Added logic to do outfit change to RS Brendan and May

include/constants/event_objects.h

@@ -5,7 +5,7 @@
 #define OBJ_EVENT_GFX_BRENDAN_MACH_BIKE            1
 #define OBJ_EVENT_GFX_BRENDAN_SURFING              2
 #define OBJ_EVENT_GFX_BRENDAN_FIELD_MOVE           3
-#define OBJ_EVENT_GFX_QUINTY_PLUMP                 4
+#define OBJ_EVENT_GFX_QUINTY_PLUMP                 4 //Was unused, now used for Followers
 #define OBJ_EVENT_GFX_NINJA_BOY                    5
 #define OBJ_EVENT_GFX_TWIN                         6
 #define OBJ_EVENT_GFX_BOY_1                        7
@@ -60,7 +60,7 @@
 #define OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M        56
 #define OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F        57
 #define OBJ_EVENT_GFX_NURSE                       58
-#define OBJ_EVENT_GFX_ITEM_BALL                   59
+#define OBJ_EVENT_GFX_ITEM_BALL                   59 //Was unused, now used for Followers
 #define OBJ_EVENT_GFX_BERRY_TREE                  60
 #define OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES     61
 #define OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES      62
@@ -77,12 +77,12 @@
 #define OBJ_EVENT_GFX_SPENSER                     73
 #define OBJ_EVENT_GFX_NOLAND                      74
 #define OBJ_EVENT_GFX_LUCY                        75
-#define OBJ_EVENT_GFX_UNUSED_NATU_DOLL            76
-#define OBJ_EVENT_GFX_UNUSED_MAGNEMITE_DOLL       77
-#define OBJ_EVENT_GFX_UNUSED_SQUIRTLE_DOLL        78
-#define OBJ_EVENT_GFX_UNUSED_WOOPER_DOLL          79
-#define OBJ_EVENT_GFX_UNUSED_PIKACHU_DOLL         80
-#define OBJ_EVENT_GFX_UNUSED_PORYGON2_DOLL        81
+#define OBJ_EVENT_GFX_UNUSED_NATU_DOLL            76 //Was unused, now used for RS Outfit
+#define OBJ_EVENT_GFX_UNUSED_MAGNEMITE_DOLL       77 //Was unused, now used for RS Outfit
+#define OBJ_EVENT_GFX_UNUSED_SQUIRTLE_DOLL        78 //Was unused, now used for RS Outfit
+#define OBJ_EVENT_GFX_UNUSED_WOOPER_DOLL          79 //Was unused, now used for RS Outfit
+#define OBJ_EVENT_GFX_UNUSED_PIKACHU_DOLL         80 //Was unused, now used for RS Outfit
+#define OBJ_EVENT_GFX_UNUSED_PORYGON2_DOLL        81 //Was unused, now used for RS Outfit
 #define OBJ_EVENT_GFX_CUTTABLE_TREE               82
 #define OBJ_EVENT_GFX_MART_EMPLOYEE               83
 #define OBJ_EVENT_GFX_ROOFTOP_SALE_WOMAN          84
@@ -201,33 +201,33 @@
 #define OBJ_EVENT_GFX_KYOGRE_FRONT               197
 #define OBJ_EVENT_GFX_GROUDON_FRONT              198
 #define OBJ_EVENT_GFX_FOSSIL                     199
-#define OBJ_EVENT_GFX_REGIROCK                   200
-#define OBJ_EVENT_GFX_REGICE                     201
-#define OBJ_EVENT_GFX_REGISTEEL                  202
-#define OBJ_EVENT_GFX_SKITTY                     203
-#define OBJ_EVENT_GFX_KECLEON                    204
+#define OBJ_EVENT_GFX_REGIROCK                   200 //Was unused, now used for RS Outfit
+#define OBJ_EVENT_GFX_REGICE                     201 //Was unused, now used for Followers
+#define OBJ_EVENT_GFX_REGISTEEL                  202 //Was unused, now used for RS Outfit
+#define OBJ_EVENT_GFX_SKITTY                     203 //Was unused, now used for RS Outfit
+#define OBJ_EVENT_GFX_KECLEON                    204 //Was unused, now used for RS Outfit
 #define OBJ_EVENT_GFX_KYOGRE_ASLEEP              205
 #define OBJ_EVENT_GFX_GROUDON_ASLEEP             206
 #define OBJ_EVENT_GFX_RAYQUAZA                   207
-#define OBJ_EVENT_GFX_ZIGZAGOON_2                208
-#define OBJ_EVENT_GFX_PIKACHU                    209
-#define OBJ_EVENT_GFX_AZUMARILL                  210
-#define OBJ_EVENT_GFX_WINGULL                    211
-#define OBJ_EVENT_GFX_KECLEON_BRIDGE_SHADOW      212
+#define OBJ_EVENT_GFX_ZIGZAGOON_2                208 //Was unused, now used for RS Outfit
+#define OBJ_EVENT_GFX_PIKACHU                    209 //Was unused, now used for RS Outfit
+#define OBJ_EVENT_GFX_AZUMARILL                  210 //Was unused, now used for RS Outfit
+#define OBJ_EVENT_GFX_WINGULL                    211 //Was unused, now used for RS Outfit
+#define OBJ_EVENT_GFX_KECLEON_BRIDGE_SHADOW      212 //Unused
 #define OBJ_EVENT_GFX_TUBER_M_SWIMMING           213
-#define OBJ_EVENT_GFX_AZURILL                    214
+#define OBJ_EVENT_GFX_AZURILL                    214 //Was unused, now used for RS Outfit
 #define OBJ_EVENT_GFX_MOM                        215
 #define OBJ_EVENT_GFX_LINK_BRENDAN               216
 #define OBJ_EVENT_GFX_LINK_MAY                   217
 #define OBJ_EVENT_GFX_JUAN                       218
 #define OBJ_EVENT_GFX_SCOTT                      219
-#define OBJ_EVENT_GFX_POOCHYENA                  220
+#define OBJ_EVENT_GFX_POOCHYENA                  220 //Was unused, now used for RS Outfit
 #define OBJ_EVENT_GFX_KYOGRE_SIDE                221
 #define OBJ_EVENT_GFX_GROUDON_SIDE               222
 #define OBJ_EVENT_GFX_MYSTERY_GIFT_MAN           223
 #define OBJ_EVENT_GFX_TRICK_HOUSE_STATUE         224
-#define OBJ_EVENT_GFX_KIRLIA                     225
-#define OBJ_EVENT_GFX_DUSCLOPS                   226
+#define OBJ_EVENT_GFX_KIRLIA                     225 //Was unused, now used for RS Outfit
+#define OBJ_EVENT_GFX_DUSCLOPS                   226 //Was unused, now used for RS Outfit
 #define OBJ_EVENT_GFX_UNION_ROOM_NURSE           227
 #define OBJ_EVENT_GFX_SUDOWOODO                  228
 #define OBJ_EVENT_GFX_MEW                        229
