Merge remote-tracking branch 'pret/master'

1 files changed, 0 insertions, 239 deletions

diff --git a/include/map_object_constants.h b/include/map_object_constants.h
deleted file mode 100644
index 79482b54a..000000000
--- a/include/map_object_constants.h
+++ /dev/null
@@ -1,239 +0,0 @@
-#ifndef GUARD_MAP_OBJECT_CONSTANTS_H
-#define GUARD_MAP_OBJECT_CONSTANTS_H
-
-enum
-{
-    MAP_OBJ_GFX_BRENDAN_NORMAL,
-    MAP_OBJ_GFX_BRENDAN_MACH_BIKE,
-    MAP_OBJ_GFX_BRENDAN_SURFING,
-    MAP_OBJ_GFX_BRENDAN_FIELD_MOVE,
-    MAP_OBJ_GFX_QUINTY_PLUMP,
-    MAP_OBJ_GFX_LITTLE_BOY_1,
-    MAP_OBJ_GFX_LITTLE_GIRL_1,
-    MAP_OBJ_GFX_BOY_1,
-    MAP_OBJ_GFX_GIRL_1,
-    MAP_OBJ_GFX_BOY_2,
-    MAP_OBJ_GFX_GIRL_2,
-    MAP_OBJ_GFX_LITTLE_BOY_2,
-    MAP_OBJ_GFX_LITTLE_GIRL_2,
-    MAP_OBJ_GFX_BOY_3,
-    MAP_OBJ_GFX_GIRL_3,
-    MAP_OBJ_GFX_BOY_4,
-    MAP_OBJ_GFX_WOMAN_1,
-    MAP_OBJ_GFX_FAT_MAN,
-    MAP_OBJ_GFX_WOMAN_2,
-    MAP_OBJ_GFX_MAN_1,
-    MAP_OBJ_GFX_WOMAN_3,
-    MAP_OBJ_GFX_OLD_MAN_1,
-    MAP_OBJ_GFX_OLD_WOMAN_1,
-    MAP_OBJ_GFX_MAN_2,
-    MAP_OBJ_GFX_WOMAN_4,
-    MAP_OBJ_GFX_MAN_3,
-    MAP_OBJ_GFX_WOMAN_5,
-    MAP_OBJ_GFX_COOK,
-    MAP_OBJ_GFX_WOMAN_6,
-    MAP_OBJ_GFX_OLD_MAN_2,
-    MAP_OBJ_GFX_OLD_WOMAN_2,
-    MAP_OBJ_GFX_CAMPER,
-    MAP_OBJ_GFX_PICNICKER,
-    MAP_OBJ_GFX_MAN_4,
-    MAP_OBJ_GFX_WOMAN_7,
-    MAP_OBJ_GFX_YOUNGSTER,
-    MAP_OBJ_GFX_BUG_CATCHER,
-    MAP_OBJ_GFX_PSYCHIC_M,
-    MAP_OBJ_GFX_SCHOOL_KID_M,
-    MAP_OBJ_GFX_MANIAC,
-    MAP_OBJ_GFX_HEX_MANIAC,
-    MAP_OBJ_GFX_WOMAN_8,
-    MAP_OBJ_GFX_SWIMMER_M,
-    MAP_OBJ_GFX_SWIMMER_F,
-    MAP_OBJ_GFX_BLACK_BELT,
-    MAP_OBJ_GFX_BEAUTY,
-    MAP_OBJ_GFX_SCIENTIST_1,
-    MAP_OBJ_GFX_LASS,
-    MAP_OBJ_GFX_GENTLEMAN,
-    MAP_OBJ_GFX_SAILOR,
-    MAP_OBJ_GFX_FISHERMAN,
-    MAP_OBJ_GFX_RUNNING_TRIATHLETE_M,
-    MAP_OBJ_GFX_RUNNING_TRIATHLETE_F,
-    MAP_OBJ_GFX_TUBER_F,
-    MAP_OBJ_GFX_TUBER_M,
-    MAP_OBJ_GFX_HIKER,
-    MAP_OBJ_GFX_CYCLING_TRIATHLETE_M,
-    MAP_OBJ_GFX_CYCLING_TRIATHLETE_F,
-    MAP_OBJ_GFX_NURSE,
-    MAP_OBJ_GFX_ITEM_BALL,
-    MAP_OBJ_GFX_BERRY_TREE,
-    MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES,
-    MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES,
-    MAP_OBJ_GFX_BRENDAN_ACRO_BIKE,
-    MAP_OBJ_GFX_PROF_BIRCH,
-    MAP_OBJ_GFX_MAN_5,
-    MAP_OBJ_GFX_MAN_6,
-    MAP_OBJ_GFX_REPORTER_M,
-    MAP_OBJ_GFX_REPORTER_F,
-    MAP_OBJ_GFX_BARD,
-    MAP_OBJ_GFX_HIPSTER,
-    MAP_OBJ_GFX_TRADER,
-    MAP_OBJ_GFX_STORYTELLER,
-    MAP_OBJ_GFX_GIDDY,
-    MAP_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_1,
-    MAP_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_2,
-    MAP_OBJ_GFX_UNUSED_NATU_DOLL,
-    MAP_OBJ_GFX_UNUSED_MAGNEMITE_DOLL,
-    MAP_OBJ_GFX_UNUSED_SQUIRTLE_DOLL,
-    MAP_OBJ_GFX_UNUSED_WOOPER_DOLL,
-    MAP_OBJ_GFX_UNUSED_PIKACHU_DOLL,
-    MAP_OBJ_GFX_UNUSED_PORYGON2_DOLL,
-    MAP_OBJ_GFX_CUTTABLE_TREE,
-    MAP_OBJ_GFX_MART_EMPLOYEE,
-    MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN,
-    MAP_OBJ_GFX_TEALA,
-    MAP_OBJ_GFX_BREAKABLE_ROCK,
-    MAP_OBJ_GFX_PUSHABLE_BOULDER,
-    MAP_OBJ_GFX_MR_BRINEYS_BOAT,
-    MAP_OBJ_GFX_MAY_NORMAL,
-    MAP_OBJ_GFX_MAY_MACH_BIKE,
-    MAP_OBJ_GFX_MAY_ACRO_BIKE,
-    MAP_OBJ_GFX_MAY_SURFING,
-    MAP_OBJ_GFX_MAY_FIELD_MOVE,
-    MAP_OBJ_GFX_TRUCK,
-    MAP_OBJ_GFX_MACHOKE_CARRYING_BOX,
-    MAP_OBJ_GFX_MACHOKE_FACING_AWAY,
-    MAP_OBJ_GFX_BIRCHS_BAG,
-    MAP_OBJ_GFX_POOCHYENA,
-    MAP_OBJ_GFX_ARTIST,
-    MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL,
-    MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE,
-    MAP_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE,
-    MAP_OBJ_GFX_RIVAL_BRENDAN_SURFING,
-    MAP_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE,
-    MAP_OBJ_GFX_RIVAL_MAY_NORMAL,
-    MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE,
-    MAP_OBJ_GFX_RIVAL_MAY_ACRO_BIKE,
-    MAP_OBJ_GFX_RIVAL_MAY_SURFING,
-    MAP_OBJ_GFX_RIVAL_MAY_FIELD_MOVE,
-    MAP_OBJ_GFX_CAMERAMAN,
-    MAP_OBJ_GFX_BRENDAN_UNDERWATER,
-    MAP_OBJ_GFX_MAY_UNDERWATER,
-    MAP_OBJ_GFX_MOVING_BOX,
-    MAP_OBJ_GFX_CABLE_CAR,
-    MAP_OBJ_GFX_SCIENTIST_2,
-    MAP_OBJ_GFX_MAN_7,
-    MAP_OBJ_GFX_AQUA_MEMBER_M,
-    MAP_OBJ_GFX_AQUA_MEMBER_F,
-    MAP_OBJ_GFX_MAGMA_MEMBER_M,
-    MAP_OBJ_GFX_MAGMA_MEMBER_F,
-    MAP_OBJ_GFX_SIDNEY,
-    MAP_OBJ_GFX_PHOEBE,
-    MAP_OBJ_GFX_GLACIA,
-    MAP_OBJ_GFX_DRAKE,
-    MAP_OBJ_GFX_ROXANNE,
-    MAP_OBJ_GFX_BRAWLY,
-    MAP_OBJ_GFX_WATTSON,
-    MAP_OBJ_GFX_FLANNERY,
-    MAP_OBJ_GFX_NORMAN,
-    MAP_OBJ_GFX_WINONA,
-    MAP_OBJ_GFX_LIZA,
-    MAP_OBJ_GFX_TATE,
-    MAP_OBJ_GFX_WALLACE,
-    MAP_OBJ_GFX_STEVEN,
-    MAP_OBJ_GFX_WALLY,
-    MAP_OBJ_GFX_LITTLE_BOY_3,
-    MAP_OBJ_GFX_BRENDAN_FISHING,
-    MAP_OBJ_GFX_MAY_FISHING,
-    MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN,
-    MAP_OBJ_GFX_SS_TIDAL,
-    MAP_OBJ_GFX_SUBMARINE_SHADOW,
-    MAP_OBJ_GFX_PICHU_DOLL,
-    MAP_OBJ_GFX_PIKACHU_DOLL,
-    MAP_OBJ_GFX_MARILL_DOLL,
-    MAP_OBJ_GFX_TOGEPI_DOLL,
-    MAP_OBJ_GFX_CYNDAQUIL_DOLL,
-    MAP_OBJ_GFX_CHIKORITA_DOLL,
-    MAP_OBJ_GFX_TOTODILE_DOLL,
-    MAP_OBJ_GFX_JIGGLYPUFF_DOLL,
-    MAP_OBJ_GFX_MEOWTH_DOLL,
-    MAP_OBJ_GFX_CLEFAIRY_DOLL,
-    MAP_OBJ_GFX_DITTO_DOLL,
-    MAP_OBJ_GFX_SMOOCHUM_DOLL,
-    MAP_OBJ_GFX_TREECKO_DOLL,
-    MAP_OBJ_GFX_TORCHIC_DOLL,
-    MAP_OBJ_GFX_MUDKIP_DOLL,
-    MAP_OBJ_GFX_DUSKULL_DOLL,
-    MAP_OBJ_GFX_WYNAUT_DOLL,
-    MAP_OBJ_GFX_BALTOY_DOLL,
-    MAP_OBJ_GFX_KECLEON_DOLL,
-    MAP_OBJ_GFX_AZURILL_DOLL,
-    MAP_OBJ_GFX_SKITTY_DOLL,
-    MAP_OBJ_GFX_SWABLU_DOLL,
-    MAP_OBJ_GFX_GULPIN_DOLL,
-    MAP_OBJ_GFX_LOTAD_DOLL,
-    MAP_OBJ_GFX_SEEDOT_DOLL,
-    MAP_OBJ_GFX_PIKA_CUSHION,
-    MAP_OBJ_GFX_ROUND_CUSHION,
-    MAP_OBJ_GFX_KISS_CUSHION,
-    MAP_OBJ_GFX_ZIGZAG_CUSHION,
-    MAP_OBJ_GFX_SPIN_CUSHION,
-    MAP_OBJ_GFX_DIAMOND_CUSHION,
-    MAP_OBJ_GFX_BALL_CUSHION,
-    MAP_OBJ_GFX_GRASS_CUSHION,
-    MAP_OBJ_GFX_FIRE_CUSHION,
-    MAP_OBJ_GFX_WATER_CUSHION,
-    MAP_OBJ_GFX_BIG_SNORLAX_DOLL,
-    MAP_OBJ_GFX_BIG_RHYDON_DOLL,
-    MAP_OBJ_GFX_BIG_LAPRAS_DOLL,
-    MAP_OBJ_GFX_BIG_VENUSAUR_DOLL,
-    MAP_OBJ_GFX_BIG_CHARIZARD_DOLL,
-    MAP_OBJ_GFX_BIG_BLASTOISE_DOLL,
-    MAP_OBJ_GFX_BIG_WAILMER_DOLL,
-    MAP_OBJ_GFX_BIG_REGIROCK_DOLL,
-    MAP_OBJ_GFX_BIG_REGICE_DOLL,
-    MAP_OBJ_GFX_BIG_REGISTEEL_DOLL,
-    MAP_OBJ_GFX_LATIAS,
-    MAP_OBJ_GFX_LATIOS,
-    MAP_OBJ_GFX_BOY_5,
-    MAP_OBJ_GFX_CONTEST_JUDGE,
-    MAP_OBJ_GFX_BRENDAN_WATERING,
-    MAP_OBJ_GFX_MAY_WATERING,
-    MAP_OBJ_GFX_BRENDAN_DECORATING,
-    MAP_OBJ_GFX_MAY_DECORATING,
-    MAP_OBJ_GFX_ARCHIE,
-    MAP_OBJ_GFX_MAXIE,
-    MAP_OBJ_GFX_KYOGRE_1,
-    MAP_OBJ_GFX_GROUDON_1,
-    MAP_OBJ_GFX_FOSSIL,
-    MAP_OBJ_GFX_REGIROCK,
-    MAP_OBJ_GFX_REGICE,
-    MAP_OBJ_GFX_REGISTEEL,
-    MAP_OBJ_GFX_SKITTY,
-    MAP_OBJ_GFX_KECLEON_1,
-    MAP_OBJ_GFX_KYOGRE_2,
-    MAP_OBJ_GFX_GROUDON_2,
-    MAP_OBJ_GFX_RAYQUAZA,
-    MAP_OBJ_GFX_ZIGZAGOON,
-    MAP_OBJ_GFX_PIKACHU,
-    MAP_OBJ_GFX_AZUMARILL,
-    MAP_OBJ_GFX_WINGULL,
-    MAP_OBJ_GFX_KECLEON_2,
-    MAP_OBJ_GFX_TUBER_M_SWIMMING,
-    MAP_OBJ_GFX_AZURILL,
-    MAP_OBJ_GFX_MOM,
-    MAP_OBJ_GFX_LINK_BRENDAN,
-    MAP_OBJ_GFX_LINK_MAY,
-};
-
-enum {
-    SHADOW_SIZE_S,
-    SHADOW_SIZE_M,
-    SHADOW_SIZE_L,
-    SHADOW_SIZE_XL
-};
-
-enum {
-    TRACKS_NONE,
-    TRACKS_FOOT,
-    TRACKS_BIKE_TIRE
-};
-
-#endif // GUARD_MAP_OBJECT_CONSTANTS_H