diff --git a/pokefirered.sym b/pokefirered.sym
index b0c36c5a9..4fb4d0b5b 100644
--- a/pokefirered.sym
+++ b/pokefirered.sym
@@ -25732,10 +25732,10 @@
 0823468b l 00000003 sTextColor2
 08234690 l 00000004 sBgTemplate
 08234694 l 00000003 sMenuCursorYMax
-08234698 g 00000020 gSpriteImages_BattlerPlayerLeft
-082346b8 g 00000020 gSpriteImages_BattlerOpponentLeft
-082346d8 g 00000020 gSpriteImages_BattlerPlayerRight
-082346f8 g 00000020 gSpriteImages_BattlerOpponentRight
+08234698 g 00000020 gBattlerPicTable_PlayerLeft
+082346b8 g 00000020 gBattlerPicTable_OpponentLeft
+082346d8 g 00000020 gBattlerPicTable_PlayerRight
+082346f8 g 00000020 gBattlerPicTable_OpponentRight
 08234718 g 00000028 gTrainerBackPicTable_Red
 08234740 g 00000028 gTrainerBackPicTable_Leaf
 08234768 g 00000020 gTrainerBackPicTable_Pokedude
@@ -25744,182 +25744,182 @@
 082347c8 g 00000020 gTrainerBackPicTable_RSMay
 082347e8 l 00000008 sAnim_GeneralFrame0
 082347f0 l 00000008 sAnim_GeneralFrame3
-082347f8 l 00000010 gSpriteAffineAnim_82347F8
-08234808 l 00000010 gSpriteAffineAnim_8234808
-08234818 l 00000018 gSpriteAffineAnim_8234818
-08234830 l 00000018 gSpriteAffineAnim_8234830
-08234848 l 00000020 gSpriteAffineAnim_8234848
-08234868 l 00000010 gSpriteAffineAnim_8234868
-08234878 l 00000010 gSpriteAffineAnim_8234878
-08234888 l 00000018 gSpriteAffineAnim_8234888
-082348a0 l 00000010 gSpriteAffineAnim_82348A0
-082348b0 l 00000018 gSpriteAffineAnim_82348B0
-082348c8 g 00000024 gSpriteAffineAnimTable_BattlerPlayer
-082348ec l 00000010 gSpriteAffineAnim_82348EC
-082348fc l 00000018 gSpriteAffineAnim_82348FC
-08234914 l 00000020 gSpriteAffineAnim_8234914
-08234934 l 00000010 gSpriteAffineAnim_8234934
-08234944 g 0000002c gSpriteAffineAnimTable_BattlerOpponent
-08234970 g 0000002c gSpriteAffineAnimTable_82349470
-0823499c l 00000008 gSpriteAnim_823499C
-082349a4 l 00000008 gSpriteAnim_82349A4
-082349ac l 00000008 gSpriteAnim_82349AC
-082349b4 l 00000008 gSpriteAnim_82349B4
-082349bc g 00000010 gSpriteAnimTable_82349BC
+082347f8 l 00000010 sAffineAnim_Battler_Normal
+08234808 l 00000010 sAffineAnim_Battler_Flipped
+08234818 l 00000018 sAffineAnim_Battler_Emerge
+08234830 l 00000018 sAffineAnim_Battler_Return
+08234848 l 00000020 sAffineAnim_Battler_HorizontalSquishLoop
+08234868 l 00000010 sAffineAnim_Battler_Grow
+08234878 l 00000010 sAffineAnim_Battler_Shrink
+08234888 l 00000018 sAffineAnim_Battler_BigToSmall
+082348a0 l 00000010 sAffineAnim_Battler_GrowLarge
+082348b0 l 00000018 sAffineAnim_Battler_TipRight
+082348c8 g 00000024 gAffineAnims_BattleSpritePlayerSide
+082348ec l 00000010 sAffineAnim_Battler_SpinShrink
+082348fc l 00000018 sAffineAnim_Battler_TipLeft
+08234914 l 00000020 sAffineAnim_Battler_RotateUpAndBack
+08234934 l 00000010 sAffineAnim_Battler_Spin
+08234944 g 0000002c gAffineAnims_BattleSpriteOpponentSide
+08234970 g 0000002c gAffineAnims_BattleSpriteContest
+0823499c l 00000008 sAnim_MonPic_0
+082349a4 l 00000008 sAnim_MonPic_1
+082349ac l 00000008 sAnim_MonPic_2
+082349b4 l 00000008 sAnim_MonPic_3
+082349bc g 00000010 gAnims_MonPic
 082349cc g 000006e0 gMonFrontPicCoords
 082350ac g 00000dc0 gMonFrontPicTable
 08235e6c g 000006e0 gMonBackPicCoords
 0823654c g 00000dc0 gMonBackPicTable
 0823730c g 00000dc0 gMonPaletteTable
 082380cc g 00000dc0 gMonShinyPaletteTable
