Merge branch 'master' into decompile_use_pokeblock

1 files changed, 0 insertions, 258 deletions

diff --git a/constants/map_object_constants.inc b/constants/map_object_constants.inc
deleted file mode 100644
index 50b171d9c..000000000
--- a/constants/map_object_constants.inc
+++ /dev/null
@@ -1,258 +0,0 @@
-	.set MAP_OBJ_GFX_BRENDAN_NORMAL,              0
-	.set MAP_OBJ_GFX_BRENDAN_MACH_BIKE,           1
-	.set MAP_OBJ_GFX_BRENDAN_SURFING,             2
-	.set MAP_OBJ_GFX_BRENDAN_FIELD_MOVE,          3
-	.set MAP_OBJ_GFX_QUINTY_PLUMP,                4
-	.set MAP_OBJ_GFX_LITTLE_BOY_1,                5
-	.set MAP_OBJ_GFX_LITTLE_GIRL_1,               6
-	.set MAP_OBJ_GFX_BOY_1,                       7
-	.set MAP_OBJ_GFX_GIRL_1,                      8
-	.set MAP_OBJ_GFX_BOY_2,                       9
-	.set MAP_OBJ_GFX_GIRL_2,                     10
-	.set MAP_OBJ_GFX_LITTLE_BOY_2,               11
-	.set MAP_OBJ_GFX_LITTLE_GIRL_2,              12
-	.set MAP_OBJ_GFX_BOY_3,                      13
-	.set MAP_OBJ_GFX_GIRL_3,                     14
-	.set MAP_OBJ_GFX_BOY_4,                      15
-	.set MAP_OBJ_GFX_WOMAN_1,                    16
-	.set MAP_OBJ_GFX_FAT_MAN,                    17
-	.set MAP_OBJ_GFX_WOMAN_2,                    18
-	.set MAP_OBJ_GFX_MAN_1,                      19
-	.set MAP_OBJ_GFX_WOMAN_3,                    20
-	.set MAP_OBJ_GFX_OLD_MAN_1,                  21
-	.set MAP_OBJ_GFX_OLD_WOMAN_1,                22
-	.set MAP_OBJ_GFX_MAN_2,                      23
-	.set MAP_OBJ_GFX_WOMAN_4,                    24
-	.set MAP_OBJ_GFX_MAN_3,                      25
-	.set MAP_OBJ_GFX_WOMAN_5,                    26
-	.set MAP_OBJ_GFX_COOK,                       27
-	.set MAP_OBJ_GFX_WOMAN_6,                    28
-	.set MAP_OBJ_GFX_OLD_MAN_2,                  29
-	.set MAP_OBJ_GFX_OLD_WOMAN_2,                30
-	.set MAP_OBJ_GFX_CAMPER,                     31
-	.set MAP_OBJ_GFX_PICNICKER,                  32
-	.set MAP_OBJ_GFX_MAN_4,                      33
-	.set MAP_OBJ_GFX_WOMAN_7,                    34
-	.set MAP_OBJ_GFX_YOUNGSTER,                  35
-	.set MAP_OBJ_GFX_BUG_CATCHER,                36
-	.set MAP_OBJ_GFX_PSYCHIC_M,                  37
-	.set MAP_OBJ_GFX_SCHOOL_KID_M,               38
-	.set MAP_OBJ_GFX_MANIAC,                     39
-	.set MAP_OBJ_GFX_HEX_MANIAC,                 40
-	.set MAP_OBJ_GFX_RAYQUAZA_1,                 41
-	.set MAP_OBJ_GFX_SWIMMER_M,                  42
-	.set MAP_OBJ_GFX_SWIMMER_F,                  43
-	.set MAP_OBJ_GFX_BLACK_BELT,                 44
-	.set MAP_OBJ_GFX_BEAUTY,                     45
-	.set MAP_OBJ_GFX_SCIENTIST_1,                46
-	.set MAP_OBJ_GFX_LASS,                       47
-	.set MAP_OBJ_GFX_GENTLEMAN,                  48
-	.set MAP_OBJ_GFX_SAILOR,                     49
-	.set MAP_OBJ_GFX_FISHERMAN,                  50
-	.set MAP_OBJ_GFX_RUNNING_TRIATHLETE_M,       51
-	.set MAP_OBJ_GFX_RUNNING_TRIATHLETE_F,       52
-	.set MAP_OBJ_GFX_TUBER_F,                    53
-	.set MAP_OBJ_GFX_TUBER_M,                    54
-	.set MAP_OBJ_GFX_HIKER,                      55
-	.set MAP_OBJ_GFX_CYCLING_TRIATHLETE_M,       56
-	.set MAP_OBJ_GFX_CYCLING_TRIATHLETE_F,       57
-	.set MAP_OBJ_GFX_NURSE,                      58
-	.set MAP_OBJ_GFX_ITEM_BALL,                  59
-	.set MAP_OBJ_GFX_BERRY_TREE,                 60
-	.set MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES,    61
-	.set MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES,     62
-	.set MAP_OBJ_GFX_BRENDAN_ACRO_BIKE,          63
-	.set MAP_OBJ_GFX_PROF_BIRCH,                 64
-	.set MAP_OBJ_GFX_MAN_5,                      65
-	.set MAP_OBJ_GFX_MAN_6,                      66
-	.set MAP_OBJ_GFX_REPORTER_M,                 67
-	.set MAP_OBJ_GFX_REPORTER_F,                 68
-	.set MAP_OBJ_GFX_BARD,                       69
-	.set MAP_OBJ_GFX_ANABEL,                     70
-	.set MAP_OBJ_GFX_TUCKER,                     71
-	.set MAP_OBJ_GFX_GRETA,                      72
-	.set MAP_OBJ_GFX_SPENSER,                    73
-	.set MAP_OBJ_GFX_NOLAND,                     74
-	.set MAP_OBJ_GFX_LUCY,                       75
-	.set MAP_OBJ_GFX_UNUSED_NATU_DOLL,           76
-	.set MAP_OBJ_GFX_UNUSED_MAGNEMITE_DOLL,      77
-	.set MAP_OBJ_GFX_UNUSED_SQUIRTLE_DOLL,       78
-	.set MAP_OBJ_GFX_UNUSED_WOOPER_DOLL,         79
-	.set MAP_OBJ_GFX_UNUSED_PIKACHU_DOLL,        80
-	.set MAP_OBJ_GFX_UNUSED_PORYGON2_DOLL,       81
-	.set MAP_OBJ_GFX_CUTTABLE_TREE,              82
-	.set MAP_OBJ_GFX_MART_EMPLOYEE,              83
-	.set MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN,         84
-	.set MAP_OBJ_GFX_TEALA,                      85
-	.set MAP_OBJ_GFX_BREAKABLE_ROCK,             86
-	.set MAP_OBJ_GFX_PUSHABLE_BOULDER,           87
-	.set MAP_OBJ_GFX_MR_BRINEYS_BOAT,            88
-	.set MAP_OBJ_GFX_MAY_NORMAL,                 89
-	.set MAP_OBJ_GFX_MAY_MACH_BIKE,              90
-	.set MAP_OBJ_GFX_MAY_ACRO_BIKE,              91
-	.set MAP_OBJ_GFX_MAY_SURFING,                92
-	.set MAP_OBJ_GFX_MAY_FIELD_MOVE,             93
-	.set MAP_OBJ_GFX_TRUCK,                      94
-	.set MAP_OBJ_GFX_VIGAROTH_CARRYING_BOX,      95
-	.set MAP_OBJ_GFX_VIGAROTH_FACING_AWAY,       96
-	.set MAP_OBJ_GFX_BIRCHS_BAG,                 97
-	.set MAP_OBJ_GFX_ZIGZAGOON_1,                98
-	.set MAP_OBJ_GFX_ARTIST,                     99
-	.set MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL,      100
-	.set MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE,   101
-	.set MAP_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE,   102
-	.set MAP_OBJ_GFX_RIVAL_BRENDAN_SURFING,     103
-	.set MAP_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE,  104
-	.set MAP_OBJ_GFX_RIVAL_MAY_NORMAL,          105
-	.set MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE,       106
-	.set MAP_OBJ_GFX_RIVAL_MAY_ACRO_BIKE,       107
-	.set MAP_OBJ_GFX_RIVAL_MAY_SURFING,         108
-	.set MAP_OBJ_GFX_RIVAL_MAY_FIELD_MOVE,      109
-	.set MAP_OBJ_GFX_CAMERAMAN,                 110
-	.set MAP_OBJ_GFX_BRENDAN_UNDERWATER,        111
-	.set MAP_OBJ_GFX_MAY_UNDERWATER,            112
-	.set MAP_OBJ_GFX_MOVING_BOX,                113
-	.set MAP_OBJ_GFX_CABLE_CAR,                 114
-	.set MAP_OBJ_GFX_SCIENTIST_2,               115
-	.set MAP_OBJ_GFX_MAN_7,                     116
-	.set MAP_OBJ_GFX_AQUA_MEMBER_M,             117
-	.set MAP_OBJ_GFX_AQUA_MEMBER_F,             118
-	.set MAP_OBJ_GFX_MAGMA_MEMBER_M,            119
-	.set MAP_OBJ_GFX_MAGMA_MEMBER_F,            120
-	.set MAP_OBJ_GFX_SIDNEY,                    121
-	.set MAP_OBJ_GFX_PHOEBE,                    122
-	.set MAP_OBJ_GFX_GLACIA,                    123
-	.set MAP_OBJ_GFX_DRAKE,                     124
-	.set MAP_OBJ_GFX_ROXANNE,                   125
-	.set MAP_OBJ_GFX_BRAWLY,                    126
-	.set MAP_OBJ_GFX_WATTSON,                   127
-	.set MAP_OBJ_GFX_FLANNERY,                  128
-	.set MAP_OBJ_GFX_NORMAN,                    129
-	.set MAP_OBJ_GFX_WINONA,                    130
-	.set MAP_OBJ_GFX_LIZA,                      131
-	.set MAP_OBJ_GFX_TATE,                      132
-	.set MAP_OBJ_GFX_WALLACE,                   133
-	.set MAP_OBJ_GFX_STEVEN,                    134
-	.set MAP_OBJ_GFX_WALLY,                     135
-	.set MAP_OBJ_GFX_LITTLE_BOY_3,              136
-	.set MAP_OBJ_GFX_BRENDAN_FISHING,           137
-	.set MAP_OBJ_GFX_MAY_FISHING,               138
-	.set MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN,     139
-	.set MAP_OBJ_GFX_SS_TIDAL,                  140
-	.set MAP_OBJ_GFX_SUBMARINE_SHADOW,          141
-	.set MAP_OBJ_GFX_PICHU_DOLL,                142
-	.set MAP_OBJ_GFX_PIKACHU_DOLL,              143
-	.set MAP_OBJ_GFX_MARILL_DOLL,               144
-	.set MAP_OBJ_GFX_TOGEPI_DOLL,               145
-	.set MAP_OBJ_GFX_CYNDAQUIL_DOLL,            146
-	.set MAP_OBJ_GFX_CHIKORITA_DOLL,            147
-	.set MAP_OBJ_GFX_TOTODILE_DOLL,             148
-	.set MAP_OBJ_GFX_JIGGLYPUFF_DOLL,           149
-	.set MAP_OBJ_GFX_MEOWTH_DOLL,               150
-	.set MAP_OBJ_GFX_CLEFAIRY_DOLL,             151
-	.set MAP_OBJ_GFX_DITTO_DOLL,                152
-	.set MAP_OBJ_GFX_SMOOCHUM_DOLL,             153
-	.set MAP_OBJ_GFX_TREECKO_DOLL,              154
-	.set MAP_OBJ_GFX_TORCHIC_DOLL,              155
-	.set MAP_OBJ_GFX_MUDKIP_DOLL,               156
-	.set MAP_OBJ_GFX_DUSKULL_DOLL,              157
-	.set MAP_OBJ_GFX_WYNAUT_DOLL,               158
-	.set MAP_OBJ_GFX_BALTOY_DOLL,               159
-	.set MAP_OBJ_GFX_KECLEON_DOLL,              160
-	.set MAP_OBJ_GFX_AZURILL_DOLL,              161
-	.set MAP_OBJ_GFX_SKITTY_DOLL,               162
-	.set MAP_OBJ_GFX_SWABLU_DOLL,               163
-	.set MAP_OBJ_GFX_GULPIN_DOLL,               164
-	.set MAP_OBJ_GFX_LOTAD_DOLL,                165
-	.set MAP_OBJ_GFX_SEEDOT_DOLL,               166
-	.set MAP_OBJ_GFX_PIKA_CUSHION,              167
-	.set MAP_OBJ_GFX_ROUND_CUSHION,             168
-	.set MAP_OBJ_GFX_KISS_CUSHION,              169
-	.set MAP_OBJ_GFX_ZIGZAG_CUSHION,            170
-	.set MAP_OBJ_GFX_SPIN_CUSHION,              171
-	.set MAP_OBJ_GFX_DIAMOND_CUSHION,           172
-	.set MAP_OBJ_GFX_BALL_CUSHION,              173
-	.set MAP_OBJ_GFX_GRASS_CUSHION,             174
-	.set MAP_OBJ_GFX_FIRE_CUSHION,              175
-	.set MAP_OBJ_GFX_WATER_CUSHION,             176
-	.set MAP_OBJ_GFX_BIG_SNORLAX_DOLL,          177
-	.set MAP_OBJ_GFX_BIG_RHYDON_DOLL,           178
-	.set MAP_OBJ_GFX_BIG_LAPRAS_DOLL,           179
-	.set MAP_OBJ_GFX_BIG_VENUSAUR_DOLL,         180
-	.set MAP_OBJ_GFX_BIG_CHARIZARD_DOLL,        181
-	.set MAP_OBJ_GFX_BIG_BLASTOISE_DOLL,        182
-	.set MAP_OBJ_GFX_BIG_WAILMER_DOLL,          183
-	.set MAP_OBJ_GFX_BIG_REGIROCK_DOLL,         184
-	.set MAP_OBJ_GFX_BIG_REGICE_DOLL,           185
-	.set MAP_OBJ_GFX_BIG_REGISTEEL_DOLL,        186
-	.set MAP_OBJ_GFX_LATIAS,                    187
-	.set MAP_OBJ_GFX_LATIOS,                    188
-	.set MAP_OBJ_GFX_BOY_5,                     189
-	.set MAP_OBJ_GFX_CONTEST_JUDGE,             190
-	.set MAP_OBJ_GFX_BRENDAN_WATERING,          191
-	.set MAP_OBJ_GFX_MAY_WATERING,              192
-	.set MAP_OBJ_GFX_BRENDAN_DECORATING,        193
-	.set MAP_OBJ_GFX_MAY_DECORATING,            194
-	.set MAP_OBJ_GFX_ARCHIE,                    195
-	.set MAP_OBJ_GFX_MAXIE,                     196
-	.set MAP_OBJ_GFX_KYOGRE_1,                  197
-	.set MAP_OBJ_GFX_GROUDON_1,                 198
-	.set MAP_OBJ_GFX_FOSSIL,                    199
-	.set MAP_OBJ_GFX_REGIROCK,                  200
-	.set MAP_OBJ_GFX_REGICE,                    201
-	.set MAP_OBJ_GFX_REGISTEEL,                 202
-	.set MAP_OBJ_GFX_SKITTY,                    203
-	.set MAP_OBJ_GFX_KECLEON_1,                 204
-	.set MAP_OBJ_GFX_KYOGRE_2,                  205
-	.set MAP_OBJ_GFX_GROUDON_2,                 206
-	.set MAP_OBJ_GFX_RAYQUAZA_2,                207
-	.set MAP_OBJ_GFX_ZIGZAGOON_2,               208
-	.set MAP_OBJ_GFX_PIKACHU,                   209
-	.set MAP_OBJ_GFX_AZUMARILL,                 210
-	.set MAP_OBJ_GFX_WINGULL,                   211
-	.set MAP_OBJ_GFX_KECLEON_2,                 212
-	.set MAP_OBJ_GFX_TUBER_M_SWIMMING,          213
-	.set MAP_OBJ_GFX_AZURILL,                   214
-	.set MAP_OBJ_GFX_MOM,                       215
-	.set MAP_OBJ_GFX_LINK_BRENDAN,              216
-	.set MAP_OBJ_GFX_LINK_MAY,                  217
-	.set MAP_OBJ_GFX_JUAN,                      218
-	.set MAP_OBJ_GFX_SCOTT,                     219
-	.set MAP_OBJ_GFX_POOCHYENA,                 220
-	.set MAP_OBJ_GFX_KYOGRE_3,                  221
-	.set MAP_OBJ_GFX_GROUDON_3,                 222
-	.set MAP_OBJ_GFX_MYSTERY_GIFT_MAN,          223
-	.set MAP_OBJ_GFX_TRICK_HOUSE_STATUE,        224
-	.set MAP_OBJ_GFX_KIRLIA,                    225
-	.set MAP_OBJ_GFX_DUSCLOPS,                  226
-	.set MAP_OBJ_GFX_UNION_ROOM_NURSE,          227
-	.set MAP_OBJ_GFX_SUDOWOODO,                 228
-	.set MAP_OBJ_GFX_MEW,                       229
-	.set MAP_OBJ_GFX_RED,                       230
-	.set MAP_OBJ_GFX_LEAF,                      231
-	.set MAP_OBJ_GFX_DEOXYS,                    232
-	.set MAP_OBJ_GFX_DEOXYS_TRIANGLE,           233
-	.set MAP_OBJ_GFX_BRANDON,                   234
-	.set MAP_OBJ_GFX_LINK_RS_BRENDAN,           235
-	.set MAP_OBJ_GFX_LINK_RS_MAY,               236
-	.set MAP_OBJ_GFX_LUGIA,                     237
-	.set MAP_OBJ_GFX_HOOH,                      238
-	.set MAP_OBJ_GFX_BARD_2,                    239
-	.set MAP_OBJ_GFX_HIPSTER,                   240
-	.set MAP_OBJ_GFX_TRADER,                    241
-	.set MAP_OBJ_GFX_STORYTELLER,               242
-	.set MAP_OBJ_GFX_GIDDY,                     243
-	.set MAP_OBJ_GFX_PLACEHOLDER_1,             244
-	.set MAP_OBJ_GFX_PLACEHOLDER_2,             245
-
-	.set SHADOW_SIZE_S,  0
-	.set SHADOW_SIZE_M,  1
-	.set SHADOW_SIZE_L,  2
-	.set SHADOW_SIZE_XL, 3
-
-	.set F_INANIMATE,                       1 << 6
-	.set F_DISABLE_REFLECTION_PALETTE_LOAD, 1 << 7
-
-	.set TRACKS_NONE,      0
-	.set TRACKS_FOOT,      1
-	.set TRACKS_BIKE_TIRE, 2