Merge branch 'master' into sync-ai

2 files changed, 6 insertions, 6 deletions

diff --git a/src/data/trainer_graphics/back_pic_anims.h b/src/data/trainer_graphics/back_pic_anims.h
index 2e107c21e..833a0cb28 100644
--- a/src/data/trainer_graphics/back_pic_anims.h
+++ b/src/data/trainer_graphics/back_pic_anims.h
@@ -16,7 +16,7 @@ static const union AnimCmd sAnimCmd_Leaf_1[] = {
     ANIMCMD_END
 };
 
-static const union AnimCmd sAnimCmd_PokeDude_1[] = {
+static const union AnimCmd sAnimCmd_Pokedude_1[] = {
     ANIMCMD_FRAME(1, 24),
     ANIMCMD_FRAME(2, 9),
     ANIMCMD_FRAME(3, 24),
@@ -60,9 +60,9 @@ const union AnimCmd *const sBackAnims_Leaf[] = {
     sAnimCmd_Leaf_1
 };
 
-const union AnimCmd *const sBackAnims_PokeDude[] = {
+const union AnimCmd *const sBackAnims_Pokedude[] = {
     sAnim_GeneralFrame0,
-    sAnimCmd_PokeDude_1
+    sAnimCmd_Pokedude_1
 };
 
 const union AnimCmd *const sBackAnims_OldMan[] = {
@@ -85,6 +85,6 @@ const union AnimCmd *const *const gTrainerBackAnimsPtrTable[] = {
     sBackAnims_Leaf,
     sBackAnims_RSBrendan,
     sBackAnims_RSMay,
-    sBackAnims_PokeDude,
+    sBackAnims_Pokedude,
     sBackAnims_OldMan
 };
diff --git a/src/data/trainer_graphics/back_pic_tables.h b/src/data/trainer_graphics/back_pic_tables.h
index 86e7824c1..4d0c129a8 100644
--- a/src/data/trainer_graphics/back_pic_tables.h
+++ b/src/data/trainer_graphics/back_pic_tables.h
@@ -12,7 +12,7 @@ const struct CompressedSpriteSheet gTrainerBackPicTable[] = {
     { (const u32 *)gTrainerBackPic_Leaf, 0x2800, 1 },
     { (const u32 *)gTrainerBackPic_RSBrendan, 0x2000, 2 },
     { (const u32 *)gTrainerBackPic_RSMay, 0x2000, 3 },
-    { (const u32 *)gTrainerBackPic_PokeDude, 0x2000, 4 },
+    { (const u32 *)gTrainerBackPic_Pokedude, 0x2000, 4 },
     { (const u32 *)gTrainerBackPic_OldMan, 0x2000, 5 }
 };
 
@@ -21,6 +21,6 @@ const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] = {
     { gTrainerPalette_LeafBackPic, 1 },
     { gTrainerPalette_RSBrendan1, 2 },
     { gTrainerPalette_RSMay1, 3 },
-    { gTrainerPalette_PokeDudeBackPic, 4 },
+    { gTrainerPalette_PokedudeBackPic, 4 },
     { gTrainerPalette_OldManBackPic, 5 }
 };