-08238e8c l 00000004 sAnims_8238E8C
-08238e90 l 00000004 sAnims_8238E90
-08238e94 l 00000004 sAnims_8238E94
-08238e98 l 00000004 sAnims_8238E98
-08238e9c l 00000004 sAnims_8238E9C
-08238ea0 l 00000004 sAnims_8238EA0
-08238ea4 l 00000004 sAnims_8238EA4
-08238ea8 l 00000004 sAnims_8238EA8
-08238eac l 00000004 sAnims_8238EAC
-08238eb0 l 00000004 sAnims_8238EB0
-08238eb4 l 00000004 sAnims_8238EB4
-08238eb8 l 00000004 sAnims_8238EB8
-08238ebc l 00000004 sAnims_8238EBC
-08238ec0 l 00000004 sAnims_8238EC0
-08238ec4 l 00000004 sAnims_8238EC4
-08238ec8 l 00000004 sAnims_8238EC8
-08238ecc l 00000004 sAnims_8238ECC
-08238ed0 l 00000004 sAnims_8238ED0
-08238ed4 l 00000004 sAnims_8238ED4
-08238ed8 l 00000004 sAnims_8238ED8
-08238edc l 00000004 sAnims_8238EDC
-08238ee0 l 00000004 sAnims_8238EE0
-08238ee4 l 00000004 sAnims_8238EE4
-08238ee8 l 00000004 sAnims_8238EE8
-08238eec l 00000004 sAnims_8238EEC
-08238ef0 l 00000004 sAnims_8238EF0
-08238ef4 l 00000004 sAnims_8238EF4
-08238ef8 l 00000004 sAnims_8238EF8
-08238efc l 00000004 sAnims_8238EFC
-08238f00 l 00000004 sAnims_8238F00
-08238f04 l 00000004 sAnims_8238F04
-08238f08 l 00000004 sAnims_8238F08
-08238f0c l 00000004 sAnims_8238F0C
-08238f10 l 00000004 sAnims_8238F10
-08238f14 l 00000004 sAnims_8238F14
-08238f18 l 00000004 sAnims_8238F18
-08238f1c l 00000004 sAnims_8238F1C
-08238f20 l 00000004 sAnims_8238F20
-08238f24 l 00000004 sAnims_8238F24
-08238f28 l 00000004 sAnims_8238F28
-08238f2c l 00000004 sAnims_8238F2C
-08238f30 l 00000004 sAnims_8238F30
-08238f34 l 00000004 sAnims_8238F34
-08238f38 l 00000004 sAnims_8238F38
-08238f3c l 00000004 sAnims_8238F3C
-08238f40 l 00000004 sAnims_8238F40
-08238f44 l 00000004 sAnims_8238F44
-08238f48 l 00000004 sAnims_8238F48
-08238f4c l 00000004 sAnims_8238F4C
-08238f50 l 00000004 sAnims_8238F50
-08238f54 l 00000004 sAnims_8238F54
-08238f58 l 00000004 sAnims_8238F58
-08238f5c l 00000004 sAnims_8238F5C
-08238f60 l 00000004 sAnims_8238F60
-08238f64 l 00000004 sAnims_8238F64
-08238f68 l 00000004 sAnims_8238F68
-08238f6c l 00000004 sAnims_8238F6C
-08238f70 l 00000004 sAnims_8238F70
-08238f74 l 00000004 sAnims_8238F74
-08238f78 l 00000004 sAnims_8238F78
-08238f7c l 00000004 sAnims_8238F7C
-08238f80 l 00000004 sAnims_8238F80
-08238f84 l 00000004 sAnims_8238F84
-08238f88 l 00000004 sAnims_8238F88
-08238f8c l 00000004 sAnims_8238F8C
-08238f90 l 00000004 sAnims_8238F90
-08238f94 l 00000004 sAnims_8238F94
-08238f98 l 00000004 sAnims_8238F98
-08238f9c l 00000004 sAnims_8238F9C
-08238fa0 l 00000004 sAnims_8238FA0
-08238fa4 l 00000004 sAnims_8238FA4
-08238fa8 l 00000004 sAnims_8238FA8
-08238fac l 00000004 sAnims_8238FAC
-08238fb0 l 00000004 sAnims_8238FB0
-08238fb4 l 00000004 sAnims_8238FB4
-08238fb8 l 00000004 sAnims_8238FB8
-08238fbc l 00000004 sAnims_8238FBC
-08238fc0 l 00000004 sAnims_8238FC0
-08238fc4 l 00000004 sAnims_8238FC4
-08238fc8 l 00000004 sAnims_8238FC8
-08238fcc l 00000004 sAnims_8238FCC
-08238fd0 l 00000004 sAnims_8238FD0
-08238fd4 l 00000004 sAnims_8238FD4
-08238fd8 l 00000004 sAnims_8238FD8
-08238fdc l 00000004 sAnims_8238FDC
-08238fe0 l 00000004 sAnims_8238FE0
-08238fe4 l 00000004 sAnims_8238FE4
-08238fe8 l 00000004 sAnims_8238FE8
-08238fec l 00000004 sAnims_8238FEC
-08238ff0 l 00000004 sAnims_8238FF0
-08238ff4 l 00000004 sAnims_8238FF4
-08238ff8 l 00000004 sAnims_8238FF8
-08238ffc l 00000004 sAnims_8238FFC
-08239000 l 00000004 sAnims_8239000
-08239004 l 00000004 sAnims_8239004
-08239008 l 00000004 sAnims_8239008
-0823900c l 00000004 sAnims_823900C
-08239010 l 00000004 sAnims_8239010
-08239014 l 00000004 sAnims_8239014
-08239018 l 00000004 sAnims_8239018
-0823901c l 00000004 sAnims_823901C
-08239020 l 00000004 sAnims_8239020
-08239024 l 00000004 sAnims_8239024
-08239028 l 00000004 sAnims_8239028
-0823902c l 00000004 sAnims_823902C
-08239030 l 00000004 sAnims_8239030
-08239034 l 00000004 sAnims_8239034
-08239038 l 00000004 sAnims_8239038
-0823903c l 00000004 sAnims_823903C
-08239040 l 00000004 sAnims_8239040
-08239044 l 00000004 sAnims_8239044
-08239048 l 00000004 sAnims_8239048
-0823904c l 00000004 sAnims_823904C
-08239050 l 00000004 sAnims_8239050
-08239054 l 00000004 sAnims_8239054
-08239058 l 00000004 sAnims_8239058
-0823905c l 00000004 sAnims_823905C
-08239060 l 00000004 sAnims_8239060
-08239064 l 00000004 sAnims_8239064
-08239068 l 00000004 sAnims_8239068
-0823906c l 00000004 sAnims_823906C
-08239070 l 00000004 sAnims_8239070
-08239074 l 00000004 sAnims_8239074
-08239078 l 00000004 sAnims_8239078
-0823907c l 00000004 sAnims_823907C
-08239080 l 00000004 sAnims_8239080
-08239084 l 00000004 sAnims_8239084
-08239088 l 00000004 sAnims_8239088
-0823908c l 00000004 sAnims_823908C
-08239090 l 00000004 sAnims_8239090
-08239094 l 00000004 sAnims_8239094
-08239098 l 00000004 sAnims_8239098
-0823909c l 00000004 sAnims_823909C
-082390a0 l 00000004 sAnims_82390A0
-082390a4 l 00000004 sAnims_82390A4
-082390a8 l 00000004 sAnims_82390A8
-082390ac l 00000004 sAnims_82390AC
-082390b0 l 00000004 sAnims_82390B0
-082390b4 l 00000004 sAnims_82390B4
-082390b8 l 00000004 sAnims_82390B8
-082390bc l 00000004 sAnims_82390BC
-082390c0 l 00000004 sAnims_82390C0
-082390c4 l 00000004 sAnims_82390C4
-082390c8 l 00000004 sAnims_82390C8
-082390cc l 00000004 sAnims_82390CC
-082390d0 l 00000004 sAnims_82390D0
-082390d4 l 00000004 sAnims_82390D4
-082390d8 l 00000004 sAnims_82390D8
+08238e8c l 00000004 sAnims_AquaLeaderArchie
+08238e90 l 00000004 sAnims_AquaGruntM
+08238e94 l 00000004 sAnims_AquaGruntF
+08238e98 l 00000004 sAnims_RSAromaLady
+08238e9c l 00000004 sAnims_RSRuinManiac
+08238ea0 l 00000004 sAnims_Interviewer
+08238ea4 l 00000004 sAnims_RSTuberF
+08238ea8 l 00000004 sAnims_RSTuberM
+08238eac l 00000004 sAnims_RSCooltrainerM
+08238eb0 l 00000004 sAnims_RSCooltrainerF
+08238eb4 l 00000004 sAnims_HexManiac
+08238eb8 l 00000004 sAnims_RSLady
+08238ebc l 00000004 sAnims_RSBeauty
+08238ec0 l 00000004 sAnims_RichBoy
+08238ec4 l 00000004 sAnims_RSPokemaniac
+08238ec8 l 00000004 sAnims_RSSwimmerM
+08238ecc l 00000004 sAnims_RSBlackBelt
+08238ed0 l 00000004 sAnims_Guitarist
+08238ed4 l 00000004 sAnims_Kindler
+08238ed8 l 00000004 sAnims_RSCamper
+08238edc l 00000004 sAnims_BugManiac
+08238ee0 l 00000004 sAnims_RSPsychicM
+08238ee4 l 00000004 sAnims_RSPsychicF
+08238ee8 l 00000004 sAnims_RSGentleman
+08238eec l 00000004 sAnims_EliteFourSidney
+08238ef0 l 00000004 sAnims_EliteFourPhoebe
+08238ef4 l 00000004 sAnims_LeaderRoxanne
+08238ef8 l 00000004 sAnims_LeaderBrawly
+08238efc l 00000004 sAnims_LeaderTateAndLiza
+08238f00 l 00000004 sAnims_SchoolKidM
+08238f04 l 00000004 sAnims_SchoolKidF
+08238f08 l 00000004 sAnims_SrAndJr
+08238f0c l 00000004 sAnims_PokefanM
+08238f10 l 00000004 sAnims_PokefanF
+08238f14 l 00000004 sAnims_ExpertM
+08238f18 l 00000004 sAnims_ExpertF
+08238f1c l 00000004 sAnims_RSYoungster
+08238f20 l 00000004 sAnims_ChampionSteven
+08238f24 l 00000004 sAnims_RSFisherman
+08238f28 l 00000004 sAnims_CyclingTriathleteM
+08238f2c l 00000004 sAnims_CyclingTriathleteF
+08238f30 l 00000004 sAnims_RunningTriathleteM
+08238f34 l 00000004 sAnims_RunningTriathleteF
+08238f38 l 00000004 sAnims_SwimmingTriathleteM
+08238f3c l 00000004 sAnims_SwimmingTriathleteF
+08238f40 l 00000004 sAnims_DragonTamer
+08238f44 l 00000004 sAnims_RSBirdKeeper
+08238f48 l 00000004 sAnims_NinjaBoy
+08238f4c l 00000004 sAnims_BattleGirl
+08238f50 l 00000004 sAnims_ParasolLady
+08238f54 l 00000004 sAnims_RSSwimmerF
+08238f58 l 00000004 sAnims_RSPicnicker
+08238f5c l 00000004 sAnims_RSTwins
+08238f60 l 00000004 sAnims_RSSailor
+08238f64 l 00000004 sAnims_Collector
+08238f68 l 00000004 sAnims_Wally
+08238f6c l 00000004 sAnims_RSBrendan1
+08238f70 l 00000004 sAnims_RSMay1
+08238f74 l 00000004 sAnims_RSPokemonBreederM
+08238f78 l 00000004 sAnims_RSPokemonBreederF
+08238f7c l 00000004 sAnims_RSPokemonRangerM
+08238f80 l 00000004 sAnims_RSPokemonRangerF
+08238f84 l 00000004 sAnims_MagmaLeaderMaxie
+08238f88 l 00000004 sAnims_MagmaGruntM
+08238f8c l 00000004 sAnims_MagmaGruntF
+08238f90 l 00000004 sAnims_RSLass
+08238f94 l 00000004 sAnims_RSBugCatcher
+08238f98 l 00000004 sAnims_RSHiker
+08238f9c l 00000004 sAnims_RSYoungCouple
+08238fa0 l 00000004 sAnims_OldCouple
+08238fa4 l 00000004 sAnims_RSSisAndBro
+08238fa8 l 00000004 sAnims_AquaAdminM
+08238fac l 00000004 sAnims_AquaAdminF
+08238fb0 l 00000004 sAnims_MagmaAdminM
+08238fb4 l 00000004 sAnims_MagmaAdminF
+08238fb8 l 00000004 sAnims_LeaderWattson
+08238fbc l 00000004 sAnims_LeaderFlannery
+08238fc0 l 00000004 sAnims_LeaderNorman
+08238fc4 l 00000004 sAnims_LeaderWinona
+08238fc8 l 00000004 sAnims_LeaderWallace
+08238fcc l 00000004 sAnims_EliteFourGlacia
+08238fd0 l 00000004 sAnims_EliteFourDrake
+08238fd4 l 00000004 sAnims_Youngster
+08238fd8 l 00000004 sAnims_BugCatcher
+08238fdc l 00000004 sAnims_Lass
+08238fe0 l 00000004 sAnims_Sailor
+08238fe4 l 00000004 sAnims_Camper
+08238fe8 l 00000004 sAnims_Picnicker
+08238fec l 00000004 sAnims_Pokemaniac
+08238ff0 l 00000004 sAnims_SuperNerd
+08238ff4 l 00000004 sAnims_Hiker
+08238ff8 l 00000004 sAnims_Biker
+08238ffc l 00000004 sAnims_Burglar
+08239000 l 00000004 sAnims_Engineer
+08239004 l 00000004 sAnims_Fisherman
+08239008 l 00000004 sAnims_SwimmerM
+0823900c l 00000004 sAnims_CueBall
+08239010 l 00000004 sAnims_Gamer
+08239014 l 00000004 sAnims_Beauty
+08239018 l 00000004 sAnims_SwimmerF
+0823901c l 00000004 sAnims_PsychicM
+08239020 l 00000004 sAnims_Rocker
+08239024 l 00000004 sAnims_Juggler
+08239028 l 00000004 sAnims_Tamer
+0823902c l 00000004 sAnims_BirdKeeper
+08239030 l 00000004 sAnims_BlackBelt
+08239034 l 00000004 sAnims_RivalEarly
+08239038 l 00000004 sAnims_Scientist
+0823903c l 00000004 sAnims_LeaderGiovanni
+08239040 l 00000004 sAnims_RocketGruntM
+08239044 l 00000004 sAnims_CooltrainerM
+08239048 l 00000004 sAnims_CooltrainerF
+0823904c l 00000004 sAnims_EliteFourLorelei
+08239050 l 00000004 sAnims_EliteFourBruno
+08239054 l 00000004 sAnims_EliteFourAgatha
+08239058 l 00000004 sAnims_EliteFourLance
+0823905c l 00000004 sAnims_LeaderBrock
+08239060 l 00000004 sAnims_LeaderMisty
+08239064 l 00000004 sAnims_LeaderLtSurge
+08239068 l 00000004 sAnims_LeaderErika
+0823906c l 00000004 sAnims_LeaderKoga
+08239070 l 00000004 sAnims_LeaderBlaine
+08239074 l 00000004 sAnims_LeaderSabrina
+08239078 l 00000004 sAnims_Gentleman
+0823907c l 00000004 sAnims_RivalLate
+08239080 l 00000004 sAnims_ChampionRival
+08239084 l 00000004 sAnims_Channeler
+08239088 l 00000004 sAnims_Twins
+0823908c l 00000004 sAnims_CoolCouple
+08239090 l 00000004 sAnims_YoungCouple
+08239094 l 00000004 sAnims_CrushKin
+08239098 l 00000004 sAnims_SisAndBro
+0823909c l 00000004 sAnims_ProfessorOak
+082390a0 l 00000004 sAnims_RSBrendan2
+082390a4 l 00000004 sAnims_RSMay2
+082390a8 l 00000004 sAnims_Red
+082390ac l 00000004 sAnims_Leaf
+082390b0 l 00000004 sAnims_RocketGruntF
+082390b4 l 00000004 sAnims_PsychicF
+082390b8 l 00000004 sAnims_CrushGirl
+082390bc l 00000004 sAnims_TuberF
+082390c0 l 00000004 sAnims_PokemonBreeder
+082390c4 l 00000004 sAnims_PokemonRangerM
+082390c8 l 00000004 sAnims_PokemonRangerF
+082390cc l 00000004 sAnims_AromaLady
+082390d0 l 00000004 sAnims_RuinManiac
+082390d4 l 00000004 sAnims_Lady
+082390d8 l 00000004 sAnims_Painter
 082390dc g 00000250 gTrainerFrontAnimsPtrTable
 0823932c g 00000250 gTrainerFrontPicCoords
 0823957c g 000004a0 gTrainerFrontPicTable
diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym
index ec2b78d38..1812e65d8 100644
--- a/pokefirered_rev1.sym
+++ b/pokefirered_rev1.sym
@@ -25733,10 +25733,10 @@
 082346fb l 00000003 sTextColor2
 08234700 l 00000004 sBgTemplate
 08234704 l 00000003 sMenuCursorYMax
-08234708 g 00000020 gSpriteImages_BattlerPlayerLeft
-08234728 g 00000020 gSpriteImages_BattlerOpponentLeft
-08234748 g 00000020 gSpriteImages_BattlerPlayerRight
-08234768 g 00000020 gSpriteImages_BattlerOpponentRight
+08234708 g 00000020 gBattlerPicTable_PlayerLeft
+08234728 g 00000020 gBattlerPicTable_OpponentLeft
+08234748 g 00000020 gBattlerPicTable_PlayerRight
+08234768 g 00000020 gBattlerPicTable_OpponentRight
 08234788 g 00000028 gTrainerBackPicTable_Red
 082347b0 g 00000028 gTrainerBackPicTable_Leaf
 082347d8 g 00000020 gTrainerBackPicTable_Pokedude
@@ -25745,182 +25745,182 @@
 08234838 g 00000020 gTrainerBackPicTable_RSMay
 08234858 l 00000008 sAnim_GeneralFrame0
 08234860 l 00000008 sAnim_GeneralFrame3
-08234868 l 00000010 gSpriteAffineAnim_82347F8
-08234878 l 00000010 gSpriteAffineAnim_8234808
-08234888 l 00000018 gSpriteAffineAnim_8234818
-082348a0 l 00000018 gSpriteAffineAnim_8234830
-082348b8 l 00000020 gSpriteAffineAnim_8234848
-082348d8 l 00000010 gSpriteAffineAnim_8234868
-082348e8 l 00000010 gSpriteAffineAnim_8234878
-082348f8 l 00000018 gSpriteAffineAnim_8234888
-08234910 l 00000010 gSpriteAffineAnim_82348A0
-08234920 l 00000018 gSpriteAffineAnim_82348B0
-08234938 g 00000024 gSpriteAffineAnimTable_BattlerPlayer
-0823495c l 00000010 gSpriteAffineAnim_82348EC
-0823496c l 00000018 gSpriteAffineAnim_82348FC
-08234984 l 00000020 gSpriteAffineAnim_8234914
-082349a4 l 00000010 gSpriteAffineAnim_8234934
-082349b4 g 0000002c gSpriteAffineAnimTable_BattlerOpponent
-082349e0 g 0000002c gSpriteAffineAnimTable_82349470
-08234a0c l 00000008 gSpriteAnim_823499C
-08234a14 l 00000008 gSpriteAnim_82349A4
-08234a1c l 00000008 gSpriteAnim_82349AC
-08234a24 l 00000008 gSpriteAnim_82349B4
-08234a2c g 00000010 gSpriteAnimTable_82349BC
+08234868 l 00000010 sAffineAnim_Battler_Normal
+08234878 l 00000010 sAffineAnim_Battler_Flipped
+08234888 l 00000018 sAffineAnim_Battler_Emerge
+082348a0 l 00000018 sAffineAnim_Battler_Return
+082348b8 l 00000020 sAffineAnim_Battler_HorizontalSquishLoop
+082348d8 l 00000010 sAffineAnim_Battler_Grow
+082348e8 l 00000010 sAffineAnim_Battler_Shrink
+082348f8 l 00000018 sAffineAnim_Battler_BigToSmall
+08234910 l 00000010 sAffineAnim_Battler_GrowLarge
+08234920 l 00000018 sAffineAnim_Battler_TipRight
+08234938 g 00000024 gAffineAnims_BattleSpritePlayerSide
+0823495c l 00000010 sAffineAnim_Battler_SpinShrink
+0823496c l 00000018 sAffineAnim_Battler_TipLeft
+08234984 l 00000020 sAffineAnim_Battler_RotateUpAndBack
+082349a4 l 00000010 sAffineAnim_Battler_Spin
+082349b4 g 0000002c gAffineAnims_BattleSpriteOpponentSide
+082349e0 g 0000002c gAffineAnims_BattleSpriteContest
+08234a0c l 00000008 sAnim_MonPic_0
+08234a14 l 00000008 sAnim_MonPic_1
+08234a1c l 00000008 sAnim_MonPic_2
+08234a24 l 00000008 sAnim_MonPic_3
+08234a2c g 00000010 gAnims_MonPic
 08234a3c g 000006e0 gMonFrontPicCoords
 0823511c g 00000dc0 gMonFrontPicTable
 08235edc g 000006e0 gMonBackPicCoords
 082365bc g 00000dc0 gMonBackPicTable
 0823737c g 00000dc0 gMonPaletteTable
 0823813c g 00000dc0 gMonShinyPaletteTable