@@ -243,6 +243,26 @@
 #define OBJ_EVENT_GFX_POKE_BALL                  OBJ_EVENT_GFX_ITEM_BALL // replaces ITEM_BALL
 #define OBJ_EVENT_GFX_OW_MON                     OBJ_EVENT_GFX_REGICE
 #define OBJ_EVENT_GFX_LIGHT_SPRITE               OBJ_EVENT_GFX_QUINTY_PLUMP
+//RS Outfit, Brendan
+#define OBJ_EVENT_GFX_BRENDAN_NORMAL_RS               OBJ_EVENT_GFX_UNUSED_NATU_DOLL
+#define OBJ_EVENT_GFX_BRENDAN_MACH_BIKE_RS            OBJ_EVENT_GFX_UNUSED_MAGNEMITE_DOLL
+#define OBJ_EVENT_GFX_BRENDAN_SURFING_RS              OBJ_EVENT_GFX_UNUSED_SQUIRTLE_DOLL
+#define OBJ_EVENT_GFX_BRENDAN_FIELD_MOVE_RS           OBJ_EVENT_GFX_UNUSED_WOOPER_DOLL
+#define OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE_RS            OBJ_EVENT_GFX_UNUSED_PIKACHU_DOLL
+#define OBJ_EVENT_GFX_BRENDAN_UNDERWATER_RS           OBJ_EVENT_GFX_UNUSED_PORYGON2_DOLL
+#define OBJ_EVENT_GFX_BRENDAN_FISHING_RS              OBJ_EVENT_GFX_REGIROCK
+#define OBJ_EVENT_GFX_BRENDAN_WATERING_RS             OBJ_EVENT_GFX_SKITTY
+#define OBJ_EVENT_GFX_BRENDAN_DECORATING_RS           OBJ_EVENT_GFX_REGISTEEL
+//RS Outfit, May
+#define OBJ_EVENT_GFX_MAY_NORMAL_RS                   OBJ_EVENT_GFX_KECLEON
+#define OBJ_EVENT_GFX_MAY_MACH_BIKE_RS                OBJ_EVENT_GFX_ZIGZAGOON_2
+#define OBJ_EVENT_GFX_MAY_SURFING_RS                  OBJ_EVENT_GFX_PIKACHU
+#define OBJ_EVENT_GFX_MAY_FIELD_MOVE_RS               OBJ_EVENT_GFX_AZUMARILL
+#define OBJ_EVENT_GFX_MAY_ACRO_BIKE_RS                OBJ_EVENT_GFX_WINGULL
+#define OBJ_EVENT_GFX_MAY_UNDERWATER_RS               OBJ_EVENT_GFX_POOCHYENA
+#define OBJ_EVENT_GFX_MAY_FISHING_RS                  OBJ_EVENT_GFX_KIRLIA
+#define OBJ_EVENT_GFX_MAY_WATERING_RS                 OBJ_EVENT_GFX_DUSCLOPS
+#define OBJ_EVENT_GFX_MAY_DECORATING_RS               OBJ_EVENT_GFX_AZURILL
 
 // NOTE: By default, the max value for NUM_OBJ_EVENT_GFX is 239.
 //

include/constants/flags.h

@@ -687,7 +687,7 @@
 #define FLAG_UNUSED_0x284  0x284 
 #define FLAG_UNUSED_0x285  0x285 //QM
 #define FLAG_SURF_PICHU_OBTAINED  0x286 // Surf Pichu
-#define FLAG_UNUSED_0x287  0x287 // Unused Flag
+#define FLAG_RS_OUTFIT     0x287
 #define FLAG_UNUSED_0x288  0x288 // Unused Flag
 #define FLAG_UNUSED_0x289  0x289 // Unused Flag
 #define FLAG_UNUSED_0x28A  0x28A // Unused Flag

spritesheet_rules.mk

@@ -121,21 +121,6 @@ $(OBJEVENTGFXDIR)/people/may/watering.4bpp: %.4bpp: %.png
 $(OBJEVENTGFXDIR)/people/may/underwater.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-
-$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/walking.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -mwidth 2 -mheight 4
-
-$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/running.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -mwidth 2 -mheight 4
-
-
-$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/walking.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -mwidth 2 -mheight 4
-
-$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/running.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -mwidth 2 -mheight 4
-
-
 $(OBJEVENTGFXDIR)/people/team_aqua/aqua_member_f.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
@@ -2082,3 +2067,57 @@ $(SLIDINGPUZZLESDIR)/aerodactyl/tiles.4bpp: %.4bpp: %.png
 
 $(SLIDINGPUZZLESDIR)/ho_oh/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/walking.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/running.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/field_move.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/surfing.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/mach_bike.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/acro_bike.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/fishing.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/watering.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/underwater.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/walking.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/running.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/field_move.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/surfing.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/mach_bike.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/acro_bike.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/fishing.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/watering.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/underwater.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4

src/data/object_events/object_event_graphics.h

@@ -847,6 +847,29 @@ const u16 gObjectEventPal_Substitute[] = INCBIN_U16("graphics/object_events/pics
 const u16 gObjectEventPaletteEmotes[] = INCBIN_U16("graphics/misc/emotes.gbapal");
 const u16 gObjectEventPaletteNeonLight[] = INCBIN_U16("graphics/object_events/palettes/neon_light.gbapal");
 
+//RS Outfit, Brendan
+const u32 gObjectEventPic_BrendanNormal_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/walking.4bpp");
+const u32 gObjectEventPic_BrendanRunning_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/running.4bpp");
+const u32 gObjectEventPic_BrendanFieldMove_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/field_move.4bpp");
+const u32 gObjectEventPic_BrendanSurfing_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/surfing.4bpp");
+const u32 gObjectEventPic_BrendanMachBike_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/mach_bike.4bpp");
+const u32 gObjectEventPic_BrendanAcroBike_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/acro_bike.4bpp");
+const u32 gObjectEventPic_BrendanFishing_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/fishing.4bpp");
+const u32 gObjectEventPic_BrendanWatering_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/watering.4bpp");
+const u32 gObjectEventPic_BrendanDecorating_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/decorating.4bpp");
+const u32 gObjectEventPic_BrendanUnderwater_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/underwater.4bpp");
+//RS Outfit, May
+const u32 gObjectEventPic_MayNormal_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/walking.4bpp");
+const u32 gObjectEventPic_MayRunning_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/running.4bpp");
+const u32 gObjectEventPic_MayFieldMove_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/field_move.4bpp");
+const u32 gObjectEventPic_MaySurfing_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/surfing.4bpp");
+const u32 gObjectEventPic_MayMachBike_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/mach_bike.4bpp");
+const u32 gObjectEventPic_MayAcroBike_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/acro_bike.4bpp");
+const u32 gObjectEventPic_MayFishing_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/fishing.4bpp");
+const u32 gObjectEventPic_MayWatering_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/watering.4bpp");
+const u32 gObjectEventPic_MayDecorating_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/decorating.4bpp");
+const u32 gObjectEventPic_MayUnderwater_RS[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/underwater.4bpp");
+
 #if OW_MON_POKEBALLS
 // Vanilla
 const u32 gObjectEventPic_MasterBall[] = INCBIN_U32("graphics/object_events/pics/misc/ball_master.4bpp");

src/data/object_events/object_event_graphics_info.h

@@ -244,5 +244,25 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {TAG_NONE,
 const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {TAG_NONE, OBJ_EVENT_PAL_TAG_HO_OH, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_HoOh, sPicTable_HoOhOld, gDummySpriteAffineAnimTable};
 const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokeBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Following, sPicTable_PokeBall, gDummySpriteAffineAnimTable};
 const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Follower = {TAG_NONE, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Togetic, gDummySpriteAffineAnimTable};
-
 const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallLight = {TAG_NONE, OBJ_EVENT_PAL_TAG_LIGHT, OBJ_EVENT_PAL_TAG_LIGHT_2, 512, 32, 32, 2, SHADOW_SIZE_NONE, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, gFieldEffectObjectPicTable_BallLight, gDummySpriteAffineAnimTable};
+
+//RS Outfit, Brendan
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BrendanMayNormal, sPicTable_BrendanNormal_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_BrendanMachBike_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_AcroBike, sPicTable_BrendanAcroBike_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_BRENDAN, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Surfing, sPicTable_BrendanSurfing_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_FieldMove, sPicTable_BrendanFieldMove_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_UNDERWATER, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_BrendanUnderwater_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Fishing, sPicTable_BrendanFishing_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_BrendanWatering_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Inanimate, sPicTable_BrendanDecorating_RS, gDummySpriteAffineAnimTable};
+//RS Outfit, May
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BrendanMayNormal, sPicTable_MayNormal_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_MayMachBike_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_AcroBike, sPicTable_MayAcroBike_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_MAY, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Surfing, sPicTable_MaySurfing_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_FieldMove, sPicTable_MayFieldMove_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_UNDERWATER, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_MayUnderwater_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Fishing, sPicTable_MayFishing_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_MayWatering_RS, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating_RS = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Inanimate, sPicTable_MayDecorating_RS, gDummySpriteAffineAnimTable};

