Merge remote-tracking branch 'upstream/master' into event-flags

author: garak <garakmon@gmail.com> 2018-10-16 14:31:45 -0400
committer: garak <garakmon@gmail.com> 2018-10-16 14:31:45 -0400
commit: 0051947414df4656826a5ba0b252fdbb5fb0e065 (patch)
tree: 4ac69544094baaa620b1e8556ddf79715db4fde3 /data
parent: 72f9afcbf4a81909019f21acad0484b72ed217f6 (diff)
parent: ed1bb3030bae8b0d00a1fbb68ebd50f6376938ac (diff)
244 files changed, 10202 insertions, 11107 deletions
diff --git a/data/battle_anim_80A9C70.s b/data/battle_anim_80A9C70.s
index 56486b8b7..892984c64 100644
--- a/data/battle_anim_80A9C70.s
+++ b/data/battle_anim_80A9C70.s
@@ -86,20 +86,3 @@ gUnknown_0853EF14:: @ 853EF14
     .align 2
 gUnknown_0853EF18:: @ 853EF18
 	spr_template 0x2714, 0x2714, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C
-
-    .align 2
-gUnknown_0853EF30:: @ 853EF30
-	.byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88
-
-    .align 2
-gUnknown_0853EF40:: @ 853EF40
-	.4byte 0x00000004, gUnknown_0853EF30
-
-    .align 2
-gUnknown_0853EF48:: @ 853EF48
-	spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-    .align 2
-gUnknown_0853EF60:: @ 853EF60
-	spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44
-
diff --git a/data/battle_anim_80FE840.s b/data/battle_anim_80FE840.s
index 749db42f8..856f379d9 100644
--- a/data/battle_anim_80FE840.s
+++ b/data/battle_anim_80FE840.s
@@ -14,15 +14,15 @@ gUnknown_08592114:: @ 8592114
 	.4byte gUnknown_085920F0
 
     .align 2
-gUnknown_08592118:: @ 8592118
+gSleepPowderParticleSpriteTemplate:: @ 8592118
 	spr_template 0x2753, 0x2753, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
 	
 	.align 2
-gUnknown_08592130:: @ 8592130
+gStunSporeParticleSpriteTemplate:: @ 8592130
 	spr_template 0x2754, 0x2754, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
 	
     .align 2
-gUnknown_08592148:: @ 8592148
+gPoisonPowderParticleSpriteTemplate:: @ 8592148
 	spr_template 0x2751, 0x2751, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
 
     .align 2
@@ -142,7 +142,7 @@ gUnknown_085922B4:: @ 85922B4
 	.4byte gUnknown_085922A8
 
     .align 2
-gUnknown_085922BC:: @ 85922BC
+gLeechSeedSpriteTemplate:: @ 85922BC
 	spr_template 0x2716, 0x2716, gUnknown_0852490C, gUnknown_085922B4, NULL, gDummySpriteAffineAnimTable, sub_80FEC48
 
     .align 2
@@ -230,7 +230,7 @@ gUnknown_08592400:: @ 8592400
 	.4byte gUnknown_085923F0
 
     .align 2
-gUnknown_08592404:: @ 8592404
+gSwiftStarSpriteTemplate:: @ 8592404
 	spr_template 0x27be, 0x27be, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08592400, sub_80FF0F4
 
     .align 2
@@ -353,7 +353,7 @@ gUnknown_08592610:: @ 8592610
 	spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFB18
 
     .align 2
-gUnknown_08592628:: @ 8592628
+gBattleAnimSpriteTemplate_8592628:: @ 8592628
 	spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFBF4
 
     .align 2
@@ -599,7 +599,7 @@ gUnknown_08592A18:: @ 8592A18
 	.4byte gUnknown_08592A04
 
 	.align 2
-gUnknown_08592A1C:: @ 8592A1C
+gCuttingSliceSpriteTemplate:: @ 8592A1C
 	spr_template 0x279a, 0x279a, gUnknown_08524A34, gUnknown_08592A18, NULL, gDummySpriteAffineAnimTable, sub_8100AE0
 
 	.align 2
@@ -828,7 +828,7 @@ gUnknown_08592DE4:: @ 8592DE4
 
 	.align 2
 gUnknown_08592DFC:: @ 8592DFC
-	spr_template 0x2721, 0x2721, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7820
+	spr_template 0x2721, 0x2721, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
 
 	.align 2
 gUnknown_08592E14:: @ 8592E14
@@ -888,7 +888,7 @@ gUnknown_08592EE8:: @ 8592EE8
 	.4byte gUnknown_08592ED4
 
 	.align 2
-gUnknown_08592EEC:: @ 8592EEC
+gBattleAnimSpriteTemplate_8592EEC:: @ 8592EEC
 	spr_template 0x27d3, 0x27d3, gUnknown_0852490C, gUnknown_08592EE8, NULL, gDummySpriteAffineAnimTable, sub_8102540
 
 	.align 2
@@ -1157,11 +1157,11 @@ gUnknown_0859337C:: @ 859337C
 	.4byte gUnknown_0859335C
 
 	.align 2
-gUnknown_08593380:: @ 8593380
+gBattleAnimSpriteTemplate_8593380:: @ 8593380
 	spr_template 0x2715, 0x2715, gUnknown_08524ADC, gDummySpriteAnimTable, NULL, gUnknown_0859337C, sub_810387C
 
 	.align 2
-gUnknown_08593398:: @ 8593398
+gSonicBoomSpriteTemplate:: @ 8593398
 	spr_template 0x2713, 0x2713, gUnknown_08524B14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81038C8
 
 	.align 2
@@ -1189,16 +1189,16 @@ gUnknown_08593424:: @ 8593424
 	.4byte gUnknown_085933E0
 
 	.align 2
-gUnknown_08593428:: @ 8593428
-	spr_template 0x27b3, 0x27b3, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_80A7820
+gSupersonicWaveSpriteTemplate:: @ 8593428
+	spr_template 0x27b3, 0x27b3, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation
 
 	.align 2
-gUnknown_08593440:: @ 8593440
-	spr_template 0x27b4, 0x27b4, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_80A7820
+gScreechWaveSpriteTemplate:: @ 8593440
+	spr_template 0x27b4, 0x27b4, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation
 
 	.align 2
 gUnknown_08593458:: @ 8593458
-	spr_template 0x2814, 0x2814, gUnknown_08524A1C, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_80A7820
+	spr_template 0x2814, 0x2814, gUnknown_08524A1C, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation
 
 	.align 2
 gUnknown_08593470:: @ 8593470
@@ -1357,7 +1357,7 @@ gUnknown_08593718:: @ 8593718
 	.4byte gUnknown_08593704
 
 	.align 2
-gUnknown_0859371C:: @ 859371C
+gBattleAnimSpriteTemplate_859371C:: @ 859371C
 	spr_template 0x27d6, 0x27d6, gUnknown_08524914, gUnknown_08593718, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
 
 	.align 2
@@ -1436,7 +1436,7 @@ gUnknown_08593880:: @ 8593880
 	spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593818, sub_81052A4
 
 	.align 2
-gUnknown_08593898:: @ 8593898
+gBattleAnimSpriteTemplate_8593898:: @ 8593898
 	spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593810, sub_81054E8
 
 	.align 2
@@ -1497,7 +1497,7 @@ gUnknown_085939A0:: @ 85939A0
 	spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106140
 
 	.align 2
-gUnknown_085939B8:: @ 85939B8
+gBattleAnimSpriteTemplate_85939B8:: @ 85939B8
 	spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4
 
 	.align 2
@@ -1514,11 +1514,11 @@ gUnknown_08593A00:: @ 8593A00
 	.4byte gUnknown_085939E8
 
 	.align 2
-gUnknown_08593A04:: @ 8593A04
+gHiddenPowerOrbSpriteTemplate:: @ 8593A04
 	spr_template 0x27e9, 0x27e9, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_810673C
 
 	.align 2
-gUnknown_08593A1C:: @ 8593A1C
+gHiddenPowerOrbScatterSpriteTemplate:: @ 8593A1C
 	spr_template 0x27e9, 0x27e9, gUnknown_085249CC, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_8106878
 
 	.align 2
@@ -1620,7 +1620,7 @@ gUnknown_08593B98:: @ 8593B98
 	.2byte 0xfff8, 0x000c, 0x0400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
 
 	.align 2
-gUnknown_08593BB8:: @ 8593BB8
+gBattleAnimSpriteTemplate_8593BB8:: @ 8593BB8
 	spr_template 0x27f1, 0x27f1, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106E00
 
 	.align 2
@@ -1703,7 +1703,7 @@ gUnknown_08595064:: @ 8595064
 	.4byte gUnknown_08595054
 
 	.align 2
-gUnknown_08595068:: @ 8595068
+gBattleAnimSpriteTemplate_8595068:: @ 8595068
 	spr_template 0x27a2, 0x27a2, gUnknown_08524A8C, gUnknown_08595064, NULL, gUnknown_08595050, sub_8107260
 
 	.align 2
@@ -1990,11 +1990,11 @@ gUnknown_085954D0:: @ 85954D0
 	.4byte gUnknown_085954B8
 
 	.align 2
-gUnknown_085954D4:: @ 85954D4
-	spr_template 0x272d, 0x272d, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7820
+gEmberSpriteTemplate:: @ 85954D4
+	spr_template 0x272d, 0x272d, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
 
 	.align 2
-gUnknown_085954EC:: @ 85954EC
+gEmberFlareSpriteTemplate:: @ 85954EC
 	spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_8109198
 
 	.align 2
@@ -2031,7 +2031,7 @@ gUnknown_0859556C:: @ 859556C
 	spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08595540, NULL, gDummySpriteAffineAnimTable, sub_8109364
 
 	.align 2
-gUnknown_08595584:: @ 8595584
+gBattleAnimSpriteTemplate_8595584:: @ 8595584
 	spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_81093A4
 
 	.align 2
@@ -2138,12 +2138,12 @@ gUnknown_08595734:: @ 8595734
 	spr_template 0x275f, 0x275f, gUnknown_08524914, gUnknown_08595730, NULL, gDummySpriteAffineAnimTable, sub_810A274
 
 	.align 2
-gUnknown_0859574C:: @ 859574C
+gBattleAnimSpriteTemplate_859574C:: @ 859574C
 	spr_template 0x271b, 0x271b, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810A308
 
 	.align 2
 gUnknown_08595764:: @ 8595764
-	spr_template 0x27bb, 0x27bb, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7820
+	spr_template 0x27bb, 0x27bb, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
 
 	.align 2
 gUnknown_0859577C:: @ 859577C
@@ -2175,15 +2175,15 @@ gUnknown_085957DC:: @ 85957DC
 	.4byte gUnknown_085957BC
 
 	.align 2
-gUnknown_085957E0:: @ 85957E0
+gBattleAnimSpriteTemplate_85957E0:: @ 85957E0
 	spr_template 0x282a, 0x282a, gUnknown_08524974, gUnknown_085957B8, NULL, gUnknown_085957DC, sub_810A5BC
 
 	.align 2
-gUnknown_085957F8:: @ 85957F8
+gBattleAnimSpriteTemplate_85957F8:: @ 85957F8
 	spr_template 0x271b, 0x271b, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_0859578C, sub_810A628
 
 	.align 2
-gUnknown_08595810:: @ 8595810
+gElectricitySpriteTemplate:: @ 8595810
 	spr_template 0x271b, 0x271b, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810A75C
 
 	.align 2
@@ -2613,7 +2613,7 @@ gUnknown_08595E80:: @ 8595E80
 	spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEB4
 
 	.align 2
-gUnknown_08595E98:: @ 8595E98
+gFistFootSpriteTemplate:: @ 8595E98
 	spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEE0
 
 	.align 2
@@ -2651,7 +2651,7 @@ gUnknown_08595F44:: @ 8595F44
 	.4byte gUnknown_08595F2C
 
 	.align 2
-gUnknown_08595F48:: @ 8595F48
+gMegaPunchKickSpriteTemplate:: @ 8595F48
 	spr_template 0x279f, 0x279f, gUnknown_085249D4, gUnknown_08595E54, NULL, gUnknown_08595F44, sub_810D278
 
 	.align 2
@@ -2841,11 +2841,11 @@ gUnknown_0859623C:: @ 859623C
 	.4byte gUnknown_08596224
 
 	.align 2
-gUnknown_08596240:: @ 8596240
+gPoisonBubbleSpriteTemplate:: @ 8596240
 	spr_template 0x27a6, 0x27a6, gUnknown_0852496C, gUnknown_08596164, NULL, gUnknown_0859623C, sub_810DDC4
 
 	.align 2
-gUnknown_08596258:: @ 8596258
+gWaterBubbleSpriteTemplate:: @ 8596258
 	spr_template 0x27ab, 0x27ab, gUnknown_08524A8C, gUnknown_08595200, NULL, gUnknown_0859623C, sub_810DDC4
 
 	.align 2
@@ -2862,7 +2862,7 @@ gUnknown_085962A0:: @ 85962A0
 	.4byte gUnknown_08596288
 
 	.align 2
-gUnknown_085962A4:: @ 85962A4
+gBattleAnimSpriteTemplate_85962A4:: @ 85962A4
 	spr_template 0x2719, 0x2719, gUnknown_085249BC, gDummySpriteAnimTable, NULL, gUnknown_085962A0, sub_810DFA8
 
 	.align 2
@@ -3067,7 +3067,7 @@ gUnknown_08596624:: @ 8596624
 
 	.align 2
 gUnknown_0859663C:: @ 859663C
-	spr_template 0x27b3, 0x27b3, gUnknown_08524954, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7820
+	spr_template 0x27b3, 0x27b3, gUnknown_08524954, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
 
 	.align 2
 gUnknown_08596654:: @ 8596654
@@ -3268,15 +3268,15 @@ gUnknown_08596A2C:: @ 8596A2C
 	spr_template 0x27c5, 0x27c5, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08596A28, sub_811067C
 
 	.align 2
-gUnknown_08596A44:: @ 8596A44
+gLinearStingerSpriteTemplate:: @ 8596A44
 	spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110720
 
 	.align 2
-gUnknown_08596A5C:: @ 8596A5C
+gPinMissileSpriteTemplate:: @ 8596A5C
 	spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850
 
 	.align 2
-gUnknown_08596A74:: @ 8596A74
+gIcicleSpearSpriteTemplate:: @ 8596A74
 	spr_template 0x2816, 0x2816, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850
 
 	.align 2
@@ -3342,7 +3342,7 @@ gUnknown_08596B88:: @ 8596B88
 	spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_8110B38
 
 	.align 2
-gUnknown_08596BA0:: @ 8596BA0
+gBattleAnimSpriteTemplate_8596BA0:: @ 8596BA0
 	spr_template 0x2815, 0x2815, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110E4C
 
 	.align 2
@@ -3500,11 +3500,11 @@ gUnknown_08596DD0:: @ 8596DD0
 	spr_template 0x27d7, 0x27d7, gUnknown_08524A54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81129F0
 
 	.align 2
-gUnknown_08596DE8:: @ 8596DE8
+gBattleAnimSpriteTemplate_8596DE8:: @ 8596DE8
 	spr_template 0x27d8, 0x27d8, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78
 
 	.align 2
-gUnknown_08596E00:: @ 8596E00
+gBattleAnimSpriteTemplate_8596E00:: @ 8596E00
 	spr_template 0x27ed, 0x27ed, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78
 
 	.align 2
@@ -3533,7 +3533,7 @@ gUnknown_08596E78:: @ 8596E78
 	.4byte gUnknown_08596E60
 
 	.align 2
-gUnknown_08596E7C:: @ 8596E7C
+gBattleAnimSpriteTemplate_8596E7C:: @ 8596E7C
 	spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08596E78, NULL, gDummySpriteAffineAnimTable, sub_8113064
 
 	.align 2
@@ -3705,7 +3705,7 @@ gUnknown_08597130:: @ 8597130
 	.4byte gUnknown_08597118
 
 	.align 2
-gUnknown_08597138:: @ 8597138
+gBattleAnimSpriteTemplate_8597138:: @ 8597138
 	spr_template 0x2737, 0x2737, gUnknown_08524914, gUnknown_08597130, NULL, gDummySpriteAffineAnimTable, sub_81144BC
 
 	.align 2
@@ -3774,15 +3774,15 @@ gUnknown_08597254:: @ 8597254
 	.4byte gUnknown_08597240
 
 	.align 2
-gUnknown_0859725C:: @ 859725C
+gConfusionDuckSpriteTemplate:: @ 859725C
 	spr_template 0x2759, 0x2759, gUnknown_0852490C, gUnknown_08597254, NULL, gDummySpriteAffineAnimTable, sub_811572C
 
 	.align 2
-gUnknown_08597274:: @ 8597274
+gSimplePaletteBlendSpriteTemplate:: @ 8597274
 	spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81157FC
 
 	.align 2
-gUnknown_0859728C:: @ 859728C
+gComplexPaletteBlendSpriteTemplate:: @ 859728C
 	spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81158A4
 
 	.align 2
@@ -3799,7 +3799,7 @@ gUnknown_085972C0:: @ 85972C0
 	spr_template 0x2757, 0x2757, gUnknown_08524914, gUnknown_085972BC, NULL, gDummySpriteAffineAnimTable, sub_81159B4
 
 	.align 2
-gUnknown_085972D8:: @ 85972D8
+gBattleAnimSpriteTemplate_85972D8:: @ 85972D8
 	spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81160A4
 
 	.align 2
@@ -3829,11 +3829,11 @@ gUnknown_08597348:: @ 8597348
 	.4byte gUnknown_08597330
 
 	.align 2
-gUnknown_08597358:: @ 8597358
+gBasicHitSplatSpriteTemplate:: @ 8597358
 	spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116388
 
 	.align 2
-gUnknown_08597370:: @ 8597370
+gBattleAnimSpriteTemplate_8597370:: @ 8597370
 	spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116420
 
 	.align 2
@@ -3845,7 +3845,7 @@ gUnknown_085973A0:: @ 85973A0
 	spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116458
 
 	.align 2
-gUnknown_085973B8:: @ 85973B8
+gBattleAnimSpriteTemplate_85973B8:: @ 85973B8
 	spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_81164F0
 
 	.align 2
diff --git a/data/battle_anim_815A0D4.s b/data/battle_anim_815A0D4.s
index 0cb95a7e1..660e5774b 100644
--- a/data/battle_anim_815A0D4.s
+++ b/data/battle_anim_815A0D4.s
@@ -330,7 +330,7 @@ gUnknown_085CE5A8::
 	spr_template 0x2800, 0x2800, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88
 gUnknown_085CE5C0::
 	spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94
-gUnknown_085CE5D8::
+gBattleAnimSpriteTemplate_85CE5D8::
 	spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4
 
 	.align 2
diff --git a/data/battle_anim_8170478.s b/data/battle_anim_8170478.s
index 07516ba35..5ccf37c54 100644
--- a/data/battle_anim_8170478.s
+++ b/data/battle_anim_8170478.s
@@ -140,7 +140,7 @@ gUnknown_085E5310:: @ 85E5310
 	.2byte 0x0100, 0x0503, 0x0506, 0x0004
 
 	.align 2
-gUnknown_085E5338:: @ 85E5338
+gBattleAnimSpriteTemplate_85E5338:: @ 85E5338
 	spr_template 0x281d, 0x281d, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C
 
 	.align 2
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 624a5c69f..9af3ed7a9 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -1,16 +1,20 @@
+#include "constants/battle.h"
 #include "constants/battle_anim.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
+#include "constants/moves.h"
+	.include "asm/macros.inc"
 	.include "asm/macros/battle_anim_script.inc"
+	.include "constants/constants.inc"
 
 	.section script_data, "aw", %progbits
 
-.align 2
-gUnknown_082C8D64:: @ 82C8D64
-	.2byte 0x2F, 0xC3, 0x140, 0xFFFF
+	.align 2
+gMovesWithQuietBGM::
+	.2byte MOVE_SING, MOVE_PERISH_SONG, MOVE_GRASS_WHISTLE, 0xFFFF
 
-.align 2
-gBattleAnims_Moves:: @ 82C8D6C
+	.align 2
+gBattleAnims_Moves::
 	.4byte Move_NONE
 	.4byte Move_POUND
 	.4byte Move_KARATE_CHOP
@@ -368,8 +372,8 @@ gBattleAnims_Moves:: @ 82C8D6C
 	.4byte Move_PSYCHO_BOOST
 	.4byte Move_COUNT @ cannot be reached, because last move is Psycho Boost
 
-.align 2
-gBattleAnims_Statuses:: @ 82C92FC
+	.align 2
+gBattleAnims_StatusConditions::
 	.4byte Status_Poison
 	.4byte Status_Confusion
 	.4byte Status_Burn
@@ -380,212 +384,209 @@ gBattleAnims_Statuses:: @ 82C92FC
 	.4byte Status_Curse
 	.4byte Status_Nightmare
 
-.align 2
-gBattleAnims_VariousTable:: @ 82C9320
-	.4byte Anim_CastformTransform
-	.4byte Anim_StatChange
-	.4byte Anim_SubsituteOff
-	.4byte Anim_SubsituteOn
-	.4byte Anim_Table_4
-	.4byte Anim_ItemKnockOff
-	.4byte Status_Wrap
-	.4byte Anim_ItemEffect
-	.4byte Anim_SmokeBallEscape
-	.4byte Anim_HangedOn
-	.4byte Anim_Rain
-	.4byte Anim_Sun
-	.4byte Anim_Sandstorm
-	.4byte Anim_Hail
-	.4byte Status_LeechSeed
-	.4byte Anim_Hit
-	.4byte Anim_ItemSteal
-	.4byte Anim_SnatchMove
-	.4byte Anim_FutureSightHit
-	.4byte Anim_DoomDesireHit
-	.4byte Anim_Table_x14
-	.4byte Status_Ingrain
-	.4byte Anim_WishHeal
-
-.align 2
-gBattleAnims_Special:: @ 82C937C
-	.4byte Anim_LevelUp
-	.4byte Anim_SwitchOutPlayer
-	.4byte Anim_SwitchOutOpponent
-	.4byte Anim_BallThrow
-	.4byte Anim_SafariBallThrow
-	.4byte Anim_SubstituteToMon
-	.4byte Anim_MonToSubstitute
+	.align 2
+gBattleAnims_General::
+	.4byte General_CastformChange
+	.4byte General_StatsChange
+	.4byte General_SubstituteFade
+	.4byte General_SubstituteAppear
+	.4byte General_PokeblockThrow
+	.4byte General_ItemKnockoff
+	.4byte General_TurnTrap
+	.4byte General_ItemEffect
+	.4byte General_SmokeballEscape
+	.4byte General_HangedOn
+	.4byte General_Rain
+	.4byte General_Sun
+	.4byte General_Sandstorm
+	.4byte General_Hail
+	.4byte General_LeechSeedDrain
+	.4byte General_MonHit
+	.4byte General_ItemSteal
+	.4byte General_SnatchMove
+	.4byte General_FutureSightHit
+	.4byte General_DoomDesireHit
+	.4byte General_FocusPunchSetUp
+	.4byte General_IngrainHeal
+	.4byte General_WishHeal
+
+	.align 2
+gBattleAnims_Special::
+	.4byte Special_LevelUp
+	.4byte Special_SwitchOutPlayerMon
+	.4byte Special_SwitchOutOpponentMon
+	.4byte Special_BallThrow
+	.4byte Special_SafariBallThrow
+	.4byte Special_SubstituteToMon
+	.4byte Special_MonToSubstitute
 
 Move_NONE:
 Move_MIRROR_MOVE:
 Move_POUND:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W003, +63
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_DOUBLE_SLAP:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	choosetwoturnanim AnimScript_82C93F4, AnimScript_82C9408
-
-AnimScript_82C93DA:
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+	setalpha 12, 8
+	choosetwoturnanim DoubleSlapLeft, DoubleSlapRight
+DoubleSlapContinue:
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	playsewithpan SE_W003, +63
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
-
-AnimScript_82C93F4:
-	createsprite gUnknown_08597358, 0x2, -8, 0, 1, 2
-	goto AnimScript_82C93DA
-
-AnimScript_82C9408:
-	createsprite gUnknown_08597358, 0x2, 8, 0, 1, 2
-	goto AnimScript_82C93DA
+DoubleSlapLeft:
+	createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2
+	goto DoubleSlapContinue
+DoubleSlapRight:
+	createsprite gBasicHitSplatSpriteTemplate, 2, 8, 0, 1, 2
+	goto DoubleSlapContinue
 
 Move_POISON_POWDER:
-	loadspritegfx 0x2751
-	loadspritegfx 0x27A6
-	loopsewithpan SE_W077, +63, 0xA, 0x6
-	createsprite gUnknown_08592148, 0x82, -30, -22, 117, 80, 5, 1
-	createsprite gUnknown_08592148, 0x82, 10, -22, 117, 80, -5, 1
-	createsprite gUnknown_08592148, 0x82, -25, -22, 117, 112, 5, 3
-	delay 0xF
-	createsprite gUnknown_08592148, 0x82, -5, -22, 117, 80, -5, 1
-	createsprite gUnknown_08592148, 0x82, 5, -22, 117, 96, 5, 1
-	createsprite gUnknown_08592148, 0x82, 0, -22, 117, 69, -5, 1
-	createsprite gUnknown_08592148, 0x82, -15, -22, 117, 112, 5, 2
-	delay 0x1E
-	createsprite gUnknown_08592148, 0x82, -15, -22, 117, 112, 5, 2
-	createsprite gUnknown_08592148, 0x82, 15, -22, 117, 80, -5, 1
-	createsprite gUnknown_08592148, 0x82, -10, -22, 117, 96, 7, 2
-	createsprite gUnknown_08592148, 0x82, -5, -22, 117, 90, -8, 0
-	delay 0x14
-	createsprite gUnknown_08592148, 0x82, -10, -22, 117, 80, -5, 1
-	createsprite gUnknown_08592148, 0x82, 0, -22, 117, 89, 5, 2
-	createsprite gUnknown_08592148, 0x82, 20, -22, 117, 112, -8, 2
-	createsprite gUnknown_08592148, 0x82, 5, -22, 117, 80, 5, 1
+	loadspritegfx ANIM_TAG_065
+	loadspritegfx ANIM_TAG_POISON_BUBBLE
+	loopsewithpan SE_W077, +63, 10, 6
+	createsprite gPoisonPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1
+	createsprite gPoisonPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1
+	createsprite gPoisonPowderParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3
+	delay 15
+	createsprite gPoisonPowderParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1
+	createsprite gPoisonPowderParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1
+	createsprite gPoisonPowderParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1
+	createsprite gPoisonPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2
+	delay 30
+	createsprite gPoisonPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2
+	createsprite gPoisonPowderParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1
+	createsprite gPoisonPowderParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2
+	createsprite gPoisonPowderParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0
+	delay 20
+	createsprite gPoisonPowderParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1
+	createsprite gPoisonPowderParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2
+	createsprite gPoisonPowderParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2
+	createsprite gPoisonPowderParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1
 	waitforvisualfinish
 	end
 
 Move_STUN_SPORE:
-	loadspritegfx 0x2754
-	loopsewithpan SE_W077, +63, 0xA, 0x6
-	createsprite gUnknown_08592130, 0x82, -30, -22, 117, 80, 5, 1
-	createsprite gUnknown_08592130, 0x82, 10, -22, 117, 80, -5, 1
-	createsprite gUnknown_08592130, 0x82, -25, -22, 117, 112, 5, 3
-	delay 0xF
-	createsprite gUnknown_08592130, 0x82, -5, -22, 117, 80, -5, 1
-	createsprite gUnknown_08592130, 0x82, 5, -22, 117, 96, 5, 1
-	createsprite gUnknown_08592130, 0x82, 0, -22, 117, 69, -5, 1
-	createsprite gUnknown_08592130, 0x82, -15, -22, 117, 112, 5, 2
-	delay 0x1E
-	createsprite gUnknown_08592130, 0x82, -15, -22, 117, 112, 5, 2
-	createsprite gUnknown_08592130, 0x82, 15, -22, 117, 80, -5, 1
-	createsprite gUnknown_08592130, 0x82, -10, -22, 117, 96, 7, 2
-	createsprite gUnknown_08592130, 0x82, -5, -22, 117, 90, -8, 0
-	delay 0x14
-	createsprite gUnknown_08592130, 0x82, -10, -22, 117, 80, -5, 1
-	createsprite gUnknown_08592130, 0x82, 0, -22, 117, 89, 5, 2
-	createsprite gUnknown_08592130, 0x82, 20, -22, 117, 112, -8, 2
-	createsprite gUnknown_08592130, 0x82, 5, -22, 117, 80, 5, 1
+	loadspritegfx ANIM_TAG_068
+	loopsewithpan SE_W077, +63, 10, 6
+	createsprite gStunSporeParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1
+	createsprite gStunSporeParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1
+	createsprite gStunSporeParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3
+	delay 15
+	createsprite gStunSporeParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1
+	createsprite gStunSporeParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1
+	createsprite gStunSporeParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1
+	createsprite gStunSporeParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2
+	delay 30
+	createsprite gStunSporeParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2
+	createsprite gStunSporeParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1
+	createsprite gStunSporeParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2
+	createsprite gStunSporeParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0
+	delay 20
+	createsprite gStunSporeParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1
+	createsprite gStunSporeParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2
+	createsprite gStunSporeParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2
+	createsprite gStunSporeParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1
 	waitforvisualfinish
 	end
 
 Move_SLEEP_POWDER:
-	loadspritegfx 0x2753
-	loopsewithpan SE_W077, +63, 0xA, 0x6
-	createsprite gUnknown_08592118, 0x82, -30, -22, 117, 80, 5, 1
-	createsprite gUnknown_08592118, 0x82, 10, -22, 117, 80, -5, 1
-	createsprite gUnknown_08592118, 0x82, -25, -22, 117, 112, 5, 3
-	delay 0xF
-	createsprite gUnknown_08592118, 0x82, -5, -22, 117, 80, -5, 1
-	createsprite gUnknown_08592118, 0x82, 5, -22, 117, 96, 5, 1
-	createsprite gUnknown_08592118, 0x82, 0, -22, 117, 69, -5, 1
-	createsprite gUnknown_08592118, 0x82, -15, -22, 117, 112, 5, 2
-	delay 0x1E
-	createsprite gUnknown_08592118, 0x82, -15, -22, 117, 112, 5, 2
-	createsprite gUnknown_08592118, 0x82, 15, -22, 117, 80, -5, 1
-	createsprite gUnknown_08592118, 0x82, -10, -22, 117, 96, 7, 2
-	createsprite gUnknown_08592118, 0x82, -5, -22, 117, 90, -8, 0
-	delay 0x14
-	createsprite gUnknown_08592118, 0x82, -10, -22, 117, 80, -5, 1
-	createsprite gUnknown_08592118, 0x82, 0, -22, 117, 89, 5, 2
-	createsprite gUnknown_08592118, 0x82, 20, -22, 117, 112, -8, 2
-	createsprite gUnknown_08592118, 0x82, 5, -22, 117, 80, 5, 1
+	loadspritegfx ANIM_TAG_067
+	loopsewithpan SE_W077, +63, 10, 6
+	createsprite gSleepPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1
+	createsprite gSleepPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1
+	createsprite gSleepPowderParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3
+	delay 15
+	createsprite gSleepPowderParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1
+	createsprite gSleepPowderParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1
+	createsprite gSleepPowderParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1
+	createsprite gSleepPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2
+	delay 30
+	createsprite gSleepPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2
+	createsprite gSleepPowderParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1
+	createsprite gSleepPowderParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2
+	createsprite gSleepPowderParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0
+	delay 20
+	createsprite gSleepPowderParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1
+	createsprite gSleepPowderParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2
+	createsprite gSleepPowderParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2
+	createsprite gSleepPowderParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1
 	waitforvisualfinish
 	end
 
 Move_SWIFT:
-	loadspritegfx 0x27BE
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_174
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W129, -64
-	createsprite gUnknown_08592404, 0x83, 20, -10, 20, 0, 22, 20, 1
-	delay 0x5
+	createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 20, 1
+	delay 5
 	playsewithpan SE_W129, -64
-	createsprite gUnknown_08592404, 0x83, 20, -10, 20, 5, 22, -18, 1
-	delay 0x5
+	createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 5, 22, -18, 1
+	delay 5
 	playsewithpan SE_W129, -64
-	createsprite gUnknown_08592404, 0x83, 20, -10, 20, -10, 22, 15, 1
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 18, 1
-	createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 18, 1
-	delay 0x5
+	createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, -10, 22, 15, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 18, 1
+	delay 5
 	playsewithpan SE_W129, -64
-	createsprite gUnknown_08592404, 0x83, 20, -10, 20, 0, 22, -20, 1
-	delay 0x5
+	createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, -20, 1
+	delay 5
 	playsewithpan SE_W129, -64
-	createsprite gUnknown_08592404, 0x83, 20, -10, 20, 0, 22, 12, 1
-	delay 0x5
+	createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 12, 1
+	delay 5
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_STRENGTH:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W036, -64
-	createvisualtask sub_80D5644, 0x5, 0, 2, 0, 96, 30
+	createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_ATTACKER, 2, 0, 96, 30
 	waitforvisualfinish
-	delay 0xA
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 4
-	createvisualtask sub_80D5830, 0x2, 1, 18, 6, 2, 4
-	delay 0x4
+	delay 10
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 4
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 18, 6, 2, 4
+	delay 4
 	playsewithpan SE_W025B, +63
-	createsprite gUnknown_08597358, 0x3, 16, 12, 1, 1
-	delay 0x4
+	createsprite gBasicHitSplatSpriteTemplate, 3, 16, 12, 1, 1
+	delay 4
 	playsewithpan SE_W025B, +63
-	createsprite gUnknown_08597358, 0x3, -16, -12, 1, 1
-	delay 0x4
+	createsprite gBasicHitSplatSpriteTemplate, 3, -16, -12, 1, 1
+	delay 4
 	playsewithpan SE_W025B, +63
-	createsprite gUnknown_08597358, 0x3, 3, 4, 1, 1
+	createsprite gBasicHitSplatSpriteTemplate, 3, 3, 4, 1, 1
 	waitforvisualfinish
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_TACKLE:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	createsprite gUnknown_0857FE28, 0x2, 4, 4
-	delay 0x6
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+	setalpha 12, 8
+	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4
+	delay 6
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	playsewithpan SE_W004, +63
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
@@ -593,614 +594,597 @@ Move_TACKLE:
 	end
 
 Move_BODY_SLAM:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W036, -64
-	createsprite gUnknown_0857FE40, 0x2, 6, 1, 0
+	createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER
 	waitforvisualfinish
-	delay 0xB
-	createsprite gUnknown_0857FE70, 0x2, 0, 26, 0, 0, 5
-	delay 0x6
-	createsprite gUnknown_08597358, 0x4, -10, 0, 1, 0
-	loopsewithpan SE_W025B, +63, 0xA, 0x2
-	delay 0x1
-	createsprite gUnknown_0857FE70, 0x2, 1, -28, 0, 0, 3
+	delay 11
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 26, 0, 0, 5
+	delay 6
+	createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0
+	loopsewithpan SE_W025B, +63, 10, 2
+	delay 1
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3
 	waitforvisualfinish
-	createvisualtask sub_80D5484, 0x2, 1, 4, 0, 12, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
 	waitforvisualfinish
-	delay 0xA
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 6
-	delay 0x5
-	createsprite gUnknown_0857FE58, 0x2, 1, 0, 6
+	delay 10
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6
+	delay 5
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_SUPERSONIC:
-	loadspritegfx 0x27B3
+	loadspritegfx ANIM_TAG_163
 	monbg ANIM_ATK_PARTNER
 	monbgprio_2A ANIM_ATTACKER
-	setalpha 0x80C
-	createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 8, 1
-	call AnimScript_82C99FF
-	call AnimScript_82C99FF
-	call AnimScript_82C99FF
-	call AnimScript_82C99FF
-	call AnimScript_82C99FF
-	call AnimScript_82C99FF
+	setalpha 12, 8
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1
+	call Supersonic1
+	call Supersonic1
+	call Supersonic1
+	call Supersonic1
+	call Supersonic1
+	call Supersonic1
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
 	end
-
-AnimScript_82C99FF:
+Supersonic1:
 	playsewithpan SE_W048, -64
-	createsprite gUnknown_08593428, 0x82, 16, 0, 0, 0, 30, 0
-	delay 0x2
+	createsprite gSupersonicWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0
+	delay 2
 	return
 
 Move_SCREECH:
-	loadspritegfx 0x27B4
-	createvisualtask sub_80D52D0, 0x2, 0, 3, 0, 2, 1
-	call AnimScript_82C9A4C
-	call AnimScript_82C9A4C
-	delay 0x10
-	createvisualtask sub_80D5EB8, 0x5, 0, 6, 2048, 2, 1
+	loadspritegfx ANIM_TAG_164
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 2, 1
+	call Screech1
+	call Screech1
+	delay 16
+	createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 2, ANIM_TARGET
 	waitforvisualfinish
 	end
-
-AnimScript_82C9A4C:
+Screech1:
 	playsewithpan SE_W103, -64
-	createsprite gUnknown_08593440, 0x82, 16, 0, 0, 0, 30, 0
-	delay 0x2
+	createsprite gScreechWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0
+	delay 2
 	return
 
 Move_FLAME_WHEEL:
-	loadspritegfx 0x272D
+	loadspritegfx ANIM_TAG_SMALL_EMBER
 	monbg ANIM_DEF_PARTNER
 	monbgprio_2A ANIM_TARGET
-	createsprite gUnknown_08595584, 0x3, 0, 0, 56, 0
+	createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 0
 	playsewithpan SE_W172, -64
-	delay 0x2
-	createsprite gUnknown_08595584, 0x3, 0, 0, 56, 4
+	delay 2
+	createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 4
 	playsewithpan SE_W172, -64
-	delay 0x2
-	createsprite gUnknown_08595584, 0x3, 0, 0, 56, 8
+	delay 2
+	createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 8
 	playsewithpan SE_W172, -64
-	delay 0x2
-	createsprite gUnknown_08595584, 0x3, 0, 0, 56, 12
+	delay 2
+	createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 12
 	playsewithpan SE_W172, -64
-	delay 0x2
-	createsprite gUnknown_08595584, 0x3, 0, 0, 56, 16
+	delay 2
+	createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 16
 	playsewithpan SE_W172, -64
-	delay 0x2
-	createsprite gUnknown_08595584, 0x3, 0, 0, 56, 20
+	delay 2
+	createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 20
 	playsewithpan SE_W172, -64
-	delay 0x2
-	createsprite gUnknown_08595584, 0x3, 0, 0, 56, 24
+	delay 2
+	createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 24
 	playsewithpan SE_W172, -64
 	waitforvisualfinish
-	createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 6
-	delay 0x4
-	createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 8, 1
-	createvisualtask sub_80A7B98, 0x3, 1, RGB_RED, 12, 1, 1
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 6
+	delay 4
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 8, 1
+	createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1
 	playsewithpan SE_W172B, +63
-	call AnimScript_82D2D18
-	delay 0x7
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 9
+	call FireMoveEffect
+	delay 7
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 9
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
-AnimScript_82C9B50:
-	createsprite gUnknown_08595584, 0x3, 0, 0, 50
-	delay 0x4
+FlameWheel1: @ Unused
+	createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 50
+	delay 4
 	return
 
 Move_PIN_MISSILE:
-	loadspritegfx 0x27B1
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_161
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W026, -64
-	createsprite gUnknown_08596A5C, 0x2, 20, -8, -8, -8, 20, -32
-	delay 0xF
-	createsprite gUnknown_08596A5C, 0x2, 20, -8, 8, 8, 20, -40
-	delay 0x4
+	createsprite gPinMissileSpriteTemplate, 2, 20, -8, -8, -8, 20, -32
+	delay 15
+	createsprite gPinMissileSpriteTemplate, 2, 20, -8, 8, 8, 20, -40
+	delay 4
 	playsewithpan SE_W030, +63
-	createsprite gUnknown_08597358, 0x3, -8, -8, 1, 2
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1
-	delay 0x9
-	createsprite gUnknown_08596A5C, 0x2, 20, -8, 0, 0, 20, -32
-	delay 0x4
+	createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
+	delay 9
+	createsprite gPinMissileSpriteTemplate, 2, 20, -8, 0, 0, 20, -32
+	delay 4
 	playsewithpan SE_W030, +63
-	createsprite gUnknown_08597358, 0x3, 8, 8, 1, 2
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1
-	delay 0xE
+	createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
+	delay 14
 	playsewithpan SE_W030, +63
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_ICICLE_SPEAR:
-	loadspritegfx 0x2816
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_262
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W196, -64
-	createsprite gUnknown_08596A74, 0x2, 20, -8, -8, -8, 20, -32
-	delay 0xF
-	createsprite gUnknown_08596A74, 0x2, 20, -8, 8, 8, 20, -40
-	delay 0x4
+	createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, -8, -8, 20, -32
+	delay 15
+	createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 8, 8, 20, -40
+	delay 4
 	playsewithpan SE_W030, +63
-	createsprite gUnknown_08597358, 0x3, -8, -8, 1, 2
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1
-	delay 0x9
-	createsprite gUnknown_08596A74, 0x2, 20, -8, 0, 0, 20, -32
-	delay 0x4
+	createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
+	delay 9
+	createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 0, 0, 20, -32
+	delay 4
 	playsewithpan SE_W030, +63
-	createsprite gUnknown_08597358, 0x3, 8, 8, 1, 2
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1
-	delay 0xE
+	createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
+	delay 14
 	playsewithpan SE_W030, +63
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_TAKE_DOWN:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	createvisualtask sub_80D5C50, 0x5, 0, -24, 8, 23, 10, 40, 10
-	delay 0x23
-	createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 10, 0, 0
-	createsprite gUnknown_08597358, 0x4, -10, 0, 1, 0
+	setalpha 12, 8
+	createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -24, 8, 23, 10, 40, 10
+	delay 35
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0
+	createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0
 	playsewithpan SE_W025B, +63
-	delay 0x1
-	createsprite gUnknown_0857FE70, 0x2, 1, -16, 0, 0, 4
+	delay 1
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 0, 0, 4
 	waitforvisualfinish
-	createvisualtask sub_80D5484, 0x2, 1, 4, 0, 12, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
 	waitforvisualfinish
-	delay 0x2
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 5
-	delay 0x3
-	createsprite gUnknown_0857FE58, 0x2, 1, 0, 7
+	delay 2
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5
+	delay 3
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_DOUBLE_EDGE:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	playsewithpan SE_W129, -64
-	createsprite gUnknown_0859728C, 0x2, 2, 4, 2, 0x7FFF, 10, 0, 0
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0
 	waitforvisualfinish
-	delay 0xA
+	delay 10
 	playsewithpan SE_W207, -64
-	waitplaysewithpan SE_W207, -64, 0x8
-	createvisualtask sub_80D5830, 0x2, 0, 18, 6, 2, 4
+	waitplaysewithpan SE_W207, -64, 8
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 0, 16, 16, RGB_WHITE
-	createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4
-	delay 0x3
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 16, 16, RGB_WHITE
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4
+	delay 3
 	waitforvisualfinish
 	playsewithpan SE_W025B, +63
-	createsprite gUnknown_08597358, 0x84, -10, 0, 1, 0
-	createsprite gUnknown_0857FE70, 0x2, 1, -32, 0, 0, 3
+	createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 0
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -32, 0, 0, 3
 	waitforvisualfinish
-	createvisualtask sub_80D6134, 0x2, 8, -256, 0, 0
-	createvisualtask sub_80D6134, 0x2, 8, -256, 1, 0
-	createvisualtask sub_80D5484, 0x2, 0, 4, 0, 12, 1
-	createvisualtask sub_80D5484, 0x2, 1, 4, 0, 12, 1
-	createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_WHITE
+	createvisualtask sub_80D6134, 2, 8, -256, 0, 0
+	createvisualtask sub_80D6134, 2, 8, -256, 1, 0
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_WHITE
 	waitforvisualfinish
-	createvisualtask sub_80D6134, 0x2, 8, -256, 0, 1
-	createvisualtask sub_80D6134, 0x2, 8, -256, 1, 1
+	createvisualtask sub_80D6134, 2, 8, -256, 0, 1
+	createvisualtask sub_80D6134, 2, 8, -256, 1, 1
 	waitforvisualfinish
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 5
-	delay 0x3
-	createsprite gUnknown_0857FE58, 0x2, 1, 0, 7
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5
+	delay 3
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7
 	waitforvisualfinish
 	end
 
 Move_POISON_STING:
-	loadspritegfx 0x27B1
-	loadspritegfx 0x2797
-	loadspritegfx 0x27A6
+	loadspritegfx ANIM_TAG_161
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_POISON_BUBBLE
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W013B, -64
-	createsprite gUnknown_08596A44, 0x82, 20, 0, -8, 0, 20
+	createsprite gLinearStingerSpriteTemplate, 130, 20, 0, -8, 0, 20
 	waitforvisualfinish
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 5, 1
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1
 	playsewithpan SE_W030, +63
 	waitforvisualfinish
-	call AnimScript_82D7A71
+	call PoisonBubblesEffect
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_TWINEEDLE:
-	loadspritegfx 0x27B1
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_161
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	loopsewithpan SE_W013B, -64, 0x6, 0x2
-	createsprite gUnknown_08596A44, 0x82, 10, -4, 0, -4, 20
-	createsprite gUnknown_08596A44, 0x82, 20, 12, 10, 12, 20
-	delay 0x14
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 5, 1
-	createsprite gUnknown_08597370, 0x3, 0, -4, 1, 3
-	loopsewithpan SE_W030, +63, 0x5, 0x2
-	delay 0x1
-	createsprite gUnknown_08597370, 0x3, 10, 12, 1, 3
+	setalpha 12, 8
+	loopsewithpan SE_W013B, -64, 6, 2
+	createsprite gLinearStingerSpriteTemplate, 130, 10, -4, 0, -4, 20
+	createsprite gLinearStingerSpriteTemplate, 130, 20, 12, 10, 12, 20
+	delay 20
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1
+	createsprite gBattleAnimSpriteTemplate_8597370, 3, 0, -4, 1, 3
+	loopsewithpan SE_W030, +63, 5, 2
+	delay 1
+	createsprite gBattleAnimSpriteTemplate_8597370, 3, 10, 12, 1, 3
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_FIRE_BLAST:
-	loadspritegfx 0x272D
+	loadspritegfx ANIM_TAG_SMALL_EMBER
 	createsoundtask sub_8158B30, 144, 145
-	call AnimScript_82C9FE9
-	call AnimScript_82C9FE9
-	call AnimScript_82C9FE9
-	delay 0x18
-	createvisualtask sub_8116620, 0xA, 1, 3, 0, 8, 0
-	waitforvisualfinish
-	delay 0x13
-	createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 20, 1
-	call AnimScript_82CA02D
-	delay 0x3
-	call AnimScript_82CA02D
-	delay 0x3
-	call AnimScript_82CA02D
-	delay 0x3
-	call AnimScript_82CA02D
-	delay 0x3
-	call AnimScript_82CA02D
-	delay 0x3
-	call AnimScript_82CA02D
-	delay 0x3
-	call AnimScript_82CA02D
-	delay 0x3
-	call AnimScript_82CA02D
-	delay 0x3
-	call AnimScript_82CA02D
-	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 1, 2, 8, 0, 0
-	waitforvisualfinish
-	end
-
-AnimScript_82C9FE9:
-	createsprite gUnknown_0859551C, 0x82, 0, 0, 0
-	createsprite gUnknown_0859551C, 0x82, 0, 0, 51
-	createsprite gUnknown_0859551C, 0x82, 0, 0, 102
-	createsprite gUnknown_0859551C, 0x82, 0, 0, 153
-	createsprite gUnknown_0859551C, 0x82, 0, 0, 204
-	delay 0x5
+	call FireBlast1
+	call FireBlast1
+	call FireBlast1
+	delay 24
+	createvisualtask sub_8116620, 10, 1, 3, 0, 8, RGB_BLACK
+	waitforvisualfinish
+	delay 19
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 20, 1
+	call FireBlast2
+	delay 3
+	call FireBlast2
+	delay 3
+	call FireBlast2
+	delay 3
+	call FireBlast2
+	delay 3
+	call FireBlast2
+	delay 3
+	call FireBlast2
+	delay 3
+	call FireBlast2
+	delay 3
+	call FireBlast2
+	delay 3
+	call FireBlast2
+	waitforvisualfinish
+	createvisualtask sub_8116620, 10, 1, 2, 8, 0, RGB_BLACK
+	waitforvisualfinish
+	end
+FireBlast1:
+	createsprite gUnknown_0859551C, 130, 0, 0, 0
+	createsprite gUnknown_0859551C, 130, 0, 0, 51
+	createsprite gUnknown_0859551C, 130, 0, 0, 102
+	createsprite gUnknown_0859551C, 130, 0, 0, 153
+	createsprite gUnknown_0859551C, 130, 0, 0, 204
+	delay 5
 	return
-
-AnimScript_82CA02D:
-	createsprite gUnknown_0859556C, 0x82, 0, 0, 10, 0, -2
-	createsprite gUnknown_0859556C, 0x82, 0, 0, 13, -2, 0
-	createsprite gUnknown_0859556C, 0x82, 0, 0, 13, 2, 0
-	createsprite gUnknown_0859556C, 0x82, 0, 0, 15, -2, 2
-	createsprite gUnknown_0859556C, 0x82, 0, 0, 15, 2, 2
+FireBlast2:
+	createsprite gUnknown_0859556C, 130, 0, 0, 10, 0, -2
+	createsprite gUnknown_0859556C, 130, 0, 0, 13, -2, 0
+	createsprite gUnknown_0859556C, 130, 0, 0, 13, 2, 0
+	createsprite gUnknown_0859556C, 130, 0, 0, 15, -2, 2
+	createsprite gUnknown_0859556C, 130, 0, 0, 15, 2, 2
 	return
 
 Move_LEECH_SEED:
-	loadspritegfx 0x2716
+	loadspritegfx ANIM_TAG_SEED
 	playsewithpan SE_W077, -64
-	createsprite gUnknown_085922BC, 0x82, 15, 0, 0, 24, 35, -32
-	delay 0x8
+	createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 0, 24, 35, -32
+	delay 8
 	playsewithpan SE_W077, -64
-	createsprite gUnknown_085922BC, 0x82, 15, 0, -16, 24, 35, -40
-	delay 0x8
+	createsprite gLeechSeedSpriteTemplate, 130, 15, 0, -16, 24, 35, -40
+	delay 8
 	playsewithpan SE_W077, -64
-	createsprite gUnknown_085922BC, 0x82, 15, 0, 16, 24, 35, -37
-	delay 0xC
-	loopsewithpan SE_W039, +63, 0xA, 0x8
+	createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 16, 24, 35, -37
+	delay 12
+	loopsewithpan SE_W039, +63, 10, 8
 	waitforvisualfinish
 	end
 
 Move_EMBER:
-	loadspritegfx 0x272D
-	loopsewithpan SE_W052, -64, 0x5, 0x2
-	createsprite gUnknown_085954D4, 0x82, 20, 0, -16, 24, 20, 1
-	delay 0x4
-	createsprite gUnknown_085954D4, 0x82, 20, 0, 0, 24, 20, 1
-	delay 0x4
-	createsprite gUnknown_085954D4, 0x82, 20, 0, 16, 24, 20, 1
-	delay 0x10
+	loadspritegfx ANIM_TAG_SMALL_EMBER
+	loopsewithpan SE_W052, -64, 5, 2
+	createsprite gEmberSpriteTemplate, 130, 20, 0, -16, 24, 20, 1
+	delay 4
+	createsprite gEmberSpriteTemplate, 130, 20, 0, 0, 24, 20, 1
+	delay 4
+	createsprite gEmberSpriteTemplate, 130, 20, 0, 16, 24, 20, 1
+	delay 16
 	playsewithpan SE_W172, +63
-	call AnimScript_82CA135
-	call AnimScript_82CA135
-	call AnimScript_82CA135
+	call Ember1
+	call Ember1
+	call Ember1
 	end
 
-AnimScript_82CA135:
-	createsprite gUnknown_085954EC, 0x82, -24, 24, 24, 24, 20, 1, 1
-	delay 0x4
+Ember1:
+	createsprite gEmberFlareSpriteTemplate, 130, -24, 24, 24, 24, 20, 1, 1
+	delay 4
 	return
 
 Move_MEGA_PUNCH:
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
 	monbg ANIM_TARGET
-	delay 0x2
-	createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, RGB_BLACK
-	setalpha 0x80C
+	delay 2
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK
+	setalpha 12, 8
 	playsewithpan SE_W025, +63
-	createsprite gUnknown_08595F48, 0x3, 0, 0, 0, 50
-	createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, 0x7FFF
-	delay 0x32
-	call AnimScript_82CA1E9
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 22, 1
-	createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, 0x7FFF
-	createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0
+	createsprite gMegaPunchKickSpriteTemplate, 3, 0, 0, 0, 50
+	createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE
+	delay 50
+	call SetImpactBackground
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1
+	createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0
 	playsewithpan SE_W233B, +63
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
-	delay 0x2
+	delay 2
 	restorebg
 	waitbgfadein
 	end
-
-AnimScript_82CA1E9:
-	delay 0x2
-	createvisualtask sub_8117E60, 0x2
-	jumpargeq 0x7, 0x1, AnimScript_82CA220
-	createvisualtask sub_815A8C8, 0x2
-	jumpargeq 0x7, 0x0, AnimScript_82CA212
-	jumpargeq 0x7, 0x1, AnimScript_82CA219
-
-AnimScript_82CA211:
+SetImpactBackground:
+	delay 2
+	createvisualtask AnimTask_IsContest, 2
+	jumprettrue SetImpactContestsBG
+	createvisualtask AnimTask_IsTargetPlayerSide, 2
+	jumpretfalse SetImpactOpponentBG
+	jumprettrue SetImpactPlayerBG
+SetImpactBackgroundRet:
 	return
-
-AnimScript_82CA212:
+SetImpactOpponentBG:
 	changebg BG_IMPACT_OPPONENT
-	goto AnimScript_82CA211
-
-AnimScript_82CA219:
+	goto SetImpactBackgroundRet
+SetImpactPlayerBG:
 	changebg BG_IMPACT_PLAYER
-	goto AnimScript_82CA211
-
-AnimScript_82CA220:
+	goto SetImpactBackgroundRet
+SetImpactContestsBG:
 	changebg BG_IMPACT_CONTESTS
-	goto AnimScript_82CA211
+	goto SetImpactBackgroundRet
 
 Move_MEGA_KICK:
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
 	monbg ANIM_TARGET
-	delay 0x2
-	createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, RGB_BLACK
-	setalpha 0x80C
+	delay 2
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK
+	setalpha 12, 8
 	playsewithpan SE_W025, +63
-	createsprite gUnknown_08595F48, 0x3, 0, 0, 1, 50
-	createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, 0x7FFF
-	delay 0x32
+	createsprite gMegaPunchKickSpriteTemplate, 3, 0, 0, 1, 50
+	createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE
+	delay 50
 	playsewithpan SE_W025B, +63
-	call AnimScript_82CA1E9
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 22, 1
-	createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, 0x7FFF
-	createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0
+	call SetImpactBackground
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1
+	createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
-	delay 0x2
+	delay 2
 	restorebg
 	waitbgfadein
 	end
 
 Move_COMET_PUNCH:
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	choosetwoturnanim AnimScript_82CA2F1, AnimScript_82CA316
-
-AnimScript_82CA2D7:
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+	setalpha 12, 8
+	choosetwoturnanim CometPunchLeft, CometPunchRight
+CometPunchContinue:
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	playsewithpan SE_W004, +63
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
-
-AnimScript_82CA2F1:
-	createsprite gUnknown_08597358, 0x2, -8, -8, 1, 2
-	createsprite gUnknown_08595E98, 0x3, -8, 0, 8, 1, 0
-	goto AnimScript_82CA2D7
-
-AnimScript_82CA316:
-	createsprite gUnknown_08597358, 0x2, 8, -8, 1, 2
-	createsprite gUnknown_08595E98, 0x3, 8, 0, 8, 1, 0
-	goto AnimScript_82CA2D7
+CometPunchLeft:
+	createsprite gBasicHitSplatSpriteTemplate, 2, -8, -8, 1, 2
+	createsprite gFistFootSpriteTemplate, 3, -8, 0, 8, 1, 0
+	goto CometPunchContinue
+CometPunchRight:
+	createsprite gBasicHitSplatSpriteTemplate, 2, 8, -8, 1, 2
+	createsprite gFistFootSpriteTemplate, 3, 8, 0, 8, 1, 0
+	goto CometPunchContinue
 
 Move_SONIC_BOOM:
-	loadspritegfx 0x2713
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_AIR_WAVE
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	call AnimScript_82CA372
-	call AnimScript_82CA372
-	call AnimScript_82CA372
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 10, 1
-	call AnimScript_82CA38A
+	setalpha 12, 8
+	call SonicBoom1
+	call SonicBoom1
+	call SonicBoom1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 10, 1
+	call SonicBoom2
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
-
-AnimScript_82CA372:
+SonicBoom1:
 	playsewithpan SE_W013B, -64
-	createsprite gUnknown_08593398, 0x82, 16, 0, 0, 0, 15
-	delay 0x4
+	createsprite gSonicBoomSpriteTemplate, 130, 16, 0, 0, 0, 15
+	delay 4
 	return
-
-AnimScript_82CA38A:
-	createsprite gUnknown_08597358, 0x83, 0, 0, 1, 2
-	delay 0x4
+SonicBoom2:
+	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2
+	delay 4
 	return
 
 Move_THUNDER_SHOCK:
-	loadspritegfx 0x2711
-	loadspritegfx 0x271B
-	createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, 0
+	loadspritegfx ANIM_TAG_SPARK
+	loadspritegfx ANIM_TAG_SPARK_2
+	createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK
 	waitforvisualfinish
-	delay 0xA
-	createvisualtask sub_810A7DC, 0x5, 0, -44, 0
+	delay 10
+	createvisualtask sub_810A7DC, 5, 0, -44, 0
 	playsewithpan SE_W085, +63
-	delay 0x9
-	createvisualtask sub_8116620, 0xA, 4, 0, 0, 13, 0
+	delay 9
+	createvisualtask sub_8116620, 10, 4, 0, 0, 13, RGB_BLACK
 	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 4, 0, 13, 0, 0
+	createvisualtask sub_8116620, 10, 4, 0, 13, 0, RGB_BLACK
 	waitforvisualfinish
-	delay 0x14
-	call AnimScript_82D7BEA
+	delay 20
+	call ElectricityEffect
 	waitforvisualfinish
-	delay 0x14
-	createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, 0
+	delay 20
+	createvisualtask sub_8116620, 10, 1, 0, 6, 0, RGB_BLACK
 	waitforvisualfinish
 	end
 
 Move_THUNDERBOLT:
-	loadspritegfx 0x2711
-	loadspritegfx 0x282A
-	loadspritegfx 0x271B
-	createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, 0
+	loadspritegfx ANIM_TAG_SPARK
+	loadspritegfx ANIM_TAG_282
+	loadspritegfx ANIM_TAG_SPARK_2
+	createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK
 	waitforvisualfinish
-	delay 0xA
-	createvisualtask sub_810A7DC, 0x5, 24, -52, 0
+	delay 10
+	createvisualtask sub_810A7DC, 5, 24, -52, 0
 	playsewithpan SE_W085, +63
-	delay 0x7
-	createvisualtask sub_810A7DC, 0x5, -24, -52, 0
+	delay 7
+	createvisualtask sub_810A7DC, 5, -24, -52, 0
 	playsewithpan SE_W085, +63
-	delay 0x7
-	createvisualtask sub_810A7DC, 0x5, 0, -60, 1
+	delay 7
+	createvisualtask sub_810A7DC, 5, 0, -60, 1
 	playsewithpan SE_W085, +63
-	delay 0x9
-	createvisualtask sub_8116620, 0xA, 4, 0, 0, 13, 0
-	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 4, 0, 13, 0, 0
-	waitforvisualfinish
-	delay 0x14
-	createsprite gUnknown_085957E0, 0x83, 44, 0, 0, 3
-	createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 0, 40, 0, -32765
-	createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 64, 40, 1, -32765
-	createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 128, 40, 0, -32765
-	createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 192, 40, 2, -32765
-	createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 32, 40, 0, -32765
-	createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 96, 40, 1, -32765
-	createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 160, 40, 0, -32765
-	createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 224, 40, 2, -32765
+	delay 9
+	createvisualtask sub_8116620, 10, 4, 0, 0, 13, RGB_BLACK
+	waitforvisualfinish
+	createvisualtask sub_8116620, 10, 4, 0, 13, 0, RGB_BLACK
+	waitforvisualfinish
+	delay 20
+	createsprite gBattleAnimSpriteTemplate_85957E0, 131, 44, 0, 0, 3
+	createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 0, 40, 0, -32765
+	createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 64, 40, 1, -32765
+	createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 128, 40, 0, -32765
+	createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 192, 40, 2, -32765
+	createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 32, 40, 0, -32765
+	createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 96, 40, 1, -32765
+	createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 160, 40, 0, -32765
+	createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 224, 40, 2, -32765
 	playsewithpan SE_W063, +63
-	delay 0x0
-	createvisualtask sub_8116620, 0xA, 1, 0, 2, 2, 0
-	delay 0x6
-	createvisualtask sub_8116620, 0xA, 1, 0, 6, 6, 0
-	delay 0x6
-	createvisualtask sub_8116620, 0xA, 1, 0, 2, 2, 0
-	delay 0x6
-	createvisualtask sub_8116620, 0xA, 1, 0, 6, 6, 0
+	delay 0
+	createvisualtask sub_8116620, 10, 1, 0, 2, 2, RGB_BLACK
+	delay 6
+	createvisualtask sub_8116620, 10, 1, 0, 6, 6, RGB_BLACK
+	delay 6
+	createvisualtask sub_8116620, 10, 1, 0, 2, 2, RGB_BLACK
+	delay 6
+	createvisualtask sub_8116620, 10, 1, 0, 6, 6, RGB_BLACK
 	waitforvisualfinish
-	delay 0x14
-	waitplaysewithpan SE_W085B, +63, 0x13
-	call AnimScript_82D7BEA
+	delay 20
+	waitplaysewithpan SE_W085B, +63, 19
+	call ElectricityEffect
 	waitforvisualfinish
-	delay 0x14
-	createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, 0
+	delay 20
+	createvisualtask sub_8116620, 10, 1, 0, 6, 0, RGB_BLACK
 	waitforvisualfinish
 	end
 
 Move_THUNDER_WAVE:
-	loadspritegfx 0x2711
-	loadspritegfx 0x271B
-	loadspritegfx 0x27BD
-	createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, 0
+	loadspritegfx ANIM_TAG_SPARK
+	loadspritegfx ANIM_TAG_SPARK_2
+	loadspritegfx ANIM_TAG_173
+	createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK
 	waitforvisualfinish
-	delay 0xA
-	createvisualtask sub_810A7DC, 0x5, 0, -48, 0
+	delay 10
+	createvisualtask sub_810A7DC, 5, 0, -48, 0
 	playsewithpan SE_W086, +63
-	delay 0x14
-	loopsewithpan SE_W085B, +63, 0xA, 0x4
-	createsprite gUnknown_08595840, 0x82, -16, -16
-	delay 0x4
-	createsprite gUnknown_08595840, 0x82, -16, 0
-	delay 0x4
-	createsprite gUnknown_08595840, 0x82, -16, 16
+	delay 20
+	loopsewithpan SE_W085B, +63, 10, 4
+	createsprite gUnknown_08595840, 130, -16, -16
+	delay 4
+	createsprite gUnknown_08595840, 130, -16, 0
+	delay 4
+	createsprite gUnknown_08595840, 130, -16, 16
 	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, 0
+	createvisualtask sub_8116620, 10, 1, 0, 6, 0, RGB_BLACK
 	waitforvisualfinish
 	end
 
 Move_BEAT_UP:
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	choosetwoturnanim AnimScript_82CA648, AnimScript_82CA6B9
-
-AnimScript_82CA643:
+	setalpha 12, 8
+	choosetwoturnanim BeatUpLeft, BeatUpRight
+BeatUpContinue:
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
-
-AnimScript_82CA648:
-	createsprite gUnknown_08597358, 0x82, -20, -20, 1, 2
-	createsprite gUnknown_08595E98, 0x83, -20, -12, 8, 1, 0
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+BeatUpLeft:
+	createsprite gBasicHitSplatSpriteTemplate, 130, -20, -20, 1, 2
+	createsprite gFistFootSpriteTemplate, 131, -20, -12, 8, 1, 0
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	playsewithpan SE_W233B, +63
-	delay 0x8
-	createsprite gUnknown_08597358, 0x82, 8, 0, 1, 2
-	createsprite gUnknown_08595E98, 0x83, 8, 8, 8, 1, 0
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+	delay 8
+	createsprite gBasicHitSplatSpriteTemplate, 130, 8, 0, 1, 2
+	createsprite gFistFootSpriteTemplate, 131, 8, 8, 8, 1, 0
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	playsewithpan SE_W233B, +63
-	goto AnimScript_82CA643
-
-AnimScript_82CA6B9:
-	createsprite gUnknown_08597358, 0x82, 12, -20, 1, 2
-	createsprite gUnknown_08595E98, 0x83, 12, -12, 8, 1, 0
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+	goto BeatUpContinue
+BeatUpRight:
+	createsprite gBasicHitSplatSpriteTemplate, 130, 12, -20, 1, 2
+	createsprite gFistFootSpriteTemplate, 131, 12, -12, 8, 1, 0
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	playsewithpan SE_W233B, +63
-	delay 0x8
-	createsprite gUnknown_08597358, 0x82, -12, 0, 1, 2
-	createsprite gUnknown_08595E98, 0x83, -12, 8, 8, 1, 0
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+	delay 8
+	createsprite gBasicHitSplatSpriteTemplate, 130, -12, 0, 1, 2
+	createsprite gFistFootSpriteTemplate, 131, -12, 8, 8, 1, 0
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	playsewithpan SE_W233B, +63
-	goto AnimScript_82CA643
+	goto BeatUpContinue
 
 Move_STOMP:
-	loadspritegfx 0x279F
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W104, +63
-	createsprite gUnknown_08595F60, 0x3, 0, -32, 15
-	delay 0x13
-	createsprite gUnknown_08597358, 0x2, 0, -8, 1, 1
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 4, 9, 1
+	createsprite gUnknown_08595F60, 3, 0, -32, 15
+	delay 19
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, -8, 1, 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 9, 1
 	playsewithpan SE_W025B, +63
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
@@ -1208,19 +1192,19 @@ Move_STOMP:
 	end
 
 Move_TAIL_WHIP:
-	loopsewithpan SE_W039, -64, 0x18, 0x3
-	createvisualtask sub_80D5830, 0x2, 0, 12, 4, 2, 3
+	loopsewithpan SE_W039, -64, 24, 3
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 3
 	waitforvisualfinish
 	end
 
 Move_CUT:
-	loadspritegfx 0x279A
+	loadspritegfx ANIM_TAG_138
 	monbg ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W015, +63
-	createsprite gUnknown_08592A1C, 0x2, 40, -32, 0
-	delay 0x5
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 10, 1
+	createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0
+	delay 5
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -1228,682 +1212,664 @@ Move_CUT:
 	end
 
 Move_HIDDEN_POWER:
-	loadspritegfx 0x27E9
+	loadspritegfx ANIM_TAG_217
 	playsewithpan SE_W036, -64
-	createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
 	waitforvisualfinish
-	delay 0x1E
-	createvisualtask sub_80A7B98, 0x5, 0, RGB(31, 31, 19), 12, 5, 1
-	delay 0x4
-	createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0
+	delay 30
+	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 31, 19), 12, 5, 1
+	delay 4
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
 	playsewithpan SE_W179, -64
-	createsprite gUnknown_08593A04, 0x2, 26, 0
-	createsprite gUnknown_08593A04, 0x2, 26, 42
-	createsprite gUnknown_08593A04, 0x2, 26, 84
-	createsprite gUnknown_08593A04, 0x2, 26, 126
-	createsprite gUnknown_08593A04, 0x2, 26, 168
-	createsprite gUnknown_08593A04, 0x2, 26, 210
-	delay 0x34
-	setarg 0x7, 0xFFFF
+	createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 0
+	createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 42
+	createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 84
+	createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 126
+	createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 168
+	createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 210
+	delay 52
+	setarg 7, -1
 	playsewithpan SE_W115, -64
-	createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0
-	createsprite gUnknown_08593A1C, 0x82, 0
-	createsprite gUnknown_08593A1C, 0x82, 32
-	createsprite gUnknown_08593A1C, 0x82, 64
-	createsprite gUnknown_08593A1C, 0x82, 96
-	createsprite gUnknown_08593A1C, 0x82, 128
-	createsprite gUnknown_08593A1C, 0x82, 160
-	createsprite gUnknown_08593A1C, 0x82, 192
-	createsprite gUnknown_08593A1C, 0x82, 224
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
+	createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 0
+	createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 32
+	createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 64
+	createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 96
+	createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 128
+	createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 160
+	createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 192
+	createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 224
 	end
 
 Move_REVERSAL:
-	loadspritegfx 0x27FC
-	loadspritegfx 0x279F
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_236
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_135
 	playsewithpan SE_W197, -64
-	createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 0x7FFF, 8, 0, 0
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0
 	waitforvisualfinish
-	delay 0x1E
-	createvisualtask sub_8115A04, 0x2, 31, 3, 2, 0, 10, 0x7FFF
-	delay 0xA
+	delay 30
+	createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE
+	delay 10
 	playsewithpan SE_W179, -64
-	createsprite gUnknown_085CE5D8, 0x2, 26, 0
-	createsprite gUnknown_085CE5D8, 0x2, 26, 42
-	createsprite gUnknown_085CE5D8, 0x2, 26, 84
-	createsprite gUnknown_085CE5D8, 0x2, 26, 126
-	createsprite gUnknown_085CE5D8, 0x2, 26, 168
-	createsprite gUnknown_085CE5D8, 0x2, 26, 210
-	waitforvisualfinish
-	delay 0x14
-	createsprite gUnknown_0857FE28, 0x2, 6, 4
-	delay 0x8
+	createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 0
+	createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 42
+	createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 84
+	createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 126
+	createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 168
+	createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 210
+	waitforvisualfinish
+	delay 20
+	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
+	delay 8
 	playsewithpan SE_W233B, +63
-	createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0x7FFF, 8, 0, 0
-	createsprite gUnknown_08595E98, 0x84, 0, 0, 10, 1, 0
-	createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1
-	createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_WHITE, 8, 0, 0
+	createsprite gFistFootSpriteTemplate, 132, 0, 0, 10, 1, 0
+	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
+	createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0
 	end
 
 Move_PURSUIT:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	fadetobg BG_DARK
 	waitbgfadein
-	delay 0x0
-	setalpha 0x80C
-	choosetwoturnanim AnimScript_82CA99F, AnimScript_82CA9C8
-
-AnimScript_82CA996:
+	delay 0
+	setalpha 12, 8
+	choosetwoturnanim PursuitNormal, PursuitOnSwitchout
+PursuitContinue:
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
-	delay 0x0
+	delay 0
 	restorebg
 	waitbgfadein
 	end
-
-AnimScript_82CA99F:
+PursuitNormal:
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2
-	createvisualtask sub_80D6388, 0x5, 0, 1, 6, 1, 0
-	goto AnimScript_82CA996
-
-AnimScript_82CA9C8:
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
+	createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0
+	goto PursuitContinue
+PursuitOnSwitchout:
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1
-	createvisualtask sub_80D6388, 0x5, 0, 1, 6, 1, 0
-	goto AnimScript_82CA996
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
+	createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0
+	goto PursuitContinue
 
 Move_SPIKE_CANNON:
-	loadspritegfx 0x27B1
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_161
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	createvisualtask sub_80D5C50, 0x5, 0, -4, 0, 4, 6, 8, 4
+	setalpha 12, 8
+	createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -4, 0, 4, 6, 8, 4
 	waitforvisualfinish
-	loopsewithpan SE_W013B, -64, 0x5, 0x3
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 5
-	createsprite gUnknown_08596A44, 0x2, 10, -8, -8, -8, 20
-	createsprite gUnknown_08596A44, 0x2, 18, 0, 0, 0, 20
-	createsprite gUnknown_08596A44, 0x2, 26, 8, 8, 8, 20
+	loopsewithpan SE_W013B, -64, 5, 3
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5
+	createsprite gLinearStingerSpriteTemplate, 2, 10, -8, -8, -8, 20
+	createsprite gLinearStingerSpriteTemplate, 2, 18, 0, 0, 0, 20
+	createsprite gLinearStingerSpriteTemplate, 2, 26, 8, 8, 8, 20
 	waitforvisualfinish
-	createsprite gUnknown_08597370, 0x3, -8, -8, 1, 2
-	createsprite gUnknown_08597370, 0x3, 0, 0, 1, 2
-	createsprite gUnknown_08597370, 0x3, 8, 8, 1, 2
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 7, 1
-	loopsewithpan SE_W030, +63, 0x5, 0x3
+	createsprite gBattleAnimSpriteTemplate_8597370, 3, -8, -8, 1, 2
+	createsprite gBattleAnimSpriteTemplate_8597370, 3, 0, 0, 1, 2
+	createsprite gBattleAnimSpriteTemplate_8597370, 3, 8, 8, 1, 2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1
+	loopsewithpan SE_W030, +63, 5, 3
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_SWORDS_DANCE:
-	loadspritegfx 0x2715
+	loadspritegfx ANIM_TAG_SWORD
 	monbg ANIM_ATTACKER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W014, -64
-	createvisualtask sub_80D5830, 0x2, 0, 16, 6, 1, 4
-	createsprite gUnknown_08593380, 0x2, 0, 0
-	delay 0x16
-	createvisualtask sub_8115D94, 0x2, 10005, 2, 2, 32754, 16, 0, 0
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4
+	createsprite gBattleAnimSpriteTemplate_8593380, 2, 0, 0
+	delay 22
+	createvisualtask sub_8115D94, 2, ANIM_TAG_SWORD, 2, 2, RGB(18, 31, 31), 16, 0, 0
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	blendoff
-	delay 0x1
+	delay 1
 	end
 
 Move_PSYCH_UP:
-	loadspritegfx 0x27D4
+	loadspritegfx ANIM_TAG_196
 	monbg ANIM_ATK_PARTNER
-	createvisualtask sub_8115B0C, 0x2, 1, 2, 6, 1, 11, 0
-	setalpha 0x80C
-	loopsewithpan SE_W060B, -64, 0x5, 0xA
-	createsprite gUnknown_08596548, 0x2, 0, 0, 0, 0
-	createvisualtask sub_80D5EB8, 0x5, 0, 5, 2560, 8, 0
-	delay 0x7F
-	delay 0x4
+	createvisualtask sub_8115B0C, 2, 1, 2, 6, 1, 11, 0
+	setalpha 12, 8
+	loopsewithpan SE_W060B, -64, 5, 10
+	createsprite gUnknown_08596548, 2, 0, 0, 0, 0
+	createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, ANIM_ATTACKER
+	delay 127
+	delay 4
 	playsewithpan SE_W060, -64
-	createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1
-	createvisualtask sub_8116620, 0x9, 2, 2, 10, 0, 1023
-	delay 0x1E
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1
+	createvisualtask sub_8116620, 9, 2, 2, 10, 0, RGB_YELLOW
+	delay 30
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
 	waitforvisualfinish
 	end
 
 Move_DIZZY_PUNCH:
-	loadspritegfx 0x2759
-	loadspritegfx 0x279F
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_DUCK
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	call AnimScript_82CAC77
-	createsprite gUnknown_08595E98, 0x85, 16, 8, 20, 1, 0
-	createsprite gUnknown_08597358, 0x84, 16, 0, 1, 1
+	setalpha 12, 8
+	call DizzyPunch1
+	createsprite gFistFootSpriteTemplate, 133, 16, 8, 20, 1, 0
+	createsprite gBasicHitSplatSpriteTemplate, 132, 16, 0, 1, 1
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_08595F78, 0x83, 16, 8, 160, -32
-	createsprite gUnknown_08595F78, 0x83, 16, 8, -256, -40
-	createsprite gUnknown_08595F78, 0x83, 16, 8, 128, -16
-	createsprite gUnknown_08595F78, 0x83, 16, 8, 416, -38
-	createsprite gUnknown_08595F78, 0x83, 16, 8, -128, -22
-	createsprite gUnknown_08595F78, 0x83, 16, 8, -384, -31
-	delay 0xA
-	call AnimScript_82CAC77
-	createsprite gUnknown_08595E98, 0x85, -16, -8, 20, 1, 0
-	createsprite gUnknown_08597358, 0x84, -16, -16, 1, 1
+	createsprite gUnknown_08595F78, 131, 16, 8, 160, -32
+	createsprite gUnknown_08595F78, 131, 16, 8, -256, -40
+	createsprite gUnknown_08595F78, 131, 16, 8, 128, -16
+	createsprite gUnknown_08595F78, 131, 16, 8, 416, -38
+	createsprite gUnknown_08595F78, 131, 16, 8, -128, -22
+	createsprite gUnknown_08595F78, 131, 16, 8, -384, -31
+	delay 10
+	call DizzyPunch1
+	createsprite gFistFootSpriteTemplate, 133, -16, -8, 20, 1, 0
+	createsprite gBasicHitSplatSpriteTemplate, 132, -16, -16, 1, 1
 	playsewithpan SE_W233B, +63
-	createsprite gUnknown_08595F78, 0x83, -16, -8, 160, -32
-	createsprite gUnknown_08595F78, 0x83, -16, -8, -256, -40
-	createsprite gUnknown_08595F78, 0x83, -16, -8, 128, -16
-	createsprite gUnknown_08595F78, 0x83, -16, -8, 416, -38
-	createsprite gUnknown_08595F78, 0x83, -16, -8, -128, -22
-	createsprite gUnknown_08595F78, 0x83, -16, -8, -384, -31
+	createsprite gUnknown_08595F78, 131, -16, -8, 160, -32
+	createsprite gUnknown_08595F78, 131, -16, -8, -256, -40
+	createsprite gUnknown_08595F78, 131, -16, -8, 128, -16
+	createsprite gUnknown_08595F78, 131, -16, -8, 416, -38
+	createsprite gUnknown_08595F78, 131, -16, -8, -128, -22
+	createsprite gUnknown_08595F78, 131, -16, -8, -384, -31
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
-
-AnimScript_82CAC77:
-	createsprite gUnknown_0857FE28, 0x2, 6, 4
-	delay 0x6
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 7, 1
+DizzyPunch1:
+	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
+	delay 6
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1
 	return
 
 Move_FIRE_SPIN:
-	loadspritegfx 0x272D
+	loadspritegfx ANIM_TAG_SMALL_EMBER
 	playsewithpan SE_W221B, +63
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 47, 1
-	call AnimScript_82CACBF
-	call AnimScript_82CACBF
-	call AnimScript_82CACBF
-	waitforvisualfinish
-	end
-
-AnimScript_82CACBF:
-	createsprite gUnknown_08596B88, 0x82, 0, 28, 528, 30, 13, 50, 1
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x82, 0, 32, 480, 20, 16, -46, 1
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x82, 0, 33, 576, 20, 8, 42, 1
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x82, 0, 31, 400, 25, 11, -42, 1
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x82, 0, 28, 512, 25, 16, 46, 1
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x82, 0, 33, 464, 30, 15, -50, 1
-	delay 0x2
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 47, 1
+	call FireSpinEffect
+	call FireSpinEffect
+	call FireSpinEffect
+	waitforvisualfinish
+	end
+
+FireSpinEffect:
+	createsprite gUnknown_08596B88, 130, 0, 28, 528, 30, 13, 50, 1
+	delay 2
+	createsprite gUnknown_08596B88, 130, 0, 32, 480, 20, 16, -46, 1
+	delay 2
+	createsprite gUnknown_08596B88, 130, 0, 33, 576, 20, 8, 42, 1
+	delay 2
+	createsprite gUnknown_08596B88, 130, 0, 31, 400, 25, 11, -42, 1
+	delay 2
+	createsprite gUnknown_08596B88, 130, 0, 28, 512, 25, 16, 46, 1
+	delay 2
+	createsprite gUnknown_08596B88, 130, 0, 33, 464, 30, 15, -50, 1
+	delay 2
 	return
 
 Move_FURY_CUTTER:
-	loadspritegfx 0x279A
+	loadspritegfx ANIM_TAG_138
 	monbg ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W013, +63
-	createvisualtask sub_8107144, 0x2
-	jumpargeq 0x7, 0x0, AnimScript_82CADA7
-	goto AnimScript_82CADB9
-
-AnimScript_82CAD6A:
-	createvisualtask sub_8107168, 0x2
-	jumpargeq 0x7, 0x1, AnimScript_82CAD8E
-	jumpargeq 0x7, 0x2, AnimScript_82CADCB
-	jumpargeq 0x7, 0x3, AnimScript_82CADE5
-	goto AnimScript_82CADFF
-
-AnimScript_82CAD8E:
-	delay 0x5
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 10, 1
+	createvisualtask AnimTask_IsFuryCutterHitRight, 2
+	jumpretfalse FuryCutterLeft
+	goto FuryCutterRight
+FuryCutterContinue:
+	createvisualtask AnimTask_GetFuryCutterHitCount, 2
+	jumpreteq 1, FuryCutterContinue2
+	jumpreteq 2, FuryCutterMedium
+	jumpreteq 3, FuryCutterStrong
+	goto FuryCutterStrongest
+FuryCutterContinue2:
+	delay 5
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	waitforvisualfinish
 	end
-
-AnimScript_82CADA7:
-	createsprite gUnknown_08592A1C, 0x2, 40, -32, 0
-	goto AnimScript_82CAD6A
-
-AnimScript_82CADB9:
-	createsprite gUnknown_08592A1C, 0x2, 40, -32, 1
-	goto AnimScript_82CAD6A
-
-AnimScript_82CADCB:
-	createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 10505, 4, 0, 0
-	goto AnimScript_82CAD8E
-
-AnimScript_82CADE5:
-	createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 10505, 4, 0, 0
-	goto AnimScript_82CAD8E
-
-AnimScript_82CADFF:
-	createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 10505, 4, 0, 0
-	goto AnimScript_82CAD8E
+FuryCutterLeft:
+	createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0
+	goto FuryCutterContinue
+FuryCutterRight:
+	createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 1
+	goto FuryCutterContinue
+FuryCutterMedium:
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB(9, 8, 10), 4, 0, 0
+	goto FuryCutterContinue2
+FuryCutterStrong:
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0
+	goto FuryCutterContinue2
+FuryCutterStrongest:
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0
+	goto FuryCutterContinue2
 
 Move_SELF_DESTRUCT:
-	loadspritegfx 0x27D6
-	createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, 31
-	createvisualtask sub_80D52D0, 0x5, 4, 6, 0, 38, 1
-	createvisualtask sub_80D52D0, 0x5, 5, 6, 0, 38, 1
-	createvisualtask sub_80D52D0, 0x5, 6, 6, 0, 38, 1
-	createvisualtask sub_80D52D0, 0x5, 7, 6, 0, 38, 1
-	createvisualtask sub_80D52D0, 0x5, 8, 6, 0, 38, 1
-	call AnimScript_82CAE9F
-	call AnimScript_82CAE9F
-	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 2, 1, 9, 0, 31
-	end
-
-AnimScript_82CAE9F:
+	loadspritegfx ANIM_TAG_EXPLOSION
+	createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_RED
+	createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1
+	createvisualtask AnimTask_ShakeMon2, 5, 5, 6, 0, 38, 1
+	createvisualtask AnimTask_ShakeMon2, 5, 6, 6, 0, 38, 1
+	createvisualtask AnimTask_ShakeMon2, 5, 7, 6, 0, 38, 1
+	createvisualtask AnimTask_ShakeMon2, 5, 8, 6, 0, 38, 1
+	call SelfDestruct1
+	call SelfDestruct1
+	waitforvisualfinish
+	createvisualtask sub_8116620, 10, 2, 1, 9, 0, RGB_RED
+	end
+SelfDestruct1:
 	playsewithpan SE_W120, -64
-	createsprite gUnknown_0859371C, 0x3, 0, 0, 0, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 0, 1
+	delay 6
 	playsewithpan SE_W120, -64
-	createsprite gUnknown_0859371C, 0x3, 24, -24, 0, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 0, 1
+	delay 6
 	playsewithpan SE_W120, -64
-	createsprite gUnknown_0859371C, 0x3, -16, 16, 0, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 0, 1
+	delay 6
 	playsewithpan SE_W120, -64
-	createsprite gUnknown_0859371C, 0x3, -24, -12, 0, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 0, 1
+	delay 6
 	playsewithpan SE_W120, -64
-	createsprite gUnknown_0859371C, 0x3, 16, 16, 0, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 0, 1
+	delay 6
 	return
 
 Move_SLAM:
-	loadspritegfx 0x2748
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_056
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W004, -64
-	createsprite gUnknown_0857FE70, 0x2, 0, 20, 3, 0, 4
-	delay 0x1
-	createsprite gUnknown_085928D0, 0x2, 0, 0
-	delay 0x3
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 3, 0, 4
+	delay 1
+	createsprite gUnknown_085928D0, 2, 0, 0
+	delay 3
 	playsewithpan SE_W025B, +63
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1
-	createsprite gUnknown_0857FE70, 0x2, 1, -12, 10, 0, 3
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 5
-	delay 0x3
-	createvisualtask sub_80D5484, 0x2, 1, 0, 3, 6, 1
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5
+	delay 3
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1
 	waitforvisualfinish
-	delay 0x5
-	createsprite gUnknown_0857FE58, 0x2, 1, 0, 6
+	delay 5
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_VINE_WHIP:
-	loadspritegfx 0x282F
+	loadspritegfx ANIM_TAG_287
 	playsewithpan SE_W026, -64
-	createsprite gUnknown_0857FE28, 0x2, 4, 6
-	delay 0x6
+	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6
+	delay 6
 	playsewithpan SE_W010, +63
-	createsprite gUnknown_085928E8, 0x82, 0, 0
-	delay 0x6
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 6, 1
+	createsprite gUnknown_085928E8, 130, 0, 0
+	delay 6
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1
 	end
 
 Move_DRILL_PECK:
-	loadspritegfx 0x2797
-	loadspritegfx 0x27B2
-	createsprite gUnknown_08592CD8, 0x2, 0
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_162
+	createsprite gUnknown_08592CD8, 2, 0
 	playsewithpan SE_W029, -64
 	waitforvisualfinish
-	delay 0x2
-	createsprite gUnknown_08592CD8, 0x2, 1
-	delay 0x2
-	loopsewithpan SE_W030, +63, 0x4, 0x8
-	createvisualtask sub_810EB88, 0x5
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 18, 1
+	delay 2
+	createsprite gUnknown_08592CD8, 2, 1
+	delay 2
+	loopsewithpan SE_W030, +63, 4, 8
+	createvisualtask sub_810EB88, 5
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1
 	waitforvisualfinish
-	createsprite gUnknown_08592CD8, 0x2, 2
+	createsprite gUnknown_08592CD8, 2, 2
 	waitforvisualfinish
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 6
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6
 	waitforvisualfinish
 	end
 
 Move_WATERFALL:
-	loadspritegfx 0x27A4
-	loadspritegfx 0x27AB
-	loadspritegfx 0x279D
+	loadspritegfx ANIM_TAG_148
+	loadspritegfx ANIM_TAG_155
+	loadspritegfx ANIM_TAG_141
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 23, 1
-	delay 0x5
+	setalpha 12, 8
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1
+	delay 5
 	playsewithpan SE_W152, -64
-	createsprite gUnknown_08595238, 0x2, 10, 10, 25, 0
-	delay 0x4
+	createsprite gUnknown_08595238, 2, 10, 10, 25, 0
+	delay 4
 	playsewithpan SE_W152, -64
-	createsprite gUnknown_08595238, 0x2, -15, 0, 25, 0
-	delay 0x4
+	createsprite gUnknown_08595238, 2, -15, 0, 25, 0
+	delay 4
 	playsewithpan SE_W152, -64
-	createsprite gUnknown_08595238, 0x2, 20, 10, 25, 0
-	delay 0x4
+	createsprite gUnknown_08595238, 2, 20, 10, 25, 0
+	delay 4
 	playsewithpan SE_W152, -64
-	createsprite gUnknown_08595238, 0x2, 0, -10, 25, 0
-	delay 0x4
+	createsprite gUnknown_08595238, 2, 0, -10, 25, 0
+	delay 4
 	playsewithpan SE_W152, -64
-	createsprite gUnknown_08595238, 0x2, -10, 15, 25, 0
-	delay 0x4
+	createsprite gUnknown_08595238, 2, -10, 15, 25, 0
+	delay 4
 	playsewithpan SE_W152, -64
-	createsprite gUnknown_08595238, 0x2, 25, 20, 25, 0
-	delay 0x4
+	createsprite gUnknown_08595238, 2, 25, 20, 25, 0
+	delay 4
 	playsewithpan SE_W152, -64
-	createsprite gUnknown_08595238, 0x2, -20, 20, 25, 0
-	delay 0x4
+	createsprite gUnknown_08595238, 2, -20, 20, 25, 0
+	delay 4
 	playsewithpan SE_W152, -64
-	createsprite gUnknown_08595238, 0x2, 12, 0, 25, 0
+	createsprite gUnknown_08595238, 2, 12, 0, 25, 0
 	waitforvisualfinish
-	delay 0xA
-	createsprite gUnknown_0857FE28, 0x2, 6, 5
-	delay 0x6
-	call AnimScript_82CB102
+	delay 10
+	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 5
+	delay 6
+	call UnderWaterAttack1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
-AnimScript_82CB102:
+UnderWaterAttack1:
 	playsewithpan SE_W127, +63
-	createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 17, 1
-	createsprite gUnknown_08597388, 0x3, 0, 20, 1, 1
-	createsprite gUnknown_08595250, 0x4, 0, 20
-	createsprite gUnknown_08595250, 0x4, 0, 20
-	delay 0x2
-	createsprite gUnknown_08597388, 0x3, 0, 15, 1, 1
-	createsprite gUnknown_08595250, 0x4, 0, 15
-	createsprite gUnknown_08595250, 0x4, 0, 15
-	delay 0x2
-	createsprite gUnknown_08597388, 0x3, 0, 10, 1, 1
-	createsprite gUnknown_08595250, 0x4, 0, 10
-	createsprite gUnknown_08595250, 0x4, 0, 10
-	delay 0x2
-	createsprite gUnknown_08597388, 0x3, 0, 5, 1, 1
-	createsprite gUnknown_08595250, 0x4, 0, 5
-	createsprite gUnknown_08595250, 0x4, 0, 5
-	delay 0x2
-	createsprite gUnknown_08597388, 0x3, 0, 0, 1, 1
-	createsprite gUnknown_08595250, 0x4, 0, 0
-	createsprite gUnknown_08595250, 0x4, 0, 0
-	delay 0x2
-	createsprite gUnknown_08597388, 0x3, 0, -5, 1, 1
-	createsprite gUnknown_08595250, 0x4, 0, -5
-	createsprite gUnknown_08595250, 0x4, 0, -5
-	delay 0x2
-	createsprite gUnknown_08597388, 0x3, 0, -10, 1, 1
-	createsprite gUnknown_08595250, 0x4, 0, -10
-	createsprite gUnknown_08595250, 0x4, 0, -10
-	delay 0x2
-	createsprite gUnknown_08597388, 0x3, 0, -15, 1, 1
-	createsprite gUnknown_08595250, 0x4, 0, -15
-	createsprite gUnknown_08595250, 0x4, 0, -15
-	delay 0x2
-	createsprite gUnknown_08597388, 0x3, 0, -20, 1, 1
-	createsprite gUnknown_08595250, 0x4, 0, -20
-	createsprite gUnknown_08595250, 0x4, 0, -20
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 17, 1
+	createsprite gUnknown_08597388, 3, 0, 20, 1, 1
+	createsprite gUnknown_08595250, 4, 0, 20
+	createsprite gUnknown_08595250, 4, 0, 20
+	delay 2
+	createsprite gUnknown_08597388, 3, 0, 15, 1, 1
+	createsprite gUnknown_08595250, 4, 0, 15
+	createsprite gUnknown_08595250, 4, 0, 15
+	delay 2
+	createsprite gUnknown_08597388, 3, 0, 10, 1, 1
+	createsprite gUnknown_08595250, 4, 0, 10
+	createsprite gUnknown_08595250, 4, 0, 10
+	delay 2
+	createsprite gUnknown_08597388, 3, 0, 5, 1, 1
+	createsprite gUnknown_08595250, 4, 0, 5
+	createsprite gUnknown_08595250, 4, 0, 5
+	delay 2
+	createsprite gUnknown_08597388, 3, 0, 0, 1, 1
+	createsprite gUnknown_08595250, 4, 0, 0
+	createsprite gUnknown_08595250, 4, 0, 0
+	delay 2
+	createsprite gUnknown_08597388, 3, 0, -5, 1, 1
+	createsprite gUnknown_08595250, 4, 0, -5
+	createsprite gUnknown_08595250, 4, 0, -5
+	delay 2
+	createsprite gUnknown_08597388, 3, 0, -10, 1, 1
+	createsprite gUnknown_08595250, 4, 0, -10
+	createsprite gUnknown_08595250, 4, 0, -10
+	delay 2
+	createsprite gUnknown_08597388, 3, 0, -15, 1, 1
+	createsprite gUnknown_08595250, 4, 0, -15
+	createsprite gUnknown_08595250, 4, 0, -15
+	delay 2
+	createsprite gUnknown_08597388, 3, 0, -20, 1, 1
+	createsprite gUnknown_08595250, 4, 0, -20
+	createsprite gUnknown_08595250, 4, 0, -20
 	return
 
 Move_EXPLOSION:
-	loadspritegfx 0x27D6
-	createsprite gUnknown_0859728C, 0x2, 1, 8, 9, 8474, 8, 0, 8
-	createvisualtask sub_80D52D0, 0x5, 4, 8, 0, 40, 1
-	createvisualtask sub_80D52D0, 0x5, 5, 8, 0, 40, 1
-	createvisualtask sub_80D52D0, 0x5, 6, 8, 0, 40, 1
-	createvisualtask sub_80D52D0, 0x5, 7, 8, 0, 40, 1
-	createvisualtask sub_80D52D0, 0x5, 8, 8, 0, 40, 1
-	call AnimScript_82CB312
-	call AnimScript_82CB312
-	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 1, 1, 16, 16, 0x7FFF
-	delay 0x32
-	createvisualtask sub_8116620, 0xA, 1, 3, 16, 0, 0x7FFF
-	end
-
-AnimScript_82CB312:
+	loadspritegfx ANIM_TAG_EXPLOSION
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 8, 9, RGB(26, 8, 8), 8, 0, 8
+	createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1
+	createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1
+	createvisualtask AnimTask_ShakeMon2, 5, 6, 8, 0, 40, 1
+	createvisualtask AnimTask_ShakeMon2, 5, 7, 8, 0, 40, 1
+	createvisualtask AnimTask_ShakeMon2, 5, 8, 8, 0, 40, 1
+	call Explosion1
+	call Explosion1
+	waitforvisualfinish
+	createvisualtask sub_8116620, 10, 1, 1, 16, 16, RGB_WHITE
+	delay 50
+	createvisualtask sub_8116620, 10, 1, 3, 16, 0, RGB_WHITE
+	end
+Explosion1:
 	playsewithpan SE_W153, -64
-	createsprite gUnknown_0859371C, 0x3, 0, 0, 0, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 0, 1
+	delay 6
 	playsewithpan SE_W153, -64
-	createsprite gUnknown_0859371C, 0x3, 24, -24, 0, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 0, 1
+	delay 6
 	playsewithpan SE_W153, -64
-	createsprite gUnknown_0859371C, 0x3, -16, 16, 0, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 0, 1
+	delay 6
 	playsewithpan SE_W153, -64
-	createsprite gUnknown_0859371C, 0x3, -24, -12, 0, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 0, 1
+	delay 6
 	playsewithpan SE_W153, -64
-	createsprite gUnknown_0859371C, 0x3, 16, 16, 0, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 0, 1
+	delay 6
 	return
 
 Move_DEFENSE_CURL:
-	loadspritegfx 0x27FA
-	loopsewithpan SE_W161, -64, 0x12, 0x3
-	createvisualtask sub_811489C, 0x5, 0, 0
-	createvisualtask sub_815B338, 0x5
+	loadspritegfx ANIM_TAG_234
+	loopsewithpan SE_W161, -64, 18, 3
+	createvisualtask sub_811489C, 5, 0, 0
+	createvisualtask sub_815B338, 5
 	waitforvisualfinish
-	createsprite gUnknown_085CE338, 0x2, 0, 6, 0, 1
+	createsprite gUnknown_085CE338, 2, 0, 6, 0, 1
 	waitforvisualfinish
-	createvisualtask sub_811489C, 0x5, 0, 1
+	createvisualtask sub_811489C, 5, 0, 1
 	waitforvisualfinish
 	end
 
 Move_PROTECT:
-	loadspritegfx 0x2828
+	loadspritegfx ANIM_TAG_PROTECT
 	monbg ANIM_ATK_PARTNER
 	monbgprio_28 ANIM_ATTACKER
-	waitplaysewithpan SE_W115, -64, 0x10
-	createsprite gUnknown_08592ADC, 0x2, 24, 0, 90
+	waitplaysewithpan SE_W115, -64, 16
+	createsprite gUnknown_08592ADC, 2, 24, 0, 90
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	end
 
 Move_DETECT:
-	loadspritegfx 0x2757
-	createsprite gUnknown_08597274, 0x2, 1, 2, 0, 9, RGB_BLACK
+	loadspritegfx ANIM_TAG_071
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 9, RGB_BLACK
 	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, 0x7FFF
-	delay 0x12
+	createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_WHITE
+	delay 18
 	playsewithpan SE_W197, -64
-	createsprite gUnknown_0853EE84, 0xD, 20, -20
+	createsprite gUnknown_0853EE84, 13, 20, -20
 	waitforvisualfinish
-	delay 0xA
-	createsprite gUnknown_08597274, 0x2, 1, 2, 9, 0, RGB_BLACK
-	createvisualtask sub_8116620, 0xA, 2, 2, 9, 0, 0x7FFF
+	delay 10
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 9, 0, RGB_BLACK
+	createvisualtask sub_8116620, 10, 2, 2, 9, 0, RGB_WHITE
 	waitforvisualfinish
 	end
 
 Move_FRUSTRATION:
-	loadspritegfx 0x2797
-	loadspritegfx 0x2767
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_ANGER
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	createvisualtask sub_80A8140, 0x1
-	jumpargeq 0x7, 0x0, AnimScript_82CB464
-	jumpargeq 0x7, 0x1, AnimScript_82CB56A
-	jumpargeq 0x7, 0x2, AnimScript_82CB637
-	goto AnimScript_82CB6B3
-
-AnimScript_82CB45F:
+	setalpha 12, 8
+	createvisualtask AnimTask_GetFrustrationPowerLevel, 1
+	jumpreteq 0, Frustration_Strongest
+	jumpreteq 1, Frustration_Strong
+	jumpreteq 2, Frustration_Medium
+	goto Frustration_Weak
+Frustration_Continue:
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
-
-AnimScript_82CB464:
+Frustration_Strongest:
 	playsewithpan SE_W082, -64
-	createvisualtask sub_80D52D0, 0x5, 0, 1, 0, 15, 1
-	createvisualtask sub_8116620, 0xA, 2, 3, 0, 9, 31
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1
+	createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31
 	waitforvisualfinish
-	delay 0x14
+	delay 20
 	playsewithpan SE_W207B, -64
-	createsprite gUnknown_0859368C, 0x2, 0, 20, -28
+	createsprite gUnknown_0859368C, 2, 0, 20, -28
 	waitforvisualfinish
 	playsewithpan SE_W207B, -64
-	createsprite gUnknown_0859368C, 0x2, 0, 20, -28
+	createsprite gUnknown_0859368C, 2, 0, 20, -28
 	waitforvisualfinish
-	delay 0xA
-	createvisualtask sub_80D5EB8, 0x5, 0, 16, 6144, 8, 0
-	delay 0x5
-	createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 30, 1
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 0
+	delay 10
+	createvisualtask AnimTask_SwayMon, 5, 0, 16, 6144, 8, ANIM_ATTACKER
+	delay 5
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 30, 1
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0
 	playsewithpan SE_W004, +63
-	delay 0x5
-	createsprite gUnknown_08597358, 0x3, 24, 8, 1, 0
+	delay 5
+	createsprite gBasicHitSplatSpriteTemplate, 3, 24, 8, 1, 0
 	playsewithpan SE_W004, +63
-	delay 0x5
-	createsprite gUnknown_08597358, 0x3, -24, -16, 1, 0
+	delay 5
+	createsprite gBasicHitSplatSpriteTemplate, 3, -24, -16, 1, 0
 	playsewithpan SE_W004, +63
-	delay 0x5
-	createsprite gUnknown_08597358, 0x3, 8, 4, 1, 0
+	delay 5
+	createsprite gBasicHitSplatSpriteTemplate, 3, 8, 4, 1, 0
 	playsewithpan SE_W004, +63
-	delay 0x5
-	createsprite gUnknown_08597358, 0x3, -16, 19, 1, 0
+	delay 5
+	createsprite gBasicHitSplatSpriteTemplate, 3, -16, 19, 1, 0
 	playsewithpan SE_W004, +63
-	delay 0x5
-	createsprite gUnknown_08597358, 0x3, 18, -18, 1, 0
+	delay 5
+	createsprite gBasicHitSplatSpriteTemplate, 3, 18, -18, 1, 0
 	playsewithpan SE_W004, +63
 	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 2, 3, 9, 0, 31
-	goto AnimScript_82CB45F
-
-AnimScript_82CB56A:
+	createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31
+	goto Frustration_Continue
+Frustration_Strong:
 	playsewithpan SE_W082, -64
-	createvisualtask sub_80D52D0, 0x5, 0, 1, 0, 15, 1
-	createvisualtask sub_8116620, 0xA, 2, 3, 0, 9, 31
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1
+	createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31
 	waitforvisualfinish
-	delay 0x14
+	delay 20
 	playsewithpan SE_W207B, -64
-	createsprite gUnknown_0859368C, 0x2, 0, 20, -28
+	createsprite gUnknown_0859368C, 2, 0, 20, -28
 	waitforvisualfinish
-	delay 0x5
-	createvisualtask sub_815C3A8, 0x5
-	delay 0x7
+	delay 5
+	createvisualtask sub_815C3A8, 5
+	delay 7
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_08597358, 0x3, 0, 8, 1, 1
-	createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1
-	delay 0xE
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 8, 1, 1
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1
+	delay 14
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_08597358, 0x3, 12, -6, 1, 1
-	createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1
-	delay 0xE
+	createsprite gBasicHitSplatSpriteTemplate, 3, 12, -6, 1, 1
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1
+	delay 14
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_08597358, 0x3, -12, -6, 1, 1
-	createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1
+	createsprite gBasicHitSplatSpriteTemplate, 3, -12, -6, 1, 1
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1
 	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 2, 3, 9, 0, 31
-	goto AnimScript_82CB45F
-
-AnimScript_82CB637:
+	createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31
+	goto Frustration_Continue
+Frustration_Medium:
 	playsewithpan SE_W207B, -64
-	createsprite gUnknown_0859368C, 0x2, 0, 20, -28
+	createsprite gUnknown_0859368C, 2, 0, 20, -28
 	waitforvisualfinish
-	delay 0x5
-	createsprite gUnknown_0857FE28, 0x2, 4, 4
-	delay 0x6
+	delay 5
+	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4
+	delay 6
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_08597358, 0x2, 10, 4, 1, 1
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1
+	createsprite gBasicHitSplatSpriteTemplate, 2, 10, 4, 1, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
-	createsprite gUnknown_0857FE28, 0x2, 4, 4
-	delay 0x6
+	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4
+	delay 6
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_08597358, 0x2, -10, -4, 1, 2
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1
-	goto AnimScript_82CB45F
-
-AnimScript_82CB6B3:
-	createsprite gUnknown_085CE4D0, 0x2, 20, -28
-	waitforvisualfinish
-	delay 0xA
-	createsprite gUnknown_0857FE28, 0x2, 10, 2
-	delay 0xC
+	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -4, 1, 2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
+	goto Frustration_Continue
+Frustration_Weak:
+	createsprite gUnknown_085CE4D0, 2, 20, -28
+	waitforvisualfinish
+	delay 10
+	createsprite gHorizontalLungeSpriteTemplate, 2, 10, 2
+	delay 12
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
-	createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1
-	goto AnimScript_82CB45F
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1
+	goto Frustration_Continue
 
 Move_SAFEGUARD:
-	loadspritegfx 0x2804
+	loadspritegfx ANIM_TAG_244
 	monbg ANIM_ATK_PARTNER
-	setalpha 0x808
+	setalpha 8, 8
 	playsewithpan SE_W208, -64
-	createsprite gUnknown_08593C64, 0x2
-	delay 0x4
-	createsprite gUnknown_08593C64, 0x2
-	delay 0x4
-	createsprite gUnknown_08593C64, 0x2
+	createsprite gUnknown_08593C64, 2
+	delay 4
+	createsprite gUnknown_08593C64, 2
+	delay 4
+	createsprite gUnknown_08593C64, 2
 	waitforvisualfinish
 	playsewithpan SE_REAPOKE, -64
-	createvisualtask sub_8115A04, 0x2, 10, 0, 2, 0, 10, 0x7FFF
+	createvisualtask sub_8115A04, 2, 10, 0, 2, 0, 10, RGB_WHITE
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
 	end
 
 Move_PAIN_SPLIT:
-	loadspritegfx 0x27FF
-	createsprite gUnknown_085CE590, 0x2, -8, -42, 0
-	createsprite gUnknown_085CE590, 0x82, -8, -42, 1
-	delay 0xA
+	loadspritegfx ANIM_TAG_239
+	createsprite gUnknown_085CE590, 2, -8, -42, 0
+	createsprite gUnknown_085CE590, 130, -8, -42, 1
+	delay 10
 	playsewithpan SE_W207B, 0
-	createvisualtask sub_815CA20, 0x2, 0, 0
-	createvisualtask sub_815CA20, 0x2, 1, 0
+	createvisualtask sub_815CA20, 2, 0, 0
+	createvisualtask sub_815CA20, 2, 1, 0
 	waitforvisualfinish
-	createsprite gUnknown_085CE590, 0x2, -24, -42, 0
-	createsprite gUnknown_085CE590, 0x82, -24, -42, 1
-	delay 0xA
+	createsprite gUnknown_085CE590, 2, -24, -42, 0
+	createsprite gUnknown_085CE590, 130, -24, -42, 1
+	delay 10
 	playsewithpan SE_W207B, 0
-	createvisualtask sub_815CA20, 0x2, 0, 1
-	createvisualtask sub_815CA20, 0x2, 1, 1
+	createvisualtask sub_815CA20, 2, 0, 1
+	createvisualtask sub_815CA20, 2, 1, 1
 	waitforvisualfinish
-	createsprite gUnknown_085CE590, 0x2, 8, -42, 0
-	createsprite gUnknown_085CE590, 0x82, 8, -42, 1
-	delay 0xA
+	createsprite gUnknown_085CE590, 2, 8, -42, 0
+	createsprite gUnknown_085CE590, 130, 8, -42, 1
+	delay 10
 	playsewithpan SE_W207B, 0
-	createvisualtask sub_815CA20, 0x2, 0, 2
-	createvisualtask sub_815CA20, 0x2, 1, 2
+	createvisualtask sub_815CA20, 2, 0, 2
+	createvisualtask sub_815CA20, 2, 1, 2
 	end
 
 Move_VICE_GRIP:
-	loadspritegfx 0x279A
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_138
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W011, +63
-	createsprite gUnknown_08593590, 0x2, 0
-	createsprite gUnknown_08593590, 0x2, 1
-	delay 0x9
-	createsprite gUnknown_08597358, 0x1, 0, 0, 1, 2
-	createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 5, 1
+	createsprite gUnknown_08593590, 2, 0
+	createsprite gUnknown_08593590, 2, 1
+	delay 9
+	createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 5, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_GUILLOTINE:
-	loadspritegfx 0x279A
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_138
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS
 	waitbgfadein
 	playsewithpan SE_W011, +63
-	createsprite gUnknown_085935D0, 0x2, 0
-	createsprite gUnknown_085935D0, 0x2, 1
-	createvisualtask sub_8116620, 0xA, 4, 2, 0, 16, 0
-	delay 0x9
-	createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 23, 1
+	createsprite gUnknown_085935D0, 2, 0
+	createsprite gUnknown_085935D0, 2, 1
+	createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_BLACK
+	delay 9
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 23, 1
 	delay 0x2E
-	createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 8, 1
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 0
-	createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 8, 1
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0
 	playsewithpan SE_W013, +63
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -1913,190 +1879,188 @@ Move_GUILLOTINE:
 	end
 
 Move_PAY_DAY:
-	loadspritegfx 0x2774
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_100
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W013B, -64
-	createsprite gUnknown_085934D8, 0x2, 20, 0, 0, 0, 1152
+	createsprite gUnknown_085934D8, 2, 20, 0, 0, 0, 1152
 	waitforvisualfinish
 	playsewithpan SE_W006, +63
-	createsprite gUnknown_08597358, 0x1, 0, 0, 1, 2
-	createsprite gUnknown_085934F0, 0x2
-	createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1
+	createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2
+	createsprite gUnknown_085934F0, 2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_OUTRAGE:
-	loadspritegfx 0x272D
-	loopsewithpan SE_W082, -64, 0x8, 0x3
-	createvisualtask sub_8115A04, 0x2, 7, 2, 5, 3, 8, 430
-	createvisualtask sub_80D5830, 0x2, 0, 12, 6, 5, 4
-	delay 0x0
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 0, 3
-	delay 0x0
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 0, 3
-	delay 0x0
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, 1280, 3
-	delay 0x0
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, -1280, 3
-	delay 0x0
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 40, 1
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 768, 3
-	delay 0x0
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 768, 3
-	delay 0x0
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, -768, 3
-	delay 0x0
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, -768, 3
-	delay 0x0
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 0, 3
-	call AnimScript_82CBA0F
-	call AnimScript_82CBA0F
-	waitforvisualfinish
-	end
-
-AnimScript_82CBA0F:
-	delay 0x3
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 0, 3
-	delay 0x0
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, 1280, 3
-	delay 0x0
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, -1280, 3
-	delay 0x0
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 768, 3
-	delay 0x0
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 768, 3
-	delay 0x0
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, -768, 3
-	delay 0x0
-	createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, -768, 3
+	loadspritegfx ANIM_TAG_SMALL_EMBER
+	loopsewithpan SE_W082, -64, 8, 3
+	createvisualtask sub_8115A04, 2, 7, 2, 5, 3, 8, RGB(14, 13, 0)
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 5, 4
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 0, 3
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 0, 3
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, 1280, 3
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, -1280, 3
+	delay 0
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 40, 1
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 768, 3
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 768, 3
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, -768, 3
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, -768, 3
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 0, 3
+	call Outrage1
+	call Outrage1
+	waitforvisualfinish
+	end
+Outrage1:
+	delay 3
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 0, 3
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, 1280, 3
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, -1280, 3
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 768, 3
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 768, 3
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, -768, 3
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, -768, 3
 	return
 
 Move_SPARK:
-	loadspritegfx 0x2797
-	loadspritegfx 0x271B
-	delay 0x0
-	createvisualtask sub_8115A04, 0x2, 3, -31, 1, 5, 5, 23551
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_SPARK_2
+	delay 0
+	createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22)
 	playsewithpan SE_W085B, -64
-	createsprite gUnknown_0859574C, 0x0, 32, 24, 190, 12, 0, 1, 0
-	delay 0x0
-	createsprite gUnknown_0859574C, 0x0, 80, 24, 22, 12, 0, 1, 0
-	createsprite gUnknown_0859574C, 0x0, 156, 24, 121, 13, 0, 1, 1
-	delay 0x0
-	createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, 23551
-	delay 0xA
-	createvisualtask sub_8115A04, 0x2, 3, -31, 1, 5, 5, 23551
+	createsprite gBattleAnimSpriteTemplate_859574C, 0, 32, 24, 190, 12, 0, 1, 0
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_859574C, 0, 80, 24, 22, 12, 0, 1, 0
+	createsprite gBattleAnimSpriteTemplate_859574C, 0, 156, 24, 121, 13, 0, 1, 1
+	delay 0
+	createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22)
+	delay 10
+	createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22)
 	playsewithpan SE_W085B, -64
-	createsprite gUnknown_0859574C, 0x0, 100, 24, 60, 10, 0, 1, 0
-	createsprite gUnknown_0859574C, 0x0, 170, 24, 42, 11, 0, 1, 1
-	delay 0x0
-	createsprite gUnknown_0859574C, 0x0, 238, 24, 165, 10, 0, 1, 1
-	delay 0x0
-	createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, 23551
-	delay 0x14
-	createvisualtask sub_8115A04, 0x2, 3, -31, 1, 7, 7, 23551
+	createsprite gBattleAnimSpriteTemplate_859574C, 0, 100, 24, 60, 10, 0, 1, 0
+	createsprite gBattleAnimSpriteTemplate_859574C, 0, 170, 24, 42, 11, 0, 1, 1
+	delay 0
+	createsprite gBattleAnimSpriteTemplate_859574C, 0, 238, 24, 165, 10, 0, 1, 1
+	delay 0
+	createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22)
+	delay 20
+	createvisualtask sub_8115A04, 2, 3, -31, 1, 7, 7, RGB(31, 31, 22)
 	playsewithpan SE_W085B, -64
-	createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 0, 20, 0, 0
-	createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 64, 20, 1, 0
-	createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 128, 20, 0, 0
-	createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 192, 20, 2, 0
-	createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 32, 20, 0, 0
-	createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 96, 20, 1, 0
-	createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 160, 20, 0, 0
-	createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 224, 20, 2, 0
-	delay 0x4
-	waitforvisualfinish
-	createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, 23551
-	createsprite gUnknown_0857FE28, 0x2, 4, 4
-	delay 0x4
+	createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 0, 20, 0, 0
+	createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 64, 20, 1, 0
+	createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 128, 20, 0, 0
+	createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 192, 20, 2, 0
+	createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 32, 20, 0, 0
+	createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 96, 20, 1, 0
+	createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 160, 20, 0, 0
+	createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 224, 20, 2, 0
+	delay 4
+	waitforvisualfinish
+	createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22)
+	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4
+	delay 4
 	playsewithpan SE_W063, +63
-	createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
-	createvisualtask sub_8115A04, 0x2, 4, -31, 2, 0, 6, 23551
-	call AnimScript_82D7BEA
+	createvisualtask sub_8115A04, 2, 4, -31, 2, 0, 6, RGB(31, 31, 22)
+	call ElectricityEffect
 	waitforvisualfinish
 	end
 
 Move_ATTRACT:
-	loadspritegfx 0x27E8
-	loopsewithpan SE_W204, -64, 0xC, 0x3
-	createvisualtask sub_80D5EB8, 0x5, 0, 12, 4096, 4, 0
-	delay 0xF
-	createsprite gUnknown_085939A0, 0x83, 20, -8
+	loadspritegfx ANIM_TAG_216
+	loopsewithpan SE_W204, -64, 12, 3
+	createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER
+	delay 15
+	createsprite gUnknown_085939A0, 131, 20, -8
 	waitforvisualfinish
 	playsewithpan SE_W213, +63
-	createsprite gUnknown_085939B8, 0x83, 160, -32
-	createsprite gUnknown_085939B8, 0x83, -256, -40
-	createsprite gUnknown_085939B8, 0x83, 128, -16
-	createsprite gUnknown_085939B8, 0x83, 416, -38
-	createsprite gUnknown_085939B8, 0x83, -128, -22
-	createsprite gUnknown_085939B8, 0x83, -384, -31
-	waitforvisualfinish
-	waitplaysewithpan SE_W213B, 0, 0xF
-	createvisualtask sub_81062E8, 0x5
-	createsprite gUnknown_085939D0, 0x28, 16, 256, 0
-	createsprite gUnknown_085939D0, 0x28, 224, 240, 15
-	createsprite gUnknown_085939D0, 0x28, 126, 272, 30
-	createsprite gUnknown_085939D0, 0x28, 80, 224, 45
-	createsprite gUnknown_085939D0, 0x28, 170, 272, 60
-	createsprite gUnknown_085939D0, 0x28, 40, 256, 75
-	createsprite gUnknown_085939D0, 0x28, 112, 256, 90
-	createsprite gUnknown_085939D0, 0x28, 200, 272, 90
+	createsprite gBattleAnimSpriteTemplate_85939B8, 131, 160, -32
+	createsprite gBattleAnimSpriteTemplate_85939B8, 131, -256, -40
+	createsprite gBattleAnimSpriteTemplate_85939B8, 131, 128, -16
+	createsprite gBattleAnimSpriteTemplate_85939B8, 131, 416, -38
+	createsprite gBattleAnimSpriteTemplate_85939B8, 131, -128, -22
+	createsprite gBattleAnimSpriteTemplate_85939B8, 131, -384, -31
+	waitforvisualfinish
+	waitplaysewithpan SE_W213B, 0, 15
+	createvisualtask sub_81062E8, 5
+	createsprite gUnknown_085939D0, 40, 16, 256, 0
+	createsprite gUnknown_085939D0, 40, 224, 240, 15
+	createsprite gUnknown_085939D0, 40, 126, 272, 30
+	createsprite gUnknown_085939D0, 40, 80, 224, 45
+	createsprite gUnknown_085939D0, 40, 170, 272, 60
+	createsprite gUnknown_085939D0, 40, 40, 256, 75
+	createsprite gUnknown_085939D0, 40, 112, 256, 90
+	createsprite gUnknown_085939D0, 40, 200, 272, 90
 	delay 0x4B
-	createvisualtask sub_8115A04, 0x2, 4, 4, 4, 0, 10, 28479
+	createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27)
 	end
 
 Move_GROWTH:
-	call AnimScript_82CBDC0
+	call Growth1
 	waitforvisualfinish
-	call AnimScript_82CBDC0
+	call Growth1
 	waitforvisualfinish
 	end
-
-AnimScript_82CBDC0:
-	createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 0x7FFF
+Growth1:
+	createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE
 	playsewithpan SE_W036, -64
-	createvisualtask sub_80D6064, 0x5, -3, -3, 16, 0, 0
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_ATTACKER, 0
 	return
 
 Move_WHIRLWIND:
-	loadspritegfx 0x27B2
-	createsprite gUnknown_085963D4, 0x2, 0, -8, 1, 60, 0
-	createsprite gUnknown_085963D4, 0x2, 0, 0, 1, 60, 1
-	createsprite gUnknown_085963D4, 0x2, 0, 8, 1, 60, 2
-	createsprite gUnknown_085963D4, 0x2, 0, 16, 1, 60, 3
-	createsprite gUnknown_085963D4, 0x2, 0, 24, 1, 60, 4
-	createsprite gUnknown_085963D4, 0x2, 0, 32, 1, 60, 0
-	delay 0x5
-	loopsewithpan SE_W104, +63, 0xA, 0x4
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 15, 1
+	loadspritegfx ANIM_TAG_162
+	createsprite gUnknown_085963D4, 2, 0, -8, 1, 60, 0
+	createsprite gUnknown_085963D4, 2, 0, 0, 1, 60, 1
+	createsprite gUnknown_085963D4, 2, 0, 8, 1, 60, 2
+	createsprite gUnknown_085963D4, 2, 0, 16, 1, 60, 3
+	createsprite gUnknown_085963D4, 2, 0, 24, 1, 60, 4
+	createsprite gUnknown_085963D4, 2, 0, 32, 1, 60, 0
+	delay 5
+	loopsewithpan SE_W104, +63, 10, 4
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 15, 1
 	delay 0x1D
-	createvisualtask sub_80D5830, 0x2, 1, 12, 6, 1, 5
-	delay 0x7
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 12, 6, 1, 5
+	delay 7
 	playsewithpan SE_W081, +63
-	createvisualtask sub_80D5DB0, 0x5, 1, 8
+	createvisualtask sub_80D5DB0, 5, 1, 8
 	waitforvisualfinish
 	end
 
 Move_CONFUSE_RAY:
-	loadspritegfx 0x271D
+	loadspritegfx ANIM_TAG_YELLOW_BALL
 	monbg ANIM_DEF_PARTNER
 	fadetobg BG_GHOST
 	waitbgfadein
-	createvisualtask sub_8159278, 0x2, -64, 63, 2, 0
-	createvisualtask sub_8115C80, 0x2, 10013, 0, 6, 0, 14, 351
-	createsprite gUnknown_08596D14, 0x82, 28, 0, 288
+	createvisualtask sub_8159278, 2, -64, 63, 2, 0
+	createvisualtask sub_8115C80, 2, 10013, 0, 6, 0, 14, 351
+	createsprite gUnknown_08596D14, 130, 28, 0, 288
 	waitforvisualfinish
-	setalpha 0x808
+	setalpha 8, 8
 	playsewithpan SE_W081B, +63
-	createsprite gUnknown_08596D2C, 0x82, 0, -16
+	createsprite gUnknown_08596D2C, 130, 0, -16
 	waitforvisualfinish
-	delay 0x0
+	delay 0
 	blendoff
 	clearmonbg ANIM_DEF_PARTNER
 	restorebg
@@ -2104,118 +2068,118 @@ Move_CONFUSE_RAY:
 	end
 
 Move_LOCK_ON:
-	loadspritegfx 0x271E
-	createsprite gUnknown_08592CA0, 0x28
-	createsprite gUnknown_08592CB8, 0x28, 1
-	createsprite gUnknown_08592CB8, 0x28, 2
-	createsprite gUnknown_08592CB8, 0x28, 3
-	createsprite gUnknown_08592CB8, 0x28, 4
-	delay 0x78
-	setarg 0x7, 0xFFFF
+	loadspritegfx ANIM_TAG_LOCK_ON
+	createsprite gUnknown_08592CA0, 40
+	createsprite gUnknown_08592CB8, 40, 1
+	createsprite gUnknown_08592CB8, 40, 2
+	createsprite gUnknown_08592CB8, 40, 3
+	createsprite gUnknown_08592CB8, 40, 4
+	delay 120
+	setarg 7, -1
 	waitforvisualfinish
 	end
 
 Move_MEAN_LOOK:
-	loadspritegfx 0x27CB
+	loadspritegfx ANIM_TAG_EYE
 	monbg ANIM_DEF_PARTNER
 	playsewithpan SE_W060, -64
-	createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, RGB_BLACK
-	loopsewithpan SE_W109, +63, 0xF, 0x4
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK
+	loopsewithpan SE_W109, +63, 15, 4
 	waitplaysewithpan SE_W043, +63, 0x55
-	createsprite gUnknown_085CE104, 0x2
-	delay 0x78
-	createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_BLACK
-	delay 0x1E
+	createsprite gUnknown_085CE104, 2
+	delay 120
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK
+	delay 30
 	clearmonbg ANIM_DEF_PARTNER
 	waitforvisualfinish
 	end
 
 Move_ROCK_THROW:
-	loadspritegfx 0x274A
-	createsprite gUnknown_085972D8, 0x82, 6, 1, 15, 1
-	createsprite gUnknown_08596B04, 0x82, 0, 1, 0, 0
+	loadspritegfx ANIM_TAG_058
+	createsprite gBattleAnimSpriteTemplate_85972D8, 130, 6, 1, 15, 1
+	createsprite gUnknown_08596B04, 130, 0, 1, 0, 0
 	playsewithpan SE_W088, +63
-	delay 0x6
-	createsprite gUnknown_08596B04, 0x82, 19, 1, 10, 0
+	delay 6
+	createsprite gUnknown_08596B04, 130, 19, 1, 10, 0
 	playsewithpan SE_W088, +63
-	delay 0x6
-	createsprite gUnknown_08596B04, 0x82, -23, 2, -10, 0
+	delay 6
+	createsprite gUnknown_08596B04, 130, -23, 2, -10, 0
 	playsewithpan SE_W088, +63
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 5, 20, 1
-	delay 0x6
-	createsprite gUnknown_08596B04, 0x82, -15, 1, -10, 0
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 20, 1
+	delay 6
+	createsprite gUnknown_08596B04, 130, -15, 1, -10, 0
 	playsewithpan SE_W088, +63
-	delay 0x6
-	createsprite gUnknown_08596B04, 0x82, 23, 2, 10, 0
+	delay 6
+	createsprite gUnknown_08596B04, 130, 23, 2, 10, 0
 	playsewithpan SE_W088, +63
 	waitforvisualfinish
 	end
 
 Move_ROCK_SLIDE:
-	loadspritegfx 0x274A
+	loadspritegfx ANIM_TAG_058
 	monbg ANIM_DEF_PARTNER
-	createsprite gUnknown_085972D8, 0x2, 7, 1, 11, 1
-	createsprite gUnknown_08596B04, 0x82, -5, 1, -5, 1
+	createsprite gBattleAnimSpriteTemplate_85972D8, 2, 7, 1, 11, 1
+	createsprite gUnknown_08596B04, 130, -5, 1, -5, 1
 	playsewithpan SE_W088, +63
-	delay 0x2
-	createsprite gUnknown_08596B04, 0x82, 5, 0, 6, 1
+	delay 2
+	createsprite gUnknown_08596B04, 130, 5, 0, 6, 1
 	playsewithpan SE_W088, +63
-	delay 0x2
-	createsprite gUnknown_08596B04, 0x82, 19, 1, 10, 1
+	delay 2
+	createsprite gUnknown_08596B04, 130, 19, 1, 10, 1
 	playsewithpan SE_W088, +63
-	delay 0x2
-	createsprite gUnknown_08596B04, 0x82, -23, 2, -10, 1
+	delay 2
+	createsprite gUnknown_08596B04, 130, -23, 2, -10, 1
 	playsewithpan SE_W088, +63
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 5, 50, 1
-	createvisualtask sub_80D51AC, 0x2, 3, 0, 5, 50, 1
-	delay 0x2
-	call AnimScript_82CC083
-	call AnimScript_82CC083
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 50, 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 5, 50, 1
+	delay 2
+	call RockSlide1
+	call RockSlide1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
-AnimScript_82CC083:
-	createsprite gUnknown_08596B04, 0x82, -20, 0, -10, 1
+RockSlide1:
+	createsprite gUnknown_08596B04, 130, -20, 0, -10, 1
 	playsewithpan SE_W088, +63
-	delay 0x2
-	createsprite gUnknown_08596B04, 0x82, 28, 1, 10, 1
+	delay 2
+	createsprite gUnknown_08596B04, 130, 28, 1, 10, 1
 	playsewithpan SE_W088, +63
-	delay 0x2
-	createsprite gUnknown_08596B04, 0x82, -10, 1, -5, 1
+	delay 2
+	createsprite gUnknown_08596B04, 130, -10, 1, -5, 1
 	playsewithpan SE_W088, +63
-	delay 0x2
-	createsprite gUnknown_08596B04, 0x82, 10, 0, 6, 1
+	delay 2
+	createsprite gUnknown_08596B04, 130, 10, 0, 6, 1
 	playsewithpan SE_W088, +63
-	delay 0x2
-	createsprite gUnknown_08596B04, 0x82, 24, 1, 10, 1
+	delay 2
+	createsprite gUnknown_08596B04, 130, 24, 1, 10, 1
 	playsewithpan SE_W088, +63
-	delay 0x2
-	createsprite gUnknown_08596B04, 0x82, -32, 2, -10, 1
+	delay 2
+	createsprite gUnknown_08596B04, 130, -32, 2, -10, 1
 	playsewithpan SE_W088, +63
-	delay 0x2
-	createsprite gUnknown_08596B04, 0x82, -20, 0, -10, 1
+	delay 2
+	createsprite gUnknown_08596B04, 130, -20, 0, -10, 1
 	playsewithpan SE_W088, +63
-	delay 0x2
-	createsprite gUnknown_08596B04, 0x82, 30, 2, 10, 1
+	delay 2
+	createsprite gUnknown_08596B04, 130, 30, 2, 10, 1
 	playsewithpan SE_W088, +63
-	delay 0x2
+	delay 2
 	return
 
 Move_THIEF:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
-	delay 0x1
+	delay 1
 	fadetobg BG_DARK
 	waitbgfadein
-	setalpha 0x80C
-	createsprite gUnknown_0857FE28, 0x2, 6, 4
-	delay 0x6
+	setalpha 12, 8
+	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
+	delay 6
 	playsewithpan SE_W233, +63
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
-	createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 8, 1
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 8, 1
 	waitforvisualfinish
-	delay 0x14
+	delay 20
 	clearmonbg ANIM_TARGET
 	blendoff
 	restorebg
@@ -2223,196 +2187,194 @@ Move_THIEF:
 	end
 
 Move_BUBBLE_BEAM:
-	loadspritegfx 0x27A2
-	loadspritegfx 0x27AB
+	loadspritegfx ANIM_TAG_146
+	loadspritegfx ANIM_TAG_155
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	delay 0x1
-	call AnimScript_82CC1AD
-	createvisualtask sub_80D5EB8, 0x5, 0, 3, 3072, 8, 1
-	call AnimScript_82CC1AD
-	call AnimScript_82CC1AD
+	setalpha 12, 8
+	delay 1
+	call Bulbblebeam1
+	createvisualtask AnimTask_SwayMon, 5, 0, 3, 3072, 8, ANIM_TARGET
+	call Bulbblebeam1
+	call Bulbblebeam1
 	waitforvisualfinish
-	call AnimScript_82D7AE2
+	call WaterBubbleEffect
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
-
-AnimScript_82CC1AD:
-	createsprite gUnknown_08595068, 0x2, 18, 0, 35, 70, 0, 256, 50
+Bulbblebeam1:
+	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 35, 70, 0, 256, 50
 	playsewithpan SE_W145, -64
-	delay 0x3
-	createsprite gUnknown_08595068, 0x2, 18, 0, 20, 40, -10, 256, 50
+	delay 3
+	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 20, 40, -10, 256, 50
 	playsewithpan SE_W145, -64
-	delay 0x3
-	createsprite gUnknown_08595068, 0x2, 18, 0, 10, -60, 0, 256, 50
+	delay 3
+	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 10, -60, 0, 256, 50
 	playsewithpan SE_W145, -64
-	delay 0x3
-	createsprite gUnknown_08595068, 0x2, 18, 0, 15, -15, 10, 256, 50
+	delay 3
+	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 15, -15, 10, 256, 50
 	playsewithpan SE_W145, -64
-	delay 0x3
-	createsprite gUnknown_08595068, 0x2, 18, 0, 30, 10, -10, 256, 50
+	delay 3
+	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 30, 10, -10, 256, 50
 	playsewithpan SE_W145, -64
-	delay 0x3
-	createsprite gUnknown_08595068, 0x2, 18, 0, 25, -30, 10, 256, 50
+	delay 3
+	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 25, -30, 10, 256, 50
 	playsewithpan SE_W145, -64
-	delay 0x3
+	delay 3
 	return
 
 Move_ICY_WIND:
-	loadspritegfx 0x279D
-	loadspritegfx 0x279E
+	loadspritegfx ANIM_TAG_141
+	loadspritegfx ANIM_TAG_142
 	monbg ANIM_DEF_PARTNER
-	createvisualtask sub_8116620, 0xA, 11, 4, 0, 4, 0
+	createvisualtask sub_8116620, 10, 11, 4, 0, 4, RGB_BLACK
 	fadetobg BG_ICE
 	waitbgfadeout
 	playsewithpan SE_W196, 0
 	waitbgfadein
 	waitforvisualfinish
-	panse_1B SE_W016, -64, +63, +2, 0x0
-	call AnimScript_82CC2A8
-	delay 0x5
-	call AnimScript_82CC2A8
+	panse_1B SE_W016, -64, +63, +2, 0
+	call IcyWind1
+	delay 5
+	call IcyWind1
 	playsewithpan SE_W016B, +63
 	delay 0x37
-	call AnimScript_82D78F8
+	call IcyWindEffect2
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	restorebg
 	waitbgfadeout
-	createvisualtask sub_8116620, 0xA, 11, 4, 4, 0, 0
+	createvisualtask sub_8116620, 10, 11, 4, 4, 0, RGB_BLACK
 	waitbgfadein
 	end
-
-AnimScript_82CC2A8:
+IcyWind1:
 	createsprite gUnknown_08595B98, 0xA8, 0, 0, 0, 0, 72, 1
-	delay 0x5
+	delay 5
 	createsprite gUnknown_08595B98, 0xA8, 0, 10, 0, 10, 72, 1
-	delay 0x5
+	delay 5
 	createsprite gUnknown_08595B98, 0xA8, 0, -10, 0, -10, 72, 1
-	delay 0x5
+	delay 5
 	createsprite gUnknown_08595B98, 0xA8, 0, 15, 0, 15, 72, 1
-	delay 0x5
+	delay 5
 	createsprite gUnknown_08595B98, 0xA8, 0, -5, 0, -5, 72, 1
 	return
 
 Move_SMOKESCREEN:
-	loadspritegfx 0x2720
-	loadspritegfx 0x2721
+	loadspritegfx ANIM_TAG_BLACK_SMOKE
+	loadspritegfx ANIM_TAG_BLACK_BALL
 	playsewithpan SE_W104, -64
-	createsprite gUnknown_085CE050, 0x82, 20, 0, 0, 0, 35, -25
+	createsprite gUnknown_085CE050, 130, 20, 0, 0, 0, 35, -25
 	waitforvisualfinish
-	createvisualtask sub_815A160, 0x2
-	delay 0x2
+	createvisualtask sub_815A160, 2
+	delay 2
 	playsewithpan SE_W028, +63
-	createsprite gUnknown_085CE038, 0x84, 0, -12, 104, 0, 75
-	createsprite gUnknown_085CE038, 0x84, 0, -12, 72, 1, 75
-	createsprite gUnknown_085CE038, 0x84, 0, -6, 56, 1, 75
-	createsprite gUnknown_085CE038, 0x84, 0, -6, 88, 0, 75
-	createsprite gUnknown_085CE038, 0x84, 0, 0, 56, 0, 75
-	createsprite gUnknown_085CE038, 0x84, 0, 0, 88, 1, 75
-	createsprite gUnknown_085CE038, 0x84, 0, 6, 72, 0, 75
-	createsprite gUnknown_085CE038, 0x84, 0, 6, 104, 1, 75
-	createsprite gUnknown_085CE038, 0x84, 0, 12, 72, 0, 75
-	createsprite gUnknown_085CE038, 0x84, 0, 12, 56, 1, 75
-	createsprite gUnknown_085CE038, 0x84, 0, 18, 80, 0, 75
-	createsprite gUnknown_085CE038, 0x84, 0, 18, 72, 1, 75
+	createsprite gUnknown_085CE038, 132, 0, -12, 104, 0, 75
+	createsprite gUnknown_085CE038, 132, 0, -12, 72, 1, 75
+	createsprite gUnknown_085CE038, 132, 0, -6, 56, 1, 75
+	createsprite gUnknown_085CE038, 132, 0, -6, 88, 0, 75
+	createsprite gUnknown_085CE038, 132, 0, 0, 56, 0, 75
+	createsprite gUnknown_085CE038, 132, 0, 0, 88, 1, 75
+	createsprite gUnknown_085CE038, 132, 0, 6, 72, 0, 75
+	createsprite gUnknown_085CE038, 132, 0, 6, 104, 1, 75
+	createsprite gUnknown_085CE038, 132, 0, 12, 72, 0, 75
+	createsprite gUnknown_085CE038, 132, 0, 12, 56, 1, 75
+	createsprite gUnknown_085CE038, 132, 0, 18, 80, 0, 75
+	createsprite gUnknown_085CE038, 132, 0, 18, 72, 1, 75
 	waitforvisualfinish
 	end
 
 Move_CONVERSION:
-	loadspritegfx 0x2722
+	loadspritegfx ANIM_TAG_CONVERSION
 	monbg ANIM_ATK_PARTNER
 	monbgprio_28 ANIM_ATTACKER
-	setalpha 0x10
-	delay 0x0
+	setalpha 16, 0
+	delay 0
 	playsewithpan SE_W129, -64
-	createsprite gUnknown_08592E74, 0x2, -24, -24
-	delay 0x3
-	createsprite gUnknown_08592E74, 0x2, -8, -24
-	delay 0x3
-	createsprite gUnknown_08592E74, 0x2, 8, -24
-	delay 0x3
-	createsprite gUnknown_08592E74, 0x2, 24, -24
-	delay 0x3
+	createsprite gUnknown_08592E74, 2, -24, -24
+	delay 3
+	createsprite gUnknown_08592E74, 2, -8, -24
+	delay 3
+	createsprite gUnknown_08592E74, 2, 8, -24
+	delay 3
+	createsprite gUnknown_08592E74, 2, 24, -24
+	delay 3
 	playsewithpan SE_W129, -64
-	createsprite gUnknown_08592E74, 0x2, -24, -8
-	delay 0x3
-	createsprite gUnknown_08592E74, 0x2, -8, -8
-	delay 0x3
-	createsprite gUnknown_08592E74, 0x2, 8, -8
-	delay 0x3
-	createsprite gUnknown_08592E74, 0x2, 24, -8
-	delay 0x3
+	createsprite gUnknown_08592E74, 2, -24, -8
+	delay 3
+	createsprite gUnknown_08592E74, 2, -8, -8
+	delay 3
+	createsprite gUnknown_08592E74, 2, 8, -8
+	delay 3
+	createsprite gUnknown_08592E74, 2, 24, -8
+	delay 3
 	playsewithpan SE_W129, -64
-	createsprite gUnknown_08592E74, 0x2, -24, 8
-	delay 0x3
-	createsprite gUnknown_08592E74, 0x2, -8, 8
-	delay 0x3
-	createsprite gUnknown_08592E74, 0x2, 8, 8
-	delay 0x3
-	createsprite gUnknown_08592E74, 0x2, 24, 8
-	delay 0x3
+	createsprite gUnknown_08592E74, 2, -24, 8
+	delay 3
+	createsprite gUnknown_08592E74, 2, -8, 8
+	delay 3
+	createsprite gUnknown_08592E74, 2, 8, 8
+	delay 3
+	createsprite gUnknown_08592E74, 2, 24, 8
+	delay 3
 	playsewithpan SE_W129, -64
-	createsprite gUnknown_08592E74, 0x2, -24, 24
-	delay 0x3
-	createsprite gUnknown_08592E74, 0x2, -8, 24
-	delay 0x3
-	createsprite gUnknown_08592E74, 0x2, 8, 24
-	delay 0x3
-	createsprite gUnknown_08592E74, 0x2, 24, 24
-	delay 0x14
+	createsprite gUnknown_08592E74, 2, -24, 24
+	delay 3
+	createsprite gUnknown_08592E74, 2, -8, 24
+	delay 3
+	createsprite gUnknown_08592E74, 2, 8, 24
+	delay 3
+	createsprite gUnknown_08592E74, 2, 24, 24
+	delay 20
 	playsewithpan SE_W112, -64
-	createvisualtask sub_8115D94, 0x2, 10018, 1, 1, 14335, 12, 0, 0
-	delay 0x6
-	createvisualtask sub_81022D4, 0x5
+	createvisualtask sub_8115D94, 2, ANIM_TAG_CONVERSION, 1, 1, 14335, 12, 0, 0
+	delay 6
+	createvisualtask sub_81022D4, 5
 	waitforvisualfinish
-	delay 0x1
+	delay 1
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
 	end
 
 Move_CONVERSION_2:
-	loadspritegfx 0x2722
+	loadspritegfx ANIM_TAG_CONVERSION
 	monbg ANIM_DEF_PARTNER
 	monbgprio_2A ANIM_TARGET
-	setalpha 0x1000
-	delay 0x0
+	setalpha 0, 16
+	delay 0
 	playsewithpan SE_W112, +63
-	createsprite gUnknown_08592EA4, 0x2, -24, -24, 60
-	createsprite gUnknown_08592EA4, 0x2, -8, -24, 65
-	createsprite gUnknown_08592EA4, 0x2, 8, -24, 70
-	createsprite gUnknown_08592EA4, 0x2, 24, -24, 75
-	createsprite gUnknown_08592EA4, 0x2, -24, -8, 80
-	createsprite gUnknown_08592EA4, 0x2, -8, -8, 85
-	createsprite gUnknown_08592EA4, 0x2, 8, -8, 90
-	createsprite gUnknown_08592EA4, 0x2, 24, -8, 95
-	createsprite gUnknown_08592EA4, 0x2, -24, 8, 100
-	createsprite gUnknown_08592EA4, 0x2, -8, 8, 105
-	createsprite gUnknown_08592EA4, 0x2, 8, 8, 110
-	createsprite gUnknown_08592EA4, 0x2, 24, 8, 115
-	createsprite gUnknown_08592EA4, 0x2, -24, 24, 120
-	createsprite gUnknown_08592EA4, 0x2, -8, 24, 125
-	createsprite gUnknown_08592EA4, 0x2, 8, 24, 130
-	createsprite gUnknown_08592EA4, 0x2, 24, 24, 135
-	createvisualtask sub_81023E0, 0x5
-	delay 0x3C
+	createsprite gUnknown_08592EA4, 2, -24, -24, 60
+	createsprite gUnknown_08592EA4, 2, -8, -24, 65
+	createsprite gUnknown_08592EA4, 2, 8, -24, 70
+	createsprite gUnknown_08592EA4, 2, 24, -24, 75
+	createsprite gUnknown_08592EA4, 2, -24, -8, 80
+	createsprite gUnknown_08592EA4, 2, -8, -8, 85
+	createsprite gUnknown_08592EA4, 2, 8, -8, 90
+	createsprite gUnknown_08592EA4, 2, 24, -8, 95
+	createsprite gUnknown_08592EA4, 2, -24, 8, 100
+	createsprite gUnknown_08592EA4, 2, -8, 8, 105
+	createsprite gUnknown_08592EA4, 2, 8, 8, 110
+	createsprite gUnknown_08592EA4, 2, 24, 8, 115
+	createsprite gUnknown_08592EA4, 2, -24, 24, 120
+	createsprite gUnknown_08592EA4, 2, -8, 24, 125
+	createsprite gUnknown_08592EA4, 2, 8, 24, 130
+	createsprite gUnknown_08592EA4, 2, 24, 24, 135
+	createvisualtask sub_81023E0, 5
+	delay 60
 	playsewithpan SE_W129, +63
-	delay 0xA
+	delay 10
 	playsewithpan SE_W129, +63
-	delay 0xA
+	delay 10
 	playsewithpan SE_W129, +63
-	delay 0xA
+	delay 10
 	playsewithpan SE_W129, +63
-	delay 0xA
+	delay 10
 	playsewithpan SE_W129, +63
-	delay 0xA
+	delay 10
 	playsewithpan SE_W129, +63
-	delay 0xA
+	delay 10
 	playsewithpan SE_W129, +63
-	delay 0xA
+	delay 10
 	playsewithpan SE_W129, +63
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -2420,367 +2382,361 @@ Move_CONVERSION_2:
 	end
 
 Move_ROLLING_KICK:
-	loadspritegfx 0x279F
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	createvisualtask sub_80D5830, 0x2, 0, 18, 6, 1, 4
+	setalpha 12, 8
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4
 	playsewithpan SE_W104, -64
-	delay 0x6
+	delay 6
 	playsewithpan SE_W104, -64
 	waitforvisualfinish
-	createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4
-	createsprite gUnknown_08595EE0, 0x2, -24, 0, 48, 10, 160, 0
-	delay 0x5
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4
+	createsprite gUnknown_08595EE0, 2, -24, 0, 48, 10, 160, 0
+	delay 5
 	playsewithpan SE_W233B, +63
-	createsprite gUnknown_08597358, 0x2, -8, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1
+	createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
 	waitforvisualfinish
-	createsprite gUnknown_0857FE58, 0x2, 0, 1, 8
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 8
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_HEADBUTT:
-	loadspritegfx 0x2797
-	createsprite gUnknown_08592CD8, 0x2, 0
+	loadspritegfx ANIM_TAG_135
+	createsprite gUnknown_08592CD8, 2, 0
 	playsewithpan SE_W029, -64
 	waitforvisualfinish
-	delay 0x2
-	createsprite gUnknown_08592CD8, 0x2, 1
+	delay 2
+	createsprite gUnknown_08592CD8, 2, 1
 	waitforvisualfinish
-	createvisualtask sub_80D5484, 0x2, 0, 2, 0, 4, 1
-	createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1
-	createsprite gUnknown_08592CD8, 0x2, 2
-	createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
+	createsprite gUnknown_08592CD8, 2, 2
+	createsprite gUnknown_085973E8, 131, 0, 0, 1, 1
 	playsewithpan SE_W233B, +63
 	waitforvisualfinish
 	end
 
 Move_HORN_ATTACK:
-	loadspritegfx 0x2797
-	loadspritegfx 0x2724
-	createsprite gUnknown_08592CD8, 0x2, 0
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_HORN_HIT
+	createsprite gUnknown_08592CD8, 2, 0
 	playsewithpan SE_W029, -64
 	waitforvisualfinish
-	delay 0x2
-	createsprite gUnknown_08592CD8, 0x2, 1
-	createsprite gUnknown_08592F44, 0x84, 0, 0, 10
+	delay 2
+	createsprite gUnknown_08592CD8, 2, 1
+	createsprite gUnknown_08592F44, 132, 0, 0, 10
 	waitforvisualfinish
-	createvisualtask sub_80D5484, 0x2, 0, 2, 0, 4, 1
-	createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1
-	createsprite gUnknown_08592CD8, 0x2, 2
-	createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
+	createsprite gUnknown_08592CD8, 2, 2
+	createsprite gUnknown_085973E8, 131, 0, 0, 1, 1
 	playsewithpan SE_W030, +63
 	waitforvisualfinish
 	end
 
 Move_FURY_ATTACK:
-	loadspritegfx 0x2797
-	loadspritegfx 0x2724
-	createvisualtask sub_80D6134, 0x2, 4, 256, 0, 2
-	choosetwoturnanim AnimScript_82CC7B8, AnimScript_82CC7DE
-
-AnimScript_82CC7A5:
-	createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_HORN_HIT
+	createvisualtask sub_80D6134, 2, 4, 256, 0, 2
+	choosetwoturnanim FuryAttackRight, FuryAttackLeft
+FuryAttackContinue:
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
 	waitforvisualfinish
 	end
 
-AnimScript_82CC7B8:
-	createsprite gUnknown_08592F44, 0x84, 8, 8, 10
+FuryAttackRight:
+	createsprite gUnknown_08592F44, 132, 8, 8, 10
 	waitforvisualfinish
-	createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1
+	createsprite gUnknown_085973E8, 131, 0, 0, 1, 1
 	playsewithpan SE_W030, +63
-	goto AnimScript_82CC7A5
+	goto FuryAttackContinue
 
-AnimScript_82CC7DE:
-	createsprite gUnknown_08592F44, 0x84, -8, -8, 10
+FuryAttackLeft:
+	createsprite gUnknown_08592F44, 132, -8, -8, 10
 	waitforvisualfinish
-	createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1
+	createsprite gUnknown_085973E8, 131, 0, 0, 1, 1
 	playsewithpan SE_W030, +63
-	goto AnimScript_82CC7A5
+	goto FuryAttackContinue
 
 Move_HORN_DRILL:
-	loadspritegfx 0x2797
-	loadspritegfx 0x2724
-	jumpifcontest AnimScript_82CC96A
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_HORN_HIT
+	jumpifcontest HornDrillInContest
 	fadetobg BG_DRILL
 	waitbgfadeout
-	createvisualtask sub_8117660, 0x5, -2304, 768, 1, -1
-
-AnimScript_82CC821:
+	createvisualtask sub_8117660, 5, -2304, 768, 1, -1
+HornDrillContinue:
 	waitbgfadein
-	setalpha 0x80C
-	createsprite gUnknown_08592CD8, 0x2, 0
+	setalpha 12, 8
+	createsprite gUnknown_08592CD8, 2, 0
 	playsewithpan SE_W029, -64
 	waitforvisualfinish
-	delay 0x2
-	createsprite gUnknown_08592CD8, 0x2, 1
-	createsprite gUnknown_08592F44, 0x84, 0, 0, 12
+	delay 2
+	createsprite gUnknown_08592CD8, 2, 1
+	createsprite gUnknown_08592F44, 132, 0, 0, 12
 	waitforvisualfinish
 	playse SE_BAN
-	createvisualtask sub_80D5484, 0x2, 0, 2, 0, 40, 1
-	createvisualtask sub_80D5484, 0x2, 1, 10, 0, 40, 1
-	createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 3
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1
+	createsprite gUnknown_085973E8, 131, 0, 0, 1, 3
 	playsewithpan SE_W030, +63
-	delay 0x4
-	createsprite gUnknown_085973E8, 0x83, 0, 2, 1, 3
+	delay 4
+	createsprite gUnknown_085973E8, 131, 0, 2, 1, 3
 	playsewithpan SE_W030, +63
-	delay 0x4
-	createsprite gUnknown_085973E8, 0x83, -4, 3, 1, 3
+	delay 4
+	createsprite gUnknown_085973E8, 131, -4, 3, 1, 3
 	playsewithpan SE_W030, +63
-	delay 0x4
-	createsprite gUnknown_085973E8, 0x83, -8, -5, 1, 3
+	delay 4
+	createsprite gUnknown_085973E8, 131, -8, -5, 1, 3
 	playsewithpan SE_W030, +63
-	delay 0x4
-	createsprite gUnknown_085973E8, 0x83, 4, -12, 1, 3
+	delay 4
+	createsprite gUnknown_085973E8, 131, 4, -12, 1, 3
 	playsewithpan SE_W030, +63
-	delay 0x4
-	createsprite gUnknown_085973E8, 0x83, 16, 0, 1, 3
+	delay 4
+	createsprite gUnknown_085973E8, 131, 16, 0, 1, 3
 	playsewithpan SE_W030, +63
-	delay 0x4
-	createsprite gUnknown_085973E8, 0x83, 5, 18, 1, 3
+	delay 4
+	createsprite gUnknown_085973E8, 131, 5, 18, 1, 3
 	playsewithpan SE_W030, +63
-	delay 0x4
-	createsprite gUnknown_085973E8, 0x83, -17, 12, 1, 2
+	delay 4
+	createsprite gUnknown_085973E8, 131, -17, 12, 1, 2
 	playsewithpan SE_W030, +63
-	delay 0x4
-	createsprite gUnknown_085973E8, 0x83, -21, -15, 1, 2
+	delay 4
+	createsprite gUnknown_085973E8, 131, -21, -15, 1, 2
 	playsewithpan SE_W030, +63
-	delay 0x4
-	createsprite gUnknown_085973E8, 0x83, 8, -27, 1, 2
+	delay 4
+	createsprite gUnknown_085973E8, 131, 8, -27, 1, 2
 	playsewithpan SE_W030, +63
-	delay 0x4
-	createsprite gUnknown_085973E8, 0x83, 32, 0, 1, 2
+	delay 4
+	createsprite gUnknown_085973E8, 131, 32, 0, 1, 2
 	playsewithpan SE_W030, +63
-	delay 0x4
-	createsprite gUnknown_08592CD8, 0x2, 2
+	delay 4
+	createsprite gUnknown_08592CD8, 2, 2
 	waitforvisualfinish
 	restorebg
 	waitbgfadeout
-	setarg 0x7, 0xFFFF
+	setarg 7, -1
 	waitbgfadein
 	end
 
-AnimScript_82CC96A:
+HornDrillInContest:
 	fadetobg BG_DRILL_CONTESTS
 	waitbgfadeout
-	createvisualtask sub_8117660, 0x5, 2304, 768, 0, -1
-	goto AnimScript_82CC821
+	createvisualtask sub_8117660, 5, 2304, 768, 0, -1
+	goto HornDrillContinue
 
 Move_THRASH:
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
-	createvisualtask sub_8104C38, 0x2
-	createvisualtask sub_8104CA4, 0x2
-	createsprite gUnknown_08595EB0, 0x83, 1, 10, 0
-	createvisualtask sub_80D5484, 0x2, 1, 4, 0, 7, 1
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
+	createvisualtask sub_8104C38, 2
+	createvisualtask sub_8104CA4, 2
+	createsprite gUnknown_08595EB0, 131, 1, 10, 0
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1
 	playsewithpan SE_W004, +63
-	delay 0x1C
-	createsprite gUnknown_08595EB0, 0x83, 1, 10, 1
-	createvisualtask sub_80D5484, 0x2, 1, 4, 0, 7, 1
+	delay 28
+	createsprite gUnknown_08595EB0, 131, 1, 10, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1
 	playsewithpan SE_W233B, +63
-	delay 0x1C
-	createsprite gUnknown_08595EB0, 0x83, 1, 10, 3
-	createvisualtask sub_80D5484, 0x2, 1, 8, 0, 16, 1
+	delay 28
+	createsprite gUnknown_08595EB0, 131, 1, 10, 3
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 8, 0, 16, 1
 	playsewithpan SE_W025B, +63
 	end
 
 Move_SING:
-	loadspritegfx 0x2758
+	loadspritegfx ANIM_TAG_MUSIC_NOTES2
 	monbg ANIM_DEF_PARTNER
-	createvisualtask sub_8102BE8, 0x2
-	waitforvisualfinish
-	panse_1B SE_W047, -64, +63, +2, 0x0
-	createsprite gUnknown_08593008, 0x82, 7, 0, 12
-	delay 0x5
-	createsprite gUnknown_08593008, 0x82, 6, 1, 12
-	delay 0x5
-	createsprite gUnknown_08593008, 0x82, 1, 2, 12
-	delay 0x5
-	createsprite gUnknown_08593008, 0x82, 2, 3, 12
-	delay 0x5
-	createsprite gUnknown_08593008, 0x82, 3, 0, 12
-	delay 0x4
-	createsprite gUnknown_08593008, 0x82, 2, 1, 12
-	delay 0x4
-	createsprite gUnknown_08593008, 0x82, 5, 2, 12
-	delay 0x4
-	createsprite gUnknown_08593008, 0x82, 6, 3, 12
-	delay 0x4
-	createsprite gUnknown_08593008, 0x82, 2, 0, 12
-	delay 0x4
-	createsprite gUnknown_08593008, 0x82, 2, 1, 12
-	delay 0x4
-	createsprite gUnknown_08593008, 0x82, 1, 2, 12
-	delay 0x4
-	createsprite gUnknown_08593008, 0x82, 5, 3, 12
-	delay 0x4
+	createvisualtask sub_8102BE8, 2
+	waitforvisualfinish
+	panse_1B SE_W047, -64, +63, +2, 0
+	createsprite gUnknown_08593008, 130, 7, 0, 12
+	delay 5
+	createsprite gUnknown_08593008, 130, 6, 1, 12
+	delay 5
+	createsprite gUnknown_08593008, 130, 1, 2, 12
+	delay 5
+	createsprite gUnknown_08593008, 130, 2, 3, 12
+	delay 5
+	createsprite gUnknown_08593008, 130, 3, 0, 12
+	delay 4
+	createsprite gUnknown_08593008, 130, 2, 1, 12
+	delay 4
+	createsprite gUnknown_08593008, 130, 5, 2, 12
+	delay 4
+	createsprite gUnknown_08593008, 130, 6, 3, 12
+	delay 4
+	createsprite gUnknown_08593008, 130, 2, 0, 12
+	delay 4
+	createsprite gUnknown_08593008, 130, 2, 1, 12
+	delay 4
+	createsprite gUnknown_08593008, 130, 1, 2, 12
+	delay 4
+	createsprite gUnknown_08593008, 130, 5, 3, 12
+	delay 4
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
-	createvisualtask sub_8102CA0, 0x2
+	createvisualtask sub_8102CA0, 2
 	waitforvisualfinish
 	end
 
 Move_LOW_KICK:
-	loadspritegfx 0x279F
-	loadspritegfx 0x2797
-	createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4
-	createsprite gUnknown_08595EE0, 0x82, -24, 28, 40, 8, 160, 0
-	delay 0x4
-	createsprite gUnknown_08597358, 0x82, -8, 8, 1, 2
-	createvisualtask sub_80D6134, 0x2, 6, 384, 1, 2
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_135
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4
+	createsprite gUnknown_08595EE0, 130, -24, 28, 40, 8, 160, 0
+	delay 4
+	createsprite gBasicHitSplatSpriteTemplate, 130, -8, 8, 1, 2
+	createvisualtask sub_80D6134, 2, 6, 384, 1, 2
 	playsewithpan SE_W233B, +63
 	waitforvisualfinish
-	createsprite gUnknown_0857FE58, 0x2, 0, 1, 4
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 4
 	end
 
 Move_EARTHQUAKE:
-	createvisualtask sub_81152DC, 0x5, 5, 10, 50
-	createvisualtask sub_81152DC, 0x5, 4, 10, 50
+	createvisualtask sub_81152DC, 5, 5, 10, 50
+	createvisualtask sub_81152DC, 5, 4, 10, 50
 	playsewithpan SE_W089, 0
-	delay 0xA
-	createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14
-	delay 0x10
-	createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14
+	delay 10
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14
+	delay 16
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14
 	end
 
 Move_FISSURE:
-	loadspritegfx 0x275A
-	createvisualtask sub_81152DC, 0x3, 5, 10, 50
-	createvisualtask sub_81152DC, 0x3, 1, 10, 50
+	loadspritegfx ANIM_TAG_074
+	createvisualtask sub_81152DC, 3, 5, 10, 50
+	createvisualtask sub_81152DC, 3, 1, 10, 50
 	playsewithpan SE_W089, +63
-	delay 0x8
-	call AnimScript_82CCBFF
-	delay 0xF
-	createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14
-	delay 0xF
-	call AnimScript_82CCC50
-	delay 0xF
-	createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14
-	delay 0xF
-	call AnimScript_82CCBFF
-	delay 0x32
+	delay 8
+	call Fissure1
+	delay 15
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14
+	delay 15
+	call Fissure2
+	delay 15
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14
+	delay 15
+	call Fissure1
+	delay 50
 	fadetobg BG_FISSURE
 	waitbgfadeout
-	createvisualtask sub_8115628, 0x5, 1, 5, -1
+	createvisualtask sub_8115628, 5, 1, 5, -1
 	waitbgfadein
-	delay 0x28
+	delay 40
 	restorebg
 	waitbgfadeout
-	setarg 0x7, 0xFFFF
+	setarg 7, -1
 	waitbgfadein
 	end
 
-AnimScript_82CCBFF:
-	createsprite gUnknown_085971FC, 0x82, 1, 0, 12, -48, -16, 24
-	createsprite gUnknown_085971FC, 0x82, 1, 0, 16, -16, -10, 24
-	createsprite gUnknown_085971FC, 0x82, 1, 1, 14, -52, -18, 24
-	createsprite gUnknown_085971FC, 0x82, 1, 1, 12, -32, -16, 24
+Fissure1:
+	createsprite gUnknown_085971FC, 130, 1, 0, 12, -48, -16, 24
+	createsprite gUnknown_085971FC, 130, 1, 0, 16, -16, -10, 24
+	createsprite gUnknown_085971FC, 130, 1, 1, 14, -52, -18, 24
+	createsprite gUnknown_085971FC, 130, 1, 1, 12, -32, -16, 24
 	playsewithpan SE_W091, +63
 	return
 
-AnimScript_82CCC50:
-	createsprite gUnknown_085971FC, 0x82, 1, 0, 12, -24, -16, 24
-	createsprite gUnknown_085971FC, 0x82, 1, 0, 16, -38, -10, 24
-	createsprite gUnknown_085971FC, 0x82, 1, 1, 14, -20, -18, 24
-	createsprite gUnknown_085971FC, 0x82, 1, 1, 12, -36, -16, 24
+Fissure2:
+	createsprite gUnknown_085971FC, 130, 1, 0, 12, -24, -16, 24
+	createsprite gUnknown_085971FC, 130, 1, 0, 16, -38, -10, 24
+	createsprite gUnknown_085971FC, 130, 1, 1, 14, -20, -18, 24
+	createsprite gUnknown_085971FC, 130, 1, 1, 12, -36, -16, 24
 	playsewithpan SE_W091, +63
 	return
 
 Move_DIG:
-	choosetwoturnanim AnimScript_82CCCAB, AnimScript_82CCD06
-
-AnimScript_82CCCAA:
-	end
-
-AnimScript_82CCCAB:
-	loadspritegfx 0x275A
-	loadspritegfx 0x2829
-	createsprite gUnknown_08597214, 0x1, 0, 0, 180
-	createsprite gUnknown_08597214, 0x1, 0, 1, 180
+	choosetwoturnanim DigSetUp, DigUnleash
+DigEnd:
+	end
+DigSetUp:
+	loadspritegfx ANIM_TAG_074
+	loadspritegfx ANIM_TAG_281
+	createsprite gUnknown_08597214, 1, 0, 0, 180
+	createsprite gUnknown_08597214, 1, 0, 1, 180
 	monbg_22 ANIM_ATTACKER
-	delay 0x1
-	createvisualtask sub_8114CBC, 0x2, 0
-	delay 0x6
-	call AnimScript_82CCD6A
-	call AnimScript_82CCD6A
-	call AnimScript_82CCD6A
-	call AnimScript_82CCD6A
-	call AnimScript_82CCD6A
+	delay 1
+	createvisualtask sub_8114CBC, 2, 0
+	delay 6
+	call DigSetUp1
+	call DigSetUp1
+	call DigSetUp1
+	call DigSetUp1
+	call DigSetUp1
 	waitforvisualfinish
 	clearmonbg_23 ANIM_ATTACKER
-	delay 0x1
-	createvisualtask sub_8114CBC, 0x2, 1
-	goto AnimScript_82CCCAA
-
-AnimScript_82CCD06:
-	loadspritegfx 0x2797
-	loadspritegfx 0x2829
-	createvisualtask sub_8114F14, 0x2, 0
+	delay 1
+	createvisualtask sub_8114CBC, 2, 1
+	goto DigEnd
+DigUnleash:
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_281
+	createvisualtask sub_8114F14, 2, 0
 	waitforvisualfinish
 	monbg ANIM_ATTACKER
-	createsprite gUnknown_08597214, 0x1, 0, 0, 48
-	createsprite gUnknown_08597214, 0x1, 0, 1, 48
-	delay 0x1
-	createvisualtask sub_8114F14, 0x2, 1
-	delay 0x10
-	createsprite gUnknown_08597358, 0x2, -8, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1
+	createsprite gUnknown_08597214, 1, 0, 0, 48
+	createsprite gUnknown_08597214, 1, 0, 1, 48
+	delay 1
+	createvisualtask sub_8114F14, 2, 1
+	delay 16
+	createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
 	playsewithpan SE_W025B, -64
 	clearmonbg ANIM_ATTACKER
-	goto AnimScript_82CCCAA
-
-AnimScript_82CCD6A:
-	createsprite gUnknown_085971FC, 0x2, 0, 0, 12, 4, -16, 18
-	createsprite gUnknown_085971FC, 0x2, 0, 0, 16, 4, -10, 18
-	createsprite gUnknown_085971FC, 0x2, 0, 1, 14, 4, -18, 18
-	createsprite gUnknown_085971FC, 0x2, 0, 1, 12, 4, -16, 18
+	goto DigEnd
+DigSetUp1:
+	createsprite gUnknown_085971FC, 2, 0, 0, 12, 4, -16, 18
+	createsprite gUnknown_085971FC, 2, 0, 0, 16, 4, -10, 18
+	createsprite gUnknown_085971FC, 2, 0, 1, 14, 4, -18, 18
+	createsprite gUnknown_085971FC, 2, 0, 1, 12, 4, -16, 18
 	playsewithpan SE_W091, -64
-	delay 0x20
+	delay 32
 	return
 
 Move_MEDITATE:
-	call AnimScript_82D7CD1
-	createvisualtask sub_810F7D4, 0x2
+	call SetPsychicBackground
+	createvisualtask sub_810F7D4, 2
 	playsewithpan SE_W029, -64
-	delay 0x10
+	delay 16
 	playsewithpan SE_W036, -64
 	waitforvisualfinish
-	call AnimScript_82D7CDD
+	call UnsetPsychicBackground
 	end
 
 Move_AGILITY:
 	monbg ANIM_ATK_PARTNER
-	setalpha 0x80C
-	createvisualtask sub_80D5830, 0x2, 0, 24, 6, 4, 4
-	createvisualtask sub_81169C0, 0x2, 0, 4, 7, 10
+	setalpha 12, 8
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 4, 4
+	createvisualtask sub_81169C0, 2, 0, 4, 7, 10
 	playsewithpan SE_W104, -64
-	delay 0xC
+	delay 12
 	playsewithpan SE_W104, -64
-	delay 0xC
+	delay 12
 	playsewithpan SE_W104, -64
-	delay 0xC
+	delay 12
 	playsewithpan SE_W104, -64
-	delay 0xC
+	delay 12
 	playsewithpan SE_W104, -64
-	delay 0xC
+	delay 12
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
-	delay 0x1
+	delay 1
 	end
 
 Move_QUICK_ATTACK:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_ATK_PARTNER
-	setalpha 0x80C
-	createvisualtask sub_80D5830, 0x2, 0, 24, 6, 1, 5
-	createvisualtask sub_81169C0, 0x2, 0, 4, 7, 3
+	setalpha 12, 8
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5
+	createvisualtask sub_81169C0, 2, 0, 4, 7, 3
 	playsewithpan SE_W026, -64
-	delay 0x4
-	createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1
-	createsprite gUnknown_08597358, 0x84, 0, 0, 1, 1
+	delay 4
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
+	createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 1
 	playsewithpan SE_W233B, +63
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -2789,323 +2745,314 @@ Move_QUICK_ATTACK:
 	end
 
 Move_RAGE:
-	loadspritegfx 0x2797
-	loadspritegfx 0x2767
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_ANGER
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	createvisualtask sub_80A7B98, 0x3, 0, RGB_RED, 10, 0, 2
-	createsprite gUnknown_0859368C, 0x2, 0, -20, -28
+	setalpha 12, 8
+	createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_ATTACKER, RGB_RED, 10, 0, 2
+	createsprite gUnknown_0859368C, 2, 0, -20, -28
 	playsewithpan SE_W207B, -64
-	delay 0x14
-	createsprite gUnknown_0859368C, 0x2, 0, 20, -28
+	delay 20
+	createsprite gUnknown_0859368C, 2, 0, 20, -28
 	playsewithpan SE_W207B, -64
 	waitforvisualfinish
-	createsprite gUnknown_0857FE28, 0x2, 4, 6
-	delay 0x4
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
-	createvisualtask sub_80D6388, 0x2, 1, 1, 10, 1, 0
+	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6
+	delay 4
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+	createvisualtask sub_80D6388, 2, 1, 1, 10, 1, 0
 	playsewithpan SE_W233B, +63
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	end
 
 Move_TELEPORT:
-	call AnimScript_82D7CD1
-	createvisualtask sub_810F83C, 0x2
+	call SetPsychicBackground
+	createvisualtask sub_810F83C, 2
 	playsewithpan SE_W100, -64
-	delay 0xF
-	call AnimScript_82D7CDD
+	delay 15
+	call UnsetPsychicBackground
 	waitforvisualfinish
 	end
 
 Move_DOUBLE_TEAM:
-	createvisualtask sub_81029B4, 0x2
-	setalpha 0x80C
+	createvisualtask sub_81029B4, 2
+	setalpha 12, 8
 	monbg ANIM_ATK_PARTNER
 	playsewithpan SE_W104, -64
-	delay 0x20
+	delay 32
 	playsewithpan SE_W104, -64
-	delay 0x18
+	delay 24
 	playsewithpan SE_W104, -64
-	delay 0x10
+	delay 16
 	playsewithpan SE_W104, -64
-	delay 0x8
+	delay 8
 	playsewithpan SE_W104, -64
-	delay 0x8
+	delay 8
 	playsewithpan SE_W104, -64
-	delay 0x8
+	delay 8
 	playsewithpan SE_W104, -64
-	delay 0x8
+	delay 8
 	playsewithpan SE_W104, -64
-	delay 0x8
+	delay 8
 	playsewithpan SE_W104, -64
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
-	delay 0x1
+	delay 1
 	end
 
 Move_MINIMIZE:
-	setalpha 0x80A
-	createvisualtask sub_8104674, 0x2
-	loopsewithpan SE_W107, -64, 0x22, 0x3
+	setalpha 10, 8
+	createvisualtask sub_8104674, 2
+	loopsewithpan SE_W107, -64, 34, 3
 	waitforvisualfinish
 	blendoff
 	end
 
 Move_METRONOME:
-	loadspritegfx 0x2750
-	loadspritegfx 0x27E1
-	createsprite gUnknown_08593114, 0xB, 0, 100
+	loadspritegfx ANIM_TAG_064
+	loadspritegfx ANIM_TAG_209
+	createsprite gUnknown_08593114, 11, 0, 100
 	playsewithpan SE_W118, -64
-	delay 0x6
-	createsprite gUnknown_085931BC, 0xC, 0
-	delay 0x18
-	loopsewithpan SE_W039, -64, 0x16, 0x3
+	delay 6
+	createsprite gUnknown_085931BC, 12, 0
+	delay 24
+	loopsewithpan SE_W039, -64, 22, 3
 	waitforvisualfinish
 	end
 
 Move_SKULL_BASH:
-	choosetwoturnanim AnimScript_82CCF99, AnimScript_82CCFE6
-
-AnimScript_82CCF98:
+	choosetwoturnanim SkullBashSetUp, SkullBashAttack
+SkullBashEnd:
 	end
-
-AnimScript_82CCF99:
-	call AnimScript_82CCFA9
-	call AnimScript_82CCFA9
+SkullBashSetUp:
+	call SkullBashSetUp1
+	call SkullBashSetUp1
 	waitforvisualfinish
-	goto AnimScript_82CCF98
-
-AnimScript_82CCFA9:
-	createsprite gUnknown_0857FE88, 0x2, 0, -24, 0, 0, 10, 0
+	goto SkullBashEnd
+SkullBashSetUp1:
+	createsprite gUnknown_0857FE88, 2, 0, -24, 0, 0, 10, 0
 	playsewithpan SE_W036, -64
 	waitforvisualfinish
-	createvisualtask sub_80D6134, 0x2, 16, 96, 0, 2
+	createvisualtask sub_80D6134, 2, 16, 96, 0, 2
 	waitforvisualfinish
-	createsprite gUnknown_0857FE88, 0x2, 0, 24, 0, 0, 10, 1
+	createsprite gUnknown_0857FE88, 2, 0, 24, 0, 0, 10, 1
 	waitforvisualfinish
 	return
-
-AnimScript_82CCFE6:
-	loadspritegfx 0x2797
-	createvisualtask sub_8101C94, 0x2, 0
+SkullBashAttack:
+	loadspritegfx ANIM_TAG_135
+	createvisualtask sub_8101C94, 2, 0
 	playsewithpan SE_W036, -64
 	waitforvisualfinish
 	playse SE_BAN
-	createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14
-	createvisualtask sub_80D5484, 0x2, 0, 2, 0, 40, 1
-	createvisualtask sub_80D5484, 0x2, 1, 10, 0, 40, 1
-	createsprite gUnknown_085973E8, 0x84, 0, 0, 1, 0
-	loopsewithpan SE_W025B, +63, 0x8, 0x3
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1
+	createsprite gUnknown_085973E8, 132, 0, 0, 1, 0
+	loopsewithpan SE_W025B, +63, 8, 3
 	waitforvisualfinish
-	createvisualtask sub_8101C94, 0x2, 1
-	goto AnimScript_82CCF98
+	createvisualtask sub_8101C94, 2, 1
+	goto SkullBashEnd
 
 Move_AMNESIA:
-	loadspritegfx 0x276D
-	call AnimScript_82D7CD1
-	delay 0x8
-	createsprite gUnknown_08596744, 0x14
+	loadspritegfx ANIM_TAG_093
+	call SetPsychicBackground
+	delay 8
+	createsprite gUnknown_08596744, 20
 	playsewithpan SE_W118, -64
-	delay 0x36
-	loopsewithpan SE_W118, -64, 0x10, 0x3
+	delay 54
+	loopsewithpan SE_W118, -64, 16, 3
 	waitforvisualfinish
-	call AnimScript_82D7CDD
+	call UnsetPsychicBackground
 	end
 
 Move_KINESIS:
-	loadspritegfx 0x275B
-	loadspritegfx 0x2771
+	loadspritegfx ANIM_TAG_075
+	loadspritegfx ANIM_TAG_BENT_SPOON
 	playsewithpan SE_W060, -64
-	call AnimScript_82D7CD1
-	createsprite gUnknown_085966DC, 0x14
-	createsprite gUnknown_08593344, 0x13, 32, -8, 0
-	createsprite gUnknown_08593344, 0x13, 32, 16, 1
-	loopsewithpan SE_W109, -64, 0x15, 0x2
-	delay 0x3C
+	call SetPsychicBackground
+	createsprite gUnknown_085966DC, 20
+	createsprite gUnknown_08593344, 19, 32, -8, 0
+	createsprite gUnknown_08593344, 19, 32, 16, 1
+	loopsewithpan SE_W109, -64, 21, 2
+	delay 60
 	playsewithpan SE_W146, -64
-	delay 0x1E
-	loopsewithpan SE_W146, -64, 0x14, 0x2
-	delay 0x46
+	delay 30
+	loopsewithpan SE_W146, -64, 20, 2
+	delay 70
 	playsewithpan SE_W207B, -64
 	waitforvisualfinish
-	call AnimScript_82D7CDD
+	call UnsetPsychicBackground
 	end
 
 Move_GLARE:
-	loadspritegfx 0x2808
-	loadspritegfx 0x27EA
-	createvisualtask sub_815E114, 0x5, 0
+	loadspritegfx ANIM_TAG_248
+	loadspritegfx ANIM_TAG_218
+	createvisualtask sub_815E114, 5, 0
 	playsewithpan SE_W060B, -64
 	waitforvisualfinish
-	createvisualtask sub_8116620, 0x5, 1, 0, 0, 16, 0
+	createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK
 	waitforvisualfinish
-	createsprite gUnknown_08593A84, 0x0, -16, -8
-	createsprite gUnknown_08593A84, 0x0, 16, -8
-	createvisualtask sub_81064F8, 0x5
+	createsprite gUnknown_08593A84, 0, -16, -8
+	createsprite gUnknown_08593A84, 0, 16, -8
+	createvisualtask sub_81064F8, 5
 	playsewithpan SE_W043, -64
-	delay 0x2
-	createvisualtask sub_810A094, 0x3, 20, 1, 0
+	delay 2
+	createvisualtask sub_810A094, 3, 20, 1, 0
 	waitforvisualfinish
-	createvisualtask sub_8116620, 0x5, 1, 0, 16, 0, 0
+	createvisualtask sub_8116620, 5, 1, 0, 16, 0, RGB_BLACK
 	end
 
 Move_BARRAGE:
-	loadspritegfx 0x280E
-	createvisualtask sub_815E47C, 0x3
+	loadspritegfx ANIM_TAG_254
+	createvisualtask sub_815E47C, 3
 	playsewithpan SE_W207, -64
-	delay 0x18
-	createsprite gUnknown_085972D8, 0x2, 8, 1, 40, 1
-	createvisualtask sub_80D51AC, 0x3, 1, 0, 4, 20, 1
-	createvisualtask sub_80D51AC, 0x3, 3, 0, 4, 20, 1
-	loopsewithpan SE_W070, +63, 0x8, 0x2
+	delay 24
+	createsprite gBattleAnimSpriteTemplate_85972D8, 2, 8, 1, 40, 1
+	createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 4, 20, 1
+	createvisualtask AnimTask_ShakeMon, 3, ANIM_DEF_PARTNER, 0, 4, 20, 1
+	loopsewithpan SE_W070, +63, 8, 2
 	end
 
 Move_SKY_ATTACK:
-	choosetwoturnanim AnimScript_82CD185, AnimScript_82CD28E
-
-AnimScript_82CD184:
+	choosetwoturnanim SkyAttackSetUp, SkyAttackUnleash
+SkyAttackEnd:
 	end
-
-AnimScript_82CD185:
+SkyAttackSetUp:
 	monbg ANIM_DEF_PARTNER
-	setalpha 0xB0C
-	createvisualtask sub_81177AC, 0x5, 7
-	jumpargeq 0x7, 0x0, AnimScript_82CD1A0
-	goto AnimScript_82CD217
-
-AnimScript_82CD1A0:
-	createvisualtask sub_8116620, 0xA, 27, 1, 0, 12, 0
-	waitforvisualfinish
-	delay 0xC
-	createvisualtask sub_8116620, 0xA, 2, 1, 8, 0, 0
-	createvisualtask sub_81152DC, 0x5, 0, 2, 16
-	loopsewithpan SE_W287, -64, 0x4, 0x8
-	createvisualtask sub_8116620, 0xA, 2, 1, 0, 15, 0x7FFF
-	delay 0x14
-	createvisualtask sub_8116620, 0xA, 2, 1, 15, 0, 0x7FFF
-	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 25, 1, 8, 0, 0
+	setalpha 12, 11
+	createvisualtask AnimTask_IsTargetPartner, 5, ARG_RET_ID
+	jumpretfalse SkyAttackSetUpAgainstOpponent
+	goto SkyAttackSetUpAgainstPartner
+SkyAttackSetUpAgainstOpponent:
+	createvisualtask sub_8116620, 10, 27, 1, 0, 12, RGB_BLACK
+	waitforvisualfinish
+	delay 12
+	createvisualtask sub_8116620, 10, 2, 1, 8, 0, RGB_BLACK
+	createvisualtask sub_81152DC, 5, 0, 2, 16
+	loopsewithpan SE_W287, -64, 4, 8
+	createvisualtask sub_8116620, 10, 2, 1, 0, 15, RGB_WHITE
+	delay 20
+	createvisualtask sub_8116620, 10, 2, 1, 15, 0, RGB_WHITE
+	waitforvisualfinish
+	createvisualtask sub_8116620, 10, 25, 1, 8, 0, RGB_BLACK
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
-	goto AnimScript_82CD184
-
-AnimScript_82CD217:
-	createvisualtask sub_8116664, 0xA, 1, 1, 0, 12, 0
+	goto SkyAttackEnd
+SkyAttackSetUpAgainstPartner:
+	createvisualtask sub_8116664, 10, 1, 1, 0, 12, RGB_BLACK
 	waitforvisualfinish
-	delay 0xC
-	createvisualtask sub_8116620, 0xA, 2, 1, 8, 0, 0
-	createvisualtask sub_81152DC, 0x5, 0, 2, 16
+	delay 12
+	createvisualtask sub_8116620, 10, 2, 1, 8, 0, RGB_BLACK
+	createvisualtask sub_81152DC, 5, 0, 2, 16
 	playsewithpan SE_W287, -64
-	delay 0x8
-	createvisualtask sub_8116620, 0xA, 2, 1, 0, 15, 0x7FFF
-	delay 0x14
-	createvisualtask sub_8116620, 0xA, 2, 1, 15, 0, 0x7FFF
+	delay 8
+	createvisualtask sub_8116620, 10, 2, 1, 0, 15, RGB_WHITE
+	delay 20
+	createvisualtask sub_8116620, 10, 2, 1, 15, 0, RGB_WHITE
 	waitforvisualfinish
-	createvisualtask sub_8116664, 0xA, 4, 1, 8, 0, 0
+	createvisualtask sub_8116664, 10, 4, 1, 8, 0, RGB_BLACK
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
-	goto AnimScript_82CD184
-
-AnimScript_82CD28E:
-	loadspritegfx 0x2797
-	loadspritegfx 0x282C
-	call AnimScript_82D7CE5
+	goto SkyAttackEnd
+SkyAttackUnleash:
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_284
+	call SetFlyingBg
 	monbg ANIM_ATTACKER
-	createvisualtask sub_8116620, 0xA, 2, 0, 0, 16, 0x7FFF
-	delay 0x4
-	createvisualtask sub_81136E8, 0x5, 0
-	waitforvisualfinish
-	createvisualtask sub_8159244, 0x5, 238, -64
-	createsprite gUnknown_08596514, 0x82
-	delay 0xE
-	createvisualtask sub_80D52D0, 0x2, 1, 10, 0, 18, 1
-	createvisualtask sub_8159210, 0x5, 141, 63
-	delay 0x14
-	createvisualtask sub_81137E4, 0x5, 1
-	delay 0x2
-	createvisualtask sub_8116620, 0xA, 2, 0, 15, 0, 0x7FFF
+	createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE
+	delay 4
+	createvisualtask sub_81136E8, 5, 0
+	waitforvisualfinish
+	createvisualtask sub_8159244, 5, 238, -64
+	createsprite gUnknown_08596514, 130
+	delay 14
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1
+	createvisualtask sub_8159210, 5, 141, 63
+	delay 20
+	createvisualtask sub_81137E4, 5, 1
+	delay 2
+	createvisualtask sub_8116620, 10, 2, 0, 15, 0, RGB_WHITE
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
-	call AnimScript_82D7D15
-	goto AnimScript_82CD184
+	call UnsetFlyingBg
+	goto SkyAttackEnd
 
 Move_FLASH:
 	playsewithpan SE_W043, -64
-	createvisualtask sub_8117494, 0x2
+	createvisualtask sub_8117494, 2
 	waitforvisualfinish
 	end
 
 Move_SPLASH:
-	createvisualtask sub_8104938, 0x2, 0, 3
-	delay 0x8
-	loopsewithpan SE_W039, -64, 0x26, 0x3
+	createvisualtask sub_8104938, 2, 0, 3
+	delay 8
+	loopsewithpan SE_W039, -64, 38, 3
 	waitforvisualfinish
 	end
 
 Move_ACID_ARMOR:
 	monbg ANIM_ATTACKER
-	setalpha 0xF
-	createvisualtask sub_815D240, 0x2, 0
+	setalpha 15, 0
+	createvisualtask sub_815D240, 2, 0
 	playsewithpan SE_W151, -64
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_ATTACKER
-	delay 0x1
+	delay 1
 	end
 
 Move_SHARPEN:
-	loadspritegfx 0x27C9
-	createsprite gUnknown_08592DE4, 0x2
+	loadspritegfx ANIM_TAG_185
+	createsprite gUnknown_08592DE4, 2
 	waitforvisualfinish
 	end
 
 Move_SUPER_FANG:
-	loadspritegfx 0x27D0
-	createvisualtask sub_80D5484, 0x2, 0, 1, 0, 20, 1
+	loadspritegfx ANIM_TAG_192
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1
 	playsewithpan SE_W082, -64
 	waitforvisualfinish
-	createvisualtask sub_80D5484, 0x2, 0, 3, 0, 48, 1
-	createvisualtask sub_80A7B98, 0x2, 0, RGB(31, 6, 1), 12, 4, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 48, 1
+	createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB(31, 6, 1), 12, 4, 1
 	waitforvisualfinish
-	delay 0x14
-	createsprite gUnknown_0857FE28, 0x2, 4, 4
-	delay 0x4
-	createsprite gUnknown_08592F74, 0x82
+	delay 20
+	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4
+	delay 4
+	createsprite gUnknown_08592F74, 130
 	playsewithpan SE_W044, +63
-	delay 0x8
-	createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 2143, 14, 0x7FFF, 14
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 7, 12, 1
+	delay 8
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB(31, 2, 2), 14, 0x7FFF, 14
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 7, 12, 1
 	waitforvisualfinish
 	blendoff
 	end
 
 Move_SLASH:
-	loadspritegfx 0x27C7
-	createsprite gUnknown_08592D2C, 0x82, 1, -8, 0
+	loadspritegfx ANIM_TAG_183
+	createsprite gUnknown_08592D2C, 130, 1, -8, 0
 	playsewithpan SE_W013, +63
-	delay 0x4
-	createsprite gUnknown_08592D2C, 0x82, 1, 8, 0
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 18, 1
+	delay 4
+	createsprite gUnknown_08592D2C, 130, 1, 8, 0
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1
 	playsewithpan SE_W013, +63
 	waitforvisualfinish
 	end
 
 Move_STRUGGLE:
-	loadspritegfx 0x2797
-	loadspritegfx 0x27E7
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_215
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	createvisualtask sub_80D5484, 0x2, 0, 3, 0, 12, 4
-	createsprite gUnknown_08593B80, 0x2, 0, 0, 2
-	createsprite gUnknown_08593B80, 0x2, 0, 1, 2
-	loopsewithpan SE_W029, -64, 0xC, 0x4
-	waitforvisualfinish
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2
-	createvisualtask sub_80D5484, 0x2, 1, 3, 0, 6, 1
+	setalpha 12, 8
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4
+	createsprite gUnknown_08593B80, 2, 0, 0, 2
+	createsprite gUnknown_08593B80, 2, 0, 1, 2
+	loopsewithpan SE_W029, -64, 12, 4
+	waitforvisualfinish
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 6, 1
 	playsewithpan SE_W025B, +63
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
@@ -3113,33 +3060,32 @@ Move_STRUGGLE:
 	end
 
 Move_SKETCH:
-	loadspritegfx 0x2712
+	loadspritegfx ANIM_TAG_PENCIL
 	monbg ANIM_TARGET
-	createvisualtask sub_8104E74, 0x2
-	createsprite gUnknown_085936D4, 0x82
+	createvisualtask sub_8104E74, 2
+	createsprite gUnknown_085936D4, 130
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
-	createvisualtask sub_8104938, 0x2, 0, 2
-	loopsewithpan SE_W039, -64, 0x26, 0x2
+	createvisualtask sub_8104938, 2, 0, 2
+	loopsewithpan SE_W039, -64, 38, 2
 	end
 
 Move_NIGHTMARE:
 	fadetobg BG_GHOST
 	waitbgfadein
-	jumpifcontest AnimScript_82CD4CF
+	jumpifcontest NightmareInContest
 	monbg ANIM_DEF_PARTNER
-	createvisualtask sub_8111C50, 0x2
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 40, 1
+	createvisualtask sub_8111C50, 2
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 40, 1
 	playsewithpan SE_W171, +63
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	restorebg
 	waitbgfadein
 	end
-
-AnimScript_82CD4CF:
-	createvisualtask sub_80A7B98, 0x2, 0, RGB_WHITE, 10, 2, 1
-	createvisualtask sub_80D51AC, 0x2, 0, 3, 0, 32, 1
+NightmareInContest:
+	createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB_WHITE, 10, 2, 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 32, 1
 	playsewithpan SE_W171, +63
 	waitforvisualfinish
 	restorebg
@@ -3147,14 +3093,14 @@ AnimScript_82CD4CF:
 	end
 
 Move_FLAIL:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	createvisualtask sub_815C770, 0x2, 0
-	loopsewithpan SE_W029, -64, 0x8, 0x2
+	setalpha 12, 8
+	createvisualtask sub_815C770, 2, 0
+	loopsewithpan SE_W029, -64, 8, 2
 	waitforvisualfinish
-	createsprite gUnknown_085973A0, 0x83, 1, 3
-	createvisualtask sub_80D6388, 0x2, 0, 1, 30, 1, 0
+	createsprite gUnknown_085973A0, 131, 1, 3
+	createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0
 	playsewithpan SE_W025B, +63
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
@@ -3166,9 +3112,9 @@ Move_SPITE:
 	playsewithpan SE_W060, -64
 	waitbgfadein
 	monbg ANIM_DEF_PARTNER
-	createvisualtask sub_8115A04, 0x2, 2, 2, 6, 0, 8, 0x7FFF
-	createvisualtask sub_8111E50, 0x2
-	loopsewithpan SE_W060, +63, 0x14, 0x3
+	createvisualtask sub_8115A04, 2, 2, 2, 6, 0, 8, RGB_WHITE
+	createvisualtask sub_8111E50, 2
+	loopsewithpan SE_W060, +63, 20, 3
 	waitforvisualfinish
 	restorebg
 	waitbgfadein
@@ -3176,52 +3122,50 @@ Move_SPITE:
 	end
 
 Move_MACH_PUNCH:
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
 	monbg ANIM_ATK_PARTNER
-	createvisualtask sub_8117754, 0x2
-	jumpargeq 0x7, 0x1, AnimScript_82CD5E6
+	createvisualtask AnimTask_IsAttackerOpponentSide, 2
+	jumprettrue MachPunchAgainstPlayer
 	fadetobg BG_HIGHSPEED_OPPONENT
-
-AnimScript_82CD57E:
+MachPunchContinue:
 	waitbgfadeout
-	createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1
+	createvisualtask sub_8117660, 5, -2304, 0, 1, -1
 	waitbgfadein
-	delay 0x0
-	setalpha 0x809
-	createvisualtask sub_80A8BC4, 0x2, 28968, 10
+	delay 0
+	setalpha 9, 8
+	createvisualtask sub_80A8BC4, 2, 28968, 10
 	playsewithpan SE_W026, -64
-	delay 0x6
-	createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1
-	createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0
+	delay 6
+	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
+	createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0
 	playsewithpan SE_W004, +63
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
 	restorebg
 	waitbgfadeout
-	setarg 0x7, 0xFFFF
+	setarg 7, -1
 	waitbgfadein
 	end
-
-AnimScript_82CD5E6:
+MachPunchAgainstPlayer:
 	fadetobg BG_HIGHSPEED_PLAYER
-	goto AnimScript_82CD57E
+	goto MachPunchContinue
 
 Move_FORESIGHT:
-	loadspritegfx 0x2812
+	loadspritegfx ANIM_TAG_MAGNIFYING_GLASS
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x10
-	createsprite gUnknown_085CE8C4, 0x82, 1
-	delay 0x11
-	loopsewithpan SE_W166, +63, 0x10, 0x4
-	delay 0x30
-	delay 0x18
+	setalpha 16, 0
+	createsprite gUnknown_085CE8C4, 130, 1
+	delay 17
+	loopsewithpan SE_W166, +63, 16, 4
+	delay 48
+	delay 24
 	playsewithpan SE_W166, +63
-	delay 0xA
-	createvisualtask sub_80A7B98, 0x5, 1, RGB_WHITE, 12, 2, 1
+	delay 10
+	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 2, 1
 	playsewithpan SE_W197, +63
 	waitforvisualfinish
 	blendoff
@@ -3229,17 +3173,17 @@ Move_FORESIGHT:
 	end
 
 Move_DESTINY_BOND:
-	loadspritegfx 0x27CC
+	loadspritegfx ANIM_TAG_188
 	fadetobg BG_GHOST
 	playsewithpan SE_W060, -64
 	waitbgfadein
-	createvisualtask sub_81123C4, 0x5, 0, 48
+	createvisualtask sub_81123C4, 5, 0, 48
 	playsewithpan SE_W109, -64
-	delay 0x30
-	createvisualtask sub_80D5484, 0x2, 0, 2, 0, 24, 1
-	createvisualtask sub_8116664, 0x2, 6, 1, 0, 12, 30653
-	delay 0x18
-	createvisualtask sub_8116664, 0x2, 6, 1, 12, 0, 30653
+	delay 48
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1
+	createvisualtask sub_8116664, 2, 6, 1, 0, 12, RGB(29, 29, 29)
+	delay 24
+	createvisualtask sub_8116664, 2, 6, 1, 12, 0, RGB(29, 29, 29)
 	playsewithpan SE_W171, +63
 	waitforvisualfinish
 	restorebg
@@ -3249,55 +3193,55 @@ Move_DESTINY_BOND:
 	end
 
 Move_ENDURE:
-	loadspritegfx 0x27C8
+	loadspritegfx ANIM_TAG_184
 	playsewithpan SE_W082, -64
-	call AnimScript_82CD6C7
-	delay 0x8
-	createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 31
-	createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1
-	call AnimScript_82CD6C7
-	delay 0x8
-	call AnimScript_82CD6C7
-	waitforvisualfinish
-	end
-
-AnimScript_82CD6C7:
-	createsprite gUnknown_08592D8C, 0x2, 0, -24, 26, 2
-	delay 0x4
-	createsprite gUnknown_08592D8C, 0x2, 0, 14, 28, 1
-	delay 0x4
-	createsprite gUnknown_08592D8C, 0x2, 0, -5, 10, 2
-	delay 0x4
-	createsprite gUnknown_08592D8C, 0x2, 0, 28, 26, 3
-	delay 0x4
-	createsprite gUnknown_08592D8C, 0x2, 0, -12, 0, 1
+	call EndureEffect
+	delay 8
+	createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
+	call EndureEffect
+	delay 8
+	call EndureEffect
+	waitforvisualfinish
+	end
+
+EndureEffect:
+	createsprite gUnknown_08592D8C, 2, 0, -24, 26, 2
+	delay 4
+	createsprite gUnknown_08592D8C, 2, 0, 14, 28, 1
+	delay 4
+	createsprite gUnknown_08592D8C, 2, 0, -5, 10, 2
+	delay 4
+	createsprite gUnknown_08592D8C, 2, 0, 28, 26, 3
+	delay 4
+	createsprite gUnknown_08592D8C, 2, 0, -12, 0, 1
 	return
 
 Move_CHARM:
-	loadspritegfx 0x27E2
-	createvisualtask sub_815C478, 0x5, 0, 2, 0
-	createsprite gUnknown_08593970, 0x3, 0, 20
+	loadspritegfx ANIM_TAG_PURPLE_HEART
+	createvisualtask sub_815C478, 5, 0, 2, 0
+	createsprite gUnknown_08593970, 3, 0, 20
 	playsewithpan SE_W204, -64
-	delay 0xF
-	createsprite gUnknown_08593970, 0x3, -20, 20
+	delay 15
+	createsprite gUnknown_08593970, 3, -20, 20
 	playsewithpan SE_W204, -64
-	delay 0xF
-	createsprite gUnknown_08593970, 0x3, 20, 20
+	delay 15
+	createsprite gUnknown_08593970, 3, 20, 20
 	playsewithpan SE_W204, -64
 	waitforvisualfinish
 	end
 
 Move_ROLLOUT:
-	loadspritegfx 0x2797
-	loadspritegfx 0x275A
-	loadspritegfx 0x274A
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_074
+	loadspritegfx ANIM_TAG_058
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	createvisualtask sub_8110F74, 0x2
+	setalpha 12, 8
+	createvisualtask sub_8110F74, 2
 	waitforvisualfinish
-	createvisualtask sub_80D6388, 0x2, 0, 1, 30, 1, 0
-	createsprite gUnknown_08597358, 0x4, 0, 0, 1, 2
+	createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0
+	createsprite gBasicHitSplatSpriteTemplate, 4, 0, 0, 1, 2
 	playsewithpan SE_W025B, +63
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -3305,624 +3249,617 @@ Move_ROLLOUT:
 	end
 
 Move_FALSE_SWIPE:
-	loadspritegfx 0x282E
-	loadspritegfx 0x2797
-	createsprite gUnknown_08592D44, 0x82
+	loadspritegfx ANIM_TAG_286
+	loadspritegfx ANIM_TAG_135
+	createsprite gUnknown_08592D44, 130
 	playsewithpan SE_W233, +63
-	delay 0x10
-	createsprite gUnknown_08592D5C, 0x82, 0
+	delay 16
+	createsprite gUnknown_08592D5C, 130, 0
 	playsewithpan SE_W104, +63
-	delay 0x2
-	createsprite gUnknown_08592D5C, 0x82, 16
-	delay 0x2
-	createsprite gUnknown_08592D5C, 0x82, 32
+	delay 2
+	createsprite gUnknown_08592D5C, 130, 16
+	delay 2
+	createsprite gUnknown_08592D5C, 130, 32
 	playsewithpan SE_W104, +63
-	delay 0x2
-	createsprite gUnknown_08592D5C, 0x82, 48
-	delay 0x2
-	createsprite gUnknown_08592D5C, 0x82, 64
+	delay 2
+	createsprite gUnknown_08592D5C, 130, 48
+	delay 2
+	createsprite gUnknown_08592D5C, 130, 64
 	playsewithpan SE_W104, +63
-	delay 0x2
-	createsprite gUnknown_08592D5C, 0x82, 80
-	delay 0x2
+	delay 2
+	createsprite gUnknown_08592D5C, 130, 80
+	delay 2
 	waitforvisualfinish
-	createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1
-	createsprite gUnknown_08597358, 0x84, 0, 0, 1, 3
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
+	createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 3
 	playsewithpan SE_W004, +63
 	end
 
 Move_SWAGGER:
-	loadspritegfx 0x2766
-	loadspritegfx 0x2767
-	createvisualtask sub_8104AB4, 0x2
+	loadspritegfx ANIM_TAG_086
+	loadspritegfx ANIM_TAG_ANGER
+	createvisualtask sub_8104AB4, 2
 	playsewithpan SE_W207, -64
 	waitforvisualfinish
-	createsprite gUnknown_08593658, 0x2
-	loopsewithpan SE_W207, -64, 0x4, 0x2
+	createsprite gUnknown_08593658, 2
+	loopsewithpan SE_W207, -64, 4, 2
 	waitforvisualfinish
-	delay 0x18
-	createsprite gUnknown_0859368C, 0x82, 1, -20, -28
+	delay 24
+	createsprite gUnknown_0859368C, 130, 1, -20, -28
 	playsewithpan SE_W207B, +63
-	delay 0xC
-	createsprite gUnknown_0859368C, 0x82, 1, 20, -28
+	delay 12
+	createsprite gUnknown_0859368C, 130, 1, 20, -28
 	playsewithpan SE_W207B, +63
 	waitforvisualfinish
 	end
 
 Move_MILK_DRINK:
-	loadspritegfx 0x2773
-	loadspritegfx 0x27DB
-	loadspritegfx 0x272F
+	loadspritegfx ANIM_TAG_MILK_BOTTLE
+	loadspritegfx ANIM_TAG_203
+	loadspritegfx ANIM_TAG_BLUE_STAR
 	monbg ANIM_TARGET
-	createsprite gUnknown_08592B3C, 0x2
-	delay 0x28
+	createsprite gUnknown_08592B3C, 2
+	delay 40
 	playsewithpan SE_W152, -64
-	delay 0xC
+	delay 12
 	playsewithpan SE_W152, -64
-	delay 0x14
+	delay 20
 	playsewithpan SE_W152, -64
 	waitforvisualfinish
-	createsprite gUnknown_0859381C, 0x3, 0, 0, 1, 0
+	createsprite gUnknown_0859381C, 3, 0, 0, 1, 0
 	playsewithpan SE_W208, -64
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
-	call AnimScript_82D7A28
+	call HealingEffect2
 	waitforvisualfinish
 	end
 
 Move_MAGNITUDE:
-	createvisualtask sub_8115600, 0x2
-	waitforvisualfinish
-	jumpargeq 0xF, 0x0, AnimScript_82CD8C9
-	jumpargeq 0xF, 0x1, AnimScript_82CD8EE
-
-AnimScript_82CD8C8:
-	end
-
-AnimScript_82CD8C9:
-	createvisualtask sub_81152DC, 0x5, 5, 0, 50
-	createvisualtask sub_81152DC, 0x5, 4, 0, 50
-	loopsewithpan SE_W070, +63, 0x8, 0xA
-	goto AnimScript_82CD8C8
-
-AnimScript_82CD8EE:
-	createvisualtask sub_81152DC, 0x5, 5, 0, 50
-	createvisualtask sub_81152DC, 0x5, 4, 0, 50
-	loopsewithpan SE_W070, +63, 0x8, 0xA
-	delay 0xA
-	createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14
-	delay 0x10
-	createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14
-	goto AnimScript_82CD8C8
+	createvisualtask AnimTask_IsPowerOver99, 2
+	waitforvisualfinish
+	jumpargeq 15, FALSE, MagnitudeRegular
+	jumpargeq 15, TRUE, MagnitudeIntense
+MagnitudeEnd:
+	end
+MagnitudeRegular:
+	createvisualtask sub_81152DC, 5, 5, 0, 50
+	createvisualtask sub_81152DC, 5, 4, 0, 50
+	loopsewithpan SE_W070, +63, 8, 10
+	goto MagnitudeEnd
+MagnitudeIntense:
+	createvisualtask sub_81152DC, 5, 5, 0, 50
+	createvisualtask sub_81152DC, 5, 4, 0, 50
+	loopsewithpan SE_W070, +63, 8, 10
+	delay 10
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14
+	delay 16
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14
+	goto MagnitudeEnd
 
 Move_RAPID_SPIN:
-	loadspritegfx 0x2797
-	loadspritegfx 0x27F5
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_229
 	monbg ANIM_ATTACKER
-	createsprite gUnknown_085CE288, 0x2, 0, 0, 32, -32, 40, -2
-	createvisualtask sub_815ADB0, 0x2, 0, 2, 0
-	loopsewithpan SE_W013B, -64, 0x8, 0x4
+	createsprite gUnknown_085CE288, 2, 0, 0, 32, -32, 40, -2
+	createvisualtask sub_815ADB0, 2, 0, 2, 0
+	loopsewithpan SE_W013B, -64, 8, 4
 	waitforvisualfinish
-	createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2
-	createvisualtask sub_80D6388, 0x2, 0, 1, 10, 1, 0
+	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2
+	createvisualtask sub_80D6388, 2, 0, 1, 10, 1, 0
 	playsewithpan SE_W003, +63
 	waitforvisualfinish
-	delay 0x8
-	createvisualtask sub_815ADB0, 0x2, 0, 2, 1
-	loopsewithpan SE_W013B, -64, 0x8, 0x4
+	delay 8
+	createvisualtask sub_815ADB0, 2, 0, 2, 1
+	loopsewithpan SE_W013B, -64, 8, 4
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	end
 
 Move_MOONLIGHT:
-	loadspritegfx 0x27D2
-	loadspritegfx 0x27D3
-	loadspritegfx 0x272F
-	setalpha 0x1000
-	createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, RGB_BLACK
-	waitforvisualfinish
-	createsprite gUnknown_08592EBC, 0x2, 120, 56
-	createvisualtask sub_80A7A74, 0x3, 0, 16, 16, 0, 1
+	loadspritegfx ANIM_TAG_MOON
+	loadspritegfx ANIM_TAG_GREEN_SPARKLE
+	loadspritegfx ANIM_TAG_BLUE_STAR
+	setalpha 0, 16
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK
+	waitforvisualfinish
+	createsprite gUnknown_08592EBC, 2, 120, 56
+	createvisualtask sub_80A7A74, 3, 0, 16, 16, 0, 1
 	playsewithpan SE_W236, 0
-	delay 0x1E
-	createsprite gUnknown_08592EEC, 0x28, -12, 0
-	delay 0x1E
-	createsprite gUnknown_08592EEC, 0x28, -24, 0
-	delay 0x1E
-	createsprite gUnknown_08592EEC, 0x28, 21, 0
-	delay 0x1E
-	createsprite gUnknown_08592EEC, 0x28, 0, 0
-	delay 0x1E
-	createsprite gUnknown_08592EEC, 0x28, 10, 0
-	delay 0x14
-	createvisualtask sub_81025C0, 0x2
+	delay 30
+	createsprite gBattleAnimSpriteTemplate_8592EEC, 40, -12, 0
+	delay 30
+	createsprite gBattleAnimSpriteTemplate_8592EEC, 40, -24, 0
+	delay 30
+	createsprite gBattleAnimSpriteTemplate_8592EEC, 40, 21, 0
+	delay 30
+	createsprite gBattleAnimSpriteTemplate_8592EEC, 40, 0, 0
+	delay 30
+	createsprite gBattleAnimSpriteTemplate_8592EEC, 40, 10, 0
+	delay 20
+	createvisualtask sub_81025C0, 2
 	waitforvisualfinish
-	call AnimScript_82D79DF
+	call HealingEffect
 	waitforvisualfinish
 	end
 
 Move_EXTREME_SPEED:
-	loadspritegfx 0x27DF
-	loadspritegfx 0x2797
-	createvisualtask sub_8117754, 0x2
-	jumpargeq 0x7, 0x1, AnimScript_82CDAF5
+	loadspritegfx ANIM_TAG_207
+	loadspritegfx ANIM_TAG_135
+	createvisualtask AnimTask_IsAttackerOpponentSide, 2
+	jumprettrue ExtremeSpeedAgainstPlayer
 	fadetobg BG_HIGHSPEED_OPPONENT
-
-AnimScript_82CDA55:
+ExtremeSpeedContinue:
 	waitbgfadeout
-	createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1
+	createvisualtask sub_8117660, 5, -2304, 0, 1, -1
 	waitbgfadein
-	createvisualtask sub_810577C, 0x2
-	loopsewithpan SE_W013B, -64, 0x8, 0x3
+	createvisualtask sub_810577C, 2
+	loopsewithpan SE_W013B, -64, 8, 3
 	waitforvisualfinish
-	delay 0x1
-	createvisualtask sub_8117F60, 0x2
+	delay 1
+	createvisualtask sub_8117F60, 2
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	delay 0x12
-	createvisualtask sub_8105810, 0x2
-	delay 0x2
+	setalpha 12, 8
+	delay 18
+	createvisualtask sub_8105810, 2
+	delay 2
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_085973B8, 0x82, 1, 0, -12, 3
-	delay 0xA
+	createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, -12, 3
+	delay 10
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_085973B8, 0x82, 1, 0, 12, 3
-	delay 0xA
+	createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, 12, 3
+	delay 10
 	playsewithpan SE_W233B, +63
-	createsprite gUnknown_085973B8, 0x82, 1, 0, 0, 3
+	createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, 0, 3
 	waitforvisualfinish
-	createvisualtask sub_8105AAC, 0x2
-	delay 0xA
-	createvisualtask sub_810599C, 0x2
-	loopsewithpan SE_W104, -64, 0x8, 0x4
+	createvisualtask sub_8105AAC, 2
+	delay 10
+	createvisualtask sub_810599C, 2
+	loopsewithpan SE_W104, -64, 8, 4
 	waitforvisualfinish
 	restorebg
 	waitbgfadeout
-	setarg 0x7, 0xFFFF
+	setarg 7, -1
 	waitbgfadein
 	clearmonbg ANIM_TARGET
 	blendoff
-	delay 0x1
-	setarg 0x7, 0x1000
-	delay 0x1
+	delay 1
+	setarg 7, 0x1000
+	delay 1
 	end
-
-AnimScript_82CDAF5:
+ExtremeSpeedAgainstPlayer:
 	fadetobg BG_HIGHSPEED_PLAYER
-	goto AnimScript_82CDA55
+	goto ExtremeSpeedContinue
 
 Move_UPROAR:
-	loadspritegfx 0x27F1
-	loadspritegfx 0x27DB
+	loadspritegfx ANIM_TAG_225
+	loadspritegfx ANIM_TAG_203
 	monbg ANIM_DEF_PARTNER
-	createvisualtask sub_8106D90, 0x2, 0
-	createsprite gUnknown_08593898, 0x3, 0, 0, 0, 0, 31, 8
+	createvisualtask sub_8106D90, 2, 0
+	createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8
 	playsewithpan SE_W253, -64
-	createsprite gUnknown_08593BB8, 0x2, 0, 29, -12, 0
-	createsprite gUnknown_08593BB8, 0x2, 0, -12, -29, 1
-	delay 0x10
-	createvisualtask sub_8106D90, 0x2, 0
-	createsprite gUnknown_08593898, 0x3, 0, 0, 0, 0, 31, 8
+	createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 29, -12, 0
+	createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -12, -29, 1
+	delay 16
+	createvisualtask sub_8106D90, 2, 0
+	createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8
 	playsewithpan SE_W253, -64
-	createsprite gUnknown_08593BB8, 0x2, 0, 12, -29, 1
-	createsprite gUnknown_08593BB8, 0x2, 0, -29, -12, 0
-	delay 0x10
-	createvisualtask sub_8106D90, 0x2, 0
-	createsprite gUnknown_08593898, 0x3, 0, 0, 0, 0, 31, 8
+	createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 12, -29, 1
+	createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -29, -12, 0
+	delay 16
+	createvisualtask sub_8106D90, 2, 0
+	createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8
 	playsewithpan SE_W253, -64
-	createsprite gUnknown_08593BB8, 0x2, 0, 24, -24, 1
-	createsprite gUnknown_08593BB8, 0x2, 0, -24, -24, 0
+	createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 24, -24, 1
+	createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -24, -24, 0
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
 Move_HEAT_WAVE:
-	loadspritegfx 0x2815
-	createvisualtask sub_8116848, 0x5, 10261, 0, 6, 6, RGB_RED
-	createvisualtask sub_8110BCC, 0x5, 1
-	createvisualtask sub_810A060, 0x6, 6, 31
-	panse_1B SE_W257, -64, +63, +2, 0x0
-	delay 0x4
-	createvisualtask sub_8109DBC, 0x5
-	delay 0xC
-	createsprite gUnknown_08596BA0, 0x28, 10, 2304, 96, 1
-	delay 0xA
-	createsprite gUnknown_08596BA0, 0x28, 90, 2048, 96, 1
-	delay 0xA
-	createsprite gUnknown_08596BA0, 0x28, 50, 2560, 96, 1
-	delay 0xA
-	createsprite gUnknown_08596BA0, 0x28, 20, 2304, 96, 1
-	delay 0xA
-	createsprite gUnknown_08596BA0, 0x28, 70, 1984, 96, 1
-	delay 0xA
-	createsprite gUnknown_08596BA0, 0x28, 0, 2816, 96, 1
-	delay 0xA
-	createsprite gUnknown_08596BA0, 0x28, 60, 2560, 96, 1
+	loadspritegfx ANIM_TAG_261
+	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_261, 0, 6, 6, RGB_RED
+	createvisualtask AnimTask_LoadSandstormBackground, 5, TRUE
+	createvisualtask AnimTask_BlendBackground, 6, 6, RGB_RED
+	panse_1B SE_W257, -64, +63, +2, 0
+	delay 4
+	createvisualtask sub_8109DBC, 5
+	delay 12
+	createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 10, 2304, 96, 1
+	delay 10
+	createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 90, 2048, 96, 1
+	delay 10
+	createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 50, 2560, 96, 1
+	delay 10
+	createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 20, 2304, 96, 1
+	delay 10
+	createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 70, 1984, 96, 1
+	delay 10
+	createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 0, 2816, 96, 1
+	delay 10
+	createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 60, 2560, 96, 1
 	end
 
 Move_HAIL:
-	loadspritegfx 0x2817
-	loadspritegfx 0x279D
-	createvisualtask sub_8116620, 0xA, 1, 3, 0, 6, 0
+	loadspritegfx ANIM_TAG_263
+	loadspritegfx ANIM_TAG_141
+	createvisualtask sub_8116620, 10, 1, 3, 0, 6, RGB_BLACK
 	waitforvisualfinish
-	createvisualtask sub_810C918, 0x5
-	loopsewithpan SE_W258, 0, 0x8, 0xA
+	createvisualtask sub_810C918, 5
+	loopsewithpan SE_W258, 0, 8, 10
 	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 1, 3, 6, 0, 0
+	createvisualtask sub_8116620, 10, 1, 3, 6, 0, RGB_BLACK
 	end
 
 Move_TORMENT:
-	loadspritegfx 0x2767
-	loadspritegfx 0x27E1
-	createvisualtask sub_815AFF0, 0x2
+	loadspritegfx ANIM_TAG_ANGER
+	loadspritegfx ANIM_TAG_209
+	createvisualtask sub_815AFF0, 2
 	waitforvisualfinish
-	createvisualtask sub_80A7B98, 0x2, 1, RGB_RED, 10, 1, 1
-	createsprite gUnknown_0859368C, 0x82, 1, -20, -28
+	createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1
+	createsprite gUnknown_0859368C, 130, 1, -20, -28
 	playsewithpan SE_W207B, +63
-	delay 0x14
-	createsprite gUnknown_0859368C, 0x82, 1, 20, -28
+	delay 20
+	createsprite gUnknown_0859368C, 130, 1, 20, -28
 	playsewithpan SE_W207B, +63
 	end
 
 Move_MEMENTO:
-	setalpha 0x1000
-	delay 0x1
-	createvisualtask sub_81143C0, 0x2
-	delay 0x1
-	createvisualtask sub_8113BAC, 0x5
+	setalpha 0, 16
+	delay 1
+	createvisualtask sub_81143C0, 2
+	delay 1
+	createvisualtask sub_8113BAC, 5
 	playsewithpan SE_W060, -64
-	delay 0x30
+	delay 48
 	playsewithpan SE_W060B, -64
 	waitforvisualfinish
-	createvisualtask sub_8114470, 0x2
-	delay 0xC
-	setalpha 0x1000
-	delay 0x1
+	createvisualtask sub_8114470, 2
+	delay 12
+	setalpha 0, 16
+	delay 1
 	monbg_22 ANIM_TARGET
-	createvisualtask sub_8113E78, 0x5
+	createvisualtask sub_8113E78, 5
 	playsewithpan SE_W060, +63
 	waitforvisualfinish
 	clearmonbg_23 ANIM_TARGET
-	delay 0x1
+	delay 1
 	blendoff
-	delay 0x1
+	delay 1
 	end
 
 Move_FACADE:
-	loadspritegfx 0x2803
-	createvisualtask sub_815DCA4, 0x2, 0, 3
-	createvisualtask sub_815DF0C, 0x2, 0, 72
-	loopsewithpan SE_W207, -64, 0x18, 0x3
+	loadspritegfx ANIM_TAG_243
+	createvisualtask sub_815DCA4, 2, 0, 3
+	createvisualtask sub_815DF0C, 2, 0, 72
+	loopsewithpan SE_W207, -64, 24, 3
 	end
 
 Move_SMELLING_SALT:
-	loadspritegfx 0x2807
-	loadspritegfx 0x280F
-	createsprite gUnknown_085CE864, 0x82, 1, 0, 2
-	createsprite gUnknown_085CE864, 0x82, 1, 1, 2
-	delay 0x20
-	createvisualtask sub_815E840, 0x3, 1, 2
-	loopsewithpan SE_W003, +63, 0xC, 0x2
+	loadspritegfx ANIM_TAG_HAND
+	loadspritegfx ANIM_TAG_255
+	createsprite gUnknown_085CE864, 130, 1, 0, 2
+	createsprite gUnknown_085CE864, 130, 1, 1, 2
+	delay 32
+	createvisualtask sub_815E840, 3, 1, 2
+	loopsewithpan SE_W003, +63, 12, 2
 	waitforvisualfinish
-	delay 0x4
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 6, 2
-	createsprite gUnknown_085CE894, 0x82, 1, 8, 3
-	loopsewithpan SE_W207B, +63, 0x10, 0x3
+	delay 4
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2
+	createsprite gUnknown_085CE894, 130, 1, 8, 3
+	loopsewithpan SE_W207B, +63, 16, 3
 	end
 
 Move_FOLLOW_ME:
-	loadspritegfx 0x2750
-	createsprite gUnknown_085931D4, 0x2, 0
+	loadspritegfx ANIM_TAG_064
+	createsprite gUnknown_085931D4, 2, 0
 	playsewithpan SE_W039, -64
-	delay 0x12
+	delay 18
 	playsewithpan SE_W213, -64
-	delay 0x47
-	loopsewithpan SE_W039, -64, 0x16, 0x3
+	delay 71
+	loopsewithpan SE_W039, -64, 22, 3
 	end
 
 Move_CHARGE:
-	loadspritegfx 0x27E3
-	loadspritegfx 0x27E4
-	loadspritegfx 0x27E5
+	loadspritegfx ANIM_TAG_211
+	loadspritegfx ANIM_TAG_212
+	loadspritegfx ANIM_TAG_213
 	monbg ANIM_ATTACKER
-	setalpha 0x80C
-	createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK
+	setalpha 12, 8
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK
 	waitforvisualfinish
-	createvisualtask sub_810AAFC, 0x2, 0, 60, 2, 12
+	createvisualtask sub_810AAFC, 2, 0, 60, 2, 12
 	playsewithpan SE_W268, -64
-	delay 0x1E
+	delay 30
 	playsewithpan SE_W268, -64
-	delay 0x1E
+	delay 30
 	playsewithpan SE_W268, -64
-	createsprite gUnknown_0859595C, 0x2, 0
-	delay 0x19
+	createsprite gUnknown_0859595C, 2, 0
+	delay 25
 	playsewithpan SE_W268, -64
-	delay 0x14
+	delay 20
 	playsewithpan SE_W268, -64
-	delay 0xF
+	delay 15
 	playsewithpan SE_W268, -64
-	delay 0xA
-	delay 0x6
-	loopsewithpan SE_W268, -64, 0x6, 0x5
+	delay 10
+	delay 6
+	loopsewithpan SE_W268, -64, 6, 5
 	waitforvisualfinish
-	createsprite gUnknown_0859598C, 0x2, 0, 16, 16
-	delay 0x2
-	createsprite gUnknown_0859598C, 0x2, 0, -16, -16
+	createsprite gUnknown_0859598C, 2, 0, 16, 16
+	delay 2
+	createsprite gUnknown_0859598C, 2, 0, -16, -16
 	playsewithpan SE_W085B, -64
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB_BLACK
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB_BLACK
 	clearmonbg ANIM_ATTACKER
 	blendoff
 	end
 
 Move_TAUNT:
-	loadspritegfx 0x27E6
-	loadspritegfx 0x27E1
-	loadspritegfx 0x2767
-	createsprite gUnknown_08593114, 0xB, 0, 45
+	loadspritegfx ANIM_TAG_214
+	loadspritegfx ANIM_TAG_209
+	loadspritegfx ANIM_TAG_ANGER
+	createsprite gUnknown_08593114, 11, 0, 45
 	playsewithpan SE_W118, -64
-	delay 0x6
-	createsprite gUnknown_0859324C, 0xC, 0
-	delay 0x4
-	loopsewithpan SE_W039, -64, 0x10, 0x2
+	delay 6
+	createsprite gUnknown_0859324C, 12, 0
+	delay 4
+	loopsewithpan SE_W039, -64, 16, 2
 	waitforvisualfinish
-	delay 0x8
-	createsprite gUnknown_0859368C, 0x82, 1, -20, -28
+	delay 8
+	createsprite gUnknown_0859368C, 130, 1, -20, -28
 	playsewithpan SE_W207B, +63
 	waitforvisualfinish
-	delay 0xC
-	createsprite gUnknown_0859368C, 0x82, 1, 20, -28
+	delay 12
+	createsprite gUnknown_0859368C, 130, 1, 20, -28
 	playsewithpan SE_W207B, +63
 	end
 
 Move_HELPING_HAND:
-	loadspritegfx 0x2807
-	createvisualtask sub_815EC48, 0x5
-	createsprite gUnknown_085CE8AC, 0x28, 0
-	createsprite gUnknown_085CE8AC, 0x28, 1
-	delay 0x13
+	loadspritegfx ANIM_TAG_HAND
+	createvisualtask sub_815EC48, 5
+	createsprite gUnknown_085CE8AC, 40, 0
+	createsprite gUnknown_085CE8AC, 40, 1
+	delay 19
 	playsewithpan SE_W227, 0
-	createvisualtask sub_80D52D0, 0x2, 2, 2, 0, 5, 1
-	delay 0xE
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1
+	delay 14
 	playsewithpan SE_W227, 0
-	createvisualtask sub_80D52D0, 0x2, 2, 2, 0, 5, 1
-	delay 0x14
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1
+	delay 20
 	playsewithpan SE_W227, 0
-	createvisualtask sub_80D52D0, 0x2, 2, 3, 0, 10, 1
-	createvisualtask sub_80A7B98, 0x2, 2, RGB_YELLOW, 12, 1, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 3, 0, 10, 1
+	createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATK_PARTNER, RGB_YELLOW, 12, 1, 1
 	end
 
 Move_ASSIST:
-	loadspritegfx 0x280C
-	createsprite gUnknown_085CE804, 0x32, 112, -16, 140, 128, 36
-	delay 0x2
-	createsprite gUnknown_085CE804, 0x32, 208, 128, -16, 48, 36
+	loadspritegfx ANIM_TAG_252
+	createsprite gUnknown_085CE804, 50, 112, -16, 140, 128, 36
+	delay 2
+	createsprite gUnknown_085CE804, 50, 208, 128, -16, 48, 36
 	playsewithpan SE_W010, 0
-	delay 0x2
-	createsprite gUnknown_085CE804, 0x32, -16, 112, 256, -16, 36
+	delay 2
+	createsprite gUnknown_085CE804, 50, -16, 112, 256, -16, 36
 	playsewithpan SE_W010, 0
-	delay 0x2
-	createsprite gUnknown_085CE804, 0x32, 108, 128, 84, -16, 36
+	delay 2
+	createsprite gUnknown_085CE804, 50, 108, 128, 84, -16, 36
 	playsewithpan SE_W010, 0
-	delay 0x2
-	createsprite gUnknown_085CE804, 0x32, -16, 56, 256, 56, 36
+	delay 2
+	createsprite gUnknown_085CE804, 50, -16, 56, 256, 56, 36
 	playsewithpan SE_W010, 0
 	end
 
 Move_SUPERPOWER:
-	loadspritegfx 0x27E4
-	loadspritegfx 0x2810
-	loadspritegfx 0x2811
+	loadspritegfx ANIM_TAG_212
+	loadspritegfx ANIM_TAG_256
+	loadspritegfx ANIM_TAG_257
 	monbg ANIM_ATK_PARTNER
 	monbgprio_28 ANIM_ATTACKER
-	setalpha 0x80C
-	createsprite gUnknown_08595FEC, 0x82, 0
+	setalpha 12, 8
+	createsprite gUnknown_08595FEC, 130, 0
 	playsewithpan SE_W025, -64
-	delay 0x14
-	createsprite gUnknown_085972D8, 0x2, 4, 1, 180, 1
-	createvisualtask sub_8159244, 0x5, 234, 0
-	delay 0x28
-	createsprite gUnknown_08596004, 0x29, 200, 96, 1, 120
-	delay 0x8
-	createsprite gUnknown_08596004, 0x29, 20, 248, 4, 112
-	delay 0x8
-	createsprite gUnknown_08596004, 0x29, 130, 160, 2, 104
-	delay 0x8
-	createsprite gUnknown_08596004, 0x29, 160, 192, 0, 96
-	delay 0x8
-	createsprite gUnknown_08596004, 0x29, 60, 288, 3, 88
-	delay 0x4A
-	createsprite gUnknown_0859601C, 0x83, 0
+	delay 20
+	createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 180, 1
+	createvisualtask sub_8159244, 5, 234, 0
+	delay 40
+	createsprite gUnknown_08596004, 41, 200, 96, 1, 120
+	delay 8
+	createsprite gUnknown_08596004, 41, 20, 248, 4, 112
+	delay 8
+	createsprite gUnknown_08596004, 41, 130, 160, 2, 104
+	delay 8
+	createsprite gUnknown_08596004, 41, 160, 192, 0, 96
+	delay 8
+	createsprite gUnknown_08596004, 41, 60, 288, 3, 88
+	delay 74
+	createsprite gUnknown_0859601C, 131, 0
 	playsewithpan SE_W207, -64
-	delay 0x10
-	createvisualtask sub_80D52D0, 0x2, 1, 8, 0, 16, 1
+	delay 16
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 16, 1
 	playsewithpan SE_W025B, +63
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
-	delay 0x1
+	delay 1
 	end
 
 Move_RECYCLE:
-	loadspritegfx 0x2826
+	loadspritegfx ANIM_TAG_RECYCLE
 	monbg ANIM_ATTACKER
-	setalpha 0x1000
-	delay 0x1
-	createsprite gUnknown_085CE9B0, 0x2
-	loopsewithpan SE_W036, -64, 0x18, 0x3
+	setalpha 0, 16
+	delay 1
+	createsprite gUnknown_085CE9B0, 2
+	loopsewithpan SE_W036, -64, 24, 3
 	waitforvisualfinish
-	createvisualtask sub_80A7B98, 0x5, 0, RGB_WHITE, 12, 2, 1
+	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1
 	playsewithpan SE_W036, -64
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_ATTACKER
-	delay 0x1
+	delay 1
 	end
 
 Move_BRICK_BREAK:
-	loadspritegfx 0x27B7
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
-	loadspritegfx 0x27E0
-	choosetwoturnanim AnimScript_82CE0A7, AnimScript_82CE154
-
-AnimScript_82CE0A7:
+	loadspritegfx ANIM_TAG_167
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_208
+	choosetwoturnanim BrickBreakNormal, BrickBreakShatteredWall
+BrickBreakNormal:
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	createsprite gUnknown_0857FE28, 0x2, 3, 8
-	delay 0x4
-	delay 0x1
-	createsprite gUnknown_08597358, 0x3, -18, -18, 1, 1
+	setalpha 12, 8
+	createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8
+	delay 4
+	delay 1
+	createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1
 	playsewithpan SE_W233, +63
-	delay 0x14
-	createsprite gUnknown_0857FE28, 0x2, 3, 8
-	delay 0x5
-	createsprite gUnknown_08597358, 0x3, 18, 18, 1, 1
+	delay 20
+	createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8
+	delay 5
+	createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1
 	playsewithpan SE_W233, +63
-	delay 0x14
-	createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3
-	createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, RGB_BLACK
-	delay 0x25
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1
-	createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0
+	delay 20
+	createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK
+	delay 37
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
+	createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0
 	playsewithpan SE_W233B, +63
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, RGB_BLACK
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, RGB_BLACK
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	end
-
-AnimScript_82CE154:
+BrickBreakShatteredWall:
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	createsprite gUnknown_0857FE28, 0x2, 3, 8
-	delay 0x4
-	createsprite gUnknown_08595F90, 0x3, 1, 0, 0, 90, 10
-	delay 0x1
-	createsprite gUnknown_08597358, 0x3, -18, -18, 1, 1
+	setalpha 12, 8
+	createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8
+	delay 4
+	createsprite gUnknown_08595F90, 3, 1, 0, 0, 90, 10
+	delay 1
+	createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1
 	playsewithpan SE_W233, +63
-	delay 0x14
-	createsprite gUnknown_0857FE28, 0x2, 3, 8
-	delay 0x5
-	createsprite gUnknown_08597358, 0x3, 18, 18, 1, 1
+	delay 20
+	createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8
+	delay 5
+	createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1
 	playsewithpan SE_W233, +63
-	delay 0x14
-	createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3
-	createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, RGB_BLACK
-	delay 0x25
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1
-	createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0
+	delay 20
+	createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK
+	delay 37
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
+	createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0
 	playsewithpan SE_W233B, +63
 	waitforvisualfinish
-	createsprite gUnknown_08595FA8, 0x2, 1, 0, -8, -12
-	createsprite gUnknown_08595FA8, 0x2, 1, 1, 8, -12
-	createsprite gUnknown_08595FA8, 0x2, 1, 2, -8, 12
-	createsprite gUnknown_08595FA8, 0x2, 1, 3, 8, 12
+	createsprite gUnknown_08595FA8, 2, 1, 0, -8, -12
+	createsprite gUnknown_08595FA8, 2, 1, 1, 8, -12
+	createsprite gUnknown_08595FA8, 2, 1, 2, -8, 12
+	createsprite gUnknown_08595FA8, 2, 1, 3, 8, 12
 	playsewithpan SE_W280, +63
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, RGB_BLACK
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, RGB_BLACK
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	end
 
 Move_YAWN:
-	loadspritegfx 0x2802
-	createvisualtask sub_815D64C, 0x2, 0
+	loadspritegfx ANIM_TAG_242
+	createvisualtask sub_815D64C, 2, 0
 	playsewithpan SE_W281, -64
 	waitforvisualfinish
-	createsprite gUnknown_085CE68C, 0x85, 2
+	createsprite gUnknown_085CE68C, 133, 2
 	playsewithpan SE_W255, -64
-	delay 0x4
-	createsprite gUnknown_085CE68C, 0x85, 1
-	delay 0x4
-	createsprite gUnknown_085CE68C, 0x85, 0
+	delay 4
+	createsprite gUnknown_085CE68C, 133, 1
+	delay 4
+	createsprite gUnknown_085CE68C, 133, 0
 	waitforvisualfinish
-	createvisualtask sub_815D64C, 0x2, 1
+	createvisualtask sub_815D64C, 2, 1
 	playsewithpan SE_W281, +63
 	end
 
 Move_ENDEAVOR:
-	loadspritegfx 0x2803
-	loadspritegfx 0x2797
-	createvisualtask sub_815DCA4, 0x2, 0, 2
-	loopsewithpan SE_W039, -64, 0x18, 0x2
-	createvisualtask sub_80A7B98, 0x5, 0, RGB(31, 21, 0), 12, 1, 2
-	delay 0x6
-	createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0
-	createsprite gUnknown_08597358, 0x82, 12, -12, 1, 2
+	loadspritegfx ANIM_TAG_243
+	loadspritegfx ANIM_TAG_135
+	createvisualtask sub_815DCA4, 2, 0, 2
+	loopsewithpan SE_W039, -64, 24, 2
+	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2
+	delay 6
+	createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0
+	createsprite gBasicHitSplatSpriteTemplate, 130, 12, -12, 1, 2
 	playsewithpan SE_W003, +63
-	delay 0x18
-	createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0
-	createsprite gUnknown_08597358, 0x82, -12, 12, 1, 2
+	delay 24
+	createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0
+	createsprite gBasicHitSplatSpriteTemplate, 130, -12, 12, 1, 2
 	playsewithpan SE_W004, +63
 	end
 
 Move_ERUPTION:
-	loadspritegfx 0x27D9
-	createsprite gUnknown_08597274, 0x2, 31, 2, 0, 4, RGB_RED
-	waitforvisualfinish
-	createvisualtask sub_8109460, 0x2
-	waitplaysewithpan SE_W153, -64, 0x3C
-	waitforvisualfinish
-	createvisualtask sub_8109460, 0x2
-	waitplaysewithpan SE_W153, -64, 0x3C
-	waitforvisualfinish
-	delay 0x1E
-	createsprite gUnknown_085955E8, 0x28, 200, -32, 0, 100, 0
-	createsprite gUnknown_085955E8, 0x28, 30, -32, 16, 90, 1
-	createsprite gUnknown_085955E8, 0x28, 150, -32, 32, 60, 2
-	createsprite gUnknown_085955E8, 0x28, 90, -32, 48, 80, 3
-	createsprite gUnknown_085955E8, 0x28, 110, -32, 64, 50, 0
-	createsprite gUnknown_085955E8, 0x28, 60, -32, 80, 70, 1
-	delay 0x16
-	createvisualtask sub_81152DC, 0x5, 5, 8, 60
-	createvisualtask sub_81152DC, 0x5, 4, 8, 60
-	loopsewithpan SE_W088, +63, 0x10, 0xC
-	delay 0x50
-	createsprite gUnknown_08597274, 0x28, 31, 4, 4, 0, RGB_RED
+	loadspritegfx ANIM_TAG_201
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 2, 0, 4, RGB_RED
+	waitforvisualfinish
+	createvisualtask sub_8109460, 2
+	waitplaysewithpan SE_W153, -64, 60
+	waitforvisualfinish
+	createvisualtask sub_8109460, 2
+	waitplaysewithpan SE_W153, -64, 60
+	waitforvisualfinish
+	delay 30
+	createsprite gUnknown_085955E8, 40, 200, -32, 0, 100, 0
+	createsprite gUnknown_085955E8, 40, 30, -32, 16, 90, 1
+	createsprite gUnknown_085955E8, 40, 150, -32, 32, 60, 2
+	createsprite gUnknown_085955E8, 40, 90, -32, 48, 80, 3
+	createsprite gUnknown_085955E8, 40, 110, -32, 64, 50, 0
+	createsprite gUnknown_085955E8, 40, 60, -32, 80, 70, 1
+	delay 22
+	createvisualtask sub_81152DC, 5, 5, 8, 60
+	createvisualtask sub_81152DC, 5, 4, 8, 60
+	loopsewithpan SE_W088, +63, 16, 12
+	delay 80
+	createsprite gSimplePaletteBlendSpriteTemplate, 40, 31, 4, 4, 0, RGB_RED
 	end
 
 Move_SKILL_SWAP:
-	loadspritegfx 0x280B
-	call AnimScript_82D7CD1
-	createvisualtask sub_810FBF0, 0x3, 1
-	createvisualtask sub_80A7B98, 0x5, 1, RGB_WHITE, 12, 3, 1
-	loopsewithpan SE_W179, -64, 0x18, 0x3
-	delay 0x10
-	createvisualtask sub_810FBF0, 0x3, 0
-	createvisualtask sub_80A7B98, 0x5, 0, RGB_WHITE, 12, 3, 1
+	loadspritegfx ANIM_TAG_251
+	call SetPsychicBackground
+	createvisualtask sub_810FBF0, 3, 1
+	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 3, 1
+	loopsewithpan SE_W179, -64, 24, 3
+	delay 16
+	createvisualtask sub_810FBF0, 3, 0
+	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 3, 1
 	waitforvisualfinish
-	call AnimScript_82D7CDD
+	call UnsetPsychicBackground
 	end
 
 Move_IMPRISON:
-	loadspritegfx 0x2809
-	loadspritegfx 0x280A
-	call AnimScript_82D7CD1
+	loadspritegfx ANIM_TAG_249
+	loadspritegfx ANIM_TAG_X_SIGN
+	call SetPsychicBackground
 	monbg ANIM_DEF_PARTNER
-	createvisualtask sub_810F940, 0x5
-	delay 0x8
-	loopsewithpan SE_W030, -64, 0x8, 0x5
+	createvisualtask sub_810F940, 5
+	delay 8
+	loopsewithpan SE_W030, -64, 8, 5
 	waitforvisualfinish
-	delay 0x4
-	createsprite gUnknown_085967AC, 0x5, 0, 40
-	createvisualtask sub_81152DC, 0x5, 4, 1, 10
+	delay 4
+	createsprite gUnknown_085967AC, 5, 0, 40
+	createvisualtask sub_81152DC, 5, 4, 1, 10
 	playsewithpan SE_W063, -64
 	clearmonbg ANIM_DEF_PARTNER
-	call AnimScript_82D7CDD
+	call UnsetPsychicBackground
 	end
 
 Move_GRUDGE:
-	loadspritegfx 0x280D
+	loadspritegfx ANIM_TAG_253
 	monbg ANIM_ATTACKER
 	monbgprio_29
 	fadetobg BG_GHOST
 	playsewithpan SE_W060, -64
 	waitbgfadein
-	createvisualtask sub_8112C6C, 0x3
-	loopsewithpan SE_W052, -64, 0x10, 0x4
-	delay 0xA
-	delay 0x50
+	createvisualtask sub_8112C6C, 3
+	loopsewithpan SE_W052, -64, 16, 4
+	delay 10
+	delay 80
 	playsewithpan SE_W171, +63
 	waitforvisualfinish
 	restorebg
@@ -3933,256 +3870,256 @@ Move_GRUDGE:
 Move_CAMOUFLAGE:
 	monbg ANIM_ATK_PARTNER
 	monbgprio_28 ANIM_ATTACKER
-	setalpha 0x10
-	createvisualtask sub_811675C, 0x5, 2, 3, 0, 14
-	delay 0x10
-	createvisualtask sub_81136E8, 0x2, 4
+	setalpha 16, 0
+	createvisualtask sub_811675C, 5, 2, 3, 0, 14
+	delay 16
+	createvisualtask sub_81136E8, 2, 4
 	playsewithpan SE_W185, -64
 	waitforvisualfinish
-	delay 0x8
-	createvisualtask sub_811675C, 0x5, 2, 0, 0, 0
+	delay 8
+	createvisualtask sub_811675C, 5, 2, 0, 0, 0
 	waitforvisualfinish
-	createvisualtask sub_81137E4, 0x2, 1
+	createvisualtask sub_81137E4, 2, 1
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_ATK_PARTNER
 	end
 
 Move_TAIL_GLOW:
-	loadspritegfx 0x27E4
+	loadspritegfx ANIM_TAG_212
 	monbg ANIM_ATTACKER
-	setalpha 0x80C
-	createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK
+	setalpha 12, 8
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK
 	waitforvisualfinish
-	createsprite gUnknown_08596AC8, 0x42, 0
-	delay 0x12
-	loopsewithpan SE_W234, -64, 0x10, 0x6
+	createsprite gUnknown_08596AC8, 66, 0
+	delay 18
+	loopsewithpan SE_W234, -64, 16, 6
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB_BLACK
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB_BLACK
 	clearmonbg ANIM_ATTACKER
 	blendoff
-	delay 0x1
+	delay 1
 	end
 
 Move_LUSTER_PURGE:
-	loadspritegfx 0x281B
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_267
+	loadspritegfx ANIM_TAG_135
 	fadetobg BG_PSYCHIC
 	waitbgfadeout
-	createvisualtask sub_815A5C8, 0x5
+	createvisualtask sub_815A5C8, 5
 	waitbgfadein
 	monbg ANIM_ATTACKER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W076, -64
-	createsprite gUnknown_08596898, 0x29, 0, 0, 0, 0
-	delay 0x14
-	createvisualtask sub_8116664, 0x5, 5, 2, 0, 16, -1
-	createvisualtask sub_8116848, 0x5, 10267, 2, 0, 16, -1
-	waitforvisualfinish
-	createvisualtask sub_8116848, 0x5, 10135, 0, 12, 12, 23552
-	waitforvisualfinish
-	createsprite gUnknown_085973A0, 0x83, 1, 2
-	createvisualtask sub_8159210, 0x5, 215, 63
-	delay 0x3
-	createsprite gUnknown_085973A0, 0x83, 1, 2
-	createvisualtask sub_8159210, 0x5, 215, 63
-	delay 0x3
-	createsprite gUnknown_085973A0, 0x83, 1, 2
-	createvisualtask sub_8159210, 0x5, 215, 63
-	delay 0x3
-	createsprite gUnknown_085973A0, 0x83, 1, 2
-	createvisualtask sub_8159210, 0x5, 215, 63
-	delay 0x3
-	createsprite gUnknown_085973A0, 0x83, 1, 2
-	createvisualtask sub_8159210, 0x5, 215, 63
-	delay 0x3
-	createsprite gUnknown_085973A0, 0x83, 1, 2
-	createvisualtask sub_8159210, 0x5, 215, 63
-	waitforvisualfinish
-	createvisualtask sub_8116664, 0x5, 5, 2, 16, 0, -1
-	createvisualtask sub_81152DC, 0x5, 1, 5, 14
+	createsprite gUnknown_08596898, 41, 0, 0, 0, 0
+	delay 20
+	createvisualtask sub_8116664, 5, 5, 2, 0, 16, RGB_WHITEALPHA
+	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_267, 2, 0, 16, RGB_WHITEALPHA
+	waitforvisualfinish
+	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_135, 0, 12, 12, RGB(0, 0, 23)
+	waitforvisualfinish
+	createsprite gUnknown_085973A0, 131, 1, 2
+	createvisualtask sub_8159210, 5, 215, 63
+	delay 3
+	createsprite gUnknown_085973A0, 131, 1, 2
+	createvisualtask sub_8159210, 5, 215, 63
+	delay 3
+	createsprite gUnknown_085973A0, 131, 1, 2
+	createvisualtask sub_8159210, 5, 215, 63
+	delay 3
+	createsprite gUnknown_085973A0, 131, 1, 2
+	createvisualtask sub_8159210, 5, 215, 63
+	delay 3
+	createsprite gUnknown_085973A0, 131, 1, 2
+	createvisualtask sub_8159210, 5, 215, 63
+	delay 3
+	createsprite gUnknown_085973A0, 131, 1, 2
+	createvisualtask sub_8159210, 5, 215, 63
+	waitforvisualfinish
+	createvisualtask sub_8116664, 5, 5, 2, 16, 0, RGB_WHITEALPHA
+	createvisualtask sub_81152DC, 5, 1, 5, 14
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	blendoff
-	call AnimScript_82D7CDD
+	call UnsetPsychicBackground
 	end
 
 Move_MIST_BALL:
-	loadspritegfx 0x27AB
-	loadspritegfx 0x281E
-	delay 0x0
+	loadspritegfx ANIM_TAG_155
+	loadspritegfx ANIM_TAG_270
+	delay 0
 	playsewithpan SE_W081, -64
-	createsprite gUnknown_08595C70, 0x80, 0, 0, 0, 0, 30, 0
+	createsprite gUnknown_08595C70, 128, 0, 0, 0, 0, 30, 0
 	waitforvisualfinish
 	playsewithpan SE_W028, +63
-	createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 10, 0
-	createsprite gUnknown_0859728C, 0x0, 1, 1, 1, 32279, 16, 0x7FFF, 16
-	delay 0x0
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 10, 0
+	createsprite gComplexPaletteBlendSpriteTemplate, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16
+	delay 0
 	playsewithpan SE_W114, 0
-	createvisualtask sub_810C324, 0x5
-	createvisualtask sub_8116620, 0xA, 4, 3, 0, 16, 0x7FFF
-	delay 0x8
-	createvisualtask sub_80D51AC, 0x2, 1, 4, 0, 70, 0
-	delay 0x46
-	createvisualtask sub_8116620, 0xA, 4, 2, 16, 0, 0x7FFF
+	createvisualtask sub_810C324, 5
+	createvisualtask sub_8116620, 10, 4, 3, 0, 16, RGB_WHITE
+	delay 8
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 70, 0
+	delay 70
+	createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE
 	end
 
 Move_FEATHER_DANCE:
-	loadspritegfx 0x281E
+	loadspritegfx ANIM_TAG_270
 	monbg ANIM_DEF_PARTNER
 	monbgprio_29
 	playsewithpan SE_W080, +63
-	delay 0x0
-	createsprite gUnknown_08596388, 0x80, 0, -16, 64, 2, 104, 11304, 32, 1
-	delay 0x6
-	createsprite gUnknown_08596388, 0x80, 0, -16, 32, 2, 104, 11304, 32, 1
-	createsprite gUnknown_08596388, 0x80, 0, -16, 0, 2, 104, 11304, 32, 1
-	delay 0x6
-	createsprite gUnknown_08596388, 0x80, 0, -16, 224, 2, 104, 11304, 32, 1
-	createsprite gUnknown_08596388, 0x80, 0, -16, 128, 2, 104, 11304, 32, 1
-	delay 0x6
-	createsprite gUnknown_08596388, 0x80, 0, -16, 192, 2, 104, 11304, 32, 1
-	createsprite gUnknown_08596388, 0x80, 0, -16, 160, 2, 104, 11304, 32, 1
-	delay 0x6
-	createsprite gUnknown_08596388, 0x80, 0, -16, 96, 2, 104, 11304, 32, 1
+	delay 0
+	createsprite gUnknown_08596388, 128, 0, -16, 64, 2, 104, 11304, 32, 1
+	delay 6
+	createsprite gUnknown_08596388, 128, 0, -16, 32, 2, 104, 11304, 32, 1
+	createsprite gUnknown_08596388, 128, 0, -16, 0, 2, 104, 11304, 32, 1
+	delay 6
+	createsprite gUnknown_08596388, 128, 0, -16, 224, 2, 104, 11304, 32, 1
+	createsprite gUnknown_08596388, 128, 0, -16, 128, 2, 104, 11304, 32, 1
+	delay 6
+	createsprite gUnknown_08596388, 128, 0, -16, 192, 2, 104, 11304, 32, 1
+	createsprite gUnknown_08596388, 128, 0, -16, 160, 2, 104, 11304, 32, 1
+	delay 6
+	createsprite gUnknown_08596388, 128, 0, -16, 96, 2, 104, 11304, 32, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
 Move_TEETER_DANCE:
-	loadspritegfx 0x2758
-	loadspritegfx 0x2759
-	createvisualtask sub_8160164, 0x5
-	createsprite gUnknown_08593050, 0x2, 0, 16, -2
+	loadspritegfx ANIM_TAG_MUSIC_NOTES2
+	loadspritegfx ANIM_TAG_DUCK
+	createvisualtask sub_8160164, 5
+	createsprite gUnknown_08593050, 2, 0, 16, -2
 	playsewithpan SE_W298, -64
-	delay 0x18
-	createsprite gUnknown_08593050, 0x2, 0, 0, -2
+	delay 24
+	createsprite gUnknown_08593050, 2, 0, 0, -2
 	playsewithpan SE_W298, -64
-	delay 0x18
-	createsprite gUnknown_08593050, 0x2, 0, -16, -2
+	delay 24
+	createsprite gUnknown_08593050, 2, 0, -16, -2
 	playsewithpan SE_W298, -64
-	delay 0x18
-	createsprite gUnknown_08593050, 0x2, 1, -8, -2
+	delay 24
+	createsprite gUnknown_08593050, 2, 1, -8, -2
 	playsewithpan SE_W298, -64
-	delay 0x18
-	createsprite gUnknown_08593050, 0x2, 2, 8, -2
+	delay 24
+	createsprite gUnknown_08593050, 2, 2, 8, -2
 	playsewithpan SE_W298, -64
 	end
 
 Move_MUD_SPORT:
-	loadspritegfx 0x275A
-	createvisualtask sub_8104938, 0x2, 0, 6
-	delay 0x18
-	createsprite gUnknown_085971E4, 0x82, 0, -4, -16
-	createsprite gUnknown_085971E4, 0x82, 0, 4, -12
+	loadspritegfx ANIM_TAG_074
+	createvisualtask sub_8104938, 2, 0, 6
+	delay 24
+	createsprite gUnknown_085971E4, 130, 0, -4, -16
+	createsprite gUnknown_085971E4, 130, 0, 4, -12
 	playsewithpan SE_W091, -64
-	delay 0x20
-	createsprite gUnknown_085971E4, 0x82, 0, -3, -12
-	createsprite gUnknown_085971E4, 0x82, 0, 5, -14
+	delay 32
+	createsprite gUnknown_085971E4, 130, 0, -3, -12
+	createsprite gUnknown_085971E4, 130, 0, 5, -14
 	playsewithpan SE_W091, -64
-	delay 0x20
-	createsprite gUnknown_085971E4, 0x82, 0, -5, -18
-	createsprite gUnknown_085971E4, 0x82, 0, 3, -14
+	delay 32
+	createsprite gUnknown_085971E4, 130, 0, -5, -18
+	createsprite gUnknown_085971E4, 130, 0, 3, -14
 	playsewithpan SE_W091, -64
-	delay 0x10
-	createsprite gUnknown_085971E4, 0x82, 1, 220, 60
-	waitplaysewithpan SE_W145B, 0, 0xF
-	delay 0x2
-	createsprite gUnknown_085971E4, 0x82, 1, 60, 100
-	waitplaysewithpan SE_W145B, 0, 0x19
-	delay 0x2
-	createsprite gUnknown_085971E4, 0x82, 1, 140, 55
-	waitplaysewithpan SE_W145B, 0, 0xE
-	delay 0x2
-	createsprite gUnknown_085971E4, 0x82, 1, 180, 50
-	waitplaysewithpan SE_W145B, 0, 0xA
-	delay 0x2
-	createsprite gUnknown_085971E4, 0x82, 1, 20, 90
-	waitplaysewithpan SE_W145B, 0, 0x16
-	delay 0x2
-	createsprite gUnknown_085971E4, 0x82, 1, 90, 90
-	waitplaysewithpan SE_W145B, 0, 0x16
-	delay 0x2
-	createsprite gUnknown_085971E4, 0x82, 1, 160, 60
-	waitplaysewithpan SE_W145B, 0, 0xF
-	delay 0x2
-	createsprite gUnknown_085971E4, 0x82, 1, 30, 90
-	waitplaysewithpan SE_W145B, 0, 0x16
-	delay 0x2
-	createsprite gUnknown_085971E4, 0x82, 1, 120, 60
-	waitplaysewithpan SE_W145B, 0, 0xF
-	delay 0x2
-	createsprite gUnknown_085971E4, 0x82, 1, 200, 40
-	waitplaysewithpan SE_W145B, 0, 0xA
+	delay 16
+	createsprite gUnknown_085971E4, 130, 1, 220, 60
+	waitplaysewithpan SE_W145B, 0, 15
+	delay 2
+	createsprite gUnknown_085971E4, 130, 1, 60, 100
+	waitplaysewithpan SE_W145B, 0, 25
+	delay 2
+	createsprite gUnknown_085971E4, 130, 1, 140, 55
+	waitplaysewithpan SE_W145B, 0, 14
+	delay 2
+	createsprite gUnknown_085971E4, 130, 1, 180, 50
+	waitplaysewithpan SE_W145B, 0, 10
+	delay 2
+	createsprite gUnknown_085971E4, 130, 1, 20, 90
+	waitplaysewithpan SE_W145B, 0, 22
+	delay 2
+	createsprite gUnknown_085971E4, 130, 1, 90, 90
+	waitplaysewithpan SE_W145B, 0, 22
+	delay 2
+	createsprite gUnknown_085971E4, 130, 1, 160, 60
+	waitplaysewithpan SE_W145B, 0, 15
+	delay 2
+	createsprite gUnknown_085971E4, 130, 1, 30, 90
+	waitplaysewithpan SE_W145B, 0, 22
+	delay 2
+	createsprite gUnknown_085971E4, 130, 1, 120, 60
+	waitplaysewithpan SE_W145B, 0, 15
+	delay 2
+	createsprite gUnknown_085971E4, 130, 1, 200, 40
+	waitplaysewithpan SE_W145B, 0, 10
 	end
 
 Move_NEEDLE_ARM:
-	loadspritegfx 0x281A
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
-	loopsewithpan SE_W030, +63, 0x2, 0x10
-	createsprite gUnknown_08592888, 0x82, 1, 0, 0, -32, 16
-	delay 0x2
-	createsprite gUnknown_08592888, 0x82, 1, 0, 22, -22, 16
-	delay 0x2
-	createsprite gUnknown_08592888, 0x82, 1, 0, 30, 0, 16
-	delay 0x2
-	createsprite gUnknown_08592888, 0x82, 1, 0, 20, 20, 16
-	delay 0x2
-	createsprite gUnknown_08592888, 0x82, 1, 0, 0, 28, 16
-	delay 0x2
-	createsprite gUnknown_08592888, 0x82, 1, 0, -19, 19, 16
-	delay 0x2
-	createsprite gUnknown_08592888, 0x82, 1, 0, -27, 0, 16
-	delay 0x2
-	createsprite gUnknown_08592888, 0x82, 1, 0, -18, -18, 16
-	delay 0x2
-	createsprite gUnknown_08592888, 0x82, 1, 0, 0, -25, 16
-	delay 0x2
-	createsprite gUnknown_08592888, 0x82, 1, 0, 17, -17, 16
-	delay 0x2
-	createsprite gUnknown_08592888, 0x82, 1, 0, 23, 0, 16
-	delay 0x2
-	createsprite gUnknown_08592888, 0x82, 1, 0, 16, 16, 16
-	waitforvisualfinish
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 18, 1
-	createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1
-	createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0
+	loadspritegfx ANIM_TAG_266
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
+	loopsewithpan SE_W030, +63, 2, 16
+	createsprite gUnknown_08592888, 130, 1, 0, 0, -32, 16
+	delay 2
+	createsprite gUnknown_08592888, 130, 1, 0, 22, -22, 16
+	delay 2
+	createsprite gUnknown_08592888, 130, 1, 0, 30, 0, 16
+	delay 2
+	createsprite gUnknown_08592888, 130, 1, 0, 20, 20, 16
+	delay 2
+	createsprite gUnknown_08592888, 130, 1, 0, 0, 28, 16
+	delay 2
+	createsprite gUnknown_08592888, 130, 1, 0, -19, 19, 16
+	delay 2
+	createsprite gUnknown_08592888, 130, 1, 0, -27, 0, 16
+	delay 2
+	createsprite gUnknown_08592888, 130, 1, 0, -18, -18, 16
+	delay 2
+	createsprite gUnknown_08592888, 130, 1, 0, 0, -25, 16
+	delay 2
+	createsprite gUnknown_08592888, 130, 1, 0, 17, -17, 16
+	delay 2
+	createsprite gUnknown_08592888, 130, 1, 0, 23, 0, 16
+	delay 2
+	createsprite gUnknown_08592888, 130, 1, 0, 16, 16, 16
+	waitforvisualfinish
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1
+	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
+	createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0
 	playsewithpan SE_W233B, +63
-	createsprite gUnknown_08592888, 0x82, 1, 1, 0, -24, 10
-	createsprite gUnknown_08592888, 0x82, 1, 1, 17, -17, 10
-	createsprite gUnknown_08592888, 0x82, 1, 1, 24, 0, 10
-	createsprite gUnknown_08592888, 0x82, 1, 1, 17, 17, 10
-	createsprite gUnknown_08592888, 0x82, 1, 1, 0, 24, 10
-	createsprite gUnknown_08592888, 0x82, 1, 1, -17, 17, 10
-	createsprite gUnknown_08592888, 0x82, 1, 1, -24, 0, 10
-	createsprite gUnknown_08592888, 0x82, 1, 1, -17, -17, 10
+	createsprite gUnknown_08592888, 130, 1, 1, 0, -24, 10
+	createsprite gUnknown_08592888, 130, 1, 1, 17, -17, 10
+	createsprite gUnknown_08592888, 130, 1, 1, 24, 0, 10
+	createsprite gUnknown_08592888, 130, 1, 1, 17, 17, 10
+	createsprite gUnknown_08592888, 130, 1, 1, 0, 24, 10
+	createsprite gUnknown_08592888, 130, 1, 1, -17, 17, 10
+	createsprite gUnknown_08592888, 130, 1, 1, -24, 0, 10
+	createsprite gUnknown_08592888, 130, 1, 1, -17, -17, 10
 	end
 
 Move_SLACK_OFF:
-	loadspritegfx 0x272F
-	createvisualtask sub_8160544, 0x2, 0
+	loadspritegfx ANIM_TAG_BLUE_STAR
+	createvisualtask sub_8160544, 2, 0
 	playsewithpan SE_W281, -64
 	waitforvisualfinish
-	call AnimScript_82D79DF
+	call HealingEffect
 	waitforvisualfinish
 	end
 
 Move_CRUSH_CLAW:
-	loadspritegfx 0x27B7
-	loadspritegfx 0x2737
-	loadspritegfx 0x27E0
+	loadspritegfx ANIM_TAG_167
+	loadspritegfx ANIM_TAG_CLAW_SLASH
+	loadspritegfx ANIM_TAG_208
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	createsprite gUnknown_0857FE28, 0x2, 6, 4
-	delay 0x4
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 18, 1
-	createsprite gUnknown_08597138, 0x82, -10, -10, 0
-	createsprite gUnknown_08597138, 0x82, -10, 10, 0
+	setalpha 12, 8
+	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
+	delay 4
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1
+	createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0
+	createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0
 	playsewithpan SE_W013, +63
-	delay 0xC
-	createsprite gUnknown_08597138, 0x82, 10, -10, 1
-	createsprite gUnknown_08597138, 0x82, 10, 10, 1
+	delay 12
+	createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1
+	createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1
 	playsewithpan SE_W013, +63
 	waitforvisualfinish
 	blendoff
@@ -4191,189 +4128,189 @@ Move_CRUSH_CLAW:
 
 Move_AROMATHERAPY:
 	playsewithpan SE_W080, 0
-	loadspritegfx 0x27AF
-	loadspritegfx 0x27DB
-	loadspritegfx 0x2741
-	createsprite gUnknown_08597274, 0x0, 1, 0, 0, 7, RGB(13, 31, 12)
-	delay 0x1
+	loadspritegfx ANIM_TAG_159
+	loadspritegfx ANIM_TAG_203
+	loadspritegfx ANIM_TAG_SPARKLE
+	createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 0, 7, RGB(13, 31, 12)
+	delay 1
 	monbg ANIM_ATTACKER
-	delay 0x1
-	createsprite gUnknown_085927AC, 0x0, 24, 16, 0, 2, 2, 0, 0
-	createsprite gUnknown_085927AC, 0x42, 64, 24, 0, 3, 1, 1, 0
-	createsprite gUnknown_085927C4, 0x0, 16, 24, 0, 2, 1, 0, 0
-	delay 0x14
-	createsprite gUnknown_085927AC, 0x42, 48, 12, 0, 4, 3, 1, 0
-	createsprite gUnknown_085927AC, 0x0, 100, 16, 0, 3, 2, 0, 0
-	createsprite gUnknown_085927AC, 0x0, 74, 24, 180, 3, 2, 0, 0
-	delay 0xA
-	createsprite gUnknown_085927AC, 0x42, 80, 30, 0, 4, 1, 1, 0
-	createsprite gUnknown_085927AC, 0x0, 128, 12, 0, 3, 3, 0, 0
-	createsprite gUnknown_085927C4, 0x0, 90, 16, 0, 2, 1, 0, 0
+	delay 1
+	createsprite gUnknown_085927AC, 0, 24, 16, 0, 2, 2, 0, 0
+	createsprite gUnknown_085927AC, 66, 64, 24, 0, 3, 1, 1, 0
+	createsprite gUnknown_085927C4, 0, 16, 24, 0, 2, 1, 0, 0
+	delay 20
+	createsprite gUnknown_085927AC, 66, 48, 12, 0, 4, 3, 1, 0
+	createsprite gUnknown_085927AC, 0, 100, 16, 0, 3, 2, 0, 0
+	createsprite gUnknown_085927AC, 0, 74, 24, 180, 3, 2, 0, 0
+	delay 10
+	createsprite gUnknown_085927AC, 66, 80, 30, 0, 4, 1, 1, 0
+	createsprite gUnknown_085927AC, 0, 128, 12, 0, 3, 3, 0, 0
+	createsprite gUnknown_085927C4, 0, 90, 16, 0, 2, 1, 0, 0
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
-	delay 0x1
-	createsprite gUnknown_08597274, 0x0, 1, 0, 7, 0, RGB(13, 31, 12)
-	delay 0x1
+	delay 1
+	createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 7, 0, RGB(13, 31, 12)
+	delay 1
 	playsewithpan SE_W287, -64
-	createvisualtask sub_815DFCC, 0x2, 1
+	createvisualtask sub_815DFCC, 2, 1
 	waitforvisualfinish
 	playsewithpan SE_W234, -64
-	createsprite gUnknown_08592B94, 0x10, -15, 0, 0, 0, 32, 60, 1
-	delay 0x8
-	createsprite gUnknown_08592B94, 0x10, 12, -5, 0, 0, 32, 60, 1
+	createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1
+	delay 8
+	createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1
 	waitforvisualfinish
 	playsewithpan SE_REAPOKE, -64
-	createsprite gUnknown_08597274, 0x0, 43, 3, 10, 0, RGB(13, 31, 12)
-	createsprite gUnknown_08593868, 0x10, 0, 0, 0, 1
+	createsprite gSimplePaletteBlendSpriteTemplate, 0, 43, 3, 10, 0, RGB(13, 31, 12)
+	createsprite gUnknown_08593868, 16, 0, 0, 0, 1
 	waitforvisualfinish
 	end
 
 Move_FAKE_TEARS:
-	loadspritegfx 0x27AB
-	loadspritegfx 0x27E1
-	loadspritegfx 0x2758
-	createvisualtask sub_8116848, 0x5, 10155, 0, 4, 4, RGB(12, 11, 31)
-	waitforvisualfinish
-	createvisualtask sub_815C478, 0x5, 0, 2, 1
-	loopsewithpan SE_W039, -64, 0xC, 0x4
-	delay 0x8
-	createsprite gUnknown_085970E8, 0x2, 0, 0
-	createsprite gUnknown_085970E8, 0x2, 0, 1
-	delay 0x8
-	createsprite gUnknown_085970E8, 0x2, 0, 2
-	createsprite gUnknown_085970E8, 0x2, 0, 3
-	delay 0x8
-	createsprite gUnknown_085970E8, 0x2, 0, 0
-	createsprite gUnknown_085970E8, 0x2, 0, 1
-	delay 0x8
-	createsprite gUnknown_085970E8, 0x2, 0, 2
-	createsprite gUnknown_085970E8, 0x2, 0, 3
+	loadspritegfx ANIM_TAG_155
+	loadspritegfx ANIM_TAG_209
+	loadspritegfx ANIM_TAG_MUSIC_NOTES2
+	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_155, 0, 4, 4, RGB(12, 11, 31)
+	waitforvisualfinish
+	createvisualtask sub_815C478, 5, 0, 2, 1
+	loopsewithpan SE_W039, -64, 12, 4
+	delay 8
+	createsprite gUnknown_085970E8, 2, 0, 0
+	createsprite gUnknown_085970E8, 2, 0, 1
+	delay 8
+	createsprite gUnknown_085970E8, 2, 0, 2
+	createsprite gUnknown_085970E8, 2, 0, 3
+	delay 8
+	createsprite gUnknown_085970E8, 2, 0, 0
+	createsprite gUnknown_085970E8, 2, 0, 1
+	delay 8
+	createsprite gUnknown_085970E8, 2, 0, 2
+	createsprite gUnknown_085970E8, 2, 0, 3
 	waitforvisualfinish
 	end
 
 Move_AIR_CUTTER:
-	loadspritegfx 0x2713
-	loadspritegfx 0x279A
-	loadspritegfx 0x2797
-	delay 0x0
+	loadspritegfx ANIM_TAG_AIR_WAVE
+	loadspritegfx ANIM_TAG_138
+	loadspritegfx ANIM_TAG_135
+	delay 0
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	delay 0x0
-	createvisualtask sub_8103CF0, 0x2, 32, -24, 1536, 2, 128
+	setalpha 12, 8
+	delay 0
+	createvisualtask sub_8103CF0, 2, 32, -24, 1536, 2, 128
 	waitforvisualfinish
 	playsewithpan SE_W015, +63
-	createsprite gUnknown_08592A34, 0x2, 40, -32, 0, 2
-	delay 0x5
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1
-	createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 8, 1
+	createsprite gUnknown_08592A34, 2, 40, -32, 0, 2
+	delay 5
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_DEF_PARTNER
-	delay 0x0
+	delay 0
 	end
 
 Move_ODOR_SLEUTH:
 	monbg ANIM_TARGET
-	createvisualtask sub_815F620, 0x5
-	delay 0x18
-	createsprite gUnknown_0857FE28, 0x2, 3, 4
+	createvisualtask sub_815F620, 5
+	delay 24
+	createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4
 	playsewithpan SE_W207, -64
-	delay 0x6
-	createsprite gUnknown_0857FE28, 0x2, 3, 4
+	delay 6
+	createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4
 	playsewithpan SE_W207, -64
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
-	delay 0x1
-	createsprite gUnknown_0859728C, 0x2, 1, 3, 1, -1, 16, -1, 0
+	delay 1
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_WHITEALPHA, 16, -1, 0
 	playsewithpan SE_W043, -64
 	end
 
 Move_GRASS_WHISTLE:
-	loadspritegfx 0x2758
-	createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB(18, 31, 12)
-	waitforvisualfinish
-	createvisualtask sub_8102BE8, 0x2
-	waitforvisualfinish
-	panse_1B SE_W320, -64, +63, +2, 0x0
-	createsprite gUnknown_08593008, 0x82, 7, 1, 0
-	delay 0x5
-	createsprite gUnknown_08593008, 0x82, 6, 1, 0
-	delay 0x5
-	createsprite gUnknown_08593008, 0x82, 1, 1, 0
-	delay 0x5
-	createsprite gUnknown_08593008, 0x82, 2, 1, 0
-	delay 0x5
-	createsprite gUnknown_08593008, 0x82, 3, 1, 0
-	delay 0x4
-	createsprite gUnknown_08593008, 0x82, 2, 1, 0
-	delay 0x4
-	createsprite gUnknown_08593008, 0x82, 5, 1, 0
-	delay 0x4
-	createsprite gUnknown_08593008, 0x82, 6, 1, 0
-	delay 0x4
-	createsprite gUnknown_08593008, 0x82, 2, 1, 0
-	delay 0x4
-	createsprite gUnknown_08593008, 0x82, 2, 1, 0
-	delay 0x4
-	createsprite gUnknown_08593008, 0x82, 1, 1, 0
-	delay 0x4
-	createsprite gUnknown_08593008, 0x82, 5, 1, 0
-	delay 0x4
-	waitforvisualfinish
-	createvisualtask sub_8102CA0, 0x2
-	createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB(18, 31, 12)
+	loadspritegfx ANIM_TAG_MUSIC_NOTES2
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB(18, 31, 12)
+	waitforvisualfinish
+	createvisualtask sub_8102BE8, 2
+	waitforvisualfinish
+	panse_1B SE_W320, -64, +63, +2, 0
+	createsprite gUnknown_08593008, 130, 7, 1, 0
+	delay 5
+	createsprite gUnknown_08593008, 130, 6, 1, 0
+	delay 5
+	createsprite gUnknown_08593008, 130, 1, 1, 0
+	delay 5
+	createsprite gUnknown_08593008, 130, 2, 1, 0
+	delay 5
+	createsprite gUnknown_08593008, 130, 3, 1, 0
+	delay 4
+	createsprite gUnknown_08593008, 130, 2, 1, 0
+	delay 4
+	createsprite gUnknown_08593008, 130, 5, 1, 0
+	delay 4
+	createsprite gUnknown_08593008, 130, 6, 1, 0
+	delay 4
+	createsprite gUnknown_08593008, 130, 2, 1, 0
+	delay 4
+	createsprite gUnknown_08593008, 130, 2, 1, 0
+	delay 4
+	createsprite gUnknown_08593008, 130, 1, 1, 0
+	delay 4
+	createsprite gUnknown_08593008, 130, 5, 1, 0
+	delay 4
+	waitforvisualfinish
+	createvisualtask sub_8102CA0, 2
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB(18, 31, 12)
 	waitforvisualfinish
 	end
 
 Move_TICKLE:
-	loadspritegfx 0x27EA
-	createsprite gUnknown_08597274, 0x2, 2, 0, 0, 16, RGB_BLACK
+	loadspritegfx ANIM_TAG_218
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 0, 16, RGB_BLACK
 	waitforvisualfinish
-	createsprite gUnknown_08593A84, 0x0, -16, -8
-	createsprite gUnknown_08593A84, 0x0, 16, -8
+	createsprite gUnknown_08593A84, 0, -16, -8
+	createsprite gUnknown_08593A84, 0, 16, -8
 	playsewithpan SE_W197, -64
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 2, 0, 16, 0, RGB_BLACK
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 16, 0, RGB_BLACK
 	waitforvisualfinish
-	delay 0x14
-	createvisualtask sub_80D5EB8, 0x3, 0, 6, 1280, 3, 0
-	delay 0xC
-	createvisualtask sub_815C478, 0x3, 1, 6, 2
-	loopsewithpan SE_W039, +63, 0x8, 0x8
+	delay 20
+	createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER
+	delay 12
+	createvisualtask sub_815C478, 3, 1, 6, 2
+	loopsewithpan SE_W039, +63, 8, 8
 	waitforvisualfinish
 	end
 
 Move_WATER_SPOUT:
-	loadspritegfx 0x281C
-	loadspritegfx 0x27A4
+	loadspritegfx ANIM_TAG_268
+	loadspritegfx ANIM_TAG_148
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	createvisualtask sub_81080E4, 0x5
+	setalpha 12, 8
+	createvisualtask sub_81080E4, 5
 	playsewithpan SE_W029, -64
-	delay 0x2C
+	delay 44
 	playsewithpan SE_W291, -64
 	waitforvisualfinish
-	delay 0x10
-	createvisualtask sub_81085C8, 0x5
+	delay 16
+	createvisualtask sub_81085C8, 5
 	playsewithpan SE_W057, +63
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_SHADOW_PUNCH:
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
 	fadetobg BG_GHOST
 	waitbgfadein
 	monbg ANIM_ATK_PARTNER
-	setalpha 0x809
-	createvisualtask sub_80A8BC4, 0x2, 0, 13
+	setalpha 9, 8
+	createvisualtask sub_80A8BC4, 2, 0, 13
 	playsewithpan SE_W026, -64
-	delay 0x6
-	createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1
-	createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0
+	delay 6
+	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
+	createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0
 	playsewithpan SE_W004, +63
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
@@ -4382,37 +4319,37 @@ Move_SHADOW_PUNCH:
 	end
 
 Move_EXTRASENSORY:
-	call AnimScript_82D7CD1
+	call SetPsychicBackground
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	createvisualtask sub_80A7B98, 0x5, 0, RGB(27, 27, 0), 12, 1, 1
-	createvisualtask sub_810FE14, 0x5, 0
+	setalpha 12, 8
+	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1
+	createvisualtask sub_810FE14, 5, 0
 	playsewithpan SE_W020, +63
 	waitforvisualfinish
-	createvisualtask sub_80A7B98, 0x5, 0, RGB(27, 27, 0), 12, 1, 1
-	createvisualtask sub_810FE14, 0x5, 1
+	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1
+	createvisualtask sub_810FE14, 5, 1
 	playsewithpan SE_W020, +63
 	waitforvisualfinish
-	createvisualtask sub_8110034, 0x5, 0
-	createvisualtask sub_810FE14, 0x5, 2
+	createvisualtask sub_8110034, 5, 0
+	createvisualtask sub_810FE14, 5, 2
 	playsewithpan SE_W043, -64
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_DEF_PARTNER
-	call AnimScript_82D7CDD
+	call UnsetPsychicBackground
 	end
 
 Move_AERIAL_ACE:
-	loadspritegfx 0x279A
+	loadspritegfx ANIM_TAG_138
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	createvisualtask sub_80D5830, 0x2, 0, 24, 6, 1, 5
-	createvisualtask sub_81169C0, 0x2, 0, 4, 7, 3
-	createsprite gUnknown_08592A1C, 0x2, 40, -32, 0
+	setalpha 12, 8
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5
+	createvisualtask sub_81169C0, 2, 0, 4, 7, 3
+	createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0
 	playsewithpan SE_W013B, -64
-	delay 0x5
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 10, 1
-	createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 10, 0, 0
+	delay 5
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0
 	playsewithpan SE_W013, +63
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
@@ -4420,157 +4357,157 @@ Move_AERIAL_ACE:
 	end
 
 Move_IRON_DEFENSE:
-	loopsewithpan SE_REAPOKE, -64, 0x1C, 0x2
-	createvisualtask sub_81144F8, 0x5, 0, 0, 0
-	createsprite gUnknown_0859728C, 0x2, 1, 8, 2, -1, 14, -1, 0
+	loopsewithpan SE_REAPOKE, -64, 28, 2
+	createvisualtask sub_81144F8, 5, 0, 0, 0
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0
 	waitforvisualfinish
 	end
 
 Move_BLOCK:
-	loadspritegfx 0x280A
-	createsprite gUnknown_085CE90C, 0xC2
+	loadspritegfx ANIM_TAG_X_SIGN
+	createsprite gUnknown_085CE90C, 194
 	playsewithpan SE_W207, +63
 	end
 
 Move_HOWL:
-	loadspritegfx 0x2745
-	createvisualtask sub_815D64C, 0x2, 0
-	delay 0xC
-	call AnimScript_82CFECB
-	createvisualtask sub_8158D8C, 0x2, 0, 3
+	loadspritegfx ANIM_TAG_053
+	createvisualtask sub_815D64C, 2, 0
+	delay 12
+	call RoarEffect
+	createvisualtask sub_8158D8C, 2, 0, 3
 	waitforvisualfinish
-	delay 0x1E
+	delay 30
 	end
 
 Move_BULK_UP:
-	loadspritegfx 0x2766
-	createvisualtask sub_8104AB4, 0x2
+	loadspritegfx ANIM_TAG_086
+	createvisualtask sub_8104AB4, 2
 	playsewithpan SE_W207, -64
 	waitforvisualfinish
-	createsprite gUnknown_08593658, 0x2
-	loopsewithpan SE_W207, -64, 0x4, 0x2
+	createsprite gUnknown_08593658, 2
+	loopsewithpan SE_W207, -64, 4, 2
 	waitforvisualfinish
 	end
 
 Move_COVET:
-	loadspritegfx 0x27E2
-	loadspritegfx 0x27F0
-	createvisualtask sub_815C478, 0x5, 0, 2, 0
-	createsprite gUnknown_08593970, 0x3, 0, 20
+	loadspritegfx ANIM_TAG_PURPLE_HEART
+	loadspritegfx ANIM_TAG_ITEM_BAG
+	createvisualtask sub_815C478, 5, 0, 2, 0
+	createsprite gUnknown_08593970, 3, 0, 20
 	playsewithpan SE_W204, -64
-	delay 0xF
-	createsprite gUnknown_08593970, 0x3, -20, 20
+	delay 15
+	createsprite gUnknown_08593970, 3, -20, 20
 	playsewithpan SE_W204, -64
-	delay 0xF
-	createsprite gUnknown_08593970, 0x3, 20, 20
+	delay 15
+	createsprite gUnknown_08593970, 3, 20, 20
 	playsewithpan SE_W204, -64
 	waitforvisualfinish
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1
-	loopsewithpan SE_W146, +63, 0x4, 0x3
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
+	loopsewithpan SE_W146, +63, 4, 3
 	end
 
 Move_VOLT_TACKLE:
-	loadspritegfx 0x2711
-	loadspritegfx 0x27E4
-	loadspritegfx 0x27E5
+	loadspritegfx ANIM_TAG_SPARK
+	loadspritegfx ANIM_TAG_212
+	loadspritegfx ANIM_TAG_213
 	monbg ANIM_ATTACKER
-	setalpha 0x80C
-	createvisualtask sub_8116620, 0xA, 1, 0, 0, 8, 0
+	setalpha 12, 8
+	createvisualtask sub_8116620, 10, 1, 0, 0, 8, RGB_BLACK
 	waitforvisualfinish
-	createsprite gUnknown_085959A4, 0x1
+	createsprite gUnknown_085959A4, 1
 	playsewithpan SE_W268, -64
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	blendoff
-	delay 0x8
-	createvisualtask sub_810AFCC, 0x5, 0
+	delay 8
+	createvisualtask sub_810AFCC, 5, 0
 	playsewithpan SE_W085, -64
 	waitforvisualfinish
-	createvisualtask sub_810AFCC, 0x5, 1
+	createvisualtask sub_810AFCC, 5, 1
 	playsewithpan SE_W085, +63
 	waitforvisualfinish
-	createvisualtask sub_810AFCC, 0x5, 2
+	createvisualtask sub_810AFCC, 5, 2
 	playsewithpan SE_W085, -64
 	waitforvisualfinish
-	createvisualtask sub_810AFCC, 0x5, 3
+	createvisualtask sub_810AFCC, 5, 3
 	playsewithpan SE_W085, +63
 	waitforvisualfinish
-	createvisualtask sub_810AFCC, 0x5, 4
+	createvisualtask sub_810AFCC, 5, 4
 	playsewithpan SE_W085, -64
-	delay 0x8
-	createvisualtask sub_80D52D0, 0x2, 1, 10, 0, 18, 1
+	delay 8
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_0859598C, 0x2, 1, 16, 16
-	delay 0x2
-	createsprite gUnknown_0859598C, 0x2, 1, -16, -16
-	delay 0x8
-	createvisualtask sub_810AE5C, 0x5
+	createsprite gUnknown_0859598C, 2, 1, 16, 16
+	delay 2
+	createsprite gUnknown_0859598C, 2, 1, -16, -16
+	delay 8
+	createvisualtask sub_810AE5C, 5
 	waitforvisualfinish
-	createvisualtask sub_80D52D0, 0x2, 0, 3, 0, 9, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1
 	playsewithpan SE_W085B, -64
-	createsprite gUnknown_0859598C, 0x2, 0, 16, 16
-	delay 0x2
-	createsprite gUnknown_0859598C, 0x2, 0, -16, -16
+	createsprite gUnknown_0859598C, 2, 0, 16, 16
+	delay 2
+	createsprite gUnknown_0859598C, 2, 0, -16, -16
 	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 1, 0, 8, 0, 0
+	createvisualtask sub_8116620, 10, 1, 0, 8, 0, RGB_BLACK
 	waitforvisualfinish
 	end
 
 Move_WATER_SPORT:
-	loadspritegfx 0x281C
-	createvisualtask sub_81088E4, 0x5
-	delay 0x8
+	loadspritegfx ANIM_TAG_268
+	createvisualtask sub_81088E4, 5
+	delay 8
 	playsewithpan SE_W057, -64
-	delay 0x2C
+	delay 44
 	playsewithpan SE_W057, -64
-	delay 0x2C
+	delay 44
 	playsewithpan SE_W057, -64
-	delay 0x2C
-	panse_1B SE_W057, -64, +63, +2, 0x0
+	delay 44
+	panse_1B SE_W057, -64, +63, +2, 0
 	end
 
 Move_CALM_MIND:
-	loadspritegfx 0x27DB
+	loadspritegfx ANIM_TAG_203
 	monbg ANIM_ATK_PARTNER
-	createvisualtask sub_8116664, 0x5, 0, 0, 0, 16, 0
+	createvisualtask sub_8116664, 5, 0, 0, 0, 16, RGB_BLACK
 	waitforvisualfinish
-	createvisualtask sub_81177E4, 0x5, 1
+	createvisualtask sub_81177E4, 5, 1
 	waitforvisualfinish
-	createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0
+	createsprite gUnknown_08593850, 40, 0, 0, 0, 0
 	playsewithpan SE_W048, -64
-	delay 0xE
-	createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0
+	delay 14
+	createsprite gUnknown_08593850, 40, 0, 0, 0, 0
 	playsewithpan SE_W048, -64
-	delay 0xE
-	createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0
+	delay 14
+	createsprite gUnknown_08593850, 40, 0, 0, 0, 0
 	playsewithpan SE_W048, -64
 	waitforvisualfinish
-	createvisualtask sub_81177E4, 0x5, 0
+	createvisualtask sub_81177E4, 5, 0
 	waitforvisualfinish
-	createvisualtask sub_8116664, 0x5, 0, 0, 16, 0, 0
+	createvisualtask sub_8116664, 5, 0, 0, 16, 0, RGB_BLACK
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	end
 
 Move_LEAF_BLADE:
-	loadspritegfx 0x274F
-	loadspritegfx 0x282D
-	createvisualtask sub_80FFFC0, 0x5
-	delay 0x2
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1
+	loadspritegfx ANIM_TAG_063
+	loadspritegfx ANIM_TAG_285
+	createvisualtask sub_80FFFC0, 5
+	delay 2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
 	playsewithpan SE_W015, +63
-	delay 0x32
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1
+	delay 50
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
 	playsewithpan SE_W015, +63
-	delay 0x32
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1
+	delay 50
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
 	playsewithpan SE_W015, +63
 	waitforvisualfinish
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	delay 0xC
-	createvisualtask sub_80D52D0, 0x2, 1, 8, 0, 18, 1
-	createsprite gUnknown_085973D0, 0x82, 0, 0, 1, 36
+	setalpha 12, 8
+	delay 12
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 18, 1
+	createsprite gUnknown_085973D0, 130, 0, 0, 1, 36
 	playsewithpan SE_W043, +63
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
@@ -4578,180 +4515,180 @@ Move_LEAF_BLADE:
 	end
 
 Move_DRAGON_DANCE:
-	loadspritegfx 0x2809
+	loadspritegfx ANIM_TAG_249
 	monbg ANIM_ATTACKER
 	monbgprio_28 ANIM_ATTACKER
-	delay 0x1
-	createvisualtask sub_81133E8, 0x5
+	delay 1
+	createvisualtask sub_81133E8, 5
 	playsewithpan SE_W100, -64
-	delay 0x8
-	createvisualtask sub_80A7CB4, 0x5, 10249, 19456, 14, 0, 3
-	createsprite gUnknown_08596F98, 0x2, 0
-	createsprite gUnknown_08596F98, 0x2, 43
-	createsprite gUnknown_08596F98, 0x2, 85
-	createsprite gUnknown_08596F98, 0x2, 128
-	createsprite gUnknown_08596F98, 0x2, 170
-	createsprite gUnknown_08596F98, 0x2, 213
-	delay 0x1E
+	delay 8
+	createvisualtask sub_80A7CB4, 5, 10249, 19456, 14, 0, 3
+	createsprite gUnknown_08596F98, 2, 0
+	createsprite gUnknown_08596F98, 2, 43
+	createsprite gUnknown_08596F98, 2, 85
+	createsprite gUnknown_08596F98, 2, 128
+	createsprite gUnknown_08596F98, 2, 170
+	createsprite gUnknown_08596F98, 2, 213
+	delay 30
 	playsewithpan SE_W100, -64
-	delay 0x1E
+	delay 30
 	playsewithpan SE_W100, -64
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
-	delay 0x1
+	delay 1
 	end
 
 Move_SHOCK_WAVE:
-	loadspritegfx 0x27E3
-	loadspritegfx 0x27E4
-	loadspritegfx 0x2711
-	loadspritegfx 0x2735
+	loadspritegfx ANIM_TAG_211
+	loadspritegfx ANIM_TAG_212
+	loadspritegfx ANIM_TAG_SPARK
+	loadspritegfx ANIM_TAG_LIGHTNING
 	monbg ANIM_ATTACKER
-	setalpha 0x80C
-	createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK
+	setalpha 12, 8
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK
 	waitforvisualfinish
-	createvisualtask sub_810AAFC, 0x2, 0, 20, 0, 2
+	createvisualtask sub_810AAFC, 2, 0, 20, 0, 2
 	playsewithpan SE_W268, -64
-	delay 0xC
-	createsprite gUnknown_08595A18, 0x2
-	delay 0x1E
-	createvisualtask sub_810B29C, 0x5
-	delay 0xC
+	delay 12
+	createsprite gUnknown_08595A18, 2
+	delay 30
+	createvisualtask sub_810B29C, 5
+	delay 12
 	waitforvisualfinish
-	createvisualtask sub_810B55C, 0x5
+	createvisualtask sub_810B55C, 5
 	playsewithpan SE_W161B, +63
 	waitforvisualfinish
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 6, 18, 1
-	createvisualtask sub_8116620, 0x5, 1, 3, 16, 0, 0x7FFF
-	createvisualtask sub_8116620, 0x5, 4, 0, 16, 16, 0
-	delay 0x4
-	createvisualtask sub_8116620, 0x5, 4, 0, 0, 0, 0
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 6, 18, 1
+	createvisualtask sub_8116620, 5, 1, 3, 16, 0, RGB_WHITE
+	createvisualtask sub_8116620, 5, 4, 0, 16, 16, RGB_BLACK
+	delay 4
+	createvisualtask sub_8116620, 5, 4, 0, 0, 0, RGB_BLACK
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	blendoff
 	end
 
 Move_HARDEN:
-	loopsewithpan SE_W231, -64, 0x1C, 0x2
-	createvisualtask sub_81144F8, 0x5, 0, 0, 0
+	loopsewithpan SE_W231, -64, 28, 2
+	createvisualtask sub_81144F8, 5, 0, 0, 0
 	waitforvisualfinish
 	end
 
 Move_BELLY_DRUM:
-	loadspritegfx 0x2758
-	loadspritegfx 0x27D1
-	createvisualtask sub_8102BE8, 0x2
+	loadspritegfx ANIM_TAG_MUSIC_NOTES2
+	loadspritegfx ANIM_TAG_193
+	createvisualtask sub_8102BE8, 2
 	waitforvisualfinish
-	call AnimScript_82CF5A6
-	createsprite gUnknown_0859309C, 0x2, 0, 0, 0, 0
+	call BellyDrum1
+	createsprite gUnknown_0859309C, 2, 0, 0, 0, 0
 	playsewithpan SE_W187, -64
-	delay 0xF
-	call AnimScript_82CF58B
-	createsprite gUnknown_0859309C, 0x2, 1, 1, 1, 0
+	delay 15
+	call BellyDrum2
+	createsprite gUnknown_0859309C, 2, 1, 1, 1, 0
 	playsewithpan SE_W187, -64
-	delay 0xF
-	call AnimScript_82CF5A6
-	createsprite gUnknown_0859309C, 0x2, 0, 3, 3, 128
+	delay 15
+	call BellyDrum1
+	createsprite gUnknown_0859309C, 2, 0, 3, 3, 128
 	playsewithpan SE_W187, -64
-	delay 0x7
-	call AnimScript_82CF58B
-	createsprite gUnknown_0859309C, 0x2, 1, 2, 0, 128
+	delay 7
+	call BellyDrum2
+	createsprite gUnknown_0859309C, 2, 1, 2, 0, 128
 	playsewithpan SE_W187, -64
-	delay 0x7
-	call AnimScript_82CF5A6
-	createsprite gUnknown_0859309C, 0x2, 0, 1, 1, 0
+	delay 7
+	call BellyDrum1
+	createsprite gUnknown_0859309C, 2, 0, 1, 1, 0
 	playsewithpan SE_W187, -64
-	delay 0x7
-	call AnimScript_82CF58B
-	createsprite gUnknown_0859309C, 0x2, 1, 0, 3, 0
+	delay 7
+	call BellyDrum2
+	createsprite gUnknown_0859309C, 2, 1, 0, 3, 0
 	playsewithpan SE_W187, -64
 	waitforvisualfinish
-	createvisualtask sub_8102CA0, 0x2
+	createvisualtask sub_8102CA0, 2
 	waitforvisualfinish
 	end
 
-AnimScript_82CF58B:
-	createsprite gUnknown_08593068, 0x3, 0
-	createvisualtask sub_80D51AC, 0x2, 0, 0, 8, 2, 1
+BellyDrum2:
+	createsprite gUnknown_08593068, 3, 0
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1
 	return
 
-AnimScript_82CF5A6:
-	createsprite gUnknown_08593068, 0x3, 1
-	createvisualtask sub_80D51AC, 0x2, 0, 0, 8, 2, 1
+BellyDrum1:
+	createsprite gUnknown_08593068, 3, 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1
 	return
 
 Move_MIND_READER:
-	loadspritegfx 0x27CD
-	loadspritegfx 0x27CE
-	loadspritegfx 0x27CF
+	loadspritegfx ANIM_TAG_189
+	loadspritegfx ANIM_TAG_OPENING_EYE
+	loadspritegfx ANIM_TAG_191
 	monbg ANIM_DEF_PARTNER
 	playsewithpan SE_W109, +63
-	createsprite gUnknown_085CE07C, 0x5, 0, 0, 1, 0
-	createsprite gUnknown_085CE094, 0x5
-	delay 0x28
+	createsprite gUnknown_085CE07C, 5, 0, 0, 1, 0
+	createsprite gUnknown_085CE094, 5
+	delay 40
 	playsewithpan SE_W043, +63
-	createvisualtask sub_8115A04, 0x2, 1, 1, 2, 0, 10, 0
-	call AnimScript_82CF608
+	createvisualtask sub_8115A04, 2, 1, 1, 2, 0, 10, RGB_BLACK
+	call MindReaderEffect
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
-AnimScript_82CF608:
-	createsprite gUnknown_085CE0AC, 0x4, 70, 0, 6
-	createsprite gUnknown_085CE0AC, 0x4, 40, 40, 6
-	createsprite gUnknown_085CE0AC, 0x4, 10, -60, 6
-	createsprite gUnknown_085CE0AC, 0x4, -50, -40, 6
-	createsprite gUnknown_085CE0AC, 0x4, -40, 40, 6
-	createsprite gUnknown_085CE0AC, 0x4, 50, -50, 6
-	delay 0x2
-	createsprite gUnknown_085CE0AC, 0x4, 50, -30, 6
-	createsprite gUnknown_085CE0AC, 0x4, 60, 10, 6
-	createsprite gUnknown_085CE0AC, 0x4, 0, 60, 6
-	createsprite gUnknown_085CE0AC, 0x4, 0, -40, 6
-	createsprite gUnknown_085CE0AC, 0x4, -60, 20, 6
-	createsprite gUnknown_085CE0AC, 0x4, -60, -30, 6
-	delay 0x2
-	createsprite gUnknown_085CE0AC, 0x4, -50, 50, 6
-	createsprite gUnknown_085CE0AC, 0x4, -60, 20, 6
-	createsprite gUnknown_085CE0AC, 0x4, -40, -40, 6
-	createsprite gUnknown_085CE0AC, 0x4, 20, -60, 6
-	createsprite gUnknown_085CE0AC, 0x4, 50, -50, 6
-	createsprite gUnknown_085CE0AC, 0x4, 35, 40, 6
-	delay 0x2
+MindReaderEffect:
+	createsprite gUnknown_085CE0AC, 4, 70, 0, 6
+	createsprite gUnknown_085CE0AC, 4, 40, 40, 6
+	createsprite gUnknown_085CE0AC, 4, 10, -60, 6
+	createsprite gUnknown_085CE0AC, 4, -50, -40, 6
+	createsprite gUnknown_085CE0AC, 4, -40, 40, 6
+	createsprite gUnknown_085CE0AC, 4, 50, -50, 6
+	delay 2
+	createsprite gUnknown_085CE0AC, 4, 50, -30, 6
+	createsprite gUnknown_085CE0AC, 4, 60, 10, 6
+	createsprite gUnknown_085CE0AC, 4, 0, 60, 6
+	createsprite gUnknown_085CE0AC, 4, 0, -40, 6
+	createsprite gUnknown_085CE0AC, 4, -60, 20, 6
+	createsprite gUnknown_085CE0AC, 4, -60, -30, 6
+	delay 2
+	createsprite gUnknown_085CE0AC, 4, -50, 50, 6
+	createsprite gUnknown_085CE0AC, 4, -60, 20, 6
+	createsprite gUnknown_085CE0AC, 4, -40, -40, 6
+	createsprite gUnknown_085CE0AC, 4, 20, -60, 6
+	createsprite gUnknown_085CE0AC, 4, 50, -50, 6
+	createsprite gUnknown_085CE0AC, 4, 35, 40, 6
+	delay 2
 	return
 
 Move_ICE_PUNCH:
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	loadspritegfx 0x279D
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
-	createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, RGB_BLACK
-	createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, 32588
-	delay 0x14
+	setalpha 12, 8
+	loadspritegfx ANIM_TAG_141
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK
+	createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB(12, 26, 31)
+	delay 20
 	playsewithpan SE_W081, +63
-	createsprite gUnknown_08595AE8, 0x2, 0
-	createsprite gUnknown_08595AE8, 0x2, 64
-	createsprite gUnknown_08595AE8, 0x2, 128
-	createsprite gUnknown_08595AE8, 0x2, 192
-	delay 0x5
-	createsprite gUnknown_08595AD0, 0x2, 32
-	createsprite gUnknown_08595AD0, 0x2, 96
-	createsprite gUnknown_08595AD0, 0x2, 160
-	createsprite gUnknown_08595AD0, 0x2, 224
-	delay 0x11
-	createsprite gUnknown_08595E98, 0x4, 0, -10, 8, 1, 0
-	createsprite gUnknown_08597358, 0x3, 0, -10, 1, 1
+	createsprite gUnknown_08595AE8, 2, 0
+	createsprite gUnknown_08595AE8, 2, 64
+	createsprite gUnknown_08595AE8, 2, 128
+	createsprite gUnknown_08595AE8, 2, 192
+	delay 5
+	createsprite gUnknown_08595AD0, 2, 32
+	createsprite gUnknown_08595AD0, 2, 96
+	createsprite gUnknown_08595AD0, 2, 160
+	createsprite gUnknown_08595AD0, 2, 224
+	delay 17
+	createsprite gFistFootSpriteTemplate, 4, 0, -10, 8, 1, 0
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, -10, 1, 1
 	playsewithpan SE_W004, +63
-	delay 0x2
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 3, 1
+	delay 2
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 3, 1
 	waitforvisualfinish
-	delay 0xF
-	call AnimScript_82D7720
-	delay 0x5
-	createvisualtask sub_8116620, 0xA, 4, 2, 9, 0, 32588
+	delay 15
+	call FreezeEffect1
+	delay 5
+	createvisualtask sub_8116620, 10, 4, 2, 9, 0, RGB(12, 26, 31)
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, RGB_BLACK
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 7, 0, RGB_BLACK
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -4759,226 +4696,224 @@ Move_ICE_PUNCH:
 
 Move_REST:
 	playsewithpan SE_W173, -64
-	loadspritegfx 0x27F4
-	createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0
-	delay 0x14
-	createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0
-	delay 0x14
-	createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0
+	loadspritegfx ANIM_TAG_LETTER_Z
+	createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0
+	delay 20
+	createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0
+	delay 20
+	createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0
 	waitforvisualfinish
 	end
 
 Move_CONFUSION:
 	monbg ANIM_DEF_PARTNER
-	call AnimScript_82D7CD1
-	setalpha 0x808
-	createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1
-	createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 0x7FFF
+	call SetPsychicBackground
+	setalpha 8, 8
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1
+	createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE
 	waitforvisualfinish
 	playsewithpan SE_W048, +63
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 15, 1
-	createvisualtask sub_80D6064, 0x5, -4, -4, 15, 1, 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 15, 1
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
-	delay 0x1
-	call AnimScript_82D7CDD
+	delay 1
+	call UnsetPsychicBackground
 	end
 
 Move_PSYCHIC:
 	monbg ANIM_DEF_PARTNER
-	call AnimScript_82D7CD1
-	setalpha 0x808
-	createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1
-	createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 767
+	call SetPsychicBackground
+	setalpha 8, 8
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1
+	createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB(31, 23, 0)
 	waitforvisualfinish
-	loopsewithpan SE_W048, +63, 0xA, 0x3
-	createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 15, 1
-	createvisualtask sub_80D6064, 0x5, -6, -6, 15, 1, 1
+	loopsewithpan SE_W048, +63, 10, 3
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
-	delay 0x1
-	call AnimScript_82D7CDD
+	delay 1
+	call UnsetPsychicBackground
 	end
 
 Move_FUTURE_SIGHT:
-	goto AnimScript_82CF8F6
-
-AnimScript_82CF8ED:
+	goto FutureSight
+FutureSightContinue:
 	waitforvisualfinish
-	delay 0x1
-	call AnimScript_82D7CDD
+	delay 1
+	call UnsetPsychicBackground
 	end
-
-AnimScript_82CF8F6:
+FutureSight:
 	monbg ANIM_ATK_PARTNER
 	playsewithpan SE_W060, -64
-	call AnimScript_82D7CD1
-	setalpha 0x808
+	call SetPsychicBackground
+	setalpha 8, 8
 	playsewithpan SE_W048, -64
-	createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 0x7FFF
-	createvisualtask sub_80D6064, 0x5, -4, -4, 15, 0, 1
+	createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
-	goto AnimScript_82CF8ED
+	goto FutureSightContinue
 
 Move_THUNDER:
-	loadspritegfx 0x2735
+	loadspritegfx ANIM_TAG_LIGHTNING
 	fadetobg BG_THUNDER
 	waitbgfadeout
-	createvisualtask sub_8117660, 0x5, -256, 0, 1, -1
+	createvisualtask sub_8117660, 5, -256, 0, 1, -1
 	waitbgfadein
-	createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, RGB_BLACK
-	delay 0x10
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK
+	delay 16
+	createvisualtask sub_8115F10, 2, 257, 257, 257
 	playsewithpan SE_W086, +63
-	delay 0x1
-	createsprite gUnknown_085956C0, 0x82, 16, -36
-	delay 0x1
-	createsprite gUnknown_085956C0, 0x82, 16, -20
-	delay 0x1
-	createsprite gUnknown_085956C0, 0x82, 16, 12
-	delay 0x14
+	delay 1
+	createsprite gUnknown_085956C0, 130, 16, -36
+	delay 1
+	createsprite gUnknown_085956C0, 130, 16, -20
+	delay 1
+	createsprite gUnknown_085956C0, 130, 16, 12
+	delay 20
 	createsprite gUnknown_085956C0, 0x86, -16, -32
 	playsewithpan SE_W086, +63
-	delay 0x1
+	delay 1
 	createsprite gUnknown_085956C0, 0x86, -16, -16
-	delay 0x1
+	delay 1
 	createsprite gUnknown_085956C0, 0x86, -16, 16
 	playsewithpan SE_W086, +63
-	delay 0x5
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
-	delay 0x1
-	createsprite gUnknown_085956C0, 0x82, 24, -32
-	delay 0x1
-	createsprite gUnknown_085956C0, 0x82, 24, -16
-	delay 0x1
-	createsprite gUnknown_085956C0, 0x82, 24, 16
-	delay 0x1E
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
-	delay 0x5
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
-	delay 0x1
-	createsprite gUnknown_085956C0, 0x82, 0, -32
+	delay 5
+	createvisualtask sub_8115F10, 2, 257, 257, 257
+	delay 1
+	createsprite gUnknown_085956C0, 130, 24, -32
+	delay 1
+	createsprite gUnknown_085956C0, 130, 24, -16
+	delay 1
+	createsprite gUnknown_085956C0, 130, 24, 16
+	delay 30
+	createvisualtask sub_8115F10, 2, 257, 257, 257
+	delay 5
+	createvisualtask sub_8115F10, 2, 257, 257, 257
+	delay 1
+	createsprite gUnknown_085956C0, 130, 0, -32
 	playsewithpan SE_W161B, +63
-	delay 0x1
-	createsprite gUnknown_085956C0, 0x82, 0, -16
-	delay 0x1
-	createsprite gUnknown_085956C0, 0x82, 0, 16
-	delay 0xA
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
-	delay 0x1
-	createvisualtask sub_810A094, 0x2, 30, 3, 1, 0
-	delay 0x2
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
-	delay 0x1
-	createsprite gUnknown_08597274, 0x82, 1, 2, 16, 0, RGB_BLACK
+	delay 1
+	createsprite gUnknown_085956C0, 130, 0, -16
+	delay 1
+	createsprite gUnknown_085956C0, 130, 0, 16
+	delay 10
+	createvisualtask sub_8115F10, 2, 257, 257, 257
+	delay 1
+	createvisualtask sub_810A094, 2, 30, 3, 1, 0
+	delay 2
+	createvisualtask sub_8115F10, 2, 257, 257, 257
+	delay 1
+	createsprite gSimplePaletteBlendSpriteTemplate, 130, 1, 2, 16, 0, RGB_BLACK
 	waitforvisualfinish
 	restorebg
 	waitbgfadeout
-	setarg 0x7, 0xFFFF
+	setarg 7, -1
 	waitbgfadein
 	end
 
 Move_THUNDER_PUNCH:
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
-	loadspritegfx 0x2735
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_LIGHTNING
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, RGB_BLACK
+	setalpha 12, 8
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK
 	waitforvisualfinish
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0
-	createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1
-	delay 0x1
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
-	delay 0x1
-	createsprite gUnknown_085956C0, 0x82, 0, -48
-	delay 0x1
-	createsprite gUnknown_085956C0, 0x2, 0, -16
-	delay 0x1
-	createsprite gUnknown_085956C0, 0x2, 0, 16
-	delay 0x1
+	createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0
+	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
+	delay 1
+	createvisualtask sub_8115F10, 2, 257, 257, 257
+	delay 1
+	createsprite gUnknown_085956C0, 130, 0, -48
+	delay 1
+	createsprite gUnknown_085956C0, 2, 0, -16
+	delay 1
+	createsprite gUnknown_085956C0, 2, 0, 16
+	delay 1
 	playsewithpan SE_W161B, +63
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
-	delay 0x2
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 15, 1
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2
-	delay 0x1
-	createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_BLACK
-	delay 0x14
+	createvisualtask sub_8115F10, 2, 257, 257, 257
+	delay 2
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
+	delay 1
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK
+	delay 20
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_SACRED_FIRE:
-	loadspritegfx 0x2731
-	loadspritegfx 0x2733
-	loopsewithpan SE_W221, -64, 0x7, 0x5
-	createsprite gUnknown_08595428, 0x2, -32, 0, 50, 5, -2, 0
-	delay 0x1
-	createsprite gUnknown_08595428, 0x42, -20, -10, 50, 5, -1, -1
-	delay 0x1
-	createsprite gUnknown_08595428, 0x42, 0, -16, 50, 5, 0, -1
-	delay 0x1
-	createsprite gUnknown_08595428, 0x42, 20, -10, 50, 5, 1, -1
-	delay 0x1
-	createsprite gUnknown_08595428, 0x2, 32, 0, 50, 5, 2, 0
-	delay 0x1
-	createsprite gUnknown_08595428, 0x2, 20, 10, 50, 5, 1, 1
-	delay 0x1
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
-	delay 0x1
-	createsprite gUnknown_08595428, 0x2, 0, 16, 50, 5, 0, 1
-	delay 0x1
-	createsprite gUnknown_08595428, 0x2, -20, 10, 50, 5, -1, 1
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
-	delay 0x1
+	loadspritegfx ANIM_TAG_FIRE
+	loadspritegfx ANIM_TAG_035
+	loopsewithpan SE_W221, -64, 7, 5
+	createsprite gUnknown_08595428, 2, -32, 0, 50, 5, -2, 0
+	delay 1
+	createsprite gUnknown_08595428, 66, -20, -10, 50, 5, -1, -1
+	delay 1
+	createsprite gUnknown_08595428, 66, 0, -16, 50, 5, 0, -1
+	delay 1
+	createsprite gUnknown_08595428, 66, 20, -10, 50, 5, 1, -1
+	delay 1
+	createsprite gUnknown_08595428, 2, 32, 0, 50, 5, 2, 0
+	delay 1
+	createsprite gUnknown_08595428, 2, 20, 10, 50, 5, 1, 1
+	delay 1
+	createvisualtask sub_8115F10, 2, 257, 257, 257
+	delay 1
+	createsprite gUnknown_08595428, 2, 0, 16, 50, 5, 0, 1
+	delay 1
+	createsprite gUnknown_08595428, 2, -20, 10, 50, 5, -1, 1
+	createvisualtask sub_8115F10, 2, 257, 257, 257
+	delay 1
 	waitforvisualfinish
 	playsewithpan SE_W221B, +63
-	createsprite gUnknown_085953F8, 0x82, -16, 0, 70, 16, 0, 1
-	delay 0xA
+	createsprite gUnknown_085953F8, 130, -16, 0, 70, 16, 0, 1
+	delay 10
 	playsewithpan SE_W221B, +63
-	createsprite gUnknown_085953F8, 0x82, 0, 0, 70, 16, 0, 1
-	delay 0xA
+	createsprite gUnknown_085953F8, 130, 0, 0, 70, 16, 0, 1
+	delay 10
 	playsewithpan SE_W221B, +63
-	createsprite gUnknown_085953F8, 0x82, 16, 0, 80, 16, 0, 1
-	delay 0x1
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
-	delay 0x1
+	createsprite gUnknown_085953F8, 130, 16, 0, 80, 16, 0, 1
+	delay 1
+	createvisualtask sub_8115F10, 2, 257, 257, 257
+	delay 1
 	waitforvisualfinish
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
-	delay 0x1
+	createvisualtask sub_8115F10, 2, 257, 257, 257
+	delay 1
 	playsewithpan SE_W172B, +63
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 0
-	delay 0x1
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 0, 1
-	delay 0x1
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, -1
-	delay 0x1
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 2, 1
-	delay 0x1
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -1
-	delay 0x1
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 1
-	delay 0x1
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -2
-	delay 0x1
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 3, 1
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 0
+	delay 1
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 0, 1
+	delay 1
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, -1
+	delay 1
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 2, 1
+	delay 1
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -1
+	delay 1
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 1
+	delay 1
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -2
+	delay 1
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 3, 1
 	waitforvisualfinish
 	end
 
 Move_SCRATCH:
-	loadspritegfx 0x2799
+	loadspritegfx ANIM_TAG_137
 	monbg ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W010, +63
-	createsprite gUnknown_085CE020, 0x2, 0, 0, 1, 0
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+	createsprite gUnknown_085CE020, 2, 0, 0, 1, 0
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -4986,423 +4921,419 @@ Move_SCRATCH:
 	end
 
 Move_DRAGON_BREATH:
-	loadspritegfx 0x272D
+	loadspritegfx ANIM_TAG_SMALL_EMBER
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	loopsewithpan SE_W172, -64, 0x7, 0x7
-	createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20
-	delay 0x2
-	createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20
-	delay 0x2
-	createvisualtask sub_8116620, 0xA, 4, 1, 0, 9, 31
-	createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20
-	delay 0x2
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 21, 1
-	createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20
-	delay 0x2
-	createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20
-	delay 0x2
-	createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20
-	delay 0x2
-	createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20
-	delay 0x2
-	createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20
-	delay 0x2
-	createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20
-	delay 0x2
-	createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20
-	delay 0x2
-	createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20
-	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 4, 1, 9, 0, 31
+	loopsewithpan SE_W172, -64, 7, 7
+	createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20
+	delay 2
+	createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20
+	delay 2
+	createvisualtask sub_8116620, 10, 4, 1, 0, 9, RGB_RED
+	createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20
+	delay 2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 21, 1
+	createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20
+	delay 2
+	createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20
+	delay 2
+	createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20
+	delay 2
+	createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20
+	delay 2
+	createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20
+	delay 2
+	createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20
+	delay 2
+	createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20
+	delay 2
+	createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20
+	waitforvisualfinish
+	createvisualtask sub_8116620, 10, 4, 1, 9, 0, RGB_RED
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
 Move_ROAR:
-	loadspritegfx 0x2745
+	loadspritegfx ANIM_TAG_053
 	monbg ANIM_ATTACKER
 	monbgprio_28 ANIM_ATTACKER
-	setalpha 0x808
-	createvisualtask sub_8158E9C, 0x2, 0, 2
-	createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1
-	call AnimScript_82CFECB
-	delay 0x14
-	createvisualtask sub_80D5DB0, 0x5, 1, 2
+	setalpha 8, 8
+	createvisualtask sub_8158E9C, 2, 0, 2
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1
+	call RoarEffect
+	delay 20
+	createvisualtask sub_80D5DB0, 5, 1, 2
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	blendoff
 	waitforvisualfinish
-	createvisualtask sub_8159078, 0x5
+	createvisualtask sub_8159078, 5
 	waitforvisualfinish
 	end
 
-AnimScript_82CFECB:
-	createsprite gUnknown_085CE7D4, 0x2, 24, -8, 0
-	createsprite gUnknown_085CE7D4, 0x2, 24, 0, 2
-	createsprite gUnknown_085CE7D4, 0x2, 24, 8, 1
-	delay 0xF
-	createsprite gUnknown_085CE7D4, 0x2, 24, -8, 0
-	createsprite gUnknown_085CE7D4, 0x2, 24, 0, 2
-	createsprite gUnknown_085CE7D4, 0x2, 24, 8, 1
+RoarEffect:
+	createsprite gUnknown_085CE7D4, 2, 24, -8, 0
+	createsprite gUnknown_085CE7D4, 2, 24, 0, 2
+	createsprite gUnknown_085CE7D4, 2, 24, 8, 1
+	delay 15
+	createsprite gUnknown_085CE7D4, 2, 24, -8, 0
+	createsprite gUnknown_085CE7D4, 2, 24, 0, 2
+	createsprite gUnknown_085CE7D4, 2, 24, 8, 1
 	return
 
 Move_GROWL:
-	loadspritegfx 0x2745
-	createvisualtask sub_8158E9C, 0x2, 0, 255
-	call AnimScript_82CFECB
-	delay 0xA
-	createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 9, 1
-	createvisualtask sub_80D52D0, 0x2, 3, 1, 0, 9, 1
+	loadspritegfx ANIM_TAG_053
+	createvisualtask sub_8158E9C, 2, 0, 255
+	call RoarEffect
+	delay 10
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 9, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 9, 1
 	waitforvisualfinish
-	createvisualtask sub_8159078, 0x5
+	createvisualtask sub_8159078, 5
 	waitforvisualfinish
 	end
 
 Move_SNORE:
-	loadspritegfx 0x27D5
+	loadspritegfx ANIM_TAG_197
 	monbg ANIM_ATK_PARTNER
-	setalpha 0x808
-	call AnimScript_82CFF76
-	delay 0x1E
-	call AnimScript_82CFF76
+	setalpha 8, 8
+	call Snore1
+	delay 30
+	call Snore1
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
 	end
-
-AnimScript_82CFF76:
+Snore1:
 	playsewithpan SE_W173, -64
-	createvisualtask sub_80D6064, 0x5, -7, -7, 7, 0, 1
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 7, 1
-	createsprite gUnknown_085972D8, 0x2, 6, 1, 14, 0, 0
-	createsprite gUnknown_085936EC, 0x2, 0, 0, -42, -38, 24, 0, 0
-	createsprite gUnknown_085936EC, 0x2, 0, 0, 0, -42, 24, 0, 0
-	createsprite gUnknown_085936EC, 0x2, 0, 0, 42, -38, 24, 0, 0
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1
+	createsprite gBattleAnimSpriteTemplate_85972D8, 2, 6, 1, 14, 0, 0
+	createsprite gUnknown_085936EC, 2, 0, 0, -42, -38, 24, 0, 0
+	createsprite gUnknown_085936EC, 2, 0, 0, 0, -42, 24, 0, 0
+	createsprite gUnknown_085936EC, 2, 0, 0, 42, -38, 24, 0, 0
 	return
 
 Move_LIGHT_SCREEN:
-	loadspritegfx 0x2756
-	loadspritegfx 0x27B6
-	setalpha 0x1000
-	waitplaysewithpan SE_W115, -64, 0xF
-	createsprite gUnknown_08596560, 0x1, 40, 0, 10166
-	delay 0xA
-	call AnimScript_82D0014
-	waitforvisualfinish
-	delay 0x1
-	blendoff
-	end
-
-AnimScript_82D0014:
-	createsprite gUnknown_08596624, 0x2, 23, 0, 0, 1
-	delay 0x6
-	createsprite gUnknown_08596624, 0x2, 31, -8, 0, 1
-	delay 0x5
-	createsprite gUnknown_08596624, 0x2, 30, 20, 0, 1
-	delay 0x7
-	createsprite gUnknown_08596624, 0x2, 10, -15, 0, 1
-	delay 0x6
-	createsprite gUnknown_08596624, 0x2, 20, 10, 0, 1
-	delay 0x6
-	createsprite gUnknown_08596624, 0x2, 10, 18, 0, 1
+	loadspritegfx ANIM_TAG_070
+	loadspritegfx ANIM_TAG_166
+	setalpha 0, 16
+	waitplaysewithpan SE_W115, -64, 15
+	createsprite gUnknown_08596560, 1, 40, 0, 10166
+	delay 10
+	call SpecialScreenEffect
+	waitforvisualfinish
+	delay 1
+	blendoff
+	end
+
+SpecialScreenEffect:
+	createsprite gUnknown_08596624, 2, 23, 0, 0, 1
+	delay 6
+	createsprite gUnknown_08596624, 2, 31, -8, 0, 1
+	delay 5
+	createsprite gUnknown_08596624, 2, 30, 20, 0, 1
+	delay 7
+	createsprite gUnknown_08596624, 2, 10, -15, 0, 1
+	delay 6
+	createsprite gUnknown_08596624, 2, 20, 10, 0, 1
+	delay 6
+	createsprite gUnknown_08596624, 2, 10, 18, 0, 1
 	return
 
 Move_MIRROR_COAT:
-	loadspritegfx 0x2756
-	loadspritegfx 0x27B8
-	setalpha 0x1000
-	createsprite gUnknown_08596590, 0x1, 40, 0, 10168
-	delay 0xA
+	loadspritegfx ANIM_TAG_070
+	loadspritegfx ANIM_TAG_168
+	setalpha 0, 16
+	createsprite gUnknown_08596590, 1, 40, 0, 10168
+	delay 10
 	playsewithpan SE_W115, -64
-	call AnimScript_82D0014
+	call SpecialScreenEffect
 	waitforvisualfinish
-	delay 0x1
+	delay 1
 	blendoff
 	end
 
 Move_REFLECT:
-	loadspritegfx 0x2757
-	loadspritegfx 0x27B7
-	setalpha 0x1000
-	waitplaysewithpan SE_W115, -64, 0xF
-	createsprite gUnknown_08596578, 0x1, 40, 0, 10167
-	delay 0x14
-	createsprite gUnknown_085965F4, 0x2, 30, 0, 0, 1
-	delay 0x7
-	createsprite gUnknown_085965F4, 0x2, 19, -12, 0, 1
-	delay 0x7
-	createsprite gUnknown_085965F4, 0x2, 10, 20, 0, 1
+	loadspritegfx ANIM_TAG_071
+	loadspritegfx ANIM_TAG_167
+	setalpha 0, 16
+	waitplaysewithpan SE_W115, -64, 15
+	createsprite gUnknown_08596578, 1, 40, 0, 10167
+	delay 20
+	createsprite gUnknown_085965F4, 2, 30, 0, 0, 1
+	delay 7
+	createsprite gUnknown_085965F4, 2, 19, -12, 0, 1
+	delay 7
+	createsprite gUnknown_085965F4, 2, 10, 20, 0, 1
 	waitforvisualfinish
-	delay 0x1
+	delay 1
 	blendoff
 	end
 
 Move_BARRIER:
-	loadspritegfx 0x27B9
-	setalpha 0x1000
-	waitplaysewithpan SE_W112, -64, 0xF
-	createsprite gUnknown_085965A8, 0x3, 40, 0, 10169
+	loadspritegfx ANIM_TAG_169
+	setalpha 0, 16
+	waitplaysewithpan SE_W112, -64, 15
+	createsprite gUnknown_085965A8, 3, 40, 0, 10169
 	waitforvisualfinish
-	delay 0x1
+	delay 1
 	blendoff
 	end
 
 Move_BUBBLE:
-	loadspritegfx 0x27A2
-	loadspritegfx 0x27AB
+	loadspritegfx ANIM_TAG_146
+	loadspritegfx ANIM_TAG_155
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	delay 0x1
-	createsprite gUnknown_08595068, 0x2, 18, 0, 15, -15, 10, 128, 100
+	setalpha 12, 8
+	delay 1
+	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 15, -15, 10, 128, 100
 	playsewithpan SE_W145, -64
-	waitplaysewithpan SE_W145B, +63, 0x64
-	delay 0x6
-	createsprite gUnknown_08595068, 0x2, 18, 0, 35, 37, 40, 128, 100
+	waitplaysewithpan SE_W145B, +63, 100
+	delay 6
+	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 35, 37, 40, 128, 100
 	playsewithpan SE_W145, -64
-	waitplaysewithpan SE_W145B, +63, 0x64
-	delay 0x6
-	createsprite gUnknown_08595068, 0x2, 18, 0, 10, -37, 30, 128, 100
+	waitplaysewithpan SE_W145B, +63, 100
+	delay 6
+	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 10, -37, 30, 128, 100
 	playsewithpan SE_W145, -64
-	waitplaysewithpan SE_W145B, +63, 0x64
-	delay 0x6
-	createsprite gUnknown_08595068, 0x2, 18, 0, 30, 10, 15, 128, 100
+	waitplaysewithpan SE_W145B, +63, 100
+	delay 6
+	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 30, 10, 15, 128, 100
 	playsewithpan SE_W145, -64
-	waitplaysewithpan SE_W145B, +63, 0x64
-	delay 0x6
-	createsprite gUnknown_08595068, 0x2, 18, 0, 20, 33, 20, 128, 100
+	waitplaysewithpan SE_W145B, +63, 100
+	delay 6
+	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 20, 33, 20, 128, 100
 	playsewithpan SE_W145, -64
-	waitplaysewithpan SE_W145B, +63, 0x64
-	delay 0x6
-	createsprite gUnknown_08595068, 0x2, 18, 0, 25, -30, 10, 128, 100
+	waitplaysewithpan SE_W145B, +63, 100
+	delay 6
+	createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 25, -30, 10, 128, 100
 	playsewithpan SE_W145, -64
-	waitplaysewithpan SE_W145B, +63, 0x64
+	waitplaysewithpan SE_W145B, +63, 100
 	waitforvisualfinish
-	call AnimScript_82D7B53
+	call WaterBubbleEffect2
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_SMOG:
-	loadspritegfx 0x27BC
+	loadspritegfx ANIM_TAG_172
 	monbg ANIM_DEF_PARTNER
 	monbgprio_29
-	setalpha 0x80C
-	loopsewithpan SE_W054, +63, 0x11, 0xA
-	call AnimScript_82D024A
-	call AnimScript_82D024A
-	call AnimScript_82D024A
-	call AnimScript_82D024A
-	call AnimScript_82D024A
-	call AnimScript_82D024A
-	call AnimScript_82D024A
-	delay 0x78
-	loopsewithpan SE_W092, +63, 0x12, 0x2
-	createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, 26650
-	delay 0xA
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 15, 1
+	setalpha 12, 8
+	loopsewithpan SE_W054, +63, 17, 10
+	call Smog1
+	call Smog1
+	call Smog1
+	call Smog1
+	call Smog1
+	call Smog1
+	call Smog1
+	delay 120
+	loopsewithpan SE_W092, +63, 18, 2
+	createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(26, 0, 26)
+	delay 10
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 15, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
-
-AnimScript_82D024A:
-	createsprite gUnknown_08595C44, 0x2, 0, -24, 48, 240, 1, 0
-	delay 0x7
+Smog1:
+	createsprite gUnknown_08595C44, 2, 0, -24, 48, 240, 1, 0
+	delay 7
 	return
 
 Move_FAINT_ATTACK:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_ATTACKER
 	fadetobg BG_DARK
 	waitbgfadein
-	delay 0x0
+	delay 0
 	playsewithpan SE_W185, -64
-	createvisualtask sub_80D5830, 0x2, 0, 18, 6, 1, 3
-	createvisualtask sub_81136E8, 0x2, 1
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3
+	createvisualtask sub_81136E8, 2, 1
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	invisible ANIM_ATTACKER
-	delay 0x1
-	createvisualtask sub_8117F60, 0x2
-	setalpha 0x80C
+	delay 1
+	createvisualtask sub_8117F60, 2
+	setalpha 12, 8
 	monbg ANIM_TARGET
-	delay 0x1
+	delay 1
 	playsewithpan SE_W233B, +63
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 9, 1
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 9, 1
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
-	delay 0x1
-	setarg 0x7, 0x1000
-	delay 0x20
-	createvisualtask sub_8113888, 0x2
+	delay 1
+	setarg 7, 0x1000
+	delay 32
+	createvisualtask sub_8113888, 2
 	monbg ANIM_ATTACKER
-	createvisualtask sub_81137E4, 0x2, 1
+	createvisualtask sub_81137E4, 2, 1
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
-	delay 0x1
+	delay 1
 	restorebg
 	waitbgfadein
 	end
 
 Move_SAND_ATTACK:
-	loadspritegfx 0x275A
+	loadspritegfx ANIM_TAG_074
 	monbg ANIM_ATK_PARTNER
 	monbgprio_28 ANIM_ATTACKER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W028, -64
-	createsprite gUnknown_0857FE70, 0x2, 0, -10, 0, 0, 3
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3
 	waitforvisualfinish
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 2
-	call AnimScript_82D0337
-	call AnimScript_82D0337
-	call AnimScript_82D0337
-	call AnimScript_82D0337
-	call AnimScript_82D0337
-	call AnimScript_82D0337
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2
+	call SandAttack1
+	call SandAttack1
+	call SandAttack1
+	call SandAttack1
+	call SandAttack1
+	call SandAttack1
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
 	end
-
-AnimScript_82D0337:
-	createsprite gUnknown_085971A8, 0x82, 15, 15, 20, 0, 0
-	createsprite gUnknown_085971A8, 0x82, 15, 15, 20, 10, 10
-	createsprite gUnknown_085971A8, 0x82, 15, 15, 20, -10, -10
-	createsprite gUnknown_085971A8, 0x82, 15, 15, 20, 20, 5
-	createsprite gUnknown_085971A8, 0x82, 15, 15, 20, -20, -5
-	delay 0x2
+SandAttack1:
+	createsprite gUnknown_085971A8, 130, 15, 15, 20, 0, 0
+	createsprite gUnknown_085971A8, 130, 15, 15, 20, 10, 10
+	createsprite gUnknown_085971A8, 130, 15, 15, 20, -10, -10
+	createsprite gUnknown_085971A8, 130, 15, 15, 20, 20, 5
+	createsprite gUnknown_085971A8, 130, 15, 15, 20, -20, -5
+	delay 2
 	return
 
 Move_MUD_SLAP:
-	loadspritegfx 0x275A
+	loadspritegfx ANIM_TAG_074
 	playsewithpan SE_W028, -64
-	createsprite gUnknown_0857FE70, 0x2, 0, -10, 0, 0, 3
-	waitforvisualfinish
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 2
-	call AnimScript_82D03D5
-	call AnimScript_82D03D5
-	call AnimScript_82D03D5
-	call AnimScript_82D03D5
-	call AnimScript_82D03D5
-	call AnimScript_82D03D5
-	waitforvisualfinish
-	end
-
-AnimScript_82D03D5:
-	createsprite gUnknown_085971CC, 0x82, 15, 15, 20, 0, 0
-	createsprite gUnknown_085971CC, 0x82, 15, 15, 20, 10, 5
-	createsprite gUnknown_085971CC, 0x82, 15, 15, 20, -10, -5
-	createsprite gUnknown_085971CC, 0x82, 15, 15, 20, 20, 10
-	createsprite gUnknown_085971CC, 0x82, 15, 15, 20, -20, -10
-	delay 0x2
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3
+	waitforvisualfinish
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2
+	call MudSlap1
+	call MudSlap1
+	call MudSlap1
+	call MudSlap1
+	call MudSlap1
+	call MudSlap1
+	waitforvisualfinish
+	end
+MudSlap1:
+	createsprite gUnknown_085971CC, 130, 15, 15, 20, 0, 0
+	createsprite gUnknown_085971CC, 130, 15, 15, 20, 10, 5
+	createsprite gUnknown_085971CC, 130, 15, 15, 20, -10, -5
+	createsprite gUnknown_085971CC, 130, 15, 15, 20, 20, 10
+	createsprite gUnknown_085971CC, 130, 15, 15, 20, -20, -10
+	delay 2
 	return
 
 Move_DRAGON_RAGE:
-	loadspritegfx 0x272D
-	loadspritegfx 0x2733
+	loadspritegfx ANIM_TAG_SMALL_EMBER
+	loadspritegfx ANIM_TAG_035
 	playsewithpan SE_W082, -64
-	createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 40, 1
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1
 	waitforvisualfinish
-	createsprite gUnknown_0857FE70, 0x82, 0, 15, 0, 0, 4
+	createsprite gSlideMonToOffsetSpriteTemplate, 130, 0, 15, 0, 0, 4
 	waitforvisualfinish
-	createsprite gUnknown_08596F80, 0x82, 30, 15, 0, 10, 10
+	createsprite gUnknown_08596F80, 130, 30, 15, 0, 10, 10
 	waitforvisualfinish
-	loopsewithpan SE_W172B, +63, 0xB, 0x3
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 3, 25, 1
-	createsprite gUnknown_08596F28, 0xC2, 1, 5, 0
-	delay 0x1
-	createsprite gUnknown_08596F28, 0xC2, 1, -10, -15
-	delay 0x1
-	createsprite gUnknown_08596F28, 0x82, 1, 0, 25
-	delay 0x1
-	createsprite gUnknown_08596F28, 0xC2, 1, 15, 5
-	delay 0x1
-	createsprite gUnknown_08596F28, 0xC2, 1, -25, 0
-	delay 0x1
-	createsprite gUnknown_08596F28, 0x82, 1, 30, 30
-	delay 0x1
-	createsprite gUnknown_08596F28, 0x82, 1, -27, 25
-	delay 0x1
-	createsprite gUnknown_08596F28, 0xC2, 1, 0, 8
+	loopsewithpan SE_W172B, +63, 11, 3
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1
+	createsprite gUnknown_08596F28, 194, 1, 5, 0
+	delay 1
+	createsprite gUnknown_08596F28, 194, 1, -10, -15
+	delay 1
+	createsprite gUnknown_08596F28, 130, 1, 0, 25
+	delay 1
+	createsprite gUnknown_08596F28, 194, 1, 15, 5
+	delay 1
+	createsprite gUnknown_08596F28, 194, 1, -25, 0
+	delay 1
+	createsprite gUnknown_08596F28, 130, 1, 30, 30
+	delay 1
+	createsprite gUnknown_08596F28, 130, 1, -27, 25
+	delay 1
+	createsprite gUnknown_08596F28, 194, 1, 0, 8
 	waitforvisualfinish
-	createsprite gUnknown_0857FE58, 0xC2, 0, 0, 4
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 194, 0, 0, 4
 	waitforvisualfinish
 	end
 
 Move_RAIN_DANCE:
-	loadspritegfx 0x2783
+	loadspritegfx ANIM_TAG_115
 	playsewithpan SE_W240, -64
-	createvisualtask sub_8116620, 0xA, 1921, 2, 0, 4, 0
+	createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK
 	waitforvisualfinish
-	createvisualtask sub_8107188, 0x2, 0, 3, 120
-	createvisualtask sub_8107188, 0x2, 0, 3, 120
-	delay 0x78
-	delay 0x1E
+	createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120
+	createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120
+	delay 120
+	delay 30
 	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 1921, 2, 4, 0, 0
+	createvisualtask sub_8116620, 10, 0x781, 2, 4, 0, RGB_BLACK
 	waitforvisualfinish
 	end
 
 Move_BITE:
-	loadspritegfx 0x279B
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_139
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W044, +63
-	createsprite gUnknown_08597080, 0x2, 0, -32, 0, 0, 819, 10
-	createsprite gUnknown_08597080, 0x2, 0, 32, 4, 0, -819, 10
-	delay 0xA
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 4, 7, 1
+	createsprite gUnknown_08597080, 2, 0, -32, 0, 0, 819, 10
+	createsprite gUnknown_08597080, 2, 0, 32, 4, 0, -819, 10
+	delay 10
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 7, 1
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
-	delay 0x1
+	delay 1
 	end
 
 Move_CRUNCH:
-	loadspritegfx 0x279B
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_139
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	fadetobg BG_DARK
 	waitbgfadein
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W044, +63
-	createsprite gUnknown_08597080, 0x2, -32, -32, 1, 819, 819, 10
-	createsprite gUnknown_08597080, 0x2, 32, 32, 5, -819, -819, 10
-	delay 0xA
-	createsprite gUnknown_08597358, 0x2, -8, 0, 1, 1
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 7, 5, 2
+	createsprite gUnknown_08597080, 2, -32, -32, 1, 819, 819, 10
+	createsprite gUnknown_08597080, 2, 32, 32, 5, -819, -819, 10
+	delay 10
+	createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 1
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 5, 2
 	waitforvisualfinish
 	playsewithpan SE_W044, +63
-	createsprite gUnknown_08597080, 0x2, 32, -32, 7, -819, 819, 10
-	createsprite gUnknown_08597080, 0x2, -32, 32, 3, 819, -819, 10
-	delay 0xA
-	createsprite gUnknown_08597358, 0x2, 8, 0, 1, 1
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 8, 4, 2
+	createsprite gUnknown_08597080, 2, 32, -32, 7, -819, 819, 10
+	createsprite gUnknown_08597080, 2, -32, 32, 3, 819, -819, 10
+	delay 10
+	createsprite gBasicHitSplatSpriteTemplate, 2, 8, 0, 1, 1
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 8, 4, 2
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
-	delay 0x1
+	delay 1
 	restorebg
 	waitbgfadein
 	end
 
 Move_CLAMP:
-	loadspritegfx 0x27A1
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_145
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W011, +63
-	createsprite gUnknown_08597098, 0x2, -32, 0, 2, 819, 0, 10
-	createsprite gUnknown_08597098, 0x2, 32, 0, 6, -819, 0, 10
-	delay 0xA
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 5, 1
+	createsprite gUnknown_08597098, 2, -32, 0, 2, 819, 0, 10
+	createsprite gUnknown_08597098, 2, 32, 0, 6, -819, 0, 10
+	delay 10
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -5412,738 +5343,722 @@ Move_CLAMP:
 Move_ICE_BEAM:
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	loadspritegfx 0x279D
-	createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, RGB_BLACK
+	setalpha 12, 8
+	loadspritegfx ANIM_TAG_141
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK
 	waitforvisualfinish
 	createsoundtask sub_8158C58, 183, -64, 63, 4, 4, 0, 10
-	createsprite gUnknown_08595B2C, 0x2, 20, 12, 0, 12, 20
-	createsprite gUnknown_08595B2C, 0x2, 20, -12, 0, -12, 20
-	delay 0x1
-	call AnimScript_82D07C1
-	call AnimScript_82D07C1
-	call AnimScript_82D07C1
-	createsprite gUnknown_08597274, 0x2, 4, -31, 0, 7, RGB(0, 20, 31)
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 25, 1
-	call AnimScript_82D07C1
-	call AnimScript_82D07C1
-	call AnimScript_82D07C1
-	call AnimScript_82D07C1
-	call AnimScript_82D07C1
-	call AnimScript_82D07C1
-	call AnimScript_82D07C1
-	call AnimScript_82D07C1
-	createsprite gUnknown_08595B14, 0x2, 20, 0, 0, 0, 11
-	delay 0x1
-	createsprite gUnknown_08595B14, 0x2, 20, 0, 0, 0, 11
-	waitforvisualfinish
-	delay 0x14
-	call AnimScript_82D7720
-	createsprite gUnknown_08597274, 0x2, 4, 5, 7, 0, RGB(0, 20, 31)
-	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, RGB_BLACK
+	createsprite gUnknown_08595B2C, 2, 20, 12, 0, 12, 20
+	createsprite gUnknown_08595B2C, 2, 20, -12, 0, -12, 20
+	delay 1
+	call IceBeam1
+	call IceBeam1
+	call IceBeam1
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 4, -31, 0, 7, RGB(0, 20, 31)
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 25, 1
+	call IceBeam1
+	call IceBeam1
+	call IceBeam1
+	call IceBeam1
+	call IceBeam1
+	call IceBeam1
+	call IceBeam1
+	call IceBeam1
+	createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11
+	delay 1
+	createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11
+	waitforvisualfinish
+	delay 20
+	call FreezeEffect1
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 4, 5, 7, 0, RGB(0, 20, 31)
+	waitforvisualfinish
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 7, 0, RGB_BLACK
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
-
-AnimScript_82D07C1:
-	createsprite gUnknown_08595B2C, 0x2, 20, 12, 0, 12, 20
-	createsprite gUnknown_08595B2C, 0x2, 20, -12, 0, -12, 20
-	createsprite gUnknown_08595B14, 0x2, 20, 0, 0, 0, 11
-	delay 0x1
+IceBeam1:
+	createsprite gUnknown_08595B2C, 2, 20, 12, 0, 12, 20
+	createsprite gUnknown_08595B2C, 2, 20, -12, 0, -12, 20
+	createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11
+	delay 1
 	return
 
 Move_WITHDRAW:
 	playsewithpan SE_W029, -64
-	createvisualtask sub_81036A0, 0x5
+	createvisualtask sub_81036A0, 5
 	waitforvisualfinish
 	end
 
 Move_AURORA_BEAM:
-	loadspritegfx 0x279C
+	loadspritegfx ANIM_TAG_140
 	fadetobg BG_AURORABEAM
 	waitbgfadein
 	playsewithpan SE_W062, -64
-	setarg 0x7, 0x0
-	createvisualtask sub_8107528, 0xA, 130
-	call AnimScript_82D088B
-	createvisualtask sub_80D52D0, 0x5, 1, 1, 0, 17, 1
-	call AnimScript_82D088B
-	call AnimScript_82D088B
-	call AnimScript_82D088B
-	setarg 0x7, 0xFFFF
+	setarg 7, 0
+	createvisualtask sub_8107528, 10, 130
+	call AuroraBeam1
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 17, 1
+	call AuroraBeam1
+	call AuroraBeam1
+	call AuroraBeam1
+	setarg 7, -1
 	createsoundtask sub_8158C58, 183, -64, 63, 3, 6, 0, 10
-	createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 40, 1
-	call AnimScript_82D088B
-	call AnimScript_82D088B
-	call AnimScript_82D088B
-	call AnimScript_82D088B
-	call AnimScript_82D088B
-	call AnimScript_82D088B
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1
+	call AuroraBeam1
+	call AuroraBeam1
+	call AuroraBeam1
+	call AuroraBeam1
+	call AuroraBeam1
+	call AuroraBeam1
 	waitforvisualfinish
 	restorebg
 	waitbgfadein
 	end
-
-AnimScript_82D088B:
-	createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17
-	delay 0x1
-	createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17
-	delay 0x1
-	createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17
-	delay 0x1
-	createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17
-	delay 0x1
+AuroraBeam1:
+	createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17
+	delay 1
+	createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17
+	delay 1
+	createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17
+	delay 1
+	createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17
+	delay 1
 	return
 
 Move_SOLAR_BEAM:
-	loadspritegfx 0x27A3
-	choosetwoturnanim AnimScript_82D08E6, AnimScript_82D09E3
-
-AnimScript_82D08E4:
+	loadspritegfx ANIM_TAG_147
+	choosetwoturnanim SolarBeamSetUp, SolarBeamUnleash
+SolarBeamEnd:
 	waitforvisualfinish
 	end
-
-AnimScript_82D08E6:
+SolarBeamSetUp:
 	monbg ANIM_ATK_PARTNER
-	setalpha 0x80C
-	createvisualtask sub_8115A04, 0x2, 2, 1, 4, 0, 11, 12287
+	setalpha 12, 8
+	createvisualtask sub_8115A04, 2, 2, 1, 4, 0, 11, RGB(31, 31, 11)
 	playsewithpan SE_W025, -64
-	call AnimScript_82D0910
+	call SolarBeamSetUp1
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
-	goto AnimScript_82D08E4
-
-AnimScript_82D0910:
-	createsprite gUnknown_085921E0, 0x2, 40, 40, 16
-	delay 0x2
-	createsprite gUnknown_085921E0, 0x2, -40, -40, 16
-	delay 0x2
-	createsprite gUnknown_085921E0, 0x2, 0, 40, 16
-	delay 0x2
-	createsprite gUnknown_085921E0, 0x2, 0, -40, 16
-	delay 0x2
-	createsprite gUnknown_085921E0, 0x2, 40, -20, 16
-	delay 0x2
-	createsprite gUnknown_085921E0, 0x2, 40, 20, 16
-	delay 0x2
-	createsprite gUnknown_085921E0, 0x2, -40, -20, 16
-	delay 0x2
-	createsprite gUnknown_085921E0, 0x2, -40, 20, 16
-	delay 0x2
-	createsprite gUnknown_085921E0, 0x2, -20, 30, 16
-	delay 0x2
-	createsprite gUnknown_085921E0, 0x2, 20, -30, 16
-	delay 0x2
-	createsprite gUnknown_085921E0, 0x2, -20, -30, 16
-	delay 0x2
-	createsprite gUnknown_085921E0, 0x2, 20, 30, 16
-	delay 0x2
-	createsprite gUnknown_085921E0, 0x2, -40, 0, 16
-	delay 0x2
-	createsprite gUnknown_085921E0, 0x2, 40, 0, 16
-	delay 0x2
+	goto SolarBeamEnd
+SolarBeamSetUp1:
+	createsprite gUnknown_085921E0, 2, 40, 40, 16
+	delay 2
+	createsprite gUnknown_085921E0, 2, -40, -40, 16
+	delay 2
+	createsprite gUnknown_085921E0, 2, 0, 40, 16
+	delay 2
+	createsprite gUnknown_085921E0, 2, 0, -40, 16
+	delay 2
+	createsprite gUnknown_085921E0, 2, 40, -20, 16
+	delay 2
+	createsprite gUnknown_085921E0, 2, 40, 20, 16
+	delay 2
+	createsprite gUnknown_085921E0, 2, -40, -20, 16
+	delay 2
+	createsprite gUnknown_085921E0, 2, -40, 20, 16
+	delay 2
+	createsprite gUnknown_085921E0, 2, -20, 30, 16
+	delay 2
+	createsprite gUnknown_085921E0, 2, 20, -30, 16
+	delay 2
+	createsprite gUnknown_085921E0, 2, -20, -30, 16
+	delay 2
+	createsprite gUnknown_085921E0, 2, 20, 30, 16
+	delay 2
+	createsprite gUnknown_085921E0, 2, -40, 0, 16
+	delay 2
+	createsprite gUnknown_085921E0, 2, 40, 0, 16
+	delay 2
 	return
-
-AnimScript_82D09E3:
-	call AnimScript_82D7D1D
-	panse_1B SE_W076, -64, +63, +2, 0x0
-	createvisualtask sub_80FEA58, 0x5
-	createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 0
-	delay 0x4
-	createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 1
-	delay 0x4
-	createvisualtask sub_8116620, 0xA, 4, 1, 0, 10, 1017
-	createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 2
-	delay 0x4
-	createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 65, 1
-	createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 3
-	delay 0x4
-	createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 4
-	delay 0x4
-	createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 5
-	delay 0x4
-	createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 6
-	delay 0x4
-	call AnimScript_82D0AB5
-	call AnimScript_82D0AB5
-	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 4, 1, 10, 0, 1017
-	call AnimScript_82D7D57
-	goto AnimScript_82D08E4
-
-AnimScript_82D0AB5:
-	createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 0
-	delay 0x4
-	createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 1
-	delay 0x4
-	createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 2
-	delay 0x4
-	createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 3
-	delay 0x4
-	createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 4
-	delay 0x4
-	createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 5
-	delay 0x4
-	createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 6
-	delay 0x4
+SolarBeamUnleash:
+	call SetSolarbeamBg
+	panse_1B SE_W076, -64, +63, +2, 0
+	createvisualtask sub_80FEA58, 5
+	createsprite gUnknown_085921F8, 131, 15, 0, 20, 0
+	delay 4
+	createsprite gUnknown_085921F8, 131, 15, 0, 20, 1
+	delay 4
+	createvisualtask sub_8116620, 10, 4, 1, 0, 10, RGB(25, 31, 0)
+	createsprite gUnknown_085921F8, 131, 15, 0, 20, 2
+	delay 4
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 65, 1
+	createsprite gUnknown_085921F8, 131, 15, 0, 20, 3
+	delay 4
+	createsprite gUnknown_085921F8, 131, 15, 0, 20, 4
+	delay 4
+	createsprite gUnknown_085921F8, 131, 15, 0, 20, 5
+	delay 4
+	createsprite gUnknown_085921F8, 131, 15, 0, 20, 6
+	delay 4
+	call SolarBeamUnleash1
+	call SolarBeamUnleash1
+	waitforvisualfinish
+	createvisualtask sub_8116620, 10, 4, 1, 10, 0, RGB(25, 31, 0)
+	call UnsetSolarbeamBg
+	goto SolarBeamEnd
+SolarBeamUnleash1:
+	createsprite gUnknown_085921F8, 131, 15, 0, 20, 0
+	delay 4
+	createsprite gUnknown_085921F8, 131, 15, 0, 20, 1
+	delay 4
+	createsprite gUnknown_085921F8, 131, 15, 0, 20, 2
+	delay 4
+	createsprite gUnknown_085921F8, 131, 15, 0, 20, 3
+	delay 4
+	createsprite gUnknown_085921F8, 131, 15, 0, 20, 4
+	delay 4
+	createsprite gUnknown_085921F8, 131, 15, 0, 20, 5
+	delay 4
+	createsprite gUnknown_085921F8, 131, 15, 0, 20, 6
+	delay 4
 	return
 
 Move_BLIZZARD:
-	loadspritegfx 0x279D
+	loadspritegfx ANIM_TAG_141
 	monbg ANIM_DEF_PARTNER
-	createvisualtask sub_8117754, 0x2
-	jumpargeq 0x7, 0x1, AnimScript_82D0CB2
+	createvisualtask AnimTask_IsAttackerOpponentSide, 2
+	jumprettrue BlizzardAgainstPlayer
 	fadetobg BG_HIGHSPEED_OPPONENT
-
-AnimScript_82D0B43:
+BlizzardContinue:
 	waitbgfadeout
-	createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1
+	createvisualtask sub_8117660, 5, -2304, 0, 1, -1
 	waitbgfadein
 	waitforvisualfinish
-	panse_1B SE_W059, -64, +63, +2, 0x0
-	call AnimScript_82D0B7D
-	call AnimScript_82D0B7D
+	panse_1B SE_W059, -64, +63, +2, 0
+	call Blizzard1
+	call Blizzard1
 	playsewithpan SE_W059B, +63
 	waitforvisualfinish
-	call AnimScript_82D77A4
+	call FreezeEffect2
 	waitforvisualfinish
-	delay 0x14
+	delay 20
 	restorebg
 	waitbgfadeout
-	setarg 0x7, 0xFFFF
+	setarg 7, -1
 	waitbgfadein
 	clearmonbg ANIM_DEF_PARTNER
 	end
-
-AnimScript_82D0B7D:
-	createsprite gUnknown_08595B98, 0x28, 0, -10, 0, -10, 72, 1
-	createsprite gUnknown_08595BB0, 0x28, 0, 0, 0, 0, 80, 0, 0, 1
-	delay 0x3
-	createsprite gUnknown_08595B98, 0x28, 0, -15, 0, -15, 72, 1
-	createsprite gUnknown_08595BB0, 0x28, 0, -10, 0, -10, 80, 0, 0, 1
-	delay 0x3
-	createsprite gUnknown_08595B98, 0x28, 0, -5, 0, -5, 72, 1
-	createsprite gUnknown_08595BB0, 0x28, 0, 10, 0, 10, 80, 0, 0, 1
-	delay 0x3
-	createsprite gUnknown_08595B98, 0x28, 0, -10, 0, -10, 72, 1
-	createsprite gUnknown_08595BB0, 0x28, 0, -20, 0, -20, 80, 0, 0, 1
-	delay 0x3
-	createsprite gUnknown_08595B98, 0x28, 0, -20, 0, -20, 72, 1
-	createsprite gUnknown_08595BB0, 0x28, 0, 15, 0, 15, 80, 0, 0, 1
-	delay 0x3
-	createsprite gUnknown_08595B98, 0x28, 0, -15, 0, -15, 72, 1
-	createsprite gUnknown_08595BB0, 0x28, 0, -20, 0, -20, 80, 0, 0, 1
-	delay 0x3
-	createsprite gUnknown_08595B98, 0x28, 0, -25, 0, -25, 72, 1
-	createsprite gUnknown_08595BB0, 0x28, 0, 20, 0, 20, 80, 0, 0, 1
-	delay 0x3
+Blizzard1:
+	createsprite gUnknown_08595B98, 40, 0, -10, 0, -10, 72, 1
+	createsprite gUnknown_08595BB0, 40, 0, 0, 0, 0, 80, 0, 0, 1
+	delay 3
+	createsprite gUnknown_08595B98, 40, 0, -15, 0, -15, 72, 1
+	createsprite gUnknown_08595BB0, 40, 0, -10, 0, -10, 80, 0, 0, 1
+	delay 3
+	createsprite gUnknown_08595B98, 40, 0, -5, 0, -5, 72, 1
+	createsprite gUnknown_08595BB0, 40, 0, 10, 0, 10, 80, 0, 0, 1
+	delay 3
+	createsprite gUnknown_08595B98, 40, 0, -10, 0, -10, 72, 1
+	createsprite gUnknown_08595BB0, 40, 0, -20, 0, -20, 80, 0, 0, 1
+	delay 3
+	createsprite gUnknown_08595B98, 40, 0, -20, 0, -20, 72, 1
+	createsprite gUnknown_08595BB0, 40, 0, 15, 0, 15, 80, 0, 0, 1
+	delay 3
+	createsprite gUnknown_08595B98, 40, 0, -15, 0, -15, 72, 1
+	createsprite gUnknown_08595BB0, 40, 0, -20, 0, -20, 80, 0, 0, 1
+	delay 3
+	createsprite gUnknown_08595B98, 40, 0, -25, 0, -25, 72, 1
+	createsprite gUnknown_08595BB0, 40, 0, 20, 0, 20, 80, 0, 0, 1
+	delay 3
 	return
-
-AnimScript_82D0CB2:
+BlizzardAgainstPlayer:
 	fadetobg BG_HIGHSPEED_PLAYER
-	goto AnimScript_82D0B43
+	goto BlizzardContinue
 
 Move_POWDER_SNOW:
-	loadspritegfx 0x279D
+	loadspritegfx ANIM_TAG_141
 	monbg ANIM_DEF_PARTNER
-	createsprite gUnknown_08597274, 0x2, 31, 1, 0, 3, RGB_BLACK
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 0, 3, RGB_BLACK
 	waitforvisualfinish
-	panse_1B SE_W016, -64, +63, +2, 0x0
-	call AnimScript_82D0D03
-	call AnimScript_82D0D03
+	panse_1B SE_W016, -64, +63, +2, 0
+	call PowderSnow1
+	call PowderSnow1
 	playsewithpan SE_W016B, +63
 	waitforvisualfinish
 	waitsound
-	call AnimScript_82D77A4
+	call FreezeEffect2
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
-	delay 0x14
-	createsprite gUnknown_08597274, 0x2, 31, 1, 3, 0, RGB_BLACK
-	end
-
-AnimScript_82D0D03:
-	createsprite gUnknown_08595BC8, 0x28, 0, 0, 0, 0, 56, 4, 4, 1
-	delay 0x3
-	createsprite gUnknown_08595BC8, 0x28, 0, -10, 0, -10, 56, 4, 4, 1
-	delay 0x3
-	createsprite gUnknown_08595BC8, 0x28, 0, 10, 0, 10, 56, -4, 3, 1
-	delay 0x3
-	createsprite gUnknown_08595BC8, 0x28, 0, -20, 0, -20, 56, -4, 5, 1
-	delay 0x3
-	createsprite gUnknown_08595BC8, 0x28, 0, 15, 0, 15, 56, 4, 4, 1
-	delay 0x3
-	createsprite gUnknown_08595BC8, 0x28, 0, -20, 0, -20, 56, 4, 4, 1
-	delay 0x3
-	createsprite gUnknown_08595BC8, 0x28, 0, 20, 0, 20, 56, 4, 4, 1
-	delay 0x3
+	delay 20
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 3, 0, RGB_BLACK
+	end
+PowderSnow1:
+	createsprite gUnknown_08595BC8, 40, 0, 0, 0, 0, 56, 4, 4, 1
+	delay 3
+	createsprite gUnknown_08595BC8, 40, 0, -10, 0, -10, 56, 4, 4, 1
+	delay 3
+	createsprite gUnknown_08595BC8, 40, 0, 10, 0, 10, 56, -4, 3, 1
+	delay 3
+	createsprite gUnknown_08595BC8, 40, 0, -20, 0, -20, 56, -4, 5, 1
+	delay 3
+	createsprite gUnknown_08595BC8, 40, 0, 15, 0, 15, 56, 4, 4, 1
+	delay 3
+	createsprite gUnknown_08595BC8, 40, 0, -20, 0, -20, 56, 4, 4, 1
+	delay 3
+	createsprite gUnknown_08595BC8, 40, 0, 20, 0, 20, 56, 4, 4, 1
+	delay 3
 	return
 
 Move_HYDRO_PUMP:
-	loadspritegfx 0x27A5
-	loadspritegfx 0x27A4
+	loadspritegfx ANIM_TAG_149
+	loadspritegfx ANIM_TAG_148
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 40, 1
-	delay 0x6
-	panse_1B SE_W056, -64, +63, +2, 0x0
-	createvisualtask sub_81076C8, 0x5, 100
-	call AnimScript_82D0E52
-	call AnimScript_82D0E52
-	call AnimScript_82D0E52
-	createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 37, 1
-	call AnimScript_82D0E93
-	call AnimScript_82D0E52
-	call AnimScript_82D0E52
-	call AnimScript_82D0E93
-	call AnimScript_82D0E52
-	call AnimScript_82D0E52
-	call AnimScript_82D0E93
-	call AnimScript_82D0E52
-	call AnimScript_82D0E52
-	call AnimScript_82D0E93
-	call AnimScript_82D0E52
-	call AnimScript_82D0E52
-	call AnimScript_82D0E93
-	delay 0x1
-	delay 0x1
-	call AnimScript_82D0E93
+	setalpha 12, 8
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1
+	delay 6
+	panse_1B SE_W056, -64, +63, +2, 0
+	createvisualtask sub_81076C8, 5, 100
+	call HydroPump1
+	call HydroPump1
+	call HydroPump1
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 37, 1
+	call HydroPump2
+	call HydroPump1
+	call HydroPump1
+	call HydroPump2
+	call HydroPump1
+	call HydroPump1
+	call HydroPump2
+	call HydroPump1
+	call HydroPump1
+	call HydroPump2
+	call HydroPump1
+	call HydroPump1
+	call HydroPump2
+	delay 1
+	delay 1
+	call HydroPump2
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
-
-AnimScript_82D0E52:
-	createsprite gUnknown_085950E4, 0x3, 10, 10, 0, 16
-	createsprite gUnknown_085950E4, 0x3, 10, 10, 0, -16
-	delay 0x1
-	createsprite gUnknown_085950E4, 0x3, 10, 10, 0, 16
-	createsprite gUnknown_085950E4, 0x3, 10, 10, 0, -16
-	delay 0x1
+HydroPump1:
+	createsprite gUnknown_085950E4, 3, 10, 10, 0, 16
+	createsprite gUnknown_085950E4, 3, 10, 10, 0, -16
+	delay 1
+	createsprite gUnknown_085950E4, 3, 10, 10, 0, 16
+	createsprite gUnknown_085950E4, 3, 10, 10, 0, -16
+	delay 1
 	return
-
-AnimScript_82D0E93:
-	createsprite gUnknown_08597388, 0x4, 0, 15, 1, 1
-	createsprite gUnknown_08597388, 0x4, 0, -15, 1, 1
+HydroPump2:
+	createsprite gUnknown_08597388, 4, 0, 15, 1, 1
+	createsprite gUnknown_08597388, 4, 0, -15, 1, 1
 	return
 
 Move_SIGNAL_BEAM:
-	loadspritegfx 0x2818
-	loadspritegfx 0x2819
-	loadspritegfx 0x2759
-	createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 25, 1
-	delay 0x6
-	panse_1B SE_W062, -64, +63, +1, 0x0
-	createvisualtask sub_81076C8, 0x5, 100
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 25, 1
-	createsprite gUnknown_0859728C, 0x2, 4, 8, 5, 31, 8, 961, 8
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	call AnimScript_82D0F79
-	waitforvisualfinish
-	end
-
-AnimScript_82D0F79:
-	createsprite gUnknown_08595114, 0x83, 10, 10, 0, 16
-	createsprite gUnknown_0859512C, 0x83, 10, 10, 0, -16
-	delay 0x1
+	loadspritegfx ANIM_TAG_264
+	loadspritegfx ANIM_TAG_265
+	loadspritegfx ANIM_TAG_DUCK
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 25, 1
+	delay 6
+	panse_1B SE_W062, -64, +63, +1, 0
+	createvisualtask sub_81076C8, 5, 100
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 25, 1
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 4, 8, 5, RGB_RED, 8, 961, 8
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	call SignalBeam1
+	waitforvisualfinish
+	end
+SignalBeam1:
+	createsprite gUnknown_08595114, 131, 10, 10, 0, 16
+	createsprite gUnknown_0859512C, 131, 10, 10, 0, -16
+	delay 1
 	return
 
 Move_ABSORB:
-	loadspritegfx 0x27A3
-	loadspritegfx 0x272F
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_147
+	loadspritegfx ANIM_TAG_BLUE_STAR
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	monbgprio_2A ANIM_TARGET
-	setalpha 0x80C
-	createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, RGB(13, 31, 12)
+	setalpha 12, 8
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB(13, 31, 12)
 	waitforvisualfinish
 	playsewithpan SE_W071, +63
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
-	delay 0x2
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+	delay 2
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
 	waitforvisualfinish
-	delay 0x3
-	call AnimScript_82D1009
+	delay 3
+	call AbsorbEffect
 	waitforvisualfinish
-	delay 0xF
-	call AnimScript_82D79DF
+	delay 15
+	call HealingEffect
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, RGB(13, 31, 12)
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB(13, 31, 12)
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
-AnimScript_82D1009:
+AbsorbEffect:
 	playsewithpan SE_W152, +63
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	delay 4
 	playsewithpan SE_W152, +63
-	createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
+	delay 4
 	playsewithpan SE_W152, +63
-	createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33
-	delay 0x4
+	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
+	delay 4
 	playsewithpan SE_W152, +63
-	createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, -15, -16, 36
+	delay 4
 	playsewithpan SE_W152, +63
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	delay 4
 	playsewithpan SE_W152, +63
-	createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
+	delay 4
 	playsewithpan SE_W152, +63
-	createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39
-	delay 0x4
+	createsprite gUnknown_08592270, 3, -10, 20, 20, 39
+	delay 4
 	playsewithpan SE_W152, +63
-	createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 5, -18, -20, 35
+	delay 4
 	return
 
 Move_MEGA_DRAIN:
-	loadspritegfx 0x27A3
-	loadspritegfx 0x272F
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_147
+	loadspritegfx ANIM_TAG_BLUE_STAR
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	monbgprio_2A ANIM_TARGET
-	setalpha 0x80C
-	createsprite gUnknown_08597274, 0x2, 1, 1, 0, 8, RGB(13, 31, 12)
+	setalpha 12, 8
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 8, RGB(13, 31, 12)
 	waitforvisualfinish
 	playsewithpan SE_W071, +63
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1
-	delay 0x2
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1
+	delay 2
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
 	waitforvisualfinish
-	delay 0x3
-	call AnimScript_82D1121
+	delay 3
+	call MegaDrainEffect
 	waitforvisualfinish
-	delay 0xF
-	call AnimScript_82D79DF
+	delay 15
+	call HealingEffect
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 1, 8, 0, RGB(13, 31, 12)
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 8, 0, RGB(13, 31, 12)
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
-AnimScript_82D1121:
+MegaDrainEffect:
 	playsewithpan SE_W145C, +63
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	createsprite gUnknown_08592270, 3, 5, -18, -20, 35
+	delay 4
 	playsewithpan SE_W145C, +63
-	createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26
-	createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
+	createsprite gUnknown_08592270, 3, -10, 20, 20, 39
+	delay 4
 	playsewithpan SE_W145C, +63
-	createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33
-	createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26
-	delay 0x4
+	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
+	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
+	delay 4
 	playsewithpan SE_W145C, +63
-	createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, -15, -16, 36
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	delay 4
 	playsewithpan SE_W145C, +63
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	createsprite gUnknown_08592270, 3, 0, -15, -16, 36
+	delay 4
 	playsewithpan SE_W145C, +63
-	createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26
-	createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
+	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
+	delay 4
 	playsewithpan SE_W145C, +63
-	createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39
-	createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26
-	delay 0x4
+	createsprite gUnknown_08592270, 3, -10, 20, 20, 39
+	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
+	delay 4
 	playsewithpan SE_W145C, +63
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	createsprite gUnknown_08592270, 3, 5, -18, -20, 35
+	delay 4
 	return
 
 Move_GIGA_DRAIN:
-	loadspritegfx 0x27A3
-	loadspritegfx 0x272F
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_147
+	loadspritegfx ANIM_TAG_BLUE_STAR
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	monbgprio_2A ANIM_TARGET
-	setalpha 0x80C
-	createsprite gUnknown_08597274, 0x2, 1, 1, 0, 12, RGB(13, 31, 12)
+	setalpha 12, 8
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 12, RGB(13, 31, 12)
 	waitforvisualfinish
 	playsewithpan SE_W071, +63
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0
-	delay 0x2
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
+	delay 2
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
 	waitforvisualfinish
-	delay 0x3
-	call AnimScript_82D12B1
+	delay 3
+	call GigaDrainEffect
 	waitforvisualfinish
-	delay 0xF
-	call AnimScript_82D79DF
+	delay 15
+	call HealingEffect
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 1, 12, 0, RGB(13, 31, 12)
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 12, 0, RGB(13, 31, 12)
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
-AnimScript_82D12B1:
+GigaDrainEffect:
 	playsewithpan SE_W202, +63
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	createsprite gUnknown_08592270, 0x3, 5, -18, -40, 35
-	createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	createsprite gUnknown_08592270, 3, 5, -18, -40, 35
+	createsprite gUnknown_08592270, 3, -10, 20, 20, 39
+	delay 4
 	playsewithpan SE_W202, +63
-	createsprite gUnknown_08592270, 0x3, 0, 5, 28, 26
-	createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26
-	createsprite gUnknown_08592270, 0x3, -10, 20, 40, 39
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, 5, 28, 26
+	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
+	createsprite gUnknown_08592270, 3, -10, 20, 40, 39
+	delay 4
 	playsewithpan SE_W202, +63
-	createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26
-	createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33
-	createsprite gUnknown_08592270, 0x3, 10, -5, -32, 26
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
+	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
+	createsprite gUnknown_08592270, 3, 10, -5, -32, 26
+	delay 4
 	playsewithpan SE_W202, +63
-	createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, -15, -16, 36
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
+	delay 4
 	playsewithpan SE_W202, +63
-	createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33
-	createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	delay 0x4
+	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
+	createsprite gUnknown_08592270, 3, 0, -15, -16, 36
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	delay 4
 	playsewithpan SE_W202, +63
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33
-	createsprite gUnknown_08592270, 0x3, 10, -5, -40, 26
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
+	createsprite gUnknown_08592270, 3, 10, -5, -40, 26
+	delay 4
 	playsewithpan SE_W202, +63
-	createsprite gUnknown_08592270, 0x3, -5, 15, 36, 33
-	createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26
-	createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39
-	delay 0x4
+	createsprite gUnknown_08592270, 3, -5, 15, 36, 33
+	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
+	createsprite gUnknown_08592270, 3, -10, 20, 20, 39
+	delay 4
 	playsewithpan SE_W202, +63
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	createsprite gUnknown_08592270, 3, 5, -18, -20, 35
+	delay 4
 	return
 
 Move_LEECH_LIFE:
-	loadspritegfx 0x27B1
-	loadspritegfx 0x27A3
-	delay 0x1
-	loadspritegfx 0x272F
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_161
+	loadspritegfx ANIM_TAG_147
+	delay 1
+	loadspritegfx ANIM_TAG_BLUE_STAR
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	monbgprio_2A ANIM_TARGET
-	setalpha 0x80C
-	delay 0x1
-	createsprite gUnknown_085969C8, 0x2, -20, 15, 12
+	setalpha 12, 8
+	delay 1
+	createsprite gUnknown_085969C8, 2, -20, 15, 12
 	waitforvisualfinish
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
 	playsewithpan SE_W071, +63
-	delay 0x2
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1
+	delay 2
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK
 	waitforvisualfinish
-	call AnimScript_82D1009
+	call AbsorbEffect
 	waitforvisualfinish
-	delay 0xF
-	call AnimScript_82D79DF
+	delay 15
+	call HealingEffect
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 1, 7, 0, 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 7, 0, RGB_BLACK
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_SYNTHESIS:
-	loadspritegfx 0x2741
-	createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 16, 19451
+	loadspritegfx ANIM_TAG_SPARKLE
+	createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 16, RGB(27, 31, 18)
 	playsewithpan SE_W025, -64
-	call AnimScript_82D79B4
+	call GrantingStarsEffect
 	waitforvisualfinish
-	unloadspritegfx 0x2741
-	delay 0x1
-	loadspritegfx 0x272F
-	call AnimScript_82D79DF
+	unloadspritegfx ANIM_TAG_SPARKLE
+	delay 1
+	loadspritegfx ANIM_TAG_BLUE_STAR
+	call HealingEffect
 	waitforvisualfinish
 	end
 
 Move_TOXIC:
-	loadspritegfx 0x27A7
-	loadspritegfx 0x27A6
-	call AnimScript_82D1515
-	call AnimScript_82D1515
+	loadspritegfx ANIM_TAG_TOXIC_BUBBLE
+	loadspritegfx ANIM_TAG_POISON_BUBBLE
+	call Toxic1
+	call Toxic1
 	waitforvisualfinish
-	delay 0xF
-	call AnimScript_82D7A71
+	delay 15
+	call PoisonBubblesEffect
 	waitforvisualfinish
 	end
-
-AnimScript_82D1515:
-	createsprite gUnknown_08596134, 0x82, -24, 16, 1, 1
+Toxic1:
+	createsprite gUnknown_08596134, 130, -24, 16, 1, 1
 	playsewithpan SE_W092, +63
-	delay 0xF
-	createsprite gUnknown_08596134, 0x82, 8, 16, 1, 1
+	delay 15
+	createsprite gUnknown_08596134, 130, 8, 16, 1, 1
 	playsewithpan SE_W092, +63
-	delay 0xF
-	createsprite gUnknown_08596134, 0x82, -8, 16, 1, 1
+	delay 15
+	createsprite gUnknown_08596134, 130, -8, 16, 1, 1
 	playsewithpan SE_W092, +63
-	delay 0xF
-	createsprite gUnknown_08596134, 0x82, 24, 16, 1, 1
+	delay 15
+	createsprite gUnknown_08596134, 130, 24, 16, 1, 1
 	playsewithpan SE_W092, +63
-	delay 0xF
+	delay 15
 	return
 
 Move_SLUDGE:
-	loadspritegfx 0x27A6
+	loadspritegfx ANIM_TAG_POISON_BUBBLE
 	playsewithpan SE_W145C, -64
-	createsprite gUnknown_085961A8, 0x82, 20, 0, 40, 0
+	createsprite gUnknown_085961A8, 130, 20, 0, 40, 0
 	waitforvisualfinish
-	createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 5, 1
-	createvisualtask sub_8115A04, 0x2, 4, 1, 2, 0, 12, 31774
-	call AnimScript_82D7A71
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1
+	createvisualtask sub_8115A04, 2, 4, 1, 2, 0, 12, RGB(30, 0, 31)
+	call PoisonBubblesEffect
 	waitforvisualfinish
 	end
 
 Move_SLUDGE_BOMB:
-	loadspritegfx 0x27A6
-	call AnimScript_82D16BC
-	call AnimScript_82D16BC
-	call AnimScript_82D16BC
-	call AnimScript_82D16BC
-	call AnimScript_82D16BC
-	call AnimScript_82D16BC
-	call AnimScript_82D16BC
-	call AnimScript_82D16BC
-	call AnimScript_82D16BC
-	call AnimScript_82D16BC
-	createvisualtask sub_80D52D0, 0x5, 1, 3, 0, 15, 1
-	createvisualtask sub_8115A04, 0x2, 4, 1, 2, 0, 12, 31774
-	createsprite gUnknown_085961D8, 0x82, 42, 27, 20
-	createsprite gUnknown_085961D8, 0x82, -27, 44, 20
-	createsprite gUnknown_085961D8, 0x82, 39, -28, 20
-	createsprite gUnknown_085961D8, 0x82, -42, -42, 20
+	loadspritegfx ANIM_TAG_POISON_BUBBLE
+	call SludgeBomb1
+	call SludgeBomb1
+	call SludgeBomb1
+	call SludgeBomb1
+	call SludgeBomb1
+	call SludgeBomb1
+	call SludgeBomb1
+	call SludgeBomb1
+	call SludgeBomb1
+	call SludgeBomb1
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1
+	createvisualtask sub_8115A04, 2, 4, 1, 2, 0, 12, RGB(30, 0, 31)
+	createsprite gUnknown_085961D8, 130, 42, 27, 20
+	createsprite gUnknown_085961D8, 130, -27, 44, 20
+	createsprite gUnknown_085961D8, 130, 39, -28, 20
+	createsprite gUnknown_085961D8, 130, -42, -42, 20
 	playsewithpan SE_W091, +63
-	delay 0x5
-	createsprite gUnknown_085961D8, 0x82, 0, 40, 20
-	createsprite gUnknown_085961D8, 0x82, -8, -44, 20
-	createsprite gUnknown_085961D8, 0x82, -46, -28, 20
-	createsprite gUnknown_085961D8, 0x82, 46, 9, 20
+	delay 5
+	createsprite gUnknown_085961D8, 130, 0, 40, 20
+	createsprite gUnknown_085961D8, 130, -8, -44, 20
+	createsprite gUnknown_085961D8, 130, -46, -28, 20
+	createsprite gUnknown_085961D8, 130, 46, 9, 20
 	playsewithpan SE_W091, +63
-	delay 0x5
-	createsprite gUnknown_085961D8, 0x82, 42, 0, 20
-	createsprite gUnknown_085961D8, 0x82, -43, -12, 20
-	createsprite gUnknown_085961D8, 0x82, 16, -46, 20
-	createsprite gUnknown_085961D8, 0x82, -16, 44, 20
+	delay 5
+	createsprite gUnknown_085961D8, 130, 42, 0, 20
+	createsprite gUnknown_085961D8, 130, -43, -12, 20
+	createsprite gUnknown_085961D8, 130, 16, -46, 20
+	createsprite gUnknown_085961D8, 130, -16, 44, 20
 	playsewithpan SE_W091, +63
-	delay 0x0
+	delay 0
 	waitsound
 	waitforvisualfinish
-	call AnimScript_82D7A71
+	call PoisonBubblesEffect
 	waitforvisualfinish
 	end
-
-AnimScript_82D16BC:
+SludgeBomb1:
 	playsewithpan SE_W145C, -64
-	createsprite gUnknown_085961A8, 0x82, 20, 0, 40, 0
-	delay 0x3
+	createsprite gUnknown_085961A8, 130, 20, 0, 40, 0
+	delay 3
 	return
 
 Move_ACID:
-	loadspritegfx 0x27A6
+	loadspritegfx ANIM_TAG_POISON_BUBBLE
 	monbg ANIM_DEF_PARTNER
-	createsprite gUnknown_085961C0, 0x82, 20, 0, 40, 1, 0, 0
+	createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 0, 0
 	playsewithpan SE_W145C, -64
-	delay 0x5
-	createsprite gUnknown_085961C0, 0x82, 20, 0, 40, 1, 24, 0
+	delay 5
+	createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 24, 0
 	playsewithpan SE_W145C, -64
-	delay 0x5
-	createsprite gUnknown_085961C0, 0x82, 20, 0, 40, 1, -24, 0
+	delay 5
+	createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, -24, 0
 	playsewithpan SE_W145C, -64
-	delay 0xF
-	createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 10, 1
-	createvisualtask sub_80D52D0, 0x5, 3, 2, 0, 10, 1
-	createvisualtask sub_8115A04, 0x2, 20, 2, 2, 0, 12, 31774
-	createsprite gUnknown_0859620C, 0x82, 0, -22, 0, 15, 55
+	delay 15
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_DEF_PARTNER, 2, 0, 10, 1
+	createvisualtask sub_8115A04, 2, 20, 2, 2, 0, 12, RGB(30, 0, 31)
+	createsprite gUnknown_0859620C, 130, 0, -22, 0, 15, 55
 	playsewithpan SE_W145, +63
-	delay 0xA
-	createsprite gUnknown_0859620C, 0x82, -26, -24, 0, 15, 55
+	delay 10
+	createsprite gUnknown_0859620C, 130, -26, -24, 0, 15, 55
 	playsewithpan SE_W145, +63
-	delay 0xA
-	createsprite gUnknown_0859620C, 0x82, 15, -27, 0, 15, 50
+	delay 10
+	createsprite gUnknown_0859620C, 130, 15, -27, 0, 15, 50
 	playsewithpan SE_W145, +63
-	delay 0xA
-	createsprite gUnknown_0859620C, 0x82, -15, -17, 0, 10, 45
+	delay 10
+	createsprite gUnknown_0859620C, 130, -15, -17, 0, 10, 45
 	playsewithpan SE_W145, +63
-	delay 0xA
-	createsprite gUnknown_0859620C, 0x82, 27, -22, 0, 15, 50
+	delay 10
+	createsprite gUnknown_0859620C, 130, 27, -22, 0, 15, 50
 	playsewithpan SE_W145, +63
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
 Move_BONEMERANG:
-	loadspritegfx 0x2710
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_BONE
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W155, -64
-	createsprite gUnknown_08597178, 0x2
-	delay 0x14
+	createsprite gUnknown_08597178, 2
+	delay 20
 	playsewithpan SE_W030, +63
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1
-	createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 5, 1
-	delay 0x11
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 5, 1
+	delay 17
 	playsewithpan SE_W233, -64
-	createsprite gUnknown_0857FE28, 0x2, 6, -4
+	createsprite gHorizontalLungeSpriteTemplate, 2, 6, -4
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_BONE_CLUB:
-	loadspritegfx 0x2710
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_BONE
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W155, +63
-	createsprite gUnknown_08597190, 0x2, -42, -25, 0, 0, 15
-	delay 0xC
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1
-	createsprite gUnknown_0859728C, 0x2, 7, 5, 1, 0, 10, 0, 0
+	createsprite gUnknown_08597190, 2, -42, -25, 0, 0, 15
+	delay 12
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 7, 5, 1, RGB_BLACK, 10, 0, 0
 	playsewithpan SE_W233B, +63
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -6151,15 +6066,15 @@ Move_BONE_CLUB:
 	end
 
 Move_BONE_RUSH:
-	loadspritegfx 0x2710
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_BONE
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W155, +63
-	createsprite gUnknown_08597190, 0x2, -42, -25, 0, 0, 15
-	delay 0xC
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 3, 5, 1
+	createsprite gUnknown_08597190, 2, -42, -25, 0, 0, 15
+	delay 12
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 5, 1
 	playsewithpan SE_W030, +63
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -6167,79 +6082,77 @@ Move_BONE_RUSH:
 	end
 
 Move_SPIKES:
-	loadspritegfx 0x27A8
+	loadspritegfx ANIM_TAG_152
 	monbg ANIM_DEF_PARTNER
 	playsewithpan SE_W026, -64
-	waitplaysewithpan SE_W030, +63, 0x1C
-	createsprite gUnknown_085CE11C, 0x82, 20, 0, 0, 24, 30
-	delay 0xA
+	waitplaysewithpan SE_W030, +63, 28
+	createsprite gUnknown_085CE11C, 130, 20, 0, 0, 24, 30
+	delay 10
 	playsewithpan SE_W026, -64
-	waitplaysewithpan SE_W030, +63, 0x1C
-	createsprite gUnknown_085CE11C, 0x82, 20, 0, -24, 24, 30
-	delay 0xA
-	waitplaysewithpan SE_W030, +63, 0x1C
-	createsprite gUnknown_085CE11C, 0x82, 20, 0, 24, 24, 30
+	waitplaysewithpan SE_W030, +63, 28
+	createsprite gUnknown_085CE11C, 130, 20, 0, -24, 24, 30
+	delay 10
+	waitplaysewithpan SE_W030, +63, 28
+	createsprite gUnknown_085CE11C, 130, 20, 0, 24, 24, 30
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
 Move_MEGAHORN:
-	loadspritegfx 0x27A9
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_153
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	playsewithpan SE_W082, -64
-	jumpifcontest AnimScript_82D19FA
+	jumpifcontest MegahornInContest
 	fadetobg BG_DRILL
 	waitbgfadeout
-	createvisualtask sub_8117660, 0x5, -2304, 768, 1, -1
-
-AnimScript_82D1947:
+	createvisualtask sub_8117660, 5, -2304, 768, 1, -1
+MegahornContinue:
 	waitbgfadein
-	setalpha 0x80C
-	createvisualtask sub_80D51AC, 0x5, 0, 2, 0, 15, 1
-	waitforvisualfinish
-	delay 0xA
-	createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 6
-	delay 0x3
-	createsprite gUnknown_08596974, 0x3, -42, 25, 0, 0, 6
-	delay 0x4
+	setalpha 12, 8
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1
+	waitforvisualfinish
+	delay 10
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 6
+	delay 3
+	createsprite gUnknown_08596974, 3, -42, 25, 0, 0, 6
+	delay 4
 	playsewithpan SE_W011, +63
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0
-	createsprite gUnknown_0857FE70, 0x2, 1, -16, 4, 1, 4
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 4, 1, 4
 	waitforvisualfinish
-	createvisualtask sub_80D5484, 0x2, 1, -4, 1, 12, 1
-	createsprite gUnknown_0859728C, 0x2, 7, 5, 1, 0x7FFF, 10, 0, 0
-	delay 0xA
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 11
-	delay 0x3
-	createsprite gUnknown_0857FE58, 0x2, 1, 0, 7
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, -4, 1, 12, 1
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 7, 5, 1, RGB_WHITE, 10, 0, 0
+	delay 10
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11
+	delay 3
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	restorebg
 	waitbgfadeout
-	setarg 0x7, 0xFFFF
+	setarg 7, -1
 	waitbgfadein
 	end
-
-AnimScript_82D19FA:
+MegahornInContest:
 	fadetobg BG_DRILL_CONTESTS
 	waitbgfadeout
-	createvisualtask sub_8117660, 0x5, 2304, 768, 0, -1
-	goto AnimScript_82D1947
+	createvisualtask sub_8117660, 5, 2304, 768, 0, -1
+	goto MegahornContinue
 
 Move_GUST:
-	loadspritegfx 0x2719
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_GUST
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W016, +63
-	createsprite gUnknown_08596270, 0x2, 0, -16
-	createvisualtask sub_810DED8, 0x5, 1, 70
+	createsprite gUnknown_08596270, 2, 0, -16
+	createvisualtask sub_810DED8, 5, 1, 70
 	waitforvisualfinish
-	createvisualtask sub_80D52D0, 0x5, 1, 1, 0, 7, 1
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 7, 1
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
 	playsewithpan SE_W016B, +63
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -6247,97 +6160,96 @@ Move_GUST:
 	end
 
 Move_WING_ATTACK:
-	loadspritegfx 0x2719
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_GUST
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	loopsewithpan SE_W017, -64, 0x14, 0x2
-	createvisualtask sub_80D5738, 0x2, 0, 12, 4, 1, 4
-	createvisualtask sub_810DED8, 0x5, 1, 70
-	createsprite gUnknown_085962A4, 0x2, -25, 0, 0, 0, 20
-	createsprite gUnknown_085962A4, 0x2, 25, 0, 0, 0, 20
-	delay 0x18
-	createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 9
-	delay 0x11
-	createsprite gUnknown_08597358, 0x2, 16, 0, 1, 1
-	createsprite gUnknown_08597358, 0x2, -16, 0, 1, 1
-	loopsewithpan SE_W003, +63, 0x5, 0x2
-	waitforvisualfinish
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 11
+	setalpha 12, 8
+	loopsewithpan SE_W017, -64, 20, 2
+	createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4
+	createvisualtask sub_810DED8, 5, 1, 70
+	createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20
+	createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20
+	delay 24
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 9
+	delay 17
+	createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1
+	createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1
+	loopsewithpan SE_W003, +63, 5, 2
+	waitforvisualfinish
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_PECK:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	playsewithpan SE_W030, +63
-	createvisualtask sub_80D622C, 0x2, 3, -768, 1, 2
-	createsprite gUnknown_085973E8, 0x83, -12, 0, 1, 3
+	createvisualtask sub_80D622C, 2, 3, -768, 1, 2
+	createsprite gUnknown_085973E8, 131, -12, 0, 1, 3
 	waitforvisualfinish
 	end
 
 Move_AEROBLAST:
-	loadspritegfx 0x27AA
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_154
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	call AnimScript_82D7CE5
+	call SetFlyingBg
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	call AnimScript_82D1B82
-	createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 50, 1
-	call AnimScript_82D1B82
-	call AnimScript_82D1B82
-	call AnimScript_82D1B82
-	call AnimScript_82D1B82
-	waitforvisualfinish
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0
+	setalpha 12, 8
+	call Aeroblast1
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 50, 1
+	call Aeroblast1
+	call Aeroblast1
+	call Aeroblast1
+	call Aeroblast1
+	waitforvisualfinish
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
 	playsewithpan SE_W013, +63
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
-	delay 0x0
-	call AnimScript_82D7D15
+	delay 0
+	call UnsetFlyingBg
 	end
-
-AnimScript_82D1B82:
+Aeroblast1:
 	playsewithpan SE_W026, -64
-	createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 0, 0
-	createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 0, 0
-	delay 0x3
+	createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 0, 0
+	createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 0, 0
+	delay 3
 	playsewithpan SE_W026, -64
-	createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 1, 0
-	createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 1, 0
-	delay 0x3
+	createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 1, 0
+	createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 1, 0
+	delay 3
 	playsewithpan SE_W026, -64
-	createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 2, 0
-	createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 2, 0
-	delay 0x3
+	createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 2, 0
+	createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 2, 0
+	delay 3
 	playsewithpan SE_W026, -64
-	createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 3, 0
-	createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 3, 0
-	delay 0x3
+	createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 3, 0
+	createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 3, 0
+	delay 3
 	return
 
 Move_WATER_GUN:
-	loadspritegfx 0x27AB
-	loadspritegfx 0x27A4
+	loadspritegfx ANIM_TAG_155
+	loadspritegfx ANIM_TAG_148
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	createsprite gUnknown_08595208, 0x2, 20, 0, 0, 0, 40, -25
+	setalpha 12, 8
+	createsprite gUnknown_08595208, 2, 20, 0, 0, 0, 40, -25
 	playsewithpan SE_W145, -64
 	waitforvisualfinish
-	createvisualtask sub_80D52D0, 0x5, 1, 1, 0, 8, 1
-	createsprite gUnknown_08597388, 0x4, 0, 0, 1, 2
-	createsprite gUnknown_08595220, 0x2, 0, -15, 0, 15, 55
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 8, 1
+	createsprite gUnknown_08597388, 4, 0, 0, 1, 2
+	createsprite gUnknown_08595220, 2, 0, -15, 0, 15, 55
 	playsewithpan SE_W152, +63
-	delay 0xA
-	createsprite gUnknown_08595220, 0x2, 15, -20, 0, 15, 50
+	delay 10
+	createsprite gUnknown_08595220, 2, 15, -20, 0, 15, 50
 	playsewithpan SE_W152, +63
-	delay 0xA
-	createsprite gUnknown_08595220, 0x2, -15, -10, 0, 10, 45
+	delay 10
+	createsprite gUnknown_08595220, 2, -15, -10, 0, 10, 45
 	playsewithpan SE_W152, +63
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -6345,237 +6257,235 @@ Move_WATER_GUN:
 	end
 
 Move_CRABHAMMER:
-	loadspritegfx 0x279D
-	loadspritegfx 0x27A4
+	loadspritegfx ANIM_TAG_141
+	loadspritegfx ANIM_TAG_148
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	createsprite gUnknown_08597388, 0x4, 0, 0, 1, 0
+	setalpha 12, 8
+	createsprite gUnknown_08597388, 4, 0, 0, 1, 0
 	playsewithpan SE_W233B, +63
-	delay 0x1
-	createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 32429, 10, 0, 0
-	createsprite gUnknown_0857FE70, 0x2, 1, -24, 0, 0, 4
-	waitforvisualfinish
-	delay 0x8
-	waitforvisualfinish
-	createsprite gUnknown_0857FE58, 0x2, 1, 0, 4
-	waitforvisualfinish
-	loopsewithpan SE_W152, +63, 0x14, 0x3
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 4, 8, 1
-	createsprite gUnknown_08595238, 0x2, 10, 10, 20, 1
-	delay 0x4
-	createsprite gUnknown_08595238, 0x2, 20, -20, 20, 1
-	delay 0x4
-	createsprite gUnknown_08595238, 0x2, -15, 15, 20, 1
-	delay 0x4
-	createsprite gUnknown_08595238, 0x2, 0, 0, 20, 1
-	delay 0x4
-	createsprite gUnknown_08595238, 0x2, -10, -20, 20, 1
-	delay 0x4
-	createsprite gUnknown_08595238, 0x2, 16, -8, 20, 1
-	delay 0x4
-	createsprite gUnknown_08595238, 0x2, 5, 8, 20, 1
-	delay 0x4
-	createsprite gUnknown_08595238, 0x2, -16, 0, 20, 1
+	delay 1
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB(13, 21, 31), 10, 0, 0
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4
+	waitforvisualfinish
+	delay 8
+	waitforvisualfinish
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 4
+	waitforvisualfinish
+	loopsewithpan SE_W152, +63, 20, 3
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 8, 1
+	createsprite gUnknown_08595238, 2, 10, 10, 20, 1
+	delay 4
+	createsprite gUnknown_08595238, 2, 20, -20, 20, 1
+	delay 4
+	createsprite gUnknown_08595238, 2, -15, 15, 20, 1
+	delay 4
+	createsprite gUnknown_08595238, 2, 0, 0, 20, 1
+	delay 4
+	createsprite gUnknown_08595238, 2, -10, -20, 20, 1
+	delay 4
+	createsprite gUnknown_08595238, 2, 16, -8, 20, 1
+	delay 4
+	createsprite gUnknown_08595238, 2, 5, 8, 20, 1
+	delay 4
+	createsprite gUnknown_08595238, 2, -16, 0, 20, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_SURF:
-	createvisualtask sub_8107954, 0x2, 0
-	delay 0x18
-	panse_1B SE_W057, -64, +63, +2, 0x0
+	createvisualtask AnimTask_CreateSurfWave, 2, FALSE
+	delay 24
+	panse_1B SE_W057, -64, +63, +2, 0
 	waitforvisualfinish
 	end
 
 Move_FLAMETHROWER:
-	loadspritegfx 0x272D
+	loadspritegfx ANIM_TAG_SMALL_EMBER
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 46, 1
-	delay 0x6
-	createvisualtask sub_81076C8, 0x5, 100
-	panse_1B SE_W053, -64, +63, +2, 0x0
-	call AnimScript_82D1E58
-	call AnimScript_82D1E58
-	call AnimScript_82D1E58
-	createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 43, 1
-	call AnimScript_82D1E58
-	call AnimScript_82D1E58
-	call AnimScript_82D1E58
-	call AnimScript_82D1E58
-	call AnimScript_82D1E58
-	call AnimScript_82D1E58
-	call AnimScript_82D1E58
-	call AnimScript_82D1E58
+	setalpha 12, 8
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1
+	delay 6
+	createvisualtask sub_81076C8, 5, 100
+	panse_1B SE_W053, -64, +63, +2, 0
+	call Flamethrower1
+	call Flamethrower1
+	call Flamethrower1
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 43, 1
+	call Flamethrower1
+	call Flamethrower1
+	call Flamethrower1
+	call Flamethrower1
+	call Flamethrower1
+	call Flamethrower1
+	call Flamethrower1
+	call Flamethrower1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
-AnimScript_82D1E58:
-	createsprite gUnknown_08595158, 0x3, 10, 10, 0, 16
-	delay 0x2
-	createsprite gUnknown_08595158, 0x3, 10, 10, 0, 16
-	delay 0x2
+Flamethrower1:
+	createsprite gUnknown_08595158, 3, 10, 10, 0, 16
+	delay 2
+	createsprite gUnknown_08595158, 3, 10, 10, 0, 16
+	delay 2
 	return
 
 Move_SANDSTORM:
-	loadspritegfx 0x2815
+	loadspritegfx ANIM_TAG_261
 	playsewithpan SE_W201, 0
-	createvisualtask sub_8110BCC, 0x5, 0
-	delay 0x10
-	createsprite gUnknown_08596BA0, 0x28, 10, 2304, 96, 0
-	delay 0xA
-	createsprite gUnknown_08596BA0, 0x28, 90, 2048, 96, 0
-	delay 0xA
-	createsprite gUnknown_08596BA0, 0x28, 50, 2560, 96, 0
-	delay 0xA
-	createsprite gUnknown_08596BA0, 0x28, 20, 2304, 96, 0
-	delay 0xA
-	createsprite gUnknown_08596BA0, 0x28, 70, 1984, 96, 0
-	delay 0xA
-	createsprite gUnknown_08596BA0, 0x28, 0, 2816, 96, 0
-	delay 0xA
-	createsprite gUnknown_08596BA0, 0x28, 60, 2560, 96, 0
+	createvisualtask AnimTask_LoadSandstormBackground, 5, FALSE
+	delay 16
+	createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 10, 2304, 96, 0
+	delay 10
+	createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 90, 2048, 96, 0
+	delay 10
+	createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 50, 2560, 96, 0
+	delay 10
+	createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 20, 2304, 96, 0
+	delay 10
+	createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 70, 1984, 96, 0
+	delay 10
+	createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 0, 2816, 96, 0
+	delay 10
+	createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 60, 2560, 96, 0
 	end
 
 Move_WHIRLPOOL:
-	loadspritegfx 0x27A5
+	loadspritegfx ANIM_TAG_149
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	delay 0x0
-	createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23)
+	setalpha 12, 8
+	delay 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(0, 13, 23)
 	playsewithpan SE_W250, +63
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 50, 1
-	call AnimScript_82D1F5B
-	call AnimScript_82D1F5B
-	call AnimScript_82D1F5B
-	delay 0xC
-	createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(0, 13, 23)
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 50, 1
+	call WhirlpoolEffect
+	call WhirlpoolEffect
+	call WhirlpoolEffect
+	delay 12
+	createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(0, 13, 23)
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
-AnimScript_82D1F5B:
-	createsprite gUnknown_08596B70, 0x82, 0, 28, 384, 50, 8, 50, 1
-	delay 0x2
-	createsprite gUnknown_08596B70, 0x82, 0, 32, 240, 40, 11, -46, 1
-	delay 0x2
-	createsprite gUnknown_08596B70, 0x82, 0, 33, 416, 40, 4, 42, 1
-	delay 0x2
-	createsprite gUnknown_08596B70, 0x82, 0, 31, 288, 45, 6, -42, 1
-	delay 0x2
-	createsprite gUnknown_08596B70, 0x82, 0, 28, 448, 45, 11, 46, 1
-	delay 0x2
-	createsprite gUnknown_08596B70, 0x82, 0, 33, 464, 50, 10, -50, 1
-	delay 0x2
+WhirlpoolEffect:
+	createsprite gUnknown_08596B70, 130, 0, 28, 384, 50, 8, 50, 1
+	delay 2
+	createsprite gUnknown_08596B70, 130, 0, 32, 240, 40, 11, -46, 1
+	delay 2
+	createsprite gUnknown_08596B70, 130, 0, 33, 416, 40, 4, 42, 1
+	delay 2
+	createsprite gUnknown_08596B70, 130, 0, 31, 288, 45, 6, -42, 1
+	delay 2
+	createsprite gUnknown_08596B70, 130, 0, 28, 448, 45, 11, 46, 1
+	delay 2
+	createsprite gUnknown_08596B70, 130, 0, 33, 464, 50, 10, -50, 1
+	delay 2
 	return
 
 Move_FLY:
-	loadspritegfx 0x27AC
-	loadspritegfx 0x2797
-	choosetwoturnanim AnimScript_82D1FF7, AnimScript_82D200F
-
-AnimScript_82D1FF5:
+	loadspritegfx ANIM_TAG_156
+	loadspritegfx ANIM_TAG_135
+	choosetwoturnanim FlySetUp, FlyUnleash
+FlyEnd:
 	waitforvisualfinish
 	end
 
-AnimScript_82D1FF7:
+FlySetUp:
 	playsewithpan SE_W019, -64
-	createsprite gUnknown_08596340, 0x2, 0, 0, 13, 336
-	goto AnimScript_82D1FF5
+	createsprite gUnknown_08596340, 2, 0, 0, 13, 336
+	goto FlyEnd
 
-AnimScript_82D200F:
+FlyUnleash:
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W104, -64
-	createsprite gUnknown_08596358, 0x2, 20
-	delay 0x14
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0
-	createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1
+	createsprite gUnknown_08596358, 2, 20
+	delay 20
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	playsewithpan SE_W013, +63
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
-	goto AnimScript_82D1FF5
+	goto FlyEnd
 
 Move_BOUNCE:
-	loadspritegfx 0x27AC
-	loadspritegfx 0x2797
-	choosetwoturnanim AnimScript_82D2060, AnimScript_82D2074
-
-AnimScript_82D205F:
+	loadspritegfx ANIM_TAG_156
+	loadspritegfx ANIM_TAG_135
+	choosetwoturnanim BounceSetUp, BounceUnleash
+BounceEnd:
 	end
 
-AnimScript_82D2060:
+BounceSetUp:
 	playsewithpan SE_W100, -64
-	createsprite gUnknown_08596420, 0x2, 0, 0
-	goto AnimScript_82D205F
+	createsprite gUnknown_08596420, 2, 0, 0
+	goto BounceEnd
 
-AnimScript_82D2074:
+BounceUnleash:
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W207, +63
-	createsprite gUnknown_0859644C, 0x83
-	delay 0x7
+	createsprite gUnknown_0859644C, 131
+	delay 7
 	playsewithpan SE_W025B, +63
-	createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 11, 1
+	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
-	goto AnimScript_82D205F
+	goto BounceEnd
 
 Move_KARATE_CHOP:
-	loadspritegfx 0x279F
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W104, +63
-	createsprite gUnknown_08595E68, 0x2, -16, 0, 0, 0, 10, 1, 3, 0
+	createsprite gUnknown_08595E68, 2, -16, 0, 0, 0, 10, 1, 3, 0
 	waitforvisualfinish
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_CROSS_CHOP:
-	loadspritegfx 0x279F
-	loadspritegfx 0x282D
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_285
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W025, +63
-	createsprite gUnknown_08595EC8, 0x2, 0, 0, 0
-	createsprite gUnknown_08595EC8, 0x2, 0, 0, 1
-	delay 0x28
+	createsprite gUnknown_08595EC8, 2, 0, 0, 0
+	createsprite gUnknown_08595EC8, 2, 0, 0, 1
+	delay 40
 	playsewithpan SE_W013, +63
-	createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0x7FFF, 10, 0, 10
-	createsprite gUnknown_085973D0, 0x3, 0, 0, 1, 20
-	createvisualtask sub_80D51AC, 0x5, 1, 7, 0, 9, 1
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10
+	createsprite gUnknown_085973D0, 3, 0, 0, 1, 20
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_JUMP_KICK:
-	loadspritegfx 0x279F
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	createsprite gUnknown_0857FE28, 0x2, 4, 4
-	delay 0x3
-	createsprite gUnknown_08595E80, 0x2, -16, 8, 0, 0, 10, 1, 1, 1
+	setalpha 12, 8
+	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4
+	delay 3
+	createsprite gUnknown_08595E80, 2, -16, 8, 0, 0, 10, 1, 1, 1
 	playsewithpan SE_W026, +63
 	waitforvisualfinish
-	createsprite gUnknown_08597358, 0x1, 0, 0, 1, 1
-	createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 7, 1
+	createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 1
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1
 	playsewithpan SE_W004, +63
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -6583,38 +6493,38 @@ Move_JUMP_KICK:
 	end
 
 Move_HI_JUMP_KICK:
-	loadspritegfx 0x279F
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	createsprite gUnknown_0857FE70, 0x2, 0, -24, 0, 0, 8
+	setalpha 12, 8
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -24, 0, 0, 8
 	waitforvisualfinish
-	delay 0xA
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 3
-	delay 0x2
-	createsprite gUnknown_08595E80, 0x2, -16, 8, 0, 0, 10, 1, 1, 1
+	delay 10
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 3
+	delay 2
+	createsprite gUnknown_08595E80, 2, -16, 8, 0, 0, 10, 1, 1, 1
 	playsewithpan SE_W026, +63
 	waitforvisualfinish
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1
 	playsewithpan SE_W233B, +63
-	createsprite gUnknown_0857FE70, 0x2, 1, -28, 0, 0, 3
-	delay 0x3
-	createvisualtask sub_80D5484, 0x2, 1, 3, 0, 11, 1
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3
+	delay 3
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 11, 1
 	waitforvisualfinish
-	delay 0x5
-	createsprite gUnknown_0857FE58, 0x2, 1, 0, 6
+	delay 5
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_DOUBLE_KICK:
-	loadspritegfx 0x279F
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	createsprite gUnknown_08595EB0, 0x3, 1, 20, 1
-	createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1
+	setalpha 12, 8
+	createsprite gUnknown_08595EB0, 3, 1, 20, 1
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1
 	playsewithpan SE_W233B, +63
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -6622,329 +6532,328 @@ Move_DOUBLE_KICK:
 	end
 
 Move_TRIPLE_KICK:
-	loadspritegfx 0x279F
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W233B, +63
-	jumpifmoveturn 0x0, AnimScript_82D22B8
-	jumpifmoveturn 0x1, AnimScript_82D22EE
-	goto AnimScript_82D2324
-
-AnimScript_82D22B3:
+	jumpifmoveturn 0, TripleKickLeft
+	jumpifmoveturn 1, TripleKickRight
+	goto TripleKickCenter
+TripleKickContinue:
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
-AnimScript_82D22B8:
-	createsprite gUnknown_08595E98, 0x84, -16, -8, 20, 1, 1
-	createsprite gUnknown_08597358, 0x83, -16, -16, 1, 2
-	createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1
-	goto AnimScript_82D22B3
+TripleKickLeft:
+	createsprite gFistFootSpriteTemplate, 132, -16, -8, 20, 1, 1
+	createsprite gBasicHitSplatSpriteTemplate, 131, -16, -16, 1, 2
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1
+	goto TripleKickContinue
 
-AnimScript_82D22EE:
-	createsprite gUnknown_08595E98, 0x84, 8, 8, 20, 1, 1
-	createsprite gUnknown_08597358, 0x83, 8, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1
-	goto AnimScript_82D22B3
+TripleKickRight:
+	createsprite gFistFootSpriteTemplate, 132, 8, 8, 20, 1, 1
+	createsprite gBasicHitSplatSpriteTemplate, 131, 8, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1
+	goto TripleKickContinue
 
-AnimScript_82D2324:
-	createsprite gUnknown_08595E98, 0x84, 0, 0, 20, 1, 1
-	createsprite gUnknown_08597358, 0x83, 0, -8, 1, 1
-	createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1
-	goto AnimScript_82D22B3
+TripleKickCenter:
+	createsprite gFistFootSpriteTemplate, 132, 0, 0, 20, 1, 1
+	createsprite gBasicHitSplatSpriteTemplate, 131, 0, -8, 1, 1
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
+	goto TripleKickContinue
 
 Move_DYNAMIC_PUNCH:
-	loadspritegfx 0x279F
-	loadspritegfx 0x2797
-	loadspritegfx 0x27D6
-	loadspritegfx 0x2717
-	delay 0x1
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_EXPLOSION
+	loadspritegfx ANIM_TAG_007
+	delay 1
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W233B, +63
-	createsprite gUnknown_08595E98, 0x83, 0, 0, 20, 1, 0
-	createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0
-	createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 7, 1
-	delay 0x1
+	createsprite gFistFootSpriteTemplate, 131, 0, 0, 20, 1, 0
+	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1
+	delay 1
 	waitsound
 	playsewithpan SE_W120, +63
-	createvisualtask sub_80D52D0, 0x5, 1, 5, 0, 28, 1
-	createsprite gUnknown_0859371C, 0x3, 0, 0, 1, 1
-	delay 0x6
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 5, 0, 28, 1
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 1, 1
+	delay 6
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_0859371C, 0x3, 24, -24, 1, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 1, 1
+	delay 6
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_0859371C, 0x3, -16, 16, 1, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 1, 1
+	delay 6
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_0859371C, 0x3, -24, -12, 1, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 1, 1
+	delay 6
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_0859371C, 0x3, 16, 16, 1, 1
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 1, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_COUNTER:
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	createvisualtask sub_80D5830, 0x2, 0, 18, 6, 1, 4
+	setalpha 12, 8
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4
 	playsewithpan SE_W233, -64
 	waitforvisualfinish
-	createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4
-	delay 0x4
-	createsprite gUnknown_08597358, 0x2, -15, 18, 1, 0
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4
+	delay 4
+	createsprite gBasicHitSplatSpriteTemplate, 2, -15, 18, 1, 0
 	playsewithpan SE_W233B, +63
-	delay 0x1
-	createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 25, 1
-	createsprite gUnknown_08595E98, 0x3, -15, 18, 8, 1, 0
-	delay 0x3
-	createsprite gUnknown_08597358, 0x2, 0, -4, 1, 0
+	delay 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 25, 1
+	createsprite gFistFootSpriteTemplate, 3, -15, 18, 8, 1, 0
+	delay 3
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, -4, 1, 0
 	playsewithpan SE_W233B, +63
-	delay 0x1
-	createsprite gUnknown_08595E98, 0x3, 0, -4, 8, 1, 0
-	delay 0x3
-	createsprite gUnknown_08597358, 0x2, 15, 9, 1, 0
+	delay 1
+	createsprite gFistFootSpriteTemplate, 3, 0, -4, 8, 1, 0
+	delay 3
+	createsprite gBasicHitSplatSpriteTemplate, 2, 15, 9, 1, 0
 	playsewithpan SE_W233B, +63
-	delay 0x1
-	createsprite gUnknown_08595E98, 0x3, 15, 9, 8, 1, 0
-	delay 0x5
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 5
+	delay 1
+	createsprite gFistFootSpriteTemplate, 3, 15, 9, 8, 1, 0
+	delay 5
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_VITAL_THROW:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W233, -64
-	createvisualtask sub_80D5830, 0x2, 0, 12, 4, 1, 2
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 1, 2
 	waitforvisualfinish
-	createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4
-	delay 0x2
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4
+	delay 2
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
 	playsewithpan SE_W233B, +63
-	delay 0x1
-	createsprite gUnknown_0857FE70, 0x2, 1, -24, 0, 0, 4
+	delay 1
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4
 	waitforvisualfinish
-	delay 0x3
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 7
-	delay 0xB
-	createsprite gUnknown_0857FE58, 0x2, 1, 0, 10
+	delay 3
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7
+	delay 11
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 10
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_ROCK_SMASH:
-	loadspritegfx 0x274A
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
+	loadspritegfx ANIM_TAG_058
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	delay 0x1
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1
-	createsprite gUnknown_08595E98, 0x2, 0, 0, 8, 1, 0
+	setalpha 12, 8
+	delay 1
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
+	createsprite gFistFootSpriteTemplate, 2, 0, 0, 8, 1, 0
 	playsewithpan SE_W233B, +63
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 5, 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1
 	waitforvisualfinish
 	playsewithpan SE_W088, +63
-	createsprite gUnknown_08596B1C, 0x2, 0, 0, 20, 24, 14, 2
-	createsprite gUnknown_08596B1C, 0x2, 5, 0, -20, 24, 14, 1
-	createsprite gUnknown_08596B1C, 0x2, 0, 5, 20, -24, 14, 2
-	createsprite gUnknown_08596B1C, 0x2, -5, 0, -20, -24, 14, 2
-	createsprite gUnknown_08596B1C, 0x2, 0, -5, 30, 18, 8, 2
-	createsprite gUnknown_08596B1C, 0x2, 0, 0, 30, -18, 8, 2
-	createsprite gUnknown_08596B1C, 0x2, 0, 0, -30, 18, 8, 2
-	createsprite gUnknown_08596B1C, 0x2, 0, 0, -30, -18, 8, 2
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 7, 1
+	createsprite gUnknown_08596B1C, 2, 0, 0, 20, 24, 14, 2
+	createsprite gUnknown_08596B1C, 2, 5, 0, -20, 24, 14, 1
+	createsprite gUnknown_08596B1C, 2, 0, 5, 20, -24, 14, 2
+	createsprite gUnknown_08596B1C, 2, -5, 0, -20, -24, 14, 2
+	createsprite gUnknown_08596B1C, 2, 0, -5, 30, 18, 8, 2
+	createsprite gUnknown_08596B1C, 2, 0, 0, 30, -18, 8, 2
+	createsprite gUnknown_08596B1C, 2, 0, 0, -30, 18, 8, 2
+	createsprite gUnknown_08596B1C, 2, 0, 0, -30, -18, 8, 2
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 7, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_SUBMISSION:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W104, -64
-	waitplaysewithpan SE_W004, +63, 0xA
-	waitplaysewithpan SE_W104, -64, 0x14
-	waitplaysewithpan SE_W004, +63, 0x1E
-	waitplaysewithpan SE_W104, -64, 0x28
-	waitplaysewithpan SE_W004, +63, 0x32
-	waitplaysewithpan SE_W104, -64, 0x3C
-	waitplaysewithpan SE_W004, +63, 0x46
-	waitplaysewithpan SE_W104, -64, 0x50
+	waitplaysewithpan SE_W004, +63, 10
+	waitplaysewithpan SE_W104, -64, 20
+	waitplaysewithpan SE_W004, +63, 30
+	waitplaysewithpan SE_W104, -64, 40
+	waitplaysewithpan SE_W004, +63, 50
+	waitplaysewithpan SE_W104, -64, 60
+	waitplaysewithpan SE_W004, +63, 70
+	waitplaysewithpan SE_W104, -64, 80
 	waitplaysewithpan SE_W004, +63, 0x5A
-	createvisualtask sub_80D5738, 0x2, 0, -18, 6, 6, 4
-	createvisualtask sub_80D5738, 0x2, 1, 18, 6, 6, 4
-	call AnimScript_82D26D3
-	call AnimScript_82D26D3
-	call AnimScript_82D26D3
+	createvisualtask AnimTask_TranslateMonElliptical, 2, 0, -18, 6, 6, 4
+	createvisualtask AnimTask_TranslateMonElliptical, 2, 1, 18, 6, 6, 4
+	call Submission1
+	call Submission1
+	call Submission1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
-AnimScript_82D26D3:
-	createsprite gUnknown_08597358, 0x3, 0, -12, 1, 1
-	delay 0x8
-	createsprite gUnknown_08597358, 0x3, -12, 8, 1, 1
-	delay 0x8
-	createsprite gUnknown_08597358, 0x3, 12, 0, 1, 1
-	delay 0x8
+Submission1:
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, -12, 1, 1
+	delay 8
+	createsprite gBasicHitSplatSpriteTemplate, 3, -12, 8, 1, 1
+	delay 8
+	createsprite gBasicHitSplatSpriteTemplate, 3, 12, 0, 1, 1
+	delay 8
 	return
 
 Move_SUNNY_DAY:
-	loadspritegfx 0x27AD
+	loadspritegfx ANIM_TAG_157
 	monbg ANIM_ATK_PARTNER
-	setalpha 0x30D
-	createvisualtask sub_8116620, 0xA, 1921, 1, 0, 6, 0x7FFF
+	setalpha 13, 3
+	createvisualtask sub_8116620, 10, 0x781, 1, 0, 6, RGB_WHITE
 	waitforvisualfinish
-	panse_26 SE_W080, -64, +63, +1, 0x0
-	call AnimScript_82D2753
-	call AnimScript_82D2753
-	call AnimScript_82D2753
-	call AnimScript_82D2753
+	panse_26 SE_W080, -64, +63, +1, 0
+	call SunnyDay1
+	call SunnyDay1
+	call SunnyDay1
+	call SunnyDay1
 	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 1921, 1, 6, 0, 0x7FFF
+	createvisualtask sub_8116620, 10, 0x781, 1, 6, 0, RGB_WHITE
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
 	end
 
-AnimScript_82D2753:
-	createsprite gUnknown_085954A0, 0x28
-	delay 0x6
+SunnyDay1:
+	createsprite gUnknown_085954A0, 40
+	delay 6
 	return
 
 Move_COTTON_SPORE:
-	loadspritegfx 0x27AE
+	loadspritegfx ANIM_TAG_158
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	loopsewithpan SE_W077, +63, 0x12, 0xA
-	call AnimScript_82D277D
-	call AnimScript_82D277D
-	call AnimScript_82D277D
+	loopsewithpan SE_W077, +63, 18, 10
+	call CottonSpore1
+	call CottonSpore1
+	call CottonSpore1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
-AnimScript_82D277D:
-	createsprite gUnknown_085922EC, 0x2, 0, -20, 85, 80, 0
-	delay 0xC
-	createsprite gUnknown_085922EC, 0x2, 0, -10, 170, 80, 0
-	delay 0xC
-	createsprite gUnknown_085922EC, 0x2, 0, -15, 0, 80, 0
-	delay 0xC
+CottonSpore1:
+	createsprite gUnknown_085922EC, 2, 0, -20, 85, 80, 0
+	delay 12
+	createsprite gUnknown_085922EC, 2, 0, -10, 170, 80, 0
+	delay 12
+	createsprite gUnknown_085922EC, 2, 0, -15, 0, 80, 0
+	delay 12
 	return
 
 Move_SPORE:
-	loadspritegfx 0x27AE
+	loadspritegfx ANIM_TAG_158
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	createvisualtask sub_80FEE1C, 0x2
-	loopsewithpan SE_W077, +63, 0x10, 0xB
-	call AnimScript_82D27E2
-	call AnimScript_82D27E2
-	call AnimScript_82D27E2
-	waitforvisualfinish
-	delay 0x1
+	setalpha 12, 8
+	createvisualtask sub_80FEE1C, 2
+	loopsewithpan SE_W077, +63, 16, 11
+	call Spore1
+	call Spore1
+	call Spore1
+	waitforvisualfinish
+	delay 1
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
-AnimScript_82D27E2:
-	createsprite gUnknown_085922EC, 0x82, 0, -20, 85, 80, 1
-	delay 0xC
-	createsprite gUnknown_085922EC, 0x82, 0, -10, 170, 80, 1
-	delay 0xC
-	createsprite gUnknown_085922EC, 0x82, 0, -15, 0, 80, 1
-	delay 0xC
+Spore1:
+	createsprite gUnknown_085922EC, 130, 0, -20, 85, 80, 1
+	delay 12
+	createsprite gUnknown_085922EC, 130, 0, -10, 170, 80, 1
+	delay 12
+	createsprite gUnknown_085922EC, 130, 0, -15, 0, 80, 1
+	delay 12
 	return
 
 Move_PETAL_DANCE:
-	loadspritegfx 0x27AF
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_159
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W080, -64
-	createvisualtask sub_80D5830, 0x2, 0, 12, 6, 6, 3
-	createsprite gUnknown_0859231C, 0x2, 0, -24, 8, 140
-	createsprite gUnknown_08592334, 0x2, 16, -24, 8, 100
-	createsprite gUnknown_08592334, 0x2, -16, -24, 8, 100
-	delay 0xF
-	createsprite gUnknown_0859231C, 0x2, 0, -24, 8, 140
-	createsprite gUnknown_08592334, 0x2, 32, -24, 8, 100
-	createsprite gUnknown_08592334, 0x2, -32, -24, 8, 100
-	delay 0xF
-	createsprite gUnknown_0859231C, 0x2, 0, -24, 8, 140
-	createsprite gUnknown_08592334, 0x2, 24, -24, 8, 100
-	createsprite gUnknown_08592334, 0x2, -24, -24, 8, 100
-	delay 0x1E
-	createsprite gUnknown_08592334, 0x2, 16, -24, 0, 100
-	createsprite gUnknown_08592334, 0x2, -16, -24, 0, 100
-	delay 0x1E
-	createsprite gUnknown_08592334, 0x2, 20, -16, 14, 80
-	createsprite gUnknown_08592334, 0x2, -20, -14, 16, 80
-	waitforvisualfinish
-	createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 5
-	delay 0x3
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 6, 3
+	createsprite gUnknown_0859231C, 2, 0, -24, 8, 140
+	createsprite gUnknown_08592334, 2, 16, -24, 8, 100
+	createsprite gUnknown_08592334, 2, -16, -24, 8, 100
+	delay 15
+	createsprite gUnknown_0859231C, 2, 0, -24, 8, 140
+	createsprite gUnknown_08592334, 2, 32, -24, 8, 100
+	createsprite gUnknown_08592334, 2, -32, -24, 8, 100
+	delay 15
+	createsprite gUnknown_0859231C, 2, 0, -24, 8, 140
+	createsprite gUnknown_08592334, 2, 24, -24, 8, 100
+	createsprite gUnknown_08592334, 2, -24, -24, 8, 100
+	delay 30
+	createsprite gUnknown_08592334, 2, 16, -24, 0, 100
+	createsprite gUnknown_08592334, 2, -16, -24, 0, 100
+	delay 30
+	createsprite gUnknown_08592334, 2, 20, -16, 14, 80
+	createsprite gUnknown_08592334, 2, -20, -14, 16, 80
+	waitforvisualfinish
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 5
+	delay 3
 	playsewithpan SE_W025B, +63
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 0
-	createvisualtask sub_80D51AC, 0x2, 1, 6, 0, 8, 1
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 6, 0, 8, 1
 	waitforvisualfinish
-	delay 0x8
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 7
+	delay 8
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_RAZOR_LEAF:
-	loadspritegfx 0x274F
-	loadspritegfx 0x27B0
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_063
+	loadspritegfx ANIM_TAG_160
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	delay 0x1
-	loopsewithpan SE_W077, -64, 0xA, 0x5
-	createsprite gUnknown_08592390, 0x2, -3, -2, 10
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, -1, -1, 15
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, -4, -4, 7
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, 3, -3, 11
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, -1, -6, 8
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, 2, -1, 12
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, -3, -4, 13
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, 4, -5, 7
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, 2, -6, 11
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, -3, -5, 8
-	delay 0x3C
+	setalpha 12, 8
+	delay 1
+	loopsewithpan SE_W077, -64, 10, 5
+	createsprite gUnknown_08592390, 2, -3, -2, 10
+	delay 2
+	createsprite gUnknown_08592390, 2, -1, -1, 15
+	delay 2
+	createsprite gUnknown_08592390, 2, -4, -4, 7
+	delay 2
+	createsprite gUnknown_08592390, 2, 3, -3, 11
+	delay 2
+	createsprite gUnknown_08592390, 2, -1, -6, 8
+	delay 2
+	createsprite gUnknown_08592390, 2, 2, -1, 12
+	delay 2
+	createsprite gUnknown_08592390, 2, -3, -4, 13
+	delay 2
+	createsprite gUnknown_08592390, 2, 4, -5, 7
+	delay 2
+	createsprite gUnknown_08592390, 2, 2, -6, 11
+	delay 2
+	createsprite gUnknown_08592390, 2, -3, -5, 8
+	delay 60
 	playsewithpan SE_W013B, -64
-	createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 22, 20, 1
-	createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 22, -20, 1
-	delay 0x14
+	createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 22, 20, 1
+	createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 22, -20, 1
+	delay 20
 	playsewithpan SE_W013, +63
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1
-	createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 8, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6952,116 +6861,116 @@ Move_RAZOR_LEAF:
 
 Move_NATURE_POWER:
 Move_ANCIENT_POWER:
-	loadspritegfx 0x274A
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_058
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	createsprite gUnknown_085972D8, 0x2, 4, 1, 10, 1
-	createsprite gUnknown_08596C10, 0x2, 20, 32, -48, 50, 2
-	createsprite gUnknown_08596C10, 0x2, 0, 32, -38, 25, 5
-	createsprite gUnknown_08596C10, 0x2, 32, 32, -28, 40, 3
-	createsprite gUnknown_08596C10, 0x2, -20, 32, -48, 50, 2
-	createsprite gUnknown_08596C10, 0x2, 20, 32, -28, 60, 1
-	createsprite gUnknown_08596C10, 0x2, 0, 32, -28, 30, 4
-	createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 30, 1
+	setalpha 12, 8
+	createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 10, 1
+	createsprite gUnknown_08596C10, 2, 20, 32, -48, 50, 2
+	createsprite gUnknown_08596C10, 2, 0, 32, -38, 25, 5
+	createsprite gUnknown_08596C10, 2, 32, 32, -28, 40, 3
+	createsprite gUnknown_08596C10, 2, -20, 32, -48, 50, 2
+	createsprite gUnknown_08596C10, 2, 20, 32, -28, 60, 1
+	createsprite gUnknown_08596C10, 2, 0, 32, -28, 30, 4
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 30, 1
 	playsewithpan SE_W082, -64
-	delay 0xA
-	createsprite gUnknown_08596C10, 0x2, 15, 32, -48, 25, 5
-	createsprite gUnknown_08596C10, 0x2, -10, 32, -42, 30, 4
-	delay 0xA
-	createsprite gUnknown_08596C10, 0x2, 0, 32, -42, 25, 5
-	createsprite gUnknown_08596C10, 0x2, -25, 32, -48, 30, 4
-	waitforvisualfinish
-	createsprite gUnknown_0857FE70, 0x2, 0, 16, 0, 0, 4
-	delay 0x3
+	delay 10
+	createsprite gUnknown_08596C10, 2, 15, 32, -48, 25, 5
+	createsprite gUnknown_08596C10, 2, -10, 32, -42, 30, 4
+	delay 10
+	createsprite gUnknown_08596C10, 2, 0, 32, -42, 25, 5
+	createsprite gUnknown_08596C10, 2, -25, 32, -48, 30, 4
+	waitforvisualfinish
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 16, 0, 0, 4
+	delay 3
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 7
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_OCTAZOOKA:
-	loadspritegfx 0x272E
-	loadspritegfx 0x2721
+	loadspritegfx ANIM_TAG_GRAY_SMOKE
+	loadspritegfx ANIM_TAG_BLACK_BALL
 	playsewithpan SE_W025B, -64
-	createsprite gUnknown_08592DFC, 0x82, 20, 0, 0, 0, 20, 0
+	createsprite gUnknown_08592DFC, 130, 20, 0, 0, 0, 20, 0
 	waitforvisualfinish
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_08592E30, 0x82, 8, 8, 1, 0
-	delay 0x2
-	createsprite gUnknown_08592E30, 0x82, -8, -8, 1, 0
-	delay 0x2
-	createsprite gUnknown_08592E30, 0x82, 8, -8, 1, 0
-	delay 0x2
-	createsprite gUnknown_08592E30, 0x82, -8, 8, 1, 0
+	createsprite gUnknown_08592E30, 130, 8, 8, 1, 0
+	delay 2
+	createsprite gUnknown_08592E30, 130, -8, -8, 1, 0
+	delay 2
+	createsprite gUnknown_08592E30, 130, 8, -8, 1, 0
+	delay 2
+	createsprite gUnknown_08592E30, 130, -8, 8, 1, 0
 	waitforvisualfinish
 	end
 
 Move_MIST:
-	loadspritegfx 0x27A0
+	loadspritegfx ANIM_TAG_144
 	monbg ANIM_ATK_PARTNER
-	setalpha 0x80C
-	loopsewithpan SE_W054, -64, 0x14, 0xF
-	call AnimScript_82D2C34
-	call AnimScript_82D2C34
-	call AnimScript_82D2C34
-	call AnimScript_82D2C34
-	call AnimScript_82D2C34
-	call AnimScript_82D2C34
-	call AnimScript_82D2C34
-	delay 0x20
-	createvisualtask sub_8115A04, 0x2, 10, 8, 2, 0, 14, 0x7FFF
+	setalpha 12, 8
+	loopsewithpan SE_W054, -64, 20, 15
+	call Mist1
+	call Mist1
+	call Mist1
+	call Mist1
+	call Mist1
+	call Mist1
+	call Mist1
+	delay 32
+	createvisualtask sub_8115A04, 2, 10, 8, 2, 0, 14, RGB_WHITE
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
 	end
 
-AnimScript_82D2C34:
-	createsprite gUnknown_08595C2C, 0x2, 0, -24, 48, 240, 0, 1
-	delay 0x7
+Mist1:
+	createsprite gUnknown_08595C2C, 2, 0, -24, 48, 240, 0, 1
+	delay 7
 	return
 
 Move_HAZE:
 	waitforvisualfinish
 	playsewithpan SE_W114, 0
-	createvisualtask sub_810C0A0, 0x5
-	delay 0x1E
-	createvisualtask sub_8116620, 0xA, 1920, 2, 0, 16, 0
+	createvisualtask sub_810C0A0, 5
+	delay 30
+	createvisualtask sub_8116620, 10, 0x780, 2, 0, 16, RGB_BLACK
 	delay 0x5A
-	createvisualtask sub_8116620, 0xA, 1920, 1, 16, 0, 0
+	createvisualtask sub_8116620, 10, 0x780, 1, 16, 0, RGB_BLACK
 	end
 
 Move_FIRE_PUNCH:
-	loadspritegfx 0x279F
-	loadspritegfx 0x272D
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_SMALL_EMBER
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, 31
+	setalpha 12, 8
+	createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB_RED
 	createsprite gUnknown_08595368, 0x81, 0
 	createsprite gUnknown_08595368, 0x81, 64
 	createsprite gUnknown_08595368, 0x81, 128
 	createsprite gUnknown_08595368, 0x81, 196
 	playsewithpan SE_W172, +63
 	waitforvisualfinish
-	createsprite gUnknown_08595E98, 0x83, 0, 0, 8, 1, 0
-	createsprite gUnknown_08597358, 0x82, 0, 0, 1, 1
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 15, 1
-	call AnimScript_82D2D18
-	delay 0x4
+	createsprite gFistFootSpriteTemplate, 131, 0, 0, 8, 1, 0
+	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
+	call FireMoveEffect
+	delay 4
 	playsewithpan SE_W007, +63
 	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 4, 0, 9, 0, 31
+	createvisualtask sub_8116620, 10, 4, 0, 9, 0, RGB_RED
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
-AnimScript_82D2D18:
+FireMoveEffect:
 	createsprite gUnknown_08595380, 0x81, 0, 10, 192, 176, 40
 	createsprite gUnknown_08595380, 0x81, 0, 10, -192, 240, 40
 	createsprite gUnknown_08595380, 0x81, 0, 10, 192, -160, 40
@@ -7072,324 +6981,319 @@ AnimScript_82D2D18:
 	return
 
 Move_LEER:
-	loadspritegfx 0x272B
+	loadspritegfx ANIM_TAG_GLARE
 	monbg ANIM_ATTACKER
 	monbgprio_28 ANIM_ATTACKER
-	setalpha 0x808
+	setalpha 8, 8
 	playsewithpan SE_W043, -64
-	createsprite gUnknown_085CE150, 0x2, 24, -12
-	createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1
+	createsprite gUnknown_085CE150, 2, 24, -12
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1
 	waitforvisualfinish
-	delay 0xA
-	createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 9, 1
-	createvisualtask sub_80D52D0, 0x2, 3, 1, 0, 9, 1
+	delay 10
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 9, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 9, 1
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	blendoff
-	delay 0x1
+	delay 1
 	waitforvisualfinish
 	end
 
 Move_DREAM_EATER:
-	loadspritegfx 0x27A3
-	loadspritegfx 0x272F
+	loadspritegfx ANIM_TAG_147
+	loadspritegfx ANIM_TAG_BLUE_STAR
 	monbg ANIM_DEF_PARTNER
 	monbgprio_2A ANIM_TARGET
 	playsewithpan SE_W060, -64
-	call AnimScript_82D7CD1
-	setalpha 0x808
+	call SetPsychicBackground
+	setalpha 8, 8
 	playsewithpan SE_W107, +63
-	createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 15, 1
-	createvisualtask sub_80D6064, 0x5, -6, -6, 15, 1, 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1
 	waitforvisualfinish
-	setalpha 0x80C
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 2, 25, 1
-	call AnimScript_82D2E51
+	setalpha 12, 8
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 2, 25, 1
+	call DreamEaterEffect
 	waitforvisualfinish
-	delay 0xF
-	call AnimScript_82D79DF
+	delay 15
+	call HealingEffect
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
-	delay 0x1
-	call AnimScript_82D7CDD
+	delay 1
+	call UnsetPsychicBackground
 	end
-
-AnimScript_82D2E51:
+DreamEaterEffect:
 	playsewithpan SE_W207, +63
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	createsprite gUnknown_08592270, 0x3, 5, -18, -40, 35
-	createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	createsprite gUnknown_08592270, 3, 5, -18, -40, 35
+	createsprite gUnknown_08592270, 3, -10, 20, 20, 39
+	delay 4
 	playsewithpan SE_W207, +63
-	createsprite gUnknown_08592270, 0x3, 0, 5, 28, 26
-	createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26
-	createsprite gUnknown_08592270, 0x3, -10, 20, 40, 39
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, 5, 28, 26
+	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
+	createsprite gUnknown_08592270, 3, -10, 20, 40, 39
+	delay 4
 	playsewithpan SE_W207, +63
-	createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26
-	createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33
-	createsprite gUnknown_08592270, 0x3, 10, -5, -32, 26
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
+	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
+	createsprite gUnknown_08592270, 3, 10, -5, -32, 26
+	delay 4
 	playsewithpan SE_W207, +63
-	createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, -15, -16, 36
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
+	delay 4
 	playsewithpan SE_W207, +63
-	createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33
-	createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	delay 0x4
+	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
+	createsprite gUnknown_08592270, 3, 0, -15, -16, 36
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	delay 4
 	playsewithpan SE_W207, +63
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33
-	createsprite gUnknown_08592270, 0x3, 10, -5, -40, 26
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	createsprite gUnknown_08592270, 3, -5, 15, 16, 33
+	createsprite gUnknown_08592270, 3, 10, -5, -40, 26
+	delay 4
 	playsewithpan SE_W207, +63
-	createsprite gUnknown_08592270, 0x3, -5, 15, 36, 33
-	createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26
-	createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39
-	delay 0x4
+	createsprite gUnknown_08592270, 3, -5, 15, 36, 33
+	createsprite gUnknown_08592270, 3, 10, -5, -8, 26
+	createsprite gUnknown_08592270, 3, -10, 20, 20, 39
+	delay 4
 	playsewithpan SE_W207, +63
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26
-	createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35
-	delay 0x4
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	createsprite gUnknown_08592270, 3, 0, 5, 8, 26
+	createsprite gUnknown_08592270, 3, 5, -18, -20, 35
+	delay 4
 	return
 
 Move_POISON_GAS:
-	loadspritegfx 0x27BC
-	loadspritegfx 0x27A6
-	delay 0x0
+	loadspritegfx ANIM_TAG_172
+	loadspritegfx ANIM_TAG_POISON_BUBBLE
+	delay 0
 	monbg ANIM_DEF_PARTNER
 	monbgprio_29
-	setalpha 0x80C
-	delay 0x0
+	setalpha 12, 8
+	delay 0
 	playsewithpan SE_W054, -64
-	createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0
-	delay 0x4
+	createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
+	delay 4
 	playsewithpan SE_W054, -64
-	createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0
-	delay 0x4
+	createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
+	delay 4
 	playsewithpan SE_W054, -64
-	createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0
-	delay 0x4
+	createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
+	delay 4
 	playsewithpan SE_W054, -64
-	createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0
-	delay 0x4
+	createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
+	delay 4
 	playsewithpan SE_W054, -64
-	createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0
-	delay 0x4
+	createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
+	delay 4
 	playsewithpan SE_W054, -64
-	createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0
-	delay 0x28
-	loopsewithpan SE_W054, +63, 0x1C, 0x6
-	createvisualtask sub_8115A04, 0x2, 4, 6, 2, 0, 12, 26650
+	createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
+	delay 40
+	loopsewithpan SE_W054, +63, 28, 6
+	createvisualtask sub_8115A04, 2, 4, 6, 2, 0, 12, RGB(26, 0, 26)
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_DEF_PARTNER
-	delay 0x0
+	delay 0
 	end
 
 Move_BIND:
-	createvisualtask sub_80D5EB8, 0x5, 0, 6, 3328, 4, 0
-	goto AnimScript_82D30DE
+	createvisualtask AnimTask_SwayMon, 5, 0, 6, 3328, 4, ANIM_ATTACKER
+	goto BindWrap
 
-AnimScript_82D30DE:
+BindWrap:
 	playsewithpan SE_W020, +63
-	call AnimScript_82D30EE
-	call AnimScript_82D30EE
+	call BindWrap1
+	call BindWrap1
 	waitforvisualfinish
 	end
-
-AnimScript_82D30EE:
-	createvisualtask sub_80D6064, 0x5, 10, -5, 5, 1, 0
-	delay 0x10
+BindWrap1:
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, 10, -5, 5, ANIM_TARGET, 0
+	delay 16
 	return
 
 Move_WRAP:
-	createvisualtask sub_80D5830, 0x2, 0, 6, 4, 2, 4
-	goto AnimScript_82D30DE
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 6, 4, 2, 4
+	goto BindWrap
 
 Move_PSYBEAM:
-	loadspritegfx 0x27B3
+	loadspritegfx ANIM_TAG_163
 	playsewithpan SE_W060, -64
-	call AnimScript_82D7CD1
+	call SetPsychicBackground
 	createsoundtask sub_8158C58, 200, -64, 63, 3, 4, 0, 15
-	call AnimScript_82D319C
-	call AnimScript_82D319C
-	createvisualtask sub_80D5EB8, 0x5, 0, 6, 2048, 4, 1
-	createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, 32351
-	call AnimScript_82D319C
-	call AnimScript_82D319C
-	call AnimScript_82D319C
-	call AnimScript_82D319C
-	call AnimScript_82D319C
-	call AnimScript_82D319C
-	call AnimScript_82D319C
-	call AnimScript_82D319C
-	call AnimScript_82D319C
-	waitforvisualfinish
-	delay 0x1
-	call AnimScript_82D7CDD
-	end
-
-AnimScript_82D319C:
-	createsprite gUnknown_0859663C, 0x82, 16, 0, 0, 0, 13, 0
-	delay 0x4
+	call Psybeam1
+	call Psybeam1
+	createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET
+	createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(31, 18, 31)
+	call Psybeam1
+	call Psybeam1
+	call Psybeam1
+	call Psybeam1
+	call Psybeam1
+	call Psybeam1
+	call Psybeam1
+	call Psybeam1
+	call Psybeam1
+	waitforvisualfinish
+	delay 1
+	call UnsetPsychicBackground
+	end
+Psybeam1:
+	createsprite gUnknown_0859663C, 130, 16, 0, 0, 0, 13, 0
+	delay 4
 	return
 
 Move_HYPNOSIS:
-	loadspritegfx 0x27B3
-	call AnimScript_82D7CD1
-	call AnimScript_82D31E5
-	call AnimScript_82D31E5
-	call AnimScript_82D31E5
-	createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, 32351
+	loadspritegfx ANIM_TAG_163
+	call SetPsychicBackground
+	call Hypnosis1
+	call Hypnosis1
+	call Hypnosis1
+	createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(31, 18, 31)
 	waitforvisualfinish
-	delay 0x1
-	call AnimScript_82D7CDD
+	delay 1
+	call UnsetPsychicBackground
 	end
-
-AnimScript_82D31E5:
+Hypnosis1:
 	playsewithpan SE_W048, -64
-	createsprite gUnknown_0859663C, 0x82, 0, 8, 0, 8, 27, 0
-	createsprite gUnknown_0859663C, 0x82, 16, -8, 0, -8, 27, 0
-	delay 0x6
+	createsprite gUnknown_0859663C, 130, 0, 8, 0, 8, 27, 0
+	createsprite gUnknown_0859663C, 130, 16, -8, 0, -8, 27, 0
+	delay 6
 	return
 
 Move_PSYWAVE:
-	loadspritegfx 0x27B5
+	loadspritegfx ANIM_TAG_165
 	playsewithpan SE_W060, -64
-	call AnimScript_82D7CD1
-	createvisualtask sub_81076C8, 0x5, 100
+	call SetPsychicBackground
+	createvisualtask sub_81076C8, 5, 100
 	createsoundtask sub_8158C58, 203, -64, 63, 2, 9, 0, 10
-	call AnimScript_82D3275
-	call AnimScript_82D3275
-	createvisualtask sub_8115A04, 0x2, 4, 1, 4, 0, 12, 32351
-	call AnimScript_82D3275
-	call AnimScript_82D3275
-	call AnimScript_82D3275
-	call AnimScript_82D3275
-	waitforvisualfinish
-	delay 0x1
-	call AnimScript_82D7CDD
-	end
-
-AnimScript_82D3275:
-	createsprite gUnknown_08595170, 0x83, 10, 10, 0, 16
-	delay 0x4
-	createsprite gUnknown_08595170, 0x83, 10, 10, 0, 16
-	delay 0x4
+	call Psywave1
+	call Psywave1
+	createvisualtask sub_8115A04, 2, 4, 1, 4, 0, 12, RGB(31, 18, 31)
+	call Psywave1
+	call Psywave1
+	call Psywave1
+	call Psywave1
+	waitforvisualfinish
+	delay 1
+	call UnsetPsychicBackground
+	end
+Psywave1:
+	createsprite gUnknown_08595170, 131, 10, 10, 0, 16
+	delay 4
+	createsprite gUnknown_08595170, 131, 10, 10, 0, 16
+	delay 4
 	return
 
 Move_ZAP_CANNON:
-	loadspritegfx 0x27BB
-	loadspritegfx 0x271B
+	loadspritegfx ANIM_TAG_171
+	loadspritegfx ANIM_TAG_SPARK_2
 	playsewithpan SE_W086, -64
-	createsprite gUnknown_08595764, 0x83, 10, 0, 0, 0, 30, 0
-	createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 0, 40, 0
-	createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 64, 40, 1
-	createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 128, 40, 0
-	createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 192, 40, 2
-	createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 32, 40, 0
-	createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 96, 40, 1
-	createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 160, 40, 0
-	createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 224, 40, 2
+	createsprite gUnknown_08595764, 131, 10, 0, 0, 0, 30, 0
+	createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 0, 40, 0
+	createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 64, 40, 1
+	createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 128, 40, 0
+	createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 192, 40, 2
+	createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 32, 40, 0
+	createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 96, 40, 1
+	createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 160, 40, 0
+	createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 224, 40, 2
 	waitforvisualfinish
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1
-	delay 0xF
-	waitplaysewithpan SE_W085B, +63, 0x13
-	call AnimScript_82D7BEA
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
+	delay 15
+	waitplaysewithpan SE_W085B, +63, 19
+	call ElectricityEffect
 	waitforvisualfinish
 	end
 
 Move_STEEL_WING:
-	loadspritegfx 0x2719
-	loadspritegfx 0x2797
-	loopsewithpan SE_W231, -64, 0x1C, 0x2
-	createvisualtask sub_81144F8, 0x5, 0, 0, 0
+	loadspritegfx ANIM_TAG_GUST
+	loadspritegfx ANIM_TAG_135
+	loopsewithpan SE_W231, -64, 28, 2
+	createvisualtask sub_81144F8, 5, 0, 0, 0
 	waitforvisualfinish
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	loopsewithpan SE_W017, -64, 0x14, 0x2
-	createvisualtask sub_80D5738, 0x2, 0, 12, 4, 1, 4
-	createvisualtask sub_810DED8, 0x5, 1, 70
-	createsprite gUnknown_085962A4, 0x2, -25, 0, 0, 0, 20
-	createsprite gUnknown_085962A4, 0x2, 25, 0, 0, 0, 20
-	delay 0x18
-	createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 9
-	delay 0x11
-	createsprite gUnknown_08597358, 0x2, 16, 0, 1, 1
-	createsprite gUnknown_08597358, 0x2, -16, 0, 1, 1
+	setalpha 12, 8
+	loopsewithpan SE_W017, -64, 20, 2
+	createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4
+	createvisualtask sub_810DED8, 5, 1, 70
+	createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20
+	createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20
+	delay 24
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 9
+	delay 17
+	createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1
+	createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1
 	playsewithpan SE_W013, +63
 	waitforvisualfinish
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 11
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_IRON_TAIL:
-	loadspritegfx 0x2797
-	loopsewithpan SE_W231, -64, 0x1C, 0x2
-	createvisualtask sub_81144F8, 0x5, 1, 0, 0
+	loadspritegfx ANIM_TAG_135
+	loopsewithpan SE_W231, -64, 28, 2
+	createvisualtask sub_81144F8, 5, 1, 0, 0
 	waitforvisualfinish
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	createsprite gUnknown_0857FE28, 0x2, 4, 4
-	delay 0x6
-	createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+	setalpha 12, 8
+	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4
+	delay 6
+	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	playsewithpan SE_W233B, +63
 	waitforvisualfinish
-	createvisualtask sub_811489C, 0x5, 0, 1
+	createvisualtask sub_811489C, 5, 0, 1
 	clearmonbg ANIM_TARGET
 	blendoff
 	waitforvisualfinish
 	end
 
 Move_POISON_TAIL:
-	loadspritegfx 0x2797
-	loadspritegfx 0x27A6
-	loopsewithpan SE_W231, -64, 0x1C, 0x2
-	createvisualtask sub_81144F8, 0x5, 1, 1, RGB(24, 6, 23)
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_POISON_BUBBLE
+	loopsewithpan SE_W231, -64, 28, 2
+	createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23)
 	waitforvisualfinish
 	monbg ANIM_TARGET
-	setalpha 0x80C
-	createsprite gUnknown_0857FE28, 0x2, 4, 4
-	delay 0x6
-	createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+	setalpha 12, 8
+	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4
+	delay 6
+	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	playsewithpan SE_W233B, +63
 	waitforvisualfinish
-	createvisualtask sub_811489C, 0x5, 0, 1
+	createvisualtask sub_811489C, 5, 0, 1
 	clearmonbg ANIM_TARGET
 	blendoff
-	call AnimScript_82D7A71
+	call PoisonBubblesEffect
 	waitforvisualfinish
 	end
 
 Move_METAL_CLAW:
-	loadspritegfx 0x2737
-	loopsewithpan SE_W231, -64, 0x1C, 0x2
-	createvisualtask sub_81144F8, 0x5, 0, 0, 0
+	loadspritegfx ANIM_TAG_CLAW_SLASH
+	loopsewithpan SE_W231, -64, 28, 2
+	createvisualtask sub_81144F8, 5, 0, 0, 0
 	waitforvisualfinish
-	createsprite gUnknown_0857FE28, 0x2, 6, 4
-	delay 0x2
+	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
+	delay 2
 	playsewithpan SE_W013, +63
-	createsprite gUnknown_08597138, 0x82, -10, -10, 0
-	createsprite gUnknown_08597138, 0x82, -10, 10, 0
-	createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1
-	delay 0x8
-	createsprite gUnknown_0857FE28, 0x2, 6, 4
-	delay 0x2
+	createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0
+	createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0
+	createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1
+	delay 8
+	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
+	delay 2
 	playsewithpan SE_W013, +63
-	createsprite gUnknown_08597138, 0x82, 10, -10, 1
-	createsprite gUnknown_08597138, 0x82, 10, 10, 1
-	createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1
+	createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1
+	createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1
+	createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1
 	waitforvisualfinish
 	end
 
@@ -7399,1265 +7303,1241 @@ Move_NIGHT_SHADE:
 	playsewithpan SE_W060, -64
 	fadetobg BG_GHOST
 	waitbgfadein
-	delay 0xA
+	delay 10
 	playsewithpan SE_W043, -64
-	createvisualtask sub_811188C, 0x5, 85
-	delay 0x46
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 12, 1
-	createvisualtask sub_8115A04, 0x2, 4, 0, 2, 0, 13, 0
+	createvisualtask sub_811188C, 5, 85
+	delay 70
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1
+	createvisualtask sub_8115A04, 2, 4, 0, 2, 0, 13, RGB_BLACK
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
-	delay 0x1
+	delay 1
 	restorebg
 	waitbgfadein
 	end
 
 Move_EGG_BOMB:
-	loadspritegfx 0x27D6
-	loadspritegfx 0x27BF
+	loadspritegfx ANIM_TAG_EXPLOSION
+	loadspritegfx ANIM_TAG_175
 	playsewithpan SE_W039, -64
-	createsprite gUnknown_08593488, 0x82, 10, 0, 0, 0, 25, -32
+	createsprite gUnknown_08593488, 130, 10, 0, 0, 0, 25, -32
 	waitforvisualfinish
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 16, 1
-	createsprite gUnknown_0859371C, 0x84, 6, 5, 1, 0
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 16, 1
+	createsprite gBattleAnimSpriteTemplate_859371C, 132, 6, 5, 1, 0
 	playsewithpan SE_W120, +63
-	delay 0x3
-	createsprite gUnknown_0859371C, 0x84, -16, -15, 1, 0
+	delay 3
+	createsprite gBattleAnimSpriteTemplate_859371C, 132, -16, -15, 1, 0
 	playsewithpan SE_W120, +63
-	delay 0x3
-	createsprite gUnknown_0859371C, 0x84, 16, -5, 1, 0
+	delay 3
+	createsprite gBattleAnimSpriteTemplate_859371C, 132, 16, -5, 1, 0
 	playsewithpan SE_W120, +63
-	delay 0x3
-	createsprite gUnknown_0859371C, 0x84, -12, 18, 1, 0
+	delay 3
+	createsprite gBattleAnimSpriteTemplate_859371C, 132, -12, 18, 1, 0
 	playsewithpan SE_W120, +63
-	delay 0x3
-	createsprite gUnknown_0859371C, 0x84, 0, 5, 1, 0
+	delay 3
+	createsprite gBattleAnimSpriteTemplate_859371C, 132, 0, 5, 1, 0
 	playsewithpan SE_W120, +63
-	delay 0x3
+	delay 3
 	waitforvisualfinish
 	end
 
 Move_SHADOW_BALL:
-	loadspritegfx 0x27C0
+	loadspritegfx ANIM_TAG_176
 	fadetobg BG_GHOST
 	waitbgfadein
-	delay 0xF
+	delay 15
 	createsoundtask sub_8158C58, 168, -64, 63, 5, 5, 0, 5
-	createsprite gUnknown_08596D58, 0x82, 16, 16, 8
+	createsprite gUnknown_08596D58, 130, 16, 16, 8
 	waitforvisualfinish
 	playsewithpan SE_W028, +63
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 8, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1
 	waitforvisualfinish
 	restorebg
 	waitbgfadein
 	end
 
 Move_LICK:
-	loadspritegfx 0x27C1
-	delay 0xF
+	loadspritegfx ANIM_TAG_177
+	delay 15
 	playsewithpan SE_W122, +63
-	createsprite gUnknown_08596D8C, 0x82, 0, 0
-	createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 16, 1
+	createsprite gUnknown_08596D8C, 130, 0, 0
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 16, 1
 	waitforvisualfinish
 	end
 
 Move_FOCUS_ENERGY:
-	loadspritegfx 0x27C8
+	loadspritegfx ANIM_TAG_184
 	playsewithpan SE_W082, -64
-	call AnimScript_82CD6C7
-	delay 0x8
-	createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 0x7FFF
-	createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1
-	call AnimScript_82CD6C7
-	delay 0x8
-	call AnimScript_82CD6C7
+	call EndureEffect
+	delay 8
+	createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_WHITE
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
+	call EndureEffect
+	delay 8
+	call EndureEffect
 	waitforvisualfinish
 	end
 
 Move_BIDE:
-	choosetwoturnanim AnimScript_82D3719, AnimScript_82D3745
+	choosetwoturnanim BideSetUp, BideUnleash
 	end
-
-AnimScript_82D3719:
-	loopsewithpan SE_W036, -64, 0x9, 0x2
-	createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 31
-	createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1
+BideSetUp:
+	loopsewithpan SE_W036, -64, 9, 2
+	createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
 	waitforvisualfinish
 	end
 
-AnimScript_82D3745:
-	loadspritegfx 0x2797
+BideUnleash:
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	loopsewithpan SE_W036, -64, 0x9, 0x2
-	createvisualtask sub_8116620, 0xA, 2, 2, 0, 11, 31
-	createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1
+	setalpha 12, 8
+	loopsewithpan SE_W036, -64, 9, 2
+	createvisualtask sub_8116620, 10, 2, 2, 0, 11, RGB_RED
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
 	waitforvisualfinish
-	createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 4
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 4
 	waitforvisualfinish
-	createvisualtask sub_80D5484, 0x2, 0, 2, 0, 12, 1
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 16, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 12, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 16, 1
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_08597358, 0x1, 18, -8, 1, 1
-	delay 0x5
+	createsprite gBasicHitSplatSpriteTemplate, 1, 18, -8, 1, 1
+	delay 5
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_08597358, 0x1, -18, 8, 1, 1
-	delay 0x5
+	createsprite gBasicHitSplatSpriteTemplate, 1, -18, 8, 1, 1
+	delay 5
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_08597358, 0x1, -8, -5, 1, 1
+	createsprite gBasicHitSplatSpriteTemplate, 1, -8, -5, 1, 1
 	waitforvisualfinish
-	delay 0x5
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 7
+	delay 5
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7
 	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 2, 2, 11, 0, 31
+	createvisualtask sub_8116620, 10, 2, 2, 11, 0, RGB_RED
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_STRING_SHOT:
-	loadspritegfx 0x27C3
-	loadspritegfx 0x27C4
+	loadspritegfx ANIM_TAG_179
+	loadspritegfx ANIM_TAG_WEB_THREAD
 	monbg ANIM_DEF_PARTNER
-	delay 0x0
-	createsprite gUnknown_08597274, 0x5, 1, 2, 0, 9, 0
-	waitforvisualfinish
-	loopsewithpan SE_W081, -64, 0x9, 0x6
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
-	call AnimScript_82D38CC
+	delay 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK
+	waitforvisualfinish
+	loopsewithpan SE_W081, -64, 9, 6
+	call StringShot1
+	call StringShot1
+	call StringShot1
+	call StringShot1
+	call StringShot1
+	call StringShot1
+	call StringShot1
+	call StringShot1
+	call StringShot1
+	call StringShot1
+	call StringShot1
+	call StringShot1
+	call StringShot1
+	call StringShot1
+	call StringShot1
+	call StringShot1
+	call StringShot1
+	call StringShot1
 	waitforvisualfinish
 	playsewithpan SE_W081B, +63
-	createsprite gUnknown_085969F8, 0x82, 0, 10
-	delay 0x4
-	createsprite gUnknown_085969F8, 0x82, 0, -2
-	delay 0x4
-	createsprite gUnknown_085969F8, 0x82, 0, 22
+	createsprite gUnknown_085969F8, 130, 0, 10
+	delay 4
+	createsprite gUnknown_085969F8, 130, 0, -2
+	delay 4
+	createsprite gUnknown_085969F8, 130, 0, 22
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
-	delay 0x1
+	delay 1
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x5, 1, 2, 9, 0, 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 9, 0, RGB_BLACK
 	end
 
-AnimScript_82D38CC:
-	createsprite gUnknown_085969E0, 0x82, 20, 0, 512, 20, 1
-	delay 0x1
+StringShot1:
+	createsprite gUnknown_085969E0, 130, 20, 0, 512, 20, 1
+	delay 1
 	return
 
 Move_SPIDER_WEB:
-	loadspritegfx 0x27C5
-	loadspritegfx 0x27C4
+	loadspritegfx ANIM_TAG_SPIDER_WEB
+	loadspritegfx ANIM_TAG_WEB_THREAD
 	monbg ANIM_DEF_PARTNER
-	delay 0x0
-	createsprite gUnknown_08597274, 0x5, 1, 2, 0, 9, 0
+	delay 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK
 	waitforvisualfinish
 	monbgprio_28 ANIM_TARGET
-	loopsewithpan SE_W081, -64, 0x9, 0x6
-	call AnimScript_82D396D
-	call AnimScript_82D396D
-	call AnimScript_82D396D
-	call AnimScript_82D396D
-	call AnimScript_82D396D
-	call AnimScript_82D396D
-	call AnimScript_82D396D
-	call AnimScript_82D396D
-	call AnimScript_82D396D
-	call AnimScript_82D396D
-	call AnimScript_82D396D
-	call AnimScript_82D396D
-	call AnimScript_82D396D
-	call AnimScript_82D396D
+	loopsewithpan SE_W081, -64, 9, 6
+	call SpiderWeb1
+	call SpiderWeb1
+	call SpiderWeb1
+	call SpiderWeb1
+	call SpiderWeb1
+	call SpiderWeb1
+	call SpiderWeb1
+	call SpiderWeb1
+	call SpiderWeb1
+	call SpiderWeb1
+	call SpiderWeb1
+	call SpiderWeb1
+	call SpiderWeb1
+	call SpiderWeb1
 	waitforvisualfinish
 	playsewithpan SE_W081B, +63
-	createsprite gUnknown_08596A2C, 0x2
+	createsprite gUnknown_08596A2C, 2
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
-	delay 0x1
-	createsprite gUnknown_08597274, 0x5, 1, 2, 9, 0, 0
+	delay 1
+	createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 9, 0, RGB_BLACK
 	end
 
-AnimScript_82D396D:
-	createsprite gUnknown_085969E0, 0x82, 20, 0, 512, 20, 0
-	delay 0x1
+SpiderWeb1:
+	createsprite gUnknown_085969E0, 130, 20, 0, 512, 20, 0
+	delay 1
 	return
 
 Move_RAZOR_WIND:
-	choosetwoturnanim AnimScript_82D398C, AnimScript_82D39DC
-
-AnimScript_82D398A:
+	choosetwoturnanim RazorWindSetUp, RazorWindUnleash
+RazorWindContinue:
 	waitforvisualfinish
 	end
 
-AnimScript_82D398C:
-	loadspritegfx 0x2719
+RazorWindSetUp:
+	loadspritegfx ANIM_TAG_GUST
 	playsewithpan SE_W016, -64
-	createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 0, 7, 40
-	createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 85, 7, 40
-	createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 170, 7, 40
+	createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 0, 7, 40
+	createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 85, 7, 40
+	createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 170, 7, 40
 	waitforvisualfinish
 	playsewithpan SE_W016B, -64
-	goto AnimScript_82D398A
+	goto RazorWindContinue
 
-AnimScript_82D39DC:
-	loadspritegfx 0x27AA
-	loadspritegfx 0x2797
+RazorWindUnleash:
+	loadspritegfx ANIM_TAG_154
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W013B, -64
-	createsprite gUnknown_085962D4, 0x2, 14, 8, 0, 0, 22, 2, 1
-	delay 0x2
+	createsprite gUnknown_085962D4, 2, 14, 8, 0, 0, 22, 2, 1
+	delay 2
 	playsewithpan SE_W013B, -64
-	createsprite gUnknown_085962D4, 0x2, 14, -8, 16, 14, 22, 1, 1
-	delay 0x2
+	createsprite gUnknown_085962D4, 2, 14, -8, 16, 14, 22, 1, 1
+	delay 2
 	playsewithpan SE_W013B, -64
-	createsprite gUnknown_085962D4, 0x2, 14, 12, -16, -14, 22, 0, 1
-	delay 0x11
+	createsprite gUnknown_085962D4, 2, 14, 12, -16, -14, 22, 0, 1
+	delay 17
 	playsewithpan SE_W013, +63
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 10, 1
-	createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 10, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 10, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 10, 1
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
-	goto AnimScript_82D398A
+	goto RazorWindContinue
 
 Move_DISABLE:
-	loadspritegfx 0x2757
+	loadspritegfx ANIM_TAG_071
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x808
+	setalpha 8, 8
 	playsewithpan SE_W197, -64
-	createsprite gUnknown_0853EE84, 0xD, 24, -16
+	createsprite gUnknown_0853EE84, 13, 24, -16
 	waitforvisualfinish
-	createvisualtask sub_81045B0, 0x5
-	loopsewithpan SE_W020, +63, 0xF, 0x4
+	createvisualtask sub_81045B0, 5
+	loopsewithpan SE_W020, +63, 15, 4
 	waitforvisualfinish
-	delay 0x1
+	delay 1
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_RECOVER:
-	loadspritegfx 0x27A3
-	loadspritegfx 0x272F
+	loadspritegfx ANIM_TAG_147
+	loadspritegfx ANIM_TAG_BLUE_STAR
 	monbg ANIM_ATK_PARTNER
-	setalpha 0x80C
-	loopsewithpan SE_W025, -64, 0xD, 0x3
-	createvisualtask sub_8115A04, 0x2, 2, 0, 6, 0, 11, 12287
-	call AnimScript_82D3AD5
-	call AnimScript_82D3AD5
-	call AnimScript_82D3AD5
+	setalpha 12, 8
+	loopsewithpan SE_W025, -64, 13, 3
+	createvisualtask sub_8115A04, 2, 2, 0, 6, 0, 11, RGB(31, 31, 11)
+	call Recover1
+	call Recover1
+	call Recover1
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
-	delay 0x1
-	call AnimScript_82D79DF
-	waitforvisualfinish
-	end
-
-AnimScript_82D3AD5:
-	createsprite gUnknown_085921E0, 0x2, 40, -10, 13
-	delay 0x3
-	createsprite gUnknown_085921E0, 0x2, -35, -10, 13
-	delay 0x3
-	createsprite gUnknown_085921E0, 0x2, 15, -40, 13
-	delay 0x3
-	createsprite gUnknown_085921E0, 0x2, -10, -32, 13
-	delay 0x3
-	createsprite gUnknown_085921E0, 0x2, 25, -20, 13
-	delay 0x3
-	createsprite gUnknown_085921E0, 0x2, -40, -20, 13
-	delay 0x3
-	createsprite gUnknown_085921E0, 0x2, 5, -40, 13
-	delay 0x3
+	delay 1
+	call HealingEffect
+	waitforvisualfinish
+	end
+
+Recover1:
+	createsprite gUnknown_085921E0, 2, 40, -10, 13
+	delay 3
+	createsprite gUnknown_085921E0, 2, -35, -10, 13
+	delay 3
+	createsprite gUnknown_085921E0, 2, 15, -40, 13
+	delay 3
+	createsprite gUnknown_085921E0, 2, -10, -32, 13
+	delay 3
+	createsprite gUnknown_085921E0, 2, 25, -20, 13
+	delay 3
+	createsprite gUnknown_085921E0, 2, -40, -20, 13
+	delay 3
+	createsprite gUnknown_085921E0, 2, 5, -40, 13
+	delay 3
 	return
 
 Move_MIMIC:
-	loadspritegfx 0x27A3
-	setalpha 0x50B
+	loadspritegfx ANIM_TAG_147
+	setalpha 11, 5
 	monbg_22 ANIM_DEF_PARTNER
 	monbgprio_29
-	panse_1B SE_W107, +63, -64, -3, 0x0
-	createvisualtask sub_80FF458, 0x5, 128, 24
-	delay 0xF
-	createsprite gUnknown_085924DC, 0x82, -12, 24
-	delay 0xA
-	setarg 0x7, 0xFFFF
+	panse_1B SE_W107, +63, -64, -3, 0
+	createvisualtask sub_80FF458, 5, 128, 24
+	delay 15
+	createsprite gUnknown_085924DC, 130, -12, 24
+	delay 10
+	setarg 7, -1
 	waitforvisualfinish
 	playsewithpan SE_W036, -64
-	createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 11, 0x7FFF
+	createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 11, RGB_WHITE
 	waitforvisualfinish
 	clearmonbg_23 ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_CONSTRICT:
-	loadspritegfx 0x27CA
-	loopsewithpan SE_W010, +63, 0x6, 0x4
-	createsprite gUnknown_08592494, 0x84, 0, 16, 0, 2
-	delay 0x7
-	createsprite gUnknown_08592494, 0x83, 0, 0, 0, 2
-	createsprite gUnknown_08592494, 0x82, 0, 8, 1, 2
-	delay 0x7
-	createsprite gUnknown_08592494, 0x83, 0, -8, 1, 2
-	delay 0x8
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1
-	delay 0x14
+	loadspritegfx ANIM_TAG_186
+	loopsewithpan SE_W010, +63, 6, 4
+	createsprite gUnknown_08592494, 132, 0, 16, 0, 2
+	delay 7
+	createsprite gUnknown_08592494, 131, 0, 0, 0, 2
+	createsprite gUnknown_08592494, 130, 0, 8, 1, 2
+	delay 7
+	createsprite gUnknown_08592494, 131, 0, -8, 1, 2
+	delay 8
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
+	delay 20
 	playsewithpan SE_W020, +63
-	setarg 0x7, 0xFFFF
+	setarg 7, -1
 	waitforvisualfinish
 	end
 
 Move_CURSE:
-	choosetwoturnanim AnimScript_82D3BFB, AnimScript_82D3C78
-
-AnimScript_82D3BFB:
-	loadspritegfx 0x27D7
-	loadspritegfx 0x27D8
+	choosetwoturnanim CurseGhost, CurseStats
+CurseGhost:
+	loadspritegfx ANIM_TAG_NAIL
+	loadspritegfx ANIM_TAG_200
 	monbg ANIM_ATK_PARTNER
-	createvisualtask sub_8112758, 0x5
+	createvisualtask sub_8112758, 5
 	waitforvisualfinish
-	delay 0x14
-	createsprite gUnknown_08596DD0, 0x2
-	delay 0x3C
-	call AnimScript_82D3C62
-	delay 0x29
-	call AnimScript_82D3C62
-	delay 0x29
-	call AnimScript_82D3C62
+	delay 20
+	createsprite gUnknown_08596DD0, 2
+	delay 60
+	call CurseGhost1
+	delay 41
+	call CurseGhost1
+	delay 41
+	call CurseGhost1
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
-	delay 0x1
+	delay 1
 	monbg ANIM_DEF_PARTNER
 	playsewithpan SE_W171, +63
-	createsprite gUnknown_08596DE8, 0x82
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 14, 1
+	createsprite gBattleAnimSpriteTemplate_8596DE8, 130
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 1, 16, 0, 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 16, 0, RGB_BLACK
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
-
-AnimScript_82D3C62:
-	createvisualtask sub_80D52D0, 0x2, 0, 4, 0, 10, 0
+CurseGhost1:
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 4, 0, 10, 0
 	playsewithpan SE_W020, -64
 	return
-
-AnimScript_82D3C78:
-	createvisualtask sub_80D5EB8, 0x5, 0, 10, 1536, 3, 0
+CurseStats:
+	createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, ANIM_ATTACKER
 	waitforvisualfinish
-	delay 0xA
-	call AnimScript_82D3C93
+	delay 10
+	call CurseStats1
 	waitforvisualfinish
 	end
-
-AnimScript_82D3C93:
+CurseStats1:
 	playsewithpan SE_W082, -64
-	createvisualtask sub_8116B14, 0x5
-	createvisualtask sub_8115A04, 0x5, 2, 4, 2, 0, 10, 31
+	createvisualtask sub_8116B14, 5
+	createvisualtask sub_8115A04, 5, 2, 4, 2, 0, 10, RGB_RED
 	return
 
 Move_SOFT_BOILED:
-	loadspritegfx 0x27DA
-	loadspritegfx 0x27DB
-	loadspritegfx 0x272F
+	loadspritegfx ANIM_TAG_BREAKING_EGG
+	loadspritegfx ANIM_TAG_203
+	loadspritegfx ANIM_TAG_BLUE_STAR
 	monbg ANIM_ATK_PARTNER
 	playsewithpan SE_W039, -64
-	createvisualtask sub_80D51AC, 0x2, 0, 0, 2, 6, 1
-	createsprite gUnknown_085937B0, 0x4, 0, 16, 0
-	createsprite gUnknown_085937B0, 0x4, 0, 16, 1
-	delay 0x78
-	delay 0x7
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 2, 6, 1
+	createsprite gUnknown_085937B0, 4, 0, 16, 0
+	createsprite gUnknown_085937B0, 4, 0, 16, 1
+	delay 120
+	delay 7
 	playsewithpan SE_W030, -64
-	createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, RGB(12, 24, 30)
-	createsprite gUnknown_0859381C, 0x3, 31, 16, 0, 1
-	delay 0x8
-	createsprite gUnknown_0859381C, 0x3, 31, 16, 0, 1
-	delay 0x3C
-	setarg 0x7, 0xFFFF
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, RGB(12, 24, 30)
+	createsprite gUnknown_0859381C, 3, 31, 16, 0, 1
+	delay 8
+	createsprite gUnknown_0859381C, 3, 31, 16, 0, 1
+	delay 60
+	setarg 7, -1
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
-	call AnimScript_82D7A28
+	call HealingEffect2
 	end
 
 Move_HEAL_BELL:
-	loadspritegfx 0x27DD
-	loadspritegfx 0x27DE
-	loadspritegfx 0x27DB
-	createvisualtask sub_8116620, 0xA, 10, 0, 0, 10, 0x7FFF
-	waitforvisualfinish
-	createvisualtask sub_8105CB4, 0x5
-	createsprite gUnknown_08593938, 0x2, 0, -24, 0, 1
-	delay 0xC
-	createsprite gUnknown_08593958, 0x28, 0, -24, 48, -18, 35, 0, 0
-	createsprite gUnknown_08593958, 0x28, 0, -24, -48, 20, 30, 1, 1
-	createsprite gUnknown_08593958, 0x28, 0, -24, -38, -29, 30, 2, 2
-	createsprite gUnknown_08593958, 0x28, 0, -24, 36, 18, 30, 3, 3
-	call AnimScript_82D3EF8
+	loadspritegfx ANIM_TAG_BELL
+	loadspritegfx ANIM_TAG_MUSIC_NOTES
+	loadspritegfx ANIM_TAG_203
+	createvisualtask sub_8116620, 10, 10, 0, 0, 10, RGB_WHITE
+	waitforvisualfinish
+	createvisualtask sub_8105CB4, 5
+	createsprite gUnknown_08593938, 2, 0, -24, 0, 1
+	delay 12
+	createsprite gUnknown_08593958, 40, 0, -24, 48, -18, 35, 0, 0
+	createsprite gUnknown_08593958, 40, 0, -24, -48, 20, 30, 1, 1
+	createsprite gUnknown_08593958, 40, 0, -24, -38, -29, 30, 2, 2
+	createsprite gUnknown_08593958, 40, 0, -24, 36, 18, 30, 3, 3
+	call HealBell1
 	delay 0x21
-	createsprite gUnknown_08593958, 0x28, 0, -24, 19, 26, 35, 4, 4
-	createsprite gUnknown_08593958, 0x28, 0, -24, -34, -12, 30, 5, 5
-	createsprite gUnknown_08593958, 0x28, 0, -24, 41, -20, 34, 6, 2
-	createsprite gUnknown_08593958, 0x28, 0, -24, -15, 26, 32, 7, 0
-	call AnimScript_82D3EF8
+	createsprite gUnknown_08593958, 40, 0, -24, 19, 26, 35, 4, 4
+	createsprite gUnknown_08593958, 40, 0, -24, -34, -12, 30, 5, 5
+	createsprite gUnknown_08593958, 40, 0, -24, 41, -20, 34, 6, 2
+	createsprite gUnknown_08593958, 40, 0, -24, -15, 26, 32, 7, 0
+	call HealBell1
 	delay 0x21
-	createsprite gUnknown_08593958, 0x28, 0, -24, -48, 18, 31, 0, 2
-	createsprite gUnknown_08593958, 0x28, 0, -24, 48, -20, 30, 2, 5
-	createsprite gUnknown_08593958, 0x28, 0, -24, 38, 29, 33, 4, 3
-	createsprite gUnknown_08593958, 0x28, 0, -24, -36, -18, 30, 6, 1
-	call AnimScript_82D3EF8
-	waitforvisualfinish
-	createvisualtask sub_8105D60, 0x5
-	waitforvisualfinish
-	unloadspritegfx 0x27DD
-	unloadspritegfx 0x27DE
-	unloadspritegfx 0x27DB
-	loadspritegfx 0x2741
+	createsprite gUnknown_08593958, 40, 0, -24, -48, 18, 31, 0, 2
+	createsprite gUnknown_08593958, 40, 0, -24, 48, -20, 30, 2, 5
+	createsprite gUnknown_08593958, 40, 0, -24, 38, 29, 33, 4, 3
+	createsprite gUnknown_08593958, 40, 0, -24, -36, -18, 30, 6, 1
+	call HealBell1
+	waitforvisualfinish
+	createvisualtask sub_8105D60, 5
+	waitforvisualfinish
+	unloadspritegfx ANIM_TAG_BELL
+	unloadspritegfx ANIM_TAG_MUSIC_NOTES
+	unloadspritegfx ANIM_TAG_203
+	loadspritegfx ANIM_TAG_SPARKLE
 	playsewithpan SE_W234, -64
-	createsprite gUnknown_08592B94, 0x10, -15, 0, 0, 0, 32, 60, 1
-	delay 0x8
-	createsprite gUnknown_08592B94, 0x10, 12, -5, 0, 0, 32, 60, 1
+	createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1
+	delay 8
+	createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1
 	waitforvisualfinish
-	unloadspritegfx 0x2741
-	loadspritegfx 0x27DB
+	unloadspritegfx ANIM_TAG_SPARKLE
+	loadspritegfx ANIM_TAG_203
 	playsewithpan SE_REAPOKE, -64
-	createvisualtask sub_8116664, 0xA, 4, 3, 10, 0, 31500
-	createvisualtask sub_8116620, 0xA, 10, 3, 10, 0, 0x7FFF
-	createsprite gUnknown_08593868, 0x10, 0, 0, 0, 1
-	end
-
-AnimScript_82D3EF8:
-	createvisualtask sub_8116664, 0xA, 4, 3, 8, 0, 31500
-	createvisualtask sub_8116620, 0xA, 10, 3, 2, 10, 0x7FFF
-	createsprite gUnknown_0859381C, 0x28, 0, -24, 0, 1
+	createvisualtask sub_8116664, 10, 4, 3, 10, 0, RGB(12, 24, 30)
+	createvisualtask sub_8116620, 10, 10, 3, 10, 0, RGB_WHITE
+	createsprite gUnknown_08593868, 16, 0, 0, 0, 1
+	end
+HealBell1:
+	createvisualtask sub_8116664, 10, 4, 3, 8, 0, RGB(12, 24, 30)
+	createvisualtask sub_8116620, 10, 10, 3, 2, 10, RGB_WHITE
+	createsprite gUnknown_0859381C, 40, 0, -24, 0, 1
 	playsewithpan SE_W215, -64
 	return
 
 Move_FAKE_OUT:
 	playsewithpan SE_W260, 0
-	createvisualtask sub_8105EB0, 0x5
+	createvisualtask sub_8105EB0, 5
 	waitforvisualfinish
 	playsewithpan SE_W166, +63
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1
-	createvisualtask sub_8106020, 0x3
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
+	createvisualtask sub_8106020, 3
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, RGB_WHITE
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_WHITE
 	end
 
 Move_SCARY_FACE:
-	loadspritegfx 0x27EA
-	createsprite gUnknown_08597274, 0x2, 27, 3, 0, 16, 0
+	loadspritegfx ANIM_TAG_218
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 0, 16, RGB_BLACK
 	playsewithpan SE_W060, -64
 	waitforvisualfinish
-	delay 0xA
+	delay 10
 	playsewithpan SE_W043, -64
-	createvisualtask sub_81064F8, 0x5
-	delay 0xD
-	createsprite gUnknown_08593A84, 0x0, -16, -8
-	createsprite gUnknown_08593A84, 0x0, 16, -8
+	createvisualtask sub_81064F8, 5
+	delay 13
+	createsprite gUnknown_08593A84, 0, -16, -8
+	createsprite gUnknown_08593A84, 0, 16, -8
 	waitforvisualfinish
-	createvisualtask sub_810A094, 0x3, 20, 1, 0
+	createvisualtask sub_810A094, 3, 20, 1, 0
 	playsewithpan SE_W081B, +63
-	createsprite gUnknown_08597274, 0x2, 27, 3, 16, 0, 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 16, 0, RGB_BLACK
 	waitforvisualfinish
 	end
 
 Move_SWEET_KISS:
-	loadspritegfx 0x27E8
-	loadspritegfx 0x27EC
-	createsprite gUnknown_08593AA8, 0x82, 16, -48
+	loadspritegfx ANIM_TAG_216
+	loadspritegfx ANIM_TAG_ANGEL
+	createsprite gUnknown_08593AA8, 130, 16, -48
 	playsewithpan SE_W215, +63
-	delay 0x17
+	delay 23
 	playsewithpan SE_W215, +63
-	delay 0x17
+	delay 23
 	playsewithpan SE_W215, +63
 	waitforvisualfinish
-	createsprite gUnknown_085939B8, 0x83, 160, -30
+	createsprite gBattleAnimSpriteTemplate_85939B8, 131, 160, -30
 	playsewithpan SE_W213, +63
-	createsprite gUnknown_085939B8, 0x83, -256, -42
-	createsprite gUnknown_085939B8, 0x83, 128, -14
-	createsprite gUnknown_085939B8, 0x83, 416, -38
-	createsprite gUnknown_085939B8, 0x83, -128, -22
-	createsprite gUnknown_085939B8, 0x83, -384, -31
+	createsprite gBattleAnimSpriteTemplate_85939B8, 131, -256, -42
+	createsprite gBattleAnimSpriteTemplate_85939B8, 131, 128, -14
+	createsprite gBattleAnimSpriteTemplate_85939B8, 131, 416, -38
+	createsprite gBattleAnimSpriteTemplate_85939B8, 131, -128, -22
+	createsprite gBattleAnimSpriteTemplate_85939B8, 131, -384, -31
 	end
 
 Move_LOVELY_KISS:
-	loadspritegfx 0x27EB
-	loadspritegfx 0x27ED
-	createsprite gUnknown_08593AF0, 0x82, 0, -24
+	loadspritegfx ANIM_TAG_219
+	loadspritegfx ANIM_TAG_EVIL_ANGEL
+	createsprite gUnknown_08593AF0, 130, 0, -24
 	playsewithpan SE_W060B, +63
 	waitforvisualfinish
 	playsewithpan SE_W213, +63
-	createsprite gUnknown_08593AC0, 0x83, -256, -42
-	createsprite gUnknown_08593AC0, 0x83, 128, -14
-	createsprite gUnknown_08593AC0, 0x83, 416, -38
-	createsprite gUnknown_08593AC0, 0x83, -128, -22
+	createsprite gUnknown_08593AC0, 131, -256, -42
+	createsprite gUnknown_08593AC0, 131, 128, -14
+	createsprite gUnknown_08593AC0, 131, 416, -38
+	createsprite gUnknown_08593AC0, 131, -128, -22
 	end
 
 Move_FURY_SWIPES:
-	loadspritegfx 0x27EE
-	createsprite gUnknown_0857FE28, 0x2, 5, 5
-	delay 0x4
+	loadspritegfx ANIM_TAG_222
+	createsprite gHorizontalLungeSpriteTemplate, 2, 5, 5
+	delay 4
 	playsewithpan SE_W010, +63
-	createsprite gUnknown_08593B38, 0x82, 16, 0, 1
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 5, 1
-	delay 0xA
-	createsprite gUnknown_0857FE28, 0x82, 5, 5
-	delay 0x4
+	createsprite gUnknown_08593B38, 130, 16, 0, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 5, 1
+	delay 10
+	createsprite gHorizontalLungeSpriteTemplate, 130, 5, 5
+	delay 4
 	playsewithpan SE_W010, +63
-	createsprite gUnknown_08593B38, 0x82, -16, 0, 0
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 7, 1
+	createsprite gUnknown_08593B38, 130, -16, 0, 0
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1
 	end
 
 Move_INGRAIN:
-	loadspritegfx 0x27EF
-	loadspritegfx 0x27A3
-	createsprite gUnknown_0859254C, 0x2, 16, 26, -1, 2, 150
+	loadspritegfx ANIM_TAG_223
+	loadspritegfx ANIM_TAG_147
+	createsprite gUnknown_0859254C, 2, 16, 26, -1, 2, 150
 	playsewithpan SE_W010, -64
-	delay 0xA
-	createsprite gUnknown_0859254C, 0x2, -32, 20, 1, 1, 140
+	delay 10
+	createsprite gUnknown_0859254C, 2, -32, 20, 1, 1, 140
 	playsewithpan SE_W010, -64
-	delay 0xA
-	createsprite gUnknown_0859254C, 0x2, 32, 22, 1, 0, 130
+	delay 10
+	createsprite gUnknown_0859254C, 2, 32, 22, 1, 0, 130
 	playsewithpan SE_W010, -64
-	delay 0xA
-	createsprite gUnknown_0859254C, 0x2, -16, 25, -1, 3, 120
+	delay 10
+	createsprite gUnknown_0859254C, 2, -16, 25, -1, 3, 120
 	playsewithpan SE_W010, -64
-	delay 0x28
-	createsprite gUnknown_0859258C, 0x3, 32, 26, -1, 3, 30
-	delay 0x5
+	delay 40
+	createsprite gUnknown_0859258C, 3, 32, 26, -1, 3, 30
+	delay 5
 	playsewithpan SE_W145C, -64
-	delay 0x5
-	createsprite gUnknown_0859258C, 0x3, -48, 20, 1, 2, 30
+	delay 5
+	createsprite gUnknown_0859258C, 3, -48, 20, 1, 2, 30
 	playsewithpan SE_W145C, -64
-	delay 0x5
+	delay 5
 	playsewithpan SE_W145C, -64
-	delay 0x5
-	createsprite gUnknown_0859258C, 0x3, 48, 26, -2, 3, 18
+	delay 5
+	createsprite gUnknown_0859258C, 3, 48, 26, -2, 3, 18
 	playsewithpan SE_W145C, -64
-	delay 0xA
+	delay 10
 	waitforvisualfinish
 	end
 
 Move_PRESENT:
-	loadspritegfx 0x27F0
-	createvisualtask sub_815A904, 0x2
-	createsprite gUnknown_08592610, 0x82, 0, -5, 10, 2, -1
+	loadspritegfx ANIM_TAG_ITEM_BAG
+	createvisualtask AnimTask_IsHealingMove, 2
+	createsprite gUnknown_08592610, 130, 0, -5, 10, 2, -1
 	playsewithpan SE_W039, -64
-	delay 0xE
+	delay 14
 	playsewithpan SE_W145B, -64
-	delay 0xE
+	delay 14
 	playsewithpan SE_W145B, 0
-	delay 0x14
+	delay 20
 	playsewithpan SE_W145B, +63
 	waitforvisualfinish
-	jumpargeq 0x7, 0x0, AnimScript_82D41D4
-	jumpargeq 0x7, 0x1, AnimScript_82D423F
+	jumpretfalse PresentDamage
+	jumprettrue PresentHeal
 	end
 
-AnimScript_82D41D4:
-	loadspritegfx 0x27D6
+PresentDamage:
+	loadspritegfx ANIM_TAG_EXPLOSION
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_0859371C, 0x83, 0, 0, 1, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 131, 0, 0, 1, 1
+	delay 6
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_0859371C, 0x83, 24, -24, 1, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 131, 24, -24, 1, 1
+	delay 6
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_0859371C, 0x83, -16, 16, 1, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 131, -16, 16, 1, 1
+	delay 6
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_0859371C, 0x83, -24, -12, 1, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 131, -24, -12, 1, 1
+	delay 6
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_0859371C, 0x83, 16, 16, 1, 1
+	createsprite gBattleAnimSpriteTemplate_859371C, 131, 16, 16, 1, 1
 	end
 
-AnimScript_82D423F:
-	loadspritegfx 0x27D3
-	loadspritegfx 0x272F
+PresentHeal:
+	loadspritegfx ANIM_TAG_GREEN_SPARKLE
+	loadspritegfx ANIM_TAG_BLUE_STAR
 	playsewithpan SE_W234, +63
-	createsprite gUnknown_08592658, 0x84, -16, 32, -3, 1
-	delay 0x3
-	createsprite gUnknown_08592658, 0x84, 16, 32, -3, -1
-	delay 0x3
-	createsprite gUnknown_08592658, 0x84, 32, 32, -3, 1
-	delay 0x3
-	createsprite gUnknown_08592658, 0x84, -32, 32, -3, 1
-	delay 0x3
-	createsprite gUnknown_08592658, 0x84, 0, 32, -3, 1
-	delay 0x3
-	createsprite gUnknown_08592658, 0x84, -8, 32, -3, 1
-	delay 0x3
-	createsprite gUnknown_08592658, 0x84, -8, 32, -3, 1
-	delay 0x3
-	createsprite gUnknown_08592658, 0x84, 24, 32, -3, 1
-	delay 0x3
-	createsprite gUnknown_08592658, 0x84, -24, 32, -3, 1
+	createsprite gUnknown_08592658, 132, -16, 32, -3, 1
+	delay 3
+	createsprite gUnknown_08592658, 132, 16, 32, -3, -1
+	delay 3
+	createsprite gUnknown_08592658, 132, 32, 32, -3, 1
+	delay 3
+	createsprite gUnknown_08592658, 132, -32, 32, -3, 1
+	delay 3
+	createsprite gUnknown_08592658, 132, 0, 32, -3, 1
+	delay 3
+	createsprite gUnknown_08592658, 132, -8, 32, -3, 1
+	delay 3
+	createsprite gUnknown_08592658, 132, -8, 32, -3, 1
+	delay 3
+	createsprite gUnknown_08592658, 132, 24, 32, -3, 1
+	delay 3
+	createsprite gUnknown_08592658, 132, -24, 32, -3, 1
 	waitforvisualfinish
 	waitsound
-	call AnimScript_82D7A28
+	call HealingEffect2
 	end
 
 Move_BATON_PASS:
-	loadspritegfx 0x27F2
+	loadspritegfx ANIM_TAG_226
 	playsewithpan SE_W226, -64
-	createvisualtask sub_8115A04, 0x2, 31, 1, 2, 0, 11, 31455
-	createsprite gUnknown_085CE370, 0x2
+	createvisualtask sub_8115A04, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30)
+	createsprite gUnknown_085CE370, 2
 	end
 
 Move_PERISH_SONG:
-	loadspritegfx 0x27DE
-	createsprite gUnknown_08593C0C, 0x4, 0, 0, 0
-	createsprite gUnknown_08593C0C, 0x4, 1, 1, 16
-	createsprite gUnknown_08593C0C, 0x4, 2, 1, 32
-	createsprite gUnknown_08593C0C, 0x4, 3, 2, 48
-	createsprite gUnknown_08593C0C, 0x4, 4, 2, 64
-	createsprite gUnknown_08593C0C, 0x4, 5, 0, 80
-	createsprite gUnknown_08593C0C, 0x4, 6, 0, 96
-	createsprite gUnknown_08593C0C, 0x4, 7, 1, 112
-	createsprite gUnknown_08593C0C, 0x4, 8, 2, 128
-	createsprite gUnknown_08593C0C, 0x4, 9, 0, 144
-	createsprite gUnknown_08593C0C, 0x4, 10, 2, 160
-	createsprite gUnknown_08593C0C, 0x4, 11, 0, 176
-	createsprite gUnknown_08593C0C, 0x4, 12, 1, 192
-	createsprite gUnknown_08593C0C, 0x4, 13, 3, 208
-	createsprite gUnknown_08593C0C, 0x4, 14, 3, 224
-	createsprite gUnknown_08593C0C, 0x4, 15, 0, 240
-	createsprite gUnknown_08593C24, 0x4, 15, 0, 0
-	delay 0x14
-	panse_1B SE_W195, -64, +63, +2, 0x0
-	delay 0x50
-	createsprite gUnknown_08597274, 0x2, 1, 3, 0, 16, 0
-	createvisualtask sub_811489C, 0x5, 4, 0
-	createvisualtask sub_811489C, 0x5, 5, 0
-	createvisualtask sub_811489C, 0x5, 6, 0
-	createvisualtask sub_811489C, 0x5, 7, 0
-	delay 0x64
-	createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, 0
-	createvisualtask sub_811489C, 0x5, 4, 1
-	createvisualtask sub_811489C, 0x5, 5, 1
-	createvisualtask sub_811489C, 0x5, 6, 1
-	createvisualtask sub_811489C, 0x5, 7, 1
+	loadspritegfx ANIM_TAG_MUSIC_NOTES
+	createsprite gUnknown_08593C0C, 4, 0, 0, 0
+	createsprite gUnknown_08593C0C, 4, 1, 1, 16
+	createsprite gUnknown_08593C0C, 4, 2, 1, 32
+	createsprite gUnknown_08593C0C, 4, 3, 2, 48
+	createsprite gUnknown_08593C0C, 4, 4, 2, 64
+	createsprite gUnknown_08593C0C, 4, 5, 0, 80
+	createsprite gUnknown_08593C0C, 4, 6, 0, 96
+	createsprite gUnknown_08593C0C, 4, 7, 1, 112
+	createsprite gUnknown_08593C0C, 4, 8, 2, 128
+	createsprite gUnknown_08593C0C, 4, 9, 0, 144
+	createsprite gUnknown_08593C0C, 4, 10, 2, 160
+	createsprite gUnknown_08593C0C, 4, 11, 0, 176
+	createsprite gUnknown_08593C0C, 4, 12, 1, 192
+	createsprite gUnknown_08593C0C, 4, 13, 3, 208
+	createsprite gUnknown_08593C0C, 4, 14, 3, 224
+	createsprite gUnknown_08593C0C, 4, 15, 0, 240
+	createsprite gUnknown_08593C24, 4, 15, 0, 0
+	delay 20
+	panse_1B SE_W195, -64, +63, +2, 0
+	delay 80
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, RGB_BLACK
+	createvisualtask sub_811489C, 5, 4, 0
+	createvisualtask sub_811489C, 5, 5, 0
+	createvisualtask sub_811489C, 5, 6, 0
+	createvisualtask sub_811489C, 5, 7, 0
+	delay 100
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_BLACK
+	createvisualtask sub_811489C, 5, 4, 1
+	createvisualtask sub_811489C, 5, 5, 1
+	createvisualtask sub_811489C, 5, 6, 1
+	createvisualtask sub_811489C, 5, 7, 1
 	waitforvisualfinish
 	end
 
 Move_SLEEP_TALK:
-	loadspritegfx 0x27F4
-	createvisualtask sub_80D5EB8, 0x5, 0, 4, 4096, 2, 0
-	delay 0x14
-	createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -1
+	loadspritegfx ANIM_TAG_LETTER_Z
+	createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER
+	delay 20
+	createsprite gUnknown_085CE190, 130, 0, 20, 5, -1
 	playsewithpan SE_W173, -64
-	delay 0x6
-	createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -1
-	delay 0x6
-	createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -1
-	delay 0x14
-	createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -5
+	delay 6
+	createsprite gUnknown_085CE190, 130, 0, 20, 5, -1
+	delay 6
+	createsprite gUnknown_085CE190, 130, 0, 20, 5, -1
+	delay 20
+	createsprite gUnknown_085CE190, 130, 0, 20, 5, -5
 	playsewithpan SE_W173, -64
-	delay 0x6
-	createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -5
-	delay 0x6
-	createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -5
-	delay 0x14
-	createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -3
+	delay 6
+	createsprite gUnknown_085CE190, 130, 0, 20, 5, -5
+	delay 6
+	createsprite gUnknown_085CE190, 130, 0, 20, 5, -5
+	delay 20
+	createsprite gUnknown_085CE190, 130, 0, 20, 5, -3
 	playsewithpan SE_W173, -64
-	delay 0x6
-	createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -3
-	delay 0x6
-	createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -3
+	delay 6
+	createsprite gUnknown_085CE190, 130, 0, 20, 5, -3
+	delay 6
+	createsprite gUnknown_085CE190, 130, 0, 20, 5, -3
 	waitforvisualfinish
 	end
 
 Move_HYPER_FANG:
-	loadspritegfx 0x27D0
+	loadspritegfx ANIM_TAG_192
 	playsewithpan SE_W044, +63
-	delay 0x1
-	delay 0x2
-	createvisualtask sub_8117E60, 0x2
-	jumpargeq 0x7, 0x1, AnimScript_82D458E
-	createvisualtask sub_815A8C8, 0x2
-	jumpargeq 0x7, 0x0, AnimScript_82D4580
-	goto AnimScript_82D4587
-
-AnimScript_82D455C:
+	delay 1
+	delay 2
+	createvisualtask AnimTask_IsContest, 2
+	jumprettrue HyperFangInContest
+	createvisualtask AnimTask_IsTargetPlayerSide, 2
+	jumpretfalse HyperFangOnOpponent
+	goto HyperFangOnPlayer
+HyperFangContinue:
 	waitbgfadeout
-	createsprite gUnknown_085CE1DC, 0x82
+	createsprite gUnknown_085CE1DC, 130
 	waitbgfadein
-	createvisualtask sub_80D51AC, 0x3, 1, 0, 10, 10, 1
+	createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 10, 10, 1
 	playsewithpan SE_W043, +63
-	delay 0x14
+	delay 20
 	restorebg
 	waitbgfadein
 	waitforvisualfinish
 	end
-
-AnimScript_82D4580:
+HyperFangOnOpponent:
 	fadetobg BG_IMPACT_OPPONENT
-	goto AnimScript_82D455C
-
-AnimScript_82D4587:
+	goto HyperFangContinue
+HyperFangOnPlayer:
 	fadetobg BG_IMPACT_PLAYER
-	goto AnimScript_82D455C
-
-AnimScript_82D458E:
+	goto HyperFangContinue
+HyperFangInContest:
 	fadetobg BG_IMPACT_CONTESTS
-	goto AnimScript_82D455C
+	goto HyperFangContinue
 
 Move_TRI_ATTACK:
-	loadspritegfx 0x27F6
-	createsprite gUnknown_085CE2F8, 0x82, 16, 0
+	loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE
+	createsprite gUnknown_085CE2F8, 130, 16, 0
 	playsewithpan SE_W161, -64
-	delay 0x14
+	delay 20
 	playsewithpan SE_W161, -64
-	delay 0x14
+	delay 20
 	createsoundtask sub_8158C58, 220, -64, 63, 5, 6, 0, 7
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, 0
-	delay 0x10
-	loadspritegfx 0x2731
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK
+	delay 16
+	loadspritegfx ANIM_TAG_FIRE
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 0
 	playsewithpan SE_W172B, +63
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 0, 1
-	delay 0x1
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, -1
-	delay 0x1
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 2, 1
-	delay 0x1
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -1
-	delay 0x1
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 1
-	delay 0x1
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -2
-	delay 0x1
-	createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 3, 1
-	delay 0x2
-	createvisualtask sub_810A094, 0x2, 20, 3, 1, 1
-	waitforvisualfinish
-	loadspritegfx 0x2735
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 0, 1
+	delay 1
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, -1
+	delay 1
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 2, 1
+	delay 1
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -1
+	delay 1
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 1
+	delay 1
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -2
+	delay 1
+	createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 3, 1
+	delay 2
+	createvisualtask sub_810A094, 2, 20, 3, 1, 1
+	waitforvisualfinish
+	loadspritegfx ANIM_TAG_LIGHTNING
+	createvisualtask sub_8115F10, 2, 257, 257, 257
 	playsewithpan SE_W161B, +63
-	createsprite gUnknown_085956C0, 0x82, 0, -48
-	delay 0x1
-	createsprite gUnknown_085956C0, 0x82, 0, -16
-	delay 0x1
-	createsprite gUnknown_085956C0, 0x82, 0, 16
-	delay 0x14
-	createvisualtask sub_810A094, 0x2, 20, 3, 1, 0
-	delay 0x2
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
+	createsprite gUnknown_085956C0, 130, 0, -48
+	delay 1
+	createsprite gUnknown_085956C0, 130, 0, -16
+	delay 1
+	createsprite gUnknown_085956C0, 130, 0, 16
+	delay 20
+	createvisualtask sub_810A094, 2, 20, 3, 1, 0
+	delay 2
+	createvisualtask sub_8115F10, 2, 257, 257, 257
 	waitforvisualfinish
-	loadspritegfx 0x279D
-	call AnimScript_82D7720
-	createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, 0
+	loadspritegfx ANIM_TAG_141
+	call FreezeEffect1
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK
 	waitforvisualfinish
 	end
 
 Move_WILL_O_WISP:
-	loadspritegfx 0x27F8
-	loadspritegfx 0x27F7
+	loadspritegfx ANIM_TAG_232
+	loadspritegfx ANIM_TAG_231
 	monbg ANIM_DEF_PARTNER
 	monbgprio_2A ANIM_TARGET
 	playsewithpan SE_W052, -64
-	waitplaysewithpan SE_W052, -64, 0xA
-	createvisualtask sub_8159278, 0x2, -64, -64, 1, 0
-	createsprite gUnknown_0859563C, 0x2, 0, 0, 0
-	delay 0x3
-	createsprite gUnknown_0859563C, 0x3, 0, 0, 1
-	delay 0x3
-	createsprite gUnknown_0859563C, 0x4, 0, 0, 2
-	delay 0x3
-	createsprite gUnknown_0859563C, 0x4, 0, 0, 3
-	delay 0x28
-	createvisualtask sub_8159278, 0x2, -64, 63, 2, 0
+	waitplaysewithpan SE_W052, -64, 10
+	createvisualtask sub_8159278, 2, -64, -64, 1, 0
+	createsprite gUnknown_0859563C, 2, 0, 0, 0
+	delay 3
+	createsprite gUnknown_0859563C, 3, 0, 0, 1
+	delay 3
+	createsprite gUnknown_0859563C, 4, 0, 0, 2
+	delay 3
+	createsprite gUnknown_0859563C, 4, 0, 0, 3
+	delay 40
+	createvisualtask sub_8159278, 2, -64, 63, 2, 0
 	waitforvisualfinish
 	monbgprio_29
 	playsewithpan SE_W172B, +63
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 13, 1
-	createsprite gUnknown_0859566C, 0x2, 0
-	createsprite gUnknown_0859566C, 0x2, 42
-	createsprite gUnknown_0859566C, 0x2, 84
-	createsprite gUnknown_0859566C, 0x2, 126
-	createsprite gUnknown_0859566C, 0x2, 168
-	createsprite gUnknown_0859566C, 0x2, 210
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 13, 1
+	createsprite gUnknown_0859566C, 2, 0
+	createsprite gUnknown_0859566C, 2, 42
+	createsprite gUnknown_0859566C, 2, 84
+	createsprite gUnknown_0859566C, 2, 126
+	createsprite gUnknown_0859566C, 2, 168
+	createsprite gUnknown_0859566C, 2, 210
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
 Move_ENCORE:
-	loadspritegfx 0x27F3
-	loadspritegfx 0x2807
-	createvisualtask sub_815ABEC, 0x2
-	createvisualtask sub_8116960, 0x2, 248, 3, 0, 10, 0
+	loadspritegfx ANIM_TAG_227
+	loadspritegfx ANIM_TAG_HAND
+	createvisualtask sub_815ABEC, 2
+	createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0
 	waitforvisualfinish
-	createsprite gUnknown_085CE22C, 0x82, 0, -8
-	createsprite gUnknown_085CE244, 0x2, -2, 0, 0, 0, 9
-	createsprite gUnknown_085CE244, 0x2, 2, 0, 1, 0, 9
-	createsprite gUnknown_085CE25C, 0x3, -2, 0, 0, 0, 9
-	createsprite gUnknown_085CE25C, 0x3, 2, 0, 1, 0, 9
-	delay 0x10
-	createvisualtask sub_8159244, 0x5, 223, 63
-	createvisualtask sub_80D5EB8, 0x5, 1, 8, 1536, 5, 1
+	createsprite gUnknown_085CE22C, 130, 0, -8
+	createsprite gUnknown_085CE244, 2, -2, 0, 0, 0, 9
+	createsprite gUnknown_085CE244, 2, 2, 0, 1, 0, 9
+	createsprite gUnknown_085CE25C, 3, -2, 0, 0, 0, 9
+	createsprite gUnknown_085CE25C, 3, 2, 0, 1, 0, 9
+	delay 16
+	createvisualtask sub_8159244, 5, 223, 63
+	createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET
 	waitforvisualfinish
-	createvisualtask sub_8116960, 0x2, 248, 3, 10, 0, 1
+	createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1
 	waitforvisualfinish
-	createvisualtask sub_815AC8C, 0x2
+	createvisualtask sub_815AC8C, 2
 	end
 
 Move_TRICK:
-	loadspritegfx 0x27F0
-	loadspritegfx 0x27DF
-	createsprite gUnknown_085926E8, 0x2, -40, 80
-	createsprite gUnknown_085926E8, 0x2, -40, 208
-	delay 0x10
+	loadspritegfx ANIM_TAG_ITEM_BAG
+	loadspritegfx ANIM_TAG_207
+	createsprite gUnknown_085926E8, 2, -40, 80
+	createsprite gUnknown_085926E8, 2, -40, 208
+	delay 16
 	playsewithpan SE_W166, 0
-	createvisualtask sub_8106020, 0x3
-	createvisualtask sub_81060B0, 0x3
-	delay 0x1E
+	createvisualtask sub_8106020, 3
+	createvisualtask sub_81060B0, 3
+	delay 30
 	playsewithpan SE_W104, 0
-	delay 0x18
+	delay 24
 	playsewithpan SE_W104, 0
-	delay 0x10
+	delay 16
 	playsewithpan SE_W104, 0
-	delay 0x10
+	delay 16
 	playsewithpan SE_W104, 0
-	delay 0x10
+	delay 16
 	playsewithpan SE_W104, 0
-	delay 0x10
+	delay 16
 	playsewithpan SE_W104, 0
-	delay 0x10
+	delay 16
 	playsewithpan SE_W213, 0
-	createvisualtask sub_80D51AC, 0x3, 0, 5, 0, 7, 2
-	createvisualtask sub_80D51AC, 0x3, 1, 5, 0, 7, 2
+	createvisualtask AnimTask_ShakeMon, 3, ANIM_ATTACKER, 5, 0, 7, 2
+	createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 5, 0, 7, 2
 	waitforvisualfinish
 	end
 
 Move_WISH:
-	loadspritegfx 0x27F9
-	loadspritegfx 0x2741
-	createsprite gUnknown_08597274, 0x2, 1, 3, 0, 10, 0
+	loadspritegfx ANIM_TAG_233
+	loadspritegfx ANIM_TAG_SPARKLE
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK
 	waitforvisualfinish
-	panse_27 SE_W115, +63, -64, -3, 0x0
-	createsprite gUnknown_085CE388, 0x28
+	panse_27 SE_W115, +63, -64, -3, 0
+	createsprite gUnknown_085CE388, 40
 	waitforvisualfinish
-	delay 0x3C
-	loopsewithpan SE_W215, -64, 0x10, 0x3
-	call AnimScript_82D79B4
+	delay 60
+	loopsewithpan SE_W215, -64, 16, 3
+	call GrantingStarsEffect
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 3, 10, 0, 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 10, 0, RGB_BLACK
 	waitforvisualfinish
 	end
 
 Move_STOCKPILE:
-	loadspritegfx 0x27FB
+	loadspritegfx ANIM_TAG_235
 	playsewithpan SE_W025, -64
-	createvisualtask sub_8115A04, 0x2, 2, 8, 1, 0, 12, 0x7FFF
-	createvisualtask sub_815B65C, 0x5
-	call AnimScript_82D4972
-	call AnimScript_82D4972
-	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 2, 0, 12, 0, RGB_WHITE
-	end
-
-AnimScript_82D4972:
-	createsprite gUnknown_08592244, 0x2, 55, 55, 13
-	delay 0x1
-	createsprite gUnknown_08592244, 0x2, -55, -55, 13
-	delay 0x1
-	createsprite gUnknown_08592244, 0x2, 0, 55, 13
-	delay 0x1
-	createsprite gUnknown_08592244, 0x2, 0, -55, 13
-	delay 0x1
-	createsprite gUnknown_08592244, 0x2, 55, -34, 13
-	delay 0x1
-	createsprite gUnknown_08592244, 0x2, 55, 34, 13
-	delay 0x1
-	createsprite gUnknown_08592244, 0x2, -55, -34, 13
-	delay 0x1
-	createsprite gUnknown_08592244, 0x2, -55, 34, 13
-	delay 0x1
+	createvisualtask sub_8115A04, 2, 2, 8, 1, 0, 12, RGB_WHITE
+	createvisualtask sub_815B65C, 5
+	call Stockpile1
+	call Stockpile1
+	waitforvisualfinish
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 12, 0, RGB_WHITE
+	end
+Stockpile1:
+	createsprite gUnknown_08592244, 2, 55, 55, 13
+	delay 1
+	createsprite gUnknown_08592244, 2, -55, -55, 13
+	delay 1
+	createsprite gUnknown_08592244, 2, 0, 55, 13
+	delay 1
+	createsprite gUnknown_08592244, 2, 0, -55, 13
+	delay 1
+	createsprite gUnknown_08592244, 2, 55, -34, 13
+	delay 1
+	createsprite gUnknown_08592244, 2, 55, 34, 13
+	delay 1
+	createsprite gUnknown_08592244, 2, -55, -34, 13
+	delay 1
+	createsprite gUnknown_08592244, 2, -55, 34, 13
+	delay 1
 	return
 
 Move_SPIT_UP:
-	loadspritegfx 0x27FD
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_237
+	loadspritegfx ANIM_TAG_135
 	playsewithpan SE_W036, -64
-	createvisualtask sub_815B6B4, 0x5
-	createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 8, 2
-	delay 0x2D
+	createvisualtask sub_815B6B4, 5
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2
+	delay 45
 	playsewithpan SE_W255, -64
-	delay 0x3
-	createsprite gUnknown_08593A50, 0x2, 0, 12
-	createsprite gUnknown_08593A50, 0x2, 32, 12
-	createsprite gUnknown_08593A50, 0x2, 64, 12
-	createsprite gUnknown_08593A50, 0x2, 96, 12
-	createsprite gUnknown_08593A50, 0x2, 128, 12
-	createsprite gUnknown_08593A50, 0x2, 160, 12
-	createsprite gUnknown_08593A50, 0x2, 192, 12
-	createsprite gUnknown_08593A50, 0x2, 224, 12
-	delay 0x5
-	jumpifmoveturn 0x2, AnimScript_82D4AB8
-	jumpifmoveturn 0x3, AnimScript_82D4AE1
-
-AnimScript_82D4A7B:
-	delay 0x5
-	createvisualtask sub_80D6388, 0x2, 0, 1, 8, 1, 0
+	delay 3
+	createsprite gUnknown_08593A50, 2, 0, 12
+	createsprite gUnknown_08593A50, 2, 32, 12
+	createsprite gUnknown_08593A50, 2, 64, 12
+	createsprite gUnknown_08593A50, 2, 96, 12
+	createsprite gUnknown_08593A50, 2, 128, 12
+	createsprite gUnknown_08593A50, 2, 160, 12
+	createsprite gUnknown_08593A50, 2, 192, 12
+	createsprite gUnknown_08593A50, 2, 224, 12
+	delay 5
+	jumpifmoveturn 2, SpitUpStrong
+	jumpifmoveturn 3, SpitUpStrongest
+SpitUpContinue:
+	delay 5
+	createvisualtask sub_80D6388, 2, 0, 1, 8, 1, 0
 	playsewithpan SE_W003, +63
-	createsprite gUnknown_085973E8, 0x83, -12, 10, 1, 1
-	delay 0x5
+	createsprite gUnknown_085973E8, 131, -12, 10, 1, 1
+	delay 5
 	playsewithpan SE_W003, +63
-	createsprite gUnknown_085973E8, 0x83, 12, -10, 1, 1
-	waitforvisualfinish
-	end
-
-AnimScript_82D4AB8:
-	createsprite gUnknown_08593A50, 0x2, 16
-	createsprite gUnknown_08593A50, 0x2, 80
-	createsprite gUnknown_08593A50, 0x2, 144
-	createsprite gUnknown_08593A50, 0x2, 208
-	goto AnimScript_82D4A7B
-
-AnimScript_82D4AE1:
-	createsprite gUnknown_08593A50, 0x2, 16
-	createsprite gUnknown_08593A50, 0x2, 48
-	createsprite gUnknown_08593A50, 0x2, 80
-	createsprite gUnknown_08593A50, 0x2, 112
-	createsprite gUnknown_08593A50, 0x2, 144
-	createsprite gUnknown_08593A50, 0x2, 176
-	createsprite gUnknown_08593A50, 0x2, 208
-	createsprite gUnknown_08593A50, 0x2, 240
-	goto AnimScript_82D4A7B
+	createsprite gUnknown_085973E8, 131, 12, -10, 1, 1
+	waitforvisualfinish
+	end
+SpitUpStrong:
+	createsprite gUnknown_08593A50, 2, 16
+	createsprite gUnknown_08593A50, 2, 80
+	createsprite gUnknown_08593A50, 2, 144
+	createsprite gUnknown_08593A50, 2, 208
+	goto SpitUpContinue
+SpitUpStrongest:
+	createsprite gUnknown_08593A50, 2, 16
+	createsprite gUnknown_08593A50, 2, 48
+	createsprite gUnknown_08593A50, 2, 80
+	createsprite gUnknown_08593A50, 2, 112
+	createsprite gUnknown_08593A50, 2, 144
+	createsprite gUnknown_08593A50, 2, 176
+	createsprite gUnknown_08593A50, 2, 208
+	createsprite gUnknown_08593A50, 2, 240
+	goto SpitUpContinue
 
 Move_SWALLOW:
-	loadspritegfx 0x27FC
-	loadspritegfx 0x272F
+	loadspritegfx ANIM_TAG_236
+	loadspritegfx ANIM_TAG_BLUE_STAR
 	playsewithpan SE_W036, -64
-	createvisualtask sub_815B778, 0x5
-	createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 8, 2
-	delay 0x26
+	createvisualtask sub_815B778, 5
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2
+	delay 38
 	playsewithpan SE_W255, -64
-	createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 12, 1
-	call AnimScript_82D4B7F
-	jumpifmoveturn 0x2, AnimScript_82D4BC1
-	jumpifmoveturn 0x3, AnimScript_82D4BCB
-
-AnimScript_82D4B78:
-	waitforvisualfinish
-	call AnimScript_82D79DF
-	end
-
-AnimScript_82D4B7F:
-	createsprite gUnknown_085CE418, 0x2, 0, -8
-	delay 0x1
-	createsprite gUnknown_085CE418, 0x2, -24, -8
-	delay 0x1
-	createsprite gUnknown_085CE418, 0x2, 16, -8
-	delay 0x1
-	createsprite gUnknown_085CE418, 0x2, -16, -8
-	delay 0x1
-	createsprite gUnknown_085CE418, 0x2, 24, -8
-	delay 0x1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 12, 1
+	call SwallowEffect
+	jumpifmoveturn 2, SwallowGood
+	jumpifmoveturn 3, SwallowBest
+SwallowContinue:
+	waitforvisualfinish
+	call HealingEffect
+	end
+SwallowEffect:
+	createsprite gUnknown_085CE418, 2, 0, -8
+	delay 1
+	createsprite gUnknown_085CE418, 2, -24, -8
+	delay 1
+	createsprite gUnknown_085CE418, 2, 16, -8
+	delay 1
+	createsprite gUnknown_085CE418, 2, -16, -8
+	delay 1
+	createsprite gUnknown_085CE418, 2, 24, -8
+	delay 1
 	return
-
-AnimScript_82D4BC1:
-	call AnimScript_82D4B7F
-	goto AnimScript_82D4B78
-
-AnimScript_82D4BCB:
-	call AnimScript_82D4B7F
-	call AnimScript_82D4B7F
-	goto AnimScript_82D4B78
+SwallowGood:
+	call SwallowEffect
+	goto SwallowContinue
+SwallowBest:
+	call SwallowEffect
+	call SwallowEffect
+	goto SwallowContinue
 
 Move_TRANSFORM:
 	monbg ANIM_ATTACKER
 	playsewithpan SE_W100, -64
-	waitplaysewithpan SE_W107, -64, 0x30
-	createvisualtask sub_815B7D0, 0x2, 0
+	waitplaysewithpan SE_W107, -64, 48
+	createvisualtask sub_815B7D0, 2, 0
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	end
 
 Move_MORNING_SUN:
-	loadspritegfx 0x2801
-	loadspritegfx 0x272F
-	createvisualtask sub_815BB84, 0x5
-	delay 0x8
-	createvisualtask sub_8116620, 0xA, 1921, 8, 0, 12, 0x7FFF
-	delay 0xE
-	call AnimScript_82D4C78
-	call AnimScript_82D4C78
-	call AnimScript_82D4C78
-	call AnimScript_82D4C78
-	call AnimScript_82D4C78
-	call AnimScript_82D4C78
-	call AnimScript_82D4C78
-	call AnimScript_82D4C78
-	call AnimScript_82D4C78
-	call AnimScript_82D4C78
-	call AnimScript_82D4C78
-	call AnimScript_82D4C78
-	call AnimScript_82D4C78
-	call AnimScript_82D4C78
-	call AnimScript_82D4C78
-	createvisualtask sub_8116620, 0xA, 1921, 3, 12, 0, 0x7FFF
+	loadspritegfx ANIM_TAG_GREEN_STAR
+	loadspritegfx ANIM_TAG_BLUE_STAR
+	createvisualtask sub_815BB84, 5
+	delay 8
+	createvisualtask sub_8116620, 10, 0x781, 8, 0, 12, RGB_WHITE
+	delay 14
+	call MorningSun1
+	call MorningSun1
+	call MorningSun1
+	call MorningSun1
+	call MorningSun1
+	call MorningSun1
+	call MorningSun1
+	call MorningSun1
+	call MorningSun1
+	call MorningSun1
+	call MorningSun1
+	call MorningSun1
+	call MorningSun1
+	call MorningSun1
+	call MorningSun1
+	createvisualtask sub_8116620, 10, 0x781, 3, 12, 0, RGB_WHITE
 	waitforvisualfinish
 	waitsound
-	call AnimScript_82D79DF
+	call HealingEffect
 	end
-
-AnimScript_82D4C78:
-	createsprite gUnknown_085CE48C, 0x2, 30, 640
-	delay 0x5
+MorningSun1:
+	createsprite gUnknown_085CE48C, 2, 30, 640
+	delay 5
 	return
 
 Move_SWEET_SCENT:
-	loadspritegfx 0x27FE
+	loadspritegfx ANIM_TAG_238
 	playsewithpan SE_W230, -64
-	createsprite gUnknown_085CE544, 0x2, 100, 0, 100
-	delay 0x19
+	createsprite gUnknown_085CE544, 2, 100, 0, 100
+	delay 25
 	setpan 0
-	call AnimScript_82D4CCA
-	createsprite gUnknown_085CE544, 0x2, 55, 0
+	call SweetScentEffect
+	createsprite gUnknown_085CE544, 2, 55, 0
 	setpan +63
-	createvisualtask sub_8115A04, 0x2, 20, 1, 5, 5, 13, 22207
-	call AnimScript_82D4CCA
-	waitforvisualfinish
-	end
-
-AnimScript_82D4CCA:
-	createsprite gUnknown_085CE544, 0x2, 70, 1, 64
-	delay 0x2
-	createsprite gUnknown_085CE544, 0x2, 60, 0, 64
-	delay 0x5
-	createsprite gUnknown_085CE544, 0x2, 80, 1, 64
-	delay 0x2
-	createsprite gUnknown_085CE544, 0x2, 58, 0, 120
-	delay 0x2
-	createsprite gUnknown_085CE544, 0x2, 100, 0, 120
-	delay 0x2
-	createsprite gUnknown_085CE544, 0x2, 90, 0, 64
-	delay 0x2
-	createsprite gUnknown_085CE544, 0x2, 48, 0, 64
-	delay 0x2
-	createsprite gUnknown_085CE544, 0x2, 95, 1, 80
-	delay 0x2
-	createsprite gUnknown_085CE544, 0x2, 100, 0, 120
-	delay 0x2
-	createsprite gUnknown_085CE544, 0x2, 75, 1, 64
-	delay 0x2
-	createsprite gUnknown_085CE544, 0x2, 85, 0, 120
-	delay 0x2
+	createvisualtask sub_8115A04, 2, 20, 1, 5, 5, 13, RGB(31, 21, 21)
+	call SweetScentEffect
+	waitforvisualfinish
+	end
+SweetScentEffect:
+	createsprite gUnknown_085CE544, 2, 70, 1, 64
+	delay 2
+	createsprite gUnknown_085CE544, 2, 60, 0, 64
+	delay 5
+	createsprite gUnknown_085CE544, 2, 80, 1, 64
+	delay 2
+	createsprite gUnknown_085CE544, 2, 58, 0, 120
+	delay 2
+	createsprite gUnknown_085CE544, 2, 100, 0, 120
+	delay 2
+	createsprite gUnknown_085CE544, 2, 90, 0, 64
+	delay 2
+	createsprite gUnknown_085CE544, 2, 48, 0, 64
+	delay 2
+	createsprite gUnknown_085CE544, 2, 95, 1, 80
+	delay 2
+	createsprite gUnknown_085CE544, 2, 100, 0, 120
+	delay 2
+	createsprite gUnknown_085CE544, 2, 75, 1, 64
+	delay 2
+	createsprite gUnknown_085CE544, 2, 85, 0, 120
+	delay 2
 	return
 
 Move_HYPER_BEAM:
-	loadspritegfx 0x27A3
-	createsprite gUnknown_08597274, 0x2, 1, 4, 0, 16, 0
+	loadspritegfx ANIM_TAG_147
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 0, 16, RGB_BLACK
 	waitforvisualfinish
-	delay 0xA
+	delay 10
 	playsewithpan SE_W063, -64
-	createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 4, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 4, 1
 	waitforvisualfinish
-	delay 0x1E
+	delay 30
 	createsoundtask sub_8158C58, 247, -64, 63, 1, 15, 0, 5
-	createvisualtask sub_80D51AC, 0x2, 0, 0, 4, 50, 1
-	createvisualtask sub_8115D94, 0x2, 10147, 1, 12, 31, 16, 0, 0
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 50, 1
-	createvisualtask sub_8116620, 0xA, 4, 2, 0, 11, 26425
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	call AnimScript_82D4EA1
-	createvisualtask sub_8116620, 0xA, 4, 2, 11, 0, 26425
-	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 4, 16, 0, 0
-	end
-
-AnimScript_82D4EA1:
-	createsprite gUnknown_08592288, 0x82
-	createsprite gUnknown_08592288, 0x82
-	delay 0x1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
+	createvisualtask sub_8115D94, 2, ANIM_TAG_147, 1, 12, 31, 16, 0, 0
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 50, 1
+	createvisualtask sub_8116620, 10, 4, 2, 0, 11, RGB(25, 25, 25)
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	call HyperBeam1
+	createvisualtask sub_8116620, 10, 4, 2, 11, 0, RGB(25, 25, 25)
+	waitforvisualfinish
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 16, 0, RGB_BLACK
+	end
+HyperBeam1:
+	createsprite gUnknown_08592288, 130
+	createsprite gUnknown_08592288, 130
+	delay 1
 	return
 
 Move_FLATTER:
-	loadspritegfx 0x27F3
-	loadspritegfx 0x2800
-	createvisualtask sub_8159244, 0x5, 223, 63
-	createvisualtask sub_815ABEC, 0x2
-	createvisualtask sub_8116960, 0x2, 248, 3, 0, 10, 0
-	waitforvisualfinish
-	createsprite gUnknown_085CE5C0, 0x82, 0, -8, 80
-	delay 0x0
-	createsprite gUnknown_0857FE40, 0x2, 5, 2, 1
-	delay 0xA
-	createsprite gUnknown_0857FE40, 0x2, 5, 2, 1
-	delay 0x0
-	createvisualtask sub_8159210, 0x5, 229, -64
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	call AnimScript_82D4F9B
-	delay 0x5
-	createvisualtask sub_8159210, 0x5, 229, 63
-	waitforvisualfinish
-	createvisualtask sub_8116960, 0x2, 248, 3, 10, 0, 1
-	waitforvisualfinish
-	createvisualtask sub_815AC8C, 0x2
-	end
-
-AnimScript_82D4F9B:
-	createsprite gUnknown_085CE5A8, 0x28, 0
-	createsprite gUnknown_085CE5A8, 0x28, 1
+	loadspritegfx ANIM_TAG_227
+	loadspritegfx ANIM_TAG_240
+	createvisualtask sub_8159244, 5, 223, 63
+	createvisualtask sub_815ABEC, 2
+	createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0
+	waitforvisualfinish
+	createsprite gUnknown_085CE5C0, 130, 0, -8, 80
+	delay 0
+	createsprite gVerticalDipSpriteTemplate, 2, 5, 2, ANIM_TARGET
+	delay 10
+	createsprite gVerticalDipSpriteTemplate, 2, 5, 2, ANIM_TARGET
+	delay 0
+	createvisualtask sub_8159210, 5, 229, -64
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	call Flatter1
+	delay 5
+	createvisualtask sub_8159210, 5, 229, 63
+	waitforvisualfinish
+	createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1
+	waitforvisualfinish
+	createvisualtask sub_815AC8C, 2
+	end
+Flatter1:
+	createsprite gUnknown_085CE5A8, 40, 0
+	createsprite gUnknown_085CE5A8, 40, 1
 	return
 
 Move_ROLE_PLAY:
 	monbg ANIM_ATK_PARTNER
-	createvisualtask sub_8116620, 0xA, 4, 2, 0, 16, 0x7FFF
-	createsprite gUnknown_08597274, 0x2, 1, 2, 0, 10, 0
+	createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_WHITE
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 10, RGB_BLACK
 	waitforvisualfinish
 	playsewithpan SE_W161, -64
-	waitplaysewithpan SE_W197, -64, 0x1E
-	createvisualtask sub_815CED8, 0x2
+	waitplaysewithpan SE_W197, -64, 30
+	createvisualtask sub_815CED8, 2
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
-	createvisualtask sub_8116620, 0xA, 4, 2, 16, 0, 0x7FFF
-	delay 0x8
-	createsprite gUnknown_08597274, 0x2, 1, 2, 10, 0, 0
+	createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE
+	delay 8
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 10, 0, RGB_BLACK
 	end
 
 Move_REFRESH:
-	loadspritegfx 0x27DB
-	loadspritegfx 0x2741
+	loadspritegfx ANIM_TAG_203
+	loadspritegfx ANIM_TAG_SPARKLE
 	playsewithpan SE_W287, -64
-	createvisualtask sub_815DFCC, 0x2, 0
+	createvisualtask sub_815DFCC, 2, 0
 	waitforvisualfinish
 	playsewithpan SE_W234, -64
-	call AnimScript_82D79B4
+	call GrantingStarsEffect
 	waitforvisualfinish
 	playsewithpan SE_REAPOKE, -64
-	createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, RGB(12, 24, 30)
-	createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, RGB(12, 24, 30)
+	createsprite gUnknown_0859381C, 3, 0, 0, 0, 0
 	end
 
 Move_BLAZE_KICK:
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
-	loadspritegfx 0x272D
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_SMALL_EMBER
 	monbg ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W172, +63
-	createsprite gUnknown_08595F14, 0x83, 0, 0, 1, 30
-	createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, 0x7FFF
-	delay 0x1E
+	createsprite gUnknown_08595F14, 131, 0, 0, 1, 30
+	createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE
+	delay 30
 	playsewithpan SE_W007, +63
-	createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 14, 1
-	createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, 0x7FFF
-	createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0
-	call AnimScript_82D2D18
+	createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 14, 1
+	createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0
+	call FireMoveEffect
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_HYPER_VOICE:
-	loadspritegfx 0x27DB
-	createvisualtask sub_81590B8, 0x5, 0
-	call AnimScript_82D50FA
-	waitforvisualfinish
-	delay 0x8
-	createvisualtask sub_81590B8, 0x5, 1
-	call AnimScript_82D50FA
-	waitforvisualfinish
-	end
-
-AnimScript_82D50FA:
-	createsprite gUnknown_08597274, 0x2, 31, 3, 8, 0, RGB_YELLOW
-	createvisualtask sub_80D6064, 0x5, -5, -5, 5, 0, 0
-	createsprite gUnknown_08593880, 0x0, 45, 0, 0, 0, 0, 0, 1
-	createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1
-	createvisualtask sub_80D52D0, 0x2, 3, 1, 0, 6, 1
-	createvisualtask sub_81162A4, 0x2, 1, 0, 6, 1
-	createvisualtask sub_8159078, 0x5
+	loadspritegfx ANIM_TAG_203
+	createvisualtask sub_81590B8, 5, 0
+	call HyperVoiceEffect
+	waitforvisualfinish
+	delay 8
+	createvisualtask sub_81590B8, 5, 1
+	call HyperVoiceEffect
+	waitforvisualfinish
+	end
+HyperVoiceEffect:
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 8, 0, RGB_YELLOW
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 5, ANIM_ATTACKER, 0
+	createsprite gUnknown_08593880, 0, 45, 0, 0, 0, 0, 0, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 6, 1
+	createvisualtask sub_81162A4, 2, 1, 0, 6, 1
+	createvisualtask sub_8159078, 5
 	return
 
 Move_SAND_TOMB:
-	loadspritegfx 0x275A
-	createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0)
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 43, 1
+	loadspritegfx ANIM_TAG_074
+	createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0)
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 43, 1
 	playsewithpan SE_W328, +63
-	call AnimScript_82D51B7
-	call AnimScript_82D51B7
-	call AnimScript_82D51B7
-	delay 0x16
-	createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(19, 17, 0)
-	waitforvisualfinish
-	end
-
-AnimScript_82D51B7:
-	createsprite gUnknown_08596B34, 0x82, 0, 32, 528, 30, 10, 50, 1
-	delay 0x2
-	createsprite gUnknown_08596B34, 0x82, 0, 36, 480, 20, 13, -46, 1
-	delay 0x2
-	createsprite gUnknown_08596B34, 0x82, 0, 37, 576, 20, 5, 42, 1
-	delay 0x2
-	createsprite gUnknown_08596B34, 0x82, 0, 35, 400, 25, 8, -42, 1
-	delay 0x2
-	createsprite gUnknown_08596B34, 0x82, 0, 32, 512, 25, 13, 46, 1
-	delay 0x2
-	createsprite gUnknown_08596B34, 0x82, 0, 37, 464, 30, 12, -50, 1
-	delay 0x2
+	call SandTombEffect
+	call SandTombEffect
+	call SandTombEffect
+	delay 22
+	createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(19, 17, 0)
+	waitforvisualfinish
+	end
+
+SandTombEffect:
+	createsprite gUnknown_08596B34, 130, 0, 32, 528, 30, 10, 50, 1
+	delay 2
+	createsprite gUnknown_08596B34, 130, 0, 36, 480, 20, 13, -46, 1
+	delay 2
+	createsprite gUnknown_08596B34, 130, 0, 37, 576, 20, 5, 42, 1
+	delay 2
+	createsprite gUnknown_08596B34, 130, 0, 35, 400, 25, 8, -42, 1
+	delay 2
+	createsprite gUnknown_08596B34, 130, 0, 32, 512, 25, 13, 46, 1
+	delay 2
+	createsprite gUnknown_08596B34, 130, 0, 37, 464, 30, 12, -50, 1
+	delay 2
 	return
 
 Move_SHEER_COLD:
@@ -8665,12 +8545,12 @@ Move_SHEER_COLD:
 	waitbgfadeout
 	playsewithpan SE_W196, 0
 	waitbgfadein
-	loadspritegfx 0x271A
+	loadspritegfx ANIM_TAG_ICE_CUBE
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	createvisualtask sub_80A9EF4, 0x2
-	waitplaysewithpan SE_W258, +63, 0x11
+	setalpha 12, 8
+	createvisualtask sub_80A9EF4, 2
+	waitplaysewithpan SE_W258, +63, 17
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -8679,210 +8559,205 @@ Move_SHEER_COLD:
 	end
 
 Move_ARM_THRUST:
-	loadspritegfx 0x279F
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_143
+	loadspritegfx ANIM_TAG_135
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	createvisualtask sub_80D6134, 0x5, 8, 5, 0, 0
-	delay 0x6
-	createsprite gUnknown_0857FE28, 0x2, 4, 3
-	delay 0x4
+	setalpha 12, 8
+	createvisualtask sub_80D6134, 5, 8, 5, 0, 0
+	delay 6
+	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 3
+	delay 4
 	playsewithpan SE_W207, +63
-	createsprite gUnknown_08596034, 0x82, 10, -8, 14, 3
+	createsprite gUnknown_08596034, 130, 10, -8, 14, 3
 	waitforvisualfinish
-	createvisualtask sub_80D6134, 0x5, 8, 5, 0, 1
+	createvisualtask sub_80D6134, 5, 8, 5, 0, 1
 	playsewithpan SE_W003, +63
-	choosetwoturnanim AnimScript_82D52D4, AnimScript_82D52E8
-
-AnimScript_82D52C0:
-	createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1
+	choosetwoturnanim ArmThrustRight, ArmThrustLeft
+ArmThrustContinue:
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1
 	waitforvisualfinish
 	blendoff
 	end
-
-AnimScript_82D52D4:
-	createsprite gUnknown_08597358, 0x82, 8, 0, 1, 2
-	goto AnimScript_82D52C0
-
-AnimScript_82D52E8:
-	createsprite gUnknown_08597358, 0x82, -8, 0, 1, 2
-	goto AnimScript_82D52C0
+ArmThrustRight:
+	createsprite gBasicHitSplatSpriteTemplate, 130, 8, 0, 1, 2
+	goto ArmThrustContinue
+ArmThrustLeft:
+	createsprite gBasicHitSplatSpriteTemplate, 130, -8, 0, 1, 2
+	goto ArmThrustContinue
 
 Move_MUDDY_WATER:
-	panse_1B SE_W250, -64, +63, +2, 0x0
-	createvisualtask sub_8107954, 0x2, 1
+	panse_1B SE_W250, -64, +63, +2, 0
+	createvisualtask AnimTask_CreateSurfWave, 2, TRUE
 	waitforvisualfinish
 	end
 
 Move_BULLET_SEED:
-	loadspritegfx 0x2716
-	createsprite gUnknown_0859351C, 0x82, 20, 0
-	delay 0x5
-	createsprite gUnknown_0859351C, 0x82, 20, 0
-	delay 0x5
-	createsprite gUnknown_0859351C, 0x82, 20, 0
-	delay 0x5
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 30, 1
-	createsprite gUnknown_0859351C, 0x82, 20, 0
-	delay 0x5
-	createsprite gUnknown_0859351C, 0x82, 20, 0
-	delay 0x5
-	createsprite gUnknown_0859351C, 0x82, 20, 0
-	delay 0x5
-	createsprite gUnknown_0859351C, 0x82, 20, 0
-	delay 0x5
-	createsprite gUnknown_0859351C, 0x82, 20, 0
-	delay 0x5
-	createsprite gUnknown_0859351C, 0x82, 20, 0
-	delay 0x5
-	createsprite gUnknown_0859351C, 0x82, 20, 0
+	loadspritegfx ANIM_TAG_SEED
+	createsprite gUnknown_0859351C, 130, 20, 0
+	delay 5
+	createsprite gUnknown_0859351C, 130, 20, 0
+	delay 5
+	createsprite gUnknown_0859351C, 130, 20, 0
+	delay 5
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 30, 1
+	createsprite gUnknown_0859351C, 130, 20, 0
+	delay 5
+	createsprite gUnknown_0859351C, 130, 20, 0
+	delay 5
+	createsprite gUnknown_0859351C, 130, 20, 0
+	delay 5
+	createsprite gUnknown_0859351C, 130, 20, 0
+	delay 5
+	createsprite gUnknown_0859351C, 130, 20, 0
+	delay 5
+	createsprite gUnknown_0859351C, 130, 20, 0
+	delay 5
+	createsprite gUnknown_0859351C, 130, 20, 0
 	waitforvisualfinish
 	end
 
 Move_DRAGON_CLAW:
-	loadspritegfx 0x272D
-	loadspritegfx 0x2737
+	loadspritegfx ANIM_TAG_SMALL_EMBER
+	loadspritegfx ANIM_TAG_CLAW_SLASH
 	playsewithpan SE_W221B, -64
-	createvisualtask sub_8116620, 0xA, 2, 4, 0, 8, 639
-	createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 15, 1
-	call AnimScript_82D5581
-	call AnimScript_82D5581
-	createsprite gUnknown_0857FE28, 0x2, 6, 4
-	createsprite gUnknown_08596B88, 0x2, 0, 28, 528, 30, 13, 50, 0
-	delay 0x2
-	createvisualtask sub_8159210, 0x5, 136, 63
-	createsprite gUnknown_08597138, 0x82, -10, -10, 0
-	createsprite gUnknown_08597138, 0x82, -10, 10, 0
-	createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1
-	createsprite gUnknown_08596B88, 0x2, 0, 32, 480, 20, 16, -46, 0
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x2, 0, 33, 576, 20, 8, 42, 0
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x2, 0, 31, 400, 25, 11, -42, 0
-	delay 0x2
-	createsprite gUnknown_0857FE28, 0x2, 6, 4
-	createsprite gUnknown_08596B88, 0x2, 0, 28, 512, 25, 16, 46, 0
-	delay 0x2
-	createvisualtask sub_8159210, 0x5, 136, 63
-	createsprite gUnknown_08597138, 0x82, 10, -10, 1
-	createsprite gUnknown_08597138, 0x82, 10, 10, 1
-	createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1
-	createsprite gUnknown_08596B88, 0x2, 0, 33, 464, 30, 15, -50, 0
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x2, 0, 28, 528, 30, 13, 50, 0
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x2, 0, 32, 480, 20, 16, -46, 0
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x2, 0, 33, 576, 20, 8, 42, 0
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x2, 0, 31, 400, 25, 11, -42, 0
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x2, 0, 28, 512, 25, 16, 46, 0
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x2, 0, 33, 464, 30, 15, -50, 0
-	createvisualtask sub_8116620, 0xA, 2, 4, 8, 0, 639
-	waitforvisualfinish
-	end
-
-AnimScript_82D5581:
-	createsprite gUnknown_08596B88, 0x2, 0, 28, 528, 30, 13, 50, 0
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x2, 0, 32, 480, 20, 16, -46, 0
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x2, 0, 33, 576, 20, 8, 42, 0
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x2, 0, 31, 400, 25, 11, -42, 0
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x2, 0, 28, 512, 25, 16, 46, 0
-	delay 0x2
-	createsprite gUnknown_08596B88, 0x2, 0, 33, 464, 30, 15, -50, 0
-	delay 0x2
+	createvisualtask sub_8116620, 10, 2, 4, 0, 8, RGB(31, 19, 0)
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 15, 1
+	call DragonClawEffect
+	call DragonClawEffect
+	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
+	createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0
+	delay 2
+	createvisualtask sub_8159210, 5, 136, 63
+	createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0
+	createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0
+	createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1
+	createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0
+	delay 2
+	createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0
+	delay 2
+	createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0
+	delay 2
+	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
+	createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0
+	delay 2
+	createvisualtask sub_8159210, 5, 136, 63
+	createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1
+	createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1
+	createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1
+	createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0
+	delay 2
+	createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0
+	delay 2
+	createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0
+	delay 2
+	createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0
+	delay 2
+	createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0
+	delay 2
+	createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0
+	delay 2
+	createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0
+	createvisualtask sub_8116620, 10, 2, 4, 8, 0, RGB(31, 19, 0)
+	waitforvisualfinish
+	end
+DragonClawEffect:
+	createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0
+	delay 2
+	createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0
+	delay 2
+	createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0
+	delay 2
+	createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0
+	delay 2
+	createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0
+	delay 2
+	createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0
+	delay 2
 	return
 
-AnimScript_82D560C:
+End:
 	end
 
 Move_MUD_SHOT:
-	loadspritegfx 0x2813
+	loadspritegfx ANIM_TAG_259
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 46, 1
-	delay 0x6
-	createvisualtask sub_81076C8, 0x5, 100
-	panse_1B SE_W250, -64, +63, +1, 0x0
-	call AnimScript_82D5687
-	call AnimScript_82D5687
-	call AnimScript_82D5687
-	createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 43, 1
-	call AnimScript_82D5687
-	call AnimScript_82D5687
-	call AnimScript_82D5687
-	call AnimScript_82D5687
-	call AnimScript_82D5687
-	call AnimScript_82D5687
-	call AnimScript_82D5687
-	call AnimScript_82D5687
+	setalpha 12, 8
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1
+	delay 6
+	createvisualtask sub_81076C8, 5, 100
+	panse_1B SE_W250, -64, +63, +1, 0
+	call MudShot1
+	call MudShot1
+	call MudShot1
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 43, 1
+	call MudShot1
+	call MudShot1
+	call MudShot1
+	call MudShot1
+	call MudShot1
+	call MudShot1
+	call MudShot1
+	call MudShot1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
-
-AnimScript_82D5687:
-	createsprite gUnknown_085950FC, 0x3, 10, 10, 0, 16
-	delay 0x2
-	createsprite gUnknown_085950FC, 0x3, 10, 10, 0, 16
-	delay 0x2
+MudShot1:
+	createsprite gUnknown_085950FC, 3, 10, 10, 0, 16
+	delay 2
+	createsprite gUnknown_085950FC, 3, 10, 10, 0, 16
+	delay 2
 	return
 
 Move_METEOR_MASH:
-	loadspritegfx 0x27F9
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
-	panse_1B SE_W112, -64, +63, +3, 0x0
+	loadspritegfx ANIM_TAG_233
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
+	panse_1B SE_W112, -64, +63, +3, 0
 	fadetobg BG_COSMIC
 	waitbgfadein
 	waitforvisualfinish
-	createsprite gUnknown_085CE8DC, 0x83, -48, -64, 72, 32, 30
-	delay 0xA
-	createsprite gUnknown_085CE8DC, 0x83, -112, -64, 8, 32, 30
-	delay 0x28
-	createsprite gUnknown_08595F14, 0x83, 0, 0, 0, 30
-	createsprite gUnknown_085CE8DC, 0x83, -80, -64, 40, 32, 30
-	delay 0x14
+	createsprite gUnknown_085CE8DC, 131, -48, -64, 72, 32, 30
+	delay 10
+	createsprite gUnknown_085CE8DC, 131, -112, -64, 8, 32, 30
+	delay 40
+	createsprite gUnknown_08595F14, 131, 0, 0, 0, 30
+	createsprite gUnknown_085CE8DC, 131, -80, -64, 40, 32, 30
+	delay 20
 	playsewithpan SE_W233B, +63
-	createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1
-	createvisualtask sub_80D52D0, 0x2, 1, 5, 0, 20, 1
+	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 5, 0, 20, 1
 	waitforvisualfinish
-	delay 0xA
+	delay 10
 	restorebg
 	waitbgfadein
 	waitforvisualfinish
 	end
 
 Move_REVENGE:
-	loadspritegfx 0x2805
+	loadspritegfx ANIM_TAG_245
 	monbg ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W036, -64
-	createsprite gUnknown_08596088, 0x2, 10, -10
+	createsprite gUnknown_08596088, 2, 10, -10
 	waitforvisualfinish
-	createvisualtask sub_8115A04, 0x2, 2, 0, 4, 2, 8, 31
+	createvisualtask sub_8115A04, 2, 2, 0, 4, 2, 8, RGB_RED
 	waitforvisualfinish
-	unloadspritegfx 0x2805
-	loadspritegfx 0x2806
-	createsprite gUnknown_0857FE28, 0x2, 6, 4
-	delay 0x4
+	unloadspritegfx ANIM_TAG_245
+	loadspritegfx ANIM_TAG_246
+	createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4
+	delay 4
 	playsewithpan SE_W207, +63
-	createsprite gUnknown_085960D0, 0x82, 10, -10
+	createsprite gUnknown_085960D0, 130, 10, -10
 	waitforvisualfinish
-	unloadspritegfx 0x2806
-	loadspritegfx 0x2797
-	createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 10, 1
-	createsprite gUnknown_08597400, 0x83, -10, -8, 1, 1, 8
+	unloadspritegfx ANIM_TAG_246
+	loadspritegfx ANIM_TAG_135
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 10, 1
+	createsprite gUnknown_08597400, 131, -10, -8, 1, 1, 8
 	playsewithpan SE_W233B, +63
-	delay 0x8
-	createsprite gUnknown_08597400, 0x83, 10, 8, 1, 1, 8
+	delay 8
+	createsprite gUnknown_08597400, 131, 10, 8, 1, 1, 8
 	playsewithpan SE_W025B, +63
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
@@ -8890,949 +8765,923 @@ Move_REVENGE:
 	end
 
 Move_POISON_FANG:
-	loadspritegfx 0x27D0
-	loadspritegfx 0x27A6
+	loadspritegfx ANIM_TAG_192
+	loadspritegfx ANIM_TAG_POISON_BUBBLE
 	playsewithpan SE_W044, +63
-	createsprite gUnknown_085CE1DC, 0x82
-	delay 0xA
-	createvisualtask sub_80D51AC, 0x3, 1, 3, 0, 10, 1
+	createsprite gUnknown_085CE1DC, 130
+	delay 10
+	createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 3, 0, 10, 1
 	waitforvisualfinish
-	createvisualtask sub_8115A04, 0x2, 4, 0, 4, 0, 12, 26650
-	call AnimScript_82D7A71
+	createvisualtask sub_8115A04, 2, 4, 0, 4, 0, 12, RGB(26, 0, 26)
+	call PoisonBubblesEffect
 	waitforvisualfinish
 	end
 
 Move_SUBSTITUTE:
 	playsewithpan SE_W213, -64
-	createvisualtask sub_815F20C, 0x2
+	createvisualtask AnimTask_MonToSubstitute, 2
 	end
 
 Move_FRENZY_PLANT:
-	loadspritegfx 0x27EF
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_223
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	createsprite gUnknown_08597274, 0x0, 1, 2, 0, 5, 0
+	setalpha 12, 8
+	createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 0, 5, RGB_BLACK
 	waitforvisualfinish
-	createsprite gUnknown_08592564, 0x2, 10, 8, 2, 0, 0, 100
+	createsprite gUnknown_08592564, 2, 10, 8, 2, 0, 0, 100
 	playsewithpan SE_W010, -64
-	delay 0x5
-	createsprite gUnknown_08592564, 0x2, 20, -8, -2, 0, 1, 95
+	delay 5
+	createsprite gUnknown_08592564, 2, 20, -8, -2, 0, 1, 95
 	playsewithpan SE_W010, -43
-	delay 0x5
-	createsprite gUnknown_08592564, 0x2, 30, 8, -4, 0, 0, 90
+	delay 5
+	createsprite gUnknown_08592564, 2, 30, 8, -4, 0, 0, 90
 	playsewithpan SE_W010, -22
-	delay 0x5
-	createsprite gUnknown_08592564, 0x2, 40, -8, 4, 0, 1, 85
+	delay 5
+	createsprite gUnknown_08592564, 2, 40, -8, 4, 0, 1, 85
 	playsewithpan SE_W010, 0
-	delay 0x5
-	createsprite gUnknown_08592564, 0x2, 50, 8, 0, 0, 0, 85
+	delay 5
+	createsprite gUnknown_08592564, 2, 50, 8, 0, 0, 0, 85
 	playsewithpan SE_W010, +21
-	delay 0x5
-	createsprite gUnknown_08592564, 0x2, 60, -8, -2, 0, 1, 85
+	delay 5
+	createsprite gUnknown_08592564, 2, 60, -8, -2, 0, 1, 85
 	playsewithpan SE_W010, +42
-	delay 0x5
-	createsprite gUnknown_08592564, 0x2, 75, 8, 0, 0, 0, 85
+	delay 5
+	createsprite gUnknown_08592564, 2, 75, 8, 0, 0, 0, 85
 	playsewithpan SE_W010, +63
-	delay 0x5
-	createsprite gUnknown_08592564, 0x2, 85, 16, 6, 0, 3, 80
+	delay 5
+	createsprite gUnknown_08592564, 2, 85, 16, 6, 0, 3, 80
 	playsewithpan SE_W010, +63
-	delay 0x5
-	createsprite gUnknown_08592564, 0x2, 85, -16, -6, 0, 2, 75
+	delay 5
+	createsprite gUnknown_08592564, 2, 85, -16, -6, 0, 2, 75
 	playsewithpan SE_W010, +63
-	delay 0x5
-	createsprite gUnknown_08597358, 0x2, -10, -10, 1, 3
+	delay 5
+	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -10, 1, 3
 	playsewithpan SE_W003, +63
-	createvisualtask sub_80D51AC, 0x3, 1, 8, 0, 20, 1
-	delay 0x3
-	createsprite gUnknown_08597358, 0x2, 10, 8, 1, 3
+	createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 8, 0, 20, 1
+	delay 3
+	createsprite gBasicHitSplatSpriteTemplate, 2, 10, 8, 1, 3
 	playsewithpan SE_W003, +63
-	delay 0x3
-	createsprite gUnknown_08597358, 0x2, 10, -3, 1, 2
+	delay 3
+	createsprite gBasicHitSplatSpriteTemplate, 2, 10, -3, 1, 2
 	playsewithpan SE_W003, +63
-	delay 0x3
-	createsprite gUnknown_08597358, 0x2, -3, 1, 1, 2
+	delay 3
+	createsprite gBasicHitSplatSpriteTemplate, 2, -3, 1, 1, 2
 	playsewithpan SE_W003, +63
-	delay 0x2
-	createsprite gUnknown_08597358, 0x2, -10, 1, 1, 1
+	delay 2
+	createsprite gBasicHitSplatSpriteTemplate, 2, -10, 1, 1, 1
 	playsewithpan SE_W003, +63
-	delay 0x2
-	createsprite gUnknown_08597358, 0x2, 0, 10, 1, 1
+	delay 2
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 10, 1, 1
 	playsewithpan SE_W003, +63
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x0, 1, 2, 5, 0, 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 5, 0, RGB_BLACK
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_METAL_SOUND:
-	loadspritegfx 0x2814
+	loadspritegfx ANIM_TAG_260
 	monbg ANIM_DEF_PARTNER
 	monbgprio_2A ANIM_TARGET
-	createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 8, 1
-	call AnimScript_82D59EA
-	call AnimScript_82D59EA
-	call AnimScript_82D59EA
-	call AnimScript_82D59EA
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1
+	call MetalSound1
+	call MetalSound1
+	call MetalSound1
+	call MetalSound1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
-	delay 0x0
+	delay 0
 	waitforvisualfinish
 	end
-
-AnimScript_82D59EA:
-	panse_1B SE_W103, -64, +63, +2, 0x0
-	createsprite gUnknown_08593458, 0x82, 16, 0, 0, 0, 30, 0
-	delay 0x2
+MetalSound1:
+	panse_1B SE_W103, -64, +63, +2, 0
+	createsprite gUnknown_08593458, 130, 16, 0, 0, 0, 30, 0
+	delay 2
 	return
 
 Move_FOCUS_PUNCH:
-	goto AnimScript_82D5A0E
-
-AnimScript_82D5A0C:
-	waitforvisualfinish
-	end
-
-AnimScript_82D5A0E:
-	loadspritegfx 0x2797
-	loadspritegfx 0x279F
-	delay 0x1
-	createvisualtask sub_8117E60, 0x2
-	jumpargeq 0x7, 0x1, AnimScript_82D5AC7
-	createvisualtask sub_815A8C8, 0x2
-	jumpargeq 0x7, 0x0, AnimScript_82D5AB9
-	jumpargeq 0x7, 0x1, AnimScript_82D5AC0
-
-AnimScript_82D5A3C:
+	goto FocusPunch
+FocusPunchEnd:
+	waitforvisualfinish
+	end
+FocusPunch:
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_143
+	delay 1
+	createvisualtask AnimTask_IsContest, 2
+	jumprettrue FocusPunchInContest
+	createvisualtask AnimTask_IsTargetPlayerSide, 2
+	jumpretfalse FocusPunchOnOpponent
+	jumprettrue FocusPunchOnPlayer
+FocusPunchContinue:
 	waitbgfadein
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W207, +63
-	createsprite gUnknown_08596104, 0x82
-	delay 0xA
-	createsprite gUnknown_08597358, 0x2, -10, -8, 1, 0
-	createvisualtask sub_80D51AC, 0x5, 1, 8, 0, 24, 1
-	delay 0x8
-	createsprite gUnknown_08597358, 0x2, 10, 2, 1, 0
+	createsprite gUnknown_08596104, 130
+	delay 10
+	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1
+	delay 8
+	createsprite gBasicHitSplatSpriteTemplate, 2, 10, 2, 1, 0
 	playsewithpan SE_W233B, +63
-	delay 0x8
-	createsprite gUnknown_08597358, 0x2, 10, -6, 1, 0
+	delay 8
+	createsprite gBasicHitSplatSpriteTemplate, 2, 10, -6, 1, 0
 	playsewithpan SE_W233B, +63
-	delay 0x8
-	createsprite gUnknown_08597358, 0x2, 0, 8, 1, 0
+	delay 8
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 8, 1, 0
 	playsewithpan SE_W025B, +63
 	waitforvisualfinish
 	restorebg
 	waitbgfadein
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
-	goto AnimScript_82D5A0C
-
-AnimScript_82D5AB9:
+	goto FocusPunchEnd
+FocusPunchOnOpponent:
 	fadetobg BG_IMPACT_OPPONENT
-	goto AnimScript_82D5A3C
-
-AnimScript_82D5AC0:
+	goto FocusPunchContinue
+FocusPunchOnPlayer:
 	fadetobg BG_IMPACT_PLAYER
-	goto AnimScript_82D5A3C
-
-AnimScript_82D5AC7:
+	goto FocusPunchContinue
+FocusPunchInContest:
 	fadetobg BG_IMPACT_CONTESTS
-	goto AnimScript_82D5A3C
+	goto FocusPunchContinue
 
 Move_RETURN:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	createvisualtask sub_815F8A0, 0x2
-	delay 0x2
-	jumpargeq 0x7, 0x0, AnimScript_82D5B04
-	jumpargeq 0x7, 0x1, AnimScript_82D5B56
-	jumpargeq 0x7, 0x2, AnimScript_82D5BB6
-	jumpargeq 0x7, 0x3, AnimScript_82D5CD1
-
-AnimScript_82D5AFF:
+	setalpha 12, 8
+	createvisualtask AnimTask_GetReturnPowerLevel, 2
+	delay 2
+	jumpreteq 0, ReturnWeak
+	jumpreteq 1, ReturnMedium
+	jumpreteq 2, ReturnStrong
+	jumpreteq 3, ReturnStrongest
+ReturnContinue:
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
-
-AnimScript_82D5B04:
-	createsprite gUnknown_0857FE40, 0x2, 16, 1, 0
-	createvisualtask sub_8159244, 0x5, 167, -64
-	waitforvisualfinish
-	createsprite gUnknown_0857FE40, 0x2, 16, 1, 0
-	createvisualtask sub_8159244, 0x5, 167, -64
-	delay 0x5
-	createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2
-	createvisualtask sub_8159210, 0x5, 139, 63
-	goto AnimScript_82D5AFF
-
-AnimScript_82D5B56:
-	createsprite gUnknown_0857FE40, 0x2, 6, 1, 0
-	createvisualtask sub_8159244, 0x5, 167, -64
-	waitforvisualfinish
-	createsprite gUnknown_0857FE40, 0x2, 6, 1, 0
-	createvisualtask sub_8159244, 0x5, 167, -64
-	waitforvisualfinish
-	delay 0xB
-	createsprite gUnknown_0857FE28, 0x2, 5, 4
-	delay 0x6
-	createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2
-	createvisualtask sub_8159210, 0x5, 141, 63
-	goto AnimScript_82D5AFF
-
-AnimScript_82D5BB6:
-	createsprite gUnknown_0857FE40, 0x2, 6, 1, 0
-	createvisualtask sub_8159244, 0x5, 167, -64
-	waitforvisualfinish
-	createsprite gUnknown_0857FE40, 0x2, 6, 1, 0
-	createvisualtask sub_8159244, 0x5, 167, -64
-	waitforvisualfinish
-	createsprite gUnknown_0857FE40, 0x2, 6, 1, 0
-	createvisualtask sub_8159244, 0x5, 167, -64
-	waitforvisualfinish
-	createsprite gUnknown_0857FE40, 0x2, 6, 1, 0
-	createvisualtask sub_8159244, 0x5, 167, -64
-	waitforvisualfinish
-	createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2
-	createvisualtask sub_8159210, 0x5, 123, 63
-	createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1
-	delay 0x8
-	createsprite gUnknown_08597358, 0x2, 10, 10, 1, 2
-	createvisualtask sub_8159210, 0x5, 123, 63
-	createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1
-	delay 0x8
-	createsprite gUnknown_08597358, 0x2, 3, -5, 1, 2
-	createvisualtask sub_8159210, 0x5, 123, 63
-	createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1
-	delay 0x8
-	createsprite gUnknown_08597358, 0x2, -5, 3, 1, 2
-	createvisualtask sub_8159210, 0x5, 123, 63
-	createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1
-	goto AnimScript_82D5AFF
-
-AnimScript_82D5CD1:
-	createsprite gUnknown_08597274, 0x2, 1, 0, 0, 6, 0
-	waitforvisualfinish
-	createsprite gUnknown_0857FE40, 0x2, 16, 1, 0
-	createvisualtask sub_8159244, 0x5, 167, -64
-	delay 0x8
-	createsprite gUnknown_08597358, 0x2, 3, -5, 1, 2
-	createvisualtask sub_8159210, 0x5, 123, 63
-	waitforvisualfinish
-	createsprite gUnknown_0857FE40, 0x2, 12, 1, 0
-	createvisualtask sub_8159244, 0x5, 167, -64
-	delay 0x5
-	createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2
-	createvisualtask sub_8159210, 0x5, 123, 63
-	createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1
-	waitforvisualfinish
-	delay 0x4
-	createsprite gUnknown_0857FE40, 0x2, 8, 1, 0
-	createvisualtask sub_8159244, 0x5, 167, -64
-	delay 0x5
-	createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2
-	createvisualtask sub_8159210, 0x5, 123, 63
-	createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1
-	waitforvisualfinish
-	delay 0x2
-	createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1
-	createsprite gUnknown_0857FE40, 0x2, 4, 1, 0
-	createvisualtask sub_8159244, 0x5, 167, -64
-	createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2
-	createvisualtask sub_8159210, 0x5, 123, 63
-	createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1
-	createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1
-	waitforvisualfinish
-	createsprite gUnknown_0857FE40, 0x2, 4, 2, 0
-	createvisualtask sub_8159244, 0x5, 167, -64
-	delay 0x5
-	createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2
-	createvisualtask sub_8159210, 0x5, 123, 63
-	createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1
-	createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1
-	waitforvisualfinish
-	call AnimScript_82D5F09
-	call AnimScript_82D5F09
-	call AnimScript_82D5F09
-	call AnimScript_82D5F09
-	createsprite gUnknown_08597358, 0x2, -10, -8, 1, 0
-	createvisualtask sub_8159210, 0x5, 141, 63
-	createvisualtask sub_80D51AC, 0x5, 1, 8, 0, 24, 1
-	delay 0x6
-	createsprite gUnknown_08597358, 0x2, 10, 10, 1, 0
-	createvisualtask sub_8159210, 0x5, 141, 63
-	delay 0x6
-	createsprite gUnknown_08597358, 0x2, 3, -5, 1, 0
-	createvisualtask sub_8159210, 0x5, 141, 63
-	delay 0x6
-	createsprite gUnknown_08597358, 0x2, -5, 3, 1, 0
-	createvisualtask sub_8159210, 0x5, 141, 63
-	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 0, 6, 0, 0
-	goto AnimScript_82D5AFF
-
-AnimScript_82D5F09:
-	createsprite gUnknown_0857FE40, 0x2, 4, 3, 0
-	createvisualtask sub_8159244, 0x5, 167, -64
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
-	createvisualtask sub_8159210, 0x5, 123, 63
-	createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1
-	createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1
+ReturnWeak:
+	createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER
+	createvisualtask sub_8159244, 5, 167, -64
+	waitforvisualfinish
+	createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER
+	createvisualtask sub_8159244, 5, 167, -64
+	delay 5
+	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
+	createvisualtask sub_8159210, 5, 139, 63
+	goto ReturnContinue
+ReturnMedium:
+	createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER
+	createvisualtask sub_8159244, 5, 167, -64
+	waitforvisualfinish
+	createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER
+	createvisualtask sub_8159244, 5, 167, -64
+	waitforvisualfinish
+	delay 11
+	createsprite gHorizontalLungeSpriteTemplate, 2, 5, 4
+	delay 6
+	createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
+	createvisualtask sub_8159210, 5, 141, 63
+	goto ReturnContinue
+ReturnStrong:
+	createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER
+	createvisualtask sub_8159244, 5, 167, -64
+	waitforvisualfinish
+	createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER
+	createvisualtask sub_8159244, 5, 167, -64
+	waitforvisualfinish
+	createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER
+	createvisualtask sub_8159244, 5, 167, -64
+	waitforvisualfinish
+	createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER
+	createvisualtask sub_8159244, 5, 167, -64
+	waitforvisualfinish
+	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
+	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
+	delay 8
+	createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 2
+	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
+	delay 8
+	createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2
+	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
+	delay 8
+	createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 2
+	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
+	goto ReturnContinue
+ReturnStrongest:
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 6, RGB_BLACK
+	waitforvisualfinish
+	createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER
+	createvisualtask sub_8159244, 5, 167, -64
+	delay 8
+	createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2
+	createvisualtask sub_8159210, 5, 123, 63
+	waitforvisualfinish
+	createsprite gVerticalDipSpriteTemplate, 2, 12, 1, ANIM_ATTACKER
+	createvisualtask sub_8159244, 5, 167, -64
+	delay 5
+	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
+	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
+	waitforvisualfinish
+	delay 4
+	createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER
+	createvisualtask sub_8159244, 5, 167, -64
+	delay 5
+	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
+	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
+	waitforvisualfinish
+	delay 2
+	createvisualtask sub_81169C0, 2, 0, 4, 5, 1
+	createsprite gVerticalDipSpriteTemplate, 2, 4, 1, ANIM_ATTACKER
+	createvisualtask sub_8159244, 5, 167, -64
+	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
+	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
+	createvisualtask sub_81169C0, 2, 0, 4, 5, 1
+	waitforvisualfinish
+	createsprite gVerticalDipSpriteTemplate, 2, 4, 2, ANIM_ATTACKER
+	createvisualtask sub_8159244, 5, 167, -64
+	delay 5
+	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
+	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
+	createvisualtask sub_81169C0, 2, 0, 4, 5, 1
+	waitforvisualfinish
+	call ReturnStrongest1
+	call ReturnStrongest1
+	call ReturnStrongest1
+	call ReturnStrongest1
+	createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0
+	createvisualtask sub_8159210, 5, 141, 63
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1
+	delay 6
+	createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 0
+	createvisualtask sub_8159210, 5, 141, 63
+	delay 6
+	createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 0
+	createvisualtask sub_8159210, 5, 141, 63
+	delay 6
+	createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 0
+	createvisualtask sub_8159210, 5, 141, 63
+	waitforvisualfinish
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 6, 0, RGB_BLACK
+	goto ReturnContinue
+ReturnStrongest1:
+	createsprite gVerticalDipSpriteTemplate, 2, 4, 3, ANIM_ATTACKER
+	createvisualtask sub_8159244, 5, 167, -64
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+	createvisualtask sub_8159210, 5, 123, 63
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
+	createvisualtask sub_81169C0, 2, 0, 4, 5, 1
 	waitforvisualfinish
 	return
 
 Move_COSMIC_POWER:
-	loadspritegfx 0x2741
-	createvisualtask sub_8159244, 0x5, 243, 0
+	loadspritegfx ANIM_TAG_SPARKLE
+	createvisualtask sub_8159244, 5, 243, 0
 	playsewithpan SE_W322, 0
-	createvisualtask sub_8117610, 0x2, 0, 0, 15, 0
+	createvisualtask sub_8117610, 2, 0, 0, 15, 0
 	waitforvisualfinish
 	fadetobg BG_COSMIC
 	waitbgfadeout
-	createvisualtask sub_8117660, 0x2, 0, 128, 0, -1
+	createvisualtask sub_8117660, 2, 0, 128, 0, -1
 	waitbgfadein
-	delay 0x46
-	createvisualtask sub_8159210, 0x5, 228, -64
-	createsprite gUnknown_08592B7C, 0x2, -15, 0, 0, 0, 32, 60
-	delay 0x8
-	createsprite gUnknown_08592B7C, 0x2, 12, -5, 0, 0, 32, 60
-	delay 0x28
-	createvisualtask sub_8117610, 0x2, 0, 15, 0, 0
+	delay 70
+	createvisualtask sub_8159210, 5, 228, -64
+	createsprite gUnknown_08592B7C, 2, -15, 0, 0, 0, 32, 60
+	delay 8
+	createsprite gUnknown_08592B7C, 2, 12, -5, 0, 0, 32, 60
+	delay 40
+	createvisualtask sub_8117610, 2, 0, 15, 0, 0
 	waitforvisualfinish
 	restorebg
 	waitbgfadeout
-	setarg 0x7, 0xFFFF
+	setarg 7, -1
 	waitbgfadein
 	waitforvisualfinish
 	end
 
 Move_BLAST_BURN:
-	loadspritegfx 0x2733
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_035
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W221, -64
-	createsprite gUnknown_08595428, 0x2, -32, 0, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x2, -20, -10, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x42, 0, -16, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x42, 20, -10, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x42, 32, 0, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x42, 20, 10, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x2, 0, 16, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x2, -20, 10, 24, 0, 0, 0
-	delay 0x19
+	createsprite gUnknown_08595428, 2, -32, 0, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 2, -20, -10, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 66, 0, -16, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 66, 20, -10, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 66, 32, 0, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 66, 20, 10, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 2, 0, 16, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 2, -20, 10, 24, 0, 0, 0
+	delay 25
 	playsewithpan SE_W172B, -64
-	createsprite gUnknown_08595428, 0x2, -64, 0, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x6, -40, -20, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x46, 0, -32, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x46, 40, -20, 24, 0, 0, 0
-	createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1
-	createsprite gUnknown_08595428, 0x42, 64, 0, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x42, 40, 20, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x2, 0, 32, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x2, -40, 20, 24, 0, 0, 0
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
-	delay 0x19
+	createsprite gUnknown_08595428, 2, -64, 0, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 6, -40, -20, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 70, 0, -32, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 70, 40, -20, 24, 0, 0, 0
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
+	createsprite gUnknown_08595428, 66, 64, 0, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 66, 40, 20, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 2, 0, 32, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 2, -40, 20, 24, 0, 0, 0
+	createvisualtask sub_8115F10, 2, 257, 257, 257
+	delay 25
 	playsewithpan SE_W172B, -64
-	createsprite gUnknown_08595428, 0x2, -96, 0, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x6, -60, -30, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x46, 0, -48, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x46, 60, -30, 24, 0, 0, 0
-	createsprite gUnknown_08597358, 0x82, -4, 3, 1, 0
-	createvisualtask sub_80D51AC, 0x5, 1, 12, 0, 20, 1
-	createvisualtask sub_81162A4, 0x2, 2, 0, 10, 1
-	createsprite gUnknown_08595428, 0x42, 96, 0, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x42, 60, 30, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x2, 0, 48, 24, 0, 0, 0
-	createsprite gUnknown_08595428, 0x2, -60, 30, 24, 0, 0, 0
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
+	createsprite gUnknown_08595428, 2, -96, 0, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 6, -60, -30, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 70, 0, -48, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 70, 60, -30, 24, 0, 0, 0
+	createsprite gBasicHitSplatSpriteTemplate, 130, -4, 3, 1, 0
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 12, 0, 20, 1
+	createvisualtask sub_81162A4, 2, 2, 0, 10, 1
+	createsprite gUnknown_08595428, 66, 96, 0, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 66, 60, 30, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 2, 0, 48, 24, 0, 0, 0
+	createsprite gUnknown_08595428, 2, -60, 30, 24, 0, 0, 0
+	createvisualtask sub_8115F10, 2, 257, 257, 257
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_ROCK_TOMB:
-	loadspritegfx 0x280A
-	loadspritegfx 0x274A
-	createvisualtask sub_81162A4, 0x2, 2, 0, 10, 1
+	loadspritegfx ANIM_TAG_X_SIGN
+	loadspritegfx ANIM_TAG_058
+	createvisualtask sub_81162A4, 2, 2, 0, 10, 1
 	waitforvisualfinish
-	createsprite gUnknown_08596C58, 0x82, 20, 12, 64, 114, 0
-	delay 0x8
-	createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1
+	createsprite gUnknown_08596C58, 130, 20, 12, 64, 114, 0
+	delay 8
+	createvisualtask sub_81162A4, 2, 0, 2, 3, 1
 	playsewithpan SE_W070, +63
-	delay 0x8
-	createsprite gUnknown_08596C58, 0x82, -20, 12, 64, 98, 0
-	delay 0x8
-	createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1
+	delay 8
+	createsprite gUnknown_08596C58, 130, -20, 12, 64, 98, 0
+	delay 8
+	createvisualtask sub_81162A4, 2, 0, 2, 3, 1
 	playsewithpan SE_W070, +63
-	delay 0x8
-	createsprite gUnknown_08596C58, 0xC2, 3, 6, 64, 82, 0
-	delay 0x8
-	createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1
+	delay 8
+	createsprite gUnknown_08596C58, 194, 3, 6, 64, 82, 0
+	delay 8
+	createvisualtask sub_81162A4, 2, 0, 2, 3, 1
 	playsewithpan SE_W070, +63
-	delay 0x8
-	createsprite gUnknown_08596C58, 0x82, -3, 13, 64, 66, 0
-	delay 0x8
-	createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1
+	delay 8
+	createsprite gUnknown_08596C58, 130, -3, 13, 64, 66, 0
+	delay 8
+	createvisualtask sub_81162A4, 2, 0, 2, 3, 1
 	playsewithpan SE_W070, +63
-	delay 0x18
+	delay 24
 	playsewithpan SE_W063, +63
-	createsprite gUnknown_085967AC, 0x85, 1, 50
-	createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 20, 1
-	createvisualtask sub_81162A4, 0x2, 2, 0, 10, 1
+	createsprite gUnknown_085967AC, 133, 1, 50
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 20, 1
+	createvisualtask sub_81162A4, 2, 2, 0, 10, 1
 	waitforvisualfinish
 	end
 
 Move_SILVER_WIND:
-	loadspritegfx 0x281F
-	panse_1B SE_W016, -64, +63, +2, 0x0
+	loadspritegfx ANIM_TAG_271
+	panse_1B SE_W016, -64, +63, +2, 0
 	playsewithpan SE_W234, 0
-	delay 0x0
+	delay 0
 	monbg ANIM_DEF_PARTNER
 	monbgprio_29
-	delay 0x0
-	createvisualtask sub_8116664, 0xA, 1, 0, 0, 4, 0
-	createvisualtask sub_8117780, 0x2
-	jumpargeq 0x7, 0x1, AnimScript_82D650C
+	delay 0
+	createvisualtask sub_8116664, 10, 1, 0, 0, 4, RGB_BLACK
+	createvisualtask AnimTask_IsTargetOpponentSide, 2
+	jumprettrue SilverWindOnPlayer
 	fadetobg BG_BUG_OPPONENT
 	waitbgfadeout
-	createvisualtask sub_8117660, 0x5, 1536, 0, 0, -1
-
-AnimScript_82D6352:
-	delay 0x0
-	createvisualtask sub_8116620, 0xA, 1, 0, 4, 4, 0
+	createvisualtask sub_8117660, 5, 1536, 0, 0, -1
+SilverWindContinue:
+	delay 0
+	createvisualtask sub_8116620, 10, 1, 0, 4, 4, RGB_BLACK
 	waitbgfadein
-	createsprite gUnknown_08592830, 0xC2, -32, 16, 0, 6, 2, 3, 1
-	createsprite gUnknown_08592830, 0xC2, -8, 18, 64, 3, 2, 2, 1
-	createsprite gUnknown_08592830, 0x78, -24, 18, 90, 5, 1, 2, 1
-	createsprite gUnknown_08592830, 0x78, -40, 14, 128, 4, 1, 2, 1
-	delay 0x0
-	createsprite gUnknown_08592848, 0xC2, -32, 16, 0, 6, 2, 3, 1
-	createsprite gUnknown_08592848, 0xC2, -8, 18, 64, 3, 2, 2, 1
-	createsprite gUnknown_08592848, 0x78, -24, 18, 90, 5, 1, 2, 1
-	createsprite gUnknown_08592848, 0x78, -40, 14, 128, 4, 1, 2, 1
-	delay 0x0
-	createsprite gUnknown_08592860, 0xC2, -32, 16, 0, 6, 2, 3, 1
-	createsprite gUnknown_08592860, 0xC2, -8, 18, 64, 3, 2, 2, 1
-	createsprite gUnknown_08592860, 0x78, -24, 18, 90, 5, 1, 2, 1
-	createsprite gUnknown_08592860, 0x78, -40, 14, 128, 4, 1, 2, 1
-	delay 0x6
-	createsprite gUnknown_08592830, 0xC2, -4, 16, 0, 6, 1, 2, 1
-	createsprite gUnknown_08592830, 0xC2, -16, 12, 192, 5, 2, 3, 1
-	delay 0x0
-	createsprite gUnknown_08592848, 0xC2, -4, 16, 0, 6, 1, 2, 1
-	createsprite gUnknown_08592848, 0xC2, -16, 12, 192, 5, 2, 3, 1
-	delay 0x0
-	createsprite gUnknown_08592860, 0xC2, -4, 16, 0, 6, 1, 2, 1
-	createsprite gUnknown_08592860, 0xC2, -16, 12, 192, 5, 2, 3, 1
+	createsprite gUnknown_08592830, -62, -32, 16, 0, 6, 2, 3, 1
+	createsprite gUnknown_08592830, -62, -8, 18, 64, 3, 2, 2, 1
+	createsprite gUnknown_08592830, 120, -24, 18, 90, 5, 1, 2, 1
+	createsprite gUnknown_08592830, 120, -40, 14, 128, 4, 1, 2, 1
+	delay 0
+	createsprite gUnknown_08592848, -62, -32, 16, 0, 6, 2, 3, 1
+	createsprite gUnknown_08592848, -62, -8, 18, 64, 3, 2, 2, 1
+	createsprite gUnknown_08592848, 120, -24, 18, 90, 5, 1, 2, 1
+	createsprite gUnknown_08592848, 120, -40, 14, 128, 4, 1, 2, 1
+	delay 0
+	createsprite gUnknown_08592860, -62, -32, 16, 0, 6, 2, 3, 1
+	createsprite gUnknown_08592860, -62, -8, 18, 64, 3, 2, 2, 1
+	createsprite gUnknown_08592860, 120, -24, 18, 90, 5, 1, 2, 1
+	createsprite gUnknown_08592860, 120, -40, 14, 128, 4, 1, 2, 1
+	delay 6
+	createsprite gUnknown_08592830, -62, -4, 16, 0, 6, 1, 2, 1
+	createsprite gUnknown_08592830, -62, -16, 12, 192, 5, 2, 3, 1
+	delay 0
+	createsprite gUnknown_08592848, -62, -4, 16, 0, 6, 1, 2, 1
+	createsprite gUnknown_08592848, -62, -16, 12, 192, 5, 2, 3, 1
+	delay 0
+	createsprite gUnknown_08592860, -62, -4, 16, 0, 6, 1, 2, 1
+	createsprite gUnknown_08592860, -62, -16, 12, 192, 5, 2, 3, 1
 	waitforvisualfinish
 	playsewithpan SE_W016B, +63
 	clearmonbg ANIM_DEF_PARTNER
-	delay 0x0
+	delay 0
 	restorebg
 	waitbgfadeout
-	createvisualtask sub_8116664, 0xA, 1, 0, 4, 0, 0
-	setarg 0x7, 0xFFFF
+	createvisualtask sub_8116664, 10, 1, 0, 4, 0, RGB_BLACK
+	setarg 7, -1
 	waitbgfadein
 	end
-
-AnimScript_82D650C:
+SilverWindOnPlayer:
 	fadetobg BG_BUG_PLAYER
 	waitbgfadeout
-	createvisualtask sub_8117660, 0x5, -1536, 0, 0, -1
-	goto AnimScript_82D6352
+	createvisualtask sub_8117660, 5, -1536, 0, 0, -1
+	goto SilverWindContinue
 
 Move_SNATCH:
 	playsewithpan SE_W036, -64
-	createvisualtask sub_80D5C50, 0x5, 0, -12, 4, 10, 10, 12, 6
+	createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -12, 4, 10, 10, 12, 6
 	end
 
 Move_DIVE:
-	loadspritegfx 0x2820
-	loadspritegfx 0x2821
-	choosetwoturnanim AnimScript_82D654C, AnimScript_82D65A1
-
-AnimScript_82D654C:
-	loadspritegfx 0x27AC
+	loadspritegfx ANIM_TAG_272
+	loadspritegfx ANIM_TAG_273
+	choosetwoturnanim DiveSetUp, DiveAttack
+DiveSetUp:
+	loadspritegfx ANIM_TAG_156
 	playsewithpan SE_W029, -64
-	createsprite gUnknown_08596490, 0x2, 0, 0, 13, 336
+	createsprite gUnknown_08596490, 2, 0, 0, 13, 336
 	waitforvisualfinish
 	playsewithpan SE_W291, -64
-	createsprite gUnknown_085964CC, 0x3, 0
-	call AnimScript_82D658A
-	call AnimScript_82D658A
-	call AnimScript_82D658A
-	call AnimScript_82D658A
-	call AnimScript_82D658A
-	end
-
-AnimScript_82D658A:
-	createsprite gUnknown_085964E4, 0x5, 0, 0
-	createsprite gUnknown_085964E4, 0x5, 1, 0
+	createsprite gUnknown_085964CC, 3, 0
+	call DiveSetUp1
+	call DiveSetUp1
+	call DiveSetUp1
+	call DiveSetUp1
+	call DiveSetUp1
+	end
+DiveSetUp1:
+	createsprite gUnknown_085964E4, 5, 0, 0
+	createsprite gUnknown_085964E4, 5, 1, 0
 	return
-
-AnimScript_82D65A1:
-	loadspritegfx 0x27A4
-	loadspritegfx 0x27AB
+DiveAttack:
+	loadspritegfx ANIM_TAG_148
+	loadspritegfx ANIM_TAG_155
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W153, +63
-	createsprite gUnknown_085964CC, 0x83, 1
-	call AnimScript_82D65E0
-	call AnimScript_82D65E0
-	call AnimScript_82D65E0
-	call AnimScript_82D65E0
-	call AnimScript_82D65E0
-	delay 0xC
-	call AnimScript_82CB102
+	createsprite gUnknown_085964CC, 131, 1
+	call DiveAttack1
+	call DiveAttack1
+	call DiveAttack1
+	call DiveAttack1
+	call DiveAttack1
+	delay 12
+	call UnderWaterAttack1
 	waitforvisualfinish
 	visible ANIM_ATTACKER
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
-
-AnimScript_82D65E0:
-	createsprite gUnknown_085964E4, 0x85, 0, 1
-	createsprite gUnknown_085964E4, 0x85, 1, 1
+DiveAttack1:
+	createsprite gUnknown_085964E4, 133, 0, 1
+	createsprite gUnknown_085964E4, 133, 1, 1
 	return
 
 Move_ROCK_BLAST:
-	loadspritegfx 0x274A
-	loadspritegfx 0x2797
-	createsprite gUnknown_0857FE28, 0x2, 4, 6
-	delay 0x3
+	loadspritegfx ANIM_TAG_058
+	loadspritegfx ANIM_TAG_135
+	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6
+	delay 3
 	playsewithpan SE_W207, -64
-	createsprite gUnknown_08596C98, 0x82, 16, 0, 0, 0, 25, 257
+	createsprite gUnknown_08596C98, 130, 16, 0, 0, 0, 25, 257
 	waitforvisualfinish
-	createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1
+	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
 	playsewithpan SE_W088, +63
-	createsprite gUnknown_08596B1C, 0x82, 0, 0, 20, 24, 14, 2
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 5, 1
-	createsprite gUnknown_08596B1C, 0x82, 5, 0, -20, 24, 14, 1
-	createsprite gUnknown_08596B1C, 0x82, 0, 5, 20, -24, 14, 2
-	createsprite gUnknown_08596B1C, 0x82, -5, 0, -20, -24, 14, 2
+	createsprite gUnknown_08596B1C, 130, 0, 0, 20, 24, 14, 2
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1
+	createsprite gUnknown_08596B1C, 130, 5, 0, -20, 24, 14, 1
+	createsprite gUnknown_08596B1C, 130, 0, 5, 20, -24, 14, 2
+	createsprite gUnknown_08596B1C, 130, -5, 0, -20, -24, 14, 2
 	waitforvisualfinish
 	end
 
 Move_OVERHEAT:
-	loadspritegfx 0x272D
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_SMALL_EMBER
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x120C
-	createsprite gUnknown_08597274, 0x2, 1, 1, 0, 5, RGB(28, 0, 0)
+	setalpha 12, 18
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 5, RGB(28, 0, 0)
 	waitforvisualfinish
-	createvisualtask sub_8117C44, 0x5
+	createvisualtask sub_8117C44, 5
 	waitforvisualfinish
-	createvisualtask sub_8117CA0, 0x5, 0, 1
-	delay 0x1
-	createvisualtask sub_8117DD8, 0x5, 0
-	delay 0x1
+	createvisualtask sub_8117CA0, 5, 0, 1
+	delay 1
+	createvisualtask sub_8117DD8, 5, 0
+	delay 1
 	playsewithpan SE_W082, -64
-	createvisualtask sub_8117CA0, 0x5, 1, 0
-	delay 0x1
-	createsprite gUnknown_08597274, 0x2, 2, 1, 0, 13, RGB(28, 0, 0)
-	createvisualtask sub_80D51AC, 0x5, 0, 2, 0, 15, 1
+	createvisualtask sub_8117CA0, 5, 1, 0
+	delay 1
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 1, 0, 13, RGB(28, 0, 0)
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1
 	waitforvisualfinish
 	playsewithpan SE_W172B, -64
-	createsprite gUnknown_08596FB0, 0x2, 1, 0, 30, 25, -20
-	createsprite gUnknown_08596FB0, 0x2, 1, 32, 30, 25, -20
-	createsprite gUnknown_08596FB0, 0x2, 1, 64, 30, 25, -20
-	createsprite gUnknown_08596FB0, 0x2, 1, 96, 30, 25, -20
-	createsprite gUnknown_08596FB0, 0x2, 1, 128, 30, 25, -20
-	createsprite gUnknown_08596FB0, 0x42, 1, 160, 30, 25, -20
-	createsprite gUnknown_08596FB0, 0x42, 1, 192, 30, 25, -20
-	createsprite gUnknown_08596FB0, 0x42, 1, 224, 30, 25, -20
-	delay 0x5
-	createsprite gUnknown_08596FB0, 0x2, 1, 0, 30, 25, 0
-	createsprite gUnknown_08596FB0, 0x2, 1, 32, 30, 25, 0
-	createsprite gUnknown_08596FB0, 0x2, 1, 64, 30, 25, 0
-	createsprite gUnknown_08596FB0, 0x2, 1, 96, 30, 25, 0
-	createsprite gUnknown_08596FB0, 0x2, 1, 128, 30, 25, 0
-	createsprite gUnknown_08596FB0, 0x42, 1, 160, 30, 25, 0
-	createsprite gUnknown_08596FB0, 0x42, 1, 192, 30, 25, 0
-	createsprite gUnknown_08596FB0, 0x42, 1, 224, 30, 25, 0
-	delay 0x5
-	createsprite gUnknown_08596FB0, 0x2, 1, 0, 30, 25, 10
-	createsprite gUnknown_08596FB0, 0x2, 1, 32, 30, 25, 10
-	createsprite gUnknown_08596FB0, 0x2, 1, 64, 30, 25, 10
-	createsprite gUnknown_08596FB0, 0x2, 1, 96, 30, 25, 10
-	createsprite gUnknown_08596FB0, 0x2, 1, 128, 30, 25, 10
-	createsprite gUnknown_08596FB0, 0x42, 1, 160, 30, 25, 10
-	createsprite gUnknown_08596FB0, 0x42, 1, 192, 30, 25, 10
-	createsprite gUnknown_08596FB0, 0x42, 1, 224, 30, 25, 10
-	delay 0x5
-	waitforvisualfinish
-	createsprite gUnknown_08597358, 0x83, -5, 3, 1, 0
+	createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, -20
+	createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, -20
+	createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, -20
+	createsprite gUnknown_08596FB0, 2, 1, 96, 30, 25, -20
+	createsprite gUnknown_08596FB0, 2, 1, 128, 30, 25, -20
+	createsprite gUnknown_08596FB0, 66, 1, 160, 30, 25, -20
+	createsprite gUnknown_08596FB0, 66, 1, 192, 30, 25, -20
+	createsprite gUnknown_08596FB0, 66, 1, 224, 30, 25, -20
+	delay 5
+	createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, 0
+	createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, 0
+	createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, 0
+	createsprite gUnknown_08596FB0, 2, 1, 96, 30, 25, 0
+	createsprite gUnknown_08596FB0, 2, 1, 128, 30, 25, 0
+	createsprite gUnknown_08596FB0, 66, 1, 160, 30, 25, 0
+	createsprite gUnknown_08596FB0, 66, 1, 192, 30, 25, 0
+	createsprite gUnknown_08596FB0, 66, 1, 224, 30, 25, 0
+	delay 5
+	createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, 10
+	createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, 10
+	createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, 10
+	createsprite gUnknown_08596FB0, 2, 1, 96, 30, 25, 10
+	createsprite gUnknown_08596FB0, 2, 1, 128, 30, 25, 10
+	createsprite gUnknown_08596FB0, 66, 1, 160, 30, 25, 10
+	createsprite gUnknown_08596FB0, 66, 1, 192, 30, 25, 10
+	createsprite gUnknown_08596FB0, 66, 1, 224, 30, 25, 10
+	delay 5
+	waitforvisualfinish
+	createsprite gBasicHitSplatSpriteTemplate, 131, -5, 3, 1, 0
 	playsewithpan SE_W007, +63
-	createvisualtask sub_80D51AC, 0x2, 1, 10, 0, 25, 1
-	delay 0x6
-	createsprite gUnknown_08597358, 0x83, 8, -5, 1, 0
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 10, 0, 25, 1
+	delay 6
+	createsprite gBasicHitSplatSpriteTemplate, 131, 8, -5, 1, 0
 	playsewithpan SE_W007, +63
-	delay 0x8
-	createsprite gUnknown_08597358, 0x83, 10, 10, 1, 0
+	delay 8
+	createsprite gBasicHitSplatSpriteTemplate, 131, 10, 10, 1, 0
 	playsewithpan SE_W007, +63
-	delay 0x8
-	createsprite gUnknown_08597358, 0x83, 0, 0, 1, 0
+	delay 8
+	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 0
 	playsewithpan SE_W007, +63
-	createvisualtask sub_8117DD8, 0x5, 1
-	delay 0x1
-	createsprite gUnknown_08597274, 0x2, 2, -1, 0, 13, RGB(18, 18, 18)
-	createvisualtask sub_80D51AC, 0x5, 0, 3, 0, 15, 1
+	createvisualtask sub_8117DD8, 5, 1
+	delay 1
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, -1, 0, 13, RGB(18, 18, 18)
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 3, 0, 15, 1
 	waitforvisualfinish
-	createvisualtask sub_8117D3C, 0x5, 0, 1
-	delay 0x1
-	createsprite gUnknown_08597274, 0x2, 1, 1, 5, 0, RGB(28, 0, 0)
+	createvisualtask sub_8117D3C, 5, 0, 1
+	delay 1
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 5, 0, RGB(28, 0, 0)
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	waitforvisualfinish
-	delay 0xF
-	createvisualtask sub_8117D3C, 0x5, 1, 0
-	delay 0x1
-	createsprite gUnknown_08597274, 0x2, 2, 0, 13, 0, RGB(18, 18, 18)
+	delay 15
+	createvisualtask sub_8117D3C, 5, 1, 0
+	delay 1
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 13, 0, RGB(18, 18, 18)
 	waitforvisualfinish
-	createvisualtask sub_8117C70, 0x5
+	createvisualtask sub_8117C70, 5
 	waitforvisualfinish
 	end
 
 Move_HYDRO_CANNON:
-	loadspritegfx 0x27A5
-	loadspritegfx 0x27A4
+	loadspritegfx ANIM_TAG_149
+	loadspritegfx ANIM_TAG_148
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W057, -64
-	createsprite gUnknown_085951C0, 0x82
-	delay 0xA
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
-	delay 0x1E
-	panse_1B SE_W056, -64, +63, +2, 0x0
-	call AnimScript_82D6A50
-	createvisualtask sub_80D51AC, 0x5, 1, 10, 0, 40, 1
-	createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0
-	call AnimScript_82D6A50
-	createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0
-	call AnimScript_82D6A50
-	createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0
-	call AnimScript_82D6A50
-	createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0
-	call AnimScript_82D6A50
-	createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0
-	call AnimScript_82D6A50
-	createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0
-	waitforvisualfinish
-	createvisualtask sub_8115F10, 0x2, 257, 257, 257
+	createsprite gUnknown_085951C0, 130
+	delay 10
+	createvisualtask sub_8115F10, 2, 257, 257, 257
+	delay 30
+	panse_1B SE_W056, -64, +63, +2, 0
+	call HydroCannon1
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 10, 0, 40, 1
+	createsprite gUnknown_08597388, 130, 0, 0, 1, 0
+	call HydroCannon1
+	createsprite gUnknown_08597388, 130, 0, 0, 1, 0
+	call HydroCannon1
+	createsprite gUnknown_08597388, 130, 0, 0, 1, 0
+	call HydroCannon1
+	createsprite gUnknown_08597388, 130, 0, 0, 1, 0
+	call HydroCannon1
+	createsprite gUnknown_08597388, 130, 0, 0, 1, 0
+	call HydroCannon1
+	createsprite gUnknown_08597388, 130, 0, 0, 1, 0
+	waitforvisualfinish
+	createvisualtask sub_8115F10, 2, 257, 257, 257
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
-
-AnimScript_82D6A50:
-	createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257
-	delay 0x1
-	createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257
-	delay 0x1
-	createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257
-	delay 0x1
-	createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257
-	delay 0x1
-	createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257
+HydroCannon1:
+	createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257
+	delay 1
+	createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257
+	delay 1
+	createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257
+	delay 1
+	createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257
+	delay 1
+	createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257
 	return
 
 Move_ASTONISH:
-	loadspritegfx 0x2821
+	loadspritegfx ANIM_TAG_273
 	playsewithpan SE_W227, -64
-	createsprite gUnknown_0857FE28, 0x2, 4, 6
-	delay 0x19
-	createsprite gUnknown_085964E4, 0x85, 0, 1
+	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6
+	delay 25
+	createsprite gUnknown_085964E4, -123, 0, 1
 	playsewithpan SE_W166, +63
-	createsprite gUnknown_085964E4, 0x85, 1, 1
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1
-	createvisualtask sub_8106020, 0x3
+	createsprite gUnknown_085964E4, -123, 1, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
+	createvisualtask sub_8106020, 3
 	waitforvisualfinish
 	end
 
 Move_SEISMIC_TOSS:
-	loadspritegfx 0x2797
-	loadspritegfx 0x274A
-	setarg 0x7, 0x0
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_058
+	setarg 7, 0
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
+	setalpha 12, 8
 	waitforvisualfinish
-	createvisualtask sub_81114EC, 0x3
-	delay 0x1
+	createvisualtask AnimTask_GetSeismicTossDamageLevel, 3
+	delay 1
 	fadetobg BG_SEISMICTOSS_SKUUPPERCUT
 	waitbgfadeout
-	createvisualtask sub_811152C, 0x3
+	createvisualtask sub_811152C, 3
 	playsewithpan SE_W327, 0
 	waitbgfadein
 	waitforvisualfinish
-	createvisualtask sub_8111590, 0x3
-	jumpargeq 0x7, 0x0, AnimScript_82D6B53
-	jumpargeq 0x7, 0x1, AnimScript_82D6B64
-	jumpargeq 0x7, 0x2, AnimScript_82D6B7C
-
-AnimScript_82D6B48:
+	createvisualtask sub_8111590, 3
+	jumpreteq 0, SeismicTossWeak
+	jumpreteq 1, SeismicTossMedium
+	jumpreteq 2, SeismicTossStrong
+SeismicTossContinue:
 	restorebg
 	waitbgfadeout
-	setarg 0x7, 0xFFF
+	setarg 7, 0xFFF
 	waitbgfadein
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
-
-AnimScript_82D6B53:
-	call AnimScript_82D6B9B
-	delay 0x10
-	call AnimScript_82D6BFC
-	goto AnimScript_82D6B48
-
-AnimScript_82D6B64:
-	call AnimScript_82D6B9B
-	delay 0xE
-	call AnimScript_82D6BFC
-	delay 0xE
-	call AnimScript_82D6B9B
-	goto AnimScript_82D6B48
-
-AnimScript_82D6B7C:
-	call AnimScript_82D6BFC
-	delay 0xA
-	call AnimScript_82D6B9B
-	delay 0xA
-	call AnimScript_82D6BFC
-	delay 0xA
-	call AnimScript_82D6B9B
-	goto AnimScript_82D6B48
-
-AnimScript_82D6B9B:
-	createsprite gUnknown_08597358, 0x83, -10, -8, 1, 1
+SeismicTossWeak:
+	call SeismicToss1
+	delay 16
+	call SeismicToss2
+	goto SeismicTossContinue
+SeismicTossMedium:
+	call SeismicToss1
+	delay 14
+	call SeismicToss2
+	delay 14
+	call SeismicToss1
+	goto SeismicTossContinue
+SeismicTossStrong:
+	call SeismicToss2
+	delay 10
+	call SeismicToss1
+	delay 10
+	call SeismicToss2
+	delay 10
+	call SeismicToss1
+	goto SeismicTossContinue
+SeismicToss1:
+	createsprite gBasicHitSplatSpriteTemplate, 131, -10, -8, 1, 1
 	playsewithpan SE_W070, +63
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 5, 1
-	createsprite gUnknown_08596CB0, 0x82, -12, 27, 2, 3
-	createsprite gUnknown_08596CB0, 0x82, 8, 28, 3, 4
-	createsprite gUnknown_08596CB0, 0x82, -4, 30, 2, 3
-	createsprite gUnknown_08596CB0, 0x82, 12, 25, 4, 4
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1
+	createsprite gUnknown_08596CB0, 130, -12, 27, 2, 3
+	createsprite gUnknown_08596CB0, 130, 8, 28, 3, 4
+	createsprite gUnknown_08596CB0, 130, -4, 30, 2, 3
+	createsprite gUnknown_08596CB0, 130, 12, 25, 4, 4
 	return
-
-AnimScript_82D6BFC:
-	createsprite gUnknown_08597358, 0x83, 10, -8, 1, 1
+SeismicToss2:
+	createsprite gBasicHitSplatSpriteTemplate, 131, 10, -8, 1, 1
 	playsewithpan SE_W088, +63
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 5, 1
-	createsprite gUnknown_08596CB0, 0x82, -12, 32, 3, 4
-	createsprite gUnknown_08596CB0, 0x82, 8, 31, 2, 2
-	createsprite gUnknown_08596CB0, 0x82, -4, 28, 2, 3
-	createsprite gUnknown_08596CB0, 0x82, 12, 30, 4, 3
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1
+	createsprite gUnknown_08596CB0, 130, -12, 32, 3, 4
+	createsprite gUnknown_08596CB0, 130, 8, 31, 2, 2
+	createsprite gUnknown_08596CB0, 130, -4, 28, 2, 3
+	createsprite gUnknown_08596CB0, 130, 12, 30, 4, 3
 	return
 
 Move_MAGIC_COAT:
-	loadspritegfx 0x27BA
-	setalpha 0x1000
-	waitplaysewithpan SE_W112, -64, 0xF
-	createsprite gUnknown_085965C0, 0x3, 40, 0, 10170
+	loadspritegfx ANIM_TAG_170
+	setalpha 0, 16
+	waitplaysewithpan SE_W112, -64, 15
+	createsprite gUnknown_085965C0, 3, 40, 0, 10170
 	waitforvisualfinish
-	delay 0x1
+	delay 1
 	blendoff
 	end
 
 Move_WATER_PULSE:
-	loadspritegfx 0x27AB
-	loadspritegfx 0x2830
+	loadspritegfx ANIM_TAG_155
+	loadspritegfx ANIM_TAG_288
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
 	playsewithpan SE_W145C, -64
-	createsprite gUnknown_08597274, 0x2, 1, 0, 0, 7, RGB(0, 25, 28)
-	delay 0xA
-	createsprite gUnknown_085952F8, 0x42, 100, 100, 8, 1, 20, 40, 0
-	createsprite gUnknown_085952F8, 0x42, 20, 100, 16, 2, 10, 35, 1
-	createsprite gUnknown_085952F8, 0x42, 200, 80, 8, 1, 40, 20, 0
-	createsprite gUnknown_085952F8, 0x42, 80, 60, 10, 3, 20, 50, 0
-	createsprite gUnknown_085952F8, 0x42, 140, 100, 16, 1, 20, 30, 1
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 7, RGB(0, 25, 28)
+	delay 10
+	createsprite gUnknown_085952F8, 66, 100, 100, 8, 1, 20, 40, 0
+	createsprite gUnknown_085952F8, 66, 20, 100, 16, 2, 10, 35, 1
+	createsprite gUnknown_085952F8, 66, 200, 80, 8, 1, 40, 20, 0
+	createsprite gUnknown_085952F8, 66, 80, 60, 10, 3, 20, 50, 0
+	createsprite gUnknown_085952F8, 66, 140, 100, 16, 1, 20, 30, 1
 	playsewithpan SE_W145C, +63
 	waitforvisualfinish
 	playsewithpan SE_W202, -64
-	createsprite gUnknown_08593470, 0x82, 0, 0, 40, 15
-	delay 0x5
+	createsprite gUnknown_08593470, 130, 0, 0, 40, 15
+	delay 5
 	playsewithpan SE_W202, -64
-	createsprite gUnknown_08593470, 0x82, 0, 0, 40, 15
-	delay 0x5
+	createsprite gUnknown_08593470, 130, 0, 0, 40, 15
+	delay 5
 	playsewithpan SE_W202, -64
-	createsprite gUnknown_08593470, 0x82, 0, 0, 40, 15
-	delay 0xD
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 8, 18, 1
+	createsprite gUnknown_08593470, 130, 0, 0, 40, 15
+	delay 13
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 8, 18, 1
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 1, 7, 0, RGB(0, 25, 28)
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 7, 0, RGB(0, 25, 28)
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
 Move_PSYCHO_BOOST:
-	loadspritegfx 0x27E4
+	loadspritegfx ANIM_TAG_212
 	monbg ANIM_ATK_PARTNER
 	fadetobg BG_PSYCHIC
 	waitbgfadeout
-	createvisualtask sub_815A5C8, 0x5
+	createvisualtask sub_815A5C8, 5
 	waitbgfadein
-	delay 0x6
-	createvisualtask sub_8115A04, 0x2, 1, 2, 8, 0, 10, 0
-	delay 0x0
+	delay 6
+	createvisualtask sub_8115A04, 2, 1, 2, 8, 0, 10, RGB_BLACK
+	delay 0
 	monbgprio_28 ANIM_ATTACKER
-	setalpha 0x808
-	delay 0xA
-	createvisualtask sub_80D51AC, 0x2, 0, 3, 0, 240, 0
-	loopsewithpan SE_W060B, -64, 0xE, 0xA
-	createsprite gUnknown_08596920, 0x2
-	delay 0x6E
-	loopsewithpan SE_W060B, -64, 0x7, 0xA
-	waitforvisualfinish
-	createvisualtask sub_80D52D0, 0x2, 1, -8, 1, 24, 1
+	setalpha 8, 8
+	delay 10
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 240, 0
+	loopsewithpan SE_W060B, -64, 14, 10
+	createsprite gUnknown_08596920, 2
+	delay 110
+	loopsewithpan SE_W060B, -64, 7, 10
+	waitforvisualfinish
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, -8, 1, 24, 1
 	playsewithpan SE_W043, +63
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
-	call AnimScript_82D7CDD
+	call UnsetPsychicBackground
 	end
 
 Move_KNOCK_OFF:
-	loadspritegfx 0x2825
-	loadspritegfx 0x2797
-	createsprite gUnknown_0857FE28, 0x2, 4, 6
-	delay 0x4
+	loadspritegfx ANIM_TAG_277
+	loadspritegfx ANIM_TAG_135
+	createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6
+	delay 4
 	playsewithpan SE_W233, +63
-	createsprite gUnknown_085CE984, 0x82, -16, -16
-	delay 0x8
-	createsprite gUnknown_0859728C, 0x2, 31, 5, 1, 0x7FFF, 10, 0, 0
-	createsprite gUnknown_08597358, 0x83, 0, 0, 1, 2
+	createsprite gUnknown_085CE984, 130, -16, -16
+	delay 8
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0
+	createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2
 	playsewithpan SE_W004, +63
-	createsprite gUnknown_0857FE70, 0x2, 1, -12, 10, 0, 3
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 5
-	delay 0x3
-	createvisualtask sub_80D5484, 0x2, 1, 0, 3, 6, 1
-	delay 0x5
-	createsprite gUnknown_0857FE58, 0x2, 1, 0, 6
-	delay 0xA
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5
+	delay 3
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1
+	delay 5
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6
+	delay 10
 	waitforvisualfinish
 	end
 
 Move_DOOM_DESIRE:
-	createvisualtask sub_8114960, 0x2
-	delay 0x1
+	createvisualtask sub_8114960, 2
+	delay 1
 	monbg ANIM_ATK_PARTNER
-	createvisualtask sub_811489C, 0x5, 1, 0
-	createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, 0
+	createvisualtask sub_811489C, 5, 1, 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB_BLACK
 	waitforvisualfinish
-	setalpha 0x808
+	setalpha 8, 8
 	playsewithpan SE_W060, -64
-	createvisualtask sub_80D6064, 0x5, -4, -4, 15, 0, 1
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1
 	waitforvisualfinish
-	delay 0x14
-	createvisualtask sub_811489C, 0x5, 1, 1
-	createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, 0
+	delay 20
+	createvisualtask sub_811489C, 5, 1, 1
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB_BLACK
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
 	end
 
 Move_SKY_UPPERCUT:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
 	fadetobg BG_SEISMICTOSS_SKUUPPERCUT
 	waitbgfadeout
 	playsewithpan SE_W327, -64
-	createvisualtask sub_810DABC, 0x5, 55
+	createvisualtask sub_810DABC, 5, 55
 	waitbgfadein
-	setalpha 0x80C
-	delay 0x26
-	createsprite gUnknown_0857FE70, 0x2, 0, 28, 0, 0, 5
-	delay 0x4
-	createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 6, 1
+	setalpha 12, 8
+	delay 38
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 28, 0, 0, 5
+	delay 4
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 6, 1
 	playsewithpan SE_W233B, +63
-	createsprite gUnknown_08597358, 0x83, -28, 28, 1, 1
-	delay 0x1
+	createsprite gBasicHitSplatSpriteTemplate, 131, -28, 28, 1, 1
+	delay 1
 	playsewithpan SE_W233B, +63
-	createsprite gUnknown_08597358, 0x83, -15, 8, 1, 1
+	createsprite gBasicHitSplatSpriteTemplate, 131, -15, 8, 1, 1
 	playsewithpan SE_W233B, +63
-	delay 0x1
+	delay 1
 	playsewithpan SE_W233B, +63
-	createsprite gUnknown_08597358, 0x83, -5, -12, 1, 1
-	delay 0x1
+	createsprite gBasicHitSplatSpriteTemplate, 131, -5, -12, 1, 1
+	delay 1
 	playsewithpan SE_W233B, +63
-	createsprite gUnknown_08597358, 0x83, 0, -32, 1, 1
-	delay 0x1
+	createsprite gBasicHitSplatSpriteTemplate, 131, 0, -32, 1, 1
+	delay 1
 	playsewithpan SE_W233B, +63
-	createsprite gUnknown_08597358, 0x83, 5, -52, 1, 1
-	createsprite gUnknown_0857FE70, 0x2, 1, -26, 16, 1, 4
-	delay 0x4
-	createvisualtask sub_80D5484, 0x2, 1, 0, 3, 6, 1
-	delay 0x1E
-	createsprite gUnknown_0857FE58, 0x2, 0, 0, 6
-	delay 0x4
-	createsprite gUnknown_0857FE58, 0x2, 1, 0, 6
+	createsprite gBasicHitSplatSpriteTemplate, 131, 5, -52, 1, 1
+	createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -26, 16, 1, 4
+	delay 4
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1
+	delay 30
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6
+	delay 4
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	restorebg
 	waitbgfadeout
-	setarg 0x7, 0xFFFF
+	setarg 7, -1
 	waitbgfadein
 	end
 
 Move_SECRET_POWER:
-	createvisualtask sub_8117C24, 0x5
-	jumpargeq 0x0, 0x0, Move_NEEDLE_ARM
-	jumpargeq 0x0, 0x1, Move_MAGICAL_LEAF
-	jumpargeq 0x0, 0x2, Move_MUD_SHOT
-	jumpargeq 0x0, 0x3, Move_WATERFALL
-	jumpargeq 0x0, 0x4, Move_SURF
-	jumpargeq 0x0, 0x5, Move_BUBBLE_BEAM
-	jumpargeq 0x0, 0x6, Move_ROCK_THROW
-	jumpargeq 0x0, 0x7, Move_BITE
-	jumpargeq 0x0, 0x8, Move_STRENGTH
+	createvisualtask AnimTask_GetBattleTerrain, 5
+	jumpargeq 0, BATTLE_TERRAIN_GRASS, Move_NEEDLE_ARM
+	jumpargeq 0, BATTLE_TERRAIN_LONG_GRASS, Move_MAGICAL_LEAF
+	jumpargeq 0, BATTLE_TERRAIN_SAND, Move_MUD_SHOT
+	jumpargeq 0, BATTLE_TERRAIN_UNDERWATER, Move_WATERFALL
+	jumpargeq 0, BATTLE_TERRAIN_WATER, Move_SURF
+	jumpargeq 0, BATTLE_TERRAIN_POND, Move_BUBBLE_BEAM
+	jumpargeq 0, BATTLE_TERRAIN_MOUNTAIN, Move_ROCK_THROW
+	jumpargeq 0, BATTLE_TERRAIN_CAVE, Move_BITE
+	jumpargeq 0, BATTLE_TERRAIN_BUILDING, Move_STRENGTH
 	goto Move_SLAM
 
 Move_TWISTER:
-	loadspritegfx 0x274F
-	loadspritegfx 0x2797
-	loadspritegfx 0x274A
+	loadspritegfx ANIM_TAG_063
+	loadspritegfx ANIM_TAG_135
+	loadspritegfx ANIM_TAG_058
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
 	playsewithpan SE_W239, +63
-	createsprite gUnknown_085923A8, 0x82, 120, 70, 5, 70, 30
-	delay 0x1
-	createsprite gUnknown_085923A8, 0x82, 115, 55, 6, 60, 25
-	delay 0x1
-	createsprite gUnknown_085923A8, 0x82, 115, 60, 7, 60, 30
-	createsprite gUnknown_085923A8, 0x82, 115, 55, 10, 60, 30
-	delay 0x3
-	createsprite gUnknown_08596CC8, 0x82, 100, 50, 4, 50, 26
-	delay 0x1
-	createsprite gUnknown_085923A8, 0x82, 105, 25, 8, 60, 20
-	delay 0x1
-	createsprite gUnknown_085923A8, 0x82, 115, 40, 10, 48, 30
-	delay 0x3
-	createsprite gUnknown_08596CC8, 0x82, 120, 30, 6, 45, 25
-	createsprite gUnknown_085923A8, 0x82, 115, 35, 10, 60, 30
-	delay 0x3
-	createsprite gUnknown_08596CC8, 0x82, 105, 20, 8, 40, 0
-	delay 0x3
-	createsprite gUnknown_085923A8, 0x82, 20, 255, 15, 32, 0
-	createsprite gUnknown_085923A8, 0x82, 110, 10, 8, 32, 20
-	waitforvisualfinish
-	createsprite gUnknown_08597358, 0x83, -32, -16, 1, 3
+	createsprite gUnknown_085923A8, 130, 120, 70, 5, 70, 30
+	delay 1
+	createsprite gUnknown_085923A8, 130, 115, 55, 6, 60, 25
+	delay 1
+	createsprite gUnknown_085923A8, 130, 115, 60, 7, 60, 30
+	createsprite gUnknown_085923A8, 130, 115, 55, 10, 60, 30
+	delay 3
+	createsprite gUnknown_08596CC8, 130, 100, 50, 4, 50, 26
+	delay 1
+	createsprite gUnknown_085923A8, 130, 105, 25, 8, 60, 20
+	delay 1
+	createsprite gUnknown_085923A8, 130, 115, 40, 10, 48, 30
+	delay 3
+	createsprite gUnknown_08596CC8, 130, 120, 30, 6, 45, 25
+	createsprite gUnknown_085923A8, 130, 115, 35, 10, 60, 30
+	delay 3
+	createsprite gUnknown_08596CC8, 130, 105, 20, 8, 40, 0
+	delay 3
+	createsprite gUnknown_085923A8, 130, 20, 255, 15, 32, 0
+	createsprite gUnknown_085923A8, 130, 110, 10, 8, 32, 20
+	waitforvisualfinish
+	createsprite gBasicHitSplatSpriteTemplate, 131, -32, -16, 1, 3
 	playsewithpan SE_W004, +63
-	createvisualtask sub_80D5484, 0x2, 1, 3, 0, 12, 1
-	createvisualtask sub_80D5484, 0x2, 3, 3, 0, 12, 1
-	delay 0x4
-	createsprite gUnknown_085973A0, 0x83, 1, 3
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1
+	delay 4
+	createsprite gUnknown_085973A0, 131, 1, 3
 	playsewithpan SE_W004, +63
-	delay 0x4
-	createsprite gUnknown_085973A0, 0x83, 1, 3
+	delay 4
+	createsprite gUnknown_085973A0, 131, 1, 3
 	playsewithpan SE_W004, +63
-	delay 0x4
-	createsprite gUnknown_08597358, 0x83, 32, 20, 1, 3
+	delay 4
+	createsprite gBasicHitSplatSpriteTemplate, 131, 32, 20, 1, 3
 	playsewithpan SE_W004, +63
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -9840,1098 +9689,1059 @@ Move_TWISTER:
 	end
 
 Move_MAGICAL_LEAF:
-	loadspritegfx 0x274F
-	loadspritegfx 0x27B0
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_063
+	loadspritegfx ANIM_TAG_160
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	delay 0x1
-	loopsewithpan SE_W077, -64, 0xA, 0x5
-	createvisualtask sub_81007C4, 0x5
-	createsprite gUnknown_08592390, 0x2, -3, -2, 10
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, -1, -1, 15
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, -4, -4, 7
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, 3, -3, 11
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, -1, -6, 8
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, 2, -1, 12
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, -3, -4, 13
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, 4, -5, 7
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, 2, -6, 11
-	delay 0x2
-	createsprite gUnknown_08592390, 0x2, -3, -5, 8
-	delay 0x3C
+	setalpha 12, 8
+	delay 1
+	loopsewithpan SE_W077, -64, 10, 5
+	createvisualtask sub_81007C4, 5
+	createsprite gUnknown_08592390, 2, -3, -2, 10
+	delay 2
+	createsprite gUnknown_08592390, 2, -1, -1, 15
+	delay 2
+	createsprite gUnknown_08592390, 2, -4, -4, 7
+	delay 2
+	createsprite gUnknown_08592390, 2, 3, -3, 11
+	delay 2
+	createsprite gUnknown_08592390, 2, -1, -6, 8
+	delay 2
+	createsprite gUnknown_08592390, 2, 2, -1, 12
+	delay 2
+	createsprite gUnknown_08592390, 2, -3, -4, 13
+	delay 2
+	createsprite gUnknown_08592390, 2, 4, -5, 7
+	delay 2
+	createsprite gUnknown_08592390, 2, 2, -6, 11
+	delay 2
+	createsprite gUnknown_08592390, 2, -3, -5, 8
+	delay 60
 	playsewithpan SE_W013B, -64
-	createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 32, 20, 0
-	createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 32, -20, 0
-	delay 0x1E
+	createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 32, 20, 0
+	createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 32, -20, 0
+	delay 30
 	playsewithpan SE_W013, +63
-	createsprite gUnknown_08597358, 0x84, -10, -4, 1, 2
-	createsprite gUnknown_08597358, 0x84, 10, 4, 1, 2
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1
-	delay 0x14
-	setarg 0x7, 0xFFFF
+	createsprite gBasicHitSplatSpriteTemplate, 132, -10, -4, 1, 2
+	createsprite gBasicHitSplatSpriteTemplate, 132, 10, 4, 1, 2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
+	delay 20
+	setarg 7, -1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
 Move_ICE_BALL:
-	loadspritegfx 0x273B
-	loadspritegfx 0x279D
-	createvisualtask sub_810CDFC, 0x5, 0
-	jumpargeq 0x0, 0x4, AnimScript_82D731B
-
-AnimScript_82D72BB:
+	loadspritegfx ANIM_TAG_ICE_CHUNK
+	loadspritegfx ANIM_TAG_141
+	createvisualtask AnimTask_GetRolloutCounter, 5, 0
+	jumpargeq 0, 4, IceBallSetIceBg
+IceBallContinue:
 	playsewithpan SE_W196, -64
-	createsprite gUnknown_08595DE4, 0x82, 15, 0, -12, -16, 30, -40
-	delay 0x1C
+	createsprite gUnknown_08595DE4, 130, 15, 0, -12, -16, 30, -40
+	delay 28
 	playsewithpan SE_W280, +63
-	createvisualtask sub_810CDFC, 0x5, 0
-	jumpargeq 0x0, 0x0, AnimScript_82D732C
-	jumpargeq 0x0, 0x1, AnimScript_82D735B
-	jumpargeq 0x0, 0x2, AnimScript_82D7394
-	jumpargeq 0x0, 0x3, AnimScript_82D73D7
-	jumpargeq 0x0, 0x4, AnimScript_82D741F
-
-AnimScript_82D7309:
-	createvisualtask sub_810CDFC, 0x5, 0
-	jumpargeq 0x0, 0x4, AnimScript_82D7322
-
-AnimScript_82D731A:
-	end
-
-AnimScript_82D731B:
+	createvisualtask AnimTask_GetRolloutCounter, 5, 0
+	jumpargeq 0, 0, IceBallWeakest
+	jumpargeq 0, 1, IceBallWeak
+	jumpargeq 0, 2, IceBallMediun
+	jumpargeq 0, 3, IceBallStrong
+	jumpargeq 0, 4, IceBallStrongest
+IceBallContinue2:
+	createvisualtask AnimTask_GetRolloutCounter, 5, 0
+	jumpargeq 0, 4, IceBallUnsetIceBg
+IceBallEnd:
+	end
+IceBallSetIceBg:
 	fadetobg BG_ICE
-	goto AnimScript_82D72BB
-
-AnimScript_82D7322:
+	goto IceBallContinue
+IceBallUnsetIceBg:
 	waitbgfadein
-	delay 0x2D
+	delay 45
 	restorebg
 	waitbgfadein
-	goto AnimScript_82D731A
-
-AnimScript_82D732C:
-	createvisualtask sub_80D6388, 0x2, 0, 1, 8, 1, 0
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	goto AnimScript_82D7309
-
-AnimScript_82D735B:
-	createvisualtask sub_80D6388, 0x2, 0, 1, 10, 1, 0
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	goto AnimScript_82D7309
-
-AnimScript_82D7394:
-	createvisualtask sub_80D6388, 0x2, 0, 1, 14, 1, 0
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	goto AnimScript_82D7309
-
-AnimScript_82D73D7:
-	createvisualtask sub_80D6388, 0x2, 0, 1, 18, 1, 0
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	goto AnimScript_82D7309
-
-AnimScript_82D741F:
-	createvisualtask sub_80D6388, 0x2, 0, 1, 30, 1, 0
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	call AnimScript_82D7467
-	goto AnimScript_82D7309
-
-AnimScript_82D7467:
-	createsprite gUnknown_08595DFC, 0x84, -12, -16
+	goto IceBallEnd
+IceBallWeakest:
+	createvisualtask sub_80D6388, 2, 0, 1, 8, 1, 0
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	goto IceBallContinue2
+IceBallWeak:
+	createvisualtask sub_80D6388, 2, 0, 1, 10, 1, 0
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	goto IceBallContinue2
+IceBallMediun:
+	createvisualtask sub_80D6388, 2, 0, 1, 14, 1, 0
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	goto IceBallContinue2
+IceBallStrong:
+	createvisualtask sub_80D6388, 2, 0, 1, 18, 1, 0
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	goto IceBallContinue2
+IceBallStrongest:
+	createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	call IceBall1
+	goto IceBallContinue2
+IceBall1:
+	createsprite gUnknown_08595DFC, 132, -12, -16
 	return
 
 Move_WEATHER_BALL:
-	loadspritegfx 0x282B
-	createsprite gUnknown_0857FE40, 0x2, 8, 1, 0
-	delay 0x8
+	loadspritegfx ANIM_TAG_283
+	createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER
+	delay 8
 	playsewithpan SE_W207, -64
-	createsprite gUnknown_0853EE38, 0x2
+	createsprite gUnknown_0853EE38, 2
 	waitforvisualfinish
-	delay 0xF
+	delay 15
 	playsewithpan SE_W197, 0
-	createsprite gUnknown_0859728C, 0x2, 31, 5, 1, 0x7FFF, 10, 0, 0
-	waitforvisualfinish
-	createvisualtask sub_81604F0, 0x2
-	delay 0x1
-	jumpargeq 0x7, 0x0, AnimScript_82D74DE
-	jumpargeq 0x7, 0x1, AnimScript_82D751B
-	jumpargeq 0x7, 0x2, AnimScript_82D757F
-	jumpargeq 0x7, 0x3, AnimScript_82D75E3
-	jumpargeq 0x7, 0x4, AnimScript_82D7683
-
-AnimScript_82D74DE:
-	loadspritegfx 0x2797
-	createsprite gUnknown_0853EE50, 0x82, -30, -100, 25, 1, 0, 0
+	createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0
+	waitforvisualfinish
+	createvisualtask AnimTask_GetWeather, 2
+	delay 1
+	jumpreteq ANIM_WEATHER_NONE, WeatherBallNormal
+	jumpreteq ANIM_WEATHER_SUN, WeatherBallFire
+	jumpreteq ANIM_WEATHER_RAIN, WeatherBallWater
+	jumpreteq ANIM_WEATHER_SANDSTORM, WeatherBallSandstorm
+	jumpreteq ANIM_WEATHER_HAIL, WeatherBallIce
+WeatherBallNormal:
+	loadspritegfx ANIM_TAG_135
+	createsprite gUnknown_0853EE50, 130, -30, -100, 25, 1, 0, 0
 	waitforvisualfinish
 	playsewithpan SE_W025B, +63
-	createsprite gUnknown_08597358, 0x84, -10, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 8, 1
+	createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1
 	waitforvisualfinish
 	end
-
-AnimScript_82D751B:
-	loadspritegfx 0x272D
-	createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, 40, 10
+WeatherBallFire:
+	loadspritegfx ANIM_TAG_SMALL_EMBER
+	createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 40, 10
 	playsewithpan SE_W172, +63
-	delay 0xA
-	createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, -40, 20
+	delay 10
+	createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, -40, 20
 	playsewithpan SE_W172, +63
-	delay 0xA
-	createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, 0, 0
+	delay 10
+	createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 0, 0
 	playsewithpan SE_W172, +63
 	waitforvisualfinish
 	playsewithpan SE_W172B, +63
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 8, 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1
 	waitforvisualfinish
 	end
-
-AnimScript_82D757F:
-	loadspritegfx 0x27AB
-	createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, 50, 10
+WeatherBallWater:
+	loadspritegfx ANIM_TAG_155
+	createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 50, 10
 	playsewithpan SE_W152, +63
-	delay 0x8
-	createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, -20, 20
+	delay 8
+	createsprite gUnknown_08595328, 130, -30, -100, 25, 1, -20, 20
 	playsewithpan SE_W152, +63
-	delay 0xD
-	createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, 0, 0
+	delay 13
+	createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 0, 0
 	playsewithpan SE_W152, +63
 	waitforvisualfinish
-	createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 8, 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1
 	playsewithpan SE_W202, +63
 	waitforvisualfinish
 	end
-
-AnimScript_82D75E3:
-	loadspritegfx 0x274A
-	createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, 30, 0
+WeatherBallSandstorm:
+	loadspritegfx ANIM_TAG_058
+	createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 30, 0
 	playsewithpan SE_W088, +63
-	delay 0x5
-	createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, -40, 20
+	delay 5
+	createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, -40, 20
 	playsewithpan SE_W088, +63
-	delay 0xE
-	createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, 0, 0
+	delay 14
+	createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 0, 0
 	playsewithpan SE_W088, +63
 	waitforvisualfinish
 	playsewithpan SE_W070, +63
-	createsprite gUnknown_08596CB0, 0x82, -12, 27, 2, 3
-	createsprite gUnknown_08596CB0, 0x82, 8, 28, 3, 4
-	createsprite gUnknown_08596CB0, 0x82, -4, 30, 2, 3
-	createsprite gUnknown_08596CB0, 0x82, 12, 25, 4, 4
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1
+	createsprite gUnknown_08596CB0, 130, -12, 27, 2, 3
+	createsprite gUnknown_08596CB0, 130, 8, 28, 3, 4
+	createsprite gUnknown_08596CB0, 130, -4, 30, 2, 3
+	createsprite gUnknown_08596CB0, 130, 12, 25, 4, 4
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
 	waitforvisualfinish
 	end
-
-AnimScript_82D7683:
-	loadspritegfx 0x2817
-	loadspritegfx 0x279D
-	createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, -40, 20
+WeatherBallIce:
+	loadspritegfx ANIM_TAG_263
+	loadspritegfx ANIM_TAG_141
+	createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, -40, 20
 	playsewithpan SE_W258, +63
-	delay 0xA
-	createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, 40, 0
+	delay 10
+	createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, 40, 0
 	playsewithpan SE_W258, +63
-	delay 0xA
-	createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, 0, 0
+	delay 10
+	createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, 0, 0
 	playsewithpan SE_W258, +63
 	waitforvisualfinish
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
 	playsewithpan SE_W196, +63
-	call AnimScript_82D7720
+	call FreezeEffect1
 	waitforvisualfinish
 	end
 
 Move_COUNT:
-	loadspritegfx 0x2797
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W003, +63
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
-AnimScript_82D7720:
-	createsprite gUnknown_08595B68, 0x82, -10, -10, 0
+FreezeEffect1:
+	createsprite gUnknown_08595B68, 130, -10, -10, 0
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B80, 0x82, 10, 20, 0
+	delay 4
+	createsprite gUnknown_08595B80, 130, 10, 20, 0
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B68, 0x82, -5, 10, 0
+	delay 4
+	createsprite gUnknown_08595B68, 130, -5, 10, 0
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B80, 0x82, 17, -12, 0
+	delay 4
+	createsprite gUnknown_08595B80, 130, 17, -12, 0
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B80, 0x82, -15, 15, 0
+	delay 4
+	createsprite gUnknown_08595B80, 130, -15, 15, 0
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B80, 0x82, 0, 0, 0
+	delay 4
+	createsprite gUnknown_08595B80, 130, 0, 0, 0
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B68, 0x82, 20, 2, 0
+	delay 4
+	createsprite gUnknown_08595B68, 130, 20, 2, 0
 	playsewithpan SE_W196, +63
 	return
 
-AnimScript_82D77A4:
-	createsprite gUnknown_08595B68, 0x82, -10, -10, 1
+FreezeEffect2:
+	createsprite gUnknown_08595B68, 130, -10, -10, 1
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B80, 0x82, 10, 20, 1
+	delay 4
+	createsprite gUnknown_08595B80, 130, 10, 20, 1
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B68, 0x82, -29, 0, 1
+	delay 4
+	createsprite gUnknown_08595B68, 130, -29, 0, 1
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B80, 0x82, 29, -20, 1
+	delay 4
+	createsprite gUnknown_08595B80, 130, 29, -20, 1
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B68, 0x82, -5, 10, 1
+	delay 4
+	createsprite gUnknown_08595B68, 130, -5, 10, 1
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B80, 0x82, 17, -12, 1
+	delay 4
+	createsprite gUnknown_08595B80, 130, 17, -12, 1
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B68, 0x82, -20, 0, 1
+	delay 4
+	createsprite gUnknown_08595B68, 130, -20, 0, 1
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B80, 0x82, -15, 15, 1
+	delay 4
+	createsprite gUnknown_08595B80, 130, -15, 15, 1
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B80, 0x82, 26, -5, 1
+	delay 4
+	createsprite gUnknown_08595B80, 130, 26, -5, 1
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B80, 0x82, 0, 0, 1
+	delay 4
+	createsprite gUnknown_08595B80, 130, 0, 0, 1
 	playsewithpan SE_W196, +63
-	delay 0x4
-	createsprite gUnknown_08595B68, 0x82, 20, 2, 1
+	delay 4
+	createsprite gUnknown_08595B68, 130, 20, 2, 1
 	playsewithpan SE_W196, +63
 	return
 
-AnimScript_82D7874:
-	loopsewithpan SE_W196, +63, 0x6, 0x4
-	createsprite gUnknown_08595C04, 0x82, 0, 24, 0
-	delay 0x4
-	createsprite gUnknown_08595C04, 0x82, 8, 24, 0
-	createsprite gUnknown_08595C04, 0x82, -8, 24, 0
-	delay 0x4
-	createsprite gUnknown_08595C04, 0x82, 16, 24, 0
-	createsprite gUnknown_08595C04, 0x82, -16, 24, 0
-	delay 0x4
-	createsprite gUnknown_08595C04, 0x82, 24, 24, 0
-	createsprite gUnknown_08595C04, 0x82, -24, 24, 0
-	delay 0x4
-	createsprite gUnknown_08595C04, 0x82, 32, 24, 0
-	createsprite gUnknown_08595C04, 0x82, -32, 24, 0
+IcyWindEffect1: @ Unused
+	loopsewithpan SE_W196, +63, 6, 4
+	createsprite gUnknown_08595C04, 130, 0, 24, 0
+	delay 4
+	createsprite gUnknown_08595C04, 130, 8, 24, 0
+	createsprite gUnknown_08595C04, 130, -8, 24, 0
+	delay 4
+	createsprite gUnknown_08595C04, 130, 16, 24, 0
+	createsprite gUnknown_08595C04, 130, -16, 24, 0
+	delay 4
+	createsprite gUnknown_08595C04, 130, 24, 24, 0
+	createsprite gUnknown_08595C04, 130, -24, 24, 0
+	delay 4
+	createsprite gUnknown_08595C04, 130, 32, 24, 0
+	createsprite gUnknown_08595C04, 130, -32, 24, 0
 	return
 
-AnimScript_82D78F8:
-	loopsewithpan SE_W196, +63, 0x6, 0x4
-	createsprite gUnknown_08595C04, 0x82, 0, 24, 1
-	delay 0x4
-	createsprite gUnknown_08595C04, 0x82, 8, 24, 1
-	createsprite gUnknown_08595C04, 0x82, -8, 24, 1
-	delay 0x4
-	createsprite gUnknown_08595C04, 0x82, 16, 24, 1
-	createsprite gUnknown_08595C04, 0x82, -16, 24, 1
-	delay 0x4
-	createsprite gUnknown_08595C04, 0x82, 24, 24, 1
-	createsprite gUnknown_08595C04, 0x82, -24, 24, 1
-	delay 0x4
-	createsprite gUnknown_08595C04, 0x82, 32, 24, 1
-	createsprite gUnknown_08595C04, 0x82, -32, 24, 1
-	delay 0x4
-	createsprite gUnknown_08595C04, 0x82, 40, 24, 1
-	createsprite gUnknown_08595C04, 0x82, -40, 24, 1
-	delay 0x4
-	createsprite gUnknown_08595C04, 0x82, 48, 24, 1
-	createsprite gUnknown_08595C04, 0x82, -48, 24, 1
+IcyWindEffect2:
+	loopsewithpan SE_W196, +63, 6, 4
+	createsprite gUnknown_08595C04, 130, 0, 24, 1
+	delay 4
+	createsprite gUnknown_08595C04, 130, 8, 24, 1
+	createsprite gUnknown_08595C04, 130, -8, 24, 1
+	delay 4
+	createsprite gUnknown_08595C04, 130, 16, 24, 1
+	createsprite gUnknown_08595C04, 130, -16, 24, 1
+	delay 4
+	createsprite gUnknown_08595C04, 130, 24, 24, 1
+	createsprite gUnknown_08595C04, 130, -24, 24, 1
+	delay 4
+	createsprite gUnknown_08595C04, 130, 32, 24, 1
+	createsprite gUnknown_08595C04, 130, -32, 24, 1
+	delay 4
+	createsprite gUnknown_08595C04, 130, 40, 24, 1
+	createsprite gUnknown_08595C04, 130, -40, 24, 1
+	delay 4
+	createsprite gUnknown_08595C04, 130, 48, 24, 1
+	createsprite gUnknown_08595C04, 130, -48, 24, 1
 	return
 
-AnimScript_82D79B4:
-	createsprite gUnknown_08592B7C, 0x2, -15, 0, 0, 0, 32, 60
-	delay 0x8
-	createsprite gUnknown_08592B7C, 0x2, 12, -5, 0, 0, 32, 60
-	delay 0x8
+GrantingStarsEffect:
+	createsprite gUnknown_08592B7C, 2, -15, 0, 0, 0, 32, 60
+	delay 8
+	createsprite gUnknown_08592B7C, 2, 12, -5, 0, 0, 32, 60
+	delay 8
 	return
 
-AnimScript_82D79DF:
+HealingEffect:
 	playsewithpan SE_W071B, -64
-	createsprite gUnknown_08592F2C, 0x2, 0, -5, 0, 0
-	delay 0x7
-	createsprite gUnknown_08592F2C, 0x2, -15, 10, 0, 0
-	delay 0x7
-	createsprite gUnknown_08592F2C, 0x2, -15, -15, 0, 0
-	delay 0x7
-	createsprite gUnknown_08592F2C, 0x2, 10, -5, 0, 0
-	delay 0x7
+	createsprite gUnknown_08592F2C, 2, 0, -5, 0, 0
+	delay 7
+	createsprite gUnknown_08592F2C, 2, -15, 10, 0, 0
+	delay 7
+	createsprite gUnknown_08592F2C, 2, -15, -15, 0, 0
+	delay 7
+	createsprite gUnknown_08592F2C, 2, 10, -5, 0, 0
+	delay 7
 	return
 
-AnimScript_82D7A28:
+HealingEffect2:
 	playsewithpan SE_W071B, +63
-	createsprite gUnknown_08592F2C, 0x82, 0, -5, 1, 0
-	delay 0x7
-	createsprite gUnknown_08592F2C, 0x82, -15, 10, 1, 0
-	delay 0x7
-	createsprite gUnknown_08592F2C, 0x82, -15, -15, 1, 0
-	delay 0x7
-	createsprite gUnknown_08592F2C, 0x82, 10, -5, 1, 0
-	delay 0x7
+	createsprite gUnknown_08592F2C, 130, 0, -5, 1, 0
+	delay 7
+	createsprite gUnknown_08592F2C, 130, -15, 10, 1, 0
+	delay 7
+	createsprite gUnknown_08592F2C, 130, -15, -15, 1, 0
+	delay 7
+	createsprite gUnknown_08592F2C, 130, 10, -5, 1, 0
+	delay 7
 	return
 
-AnimScript_82D7A71:
-	createsprite gUnknown_08596240, 0x82, 10, 10, 0
+PoisonBubblesEffect:
+	createsprite gPoisonBubbleSpriteTemplate, 130, 10, 10, 0
 	playsewithpan SE_W092, +63
-	delay 0x6
-	createsprite gUnknown_08596240, 0x82, 20, -20, 0
+	delay 6
+	createsprite gPoisonBubbleSpriteTemplate, 130, 20, -20, 0
 	playsewithpan SE_W092, +63
-	delay 0x6
-	createsprite gUnknown_08596240, 0x82, -20, 15, 0
+	delay 6
+	createsprite gPoisonBubbleSpriteTemplate, 130, -20, 15, 0
 	playsewithpan SE_W092, +63
-	delay 0x6
-	createsprite gUnknown_08596240, 0x82, 0, 0, 0
+	delay 6
+	createsprite gPoisonBubbleSpriteTemplate, 130, 0, 0, 0
 	playsewithpan SE_W092, +63
-	delay 0x6
-	createsprite gUnknown_08596240, 0x82, -20, -20, 0
+	delay 6
+	createsprite gPoisonBubbleSpriteTemplate, 130, -20, -20, 0
 	playsewithpan SE_W092, +63
-	delay 0x6
-	createsprite gUnknown_08596240, 0x82, 16, -8, 0
+	delay 6
+	createsprite gPoisonBubbleSpriteTemplate, 130, 16, -8, 0
 	playsewithpan SE_W092, +63
 	return
 
-AnimScript_82D7AE2:
-	createsprite gUnknown_08596258, 0x2, 10, 10, 0
+WaterBubbleEffect:
+	createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 0
 	playsewithpan SE_W145C, +63
-	delay 0x6
-	createsprite gUnknown_08596258, 0x2, 20, -20, 0
+	delay 6
+	createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 0
 	playsewithpan SE_W145C, +63
-	delay 0x6
-	createsprite gUnknown_08596258, 0x2, -20, 15, 0
+	delay 6
+	createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 0
 	playsewithpan SE_W145C, +63
-	delay 0x6
-	createsprite gUnknown_08596258, 0x2, 0, 0, 0
+	delay 6
+	createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 0
 	playsewithpan SE_W145C, +63
-	delay 0x6
-	createsprite gUnknown_08596258, 0x2, -20, -20, 0
+	delay 6
+	createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 0
 	playsewithpan SE_W145C, +63
-	delay 0x6
-	createsprite gUnknown_08596258, 0x2, 16, -8, 0
+	delay 6
+	createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 0
 	playsewithpan SE_W145C, +63
 	return
 
-AnimScript_82D7B53:
-	createsprite gUnknown_08596258, 0x2, 10, 10, 1
+WaterBubbleEffect2:
+	createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 1
 	playsewithpan SE_W145C, +63
-	delay 0x6
-	createsprite gUnknown_08596258, 0x2, -28, -10, 1
+	delay 6
+	createsprite gWaterBubbleSpriteTemplate, 2, -28, -10, 1
 	playsewithpan SE_W145C, +63
-	delay 0x6
-	createsprite gUnknown_08596258, 0x2, 20, -20, 1
+	delay 6
+	createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 1
 	playsewithpan SE_W145C, +63
-	delay 0x6
-	createsprite gUnknown_08596258, 0x2, -20, 15, 1
+	delay 6
+	createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 1
 	playsewithpan SE_W145C, +63
-	delay 0x6
-	createsprite gUnknown_08596258, 0x2, 0, 0, 1
+	delay 6
+	createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 1
 	playsewithpan SE_W145C, +63
-	delay 0x6
-	createsprite gUnknown_08596258, 0x2, 27, 8, 1
+	delay 6
+	createsprite gWaterBubbleSpriteTemplate, 2, 27, 8, 1
 	playsewithpan SE_W145C, +63
-	delay 0x6
-	createsprite gUnknown_08596258, 0x2, -20, -20, 1
+	delay 6
+	createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 1
 	playsewithpan SE_W145C, +63
-	delay 0x6
-	createsprite gUnknown_08596258, 0x2, 16, -8, 1
+	delay 6
+	createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 1
 	playsewithpan SE_W145C, +63
 	return
 
-AnimScript_82D7BEA:
+ElectricityEffect:
 	playsewithpan SE_W085B, +63
-	createsprite gUnknown_08595810, 0x82, 5, 0, 5, 0
-	delay 0x2
-	createsprite gUnknown_08595810, 0x82, -5, 10, 5, 1
-	delay 0x2
-	createsprite gUnknown_08595810, 0x82, 15, 20, 5, 2
-	delay 0x2
-	createsprite gUnknown_08595810, 0x82, -15, -10, 5, 0
-	delay 0x2
-	createsprite gUnknown_08595810, 0x82, 25, 0, 5, 1
-	delay 0x2
-	createsprite gUnknown_08595810, 0x82, -8, 8, 5, 2
-	delay 0x2
-	createsprite gUnknown_08595810, 0x82, 2, -8, 5, 0
-	delay 0x2
-	createsprite gUnknown_08595810, 0x82, -20, 15, 5, 1
+	createsprite gElectricitySpriteTemplate, 130, 5, 0, 5, 0
+	delay 2
+	createsprite gElectricitySpriteTemplate, 130, -5, 10, 5, 1
+	delay 2
+	createsprite gElectricitySpriteTemplate, 130, 15, 20, 5, 2
+	delay 2
+	createsprite gElectricitySpriteTemplate, 130, -15, -10, 5, 0
+	delay 2
+	createsprite gElectricitySpriteTemplate, 130, 25, 0, 5, 1
+	delay 2
+	createsprite gElectricitySpriteTemplate, 130, -8, 8, 5, 2
+	delay 2
+	createsprite gElectricitySpriteTemplate, 130, 2, -8, 5, 0
+	delay 2
+	createsprite gElectricitySpriteTemplate, 130, -20, 15, 5, 1
 	return
 
-AnimScript_82D7C75:
-	loopsewithpan SE_W146, +63, 0xD, 0x6
-	createsprite gUnknown_0859725C, 0x82, 0, -15, 0, 3, 90
-	createsprite gUnknown_0859725C, 0x82, 0, -15, 51, 3, 90
-	createsprite gUnknown_0859725C, 0x82, 0, -15, 102, 3, 90
-	createsprite gUnknown_0859725C, 0x82, 0, -15, 153, 3, 90
-	createsprite gUnknown_0859725C, 0x82, 0, -15, 204, 3, 90
+ConfusionEffect:
+	loopsewithpan SE_W146, +63, 13, 6
+	createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 0, 3, 90
+	createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 51, 3, 90
+	createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 102, 3, 90
+	createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 153, 3, 90
+	createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 204, 3, 90
 	return
 
-AnimScript_82D7CD1:
+SetPsychicBackground:
 	fadetobg BG_PSYCHIC
 	waitbgfadeout
-	createvisualtask sub_815A504, 0x5
+	createvisualtask sub_815A504, 5
 	waitbgfadein
 	return
 
-AnimScript_82D7CDD:
+UnsetPsychicBackground:
 	restorebg
 	waitbgfadeout
-	setarg 0x7, 0xFFFF
+	setarg 7, -1
 	waitbgfadein
 	return
 
-AnimScript_82D7CE5:
-	jumpifcontest AnimScript_82D7CFE
+SetFlyingBg:
+	jumpifcontest SetBgFlyingContest
 	fadetobg BG_FLYING
 	waitbgfadeout
-	createvisualtask sub_8117660, 0x5, -2304, 768, 1, -1
-
-AnimScript_82D7CFC:
+	createvisualtask sub_8117660, 5, -2304, 768, 1, -1
+SetBgFlyingContinue:
 	waitbgfadein
 	return
-
-AnimScript_82D7CFE:
+SetBgFlyingContest:
 	fadetobg BG_FLYING_CONTESTS
 	waitbgfadeout
-	createvisualtask sub_8117660, 0x5, 2304, 768, 0, -1
-	goto AnimScript_82D7CFC
+	createvisualtask sub_8117660, 5, 2304, 768, 0, -1
+	goto SetBgFlyingContinue
 
-AnimScript_82D7D15:
+UnsetFlyingBg:
 	restorebg
 	waitbgfadeout
-	setarg 0x7, 0xFFFF
+	setarg 7, -1
 	waitbgfadein
 	return
 
-AnimScript_82D7D1D:
-	createvisualtask sub_8117E60, 0x2
-	jumpargeq 0x7, 0x1, AnimScript_82D7D42
-	createvisualtask sub_815A8C8, 0x2
-	jumpargeq 0x7, 0x0, AnimScript_82D7D50
-	goto AnimScript_82D7D49
-
-AnimScript_82D7D40:
+SetSolarbeamBg:
+	createvisualtask AnimTask_IsContest, 2
+	jumprettrue SetSolarbeamBgContest
+	createvisualtask AnimTask_IsTargetPlayerSide, 2
+	jumpretfalse SetSolarbeamBgOpponent
+	goto SetSolarbeamBgPlayer
+SetSolarbeamBgContinue:
 	waitbgfadein
 	return
-
-AnimScript_82D7D42:
+SetSolarbeamBgContest:
 	fadetobg BG_SOLARBEAM_CONTESTS
-	goto AnimScript_82D7D40
-
-AnimScript_82D7D49:
+	goto SetSolarbeamBgContinue
+SetSolarbeamBgPlayer:
 	fadetobg BG_SOLARBEAM_PLAYER
-	goto AnimScript_82D7D40
-
-AnimScript_82D7D50:
+	goto SetSolarbeamBgContinue
+SetSolarbeamBgOpponent:
 	fadetobg BG_SOLARBEAM_OPPONENT
-	goto AnimScript_82D7D40
+	goto SetSolarbeamBgContinue
 
-AnimScript_82D7D57:
+UnsetSolarbeamBg:
 	restorebg
 	waitbgfadein
 	return
 
 Status_Poison:
-	loopsewithpan SE_W092, +63, 0xD, 0x6
-	createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 18, 2
-	createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 12, 31774
+	loopsewithpan SE_W092, +63, 13, 6
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 18, 2
+	createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 12, RGB(30, 0, 31)
 	end
 
 Status_Confusion:
-	loadspritegfx 0x2759
-	call AnimScript_82D7C75
+	loadspritegfx ANIM_TAG_DUCK
+	call ConfusionEffect
 	end
 
 Status_Burn:
-	loadspritegfx 0x272D
+	loadspritegfx ANIM_TAG_SMALL_EMBER
 	playsewithpan SE_W172, +63
-	call AnimScript_82D7DA6
-	call AnimScript_82D7DA6
-	call AnimScript_82D7DA6
+	call Burn1
+	call Burn1
+	call Burn1
 	waitforvisualfinish
 	end
-
-AnimScript_82D7DA6:
-	createsprite gUnknown_08595504, 0x82, -24, 24, 24, 24, 20, 1, 1
-	delay 0x4
+Burn1:
+	createsprite gUnknown_08595504, 130, -24, 24, 24, 24, 20, 1, 1
+	delay 4
 	return
 
 Status_Infatuation:
-	loadspritegfx 0x27E2
+	loadspritegfx ANIM_TAG_PURPLE_HEART
 	playsewithpan SE_W204, -64
-	createsprite gUnknown_08593970, 0x3, 0, 20
-	delay 0xF
+	createsprite gUnknown_08593970, 3, 0, 20
+	delay 15
 	playsewithpan SE_W204, -64
-	createsprite gUnknown_08593970, 0x3, -20, 20
-	delay 0xF
+	createsprite gUnknown_08593970, 3, -20, 20
+	delay 15
 	playsewithpan SE_W204, -64
-	createsprite gUnknown_08593970, 0x3, 20, 20
+	createsprite gUnknown_08593970, 3, 20, 20
 	end
 
 Status_Sleep:
-	loadspritegfx 0x27F4
+	loadspritegfx ANIM_TAG_LETTER_Z
 	playsewithpan SE_W173, -64
-	createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0
-	delay 0x1E
-	createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0
+	createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0
+	delay 30
+	createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0
 	end
 
 Status_Paralysis:
-	loadspritegfx 0x271B
-	createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1
-	call AnimScript_82D7BEA
+	loadspritegfx ANIM_TAG_SPARK_2
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1
+	call ElectricityEffect
 	end
 
 Status_Freeze:
 	playsewithpan SE_W196, 0
-	loadspritegfx 0x271A
+	loadspritegfx ANIM_TAG_ICE_CUBE
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	waitplaysewithpan SE_W258, +63, 0x11
-	createvisualtask sub_80A9EF4, 0x2
+	waitplaysewithpan SE_W258, +63, 17
+	createvisualtask sub_80A9EF4, 2
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
 Status_Curse:
-	loadspritegfx 0x27D8
+	loadspritegfx ANIM_TAG_200
 	monbg ANIM_DEF_PARTNER
 	playsewithpan SE_W171, +63
-	createsprite gUnknown_08596DE8, 0x82
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 14, 1
+	createsprite gBattleAnimSpriteTemplate_8596DE8, 130
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
 Status_Nightmare:
-	loadspritegfx 0x27ED
+	loadspritegfx ANIM_TAG_EVIL_ANGEL
 	monbg ANIM_DEF_PARTNER
 	playsewithpan SE_W171, +63
-	createsprite gUnknown_08596E00, 0x82
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 14, 1
+	createsprite gBattleAnimSpriteTemplate_8596E00, 130
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
 
-Anim_CastformTransform:
-	createvisualtask sub_815BB18, 0x2
-	jumpargeq 0x7, 0x1, AnimScript_82D7ECA
+General_CastformChange:
+	createvisualtask sub_815BB18, 2
+	jumpreteq 1, AnimScript_82D7ECA
 	goto AnimScript_82D7EB2
-
 AnimScript_82D7EB2:
 	monbg ANIM_ATTACKER
 	playsewithpan SE_W100, -64
-	waitplaysewithpan SE_W107, -64, 0x30
-	createvisualtask sub_815B7D0, 0x2, 1
+	waitplaysewithpan SE_W107, -64, 48
+	createvisualtask sub_815B7D0, 2, 1
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	end
-
 AnimScript_82D7ECA:
-	createvisualtask sub_815BB58, 0x2, 1
+	createvisualtask sub_815BB58, 2, 1
 	end
 
-Anim_StatChange:
-	createvisualtask AnimTask_StatsChange, 0x5
+General_StatsChange:
+	createvisualtask AnimTask_StatsChange, 5
 	waitforvisualfinish
 	end
 
-Anim_SubsituteOff:
+General_SubstituteFade:
 	monbg ANIM_ATTACKER
-	createvisualtask sub_8172D98, 0x5
-	createvisualtask sub_8116620, 0xA, 2, 0, 0, 16, 0x7FFF
+	createvisualtask sub_8172D98, 5
+	createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE
 	waitforvisualfinish
-	delay 0x1
+	delay 1
 	clearmonbg ANIM_ATTACKER
-	delay 0x2
-	blendoff
-	createvisualtask sub_8116620, 0xA, 2, 0, 0, 0, 0x7FFF
-	createvisualtask sub_8172BF0, 0x2, 1
-	end
-
-Anim_SubsituteOn:
-	createvisualtask sub_815F20C, 0x2
-	end
-
-Anim_Table_4:
-	createvisualtask sub_817345C, 0x2, 0
-	createvisualtask sub_81732B0, 0x2
-	delay 0x0
-	waitplaysewithpan SE_W026, -64, 0x16
-	createsprite gUnknown_085E5338, 0x83, -18, 12, 0, 32
-	delay 0x32
-	loopsewithpan SE_W039, +63, 0x13, 0x2
-	createvisualtask sub_80D5EB8, 0x5, 1, 8, 1536, 2, 1
-	waitforvisualfinish
-	createvisualtask sub_81732E4, 0x2
-	end
-
-Anim_ItemKnockOff:
-	loadspritegfx 0x27F0
-	createsprite gUnknown_08592628, 0x82
-	end
-
-Status_Wrap:
-	createvisualtask sub_81734B4, 0x5
-	jumpargeq 0x0, 0x1, AnimScript_82D7FE9
-	jumpargeq 0x0, 0x2, AnimScript_82D800E
-	jumpargeq 0x0, 0x3, AnimScript_82D8062
-	jumpargeq 0x0, 0x4, AnimScript_82D80BF
-	goto AnimScript_82D7FA1
-
-AnimScript_82D7FA1:
-	loadspritegfx 0x27CA
-	loopsewithpan SE_W010, +63, 0x6, 0x2
-	createsprite gUnknown_08592494, 0x84, 0, 16, 0, 1
-	delay 0x7
-	createsprite gUnknown_08592494, 0x82, 0, 8, 1, 1
-	delay 0x3
-	createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1
-	delay 0x14
-	setarg 0x7, 0xFFFF
+	delay 2
+	blendoff
+	createvisualtask sub_8116620, 10, 2, 0, 0, 0, RGB_WHITE
+	createvisualtask sub_8172BF0, 2, 1
+	end
+
+General_SubstituteAppear:
+	createvisualtask AnimTask_MonToSubstitute, 2
+	end
+
+General_PokeblockThrow:
+	createvisualtask sub_817345C, 2, 0
+	createvisualtask sub_81732B0, 2
+	delay 0
+	waitplaysewithpan SE_W026, -64, 22
+	createsprite gBattleAnimSpriteTemplate_85E5338, 131, -18, 12, 0, 32
+	delay 50
+	loopsewithpan SE_W039, +63, 19, 2
+	createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_TARGET
+	waitforvisualfinish
+	createvisualtask sub_81732E4, 2
+	end
+
+General_ItemKnockoff:
+	loadspritegfx ANIM_TAG_ITEM_BAG
+	createsprite gBattleAnimSpriteTemplate_8592628, 130
+	end
+
+General_TurnTrap:
+	createvisualtask AnimTask_GetTrappedMoveAnimId, 5
+	jumpargeq 0, TRAP_ANIM_FIRE_SPIN, Status_FireSpin
+	jumpargeq 0, TRAP_ANIM_WHIRLPOOL, Status_Whrilpool
+	jumpargeq 0, TRAP_ANIM_CLAMP, Status_Clamp
+	jumpargeq 0, TRAP_ANIM_SAND_TOMB, Status_SandTomb
+	goto Status_BindWrap
+Status_BindWrap:
+	loadspritegfx ANIM_TAG_186
+	loopsewithpan SE_W010, +63, 6, 2
+	createsprite gUnknown_08592494, 132, 0, 16, 0, 1
+	delay 7
+	createsprite gUnknown_08592494, 130, 0, 8, 1, 1
+	delay 3
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
+	delay 20
+	setarg 7, -1
 	playsewithpan SE_W020, +63
 	waitforvisualfinish
 	end
-
-AnimScript_82D7FE9:
-	loadspritegfx 0x272D
+Status_FireSpin:
+	loadspritegfx ANIM_TAG_SMALL_EMBER
 	playsewithpan SE_W221B, +63
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1
-	call AnimScript_82CACBF
-	call AnimScript_82CACBF
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1
+	call FireSpinEffect
+	call FireSpinEffect
 	waitforvisualfinish
 	stopsound
 	end
-
-AnimScript_82D800E:
-	loadspritegfx 0x27A5
+Status_Whrilpool:
+	loadspritegfx ANIM_TAG_149
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	setalpha 0x80C
-	delay 0x0
-	createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23)
+	setalpha 12, 8
+	delay 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(0, 13, 23)
 	playsewithpan SE_W250, +63
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1
-	call AnimScript_82D1F5B
-	call AnimScript_82D1F5B
-	delay 0xC
-	createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(0, 13, 23)
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1
+	call WhirlpoolEffect
+	call WhirlpoolEffect
+	delay 12
+	createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(0, 13, 23)
 	waitforvisualfinish
 	stopsound
 	clearmonbg ANIM_DEF_PARTNER
 	end
-
-AnimScript_82D8062:
-	loadspritegfx 0x27A1
-	loadspritegfx 0x2797
+Status_Clamp:
+	loadspritegfx ANIM_TAG_145
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W011, +63
-	createsprite gUnknown_08597098, 0x2, -32, 0, 2, 819, 0, 10
-	createsprite gUnknown_08597098, 0x2, 32, 0, 6, -819, 0, 10
-	delay 0xA
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 5, 1
+	createsprite gUnknown_08597098, 2, -32, 0, 2, 819, 0, 10
+	createsprite gUnknown_08597098, 2, 32, 0, 6, -819, 0, 10
+	delay 10
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	waitforvisualfinish
 	end
-
-AnimScript_82D80BF:
-	loadspritegfx 0x275A
-	createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0)
-	createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1
+Status_SandTomb:
+	loadspritegfx ANIM_TAG_074
+	createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0)
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1
 	playsewithpan SE_W328, +63
-	call AnimScript_82D51B7
-	call AnimScript_82D51B7
-	delay 0x16
-	createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(19, 17, 0)
+	call SandTombEffect
+	call SandTombEffect
+	delay 22
+	createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(19, 17, 0)
 	waitforvisualfinish
 	stopsound
 	end
 
-Anim_ItemEffect:
-	loadspritegfx 0x27DB
-	loadspritegfx 0x2741
-	delay 0x0
+General_ItemEffect:
+	loadspritegfx ANIM_TAG_203
+	loadspritegfx ANIM_TAG_SPARKLE
+	delay 0
 	playsewithpan SE_W036, -64
-	createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2
+	createvisualtask sub_80D622C, 2, 16, 128, 0, 2
 	waitforvisualfinish
 	playsewithpan SE_W036, -64
-	createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2
+	createvisualtask sub_80D622C, 2, 16, 128, 0, 2
 	waitforvisualfinish
 	playsewithpan SE_W036, -64
-	createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2
+	createvisualtask sub_80D622C, 2, 16, 128, 0, 2
 	waitforvisualfinish
 	playsewithpan SE_W234, -64
-	call AnimScript_82D79B4
+	call GrantingStarsEffect
 	waitforvisualfinish
 	playsewithpan SE_REAPOKE, -64
-	createsprite gUnknown_08597274, 0x2, 2, 3, 7, 0, RGB(17, 31, 25)
-	createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 3, 7, 0, RGB(17, 31, 25)
+	createsprite gUnknown_0859381C, 3, 0, 0, 0, 0
 	waitforvisualfinish
 	end
 
-Anim_SmokeBallEscape:
-	loadspritegfx 0x2802
+General_SmokeballEscape:
+	loadspritegfx ANIM_TAG_242
 	monbg ANIM_ATTACKER
-	setalpha 0x40C
-	delay 0x0
+	setalpha 12, 4
+	delay 0
 	playsewithpan SE_BOWA2, +63
-	createsprite gUnknown_085CE734, 0x80, 0, 32, 28, 30
-	delay 0x4
+	createsprite gUnknown_085CE734, 128, 0, 32, 28, 30
+	delay 4
 	playsewithpan SE_BOWA2, +63
-	createsprite gUnknown_085CE734, 0x7F, 2, 12, 20, 30
-	delay 0xC
+	createsprite gUnknown_085CE734, 127, 2, 12, 20, 30
+	delay 12
 	playsewithpan SE_BOWA2, +63
 	createsprite gUnknown_085CE734, 0x7E, 2, -28, 4, 30
-	delay 0xC
+	delay 12
 	playsewithpan SE_BOWA2, +63
 	createsprite gUnknown_085CE734, 0x7C, 2, 14, -20, 30
-	delay 0x4
+	delay 4
 	playsewithpan SE_BOWA2, +63
-	createvisualtask sub_81136E8, 0x2, 2
+	createvisualtask sub_81136E8, 2, 2
 	createsprite gUnknown_085CE734, 0x7B, 3, 4, 4, 30
-	delay 0xE
+	delay 14
 	playsewithpan SE_BOWA2, +63
 	createsprite gUnknown_085CE734, 0x7A, 3, -14, 18, 46
-	delay 0x0
+	delay 0
 	createsprite gUnknown_085CE734, 0x79, 3, 14, -14, 46
-	delay 0x0
-	createsprite gUnknown_085CE734, 0x78, 3, -12, -10, 46
-	delay 0x0
+	delay 0
+	createsprite gUnknown_085CE734, 120, 3, -12, -10, 46
+	delay 0
 	createsprite gUnknown_085CE734, 0x77, 3, 14, 14, 46
-	delay 0x0
+	delay 0
 	createsprite gUnknown_085CE734, 0x76, 3, 0, 0, 46
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	invisible ANIM_ATTACKER
-	delay 0x0
+	delay 0
 	blendoff
 	end
 
-Anim_HangedOn:
-	createsprite gUnknown_08597274, 0x0, 2, 7, 0, 9, RGB_RED
+General_HangedOn:
+	createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 7, 0, 9, RGB_RED
 	playsewithpan SE_W082, -64
-	createvisualtask sub_815DB90, 0x5, 30, 128, 0, 1, 2, 0, 1
+	createvisualtask sub_815DB90, 5, 30, 128, 0, 1, 2, 0, 1
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x0, 2, 4, 9, 0, RGB_RED
+	createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 4, 9, 0, RGB_RED
 	waitforvisualfinish
-	delay 0x6
-	createsprite gUnknown_0857FE58, 0x0, 0, 0, 15
+	delay 6
+	createsprite gSlideMonToOriginalPosSpriteTemplate, 0, 0, 0, 15
 	end
 
-Anim_Rain:
-	loadspritegfx 0x2783
+General_Rain:
+	loadspritegfx ANIM_TAG_115
 	playsewithpan SE_W240, -64
-	createvisualtask sub_8116620, 0xA, 1921, 2, 0, 4, 0
+	createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK
 	waitforvisualfinish
-	createvisualtask sub_8107188, 0x2, 0, 3, 60
-	createvisualtask sub_8107188, 0x2, 0, 3, 60
-	delay 0x32
+	createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60
+	createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60
+	delay 50
 	waitforvisualfinish
-	createvisualtask sub_8116620, 0xA, 1921, 2, 4, 0, 0
+	createvisualtask sub_8116620, 10, 0x781, 2, 4, 0, RGB_BLACK
 	waitforvisualfinish
 	end
 
-Anim_Sun:
+General_Sun:
 	goto Move_SUNNY_DAY
 
-Anim_Sandstorm:
+General_Sandstorm:
 	goto Move_SANDSTORM
 
-Anim_Hail:
+General_Hail:
 	goto Move_HAIL
 
-Status_LeechSeed:
-	createvisualtask sub_817351C, 0x5
-	delay 0x0
+General_LeechSeedDrain:
+	createvisualtask sub_817351C, 5
+	delay 0
 	goto Move_ABSORB
 
-Anim_Hit:
-	loadspritegfx 0x2797
+General_MonHit:
+	loadspritegfx ANIM_TAG_135
 	monbg ANIM_TARGET
-	setalpha 0x80C
+	setalpha 12, 8
 	playsewithpan SE_W003, +63
-	createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
-	createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1
+	createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
-Anim_ItemSteal:
-	loadspritegfx 0x27F0
-	createvisualtask sub_8117F30, 0x2
-	createvisualtask sub_8172ED0, 0x2
-	delay 0x1
-	createsprite gUnknown_08592670, 0x2, 0, -5, 10, 2, -1
+General_ItemSteal:
+	loadspritegfx ANIM_TAG_ITEM_BAG
+	createvisualtask sub_8117F30, 2
+	createvisualtask sub_8172ED0, 2
+	delay 1
+	createsprite gUnknown_08592670, 2, 0, -5, 10, 2, -1
 	end
 
-Anim_SnatchMove:
-	loadspritegfx 0x27F0
-	createvisualtask sub_8117E94, 0x2
+General_SnatchMove:
+	loadspritegfx ANIM_TAG_ITEM_BAG
+	createvisualtask sub_8117E94, 2
 	call AnimScript_82D85A3
-	delay 0x1
-	createvisualtask sub_80D5EB8, 0x2, 0, 5, 5120, 4, 1
+	delay 1
+	createvisualtask AnimTask_SwayMon, 2, 0, 5, 5120, 4, ANIM_TARGET
 	waitforvisualfinish
-	createvisualtask sub_8117EC4, 0x2
-	jumpargeq 0x7, 0x0, AnimScript_82D839F
-	goto AnimScript_82D83AF
-
-AnimScript_82D8398:
+	createvisualtask AnimTask_IsTargetSameSide, 2
+	jumpretfalse SnatchOpposingMonMove
+	goto SnatchPartnerMonMove
+SnatchMoveContinue:
 	waitforvisualfinish
 	call AnimScript_82D85C3
 	end
-
-AnimScript_82D839F:
+SnatchOpposingMonMove:
 	playsewithpan SE_W104, -64
-	createvisualtask sub_815F8F4, 0x2
-	goto AnimScript_82D8398
-
-AnimScript_82D83AF:
+	createvisualtask sub_815F8F4, 2
+	goto SnatchMoveContinue
+SnatchPartnerMonMove:
 	playsewithpan SE_W104, -64
-	createvisualtask sub_815FFC4, 0x2
-	goto AnimScript_82D8398
+	createvisualtask sub_815FFC4, 2
+	goto SnatchMoveContinue
 
-Anim_FutureSightHit:
-	createvisualtask sub_8117F10, 0x2
+General_FutureSightHit:
+	createvisualtask sub_8117F10, 2
 	monbg ANIM_DEF_PARTNER
 	playsewithpan SE_W060, -64
-	call AnimScript_82D7CD1
-	setalpha 0x808
+	call SetPsychicBackground
+	setalpha 8, 8
 	playsewithpan SE_W048, +63
-	waitplaysewithpan SE_W048, +63, 0x8
-	createvisualtask sub_80D51AC, 0x2, 1, 4, 0, 15, 1
-	createvisualtask sub_80D6064, 0x5, -5, -5, 15, 1, 1
+	waitplaysewithpan SE_W048, +63, 8
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 15, 1
+	createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_TARGET, 1
 	waitforvisualfinish
-	createvisualtask sub_80D51AC, 0x2, 1, 4, 0, 24, 1
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 24, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	waitforvisualfinish
-	delay 0x1
-	call AnimScript_82D7CDD
+	delay 1
+	call UnsetPsychicBackground
 	end
 
-Anim_DoomDesireHit:
-	createvisualtask sub_8117F10, 0x2
-	loadspritegfx 0x27D6
-	createsprite gUnknown_08597274, 0x2, 1, 3, 0, 16, RGB_WHITE
+General_DoomDesireHit:
+	createvisualtask sub_8117F10, 2
+	loadspritegfx ANIM_TAG_EXPLOSION
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, RGB_WHITE
 	waitforvisualfinish
-	delay 0xA
-	createvisualtask sub_815C0A4, 0x5
-	delay 0x9
+	delay 10
+	createvisualtask sub_815C0A4, 5
+	delay 9
 	playsewithpan SE_W109, -64
-	delay 0x9
+	delay 9
 	playsewithpan SE_W109, 0
-	delay 0x9
+	delay 9
 	playsewithpan SE_W109, +63
-	delay 0x19
-	createvisualtask sub_80D5484, 0x2, 1, 10, 0, 20, 1
+	delay 25
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_0859371C, 0x3, 0, 0, 1, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 1, 1
+	delay 6
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_0859371C, 0x3, 24, -24, 1, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 1, 1
+	delay 6
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_0859371C, 0x3, -16, 16, 1, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 1, 1
+	delay 6
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_0859371C, 0x3, -24, -12, 1, 1
-	delay 0x6
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 1, 1
+	delay 6
 	playsewithpan SE_W120, +63
-	createsprite gUnknown_0859371C, 0x3, 16, 16, 1, 1
+	createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 1, 1
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, RGB_WHITE
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_WHITE
 	waitforvisualfinish
 	end
 
-Anim_Table_x14:
-	loadspritegfx 0x27C8
+General_FocusPunchSetUp:
+	loadspritegfx ANIM_TAG_184
 	playsewithpan SE_W082, -64
-	call AnimScript_82CD6C7
-	delay 0x8
-	createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 31
-	createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1
-	call AnimScript_82CD6C7
-	delay 0x8
-	call AnimScript_82CD6C7
+	call EndureEffect
+	delay 8
+	createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
+	call EndureEffect
+	delay 8
+	call EndureEffect
 	waitforvisualfinish
 	end
 
-Status_Ingrain:
-	loadspritegfx 0x27A3
-	loadspritegfx 0x272F
+General_IngrainHeal:
+	loadspritegfx ANIM_TAG_147
+	loadspritegfx ANIM_TAG_BLUE_STAR
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, RGB(13, 31, 12)
+	setalpha 12, 8
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB(13, 31, 12)
 	waitforvisualfinish
-	delay 0x3
-	call AnimScript_82D1009
+	delay 3
+	call AbsorbEffect
 	waitforvisualfinish
-	delay 0xF
-	call AnimScript_82D79DF
+	delay 15
+	call HealingEffect
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, RGB(13, 31, 12)
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB(13, 31, 12)
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
 
-Anim_WishHeal:
-	loadspritegfx 0x2741
-	createsprite gUnknown_08597274, 0x2, 1, 3, 0, 10, 0
+General_WishHeal:
+	loadspritegfx ANIM_TAG_SPARKLE
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK
 	waitforvisualfinish
 	playsewithpan SE_W025, -64
-	call AnimScript_82D79B4
+	call GrantingStarsEffect
 	waitforvisualfinish
-	unloadspritegfx 0x2741
-	loadspritegfx 0x272F
-	call AnimScript_82D79DF
+	unloadspritegfx ANIM_TAG_SPARKLE
+	loadspritegfx ANIM_TAG_BLUE_STAR
+	call HealingEffect
 	waitforvisualfinish
-	createsprite gUnknown_08597274, 0x2, 1, 3, 10, 0, 0
+	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 10, 0, RGB_BLACK
 	end
 
 AnimScript_82D85A3:
-	createvisualtask sub_8172E9C, 0x2
-	jumpargeq 0x7, 0x1, AnimScript_82D85B4
-
+	createvisualtask sub_8172E9C, 2
+	jumpreteq 1, AnimScript_82D85B4
 AnimScript_82D85B2:
 	waitforvisualfinish
 	return
-
 AnimScript_82D85B4:
-	createvisualtask sub_8172BF0, 0x2, 1
+	createvisualtask sub_8172BF0, 2, 1
 	waitforvisualfinish
 	goto AnimScript_82D85B2
 
 AnimScript_82D85C3:
-	createvisualtask sub_8172E9C, 0x2
-	jumpargeq 0x7, 0x1, AnimScript_82D85D4
-
+	createvisualtask sub_8172E9C, 2
+	jumpreteq 1, AnimScript_82D85D4
 AnimScript_82D85D2:
 	waitforvisualfinish
 	return
-
 AnimScript_82D85D4:
-	createvisualtask sub_8172BF0, 0x2, 0
+	createvisualtask sub_8172BF0, 2, 0
 	waitforvisualfinish
 	goto AnimScript_82D85D2
 
-Anim_LevelUp:
+Special_LevelUp:
 	playsewithpan SE_EXPMAX, 0
-	createvisualtask sub_8170920, 0x2
-	delay 0x0
-	createvisualtask sub_8170A0C, 0x5, 0, 0
+	createvisualtask sub_8170920, 2
+	delay 0
+	createvisualtask sub_8170A0C, 5, 0, 0
 	waitforvisualfinish
-	createvisualtask sub_81709EC, 0x2
+	createvisualtask sub_81709EC, 2
 	end
 
-Anim_SwitchOutPlayer:
-	createvisualtask sub_8170BB0, 0x2
-	delay 0xA
-	createvisualtask sub_8170B04, 0x2
+Special_SwitchOutPlayerMon:
+	createvisualtask sub_8170BB0, 2
+	delay 10
+	createvisualtask sub_8170B04, 2
 	end
 
-Anim_SwitchOutOpponent:
-	createvisualtask sub_8170BB0, 0x2
-	delay 0xA
-	createvisualtask sub_8170B04, 0x2
+Special_SwitchOutOpponentMon:
+	createvisualtask sub_8170BB0, 2
+	delay 10
+	createvisualtask sub_8170B04, 2
 	end
 
-Anim_BallThrow:
-	createvisualtask sub_8170CFC, 0x2
-	delay 0x0
+Special_BallThrow:
+	createvisualtask sub_8170CFC, 2
+	delay 0
 	playsewithpan SE_NAGERU, 0
-	createvisualtask sub_8170E04, 0x2
-	createvisualtask sub_8170D4C, 0x2
-	jumpargeq 0x7, 0xFFFF, AnimScript_82D8652
-
-AnimScript_82D8649:
+	createvisualtask sub_8170E04, 2
+	createvisualtask AnimTask_IsBallBlockedByTrainer, 2
+	jumpreteq -1, BallThrowTrainerBlock
+BallThrowEnd:
 	waitforvisualfinish
-	createvisualtask sub_8170D24, 0x2
+	createvisualtask sub_8170D24, 2
 	end
-
-AnimScript_82D8652:
-	loadspritegfx 0x2797
-	delay 0x19
+BallThrowTrainerBlock:
+	loadspritegfx ANIM_TAG_135
+	delay 25
 	monbg ANIM_DEF_PARTNER
-	setalpha 0x80C
-	delay 0x0
+	setalpha 12, 8
+	delay 0
 	playsewithpan SE_W003, +63
-	createsprite gUnknown_08597358, 0x82, -4, -20, 1, 2
+	createsprite gBasicHitSplatSpriteTemplate, 130, -4, -20, 1, 2
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
-	goto AnimScript_82D8649
+	goto BallThrowEnd
 
-Anim_SafariBallThrow:
-	createvisualtask sub_8170CFC, 0x2
-	delay 0x0
-	createvisualtask sub_8170F2C, 0x2
+Special_SafariBallThrow:
+	createvisualtask sub_8170CFC, 2
+	delay 0
+	createvisualtask sub_8170F2C, 2
 	waitforvisualfinish
-	createvisualtask sub_8170D24, 0x2
+	createvisualtask sub_8170D24, 2
 	end
 
-Anim_SubstituteToMon:
-	createvisualtask sub_8172BF0, 0x2, 1
+Special_SubstituteToMon:
+	createvisualtask sub_8172BF0, 2, 1
 	end
 
-Anim_MonToSubstitute:
-	createvisualtask sub_8172BF0, 0x2, 0
+Special_MonToSubstitute:
+	createvisualtask sub_8172BF0, 2, 0
 	end
diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s
index dc38826a7..51b62461d 100644
--- a/data/battle_frontier_2.s
+++ b/data/battle_frontier_2.s
@@ -6,529 +6,6 @@
 
 	.section .rodata
 
-
-	.align 2 @ struct, eight bytes x6 for names in different languages, then 0x28 more bytes of data
-gUnknown_08610970:: @ 8610970
-	.string "サダヒロ$", 8
-	.string "ALANN$", 8
-	.string "ALAIN$", 8
-	.string "ADELFO$", 8
-	.string "CLAUS$", 8
-	.string "TEO$", 8
-	.byte 0xC9, 0xBD
-	.2byte 0x43
-	.2byte SPECIES_BEAUTIFLY, SPECIES_DUSTOX, SPECIES_ILLUMISE, SPECIES_SHIFTRY, SPECIES_BRELOOM, SPECIES_NINJASK, SPECIES_SHEDINJA, SPECIES_PINSIR, SPECIES_HERACROSS, SPECIES_VOLBEAT, 0
-	.byte 0x1D, 8, 0x3e, 20, 0, 12, 1, 10, 0x30, 6, 0x44, 20, 0, 0
-	.string "ヒロオ$", 8
-	.string "LIONEL$", 8
-	.string "LIONEL$", 8
-	.string "CAIO$", 8
-	.string "LUDWIG$", 8
-	.string "LEO$", 8
-	.byte 0x9, 0xCF
-	.2byte 0x2B
-	.2byte SPECIES_SWELLOW, SPECIES_SWALOT, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_TORKOAL, SPECIES_HARIYAMA, SPECIES_MIGHTYENA, SPECIES_LUDICOLO, SPECIES_CRAWDAUNT, SPECIES_WHISCASH, 1
-	.byte 0x38, 12, 1, 10, 0x30, 6, 6, 10, 0x20, 0x10, 0x13, 0x22, 0, 0
-	.string "ケイジ$", 8
-	.string "SONNY$", 8
-	.string "HERVE$", 8
-	.string "FEDRO$", 8
-	.string "WENZEL$", 8
-	.string "SANTI$", 8
-	.byte 0x34, 0x2E
-	.2byte 0x26
-	.2byte SPECIES_LINOONE, SPECIES_MIGHTYENA, SPECIES_WHISCASH, SPECIES_ZANGOOSE, SPECIES_SEVIPER, SPECIES_NINETALES, SPECIES_KECLEON, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_MACHAMP, 2
-	.byte 1, 10, 10, 0x16, 0x15, 14, 0x30, 6, 0x3b, 12, 0x4, 12, 0, 0
-	.string "ユラ$", 8
-	.string "LAYLA$", 8
-	.string "LAYLA$", 8
-	.string "ASTRID$", 8
-	.string "SONJA$", 8
-	.string "LOLA$", 8
-	.byte 0xEF, 0x84
-	.2byte 0x47
-	.2byte SPECIES_SWALOT, SPECIES_XATU, SPECIES_ALTARIA, SPECIES_GOLDUCK, SPECIES_FLYGON, SPECIES_ALAKAZAM, SPECIES_GARDEVOIR, SPECIES_WAILORD, SPECIES_GRUMPIG, SPECIES_MIGHTYENA, 3
-	.byte 11, 16, 15, 0x1e, 0x39, 16, 0x21, 0x14, 0x3, 12, 0xff, 0xff, 0, 0
-	.string "ヨウカ$", 8
-	.string "MACY$", 8
-	.string "AMELIE$", 8
-	.string "CLEO$", 8
-	.string "MARIA$", 8
-	.string "ELISA$", 8
-	.byte 0x43, 0x1E
-	.2byte 0x27
-	.2byte SPECIES_WIGGLYTUFF, SPECIES_LINOONE, SPECIES_KINGDRA, SPECIES_DELCATTY, SPECIES_RAICHU, SPECIES_FEAROW, SPECIES_STARMIE, SPECIES_MEDICHAM, SPECIES_SHIFTRY, SPECIES_BEAUTIFLY, 4
-	.byte 15, 0x1e, 0x14, 16, 6, 16, 15, 0x28, 0x1c, 0x1c, 0x13, 0x1c, 0, 0
-	.string "ヤスシ$", 8
-	.string "DONTE$", 8
-	.string "BRAHIM$", 8
-	.string "GLAUCO$", 8
-	.string "JOSEF$", 8
-	.string "ROQUE$", 8
-	.byte 0x9F, 0x37
-	.2byte 0x30
-	.2byte SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_AGGRON, SPECIES_MAGNETON, SPECIES_MACHAMP, SPECIES_ARMALDO, SPECIES_HERACROSS, SPECIES_NOSEPASS, SPECIES_EXPLOUD, SPECIES_MIGHTYENA, 5
-	.byte 0x29, 0x0A, 0x08, 0x14, 0x2F, 0x10, 0x38, 0x16, 0x20, 0x08, 0x00, 0x0C, 0x00, 0
-	.string "ミサオ$", 8
-	.string "AMIRA$", 8
-	.string "LAURE$", 8
-	.string "DAFNE$", 8
-	.string "AMELIE$", 8
-	.string "LARA$", 8
-	.byte 0x55, 0xF5
-	.2byte 0x31
-	.2byte SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_MAGNETON, SPECIES_MEDICHAM, SPECIES_MIGHTYENA, SPECIES_GLALIE, SPECIES_GOLEM, SPECIES_ELECTRODE, SPECIES_PELIPPER, SPECIES_SHARPEDO, 6
-	.byte 0x0B, 0x0C, 0x3E, 0x12, 0x00, 0x0C, 0x31, 0x0A, 0x30, 0x14, 0x00, 0x0C, 0x00, 0x00
-	.string "カズサ$", 8
-	.string "KALI$", 8
-	.string "JODIE$", 8
-	.string "ILENIA$", 8
-	.string "KARO$", 8
-	.string "ELSA$", 8
-	.byte 0x26, 0x8D
-	.2byte 0x14
-	.2byte SPECIES_NINETALES, SPECIES_ALAKAZAM, SPECIES_SCEPTILE, SPECIES_SALAMENCE, SPECIES_GOLDUCK, SPECIES_MAWILE, SPECIES_WEEZING, SPECIES_LANTURN, SPECIES_GARDEVOIR, SPECIES_MILOTIC, 7
-	.byte 0x06, 0x0A, 0x20, 0x06, 0x1F, 0x0A, 0x02, 0x0A, 0x03, 0x0C, 0xFF, 0xFF, 0x00, 0x00
-	.string "スミレ$", 8
-	.string "ANNIE$", 8
-	.string "ANNIE$", 8
-	.string "IMELDA$", 8
-	.string "INES$", 8
-	.string "ROSA$", 8
-	.byte 0xC, 0x80
-	.2byte 0xD
-	.2byte SPECIES_SCEPTILE, SPECIES_VILEPLUME, SPECIES_BELLOSSOM, SPECIES_ROSELIA, SPECIES_CORSOLA, SPECIES_FLYGON, SPECIES_BRELOOM, SPECIES_MILOTIC, SPECIES_ALTARIA, SPECIES_CRADILY, 8
-	.byte 0x22, 0x1E, 0x33, 0x04, 0x0E, 0x02, 0x02, 0x0A, 0x1E, 0x10, 0x00, 0x0C, 0x00, 0x00
-	.string "アキノリ$", 8
-	.string "DILLEN$", 8
-	.string "RENE$", 8
-	.string "INDRO$", 8
-	.string "DETLEF$", 8
-	.string "PEDRO$", 8
-	.byte 0x9f, 0x46
-	.2byte 0
-	.2byte SPECIES_SKARMORY, SPECIES_GOLEM, SPECIES_BLAZIKEN, SPECIES_CAMERUPT, SPECIES_DONPHAN, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_TROPIUS, SPECIES_SOLROCK, SPECIES_RHYDON, 9
-	.byte 0x3D, 0x0A, 0x11, 0x10, 0x1E, 0x0E, 0x1C, 0x20, 0x04, 0x0C, 0xFF, 0xFF, 0x00, 0x00
-	.string "トウゾウ$", 8
-	.string "DALLAS$", 8
-	.string "BRUNO$", 8
-	.string "LEARCO$", 8
-	.string "ANSGAR$", 8
-	.string "MANOLO$", 8
-	.byte 0xFC, 0x71
-	.2byte 0x2D 
-	.2byte SPECIES_SEAKING, SPECIES_STARMIE, SPECIES_GOLDUCK, SPECIES_TENTACRUEL, SPECIES_OCTILLERY, SPECIES_GOREBYSS, SPECIES_GLALIE, SPECIES_WAILORD, SPECIES_SHARPEDO, SPECIES_KINGDRA, 10
-	.byte 0x05, 0x0A, 0x06, 0x06, 0x0E, 0x16, 0x14, 0x0A, 0x00, 0x0C, 0xFF, 0xFF, 0x00, 0x00
-	.string "セイヤ$", 8
-	.string "FRANK$", 8
-	.string "FRANK$", 8
-	.string "OLINDO$", 8
-	.string "FRANK$", 8
-	.string "MAURO$", 8
-	.byte 0x9E, 0xA3
-	.2byte 0x3A
-	.2byte SPECIES_QUAGSIRE, SPECIES_STARMIE, SPECIES_PELIPPER, SPECIES_CRAWDAUNT, SPECIES_WAILORD, SPECIES_GYARADOS, SPECIES_SWAMPERT, SPECIES_LANTURN, SPECIES_WHISCASH, SPECIES_SHUCKLE, 11
-	.byte 0x0E, 0x28, 0x3D, 0x10, 0x0F, 0x24, 0x14, 0x0A, 0x23, 0x1E, 0x24, 0x10, 0x00, 0x00
-	.string "リュウジ$", 8
-	.string "LAMONT$", 8
-	.string "XAV$", 8
-	.string "ORFEO$", 8
-	.string "JÜRGEN$", 8
-	.string "JORGE$", 8
-	.byte 0x90, 0xE5
-	.2byte 0x19
-	.2byte SPECIES_ABSOL, SPECIES_CROBAT, SPECIES_EXPLOUD, SPECIES_MAGNETON, SPECIES_SHARPEDO, SPECIES_MANECTRIC, SPECIES_METAGROSS, SPECIES_ELECTRODE, SPECIES_NOSEPASS, SPECIES_WEEZING, 12
-	.byte 0x20, 0x10, 0x2E, 0x06, 0x0B, 0x10, 0x22, 0x1E, 0x0F, 0x1E, 0x0B, 0x10, 0x00, 0x00
-	.string "カツアキ$", 8
-	.string "TYRESE$", 8
-	.string "ANDY$", 8
-	.string "PARIDE$", 8
-	.string "DAVID$", 8
-	.string "CHICHO$", 8
-	.byte 0x18, 0xD0
-	.2byte 10
-	.2byte SPECIES_BLAZIKEN, SPECIES_GOLEM, SPECIES_MACHAMP, SPECIES_RHYDON, SPECIES_HARIYAMA, SPECIES_AGGRON, SPECIES_MEDICHAM, SPECIES_ZANGOOSE, SPECIES_VIGOROTH, SPECIES_SLAKING, 13
-	.byte 0x29, 0x0A, 0x3A, 0x06, 0x15, 0x0E, 0x35, 0x14, 0x34, 0x10, 0x1E, 0x06, 0x00, 0x00
-	.string "トシミツ$", 8
-	.string "DANTE$", 8
-	.string "DANTE$", 8
-	.string "RAOUL$", 8
-	.string "LOTHAR$", 8
-	.string "PABLO$", 8
-	.byte 0x75, 0xBC
-	.2byte 14
-	.2byte SPECIES_SCEPTILE, SPECIES_SANDSLASH, SPECIES_FLYGON, SPECIES_CLAYDOL, SPECIES_ARMALDO, SPECIES_CROBAT, SPECIES_CRADILY, SPECIES_SOLROCK, SPECIES_LUNATONE, SPECIES_GOLEM, 14
-	.byte 0x01, 0x0A, 0x17, 0x10, 0x43, 0x12, 0x22, 0x1E, 0x0B, 0x10, 0x0F, 0x28, 0x00, 0x00
-	.string "ローウェン$", 8
-	.string "ARTURO$", 8
-	.string "ARTURO$", 8
-	.string "ROMOLO$", 8
-	.string "BRIAN$", 8
-	.string "ARTURO$", 8
-	.byte 0x2, 0xFA
-	.2byte 0x20
-	.2byte SPECIES_ABSOL, SPECIES_MIGHTYENA, SPECIES_ALAKAZAM, SPECIES_BANETTE, SPECIES_NINETALES, SPECIES_CLAYDOL, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_WALREIN, SPECIES_DUSCLOPS, 15
-	.byte 0x0F, 0x1E, 0x04, 0x14, 0x2F, 0x10, 0x06, 0x10, 0x20, 0x10, 0x03, 0x0E, 0x00, 0x00
-
-	.align 2
-gUnknown_08610EF0:: @ 8610EF0
-	.4byte gText_082B7229
-	.4byte gText_082B731C
-	.4byte gText_082B735B
-	.4byte gText_082B7423
-	.4byte gText_082B74C1
-	.4byte gText_082B756F
-	.4byte gText_082B75B2
-	.4byte gText_082B763F
-	.4byte gText_082B76AC
-	.4byte gText_082B7772
-	.4byte gText_082B77CE
-	.4byte gText_082B7871
-	.4byte gText_082B78D4
-	.4byte gText_082B7B1A
-	.4byte gText_082B7C13
-	.4byte gText_082B7D18
-	.4byte gText_082B7DD4
-	.4byte gText_082B7EE5
-	.4byte gText_082B7F35
-	.4byte gText_082B7FE8
-	.4byte gText_082B8087
-	.4byte gText_082B822B
-	.4byte gText_082B8286
-	.4byte gText_082B8356
-	.4byte gText_082B83CE
-	.4byte gText_082B84FC
-	.4byte gText_082B8559
-	.4byte gText_082B8656
-	.4byte gText_082B86EA
-	.4byte gText_082B87DA
-	.4byte gText_082B887C
-	.4byte gText_082B8957
-	.4byte gText_082B89C6
-	.4byte gText_082B8ACF
-	.4byte gText_082B8B66
-	.4byte gText_082B8C20
-	.4byte gText_082B8CAA
-	.4byte gText_082B8DD3
-	.4byte gText_082B8E24
-	.4byte gText_082B8ED5
-	.4byte gText_082B8F45
-	.4byte gText_082B905F
-	.4byte gText_082B910E
-	.4byte gText_082B9204
-	.4byte gText_082B929C
-	.4byte gText_082B9438
-	.4byte gText_082B9488
-	.4byte gText_082B9564
-	.4byte gText_082B95D8
-	.4byte gText_082B9763
-	.4byte gText_082B97E5
-	.4byte gText_082B989A
-	.4byte gText_082B992D
-	.4byte gText_082B9A84
-	.4byte gText_082B9AB9
-	.4byte gText_082B9B76
-	.4byte gText_082B9BF2
-	.4byte gText_082B9D83
-	.4byte gText_082B9DF9
-	.4byte gText_082B9EAA
-	.4byte gText_082B9F55
-	.4byte gText_082BA084
-	.4byte gText_082BA11D
-	.4byte gText_082BA1F3
-
-	.align 2
-gUnknown_08610FF0:: @ 8610FF0
-	.4byte gText_082BE50D
-	.4byte gText_082BE5F5
-	.4byte gText_082BE679
-	.4byte gText_082BE71E
-	.4byte gText_082BE762
-	.4byte gText_082BE7F8
-	.4byte gText_082BE850
-	.4byte gText_082BE99C
-	.4byte gText_082BEA1B
-	.4byte gText_082BEAE9
-	.4byte gText_082BEB72
-	.4byte gText_082BEC8E
-	.4byte gText_082BED16
-	.4byte gText_082BEE29
-	.4byte gText_082BEEB4
-	.4byte gText_082BEFE2
-	.4byte gText_082BF04E
-	.4byte gText_082BF11D
-	.4byte gText_082BF1A8
-	.4byte gText_082BF268
-	.4byte gText_082BF2D1
-	.4byte gText_082BF3CF
-	.4byte gText_082BF46A
-	.4byte gText_082BF551
-	.4byte gText_082BF5C3
-	.4byte gText_082BF6E5
-	.4byte gText_082BF773
-	.4byte gText_082BF869
-	.4byte gText_082BF8DD
-	.4byte gText_082BF9BA
-	.4byte gText_082BFA5A
-	.4byte gText_082BFB4E
-
-	.align 2
-gUnknown_08611070:: @ 8611070
-	.4byte gText_082BA2A3
-	.4byte gText_082BA34E
-	.4byte gText_082BA380
-	.4byte gText_082BA3D2
-	.4byte gText_082BA448
-	.4byte gText_082BA4D3
-	.4byte gText_082BA58C
-	.4byte gText_082BA5BF
-	.4byte gText_082BA5F3
-	.4byte gText_082BA635
-	.4byte gText_082BA6E6
-	.4byte gText_082BA742
-	.4byte gText_082BA770
-	.4byte gText_082BA78F
-	.4byte gText_082BA7D8
-	.4byte gText_082BA867
-	.4byte gText_082BA96B
-	.4byte gText_082BA9B7
-	.4byte gText_082BAA1B
-	.4byte gText_082BAA81
-	.4byte gText_082BAB22
-	.4byte gText_082BAC43
-	.4byte gText_082BAC78
-	.4byte gText_082BAD17
-	.4byte gText_082BADB6
-	.4byte gText_082BAE36
-	.4byte gText_082BAF4E
-	.4byte gText_082BAF8F
-	.4byte gText_082BAFDB
-	.4byte gText_082BB05F
-	.4byte gText_082BB0D4
-	.4byte gText_082BB18C
-	.4byte gText_082BB1CE
-	.4byte gText_082BB242
-	.4byte gText_082BB2D9
-	.4byte gText_082BB370
-	.4byte gText_082BB4C3
-	.4byte gText_082BB4FB
-	.4byte gText_082BB575
-	.4byte gText_082BB5E1
-	.4byte gText_082BB656
-	.4byte gText_082BB6E5
-	.4byte gText_082BB72C
-	.4byte gText_082BB7A2
-	.4byte gText_082BB84A
-	.4byte gText_082BB8CD
-	.4byte gText_082BB970
-	.4byte gText_082BB9AE
-	.4byte gText_082BBA05
-	.4byte gText_082BBA6C
-	.4byte gText_082BBB01
-	.4byte gText_082BBC1C
-	.4byte gText_082BBC4B
-	.4byte gText_082BBCF6
-	.4byte gText_082BBD90
-	.4byte gText_082BBE0B
-	.4byte gText_082BBEE5
-	.4byte gText_082BBF25
-	.4byte gText_082BBFA4
-	.4byte gText_082BC024
-	.4byte gText_082BC0C8
-	.4byte gText_082BC213
-	.4byte gText_082BC247
-	.4byte gText_082BC2DD
-	.4byte gText_082BC373
-	.4byte gText_082BC40E
-	.4byte gText_082BC514
-	.4byte gText_082BC555
-	.4byte gText_082BC5CE
-	.4byte gText_082BC666
-	.4byte gText_082BC714
-	.4byte gText_082BC808
-	.4byte gText_082BC84D
-	.4byte gText_082BC8EA
-	.4byte gText_082BC984
-	.4byte gText_082BCA4D
-	.4byte gText_082BCB75
-	.4byte gText_082BCBA6
-	.4byte gText_082BCBFC
-	.4byte gText_082BCCA4
-
-	.align 2
-gUnknown_086111B0:: @ 86111B0
-	.4byte gText_082BFBF2
-	.4byte gText_082BFCAE
-	.4byte gText_082BFD26
-	.4byte gText_082BFDB1
-	.4byte gText_082BFE24
-	.4byte gText_082BFEAD
-	.4byte gText_082BFF0A
-	.4byte gText_082C0032
-	.4byte gText_082C0090
-	.4byte gText_082C016E
-	.4byte gText_082C01F7
-	.4byte gText_082C034C
-	.4byte gText_082C03CA
-	.4byte gText_082C046E
-	.4byte gText_082C04F9
-	.4byte gText_082C0598
-	.4byte gText_082C0602
-	.4byte gText_082C06D8
-	.4byte gText_082C074A
-	.4byte gText_082C0809
-	.4byte gText_082C086E
-	.4byte gText_082C0982
-	.4byte gText_082C0A1D
-	.4byte gText_082C0AFD
-	.4byte gText_082C0B6F
-	.4byte gText_082C0C7D
-	.4byte gText_082C0D0B
-	.4byte gText_082C0DFE
-	.4byte gText_082C0E71
-	.4byte gText_082C0F6D
-	.4byte gText_082C1003
-	.4byte gText_082C1122
-
-	.align 2
-gUnknown_08611230:: @ 8611230
-	.4byte gText_082BCD68
-	.4byte gText_082BCE64
-	.4byte gText_082BCEF2
-	.4byte gText_082BCF61
-	.4byte gText_082BCFA1
-	.4byte gText_082BD03C
-	.4byte gText_082BD06D
-	.4byte gText_082BD18A
-	.4byte gText_082BD222
-	.4byte gText_082BD325
-	.4byte gText_082BD3B1
-	.4byte gText_082BD493
-	.4byte gText_082BD51C
-	.4byte gText_082BD609
-	.4byte gText_082BD697
-	.4byte gText_082BD797
-	.4byte gText_082BD806
-	.4byte gText_082BD8F5
-	.4byte gText_082BD9BE
-	.4byte gText_082BDAE1
-	.4byte gText_082BDB4E
-	.4byte gText_082BDC6B
-	.4byte gText_082BDD0D
-	.4byte gText_082BDDEC
-	.4byte gText_082BDE68
-	.4byte gText_082BDF4D
-	.4byte gText_082BDFD8
-	.4byte gText_082BE0FD
-	.4byte gText_082BE189
-	.4byte gText_082BE2A5
-	.4byte gText_082BE33E
-	.4byte gText_082BE46C
-
-	.align 2
-gUnknown_086112B0:: @ 86112B0
-	.4byte gText_082C11D1
-	.4byte gText_082C12D5
-	.4byte gText_082C13AB
-	.4byte gText_082C1444
-	.4byte gText_082C1501
-	.4byte gText_082C15B6
-	.4byte gText_082C165E
-	.4byte gText_082C174F
-	.4byte gText_082C1862
-	.4byte gText_082C19A0
-	.4byte gText_082C1A76
-	.4byte gText_082C1C16
-	.4byte gText_082C1CF5
-	.4byte gText_082C1DC1
-	.4byte gText_082C1EDC
-	.4byte gText_082C1FEC
-	.4byte gText_082C20D1
-	.4byte gText_082C21FF
-	.4byte gText_082C231C
-	.4byte gText_082C2407
-	.4byte gText_082C24B5
-	.4byte gText_082C25B1
-	.4byte gText_082C2707
-	.4byte gText_082C27D4
-	.4byte gText_082C28D6
-	.4byte gText_082C2A0B
-	.4byte gText_082C2B50
-	.4byte gText_082C2C77
-	.4byte gText_082C2D67
-	.4byte gText_082C2E41
-	.4byte gText_082C2EF5
-	.4byte gText_082C3023
-
-	.align 2
-gUnknown_08611330:: @ 8611330
-	.4byte gText_082B6EA5
-	.4byte gText_082B6EEC
-	.4byte gText_082B6F16
-	.4byte gText_082B6F4C
-	.4byte gText_082B6F92
-	.4byte gText_082B6FC9
-	.4byte gText_082B700C
-	.4byte gText_082B703A
-	.4byte gText_082B706A
-	.4byte gText_082B709C
-	.4byte gText_082B70CC
-	.4byte gText_082B710A
-	.4byte gText_082B714D
-	.4byte gText_082B7185
-	.4byte gText_082B71C1
-	.4byte gText_082B71F9
-
-gUnknown_08611370:: @ 8611370
-	.byte 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00
-	.byte 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01
-	.byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01
-	.byte 0x01, 0x01, 0x01
-
-gUnknown_086114D3:: @ 86114D3
-	.byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00
-
-	.align 2
-gUnknown_086114E0:: @ 86114E0
-	.4byte sub_81A093C
-	.4byte sub_81A0964
-	.4byte sub_81A0978
-	.4byte sub_819FC60
-	.4byte sub_81A0984
-	.4byte sub_81A0990
-	.4byte sub_81A09D0
-	.4byte sub_81A0A20
-	.4byte sub_81A0C9C
-	.4byte sub_81A087C
-	.4byte sub_81A1638
-	.4byte sub_81A0CC0
-	.4byte sub_81A09B4
-	.4byte sub_81A0D40
-	.4byte sub_81A0DD4
-	.4byte sub_81A0FE4
-	.4byte sub_81A0FFC
-	.4byte sub_81A0D80
-	.4byte sub_81A11F8
-	.4byte sub_81A1218
-	.4byte sub_81A1224
-	.4byte sub_81A1438
-	.4byte sub_81A150C
-	.4byte sub_81A15A4
-	.4byte sub_81A1644
-	.4byte sub_81A1370
-
-	.align 2
-gUnknown_08611548:: @ 8611548
-	.byte 0x00, 0x01, 0x02, 0x03, 0x06, 0x07, 0x08, 0x09
-
 	.align 2
 gUnknown_08611550:: @ 8611550
 	.byte 0x23, 0x46, 0x23, 0x01, 0x04, 0x09, 0x05, 0x00, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x38, 0x1c, 0x01, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x8c, 0x38, 0x01, 0x15, 0x46, 0x23, 0x00
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index a01066be1..d8f681686 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -6,6 +6,7 @@
 #include "constants/abilities.h"
 #include "constants/moves.h"
 #include "constants/songs.h"
+#include "constants/game_stat.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/battle_script.inc"
 	.include "constants/constants.inc"
@@ -922,7 +923,7 @@ BattleScript_EffectFocusEnergy::
 BattleScript_EffectRecoil::
 	setmoveeffect MOVE_EFFECT_RECOIL_25 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
 	jumpifnotmove MOVE_STRUGGLE, BattleScript_EffectHit
-	incrementgamestat 0x1B
+	incrementgamestat GAME_STAT_USED_STRUGGLE
 	goto BattleScript_EffectHit
 
 BattleScript_EffectConfuse::
@@ -1200,7 +1201,7 @@ BattleScript_EffectSplash::
 	ppreduce
 	attackanimation
 	waitanimation
-	incrementgamestat 0x1A
+	incrementgamestat GAME_STAT_USED_SPLASH
 	printstring STRINGID_BUTNOTHINGHAPPENED
 	waitmessage 0x40
 	goto BattleScript_MoveEnd
@@ -3741,7 +3742,7 @@ BattleScript_SAtkDown2End::
 BattleScript_FocusPunchSetUp::
 	printstring STRINGID_EMPTYSTRING3
 	waitmessage 0x1
-	playanimation BS_ATTACKER, B_ANIM_x14, NULL
+	playanimation BS_ATTACKER, B_ANIM_FOCUS_PUNCH_SETUP, NULL
 	printstring STRINGID_PKMNTIGHTENINGFOCUS
 	waitmessage 0x40
 	end2
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index 485847ed1..b74f557a7 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -190,7 +190,7 @@ BattleScript_ActionGetNear:
 BattleScript_ActionThrowPokeblock:
 	printstring STRINGID_THREWPOKEBLOCKATPKMN
 	waitmessage 0x40
-	playanimation BS_ATTACKER, B_ANIM_x4, NULL
+	playanimation BS_ATTACKER, B_ANIM_POKEBLOCK_THROW, NULL
 	printfromtable gSafariPokeblockResultStringIds
 	waitmessage 0x40
 	end2
diff --git a/data/cable_club.s b/data/cable_club.s
deleted file mode 100644
index f62b0b90a..000000000
--- a/data/cable_club.s
+++ /dev/null
@@ -1,16 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-	.align 2
-gUnknown_08550594:: @ 8550594
-	window_template 0x00, 0x10, 0x0b, 0x0b, 0x02, 0x0f, 0x0125
-
-	.align 2
-gUnknown_0855059C:: @ 855059C
-	.4byte gText_BronzeCard
-	.4byte gText_CopperCard
-	.4byte gText_SilverCard
-	.4byte gText_GoldCard
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 56658a994..dc308f8b1 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -9853,2983 +9853,8 @@ gText_MrStone_Pokenav_2B67ED:: @ 82B67ED
 	.string "Hm! You must come visit us at DEVON\n"
 	.string "sometime!$"
 
-BattleFrontier_BattleTowerLobby_EventScript_2B688D:: @ 82B688D
-	lock
-	faceplayer
-	setvar VAR_0x8004, 0
-	special sub_81A085C
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6900
-	setvar VAR_0x8004, 10
-	special sub_81A085C
-	compare VAR_0x8004, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B68BE
-	checkflag FLAG_0x934
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6E90
-
-BattleFrontier_BattleTowerLobby_EventScript_2B68BE:: @ 82B68BE
-	setvar VAR_0x8004, 11
-	special sub_81A085C
-	compare VAR_RESULT, 2
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B69D3
-	compare VAR_RESULT, 4
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ACF
-	compare VAR_RESULT, 3
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C77
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D5C
-	compare VAR_RESULT, 5
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6DD4
-	release
-	releaseall
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6900:: @ 82B6900
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 6
-	special sub_81A085C
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A085C
-	waitstate
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6925:: @ 82B6925
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 6
-	special sub_81A085C
-	waitstate
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B69BB
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 2
-	special sub_81A085C
-	waitstate
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	special sub_81A085C
-	waitstate
-	setvar VAR_0x8004, 1
-	setorcopyvar VAR_0x8005, VAR_RESULT
-	addvar VAR_0x8005, 1
-	special sub_81A085C
-	setvar VAR_0x8004, 3
-	special sub_81A085C
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 8
-	special sub_81A085C
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 3
-	special sub_81A085C
-	waitstate
-	call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D
-	release
-	releaseall
-	switch VAR_FACING
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_2B6E54
-	goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_2B69BB:: @ 82B69BB
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special sub_81A085C
-	waitstate
-	goto BattleFrontier_BattleTowerLobby_EventScript_2B6925
-
-BattleFrontier_BattleTowerLobby_EventScript_2B69D3:: @ 82B69D3
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 2
-	special sub_81A085C
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A085C
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 1
-	special sub_81A085C
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 6
-	special sub_81A085C
-	waitstate
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 2
-	special sub_81A085C
-	waitstate
-	copyvar VAR_0x8005, VAR_RESULT
-	compare VAR_0x8005, 0
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6ABA
-	compare VAR_0x8005, 1
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6AC0
-	setvar VAR_0x8004, 12
-	special sub_81A085C
-	copyvar VAR_0x8006, VAR_RESULT
-	setvar VAR_0x8004, 13
-	special sub_81A085C
-	setvar VAR_0x8004, 5
-	special sub_81A085C
-	setvar VAR_0x8004, 12
-	special sub_81A085C
-	compare VAR_RESULT, 3
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6AC6
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 0
-	copyvar VAR_0x8006, VAR_0x8007
-	special sub_81A085C
-	setvar VAR_0x8004, 15
-	special sub_81A085C
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 7
-	special sub_81A085C
-	waitstate
-	call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D
-	release
-	releaseall
-	switch VAR_FACING
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_2B6E54
-	goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6ABA:: @ 82B6ABA
-	setvar VAR_0x8007, 0
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6AC0:: @ 82B6AC0
-	setvar VAR_0x8007, 1
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6AC6:: @ 82B6AC6
-	setvar VAR_0x8004, 4
-	special sub_81A085C
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6ACF:: @ 82B6ACF
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 4
-	special sub_81A085C
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 2
-	special sub_81A085C
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 10
-	special sub_81A085C
-	waitstate
-	setvar VAR_0x8004, 15
-	special sub_81A085C
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6B09:: @ 82B6B09
-	fadescreen 1
-	setvar VAR_RESULT, 0
-	setvar VAR_0x8004, 19
-	special sub_81A085C
-	waitstate
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B81
-	setvar VAR_0x8004, 20
-	special sub_81A085C
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C0C
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 5
-	special sub_81A085C
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 12
-	special sub_81A085C
-	waitstate
-	setvar VAR_0x8004, 5
-	special sub_81A085C
-	call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D
-	release
-	releaseall
-	switch VAR_FACING
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_2B6E54
-	goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6B81:: @ 82B6B81
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 4
-	special sub_81A085C
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 2
-	special sub_81A085C
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 13
-	special sub_81A085C
-	waitstate
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 4
-	special sub_81A085C
-	waitstate
-	setvar VAR_0x8004, 15
-	special sub_81A085C
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6BD4:: @ 82B6BD4
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 14
-	special sub_81A085C
-	waitstate
-	setvar VAR_0x8004, 5
-	special sub_81A085C
-	call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D
-	release
-	releaseall
-	switch VAR_FACING
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_2B6E54
-	goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6C0C:: @ 82B6C0C
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 4
-	special sub_81A085C
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 5
-	special sub_81A085C
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 2
-	special sub_81A085C
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 16
-	special sub_81A085C
-	waitstate
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 4
-	special sub_81A085C
-	waitstate
-	setvar VAR_0x8004, 15
-	special sub_81A085C
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09
-	goto BattleFrontier_BattleTowerLobby_EventScript_2B6BD4
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6C77:: @ 82B6C77
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 3
-	special sub_81A085C
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 2
-	special sub_81A085C
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 3
-	special sub_81A085C
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 4
-	special sub_81A085C
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 8
-	special sub_81A085C
-	waitstate
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 3
-	special sub_81A085C
-	waitstate
-	copyvar VAR_0x8005, VAR_RESULT
-	compare VAR_0x8005, 0
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6D50
-	compare VAR_0x8005, 1
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6D56
-	setvar VAR_0x8004, 17
-	special sub_81A085C
-	setvar VAR_0x8004, 5
-	special sub_81A085C
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 0
-	copyvar VAR_0x8006, VAR_0x8007
-	special sub_81A085C
-	setvar VAR_0x8004, 15
-	special sub_81A085C
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 9
-	special sub_81A085C
-	waitstate
-	call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D
-	release
-	releaseall
-	switch VAR_FACING
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_2B6E54
-	goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6D50:: @ 82B6D50
-	setvar VAR_0x8007, 3
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6D56:: @ 82B6D56
-	setvar VAR_0x8007, 4
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6D5C:: @ 82B6D5C
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special sub_81A085C
-	waitstate
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 1
-	special sub_81A085C
-	waitstate
-	copyvar VAR_0x8005, VAR_RESULT
-	setvar VAR_0x8004, 18
-	special sub_81A085C
-	setvar VAR_0x8004, 5
-	special sub_81A085C
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 9
-	special sub_81A085C
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 5
-	special sub_81A085C
-	waitstate
-	call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D
-	release
-	releaseall
-	switch VAR_FACING
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_2B6E54
-	goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:: @ 82B6DD4
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 11
-	special sub_81A085C
-	waitstate
-	setvar VAR_0x8004, 25
-	special sub_81A085C
-	setvar VAR_0x8004, 19
-	call BattleFrontier_BattleTowerLobby_EventScript_271E7C
-	lock
-	faceplayer
-	setvar VAR_0x8004, 21
-	special sub_81A085C
-	setvar VAR_0x8004, 16
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 7
-	special sub_81A085C
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 15
-	special sub_81A085C
-	waitstate
-	setvar VAR_0x8004, 9
-	special sub_81A085C
-	call BattleFrontier_BattleTowerLobby_EventScript_2B6E4D
-	release
-	releaseall
-	switch VAR_FACING
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_2B6E54
-	goto BattleFrontier_BattleTowerLobby_EventScript_2B6E72
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6E4D:: @ 82B6E4D
-	setflag FLAG_0x2BD
-	setflag FLAG_0x934
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6E54:: @ 82B6E54
-	setvar VAR_0x8004, 24
-	special sub_81A085C
-	compare VAR_0x8004, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6E93
-	applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E94
-	waitmovement 0
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6E72:: @ 82B6E72
-	setvar VAR_0x8004, 24
-	special sub_81A085C
-	compare VAR_0x8004, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6E93
-	applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E95
-	waitmovement 0
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6E90:: @ 82B6E90
-	release
-	releaseall
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_2B6E93:: @ 82B6E93
-	end
-
-BattleFrontier_BattleTowerLobby_Movement_2B6E94: @ 82B6E94
-	walk_fast_right
-
-BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95
-	walk_fast_down
-	walk_fast_down
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	set_invisible
-	slide_down
-	slide_down
-	slide_down
-	step_end
-
-gText_082B6EA5:: @ 82B6EA5
-	.string "Um, I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n"
-	.string "Snivel… This tension is getting to me…$"
-
-gText_082B6EEC:: @ 82B6EEC
-	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n"
-	.string "Here we come!$"
-
-gText_082B6F16:: @ 82B6F16
-	.string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}!\n"
-	.string "Accept my challenge!$"
-
-gText_082B6F4C:: @ 82B6F4C
-	.string "Um… I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice…\n"
-	.string "Do you think someone like me can win?$"
-
-gText_082B6F92:: @ 82B6F92
-	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n"
-	.string "I’ll let you challenge me!$"
-
-gText_082B6FC9:: @ 82B6FC9
-	.string "I’m horribly busy, but I also happen\n"
-	.string "to be {STR_VAR_1}’s no. {STR_VAR_2} apprentice.$"
-
-gText_082B700C:: @ 82B700C
-	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n"
-	.string "Glad to meet you!$"
-
-gText_082B703A:: @ 82B703A
-	.string "I serve as {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n"
-	.string "May I begin?$"
-
-gText_082B706A:: @ 82B706A
-	.string "Eek! I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n"
-	.string "I’ll do my best!$"
-
-gText_082B709C:: @ 82B709C
-	.string "Yeehaw! I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n"
-	.string "Put ’em up!$"
-
-gText_082B70CC:: @ 82B70CC
-	.string "I’m {STR_VAR_1}’s 1,000th apprentice!\n"
-	.string "Actually, I’m no. {STR_VAR_2}! Here goes!$"
-
-gText_082B710A:: @ 82B710A
-	.string "Yeah, I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n"
-	.string "Let’s get rockin’ and a-rollin’!$"
-
-gText_082B714D:: @ 82B714D
-	.string "Yippee-yahoo! I’m what you call\n"
-	.string "{STR_VAR_1}’s no. {STR_VAR_2} apprentice!$"
-
-gText_082B7185:: @ 82B7185
-	.string "Cough! I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n"
-	.string "Good to meet you! Cough!$"
-
-gText_082B71C1:: @ 82B71C1
-	.string "This is nerve-racking…\n"
-	.string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$"
-
-gText_082B71F9:: @ 82B71F9
-	.string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice,\n"
-	.string "and that’s no lie.$"
-
-gText_082B7229:: @ 82B7229
-	.string "Are you… {PLAYER}?\n"
-	.string "Oh! Sniff…sob…\p"
-	.string "Oh! S-sorry…\n"
-	.string "I’m so nervous, I can’t help crying…\p"
-	.string "I’m {STR_VAR_1}, and I really look up\n"
-	.string "to you, {PLAYER}.\p"
-	.string "I… I had this dream of one day meeting\n"
-	.string "you and asking you about POKéMON.\p"
-	.string "Please, please, {PLAYER}!\n"
-	.string "Please teach me about POKéMON!$"
-
-gText_082B731C:: @ 82B731C
-	.string "Oh… B-but…\n"
-	.string "Snivel… Waaaaaaah!\p"
-	.string "Please!\n"
-	.string "I’m begging you, please!$"
-
-gText_082B735B:: @ 82B735B
-	.string "Oh, really? You will?\n"
-	.string "Awesome! Wicked! Awoooh!\p"
-	.string "Oh… I’m sorry…\n"
-	.string "I’m so happy, I’m crying…\p"
-	.string "Um… Then please tell me!\n"
-	.string "It’s about the BATTLE TOWER.\p"
-	.string "Which would be better for me: Level 50\n"
-	.string "or the Open Level?$"
-
-gText_082B7423:: @ 82B7423
-	.string "{STR_VAR_1}?\n"
-	.string "Waaaaah!\p"
-	.string "Oh! I’m so sorry!\n"
-	.string "You’ve made me happy by choosing\l"
-	.string "the level for me, and it’s made me cry…\p"
-	.string "Snivel…\n"
-	.string "Thank you so much!\l"
-	.string "Please talk with me again!$"
-
-gText_082B74C1:: @ 82B74C1
-	.string "Wowee! You’re {PLAYER}, aren’t you?\n"
-	.string "You’re awesomely strong, aren’t you?\p"
-	.string "I’m {STR_VAR_1}!\n"
-	.string "I just became a TRAINER!\p"
-	.string "Please, {PLAYER}!\n"
-	.string "Can you be my teacher and tell me\l"
-	.string "lots about being a TRAINER?$"
-
-gText_082B756F:: @ 82B756F
-	.string "Aww, why?\n"
-	.string "Oh, please? Pretty please?\l"
-	.string "Please be my teacher, please!$"
-
-gText_082B75B2:: @ 82B75B2
-	.string "Yay! Great!\p"
-	.string "The first thing I wanted to ask you is\n"
-	.string "about the BATTLE TOWER!\p"
-	.string "The Level 50 and Open Level Rooms…\n"
-	.string "Which would be perfect for me?$"
-
-gText_082B763F:: @ 82B763F
-	.string "{STR_VAR_1}, huh? That’s true!\n"
-	.string "I’ll do my best there!\p"
-	.string "If we meet here again, please teach\n"
-	.string "me something else, teacher!$"
-
-gText_082B76AC:: @ 82B76AC
-	.string "Um… Are you {PLAYER}?\n"
-	.string "My name is {STR_VAR_1}.\p"
-	.string "I want to become a POKéMON TRAINER,\n"
-	.string "but I don’t know what to do…\p"
-	.string "So I thought maybe I could ask you for\n"
-	.string "advice because you’re so famous.\p"
-	.string "{PLAYER}, could you give me advice?$"
-
-gText_082B7772:: @ 82B7772
-	.string "Oh, but…\p"
-	.string "I sincerely want to become a POKéMON\n"
-	.string "TRAINER!\p"
-	.string "Please, can you answer my questions?$"
-
-gText_082B77CE:: @ 82B77CE
-	.string "Thank you!\n"
-	.string "Here’s my first question right away!\p"
-	.string "The BATTLE TOWER has two levels,\n"
-	.string "Level 50 and Open Level, right?\p"
-	.string "Which level do you think is more\n"
-	.string "suitable for me?$"
-
-gText_082B7871:: @ 82B7871
-	.string "Oh, the {STR_VAR_1} challenge?\n"
-	.string "Understood!\p"
-	.string "If I have another question, I’ll come\n"
-	.string "back here for your advice!$"
-
-gText_082B78D4:: @ 82B78D4
-	.string "Oh? Huh? You’re…\n"
-	.string "No, that can’t be true.\p"
-	.string "There isn’t any way that someone\n"
-	.string "like me could meet {PLAYER}.\p"
-	.string "…You really are {PLAYER}?\n"
-	.string "I can’t believe I’m talking to you!\p"
-	.string "When something this good happens,\n"
-	.string "only terrible things will happen to me\l"
-	.string "now, I just know it…\p"
-	.string "…I’m sorry…\n"
-	.string "I’m… {STR_VAR_1}…\p"
-	.string "There isn’t anything special about\n"
-	.string "me that I can be proud of…\p"
-	.string "I shouldn’t even say anything about\n"
-	.string "myself because you’ll forget…\p"
-	.string "I had this dream that if I ever met\n"
-	.string "you, {PLAYER}, that maybe I could ask\l"
-	.string "you for advice as a TRAINER.\p"
-	.string "But I don’t think you would agree\n"
-	.string "to that.\p"
-	.string "…Or will you be so kind as to give\n"
-	.string "me advice?$"
-
-gText_082B7B1A:: @ 82B7B1A
-	.string "I knew it…\p"
-	.string "It had to happen because I’m such\n"
-	.string "a really boring nobody…\p"
-	.string "But I thought just maybe…\n"
-	.string "You won’t reconsider, will you?\p"
-	.string "But I can’t give up just like that.\n"
-	.string "I’ll ask you while I’m still lucky!\p"
-	.string "Please, will you be so kind as to give\n"
-	.string "me advice?$"
-
-gText_082B7C13:: @ 82B7C13
-	.string "Really? I can’t believe it!\n"
-	.string "I can’t believe you’ll advise me!\l"
-	.string "I… I’m so happy…\p"
-	.string "What I want to ask you is really\n"
-	.string "trivial, but I can’t decide…\p"
-	.string "At the BATTLE TOWER, they let you\n"
-	.string "choose Level 50 or Open Level.\p"
-	.string "Which course do you think even I may\n"
-	.string "have a chance at?$"
-
-gText_082B7D18:: @ 82B7D18
-	.string "{STR_VAR_1}? Okay!\n"
-	.string "But do you really think someone like\l"
-	.string "me would have a chance?\p"
-	.string "I’ll do my best, even though I don’t\n"
-	.string "think it will work.\p"
-	.string "Thank you very much for spending\n"
-	.string "time with someone like me.$"
-
-gText_082B7DD4:: @ 82B7DD4
-	.string "Oh! You’re {PLAYER}{STRING 5}, aren’t you?\p"
-	.string "I’ve heard that you’re tough at\n"
-	.string "POKéMON!\p"
-	.string "I’m {STR_VAR_1}!\n"
-	.string "I’ll be your friend!\p"
-	.string "Did you know?\p"
-	.string "You can’t win at the BATTLE FRONTIER\n"
-	.string "if all you know is what they teach at\l"
-	.string "the TRAINER’S SCHOOL.\p"
-	.string "I’m willing to listen to your advice.\n"
-	.string "You’ll agree, of course?$"
-
-gText_082B7EE5:: @ 82B7EE5
-	.string "Huh? Why are you refusing me?\n"
-	.string "It’s me who’s asking you!\l"
-	.string "You have to reconsider!$"
-
-gText_082B7F35:: @ 82B7F35
-	.string "Okay, so there is this something.\n"
-	.string "I want you to decide it for me.\p"
-	.string "You know that the BATTLE TOWER has\n"
-	.string "Level 50 and Open Level Rooms?\p"
-	.string "Which do you think would be good\n"
-	.string "for me, {PLAYER}{STRING 5}?$"
-
-gText_082B7FE8:: @ 82B7FE8
-	.string "Okay, {STR_VAR_1} is suitable for me?\n"
-	.string "Thank you!\p"
-	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{STRING 5}, I won’t be so upset if\l"
-	.string "I lose.\p"
-	.string "Okay, I’ll look to you for advice again.\n"
-	.string "Bye!$"
-
-gText_082B8087:: @ 82B8087
-	.string "Oh, hi, there! {PLAYER}{STRING 5}!\n"
-	.string "I know you because you’re famous!\l"
-	.string "Call me {STR_VAR_1}! Glad to meet you!\p"
-	.string "I’m a TRIATHLETE, so I keep myself\n"
-	.string "fit even while I raise POKéMON.\p"
-	.string "I’m also involved with other things\n"
-	.string "like work, napping, ballroom dancing…\p"
-	.string "Being this busy, it’s not so easy for\n"
-	.string "me to become a decent TRAINER.\p"
-	.string "So, I have a proposition!\p"
-	.string "There must be a reason why we met.\n"
-	.string "So, {PLAYER}{STRING 5}, how about sharing your\l"
-	.string "wisdom with me every so often?$"
-
-gText_082B822B:: @ 82B822B
-	.string "Oh, but, please?\n"
-	.string "A guy like me needs someone like\l"
-	.string "you, {PLAYER}{STRING 5}!\p"
-	.string "Honestly, I need your advice!$"
-
-gText_082B8286:: @ 82B8286
-	.string "Thank you! That’s more like it!\n"
-	.string "So, let’s start with an easy one!\p"
-	.string "You know about the BATTLE TOWER’s\n"
-	.string "two courses, right?\l"
-	.string "You know, Level 50 and Open Level.\p"
-	.string "Me being a busy guy, which one should\n"
-	.string "I gear up for?$"
-
-gText_082B8356:: @ 82B8356
-	.string "{STR_VAR_1}, huh? Okay, gotcha.\n"
-	.string "I’ll find time somehow and give it a go!\p"
-	.string "…Whoops, I’d better go to work!\n"
-	.string "Thanks! See you around!$"
-
-gText_082B83CE:: @ 82B83CE
-	.string "No way! Uh-uh!\n"
-	.string "Are you maybe the real {PLAYER}?\p"
-	.string "A-hah! Awesome! I’m {STR_VAR_1},\n"
-	.string "so pleased to meet you!\p"
-	.string "{PLAYER}, you’re very strong,\n"
-	.string "aren’t you?\p"
-	.string "Everyone’s talking about you!\p"
-	.string "Oh! I just had this great idea!\n"
-	.string "I’ll get advice off you, {PLAYER}!\l"
-	.string "I’m sure it will make me tougher!\p"
-	.string "Isn’t it a great idea?\n"
-	.string "Please, I want your advice!$"
-
-gText_082B84FC:: @ 82B84FC
-	.string "Ahahaha, you can pretend to be mean,\n"
-	.string "but you can’t fool me!\l"
-	.string "You really mean okay, don’t you?$"
-
-gText_082B8559:: @ 82B8559
-	.string "Yay! I knew you’d have a big heart,\n"
-	.string "{PLAYER}!\p"
-	.string "What should I ask you first?\n"
-	.string "…Oh, I thought of something!\p"
-	.string "Drum roll, please!\n"
-	.string "The question I have is…\p"
-	.string "If I were to take a BATTLE TOWER\n"
-	.string "challenge, which way should I go?\p"
-	.string "Level 50 or Open Level?\n"
-	.string "Which suits me more?$"
-
-gText_082B8656:: @ 82B8656
-	.string "Oh-oh-oh!\n"
-	.string "{STR_VAR_1}, you say!\l"
-	.string "Thank you for a totally cool reply!\p"
-	.string "I guess that’s about all I wanted\n"
-	.string "to ask you today.\p"
-	.string "Let’s meet here again, okay?\n"
-	.string "Thanks!$"
-
-gText_082B86EA:: @ 82B86EA
-	.string "I beg your pardon, but…\n"
-	.string "Are you {PLAYER}?\p"
-	.string "I’m {STR_VAR_1}, and I am delighted to\n"
-	.string "make your acquaintance.\p"
-	.string "I have long been an admirer\n"
-	.string "of yours…\p"
-	.string "… … … … … …\p"
-	.string "Um… I hope you don’t find this\n"
-	.string "request too much of a burden, but…\p"
-	.string "May I become your apprentice,\n"
-	.string "{PLAYER}?$"
-
-gText_082B87DA:: @ 82B87DA
-	.string "Oh…!\p"
-	.string "… … … … … …\n"
-	.string "… … … … … …\p"
-	.string "…I must have fainted from shock.\n"
-	.string "I’m sorry, I must have misheard you.\p"
-	.string "Please! Please say that you will\n"
-	.string "accept me as your apprentice!$"
-
-gText_082B887C:: @ 82B887C
-	.string "Oh… I’m delighted!\p"
-	.string "I don’t wish to waste your time,\n"
-	.string "so please advise me on this.\p"
-	.string "I plan to take a BATTLE TOWER\n"
-	.string "challenge soon.\p"
-	.string "However, there are two levels…\p"
-	.string "Which would be most suitable for me?\n"
-	.string "Level 50 or Open Level?$"
-
-gText_082B8957:: @ 82B8957
-	.string "{STR_VAR_1} is your choice!\n"
-	.string "I see. I will do my best!\p"
-	.string "Thank you, {PLAYER}.\n"
-	.string "I hope I can count on you again.\l"
-	.string "Please take care!$"
-
-gText_082B89C6:: @ 82B89C6
-	.string "Eek! Eek! {PLAYER}!\n"
-	.string "You spoke to me!\l"
-	.string "I… I’m overjoyed!\p"
-	.string "Me! My name is {STR_VAR_1}!\n"
-	.string "I just became a TRAINER!\p"
-	.string "I’m delighted I met you, {PLAYER},\n"
-	.string "the big name in POKéMON circles!\p"
-	.string "Oh-oh-oh, I know!\n"
-	.string "May I ask a huge favor, {PLAYER}?\p"
-	.string "Please take me in as your apprentice!\n"
-	.string "I want to learn from you!$"
-
-gText_082B8ACF:: @ 82B8ACF
-	.string "Waaaah!\n"
-	.string "{PLAYER} turned me down…\l"
-	.string "It… It’s an invaluable experience!\p"
-	.string "{PLAYER}, please! I want to hear\n"
-	.string "an affirmative answer this time!\p"
-	.string "I beg you for your guidance!$"
-
-gText_082B8B66:: @ 82B8B66
-	.string "Hieeeeh! {PLAYER} said yes!\n"
-	.string "{PLAYER} said yes!\p"
-	.string "I won’t be able to sleep tonight…\n"
-	.string "Thank you ever so much!\p"
-	.string "Then, here’s my question!\p"
-	.string "At the BATTLE TOWER, what is right\n"
-	.string "for me, Level 50 or Open Level?$"
-
-gText_082B8C20:: @ 82B8C20
-	.string "{STR_VAR_1}! Perfectly understood!\n"
-	.string "I understand perfectly!\l"
-	.string "I’m deliriously delighted!\p"
-	.string "I hope you’ll be willing to teach me\n"
-	.string "some more another time.$"
-
-gText_082B8CAA:: @ 82B8CAA
-	.string "Whoa! Could you be…\n"
-	.string "Might you be… {PLAYER}{STRING 5}?!\l"
-	.string "That strong and famous TRAINER?\l"
-	.string "Well, hello, aren’t I just the luckiest!\p"
-	.string "Hello, the name’s {STR_VAR_1}!\p"
-	.string "I’ve been on the lookout for\n"
-	.string "a POKéMON teacher.\p"
-	.string "And with impeccably good timing,\n"
-	.string "along came you, {PLAYER}{STRING 5}!\p"
-	.string "So, there you have it, {PLAYER}{STRING 5}!\n"
-	.string "Let me apprentice under you!$"
-
-gText_082B8DD3:: @ 82B8DD3
-	.string "Gwaaaah!\n"
-	.string "You’re quite cool and tough…\p"
-	.string "Don’t be that way, please.\n"
-	.string "I’m asking you!$"
-
-gText_082B8E24:: @ 82B8E24
-	.string "Oh, yeah! That’s a solid reply!\n"
-	.string "Excellent, I might add!\p"
-	.string "So how about a first piece of advice\n"
-	.string "on the BATTLE TOWER?\p"
-	.string "If I were to go, what would be better?\n"
-	.string "Level 50 or Open Level?$"
-
-gText_082B8ED5:: @ 82B8ED5
-	.string "Uh-huh, {STR_VAR_1} it is!\n"
-	.string "OK, A-OK!\l"
-	.string "I’ll go show my mettle, like, jam!\p"
-	.string "All right, I’ll look to you as my mentor!\n"
-	.string "Adios!$"
-
-gText_082B8F45:: @ 82B8F45
-	.string "Oh, hey, {PLAYER}{STRING 5}, right?\n"
-	.string "The police were looking for you!\p"
-	.string "… … …\n"
-	.string "Of course I’m lying!\p"
-	.string "Me, I’m {STR_VAR_1}. Despite the way\n"
-	.string "I look, I’m the POKéMON CHAMPION!\l"
-	.string "…That’s a lie, too!\p"
-	.string "This is no lie, though.\n"
-	.string "I’m not very good at battling.\p"
-	.string "So, how about you becoming my master\n"
-	.string "about all things POKéMON?$"
-
-gText_082B905F:: @ 82B905F
-	.string "If you’re going to act cold like that,\n"
-	.string "I’ll show you what I’ll do!\p"
-	.string "Waaah! Waaah! Waaah!\n"
-	.string "Hiccup!\p"
-	.string "Hahaha, that was my FAKE TEARS!\p"
-	.string "Come on, will you please be\n"
-	.string "my POKéMON master?$"
-
-gText_082B910E:: @ 82B910E
-	.string "Yippee!\n"
-	.string "I’ll buy you a boat for that!\p"
-	.string "Of course I’m lying again!\n"
-	.string "But… Thank you, master!\p"
-	.string "You know how there’s Level 50 and\n"
-	.string "Open Level at the BATTLE TOWER?\p"
-	.string "I’m having trouble deciding which\n"
-	.string "level I should challenge…\p"
-	.string "Can you decide for me, master?$"
-
-gText_082B9204:: @ 82B9204
-	.string "Okay, so {STR_VAR_1} is better!\n"
-	.string "I’ll go to the other level, then!\p"
-	.string "Just kidding!\n"
-	.string "I’ll obey your teaching, master!\p"
-	.string "Thanks, master!\n"
-	.string "I hope you’ll keep teaching me!$"
-
-gText_082B929C:: @ 82B929C
-	.string "A-H-O-Y!\n"
-	.string "And that spells ahoy, and it means hi!\p"
-	.string "I’m {STR_VAR_1}, the rappin’ SAILOR\n"
-	.string "am I!\p"
-	.string "Your turn now, tell me a little about\n"
-	.string "yourself, give it a try!\p"
-	.string "Uh-huh, uh-huh!\n"
-	.string "{PLAYER}{STRING 5}’s your name,\l"
-	.string "and POKéMON’s your game!\p"
-	.string "And you’re at a delicate age\n"
-	.string "when all the world’s your stage!\p"
-	.string "Anyway, I just want to say,\n"
-	.string "that you’re the tenth TRAINER\l"
-	.string "I’ve spoken to today.\p"
-	.string "Let’s make that a celebration!\n"
-	.string "Become my mentor for commemoration!$"
-
-gText_082B9438:: @ 82B9438
-	.string "But!\n"
-	.string "You have to work with me!\p"
-	.string "Don’t be such a tease!\n"
-	.string "Become my mentor, please!$"
-
-gText_082B9488:: @ 82B9488
-	.string "That’s it!\n"
-	.string "{PLAYER}, you’ve got the spirit!\p"
-	.string "So here’s my first question\n"
-	.string "that begs your suggestion!\p"
-	.string "It’s about the BATTLE TOWER,\n"
-	.string "and it hinges on my power!\p"
-	.string "Level 50 and Open Level there be,\n"
-	.string "which is the one that’s good for me?$"
-
-gText_082B9564:: @ 82B9564
-	.string "Okay, {STR_VAR_1} it is, you say!\n"
-	.string "I’ll go and take it on my way!\p"
-	.string "If it’s advice I ever need,\n"
-	.string "{PLAYER}, your word I’ll always heed!$"
-
-gText_082B95D8:: @ 82B95D8
-	.string "Say, hey, aren’t you {PLAYER}?\n"
-	.string "What should I do? Talk to you?\l"
-	.string "Why not? I’m already talking to you!\p"
-	.string "{PLAYER}, are you surprised at me?\n"
-	.string "I’d better tell you who I happen to be!\p"
-	.string "{STR_VAR_1} is what you can call me.\n"
-	.string "The brightest star in guitardom,\l"
-	.string "that’s me!\p"
-	.string "Are you receiving me?\n"
-	.string "You are receiving me!\p"
-	.string "My luck’s at its best,\n"
-	.string "I’ll hit you with a request!\p"
-	.string "{PLAYER}, let me be your underling!\n"
-	.string "I want you to teach me everything!$"
-
-gText_082B9763:: @ 82B9763
-	.string "You’re turning me down, then?\n"
-	.string "I’ll just have to ask you again!\p"
-	.string "{PLAYER}, I beg to be your underling!\n"
-	.string "I need you to teach me everything!$"
-
-gText_082B97E5:: @ 82B97E5
-	.string "Lucky, yeah, woohoo!\n"
-	.string "Should I pop a question to you?\p"
-	.string "Since we’re near the BATTLE TOWER,\n"
-	.string "how about a question about its power?\p"
-	.string "Of the choices you see,\n"
-	.string "which is the right one for me?$"
-
-gText_082B989A:: @ 82B989A
-	.string "If {STR_VAR_1} is what you suggest,\n"
-	.string "it must be the very best!\p"
-	.string "Well, {PLAYER}, I have to roam free,\n"
-	.string "but don’t you forget about me.\p"
-	.string "See you again, my smart friend!$"
-
-gText_082B992D:: @ 82B992D
-	.string "Oh, hi! You there!\n"
-	.string "Can I get you to massage my shoulder?\p"
-	.string "…Yes, there! That’s it!\n"
-	.string "Ouch, ouch! Oooh, that feels great!\p"
-	.string "My name’s {STR_VAR_1}.\n"
-	.string "I take karate training, but my body’s\l"
-	.string "not built to take the abuse…\p"
-	.string "I decided I’ll battle POKéMON and\n"
-	.string "toughen myself up.\p"
-	.string "You’re {PLAYER}{STRING 5}, aren’t you?\n"
-	.string "The POKéMON LEAGUE CHAMP?\p"
-	.string "Listen, can I get you to give me\n"
-	.string "advice?$"
-
-gText_082B9A84:: @ 82B9A84
-	.string "Oh, why?\p"
-	.string "I won’t be a big bother, I promise!\n"
-	.string "Please?$"
-
-gText_082B9AB9:: @ 82B9AB9
-	.string "Thank you. Mighty good of you!\n"
-	.string "…Cough! Cough!\p"
-	.string "Oogh, I have to toughen up quick…\p"
-	.string "I’ll be heading off to the BATTLE TOWER\n"
-	.string "right away, but what would be better\l"
-	.string "for me? Level 50 or Open Level?$"
-
-gText_082B9B76:: @ 82B9B76
-	.string "Hm, all right. That’s {STR_VAR_1}.\n"
-	.string "I’ll go there right away.\p"
-	.string "I hope I can keep hitting you up for\n"
-	.string "help--after all, you’re my mentor!$"
-
-gText_082B9BF2:: @ 82B9BF2
-	.string "Er… Um…\n"
-	.string "{PLAYER}{STRING 5}…?\p"
-	.string "Please, don’t look at me that way.\n"
-	.string "You’re making me all self-conscious.\p"
-	.string "I… I’m {STR_VAR_1}.\p"
-	.string "I’m really embarrassed to say this,\n"
-	.string "but I explore ancient ruins and such.\p"
-	.string "I’m even more embarrassed to admit\n"
-	.string "I’m interested in the BATTLE FRONTIER.\p"
-	.string "{PLAYER}{STRING 5}, you have a reputation as\n"
-	.string "a tough TRAINER…\p"
-	.string "It’s hard for me to say this,\n"
-	.string "but I want to ask something.\p"
-	.string "Could you become my teacher and\n"
-	.string "give me advice?$"
-
-gText_082B9D83:: @ 82B9D83
-	.string "Please don’t brush me off like this!\n"
-	.string "I can’t live with the humiliation.\p"
-	.string "Please become my teacher!\n"
-	.string "I need your advice!$"
-
-gText_082B9DF9:: @ 82B9DF9
-	.string "Th-thank you…\p"
-	.string "But please don’t look at me like that.\n"
-	.string "It makes me all flustered.\p"
-	.string "Please, answer me without looking\n"
-	.string "at my eyes.\p"
-	.string "At the BATTLE TOWER…\n"
-	.string "Which level should I attempt?$"
-
-gText_082B9EAA:: @ 82B9EAA
-	.string "Oh… Okay!\n"
-	.string "I’ll try my hand at that.\p"
-	.string "I hope I can make a valiant challenge\n"
-	.string "without getting all flustered…\p"
-	.string "Thank you, {PLAYER}{STRING 5}.\n"
-	.string "If we meet again, I hope you will be\l"
-	.string "as helpful.$"
-
-gText_082B9F55:: @ 82B9F55
-	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
-	.string "But are you really real?\p"
-	.string "You may call me {STR_VAR_1}.\p"
-	.string "I have been toying with the idea of\n"
-	.string "apprenticing under a strong TRAINER.\p"
-	.string "So, I must say I’m lucky you came along!\n"
-	.string "…You really are {PLAYER}{STRING 5}, yes?\p"
-	.string "No, no, if you are real, it’s fine.\n"
-	.string "I merely want you to recognize me\l"
-	.string "as your apprentice.$"
-
-gText_082BA084:: @ 82BA084
-	.string "Oh?\n"
-	.string "But what would compel you to refuse?\p"
-	.string "I apologize for being skeptical about\n"
-	.string "your identity.\p"
-	.string "Please accept my apology and\n"
-	.string "accept me as your apprentice.$"
-
-gText_082BA11D:: @ 82BA11D
-	.string "You really are accepting me?\n"
-	.string "I don’t wish to celebrate prematurely.\p"
-	.string "If it is true, I apologize.\n"
-	.string "But now, I need your advice.\p"
-	.string "If I were to enter the BATTLE TOWER,\n"
-	.string "what would be worthy of me?\l"
-	.string "Level 50 or Open Level?$"
-
-gText_082BA1F3:: @ 82BA1F3
-	.string "{STR_VAR_1}?\n"
-	.string "Are you certain?\p"
-	.string "I see. If that’s the case, that’s fine.\n"
-	.string "I thank you for your time.\p"
-	.string "I realize I can annoy, but it delights\n"
-	.string "me that you have accepted me.\p"
-	.string "Let us meet again!$"
-
-gText_082BA2A3:: @ 82BA2A3
-	.string "Sigh… Sob…\n"
-	.string "Oh, {PLAYER}!\p"
-	.string "I’m all tangled up in a dilemma\n"
-	.string "that I can’t decide.\p"
-	.string "I can’t decide what I should make\n"
-	.string "my {STR_VAR_1} hold.\p"
-	.string "Please tell me, {PLAYER}.\n"
-	.string "What item should I make it hold?$"
-
-gText_082BA34E:: @ 82BA34E
-	.string "Oh, really? I shouldn’t make\n"
-	.string "my {STR_VAR_1} hold anything?$"
-
-gText_082BA380:: @ 82BA380
-	.string "Oh, okay! I’m delighted it’s settled!\n"
-	.string "Awesome! Wicked! Awoooh!\p"
-	.string "Thank you so much!$"
-
-gText_082BA3D2:: @ 82BA3D2
-	.string "Oh, I’m so glad…\n"
-	.string "I think I have that {STR_VAR_1}, too.\p"
-	.string "I’m delighted it’s settled!\n"
-	.string "Awesome! Wicked! Awoooh!\p"
-	.string "Thank you so much!$"
-
-gText_082BA448:: @ 82BA448
-	.string "Waaaah! Please don’t be mean!\p"
-	.string "That item {STR_VAR_1} was already\n"
-	.string "recommended to me before, sob…\p"
-	.string "Or do you mean I shouldn’t make\n"
-	.string "my {STR_VAR_2} hold anything?$"
-
-gText_082BA4D3:: @ 82BA4D3
-	.string "Yay! It’s {PLAYER}!\n"
-	.string "Great! I wanted to ask you something!\p"
-	.string "Do you make your POKéMON hold items?\n"
-	.string "I want to make mine hold items, but…\p"
-	.string "What item would be good for\n"
-	.string "{STR_VAR_1} to hold?\p"
-	.string "What do you think?$"
-
-gText_082BA58C:: @ 82BA58C
-	.string "Huh? You mean my {STR_VAR_1} doesn’t\n"
-	.string "have to hold anything?$"
-
-gText_082BA5BF:: @ 82BA5BF
-	.string "Oh, I get it! I’ll do that!\n"
-	.string "Thanks for teaching me!$"
-
-gText_082BA5F3:: @ 82BA5F3
-	.string "Oh, wow! One {STR_VAR_1}, huh?\n"
-	.string "Okay, I’ll do that!\p"
-	.string "Thanks for teaching me!$"
-
-gText_082BA635:: @ 82BA635
-	.string "Oh, uh, no, that’s not what I meant.\n"
-	.string "I want to know about a different item\l"
-	.string "than the ones I already know.\p"
-	.string "Or do you mean that my POKéMON doesn’t\n"
-	.string "have to hold anything this time?$"
-
-gText_082BA6E6:: @ 82BA6E6
-	.string "{PLAYER}, hello!\n"
-	.string "It’s about my {STR_VAR_1}…\p"
-	.string "I want to make it hold a good item.\n"
-	.string "What would be good for it?$"
-
-gText_082BA742:: @ 82BA742
-	.string "Oh, then my {STR_VAR_1} doesn’t have\n"
-	.string "to hold anything?$"
-
-gText_082BA770:: @ 82BA770
-	.string "Okay, I got it!\n"
-	.string "See you again!$"
-
-gText_082BA78F:: @ 82BA78F
-	.string "Oh, the item {STR_VAR_1}?\n"
-	.string "Understood!\p"
-	.string "I’ll do my best to find one!\n"
-	.string "See you again!$"
-
-gText_082BA7D8:: @ 82BA7D8
-	.string "Somebody taught me about\n"
-	.string "the {STR_VAR_1} already.\p"
-	.string "I want my POKéMON to hold a different\n"
-	.string "kind of item.\p"
-	.string "Or do you think {STR_VAR_2} doesn’t\n"
-	.string "have to hold anything?$"
-
-gText_082BA867:: @ 82BA867
-	.string "Hello, {PLAYER}…\n"
-	.string "I’m sorry to disturb you, but I have\l"
-	.string "something else I wanted to ask you.\p"
-	.string "I don’t think I’m good enough to win\n"
-	.string "matches on my own, so I’m thinking of\l"
-	.string "making my {STR_VAR_1} hold an item.\p"
-	.string "But I don’t know what would be good.\p"
-	.string "{PLAYER}, please, could you decide\n"
-	.string "for me?$"
-
-gText_082BA96B:: @ 82BA96B
-	.string "A POKéMON belonging to someone like me\n"
-	.string "would be better off without an item?$"
-
-gText_082BA9B7:: @ 82BA9B7
-	.string "I understand…\n"
-	.string "You’re saying I shouldn’t rely on items.\l"
-	.string "I’ll do my best not to!\p"
-	.string "Thank you very much!$"
-
-gText_082BAA1B:: @ 82BAA1B
-	.string "The item {STR_VAR_1}, okay.\n"
-	.string "I’m not sure if I can get one…\l"
-	.string "No! I’ll do my best to get it.\p"
-	.string "Thank you very much!$"
-
-gText_082BAA81:: @ 82BAA81
-	.string "Oh, but…\n"
-	.string "I think I’ve heard about that before…\p"
-	.string "Is it maybe because I haven’t handled\n"
-	.string "the item {STR_VAR_1} very well?\p"
-	.string "Or do you mean I shouldn’t make\n"
-	.string "my {STR_VAR_2} hold anything?$"
-
-gText_082BAB22:: @ 82BAB22
-	.string "Oh, {PLAYER}{STRING 5}.\n"
-	.string "There’s something I wanted to ask you.\p"
-	.string "You know how you decided which\n"
-	.string "POKéMON I should have for me?\p"
-	.string "But I never asked you what item\n"
-	.string "it should be holding.\p"
-	.string "Since you already gave me advice,\n"
-	.string "how about seeing this to the end?\p"
-	.string "What would be good? I want to make\n"
-	.string "my {STR_VAR_1} hold something.$"
-
-gText_082BAC43:: @ 82BAC43
-	.string "Oh! So my {STR_VAR_1} should do\n"
-	.string "the best it can empty-handed?$"
-
-gText_082BAC78:: @ 82BAC78
-	.string "If you think that’s best, I’ll do that.\p"
-	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{STRING 5}, I won’t be so upset if\l"
-	.string "I lose.\p"
-	.string "Okay, I’ll look to you for advice again.\n"
-	.string "Bye!$"
-
-gText_082BAD17:: @ 82BAD17
-	.string "The item {STR_VAR_1}, huh?\n"
-	.string "Not bad. I’ll use it!\p"
-	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{STRING 5}, I won’t be so upset if\l"
-	.string "I lose.\p"
-	.string "Okay, I’ll look to you for advice again.\n"
-	.string "Bye!$"
-
-gText_082BADB6:: @ 82BADB6
-	.string "Huh? What are you saying?\n"
-	.string "You told me about the {STR_VAR_1}\l"
-	.string "already before.\p"
-	.string "Or do you mean my {STR_VAR_2} should\n"
-	.string "do the best it can empty-handed?$"
-
-gText_082BAE36:: @ 82BAE36
-	.string "Yo, {PLAYER}{STRING 5}!\p"
-	.string "We’re both busy, but we seem to run\n"
-	.string "into each other often anyway!\p"
-	.string "Today I have to do some walking,\n"
-	.string "cleaning, and brushing.\p"
-	.string "I haven’t even had the time to buy\n"
-	.string "my precious {STR_VAR_1} anything.\p"
-	.string "I don’t have any time, so how about\n"
-	.string "giving me advice on what I should make\l"
-	.string "my {STR_VAR_1} hold?$"
-
-gText_082BAF4E:: @ 82BAF4E
-	.string "Oh, so me being a busy guy, you say\n"
-	.string "my {STR_VAR_1} doesn’t need anything?$"
-
-gText_082BAF8F:: @ 82BAF8F
-	.string "Okay, gotcha.\n"
-	.string "I won’t need any time for that.\p"
-	.string "Thanks today!\n"
-	.string "See you around!$"
-
-gText_082BAFDB:: @ 82BAFDB
-	.string "Okay, gotcha.\n"
-	.string "I’ll find time somehow and find\l"
-	.string "that {STR_VAR_1} you recommended.\p"
-	.string "I’m glad I met a good mentor in you.\n"
-	.string "Thanks! See you around!$"
-
-gText_082BB05F:: @ 82BB05F
-	.string "Huh? I already know about\n"
-	.string "that {STR_VAR_1}.\p"
-	.string "Oh, right, I get it.\n"
-	.string "So me being a busy guy, you say\l"
-	.string "my {STR_VAR_2} doesn’t need anything?$"
-
-gText_082BB0D4:: @ 82BB0D4
-	.string "Hiya, {PLAYER}! It’s me!\n"
-	.string "I need to tap your mind again today.\l"
-	.string "Please, I need your advice!\p"
-	.string "Drum roll, please!\n"
-	.string "The question I have is…\p"
-	.string "If I want to make my {STR_VAR_1} hold\n"
-	.string "an item, what should it be?$"
-
-gText_082BB18C:: @ 82BB18C
-	.string "Is that right? My {STR_VAR_1} doesn’t\n"
-	.string "need to hold an item, you’re saying.$"
-
-gText_082BB1CE:: @ 82BB1CE
-	.string "Okay, that’s what I’ll do!\p"
-	.string "I guess that’s about all I wanted\n"
-	.string "to ask you today.\p"
-	.string "Let’s meet here again, okay?\n"
-	.string "Thanks!$"
-
-gText_082BB242:: @ 82BB242
-	.string "Uh-huh! One {STR_VAR_1}.\n"
-	.string "What a cool choice!\l"
-	.string "I’ll definitely try that!\p"
-	.string "I guess that’s about all I wanted\n"
-	.string "to ask you today.\p"
-	.string "Let’s meet here again, okay?\n"
-	.string "Thanks!$"
-
-gText_082BB2D9:: @ 82BB2D9
-	.string "Ahahah! That’s silly!\n"
-	.string "You already told me about that\l"
-	.string "{STR_VAR_1} before!\p"
-	.string "Are you feeling okay, {PLAYER}?\p"
-	.string "Oh, wait! My {STR_VAR_2} doesn’t\n"
-	.string "need to hold an item, you’re saying.$"
-
-gText_082BB370:: @ 82BB370
-	.string "Hello, {PLAYER}. I hope you’ve been\n"
-	.string "keeping well.\p"
-	.string "May I approach you for advice?\p"
-	.string "In a recent battle, my opponent\n"
-	.string "seemed to have given his POKéMON\l"
-	.string "an item to hold.\p"
-	.string "As a result, I was defeated…\p"
-	.string "I don’t wish to be left behind.\n"
-	.string "I would like to make my {STR_VAR_1}\l"
-	.string "hold an item, too.\p"
-	.string "It would please me if you could decide\n"
-	.string "what would be right for my POKéMON…$"
-
-gText_082BB4C3:: @ 82BB4C3
-	.string "In other words… My POKéMON has\n"
-	.string "no need to hold an item?$"
-
-gText_082BB4FB:: @ 82BB4FB
-	.string "I understand clearly now!\n"
-	.string "I will keep trying like this.\p"
-	.string "Thank you, {PLAYER}.\n"
-	.string "I hope I can count on you again.\l"
-	.string "Please take care!$"
-
-gText_082BB575:: @ 82BB575
-	.string "One {STR_VAR_1} it is!\n"
-	.string "I will order it right away.\p"
-	.string "Thank you, {PLAYER}.\n"
-	.string "I hope I can count on you again.\l"
-	.string "Please take care!$"
-
-gText_082BB5E1:: @ 82BB5E1
-	.string "You’ve already told me about that,\n"
-	.string "and I already have it.\p"
-	.string "Or are you saying… My POKéMON has\n"
-	.string "no need to hold an item?$"
-
-gText_082BB656:: @ 82BB656
-	.string "Eek! {PLAYER}!\n"
-	.string "I… I’m overjoyed to see you again!\p"
-	.string "Oh-oh-oh! There’s something I just\n"
-	.string "had to ask you, {PLAYER}!\p"
-	.string "Please decide what my {STR_VAR_1}\n"
-	.string "should be holding!$"
-
-gText_082BB6E5:: @ 82BB6E5
-	.string "Oh, wow! I didn’t expect that answer!\n"
-	.string "So, a hold item isn’t necessary?$"
-
-gText_082BB72C:: @ 82BB72C
-	.string "Perfectly understood!\n"
-	.string "I’ll keep at this without an item!\p"
-	.string "I hope you’ll be willing to teach me\n"
-	.string "some more another time.$"
-
-gText_082BB7A2:: @ 82BB7A2
-	.string "{STR_VAR_1}! I’ll use that!\p"
-	.string "Um… Could it be, {PLAYER}, you also\n"
-	.string "make your POKéMON hold that item?\p"
-	.string "I’ll be sure to get it!\n"
-	.string "I hope you’ll be willing to teach me\l"
-	.string "some more another time.$"
-
-gText_082BB84A:: @ 82BB84A
-	.string "Oh? You recommended that\n"
-	.string "{STR_VAR_1} before, too.\p"
-	.string "Or is it the best thing to hold?\n"
-	.string "Or do you mean that my {STR_VAR_2}\l"
-	.string "doesn’t need anything to hold?$"
-
-gText_082BB8CD:: @ 82BB8CD
-	.string "Hola!\n"
-	.string "My maestro, {PLAYER}{STRING 5}!\p"
-	.string "I want to hit you up for advice on\n"
-	.string "POKéMON tools.\p"
-	.string "What do you think would be good for\n"
-	.string "my {STR_VAR_1} to hold?\p"
-	.string "Don’t be shy now.\n"
-	.string "Let’s blurt it out!$"
-
-gText_082BB970:: @ 82BB970
-	.string "Oh? So, you’re saying my {STR_VAR_1}\n"
-	.string "can win without holding any item?$"
-
-gText_082BB9AE:: @ 82BB9AE
-	.string "Si, bueno!\n"
-	.string "I’ll give it my best shot, like, slam!\p"
-	.string "All right, thanks, as always!\n"
-	.string "Adios!$"
-
-gText_082BBA05:: @ 82BBA05
-	.string "Uh-huh, that’s one {STR_VAR_1}?\n"
-	.string "Si, bueno!\l"
-	.string "I’ll go find me one, like, bam!\p"
-	.string "All right, thanks, as always!\n"
-	.string "Adios!$"
-
-gText_082BBA6C:: @ 82BBA6C
-	.string "No, no! You already told me about\n"
-	.string "that {STR_VAR_1} thing before.\p"
-	.string "Oh, now wait just one minute here…\n"
-	.string "So, you’re saying my {STR_VAR_2}\l"
-	.string "can win without holding any item?$"
-
-gText_082BBB01:: @ 82BBB01
-	.string "{PLAYER}{STRING 5}, something unbelievable\n"
-	.string "has happened!\p"
-	.string "I woke up this morning, and my POKéMON\n"
-	.string "had 10 NUGGETS!\p"
-	.string "Of course I’m lying!\n"
-	.string "Wahahaha!\p"
-	.string "This is no lie, though.\n"
-	.string "I’m not very good at thinking about\l"
-	.string "what items POKéMON should hold.\p"
-	.string "So, how about deciding for me what\n"
-	.string "my {STR_VAR_1} should hold, master?$"
-
-gText_082BBC1C:: @ 82BBC1C
-	.string "What’s that mean?\n"
-	.string "Don’t make it hold anything?$"
-
-gText_082BBC4B:: @ 82BBC4B
-	.string "Okay, so it shouldn’t hold anything.\n"
-	.string "Then, I’d better get something for it!\p"
-	.string "Just kidding!\n"
-	.string "I’ll obey your teaching, master!\p"
-	.string "Thanks, master!\n"
-	.string "I hope you’ll keep teaching me!$"
-
-gText_082BBCF6:: @ 82BBCF6
-	.string "Okay, so it’s one {STR_VAR_1}!\n"
-	.string "I’ll make it hold anything but that!\p"
-	.string "Just kidding!\n"
-	.string "I’ll obey your teaching, master!\p"
-	.string "Thanks, master!\n"
-	.string "I hope you’ll keep teaching me!$"
-
-gText_082BBD90:: @ 82BBD90
-	.string "Um, you told me about that before,\n"
-	.string "didn’t you?\p"
-	.string "Isn’t there something else?\p"
-	.string "Or do you mean, don’t make\n"
-	.string "my {STR_VAR_2} hold anything?$"
-
-gText_082BBE0B:: @ 82BBE0B
-	.string "A-H-O-Y!\n"
-	.string "And that spells ahoy!\p"
-	.string "The rappin’ SAILOR am I!\n"
-	.string "I present to you a question\l"
-	.string "that’s pretty fly!\p"
-	.string "It’s an item question\n"
-	.string "that begs your suggestion!\p"
-	.string "My {STR_VAR_1} needs an item to hold,\n"
-	.string "What should it be, if I may be bold?$"
-
-gText_082BBEE5:: @ 82BBEE5
-	.string "Is that right?\n"
-	.string "My {STR_VAR_1} doesn’t need to be\l"
-	.string "holding anything tight?$"
-
-gText_082BBF25:: @ 82BBF25
-	.string "Okay, I hear you, sure I do!\n"
-	.string "My POKéMON will go empty-handed, too!\p"
-	.string "If it’s advice I ever need,\n"
-	.string "{PLAYER}, your word I’ll always heed!$"
-
-gText_082BBFA4:: @ 82BBFA4
-	.string "Okay, one {STR_VAR_1},\n"
-	.string "that’s what I’ll use.\l"
-	.string "I was right to make you choose!\p"
-	.string "If it’s advice I ever need,\n"
-	.string "{PLAYER}, your word I’ll always heed!$"
-
-gText_082BC024:: @ 82BC024
-	.string "Okay, one {STR_VAR_1}, you say?\n"
-	.string "You told me that the other day.\l"
-	.string "I need a new idea, a brand new way.\p"
-	.string "Or, what, is that right?\n"
-	.string "My POKéMON doesn’t need to hold\l"
-	.string "anything tight?$"
-
-gText_082BC0C8:: @ 82BC0C8
-	.string "Say, hey, {PLAYER}!\n"
-	.string "I found you again today!\p"
-	.string "What should I do? Get your advice?\n"
-	.string "Why not? I’m already talking to you!\p"
-	.string "{PLAYER}, are you getting sick of me?\n"
-	.string "Nah, no way, that can’t be.\p"
-	.string "Will you hear me out?\n"
-	.string "I’m looking for advice--that’s what\l"
-	.string "I’m talking about.\p"
-	.string "It’s about a hold item for\n"
-	.string "my {STR_VAR_1} that’d be good.\l"
-	.string "My indecision is making me brood.$"
-
-gText_082BC213:: @ 82BC213
-	.string "My {STR_VAR_1} needs nothing?\n"
-	.string "Doesn’t need to hold anything?$"
-
-gText_082BC247:: @ 82BC247
-	.string "If holding nothing is the best,\n"
-	.string "I’ll do as you suggest!\p"
-	.string "Well, {PLAYER}, I have to roam free,\n"
-	.string "but don’t you forget about me.\p"
-	.string "See you again, my smart friend!$"
-
-gText_082BC2DD:: @ 82BC2DD
-	.string "If holding that {STR_VAR_1} is\n"
-	.string "the best, I’ll do as you suggest!\p"
-	.string "Well, {PLAYER}, I have to roam free,\n"
-	.string "but don’t you forget about me.\p"
-	.string "See you again, my smart friend!$"
-
-gText_082BC373:: @ 82BC373
-	.string "Haven’t I heard about that\n"
-	.string "{STR_VAR_1} before?\l"
-	.string "I’m certain I have, that’s for sure!\p"
-	.string "I need a new something!\n"
-	.string "Or, my {STR_VAR_2} needs nothing?\l"
-	.string "Doesn’t need to hold anything?$"
-
-gText_082BC40E:: @ 82BC40E
-	.string "Gwah! Ouch! {PLAYER}{STRING 5}, my arm’s broken!\n"
-	.string "Don’t touch it, please!\p"
-	.string "I must’ve broken it while I was trying\n"
-	.string "out different hold items with my posse\l"
-	.string "of POKéMON.\p"
-	.string "So, things being this way,\n"
-	.string "I need you to decide for me.\p"
-	.string "{PLAYER}{STRING 5}, what do you think would be\n"
-	.string "good for my {STR_VAR_1} to hold?$"
-
-gText_082BC514:: @ 82BC514
-	.string "Ouch…\p"
-	.string "So your suggestion is my {STR_VAR_1}\n"
-	.string "doesn’t have to hold anything?$"
-
-gText_082BC555:: @ 82BC555
-	.string "Hm, all right. That would be easier\n"
-	.string "for me, the way things are now.\p"
-	.string "I hope I can keep hitting you up\n"
-	.string "for help like this.$"
-
-gText_082BC5CE:: @ 82BC5CE
-	.string "Hm, all right. That’s one {STR_VAR_1}.\n"
-	.string "My POKéMON’s arm is fine, so I’ll make\l"
-	.string "it hold that item right away.\p"
-	.string "I hope I can keep hitting you up\n"
-	.string "for help like this.$"
-
-gText_082BC666:: @ 82BC666
-	.string "No, no, you told me about that\n"
-	.string "{STR_VAR_1} before, remember?\p"
-	.string "How about telling me something\n"
-	.string "even better?\p"
-	.string "Oh, wait a second.\n"
-	.string "So your suggestion is my {STR_VAR_2}\l"
-	.string "doesn’t have to hold anything?$"
-
-gText_082BC714:: @ 82BC714
-	.string "Er… Um…\n"
-	.string "{PLAYER}{STRING 5}…\p"
-	.string "Please, don’t look at me that way.\n"
-	.string "My POKéMON don’t have anything.\p"
-	.string "I… I’m really embarrassed about this,\n"
-	.string "but I really need your advice.\p"
-	.string "I can’t decide what hold item would\n"
-	.string "make my {STR_VAR_1} strong.\p"
-	.string "{PLAYER}{STRING 5}, what do you think would\n"
-	.string "be good?$"
-
-gText_082BC808:: @ 82BC808
-	.string "Oh… Then, you think it would be better\n"
-	.string "if my {STR_VAR_1} didn’t have an item?$"
-
-gText_082BC84D:: @ 82BC84D
-	.string "Oh… Okay!\n"
-	.string "I’ll go without an item.\p"
-	.string "This is nerve-racking, though.\n"
-	.string "Wouldn’t it be too cool?\p"
-	.string "Thank you, {PLAYER}{STRING 5}.\n"
-	.string "If we meet again, I hope you will be\l"
-	.string "as helpful.$"
-
-gText_082BC8EA:: @ 82BC8EA
-	.string "Oh… Okay!\n"
-	.string "I’ll go with that {STR_VAR_1}.\p"
-	.string "This is nerve-racking, though.\n"
-	.string "Wouldn’t it be too cool?\p"
-	.string "Thank you, {PLAYER}{STRING 5}.\n"
-	.string "If we meet again, I hope you will be\l"
-	.string "as helpful.$"
-
-gText_082BC984:: @ 82BC984
-	.string "B-but I already heard about that.\p"
-	.string "Please don’t brush me off like this!\n"
-	.string "I can’t live with the humiliation.\p"
-	.string "Oh… Am I jumping to conclusions?\n"
-	.string "Do you think it would be better if\l"
-	.string "my {STR_VAR_2} didn’t have an item?$"
-
-gText_082BCA4D:: @ 82BCA4D
-	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
-	.string "But are you really?\l"
-	.string "Perhaps you’re a twin?\p"
-	.string "Oh, no, no, no, don’t worry!\n"
-	.string "If you really are {PLAYER}, please\l"
-	.string "forget about my rudeness.\p"
-	.string "What I would like is some more of\n"
-	.string "your fine advice.\p"
-	.string "I have here my {STR_VAR_1} that I wish\n"
-	.string "to make hold a convenient item.\p"
-	.string "What would be worthy of it?$"
-
-gText_082BCB75:: @ 82BCB75
-	.string "It’s better if it held nothing?\n"
-	.string "Are you certain?$"
-
-gText_082BCBA6:: @ 82BCBA6
-	.string "I see. If that’s the case, that’s fine.\n"
-	.string "I thank you for your time.\p"
-	.string "Let us meet again!$"
-
-gText_082BCBFC:: @ 82BCBFC
-	.string "One {STR_VAR_1}?\n"
-	.string "Are you certain?\p"
-	.string "I see. If that’s the case, that’s fine.\n"
-	.string "I thank you for your time.\p"
-	.string "I do hope my POKéMON will be able to\n"
-	.string "put it to good use.\p"
-	.string "Let us meet again!$"
-
-gText_082BCCA4:: @ 82BCCA4
-	.string "No, no, wait a minute.\n"
-	.string "I believe you taught me that before.\p"
-	.string "I would like you to recommend\n"
-	.string "something different this time.\p"
-	.string "Perhaps you’re suggesting that\n"
-	.string "my {STR_VAR_2} should hold nothing?\l"
-	.string "Are you certain?$"
-
-gText_082BCD68:: @ 82BCD68
-	.string "Waah, {PLAYER}!\n"
-	.string "I have a dilemma, sob…\p"
-	.string "I want to begin battling other people,\n"
-	.string "but I don’t know what to do.\p"
-	.string "How should I line up my POKéMON\n"
-	.string "so they’ll be at their strongest?\p"
-	.string "Please tell me, {PLAYER}.\n"
-	.string "If you were me, which of these POKéMON\l"
-	.string "would you send out first?$"
-
-gText_082BCE64:: @ 82BCE64
-	.string "My {STR_VAR_1} should go first?\n"
-	.string "Waaaaah!\p"
-	.string "Oh! I’m so sorry!\n"
-	.string "You’ve made me happy by choosing\l"
-	.string "my first POKéMON, and it’s made me cry…\p"
-	.string "Thank you so much!$"
-
-gText_082BCEF2:: @ 82BCEF2
-	.string "Yay! It’s {PLAYER}!\n"
-	.string "Great! I wanted to ask you something!\p"
-	.string "Um, of my POKéMON, which do you\n"
-	.string "think should go out first?$"
-
-gText_082BCF61:: @ 82BCF61
-	.string "My {STR_VAR_1}? That’s true.\n"
-	.string "Okay, I’ll do that!\p"
-	.string "Thanks for teaching me!$"
-
-gText_082BCFA1:: @ 82BCFA1
-	.string "{PLAYER}, hello!\p"
-	.string "I think, in a battle, it’s very important\n"
-	.string "which POKéMON comes out first.\p"
-	.string "Out of the POKéMON that I have,\n"
-	.string "which would be good to send out first?$"
-
-gText_082BD03C:: @ 82BD03C
-	.string "My {STR_VAR_1} goes first?\n"
-	.string "Okay, I got it!\p"
-	.string "See you again!$"
-
-gText_082BD06D:: @ 82BD06D
-	.string "Hello, {PLAYER}…\n"
-	.string "I’m sorry to disturb you again with\l"
-	.string "another question.\p"
-	.string "I have so little confidence, I don’t\n"
-	.string "know what I’d do without you, {PLAYER}.\p"
-	.string "It may be a waste of time for me to\n"
-	.string "even worry about it, but I just can’t\l"
-	.string "decide something…\p"
-	.string "Which of my POKéMON should I send\n"
-	.string "out first in a battle?$"
-
-gText_082BD18A:: @ 82BD18A
-	.string "My {STR_VAR_1}?\n"
-	.string "Understood!\p"
-	.string "I can’t believe that you would bother\n"
-	.string "to answer my questions so often!\p"
-	.string "I’m so grateful that you would even\n"
-	.string "speak with me… Thank you!$"
-
-gText_082BD222:: @ 82BD222
-	.string "Oh, {PLAYER}{STRING 5}! It’s me!\n"
-	.string "I’m so glad to see you because I have\l"
-	.string "this little problem.\p"
-	.string "I can’t decide how my POKéMON should\n"
-	.string "be lined up. Could you decide for me?\p"
-	.string "Oh, you don’t need to decide the whole\n"
-	.string "party right now.\p"
-	.string "How about deciding just the first\n"
-	.string "POKéMON for me?$"
-
-gText_082BD325:: @ 82BD325
-	.string "My {STR_VAR_1}? That’s great!\p"
-	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{STRING 5}, I won’t be so upset if\l"
-	.string "I lose.\p"
-	.string "Okay, I’ll look to you for advice again.\n"
-	.string "Bye!$"
-
-gText_082BD3B1:: @ 82BD3B1
-	.string "Hi, my teacher {PLAYER}{STRING 5}!\n"
-	.string "I’m busy again today!\p"
-	.string "I have to do some cycling, shopping,\n"
-	.string "and humming.\p"
-	.string "I haven’t even had the time to decide\n"
-	.string "how to line up my POKéMON team.\p"
-	.string "So, how about checking out my team?\n"
-	.string "Which one should go first?$"
-
-gText_082BD493:: @ 82BD493
-	.string "Okay, gotcha.\n"
-	.string "I have enough time at least to put\l"
-	.string "my {STR_VAR_1} at the head of the line!\p"
-	.string "Whoops, my girlfriend’s waiting!\n"
-	.string "Thanks! See you around!$"
-
-gText_082BD51C:: @ 82BD51C
-	.string "Yoohoo! Hiya, {PLAYER}!\n"
-	.string "You always walk around looking tough!\p"
-	.string "Listen, I need something from you\n"
-	.string "again! It’s the usual thing!\p"
-	.string "Drum roll, please!\n"
-	.string "The question I have is about my team.\p"
-	.string "Which POKéMON of mine should be first\n"
-	.string "to go out in a battle?$"
-
-gText_082BD609:: @ 82BD609
-	.string "Hmhm!\n"
-	.string "My {STR_VAR_1}, you say!\l"
-	.string "Thanks for a most cool answer!\p"
-	.string "I guess that’s about all I wanted\n"
-	.string "to ask you today.\p"
-	.string "Let’s meet here again, okay?\n"
-	.string "Thanks!$"
-
-gText_082BD697:: @ 82BD697
-	.string "Thank you so much for stopping to\n"
-	.string "chat with me, {PLAYER}.\p"
-	.string "I know I’m taking advantage of your\n"
-	.string "kindness, but may I ask for advice?\p"
-	.string "I would like you to decide on the order\n"
-	.string "of my POKéMON team.\p"
-	.string "It would please me if you could decide\n"
-	.string "which POKéMON should come first.$"
-
-gText_082BD797:: @ 82BD797
-	.string "My {STR_VAR_1} it is!\n"
-	.string "I will put it first right away!\p"
-	.string "Thank you, {PLAYER}.\n"
-	.string "I hope I can count on you again.\l"
-	.string "Please take care!$"
-
-gText_082BD806:: @ 82BD806
-	.string "Eek! {PLAYER}!\n"
-	.string "I… I’m overjoyed to see you again!\p"
-	.string "My POKéMON have become much\n"
-	.string "stronger!\p"
-	.string "But I don’t always win. It seems to\n"
-	.string "depend on which POKéMON goes first.\p"
-	.string "{PLAYER}, please, I need your help!\p"
-	.string "Please decide which of my POKéMON\n"
-	.string "should go out first!$"
-
-gText_082BD8F5:: @ 82BD8F5
-	.string "Sigh… I’m overwhelmed with happiness…\p"
-	.string "It’s like a dream having you decide\n"
-	.string "for me, {PLAYER}.\p"
-	.string "But perfectly understood!\n"
-	.string "I will go with my {STR_VAR_1} first!\p"
-	.string "I hope you’ll be willing to teach me\n"
-	.string "some more another time.$"
-
-gText_082BD9BE:: @ 82BD9BE
-	.string "Hello, hello!\n"
-	.string "My mentor, {PLAYER}{STRING 5}!\l"
-	.string "Hit me with your sage advice today!\p"
-	.string "You see, I pulled together a team of\n"
-	.string "three POKéMON. So far so good.\p"
-	.string "But the team’s battling order’s not\n"
-	.string "settled yet.\p"
-	.string "This is where you come in, {PLAYER}{STRING 5}!\n"
-	.string "You decide which POKéMON leads off!\p"
-	.string "Don’t be shy now.\n"
-	.string "Let’s blurt it out!$"
-
-gText_082BDAE1:: @ 82BDAE1
-	.string "Uh-huh, my {STR_VAR_1} leads off!\n"
-	.string "OK, A-OK!\l"
-	.string "I’ll reorder the lineup, like, wham!\p"
-	.string "All right, thanks, as always!\n"
-	.string "Adios!$"
-
-gText_082BDB4E:: @ 82BDB4E
-	.string "{PLAYER}{STRING 5}, listen!\n"
-	.string "It’s a crisis!\p"
-	.string "My POKéMON, all three of them, go into\n"
-	.string "battle at once!\p"
-	.string "Of course that’s impossible!\n"
-	.string "Wahahaha!\p"
-	.string "This is no lie, though.\n"
-	.string "I’m not very good at thinking about\l"
-	.string "how I should line up my POKéMON.\p"
-	.string "So, how about deciding for me which\n"
-	.string "POKéMON should go first, master?$"
-
-gText_082BDC6B:: @ 82BDC6B
-	.string "Okay, so it’s my {STR_VAR_1} you chose?\n"
-	.string "I’ll let any but that one go first!\p"
-	.string "Just kidding!\n"
-	.string "I’ll obey your teaching, master!\p"
-	.string "Thanks, master!\n"
-	.string "I hope you’ll keep teaching me!$"
-
-gText_082BDD0D:: @ 82BDD0D
-	.string "A-H-O-Y!\n"
-	.string "And that spells ahoy!\p"
-	.string "The rappin’ SAILOR am I!\n"
-	.string "I present to you a question\l"
-	.string "that’s pretty fly!\p"
-	.string "It’s a team lineup question\n"
-	.string "that begs your suggestion!\p"
-	.string "Out of this lot, which should go first\n"
-	.string "as the first on the spot?$"
-
-gText_082BDDEC:: @ 82BDDEC
-	.string "Okay, I hear you, sure I do!\n"
-	.string "I’ll switch them up, that I’ll do!\p"
-	.string "If it’s advice I ever need,\n"
-	.string "{PLAYER}, your word I’ll always heed!$"
-
-gText_082BDE68:: @ 82BDE68
-	.string "Yahoo, {PLAYER}!\n"
-	.string "How do you do?\p"
-	.string "What should I do? Go ahead and ask?\n"
-	.string "Uh-huh, I have something to ask!\l"
-	.string "Are you receiving me?\l"
-	.string "You are receiving me!\p"
-	.string "You have to decide, which of my\n"
-	.string "POKéMON is the first to ride!\l"
-	.string "Into battle, I mean to say.$"
-
-gText_082BDF4D:: @ 82BDF4D
-	.string "My {STR_VAR_1}? Yes!\n"
-	.string "That’ll do, there’s no distress!\p"
-	.string "Well, {PLAYER}, I have to roam free,\n"
-	.string "but don’t you forget about me.\p"
-	.string "See you again, my smart friend!$"
-
-gText_082BDFD8:: @ 82BDFD8
-	.string "…Oof…ooch… {PLAYER}{STRING 5}…\n"
-	.string "My stomach’s hurting all of a sudden…\p"
-	.string "…It’s getting better now…\p"
-	.string "I must’ve worried myself sick racking\n"
-	.string "my brains on how I should line up\l"
-	.string "my posse of POKéMON.\p"
-	.string "So, things being this way,\n"
-	.string "I need you to decide for me.\p"
-	.string "{PLAYER}{STRING 5}, which of my POKéMON should\n"
-	.string "go first? So I’d win, I mean.$"
-
-gText_082BE0FD:: @ 82BE0FD
-	.string "Hm, all right.\n"
-	.string "My {STR_VAR_1} goes first.\p"
-	.string "I’ll fix the lineup like that after\n"
-	.string "I have my supper.\p"
-	.string "I hope I can keep hitting you up\n"
-	.string "for help like this.$"
-
-gText_082BE189:: @ 82BE189
-	.string "Er… Um…\n"
-	.string "{PLAYER}{STRING 5}?\p"
-	.string "Please, don’t look at me that way.\n"
-	.string "You’re making me feel all flustered.\p"
-	.string "Um…\n"
-	.string "I really need your advice.\p"
-	.string "It makes me bashful to say this,\n"
-	.string "but I chose my 3-POKéMON team.\l"
-	.string "I can’t decide on the order, though.\p"
-	.string "Which POKéMON should I send out first\n"
-	.string "so I at least look capable?$"
-
-gText_082BE2A5:: @ 82BE2A5
-	.string "Oh… Okay!\n"
-	.string "I’ll lead with my {STR_VAR_1}.\p"
-	.string "I hope I can do my best without\n"
-	.string "getting all flustered.\p"
-	.string "Thank you, {PLAYER}{STRING 5}.\n"
-	.string "If we meet again, I hope you will be\l"
-	.string "as helpful.$"
-
-gText_082BE33E:: @ 82BE33E
-	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
-	.string "But are you really?\l"
-	.string "Perhaps you’re a clever look-alike?\p"
-	.string "Oh, no, no, no, don’t worry!\n"
-	.string "If you really are {PLAYER}, please\l"
-	.string "forget about my rudeness.\p"
-	.string "What I would like is your fine advice.\p"
-	.string "I have here my POKéMON team.\n"
-	.string "I would like you to tell me which one\l"
-	.string "should go first in a battle.$"
-
-gText_082BE46C:: @ 82BE46C
-	.string "My {STR_VAR_1}…\n"
-	.string "You aren’t pulling my leg?\p"
-	.string "I see. If that’s the case, that’s fine.\n"
-	.string "I thank you for your time.\p"
-	.string "I am as you see, but I shall do\n"
-	.string "my best.\p"
-	.string "Let us meet again!$"
-
-gText_082BE50D:: @ 82BE50D
-	.string "Snivel…\n"
-	.string "Oh, {PLAYER}!\p"
-	.string "What perfect timing!\n"
-	.string "There’s something I just can’t decide…\p"
-	.string "I can’t decide which POKéMON I should\n"
-	.string "be using.\p"
-	.string "I can’t decide between the POKéMON\n"
-	.string "{STR_VAR_1} and {STR_VAR_2}…\p"
-	.string "{PLAYER}, which do you think will give\n"
-	.string "even me a chance at winning?$"
-
-gText_082BE5F5:: @ 82BE5F5
-	.string "Snivel… I… I understand!\n"
-	.string "Oh! I’m so sorry!\l"
-	.string "You’ve made me so happy, I’m crying…\p"
-	.string "I’ll do my best to catch one\n"
-	.string "{STR_VAR_1}!\p"
-	.string "Thank you so much!$"
-
-gText_082BE679:: @ 82BE679
-	.string "Yay! It’s {PLAYER}!\n"
-	.string "Yay, you came at the right time, too!\l"
-	.string "I need your advice again!\p"
-	.string "Um, I’m all mixed up--should I use\n"
-	.string "my {STR_VAR_1} or {STR_VAR_2}…\p"
-	.string "Which do you think I should raise,\n"
-	.string "{PLAYER}?$"
-
-gText_082BE71E:: @ 82BE71E
-	.string "Oh, so my {STR_VAR_1} is better!\n"
-	.string "Okay, I’ll do that!\p"
-	.string "Thanks for teaching me!$"
-
-gText_082BE762:: @ 82BE762
-	.string "{PLAYER}, hello!\n"
-	.string "I have a question I wanted to ask.\p"
-	.string "I’m in a dilemma over whether I should\n"
-	.string "raise one {STR_VAR_1} or {STR_VAR_2}.\p"
-	.string "Which POKéMON do you think will\n"
-	.string "be stronger?$"
-
-gText_082BE7F8:: @ 82BE7F8
-	.string "{STR_VAR_1} is your choice?\n"
-	.string "Okay, I got it!\p"
-	.string "I’ll go catch a strong {STR_VAR_1}\n"
-	.string "right away!\p"
-	.string "See you again!$"
-
-gText_082BE850:: @ 82BE850
-	.string "Hello, {PLAYER}…\p"
-	.string "Um, you’ve probably already forgotten\n"
-	.string "about someone like me…\p"
-	.string "…But that doesn’t matter if you\n"
-	.string "could give me advice…\p"
-	.string "I can’t decide on the one kind of\n"
-	.string "POKéMON I should raise…\p"
-	.string "I’ve narrowed the field to the POKéMON\n"
-	.string "{STR_VAR_1} and {STR_VAR_2}, but that’s\l"
-	.string "where I became stuck…\p"
-	.string "{PLAYER}, you probably don’t want to\n"
-	.string "bother, but please decide for me.$"
-
-gText_082BE99C:: @ 82BE99C
-	.string "But will a wild {STR_VAR_1} even pay\n"
-	.string "attention to me?\p"
-	.string "I will try!\p"
-	.string "But will I even be able to catch one…\n"
-	.string "No! I’ll do my best!\p"
-	.string "Thank you!$"
-
-gText_082BEA1B:: @ 82BEA1B
-	.string "Oh, {PLAYER}{STRING 5}! I’m so glad to see you!\n"
-	.string "I was about to go looking for you!\p"
-	.string "Can you decide what kind of POKéMON\n"
-	.string "I should use?\p"
-	.string "For instance…\n"
-	.string "How about the POKéMON {STR_VAR_1}\l"
-	.string "and {STR_VAR_2}?\p"
-	.string "Which one do you think would be\n"
-	.string "better?$"
-
-gText_082BEAE9:: @ 82BEAE9
-	.string "{STR_VAR_1}? That’s great!\p"
-	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{STRING 5}, I won’t be so upset if\l"
-	.string "I lose.\p"
-	.string "Okay, I’ll look to you for advice again.\n"
-	.string "Bye!$"
-
-gText_082BEB72:: @ 82BEB72
-	.string "If it isn’t {PLAYER}{STRING 5}! How’s it going?\n"
-	.string "I’m busy again as always!\p"
-	.string "I want to do good with POKéMON, too,\n"
-	.string "but I haven’t been able to decide\l"
-	.string "which POKéMON I should use.\p"
-	.string "You know how {STR_VAR_1} look strong?\n"
-	.string "But {STR_VAR_2} are tough to ignore.\p"
-	.string "{PLAYER}{STRING 5}, give me some of your good\n"
-	.string "advice! Which one’d be good for me?$"
-
-gText_082BEC8E:: @ 82BEC8E
-	.string "Okay, gotcha.\n"
-	.string "I’ll find time somehow and catch me\l"
-	.string "that {STR_VAR_1} you recommended.\p"
-	.string "I’m glad I met a good mentor in you.\n"
-	.string "Thanks! See you around!$"
-
-gText_082BED16:: @ 82BED16
-	.string "Oh!\n"
-	.string "Yay, it’s {PLAYER}!\p"
-	.string "I didn’t waste any time boasting to\n"
-	.string "my friends about meeting you!\p"
-	.string "I need to tap your mind again today.\n"
-	.string "It’s an easy one for you!\p"
-	.string "Drum roll, please!\n"
-	.string "The question I have is…\p"
-	.string "If I were to raise a POKéMON,\n"
-	.string "and the choices were one {STR_VAR_1}\l"
-	.string "or {STR_VAR_2}, which should it be?$"
-
-gText_082BEE29:: @ 82BEE29
-	.string "Ahhh!\n"
-	.string "{STR_VAR_1}, you say!\l"
-	.string "Thanks for a most cool answer!\p"
-	.string "I guess that’s about all I wanted\n"
-	.string "to ask you today.\p"
-	.string "Let’s meet here again, okay?\n"
-	.string "Thanks!$"
-
-gText_082BEEB4:: @ 82BEEB4
-	.string "Oh, is it you, {PLAYER}?\n"
-	.string "I’m delighted to see you again!\p"
-	.string "Ever since I became your apprentice,\n"
-	.string "my confidence has been blooming.\p"
-	.string "I think I’m ready to raise a POKéMON\n"
-	.string "of my own!\p"
-	.string "{PLAYER}, may I impose on you to choose\n"
-	.string "which POKéMON I should raise?\p"
-	.string "The choices are the POKéMON\n"
-	.string "{STR_VAR_1} or {STR_VAR_2}…\l"
-	.string "Which POKéMON is right for me?$"
-
-gText_082BEFE2:: @ 82BEFE2
-	.string "One {STR_VAR_1} it is!\n"
-	.string "I will find one right away!\p"
-	.string "Thank you, {PLAYER}.\n"
-	.string "I hope I can count on you again.\l"
-	.string "Please take care!$"
-
-gText_082BF04E:: @ 82BF04E
-	.string "Eek! {PLAYER}! I met you again!\n"
-	.string "I… I’m overjoyed!\p"
-	.string "Oh-oh-oh, I know!\n"
-	.string "I shouldn’t pass up this opportunity!\p"
-	.string "May I ask a huge favor, {PLAYER}?\n"
-	.string "Please choose a POKéMON for me!\p"
-	.string "Please decide which would be better,\n"
-	.string "{STR_VAR_1} or {STR_VAR_2}!$"
-
-gText_082BF11D:: @ 82BF11D
-	.string "Wow! You decided for me!\n"
-	.string "One {STR_VAR_1} is what I’ll raise to\l"
-	.string "the best of my ability.\p"
-	.string "I hope you’ll be willing to teach me\n"
-	.string "some more another time.$"
-
-gText_082BF1A8:: @ 82BF1A8
-	.string "Hey, hey!\n"
-	.string "My mentor, {PLAYER}{STRING 5}!\p"
-	.string "Hello, I’ve been looking for you\n"
-	.string "for some more of your sage advice!\p"
-	.string "Which kind of POKéMON would be right\n"
-	.string "for me, one {STR_VAR_1} or {STR_VAR_2}?\p"
-	.string "Don’t be shy now.\n"
-	.string "Let’s blurt it out!$"
-
-gText_082BF268:: @ 82BF268
-	.string "Uh-huh, one {STR_VAR_1} it is!\n"
-	.string "OK, A-OK!\l"
-	.string "I’ll get one in a BALL, like, cram!\p"
-	.string "All right, thanks, as always!\n"
-	.string "Adios!$"
-
-gText_082BF2D1:: @ 82BF2D1
-	.string "{PLAYER}{STRING 5}, listen! Big news!\n"
-	.string "I caught a mirage POKéMON!\p"
-	.string "Of course I’m lying!\n"
-	.string "Wahahaha!\p"
-	.string "This is no lie, though.\n"
-	.string "I’m not very good at catching\l"
-	.string "POKéMON.\p"
-	.string "So, how about deciding for me which\n"
-	.string "kind of POKéMON I should catch,\l"
-	.string "master?\p"
-	.string "Which would be better?\n"
-	.string "{STR_VAR_1} or {STR_VAR_2}?$"
-
-gText_082BF3CF:: @ 82BF3CF
-	.string "Okay, so it’s {STR_VAR_1} you chose?\n"
-	.string "I’ll grab the other kind, then!\p"
-	.string "Just kidding!\n"
-	.string "I’ll obey your teaching, master!\p"
-	.string "Thanks, master!\n"
-	.string "I hope you’ll keep teaching me!$"
-
-gText_082BF46A:: @ 82BF46A
-	.string "A-H-O-Y!\n"
-	.string "And that spells ahoy!\p"
-	.string "The rappin’ SAILOR am I!\n"
-	.string "Surely you remember who am I?\p"
-	.string "Today, I have a POKéMON question\n"
-	.string "that begs your suggestion!\p"
-	.string "I have the choice between this\n"
-	.string "{STR_VAR_1} and {STR_VAR_2}, you see.\l"
-	.string "Which is the one to catch for me?$"
-
-gText_082BF551:: @ 82BF551
-	.string "{STR_VAR_1}, you say, hey, hey!\n"
-	.string "I’ll go get me one right away!\p"
-	.string "If it’s advice I ever need,\n"
-	.string "{PLAYER}, your word I’ll always heed!$"
-
-gText_082BF5C3:: @ 82BF5C3
-	.string "Oh, wow, if it isn’t {PLAYER}!\p"
-	.string "What should I do? Get your advice?\n"
-	.string "Why not? I’m already talking to you!\p"
-	.string "It’s been a long time. Let me break\n"
-	.string "the ice. I’m also looking for advice!\l"
-	.string "Are you receiving me?\l"
-	.string "You are receiving me!\p"
-	.string "My POKéMON--which should I use?\n"
-	.string "It’s either {STR_VAR_1} or {STR_VAR_2}.\l"
-	.string "Which do you choose?$"
-
-gText_082BF6E5:: @ 82BF6E5
-	.string "If that {STR_VAR_1} is the best,\n"
-	.string "I’ll do as you suggest!\p"
-	.string "Well, {PLAYER}, I have to roam free,\n"
-	.string "but don’t you forget about me.\p"
-	.string "See you again, my smart friend!$"
-
-gText_082BF773:: @ 82BF773
-	.string "Oh, hi, {PLAYER}{STRING 5}…\n"
-	.string "I have this horrible headache…\p"
-	.string "I must’ve worried too much about\n"
-	.string "the kind of POKéMON I should raise.\p"
-	.string "So, things being this way,\n"
-	.string "I need you to decide for me.\p"
-	.string "{PLAYER}{STRING 5}, if I had to choose between\n"
-	.string "the POKéMON {STR_VAR_1} and\l"
-	.string "{STR_VAR_2}, which should it be?$"
-
-gText_082BF869:: @ 82BF869
-	.string "Hm, one {STR_VAR_1}, all right.\n"
-	.string "I’ll go look for one when I get better.\p"
-	.string "I hope I can keep hitting you up\n"
-	.string "for help like this.$"
-
-gText_082BF8DD:: @ 82BF8DD
-	.string "Er… Um…\n"
-	.string "{PLAYER}{STRING 5}…?\p"
-	.string "Please, don’t look at me that way.\n"
-	.string "I’m getting all flustered…\l"
-	.string "I… I need your advice.\p"
-	.string "I… I’m really embarrassed, but I can’t\n"
-	.string "decide which POKéMON to use.\p"
-	.string "If the choices were {STR_VAR_1} or\n"
-	.string "{STR_VAR_2}, which would be better?$"
-
-gText_082BF9BA:: @ 82BF9BA
-	.string "Oh… Okay!\n"
-	.string "I’ll do my best with one {STR_VAR_1}.\p"
-	.string "I hope I can do my best without\n"
-	.string "getting all flustered.\p"
-	.string "Thank you, {PLAYER}{STRING 5}.\n"
-	.string "If we meet again, I hope you will be\l"
-	.string "as helpful.$"
-
-gText_082BFA5A:: @ 82BFA5A
-	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
-	.string "But are you really real?\p"
-	.string "No, no, if you are real, it’s fine.\n"
-	.string "Incidentally, I would like to obtain\l"
-	.string "your advice.\p"
-	.string "It’s about the POKéMON I am to use.\p"
-	.string "If the choices are the POKéMON\n"
-	.string "{STR_VAR_1} and {STR_VAR_2}, which is\l"
-	.string "more worthy of me?$"
-
-gText_082BFB4E:: @ 82BFB4E
-	.string "{STR_VAR_1}?\n"
-	.string "Are you certain?\p"
-	.string "I see. If that’s the case, that’s fine.\n"
-	.string "I thank you for your time.\p"
-	.string "I do hope it is something even I can\n"
-	.string "handle with aplomb.\p"
-	.string "Let us meet again!$"
-
-gText_082BFBF2:: @ 82BFBF2
-	.string "Waaah! Oh, {PLAYER}!\n"
-	.string "Snivel… Hiccup…\p"
-	.string "I have a dilemma!\n"
-	.string "I can’t decide on a move for\l"
-	.string "my {STR_VAR_1}…\p"
-	.string "Please, please, {PLAYER}.\n"
-	.string "Can you decide for me?\p"
-	.string "For my {STR_VAR_1}, which move would\n"
-	.string "be the better choice: {STR_VAR_2}\l"
-	.string "or {STR_VAR_3}?$"
-
-gText_082BFCAE:: @ 82BFCAE
-	.string "{STR_VAR_1}?\n"
-	.string "Waaaaah!\p"
-	.string "Oh! I’m so sorry, {PLAYER}!\n"
-	.string "You’ve made me so happy by deciding\l"
-	.string "the move, I’m crying…\p"
-	.string "Snivel…\n"
-	.string "Thank you so much!$"
-
-gText_082BFD26:: @ 82BFD26
-	.string "Yay! Hi, {PLAYER}!\n"
-	.string "I need your advice again!\p"
-	.string "I want to teach my {STR_VAR_1}\n"
-	.string "a cool move.\p"
-	.string "I like either of the moves\n"
-	.string "{STR_VAR_2} or {STR_VAR_3}.\l"
-	.string "What’s your recommendation?$"
-
-gText_082BFDB1:: @ 82BFDB1
-	.string "{STR_VAR_1} is better? I guess so!\n"
-	.string "Okay, I’ll go with that!\p"
-	.string "If we meet here again, please teach\n"
-	.string "me something else, teacher!$"
-
-gText_082BFE24:: @ 82BFE24
-	.string "{PLAYER}, hello!\n"
-	.string "It’s about my {STR_VAR_1}, but I’m\l"
-	.string "worried about its moves.\p"
-	.string "You see, it’s the moves {STR_VAR_2}\n"
-	.string "and {STR_VAR_3}.\p"
-	.string "Which is stronger and better for\n"
-	.string "my {STR_VAR_1}?$"
-
-gText_082BFEAD:: @ 82BFEAD
-	.string "{STR_VAR_1} is your choice?\n"
-	.string "Okay, I got it!\p"
-	.string "I’ll go teach {STR_VAR_1} to\n"
-	.string "my POKéMON right away!\p"
-	.string "See you again!$"
-
-gText_082BFF0A:: @ 82BFF0A
-	.string "Ohhh, {PLAYER}…\n"
-	.string "I’m hopeless, no, really!\p"
-	.string "I’ve decided to raise a POKéMON,\n"
-	.string "but now I can’t even decide what\l"
-	.string "move I should let it learn…\p"
-	.string "I know that it doesn’t mean anything\n"
-	.string "to you, {PLAYER}.\p"
-	.string "But it means a lot to me…\p"
-	.string "Please, {PLAYER}, could you choose\n"
-	.string "a move for my {STR_VAR_1}?\p"
-	.string "If you could even choose between\n"
-	.string "{STR_VAR_2} and {STR_VAR_3}…$"
-
-gText_082C0032:: @ 82C0032
-	.string "I understand!\p"
-	.string "But will it even be willing to learn\n"
-	.string "{STR_VAR_1} for me…\l"
-	.string "No! I’ll do my best!\p"
-	.string "Thank you!$"
-
-gText_082C0090:: @ 82C0090
-	.string "Oh, {PLAYER}{STRING 5}!\n"
-	.string "I was just hoping to see you, too!\p"
-	.string "I was wondering what move would\n"
-	.string "be suitable for my {STR_VAR_1}.\p"
-	.string "I can’t decide, so can you decide\n"
-	.string "for me instead?\p"
-	.string "For instance… How about the moves\n"
-	.string "{STR_VAR_2} and {STR_VAR_3}?\l"
-	.string "Which one would be better?$"
-
-gText_082C016E:: @ 82C016E
-	.string "{STR_VAR_1}? That’s great!\p"
-	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{STRING 5}, I won’t be so upset if\l"
-	.string "I lose.\p"
-	.string "Okay, I’ll look to you for advice again.\n"
-	.string "Bye!$"
-
-gText_082C01F7:: @ 82C01F7
-	.string "How could things be this busy?\n"
-	.string "Hey, if it isn’t {PLAYER}{STRING 5}!\l"
-	.string "How’s it going?\p"
-	.string "Since I got up this morning, I’ve done\n"
-	.string "my jogging, swimming, and cooking!\p"
-	.string "You wouldn’t believe how busy I am!\p"
-	.string "I can’t even decide what move\n"
-	.string "my {STR_VAR_1} should learn!\p"
-	.string "{STR_VAR_2} looks good, huh?\n"
-	.string "But {STR_VAR_3}’s also decent.\p"
-	.string "{PLAYER}{STRING 5}, give me some of your good\n"
-	.string "advice! Which move’d be good for me?$"
-
-gText_082C034C:: @ 82C034C
-	.string "Okay, gotcha.\n"
-	.string "I’ll make room in my schedule and\l"
-	.string "teach that move.\p"
-	.string "I’m glad I met a good mentor in you.\n"
-	.string "Thanks! See you around!$"
-
-gText_082C03CA:: @ 82C03CA
-	.string "Oh! Lucky!\n"
-	.string "I met you again, {PLAYER}!\l"
-	.string "I need to tap your mind again today.\p"
-	.string "Drum roll, please!\n"
-	.string "The question I have is…\p"
-	.string "For my {STR_VAR_1}, which is the move\n"
-	.string "best suited, {STR_VAR_2} or\l"
-	.string "{STR_VAR_3}?$"
-
-gText_082C046E:: @ 82C046E
-	.string "Ahhh!\n"
-	.string "{STR_VAR_1}, you say!\l"
-	.string "Thanks for a most cool answer!\p"
-	.string "I guess that’s about all I wanted\n"
-	.string "to ask you today.\p"
-	.string "Let’s meet here again, okay?\n"
-	.string "Thanks!$"
-
-gText_082C04F9:: @ 82C04F9
-	.string "Oh, hello, {PLAYER}.\n"
-	.string "I trust you’ve been well?\p"
-	.string "I have to seek your advice again.\n"
-	.string "It’s about my dearest {STR_VAR_1}.\p"
-	.string "What would be the ideal move for\n"
-	.string "my lovable {STR_VAR_1}?\l"
-	.string "{STR_VAR_2} or {STR_VAR_3}?$"
-
-gText_082C0598:: @ 82C0598
-	.string "{STR_VAR_1} it is!\n"
-	.string "I will teach that right away!\p"
-	.string "Thank you, {PLAYER}.\n"
-	.string "I hope I can count on you again.\l"
-	.string "Please take care!$"
-
-gText_082C0602:: @ 82C0602
-	.string "Eek! {PLAYER}! I met you again!\n"
-	.string "I… I’m overjoyed!\p"
-	.string "Whenever I’m in need, you’re always\n"
-	.string "there for me, {PLAYER}!\p"
-	.string "Today, I want you to recommend\n"
-	.string "a move for me!\p"
-	.string "Please choose a move for\n"
-	.string "my {STR_VAR_1}!\p"
-	.string "Which move would be better,\n"
-	.string "{STR_VAR_2} or {STR_VAR_3}?$"
-
-gText_082C06D8:: @ 82C06D8
-	.string "Oh-oh-oh! Thank you!\n"
-	.string "{STR_VAR_1} is it!\l"
-	.string "Perfectly understood!\p"
-	.string "I hope you’ll be willing to teach me\n"
-	.string "some more another time.$"
-
-gText_082C074A:: @ 82C074A
-	.string "Hola, {PLAYER}{STRING 5}, bueno!\n"
-	.string "I’m hoping for some more of\l"
-	.string "your sage advice today!\p"
-	.string "What would be the best move for\n"
-	.string "my {STR_VAR_1}?\p"
-	.string "It should be something that’ll\n"
-	.string "let me win just like that!\p"
-	.string "Would it be {STR_VAR_2}?\n"
-	.string "Or {STR_VAR_3}?$"
-
-gText_082C0809:: @ 82C0809
-	.string "Uh-huh, {STR_VAR_1} it is!\n"
-	.string "Si, bueno!\l"
-	.string "I’ll get it taught, like, ka-blam!\p"
-	.string "All right, thanks, as always!\n"
-	.string "Adios!$"
-
-gText_082C086E:: @ 82C086E
-	.string "{PLAYER}{STRING 5}, it’s completely wild!\p"
-	.string "My POKéMON!\n"
-	.string "It learned six moves!\p"
-	.string "Of course I’m lying!\n"
-	.string "Wahahaha!\p"
-	.string "This is no lie, though.\n"
-	.string "I’m not very good at choosing moves\l"
-	.string "for my POKéMON.\p"
-	.string "So, how about deciding for me which\n"
-	.string "kind of move I should teach?\p"
-	.string "{STR_VAR_2} or {STR_VAR_3}--which\n"
-	.string "would go with my {STR_VAR_1} best?$"
-
-gText_082C0982:: @ 82C0982
-	.string "Okay, so it’s {STR_VAR_1} you chose?\n"
-	.string "I’ll choose another move, then!\p"
-	.string "Just kidding!\n"
-	.string "I’ll obey your teaching, master!\p"
-	.string "Thanks, master!\n"
-	.string "I hope you’ll keep teaching me!$"
-
-gText_082C0A1D:: @ 82C0A1D
-	.string "A-H-O-Y!\n"
-	.string "And that spells ahoy!\p"
-	.string "The rappin’ SAILOR am I!\n"
-	.string "I’m always with it, don’t ask me why.\p"
-	.string "Today, I have a move question\n"
-	.string "that begs your suggestion!\p"
-	.string "{STR_VAR_2} and {STR_VAR_3} are\n"
-	.string "the moves. What would be the best\l"
-	.string "for my {STR_VAR_1} so it grooves?$"
-
-gText_082C0AFD:: @ 82C0AFD
-	.string "{STR_VAR_1}, you say, hey, hey!\n"
-	.string "I’ll go teach that right away!\p"
-	.string "If it’s advice I ever need,\n"
-	.string "{PLAYER}, your word I’ll always heed!$"
-
-gText_082C0B6F:: @ 82C0B6F
-	.string "Oh, yeahah, if it isn’t {PLAYER}!\p"
-	.string "What should I do? Get your advice?\n"
-	.string "Why not? I’m already talking to you!\p"
-	.string "{PLAYER}, are you surprised by me?\n"
-	.string "I want your advice, can’t you see?\p"
-	.string "Are you receiving me?\n"
-	.string "You are receiving me!\p"
-	.string "My {STR_VAR_1}--what should it use?\n"
-	.string "It’s {STR_VAR_2} or {STR_VAR_3},\l"
-	.string "what do you choose?$"
-
-gText_082C0C7D:: @ 82C0C7D
-	.string "If that {STR_VAR_1} is the best,\n"
-	.string "I’ll do as you suggest!\p"
-	.string "Well, {PLAYER}, I have to roam free,\n"
-	.string "but don’t you forget about me.\p"
-	.string "See you again, my smart friend!$"
-
-gText_082C0D0B:: @ 82C0D0B
-	.string "Gahack! Gaah! Oh, {PLAYER}{STRING 5}…\n"
-	.string "I have this lousy cold, I do…\p"
-	.string "I want to pick a move for my POKéMON,\n"
-	.string "but I’m not up to it…\p"
-	.string "So, things being this way,\n"
-	.string "I need you to decide for me.\p"
-	.string "{PLAYER}{STRING 5}, if I had to choose between\n"
-	.string "{STR_VAR_2} and {STR_VAR_3} for\l"
-	.string "my {STR_VAR_1}, which would it be?$"
-
-gText_082C0DFE:: @ 82C0DFE
-	.string "Hm, {STR_VAR_1}, all right. Cough!\n"
-	.string "I’ll go teach it when I get better.\p"
-	.string "I hope I can keep hitting you up\n"
-	.string "for help like this.$"
-
-gText_082C0E71:: @ 82C0E71
-	.string "Er… Um…\n"
-	.string "{PLAYER}{STRING 5}…?\p"
-	.string "Please, don’t look at me that way.\n"
-	.string "I’m getting all flustered…\l"
-	.string "I… I need your advice.\p"
-	.string "I… I’m really embarrassed, but I can’t\n"
-	.string "decide what move I should teach\l"
-	.string "my POKéMON.\p"
-	.string "It’s for my {STR_VAR_1}.\n"
-	.string "If the choices were {STR_VAR_2} or\l"
-	.string "{STR_VAR_3}, which would be better?$"
-
-gText_082C0F6D:: @ 82C0F6D
-	.string "Oh… Okay!\n"
-	.string "I’ll try that {STR_VAR_1}.\p"
-	.string "I hope I can teach that move…\n"
-	.string "This is so nerve-racking…\p"
-	.string "Thank you, {PLAYER}{STRING 5}.\n"
-	.string "If we meet again, I hope you will be\l"
-	.string "as helpful.$"
-
-gText_082C1003:: @ 82C1003
-	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
-	.string "But are you really real?\p"
-	.string "Perhaps you’re one of those popular\n"
-	.string "mimics?\p"
-	.string "No, no, if you are real, it’s fine.\n"
-	.string "No need to be upset, I assure you!\p"
-	.string "Incidentally, I would like to obtain\n"
-	.string "your advice.\p"
-	.string "It’s about my {STR_VAR_1}.\p"
-	.string "Which move would be better for it to\n"
-	.string "use, {STR_VAR_2} or {STR_VAR_3}?$"
-
-gText_082C1122:: @ 82C1122
-	.string "{STR_VAR_1}?\n"
-	.string "There’s no question about that?\p"
-	.string "I see. If that’s the case, that’s fine.\n"
-	.string "I thank you for your time.\p"
-	.string "I do hope it is something even\n"
-	.string "my POKéMON can learn.\p"
-	.string "Let us meet again!$"
-
-gText_082C11D1:: @ 82C11D1
-	.string "Oh… {PLAYER}?\n"
-	.string "It is {PLAYER}!\l"
-	.string "Oh! Sniff…sob… Please, listen!\p"
-	.string "I… When I battle, I get so nervous,\n"
-	.string "I can’t help crying even if I win…\p"
-	.string "I wish I could say something cool\n"
-	.string "when I win…\p"
-	.string "Please, please, {PLAYER}!\n"
-	.string "Could you maybe teach me something\l"
-	.string "cool to say when I win so I don’t cry?$"
-
-gText_082C12D5:: @ 82C12D5
-	.string "{STR_VAR_1}\p"
-	.string "Awesome! Wicked! Awoooh!\n"
-	.string "It’s really cool!\p"
-	.string "Oh… I’m sorry…\n"
-	.string "I’m so happy, I’m crying…\p"
-	.string "Snivel… {PLAYER}!\n"
-	.string "Thank you so much for everything!\p"
-	.string "I will battle the best I can for\n"
-	.string "your sake, {PLAYER}!\p"
-	.string "{PLAYER}…\n"
-	.string "Next time… We should battle!$"
-
-gText_082C13AB:: @ 82C13AB
-	.string "Yay! It’s {PLAYER}! Hello!\n"
-	.string "I wanted to ask you something!\p"
-	.string "I want to say something cool when\n"
-	.string "I win a match.\p"
-	.string "Do you have a cool saying that\n"
-	.string "you could recommend?$"
-
-gText_082C1444:: @ 82C1444
-	.string "{STR_VAR_1}\p"
-	.string "Oh, wow! That is so cool!\n"
-	.string "Okay, I’ll say that!\p"
-	.string "Thanks for teaching me all this time!\n"
-	.string "I’m going to do the best I can\l"
-	.string "wherever I go from now on!\p"
-	.string "When we meet again, it’ll be for\n"
-	.string "a battle!$"
-
-gText_082C1501:: @ 82C1501
-	.string "{PLAYER}, hello!\p"
-	.string "My POKéMON and I are ready for\n"
-	.string "anything, except for one thing.\p"
-	.string "I think it would be good if I had\n"
-	.string "something to shout when I win.\p"
-	.string "Could you think up something good\n"
-	.string "to say?$"
-
-gText_082C15B6:: @ 82C15B6
-	.string "{STR_VAR_1}\p"
-	.string "…Cool!\n"
-	.string "I will use that!\p"
-	.string "I’m going out to battle all over\n"
-	.string "the place.\p"
-	.string "Who knows, I may even get to battle\n"
-	.string "you one day, {PLAYER}.\p"
-	.string "Next time, let’s meet at a place\n"
-	.string "of battle!$"
-
-gText_082C165E:: @ 82C165E
-	.string "Hello, {PLAYER}…\n"
-	.string "I’m sorry to bug you, but I’m hopeless…\p"
-	.string "Even when…\n"
-	.string "Even when I win, I don’t have anything\l"
-	.string "special to say…\p"
-	.string "I know that it doesn’t mean anything\n"
-	.string "to you, {PLAYER}.\p"
-	.string "But it means a lot to me…\p"
-	.string "Please, {PLAYER}, what should I say\n"
-	.string "if I win a battle?$"
-
-gText_082C174F:: @ 82C174F
-	.string "{STR_VAR_1}\p"
-	.string "That’s inspired…\p"
-	.string "Uh… Is it okay for someone like me\n"
-	.string "to even say that?\p"
-	.string "No! I’ll do my best!\p"
-	.string "{PLAYER}, thank you so much for\n"
-	.string "putting up with me for so long…\p"
-	.string "I promise to do my best from now on.\p"
-	.string "I’m sure you’ll quickly forget about\n"
-	.string "someone like me, but let’s meet\l"
-	.string "somewhere again!$"
-
-gText_082C1862:: @ 82C1862
-	.string "Oh, {PLAYER}{STRING 5}.\n"
-	.string "There’s something I want you to hear.\p"
-	.string "I know that I don’t always sound\n"
-	.string "nice or polite…\p"
-	.string "When I win a battle, I think I come\n"
-	.string "across as being arrogant.\p"
-	.string "I don’t want people to dislike me,\n"
-	.string "so I want to say something nice to\l"
-	.string "someone I beat.\p"
-	.string "But I can’t think of anything good!\n"
-	.string "Could you think something up for me?$"
-
-gText_082C19A0:: @ 82C19A0
-	.string "{STR_VAR_1}\p"
-	.string "Not bad!\n"
-	.string "Yup, that’s what I’ll go with!\p"
-	.string "I’m going to hit the road and do what\n"
-	.string "I can with what you taught me in\l"
-	.string "my head and heart.\p"
-	.string "I’m sorry that I’ve been so pushy\n"
-	.string "with you!\p"
-	.string "Next time, we battle, okay?\n"
-	.string "See you!$"
-
-gText_082C1A76:: @ 82C1A76
-	.string "Oh, I can’t get over how busy I am!\n"
-	.string "Oh, hey, I was looking for you, {PLAYER}{STRING 5}.\p"
-	.string "Are you well as usual?\n"
-	.string "Things haven’t changed for me at all.\p"
-	.string "I’ve got running, fighting, and mapping\n"
-	.string "to do. Why am I so busy?\p"
-	.string "But even though I’m busy, it’d be rude\n"
-	.string "to just turn on my heels and walk away\l"
-	.string "from a win without saying a word.\p"
-	.string "So, what would be a cool saying to\n"
-	.string "underline my coolness when I’m done\l"
-	.string "and walking away? {PLAYER}{STRING 5}, help me!$"
-
-gText_082C1C16:: @ 82C1C16
-	.string "{STR_VAR_1}\p"
-	.string "Okay, gotcha.\n"
-	.string "I can find time to say that!\p"
-	.string "Honestly, I’m glad I met a good mentor\n"
-	.string "like you.\p"
-	.string "I’m going to make time somehow so\n"
-	.string "I can get into battling.\p"
-	.string "Thanks for everything, {PLAYER}{STRING 5}!\n"
-	.string "We have to battle, you and me, one day!$"
-
-gText_082C1CF5:: @ 82C1CF5
-	.string "I lucked out again!\n"
-	.string "{PLAYER}! Am I glad to see you!\l"
-	.string "Like usual, I need your advice!\p"
-	.string "Drum roll, please!\n"
-	.string "The last question I have is…\p"
-	.string "If I win a battle and want to end\n"
-	.string "it with a cool flourish, what\l"
-	.string "should I say?$"
-
-gText_082C1DC1:: @ 82C1DC1
-	.string "{STR_VAR_1}\p"
-	.string "That… That’s fabulous!\n"
-	.string "It’s dignified and cool! I claim it!\p"
-	.string "…Listen, I think I’m getting decent\n"
-	.string "at this, huh?\p"
-	.string "So, I’m thinking of challenging other\n"
-	.string "TRAINERS from now on.\p"
-	.string "{PLAYER}, your advice really helped me.\p"
-	.string "Maybe one day, there’ll be a time when\n"
-	.string "we battle!\p"
-	.string "Thank you for everything!$"
-
-gText_082C1EDC:: @ 82C1EDC
-	.string "Oh, {PLAYER}.\n"
-	.string "I’m so glad I met you!\p"
-	.string "I no longer have any concerns with\n"
-	.string "regard to my POKéMON.\p"
-	.string "It’s myself that worries me…\p"
-	.string "Do you know how a TRAINER says\n"
-	.string "a few things upon winning a battle?\p"
-	.string "Definitely, I wish I could do that,\n"
-	.string "too!\p"
-	.string "Please, what should I say when\n"
-	.string "I win a battle?$"
-
-gText_082C1FEC:: @ 82C1FEC
-	.string "{STR_VAR_1}\p"
-	.string "Ah! That saying! It refreshes me\n"
-	.string "and makes me feel reborn!\p"
-	.string "I must use that right away!\p"
-	.string "And now, I must take my leave,\n"
-	.string "{PLAYER}…\p"
-	.string "I will go out to battle many others,\n"
-	.string "but never will I forget your teachings.\p"
-	.string "Perhaps one day…\n"
-	.string "Farewell!$"
-
-gText_082C20D1:: @ 82C20D1
-	.string "Eek! I spotted {PLAYER}!\n"
-	.string "I… I’m overjoyed to see you!\p"
-	.string "Oh-oh-oh! There’s something I just\n"
-	.string "had to ask you!\p"
-	.string "A little while ago, I won a battle.\n"
-	.string "That part was giddying!\p"
-	.string "But it made me so overjoyed that\n"
-	.string "I choked up and couldn’t say a thing!\p"
-	.string "So now, {PLAYER}, please, I want you to\n"
-	.string "think up an exit line for when I win!$"
-
-gText_082C21FF:: @ 82C21FF
-	.string "{STR_VAR_1}\p"
-	.string "Waaaaah!\n"
-	.string "I’m going to say that?!\l"
-	.string "I… I’m delirious with joy!\p"
-	.string "Th-th-thank you!\n"
-	.string "I have nothing left to regret now!\p"
-	.string "I’m going to travel now and battle\n"
-	.string "all sorts of people.\p"
-	.string "Everything, I owe it to you, {PLAYER}.\n"
-	.string "Really, really, thank you!\p"
-	.string "I’ve got to go now, but let’s meet\n"
-	.string "in battle one day!$"
-
-gText_082C231C:: @ 82C231C
-	.string "Hola, bueno!\n"
-	.string "{PLAYER}{STRING 5}!\p"
-	.string "You know, I’m getting the itch to roam\n"
-	.string "and battle where I may.\p"
-	.string "But before I do, I want your advice\n"
-	.string "once again, please!\p"
-	.string "If I were to win a battle, what would\n"
-	.string "be a good boast I could say to my\l"
-	.string "fallen TRAINER opponent?$"
-
-gText_082C2407:: @ 82C2407
-	.string "{STR_VAR_1}\p"
-	.string "Uh-huh, that’s sweet!\n"
-	.string "Si, bueno!\l"
-	.string "I’ll try saying that, like, ham!\p"
-	.string "And now, it’s time to say good-bye!\n"
-	.string "Thanks for all sorts of things!\p"
-	.string "Give me a battle one day, OK?\n"
-	.string "Adios!$"
-
-gText_082C24B5:: @ 82C24B5
-	.string "{PLAYER}{STRING 5}, there’s big trouble!\p"
-	.string "When I win a battle, I brag about it\n"
-	.string "for an hour at least!\p"
-	.string "Of course I’m lying!\n"
-	.string "Wahahaha!\p"
-	.string "This is no lie, though.\n"
-	.string "I’m not very good at chatting.\p"
-	.string "So, how about deciding for me what\n"
-	.string "I should say after winning a battle,\l"
-	.string "master?$"
-
-gText_082C25B1:: @ 82C25B1
-	.string "{STR_VAR_1}\p"
-	.string "That’s what I should say, huh?\n"
-	.string "Then, I’ll stay away from that!\p"
-	.string "Just kidding!\n"
-	.string "I’ll obey your teaching, master!\p"
-	.string "Thanks for teaching me all this time,\n"
-	.string "master!\p"
-	.string "I’m finally understanding what being\n"
-	.string "a TRAINER is about.\p"
-	.string "I’m going to go out and win battles\n"
-	.string "against any TRAINER.\p"
-	.string "Maybe it’ll be you one day, master!\p"
-	.string "That’s all!\n"
-	.string "Farewell, my master!$"
-
-gText_082C2707:: @ 82C2707
-	.string "A-H-O-Y!\n"
-	.string "And that spells ahoy!\p"
-	.string "The rappin’ SAILOR am I!\n"
-	.string "This will be my last question,\l"
-	.string "don’t you cry!\p"
-	.string "It’s a saying question\n"
-	.string "that begs your suggestion!\p"
-	.string "If I win a match, what can I say\n"
-	.string "in a real cool way?$"
-
-gText_082C27D4:: @ 82C27D4
-	.string "{STR_VAR_1}\p"
-	.string "Perfect! That’s what I’ll use.\n"
-	.string "I was right to make you choose!\p"
-	.string "And now, I think it’d be best,\n"
-	.string "if I were to fly the nest!\p"
-	.string "Thanks for all you taught me.\n"
-	.string "I’ll be off on a battle spree!\p"
-	.string "B-O-N-V-O-Y-A-G-E!\n"
-	.string "And that spells bon voyage,\l"
-	.string "to you this is my homage!$"
-
-gText_082C28D6:: @ 82C28D6
-	.string "Oh, yeah, {PLAYER}!\n"
-	.string "I found you again today!\p"
-	.string "What should I do? Ask you again?\n"
-	.string "Why not? I’m already asking you!\p"
-	.string "Anyways, {PLAYER}…\n"
-	.string "Are you receiving me?\l"
-	.string "You are receiving me!\l"
-	.string "I need some more advice for me!\p"
-	.string "It’s about what I should yell.\n"
-	.string "Something cool to holler when\l"
-	.string "a battle ends well.\p"
-	.string "Come on, I wanna hear you say it!$"
-
-gText_082C2A0B:: @ 82C2A0B
-	.string "{STR_VAR_1}\p"
-	.string "All right, all right!\n"
-	.string "I’ll use that because it’s so tight!\p"
-	.string "I’m out of things to ask you.\n"
-	.string "Waving bye is all that’s left to do.\p"
-	.string "But maybe one day we’ll meet, with one\n"
-	.string "destined to go down in defeat.\p"
-	.string "But, it really is time to say farewell.\p"
-	.string "Well, {PLAYER}, I have to roam free,\n"
-	.string "but don’t you forget about me!\p"
-	.string "Take care, {PLAYER}!\n"
-	.string "Love ya!$"
-
-gText_082C2B50:: @ 82C2B50
-	.string "{PLAYER}{STRING 5}, I’m finished…\n"
-	.string "My nose won’t stop dripping…\p"
-	.string "I was trying to think up something\n"
-	.string "cool to say when I win a battle.\p"
-	.string "It inspired me so much, it made me cry,\n"
-	.string "and now my nose won’t stop running…\p"
-	.string "So, things being this way,\n"
-	.string "I need you to decide for me, {PLAYER}{STRING 5}.\p"
-	.string "When I win a battle,\n"
-	.string "what should I say?$"
-
-gText_082C2C77:: @ 82C2C77
-	.string "{STR_VAR_1}\p"
-	.string "… … …That’s good.\n"
-	.string "No, it’s awe inspiring!\l"
-	.string "It’s bringing fresh tears to my eyes!\p"
-	.string "But in spite of my tears and runny\n"
-	.string "nose, I will use that saying!\p"
-	.string "I’m plumb out of things to ask you,\n"
-	.string "{PLAYER}{STRING 5}.\p"
-	.string "From now on, we’re rivals!\n"
-	.string "Thanks for everything!$"
-
-gText_082C2D67:: @ 82C2D67
-	.string "Er… Um…\n"
-	.string "{PLAYER}{STRING 5}…\p"
-	.string "Please, don’t look at me that way.\n"
-	.string "You’re making me all nervous.\p"
-	.string "I… I need your advice again.\n"
-	.string "I’ll make it my last, though…\p"
-	.string "It’s really embarrassing to ask,\n"
-	.string "but what if I win a battle?\l"
-	.string "What should I say?$"
-
-gText_082C2E41:: @ 82C2E41
-	.string "{STR_VAR_1}\p"
-	.string "Oh… Okay!\n"
-	.string "I’ll try to say that!\l"
-	.string "I might be too nervous to say it…\p"
-	.string "Thank you, {PLAYER}{STRING 5}.\n"
-	.string "I have to say good-bye now.\p"
-	.string "I’ll obey all that you’ve taught me,\n"
-	.string "{PLAYER}{STRING 5}, and do the best I can.$"
-
-gText_082C2EF5:: @ 82C2EF5
-	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
-	.string "But are you really?\l"
-	.string "Perhaps a clever {PLAYER} DOLL?\p"
-	.string "Oh, no, no, no, don’t worry!\n"
-	.string "If you really are real, please\l"
-	.string "forget about my rudeness.\p"
-	.string "No need to be so angry. All I wish for\n"
-	.string "is more of your fine advice.\p"
-	.string "It concerns a saying.\p"
-	.string "More precisely, what should I say\n"
-	.string "if I win a battle?$"
-
-gText_082C3023:: @ 82C3023
-	.string "{STR_VAR_1}\p"
-	.string "… … … … … …\n"
-	.string "When I win a match…\p"
-	.string "{STR_VAR_1}\p"
-	.string "…Are you serious?\p"
-	.string "I see. If you are serious, that’s fine.\n"
-	.string "I thank you for your time.\p"
-	.string "I do hope even I will be able to\n"
-	.string "put that saying to good use.\p"
-	.string "I seem to have run dry on what advice\n"
-	.string "I need.\p"
-	.string "I do believe it’s high time I bid you\n"
-	.string "farewell and strike out on my own.\p"
-	.string "Thank you, my mentor!\n"
-	.string "I apologize for my skepticism!$"
-
+	.include "data/scripts/apprentice.inc"
+	
 gBattleDomeOpponentPotential1::
 	.string "The best candidate to be a champ!$"
 
diff --git a/data/field_effect_helpers.s b/data/field_effect_helpers.s
index 63fc1580e..e49592659 100644
--- a/data/field_effect_helpers.s
+++ b/data/field_effect_helpers.s
@@ -2,31 +2,10 @@
 	.include "constants/constants.inc"
 
 	.section .rodata
-
-gUnknown_085CDC38:: @ 85CDC38
-	.2byte 12, 28, 44
-
-gUnknown_085CDC3E:: @ 85CDC3E
-	.byte 0x00, 0x01, 0x02, 0x03
-
-gUnknown_085CDC42:: @ 85CDC42
-	.2byte 0x0004, 0x0004, 0x0004, 0x0010, 0x0000
-
-gUnknown_085CDC4C:: @ 85CDC4C
-	.4byte sub_8154C7C
-	.4byte sub_8154CA0
-
-gUnknown_085CDC54:: @ 85CDC54
-	.4byte sub_815547C
-	.4byte sub_81554AC
-	.4byte sub_815550C
-
-gUnknown_085CDC60:: @ 85CDC60
-	.byte 0, 0, 1, 2, 3, 0, 0, 1, 1
-	.byte 0
+    
+    .align 1
 	
-gUnknown_085CDC6A:: @ 85CDC6A
-	.2byte 3, 7
+gUnknown_085CDC6E:: @ 85CDC6E
 	@the following might be unref, not sure
 	.byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00
 
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index c0c74496f..eab655877 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -86,15 +86,15 @@ gFieldEffectScript_UseCutOnTree:: @ 82DBAEC
 	field_eff_end
 
 gFieldEffectScript_Shadow:: @ 82DBAF2
-	field_eff_callnative oei_shadow
+	field_eff_callnative FldEff_Shadow
 	field_eff_end
 
 gFieldEffectScript_TallGrass:: @ 82DBAF8
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_grass_normal
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_TallGrass
 	field_eff_end
 
 gFieldEffectScript_Ripple:: @ 82DBB02
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_ripples
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Ripple
 	field_eff_end
 
 gFieldEffectScript_FieldMoveShowMon:: @ 82DBB0C
@@ -102,11 +102,11 @@ gFieldEffectScript_FieldMoveShowMon:: @ 82DBB0C
 	field_eff_end
 
 gFieldEffectScript_Ash:: @ 82DBB12
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_ash
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Ash
 	field_eff_end
 
 gFieldEffectScript_SurfBlob:: @ 82DBB1C
-	field_eff_callnative sub_8155534
+	field_eff_callnative FldEff_SurfBlob
 	field_eff_end
 
 gFieldEffectScript_UseSurf:: @ 82DBB22
@@ -114,7 +114,7 @@ gFieldEffectScript_UseSurf:: @ 82DBB22
 	field_eff_end
 
 gFieldEffectScript_GroundImpactDust:: @ 82DBB28
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155890
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Dust
 	field_eff_end
 
 gFieldEffectScript_Unknown11:: @ 82DBB32
@@ -122,55 +122,55 @@ gFieldEffectScript_Unknown11:: @ 82DBB32
 	field_eff_end
 
 gFieldEffectScript_BikeHopTallGrass:: @ 82DBB38
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8154658
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_JumpTallGrass
 	field_eff_end
 
 gFieldEffectScript_SandFootprints:: @ 82DBB42
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154B04
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_SandFootprints
 	field_eff_end
 
 gFieldEffectScript_BikeHopBigSplash:: @ 82DBB4C
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, oei_water_drop_tall
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_JumpBigSplash
 	field_eff_end
 
 gFieldEffectScript_Splash:: @ 82DBB56
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154CEC
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Splash
 	field_eff_end
 
 gFieldEffectScript_BikeHopSmallSplash:: @ 82DBB60
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154E1C
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_JumpSmallSplash
 	field_eff_end
 
 gFieldEffectScript_LongGrass:: @ 82DBB6A
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8154758
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_LongGrass
 	field_eff_end
 
 gFieldEffectScript_Unknown18:: @ 82DBB74
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81548FC
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_JumpLongGrass
 	field_eff_end
 
 gFieldEffectScript_Unknown19:: @ 82DBB7E
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81551F0
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Unknown19
 	field_eff_end
 
 gFieldEffectScript_Unknown20:: @ 82DBB88
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_815525C
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Unknown20
 	field_eff_end
 
 gFieldEffectScript_Unknown21:: @ 82DBB92
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_81552C8
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Unknown21
 	field_eff_end
 
 gFieldEffectScript_Unknown22:: @ 82DBB9C
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155334
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Unknown22
 	field_eff_end
 
 gFieldEffectScript_BerryTreeGrowthSparkle:: @ 82DBBA6
-	field_eff_callnative sub_8155B2C
+	field_eff_callnative FldEff_BerryTreeGrowthSparkle
 	field_eff_end
 
 gFieldEffectScript_DeepSandFootprints:: @ 82DBBAC
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154B78
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_DeepSandFootprints
 	field_eff_end
 
 gFieldEffectScript_Unknown25:: @ 82DBBB6
@@ -211,11 +211,11 @@ gFieldEffectScript_QuestionMarkIcon:: @ 82DBBEF
 	field_eff_end
 
 gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154EFC
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_FeetInFlowingWater
 	field_eff_end
 
 gFieldEffectScript_BikeTireTracks:: @ 82DBBFF
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154BEC
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_BikeTireTracks
 	field_eff_end
 
 gFieldEffectScript_SandDisguisePlaceholder:: @ 82DBC09
@@ -235,15 +235,15 @@ gFieldEffectScript_Unknown38:: @ 82DBC1B
 	field_eff_end
 
 gFieldEffectScript_Unknown39:: @ 82DBC21
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155900
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_SandPile
 	field_eff_end
 
 gFieldEffectScript_ShortGrass:: @ 82DBC2B
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_815496C
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_ShortGrass
 	field_eff_end
 
 gFieldEffectScript_HotSpringsWater:: @ 82DBC35
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81550B4
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_HotSpringsWater
 	field_eff_end
 
 gFieldEffectScript_Unknown43:: @ 82DBC3F
@@ -288,11 +288,11 @@ gFieldEffectScript_Unknown52:: @ 82DBC86
 	field_eff_end
 
 gFieldEffectScript_Bubbles:: @ 82DBC90
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155A88
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Bubbles
 	field_eff_end
 
 gFieldEffectScript_Unknown54:: @ 82DBC9A
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo3, sub_8155DDC
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo3, FldEff_Sparkle
 	field_eff_end
 
 gFieldEffectScript_Unknown55:: @ 82DBCA4
diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc
index 50debde1b..34fdb9fd7 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/events.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc
@@ -1,6 +1,6 @@
 AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8
-	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0
 	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099
 	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0
 	object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/events.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc
index 20233160e..e20bec9c3 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/events.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/events.inc
@@ -1,7 +1,7 @@
 BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814
 	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0
 	object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0
 	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0
 
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
index d33a3103c..63ceb7484 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
@@ -1,18 +1,18 @@
 BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4
 	object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 7, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_TWIN, 0, 7, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 16, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 16, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 16, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 16, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-	object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
 
 BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/events.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc
index c24a47301..cce01feda 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/events.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/events.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 1, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 1, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0
 	object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0
 	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0
 	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
index 4c84a209f..29818b1d6 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
@@ -1,7 +1,7 @@
 BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
 	object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
 	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
 	object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc
index bf06dcf34..66e844665 100644
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
+	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
 	object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 0, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0
 	object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc
index 5dae24a71..632bfdf10 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc
@@ -1,10 +1,10 @@
 BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0
+	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0
 	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0
 	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 18, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 18, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0
 	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0
-	object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 19, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0
+	object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 19, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0
 
 BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0
 	warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc
index 8734e4dc8..b34916f49 100644
--- a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54
-	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 
 BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C
 	map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/events.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc
index 1020cef3c..495d52257 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/events.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/events.inc
@@ -1,7 +1,7 @@
 BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0
+	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0
 	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0
+	object_event 3, EVENT_OBJ_GFX_TWIN, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0
 	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0
 
 BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc
index 3ce444a53..41a58ad3b 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08
-	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 
 BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20
 	map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc
index dbc3584a6..2fc9e9d6c 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc
@@ -1,6 +1,6 @@
 BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80
-	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0
+	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0
+	object_event 2, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0
 
 BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0
 	coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc
index 2945034bc..225961050 100644
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc
@@ -1,9 +1,9 @@
 BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0
+	object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0
+	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0
 	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 9, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 1, 9, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0
 	object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0
 	object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0
 	object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc
index 3e66eec7d..f9604d8d1 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 0, 0, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
 	object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc
index 521577c4c..b70958fec 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc
@@ -1,7 +1,7 @@
 BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598
 	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0
 	object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0
 	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0
 
 BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc
index 73bdeeb2b..0961aa403 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc
@@ -1,10 +1,10 @@
 BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0
 	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0
 	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918
-	object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701
+	object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, 701
 	object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0
 	object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0
 	object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index 2b07b7ea4..73c56351f 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -12,7 +12,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690
 BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
 	call BattleFrontier_BattleTowerLobby_EventScript_28CC84
 	setvar VAR_0x8004, 10
-	special sub_81A085C
+	special CallApprenticeFunction
 	compare VAR_0x8004, 0
 	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5
 	checkflag FLAG_0x934
@@ -21,7 +21,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
 BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5
 	clearflag FLAG_0x2BD
 	setvar VAR_0x8004, 23
-	special sub_81A085C
+	special CallApprenticeFunction
 
 BattleFrontier_BattleTowerLobby_EventScript_23E6C0:: @ 823E6C0
 	end
@@ -929,7 +929,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7
 
 BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
 	setvar VAR_0x8004, 9
-	message OldaleTown_PokemonCenter_2F_Text_278091
+	message gText_PleaseWaitForLink
 	waitmessage
 	setvar VAR_0x8005, 0
 	special sub_80B2DA4
diff --git a/data/maps/BattleFrontier_Lounge1/events.inc b/data/maps/BattleFrontier_Lounge1/events.inc
index 1303c3c33..78ef44109 100644
--- a/data/maps/BattleFrontier_Lounge1/events.inc
+++ b/data/maps/BattleFrontier_Lounge1/events.inc
@@ -1,5 +1,5 @@
 BattleFrontier_Lounge1_EventObjects: @ 853CFB4
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0
 	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0
 	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0
 
diff --git a/data/maps/BattleFrontier_Lounge3/events.inc b/data/maps/BattleFrontier_Lounge3/events.inc
index 75f04250c..bce1dfa35 100644
--- a/data/maps/BattleFrontier_Lounge3/events.inc
+++ b/data/maps/BattleFrontier_Lounge3/events.inc
@@ -1,9 +1,9 @@
 BattleFrontier_Lounge3_EventObjects: @ 853D1B8
 	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0
 	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 0, 3, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0
+	object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 0, 3, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0
 
 BattleFrontier_Lounge3_MapWarps: @ 853D230
 	warp_def 4, 9, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
diff --git a/data/maps/BattleFrontier_Lounge4/events.inc b/data/maps/BattleFrontier_Lounge4/events.inc
index c0dfbcf3e..8b86bebc7 100644
--- a/data/maps/BattleFrontier_Lounge4/events.inc
+++ b/data/maps/BattleFrontier_Lounge4/events.inc
@@ -1,7 +1,7 @@
 BattleFrontier_Lounge4_EventObjects: @ 853D24C
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0
 	object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0
 
 BattleFrontier_Lounge4_MapWarps: @ 853D294
 	warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
diff --git a/data/maps/BattleFrontier_Lounge5/events.inc b/data/maps/BattleFrontier_Lounge5/events.inc
index 798deb1c2..216a72473 100644
--- a/data/maps/BattleFrontier_Lounge5/events.inc
+++ b/data/maps/BattleFrontier_Lounge5/events.inc
@@ -1,8 +1,8 @@
 BattleFrontier_Lounge5_EventObjects: @ 853D2EC
-	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 12, 4, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 12, 4, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0
 	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0
 	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 11, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 11, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0
 
 BattleFrontier_Lounge5_MapWarps: @ 853D34C
 	warp_def 1, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
diff --git a/data/maps/BattleFrontier_Lounge7/events.inc b/data/maps/BattleFrontier_Lounge7/events.inc
index 901ac6641..de4aef12a 100644
--- a/data/maps/BattleFrontier_Lounge7/events.inc
+++ b/data/maps/BattleFrontier_Lounge7/events.inc
@@ -1,7 +1,7 @@
 BattleFrontier_Lounge7_EventObjects: @ 853D3A4
 	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0
+	object_event 2, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0
+	object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0
 	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0
 
 BattleFrontier_Lounge7_MapWarps: @ 853D404
diff --git a/data/maps/BattleFrontier_Lounge8/events.inc b/data/maps/BattleFrontier_Lounge8/events.inc
index 92d27d765..c8edc68aa 100644
--- a/data/maps/BattleFrontier_Lounge8/events.inc
+++ b/data/maps/BattleFrontier_Lounge8/events.inc
@@ -1,7 +1,7 @@
 BattleFrontier_Lounge8_EventObjects: @ 853D4BC
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 7, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0
+	object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 8, 7, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0
 
 BattleFrontier_Lounge8_MapWarps: @ 853D504
 	warp_def 4, 9, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
diff --git a/data/maps/BattleFrontier_Mart/events.inc b/data/maps/BattleFrontier_Mart/events.inc
index 3ca67e038..9e57319f0 100644
--- a/data/maps/BattleFrontier_Mart/events.inc
+++ b/data/maps/BattleFrontier_Mart/events.inc
@@ -1,7 +1,7 @@
 BattleFrontier_Mart_EventObjects: @ 853D68C
 	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0
 	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0
 
 BattleFrontier_Mart_MapWarps: @ 853D6EC
diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc
index 526c53971..dab98712a 100644
--- a/data/maps/BattleFrontier_OutsideEast/events.inc
+++ b/data/maps/BattleFrontier_OutsideEast/events.inc
@@ -1,28 +1,28 @@
 BattleFrontier_OutsideEast_EventObjects: @ 853BB10
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 20, 17, 0, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 42, 15, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0
+	object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 20, 17, 0, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 42, 15, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0
 	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0
 	object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 54, 16, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0
 	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 37, 32, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0
 	object_event 6, EVENT_OBJ_GFX_COOK, 0, 41, 56, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0
-	object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 46, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0
+	object_event 7, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 46, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0
 	object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 34, 41, 0, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0
-	object_event 9, EVENT_OBJ_GFX_BOY_4, 0, 45, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0
+	object_event 9, EVENT_OBJ_GFX_RICH_BOY, 0, 45, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0
 	object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 59, 35, 0, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0
-	object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 18, 40, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0
+	object_event 11, EVENT_OBJ_GFX_TWIN, 0, 18, 40, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0
 	object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0
 	object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0
 	object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842
 	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0
 	object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0
 	object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0
-	object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 11, 21, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0
-	object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 21, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0
-	object_event 20, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_3, 0, 11, 21, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0
+	object_event 19, EVENT_OBJ_GFX_WOMAN_5, 0, 10, 21, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0
+	object_event 20, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0
 	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 33, 14, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0
 	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 54, 31, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0
-	object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 54, 32, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0
-	object_event 24, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 58, 55, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 54, 32, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0
+	object_event 24, EVENT_OBJ_GFX_OLD_WOMAN, 0, 58, 55, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0
 	object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0
 	object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0
 
diff --git a/data/maps/BattleFrontier_OutsideWest/events.inc b/data/maps/BattleFrontier_OutsideWest/events.inc
index 8095b6d6c..de372832f 100644
--- a/data/maps/BattleFrontier_OutsideWest/events.inc
+++ b/data/maps/BattleFrontier_OutsideWest/events.inc
@@ -2,27 +2,27 @@ BattleFrontier_OutsideWest_EventObjects: @ 853B350
 	object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0
 	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0
-	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 20, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 27, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 41, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0
+	object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 20, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 27, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 33, 41, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0
 	object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 28, 43, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0
 	object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 20, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0
 	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 13, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0
 	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 14, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0
-	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 23, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_5, 0, 23, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0
 	object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 38, 27, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0
-	object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 45, 18, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0
+	object_event 13, EVENT_OBJ_GFX_WOMAN_3, 0, 45, 18, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0
 	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 9, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0
 	object_event 15, EVENT_OBJ_GFX_LASS, 0, 35, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0
 	object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 11, 66, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0
 	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 31, 31, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0
 	object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 48, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0
 	object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 38, 22, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0
-	object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 9, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0
+	object_event 20, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 9, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0
 	object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 12, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0
-	object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 10, 0, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0
-	object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0
-	object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 26, 0, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0
+	object_event 22, EVENT_OBJ_GFX_OLD_MAN, 0, 11, 10, 0, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0
+	object_event 23, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0
+	object_event 24, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 26, 0, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0
 
 BattleFrontier_OutsideWest_MapWarps: @ 853B590
 	warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc
index cf0215573..5f2782f0f 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc
@@ -1,7 +1,7 @@
 BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0
 	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0
 	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0
 	object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0
 
diff --git a/data/maps/BattleFrontier_RankingHall/events.inc b/data/maps/BattleFrontier_RankingHall/events.inc
index 33069e0ca..abec40c17 100644
--- a/data/maps/BattleFrontier_RankingHall/events.inc
+++ b/data/maps/BattleFrontier_RankingHall/events.inc
@@ -1,6 +1,6 @@
 BattleFrontier_RankingHall_EventObjects: @ 853CEB8
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0
+	object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0
 	object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0
 
 BattleFrontier_RankingHall_MapWarps: @ 853CF00
diff --git a/data/maps/BattlePyramidSquare01/events.inc b/data/maps/BattlePyramidSquare01/events.inc
index bd6b45b82..cf5cfc1af 100644
--- a/data/maps/BattlePyramidSquare01/events.inc
+++ b/data/maps/BattlePyramidSquare01/events.inc
@@ -1,7 +1,7 @@
 BattlePyramidSquare01_EventObjects: @ 853A460
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 6, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
diff --git a/data/maps/BattlePyramidSquare02/events.inc b/data/maps/BattlePyramidSquare02/events.inc
index 67f235026..ad621d684 100644
--- a/data/maps/BattlePyramidSquare02/events.inc
+++ b/data/maps/BattlePyramidSquare02/events.inc
@@ -1,8 +1,8 @@
 BattlePyramidSquare02_EventObjects: @ 853A51C
 	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_TWIN, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
diff --git a/data/maps/BattlePyramidSquare03/events.inc b/data/maps/BattlePyramidSquare03/events.inc
index 1f38240c5..8eb81b96a 100644
--- a/data/maps/BattlePyramidSquare03/events.inc
+++ b/data/maps/BattlePyramidSquare03/events.inc
@@ -1,8 +1,8 @@
 BattlePyramidSquare03_EventObjects: @ 853A5D8
 	object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
diff --git a/data/maps/BattlePyramidSquare04/events.inc b/data/maps/BattlePyramidSquare04/events.inc
index f44a6e14c..79caf09ff 100644
--- a/data/maps/BattlePyramidSquare04/events.inc
+++ b/data/maps/BattlePyramidSquare04/events.inc
@@ -1,7 +1,7 @@
 BattlePyramidSquare04_EventObjects: @ 853A694
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 1, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 1, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
diff --git a/data/maps/BattlePyramidSquare07/events.inc b/data/maps/BattlePyramidSquare07/events.inc
index 2891e92df..8d63fc4e1 100644
--- a/data/maps/BattlePyramidSquare07/events.inc
+++ b/data/maps/BattlePyramidSquare07/events.inc
@@ -1,8 +1,8 @@
 BattlePyramidSquare07_EventObjects: @ 853A8C8
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 4, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 4, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
diff --git a/data/maps/BattlePyramidSquare08/events.inc b/data/maps/BattlePyramidSquare08/events.inc
index f095c3972..77ed5da6b 100644
--- a/data/maps/BattlePyramidSquare08/events.inc
+++ b/data/maps/BattlePyramidSquare08/events.inc
@@ -1,8 +1,8 @@
 BattlePyramidSquare08_EventObjects: @ 853A984
-	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 2, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 2, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
diff --git a/data/maps/BattlePyramidSquare09/events.inc b/data/maps/BattlePyramidSquare09/events.inc
index 265b9b1b6..0fd84a8c5 100644
--- a/data/maps/BattlePyramidSquare09/events.inc
+++ b/data/maps/BattlePyramidSquare09/events.inc
@@ -1,8 +1,8 @@
 BattlePyramidSquare09_EventObjects: @ 853AA40
-	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 3, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
diff --git a/data/maps/BattlePyramidSquare11/events.inc b/data/maps/BattlePyramidSquare11/events.inc
index 6210faa6f..e90e691e5 100644
--- a/data/maps/BattlePyramidSquare11/events.inc
+++ b/data/maps/BattlePyramidSquare11/events.inc
@@ -1,8 +1,8 @@
 BattlePyramidSquare11_EventObjects: @ 853ABB8
-	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 3, 2, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 3, 6, 4, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 2, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 6, 4, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
diff --git a/data/maps/BattlePyramidSquare14/events.inc b/data/maps/BattlePyramidSquare14/events.inc
index 48b98a361..f2d28d456 100644
--- a/data/maps/BattlePyramidSquare14/events.inc
+++ b/data/maps/BattlePyramidSquare14/events.inc
@@ -1,8 +1,8 @@
 BattlePyramidSquare14_EventObjects: @ 853ADEC
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
diff --git a/data/maps/BattlePyramidSquare15/events.inc b/data/maps/BattlePyramidSquare15/events.inc
index 50d0addf2..2556030e3 100644
--- a/data/maps/BattlePyramidSquare15/events.inc
+++ b/data/maps/BattlePyramidSquare15/events.inc
@@ -1,8 +1,8 @@
 BattlePyramidSquare15_EventObjects: @ 853AEA8
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
diff --git a/data/maps/BattlePyramidSquare16/events.inc b/data/maps/BattlePyramidSquare16/events.inc
index 84bb566c2..e08cb110e 100644
--- a/data/maps/BattlePyramidSquare16/events.inc
+++ b/data/maps/BattlePyramidSquare16/events.inc
@@ -1,8 +1,8 @@
 BattlePyramidSquare16_EventObjects: @ 853AF64
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 0, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 0, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
 	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
 	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc
index fadd3b282..aa637587c 100644
--- a/data/maps/DewfordTown/events.inc
+++ b/data/maps/DewfordTown/events.inc
@@ -1,6 +1,6 @@
 DewfordTown_EventObjects: @ 8527964
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, 740
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0
+	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, 740
 	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0
 	object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 743
 	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0
diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc
index cd6fb5e8f..3f150c6f6 100644
--- a/data/maps/DewfordTown_Hall/events.inc
+++ b/data/maps/DewfordTown_Hall/events.inc
@@ -1,10 +1,10 @@
 DewfordTown_Hall_EventObjects: @ 852DC48
 	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0
 	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0
-	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0
-	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0
-	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0
+	object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 3, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0
+	object_event 5, EVENT_OBJ_GFX_TWIN, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 14, 7, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0
 	object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0
 	object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0
 	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940
diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc
index 72a8dc305..53d72959c 100644
--- a/data/maps/DewfordTown_House1/events.inc
+++ b/data/maps/DewfordTown_House1/events.inc
@@ -1,5 +1,5 @@
 DewfordTown_House1_EventObjects: @ 852D9C8
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0
 	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0
 	object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 1, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0
 
diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc
index 9c03f4ce4..039ebac7c 100644
--- a/data/maps/DewfordTown_House2/events.inc
+++ b/data/maps/DewfordTown_House2/events.inc
@@ -1,5 +1,5 @@
 DewfordTown_House2_EventObjects: @ 852DD5C
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0
 	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0
 
 DewfordTown_House2_MapWarps: @ 852DD8C
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc
index 2e43a2239..830b6fd9b 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/events.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc
@@ -1,7 +1,7 @@
 DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0
+	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0
 
 DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C
 	warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
index 7e90c35c7..f6fa3987f 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
@@ -1,7 +1,7 @@
 EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0
+	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0
 	object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793
 
 EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc
index c04a0f30d..dcda8722c 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc
@@ -1,8 +1,8 @@
 EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0
 	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0
 
 EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0
 	warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY
diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc
index fae6f714e..b2246ad5a 100644
--- a/data/maps/FallarborTown/events.inc
+++ b/data/maps/FallarborTown/events.inc
@@ -1,6 +1,6 @@
 FallarborTown_EventObjects: @ 8527BE0
 	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0
+	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0
 	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0
 	object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907
 
diff --git a/data/maps/FallarborTown_BattleTentLobby/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc
index cdf9c79b9..937a15f27 100644
--- a/data/maps/FallarborTown_BattleTentLobby/events.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/events.inc
@@ -1,7 +1,7 @@
 FallarborTown_BattleTentLobby_EventObjects: @ 852E370
 	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0
 	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 12, 6, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 12, 6, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0
 	object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0
 	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767
 
diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc
index 8f16a7869..972ba61b6 100644
--- a/data/maps/FallarborTown_House1/events.inc
+++ b/data/maps/FallarborTown_House1/events.inc
@@ -1,6 +1,6 @@
 FallarborTown_House1_EventObjects: @ 852E5B8
 	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, 928
-	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0
 
 FallarborTown_House1_MapWarps: @ 852E5E8
 	warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN
diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc
index f2ec25c13..41bc31894 100644
--- a/data/maps/FallarborTown_Mart/events.inc
+++ b/data/maps/FallarborTown_Mart/events.inc
@@ -1,7 +1,7 @@
 FallarborTown_Mart_EventObjects: @ 852E2D4
 	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0
+	object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0
 	object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0
 	object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0
 
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
index fffc618eb..12b7f850e 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
@@ -1,8 +1,8 @@
 FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0
 	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871
+	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871
 
 FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500
 	warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN
diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc
index 914c4901c..d0cede5fc 100644
--- a/data/maps/FortreeCity/events.inc
+++ b/data/maps/FortreeCity/events.inc
@@ -1,10 +1,10 @@
 FortreeCity_EventObjects: @ 8526B9C
 	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0
 	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_EventScript_1E25DE, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, FortreeCity_EventScript_1E25BF, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 32, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, FortreeCity_EventScript_1E25BF, 0
 	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0
-	object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0
-	object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0
+	object_event 6, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0
 	object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, 969
 
 FortreeCity_MapWarps: @ 8526C44
diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc
index 22abe3103..2c5a0d21e 100644
--- a/data/maps/FortreeCity_DecorationShop/events.inc
+++ b/data/maps/FortreeCity_DecorationShop/events.inc
@@ -1,5 +1,5 @@
 FortreeCity_DecorationShop_EventObjects: @ 85310B0
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0
+	object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0
 	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0
 	object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0
 	object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0
diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc
index 5cc222c4e..307d35cc7 100644
--- a/data/maps/FortreeCity_Gym/events.inc
+++ b/data/maps/FortreeCity_Gym/events.inc
@@ -1,12 +1,12 @@
 FortreeCity_Gym_EventObjects: @ 8530C98
 	object_event 1, EVENT_OBJ_GFX_WINONA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0
 	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0
 	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 5, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0
 	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 15, 21, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, FortreeCity_Gym_EventScript_21671B, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, FortreeCity_Gym_EventScript_21671B, 0
 
 FortreeCity_Gym_MapWarps: @ 8530D58
 	warp_def 15, 24, 0, 2, MAP_FORTREE_CITY
diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc
index 35ed2acaf..45b2a902a 100644
--- a/data/maps/FortreeCity_House1/events.inc
+++ b/data/maps/FortreeCity_House1/events.inc
@@ -1,7 +1,7 @@
 FortreeCity_House1_EventObjects: @ 8530C2C
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0
+	object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0
 	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_House1_EventScript_21635F, 0
+	object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_House1_EventScript_21635F, 0
 
 FortreeCity_House1_MapWarps: @ 8530C74
 	warp_def 3, 5, 0, 1, MAP_FORTREE_CITY
diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc
index 43bc1fdfc..f9a5c11ab 100644
--- a/data/maps/FortreeCity_House2/events.inc
+++ b/data/maps/FortreeCity_House2/events.inc
@@ -1,6 +1,6 @@
 FortreeCity_House2_EventObjects: @ 8530F30
-	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0
+	object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0
+	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0
 
 FortreeCity_House2_MapWarps: @ 8530F60
 	warp_def 3, 5, 0, 4, MAP_FORTREE_CITY
diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc
index c038066e4..2a7842d5e 100644
--- a/data/maps/FortreeCity_House4/events.inc
+++ b/data/maps/FortreeCity_House4/events.inc
@@ -1,5 +1,5 @@
 FortreeCity_House4_EventObjects: @ 8530FD8
-	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0
 	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0
 	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933
 
diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc
index 0c716961a..8db01a8d0 100644
--- a/data/maps/FortreeCity_House5/events.inc
+++ b/data/maps/FortreeCity_House5/events.inc
@@ -1,5 +1,5 @@
 FortreeCity_House5_EventObjects: @ 8531044
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0
+	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0
 	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0
 	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0
 
diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc
index 5335df01d..e41280e89 100644
--- a/data/maps/FortreeCity_Mart/events.inc
+++ b/data/maps/FortreeCity_Mart/events.inc
@@ -1,6 +1,6 @@
 FortreeCity_Mart_EventObjects: @ 8530EAC
 	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0
 	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0
 	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0
 
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc
index e63b6eabb..f43cb4063 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/events.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc
@@ -1,7 +1,7 @@
 FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0
 	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0
 	object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0
 
 FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4
diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc
index 184bed05e..1d4b1239a 100644
--- a/data/maps/LavaridgeTown/events.inc
+++ b/data/maps/LavaridgeTown/events.inc
@@ -1,13 +1,13 @@
 LavaridgeTown_EventObjects: @ 8527A54
-	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0
+	object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0
+	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0
+	object_event 4, EVENT_OBJ_GFX_TWIN, 0, 10, 13, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0
 	object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0
 	object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0
 	object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 930
 	object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 929
-	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0
+	object_event 9, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0
 
 LavaridgeTown_MapWarps: @ 8527B2C
 	warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP
diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc
index d8aa6daa4..ee1cf057f 100644
--- a/data/maps/LavaridgeTown_Gym_1F/events.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/events.inc
@@ -1,8 +1,8 @@
 LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C
 	object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 13, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0
 	object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0
 	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0
 
diff --git a/data/maps/LavaridgeTown_Gym_B1F/events.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc
index cccd9cb14..337bfd761 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/events.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/events.inc
@@ -1,7 +1,7 @@
 LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8
-	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 4, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 13, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0
+	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 4, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0
 	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0
 
 LavaridgeTown_Gym_B1F_MapWarps: @ 852E008
diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc
index 8a80c4f75..f8602d872 100644
--- a/data/maps/LavaridgeTown_HerbShop/events.inc
+++ b/data/maps/LavaridgeTown_HerbShop/events.inc
@@ -1,7 +1,7 @@
 LavaridgeTown_HerbShop_EventObjects: @ 852DDB0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0
+	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0
 
 LavaridgeTown_HerbShop_MapWarps: @ 852DDF8
 	warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN
diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc
index 85a9d859e..0a44e6e8d 100644
--- a/data/maps/LavaridgeTown_House/events.inc
+++ b/data/maps/LavaridgeTown_House/events.inc
@@ -1,7 +1,7 @@
 LavaridgeTown_House_EventObjects: @ 852E0DC
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0
 	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0
+	object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0
 
 LavaridgeTown_House_MapWarps: @ 852E124
 	warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN
diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc
index a5537f9ca..8534faa7b 100644
--- a/data/maps/LavaridgeTown_Mart/events.inc
+++ b/data/maps/LavaridgeTown_Mart/events.inc
@@ -1,7 +1,7 @@
 LavaridgeTown_Mart_EventObjects: @ 852E148
 	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0
+	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0
 
 LavaridgeTown_Mart_MapWarps: @ 852E190
 	warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc
index 1586553f2..bf7246caa 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc
@@ -1,7 +1,7 @@
 LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0
 	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0
 	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0
 
 LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214
diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc
index 240de9cd4..427f49201 100644
--- a/data/maps/LilycoveCity/events.inc
+++ b/data/maps/LilycoveCity/events.inc
@@ -2,12 +2,12 @@ LilycoveCity_EventObjects: @ 8526CE8
 	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_EventScript_1E2C53, 0
 	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C2B, 0
 	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C4A, 0
+	object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 21, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C4A, 0
 	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C72, 0
-	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0
-	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0
-	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 35, 27, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C72, 0
+	object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0
+	object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0
+	object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 57, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0
 	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852
 	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042
 	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852
@@ -17,7 +17,7 @@ LilycoveCity_EventObjects: @ 8526CE8
 	object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0
 	object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, 971
 	object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0
-	object_event 19, EVENT_OBJ_GFX_WOMAN_4, 0, 41, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0
+	object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 41, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0
 	object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0
 	object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CCB, 0
 	object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CD4, 0
diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc
index 751bc0fc7..61d1cd63a 100644
--- a/data/maps/LilycoveCity_ContestHall/events.inc
+++ b/data/maps/LilycoveCity_ContestHall/events.inc
@@ -2,34 +2,34 @@ LilycoveCity_ContestHall_EventObjects: @ 8531850
 	object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0
 	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0
 	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0
 	object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0
 	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0
-	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0
+	object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0
 	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0
-	object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0
-	object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0
-	object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0
+	object_event 9, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 16, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0
+	object_event 10, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 24, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0
+	object_event 11, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0
 	object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0
-	object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0
+	object_event 13, EVENT_OBJ_GFX_WOMAN_3, 0, 24, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0
 	object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0
-	object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0
-	object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0
+	object_event 15, EVENT_OBJ_GFX_WOMAN_4, 0, 22, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0
+	object_event 16, EVENT_OBJ_GFX_TWIN, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0
 	object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0
-	object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0
-	object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0
+	object_event 18, EVENT_OBJ_GFX_POKEFAN_F, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0
+	object_event 19, EVENT_OBJ_GFX_WOMAN_2, 0, 20, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0
 	object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0
 	object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0
 	object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0
-	object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 36, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0
 	object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0
 	object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0
 	object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0
 	object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0
-	object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0
-	object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0
+	object_event 28, EVENT_OBJ_GFX_EXPERT_F, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0
+	object_event 29, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0
 	object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0
-	object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0
+	object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 42, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0
 	object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0
 
 LilycoveCity_ContestHall_MapWarps: @ 8531B50
diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc
index be94bfb7b..636e0db5a 100644
--- a/data/maps/LilycoveCity_ContestLobby/events.inc
+++ b/data/maps/LilycoveCity_ContestLobby/events.inc
@@ -1,29 +1,29 @@
 LilycoveCity_ContestLobby_EventObjects: @ 8531534
 	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 26, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 26, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0
 	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 774
 	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0
 	object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0
 	object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0
 	object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802
 	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0
-	object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0
+	object_event 10, EVENT_OBJ_GFX_TWIN, 0, 28, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0
 	object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 895
 	object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0
 	object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0
-	object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0
-	object_event 15, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0
-	object_event 16, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873
+	object_event 14, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0
+	object_event 15, EVENT_OBJ_GFX_POKEFAN_F, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0
+	object_event 16, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873
 	object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0
-	object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 27, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832
+	object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 27, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832
 	object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832
-	object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 28, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832
+	object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 28, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832
 	object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832
 	object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832
-	object_event 23, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832
-	object_event 24, EVENT_OBJ_GFX_OLD_MAN_2, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832
-	object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0
+	object_event 23, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832
+	object_event 24, EVENT_OBJ_GFX_OLD_MAN, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832
+	object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0
 
 LilycoveCity_ContestLobby_MapWarps: @ 853178C
 	warp_def 14, 11, 0, 4, MAP_LILYCOVE_CITY
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
index c0869f319..810fe5af9 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
@@ -1,10 +1,10 @@
 LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925
 	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925
 	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925
-	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925
-	object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925
-	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925
+	object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925
+	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925
 	object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787
 
 LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
index 279772204..5d0b88445 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
@@ -1,8 +1,8 @@
 LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C
 	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0
 	object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0
 
 LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C
 	warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc
index b2771391b..dfd7cc46d 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C
 	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0
 	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0
+	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 4, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0
+	object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0
 	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0
 
 LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc
index 11fd1c403..9e7d5514e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C
 	object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0
+	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0
 	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0
 
 LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4
 	warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc
index 7042a1483..84796fad4 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200
 	object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0
+	object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0
 
 LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278
 	warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc
index 8fe1ec45e..7b39c9194 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4
 	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0
 	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0
 
 LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C
 	warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc
index 9b56742a2..2118c33e8 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc
@@ -1,11 +1,11 @@
 LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348
-	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0
+	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 17, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0
 
 LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0
 	warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F
diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc
index 6a157a1ad..7828d58a4 100644
--- a/data/maps/LilycoveCity_Harbor/events.inc
+++ b/data/maps/LilycoveCity_Harbor/events.inc
@@ -3,7 +3,7 @@ LilycoveCity_Harbor_EventObjects: @ 8531E1C
 	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 861
 	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0
 	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 909
-	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 748
+	object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 748
 
 LilycoveCity_Harbor_MapWarps: @ 8531E94
 	warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY
diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc
index d5768e01c..392336e02 100644
--- a/data/maps/LilycoveCity_House1/events.inc
+++ b/data/maps/LilycoveCity_House1/events.inc
@@ -1,5 +1,5 @@
 LilycoveCity_House1_EventObjects: @ 8531EF4
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0
+	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0
 	object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0
 
 LilycoveCity_House1_MapWarps: @ 8531F24
diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc
index 89f48e9f3..363e62132 100644
--- a/data/maps/LilycoveCity_House3/events.inc
+++ b/data/maps/LilycoveCity_House3/events.inc
@@ -1,9 +1,9 @@
 LilycoveCity_House3_EventObjects: @ 8531F84
-	object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0
-	object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0
+	object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0
+	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0
+	object_event 3, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0
+	object_event 4, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0
+	object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0
 	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0
 
 LilycoveCity_House3_MapWarps: @ 8532014
diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc
index 6e447bf9c..d14a5c82b 100644
--- a/data/maps/LilycoveCity_House4/events.inc
+++ b/data/maps/LilycoveCity_House4/events.inc
@@ -1,5 +1,5 @@
 LilycoveCity_House4_EventObjects: @ 8532038
-	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0
 	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0
 
 LilycoveCity_House4_MapWarps: @ 8532068
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
index f24ede1b9..ea9606936 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
@@ -3,9 +3,9 @@ LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C
 	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775
 	object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0
 	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0
-	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776
+	object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776
 	object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779
 	object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780
 	object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
index d88bae478..ce4a6e169 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
@@ -1,8 +1,8 @@
 LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428
 	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0
 	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780
-	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780
+	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780
+	object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780
 
 LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488
 	warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
index a1be3924f..100ee364c 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
@@ -1,5 +1,5 @@
 LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0
+	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0
 
 LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0
 	warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
index be478e45c..7ba16fbb9 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
@@ -1,12 +1,12 @@
 LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20
 	object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0
-	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0
+	object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0
+	object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791
 	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790
-	object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792
-	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792
+	object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789
 	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730
 
 LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8
diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc
index c87a35486..72fe038ff 100644
--- a/data/maps/LinkContestRoom1/events.inc
+++ b/data/maps/LinkContestRoom1/events.inc
@@ -1,5 +1,5 @@
 LinkContestRoom1_EventObjects: @ 8539EFC
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
 	object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
 	object_event 4, EVENT_OBJ_GFX_TRADER, 0, 6, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc
index b6e7c3cf9..89057d387 100644
--- a/data/maps/LittlerootTown/events.inc
+++ b/data/maps/LittlerootTown/events.inc
@@ -1,5 +1,5 @@
 LittlerootTown_EventObjects: @ 85276A8
-	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 16, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0
+	object_event 1, EVENT_OBJ_GFX_TWIN, 0, 16, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0
 	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, 868
 	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0
 	object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
index 57538339f..abe7a5bc8 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
@@ -1,10 +1,10 @@
 LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C
 	object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758
-	object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755
-	object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754
-	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784
+	object_event 2, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755
+	object_event 3, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784
 	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 734
-	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735
+	object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735
 	object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 745
 
 LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
index fda8175bb..69fb6af63 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
@@ -1,10 +1,10 @@
 LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C
 	object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759
-	object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754
-	object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755
-	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785
+	object_event 2, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754
+	object_event 3, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785
 	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 734
-	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736
+	object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736
 	object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 746
 
 LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414
diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc
index 5b2d9927c..17ae4a327 100644
--- a/data/maps/MauvilleCity/events.inc
+++ b/data/maps/MauvilleCity/events.inc
@@ -1,11 +1,11 @@
 MauvilleCity_EventObjects: @ 852662C
 	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MauvilleCity_EventScript_1DF3B3, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0
+	object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 24, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0
 	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0
 	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0
 	object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804
-	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805
+	object_event 7, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805
 	object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912
 	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, 1116
 	object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0
diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc
index 7befd0f73..bae187003 100644
--- a/data/maps/MauvilleCity_BikeShop/events.inc
+++ b/data/maps/MauvilleCity_BikeShop/events.inc
@@ -1,6 +1,6 @@
 MauvilleCity_BikeShop_EventObjects: @ 852FE80
 	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0
 
 MauvilleCity_BikeShop_MapWarps: @ 852FEB0
 	warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY
diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc
index 79b436489..0fac26b5d 100644
--- a/data/maps/MauvilleCity_GameCorner/events.inc
+++ b/data/maps/MauvilleCity_GameCorner/events.inc
@@ -1,16 +1,16 @@
 MauvilleCity_GameCorner_EventObjects: @ 852FF28
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0
 	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0
 	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0
 	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0
 	object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0
-	object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0
+	object_event 6, EVENT_OBJ_GFX_POKEFAN_M, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN, 0, 20, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0
 	object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0
 	object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0
-	object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0
+	object_event 10, EVENT_OBJ_GFX_MAN_3, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0
 	object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0
-	object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0
+	object_event 12, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0
 
 MauvilleCity_GameCorner_MapWarps: @ 8530048
 	warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY
diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc
index cb126faef..84e6f7eff 100644
--- a/data/maps/MauvilleCity_Gym/events.inc
+++ b/data/maps/MauvilleCity_Gym/events.inc
@@ -1,9 +1,9 @@
 MauvilleCity_Gym_EventObjects: @ 852FD5C
 	object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913
-	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0
 	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0
 	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 1, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0
 	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0
 	object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0
 
diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc
index 3ac497bbc..fae511bb3 100644
--- a/data/maps/MauvilleCity_House2/events.inc
+++ b/data/maps/MauvilleCity_House2/events.inc
@@ -1,5 +1,5 @@
 MauvilleCity_House2_EventObjects: @ 853018C
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0
 
 MauvilleCity_House2_MapWarps: @ 85301A4
 	warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY
diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc
index 5e96dcfd3..0d32a0e2c 100644
--- a/data/maps/MauvilleCity_Mart/events.inc
+++ b/data/maps/MauvilleCity_Mart/events.inc
@@ -1,7 +1,7 @@
 MauvilleCity_Mart_EventObjects: @ 8530310
 	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0
+	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0
 
 MauvilleCity_Mart_MapWarps: @ 8530358
 	warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
index 4000ead3e..f83ab5e45 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
@@ -2,7 +2,7 @@ MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0
 	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0
 	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0
 	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0
 
 MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240
diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc
index 1e8e1f093..d9a15cbcb 100644
--- a/data/maps/MeteorFalls_1F_2R/events.inc
+++ b/data/maps/MeteorFalls_1F_2R/events.inc
@@ -1,7 +1,7 @@
 MeteorFalls_1F_2R_EventObjects: @ 85340C4
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0
+	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0
+	object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0
 
 MeteorFalls_1F_2R_MapWarps: @ 853410C
 	warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R
diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc
index 0413b1be4..fead88f9b 100644
--- a/data/maps/MossdeepCity/events.inc
+++ b/data/maps/MossdeepCity/events.inc
@@ -1,8 +1,8 @@
 MossdeepCity_EventObjects: @ 8527018
 	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0
+	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 50, 34, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0
+	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0
+	object_event 4, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 21, 5, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0
 	object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0
 	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043
 	object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0
diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc
index 4186ec9ca..2f96c458f 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/events.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc
@@ -1,6 +1,6 @@
 MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0
+	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0
 
 MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70
 	warp_def 5, 9, 0, 9, MAP_MOSSDEEP_CITY
diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc
index 00e7a12fc..4ccf90558 100644
--- a/data/maps/MossdeepCity_House1/events.inc
+++ b/data/maps/MossdeepCity_House1/events.inc
@@ -1,6 +1,6 @@
 MossdeepCity_House1_EventObjects: @ 8532978
 	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0
 
 MossdeepCity_House1_MapWarps: @ 85329A8
 	warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY
diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc
index b38d1bf8d..001039dfc 100644
--- a/data/maps/MossdeepCity_House2/events.inc
+++ b/data/maps/MossdeepCity_House2/events.inc
@@ -1,6 +1,6 @@
 MossdeepCity_House2_EventObjects: @ 85329CC
-	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0
+	object_event 2, EVENT_OBJ_GFX_TWIN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0
 	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934
 
 MossdeepCity_House2_MapWarps: @ 8532A14
diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc
index 048bd5ffd..5e33f871f 100644
--- a/data/maps/MossdeepCity_House4/events.inc
+++ b/data/maps/MossdeepCity_House4/events.inc
@@ -1,6 +1,6 @@
 MossdeepCity_House4_EventObjects: @ 8532CAC
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0
+	object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0
 	object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0
 
 MossdeepCity_House4_MapWarps: @ 8532CF4
diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc
index 9fb1f674a..d452187d1 100644
--- a/data/maps/MossdeepCity_Mart/events.inc
+++ b/data/maps/MossdeepCity_Mart/events.inc
@@ -1,6 +1,6 @@
 MossdeepCity_Mart_EventObjects: @ 8532B50
 	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0
 	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0
 	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_222408, 0
 
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc
index ed26d83cb..5e48096c9 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc
@@ -1,6 +1,6 @@
 MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0
 	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0
 
 MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
index e13367153..1641be959 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
@@ -3,7 +3,7 @@ MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC
 	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0
 	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0
 	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702
-	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0
 
 MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24
 	warp_def 1, 6, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
index fe1d4fcf8..c45f433f2 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
@@ -2,13 +2,13 @@ MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18
 	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0
 	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0
 	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0
-	object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0
 	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756
 	object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756
 	object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756
 	object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756
-	object_event 10, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737
+	object_event 10, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737
 	object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753
 
 MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
index b1e7373da..02b771bf6 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
@@ -1,5 +1,5 @@
 MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C
-	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0
+	object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0
 	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0
 	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0
 	object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 0052f09aa..36bfc422a 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -260,7 +260,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
 	goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA
 
 MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032
-	special sub_80F94E8
+	special ReducePlayerPartyToThree
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 4
 	special sub_81A1780
diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc
index 66e00b1f4..208ec7db0 100644
--- a/data/maps/MossdeepCity_StevensHouse/events.inc
+++ b/data/maps/MossdeepCity_StevensHouse/events.inc
@@ -1,7 +1,7 @@
 MossdeepCity_StevensHouse_EventObjects: @ 8532C10
 	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967
 	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968
-	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727
+	object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727
 
 MossdeepCity_StevensHouse_MapWarps: @ 8532C58
 	warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY
diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc
index 03806a854..343f6a203 100644
--- a/data/maps/MtChimney/events.inc
+++ b/data/maps/MtChimney/events.inc
@@ -7,7 +7,7 @@ MtChimney_EventObjects: @ 85347C8
 	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926
 	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926
 	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926
-	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994
+	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994
 	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927
 	object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926
 	object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
@@ -23,7 +23,7 @@ MtChimney_EventObjects: @ 85347C8
 	object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927
 	object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926
 	object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
-	object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877
+	object_event 25, EVENT_OBJ_GFX_EXPERT_F, 0, 16, 18, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877
 	object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877
 	object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, 877
 	object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, 877
diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc
index 179a6a538..5fd821541 100644
--- a/data/maps/MtPyre_1F/events.inc
+++ b/data/maps/MtPyre_1F/events.inc
@@ -1,7 +1,7 @@
 MtPyre_1F_EventObjects: @ 8534D64
-	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0
+	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0
 
 MtPyre_1F_MapWarps: @ 8534DAC
 	warp_def 17, 18, 3, 0, MAP_ROUTE122
diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc
index 6c334ac0c..c025089e3 100644
--- a/data/maps/MtPyre_2F/events.inc
+++ b/data/maps/MtPyre_2F/events.inc
@@ -2,9 +2,9 @@ MtPyre_2F_EventObjects: @ 8534DF0
 	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0
 	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, 1129
 	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 12, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23113F, 0
+	object_event 4, EVENT_OBJ_GFX_POKEFAN_M, 0, 12, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23113F, 0
 	object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, MtPyre_2F_EventScript_23118C, 0
 	object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_2F_EventScript_231175, 0
 
diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc
index ed9caf9f3..8d841d828 100644
--- a/data/maps/MtPyre_3F/events.inc
+++ b/data/maps/MtPyre_3F/events.inc
@@ -2,7 +2,7 @@ MtPyre_3F_EventObjects: @ 8534EEC
 	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0
 	object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0
 	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, 1120
-	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0
 
 MtPyre_3F_MapWarps: @ 8534F4C
 	warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F
diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc
index 669625c41..554eaa75e 100644
--- a/data/maps/MtPyre_Summit/events.inc
+++ b/data/maps/MtPyre_Summit/events.inc
@@ -1,7 +1,7 @@
 MtPyre_Summit_EventObjects: @ 85351A0
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0
 	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 916
-	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0
+	object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0
 	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917
 	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917
 	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917
diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc
index 4933604d4..7183f9293 100644
--- a/data/maps/OldaleTown_House1/events.inc
+++ b/data/maps/OldaleTown_House1/events.inc
@@ -1,5 +1,5 @@
 OldaleTown_House1_EventObjects: @ 852D7B4
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0
 
 OldaleTown_House1_MapWarps: @ 852D7CC
 	warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN
diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc
index a57b07c26..7e94a2356 100644
--- a/data/maps/OldaleTown_House2/events.inc
+++ b/data/maps/OldaleTown_House2/events.inc
@@ -1,5 +1,5 @@
 OldaleTown_House2_EventObjects: @ 852D7F0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0
+	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0
 	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0
 
 OldaleTown_House2_MapWarps: @ 852D820
diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc
index 73adf3718..22b308364 100644
--- a/data/maps/OldaleTown_Mart/events.inc
+++ b/data/maps/OldaleTown_Mart/events.inc
@@ -1,6 +1,6 @@
 OldaleTown_Mart_EventObjects: @ 852D95C
 	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0
 	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0
 
 OldaleTown_Mart_MapWarps: @ 852D9A4
diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc
index a601c8381..f73c1d14a 100644
--- a/data/maps/PacifidlogTown/events.inc
+++ b/data/maps/PacifidlogTown/events.inc
@@ -1,7 +1,7 @@
 PacifidlogTown_EventObjects: @ 8527DE8
 	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0
 	object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0
+	object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0
 
 PacifidlogTown_MapWarps: @ 8527E30
 	warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F
diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc
index 4bc239ea6..ac082b74a 100644
--- a/data/maps/PacifidlogTown_House1/events.inc
+++ b/data/maps/PacifidlogTown_House1/events.inc
@@ -1,6 +1,6 @@
 PacifidlogTown_House1_EventObjects: @ 852EBA0
-	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0
+	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0
 
 PacifidlogTown_House1_MapWarps: @ 852EBD0
 	warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN
diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc
index bdf1aae10..30460329a 100644
--- a/data/maps/PacifidlogTown_House3/events.inc
+++ b/data/maps/PacifidlogTown_House3/events.inc
@@ -1,6 +1,6 @@
 PacifidlogTown_House3_EventObjects: @ 852EC60
 	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0
 
 PacifidlogTown_House3_MapWarps: @ 852EC90
 	warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN
diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc
index bcd3dc6e9..740cc4ba3 100644
--- a/data/maps/PacifidlogTown_House4/events.inc
+++ b/data/maps/PacifidlogTown_House4/events.inc
@@ -1,6 +1,6 @@
 PacifidlogTown_House4_EventObjects: @ 852ECB4
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0
 	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0
 
 PacifidlogTown_House4_MapWarps: @ 852ECFC
diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc
index f039b7694..8d7f0b0c0 100644
--- a/data/maps/PacifidlogTown_House5/events.inc
+++ b/data/maps/PacifidlogTown_House5/events.inc
@@ -1,5 +1,5 @@
 PacifidlogTown_House5_EventObjects: @ 852ED20
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0
+	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0
 	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0
 
 PacifidlogTown_House5_MapWarps: @ 852ED50
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc
index 8040086f8..80c8a8c71 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc
@@ -1,9 +1,9 @@
 PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0
 	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0
 	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0
 
 PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8
 	warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN
diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc
index b3fd71d2c..3e85ad434 100644
--- a/data/maps/PetalburgCity/events.inc
+++ b/data/maps/PetalburgCity/events.inc
@@ -1,9 +1,9 @@
 PetalburgCity_EventObjects: @ 8525FD0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, 728
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, 728
 	object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 726
 	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0
 	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, PetalburgCity_EventScript_1DC488, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 830
+	object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 830
 	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039
 	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040
 	object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0
diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc
index 209c789a0..42a0a8fc7 100644
--- a/data/maps/PetalburgCity_Gym/events.inc
+++ b/data/maps/PetalburgCity_Gym/events.inc
@@ -1,15 +1,15 @@
 PetalburgCity_Gym_EventObjects: @ 852EDC8
 	object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 4, 42, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 55, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 4, 68, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_3, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0
 	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781
 	object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 866
-	object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 824
+	object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 824
 
 PetalburgCity_Gym_MapWarps: @ 852EED0
 	warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY
diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc
index 4688eefe6..bcb91e637 100644
--- a/data/maps/PetalburgCity_House1/events.inc
+++ b/data/maps/PetalburgCity_House1/events.inc
@@ -1,6 +1,6 @@
 PetalburgCity_House1_EventObjects: @ 852F0BC
 	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0
+	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0
 
 PetalburgCity_House1_MapWarps: @ 852F0EC
 	warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY
diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc
index 17f9001e2..660f1efe3 100644
--- a/data/maps/PetalburgCity_House2/events.inc
+++ b/data/maps/PetalburgCity_House2/events.inc
@@ -1,5 +1,5 @@
 PetalburgCity_House2_EventObjects: @ 852F110
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0
+	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0
 	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0
 
 PetalburgCity_House2_MapWarps: @ 852F140
diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc
index 88d99918d..b79aa5cb0 100644
--- a/data/maps/PetalburgCity_Mart/events.inc
+++ b/data/maps/PetalburgCity_Mart/events.inc
@@ -2,7 +2,7 @@ PetalburgCity_Mart_EventObjects: @ 852F294
 	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0
 	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0
 	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0
 
 PetalburgCity_Mart_MapWarps: @ 852F2F4
 	warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc
index 509ed0094..8a1de856d 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc
@@ -1,9 +1,9 @@
 PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0
 	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0
 	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0
 
 PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC
 	warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY
diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc
index cc43ca814..e30f3a487 100644
--- a/data/maps/PetalburgCity_WallysHouse/events.inc
+++ b/data/maps/PetalburgCity_WallysHouse/events.inc
@@ -1,6 +1,6 @@
 PetalburgCity_WallysHouse_EventObjects: @ 852ED74
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0
+	object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0
 
 PetalburgCity_WallysHouse_MapWarps: @ 852EDA4
 	warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY
diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc
index 8e1916a5a..06c6588a9 100644
--- a/data/maps/RecordCorner/events.inc
+++ b/data/maps/RecordCorner/events.inc
@@ -1,5 +1,5 @@
 RecordCorner_EventObjects: @ 8539DFC
-	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0
+	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0
 
 RecordCorner_MapWarps: @ 8539E14
 	warp_def 8, 9, 3, 127, MAP_NONE
diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc
index 58a0bf64b..1c660cda4 100644
--- a/data/maps/Route102/events.inc
+++ b/data/maps/Route102/events.inc
@@ -1,5 +1,5 @@
 Route102_EventObjects: @ 8527FD8
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 18, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0
 	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route102_EventScript_1EC105, 0
 	object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0
 	object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0
diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc
index 6581eb582..f11191970 100644
--- a/data/maps/Route103/events.inc
+++ b/data/maps/Route103/events.inc
@@ -1,21 +1,21 @@
 Route103_EventObjects: @ 85280DC
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0
 	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723
-	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0
-	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0
+	object_event 4, EVENT_OBJ_GFX_TWIN, 0, 65, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0
+	object_event 5, EVENT_OBJ_GFX_TWIN, 0, 64, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0
 	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 1, 1, 3, Route103_EventScript_1EC6D1, 0
 	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 5, BerryTreeScript, 0
 	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 6, BerryTreeScript, 0
 	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 7, BerryTreeScript, 0
 	object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0
 	object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_272141, 898
-	object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0
+	object_event 12, EVENT_OBJ_GFX_POKEFAN_M, 0, 56, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0
 	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CE5, 1114
 	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 18
 	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 19
 	object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route103_EventScript_1EC761, 0
-	object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 67, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0
+	object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 67, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0
 	object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0
 	object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0
 	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, 1137
diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc
index 497ec2dec..94642fbba 100644
--- a/data/maps/Route104/events.inc
+++ b/data/maps/Route104/events.inc
@@ -3,10 +3,10 @@ Route104_EventObjects: @ 85282E4
 	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED006, 0
 	object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0
 	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route104_EventScript_1ED045, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED04E, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 50, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED04E, 0
 	object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route104_EventScript_1ED090, 0
 	object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 742
-	object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 738
+	object_event 8, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 738
 	object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0
 	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 8, BerryTreeScript, 0
 	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 9, BerryTreeScript, 0
@@ -14,17 +14,17 @@ Route104_EventObjects: @ 85282E4
 	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 11, BerryTreeScript, 0
 	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 12, BerryTreeScript, 0
 	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 13, BerryTreeScript, 0
-	object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route104_EventScript_1ECF8C, 0
+	object_event 16, EVENT_OBJ_GFX_EXPERT_F, 0, 37, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route104_EventScript_1ECF8C, 0
 	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 3, BerryTreeScript, 0
 	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 4, BerryTreeScript, 0
 	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 75, BerryTreeScript, 0
 	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 76, BerryTreeScript, 0
 	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002
-	object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906
-	object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED597, 0
-	object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0
-	object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 21, 25, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0
-	object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 44, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0
+	object_event 22, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906
+	object_event 23, EVENT_OBJ_GFX_TWIN, 0, 27, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED597, 0
+	object_event 24, EVENT_OBJ_GFX_TWIN, 0, 28, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0
+	object_event 25, EVENT_OBJ_GFX_RICH_BOY, 0, 21, 25, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 44, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0
 	object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D0C, 1057
 	object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 5, 6, 1, 2, Route104_EventScript_1ED376, 0
 	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D19, 1115
diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc
index 6410f02fc..d6422508c 100644
--- a/data/maps/Route104_MrBrineysHouse/events.inc
+++ b/data/maps/Route104_MrBrineysHouse/events.inc
@@ -1,5 +1,5 @@
 Route104_MrBrineysHouse_EventObjects: @ 8533AD4
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739
+	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739
 	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881
 
 Route104_MrBrineysHouse_MapWarps: @ 8533B04
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc
index 3d622f106..52e57efc7 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/events.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc
@@ -1,5 +1,5 @@
 Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0
 	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0
 	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0
 
diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc
index aa9b9b420..d11bb8cab 100644
--- a/data/maps/Route105/events.inc
+++ b/data/maps/Route105/events.inc
@@ -5,7 +5,7 @@ Route105_EventObjects: @ 85286F0
 	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0
 	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_290D33, 1003
 	object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0
 	object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0
 
 Route105_MapWarps: @ 85287B0
diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc
index e18cf16d0..a92fe680d 100644
--- a/data/maps/Route108/events.inc
+++ b/data/maps/Route108/events.inc
@@ -3,7 +3,7 @@ Route108_EventObjects: @ 8528964
 	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0
 	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0
 	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 41, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 41, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0
 	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0
 	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, 1139
 
diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc
index f74e1ceab..e74aa5dfa 100644
--- a/data/maps/Route109/events.inc
+++ b/data/maps/Route109/events.inc
@@ -1,28 +1,28 @@
 Route109_EventObjects: @ 8528A34
 	object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 744
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, 741
+	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, 741
 	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0
 	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0
 	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0
 	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0
 	object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0
 	object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0
-	object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_EventScript_1EE995, 0
+	object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_EventScript_1EE995, 0
 	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005
 	object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0
 	object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0
 	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0
 	object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 18, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route109_EventScript_1EE99E, 0
 	object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route109_EventScript_1EE9B5, 0
-	object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route109_EventScript_1EEA06, 0
-	object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBBD, 0
-	object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBA2, 0
-	object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA0F, 0
+	object_event 16, EVENT_OBJ_GFX_POKEFAN_F, 0, 30, 32, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route109_EventScript_1EEA06, 0
+	object_event 17, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBBD, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 9, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBA2, 0
+	object_event 19, EVENT_OBJ_GFX_OLD_MAN, 0, 33, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA0F, 0
 	object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0
 	object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0
 	object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0
 	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, 1140
-	object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0
+	object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0
 
 Route109_MapWarps: @ 8528C74
 	warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE
diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc
index 9c12bd582..0632596a9 100644
--- a/data/maps/Route109_SeashoreHouse/events.inc
+++ b/data/maps/Route109_SeashoreHouse/events.inc
@@ -1,5 +1,5 @@
 Route109_SeashoreHouse_EventObjects: @ 853DDE8
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0
+	object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0
 	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0
 	object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0
 	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0
diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc
index f4875cc6c..c767f91d3 100644
--- a/data/maps/Route110/events.inc
+++ b/data/maps/Route110/events.inc
@@ -1,9 +1,9 @@
 Route110_EventObjects: @ 8528CF0
 	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF338, 0
 	object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route110_EventScript_1EF326, 0
+	object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 14, 69, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route110_EventScript_1EF326, 0
 	object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF314, 0
-	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF31D, 0
+	object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF31D, 0
 	object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route110_EventScript_1EF30B, 0
 	object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF302, 0
 	object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 2, 14, 1, 3, Route110_EventScript_1EF529, 0
@@ -29,10 +29,10 @@ Route110_EventObjects: @ 8528CF0
 	object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 0, 0, 0x0, 919
 	object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 922
 	object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route110_EventScript_1EF604, 0
-	object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 76, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0
-	object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 7, 76, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route110_EventScript_1EF61C, 0
+	object_event 31, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 76, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0
+	object_event 32, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 76, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route110_EventScript_1EF61C, 0
 	object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 10, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, Route110_EventScript_1EF64A, 0
-	object_event 34, EVENT_OBJ_GFX_MAN_6, 0, 36, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 3, Route110_EventScript_1EF633, 0
+	object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 36, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 3, Route110_EventScript_1EF633, 0
 	object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_EventScript_290D8E, 1141
 	object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 837
 
diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc
index df3ef829a..72fc4fbc6 100644
--- a/data/maps/Route110_TrickHousePuzzle6/events.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/events.inc
@@ -1,6 +1,6 @@
 Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0
 	object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0
 	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0
 	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067
 
diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc
index a5d4c0f8a..8dff961ac 100644
--- a/data/maps/Route110_TrickHousePuzzle8/events.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/events.inc
@@ -1,7 +1,7 @@
 Route110_TrickHousePuzzle8_EventObjects: @ 853E908
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0
 	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069
 
 Route110_TrickHousePuzzle8_MapWarps: @ 853E968
diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc
index cd11e1ef2..93767ff41 100644
--- a/data/maps/Route111/events.inc
+++ b/data/maps/Route111/events.inc
@@ -1,12 +1,12 @@
 Route111_EventObjects: @ 85291F0
 	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 769
+	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 769
 	object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 770
-	object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 771
+	object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 771
 	object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F121B, 0
 	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 19, BerryTreeScript, 0
 	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 20, BerryTreeScript, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1189, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_3, 0, 8, 91, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1189, 0
 	object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 29, 37, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1204, 0
 	object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 2, 2, 1, 2, Route111_EventScript_1F1260, 0
 	object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route111_EventScript_1F1232, 0
@@ -29,14 +29,14 @@ Route111_EventObjects: @ 85291F0
 	object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0
 	object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0
 	object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0
-	object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 4, 0, 1, 4, Route111_EventScript_1F1369, 0
-	object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1307, 0
+	object_event 31, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 4, 0, 1, 4, Route111_EventScript_1F1369, 0
+	object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 9, 27, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1307, 0
 	object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_2765FF, 960
-	object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1192, 0
+	object_event 34, EVENT_OBJ_GFX_MAN_4, 0, 20, 114, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1192, 0
 	object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 26, 132, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route111_EventScript_1F13F9, 0
-	object_event 36, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 132, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, Route111_EventScript_1F1410, 0
+	object_event 36, EVENT_OBJ_GFX_WOMAN_2, 0, 20, 132, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, Route111_EventScript_1F1410, 0
 	object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 19, 121, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route111_EventScript_1F13E2, 0
-	object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 16, 119, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route111_EventScript_1F13CB, 0
+	object_event 38, EVENT_OBJ_GFX_MAN_5, 0, 16, 119, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route111_EventScript_1F13CB, 0
 	object_event 39, EVENT_OBJ_GFX_HIKER, 0, 29, 77, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 7, Route111_EventScript_1F143E, 0
 	object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 22, 77, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, Route111_EventScript_1F1427, 0
 	object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 37, 77, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, Route111_EventScript_1F1455, 0
diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc
index 16f480460..973837871 100644
--- a/data/maps/Route111_OldLadysRestStop/events.inc
+++ b/data/maps/Route111_OldLadysRestStop/events.inc
@@ -1,5 +1,5 @@
 Route111_OldLadysRestStop_EventObjects: @ 8533C18
-	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0
+	object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0
 
 Route111_OldLadysRestStop_MapWarps: @ 8533C30
 	warp_def 3, 7, 0, 2, MAP_ROUTE111
diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc
index e2c0a2fa5..edaf85eb4 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/events.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc
@@ -1,8 +1,8 @@
 Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94
 	object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0
 	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0
-	object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0
+	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0
+	object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0
 
 Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4
 	warp_def 3, 7, 0, 0, MAP_ROUTE111
diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc
index d61286928..123385208 100644
--- a/data/maps/Route112/events.inc
+++ b/data/maps/Route112/events.inc
@@ -11,8 +11,8 @@ Route112_EventObjects: @ 8529974
 	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 21, BerryTreeScript, 0
 	object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0
 	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011
-	object_event 13, EVENT_OBJ_GFX_MAN_6, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0
-	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0
+	object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0
 
 Route112_MapWarps: @ 8529AC4
 	warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION
diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc
index 7af1afea7..21bae5dc6 100644
--- a/data/maps/Route113/events.inc
+++ b/data/maps/Route113/events.inc
@@ -1,20 +1,20 @@
 Route113_EventObjects: @ 8529B2C
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route113_EventScript_1F2193, 0
+	object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 66, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route113_EventScript_1F2193, 0
 	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route113_EventScript_1F218A, 0
 	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0
 	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 51, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0
 	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012
 	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013
-	object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F2250, 0
-	object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 71, 2, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0
-	object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0
-	object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0
+	object_event 8, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F2250, 0
+	object_event 9, EVENT_OBJ_GFX_NINJA_BOY, 0, 71, 2, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0
+	object_event 10, EVENT_OBJ_GFX_TWIN, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0
+	object_event 11, EVENT_OBJ_GFX_TWIN, 0, 46, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0
 	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, 1143
 	object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route113_EventScript_1F2344, 0
 	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route113_EventScript_1F232D, 0
 	object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0
-	object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 7, 13, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 6, Route113_EventScript_1F2316, 0
+	object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 6, Route113_EventScript_1F2316, 0
 
 Route113_MapWarps: @ 8529CAC
 	warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP
diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc
index 352f1fabb..d6f9c0d4b 100644
--- a/data/maps/Route113_GlassWorkshop/events.inc
+++ b/data/maps/Route113_GlassWorkshop/events.inc
@@ -1,6 +1,6 @@
 Route113_GlassWorkshop_EventObjects: @ 853EA78
 	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0
+	object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0
 
 Route113_GlassWorkshop_MapWarps: @ 853EAA8
 	warp_def 3, 8, 0, 0, MAP_ROUTE113
diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc
index 70cabb8c5..910d5e004 100644
--- a/data/maps/Route114/events.inc
+++ b/data/maps/Route114/events.inc
@@ -12,10 +12,10 @@ Route114_EventObjects: @ 8529E68
 	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_2907A6, 17
 	object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0
 	object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F2612, 0
-	object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route114_EventScript_1F2582, 0
+	object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 27, 42, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route114_EventScript_1F2582, 0
 	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route114_EventScript_1F2777, 0
 	object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route114_EventScript_1F2760, 0
-	object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0
+	object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 30, 58, 5, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0
 	object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 18
 	object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 19
 	object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 20
diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc
index 0a707820e..9c4579c1d 100644
--- a/data/maps/Route114_FossilManiacsHouse/events.inc
+++ b/data/maps/Route114_FossilManiacsHouse/events.inc
@@ -1,5 +1,5 @@
 Route114_FossilManiacsHouse_EventObjects: @ 8533CFC
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0
+	object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0
 
 Route114_FossilManiacsHouse_MapWarps: @ 8533D14
 	warp_def 4, 7, 0, 1, MAP_ROUTE114
diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc
index 47bd391fb..15b016bba 100644
--- a/data/maps/Route114_LanettesHouse/events.inc
+++ b/data/maps/Route114_LanettesHouse/events.inc
@@ -1,5 +1,5 @@
 Route114_LanettesHouse_EventObjects: @ 8533DD4
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870
 
 Route114_LanettesHouse_MapWarps: @ 8533DEC
 	warp_def 5, 7, 0, 2, MAP_ROUTE114
diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc
index 36888bd7a..c79c836ea 100644
--- a/data/maps/Route115/events.inc
+++ b/data/maps/Route115/events.inc
@@ -1,6 +1,6 @@
 Route115_EventObjects: @ 852A1BC
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route115_EventScript_1F2973, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route115_EventScript_1F298E, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 18, 68, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route115_EventScript_1F2973, 0
+	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route115_EventScript_1F298E, 0
 	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2A07, 0
 	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 69, BerryTreeScript, 0
 	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 70, BerryTreeScript, 0
@@ -16,7 +16,7 @@ Route115_EventObjects: @ 852A1BC
 	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_2907A6, 17
 	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E51, 1118
 	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route115_EventScript_1F2AE2, 0
-	object_event 18, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 11, 12, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0
+	object_event 18, EVENT_OBJ_GFX_NINJA_BOY, 0, 11, 12, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0
 	object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B27, 0
 	object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route115_EventScript_1F2B10, 0
 	object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B3E, 0
diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc
index d81cf31ee..f967ebbba 100644
--- a/data/maps/Route116/events.inc
+++ b/data/maps/Route116/events.inc
@@ -9,7 +9,7 @@ Route116_EventObjects: @ 852A4B8
 	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E92, 1020
 	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 66, BerryTreeScript, 0
 	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 67, BerryTreeScript, 0
-	object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891
+	object_event 11, EVENT_OBJ_GFX_EXPERT_M, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891
 	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 19
 	object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0
 	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 20
@@ -21,7 +21,7 @@ Route116_EventObjects: @ 852A4B8
 	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290E78, 1001
 	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_1F2C70, 894
 	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2DB6, 813
-	object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route116_EventScript_1F3041, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_2, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route116_EventScript_1F3041, 0
 	object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route116_EventScript_1F3058, 0
 	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290EAC, 1146
 	object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_2906BB, 21
diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc
index 896949ae8..32a4dc0ea 100644
--- a/data/maps/Route116_TunnelersRestHouse/events.inc
+++ b/data/maps/Route116_TunnelersRestHouse/events.inc
@@ -1,7 +1,7 @@
 Route116_TunnelersRestHouse_EventObjects: @ 8533E34
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0
+	object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0
+	object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0
+	object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0
 
 Route116_TunnelersRestHouse_MapWarps: @ 8533E7C
 	warp_def 4, 8, 0, 1, MAP_ROUTE116
diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc
index ffdb9984f..0a1e6bead 100644
--- a/data/maps/Route117/events.inc
+++ b/data/maps/Route117/events.inc
@@ -1,14 +1,14 @@
 Route117_EventObjects: @ 852A828
 	object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_1F399A, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 25, 5, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, 2, 2, 0, 0, Route117_EventScript_1F39A3, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_291C18, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 25, 5, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, 2, 2, 0, 0, Route117_EventScript_1F39A3, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 47, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_291C18, 0
 	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 33, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
 	object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0
 	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
 	object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0
 	object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 38, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0
-	object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 10, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0
-	object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 33, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 10, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0
+	object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 33, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0
 	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 29, BerryTreeScript, 0
 	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 28, BerryTreeScript, 0
 	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 27, BerryTreeScript, 0
diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc
index a1a8e3673..37a9db0f2 100644
--- a/data/maps/Route117_PokemonDayCare/events.inc
+++ b/data/maps/Route117_PokemonDayCare/events.inc
@@ -1,5 +1,5 @@
 Route117_PokemonDayCare_EventObjects: @ 8533EA0
-	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0
 
 Route117_PokemonDayCare_MapWarps: @ 8533EB8
 	warp_def 2, 8, 0, 0, MAP_ROUTE117
diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc
index b24e21f44..19d36d602 100644
--- a/data/maps/Route118/events.inc
+++ b/data/maps/Route118/events.inc
@@ -2,7 +2,7 @@ Route118_EventObjects: @ 852AAB4
 	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 31, BerryTreeScript, 0
 	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, BerryTreeScript, 0
 	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, BerryTreeScript, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route118_EventScript_1F4079, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 64, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route118_EventScript_1F4079, 0
 	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, 797
 	object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, 797
 	object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0
@@ -12,11 +12,11 @@ Route118_EventObjects: @ 852AAB4
 	object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, 904
 	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, 17
 	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0
-	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0
 	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route118_EventScript_1F4000, 0
-	object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route118_EventScript_1F4090, 0
+	object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 56, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route118_EventScript_1F4090, 0
 	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0
-	object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route118_EventScript_1F4017, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route118_EventScript_1F4017, 0
 	object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 966
 	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, 1121
 	object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0
diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc
index 587b60904..1abed81eb 100644
--- a/data/maps/Route119/events.inc
+++ b/data/maps/Route119/events.inc
@@ -10,10 +10,10 @@ Route119_EventObjects: @ 852AD6C
 	object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_EventScript_1F4872, 0
 	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0
 	object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0
-	object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 0, 0, 1, 1, Route119_EventScript_1F4902, 0
-	object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 0, 0, 1, 3, Route119_EventScript_1F4919, 0
-	object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0
-	object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 63, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0
+	object_event 12, EVENT_OBJ_GFX_NINJA_BOY, 0, 28, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 0, 0, 1, 1, Route119_EventScript_1F4902, 0
+	object_event 13, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 49, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 0, 0, 1, 3, Route119_EventScript_1F4919, 0
+	object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 10, 50, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0
+	object_event 15, EVENT_OBJ_GFX_MAN_5, 0, 8, 63, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0
 	object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 851
 	object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024
 	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EED, 1025
@@ -32,13 +32,13 @@ Route119_EventObjects: @ 852AD6C
 	object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, Route119_EventScript_1F476B, 0
 	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F2E, 1106
 	object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_EventScript_1F49DA, 0
-	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route119_EventScript_1F4930, 0
+	object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route119_EventScript_1F4930, 0
 	object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_27231C, 989
 	object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_272329, 990
 	object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route119_EventScript_1F4947, 0
-	object_event 38, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 68, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route119_EventScript_1F498C, 0
-	object_event 39, EVENT_OBJ_GFX_MAN_6, 0, 16, 52, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route119_EventScript_1F4975, 0
-	object_event 40, EVENT_OBJ_GFX_MAN_6, 0, 32, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route119_EventScript_1F495E, 0
+	object_event 38, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 68, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route119_EventScript_1F498C, 0
+	object_event 39, EVENT_OBJ_GFX_MAN_5, 0, 16, 52, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route119_EventScript_1F4975, 0
+	object_event 40, EVENT_OBJ_GFX_MAN_5, 0, 32, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route119_EventScript_1F495E, 0
 	object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_291399, 1134
 	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, 1147
 	object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 786
diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc
index ebae9a0fc..aff8116a7 100644
--- a/data/maps/Route119_House/events.inc
+++ b/data/maps/Route119_House/events.inc
@@ -1,5 +1,5 @@
 Route119_House_EventObjects: @ 853ECD0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_House_EventScript_270966, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_House_EventScript_270966, 0
 	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0
 	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0
 	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_House_EventScript_27096F, 0
diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc
index 01a93f7e6..a46081332 100644
--- a/data/maps/Route119_WeatherInstitute_1F/events.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/events.inc
@@ -1,9 +1,9 @@
 Route119_WeatherInstitute_1F_EventObjects: @ 853EB20
 	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890
 	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890
-	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892
-	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892
-	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892
+	object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0
 
 Route119_WeatherInstitute_1F_MapWarps: @ 853EB98
 	warp_def 9, 12, 0, 0, MAP_ROUTE119
diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc
index d3389f615..ae7f8b9fc 100644
--- a/data/maps/Route119_WeatherInstitute_2F/events.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/events.inc
@@ -2,9 +2,9 @@ Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4
 	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890
 	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890
 	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890
-	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 893
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 893
 	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 893
+	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 893
 	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 992
 	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890
 
diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc
index 97ae62fe6..717e75055 100644
--- a/data/maps/Route120/events.inc
+++ b/data/maps/Route120/events.inc
@@ -9,8 +9,8 @@ Route120_EventObjects: @ 852B3F8
 	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 40, BerryTreeScript, 0
 	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 41, BerryTreeScript, 0
 	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 42, BerryTreeScript, 0
-	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0
-	object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_5, 0, 5, 22, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0
+	object_event 12, EVENT_OBJ_GFX_MAN_5, 0, 32, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0
 	object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route120_EventScript_1F5850, 0
 	object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route120_EventScript_1F5867, 0
 	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route120_EventScript_1F587E, 0
@@ -22,18 +22,18 @@ Route120_EventObjects: @ 852B3F8
 	object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_2906BB, 17
 	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F55, 1031
 	object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route120_EventScript_1F5527, 0
-	object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 31, 37, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0
+	object_event 24, EVENT_OBJ_GFX_WOMAN_5, 0, 31, 37, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0
 	object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0
-	object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 4, Route120_EventScript_1F590E, 0
-	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route120_EventScript_1F5925, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 6, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 4, Route120_EventScript_1F590E, 0
+	object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 34, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route120_EventScript_1F5925, 0
 	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F6F, 1108
 	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, 1107
 	object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, 970
 	object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, 972
 	object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 20
 	object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 18
-	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F593C, 0
-	object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F5953, 0
+	object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F593C, 0
+	object_event 35, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 28, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F5953, 0
 	object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 981
 	object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722DB, 982
 	object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722E8, 985
@@ -41,7 +41,7 @@ Route120_EventObjects: @ 852B3F8
 	object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_27230F, 988
 	object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_272302, 987
 	object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route120_EventScript_1F5981, 0
-	object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 14, 34, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route120_EventScript_1F596A, 0
+	object_event 43, EVENT_OBJ_GFX_MAN_3, 0, 14, 34, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route120_EventScript_1F596A, 0
 	object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, 1148
 
 Route120_MapWarps: @ 852B818
diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc
index 03f86df42..b252be7a0 100644
--- a/data/maps/Route121/events.inc
+++ b/data/maps/Route121/events.inc
@@ -1,5 +1,5 @@
 Route121_EventObjects: @ 852BA14
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 29, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0
 	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 47, BerryTreeScript, 0
 	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 48, BerryTreeScript, 0
 	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 49, BerryTreeScript, 0
@@ -15,17 +15,17 @@ Route121_EventObjects: @ 852BA14
 	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 914
 	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 17
 	object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 18
-	object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0
+	object_event 17, EVENT_OBJ_GFX_POKEFAN_F, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0
 	object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0
 	object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0
 	object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0
 	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, 1103
 	object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, 19
 	object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0
-	object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 59, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0
-	object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 59, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0
-	object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 65, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0
-	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 72, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0
+	object_event 24, EVENT_OBJ_GFX_MAN_4, 0, 59, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0
+	object_event 25, EVENT_OBJ_GFX_WOMAN_2, 0, 59, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0
+	object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 65, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0
+	object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 72, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0
 	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, 1149
 	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, 1150
 
diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc
index 3f17c6c3d..c1a7e57f8 100644
--- a/data/maps/Route123/events.inc
+++ b/data/maps/Route123/events.inc
@@ -6,8 +6,8 @@ Route123_EventObjects: @ 852BDBC
 	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 62, BerryTreeScript, 0
 	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 63, BerryTreeScript, 0
 	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 64, BerryTreeScript, 0
-	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 70, 12, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 58, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0
 	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 65, BerryTreeScript, 0
 	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 72, BerryTreeScript, 0
 	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 73, BerryTreeScript, 0
@@ -24,22 +24,22 @@ Route123_EventObjects: @ 852BDBC
 	object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 87, BerryTreeScript, 0
 	object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 88, BerryTreeScript, 0
 	object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 89, BerryTreeScript, 0
-	object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 9, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0
-	object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0
-	object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_2, 0, 18, 9, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0
+	object_event 27, EVENT_OBJ_GFX_TWIN, 0, 38, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0
+	object_event 28, EVENT_OBJ_GFX_TWIN, 0, 37, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0
 	object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route123_EventScript_1F620A, 0
 	object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F626C, 0
 	object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route123_EventScript_1F6304, 0
 	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FBD, 1104
 	object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FCA, 1109
-	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 138, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 1, Route123_EventScript_1F6377, 0
-	object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 138, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route123_EventScript_1F6360, 0
+	object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 138, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 1, Route123_EventScript_1F6377, 0
+	object_event 35, EVENT_OBJ_GFX_WOMAN_2, 0, 138, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route123_EventScript_1F6360, 0
 	object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route123_EventScript_1F6349, 0
-	object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 66, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0
-	object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 66, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F6332, 0
-	object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 49, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F631B, 0
+	object_event 37, EVENT_OBJ_GFX_MAN_5, 0, 66, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0
+	object_event 38, EVENT_OBJ_GFX_MAN_5, 0, 66, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F6332, 0
+	object_event 39, EVENT_OBJ_GFX_EXPERT_M, 0, 49, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F631B, 0
 	object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FD7, 1152
-	object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route123_EventScript_1F638E, 0
+	object_event 41, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route123_EventScript_1F638E, 0
 	object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0
 	object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FE4, 1153
 
diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc
index c848f341b..3462054cb 100644
--- a/data/maps/Route123_BerryMastersHouse/events.inc
+++ b/data/maps/Route123_BerryMastersHouse/events.inc
@@ -1,6 +1,6 @@
 Route123_BerryMastersHouse_EventObjects: @ 853EACC
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0
+	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0
 
 Route123_BerryMastersHouse_MapWarps: @ 853EAFC
 	warp_def 3, 7, 0, 0, MAP_ROUTE123
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc
index f76468efe..30dffed32 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc
@@ -1,5 +1,5 @@
 Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C
-	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0
+	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0
 
 Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4
 	warp_def 3, 8, 0, 0, MAP_ROUTE124
diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc
index b8ced006c..2a408aec6 100644
--- a/data/maps/Route125/events.inc
+++ b/data/maps/Route125/events.inc
@@ -6,8 +6,8 @@ Route125_EventObjects: @ 852C50C
 	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route125_EventScript_1F6800, 0
 	object_event 6, EVENT_OBJ_GFX_LASS, 0, 17, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F6862, 0
 	object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F687D, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 43, 19, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 2, 1, 1, 3, Route125_EventScript_1F6898, 0
-	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 48, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 43, 19, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 2, 1, 1, 3, Route125_EventScript_1F6898, 0
+	object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 48, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0
 	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route125_EventScript_291018, 1154
 
 Route125_MapWarps: @ 852C5FC
diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc
index 6a7c07b9b..bb434202b 100644
--- a/data/maps/Route127/events.inc
+++ b/data/maps/Route127/events.inc
@@ -6,9 +6,9 @@ Route127_EventObjects: @ 852C734
 	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0
 	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0
 	object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 15, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 15, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0
 	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0
-	object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0
+	object_event 10, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0
 	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, 1155
 
 Route127_MapBGEvents: @ 852C83C
diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc
index 02d28acfd..5c0b82cee 100644
--- a/data/maps/Route128/events.inc
+++ b/data/maps/Route128/events.inc
@@ -5,8 +5,8 @@ Route128_EventObjects: @ 852C88C
 	object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 944
 	object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 945
 	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0
-	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0
 	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0
 	object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0
 
diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc
index 7d62fb306..817d7b038 100644
--- a/data/maps/Route132/events.inc
+++ b/data/maps/Route132/events.inc
@@ -4,10 +4,10 @@ Route132_EventObjects: @ 852CB90
 	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, 1036
 	object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route132_EventScript_1F752F, 0
 	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route132_EventScript_1F7518, 0
-	object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 33, 26, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route132_EventScript_1F7546, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 31, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 4, Route132_EventScript_1F755D, 0
-	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route132_EventScript_1F758B, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 21, 25, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 4, Route132_EventScript_1F7574, 0
+	object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 33, 26, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route132_EventScript_1F7546, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_5, 0, 33, 31, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 4, Route132_EventScript_1F755D, 0
+	object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route132_EventScript_1F758B, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 21, 25, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 4, Route132_EventScript_1F7574, 0
 	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, 1156
 
 Route132_MapEvents:: @ 852CC80
diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc
index ba1ac2ac0..b1cbb4bb1 100644
--- a/data/maps/Route133/events.inc
+++ b/data/maps/Route133/events.inc
@@ -4,10 +4,10 @@ Route133_EventObjects: @ 852CC94
 	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0
 	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, 1037
 	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, 1038
-	object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 7, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 37, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0
-	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 56, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route133_EventScript_1F7616, 0
-	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 7, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 37, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0
+	object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 56, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route133_EventScript_1F7616, 0
+	object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0
 	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, 1157
 
 Route133_MapEvents:: @ 852CD84
diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc
index 03339b081..4201b8068 100644
--- a/data/maps/Route134/events.inc
+++ b/data/maps/Route134/events.inc
@@ -1,10 +1,10 @@
 Route134_EventObjects: @ 852CD98
 	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1F7653, 0
 	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1F766A, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 24, 23, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 1, 6, Route134_EventScript_1F7681, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 24, 23, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 1, 6, Route134_EventScript_1F7681, 0
 	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 43, 23, 1, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 43, 23, 1, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0
 	object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0
 	object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0
 	object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0
diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc
index 4471d06e0..2f14304ba 100644
--- a/data/maps/RustboroCity/events.inc
+++ b/data/maps/RustboroCity/events.inc
@@ -1,17 +1,17 @@
 RustboroCity_EventObjects: @ 85267E0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0
 	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E085F, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E08D1, 0
+	object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 25, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0
+	object_event 4, EVENT_OBJ_GFX_TWIN, 0, 21, 46, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E08D1, 0
 	object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0
-	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0
-	object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0
+	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0
+	object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 25, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0
 	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, 732
 	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 731
-	object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0
+	object_event 11, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 13, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0
 	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041
-	object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0
+	object_event 13, EVENT_OBJ_GFX_MAN_4, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0
 	object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, 814
 	object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 844
 	object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0
diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc
index 6657c9305..71e57a143 100644
--- a/data/maps/RustboroCity_CuttersHouse/events.inc
+++ b/data/maps/RustboroCity_CuttersHouse/events.inc
@@ -1,5 +1,5 @@
 RustboroCity_CuttersHouse_EventObjects: @ 8530A1C
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0
+	object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0
 	object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0
 
 RustboroCity_CuttersHouse_MapWarps: @ 8530A4C
diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc
index baef1be49..f0d54df77 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/events.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc
@@ -1,7 +1,7 @@
 RustboroCity_DevonCorp_1F_EventObjects: @ 853037C
-	object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0
+	object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 2, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0
+	object_event 2, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 15, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0
 
 RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4
 	warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY
diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc
index d52b495eb..b606a30db 100644
--- a/data/maps/RustboroCity_Flat1_1F/events.inc
+++ b/data/maps/RustboroCity_Flat1_1F/events.inc
@@ -1,6 +1,6 @@
 RustboroCity_Flat1_1F_EventObjects: @ 8530890
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0
 
 RustboroCity_Flat1_1F_MapWarps: @ 85308C0
 	warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY
diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc
index 13ebbbc0d..9d3aace61 100644
--- a/data/maps/RustboroCity_Flat1_2F/events.inc
+++ b/data/maps/RustboroCity_Flat1_2F/events.inc
@@ -1,6 +1,6 @@
 RustboroCity_Flat1_2F_EventObjects: @ 85308EC
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0
+	object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
 	object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
 	object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 10, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
 	object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 10, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc
index 16c79649a..c35574261 100644
--- a/data/maps/RustboroCity_Flat2_1F/events.inc
+++ b/data/maps/RustboroCity_Flat2_1F/events.inc
@@ -1,6 +1,6 @@
 RustboroCity_Flat2_1F_EventObjects: @ 8530AC4
 	object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0
 
 RustboroCity_Flat2_1F_MapWarps: @ 8530AF4
 	warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY
diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc
index 559c6e6e0..60423b5d6 100644
--- a/data/maps/RustboroCity_Flat2_2F/events.inc
+++ b/data/maps/RustboroCity_Flat2_2F/events.inc
@@ -1,6 +1,6 @@
 RustboroCity_Flat2_2F_EventObjects: @ 8530B20
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0
+	object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0
 
 RustboroCity_Flat2_2F_MapWarps: @ 8530B50
 	warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F
diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc
index 71d03ddb1..9ab4727f3 100644
--- a/data/maps/RustboroCity_Flat2_3F/events.inc
+++ b/data/maps/RustboroCity_Flat2_3F/events.inc
@@ -1,5 +1,5 @@
 RustboroCity_Flat2_3F_EventObjects: @ 8530B74
-	object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0
+	object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0
 	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0
 
 RustboroCity_Flat2_3F_MapWarps: @ 8530BA4
diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc
index 5c5ab205e..2f8d4b2bf 100644
--- a/data/maps/RustboroCity_House2/events.inc
+++ b/data/maps/RustboroCity_House2/events.inc
@@ -1,6 +1,6 @@
 RustboroCity_House2_EventObjects: @ 8530A70
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0
+	object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0
 
 RustboroCity_House2_MapWarps: @ 8530AA0
 	warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY
diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc
index 2fc6a6233..95198b27c 100644
--- a/data/maps/RustboroCity_House3/events.inc
+++ b/data/maps/RustboroCity_House3/events.inc
@@ -1,6 +1,6 @@
 RustboroCity_House3_EventObjects: @ 8530BC0
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0
 	object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0
 
 RustboroCity_House3_MapWarps: @ 8530C08
diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc
index 683ed5ff7..8d65c367d 100644
--- a/data/maps/RustboroCity_Mart/events.inc
+++ b/data/maps/RustboroCity_Mart/events.inc
@@ -1,7 +1,7 @@
 RustboroCity_Mart_EventObjects: @ 853080C
 	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0
 	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_Mart_EventScript_214F74, 0
+	object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_Mart_EventScript_214F74, 0
 	object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_Mart_EventScript_214F86, 0
 
 RustboroCity_Mart_MapWarps: @ 853086C
diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc
index 84548b44a..d32f8ad46 100644
--- a/data/maps/RustboroCity_PokemonSchool/events.inc
+++ b/data/maps/RustboroCity_PokemonSchool/events.inc
@@ -1,7 +1,7 @@
 RustboroCity_PokemonSchool_EventObjects: @ 85305EC
-	object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0
+	object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0
+	object_event 2, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0
+	object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0
 	object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0
 	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0
 	object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0
diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc
index 77b6f7a61..5d3f3c8be 100644
--- a/data/maps/RusturfTunnel/events.inc
+++ b/data/maps/RusturfTunnel/events.inc
@@ -3,12 +3,12 @@ RusturfTunnel_EventObjects: @ 85341C4
 	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931
 	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048
 	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049
-	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 879
+	object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 879
 	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878
 	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880
 	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932
 	object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0
-	object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, 983
+	object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, 983
 
 RusturfTunnel_MapWarps: @ 85342B4
 	warp_def 4, 10, 3, 0, MAP_ROUTE116
diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc
index 8494f36e5..6ed455cad 100644
--- a/data/maps/SSTidalCorridor/events.inc
+++ b/data/maps/SSTidalCorridor/events.inc
@@ -1,7 +1,7 @@
 SSTidalCorridor_EventObjects: @ 853A158
 	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0
 	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950
+	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950
 	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950
 	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 810
 
diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc
index 5ef669f48..cca2bc821 100644
--- a/data/maps/SSTidalRooms/events.inc
+++ b/data/maps/SSTidalRooms/events.inc
@@ -1,11 +1,11 @@
 SSTidalRooms_EventObjects: @ 853A314
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0
+	object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0
 	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0
 	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 5, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0
-	object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, SSTidalRooms_EventScript_23CAC4, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 5, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0
+	object_event 6, EVENT_OBJ_GFX_RICH_BOY, 0, 22, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, SSTidalRooms_EventScript_23CAC4, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0
 	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, 951
 
 SSTidalRooms_MapWarps: @ 853A3D4
diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc
index 1057b4ecd..11e4b2e28 100644
--- a/data/maps/SafariZone_North/events.inc
+++ b/data/maps/SafariZone_North/events.inc
@@ -1,6 +1,6 @@
 SafariZone_North_EventObjects: @ 853B160
 	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 6, 29, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0
 	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 17
 	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 18
 	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 19
diff --git a/data/maps/SafariZone_South/events.inc b/data/maps/SafariZone_South/events.inc
index 01a016f02..21626d410 100644
--- a/data/maps/SafariZone_South/events.inc
+++ b/data/maps/SafariZone_South/events.inc
@@ -1,7 +1,7 @@
 SafariZone_South_EventObjects: @ 853B2A4
 	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0
 	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 16, 6, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0
 	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2DC, 0
 	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, 717
 	object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, 717
diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc
index 3ba71ee8e..d1be808cc 100644
--- a/data/maps/SafariZone_Southeast/events.inc
+++ b/data/maps/SafariZone_Southeast/events.inc
@@ -1,7 +1,7 @@
 SafariZone_Southeast_EventObjects: @ 853BA6C
-	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 7, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0
+	object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 7, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0
 	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 8, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 8, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0
 	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170
 	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, 747
 
diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc
index 468a0013d..f4750621d 100644
--- a/data/maps/SafariZone_Southwest/events.inc
+++ b/data/maps/SafariZone_Southwest/events.inc
@@ -1,5 +1,5 @@
 SafariZone_Southwest_EventObjects: @ 853B24C
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0
 	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131
 
 SafariZone_Southwest_MapWarps: @ 853B27C
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
index 614c009c1..875bed2fb 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
@@ -1,6 +1,6 @@
 ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C
 	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0
+	object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0
 
 ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC
 	warp_def 20, 30, 3, 0, MAP_ROUTE125
diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc
index c0bcde1ba..b43b505bd 100644
--- a/data/maps/SingleBattleColosseum/events.inc
+++ b/data/maps/SingleBattleColosseum/events.inc
@@ -1,5 +1,5 @@
 SingleBattleColosseum_EventObjects: @ 8539D44
-	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0
+	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0
 
 SingleBattleColosseum_MapWarps: @ 8539D5C
 	warp_def 6, 8, 3, 127, MAP_NONE
diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc
index 8b74573b7..841de657e 100644
--- a/data/maps/SlateportCity/events.inc
+++ b/data/maps/SlateportCity/events.inc
@@ -1,29 +1,29 @@
 SlateportCity_EventObjects: @ 85261CC
 	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCED9, 0
 	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 5, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0
+	object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 5, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 26, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0
 	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882
 	object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0
-	object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE63, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_WOMAN, 0, 20, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE63, 0
 	object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE84, 0
 	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835
 	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835
 	object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840
 	object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 37, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0
 	object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0
-	object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFF7, 0
-	object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DD000, 0
+	object_event 14, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 50, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFF7, 0
+	object_event 15, EVENT_OBJ_GFX_MAN_3, 0, 16, 46, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DD000, 0
 	object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFBB, 0
-	object_event 17, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0
+	object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 15, 31, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0
 	object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882
 	object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882
 	object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0
 	object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0
-	object_event 22, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0
-	object_event 23, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0
+	object_event 22, EVENT_OBJ_GFX_MAN_5, 0, 34, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0
 	object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DD1D8, 948
-	object_event 25, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DCDBD, 0
+	object_event 25, EVENT_OBJ_GFX_POKEFAN_M, 0, 5, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DCDBD, 0
 	object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD04E, 882
 	object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, 882
 	object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, 882
@@ -32,7 +32,7 @@ SlateportCity_EventObjects: @ 85261CC
 	object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, 882
 	object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, 882
 	object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, 882
-	object_event 34, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 37, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0
+	object_event 34, EVENT_OBJ_GFX_POKEFAN_F, 0, 11, 37, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0
 	object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 2, 0, 0, 0x0, 749
 
 SlateportCity_MapWarps: @ 8526514
diff --git a/data/maps/SlateportCity_BattleTentLobby/events.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc
index c5c60ba6d..3eadecd27 100644
--- a/data/maps/SlateportCity_BattleTentLobby/events.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/events.inc
@@ -1,9 +1,9 @@
 SlateportCity_BattleTentLobby_EventObjects: @ 852F408
 	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0
 	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0
 	object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0
 
 SlateportCity_BattleTentLobby_MapWarps: @ 852F480
 	warp_def 6, 9, 0, 3, MAP_SLATEPORT_CITY
diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc
index 713ff1dd5..9917c0a24 100644
--- a/data/maps/SlateportCity_House1/events.inc
+++ b/data/maps/SlateportCity_House1/events.inc
@@ -1,5 +1,5 @@
 SlateportCity_House1_EventObjects: @ 852F538
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0
+	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0
 
 SlateportCity_House1_MapWarps: @ 852F550
 	warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY
diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc
index daa627c06..2dfffdaec 100644
--- a/data/maps/SlateportCity_House2/events.inc
+++ b/data/maps/SlateportCity_House2/events.inc
@@ -1,5 +1,5 @@
 SlateportCity_House2_EventObjects: @ 852FB9C
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0
+	object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0
 	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0
 
 SlateportCity_House2_MapWarps: @ 852FBCC
diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc
index da5f668e0..9cc5b9829 100644
--- a/data/maps/SlateportCity_Mart/events.inc
+++ b/data/maps/SlateportCity_Mart/events.inc
@@ -1,7 +1,7 @@
 SlateportCity_Mart_EventObjects: @ 852FCF0
 	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0
 	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0
 
 SlateportCity_Mart_MapWarps: @ 852FD38
 	warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
index 256b2ee1c..8e3a7879f 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
@@ -7,10 +7,10 @@ SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670
 	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883
 	object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0
 	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883
-	object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961
+	object_event 9, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961
 	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961
-	object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961
-	object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961
+	object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961
+	object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961
 	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965
 	object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961
 
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
index 7b407d5d2..3ca657bb6 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
@@ -3,9 +3,9 @@ SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8
 	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 886
 	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 884
 	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 885
-	object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961
-	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961
-	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961
+	object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961
+	object_event 7, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961
 
 SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950
 	warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc
index 32328d255..f5409bdf0 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/events.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc
@@ -1,7 +1,7 @@
 SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0
 	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0
 
 SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38
 	warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY
diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc
index d6a0ac4e1..74b2a6acf 100644
--- a/data/maps/SlateportCity_PokemonFanClub/events.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/events.inc
@@ -1,13 +1,13 @@
 SlateportCity_PokemonFanClub_EventObjects: @ 852F574
 	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0
+	object_event 2, EVENT_OBJ_GFX_TWIN, 0, 1, 5, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0
 	object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0
 	object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0
 	object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 3, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0
 	object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0
 	object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 11, 8, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 11, 8, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0
 
 SlateportCity_PokemonFanClub_MapWarps: @ 852F64C
 	warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc
index 19886500f..107a00ee0 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/events.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc
@@ -2,7 +2,7 @@ SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318
 	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0
 	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0
 	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0
-	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869
+	object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869
 
 SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378
 	warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY
diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc
index 7361ccc21..52dcb8f53 100644
--- a/data/maps/SootopolisCity/events.inc
+++ b/data/maps/SootopolisCity/events.inc
@@ -1,12 +1,12 @@
 SootopolisCity_EventObjects: @ 8527314
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854
+	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854
 	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0
+	object_event 4, EVENT_OBJ_GFX_NINJA_BOY, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0
 	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0
 	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839
 	object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, 973
-	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6038, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 49, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6038, 0
 	object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 0, 0, 0x0, 998
 	object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 0, 0, 0x0, 997
 	object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 996
diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc
index 9f747bc4a..0ca0287ad 100644
--- a/data/maps/SootopolisCity_Gym_B1F/events.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/events.inc
@@ -1,14 +1,14 @@
 SootopolisCity_Gym_B1F_EventObjects: @ 8533068
 	object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0
 	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0
 	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 11, 9, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0
 	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0
+	object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0
 	object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0
 	object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0
-	object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0
-	object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0
+	object_event 10, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0
 
 SootopolisCity_Gym_B1F_MapWarps: @ 8533158
 	warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F
diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc
index a8885190e..509eeb46f 100644
--- a/data/maps/SootopolisCity_House2/events.inc
+++ b/data/maps/SootopolisCity_House2/events.inc
@@ -1,5 +1,5 @@
 SootopolisCity_House2_EventObjects: @ 853334C
-	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0
+	object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0
 
 SootopolisCity_House2_MapWarps: @ 8533364
 	warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY
diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc
index 9f5cc781e..5a91765c5 100644
--- a/data/maps/SootopolisCity_House3/events.inc
+++ b/data/maps/SootopolisCity_House3/events.inc
@@ -1,5 +1,5 @@
 SootopolisCity_House3_EventObjects: @ 8533388
-	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0
 	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0
 
 SootopolisCity_House3_MapWarps: @ 85333B8
diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc
index d9948d5be..3bd0aed0e 100644
--- a/data/maps/SootopolisCity_House4/events.inc
+++ b/data/maps/SootopolisCity_House4/events.inc
@@ -1,6 +1,6 @@
 SootopolisCity_House4_EventObjects: @ 85333DC
 	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 2, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 2, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0
 	object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SootopolisCity_House4_EventScript_226D28, 0
 
 SootopolisCity_House4_MapWarps: @ 8533424
diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc
index 4ca7e5745..40fd1d0a7 100644
--- a/data/maps/SootopolisCity_House6/events.inc
+++ b/data/maps/SootopolisCity_House6/events.inc
@@ -1,5 +1,5 @@
 SootopolisCity_House6_EventObjects: @ 853349C
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0
 
 SootopolisCity_House6_MapWarps: @ 85334B4
 	warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY
diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc
index 76a198f6e..d2f4e1ff2 100644
--- a/data/maps/SootopolisCity_House7/events.inc
+++ b/data/maps/SootopolisCity_House7/events.inc
@@ -1,6 +1,6 @@
 SootopolisCity_House7_EventObjects: @ 85334D8
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0
+	object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0
 
 SootopolisCity_House7_MapWarps: @ 8533508
 	warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc
index 4eb796671..65a265578 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc
@@ -1,5 +1,5 @@
 SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 6, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 6, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0
 
 SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0
 	warp_def 3, 7, 0, 12, MAP_SOOTOPOLIS_CITY
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
index 652ac791a..36d0edd3a 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
@@ -106,7 +106,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
 	compare VAR_RESULT, 0
 	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
 	special SavePlayerParty
-	special sub_80F94E8
+	special ReducePlayerPartyToThree
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4
 	closemessage
 	compare VAR_FACING, 2
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc
index 4ca22d1f8..b5a221dad 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc
@@ -1,7 +1,7 @@
 SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0
 	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0
 	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0
 
 SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4
diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc
index e1f2e2bea..8991b6aab 100644
--- a/data/maps/TradeCenter/events.inc
+++ b/data/maps/TradeCenter/events.inc
@@ -1,5 +1,5 @@
 TradeCenter_EventObjects: @ 8539DA0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0
+	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0
 
 TradeCenter_MapWarps: @ 8539DB8
 	warp_def 5, 8, 3, 127, MAP_NONE
diff --git a/data/maps/TrainerHill_Entrance/events.inc b/data/maps/TrainerHill_Entrance/events.inc
index ae11a879e..30817defc 100644
--- a/data/maps/TrainerHill_Entrance/events.inc
+++ b/data/maps/TrainerHill_Entrance/events.inc
@@ -3,7 +3,7 @@ TrainerHill_Entrance_EventObjects: @ 853D874
 	object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0
 	object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0
 	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 14, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_268391, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 14, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_268391, 0
 
 TrainerHill_Entrance_MapWarps: @ 853D8EC
 	warp_def 9, 16, 3, 4, MAP_ROUTE111
diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc
index f87467d19..971ad87c4 100644
--- a/data/maps/VerdanturfTown/events.inc
+++ b/data/maps/VerdanturfTown/events.inc
@@ -1,6 +1,6 @@
 VerdanturfTown_EventObjects: @ 8527CDC
 	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0
+	object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0
 	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0
 	object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0
 
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc
index 616c0db5e..8992f7fc5 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc
@@ -1,7 +1,7 @@
 VerdanturfTown_BattleTentBattleRoom_EventObjects: @ 852E734
 	object_event 1, EVENT_OBJ_GFX_TRADER, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
 	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 11, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
 
 VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C
 	map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc
index c66173836..d0ca880ef 100644
--- a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
+	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
 
 VerdanturfTown_BattleTentCorridor_MapEvents:: @ 852E720
 	map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc
index 1c4bafba9..1da591d59 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/events.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/events.inc
@@ -1,10 +1,10 @@
 VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0
+	object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0
 	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0
 	object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0
 	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0
 	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766
-	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0
 
 VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8
 	warp_def 6, 9, 0, 0, MAP_VERDANTURF_TOWN
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc
index fa3e09561..990bcd1f6 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0
 	object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0
 
 VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8
diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc
index 5de382052..d714aa8a0 100644
--- a/data/maps/VerdanturfTown_House/events.inc
+++ b/data/maps/VerdanturfTown_House/events.inc
@@ -1,6 +1,6 @@
 VerdanturfTown_House_EventObjects: @ 852EA1C
-	object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0
 
 VerdanturfTown_House_MapWarps: @ 852EA4C
 	warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN
diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc
index 5bdbce786..9ae237dc8 100644
--- a/data/maps/VerdanturfTown_Mart/events.inc
+++ b/data/maps/VerdanturfTown_Mart/events.inc
@@ -1,7 +1,7 @@
 VerdanturfTown_Mart_EventObjects: @ 852E790
 	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0
 	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0
+	object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0
 	object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0
 
 VerdanturfTown_Mart_MapWarps: @ 852E7F0
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc
index 3faee7bda..246270361 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc
@@ -1,8 +1,8 @@
 VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814
 	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0
 	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0
+	object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0
 
 VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874
 	warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN
diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc
index e55967bd7..5f0fd0b3c 100644
--- a/data/maps/VerdanturfTown_WandasHouse/events.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/events.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_WandasHouse_EventObjects: @ 852E92C
 	object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806
 	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809
-	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984
+	object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809
+	object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984
 
 VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4
 	warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN
diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc
index 3df6ff6b0..f162a9d80 100644
--- a/data/maps/VictoryRoad_1F/events.inc
+++ b/data/maps/VictoryRoad_1F/events.inc
@@ -1,13 +1,13 @@
 VictoryRoad_1F_EventObjects: @ 8535E04
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 33, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 27, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0
 	object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858
 	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, 1084
 	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, 1085
 	object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, 751
-	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 29, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 32, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 29, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 32, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0
 
 VictoryRoad_1F_MapWarps: @ 8535EDC
 	warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY
diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc
index f96b0d4bc..14d400fec 100644
--- a/data/maps/VictoryRoad_B1F/events.inc
+++ b/data/maps/VictoryRoad_B1F/events.inc
@@ -12,14 +12,14 @@ VictoryRoad_B1F_EventObjects: @ 8535F44
 	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28
 	object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29
 	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31
-	object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0
-	object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0
-	object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0
+	object_event 14, EVENT_OBJ_GFX_MAN_3, 0, 37, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0
+	object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0
+	object_event 16, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0
 	object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21
 	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086
 	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087
-	object_event 20, EVENT_OBJ_GFX_MAN_4, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0
-	object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0
+	object_event 20, EVENT_OBJ_GFX_MAN_3, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0
+	object_event 21, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0
 
 VictoryRoad_B1F_MapWarps: @ 853613C
 	warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F
diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc
index bcd5747f7..17d878215 100644
--- a/data/maps/VictoryRoad_B2F/events.inc
+++ b/data/maps/VictoryRoad_B2F/events.inc
@@ -1,11 +1,11 @@
 VictoryRoad_B2F_EventObjects: @ 8536188
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 35, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0
 	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088
-	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 25, 18, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 25, 21, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 25, 18, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 25, 21, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0
 
 VictoryRoad_B2F_MapWarps: @ 8536230
 	warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F
diff --git a/data/rom_8525F58.s b/data/rom_8525F58.s
deleted file mode 100644
index d95af7e20..000000000
--- a/data/rom_8525F58.s
+++ /dev/null
@@ -1,34 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_08525F58:: @ 8525F58
-	.byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00
-	.byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00
-	.byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00
-	.byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00
-
-	.align 2
-gCastformFrontSpriteCoords:: @ 8525F78
-	.byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00
-	.byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08525F88:: @ 8525F88
-	.byte 0x0d, 0x0e, 0x0d, 0x0d
-
-	.align 2
-gUnknown_08525F8C:: @ 8525F8C
-	.byte 0x00, 0x00, 0x00, 0x00
-
-	.align 2
-gUnknown_08525F90:: @ 8525F90
-	spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gUnknown_08525FC0:: @ 8525FC0
-	obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755
-	obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc
new file mode 100644
index 000000000..a644008d0
--- /dev/null
+++ b/data/scripts/apprentice.inc
@@ -0,0 +1,2869 @@
+#include "constants/apprentice.h"
+
+.macro apprentice_msg waitbuttonpress which
+setvar VAR_0x8004, 8
+setvar VAR_0x8005, \waitbuttonpress
+setvar VAR_0x8006, \which
+special CallApprenticeFunction
+waitstate
+.endm
+
+.macro apprentice_buff whichstringvar tobuff
+setvar VAR_0x8004, 16
+setvar VAR_0x8005, \whichstringvar
+setvar VAR_0x8006, \tobuff
+special CallApprenticeFunction
+.endm
+
+.macro apprentice_menu which
+setvar VAR_0x8004, 7
+setvar VAR_0x8005, \which
+special CallApprenticeFunction
+waitstate
+.endm
+
+EventScript_Apprentice:: @ 82B688D
+	lock
+	faceplayer
+	setvar VAR_0x8004, 0
+	special CallApprenticeFunction
+	compare VAR_RESULT, 0
+	goto_eq Script_Apprentice_FirstMeeting
+	setvar VAR_0x8004, 10
+	special CallApprenticeFunction
+	compare VAR_0x8004, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B68BE
+	checkflag FLAG_0x934
+	goto_eq Script_Apprentice_ReleaseAndEnd
+
+BattleFrontier_BattleTowerLobby_EventScript_2B68BE:
+	setvar VAR_0x8004, 11
+	special CallApprenticeFunction
+	compare VAR_RESULT, 2
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B69D3
+	compare VAR_RESULT, 4
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ACF
+	compare VAR_RESULT, 3
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C77
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D5C
+	compare VAR_RESULT, 5
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6DD4
+	release
+	releaseall
+	end
+
+Script_Apprentice_FirstMeeting:
+	apprentice_buff 0, APPRENTICE_BUFF_NAME
+	apprentice_msg FALSE, 0
+
+Script_Apprentice_FirstMeetingNag:
+	apprentice_menu APPRENTICE_ASK_YES_NO
+	compare VAR_RESULT, 1
+	goto_eq Script_Apprentice_FirstMeetingAskAgain
+	apprentice_msg FALSE, 2
+	apprentice_menu APPRENTICE_ASK_WHICH_LEVEL
+	setvar VAR_0x8004, 1
+	setorcopyvar VAR_0x8005, VAR_RESULT
+	addvar VAR_0x8005, 1
+	special CallApprenticeFunction
+	setvar VAR_0x8004, 3
+	special CallApprenticeFunction
+	apprentice_buff 0, APPRENTICE_BUFF_LEVEL
+	apprentice_msg TRUE, 3
+	call Script_Apprentice_SetLeavingFlags
+	release
+	releaseall
+	switch VAR_FACING
+	case 2, Script_Apprentice_LeaveGoRight
+	goto Script_Apprentice_Leave
+	end
+
+Script_Apprentice_FirstMeetingAskAgain:
+	apprentice_msg FALSE, 1
+	goto Script_Apprentice_FirstMeetingNag
+
+BattleFrontier_BattleTowerLobby_EventScript_2B69D3:
+	setvar VAR_0x8004, 14
+	setvar VAR_0x8005, 2
+	special CallApprenticeFunction
+	apprentice_buff 0, APPRENTICE_BUFF_SPECIES1
+	apprentice_buff 1, APPRENTICE_BUFF_SPECIES2
+	apprentice_msg FALSE, 6
+	apprentice_menu APPRENTICE_ASK_2SPECIES
+	copyvar VAR_0x8005, VAR_RESULT
+	compare VAR_0x8005, 0
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6ABA
+	compare VAR_0x8005, 1
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6AC0
+	setvar VAR_0x8004, 12
+	special CallApprenticeFunction
+	copyvar VAR_0x8006, VAR_RESULT
+	setvar VAR_0x8004, 13
+	special CallApprenticeFunction
+	setvar VAR_0x8004, 5
+	special CallApprenticeFunction
+	setvar VAR_0x8004, 12
+	special CallApprenticeFunction
+	compare VAR_RESULT, 3
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6AC6
+	setvar VAR_0x8004, 16
+	setvar VAR_0x8005, 0
+	copyvar VAR_0x8006, VAR_0x8007
+	special CallApprenticeFunction
+	setvar VAR_0x8004, 15
+	special CallApprenticeFunction
+	apprentice_msg TRUE, 7
+	call Script_Apprentice_SetLeavingFlags
+	release
+	releaseall
+	switch VAR_FACING
+	case 2, Script_Apprentice_LeaveGoRight
+	goto Script_Apprentice_Leave
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_2B6ABA:
+	setvar VAR_0x8007, 0
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_2B6AC0:
+	setvar VAR_0x8007, 1
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_2B6AC6:
+	setvar VAR_0x8004, 4
+	special CallApprenticeFunction
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_2B6ACF:
+	setvar VAR_0x8004, 14
+	setvar VAR_0x8005, 4
+	special CallApprenticeFunction
+	apprentice_buff 0, APPRENTICE_BUFF_SPECIES3
+	apprentice_msg TRUE, 10
+	setvar VAR_0x8004, 15
+	special CallApprenticeFunction
+
+BattleFrontier_BattleTowerLobby_EventScript_2B6B09:
+	fadescreen 1
+	setvar VAR_RESULT, 0
+	setvar VAR_0x8004, 19
+	special CallApprenticeFunction
+	waitstate
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B81
+	setvar VAR_0x8004, 20
+	special CallApprenticeFunction
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C0C
+	apprentice_buff 0, APPRENTICE_BUFF_ITEM
+	apprentice_msg TRUE, 12
+	setvar VAR_0x8004, 5
+	special CallApprenticeFunction
+	call Script_Apprentice_SetLeavingFlags
+	release
+	releaseall
+	switch VAR_FACING
+	case 2, Script_Apprentice_LeaveGoRight
+	goto Script_Apprentice_Leave
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_2B6B81:
+	setvar VAR_0x8004, 14
+	setvar VAR_0x8005, 4
+	special CallApprenticeFunction
+	apprentice_buff 0, APPRENTICE_BUFF_SPECIES3
+	apprentice_msg FALSE, 13
+	apprentice_menu APPRENTICE_ASK_GIVE
+	setvar VAR_0x8004, 15
+	special CallApprenticeFunction
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09
+
+BattleFrontier_BattleTowerLobby_EventScript_2B6BD4:
+	apprentice_msg TRUE, 14
+	setvar VAR_0x8004, 5
+	special CallApprenticeFunction
+	call Script_Apprentice_SetLeavingFlags
+	release
+	releaseall
+	switch VAR_FACING
+	case 2, Script_Apprentice_LeaveGoRight
+	goto Script_Apprentice_Leave
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_2B6C0C:
+	setvar VAR_0x8004, 14
+	setvar VAR_0x8005, 4
+	special CallApprenticeFunction
+	apprentice_buff 0, APPRENTICE_BUFF_ITEM
+	apprentice_buff 1, APPRENTICE_BUFF_SPECIES3
+	apprentice_msg FALSE, 16
+	apprentice_menu APPRENTICE_ASK_GIVE
+	setvar VAR_0x8004, 15
+	special CallApprenticeFunction
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09
+	goto BattleFrontier_BattleTowerLobby_EventScript_2B6BD4
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_2B6C77:
+	setvar VAR_0x8004, 14
+	setvar VAR_0x8005, 3
+	special CallApprenticeFunction
+	apprentice_buff 0, APPRENTICE_BUFF_SPECIES3
+	apprentice_buff 1, APPRENTICE_BUFF_MOVE1
+	apprentice_buff 2, APPRENTICE_BUFF_MOVE2
+	apprentice_msg FALSE, 8
+	apprentice_menu APPRENTICE_ASK_MOVES
+	copyvar VAR_0x8005, VAR_RESULT
+	compare VAR_0x8005, 0
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6D50
+	compare VAR_0x8005, 1
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6D56
+	setvar VAR_0x8004, 17
+	special CallApprenticeFunction
+	setvar VAR_0x8004, 5
+	special CallApprenticeFunction
+	setvar VAR_0x8004, 16
+	setvar VAR_0x8005, 0
+	copyvar VAR_0x8006, VAR_0x8007
+	special CallApprenticeFunction
+	setvar VAR_0x8004, 15
+	special CallApprenticeFunction
+	apprentice_msg TRUE, 9
+	call Script_Apprentice_SetLeavingFlags
+	release
+	releaseall
+	switch VAR_FACING
+	case 2, Script_Apprentice_LeaveGoRight
+	goto Script_Apprentice_Leave
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_2B6D50:
+	setvar VAR_0x8007, 3
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_2B6D56:
+	setvar VAR_0x8007, 4
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_2B6D5C:
+	apprentice_msg FALSE, 4
+	apprentice_menu APPRENTICE_ASK_3SPECIES
+	copyvar VAR_0x8005, VAR_RESULT
+	setvar VAR_0x8004, 18
+	special CallApprenticeFunction
+	setvar VAR_0x8004, 5
+	special CallApprenticeFunction
+	apprentice_buff 0, APPRENTICE_BUFF_SPECIES4
+	apprentice_msg TRUE, 5
+	call Script_Apprentice_SetLeavingFlags
+	release
+	releaseall
+	switch VAR_FACING
+	case 2, Script_Apprentice_LeaveGoRight
+	goto Script_Apprentice_Leave
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:
+	apprentice_msg TRUE, 11
+	setvar VAR_0x8004, 25
+	special CallApprenticeFunction
+	setvar VAR_0x8004, 19
+	call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+	lock
+	faceplayer
+	setvar VAR_0x8004, 21
+	special CallApprenticeFunction
+	apprentice_buff 0, APPRENTICE_BUFF_EASY_CHAT
+	apprentice_msg TRUE, 15
+	setvar VAR_0x8004, 9
+	special CallApprenticeFunction
+	call Script_Apprentice_SetLeavingFlags
+	release
+	releaseall
+	switch VAR_FACING
+	case 2, Script_Apprentice_LeaveGoRight
+	goto Script_Apprentice_Leave
+	end
+
+Script_Apprentice_SetLeavingFlags:
+	setflag FLAG_0x2BD
+	setflag FLAG_0x934
+	return
+
+Script_Apprentice_LeaveGoRight:
+	setvar VAR_0x8004, 24
+	special CallApprenticeFunction
+	compare VAR_0x8004, 0
+	goto_eq Script_Apprentice_End
+	applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E94
+	waitmovement 0
+	end
+
+Script_Apprentice_Leave:
+	setvar VAR_0x8004, 24
+	special CallApprenticeFunction
+	compare VAR_0x8004, 0
+	goto_eq Script_Apprentice_End
+	applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E95
+	waitmovement 0
+	end
+
+Script_Apprentice_ReleaseAndEnd:
+	release
+	releaseall
+	end
+
+Script_Apprentice_End:
+	end
+
+BattleFrontier_BattleTowerLobby_Movement_2B6E94: @ 82B6E94
+	walk_fast_right
+
+BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	set_invisible
+	slide_down
+	slide_down
+	slide_down
+	step_end
+
+gText_082B6EA5:: @ 82B6EA5
+	.string "Um, I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n"
+	.string "Snivel… This tension is getting to me…$"
+
+gText_082B6EEC:: @ 82B6EEC
+	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n"
+	.string "Here we come!$"
+
+gText_082B6F16:: @ 82B6F16
+	.string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}!\n"
+	.string "Accept my challenge!$"
+
+gText_082B6F4C:: @ 82B6F4C
+	.string "Um… I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice…\n"
+	.string "Do you think someone like me can win?$"
+
+gText_082B6F92:: @ 82B6F92
+	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n"
+	.string "I’ll let you challenge me!$"
+
+gText_082B6FC9:: @ 82B6FC9
+	.string "I’m horribly busy, but I also happen\n"
+	.string "to be {STR_VAR_1}’s no. {STR_VAR_2} apprentice.$"
+
+gText_082B700C:: @ 82B700C
+	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n"
+	.string "Glad to meet you!$"
+
+gText_082B703A:: @ 82B703A
+	.string "I serve as {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n"
+	.string "May I begin?$"
+
+gText_082B706A:: @ 82B706A
+	.string "Eek! I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n"
+	.string "I’ll do my best!$"
+
+gText_082B709C:: @ 82B709C
+	.string "Yeehaw! I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n"
+	.string "Put ’em up!$"
+
+gText_082B70CC:: @ 82B70CC
+	.string "I’m {STR_VAR_1}’s 1,000th apprentice!\n"
+	.string "Actually, I’m no. {STR_VAR_2}! Here goes!$"
+
+gText_082B710A:: @ 82B710A
+	.string "Yeah, I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n"
+	.string "Let’s get rockin’ and a-rollin’!$"
+
+gText_082B714D:: @ 82B714D
+	.string "Yippee-yahoo! I’m what you call\n"
+	.string "{STR_VAR_1}’s no. {STR_VAR_2} apprentice!$"
+
+gText_082B7185:: @ 82B7185
+	.string "Cough! I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n"
+	.string "Good to meet you! Cough!$"
+
+gText_082B71C1:: @ 82B71C1
+	.string "This is nerve-racking…\n"
+	.string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$"
+
+gText_082B71F9:: @ 82B71F9
+	.string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice,\n"
+	.string "and that’s no lie.$"
+
+gText_082B7229:: @ 82B7229
+	.string "Are you… {PLAYER}?\n"
+	.string "Oh! Sniff…sob…\p"
+	.string "Oh! S-sorry…\n"
+	.string "I’m so nervous, I can’t help crying…\p"
+	.string "I’m {STR_VAR_1}, and I really look up\n"
+	.string "to you, {PLAYER}.\p"
+	.string "I… I had this dream of one day meeting\n"
+	.string "you and asking you about POKéMON.\p"
+	.string "Please, please, {PLAYER}!\n"
+	.string "Please teach me about POKéMON!$"
+
+gText_082B731C:: @ 82B731C
+	.string "Oh… B-but…\n"
+	.string "Snivel… Waaaaaaah!\p"
+	.string "Please!\n"
+	.string "I’m begging you, please!$"
+
+gText_082B735B:: @ 82B735B
+	.string "Oh, really? You will?\n"
+	.string "Awesome! Wicked! Awoooh!\p"
+	.string "Oh… I’m sorry…\n"
+	.string "I’m so happy, I’m crying…\p"
+	.string "Um… Then please tell me!\n"
+	.string "It’s about the BATTLE TOWER.\p"
+	.string "Which would be better for me: Level 50\n"
+	.string "or the Open Level?$"
+
+gText_082B7423:: @ 82B7423
+	.string "{STR_VAR_1}?\n"
+	.string "Waaaaah!\p"
+	.string "Oh! I’m so sorry!\n"
+	.string "You’ve made me happy by choosing\l"
+	.string "the level for me, and it’s made me cry…\p"
+	.string "Snivel…\n"
+	.string "Thank you so much!\l"
+	.string "Please talk with me again!$"
+
+gText_082B74C1:: @ 82B74C1
+	.string "Wowee! You’re {PLAYER}, aren’t you?\n"
+	.string "You’re awesomely strong, aren’t you?\p"
+	.string "I’m {STR_VAR_1}!\n"
+	.string "I just became a TRAINER!\p"
+	.string "Please, {PLAYER}!\n"
+	.string "Can you be my teacher and tell me\l"
+	.string "lots about being a TRAINER?$"
+
+gText_082B756F:: @ 82B756F
+	.string "Aww, why?\n"
+	.string "Oh, please? Pretty please?\l"
+	.string "Please be my teacher, please!$"
+
+gText_082B75B2:: @ 82B75B2
+	.string "Yay! Great!\p"
+	.string "The first thing I wanted to ask you is\n"
+	.string "about the BATTLE TOWER!\p"
+	.string "The Level 50 and Open Level Rooms…\n"
+	.string "Which would be perfect for me?$"
+
+gText_082B763F:: @ 82B763F
+	.string "{STR_VAR_1}, huh? That’s true!\n"
+	.string "I’ll do my best there!\p"
+	.string "If we meet here again, please teach\n"
+	.string "me something else, teacher!$"
+
+gText_082B76AC:: @ 82B76AC
+	.string "Um… Are you {PLAYER}?\n"
+	.string "My name is {STR_VAR_1}.\p"
+	.string "I want to become a POKéMON TRAINER,\n"
+	.string "but I don’t know what to do…\p"
+	.string "So I thought maybe I could ask you for\n"
+	.string "advice because you’re so famous.\p"
+	.string "{PLAYER}, could you give me advice?$"
+
+gText_082B7772:: @ 82B7772
+	.string "Oh, but…\p"
+	.string "I sincerely want to become a POKéMON\n"
+	.string "TRAINER!\p"
+	.string "Please, can you answer my questions?$"
+
+gText_082B77CE:: @ 82B77CE
+	.string "Thank you!\n"
+	.string "Here’s my first question right away!\p"
+	.string "The BATTLE TOWER has two levels,\n"
+	.string "Level 50 and Open Level, right?\p"
+	.string "Which level do you think is more\n"
+	.string "suitable for me?$"
+
+gText_082B7871:: @ 82B7871
+	.string "Oh, the {STR_VAR_1} challenge?\n"
+	.string "Understood!\p"
+	.string "If I have another question, I’ll come\n"
+	.string "back here for your advice!$"
+
+gText_082B78D4:: @ 82B78D4
+	.string "Oh? Huh? You’re…\n"
+	.string "No, that can’t be true.\p"
+	.string "There isn’t any way that someone\n"
+	.string "like me could meet {PLAYER}.\p"
+	.string "…You really are {PLAYER}?\n"
+	.string "I can’t believe I’m talking to you!\p"
+	.string "When something this good happens,\n"
+	.string "only terrible things will happen to me\l"
+	.string "now, I just know it…\p"
+	.string "…I’m sorry…\n"
+	.string "I’m… {STR_VAR_1}…\p"
+	.string "There isn’t anything special about\n"
+	.string "me that I can be proud of…\p"
+	.string "I shouldn’t even say anything about\n"
+	.string "myself because you’ll forget…\p"
+	.string "I had this dream that if I ever met\n"
+	.string "you, {PLAYER}, that maybe I could ask\l"
+	.string "you for advice as a TRAINER.\p"
+	.string "But I don’t think you would agree\n"
+	.string "to that.\p"
+	.string "…Or will you be so kind as to give\n"
+	.string "me advice?$"
+
+gText_082B7B1A:: @ 82B7B1A
+	.string "I knew it…\p"
+	.string "It had to happen because I’m such\n"
+	.string "a really boring nobody…\p"
+	.string "But I thought just maybe…\n"
+	.string "You won’t reconsider, will you?\p"
+	.string "But I can’t give up just like that.\n"
+	.string "I’ll ask you while I’m still lucky!\p"
+	.string "Please, will you be so kind as to give\n"
+	.string "me advice?$"
+
+gText_082B7C13:: @ 82B7C13
+	.string "Really? I can’t believe it!\n"
+	.string "I can’t believe you’ll advise me!\l"
+	.string "I… I’m so happy…\p"
+	.string "What I want to ask you is really\n"
+	.string "trivial, but I can’t decide…\p"
+	.string "At the BATTLE TOWER, they let you\n"
+	.string "choose Level 50 or Open Level.\p"
+	.string "Which course do you think even I may\n"
+	.string "have a chance at?$"
+
+gText_082B7D18:: @ 82B7D18
+	.string "{STR_VAR_1}? Okay!\n"
+	.string "But do you really think someone like\l"
+	.string "me would have a chance?\p"
+	.string "I’ll do my best, even though I don’t\n"
+	.string "think it will work.\p"
+	.string "Thank you very much for spending\n"
+	.string "time with someone like me.$"
+
+gText_082B7DD4:: @ 82B7DD4
+	.string "Oh! You’re {PLAYER}{STRING 5}, aren’t you?\p"
+	.string "I’ve heard that you’re tough at\n"
+	.string "POKéMON!\p"
+	.string "I’m {STR_VAR_1}!\n"
+	.string "I’ll be your friend!\p"
+	.string "Did you know?\p"
+	.string "You can’t win at the BATTLE FRONTIER\n"
+	.string "if all you know is what they teach at\l"
+	.string "the TRAINER’S SCHOOL.\p"
+	.string "I’m willing to listen to your advice.\n"
+	.string "You’ll agree, of course?$"
+
+gText_082B7EE5:: @ 82B7EE5
+	.string "Huh? Why are you refusing me?\n"
+	.string "It’s me who’s asking you!\l"
+	.string "You have to reconsider!$"
+
+gText_082B7F35:: @ 82B7F35
+	.string "Okay, so there is this something.\n"
+	.string "I want you to decide it for me.\p"
+	.string "You know that the BATTLE TOWER has\n"
+	.string "Level 50 and Open Level Rooms?\p"
+	.string "Which do you think would be good\n"
+	.string "for me, {PLAYER}{STRING 5}?$"
+
+gText_082B7FE8:: @ 82B7FE8
+	.string "Okay, {STR_VAR_1} is suitable for me?\n"
+	.string "Thank you!\p"
+	.string "Knowing that you made the decision,\n"
+	.string "{PLAYER}{STRING 5}, I won’t be so upset if\l"
+	.string "I lose.\p"
+	.string "Okay, I’ll look to you for advice again.\n"
+	.string "Bye!$"
+
+gText_082B8087:: @ 82B8087
+	.string "Oh, hi, there! {PLAYER}{STRING 5}!\n"
+	.string "I know you because you’re famous!\l"
+	.string "Call me {STR_VAR_1}! Glad to meet you!\p"
+	.string "I’m a TRIATHLETE, so I keep myself\n"
+	.string "fit even while I raise POKéMON.\p"
+	.string "I’m also involved with other things\n"
+	.string "like work, napping, ballroom dancing…\p"
+	.string "Being this busy, it’s not so easy for\n"
+	.string "me to become a decent TRAINER.\p"
+	.string "So, I have a proposition!\p"
+	.string "There must be a reason why we met.\n"
+	.string "So, {PLAYER}{STRING 5}, how about sharing your\l"
+	.string "wisdom with me every so often?$"
+
+gText_082B822B:: @ 82B822B
+	.string "Oh, but, please?\n"
+	.string "A guy like me needs someone like\l"
+	.string "you, {PLAYER}{STRING 5}!\p"
+	.string "Honestly, I need your advice!$"
+
+gText_082B8286:: @ 82B8286
+	.string "Thank you! That’s more like it!\n"
+	.string "So, let’s start with an easy one!\p"
+	.string "You know about the BATTLE TOWER’s\n"
+	.string "two courses, right?\l"
+	.string "You know, Level 50 and Open Level.\p"
+	.string "Me being a busy guy, which one should\n"
+	.string "I gear up for?$"
+
+gText_082B8356:: @ 82B8356
+	.string "{STR_VAR_1}, huh? Okay, gotcha.\n"
+	.string "I’ll find time somehow and give it a go!\p"
+	.string "…Whoops, I’d better go to work!\n"
+	.string "Thanks! See you around!$"
+
+gText_082B83CE:: @ 82B83CE
+	.string "No way! Uh-uh!\n"
+	.string "Are you maybe the real {PLAYER}?\p"
+	.string "A-hah! Awesome! I’m {STR_VAR_1},\n"
+	.string "so pleased to meet you!\p"
+	.string "{PLAYER}, you’re very strong,\n"
+	.string "aren’t you?\p"
+	.string "Everyone’s talking about you!\p"
+	.string "Oh! I just had this great idea!\n"
+	.string "I’ll get advice off you, {PLAYER}!\l"
+	.string "I’m sure it will make me tougher!\p"
+	.string "Isn’t it a great idea?\n"
+	.string "Please, I want your advice!$"
+
+gText_082B84FC:: @ 82B84FC
+	.string "Ahahaha, you can pretend to be mean,\n"
+	.string "but you can’t fool me!\l"
+	.string "You really mean okay, don’t you?$"
+
+gText_082B8559:: @ 82B8559
+	.string "Yay! I knew you’d have a big heart,\n"
+	.string "{PLAYER}!\p"
+	.string "What should I ask you first?\n"
+	.string "…Oh, I thought of something!\p"
+	.string "Drum roll, please!\n"
+	.string "The question I have is…\p"
+	.string "If I were to take a BATTLE TOWER\n"
+	.string "challenge, which way should I go?\p"
+	.string "Level 50 or Open Level?\n"
+	.string "Which suits me more?$"
+
+gText_082B8656:: @ 82B8656
+	.string "Oh-oh-oh!\n"
+	.string "{STR_VAR_1}, you say!\l"
+	.string "Thank you for a totally cool reply!\p"
+	.string "I guess that’s about all I wanted\n"
+	.string "to ask you today.\p"
+	.string "Let’s meet here again, okay?\n"
+	.string "Thanks!$"
+
+gText_082B86EA:: @ 82B86EA
+	.string "I beg your pardon, but…\n"
+	.string "Are you {PLAYER}?\p"
+	.string "I’m {STR_VAR_1}, and I am delighted to\n"
+	.string "make your acquaintance.\p"
+	.string "I have long been an admirer\n"
+	.string "of yours…\p"
+	.string "… … … … … …\p"
+	.string "Um… I hope you don’t find this\n"
+	.string "request too much of a burden, but…\p"
+	.string "May I become your apprentice,\n"
+	.string "{PLAYER}?$"
+
+gText_082B87DA:: @ 82B87DA
+	.string "Oh…!\p"
+	.string "… … … … … …\n"
+	.string "… … … … … …\p"
+	.string "…I must have fainted from shock.\n"
+	.string "I’m sorry, I must have misheard you.\p"
+	.string "Please! Please say that you will\n"
+	.string "accept me as your apprentice!$"
+
+gText_082B887C:: @ 82B887C
+	.string "Oh… I’m delighted!\p"
+	.string "I don’t wish to waste your time,\n"
+	.string "so please advise me on this.\p"
+	.string "I plan to take a BATTLE TOWER\n"
+	.string "challenge soon.\p"
+	.string "However, there are two levels…\p"
+	.string "Which would be most suitable for me?\n"
+	.string "Level 50 or Open Level?$"
+
+gText_082B8957:: @ 82B8957
+	.string "{STR_VAR_1} is your choice!\n"
+	.string "I see. I will do my best!\p"
+	.string "Thank you, {PLAYER}.\n"
+	.string "I hope I can count on you again.\l"
+	.string "Please take care!$"
+
+gText_082B89C6:: @ 82B89C6
+	.string "Eek! Eek! {PLAYER}!\n"
+	.string "You spoke to me!\l"
+	.string "I… I’m overjoyed!\p"
+	.string "Me! My name is {STR_VAR_1}!\n"
+	.string "I just became a TRAINER!\p"
+	.string "I’m delighted I met you, {PLAYER},\n"
+	.string "the big name in POKéMON circles!\p"
+	.string "Oh-oh-oh, I know!\n"
+	.string "May I ask a huge favor, {PLAYER}?\p"
+	.string "Please take me in as your apprentice!\n"
+	.string "I want to learn from you!$"
+
+gText_082B8ACF:: @ 82B8ACF
+	.string "Waaaah!\n"
+	.string "{PLAYER} turned me down…\l"
+	.string "It… It’s an invaluable experience!\p"
+	.string "{PLAYER}, please! I want to hear\n"
+	.string "an affirmative answer this time!\p"
+	.string "I beg you for your guidance!$"
+
+gText_082B8B66:: @ 82B8B66
+	.string "Hieeeeh! {PLAYER} said yes!\n"
+	.string "{PLAYER} said yes!\p"
+	.string "I won’t be able to sleep tonight…\n"
+	.string "Thank you ever so much!\p"
+	.string "Then, here’s my question!\p"
+	.string "At the BATTLE TOWER, what is right\n"
+	.string "for me, Level 50 or Open Level?$"
+
+gText_082B8C20:: @ 82B8C20
+	.string "{STR_VAR_1}! Perfectly understood!\n"
+	.string "I understand perfectly!\l"
+	.string "I’m deliriously delighted!\p"
+	.string "I hope you’ll be willing to teach me\n"
+	.string "some more another time.$"
+
+gText_082B8CAA:: @ 82B8CAA
+	.string "Whoa! Could you be…\n"
+	.string "Might you be… {PLAYER}{STRING 5}?!\l"
+	.string "That strong and famous TRAINER?\l"
+	.string "Well, hello, aren’t I just the luckiest!\p"
+	.string "Hello, the name’s {STR_VAR_1}!\p"
+	.string "I’ve been on the lookout for\n"
+	.string "a POKéMON teacher.\p"
+	.string "And with impeccably good timing,\n"
+	.string "along came you, {PLAYER}{STRING 5}!\p"
+	.string "So, there you have it, {PLAYER}{STRING 5}!\n"
+	.string "Let me apprentice under you!$"
+
+gText_082B8DD3:: @ 82B8DD3
+	.string "Gwaaaah!\n"
+	.string "You’re quite cool and tough…\p"
+	.string "Don’t be that way, please.\n"
+	.string "I’m asking you!$"
+
+gText_082B8E24:: @ 82B8E24
+	.string "Oh, yeah! That’s a solid reply!\n"
+	.string "Excellent, I might add!\p"
+	.string "So how about a first piece of advice\n"
+	.string "on the BATTLE TOWER?\p"
+	.string "If I were to go, what would be better?\n"
+	.string "Level 50 or Open Level?$"
+
+gText_082B8ED5:: @ 82B8ED5
+	.string "Uh-huh, {STR_VAR_1} it is!\n"
+	.string "OK, A-OK!\l"
+	.string "I’ll go show my mettle, like, jam!\p"
+	.string "All right, I’ll look to you as my mentor!\n"
+	.string "Adios!$"
+
+gText_082B8F45:: @ 82B8F45
+	.string "Oh, hey, {PLAYER}{STRING 5}, right?\n"
+	.string "The police were looking for you!\p"
+	.string "… … …\n"
+	.string "Of course I’m lying!\p"
+	.string "Me, I’m {STR_VAR_1}. Despite the way\n"
+	.string "I look, I’m the POKéMON CHAMPION!\l"
+	.string "…That’s a lie, too!\p"
+	.string "This is no lie, though.\n"
+	.string "I’m not very good at battling.\p"
+	.string "So, how about you becoming my master\n"
+	.string "about all things POKéMON?$"
+
+gText_082B905F:: @ 82B905F
+	.string "If you’re going to act cold like that,\n"
+	.string "I’ll show you what I’ll do!\p"
+	.string "Waaah! Waaah! Waaah!\n"
+	.string "Hiccup!\p"
+	.string "Hahaha, that was my FAKE TEARS!\p"
+	.string "Come on, will you please be\n"
+	.string "my POKéMON master?$"
+
+gText_082B910E:: @ 82B910E
+	.string "Yippee!\n"
+	.string "I’ll buy you a boat for that!\p"
+	.string "Of course I’m lying again!\n"
+	.string "But… Thank you, master!\p"
+	.string "You know how there’s Level 50 and\n"
+	.string "Open Level at the BATTLE TOWER?\p"
+	.string "I’m having trouble deciding which\n"
+	.string "level I should challenge…\p"
+	.string "Can you decide for me, master?$"
+
+gText_082B9204:: @ 82B9204
+	.string "Okay, so {STR_VAR_1} is better!\n"
+	.string "I’ll go to the other level, then!\p"
+	.string "Just kidding!\n"
+	.string "I’ll obey your teaching, master!\p"
+	.string "Thanks, master!\n"
+	.string "I hope you’ll keep teaching me!$"
+
+gText_082B929C:: @ 82B929C
+	.string "A-H-O-Y!\n"
+	.string "And that spells ahoy, and it means hi!\p"
+	.string "I’m {STR_VAR_1}, the rappin’ SAILOR\n"
+	.string "am I!\p"
+	.string "Your turn now, tell me a little about\n"
+	.string "yourself, give it a try!\p"
+	.string "Uh-huh, uh-huh!\n"
+	.string "{PLAYER}{STRING 5}’s your name,\l"
+	.string "and POKéMON’s your game!\p"
+	.string "And you’re at a delicate age\n"
+	.string "when all the world’s your stage!\p"
+	.string "Anyway, I just want to say,\n"
+	.string "that you’re the tenth TRAINER\l"
+	.string "I’ve spoken to today.\p"
+	.string "Let’s make that a celebration!\n"
+	.string "Become my mentor for commemoration!$"
+
+gText_082B9438:: @ 82B9438
+	.string "But!\n"
+	.string "You have to work with me!\p"
+	.string "Don’t be such a tease!\n"
+	.string "Become my mentor, please!$"
+
+gText_082B9488:: @ 82B9488
+	.string "That’s it!\n"
+	.string "{PLAYER}, you’ve got the spirit!\p"
+	.string "So here’s my first question\n"
+	.string "that begs your suggestion!\p"
+	.string "It’s about the BATTLE TOWER,\n"
+	.string "and it hinges on my power!\p"
+	.string "Level 50 and Open Level there be,\n"
+	.string "which is the one that’s good for me?$"
+
+gText_082B9564:: @ 82B9564
+	.string "Okay, {STR_VAR_1} it is, you say!\n"
+	.string "I’ll go and take it on my way!\p"
+	.string "If it’s advice I ever need,\n"
+	.string "{PLAYER}, your word I’ll always heed!$"
+
+gText_082B95D8:: @ 82B95D8
+	.string "Say, hey, aren’t you {PLAYER}?\n"
+	.string "What should I do? Talk to you?\l"
+	.string "Why not? I’m already talking to you!\p"
+	.string "{PLAYER}, are you surprised at me?\n"
+	.string "I’d better tell you who I happen to be!\p"
+	.string "{STR_VAR_1} is what you can call me.\n"
+	.string "The brightest star in guitardom,\l"
+	.string "that’s me!\p"
+	.string "Are you receiving me?\n"
+	.string "You are receiving me!\p"
+	.string "My luck’s at its best,\n"
+	.string "I’ll hit you with a request!\p"
+	.string "{PLAYER}, let me be your underling!\n"
+	.string "I want you to teach me everything!$"
+
+gText_082B9763:: @ 82B9763
+	.string "You’re turning me down, then?\n"
+	.string "I’ll just have to ask you again!\p"
+	.string "{PLAYER}, I beg to be your underling!\n"
+	.string "I need you to teach me everything!$"
+
+gText_082B97E5:: @ 82B97E5
+	.string "Lucky, yeah, woohoo!\n"
+	.string "Should I pop a question to you?\p"
+	.string "Since we’re near the BATTLE TOWER,\n"
+	.string "how about a question about its power?\p"
+	.string "Of the choices you see,\n"
+	.string "which is the right one for me?$"
+
+gText_082B989A:: @ 82B989A
+	.string "If {STR_VAR_1} is what you suggest,\n"
+	.string "it must be the very best!\p"
+	.string "Well, {PLAYER}, I have to roam free,\n"
+	.string "but don’t you forget about me.\p"
+	.string "See you again, my smart friend!$"
+
+gText_082B992D:: @ 82B992D
+	.string "Oh, hi! You there!\n"
+	.string "Can I get you to massage my shoulder?\p"
+	.string "…Yes, there! That’s it!\n"
+	.string "Ouch, ouch! Oooh, that feels great!\p"
+	.string "My name’s {STR_VAR_1}.\n"
+	.string "I take karate training, but my body’s\l"
+	.string "not built to take the abuse…\p"
+	.string "I decided I’ll battle POKéMON and\n"
+	.string "toughen myself up.\p"
+	.string "You’re {PLAYER}{STRING 5}, aren’t you?\n"
+	.string "The POKéMON LEAGUE CHAMP?\p"
+	.string "Listen, can I get you to give me\n"
+	.string "advice?$"
+
+gText_082B9A84:: @ 82B9A84
+	.string "Oh, why?\p"
+	.string "I won’t be a big bother, I promise!\n"
+	.string "Please?$"
+
+gText_082B9AB9:: @ 82B9AB9
+	.string "Thank you. Mighty good of you!\n"
+	.string "…Cough! Cough!\p"
+	.string "Oogh, I have to toughen up quick…\p"
+	.string "I’ll be heading off to the BATTLE TOWER\n"
+	.string "right away, but what would be better\l"
+	.string "for me? Level 50 or Open Level?$"
+
+gText_082B9B76:: @ 82B9B76
+	.string "Hm, all right. That’s {STR_VAR_1}.\n"
+	.string "I’ll go there right away.\p"
+	.string "I hope I can keep hitting you up for\n"
+	.string "help--after all, you’re my mentor!$"
+
+gText_082B9BF2:: @ 82B9BF2
+	.string "Er… Um…\n"
+	.string "{PLAYER}{STRING 5}…?\p"
+	.string "Please, don’t look at me that way.\n"
+	.string "You’re making me all self-conscious.\p"
+	.string "I… I’m {STR_VAR_1}.\p"
+	.string "I’m really embarrassed to say this,\n"
+	.string "but I explore ancient ruins and such.\p"
+	.string "I’m even more embarrassed to admit\n"
+	.string "I’m interested in the BATTLE FRONTIER.\p"
+	.string "{PLAYER}{STRING 5}, you have a reputation as\n"
+	.string "a tough TRAINER…\p"
+	.string "It’s hard for me to say this,\n"
+	.string "but I want to ask something.\p"
+	.string "Could you become my teacher and\n"
+	.string "give me advice?$"
+
+gText_082B9D83:: @ 82B9D83
+	.string "Please don’t brush me off like this!\n"
+	.string "I can’t live with the humiliation.\p"
+	.string "Please become my teacher!\n"
+	.string "I need your advice!$"
+
+gText_082B9DF9:: @ 82B9DF9
+	.string "Th-thank you…\p"
+	.string "But please don’t look at me like that.\n"
+	.string "It makes me all flustered.\p"
+	.string "Please, answer me without looking\n"
+	.string "at my eyes.\p"
+	.string "At the BATTLE TOWER…\n"
+	.string "Which level should I attempt?$"
+
+gText_082B9EAA:: @ 82B9EAA
+	.string "Oh… Okay!\n"
+	.string "I’ll try my hand at that.\p"
+	.string "I hope I can make a valiant challenge\n"
+	.string "without getting all flustered…\p"
+	.string "Thank you, {PLAYER}{STRING 5}.\n"
+	.string "If we meet again, I hope you will be\l"
+	.string "as helpful.$"
+
+gText_082B9F55:: @ 82B9F55
+	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
+	.string "But are you really real?\p"
+	.string "You may call me {STR_VAR_1}.\p"
+	.string "I have been toying with the idea of\n"
+	.string "apprenticing under a strong TRAINER.\p"
+	.string "So, I must say I’m lucky you came along!\n"
+	.string "…You really are {PLAYER}{STRING 5}, yes?\p"
+	.string "No, no, if you are real, it’s fine.\n"
+	.string "I merely want you to recognize me\l"
+	.string "as your apprentice.$"
+
+gText_082BA084:: @ 82BA084
+	.string "Oh?\n"
+	.string "But what would compel you to refuse?\p"
+	.string "I apologize for being skeptical about\n"
+	.string "your identity.\p"
+	.string "Please accept my apology and\n"
+	.string "accept me as your apprentice.$"
+
+gText_082BA11D:: @ 82BA11D
+	.string "You really are accepting me?\n"
+	.string "I don’t wish to celebrate prematurely.\p"
+	.string "If it is true, I apologize.\n"
+	.string "But now, I need your advice.\p"
+	.string "If I were to enter the BATTLE TOWER,\n"
+	.string "what would be worthy of me?\l"
+	.string "Level 50 or Open Level?$"
+
+gText_082BA1F3:: @ 82BA1F3
+	.string "{STR_VAR_1}?\n"
+	.string "Are you certain?\p"
+	.string "I see. If that’s the case, that’s fine.\n"
+	.string "I thank you for your time.\p"
+	.string "I realize I can annoy, but it delights\n"
+	.string "me that you have accepted me.\p"
+	.string "Let us meet again!$"
+
+gText_082BA2A3:: @ 82BA2A3
+	.string "Sigh… Sob…\n"
+	.string "Oh, {PLAYER}!\p"
+	.string "I’m all tangled up in a dilemma\n"
+	.string "that I can’t decide.\p"
+	.string "I can’t decide what I should make\n"
+	.string "my {STR_VAR_1} hold.\p"
+	.string "Please tell me, {PLAYER}.\n"
+	.string "What item should I make it hold?$"
+
+gText_082BA34E:: @ 82BA34E
+	.string "Oh, really? I shouldn’t make\n"
+	.string "my {STR_VAR_1} hold anything?$"
+
+gText_082BA380:: @ 82BA380
+	.string "Oh, okay! I’m delighted it’s settled!\n"
+	.string "Awesome! Wicked! Awoooh!\p"
+	.string "Thank you so much!$"
+
+gText_082BA3D2:: @ 82BA3D2
+	.string "Oh, I’m so glad…\n"
+	.string "I think I have that {STR_VAR_1}, too.\p"
+	.string "I’m delighted it’s settled!\n"
+	.string "Awesome! Wicked! Awoooh!\p"
+	.string "Thank you so much!$"
+
+gText_082BA448:: @ 82BA448
+	.string "Waaaah! Please don’t be mean!\p"
+	.string "That item {STR_VAR_1} was already\n"
+	.string "recommended to me before, sob…\p"
+	.string "Or do you mean I shouldn’t make\n"
+	.string "my {STR_VAR_2} hold anything?$"
+
+gText_082BA4D3:: @ 82BA4D3
+	.string "Yay! It’s {PLAYER}!\n"
+	.string "Great! I wanted to ask you something!\p"
+	.string "Do you make your POKéMON hold items?\n"
+	.string "I want to make mine hold items, but…\p"
+	.string "What item would be good for\n"
+	.string "{STR_VAR_1} to hold?\p"
+	.string "What do you think?$"
+
+gText_082BA58C:: @ 82BA58C
+	.string "Huh? You mean my {STR_VAR_1} doesn’t\n"
+	.string "have to hold anything?$"
+
+gText_082BA5BF:: @ 82BA5BF
+	.string "Oh, I get it! I’ll do that!\n"
+	.string "Thanks for teaching me!$"
+
+gText_082BA5F3:: @ 82BA5F3
+	.string "Oh, wow! One {STR_VAR_1}, huh?\n"
+	.string "Okay, I’ll do that!\p"
+	.string "Thanks for teaching me!$"
+
+gText_082BA635:: @ 82BA635
+	.string "Oh, uh, no, that’s not what I meant.\n"
+	.string "I want to know about a different item\l"
+	.string "than the ones I already know.\p"
+	.string "Or do you mean that my POKéMON doesn’t\n"
+	.string "have to hold anything this time?$"
+
+gText_082BA6E6:: @ 82BA6E6
+	.string "{PLAYER}, hello!\n"
+	.string "It’s about my {STR_VAR_1}…\p"
+	.string "I want to make it hold a good item.\n"
+	.string "What would be good for it?$"
+
+gText_082BA742:: @ 82BA742
+	.string "Oh, then my {STR_VAR_1} doesn’t have\n"
+	.string "to hold anything?$"
+
+gText_082BA770:: @ 82BA770
+	.string "Okay, I got it!\n"
+	.string "See you again!$"
+
+gText_082BA78F:: @ 82BA78F
+	.string "Oh, the item {STR_VAR_1}?\n"
+	.string "Understood!\p"
+	.string "I’ll do my best to find one!\n"
+	.string "See you again!$"
+
+gText_082BA7D8:: @ 82BA7D8
+	.string "Somebody taught me about\n"
+	.string "the {STR_VAR_1} already.\p"
+	.string "I want my POKéMON to hold a different\n"
+	.string "kind of item.\p"
+	.string "Or do you think {STR_VAR_2} doesn’t\n"
+	.string "have to hold anything?$"
+
+gText_082BA867:: @ 82BA867
+	.string "Hello, {PLAYER}…\n"
+	.string "I’m sorry to disturb you, but I have\l"
+	.string "something else I wanted to ask you.\p"
+	.string "I don’t think I’m good enough to win\n"
+	.string "matches on my own, so I’m thinking of\l"
+	.string "making my {STR_VAR_1} hold an item.\p"
+	.string "But I don’t know what would be good.\p"
+	.string "{PLAYER}, please, could you decide\n"
+	.string "for me?$"
+
+gText_082BA96B:: @ 82BA96B
+	.string "A POKéMON belonging to someone like me\n"
+	.string "would be better off without an item?$"
+
+gText_082BA9B7:: @ 82BA9B7
+	.string "I understand…\n"
+	.string "You’re saying I shouldn’t rely on items.\l"
+	.string "I’ll do my best not to!\p"
+	.string "Thank you very much!$"
+
+gText_082BAA1B:: @ 82BAA1B
+	.string "The item {STR_VAR_1}, okay.\n"
+	.string "I’m not sure if I can get one…\l"
+	.string "No! I’ll do my best to get it.\p"
+	.string "Thank you very much!$"
+
+gText_082BAA81:: @ 82BAA81
+	.string "Oh, but…\n"
+	.string "I think I’ve heard about that before…\p"
+	.string "Is it maybe because I haven’t handled\n"
+	.string "the item {STR_VAR_1} very well?\p"
+	.string "Or do you mean I shouldn’t make\n"
+	.string "my {STR_VAR_2} hold anything?$"
+
+gText_082BAB22:: @ 82BAB22
+	.string "Oh, {PLAYER}{STRING 5}.\n"
+	.string "There’s something I wanted to ask you.\p"
+	.string "You know how you decided which\n"
+	.string "POKéMON I should have for me?\p"
+	.string "But I never asked you what item\n"
+	.string "it should be holding.\p"
+	.string "Since you already gave me advice,\n"
+	.string "how about seeing this to the end?\p"
+	.string "What would be good? I want to make\n"
+	.string "my {STR_VAR_1} hold something.$"
+
+gText_082BAC43:: @ 82BAC43
+	.string "Oh! So my {STR_VAR_1} should do\n"
+	.string "the best it can empty-handed?$"
+
+gText_082BAC78:: @ 82BAC78
+	.string "If you think that’s best, I’ll do that.\p"
+	.string "Knowing that you made the decision,\n"
+	.string "{PLAYER}{STRING 5}, I won’t be so upset if\l"
+	.string "I lose.\p"
+	.string "Okay, I’ll look to you for advice again.\n"
+	.string "Bye!$"
+
+gText_082BAD17:: @ 82BAD17
+	.string "The item {STR_VAR_1}, huh?\n"
+	.string "Not bad. I’ll use it!\p"
+	.string "Knowing that you made the decision,\n"
+	.string "{PLAYER}{STRING 5}, I won’t be so upset if\l"
+	.string "I lose.\p"
+	.string "Okay, I’ll look to you for advice again.\n"
+	.string "Bye!$"
+
+gText_082BADB6:: @ 82BADB6
+	.string "Huh? What are you saying?\n"
+	.string "You told me about the {STR_VAR_1}\l"
+	.string "already before.\p"
+	.string "Or do you mean my {STR_VAR_2} should\n"
+	.string "do the best it can empty-handed?$"
+
+gText_082BAE36:: @ 82BAE36
+	.string "Yo, {PLAYER}{STRING 5}!\p"
+	.string "We’re both busy, but we seem to run\n"
+	.string "into each other often anyway!\p"
+	.string "Today I have to do some walking,\n"
+	.string "cleaning, and brushing.\p"
+	.string "I haven’t even had the time to buy\n"
+	.string "my precious {STR_VAR_1} anything.\p"
+	.string "I don’t have any time, so how about\n"
+	.string "giving me advice on what I should make\l"
+	.string "my {STR_VAR_1} hold?$"
+
+gText_082BAF4E:: @ 82BAF4E
+	.string "Oh, so me being a busy guy, you say\n"
+	.string "my {STR_VAR_1} doesn’t need anything?$"
+
+gText_082BAF8F:: @ 82BAF8F
+	.string "Okay, gotcha.\n"
+	.string "I won’t need any time for that.\p"
+	.string "Thanks today!\n"
+	.string "See you around!$"
+
+gText_082BAFDB:: @ 82BAFDB
+	.string "Okay, gotcha.\n"
+	.string "I’ll find time somehow and find\l"
+	.string "that {STR_VAR_1} you recommended.\p"
+	.string "I’m glad I met a good mentor in you.\n"
+	.string "Thanks! See you around!$"
+
+gText_082BB05F:: @ 82BB05F
+	.string "Huh? I already know about\n"
+	.string "that {STR_VAR_1}.\p"
+	.string "Oh, right, I get it.\n"
+	.string "So me being a busy guy, you say\l"
+	.string "my {STR_VAR_2} doesn’t need anything?$"
+
+gText_082BB0D4:: @ 82BB0D4
+	.string "Hiya, {PLAYER}! It’s me!\n"
+	.string "I need to tap your mind again today.\l"
+	.string "Please, I need your advice!\p"
+	.string "Drum roll, please!\n"
+	.string "The question I have is…\p"
+	.string "If I want to make my {STR_VAR_1} hold\n"
+	.string "an item, what should it be?$"
+
+gText_082BB18C:: @ 82BB18C
+	.string "Is that right? My {STR_VAR_1} doesn’t\n"
+	.string "need to hold an item, you’re saying.$"
+
+gText_082BB1CE:: @ 82BB1CE
+	.string "Okay, that’s what I’ll do!\p"
+	.string "I guess that’s about all I wanted\n"
+	.string "to ask you today.\p"
+	.string "Let’s meet here again, okay?\n"
+	.string "Thanks!$"
+
+gText_082BB242:: @ 82BB242
+	.string "Uh-huh! One {STR_VAR_1}.\n"
+	.string "What a cool choice!\l"
+	.string "I’ll definitely try that!\p"
+	.string "I guess that’s about all I wanted\n"
+	.string "to ask you today.\p"
+	.string "Let’s meet here again, okay?\n"
+	.string "Thanks!$"
+
+gText_082BB2D9:: @ 82BB2D9
+	.string "Ahahah! That’s silly!\n"
+	.string "You already told me about that\l"
+	.string "{STR_VAR_1} before!\p"
+	.string "Are you feeling okay, {PLAYER}?\p"
+	.string "Oh, wait! My {STR_VAR_2} doesn’t\n"
+	.string "need to hold an item, you’re saying.$"
+
+gText_082BB370:: @ 82BB370
+	.string "Hello, {PLAYER}. I hope you’ve been\n"
+	.string "keeping well.\p"
+	.string "May I approach you for advice?\p"
+	.string "In a recent battle, my opponent\n"
+	.string "seemed to have given his POKéMON\l"
+	.string "an item to hold.\p"
+	.string "As a result, I was defeated…\p"
+	.string "I don’t wish to be left behind.\n"
+	.string "I would like to make my {STR_VAR_1}\l"
+	.string "hold an item, too.\p"
+	.string "It would please me if you could decide\n"
+	.string "what would be right for my POKéMON…$"
+
+gText_082BB4C3:: @ 82BB4C3
+	.string "In other words… My POKéMON has\n"
+	.string "no need to hold an item?$"
+
+gText_082BB4FB:: @ 82BB4FB
+	.string "I understand clearly now!\n"
+	.string "I will keep trying like this.\p"
+	.string "Thank you, {PLAYER}.\n"
+	.string "I hope I can count on you again.\l"
+	.string "Please take care!$"
+
+gText_082BB575:: @ 82BB575
+	.string "One {STR_VAR_1} it is!\n"
+	.string "I will order it right away.\p"
+	.string "Thank you, {PLAYER}.\n"
+	.string "I hope I can count on you again.\l"
+	.string "Please take care!$"
+
+gText_082BB5E1:: @ 82BB5E1
+	.string "You’ve already told me about that,\n"
+	.string "and I already have it.\p"
+	.string "Or are you saying… My POKéMON has\n"
+	.string "no need to hold an item?$"
+
+gText_082BB656:: @ 82BB656
+	.string "Eek! {PLAYER}!\n"
+	.string "I… I’m overjoyed to see you again!\p"
+	.string "Oh-oh-oh! There’s something I just\n"
+	.string "had to ask you, {PLAYER}!\p"
+	.string "Please decide what my {STR_VAR_1}\n"
+	.string "should be holding!$"
+
+gText_082BB6E5:: @ 82BB6E5
+	.string "Oh, wow! I didn’t expect that answer!\n"
+	.string "So, a hold item isn’t necessary?$"
+
+gText_082BB72C:: @ 82BB72C
+	.string "Perfectly understood!\n"
+	.string "I’ll keep at this without an item!\p"
+	.string "I hope you’ll be willing to teach me\n"
+	.string "some more another time.$"
+
+gText_082BB7A2:: @ 82BB7A2
+	.string "{STR_VAR_1}! I’ll use that!\p"
+	.string "Um… Could it be, {PLAYER}, you also\n"
+	.string "make your POKéMON hold that item?\p"
+	.string "I’ll be sure to get it!\n"
+	.string "I hope you’ll be willing to teach me\l"
+	.string "some more another time.$"
+
+gText_082BB84A:: @ 82BB84A
+	.string "Oh? You recommended that\n"
+	.string "{STR_VAR_1} before, too.\p"
+	.string "Or is it the best thing to hold?\n"
+	.string "Or do you mean that my {STR_VAR_2}\l"
+	.string "doesn’t need anything to hold?$"
+
+gText_082BB8CD:: @ 82BB8CD
+	.string "Hola!\n"
+	.string "My maestro, {PLAYER}{STRING 5}!\p"
+	.string "I want to hit you up for advice on\n"
+	.string "POKéMON tools.\p"
+	.string "What do you think would be good for\n"
+	.string "my {STR_VAR_1} to hold?\p"
+	.string "Don’t be shy now.\n"
+	.string "Let’s blurt it out!$"
+
+gText_082BB970:: @ 82BB970
+	.string "Oh? So, you’re saying my {STR_VAR_1}\n"
+	.string "can win without holding any item?$"
+
+gText_082BB9AE:: @ 82BB9AE
+	.string "Si, bueno!\n"
+	.string "I’ll give it my best shot, like, slam!\p"
+	.string "All right, thanks, as always!\n"
+	.string "Adios!$"
+
+gText_082BBA05:: @ 82BBA05
+	.string "Uh-huh, that’s one {STR_VAR_1}?\n"
+	.string "Si, bueno!\l"
+	.string "I’ll go find me one, like, bam!\p"
+	.string "All right, thanks, as always!\n"
+	.string "Adios!$"
+
+gText_082BBA6C:: @ 82BBA6C
+	.string "No, no! You already told me about\n"
+	.string "that {STR_VAR_1} thing before.\p"
+	.string "Oh, now wait just one minute here…\n"
+	.string "So, you’re saying my {STR_VAR_2}\l"
+	.string "can win without holding any item?$"
+
+gText_082BBB01:: @ 82BBB01
+	.string "{PLAYER}{STRING 5}, something unbelievable\n"
+	.string "has happened!\p"
+	.string "I woke up this morning, and my POKéMON\n"
+	.string "had 10 NUGGETS!\p"
+	.string "Of course I’m lying!\n"
+	.string "Wahahaha!\p"
+	.string "This is no lie, though.\n"
+	.string "I’m not very good at thinking about\l"
+	.string "what items POKéMON should hold.\p"
+	.string "So, how about deciding for me what\n"
+	.string "my {STR_VAR_1} should hold, master?$"
+
+gText_082BBC1C:: @ 82BBC1C
+	.string "What’s that mean?\n"
+	.string "Don’t make it hold anything?$"
+
+gText_082BBC4B:: @ 82BBC4B
+	.string "Okay, so it shouldn’t hold anything.\n"
+	.string "Then, I’d better get something for it!\p"
+	.string "Just kidding!\n"
+	.string "I’ll obey your teaching, master!\p"
+	.string "Thanks, master!\n"
+	.string "I hope you’ll keep teaching me!$"
+
+gText_082BBCF6:: @ 82BBCF6
+	.string "Okay, so it’s one {STR_VAR_1}!\n"
+	.string "I’ll make it hold anything but that!\p"
+	.string "Just kidding!\n"
+	.string "I’ll obey your teaching, master!\p"
+	.string "Thanks, master!\n"
+	.string "I hope you’ll keep teaching me!$"
+
+gText_082BBD90:: @ 82BBD90
+	.string "Um, you told me about that before,\n"
+	.string "didn’t you?\p"
+	.string "Isn’t there something else?\p"
+	.string "Or do you mean, don’t make\n"
+	.string "my {STR_VAR_2} hold anything?$"
+
+gText_082BBE0B:: @ 82BBE0B
+	.string "A-H-O-Y!\n"
+	.string "And that spells ahoy!\p"
+	.string "The rappin’ SAILOR am I!\n"
+	.string "I present to you a question\l"
+	.string "that’s pretty fly!\p"
+	.string "It’s an item question\n"
+	.string "that begs your suggestion!\p"
+	.string "My {STR_VAR_1} needs an item to hold,\n"
+	.string "What should it be, if I may be bold?$"
+
+gText_082BBEE5:: @ 82BBEE5
+	.string "Is that right?\n"
+	.string "My {STR_VAR_1} doesn’t need to be\l"
+	.string "holding anything tight?$"
+
+gText_082BBF25:: @ 82BBF25
+	.string "Okay, I hear you, sure I do!\n"
+	.string "My POKéMON will go empty-handed, too!\p"
+	.string "If it’s advice I ever need,\n"
+	.string "{PLAYER}, your word I’ll always heed!$"
+
+gText_082BBFA4:: @ 82BBFA4
+	.string "Okay, one {STR_VAR_1},\n"
+	.string "that’s what I’ll use.\l"
+	.string "I was right to make you choose!\p"
+	.string "If it’s advice I ever need,\n"
+	.string "{PLAYER}, your word I’ll always heed!$"
+
+gText_082BC024:: @ 82BC024
+	.string "Okay, one {STR_VAR_1}, you say?\n"
+	.string "You told me that the other day.\l"
+	.string "I need a new idea, a brand new way.\p"
+	.string "Or, what, is that right?\n"
+	.string "My POKéMON doesn’t need to hold\l"
+	.string "anything tight?$"
+
+gText_082BC0C8:: @ 82BC0C8
+	.string "Say, hey, {PLAYER}!\n"
+	.string "I found you again today!\p"
+	.string "What should I do? Get your advice?\n"
+	.string "Why not? I’m already talking to you!\p"
+	.string "{PLAYER}, are you getting sick of me?\n"
+	.string "Nah, no way, that can’t be.\p"
+	.string "Will you hear me out?\n"
+	.string "I’m looking for advice--that’s what\l"
+	.string "I’m talking about.\p"
+	.string "It’s about a hold item for\n"
+	.string "my {STR_VAR_1} that’d be good.\l"
+	.string "My indecision is making me brood.$"
+
+gText_082BC213:: @ 82BC213
+	.string "My {STR_VAR_1} needs nothing?\n"
+	.string "Doesn’t need to hold anything?$"
+
+gText_082BC247:: @ 82BC247
+	.string "If holding nothing is the best,\n"
+	.string "I’ll do as you suggest!\p"
+	.string "Well, {PLAYER}, I have to roam free,\n"
+	.string "but don’t you forget about me.\p"
+	.string "See you again, my smart friend!$"
+
+gText_082BC2DD:: @ 82BC2DD
+	.string "If holding that {STR_VAR_1} is\n"
+	.string "the best, I’ll do as you suggest!\p"
+	.string "Well, {PLAYER}, I have to roam free,\n"
+	.string "but don’t you forget about me.\p"
+	.string "See you again, my smart friend!$"
+
+gText_082BC373:: @ 82BC373
+	.string "Haven’t I heard about that\n"
+	.string "{STR_VAR_1} before?\l"
+	.string "I’m certain I have, that’s for sure!\p"
+	.string "I need a new something!\n"
+	.string "Or, my {STR_VAR_2} needs nothing?\l"
+	.string "Doesn’t need to hold anything?$"
+
+gText_082BC40E:: @ 82BC40E
+	.string "Gwah! Ouch! {PLAYER}{STRING 5}, my arm’s broken!\n"
+	.string "Don’t touch it, please!\p"
+	.string "I must’ve broken it while I was trying\n"
+	.string "out different hold items with my posse\l"
+	.string "of POKéMON.\p"
+	.string "So, things being this way,\n"
+	.string "I need you to decide for me.\p"
+	.string "{PLAYER}{STRING 5}, what do you think would be\n"
+	.string "good for my {STR_VAR_1} to hold?$"
+
+gText_082BC514:: @ 82BC514
+	.string "Ouch…\p"
+	.string "So your suggestion is my {STR_VAR_1}\n"
+	.string "doesn’t have to hold anything?$"
+
+gText_082BC555:: @ 82BC555
+	.string "Hm, all right. That would be easier\n"
+	.string "for me, the way things are now.\p"
+	.string "I hope I can keep hitting you up\n"
+	.string "for help like this.$"
+
+gText_082BC5CE:: @ 82BC5CE
+	.string "Hm, all right. That’s one {STR_VAR_1}.\n"
+	.string "My POKéMON’s arm is fine, so I’ll make\l"
+	.string "it hold that item right away.\p"
+	.string "I hope I can keep hitting you up\n"
+	.string "for help like this.$"
+
+gText_082BC666:: @ 82BC666
+	.string "No, no, you told me about that\n"
+	.string "{STR_VAR_1} before, remember?\p"
+	.string "How about telling me something\n"
+	.string "even better?\p"
+	.string "Oh, wait a second.\n"
+	.string "So your suggestion is my {STR_VAR_2}\l"
+	.string "doesn’t have to hold anything?$"
+
+gText_082BC714:: @ 82BC714
+	.string "Er… Um…\n"
+	.string "{PLAYER}{STRING 5}…\p"
+	.string "Please, don’t look at me that way.\n"
+	.string "My POKéMON don’t have anything.\p"
+	.string "I… I’m really embarrassed about this,\n"
+	.string "but I really need your advice.\p"
+	.string "I can’t decide what hold item would\n"
+	.string "make my {STR_VAR_1} strong.\p"
+	.string "{PLAYER}{STRING 5}, what do you think would\n"
+	.string "be good?$"
+
+gText_082BC808:: @ 82BC808
+	.string "Oh… Then, you think it would be better\n"
+	.string "if my {STR_VAR_1} didn’t have an item?$"
+
+gText_082BC84D:: @ 82BC84D
+	.string "Oh… Okay!\n"
+	.string "I’ll go without an item.\p"
+	.string "This is nerve-racking, though.\n"
+	.string "Wouldn’t it be too cool?\p"
+	.string "Thank you, {PLAYER}{STRING 5}.\n"
+	.string "If we meet again, I hope you will be\l"
+	.string "as helpful.$"
+
+gText_082BC8EA:: @ 82BC8EA
+	.string "Oh… Okay!\n"
+	.string "I’ll go with that {STR_VAR_1}.\p"
+	.string "This is nerve-racking, though.\n"
+	.string "Wouldn’t it be too cool?\p"
+	.string "Thank you, {PLAYER}{STRING 5}.\n"
+	.string "If we meet again, I hope you will be\l"
+	.string "as helpful.$"
+
+gText_082BC984:: @ 82BC984
+	.string "B-but I already heard about that.\p"
+	.string "Please don’t brush me off like this!\n"
+	.string "I can’t live with the humiliation.\p"
+	.string "Oh… Am I jumping to conclusions?\n"
+	.string "Do you think it would be better if\l"
+	.string "my {STR_VAR_2} didn’t have an item?$"
+
+gText_082BCA4D:: @ 82BCA4D
+	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
+	.string "But are you really?\l"
+	.string "Perhaps you’re a twin?\p"
+	.string "Oh, no, no, no, don’t worry!\n"
+	.string "If you really are {PLAYER}, please\l"
+	.string "forget about my rudeness.\p"
+	.string "What I would like is some more of\n"
+	.string "your fine advice.\p"
+	.string "I have here my {STR_VAR_1} that I wish\n"
+	.string "to make hold a convenient item.\p"
+	.string "What would be worthy of it?$"
+
+gText_082BCB75:: @ 82BCB75
+	.string "It’s better if it held nothing?\n"
+	.string "Are you certain?$"
+
+gText_082BCBA6:: @ 82BCBA6
+	.string "I see. If that’s the case, that’s fine.\n"
+	.string "I thank you for your time.\p"
+	.string "Let us meet again!$"
+
+gText_082BCBFC:: @ 82BCBFC
+	.string "One {STR_VAR_1}?\n"
+	.string "Are you certain?\p"
+	.string "I see. If that’s the case, that’s fine.\n"
+	.string "I thank you for your time.\p"
+	.string "I do hope my POKéMON will be able to\n"
+	.string "put it to good use.\p"
+	.string "Let us meet again!$"
+
+gText_082BCCA4:: @ 82BCCA4
+	.string "No, no, wait a minute.\n"
+	.string "I believe you taught me that before.\p"
+	.string "I would like you to recommend\n"
+	.string "something different this time.\p"
+	.string "Perhaps you’re suggesting that\n"
+	.string "my {STR_VAR_2} should hold nothing?\l"
+	.string "Are you certain?$"
+
+gText_082BCD68:: @ 82BCD68
+	.string "Waah, {PLAYER}!\n"
+	.string "I have a dilemma, sob…\p"
+	.string "I want to begin battling other people,\n"
+	.string "but I don’t know what to do.\p"
+	.string "How should I line up my POKéMON\n"
+	.string "so they’ll be at their strongest?\p"
+	.string "Please tell me, {PLAYER}.\n"
+	.string "If you were me, which of these POKéMON\l"
+	.string "would you send out first?$"
+
+gText_082BCE64:: @ 82BCE64
+	.string "My {STR_VAR_1} should go first?\n"
+	.string "Waaaaah!\p"
+	.string "Oh! I’m so sorry!\n"
+	.string "You’ve made me happy by choosing\l"
+	.string "my first POKéMON, and it’s made me cry…\p"
+	.string "Thank you so much!$"
+
+gText_082BCEF2:: @ 82BCEF2
+	.string "Yay! It’s {PLAYER}!\n"
+	.string "Great! I wanted to ask you something!\p"
+	.string "Um, of my POKéMON, which do you\n"
+	.string "think should go out first?$"
+
+gText_082BCF61:: @ 82BCF61
+	.string "My {STR_VAR_1}? That’s true.\n"
+	.string "Okay, I’ll do that!\p"
+	.string "Thanks for teaching me!$"
+
+gText_082BCFA1:: @ 82BCFA1
+	.string "{PLAYER}, hello!\p"
+	.string "I think, in a battle, it’s very important\n"
+	.string "which POKéMON comes out first.\p"
+	.string "Out of the POKéMON that I have,\n"
+	.string "which would be good to send out first?$"
+
+gText_082BD03C:: @ 82BD03C
+	.string "My {STR_VAR_1} goes first?\n"
+	.string "Okay, I got it!\p"
+	.string "See you again!$"
+
+gText_082BD06D:: @ 82BD06D
+	.string "Hello, {PLAYER}…\n"
+	.string "I’m sorry to disturb you again with\l"
+	.string "another question.\p"
+	.string "I have so little confidence, I don’t\n"
+	.string "know what I’d do without you, {PLAYER}.\p"
+	.string "It may be a waste of time for me to\n"
+	.string "even worry about it, but I just can’t\l"
+	.string "decide something…\p"
+	.string "Which of my POKéMON should I send\n"
+	.string "out first in a battle?$"
+
+gText_082BD18A:: @ 82BD18A
+	.string "My {STR_VAR_1}?\n"
+	.string "Understood!\p"
+	.string "I can’t believe that you would bother\n"
+	.string "to answer my questions so often!\p"
+	.string "I’m so grateful that you would even\n"
+	.string "speak with me… Thank you!$"
+
+gText_082BD222:: @ 82BD222
+	.string "Oh, {PLAYER}{STRING 5}! It’s me!\n"
+	.string "I’m so glad to see you because I have\l"
+	.string "this little problem.\p"
+	.string "I can’t decide how my POKéMON should\n"
+	.string "be lined up. Could you decide for me?\p"
+	.string "Oh, you don’t need to decide the whole\n"
+	.string "party right now.\p"
+	.string "How about deciding just the first\n"
+	.string "POKéMON for me?$"
+
+gText_082BD325:: @ 82BD325
+	.string "My {STR_VAR_1}? That’s great!\p"
+	.string "Knowing that you made the decision,\n"
+	.string "{PLAYER}{STRING 5}, I won’t be so upset if\l"
+	.string "I lose.\p"
+	.string "Okay, I’ll look to you for advice again.\n"
+	.string "Bye!$"
+
+gText_082BD3B1:: @ 82BD3B1
+	.string "Hi, my teacher {PLAYER}{STRING 5}!\n"
+	.string "I’m busy again today!\p"
+	.string "I have to do some cycling, shopping,\n"
+	.string "and humming.\p"
+	.string "I haven’t even had the time to decide\n"
+	.string "how to line up my POKéMON team.\p"
+	.string "So, how about checking out my team?\n"
+	.string "Which one should go first?$"
+
+gText_082BD493:: @ 82BD493
+	.string "Okay, gotcha.\n"
+	.string "I have enough time at least to put\l"
+	.string "my {STR_VAR_1} at the head of the line!\p"
+	.string "Whoops, my girlfriend’s waiting!\n"
+	.string "Thanks! See you around!$"
+
+gText_082BD51C:: @ 82BD51C
+	.string "Yoohoo! Hiya, {PLAYER}!\n"
+	.string "You always walk around looking tough!\p"
+	.string "Listen, I need something from you\n"
+	.string "again! It’s the usual thing!\p"
+	.string "Drum roll, please!\n"
+	.string "The question I have is about my team.\p"
+	.string "Which POKéMON of mine should be first\n"
+	.string "to go out in a battle?$"
+
+gText_082BD609:: @ 82BD609
+	.string "Hmhm!\n"
+	.string "My {STR_VAR_1}, you say!\l"
+	.string "Thanks for a most cool answer!\p"
+	.string "I guess that’s about all I wanted\n"
+	.string "to ask you today.\p"
+	.string "Let’s meet here again, okay?\n"
+	.string "Thanks!$"
+
+gText_082BD697:: @ 82BD697
+	.string "Thank you so much for stopping to\n"
+	.string "chat with me, {PLAYER}.\p"
+	.string "I know I’m taking advantage of your\n"
+	.string "kindness, but may I ask for advice?\p"
+	.string "I would like you to decide on the order\n"
+	.string "of my POKéMON team.\p"
+	.string "It would please me if you could decide\n"
+	.string "which POKéMON should come first.$"
+
+gText_082BD797:: @ 82BD797
+	.string "My {STR_VAR_1} it is!\n"
+	.string "I will put it first right away!\p"
+	.string "Thank you, {PLAYER}.\n"
+	.string "I hope I can count on you again.\l"
+	.string "Please take care!$"
+
+gText_082BD806:: @ 82BD806
+	.string "Eek! {PLAYER}!\n"
+	.string "I… I’m overjoyed to see you again!\p"
+	.string "My POKéMON have become much\n"
+	.string "stronger!\p"
+	.string "But I don’t always win. It seems to\n"
+	.string "depend on which POKéMON goes first.\p"
+	.string "{PLAYER}, please, I need your help!\p"
+	.string "Please decide which of my POKéMON\n"
+	.string "should go out first!$"
+
+gText_082BD8F5:: @ 82BD8F5
+	.string "Sigh… I’m overwhelmed with happiness…\p"
+	.string "It’s like a dream having you decide\n"
+	.string "for me, {PLAYER}.\p"
+	.string "But perfectly understood!\n"
+	.string "I will go with my {STR_VAR_1} first!\p"
+	.string "I hope you’ll be willing to teach me\n"
+	.string "some more another time.$"
+
+gText_082BD9BE:: @ 82BD9BE
+	.string "Hello, hello!\n"
+	.string "My mentor, {PLAYER}{STRING 5}!\l"
+	.string "Hit me with your sage advice today!\p"
+	.string "You see, I pulled together a team of\n"
+	.string "three POKéMON. So far so good.\p"
+	.string "But the team’s battling order’s not\n"
+	.string "settled yet.\p"
+	.string "This is where you come in, {PLAYER}{STRING 5}!\n"
+	.string "You decide which POKéMON leads off!\p"
+	.string "Don’t be shy now.\n"
+	.string "Let’s blurt it out!$"
+
+gText_082BDAE1:: @ 82BDAE1
+	.string "Uh-huh, my {STR_VAR_1} leads off!\n"
+	.string "OK, A-OK!\l"
+	.string "I’ll reorder the lineup, like, wham!\p"
+	.string "All right, thanks, as always!\n"
+	.string "Adios!$"
+
+gText_082BDB4E:: @ 82BDB4E
+	.string "{PLAYER}{STRING 5}, listen!\n"
+	.string "It’s a crisis!\p"
+	.string "My POKéMON, all three of them, go into\n"
+	.string "battle at once!\p"
+	.string "Of course that’s impossible!\n"
+	.string "Wahahaha!\p"
+	.string "This is no lie, though.\n"
+	.string "I’m not very good at thinking about\l"
+	.string "how I should line up my POKéMON.\p"
+	.string "So, how about deciding for me which\n"
+	.string "POKéMON should go first, master?$"
+
+gText_082BDC6B:: @ 82BDC6B
+	.string "Okay, so it’s my {STR_VAR_1} you chose?\n"
+	.string "I’ll let any but that one go first!\p"
+	.string "Just kidding!\n"
+	.string "I’ll obey your teaching, master!\p"
+	.string "Thanks, master!\n"
+	.string "I hope you’ll keep teaching me!$"
+
+gText_082BDD0D:: @ 82BDD0D
+	.string "A-H-O-Y!\n"
+	.string "And that spells ahoy!\p"
+	.string "The rappin’ SAILOR am I!\n"
+	.string "I present to you a question\l"
+	.string "that’s pretty fly!\p"
+	.string "It’s a team lineup question\n"
+	.string "that begs your suggestion!\p"
+	.string "Out of this lot, which should go first\n"
+	.string "as the first on the spot?$"
+
+gText_082BDDEC:: @ 82BDDEC
+	.string "Okay, I hear you, sure I do!\n"
+	.string "I’ll switch them up, that I’ll do!\p"
+	.string "If it’s advice I ever need,\n"
+	.string "{PLAYER}, your word I’ll always heed!$"
+
+gText_082BDE68:: @ 82BDE68
+	.string "Yahoo, {PLAYER}!\n"
+	.string "How do you do?\p"
+	.string "What should I do? Go ahead and ask?\n"
+	.string "Uh-huh, I have something to ask!\l"
+	.string "Are you receiving me?\l"
+	.string "You are receiving me!\p"
+	.string "You have to decide, which of my\n"
+	.string "POKéMON is the first to ride!\l"
+	.string "Into battle, I mean to say.$"
+
+gText_082BDF4D:: @ 82BDF4D
+	.string "My {STR_VAR_1}? Yes!\n"
+	.string "That’ll do, there’s no distress!\p"
+	.string "Well, {PLAYER}, I have to roam free,\n"
+	.string "but don’t you forget about me.\p"
+	.string "See you again, my smart friend!$"
+
+gText_082BDFD8:: @ 82BDFD8
+	.string "…Oof…ooch… {PLAYER}{STRING 5}…\n"
+	.string "My stomach’s hurting all of a sudden…\p"
+	.string "…It’s getting better now…\p"
+	.string "I must’ve worried myself sick racking\n"
+	.string "my brains on how I should line up\l"
+	.string "my posse of POKéMON.\p"
+	.string "So, things being this way,\n"
+	.string "I need you to decide for me.\p"
+	.string "{PLAYER}{STRING 5}, which of my POKéMON should\n"
+	.string "go first? So I’d win, I mean.$"
+
+gText_082BE0FD:: @ 82BE0FD
+	.string "Hm, all right.\n"
+	.string "My {STR_VAR_1} goes first.\p"
+	.string "I’ll fix the lineup like that after\n"
+	.string "I have my supper.\p"
+	.string "I hope I can keep hitting you up\n"
+	.string "for help like this.$"
+
+gText_082BE189:: @ 82BE189
+	.string "Er… Um…\n"
+	.string "{PLAYER}{STRING 5}?\p"
+	.string "Please, don’t look at me that way.\n"
+	.string "You’re making me feel all flustered.\p"
+	.string "Um…\n"
+	.string "I really need your advice.\p"
+	.string "It makes me bashful to say this,\n"
+	.string "but I chose my 3-POKéMON team.\l"
+	.string "I can’t decide on the order, though.\p"
+	.string "Which POKéMON should I send out first\n"
+	.string "so I at least look capable?$"
+
+gText_082BE2A5:: @ 82BE2A5
+	.string "Oh… Okay!\n"
+	.string "I’ll lead with my {STR_VAR_1}.\p"
+	.string "I hope I can do my best without\n"
+	.string "getting all flustered.\p"
+	.string "Thank you, {PLAYER}{STRING 5}.\n"
+	.string "If we meet again, I hope you will be\l"
+	.string "as helpful.$"
+
+gText_082BE33E:: @ 82BE33E
+	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
+	.string "But are you really?\l"
+	.string "Perhaps you’re a clever look-alike?\p"
+	.string "Oh, no, no, no, don’t worry!\n"
+	.string "If you really are {PLAYER}, please\l"
+	.string "forget about my rudeness.\p"
+	.string "What I would like is your fine advice.\p"
+	.string "I have here my POKéMON team.\n"
+	.string "I would like you to tell me which one\l"
+	.string "should go first in a battle.$"
+
+gText_082BE46C:: @ 82BE46C
+	.string "My {STR_VAR_1}…\n"
+	.string "You aren’t pulling my leg?\p"
+	.string "I see. If that’s the case, that’s fine.\n"
+	.string "I thank you for your time.\p"
+	.string "I am as you see, but I shall do\n"
+	.string "my best.\p"
+	.string "Let us meet again!$"
+
+gText_082BE50D:: @ 82BE50D
+	.string "Snivel…\n"
+	.string "Oh, {PLAYER}!\p"
+	.string "What perfect timing!\n"
+	.string "There’s something I just can’t decide…\p"
+	.string "I can’t decide which POKéMON I should\n"
+	.string "be using.\p"
+	.string "I can’t decide between the POKéMON\n"
+	.string "{STR_VAR_1} and {STR_VAR_2}…\p"
+	.string "{PLAYER}, which do you think will give\n"
+	.string "even me a chance at winning?$"
+
+gText_082BE5F5:: @ 82BE5F5
+	.string "Snivel… I… I understand!\n"
+	.string "Oh! I’m so sorry!\l"
+	.string "You’ve made me so happy, I’m crying…\p"
+	.string "I’ll do my best to catch one\n"
+	.string "{STR_VAR_1}!\p"
+	.string "Thank you so much!$"
+
+gText_082BE679:: @ 82BE679
+	.string "Yay! It’s {PLAYER}!\n"
+	.string "Yay, you came at the right time, too!\l"
+	.string "I need your advice again!\p"
+	.string "Um, I’m all mixed up--should I use\n"
+	.string "my {STR_VAR_1} or {STR_VAR_2}…\p"
+	.string "Which do you think I should raise,\n"
+	.string "{PLAYER}?$"
+
+gText_082BE71E:: @ 82BE71E
+	.string "Oh, so my {STR_VAR_1} is better!\n"
+	.string "Okay, I’ll do that!\p"
+	.string "Thanks for teaching me!$"
+
+gText_082BE762:: @ 82BE762
+	.string "{PLAYER}, hello!\n"
+	.string "I have a question I wanted to ask.\p"
+	.string "I’m in a dilemma over whether I should\n"
+	.string "raise one {STR_VAR_1} or {STR_VAR_2}.\p"
+	.string "Which POKéMON do you think will\n"
+	.string "be stronger?$"
+
+gText_082BE7F8:: @ 82BE7F8
+	.string "{STR_VAR_1} is your choice?\n"
+	.string "Okay, I got it!\p"
+	.string "I’ll go catch a strong {STR_VAR_1}\n"
+	.string "right away!\p"
+	.string "See you again!$"
+
+gText_082BE850:: @ 82BE850
+	.string "Hello, {PLAYER}…\p"
+	.string "Um, you’ve probably already forgotten\n"
+	.string "about someone like me…\p"
+	.string "…But that doesn’t matter if you\n"
+	.string "could give me advice…\p"
+	.string "I can’t decide on the one kind of\n"
+	.string "POKéMON I should raise…\p"
+	.string "I’ve narrowed the field to the POKéMON\n"
+	.string "{STR_VAR_1} and {STR_VAR_2}, but that’s\l"
+	.string "where I became stuck…\p"
+	.string "{PLAYER}, you probably don’t want to\n"
+	.string "bother, but please decide for me.$"
+
+gText_082BE99C:: @ 82BE99C
+	.string "But will a wild {STR_VAR_1} even pay\n"
+	.string "attention to me?\p"
+	.string "I will try!\p"
+	.string "But will I even be able to catch one…\n"
+	.string "No! I’ll do my best!\p"
+	.string "Thank you!$"
+
+gText_082BEA1B:: @ 82BEA1B
+	.string "Oh, {PLAYER}{STRING 5}! I’m so glad to see you!\n"
+	.string "I was about to go looking for you!\p"
+	.string "Can you decide what kind of POKéMON\n"
+	.string "I should use?\p"
+	.string "For instance…\n"
+	.string "How about the POKéMON {STR_VAR_1}\l"
+	.string "and {STR_VAR_2}?\p"
+	.string "Which one do you think would be\n"
+	.string "better?$"
+
+gText_082BEAE9:: @ 82BEAE9
+	.string "{STR_VAR_1}? That’s great!\p"
+	.string "Knowing that you made the decision,\n"
+	.string "{PLAYER}{STRING 5}, I won’t be so upset if\l"
+	.string "I lose.\p"
+	.string "Okay, I’ll look to you for advice again.\n"
+	.string "Bye!$"
+
+gText_082BEB72:: @ 82BEB72
+	.string "If it isn’t {PLAYER}{STRING 5}! How’s it going?\n"
+	.string "I’m busy again as always!\p"
+	.string "I want to do good with POKéMON, too,\n"
+	.string "but I haven’t been able to decide\l"
+	.string "which POKéMON I should use.\p"
+	.string "You know how {STR_VAR_1} look strong?\n"
+	.string "But {STR_VAR_2} are tough to ignore.\p"
+	.string "{PLAYER}{STRING 5}, give me some of your good\n"
+	.string "advice! Which one’d be good for me?$"
+
+gText_082BEC8E:: @ 82BEC8E
+	.string "Okay, gotcha.\n"
+	.string "I’ll find time somehow and catch me\l"
+	.string "that {STR_VAR_1} you recommended.\p"
+	.string "I’m glad I met a good mentor in you.\n"
+	.string "Thanks! See you around!$"
+
+gText_082BED16:: @ 82BED16
+	.string "Oh!\n"
+	.string "Yay, it’s {PLAYER}!\p"
+	.string "I didn’t waste any time boasting to\n"
+	.string "my friends about meeting you!\p"
+	.string "I need to tap your mind again today.\n"
+	.string "It’s an easy one for you!\p"
+	.string "Drum roll, please!\n"
+	.string "The question I have is…\p"
+	.string "If I were to raise a POKéMON,\n"
+	.string "and the choices were one {STR_VAR_1}\l"
+	.string "or {STR_VAR_2}, which should it be?$"
+
+gText_082BEE29:: @ 82BEE29
+	.string "Ahhh!\n"
+	.string "{STR_VAR_1}, you say!\l"
+	.string "Thanks for a most cool answer!\p"
+	.string "I guess that’s about all I wanted\n"
+	.string "to ask you today.\p"
+	.string "Let’s meet here again, okay?\n"
+	.string "Thanks!$"
+
+gText_082BEEB4:: @ 82BEEB4
+	.string "Oh, is it you, {PLAYER}?\n"
+	.string "I’m delighted to see you again!\p"
+	.string "Ever since I became your apprentice,\n"
+	.string "my confidence has been blooming.\p"
+	.string "I think I’m ready to raise a POKéMON\n"
+	.string "of my own!\p"
+	.string "{PLAYER}, may I impose on you to choose\n"
+	.string "which POKéMON I should raise?\p"
+	.string "The choices are the POKéMON\n"
+	.string "{STR_VAR_1} or {STR_VAR_2}…\l"
+	.string "Which POKéMON is right for me?$"
+
+gText_082BEFE2:: @ 82BEFE2
+	.string "One {STR_VAR_1} it is!\n"
+	.string "I will find one right away!\p"
+	.string "Thank you, {PLAYER}.\n"
+	.string "I hope I can count on you again.\l"
+	.string "Please take care!$"
+
+gText_082BF04E:: @ 82BF04E
+	.string "Eek! {PLAYER}! I met you again!\n"
+	.string "I… I’m overjoyed!\p"
+	.string "Oh-oh-oh, I know!\n"
+	.string "I shouldn’t pass up this opportunity!\p"
+	.string "May I ask a huge favor, {PLAYER}?\n"
+	.string "Please choose a POKéMON for me!\p"
+	.string "Please decide which would be better,\n"
+	.string "{STR_VAR_1} or {STR_VAR_2}!$"
+
+gText_082BF11D:: @ 82BF11D
+	.string "Wow! You decided for me!\n"
+	.string "One {STR_VAR_1} is what I’ll raise to\l"
+	.string "the best of my ability.\p"
+	.string "I hope you’ll be willing to teach me\n"
+	.string "some more another time.$"
+
+gText_082BF1A8:: @ 82BF1A8
+	.string "Hey, hey!\n"
+	.string "My mentor, {PLAYER}{STRING 5}!\p"
+	.string "Hello, I’ve been looking for you\n"
+	.string "for some more of your sage advice!\p"
+	.string "Which kind of POKéMON would be right\n"
+	.string "for me, one {STR_VAR_1} or {STR_VAR_2}?\p"
+	.string "Don’t be shy now.\n"
+	.string "Let’s blurt it out!$"
+
+gText_082BF268:: @ 82BF268
+	.string "Uh-huh, one {STR_VAR_1} it is!\n"
+	.string "OK, A-OK!\l"
+	.string "I’ll get one in a BALL, like, cram!\p"
+	.string "All right, thanks, as always!\n"
+	.string "Adios!$"
+
+gText_082BF2D1:: @ 82BF2D1
+	.string "{PLAYER}{STRING 5}, listen! Big news!\n"
+	.string "I caught a mirage POKéMON!\p"
+	.string "Of course I’m lying!\n"
+	.string "Wahahaha!\p"
+	.string "This is no lie, though.\n"
+	.string "I’m not very good at catching\l"
+	.string "POKéMON.\p"
+	.string "So, how about deciding for me which\n"
+	.string "kind of POKéMON I should catch,\l"
+	.string "master?\p"
+	.string "Which would be better?\n"
+	.string "{STR_VAR_1} or {STR_VAR_2}?$"
+
+gText_082BF3CF:: @ 82BF3CF
+	.string "Okay, so it’s {STR_VAR_1} you chose?\n"
+	.string "I’ll grab the other kind, then!\p"
+	.string "Just kidding!\n"
+	.string "I’ll obey your teaching, master!\p"
+	.string "Thanks, master!\n"
+	.string "I hope you’ll keep teaching me!$"
+
+gText_082BF46A:: @ 82BF46A
+	.string "A-H-O-Y!\n"
+	.string "And that spells ahoy!\p"
+	.string "The rappin’ SAILOR am I!\n"
+	.string "Surely you remember who am I?\p"
+	.string "Today, I have a POKéMON question\n"
+	.string "that begs your suggestion!\p"
+	.string "I have the choice between this\n"
+	.string "{STR_VAR_1} and {STR_VAR_2}, you see.\l"
+	.string "Which is the one to catch for me?$"
+
+gText_082BF551:: @ 82BF551
+	.string "{STR_VAR_1}, you say, hey, hey!\n"
+	.string "I’ll go get me one right away!\p"
+	.string "If it’s advice I ever need,\n"
+	.string "{PLAYER}, your word I’ll always heed!$"
+
+gText_082BF5C3:: @ 82BF5C3
+	.string "Oh, wow, if it isn’t {PLAYER}!\p"
+	.string "What should I do? Get your advice?\n"
+	.string "Why not? I’m already talking to you!\p"
+	.string "It’s been a long time. Let me break\n"
+	.string "the ice. I’m also looking for advice!\l"
+	.string "Are you receiving me?\l"
+	.string "You are receiving me!\p"
+	.string "My POKéMON--which should I use?\n"
+	.string "It’s either {STR_VAR_1} or {STR_VAR_2}.\l"
+	.string "Which do you choose?$"
+
+gText_082BF6E5:: @ 82BF6E5
+	.string "If that {STR_VAR_1} is the best,\n"
+	.string "I’ll do as you suggest!\p"
+	.string "Well, {PLAYER}, I have to roam free,\n"
+	.string "but don’t you forget about me.\p"
+	.string "See you again, my smart friend!$"
+
+gText_082BF773:: @ 82BF773
+	.string "Oh, hi, {PLAYER}{STRING 5}…\n"
+	.string "I have this horrible headache…\p"
+	.string "I must’ve worried too much about\n"
+	.string "the kind of POKéMON I should raise.\p"
+	.string "So, things being this way,\n"
+	.string "I need you to decide for me.\p"
+	.string "{PLAYER}{STRING 5}, if I had to choose between\n"
+	.string "the POKéMON {STR_VAR_1} and\l"
+	.string "{STR_VAR_2}, which should it be?$"
+
+gText_082BF869:: @ 82BF869
+	.string "Hm, one {STR_VAR_1}, all right.\n"
+	.string "I’ll go look for one when I get better.\p"
+	.string "I hope I can keep hitting you up\n"
+	.string "for help like this.$"
+
+gText_082BF8DD:: @ 82BF8DD
+	.string "Er… Um…\n"
+	.string "{PLAYER}{STRING 5}…?\p"
+	.string "Please, don’t look at me that way.\n"
+	.string "I’m getting all flustered…\l"
+	.string "I… I need your advice.\p"
+	.string "I… I’m really embarrassed, but I can’t\n"
+	.string "decide which POKéMON to use.\p"
+	.string "If the choices were {STR_VAR_1} or\n"
+	.string "{STR_VAR_2}, which would be better?$"
+
+gText_082BF9BA:: @ 82BF9BA
+	.string "Oh… Okay!\n"
+	.string "I’ll do my best with one {STR_VAR_1}.\p"
+	.string "I hope I can do my best without\n"
+	.string "getting all flustered.\p"
+	.string "Thank you, {PLAYER}{STRING 5}.\n"
+	.string "If we meet again, I hope you will be\l"
+	.string "as helpful.$"
+
+gText_082BFA5A:: @ 82BFA5A
+	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
+	.string "But are you really real?\p"
+	.string "No, no, if you are real, it’s fine.\n"
+	.string "Incidentally, I would like to obtain\l"
+	.string "your advice.\p"
+	.string "It’s about the POKéMON I am to use.\p"
+	.string "If the choices are the POKéMON\n"
+	.string "{STR_VAR_1} and {STR_VAR_2}, which is\l"
+	.string "more worthy of me?$"
+
+gText_082BFB4E:: @ 82BFB4E
+	.string "{STR_VAR_1}?\n"
+	.string "Are you certain?\p"
+	.string "I see. If that’s the case, that’s fine.\n"
+	.string "I thank you for your time.\p"
+	.string "I do hope it is something even I can\n"
+	.string "handle with aplomb.\p"
+	.string "Let us meet again!$"
+
+gText_082BFBF2:: @ 82BFBF2
+	.string "Waaah! Oh, {PLAYER}!\n"
+	.string "Snivel… Hiccup…\p"
+	.string "I have a dilemma!\n"
+	.string "I can’t decide on a move for\l"
+	.string "my {STR_VAR_1}…\p"
+	.string "Please, please, {PLAYER}.\n"
+	.string "Can you decide for me?\p"
+	.string "For my {STR_VAR_1}, which move would\n"
+	.string "be the better choice: {STR_VAR_2}\l"
+	.string "or {STR_VAR_3}?$"
+
+gText_082BFCAE:: @ 82BFCAE
+	.string "{STR_VAR_1}?\n"
+	.string "Waaaaah!\p"
+	.string "Oh! I’m so sorry, {PLAYER}!\n"
+	.string "You’ve made me so happy by deciding\l"
+	.string "the move, I’m crying…\p"
+	.string "Snivel…\n"
+	.string "Thank you so much!$"
+
+gText_082BFD26:: @ 82BFD26
+	.string "Yay! Hi, {PLAYER}!\n"
+	.string "I need your advice again!\p"
+	.string "I want to teach my {STR_VAR_1}\n"
+	.string "a cool move.\p"
+	.string "I like either of the moves\n"
+	.string "{STR_VAR_2} or {STR_VAR_3}.\l"
+	.string "What’s your recommendation?$"
+
+gText_082BFDB1:: @ 82BFDB1
+	.string "{STR_VAR_1} is better? I guess so!\n"
+	.string "Okay, I’ll go with that!\p"
+	.string "If we meet here again, please teach\n"
+	.string "me something else, teacher!$"
+
+gText_082BFE24:: @ 82BFE24
+	.string "{PLAYER}, hello!\n"
+	.string "It’s about my {STR_VAR_1}, but I’m\l"
+	.string "worried about its moves.\p"
+	.string "You see, it’s the moves {STR_VAR_2}\n"
+	.string "and {STR_VAR_3}.\p"
+	.string "Which is stronger and better for\n"
+	.string "my {STR_VAR_1}?$"
+
+gText_082BFEAD:: @ 82BFEAD
+	.string "{STR_VAR_1} is your choice?\n"
+	.string "Okay, I got it!\p"
+	.string "I’ll go teach {STR_VAR_1} to\n"
+	.string "my POKéMON right away!\p"
+	.string "See you again!$"
+
+gText_082BFF0A:: @ 82BFF0A
+	.string "Ohhh, {PLAYER}…\n"
+	.string "I’m hopeless, no, really!\p"
+	.string "I’ve decided to raise a POKéMON,\n"
+	.string "but now I can’t even decide what\l"
+	.string "move I should let it learn…\p"
+	.string "I know that it doesn’t mean anything\n"
+	.string "to you, {PLAYER}.\p"
+	.string "But it means a lot to me…\p"
+	.string "Please, {PLAYER}, could you choose\n"
+	.string "a move for my {STR_VAR_1}?\p"
+	.string "If you could even choose between\n"
+	.string "{STR_VAR_2} and {STR_VAR_3}…$"
+
+gText_082C0032:: @ 82C0032
+	.string "I understand!\p"
+	.string "But will it even be willing to learn\n"
+	.string "{STR_VAR_1} for me…\l"
+	.string "No! I’ll do my best!\p"
+	.string "Thank you!$"
+
+gText_082C0090:: @ 82C0090
+	.string "Oh, {PLAYER}{STRING 5}!\n"
+	.string "I was just hoping to see you, too!\p"
+	.string "I was wondering what move would\n"
+	.string "be suitable for my {STR_VAR_1}.\p"
+	.string "I can’t decide, so can you decide\n"
+	.string "for me instead?\p"
+	.string "For instance… How about the moves\n"
+	.string "{STR_VAR_2} and {STR_VAR_3}?\l"
+	.string "Which one would be better?$"
+
+gText_082C016E:: @ 82C016E
+	.string "{STR_VAR_1}? That’s great!\p"
+	.string "Knowing that you made the decision,\n"
+	.string "{PLAYER}{STRING 5}, I won’t be so upset if\l"
+	.string "I lose.\p"
+	.string "Okay, I’ll look to you for advice again.\n"
+	.string "Bye!$"
+
+gText_082C01F7:: @ 82C01F7
+	.string "How could things be this busy?\n"
+	.string "Hey, if it isn’t {PLAYER}{STRING 5}!\l"
+	.string "How’s it going?\p"
+	.string "Since I got up this morning, I’ve done\n"
+	.string "my jogging, swimming, and cooking!\p"
+	.string "You wouldn’t believe how busy I am!\p"
+	.string "I can’t even decide what move\n"
+	.string "my {STR_VAR_1} should learn!\p"
+	.string "{STR_VAR_2} looks good, huh?\n"
+	.string "But {STR_VAR_3}’s also decent.\p"
+	.string "{PLAYER}{STRING 5}, give me some of your good\n"
+	.string "advice! Which move’d be good for me?$"
+
+gText_082C034C:: @ 82C034C
+	.string "Okay, gotcha.\n"
+	.string "I’ll make room in my schedule and\l"
+	.string "teach that move.\p"
+	.string "I’m glad I met a good mentor in you.\n"
+	.string "Thanks! See you around!$"
+
+gText_082C03CA:: @ 82C03CA
+	.string "Oh! Lucky!\n"
+	.string "I met you again, {PLAYER}!\l"
+	.string "I need to tap your mind again today.\p"
+	.string "Drum roll, please!\n"
+	.string "The question I have is…\p"
+	.string "For my {STR_VAR_1}, which is the move\n"
+	.string "best suited, {STR_VAR_2} or\l"
+	.string "{STR_VAR_3}?$"
+
+gText_082C046E:: @ 82C046E
+	.string "Ahhh!\n"
+	.string "{STR_VAR_1}, you say!\l"
+	.string "Thanks for a most cool answer!\p"
+	.string "I guess that’s about all I wanted\n"
+	.string "to ask you today.\p"
+	.string "Let’s meet here again, okay?\n"
+	.string "Thanks!$"
+
+gText_082C04F9:: @ 82C04F9
+	.string "Oh, hello, {PLAYER}.\n"
+	.string "I trust you’ve been well?\p"
+	.string "I have to seek your advice again.\n"
+	.string "It’s about my dearest {STR_VAR_1}.\p"
+	.string "What would be the ideal move for\n"
+	.string "my lovable {STR_VAR_1}?\l"
+	.string "{STR_VAR_2} or {STR_VAR_3}?$"
+
+gText_082C0598:: @ 82C0598
+	.string "{STR_VAR_1} it is!\n"
+	.string "I will teach that right away!\p"
+	.string "Thank you, {PLAYER}.\n"
+	.string "I hope I can count on you again.\l"
+	.string "Please take care!$"
+
+gText_082C0602:: @ 82C0602
+	.string "Eek! {PLAYER}! I met you again!\n"
+	.string "I… I’m overjoyed!\p"
+	.string "Whenever I’m in need, you’re always\n"
+	.string "there for me, {PLAYER}!\p"
+	.string "Today, I want you to recommend\n"
+	.string "a move for me!\p"
+	.string "Please choose a move for\n"
+	.string "my {STR_VAR_1}!\p"
+	.string "Which move would be better,\n"
+	.string "{STR_VAR_2} or {STR_VAR_3}?$"
+
+gText_082C06D8:: @ 82C06D8
+	.string "Oh-oh-oh! Thank you!\n"
+	.string "{STR_VAR_1} is it!\l"
+	.string "Perfectly understood!\p"
+	.string "I hope you’ll be willing to teach me\n"
+	.string "some more another time.$"
+
+gText_082C074A:: @ 82C074A
+	.string "Hola, {PLAYER}{STRING 5}, bueno!\n"
+	.string "I’m hoping for some more of\l"
+	.string "your sage advice today!\p"
+	.string "What would be the best move for\n"
+	.string "my {STR_VAR_1}?\p"
+	.string "It should be something that’ll\n"
+	.string "let me win just like that!\p"
+	.string "Would it be {STR_VAR_2}?\n"
+	.string "Or {STR_VAR_3}?$"
+
+gText_082C0809:: @ 82C0809
+	.string "Uh-huh, {STR_VAR_1} it is!\n"
+	.string "Si, bueno!\l"
+	.string "I’ll get it taught, like, ka-blam!\p"
+	.string "All right, thanks, as always!\n"
+	.string "Adios!$"
+
+gText_082C086E:: @ 82C086E
+	.string "{PLAYER}{STRING 5}, it’s completely wild!\p"
+	.string "My POKéMON!\n"
+	.string "It learned six moves!\p"
+	.string "Of course I’m lying!\n"
+	.string "Wahahaha!\p"
+	.string "This is no lie, though.\n"
+	.string "I’m not very good at choosing moves\l"
+	.string "for my POKéMON.\p"
+	.string "So, how about deciding for me which\n"
+	.string "kind of move I should teach?\p"
+	.string "{STR_VAR_2} or {STR_VAR_3}--which\n"
+	.string "would go with my {STR_VAR_1} best?$"
+
+gText_082C0982:: @ 82C0982
+	.string "Okay, so it’s {STR_VAR_1} you chose?\n"
+	.string "I’ll choose another move, then!\p"
+	.string "Just kidding!\n"
+	.string "I’ll obey your teaching, master!\p"
+	.string "Thanks, master!\n"
+	.string "I hope you’ll keep teaching me!$"
+
+gText_082C0A1D:: @ 82C0A1D
+	.string "A-H-O-Y!\n"
+	.string "And that spells ahoy!\p"
+	.string "The rappin’ SAILOR am I!\n"
+	.string "I’m always with it, don’t ask me why.\p"
+	.string "Today, I have a move question\n"
+	.string "that begs your suggestion!\p"
+	.string "{STR_VAR_2} and {STR_VAR_3} are\n"
+	.string "the moves. What would be the best\l"
+	.string "for my {STR_VAR_1} so it grooves?$"
+
+gText_082C0AFD:: @ 82C0AFD
+	.string "{STR_VAR_1}, you say, hey, hey!\n"
+	.string "I’ll go teach that right away!\p"
+	.string "If it’s advice I ever need,\n"
+	.string "{PLAYER}, your word I’ll always heed!$"
+
+gText_082C0B6F:: @ 82C0B6F
+	.string "Oh, yeahah, if it isn’t {PLAYER}!\p"
+	.string "What should I do? Get your advice?\n"
+	.string "Why not? I’m already talking to you!\p"
+	.string "{PLAYER}, are you surprised by me?\n"
+	.string "I want your advice, can’t you see?\p"
+	.string "Are you receiving me?\n"
+	.string "You are receiving me!\p"
+	.string "My {STR_VAR_1}--what should it use?\n"
+	.string "It’s {STR_VAR_2} or {STR_VAR_3},\l"
+	.string "what do you choose?$"
+
+gText_082C0C7D:: @ 82C0C7D
+	.string "If that {STR_VAR_1} is the best,\n"
+	.string "I’ll do as you suggest!\p"
+	.string "Well, {PLAYER}, I have to roam free,\n"
+	.string "but don’t you forget about me.\p"
+	.string "See you again, my smart friend!$"
+
+gText_082C0D0B:: @ 82C0D0B
+	.string "Gahack! Gaah! Oh, {PLAYER}{STRING 5}…\n"
+	.string "I have this lousy cold, I do…\p"
+	.string "I want to pick a move for my POKéMON,\n"
+	.string "but I’m not up to it…\p"
+	.string "So, things being this way,\n"
+	.string "I need you to decide for me.\p"
+	.string "{PLAYER}{STRING 5}, if I had to choose between\n"
+	.string "{STR_VAR_2} and {STR_VAR_3} for\l"
+	.string "my {STR_VAR_1}, which would it be?$"
+
+gText_082C0DFE:: @ 82C0DFE
+	.string "Hm, {STR_VAR_1}, all right. Cough!\n"
+	.string "I’ll go teach it when I get better.\p"
+	.string "I hope I can keep hitting you up\n"
+	.string "for help like this.$"
+
+gText_082C0E71:: @ 82C0E71
+	.string "Er… Um…\n"
+	.string "{PLAYER}{STRING 5}…?\p"
+	.string "Please, don’t look at me that way.\n"
+	.string "I’m getting all flustered…\l"
+	.string "I… I need your advice.\p"
+	.string "I… I’m really embarrassed, but I can’t\n"
+	.string "decide what move I should teach\l"
+	.string "my POKéMON.\p"
+	.string "It’s for my {STR_VAR_1}.\n"
+	.string "If the choices were {STR_VAR_2} or\l"
+	.string "{STR_VAR_3}, which would be better?$"
+
+gText_082C0F6D:: @ 82C0F6D
+	.string "Oh… Okay!\n"
+	.string "I’ll try that {STR_VAR_1}.\p"
+	.string "I hope I can teach that move…\n"
+	.string "This is so nerve-racking…\p"
+	.string "Thank you, {PLAYER}{STRING 5}.\n"
+	.string "If we meet again, I hope you will be\l"
+	.string "as helpful.$"
+
+gText_082C1003:: @ 82C1003
+	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
+	.string "But are you really real?\p"
+	.string "Perhaps you’re one of those popular\n"
+	.string "mimics?\p"
+	.string "No, no, if you are real, it’s fine.\n"
+	.string "No need to be upset, I assure you!\p"
+	.string "Incidentally, I would like to obtain\n"
+	.string "your advice.\p"
+	.string "It’s about my {STR_VAR_1}.\p"
+	.string "Which move would be better for it to\n"
+	.string "use, {STR_VAR_2} or {STR_VAR_3}?$"
+
+gText_082C1122:: @ 82C1122
+	.string "{STR_VAR_1}?\n"
+	.string "There’s no question about that?\p"
+	.string "I see. If that’s the case, that’s fine.\n"
+	.string "I thank you for your time.\p"
+	.string "I do hope it is something even\n"
+	.string "my POKéMON can learn.\p"
+	.string "Let us meet again!$"
+
+gText_082C11D1:: @ 82C11D1
+	.string "Oh… {PLAYER}?\n"
+	.string "It is {PLAYER}!\l"
+	.string "Oh! Sniff…sob… Please, listen!\p"
+	.string "I… When I battle, I get so nervous,\n"
+	.string "I can’t help crying even if I win…\p"
+	.string "I wish I could say something cool\n"
+	.string "when I win…\p"
+	.string "Please, please, {PLAYER}!\n"
+	.string "Could you maybe teach me something\l"
+	.string "cool to say when I win so I don’t cry?$"
+
+gText_082C12D5:: @ 82C12D5
+	.string "{STR_VAR_1}\p"
+	.string "Awesome! Wicked! Awoooh!\n"
+	.string "It’s really cool!\p"
+	.string "Oh… I’m sorry…\n"
+	.string "I’m so happy, I’m crying…\p"
+	.string "Snivel… {PLAYER}!\n"
+	.string "Thank you so much for everything!\p"
+	.string "I will battle the best I can for\n"
+	.string "your sake, {PLAYER}!\p"
+	.string "{PLAYER}…\n"
+	.string "Next time… We should battle!$"
+
+gText_082C13AB:: @ 82C13AB
+	.string "Yay! It’s {PLAYER}! Hello!\n"
+	.string "I wanted to ask you something!\p"
+	.string "I want to say something cool when\n"
+	.string "I win a match.\p"
+	.string "Do you have a cool saying that\n"
+	.string "you could recommend?$"
+
+gText_082C1444:: @ 82C1444
+	.string "{STR_VAR_1}\p"
+	.string "Oh, wow! That is so cool!\n"
+	.string "Okay, I’ll say that!\p"
+	.string "Thanks for teaching me all this time!\n"
+	.string "I’m going to do the best I can\l"
+	.string "wherever I go from now on!\p"
+	.string "When we meet again, it’ll be for\n"
+	.string "a battle!$"
+
+gText_082C1501:: @ 82C1501
+	.string "{PLAYER}, hello!\p"
+	.string "My POKéMON and I are ready for\n"
+	.string "anything, except for one thing.\p"
+	.string "I think it would be good if I had\n"
+	.string "something to shout when I win.\p"
+	.string "Could you think up something good\n"
+	.string "to say?$"
+
+gText_082C15B6:: @ 82C15B6
+	.string "{STR_VAR_1}\p"
+	.string "…Cool!\n"
+	.string "I will use that!\p"
+	.string "I’m going out to battle all over\n"
+	.string "the place.\p"
+	.string "Who knows, I may even get to battle\n"
+	.string "you one day, {PLAYER}.\p"
+	.string "Next time, let’s meet at a place\n"
+	.string "of battle!$"
+
+gText_082C165E:: @ 82C165E
+	.string "Hello, {PLAYER}…\n"
+	.string "I’m sorry to bug you, but I’m hopeless…\p"
+	.string "Even when…\n"
+	.string "Even when I win, I don’t have anything\l"
+	.string "special to say…\p"
+	.string "I know that it doesn’t mean anything\n"
+	.string "to you, {PLAYER}.\p"
+	.string "But it means a lot to me…\p"
+	.string "Please, {PLAYER}, what should I say\n"
+	.string "if I win a battle?$"
+
+gText_082C174F:: @ 82C174F
+	.string "{STR_VAR_1}\p"
+	.string "That’s inspired…\p"
+	.string "Uh… Is it okay for someone like me\n"
+	.string "to even say that?\p"
+	.string "No! I’ll do my best!\p"
+	.string "{PLAYER}, thank you so much for\n"
+	.string "putting up with me for so long…\p"
+	.string "I promise to do my best from now on.\p"
+	.string "I’m sure you’ll quickly forget about\n"
+	.string "someone like me, but let’s meet\l"
+	.string "somewhere again!$"
+
+gText_082C1862:: @ 82C1862
+	.string "Oh, {PLAYER}{STRING 5}.\n"
+	.string "There’s something I want you to hear.\p"
+	.string "I know that I don’t always sound\n"
+	.string "nice or polite…\p"
+	.string "When I win a battle, I think I come\n"
+	.string "across as being arrogant.\p"
+	.string "I don’t want people to dislike me,\n"
+	.string "so I want to say something nice to\l"
+	.string "someone I beat.\p"
+	.string "But I can’t think of anything good!\n"
+	.string "Could you think something up for me?$"
+
+gText_082C19A0:: @ 82C19A0
+	.string "{STR_VAR_1}\p"
+	.string "Not bad!\n"
+	.string "Yup, that’s what I’ll go with!\p"
+	.string "I’m going to hit the road and do what\n"
+	.string "I can with what you taught me in\l"
+	.string "my head and heart.\p"
+	.string "I’m sorry that I’ve been so pushy\n"
+	.string "with you!\p"
+	.string "Next time, we battle, okay?\n"
+	.string "See you!$"
+
+gText_082C1A76:: @ 82C1A76
+	.string "Oh, I can’t get over how busy I am!\n"
+	.string "Oh, hey, I was looking for you, {PLAYER}{STRING 5}.\p"
+	.string "Are you well as usual?\n"
+	.string "Things haven’t changed for me at all.\p"
+	.string "I’ve got running, fighting, and mapping\n"
+	.string "to do. Why am I so busy?\p"
+	.string "But even though I’m busy, it’d be rude\n"
+	.string "to just turn on my heels and walk away\l"
+	.string "from a win without saying a word.\p"
+	.string "So, what would be a cool saying to\n"
+	.string "underline my coolness when I’m done\l"
+	.string "and walking away? {PLAYER}{STRING 5}, help me!$"
+
+gText_082C1C16:: @ 82C1C16
+	.string "{STR_VAR_1}\p"
+	.string "Okay, gotcha.\n"
+	.string "I can find time to say that!\p"
+	.string "Honestly, I’m glad I met a good mentor\n"
+	.string "like you.\p"
+	.string "I’m going to make time somehow so\n"
+	.string "I can get into battling.\p"
+	.string "Thanks for everything, {PLAYER}{STRING 5}!\n"
+	.string "We have to battle, you and me, one day!$"
+
+gText_082C1CF5:: @ 82C1CF5
+	.string "I lucked out again!\n"
+	.string "{PLAYER}! Am I glad to see you!\l"
+	.string "Like usual, I need your advice!\p"
+	.string "Drum roll, please!\n"
+	.string "The last question I have is…\p"
+	.string "If I win a battle and want to end\n"
+	.string "it with a cool flourish, what\l"
+	.string "should I say?$"
+
+gText_082C1DC1:: @ 82C1DC1
+	.string "{STR_VAR_1}\p"
+	.string "That… That’s fabulous!\n"
+	.string "It’s dignified and cool! I claim it!\p"
+	.string "…Listen, I think I’m getting decent\n"
+	.string "at this, huh?\p"
+	.string "So, I’m thinking of challenging other\n"
+	.string "TRAINERS from now on.\p"
+	.string "{PLAYER}, your advice really helped me.\p"
+	.string "Maybe one day, there’ll be a time when\n"
+	.string "we battle!\p"
+	.string "Thank you for everything!$"
+
+gText_082C1EDC:: @ 82C1EDC
+	.string "Oh, {PLAYER}.\n"
+	.string "I’m so glad I met you!\p"
+	.string "I no longer have any concerns with\n"
+	.string "regard to my POKéMON.\p"
+	.string "It’s myself that worries me…\p"
+	.string "Do you know how a TRAINER says\n"
+	.string "a few things upon winning a battle?\p"
+	.string "Definitely, I wish I could do that,\n"
+	.string "too!\p"
+	.string "Please, what should I say when\n"
+	.string "I win a battle?$"
+
+gText_082C1FEC:: @ 82C1FEC
+	.string "{STR_VAR_1}\p"
+	.string "Ah! That saying! It refreshes me\n"
+	.string "and makes me feel reborn!\p"
+	.string "I must use that right away!\p"
+	.string "And now, I must take my leave,\n"
+	.string "{PLAYER}…\p"
+	.string "I will go out to battle many others,\n"
+	.string "but never will I forget your teachings.\p"
+	.string "Perhaps one day…\n"
+	.string "Farewell!$"
+
+gText_082C20D1:: @ 82C20D1
+	.string "Eek! I spotted {PLAYER}!\n"
+	.string "I… I’m overjoyed to see you!\p"
+	.string "Oh-oh-oh! There’s something I just\n"
+	.string "had to ask you!\p"
+	.string "A little while ago, I won a battle.\n"
+	.string "That part was giddying!\p"
+	.string "But it made me so overjoyed that\n"
+	.string "I choked up and couldn’t say a thing!\p"
+	.string "So now, {PLAYER}, please, I want you to\n"
+	.string "think up an exit line for when I win!$"
+
+gText_082C21FF:: @ 82C21FF
+	.string "{STR_VAR_1}\p"
+	.string "Waaaaah!\n"
+	.string "I’m going to say that?!\l"
+	.string "I… I’m delirious with joy!\p"
+	.string "Th-th-thank you!\n"
+	.string "I have nothing left to regret now!\p"
+	.string "I’m going to travel now and battle\n"
+	.string "all sorts of people.\p"
+	.string "Everything, I owe it to you, {PLAYER}.\n"
+	.string "Really, really, thank you!\p"
+	.string "I’ve got to go now, but let’s meet\n"
+	.string "in battle one day!$"
+
+gText_082C231C:: @ 82C231C
+	.string "Hola, bueno!\n"
+	.string "{PLAYER}{STRING 5}!\p"
+	.string "You know, I’m getting the itch to roam\n"
+	.string "and battle where I may.\p"
+	.string "But before I do, I want your advice\n"
+	.string "once again, please!\p"
+	.string "If I were to win a battle, what would\n"
+	.string "be a good boast I could say to my\l"
+	.string "fallen TRAINER opponent?$"
+
+gText_082C2407:: @ 82C2407
+	.string "{STR_VAR_1}\p"
+	.string "Uh-huh, that’s sweet!\n"
+	.string "Si, bueno!\l"
+	.string "I’ll try saying that, like, ham!\p"
+	.string "And now, it’s time to say good-bye!\n"
+	.string "Thanks for all sorts of things!\p"
+	.string "Give me a battle one day, OK?\n"
+	.string "Adios!$"
+
+gText_082C24B5:: @ 82C24B5
+	.string "{PLAYER}{STRING 5}, there’s big trouble!\p"
+	.string "When I win a battle, I brag about it\n"
+	.string "for an hour at least!\p"
+	.string "Of course I’m lying!\n"
+	.string "Wahahaha!\p"
+	.string "This is no lie, though.\n"
+	.string "I’m not very good at chatting.\p"
+	.string "So, how about deciding for me what\n"
+	.string "I should say after winning a battle,\l"
+	.string "master?$"
+
+gText_082C25B1:: @ 82C25B1
+	.string "{STR_VAR_1}\p"
+	.string "That’s what I should say, huh?\n"
+	.string "Then, I’ll stay away from that!\p"
+	.string "Just kidding!\n"
+	.string "I’ll obey your teaching, master!\p"
+	.string "Thanks for teaching me all this time,\n"
+	.string "master!\p"
+	.string "I’m finally understanding what being\n"
+	.string "a TRAINER is about.\p"
+	.string "I’m going to go out and win battles\n"
+	.string "against any TRAINER.\p"
+	.string "Maybe it’ll be you one day, master!\p"
+	.string "That’s all!\n"
+	.string "Farewell, my master!$"
+
+gText_082C2707:: @ 82C2707
+	.string "A-H-O-Y!\n"
+	.string "And that spells ahoy!\p"
+	.string "The rappin’ SAILOR am I!\n"
+	.string "This will be my last question,\l"
+	.string "don’t you cry!\p"
+	.string "It’s a saying question\n"
+	.string "that begs your suggestion!\p"
+	.string "If I win a match, what can I say\n"
+	.string "in a real cool way?$"
+
+gText_082C27D4:: @ 82C27D4
+	.string "{STR_VAR_1}\p"
+	.string "Perfect! That’s what I’ll use.\n"
+	.string "I was right to make you choose!\p"
+	.string "And now, I think it’d be best,\n"
+	.string "if I were to fly the nest!\p"
+	.string "Thanks for all you taught me.\n"
+	.string "I’ll be off on a battle spree!\p"
+	.string "B-O-N-V-O-Y-A-G-E!\n"
+	.string "And that spells bon voyage,\l"
+	.string "to you this is my homage!$"
+
+gText_082C28D6:: @ 82C28D6
+	.string "Oh, yeah, {PLAYER}!\n"
+	.string "I found you again today!\p"
+	.string "What should I do? Ask you again?\n"
+	.string "Why not? I’m already asking you!\p"
+	.string "Anyways, {PLAYER}…\n"
+	.string "Are you receiving me?\l"
+	.string "You are receiving me!\l"
+	.string "I need some more advice for me!\p"
+	.string "It’s about what I should yell.\n"
+	.string "Something cool to holler when\l"
+	.string "a battle ends well.\p"
+	.string "Come on, I wanna hear you say it!$"
+
+gText_082C2A0B:: @ 82C2A0B
+	.string "{STR_VAR_1}\p"
+	.string "All right, all right!\n"
+	.string "I’ll use that because it’s so tight!\p"
+	.string "I’m out of things to ask you.\n"
+	.string "Waving bye is all that’s left to do.\p"
+	.string "But maybe one day we’ll meet, with one\n"
+	.string "destined to go down in defeat.\p"
+	.string "But, it really is time to say farewell.\p"
+	.string "Well, {PLAYER}, I have to roam free,\n"
+	.string "but don’t you forget about me!\p"
+	.string "Take care, {PLAYER}!\n"
+	.string "Love ya!$"
+
+gText_082C2B50:: @ 82C2B50
+	.string "{PLAYER}{STRING 5}, I’m finished…\n"
+	.string "My nose won’t stop dripping…\p"
+	.string "I was trying to think up something\n"
+	.string "cool to say when I win a battle.\p"
+	.string "It inspired me so much, it made me cry,\n"
+	.string "and now my nose won’t stop running…\p"
+	.string "So, things being this way,\n"
+	.string "I need you to decide for me, {PLAYER}{STRING 5}.\p"
+	.string "When I win a battle,\n"
+	.string "what should I say?$"
+
+gText_082C2C77:: @ 82C2C77
+	.string "{STR_VAR_1}\p"
+	.string "… … …That’s good.\n"
+	.string "No, it’s awe inspiring!\l"
+	.string "It’s bringing fresh tears to my eyes!\p"
+	.string "But in spite of my tears and runny\n"
+	.string "nose, I will use that saying!\p"
+	.string "I’m plumb out of things to ask you,\n"
+	.string "{PLAYER}{STRING 5}.\p"
+	.string "From now on, we’re rivals!\n"
+	.string "Thanks for everything!$"
+
+gText_082C2D67:: @ 82C2D67
+	.string "Er… Um…\n"
+	.string "{PLAYER}{STRING 5}…\p"
+	.string "Please, don’t look at me that way.\n"
+	.string "You’re making me all nervous.\p"
+	.string "I… I need your advice again.\n"
+	.string "I’ll make it my last, though…\p"
+	.string "It’s really embarrassing to ask,\n"
+	.string "but what if I win a battle?\l"
+	.string "What should I say?$"
+
+gText_082C2E41:: @ 82C2E41
+	.string "{STR_VAR_1}\p"
+	.string "Oh… Okay!\n"
+	.string "I’ll try to say that!\l"
+	.string "I might be too nervous to say it…\p"
+	.string "Thank you, {PLAYER}{STRING 5}.\n"
+	.string "I have to say good-bye now.\p"
+	.string "I’ll obey all that you’ve taught me,\n"
+	.string "{PLAYER}{STRING 5}, and do the best I can.$"
+
+gText_082C2EF5:: @ 82C2EF5
+	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
+	.string "But are you really?\l"
+	.string "Perhaps a clever {PLAYER} DOLL?\p"
+	.string "Oh, no, no, no, don’t worry!\n"
+	.string "If you really are real, please\l"
+	.string "forget about my rudeness.\p"
+	.string "No need to be so angry. All I wish for\n"
+	.string "is more of your fine advice.\p"
+	.string "It concerns a saying.\p"
+	.string "More precisely, what should I say\n"
+	.string "if I win a battle?$"
+
+gText_082C3023:: @ 82C3023
+	.string "{STR_VAR_1}\p"
+	.string "… … … … … …\n"
+	.string "When I win a match…\p"
+	.string "{STR_VAR_1}\p"
+	.string "…Are you serious?\p"
+	.string "I see. If you are serious, that’s fine.\n"
+	.string "I thank you for your time.\p"
+	.string "I do hope even I will be able to\n"
+	.string "put that saying to good use.\p"
+	.string "I seem to have run dry on what advice\n"
+	.string "I need.\p"
+	.string "I do believe it’s high time I bid you\n"
+	.string "farewell and strike out on my own.\p"
+	.string "Thank you, my mentor!\n"
+	.string "I apologize for my skepticism!$"
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 96e36dcf9..08f5accca 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -430,7 +430,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60
 	call OldaleTown_PokemonCenter_2F_EventScript_27134F
 	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
-	message OldaleTown_PokemonCenter_2F_Text_278091
+	message gText_PleaseWaitForLink
 	waitmessage
 	special sub_80B2DA4
 	waitstate
@@ -532,7 +532,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2
 	call OldaleTown_PokemonCenter_2F_EventScript_27134F
 	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
-	message OldaleTown_PokemonCenter_2F_Text_278091
+	message gText_PleaseWaitForLink
 	waitmessage
 	special sub_80B2E4C
 	waitstate
@@ -607,7 +607,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB
 	call OldaleTown_PokemonCenter_2F_EventScript_27134F
 	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
-	message OldaleTown_PokemonCenter_2F_Text_278091
+	message gText_PleaseWaitForLink
 	waitmessage
 	special sub_80B2E74
 	waitstate
@@ -1675,21 +1675,21 @@ OldaleTown_PokemonCenter_2F_Text_278061: @ 8278061
 	.string "A POKéMON holding the {STR_VAR_1}\n"
 	.string "BERRY can’t be traded.$"
 
-OldaleTown_PokemonCenter_2F_Text_278091:: @ 8278091
+gText_PleaseWaitForLink:: @ 8278091
 	.string "Please wait.\n"
 	.string "… … B Button: Cancel$"
 
-OldaleTown_PokemonCenter_2F_Text_2780B3:: @ 82780B3
+gText_ConfirmLinkWhenPlayersReady:: @ 82780B3
 	.string "When all players are ready…\n"
 	.string "A Button: Confirm\l"
 	.string "B Button: Cancel$"
 
-OldaleTown_PokemonCenter_2F_Text_2780F2:: @ 82780F2
+gText_ConfirmStartLinkWithXPlayers:: @ 82780F2
 	.string "Start link with {STR_VAR_1} players.\n"
 	.string "A Button: Confirm\l"
 	.string "B Button: Cancel$"
 
-OldaleTown_PokemonCenter_2F_Text_278131:: @ 8278131
+gText_AwaitingLinkup:: @ 8278131
 	.string "Awaiting linkup…\n"
 	.string "… … B Button: Cancel$"
 
diff --git a/data/shop.s b/data/shop.s
index 58f294e6b..45ecbb585 100644
--- a/data/shop.s
+++ b/data/shop.s
@@ -53,9 +53,10 @@ gUnknown_08589AA8:: @ 8589AA8
 
 gUnknown_08589AB0:: @ 8589AB0
 	.byte 1, 2, 3
+	.byte 0, 2, 3
+	.byte 0, 3, 2
 
-gUnknown_08589AB3:: @ 8589AB3
-	.byte 0, 2, 3, 0, 3, 2, 0
+	.align 1
 
 gUnknown_08589ABA:: @ 8589ABA
 	.2byte 0x284, 0x282, 0x280
diff --git a/data/specials.inc b/data/specials.inc
index 5d31c425f..4d11cf304 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -259,7 +259,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_80F9490
 	def_special ValidateEReaderTrainer
 	def_special GetBestBattleTowerStreak
-	def_special sub_80F94E8
+	def_special ReducePlayerPartyToThree
 	def_special BedroomPC
 	def_special PlayerPC
 	def_special FieldShowRegionMap
@@ -415,7 +415,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_818E990
 	def_special PutLilycoveContestLadyShowOnTheAir
 	def_special sub_813B880
-	def_special sub_81A085C
+	def_special CallApprenticeFunction
 	def_special ShouldTryGetTrainerScript
 	def_special ShowMapNamePopup
 	def_special ShowMapNamePopup
author	garak <garakmon@gmail.com>	2018-10-16 14:31:45 -0400
committer	garak <garakmon@gmail.com>	2018-10-16 14:31:45 -0400
commit	0051947414df4656826a5ba0b252fdbb5fb0e065 (patch)
tree	4ac69544094baaa620b1e8556ddf79715db4fde3 /data
parent	72f9afcbf4a81909019f21acad0484b72ed217f6 (diff)
parent	ed1bb3030bae8b0d00a1fbb68ebd50f6376938ac (diff)