-08238efc l 00000004 sAnims_8238E8C
-08238f00 l 00000004 sAnims_8238E90
-08238f04 l 00000004 sAnims_8238E94
-08238f08 l 00000004 sAnims_8238E98
-08238f0c l 00000004 sAnims_8238E9C
-08238f10 l 00000004 sAnims_8238EA0
-08238f14 l 00000004 sAnims_8238EA4
-08238f18 l 00000004 sAnims_8238EA8
-08238f1c l 00000004 sAnims_8238EAC
-08238f20 l 00000004 sAnims_8238EB0
-08238f24 l 00000004 sAnims_8238EB4
-08238f28 l 00000004 sAnims_8238EB8
-08238f2c l 00000004 sAnims_8238EBC
-08238f30 l 00000004 sAnims_8238EC0
-08238f34 l 00000004 sAnims_8238EC4
-08238f38 l 00000004 sAnims_8238EC8
-08238f3c l 00000004 sAnims_8238ECC
-08238f40 l 00000004 sAnims_8238ED0
-08238f44 l 00000004 sAnims_8238ED4
-08238f48 l 00000004 sAnims_8238ED8
-08238f4c l 00000004 sAnims_8238EDC
-08238f50 l 00000004 sAnims_8238EE0
-08238f54 l 00000004 sAnims_8238EE4
-08238f58 l 00000004 sAnims_8238EE8
-08238f5c l 00000004 sAnims_8238EEC
-08238f60 l 00000004 sAnims_8238EF0
-08238f64 l 00000004 sAnims_8238EF4
-08238f68 l 00000004 sAnims_8238EF8
-08238f6c l 00000004 sAnims_8238EFC
-08238f70 l 00000004 sAnims_8238F00
-08238f74 l 00000004 sAnims_8238F04
-08238f78 l 00000004 sAnims_8238F08
-08238f7c l 00000004 sAnims_8238F0C
-08238f80 l 00000004 sAnims_8238F10
-08238f84 l 00000004 sAnims_8238F14
-08238f88 l 00000004 sAnims_8238F18
-08238f8c l 00000004 sAnims_8238F1C
-08238f90 l 00000004 sAnims_8238F20
-08238f94 l 00000004 sAnims_8238F24
-08238f98 l 00000004 sAnims_8238F28
-08238f9c l 00000004 sAnims_8238F2C
-08238fa0 l 00000004 sAnims_8238F30
-08238fa4 l 00000004 sAnims_8238F34
-08238fa8 l 00000004 sAnims_8238F38
-08238fac l 00000004 sAnims_8238F3C
-08238fb0 l 00000004 sAnims_8238F40
-08238fb4 l 00000004 sAnims_8238F44
-08238fb8 l 00000004 sAnims_8238F48
-08238fbc l 00000004 sAnims_8238F4C
-08238fc0 l 00000004 sAnims_8238F50
-08238fc4 l 00000004 sAnims_8238F54
-08238fc8 l 00000004 sAnims_8238F58
-08238fcc l 00000004 sAnims_8238F5C
-08238fd0 l 00000004 sAnims_8238F60
-08238fd4 l 00000004 sAnims_8238F64
-08238fd8 l 00000004 sAnims_8238F68
-08238fdc l 00000004 sAnims_8238F6C
-08238fe0 l 00000004 sAnims_8238F70
-08238fe4 l 00000004 sAnims_8238F74
-08238fe8 l 00000004 sAnims_8238F78
-08238fec l 00000004 sAnims_8238F7C
-08238ff0 l 00000004 sAnims_8238F80
-08238ff4 l 00000004 sAnims_8238F84
-08238ff8 l 00000004 sAnims_8238F88
-08238ffc l 00000004 sAnims_8238F8C
-08239000 l 00000004 sAnims_8238F90
-08239004 l 00000004 sAnims_8238F94
-08239008 l 00000004 sAnims_8238F98
-0823900c l 00000004 sAnims_8238F9C
-08239010 l 00000004 sAnims_8238FA0
-08239014 l 00000004 sAnims_8238FA4
-08239018 l 00000004 sAnims_8238FA8
-0823901c l 00000004 sAnims_8238FAC
-08239020 l 00000004 sAnims_8238FB0
-08239024 l 00000004 sAnims_8238FB4
-08239028 l 00000004 sAnims_8238FB8
-0823902c l 00000004 sAnims_8238FBC
-08239030 l 00000004 sAnims_8238FC0
-08239034 l 00000004 sAnims_8238FC4
-08239038 l 00000004 sAnims_8238FC8
-0823903c l 00000004 sAnims_8238FCC
-08239040 l 00000004 sAnims_8238FD0
-08239044 l 00000004 sAnims_8238FD4
-08239048 l 00000004 sAnims_8238FD8
-0823904c l 00000004 sAnims_8238FDC
-08239050 l 00000004 sAnims_8238FE0
-08239054 l 00000004 sAnims_8238FE4
-08239058 l 00000004 sAnims_8238FE8
-0823905c l 00000004 sAnims_8238FEC
-08239060 l 00000004 sAnims_8238FF0
-08239064 l 00000004 sAnims_8238FF4
-08239068 l 00000004 sAnims_8238FF8
-0823906c l 00000004 sAnims_8238FFC
-08239070 l 00000004 sAnims_8239000
-08239074 l 00000004 sAnims_8239004
-08239078 l 00000004 sAnims_8239008
-0823907c l 00000004 sAnims_823900C
-08239080 l 00000004 sAnims_8239010
-08239084 l 00000004 sAnims_8239014
-08239088 l 00000004 sAnims_8239018
-0823908c l 00000004 sAnims_823901C
-08239090 l 00000004 sAnims_8239020
-08239094 l 00000004 sAnims_8239024
-08239098 l 00000004 sAnims_8239028
-0823909c l 00000004 sAnims_823902C
-082390a0 l 00000004 sAnims_8239030
-082390a4 l 00000004 sAnims_8239034
-082390a8 l 00000004 sAnims_8239038
-082390ac l 00000004 sAnims_823903C
-082390b0 l 00000004 sAnims_8239040
-082390b4 l 00000004 sAnims_8239044
-082390b8 l 00000004 sAnims_8239048
-082390bc l 00000004 sAnims_823904C
-082390c0 l 00000004 sAnims_8239050
-082390c4 l 00000004 sAnims_8239054
-082390c8 l 00000004 sAnims_8239058
-082390cc l 00000004 sAnims_823905C
-082390d0 l 00000004 sAnims_8239060
-082390d4 l 00000004 sAnims_8239064
-082390d8 l 00000004 sAnims_8239068
-082390dc l 00000004 sAnims_823906C
-082390e0 l 00000004 sAnims_8239070
-082390e4 l 00000004 sAnims_8239074
-082390e8 l 00000004 sAnims_8239078
-082390ec l 00000004 sAnims_823907C
-082390f0 l 00000004 sAnims_8239080
-082390f4 l 00000004 sAnims_8239084
-082390f8 l 00000004 sAnims_8239088
-082390fc l 00000004 sAnims_823908C
-08239100 l 00000004 sAnims_8239090
-08239104 l 00000004 sAnims_8239094
-08239108 l 00000004 sAnims_8239098
-0823910c l 00000004 sAnims_823909C
-08239110 l 00000004 sAnims_82390A0
-08239114 l 00000004 sAnims_82390A4
-08239118 l 00000004 sAnims_82390A8
-0823911c l 00000004 sAnims_82390AC
-08239120 l 00000004 sAnims_82390B0
-08239124 l 00000004 sAnims_82390B4
-08239128 l 00000004 sAnims_82390B8
-0823912c l 00000004 sAnims_82390BC
-08239130 l 00000004 sAnims_82390C0
-08239134 l 00000004 sAnims_82390C4
-08239138 l 00000004 sAnims_82390C8
-0823913c l 00000004 sAnims_82390CC
-08239140 l 00000004 sAnims_82390D0
-08239144 l 00000004 sAnims_82390D4
-08239148 l 00000004 sAnims_82390D8
+08238efc l 00000004 sAnims_AquaLeaderArchie
+08238f00 l 00000004 sAnims_AquaGruntM
+08238f04 l 00000004 sAnims_AquaGruntF
+08238f08 l 00000004 sAnims_RSAromaLady
+08238f0c l 00000004 sAnims_RSRuinManiac
+08238f10 l 00000004 sAnims_Interviewer
+08238f14 l 00000004 sAnims_RSTuberF
+08238f18 l 00000004 sAnims_RSTuberM
+08238f1c l 00000004 sAnims_RSCooltrainerM
+08238f20 l 00000004 sAnims_RSCooltrainerF
+08238f24 l 00000004 sAnims_HexManiac
+08238f28 l 00000004 sAnims_RSLady
+08238f2c l 00000004 sAnims_RSBeauty
+08238f30 l 00000004 sAnims_RichBoy
+08238f34 l 00000004 sAnims_RSPokemaniac
+08238f38 l 00000004 sAnims_RSSwimmerM
+08238f3c l 00000004 sAnims_RSBlackBelt
+08238f40 l 00000004 sAnims_Guitarist
+08238f44 l 00000004 sAnims_Kindler
+08238f48 l 00000004 sAnims_RSCamper
+08238f4c l 00000004 sAnims_BugManiac
+08238f50 l 00000004 sAnims_RSPsychicM
+08238f54 l 00000004 sAnims_RSPsychicF
+08238f58 l 00000004 sAnims_RSGentleman
+08238f5c l 00000004 sAnims_EliteFourSidney
+08238f60 l 00000004 sAnims_EliteFourPhoebe
+08238f64 l 00000004 sAnims_LeaderRoxanne
+08238f68 l 00000004 sAnims_LeaderBrawly
+08238f6c l 00000004 sAnims_LeaderTateAndLiza
+08238f70 l 00000004 sAnims_SchoolKidM
+08238f74 l 00000004 sAnims_SchoolKidF
+08238f78 l 00000004 sAnims_SrAndJr
+08238f7c l 00000004 sAnims_PokefanM
+08238f80 l 00000004 sAnims_PokefanF
+08238f84 l 00000004 sAnims_ExpertM
+08238f88 l 00000004 sAnims_ExpertF
+08238f8c l 00000004 sAnims_RSYoungster
+08238f90 l 00000004 sAnims_ChampionSteven
+08238f94 l 00000004 sAnims_RSFisherman
+08238f98 l 00000004 sAnims_CyclingTriathleteM
+08238f9c l 00000004 sAnims_CyclingTriathleteF
+08238fa0 l 00000004 sAnims_RunningTriathleteM
+08238fa4 l 00000004 sAnims_RunningTriathleteF
+08238fa8 l 00000004 sAnims_SwimmingTriathleteM
+08238fac l 00000004 sAnims_SwimmingTriathleteF
+08238fb0 l 00000004 sAnims_DragonTamer
+08238fb4 l 00000004 sAnims_RSBirdKeeper
+08238fb8 l 00000004 sAnims_NinjaBoy
+08238fbc l 00000004 sAnims_BattleGirl
+08238fc0 l 00000004 sAnims_ParasolLady
+08238fc4 l 00000004 sAnims_RSSwimmerF
+08238fc8 l 00000004 sAnims_RSPicnicker
+08238fcc l 00000004 sAnims_RSTwins
+08238fd0 l 00000004 sAnims_RSSailor
+08238fd4 l 00000004 sAnims_Collector
+08238fd8 l 00000004 sAnims_Wally
+08238fdc l 00000004 sAnims_RSBrendan1
+08238fe0 l 00000004 sAnims_RSMay1
+08238fe4 l 00000004 sAnims_RSPokemonBreederM
+08238fe8 l 00000004 sAnims_RSPokemonBreederF
+08238fec l 00000004 sAnims_RSPokemonRangerM
+08238ff0 l 00000004 sAnims_RSPokemonRangerF
+08238ff4 l 00000004 sAnims_MagmaLeaderMaxie
+08238ff8 l 00000004 sAnims_MagmaGruntM
+08238ffc l 00000004 sAnims_MagmaGruntF
+08239000 l 00000004 sAnims_RSLass
+08239004 l 00000004 sAnims_RSBugCatcher
+08239008 l 00000004 sAnims_RSHiker
+0823900c l 00000004 sAnims_RSYoungCouple
+08239010 l 00000004 sAnims_OldCouple
+08239014 l 00000004 sAnims_RSSisAndBro
+08239018 l 00000004 sAnims_AquaAdminM
+0823901c l 00000004 sAnims_AquaAdminF
+08239020 l 00000004 sAnims_MagmaAdminM
+08239024 l 00000004 sAnims_MagmaAdminF
+08239028 l 00000004 sAnims_LeaderWattson
+0823902c l 00000004 sAnims_LeaderFlannery
+08239030 l 00000004 sAnims_LeaderNorman
+08239034 l 00000004 sAnims_LeaderWinona
+08239038 l 00000004 sAnims_LeaderWallace
+0823903c l 00000004 sAnims_EliteFourGlacia
+08239040 l 00000004 sAnims_EliteFourDrake
+08239044 l 00000004 sAnims_Youngster
+08239048 l 00000004 sAnims_BugCatcher
+0823904c l 00000004 sAnims_Lass
+08239050 l 00000004 sAnims_Sailor
+08239054 l 00000004 sAnims_Camper
+08239058 l 00000004 sAnims_Picnicker
+0823905c l 00000004 sAnims_Pokemaniac
+08239060 l 00000004 sAnims_SuperNerd
+08239064 l 00000004 sAnims_Hiker
+08239068 l 00000004 sAnims_Biker
+0823906c l 00000004 sAnims_Burglar
+08239070 l 00000004 sAnims_Engineer
+08239074 l 00000004 sAnims_Fisherman
+08239078 l 00000004 sAnims_SwimmerM
+0823907c l 00000004 sAnims_CueBall
+08239080 l 00000004 sAnims_Gamer
+08239084 l 00000004 sAnims_Beauty
+08239088 l 00000004 sAnims_SwimmerF
+0823908c l 00000004 sAnims_PsychicM
+08239090 l 00000004 sAnims_Rocker
+08239094 l 00000004 sAnims_Juggler
+08239098 l 00000004 sAnims_Tamer
+0823909c l 00000004 sAnims_BirdKeeper
+082390a0 l 00000004 sAnims_BlackBelt
+082390a4 l 00000004 sAnims_RivalEarly
+082390a8 l 00000004 sAnims_Scientist
+082390ac l 00000004 sAnims_LeaderGiovanni
+082390b0 l 00000004 sAnims_RocketGruntM
+082390b4 l 00000004 sAnims_CooltrainerM
+082390b8 l 00000004 sAnims_CooltrainerF
+082390bc l 00000004 sAnims_EliteFourLorelei
+082390c0 l 00000004 sAnims_EliteFourBruno
+082390c4 l 00000004 sAnims_EliteFourAgatha
+082390c8 l 00000004 sAnims_EliteFourLance
+082390cc l 00000004 sAnims_LeaderBrock
+082390d0 l 00000004 sAnims_LeaderMisty
+082390d4 l 00000004 sAnims_LeaderLtSurge
+082390d8 l 00000004 sAnims_LeaderErika
+082390dc l 00000004 sAnims_LeaderKoga
+082390e0 l 00000004 sAnims_LeaderBlaine
+082390e4 l 00000004 sAnims_LeaderSabrina
+082390e8 l 00000004 sAnims_Gentleman
+082390ec l 00000004 sAnims_RivalLate
+082390f0 l 00000004 sAnims_ChampionRival
+082390f4 l 00000004 sAnims_Channeler
+082390f8 l 00000004 sAnims_Twins
+082390fc l 00000004 sAnims_CoolCouple
+08239100 l 00000004 sAnims_YoungCouple
+08239104 l 00000004 sAnims_CrushKin
+08239108 l 00000004 sAnims_SisAndBro
+0823910c l 00000004 sAnims_ProfessorOak
+08239110 l 00000004 sAnims_RSBrendan2
+08239114 l 00000004 sAnims_RSMay2
+08239118 l 00000004 sAnims_Red
+0823911c l 00000004 sAnims_Leaf
+08239120 l 00000004 sAnims_RocketGruntF
+08239124 l 00000004 sAnims_PsychicF
+08239128 l 00000004 sAnims_CrushGirl
+0823912c l 00000004 sAnims_TuberF
+08239130 l 00000004 sAnims_PokemonBreeder
+08239134 l 00000004 sAnims_PokemonRangerM
+08239138 l 00000004 sAnims_PokemonRangerF
+0823913c l 00000004 sAnims_AromaLady
+08239140 l 00000004 sAnims_RuinManiac
+08239144 l 00000004 sAnims_Lady
+08239148 l 00000004 sAnims_Painter
 0823914c g 00000250 gTrainerFrontAnimsPtrTable
 0823939c g 00000250 gTrainerFrontPicCoords
 082395ec g 000004a0 gTrainerFrontPicTable
diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym
index c26b02eec..f8ba8ee78 100644
--- a/pokeleafgreen.sym
+++ b/pokeleafgreen.sym
@@ -25734,10 +25734,10 @@
 08234667 l 00000003 sTextColor2
 0823466c l 00000004 sBgTemplate
 08234670 l 00000003 sMenuCursorYMax
-08234674 g 00000020 gSpriteImages_BattlerPlayerLeft
-08234694 g 00000020 gSpriteImages_BattlerOpponentLeft
-082346b4 g 00000020 gSpriteImages_BattlerPlayerRight
-082346d4 g 00000020 gSpriteImages_BattlerOpponentRight
+08234674 g 00000020 gBattlerPicTable_PlayerLeft
+08234694 g 00000020 gBattlerPicTable_OpponentLeft
+082346b4 g 00000020 gBattlerPicTable_PlayerRight
+082346d4 g 00000020 gBattlerPicTable_OpponentRight
 082346f4 g 00000028 gTrainerBackPicTable_Red
 0823471c g 00000028 gTrainerBackPicTable_Leaf
 08234744 g 00000020 gTrainerBackPicTable_Pokedude
@@ -25746,182 +25746,182 @@
 082347a4 g 00000020 gTrainerBackPicTable_RSMay
 082347c4 l 00000008 sAnim_GeneralFrame0
 082347cc l 00000008 sAnim_GeneralFrame3
-082347d4 l 00000010 gSpriteAffineAnim_82347F8
-082347e4 l 00000010 gSpriteAffineAnim_8234808
-082347f4 l 00000018 gSpriteAffineAnim_8234818
-0823480c l 00000018 gSpriteAffineAnim_8234830
-08234824 l 00000020 gSpriteAffineAnim_8234848
-08234844 l 00000010 gSpriteAffineAnim_8234868
-08234854 l 00000010 gSpriteAffineAnim_8234878
-08234864 l 00000018 gSpriteAffineAnim_8234888
-0823487c l 00000010 gSpriteAffineAnim_82348A0
-0823488c l 00000018 gSpriteAffineAnim_82348B0
-082348a4 g 00000024 gSpriteAffineAnimTable_BattlerPlayer
-082348c8 l 00000010 gSpriteAffineAnim_82348EC
-082348d8 l 00000018 gSpriteAffineAnim_82348FC
-082348f0 l 00000020 gSpriteAffineAnim_8234914
-08234910 l 00000010 gSpriteAffineAnim_8234934
-08234920 g 0000002c gSpriteAffineAnimTable_BattlerOpponent
-0823494c g 0000002c gSpriteAffineAnimTable_82349470
-08234978 l 00000008 gSpriteAnim_823499C
-08234980 l 00000008 gSpriteAnim_82349A4
-08234988 l 00000008 gSpriteAnim_82349AC
-08234990 l 00000008 gSpriteAnim_82349B4
-08234998 g 00000010 gSpriteAnimTable_82349BC
+082347d4 l 00000010 sAffineAnim_Battler_Normal
+082347e4 l 00000010 sAffineAnim_Battler_Flipped
+082347f4 l 00000018 sAffineAnim_Battler_Emerge
+0823480c l 00000018 sAffineAnim_Battler_Return
+08234824 l 00000020 sAffineAnim_Battler_HorizontalSquishLoop
+08234844 l 00000010 sAffineAnim_Battler_Grow
+08234854 l 00000010 sAffineAnim_Battler_Shrink
+08234864 l 00000018 sAffineAnim_Battler_BigToSmall
+0823487c l 00000010 sAffineAnim_Battler_GrowLarge
+0823488c l 00000018 sAffineAnim_Battler_TipRight
+082348a4 g 00000024 gAffineAnims_BattleSpritePlayerSide
+082348c8 l 00000010 sAffineAnim_Battler_SpinShrink
+082348d8 l 00000018 sAffineAnim_Battler_TipLeft
+082348f0 l 00000020 sAffineAnim_Battler_RotateUpAndBack
+08234910 l 00000010 sAffineAnim_Battler_Spin
+08234920 g 0000002c gAffineAnims_BattleSpriteOpponentSide
+0823494c g 0000002c gAffineAnims_BattleSpriteContest
+08234978 l 00000008 sAnim_MonPic_0
+08234980 l 00000008 sAnim_MonPic_1
+08234988 l 00000008 sAnim_MonPic_2
+08234990 l 00000008 sAnim_MonPic_3
+08234998 g 00000010 gAnims_MonPic
 082349a8 g 000006e0 gMonFrontPicCoords
 08235088 g 00000dc0 gMonFrontPicTable
 08235e48 g 000006e0 gMonBackPicCoords
 08236528 g 00000dc0 gMonBackPicTable
 082372e8 g 00000dc0 gMonPaletteTable
 082380a8 g 00000dc0 gMonShinyPaletteTable