src/data/object_events/object_event_graphics_info_pointers.h

@@ -249,6 +249,25 @@ extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy;
 extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1;
 extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2;
 
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering_RS;
+extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating_RS;
+
 
 const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM_OBJ_EVENT_GFX] = {
     [OBJ_EVENT_GFX_BRENDAN_NORMAL] =           &gObjectEventGraphicsInfo_BrendanNormal,
@@ -327,12 +346,12 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM
     [OBJ_EVENT_GFX_SPENSER] =                  &gObjectEventGraphicsInfo_Spenser,
     [OBJ_EVENT_GFX_NOLAND] =                   &gObjectEventGraphicsInfo_Noland,
     [OBJ_EVENT_GFX_LUCY] =                     &gObjectEventGraphicsInfo_Lucy,
-    [OBJ_EVENT_GFX_UNUSED_NATU_DOLL] =         &gObjectEventGraphicsInfo_UnusedNatuDoll,
-    [OBJ_EVENT_GFX_UNUSED_MAGNEMITE_DOLL] =    &gObjectEventGraphicsInfo_UnusedMagnemiteDoll,
-    [OBJ_EVENT_GFX_UNUSED_SQUIRTLE_DOLL] =     &gObjectEventGraphicsInfo_UnusedSquirtleDoll,
-    [OBJ_EVENT_GFX_UNUSED_WOOPER_DOLL] =       &gObjectEventGraphicsInfo_UnusedWooperDoll,
-    [OBJ_EVENT_GFX_UNUSED_PIKACHU_DOLL] =      &gObjectEventGraphicsInfo_UnusedPikachuDoll,
-    [OBJ_EVENT_GFX_UNUSED_PORYGON2_DOLL] =     &gObjectEventGraphicsInfo_UnusedPorygon2Doll,
+    //[OBJ_EVENT_GFX_UNUSED_NATU_DOLL] =         &gObjectEventGraphicsInfo_UnusedNatuDoll,
+    //[OBJ_EVENT_GFX_UNUSED_MAGNEMITE_DOLL] =    &gObjectEventGraphicsInfo_UnusedMagnemiteDoll,
+    //[OBJ_EVENT_GFX_UNUSED_SQUIRTLE_DOLL] =     &gObjectEventGraphicsInfo_UnusedSquirtleDoll,
+    //[OBJ_EVENT_GFX_UNUSED_WOOPER_DOLL] =       &gObjectEventGraphicsInfo_UnusedWooperDoll,
+    //[OBJ_EVENT_GFX_UNUSED_PIKACHU_DOLL] =      &gObjectEventGraphicsInfo_UnusedPikachuDoll,
+    //[OBJ_EVENT_GFX_UNUSED_PORYGON2_DOLL] =     &gObjectEventGraphicsInfo_UnusedPorygon2Doll,
     [OBJ_EVENT_GFX_CUTTABLE_TREE] =            &gObjectEventGraphicsInfo_CuttableTree,
     [OBJ_EVENT_GFX_MART_EMPLOYEE] =            &gObjectEventGraphicsInfo_MartEmployee,
     [OBJ_EVENT_GFX_ROOFTOP_SALE_WOMAN] =       &gObjectEventGraphicsInfo_RooftopSaleWoman,
@@ -451,33 +470,33 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM
     [OBJ_EVENT_GFX_KYOGRE_FRONT] =             &gObjectEventGraphicsInfo_KyogreFront,
     [OBJ_EVENT_GFX_GROUDON_FRONT] =            &gObjectEventGraphicsInfo_GroudonFront,
     [OBJ_EVENT_GFX_FOSSIL] =                   &gObjectEventGraphicsInfo_Fossil,
-    [OBJ_EVENT_GFX_REGIROCK] =                 &gObjectEventGraphicsInfo_Regirock,
+    //[OBJ_EVENT_GFX_REGIROCK] =                 &gObjectEventGraphicsInfo_Regirock,
     // [OBJ_EVENT_GFX_REGICE] =                   &gObjectEventGraphicsInfo_Regice,
-    [OBJ_EVENT_GFX_REGISTEEL] =                &gObjectEventGraphicsInfo_Registeel,
-    [OBJ_EVENT_GFX_SKITTY] =                   &gObjectEventGraphicsInfo_Skitty,
-    [OBJ_EVENT_GFX_KECLEON] =                  &gObjectEventGraphicsInfo_Kecleon,
+    //[OBJ_EVENT_GFX_REGISTEEL] =                &gObjectEventGraphicsInfo_Registeel,
+    //[OBJ_EVENT_GFX_SKITTY] =                   &gObjectEventGraphicsInfo_Skitty,
+    //[OBJ_EVENT_GFX_KECLEON] =                  &gObjectEventGraphicsInfo_Kecleon,
     [OBJ_EVENT_GFX_KYOGRE_ASLEEP] =            &gObjectEventGraphicsInfo_KyogreAsleep,
     [OBJ_EVENT_GFX_GROUDON_ASLEEP] =           &gObjectEventGraphicsInfo_GroudonAsleep,
     [OBJ_EVENT_GFX_RAYQUAZA] =                 &gObjectEventGraphicsInfo_Rayquaza,
-    [OBJ_EVENT_GFX_ZIGZAGOON_2] =              &gObjectEventGraphicsInfo_Zigzagoon,
-    [OBJ_EVENT_GFX_PIKACHU] =                  &gObjectEventGraphicsInfo_Pikachu,
-    [OBJ_EVENT_GFX_AZUMARILL] =                &gObjectEventGraphicsInfo_Azumarill,
-    [OBJ_EVENT_GFX_WINGULL] =                  &gObjectEventGraphicsInfo_Wingull,
-    [OBJ_EVENT_GFX_KECLEON_BRIDGE_SHADOW] =    &gObjectEventGraphicsInfo_KecleonBridgeShadow,
+    //[OBJ_EVENT_GFX_ZIGZAGOON_2] =              &gObjectEventGraphicsInfo_Zigzagoon,
+    //[OBJ_EVENT_GFX_PIKACHU] =                  &gObjectEventGraphicsInfo_Pikachu,
+    //[OBJ_EVENT_GFX_AZUMARILL] =                &gObjectEventGraphicsInfo_Azumarill,
+    //[OBJ_EVENT_GFX_WINGULL] =                  &gObjectEventGraphicsInfo_Wingull,
+    //[OBJ_EVENT_GFX_KECLEON_BRIDGE_SHADOW] =    &gObjectEventGraphicsInfo_KecleonBridgeShadow,
     [OBJ_EVENT_GFX_TUBER_M_SWIMMING] =         &gObjectEventGraphicsInfo_TuberMSwimming,
-    [OBJ_EVENT_GFX_AZURILL] =                  &gObjectEventGraphicsInfo_Azurill,
+    //[OBJ_EVENT_GFX_AZURILL] =                  &gObjectEventGraphicsInfo_Azurill,
     [OBJ_EVENT_GFX_MOM] =                      &gObjectEventGraphicsInfo_Mom,
     [OBJ_EVENT_GFX_LINK_BRENDAN] =             &gObjectEventGraphicsInfo_LinkBrendan,
     [OBJ_EVENT_GFX_LINK_MAY] =                 &gObjectEventGraphicsInfo_LinkMay,
     [OBJ_EVENT_GFX_JUAN] =                     &gObjectEventGraphicsInfo_Juan,
     [OBJ_EVENT_GFX_SCOTT] =                    &gObjectEventGraphicsInfo_Scott,
-    [OBJ_EVENT_GFX_POOCHYENA] =                &gObjectEventGraphicsInfo_Poochyena,
+    //[OBJ_EVENT_GFX_POOCHYENA] =                &gObjectEventGraphicsInfo_Poochyena,
     [OBJ_EVENT_GFX_KYOGRE_SIDE] =              &gObjectEventGraphicsInfo_KyogreSide,
     [OBJ_EVENT_GFX_GROUDON_SIDE] =             &gObjectEventGraphicsInfo_GroudonSide,
     [OBJ_EVENT_GFX_MYSTERY_GIFT_MAN] =         &gObjectEventGraphicsInfo_MysteryEventDeliveryman,
     [OBJ_EVENT_GFX_TRICK_HOUSE_STATUE] =       &gObjectEventGraphicsInfo_Statue,
-    [OBJ_EVENT_GFX_KIRLIA] =                   &gObjectEventGraphicsInfo_Kirlia,
-    [OBJ_EVENT_GFX_DUSCLOPS] =                 &gObjectEventGraphicsInfo_Dusclops,
+    //[OBJ_EVENT_GFX_KIRLIA] =                   &gObjectEventGraphicsInfo_Kirlia,
+    //[OBJ_EVENT_GFX_DUSCLOPS] =                 &gObjectEventGraphicsInfo_Dusclops,
     [OBJ_EVENT_GFX_UNION_ROOM_NURSE] =         &gObjectEventGraphicsInfo_UnionRoomAttendant,
     [OBJ_EVENT_GFX_SUDOWOODO] =                &gObjectEventGraphicsInfo_Sudowoodo,
     [OBJ_EVENT_GFX_MEW] =                      &gObjectEventGraphicsInfo_Mew,
@@ -493,6 +512,26 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM
     [OBJ_EVENT_GFX_POKE_BALL] =                &gObjectEventGraphicsInfo_PokeBall,
     [OBJ_EVENT_GFX_OW_MON] =                   &gObjectEventGraphicsInfo_Follower,
     [OBJ_EVENT_GFX_LIGHT_SPRITE] =             &gObjectEventGraphicsInfo_BallLight,
+    //RS Outfit, Brendan
+    [OBJ_EVENT_GFX_BRENDAN_NORMAL_RS] =        &gObjectEventGraphicsInfo_BrendanNormal_RS,
+    [OBJ_EVENT_GFX_BRENDAN_MACH_BIKE_RS] =     &gObjectEventGraphicsInfo_BrendanMachBike_RS,
+    [OBJ_EVENT_GFX_BRENDAN_SURFING_RS] =       &gObjectEventGraphicsInfo_BrendanSurfing_RS,
+    [OBJ_EVENT_GFX_BRENDAN_FIELD_MOVE_RS] =    &gObjectEventGraphicsInfo_BrendanFieldMove_RS,
+    [OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE_RS] =     &gObjectEventGraphicsInfo_BrendanAcroBike_RS,
+    [OBJ_EVENT_GFX_BRENDAN_UNDERWATER_RS] =    &gObjectEventGraphicsInfo_BrendanUnderwater_RS,
+    [OBJ_EVENT_GFX_BRENDAN_FISHING_RS] =       &gObjectEventGraphicsInfo_BrendanFishing_RS,
+    [OBJ_EVENT_GFX_BRENDAN_WATERING_RS] =      &gObjectEventGraphicsInfo_BrendanWatering_RS,
+    [OBJ_EVENT_GFX_BRENDAN_DECORATING_RS] =    &gObjectEventGraphicsInfo_BrendanDecorating_RS,
+    //RS Outfit, May
+    [OBJ_EVENT_GFX_MAY_NORMAL_RS] =            &gObjectEventGraphicsInfo_MayNormal_RS,
+    [OBJ_EVENT_GFX_MAY_MACH_BIKE_RS] =         &gObjectEventGraphicsInfo_MayMachBike_RS,
+    [OBJ_EVENT_GFX_MAY_SURFING_RS] =           &gObjectEventGraphicsInfo_MaySurfing_RS,
+    [OBJ_EVENT_GFX_MAY_FIELD_MOVE_RS] =        &gObjectEventGraphicsInfo_MayFieldMove_RS,
+    [OBJ_EVENT_GFX_MAY_ACRO_BIKE_RS] =         &gObjectEventGraphicsInfo_MayAcroBike_RS,
+    [OBJ_EVENT_GFX_MAY_UNDERWATER_RS] =        &gObjectEventGraphicsInfo_MayUnderwater_RS,
+    [OBJ_EVENT_GFX_MAY_FISHING_RS] =           &gObjectEventGraphicsInfo_MayFishing_RS,
+    [OBJ_EVENT_GFX_MAY_WATERING_RS] =          &gObjectEventGraphicsInfo_MayWatering_RS,
+    [OBJ_EVENT_GFX_MAY_DECORATING_RS] =        &gObjectEventGraphicsInfo_MayDecorating_RS,
 };
 
 const struct ObjectEventGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = {

src/data/object_events/object_event_pic_tables.h

@@ -5979,4 +5979,264 @@ static const struct SpriteFrameImage sPicTable_Test[] = {
     overworld_frame(gObjectEventPic_Test, 4, 4, 3),
     overworld_frame(gObjectEventPic_Test, 4, 4, 4),
     overworld_frame(gObjectEventPic_Test, 4, 4, 5),
-};
+};
+
+//RS Outfit, Brendan
+static const struct SpriteFrameImage sPicTable_BrendanNormal_RS[] = {
+    overworld_frame(gObjectEventPic_BrendanNormal_RS, 2, 4, 0),
+    overworld_frame(gObjectEventPic_BrendanNormal_RS, 2, 4, 1),
+    overworld_frame(gObjectEventPic_BrendanNormal_RS, 2, 4, 2),
+    overworld_frame(gObjectEventPic_BrendanNormal_RS, 2, 4, 3),
+    overworld_frame(gObjectEventPic_BrendanNormal_RS, 2, 4, 4),
+    overworld_frame(gObjectEventPic_BrendanNormal_RS, 2, 4, 5),
+    overworld_frame(gObjectEventPic_BrendanNormal_RS, 2, 4, 6),
+    overworld_frame(gObjectEventPic_BrendanNormal_RS, 2, 4, 7),
+    overworld_frame(gObjectEventPic_BrendanNormal_RS, 2, 4, 8),
+    overworld_frame(gObjectEventPic_BrendanRunning_RS, 2, 4, 0),
+    overworld_frame(gObjectEventPic_BrendanRunning_RS, 2, 4, 1),
+    overworld_frame(gObjectEventPic_BrendanRunning_RS, 2, 4, 2),
+    overworld_frame(gObjectEventPic_BrendanRunning_RS, 2, 4, 3),
+    overworld_frame(gObjectEventPic_BrendanRunning_RS, 2, 4, 4),
+    overworld_frame(gObjectEventPic_BrendanRunning_RS, 2, 4, 5),
+    overworld_frame(gObjectEventPic_BrendanRunning_RS, 2, 4, 6),
+    overworld_frame(gObjectEventPic_BrendanRunning_RS, 2, 4, 7),
+    overworld_frame(gObjectEventPic_BrendanRunning_RS, 2, 4, 8),
+};
+
+static const struct SpriteFrameImage sPicTable_BrendanMachBike_RS[] = {
+    overworld_frame(gObjectEventPic_BrendanMachBike_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_BrendanMachBike_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_BrendanMachBike_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_BrendanMachBike_RS, 4, 4, 3),
+    overworld_frame(gObjectEventPic_BrendanMachBike_RS, 4, 4, 4),
+    overworld_frame(gObjectEventPic_BrendanMachBike_RS, 4, 4, 5),
+    overworld_frame(gObjectEventPic_BrendanMachBike_RS, 4, 4, 6),
+    overworld_frame(gObjectEventPic_BrendanMachBike_RS, 4, 4, 7),
+    overworld_frame(gObjectEventPic_BrendanMachBike_RS, 4, 4, 8),
+};
+
+static const struct SpriteFrameImage sPicTable_BrendanAcroBike_RS[] = {
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 3),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 4),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 5),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 6),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 7),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 8),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 9),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 10),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 11),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 12),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 13),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 14),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 15),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 16),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 17),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 18),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 19),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 20),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 21),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 22),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 23),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 24),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 25),
+    overworld_frame(gObjectEventPic_BrendanAcroBike_RS, 4, 4, 26),
+};
+
+static const struct SpriteFrameImage sPicTable_BrendanSurfing_RS[] = {
+    overworld_frame(gObjectEventPic_BrendanSurfing_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_BrendanSurfing_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_BrendanSurfing_RS, 4, 4, 4),
+    overworld_frame(gObjectEventPic_BrendanSurfing_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_BrendanSurfing_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_BrendanSurfing_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_BrendanSurfing_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_BrendanSurfing_RS, 4, 4, 4),
+    overworld_frame(gObjectEventPic_BrendanSurfing_RS, 4, 4, 4),
+    overworld_frame(gObjectEventPic_BrendanSurfing_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_BrendanSurfing_RS, 4, 4, 3),
+    overworld_frame(gObjectEventPic_BrendanSurfing_RS, 4, 4, 5),
+};
+
+static const struct SpriteFrameImage sPicTable_BrendanUnderwater_RS[] = {
+    overworld_frame(gObjectEventPic_BrendanUnderwater_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_BrendanUnderwater_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_BrendanUnderwater_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_BrendanUnderwater_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_BrendanUnderwater_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_BrendanUnderwater_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_BrendanUnderwater_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_BrendanUnderwater_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_BrendanUnderwater_RS, 4, 4, 2),
+};
+
+static const struct SpriteFrameImage sPicTable_BrendanFieldMove_RS[] = {
+    overworld_frame(gObjectEventPic_BrendanFieldMove_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_BrendanFieldMove_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_BrendanFieldMove_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_BrendanFieldMove_RS, 4, 4, 3),
+    overworld_frame(gObjectEventPic_BrendanFieldMove_RS, 4, 4, 4),
+};
+
+static const struct SpriteFrameImage sPicTable_BrendanFishing_RS[] = {
+    overworld_frame(gObjectEventPic_BrendanFishing_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_BrendanFishing_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_BrendanFishing_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_BrendanFishing_RS, 4, 4, 3),
+    overworld_frame(gObjectEventPic_BrendanFishing_RS, 4, 4, 4),
+    overworld_frame(gObjectEventPic_BrendanFishing_RS, 4, 4, 5),
+    overworld_frame(gObjectEventPic_BrendanFishing_RS, 4, 4, 6),
+    overworld_frame(gObjectEventPic_BrendanFishing_RS, 4, 4, 7),
+    overworld_frame(gObjectEventPic_BrendanFishing_RS, 4, 4, 8),
+    overworld_frame(gObjectEventPic_BrendanFishing_RS, 4, 4, 9),
+    overworld_frame(gObjectEventPic_BrendanFishing_RS, 4, 4, 10),
+    overworld_frame(gObjectEventPic_BrendanFishing_RS, 4, 4, 11),
+};
+
+static const struct SpriteFrameImage sPicTable_BrendanWatering_RS[] = {
+    overworld_frame(gObjectEventPic_BrendanWatering_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_BrendanWatering_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_BrendanWatering_RS, 4, 4, 4),
+    overworld_frame(gObjectEventPic_BrendanWatering_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_BrendanWatering_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_BrendanWatering_RS, 4, 4, 3),
+    overworld_frame(gObjectEventPic_BrendanWatering_RS, 4, 4, 3),
+    overworld_frame(gObjectEventPic_BrendanWatering_RS, 4, 4, 5),
+    overworld_frame(gObjectEventPic_BrendanWatering_RS, 4, 4, 5),
+};
+
+static const struct SpriteFrameImage sPicTable_BrendanDecorating_RS[] = {
+    obj_frame_tiles(gObjectEventPic_BrendanDecorating_RS),
+};
+
+//RS Outfit, May
+static const struct SpriteFrameImage sPicTable_MayNormal_RS[] = {
+    overworld_frame(gObjectEventPic_MayNormal_RS, 2, 4, 0),
+    overworld_frame(gObjectEventPic_MayNormal_RS, 2, 4, 1),
+    overworld_frame(gObjectEventPic_MayNormal_RS, 2, 4, 2),
+    overworld_frame(gObjectEventPic_MayNormal_RS, 2, 4, 3),
+    overworld_frame(gObjectEventPic_MayNormal_RS, 2, 4, 4),
+    overworld_frame(gObjectEventPic_MayNormal_RS, 2, 4, 5),
+    overworld_frame(gObjectEventPic_MayNormal_RS, 2, 4, 6),
+    overworld_frame(gObjectEventPic_MayNormal_RS, 2, 4, 7),
+    overworld_frame(gObjectEventPic_MayNormal_RS, 2, 4, 8),
+    overworld_frame(gObjectEventPic_MayRunning_RS, 2, 4, 0),
+    overworld_frame(gObjectEventPic_MayRunning_RS, 2, 4, 1),
+    overworld_frame(gObjectEventPic_MayRunning_RS, 2, 4, 2),
+    overworld_frame(gObjectEventPic_MayRunning_RS, 2, 4, 3),
+    overworld_frame(gObjectEventPic_MayRunning_RS, 2, 4, 4),
+    overworld_frame(gObjectEventPic_MayRunning_RS, 2, 4, 5),
+    overworld_frame(gObjectEventPic_MayRunning_RS, 2, 4, 6),
+    overworld_frame(gObjectEventPic_MayRunning_RS, 2, 4, 7),
+    overworld_frame(gObjectEventPic_MayRunning_RS, 2, 4, 8),
+};
+
+static const struct SpriteFrameImage sPicTable_MayMachBike_RS[] = {
+    overworld_frame(gObjectEventPic_MayMachBike_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_MayMachBike_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_MayMachBike_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_MayMachBike_RS, 4, 4, 3),
+    overworld_frame(gObjectEventPic_MayMachBike_RS, 4, 4, 4),
+    overworld_frame(gObjectEventPic_MayMachBike_RS, 4, 4, 5),
+    overworld_frame(gObjectEventPic_MayMachBike_RS, 4, 4, 6),
+    overworld_frame(gObjectEventPic_MayMachBike_RS, 4, 4, 7),
+    overworld_frame(gObjectEventPic_MayMachBike_RS, 4, 4, 8),
+};
+
+static const struct SpriteFrameImage sPicTable_MayAcroBike_RS[] = {
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 3),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 4),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 5),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 6),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 7),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 8),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 9),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 10),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 11),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 12),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 13),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 14),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 15),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 16),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 17),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 18),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 19),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 20),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 21),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 22),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 23),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 24),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 25),
+    overworld_frame(gObjectEventPic_MayAcroBike_RS, 4, 4, 26),
+};
+
+static const struct SpriteFrameImage sPicTable_MaySurfing_RS[] = {
+    overworld_frame(gObjectEventPic_MaySurfing_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_MaySurfing_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_MaySurfing_RS, 4, 4, 4),
+    overworld_frame(gObjectEventPic_MaySurfing_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_MaySurfing_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_MaySurfing_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_MaySurfing_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_MaySurfing_RS, 4, 4, 4),
+    overworld_frame(gObjectEventPic_MaySurfing_RS, 4, 4, 4),
+    overworld_frame(gObjectEventPic_MaySurfing_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_MaySurfing_RS, 4, 4, 3),
+    overworld_frame(gObjectEventPic_MaySurfing_RS, 4, 4, 5),
+};
+
+static const struct SpriteFrameImage sPicTable_MayUnderwater_RS[] = {
+    overworld_frame(gObjectEventPic_MayUnderwater_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_MayUnderwater_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_MayUnderwater_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_MayUnderwater_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_MayUnderwater_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_MayUnderwater_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_MayUnderwater_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_MayUnderwater_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_MayUnderwater_RS, 4, 4, 2),
+};
+
+static const struct SpriteFrameImage sPicTable_MayFieldMove_RS[] = {
+    overworld_frame(gObjectEventPic_MayFieldMove_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_MayFieldMove_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_MayFieldMove_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_MayFieldMove_RS, 4, 4, 3),
+    overworld_frame(gObjectEventPic_MayFieldMove_RS, 4, 4, 4),
+};
+
+static const struct SpriteFrameImage sPicTable_MayFishing_RS[] = {
+    overworld_frame(gObjectEventPic_MayFishing_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_MayFishing_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_MayFishing_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_MayFishing_RS, 4, 4, 3),
+    overworld_frame(gObjectEventPic_MayFishing_RS, 4, 4, 4),
+    overworld_frame(gObjectEventPic_MayFishing_RS, 4, 4, 5),
+    overworld_frame(gObjectEventPic_MayFishing_RS, 4, 4, 6),
+    overworld_frame(gObjectEventPic_MayFishing_RS, 4, 4, 7),
+    overworld_frame(gObjectEventPic_MayFishing_RS, 4, 4, 8),
+    overworld_frame(gObjectEventPic_MayFishing_RS, 4, 4, 9),
+    overworld_frame(gObjectEventPic_MayFishing_RS, 4, 4, 10),
+    overworld_frame(gObjectEventPic_MayFishing_RS, 4, 4, 11),
+};
+
+static const struct SpriteFrameImage sPicTable_MayWatering_RS[] = {
+    overworld_frame(gObjectEventPic_MayWatering_RS, 4, 4, 0),
+    overworld_frame(gObjectEventPic_MayWatering_RS, 4, 4, 2),
+    overworld_frame(gObjectEventPic_MayWatering_RS, 4, 4, 4),
+    overworld_frame(gObjectEventPic_MayWatering_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_MayWatering_RS, 4, 4, 1),
+    overworld_frame(gObjectEventPic_MayWatering_RS, 4, 4, 3),
+    overworld_frame(gObjectEventPic_MayWatering_RS, 4, 4, 3),
+    overworld_frame(gObjectEventPic_MayWatering_RS, 4, 4, 5),
+    overworld_frame(gObjectEventPic_MayWatering_RS, 4, 4, 5),
+};
+
+static const struct SpriteFrameImage sPicTable_MayDecorating_RS[] = {
+    obj_frame_tiles(gObjectEventPic_MayDecorating_RS),
+};

