fix merge conflicts, evo scene

1 files changed, 101 insertions, 0 deletions

diff --git a/include/trainer_front_sprites.h b/include/trainer_front_sprites.h
new file mode 100644
index 000000000..3259bec88
--- /dev/null
+++ b/include/trainer_front_sprites.h
@@ -0,0 +1,101 @@
+#ifndef GUARD_TRAINER_FRONT_SPRITES_H
+#define GUARD_TRAINER_FRONT_SPRITES_H
+
+enum
+{
+    TRAINER_FRONT_PIC_HIKER,
+    TRAINER_FRONT_PIC_AQUA_GRUNT_M,
+    TRAINER_FRONT_PIC_PKMN_BREEDER_F,
+    TRAINER_FRONT_PIC_COOLTRAINER_M,
+    TRAINER_FRONT_PIC_BIRD_KEEPER,
+    TRAINER_FRONT_PIC_COLLECTOR,
+    TRAINER_FRONT_PIC_AQUA_GRUNT_F,
+    TRAINER_FRONT_PIC_SWIMMER_M,
+    TRAINER_FRONT_PIC_MAGMA_GRUNT_M,
+    TRAINER_FRONT_PIC_EXPERT_M,
+    TRAINER_FRONT_PIC_AQUA_ADMIN_M,
+    TRAINER_FRONT_PIC_BLACK_BELT,
+    TRAINER_FRONT_PIC_AQUA_ADMIN_F,
+    TRAINER_FRONT_PIC_AQUA_LEADER,
+    TRAINER_FRONT_PIC_HEX_MANIAC,
+    TRAINER_FRONT_PIC_AROMA_LADY,
+    TRAINER_FRONT_PIC_RUIN_MANIAC,
+    TRAINER_FRONT_PIC_INTERVIEWER,
+    TRAINER_FRONT_PIC_TUBER_F,
+    TRAINER_FRONT_PIC_TUBER_M,
+    TRAINER_FRONT_PIC_COOLTRAINER_F,
+    TRAINER_FRONT_PIC_LADY,
+    TRAINER_FRONT_PIC_BEAUTY,
+    TRAINER_FRONT_PIC_RICH_BOY,
+    TRAINER_FRONT_PIC_EXPERT_F,
+    TRAINER_FRONT_PIC_POKE_MANIAC,
+    TRAINER_FRONT_PIC_MAGMA_GRUNT_F,
+    TRAINER_FRONT_PIC_GUITARIST,
+    TRAINER_FRONT_PIC_KINDLER,
+    TRAINER_FRONT_PIC_CAMPER,
+    TRAINER_FRONT_PIC_PICNICKER,
+    TRAINER_FRONT_PIC_BUG_MANIAC,
+    TRAINER_FRONT_PIC_PKMN_BREEDER_M,
+    TRAINER_FRONT_PIC_PSYCHIC_M,
+    TRAINER_FRONT_PIC_PSYCHIC_F,
+    TRAINER_FRONT_PIC_GENTLEMAN,
+    TRAINER_FRONT_PIC_SIDNEY,
+    TRAINER_FRONT_PIC_PHOEBE,
+    TRAINER_FRONT_PIC_GLACIA,
+    TRAINER_FRONT_PIC_DRAKE,
+    TRAINER_FRONT_PIC_ROXANNE,
+    TRAINER_FRONT_PIC_BRAWLY,
+    TRAINER_FRONT_PIC_WATTSON,
+    TRAINER_FRONT_PIC_FLANNERY,
+    TRAINER_FRONT_PIC_NORMAN,
+    TRAINER_FRONT_PIC_WINONA,
+    TRAINER_FRONT_PIC_TATE_LIZA,
+    TRAINER_FRONT_PIC_JUAN,
+    TRAINER_FRONT_PIC_SCHOOL_KID_M,
+    TRAINER_FRONT_PIC_SCHOOL_KID_F,
+    TRAINER_FRONT_PIC_SR_JR,
+    TRAINER_FRONT_PIC_POKÉFAN_M,
+    TRAINER_FRONT_PIC_POKÉFAN_F,
+    TRAINER_FRONT_PIC_YOUNGSTER,
+    TRAINER_FRONT_PIC_WALLACE,
+    TRAINER_FRONT_PIC_FISHERMAN,
+    TRAINER_FRONT_PIC_TRIATHLETE_BIKER_M,
+    TRAINER_FRONT_PIC_TRIATHLETE_BIKER_F,
+    TRAINER_FRONT_PIC_TRIATHLETE_JOGGER_M,
+    TRAINER_FRONT_PIC_TRIATHLETE_JOGGER_F,
+    TRAINER_FRONT_PIC_TRIATHLETE_SWIMMER_M,
+    TRAINER_FRONT_PIC_TRIATHLETE_SWIMMER_F,
+    TRAINER_FRONT_PIC_DRAGON_TAMER,
+    TRAINER_FRONT_PIC_NINJA_BOY,
+    TRAINER_FRONT_PIC_BATTLE_GIRL,
+    TRAINER_FRONT_PIC_PARASOL_LADY,
+    TRAINER_FRONT_PIC_SWIMMER_F,
+    TRAINER_FRONT_PIC_TWINS,
+    TRAINER_FRONT_PIC_SAILOR,
+    TRAINER_FRONT_PIC_MAGMA_ADMIN_M,
+    TRAINER_FRONT_PIC_WALLY,
+    TRAINER_FRONT_PIC_BRENDAN_E,
+    TRAINER_FRONT_PIC_MAY_E,
+    TRAINER_FRONT_PIC_BUG_CATCHER,
+    TRAINER_FRONT_PIC_PKMN_RANGER_M,
+    TRAINER_FRONT_PIC_PKMN_RANGER_F,
+    TRAINER_FRONT_PIC_MAGMA_LEADER,
+    TRAINER_FRONT_PIC_LASS,
+    TRAINER_FRONT_PIC_YOUNG_COUPLE,
+    TRAINER_FRONT_PIC_OLD_COUPLE,
+    TRAINER_FRONT_PIC_SIS_AND_BRO,
+    TRAINER_FRONT_PIC_STEVEN,
+    TRAINER_FRONT_PIC_ANABEL,
+    TRAINER_FRONT_PIC_TUCKER,
+    TRAINER_FRONT_PIC_SPENSER,
+    TRAINER_FRONT_PIC_GRETA,
+    TRAINER_FRONT_PIC_NOLAND,
+    TRAINER_FRONT_PIC_LUCY,
+    TRAINER_FRONT_PIC_BRANDON,
+    TRAINER_FRONT_PIC_RED,
+    TRAINER_FRONT_PIC_LEAF,
+    TRAINER_FRONT_PIC_BRENDAN_RS,
+    TRAINER_FRONT_PIC_MAY_RS
+};
+
+#endif // GUARD_TRAINER_FRONT_SPRITES_H