-08238e68 l 00000004 sAnims_8238E8C
-08238e6c l 00000004 sAnims_8238E90
-08238e70 l 00000004 sAnims_8238E94
-08238e74 l 00000004 sAnims_8238E98
-08238e78 l 00000004 sAnims_8238E9C
-08238e7c l 00000004 sAnims_8238EA0
-08238e80 l 00000004 sAnims_8238EA4
-08238e84 l 00000004 sAnims_8238EA8
-08238e88 l 00000004 sAnims_8238EAC
-08238e8c l 00000004 sAnims_8238EB0
-08238e90 l 00000004 sAnims_8238EB4
-08238e94 l 00000004 sAnims_8238EB8
-08238e98 l 00000004 sAnims_8238EBC
-08238e9c l 00000004 sAnims_8238EC0
-08238ea0 l 00000004 sAnims_8238EC4
-08238ea4 l 00000004 sAnims_8238EC8
-08238ea8 l 00000004 sAnims_8238ECC
-08238eac l 00000004 sAnims_8238ED0
-08238eb0 l 00000004 sAnims_8238ED4
-08238eb4 l 00000004 sAnims_8238ED8
-08238eb8 l 00000004 sAnims_8238EDC
-08238ebc l 00000004 sAnims_8238EE0
-08238ec0 l 00000004 sAnims_8238EE4
-08238ec4 l 00000004 sAnims_8238EE8
-08238ec8 l 00000004 sAnims_8238EEC
-08238ecc l 00000004 sAnims_8238EF0
-08238ed0 l 00000004 sAnims_8238EF4
-08238ed4 l 00000004 sAnims_8238EF8
-08238ed8 l 00000004 sAnims_8238EFC
-08238edc l 00000004 sAnims_8238F00
-08238ee0 l 00000004 sAnims_8238F04
-08238ee4 l 00000004 sAnims_8238F08
-08238ee8 l 00000004 sAnims_8238F0C
-08238eec l 00000004 sAnims_8238F10
-08238ef0 l 00000004 sAnims_8238F14
-08238ef4 l 00000004 sAnims_8238F18
-08238ef8 l 00000004 sAnims_8238F1C
-08238efc l 00000004 sAnims_8238F20
-08238f00 l 00000004 sAnims_8238F24
-08238f04 l 00000004 sAnims_8238F28
-08238f08 l 00000004 sAnims_8238F2C
-08238f0c l 00000004 sAnims_8238F30
-08238f10 l 00000004 sAnims_8238F34
-08238f14 l 00000004 sAnims_8238F38
-08238f18 l 00000004 sAnims_8238F3C
-08238f1c l 00000004 sAnims_8238F40
-08238f20 l 00000004 sAnims_8238F44
-08238f24 l 00000004 sAnims_8238F48
-08238f28 l 00000004 sAnims_8238F4C
-08238f2c l 00000004 sAnims_8238F50
-08238f30 l 00000004 sAnims_8238F54
-08238f34 l 00000004 sAnims_8238F58
-08238f38 l 00000004 sAnims_8238F5C
-08238f3c l 00000004 sAnims_8238F60
-08238f40 l 00000004 sAnims_8238F64
-08238f44 l 00000004 sAnims_8238F68
-08238f48 l 00000004 sAnims_8238F6C
-08238f4c l 00000004 sAnims_8238F70
-08238f50 l 00000004 sAnims_8238F74
-08238f54 l 00000004 sAnims_8238F78
-08238f58 l 00000004 sAnims_8238F7C
-08238f5c l 00000004 sAnims_8238F80
-08238f60 l 00000004 sAnims_8238F84
-08238f64 l 00000004 sAnims_8238F88
-08238f68 l 00000004 sAnims_8238F8C
-08238f6c l 00000004 sAnims_8238F90
-08238f70 l 00000004 sAnims_8238F94
-08238f74 l 00000004 sAnims_8238F98
-08238f78 l 00000004 sAnims_8238F9C
-08238f7c l 00000004 sAnims_8238FA0
-08238f80 l 00000004 sAnims_8238FA4
-08238f84 l 00000004 sAnims_8238FA8
-08238f88 l 00000004 sAnims_8238FAC
-08238f8c l 00000004 sAnims_8238FB0
-08238f90 l 00000004 sAnims_8238FB4
-08238f94 l 00000004 sAnims_8238FB8
-08238f98 l 00000004 sAnims_8238FBC
-08238f9c l 00000004 sAnims_8238FC0
-08238fa0 l 00000004 sAnims_8238FC4
-08238fa4 l 00000004 sAnims_8238FC8
-08238fa8 l 00000004 sAnims_8238FCC
-08238fac l 00000004 sAnims_8238FD0
-08238fb0 l 00000004 sAnims_8238FD4
-08238fb4 l 00000004 sAnims_8238FD8
-08238fb8 l 00000004 sAnims_8238FDC
-08238fbc l 00000004 sAnims_8238FE0
-08238fc0 l 00000004 sAnims_8238FE4
-08238fc4 l 00000004 sAnims_8238FE8
-08238fc8 l 00000004 sAnims_8238FEC
-08238fcc l 00000004 sAnims_8238FF0
-08238fd0 l 00000004 sAnims_8238FF4
-08238fd4 l 00000004 sAnims_8238FF8
-08238fd8 l 00000004 sAnims_8238FFC
-08238fdc l 00000004 sAnims_8239000
-08238fe0 l 00000004 sAnims_8239004
-08238fe4 l 00000004 sAnims_8239008
-08238fe8 l 00000004 sAnims_823900C
-08238fec l 00000004 sAnims_8239010
-08238ff0 l 00000004 sAnims_8239014
-08238ff4 l 00000004 sAnims_8239018
-08238ff8 l 00000004 sAnims_823901C
-08238ffc l 00000004 sAnims_8239020
-08239000 l 00000004 sAnims_8239024
-08239004 l 00000004 sAnims_8239028
-08239008 l 00000004 sAnims_823902C
-0823900c l 00000004 sAnims_8239030
-08239010 l 00000004 sAnims_8239034
-08239014 l 00000004 sAnims_8239038
-08239018 l 00000004 sAnims_823903C
-0823901c l 00000004 sAnims_8239040
-08239020 l 00000004 sAnims_8239044
-08239024 l 00000004 sAnims_8239048
-08239028 l 00000004 sAnims_823904C
-0823902c l 00000004 sAnims_8239050
-08239030 l 00000004 sAnims_8239054
-08239034 l 00000004 sAnims_8239058
-08239038 l 00000004 sAnims_823905C
-0823903c l 00000004 sAnims_8239060
-08239040 l 00000004 sAnims_8239064
-08239044 l 00000004 sAnims_8239068
-08239048 l 00000004 sAnims_823906C
-0823904c l 00000004 sAnims_8239070
-08239050 l 00000004 sAnims_8239074
-08239054 l 00000004 sAnims_8239078
-08239058 l 00000004 sAnims_823907C
-0823905c l 00000004 sAnims_8239080
-08239060 l 00000004 sAnims_8239084
-08239064 l 00000004 sAnims_8239088
-08239068 l 00000004 sAnims_823908C
-0823906c l 00000004 sAnims_8239090
-08239070 l 00000004 sAnims_8239094
-08239074 l 00000004 sAnims_8239098
-08239078 l 00000004 sAnims_823909C
-0823907c l 00000004 sAnims_82390A0
-08239080 l 00000004 sAnims_82390A4
-08239084 l 00000004 sAnims_82390A8
-08239088 l 00000004 sAnims_82390AC
-0823908c l 00000004 sAnims_82390B0
-08239090 l 00000004 sAnims_82390B4
-08239094 l 00000004 sAnims_82390B8
-08239098 l 00000004 sAnims_82390BC
-0823909c l 00000004 sAnims_82390C0
-082390a0 l 00000004 sAnims_82390C4
-082390a4 l 00000004 sAnims_82390C8
-082390a8 l 00000004 sAnims_82390CC
-082390ac l 00000004 sAnims_82390D0
-082390b0 l 00000004 sAnims_82390D4
-082390b4 l 00000004 sAnims_82390D8
+08238e68 l 00000004 sAnims_AquaLeaderArchie
+08238e6c l 00000004 sAnims_AquaGruntM
+08238e70 l 00000004 sAnims_AquaGruntF
+08238e74 l 00000004 sAnims_RSAromaLady
+08238e78 l 00000004 sAnims_RSRuinManiac
+08238e7c l 00000004 sAnims_Interviewer
+08238e80 l 00000004 sAnims_RSTuberF
+08238e84 l 00000004 sAnims_RSTuberM
+08238e88 l 00000004 sAnims_RSCooltrainerM
+08238e8c l 00000004 sAnims_RSCooltrainerF
+08238e90 l 00000004 sAnims_HexManiac
+08238e94 l 00000004 sAnims_RSLady
+08238e98 l 00000004 sAnims_RSBeauty
+08238e9c l 00000004 sAnims_RichBoy
+08238ea0 l 00000004 sAnims_RSPokemaniac
+08238ea4 l 00000004 sAnims_RSSwimmerM
+08238ea8 l 00000004 sAnims_RSBlackBelt
+08238eac l 00000004 sAnims_Guitarist
+08238eb0 l 00000004 sAnims_Kindler
+08238eb4 l 00000004 sAnims_RSCamper
+08238eb8 l 00000004 sAnims_BugManiac
+08238ebc l 00000004 sAnims_RSPsychicM
+08238ec0 l 00000004 sAnims_RSPsychicF
+08238ec4 l 00000004 sAnims_RSGentleman
+08238ec8 l 00000004 sAnims_EliteFourSidney
+08238ecc l 00000004 sAnims_EliteFourPhoebe
+08238ed0 l 00000004 sAnims_LeaderRoxanne
+08238ed4 l 00000004 sAnims_LeaderBrawly
+08238ed8 l 00000004 sAnims_LeaderTateAndLiza
+08238edc l 00000004 sAnims_SchoolKidM
+08238ee0 l 00000004 sAnims_SchoolKidF
+08238ee4 l 00000004 sAnims_SrAndJr
+08238ee8 l 00000004 sAnims_PokefanM
+08238eec l 00000004 sAnims_PokefanF
+08238ef0 l 00000004 sAnims_ExpertM
+08238ef4 l 00000004 sAnims_ExpertF
+08238ef8 l 00000004 sAnims_RSYoungster
+08238efc l 00000004 sAnims_ChampionSteven
+08238f00 l 00000004 sAnims_RSFisherman
+08238f04 l 00000004 sAnims_CyclingTriathleteM
+08238f08 l 00000004 sAnims_CyclingTriathleteF
+08238f0c l 00000004 sAnims_RunningTriathleteM
+08238f10 l 00000004 sAnims_RunningTriathleteF
+08238f14 l 00000004 sAnims_SwimmingTriathleteM
+08238f18 l 00000004 sAnims_SwimmingTriathleteF
+08238f1c l 00000004 sAnims_DragonTamer
+08238f20 l 00000004 sAnims_RSBirdKeeper
+08238f24 l 00000004 sAnims_NinjaBoy
+08238f28 l 00000004 sAnims_BattleGirl
+08238f2c l 00000004 sAnims_ParasolLady
+08238f30 l 00000004 sAnims_RSSwimmerF
+08238f34 l 00000004 sAnims_RSPicnicker
+08238f38 l 00000004 sAnims_RSTwins
+08238f3c l 00000004 sAnims_RSSailor
+08238f40 l 00000004 sAnims_Collector
+08238f44 l 00000004 sAnims_Wally
+08238f48 l 00000004 sAnims_RSBrendan1
+08238f4c l 00000004 sAnims_RSMay1
+08238f50 l 00000004 sAnims_RSPokemonBreederM
+08238f54 l 00000004 sAnims_RSPokemonBreederF
+08238f58 l 00000004 sAnims_RSPokemonRangerM
+08238f5c l 00000004 sAnims_RSPokemonRangerF
+08238f60 l 00000004 sAnims_MagmaLeaderMaxie
+08238f64 l 00000004 sAnims_MagmaGruntM
+08238f68 l 00000004 sAnims_MagmaGruntF
+08238f6c l 00000004 sAnims_RSLass
+08238f70 l 00000004 sAnims_RSBugCatcher
+08238f74 l 00000004 sAnims_RSHiker
+08238f78 l 00000004 sAnims_RSYoungCouple
+08238f7c l 00000004 sAnims_OldCouple
+08238f80 l 00000004 sAnims_RSSisAndBro
+08238f84 l 00000004 sAnims_AquaAdminM
+08238f88 l 00000004 sAnims_AquaAdminF
+08238f8c l 00000004 sAnims_MagmaAdminM
+08238f90 l 00000004 sAnims_MagmaAdminF
+08238f94 l 00000004 sAnims_LeaderWattson
+08238f98 l 00000004 sAnims_LeaderFlannery
+08238f9c l 00000004 sAnims_LeaderNorman
+08238fa0 l 00000004 sAnims_LeaderWinona
+08238fa4 l 00000004 sAnims_LeaderWallace
+08238fa8 l 00000004 sAnims_EliteFourGlacia
+08238fac l 00000004 sAnims_EliteFourDrake
+08238fb0 l 00000004 sAnims_Youngster
+08238fb4 l 00000004 sAnims_BugCatcher
+08238fb8 l 00000004 sAnims_Lass
+08238fbc l 00000004 sAnims_Sailor
+08238fc0 l 00000004 sAnims_Camper
+08238fc4 l 00000004 sAnims_Picnicker
+08238fc8 l 00000004 sAnims_Pokemaniac
+08238fcc l 00000004 sAnims_SuperNerd
+08238fd0 l 00000004 sAnims_Hiker
+08238fd4 l 00000004 sAnims_Biker
+08238fd8 l 00000004 sAnims_Burglar
+08238fdc l 00000004 sAnims_Engineer
+08238fe0 l 00000004 sAnims_Fisherman
+08238fe4 l 00000004 sAnims_SwimmerM
+08238fe8 l 00000004 sAnims_CueBall
+08238fec l 00000004 sAnims_Gamer
+08238ff0 l 00000004 sAnims_Beauty
+08238ff4 l 00000004 sAnims_SwimmerF
+08238ff8 l 00000004 sAnims_PsychicM
+08238ffc l 00000004 sAnims_Rocker
+08239000 l 00000004 sAnims_Juggler
+08239004 l 00000004 sAnims_Tamer
+08239008 l 00000004 sAnims_BirdKeeper
+0823900c l 00000004 sAnims_BlackBelt
+08239010 l 00000004 sAnims_RivalEarly
+08239014 l 00000004 sAnims_Scientist
+08239018 l 00000004 sAnims_LeaderGiovanni
+0823901c l 00000004 sAnims_RocketGruntM
+08239020 l 00000004 sAnims_CooltrainerM
+08239024 l 00000004 sAnims_CooltrainerF
+08239028 l 00000004 sAnims_EliteFourLorelei
+0823902c l 00000004 sAnims_EliteFourBruno
+08239030 l 00000004 sAnims_EliteFourAgatha
+08239034 l 00000004 sAnims_EliteFourLance
+08239038 l 00000004 sAnims_LeaderBrock
+0823903c l 00000004 sAnims_LeaderMisty
+08239040 l 00000004 sAnims_LeaderLtSurge
+08239044 l 00000004 sAnims_LeaderErika
+08239048 l 00000004 sAnims_LeaderKoga
+0823904c l 00000004 sAnims_LeaderBlaine
+08239050 l 00000004 sAnims_LeaderSabrina
+08239054 l 00000004 sAnims_Gentleman
+08239058 l 00000004 sAnims_RivalLate
+0823905c l 00000004 sAnims_ChampionRival
+08239060 l 00000004 sAnims_Channeler
+08239064 l 00000004 sAnims_Twins
+08239068 l 00000004 sAnims_CoolCouple
+0823906c l 00000004 sAnims_YoungCouple
+08239070 l 00000004 sAnims_CrushKin
+08239074 l 00000004 sAnims_SisAndBro
+08239078 l 00000004 sAnims_ProfessorOak
+0823907c l 00000004 sAnims_RSBrendan2
+08239080 l 00000004 sAnims_RSMay2
+08239084 l 00000004 sAnims_Red
+08239088 l 00000004 sAnims_Leaf
+0823908c l 00000004 sAnims_RocketGruntF
+08239090 l 00000004 sAnims_PsychicF
+08239094 l 00000004 sAnims_CrushGirl
+08239098 l 00000004 sAnims_TuberF
+0823909c l 00000004 sAnims_PokemonBreeder
+082390a0 l 00000004 sAnims_PokemonRangerM
+082390a4 l 00000004 sAnims_PokemonRangerF
+082390a8 l 00000004 sAnims_AromaLady
+082390ac l 00000004 sAnims_RuinManiac
+082390b0 l 00000004 sAnims_Lady
+082390b4 l 00000004 sAnims_Painter
 082390b8 g 00000250 gTrainerFrontAnimsPtrTable
 08239308 g 00000250 gTrainerFrontPicCoords
 08239558 g 000004a0 gTrainerFrontPicTable
diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym
index fca68bfff..93e35a634 100644
--- a/pokeleafgreen_rev1.sym
+++ b/pokeleafgreen_rev1.sym
@@ -25735,10 +25735,10 @@
 082346d7 l 00000003 sTextColor2
 082346dc l 00000004 sBgTemplate
 082346e0 l 00000003 sMenuCursorYMax
-082346e4 g 00000020 gSpriteImages_BattlerPlayerLeft
-08234704 g 00000020 gSpriteImages_BattlerOpponentLeft
-08234724 g 00000020 gSpriteImages_BattlerPlayerRight
-08234744 g 00000020 gSpriteImages_BattlerOpponentRight
+082346e4 g 00000020 gBattlerPicTable_PlayerLeft
+08234704 g 00000020 gBattlerPicTable_OpponentLeft
+08234724 g 00000020 gBattlerPicTable_PlayerRight
+08234744 g 00000020 gBattlerPicTable_OpponentRight
 08234764 g 00000028 gTrainerBackPicTable_Red
 0823478c g 00000028 gTrainerBackPicTable_Leaf
 082347b4 g 00000020 gTrainerBackPicTable_Pokedude
@@ -25747,182 +25747,182 @@
 08234814 g 00000020 gTrainerBackPicTable_RSMay
 08234834 l 00000008 sAnim_GeneralFrame0
 0823483c l 00000008 sAnim_GeneralFrame3
-08234844 l 00000010 gSpriteAffineAnim_82347F8
-08234854 l 00000010 gSpriteAffineAnim_8234808
-08234864 l 00000018 gSpriteAffineAnim_8234818
-0823487c l 00000018 gSpriteAffineAnim_8234830
-08234894 l 00000020 gSpriteAffineAnim_8234848
-082348b4 l 00000010 gSpriteAffineAnim_8234868
-082348c4 l 00000010 gSpriteAffineAnim_8234878
-082348d4 l 00000018 gSpriteAffineAnim_8234888
-082348ec l 00000010 gSpriteAffineAnim_82348A0
-082348fc l 00000018 gSpriteAffineAnim_82348B0
-08234914 g 00000024 gSpriteAffineAnimTable_BattlerPlayer
-08234938 l 00000010 gSpriteAffineAnim_82348EC
-08234948 l 00000018 gSpriteAffineAnim_82348FC
-08234960 l 00000020 gSpriteAffineAnim_8234914
-08234980 l 00000010 gSpriteAffineAnim_8234934
-08234990 g 0000002c gSpriteAffineAnimTable_BattlerOpponent
-082349bc g 0000002c gSpriteAffineAnimTable_82349470
-082349e8 l 00000008 gSpriteAnim_823499C
-082349f0 l 00000008 gSpriteAnim_82349A4
-082349f8 l 00000008 gSpriteAnim_82349AC
-08234a00 l 00000008 gSpriteAnim_82349B4
-08234a08 g 00000010 gSpriteAnimTable_82349BC
+08234844 l 00000010 sAffineAnim_Battler_Normal
+08234854 l 00000010 sAffineAnim_Battler_Flipped
+08234864 l 00000018 sAffineAnim_Battler_Emerge
+0823487c l 00000018 sAffineAnim_Battler_Return
+08234894 l 00000020 sAffineAnim_Battler_HorizontalSquishLoop
+082348b4 l 00000010 sAffineAnim_Battler_Grow
+082348c4 l 00000010 sAffineAnim_Battler_Shrink
+082348d4 l 00000018 sAffineAnim_Battler_BigToSmall
+082348ec l 00000010 sAffineAnim_Battler_GrowLarge
+082348fc l 00000018 sAffineAnim_Battler_TipRight
+08234914 g 00000024 gAffineAnims_BattleSpritePlayerSide
+08234938 l 00000010 sAffineAnim_Battler_SpinShrink
+08234948 l 00000018 sAffineAnim_Battler_TipLeft
+08234960 l 00000020 sAffineAnim_Battler_RotateUpAndBack
+08234980 l 00000010 sAffineAnim_Battler_Spin
+08234990 g 0000002c gAffineAnims_BattleSpriteOpponentSide
+082349bc g 0000002c gAffineAnims_BattleSpriteContest
+082349e8 l 00000008 sAnim_MonPic_0
+082349f0 l 00000008 sAnim_MonPic_1
+082349f8 l 00000008 sAnim_MonPic_2
+08234a00 l 00000008 sAnim_MonPic_3
+08234a08 g 00000010 gAnims_MonPic
 08234a18 g 000006e0 gMonFrontPicCoords
 082350f8 g 00000dc0 gMonFrontPicTable
 08235eb8 g 000006e0 gMonBackPicCoords
 08236598 g 00000dc0 gMonBackPicTable
 08237358 g 00000dc0 gMonPaletteTable
 08238118 g 00000dc0 gMonShinyPaletteTable