src/data/text/item_descriptions.h

@@ -1435,9 +1435,9 @@ static const u8 sHM08Desc[] = _(
 
 // FireRed/LeafGreen key items
 static const u8 sOaksParcelDesc[] = _(
-    "A parcel for PROF.\n"
-    "OAK from a POKéMON\n"
-    "MART's clerk.");
+    "A box that contains\n"
+    "a cool secondary\n"
+    "outfit.");
 
 static const u8 sPokeFluteDesc[] = _(
     "A sweet-sounding\n"

src/field_player_avatar.c

@@ -262,6 +262,18 @@ static const u8 sPlayerAvatarGfxIds[][2] =
     [PLAYER_AVATAR_STATE_WATERING]   = {OBJ_EVENT_GFX_BRENDAN_WATERING,   OBJ_EVENT_GFX_MAY_WATERING},
 };
 
+static const u8 sPlayerAvatarGfxIds_RS[][2] =
+{
+    [PLAYER_AVATAR_STATE_NORMAL]     = {OBJ_EVENT_GFX_BRENDAN_NORMAL_RS,     OBJ_EVENT_GFX_MAY_NORMAL_RS},
+    [PLAYER_AVATAR_STATE_MACH_BIKE]  = {OBJ_EVENT_GFX_BRENDAN_MACH_BIKE_RS,  OBJ_EVENT_GFX_MAY_MACH_BIKE_RS},
+    [PLAYER_AVATAR_STATE_ACRO_BIKE]  = {OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE_RS,  OBJ_EVENT_GFX_MAY_ACRO_BIKE_RS},
+    [PLAYER_AVATAR_STATE_SURFING]    = {OBJ_EVENT_GFX_BRENDAN_SURFING_RS,    OBJ_EVENT_GFX_MAY_SURFING_RS},
+    [PLAYER_AVATAR_STATE_UNDERWATER] = {OBJ_EVENT_GFX_BRENDAN_UNDERWATER_RS, OBJ_EVENT_GFX_MAY_UNDERWATER_RS},
+    [PLAYER_AVATAR_STATE_FIELD_MOVE] = {OBJ_EVENT_GFX_BRENDAN_FIELD_MOVE_RS, OBJ_EVENT_GFX_MAY_FIELD_MOVE_RS},
+    [PLAYER_AVATAR_STATE_FISHING]    = {OBJ_EVENT_GFX_BRENDAN_FISHING_RS,    OBJ_EVENT_GFX_MAY_FISHING_RS},
+    [PLAYER_AVATAR_STATE_WATERING]   = {OBJ_EVENT_GFX_BRENDAN_WATERING_RS,   OBJ_EVENT_GFX_MAY_WATERING_RS},
+};
+
 static const u8 sFRLGAvatarGfxIds[GENDER_COUNT] =
 {
     [MALE]   = OBJ_EVENT_GFX_RED,
@@ -294,6 +306,26 @@ static const u8 sPlayerAvatarGfxToStateFlag[GENDER_COUNT][5][2] =
     }
 };
 