-08238ed8 l 00000004 sAnims_8238E8C
-08238edc l 00000004 sAnims_8238E90
-08238ee0 l 00000004 sAnims_8238E94
-08238ee4 l 00000004 sAnims_8238E98
-08238ee8 l 00000004 sAnims_8238E9C
-08238eec l 00000004 sAnims_8238EA0
-08238ef0 l 00000004 sAnims_8238EA4
-08238ef4 l 00000004 sAnims_8238EA8
-08238ef8 l 00000004 sAnims_8238EAC
-08238efc l 00000004 sAnims_8238EB0
-08238f00 l 00000004 sAnims_8238EB4
-08238f04 l 00000004 sAnims_8238EB8
-08238f08 l 00000004 sAnims_8238EBC
-08238f0c l 00000004 sAnims_8238EC0
-08238f10 l 00000004 sAnims_8238EC4
-08238f14 l 00000004 sAnims_8238EC8
-08238f18 l 00000004 sAnims_8238ECC
-08238f1c l 00000004 sAnims_8238ED0
-08238f20 l 00000004 sAnims_8238ED4
-08238f24 l 00000004 sAnims_8238ED8
-08238f28 l 00000004 sAnims_8238EDC
-08238f2c l 00000004 sAnims_8238EE0
-08238f30 l 00000004 sAnims_8238EE4
-08238f34 l 00000004 sAnims_8238EE8
-08238f38 l 00000004 sAnims_8238EEC
-08238f3c l 00000004 sAnims_8238EF0
-08238f40 l 00000004 sAnims_8238EF4
-08238f44 l 00000004 sAnims_8238EF8
-08238f48 l 00000004 sAnims_8238EFC
-08238f4c l 00000004 sAnims_8238F00
-08238f50 l 00000004 sAnims_8238F04
-08238f54 l 00000004 sAnims_8238F08
-08238f58 l 00000004 sAnims_8238F0C
-08238f5c l 00000004 sAnims_8238F10
-08238f60 l 00000004 sAnims_8238F14
-08238f64 l 00000004 sAnims_8238F18
-08238f68 l 00000004 sAnims_8238F1C
-08238f6c l 00000004 sAnims_8238F20
-08238f70 l 00000004 sAnims_8238F24
-08238f74 l 00000004 sAnims_8238F28
-08238f78 l 00000004 sAnims_8238F2C
-08238f7c l 00000004 sAnims_8238F30
-08238f80 l 00000004 sAnims_8238F34
-08238f84 l 00000004 sAnims_8238F38
-08238f88 l 00000004 sAnims_8238F3C
-08238f8c l 00000004 sAnims_8238F40
-08238f90 l 00000004 sAnims_8238F44
-08238f94 l 00000004 sAnims_8238F48
-08238f98 l 00000004 sAnims_8238F4C
-08238f9c l 00000004 sAnims_8238F50
-08238fa0 l 00000004 sAnims_8238F54
-08238fa4 l 00000004 sAnims_8238F58
-08238fa8 l 00000004 sAnims_8238F5C
-08238fac l 00000004 sAnims_8238F60
-08238fb0 l 00000004 sAnims_8238F64
-08238fb4 l 00000004 sAnims_8238F68
-08238fb8 l 00000004 sAnims_8238F6C
-08238fbc l 00000004 sAnims_8238F70
-08238fc0 l 00000004 sAnims_8238F74
-08238fc4 l 00000004 sAnims_8238F78
-08238fc8 l 00000004 sAnims_8238F7C
-08238fcc l 00000004 sAnims_8238F80
-08238fd0 l 00000004 sAnims_8238F84
-08238fd4 l 00000004 sAnims_8238F88
-08238fd8 l 00000004 sAnims_8238F8C
-08238fdc l 00000004 sAnims_8238F90
-08238fe0 l 00000004 sAnims_8238F94
-08238fe4 l 00000004 sAnims_8238F98
-08238fe8 l 00000004 sAnims_8238F9C
-08238fec l 00000004 sAnims_8238FA0
-08238ff0 l 00000004 sAnims_8238FA4
-08238ff4 l 00000004 sAnims_8238FA8
-08238ff8 l 00000004 sAnims_8238FAC
-08238ffc l 00000004 sAnims_8238FB0
-08239000 l 00000004 sAnims_8238FB4
-08239004 l 00000004 sAnims_8238FB8
-08239008 l 00000004 sAnims_8238FBC
-0823900c l 00000004 sAnims_8238FC0
-08239010 l 00000004 sAnims_8238FC4
-08239014 l 00000004 sAnims_8238FC8
-08239018 l 00000004 sAnims_8238FCC
-0823901c l 00000004 sAnims_8238FD0
-08239020 l 00000004 sAnims_8238FD4
-08239024 l 00000004 sAnims_8238FD8
-08239028 l 00000004 sAnims_8238FDC
-0823902c l 00000004 sAnims_8238FE0
-08239030 l 00000004 sAnims_8238FE4
-08239034 l 00000004 sAnims_8238FE8
-08239038 l 00000004 sAnims_8238FEC
-0823903c l 00000004 sAnims_8238FF0
-08239040 l 00000004 sAnims_8238FF4
-08239044 l 00000004 sAnims_8238FF8
-08239048 l 00000004 sAnims_8238FFC
-0823904c l 00000004 sAnims_8239000
-08239050 l 00000004 sAnims_8239004
-08239054 l 00000004 sAnims_8239008
-08239058 l 00000004 sAnims_823900C
-0823905c l 00000004 sAnims_8239010
-08239060 l 00000004 sAnims_8239014
-08239064 l 00000004 sAnims_8239018
-08239068 l 00000004 sAnims_823901C
-0823906c l 00000004 sAnims_8239020
-08239070 l 00000004 sAnims_8239024
-08239074 l 00000004 sAnims_8239028
-08239078 l 00000004 sAnims_823902C
-0823907c l 00000004 sAnims_8239030
-08239080 l 00000004 sAnims_8239034
-08239084 l 00000004 sAnims_8239038
-08239088 l 00000004 sAnims_823903C
-0823908c l 00000004 sAnims_8239040
-08239090 l 00000004 sAnims_8239044
-08239094 l 00000004 sAnims_8239048
-08239098 l 00000004 sAnims_823904C
-0823909c l 00000004 sAnims_8239050
-082390a0 l 00000004 sAnims_8239054
-082390a4 l 00000004 sAnims_8239058
-082390a8 l 00000004 sAnims_823905C
-082390ac l 00000004 sAnims_8239060
-082390b0 l 00000004 sAnims_8239064
-082390b4 l 00000004 sAnims_8239068
-082390b8 l 00000004 sAnims_823906C
-082390bc l 00000004 sAnims_8239070
-082390c0 l 00000004 sAnims_8239074
-082390c4 l 00000004 sAnims_8239078
-082390c8 l 00000004 sAnims_823907C
-082390cc l 00000004 sAnims_8239080
-082390d0 l 00000004 sAnims_8239084
-082390d4 l 00000004 sAnims_8239088
-082390d8 l 00000004 sAnims_823908C
-082390dc l 00000004 sAnims_8239090
-082390e0 l 00000004 sAnims_8239094
-082390e4 l 00000004 sAnims_8239098
-082390e8 l 00000004 sAnims_823909C
-082390ec l 00000004 sAnims_82390A0
-082390f0 l 00000004 sAnims_82390A4
-082390f4 l 00000004 sAnims_82390A8
-082390f8 l 00000004 sAnims_82390AC
-082390fc l 00000004 sAnims_82390B0
-08239100 l 00000004 sAnims_82390B4
-08239104 l 00000004 sAnims_82390B8
-08239108 l 00000004 sAnims_82390BC
-0823910c l 00000004 sAnims_82390C0
-08239110 l 00000004 sAnims_82390C4
-08239114 l 00000004 sAnims_82390C8
-08239118 l 00000004 sAnims_82390CC
-0823911c l 00000004 sAnims_82390D0
-08239120 l 00000004 sAnims_82390D4
-08239124 l 00000004 sAnims_82390D8
+08238ed8 l 00000004 sAnims_AquaLeaderArchie
+08238edc l 00000004 sAnims_AquaGruntM
+08238ee0 l 00000004 sAnims_AquaGruntF
+08238ee4 l 00000004 sAnims_RSAromaLady
+08238ee8 l 00000004 sAnims_RSRuinManiac
+08238eec l 00000004 sAnims_Interviewer
+08238ef0 l 00000004 sAnims_RSTuberF
+08238ef4 l 00000004 sAnims_RSTuberM
+08238ef8 l 00000004 sAnims_RSCooltrainerM
+08238efc l 00000004 sAnims_RSCooltrainerF
+08238f00 l 00000004 sAnims_HexManiac
+08238f04 l 00000004 sAnims_RSLady
+08238f08 l 00000004 sAnims_RSBeauty
+08238f0c l 00000004 sAnims_RichBoy
+08238f10 l 00000004 sAnims_RSPokemaniac
+08238f14 l 00000004 sAnims_RSSwimmerM
+08238f18 l 00000004 sAnims_RSBlackBelt
+08238f1c l 00000004 sAnims_Guitarist
+08238f20 l 00000004 sAnims_Kindler
+08238f24 l 00000004 sAnims_RSCamper
+08238f28 l 00000004 sAnims_BugManiac
+08238f2c l 00000004 sAnims_RSPsychicM
+08238f30 l 00000004 sAnims_RSPsychicF
+08238f34 l 00000004 sAnims_RSGentleman
+08238f38 l 00000004 sAnims_EliteFourSidney
+08238f3c l 00000004 sAnims_EliteFourPhoebe
+08238f40 l 00000004 sAnims_LeaderRoxanne
+08238f44 l 00000004 sAnims_LeaderBrawly
+08238f48 l 00000004 sAnims_LeaderTateAndLiza
+08238f4c l 00000004 sAnims_SchoolKidM
+08238f50 l 00000004 sAnims_SchoolKidF
+08238f54 l 00000004 sAnims_SrAndJr
+08238f58 l 00000004 sAnims_PokefanM
+08238f5c l 00000004 sAnims_PokefanF
+08238f60 l 00000004 sAnims_ExpertM
+08238f64 l 00000004 sAnims_ExpertF
+08238f68 l 00000004 sAnims_RSYoungster
+08238f6c l 00000004 sAnims_ChampionSteven
+08238f70 l 00000004 sAnims_RSFisherman
+08238f74 l 00000004 sAnims_CyclingTriathleteM
+08238f78 l 00000004 sAnims_CyclingTriathleteF
+08238f7c l 00000004 sAnims_RunningTriathleteM
+08238f80 l 00000004 sAnims_RunningTriathleteF
+08238f84 l 00000004 sAnims_SwimmingTriathleteM
+08238f88 l 00000004 sAnims_SwimmingTriathleteF
+08238f8c l 00000004 sAnims_DragonTamer
+08238f90 l 00000004 sAnims_RSBirdKeeper
+08238f94 l 00000004 sAnims_NinjaBoy
+08238f98 l 00000004 sAnims_BattleGirl
+08238f9c l 00000004 sAnims_ParasolLady
+08238fa0 l 00000004 sAnims_RSSwimmerF
+08238fa4 l 00000004 sAnims_RSPicnicker
+08238fa8 l 00000004 sAnims_RSTwins
+08238fac l 00000004 sAnims_RSSailor
+08238fb0 l 00000004 sAnims_Collector
+08238fb4 l 00000004 sAnims_Wally
+08238fb8 l 00000004 sAnims_RSBrendan1
+08238fbc l 00000004 sAnims_RSMay1
+08238fc0 l 00000004 sAnims_RSPokemonBreederM
+08238fc4 l 00000004 sAnims_RSPokemonBreederF
+08238fc8 l 00000004 sAnims_RSPokemonRangerM
+08238fcc l 00000004 sAnims_RSPokemonRangerF
+08238fd0 l 00000004 sAnims_MagmaLeaderMaxie
+08238fd4 l 00000004 sAnims_MagmaGruntM
+08238fd8 l 00000004 sAnims_MagmaGruntF
+08238fdc l 00000004 sAnims_RSLass
+08238fe0 l 00000004 sAnims_RSBugCatcher
+08238fe4 l 00000004 sAnims_RSHiker
+08238fe8 l 00000004 sAnims_RSYoungCouple
+08238fec l 00000004 sAnims_OldCouple
+08238ff0 l 00000004 sAnims_RSSisAndBro
+08238ff4 l 00000004 sAnims_AquaAdminM
+08238ff8 l 00000004 sAnims_AquaAdminF
+08238ffc l 00000004 sAnims_MagmaAdminM
+08239000 l 00000004 sAnims_MagmaAdminF
+08239004 l 00000004 sAnims_LeaderWattson
+08239008 l 00000004 sAnims_LeaderFlannery
+0823900c l 00000004 sAnims_LeaderNorman
+08239010 l 00000004 sAnims_LeaderWinona
+08239014 l 00000004 sAnims_LeaderWallace
+08239018 l 00000004 sAnims_EliteFourGlacia
+0823901c l 00000004 sAnims_EliteFourDrake
+08239020 l 00000004 sAnims_Youngster
+08239024 l 00000004 sAnims_BugCatcher
+08239028 l 00000004 sAnims_Lass
+0823902c l 00000004 sAnims_Sailor
+08239030 l 00000004 sAnims_Camper
+08239034 l 00000004 sAnims_Picnicker
+08239038 l 00000004 sAnims_Pokemaniac
+0823903c l 00000004 sAnims_SuperNerd
+08239040 l 00000004 sAnims_Hiker
+08239044 l 00000004 sAnims_Biker
+08239048 l 00000004 sAnims_Burglar
+0823904c l 00000004 sAnims_Engineer
+08239050 l 00000004 sAnims_Fisherman
+08239054 l 00000004 sAnims_SwimmerM
+08239058 l 00000004 sAnims_CueBall
+0823905c l 00000004 sAnims_Gamer
+08239060 l 00000004 sAnims_Beauty
+08239064 l 00000004 sAnims_SwimmerF
+08239068 l 00000004 sAnims_PsychicM
+0823906c l 00000004 sAnims_Rocker
+08239070 l 00000004 sAnims_Juggler
+08239074 l 00000004 sAnims_Tamer
+08239078 l 00000004 sAnims_BirdKeeper
+0823907c l 00000004 sAnims_BlackBelt
+08239080 l 00000004 sAnims_RivalEarly
+08239084 l 00000004 sAnims_Scientist
+08239088 l 00000004 sAnims_LeaderGiovanni
+0823908c l 00000004 sAnims_RocketGruntM
+08239090 l 00000004 sAnims_CooltrainerM
+08239094 l 00000004 sAnims_CooltrainerF
+08239098 l 00000004 sAnims_EliteFourLorelei
+0823909c l 00000004 sAnims_EliteFourBruno
+082390a0 l 00000004 sAnims_EliteFourAgatha
+082390a4 l 00000004 sAnims_EliteFourLance
+082390a8 l 00000004 sAnims_LeaderBrock
+082390ac l 00000004 sAnims_LeaderMisty
+082390b0 l 00000004 sAnims_LeaderLtSurge
+082390b4 l 00000004 sAnims_LeaderErika
+082390b8 l 00000004 sAnims_LeaderKoga
+082390bc l 00000004 sAnims_LeaderBlaine
+082390c0 l 00000004 sAnims_LeaderSabrina
+082390c4 l 00000004 sAnims_Gentleman
+082390c8 l 00000004 sAnims_RivalLate
+082390cc l 00000004 sAnims_ChampionRival
+082390d0 l 00000004 sAnims_Channeler
+082390d4 l 00000004 sAnims_Twins
+082390d8 l 00000004 sAnims_CoolCouple
+082390dc l 00000004 sAnims_YoungCouple
+082390e0 l 00000004 sAnims_CrushKin
+082390e4 l 00000004 sAnims_SisAndBro
+082390e8 l 00000004 sAnims_ProfessorOak
+082390ec l 00000004 sAnims_RSBrendan2
+082390f0 l 00000004 sAnims_RSMay2
+082390f4 l 00000004 sAnims_Red
+082390f8 l 00000004 sAnims_Leaf
+082390fc l 00000004 sAnims_RocketGruntF
+08239100 l 00000004 sAnims_PsychicF
+08239104 l 00000004 sAnims_CrushGirl
+08239108 l 00000004 sAnims_TuberF
+0823910c l 00000004 sAnims_PokemonBreeder
+08239110 l 00000004 sAnims_PokemonRangerM
+08239114 l 00000004 sAnims_PokemonRangerF
+08239118 l 00000004 sAnims_AromaLady
+0823911c l 00000004 sAnims_RuinManiac
+08239120 l 00000004 sAnims_Lady
+08239124 l 00000004 sAnims_Painter
 08239128 g 00000250 gTrainerFrontAnimsPtrTable
 08239378 g 00000250 gTrainerFrontPicCoords
 082395c8 g 000004a0 gTrainerFrontPicTable