+static const u8 sPlayerAvatarGfxToStateFlag_RS[GENDER_COUNT][5][2] =
+{
+    [MALE] =
+    {
+        {OBJ_EVENT_GFX_BRENDAN_NORMAL_RS,     PLAYER_AVATAR_FLAG_ON_FOOT},
+        {OBJ_EVENT_GFX_BRENDAN_MACH_BIKE_RS,  PLAYER_AVATAR_FLAG_MACH_BIKE},
+        {OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE_RS,  PLAYER_AVATAR_FLAG_ACRO_BIKE},
+        {OBJ_EVENT_GFX_BRENDAN_SURFING_RS,    PLAYER_AVATAR_FLAG_SURFING},
+        {OBJ_EVENT_GFX_BRENDAN_UNDERWATER_RS, PLAYER_AVATAR_FLAG_UNDERWATER},
+    },
+    [FEMALE] =
+    {
+        {OBJ_EVENT_GFX_MAY_NORMAL_RS,         PLAYER_AVATAR_FLAG_ON_FOOT},
+        {OBJ_EVENT_GFX_MAY_MACH_BIKE_RS,      PLAYER_AVATAR_FLAG_MACH_BIKE},
+        {OBJ_EVENT_GFX_MAY_ACRO_BIKE_RS,      PLAYER_AVATAR_FLAG_ACRO_BIKE},
+        {OBJ_EVENT_GFX_MAY_SURFING_RS,        PLAYER_AVATAR_FLAG_SURFING},
+        {OBJ_EVENT_GFX_MAY_UNDERWATER_RS,     PLAYER_AVATAR_FLAG_UNDERWATER},
+    }
+};
+
 static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) =  //Duplicate of sArrowWarpMetatileBehaviorChecks
 {
     [DIR_SOUTH - 1] = MetatileBehavior_IsSouthArrowWarp,
@@ -1328,7 +1360,10 @@ u16 GetRivalAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender)
 
 u16 GetPlayerAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender)
 {
-    return sPlayerAvatarGfxIds[state][gender];
+    if (FlagGet(FLAG_RS_OUTFIT))
+        return sPlayerAvatarGfxIds_RS[state][gender];
+    else
+        return sPlayerAvatarGfxIds[state][gender];
 }
 
 u16 GetFRLGAvatarGraphicsIdByGender(u8 gender)
@@ -1421,12 +1456,24 @@ static u8 GetPlayerAvatarStateTransitionByGraphicsId(u16 graphicsId, u8 gender)
 {
     u8 i;
 
-    for (i = 0; i < ARRAY_COUNT(sPlayerAvatarGfxToStateFlag[0]); i++)
+    if (FlagGet(FLAG_RS_OUTFIT))
     {
-        if (sPlayerAvatarGfxToStateFlag[gender][i][0] == graphicsId)
-            return sPlayerAvatarGfxToStateFlag[gender][i][1];
+        for (i = 0; i < ARRAY_COUNT(sPlayerAvatarGfxToStateFlag_RS[0]); i++)
+        {
+            if (sPlayerAvatarGfxToStateFlag_RS[gender][i][0] == graphicsId)
+                return sPlayerAvatarGfxToStateFlag_RS[gender][i][1];
+        }
+        return PLAYER_AVATAR_FLAG_ON_FOOT;
+    }
+    else
+    {
+        for (i = 0; i < ARRAY_COUNT(sPlayerAvatarGfxToStateFlag[0]); i++)
+        {
+            if (sPlayerAvatarGfxToStateFlag[gender][i][0] == graphicsId)
+                return sPlayerAvatarGfxToStateFlag[gender][i][1];
+        }
+        return PLAYER_AVATAR_FLAG_ON_FOOT;
     }
-    return PLAYER_AVATAR_FLAG_ON_FOOT;
 }
 
 u16 GetPlayerAvatarGraphicsIdByCurrentState(void)
@@ -1434,12 +1481,24 @@ u16 GetPlayerAvatarGraphicsIdByCurrentState(void)
     u8 i;
     u8 flags = gPlayerAvatar.flags;
 
-    for (i = 0; i < ARRAY_COUNT(sPlayerAvatarGfxToStateFlag[0]); i++)
+    if (FlagGet(FLAG_RS_OUTFIT))
     {
-        if (sPlayerAvatarGfxToStateFlag[gPlayerAvatar.gender][i][1] & flags)
-            return sPlayerAvatarGfxToStateFlag[gPlayerAvatar.gender][i][0];
+        for (i = 0; i < ARRAY_COUNT(sPlayerAvatarGfxToStateFlag_RS[0]); i++)
+        {
+            if (sPlayerAvatarGfxToStateFlag_RS[gPlayerAvatar.gender][i][1] & flags)
+                return sPlayerAvatarGfxToStateFlag_RS[gPlayerAvatar.gender][i][0];
+        }
+        return 0;
+    }
+    else
+    {
+        for (i = 0; i < ARRAY_COUNT(sPlayerAvatarGfxToStateFlag[0]); i++)
+        {
+            if (sPlayerAvatarGfxToStateFlag[gPlayerAvatar.gender][i][1] & flags)
+                return sPlayerAvatarGfxToStateFlag[gPlayerAvatar.gender][i][0];
+        }
+        return 0;
     }
-    return 0;
 }
 
 void SetPlayerAvatarExtraStateTransition(u16 graphicsId, u8 transitionFlag)

src/pokemon.c

@@ -2265,6 +2265,82 @@ static const struct SpriteTemplate sTrainerBackSpriteTemplates[] =
     },
 };
 
+static const struct SpriteTemplate sTrainerBackSpriteTemplates_RS[] =
+{
+    [TRAINER_BACK_PIC_BRENDAN] = {
+        .tileTag = TAG_NONE,
+        .paletteTag = 0,
+        .oam = &gOamData_BattleSpritePlayerSide,
+        .anims = NULL,
+        .images = gTrainerBackPicTable_RubySapphireBrendan,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
+        .callback = SpriteCB_BattleSpriteStartSlideLeft,
+    },
+    [TRAINER_BACK_PIC_MAY] = {
+        .tileTag = TAG_NONE,
+        .paletteTag = 0,
+        .oam = &gOamData_BattleSpritePlayerSide,
+        .anims = NULL,
+        .images = gTrainerBackPicTable_RubySapphireMay,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
+        .callback = SpriteCB_BattleSpriteStartSlideLeft,
+    },
+    [TRAINER_BACK_PIC_RED] = {
+        .tileTag = TAG_NONE,
+        .paletteTag = 0,
+        .oam = &gOamData_BattleSpritePlayerSide,
+        .anims = NULL,
+        .images = gTrainerBackPicTable_Red,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
+        .callback = SpriteCB_BattleSpriteStartSlideLeft,
+    },
+    [TRAINER_BACK_PIC_LEAF] = {
+        .tileTag = TAG_NONE,
+        .paletteTag = 0,
+        .oam = &gOamData_BattleSpritePlayerSide,
+        .anims = NULL,
+        .images = gTrainerBackPicTable_Leaf,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
+        .callback = SpriteCB_BattleSpriteStartSlideLeft,
+    },
+    [TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN] = {
+        .tileTag = TAG_NONE,
+        .paletteTag = 0,
+        .oam = &gOamData_BattleSpritePlayerSide,
+        .anims = NULL,
+        .images = gTrainerBackPicTable_RubySapphireBrendan,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
+        .callback = SpriteCB_BattleSpriteStartSlideLeft,
+    },
+    [TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY] = {
+        .tileTag = TAG_NONE,
+        .paletteTag = 0,
+        .oam = &gOamData_BattleSpritePlayerSide,
+        .anims = NULL,
+        .images = gTrainerBackPicTable_RubySapphireMay,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
+        .callback = SpriteCB_BattleSpriteStartSlideLeft,
+    },
+    [TRAINER_BACK_PIC_WALLY] = {
+        .tileTag = TAG_NONE,
+        .paletteTag = 0,
+        .oam = &gOamData_BattleSpritePlayerSide,
+        .anims = NULL,
+        .images = gTrainerBackPicTable_Wally,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
+        .callback = SpriteCB_BattleSpriteStartSlideLeft,
+    },
+    [TRAINER_BACK_PIC_STEVEN] = {
+        .tileTag = TAG_NONE,
+        .paletteTag = 0,
+        .oam = &gOamData_BattleSpritePlayerSide,
+        .anims = NULL,
+        .images = gTrainerBackPicTable_Steven,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
+        .callback = SpriteCB_BattleSpriteStartSlideLeft,
+    },
+};
+
 #define NUM_SECRET_BASE_CLASSES 5
 static const u8 sSecretBaseFacilityClasses[GENDER_COUNT][NUM_SECRET_BASE_CLASSES] =
 {
@@ -7155,7 +7231,10 @@ void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerPicId, u8 battlerPosition
     gMultiuseSpriteTemplate.paletteTag = trainerPicId;
     if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_PLAYER_RIGHT)
     {
-        gMultiuseSpriteTemplate = sTrainerBackSpriteTemplates[trainerPicId];
+        if (FlagGet(FLAG_RS_OUTFIT))
+            gMultiuseSpriteTemplate = sTrainerBackSpriteTemplates_RS[trainerPicId];
+        else
+            gMultiuseSpriteTemplate = sTrainerBackSpriteTemplates[trainerPicId];
         gMultiuseSpriteTemplate.anims = gTrainerBackAnimsPtrTable[trainerPicId];
     }
     else

src/trainer_card.c

@@ -315,6 +315,25 @@ static const u8 sTrainerPicFacilityClass[][GENDER_COUNT] =
     }
 };
 
+static const u8 sTrainerPicFacilityClass_RS[][GENDER_COUNT] =
+{
+    [CARD_TYPE_FRLG] =
+    {
+        [MALE]   = FACILITY_CLASS_RED,
+        [FEMALE] = FACILITY_CLASS_LEAF
+    },
+    [CARD_TYPE_RS] =
+    {
+        [MALE]   = FACILITY_CLASS_RS_BRENDAN,
+        [FEMALE] = FACILITY_CLASS_RS_MAY
+    },
+    [CARD_TYPE_EMERALD] =
+    {
+        [MALE]   = FACILITY_CLASS_RS_BRENDAN,
+        [FEMALE] = FACILITY_CLASS_RS_MAY
+    }
+};
+
 static bool8 (*const sTrainerCardFlipTasks[])(struct Task *) =
 {
     Task_BeginCardFlip,
@@ -1892,12 +1911,24 @@ static void CreateTrainerCardTrainerPic(void)
     }
     else
     {
-        CreateTrainerCardTrainerPicSprite(FacilityClassToPicIndex(sTrainerPicFacilityClass[sData->cardType][sData->trainerCard.gender]),
-                    TRUE,
-                    sTrainerPicOffset[sData->isHoenn][sData->trainerCard.gender][0],
-                    sTrainerPicOffset[sData->isHoenn][sData->trainerCard.gender][1],
-                    8,
-                    2);
+        if (FlagGet(FLAG_RS_OUTFIT))
+        {
+            CreateTrainerCardTrainerPicSprite(FacilityClassToPicIndex(sTrainerPicFacilityClass_RS[sData->cardType][sData->trainerCard.gender]),
+                        TRUE,
+                        sTrainerPicOffset[sData->isHoenn][sData->trainerCard.gender][0],
+                        sTrainerPicOffset[sData->isHoenn][sData->trainerCard.gender][1],
+                        8,
+                        2);
+        }
+        else
+        {
+            CreateTrainerCardTrainerPicSprite(FacilityClassToPicIndex(sTrainerPicFacilityClass[sData->cardType][sData->trainerCard.gender]),
+                        TRUE,
+                        sTrainerPicOffset[sData->isHoenn][sData->trainerCard.gender][0],
+                        sTrainerPicOffset[sData->isHoenn][sData->trainerCard.gender][1],
+                        8,
+                        2);
+        }
     }
 }