From 98ca62cf91e7e0bd33f09edfc848a62061015aee Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 21 Nov 2019 01:15:34 -0500 Subject: Standardize Event Object to Object Event --- include/constants/event_objects.h | 474 +++++++++++++++++++------------------- include/constants/flags.h | 2 +- include/constants/vars.h | 4 +- 3 files changed, 240 insertions(+), 240 deletions(-) (limited to 'include/constants') diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 32c7b7625..eeb18e7cb 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -1,244 +1,244 @@ -#ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H -#define GUARD_CONSTANTS_EVENT_OBJECTS_H +#ifndef GUARD_CONSTANTS_OBJECT_EVENTS_H +#define GUARD_CONSTANTS_OBJECT_EVENTS_H -#define EVENT_OBJ_GFX_BRENDAN_NORMAL 0 -#define EVENT_OBJ_GFX_BRENDAN_MACH_BIKE 1 -#define EVENT_OBJ_GFX_BRENDAN_SURFING 2 -#define EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE 3 -#define EVENT_OBJ_GFX_QUINTY_PLUMP 4 -#define EVENT_OBJ_GFX_LITTLE_BOY_1 5 -#define EVENT_OBJ_GFX_LITTLE_GIRL_1 6 -#define EVENT_OBJ_GFX_BOY_1 7 -#define EVENT_OBJ_GFX_GIRL_1 8 -#define EVENT_OBJ_GFX_BOY_2 9 -#define EVENT_OBJ_GFX_GIRL_2 10 -#define EVENT_OBJ_GFX_LITTLE_BOY_2 11 -#define EVENT_OBJ_GFX_LITTLE_GIRL_2 12 -#define EVENT_OBJ_GFX_BOY_3 13 -#define EVENT_OBJ_GFX_GIRL_3 14 -#define EVENT_OBJ_GFX_BOY_4 15 -#define EVENT_OBJ_GFX_WOMAN_1 16 -#define EVENT_OBJ_GFX_FAT_MAN 17 -#define EVENT_OBJ_GFX_WOMAN_2 18 -#define EVENT_OBJ_GFX_MAN_1 19 -#define EVENT_OBJ_GFX_WOMAN_3 20 -#define EVENT_OBJ_GFX_OLD_MAN_1 21 -#define EVENT_OBJ_GFX_OLD_WOMAN_1 22 -#define EVENT_OBJ_GFX_MAN_2 23 -#define EVENT_OBJ_GFX_WOMAN_4 24 -#define EVENT_OBJ_GFX_MAN_3 25 -#define EVENT_OBJ_GFX_WOMAN_5 26 -#define EVENT_OBJ_GFX_COOK 27 -#define EVENT_OBJ_GFX_WOMAN_6 28 -#define EVENT_OBJ_GFX_OLD_MAN_2 29 -#define EVENT_OBJ_GFX_OLD_WOMAN_2 30 -#define EVENT_OBJ_GFX_CAMPER 31 -#define EVENT_OBJ_GFX_PICNICKER 32 -#define EVENT_OBJ_GFX_MAN_4 33 -#define EVENT_OBJ_GFX_WOMAN_7 34 -#define EVENT_OBJ_GFX_YOUNGSTER 35 -#define EVENT_OBJ_GFX_BUG_CATCHER 36 -#define EVENT_OBJ_GFX_PSYCHIC_M 37 -#define EVENT_OBJ_GFX_SCHOOL_KID_M 38 -#define EVENT_OBJ_GFX_MANIAC 39 -#define EVENT_OBJ_GFX_HEX_MANIAC 40 -#define EVENT_OBJ_GFX_WOMAN_8 41 -#define EVENT_OBJ_GFX_SWIMMER_M 42 -#define EVENT_OBJ_GFX_SWIMMER_F 43 -#define EVENT_OBJ_GFX_BLACK_BELT 44 -#define EVENT_OBJ_GFX_BEAUTY 45 -#define EVENT_OBJ_GFX_SCIENTIST_1 46 -#define EVENT_OBJ_GFX_LASS 47 -#define EVENT_OBJ_GFX_GENTLEMAN 48 -#define EVENT_OBJ_GFX_SAILOR 49 -#define EVENT_OBJ_GFX_FISHERMAN 50 -#define EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M 51 -#define EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F 52 -#define EVENT_OBJ_GFX_TUBER_F 53 -#define EVENT_OBJ_GFX_TUBER_M 54 -#define EVENT_OBJ_GFX_HIKER 55 -#define EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M 56 -#define EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F 57 -#define EVENT_OBJ_GFX_NURSE 58 -#define EVENT_OBJ_GFX_ITEM_BALL 59 -#define EVENT_OBJ_GFX_BERRY_TREE 60 -#define EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES 61 -#define EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES 62 -#define EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE 63 -#define EVENT_OBJ_GFX_PROF_BIRCH 64 -#define EVENT_OBJ_GFX_MAN_5 65 -#define EVENT_OBJ_GFX_MAN_6 66 -#define EVENT_OBJ_GFX_REPORTER_M 67 -#define EVENT_OBJ_GFX_REPORTER_F 68 -#define EVENT_OBJ_GFX_BARD 69 -#define EVENT_OBJ_GFX_HIPSTER 70 -#define EVENT_OBJ_GFX_TRADER 71 -#define EVENT_OBJ_GFX_STORYTELLER 72 -#define EVENT_OBJ_GFX_GIDDY 73 -#define EVENT_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_1 74 -#define EVENT_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_2 75 -#define EVENT_OBJ_GFX_UNUSED_NATU_DOLL 76 -#define EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL 77 -#define EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL 78 -#define EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL 79 -#define EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL 80 -#define EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL 81 -#define EVENT_OBJ_GFX_CUTTABLE_TREE 82 -#define EVENT_OBJ_GFX_MART_EMPLOYEE 83 -#define EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN 84 -#define EVENT_OBJ_GFX_TEALA 85 -#define EVENT_OBJ_GFX_BREAKABLE_ROCK 86 -#define EVENT_OBJ_GFX_PUSHABLE_BOULDER 87 -#define EVENT_OBJ_GFX_MR_BRINEYS_BOAT 88 -#define EVENT_OBJ_GFX_MAY_NORMAL 89 -#define EVENT_OBJ_GFX_MAY_MACH_BIKE 90 -#define EVENT_OBJ_GFX_MAY_ACRO_BIKE 91 -#define EVENT_OBJ_GFX_MAY_SURFING 92 -#define EVENT_OBJ_GFX_MAY_FIELD_MOVE 93 -#define EVENT_OBJ_GFX_TRUCK 94 -#define EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX 95 -#define EVENT_OBJ_GFX_MACHOKE_FACING_AWAY 96 -#define EVENT_OBJ_GFX_BIRCHS_BAG 97 -#define EVENT_OBJ_GFX_POOCHYENA 98 -#define EVENT_OBJ_GFX_ARTIST 99 -#define EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL 100 -#define EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE 101 -#define EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE 102 -#define EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING 103 -#define EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE 104 -#define EVENT_OBJ_GFX_RIVAL_MAY_NORMAL 105 -#define EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE 106 -#define EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE 107 -#define EVENT_OBJ_GFX_RIVAL_MAY_SURFING 108 -#define EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE 109 -#define EVENT_OBJ_GFX_CAMERAMAN 110 -#define EVENT_OBJ_GFX_BRENDAN_UNDERWATER 111 -#define EVENT_OBJ_GFX_MAY_UNDERWATER 112 -#define EVENT_OBJ_GFX_MOVING_BOX 113 -#define EVENT_OBJ_GFX_CABLE_CAR 114 -#define EVENT_OBJ_GFX_SCIENTIST_2 115 -#define EVENT_OBJ_GFX_MAN_7 116 -#define EVENT_OBJ_GFX_AQUA_MEMBER_M 117 -#define EVENT_OBJ_GFX_AQUA_MEMBER_F 118 -#define EVENT_OBJ_GFX_MAGMA_MEMBER_M 119 -#define EVENT_OBJ_GFX_MAGMA_MEMBER_F 120 -#define EVENT_OBJ_GFX_SIDNEY 121 -#define EVENT_OBJ_GFX_PHOEBE 122 -#define EVENT_OBJ_GFX_GLACIA 123 -#define EVENT_OBJ_GFX_DRAKE 124 -#define EVENT_OBJ_GFX_ROXANNE 125 -#define EVENT_OBJ_GFX_BRAWLY 126 -#define EVENT_OBJ_GFX_WATTSON 127 -#define EVENT_OBJ_GFX_FLANNERY 128 -#define EVENT_OBJ_GFX_NORMAN 129 -#define EVENT_OBJ_GFX_WINONA 130 -#define EVENT_OBJ_GFX_LIZA 131 -#define EVENT_OBJ_GFX_TATE 132 -#define EVENT_OBJ_GFX_WALLACE 133 -#define EVENT_OBJ_GFX_STEVEN 134 -#define EVENT_OBJ_GFX_WALLY 135 -#define EVENT_OBJ_GFX_LITTLE_BOY_3 136 -#define EVENT_OBJ_GFX_BRENDAN_FISHING 137 -#define EVENT_OBJ_GFX_MAY_FISHING 138 -#define EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN 139 -#define EVENT_OBJ_GFX_SS_TIDAL 140 -#define EVENT_OBJ_GFX_SUBMARINE_SHADOW 141 -#define EVENT_OBJ_GFX_PICHU_DOLL 142 -#define EVENT_OBJ_GFX_PIKACHU_DOLL 143 -#define EVENT_OBJ_GFX_MARILL_DOLL 144 -#define EVENT_OBJ_GFX_TOGEPI_DOLL 145 -#define EVENT_OBJ_GFX_CYNDAQUIL_DOLL 146 -#define EVENT_OBJ_GFX_CHIKORITA_DOLL 147 -#define EVENT_OBJ_GFX_TOTODILE_DOLL 148 -#define EVENT_OBJ_GFX_JIGGLYPUFF_DOLL 149 -#define EVENT_OBJ_GFX_MEOWTH_DOLL 150 -#define EVENT_OBJ_GFX_CLEFAIRY_DOLL 151 -#define EVENT_OBJ_GFX_DITTO_DOLL 152 -#define EVENT_OBJ_GFX_SMOOCHUM_DOLL 153 -#define EVENT_OBJ_GFX_TREECKO_DOLL 154 -#define EVENT_OBJ_GFX_TORCHIC_DOLL 155 -#define EVENT_OBJ_GFX_MUDKIP_DOLL 156 -#define EVENT_OBJ_GFX_DUSKULL_DOLL 157 -#define EVENT_OBJ_GFX_WYNAUT_DOLL 158 -#define EVENT_OBJ_GFX_BALTOY_DOLL 159 -#define EVENT_OBJ_GFX_KECLEON_DOLL 160 -#define EVENT_OBJ_GFX_AZURILL_DOLL 161 -#define EVENT_OBJ_GFX_SKITTY_DOLL 162 -#define EVENT_OBJ_GFX_SWABLU_DOLL 163 -#define EVENT_OBJ_GFX_GULPIN_DOLL 164 -#define EVENT_OBJ_GFX_LOTAD_DOLL 165 -#define EVENT_OBJ_GFX_SEEDOT_DOLL 166 -#define EVENT_OBJ_GFX_PIKA_CUSHION 167 -#define EVENT_OBJ_GFX_ROUND_CUSHION 168 -#define EVENT_OBJ_GFX_KISS_CUSHION 169 -#define EVENT_OBJ_GFX_ZIGZAG_CUSHION 170 -#define EVENT_OBJ_GFX_SPIN_CUSHION 171 -#define EVENT_OBJ_GFX_DIAMOND_CUSHION 172 -#define EVENT_OBJ_GFX_BALL_CUSHION 173 -#define EVENT_OBJ_GFX_GRASS_CUSHION 174 -#define EVENT_OBJ_GFX_FIRE_CUSHION 175 -#define EVENT_OBJ_GFX_WATER_CUSHION 176 -#define EVENT_OBJ_GFX_BIG_SNORLAX_DOLL 177 -#define EVENT_OBJ_GFX_BIG_RHYDON_DOLL 178 -#define EVENT_OBJ_GFX_BIG_LAPRAS_DOLL 179 -#define EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL 180 -#define EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL 181 -#define EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL 182 -#define EVENT_OBJ_GFX_BIG_WAILMER_DOLL 183 -#define EVENT_OBJ_GFX_BIG_REGIROCK_DOLL 184 -#define EVENT_OBJ_GFX_BIG_REGICE_DOLL 185 -#define EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL 186 -#define EVENT_OBJ_GFX_LATIAS 187 -#define EVENT_OBJ_GFX_LATIOS 188 -#define EVENT_OBJ_GFX_BOY_5 189 -#define EVENT_OBJ_GFX_CONTEST_JUDGE 190 -#define EVENT_OBJ_GFX_BRENDAN_WATERING 191 -#define EVENT_OBJ_GFX_MAY_WATERING 192 -#define EVENT_OBJ_GFX_BRENDAN_DECORATING 193 -#define EVENT_OBJ_GFX_MAY_DECORATING 194 -#define EVENT_OBJ_GFX_ARCHIE 195 -#define EVENT_OBJ_GFX_MAXIE 196 -#define EVENT_OBJ_GFX_KYOGRE_1 197 -#define EVENT_OBJ_GFX_GROUDON_1 198 -#define EVENT_OBJ_GFX_FOSSIL 199 -#define EVENT_OBJ_GFX_REGIROCK 200 -#define EVENT_OBJ_GFX_REGICE 201 -#define EVENT_OBJ_GFX_REGISTEEL 202 -#define EVENT_OBJ_GFX_SKITTY 203 -#define EVENT_OBJ_GFX_KECLEON_1 204 -#define EVENT_OBJ_GFX_KYOGRE_2 205 -#define EVENT_OBJ_GFX_GROUDON_2 206 -#define EVENT_OBJ_GFX_RAYQUAZA 207 -#define EVENT_OBJ_GFX_ZIGZAGOON 208 -#define EVENT_OBJ_GFX_PIKACHU 209 -#define EVENT_OBJ_GFX_AZUMARILL 210 -#define EVENT_OBJ_GFX_WINGULL 211 -#define EVENT_OBJ_GFX_KECLEON_2 212 -#define EVENT_OBJ_GFX_TUBER_M_SWIMMING 213 -#define EVENT_OBJ_GFX_AZURILL 214 -#define EVENT_OBJ_GFX_MOM 215 -#define EVENT_OBJ_GFX_LINK_BRENDAN 216 -#define EVENT_OBJ_GFX_LINK_MAY 217 +#define OBJ_EVENT_GFX_BRENDAN_NORMAL 0 +#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_LITTLE_BOY_1 5 +#define OBJ_EVENT_GFX_LITTLE_GIRL_1 6 +#define OBJ_EVENT_GFX_BOY_1 7 +#define OBJ_EVENT_GFX_GIRL_1 8 +#define OBJ_EVENT_GFX_BOY_2 9 +#define OBJ_EVENT_GFX_GIRL_2 10 +#define OBJ_EVENT_GFX_LITTLE_BOY_2 11 +#define OBJ_EVENT_GFX_LITTLE_GIRL_2 12 +#define OBJ_EVENT_GFX_BOY_3 13 +#define OBJ_EVENT_GFX_GIRL_3 14 +#define OBJ_EVENT_GFX_BOY_4 15 +#define OBJ_EVENT_GFX_WOMAN_1 16 +#define OBJ_EVENT_GFX_FAT_MAN 17 +#define OBJ_EVENT_GFX_WOMAN_2 18 +#define OBJ_EVENT_GFX_MAN_1 19 +#define OBJ_EVENT_GFX_WOMAN_3 20 +#define OBJ_EVENT_GFX_OLD_MAN_1 21 +#define OBJ_EVENT_GFX_OLD_WOMAN_1 22 +#define OBJ_EVENT_GFX_MAN_2 23 +#define OBJ_EVENT_GFX_WOMAN_4 24 +#define OBJ_EVENT_GFX_MAN_3 25 +#define OBJ_EVENT_GFX_WOMAN_5 26 +#define OBJ_EVENT_GFX_COOK 27 +#define OBJ_EVENT_GFX_WOMAN_6 28 +#define OBJ_EVENT_GFX_OLD_MAN_2 29 +#define OBJ_EVENT_GFX_OLD_WOMAN_2 30 +#define OBJ_EVENT_GFX_CAMPER 31 +#define OBJ_EVENT_GFX_PICNICKER 32 +#define OBJ_EVENT_GFX_MAN_4 33 +#define OBJ_EVENT_GFX_WOMAN_7 34 +#define OBJ_EVENT_GFX_YOUNGSTER 35 +#define OBJ_EVENT_GFX_BUG_CATCHER 36 +#define OBJ_EVENT_GFX_PSYCHIC_M 37 +#define OBJ_EVENT_GFX_SCHOOL_KID_M 38 +#define OBJ_EVENT_GFX_MANIAC 39 +#define OBJ_EVENT_GFX_HEX_MANIAC 40 +#define OBJ_EVENT_GFX_WOMAN_8 41 +#define OBJ_EVENT_GFX_SWIMMER_M 42 +#define OBJ_EVENT_GFX_SWIMMER_F 43 +#define OBJ_EVENT_GFX_BLACK_BELT 44 +#define OBJ_EVENT_GFX_BEAUTY 45 +#define OBJ_EVENT_GFX_SCIENTIST_1 46 +#define OBJ_EVENT_GFX_LASS 47 +#define OBJ_EVENT_GFX_GENTLEMAN 48 +#define OBJ_EVENT_GFX_SAILOR 49 +#define OBJ_EVENT_GFX_FISHERMAN 50 +#define OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M 51 +#define OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F 52 +#define OBJ_EVENT_GFX_TUBER_F 53 +#define OBJ_EVENT_GFX_TUBER_M 54 +#define OBJ_EVENT_GFX_HIKER 55 +#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_BERRY_TREE 60 +#define OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES 61 +#define OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES 62 +#define OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE 63 +#define OBJ_EVENT_GFX_PROF_BIRCH 64 +#define OBJ_EVENT_GFX_MAN_5 65 +#define OBJ_EVENT_GFX_MAN_6 66 +#define OBJ_EVENT_GFX_REPORTER_M 67 +#define OBJ_EVENT_GFX_REPORTER_F 68 +#define OBJ_EVENT_GFX_BARD 69 +#define OBJ_EVENT_GFX_HIPSTER 70 +#define OBJ_EVENT_GFX_TRADER 71 +#define OBJ_EVENT_GFX_STORYTELLER 72 +#define OBJ_EVENT_GFX_GIDDY 73 +#define OBJ_EVENT_GFX_UNUSED_MAUVILLE_OLD_MAN_1 74 +#define OBJ_EVENT_GFX_UNUSED_MAUVILLE_OLD_MAN_2 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_CUTTABLE_TREE 82 +#define OBJ_EVENT_GFX_MART_EMPLOYEE 83 +#define OBJ_EVENT_GFX_ROOFTOP_SALE_WOMAN 84 +#define OBJ_EVENT_GFX_TEALA 85 +#define OBJ_EVENT_GFX_BREAKABLE_ROCK 86 +#define OBJ_EVENT_GFX_PUSHABLE_BOULDER 87 +#define OBJ_EVENT_GFX_MR_BRINEYS_BOAT 88 +#define OBJ_EVENT_GFX_MAY_NORMAL 89 +#define OBJ_EVENT_GFX_MAY_MACH_BIKE 90 +#define OBJ_EVENT_GFX_MAY_ACRO_BIKE 91 +#define OBJ_EVENT_GFX_MAY_SURFING 92 +#define OBJ_EVENT_GFX_MAY_FIELD_MOVE 93 +#define OBJ_EVENT_GFX_TRUCK 94 +#define OBJ_EVENT_GFX_MACHOKE_CARRYING_BOX 95 +#define OBJ_EVENT_GFX_MACHOKE_FACING_AWAY 96 +#define OBJ_EVENT_GFX_BIRCHS_BAG 97 +#define OBJ_EVENT_GFX_POOCHYENA 98 +#define OBJ_EVENT_GFX_ARTIST 99 +#define OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL 100 +#define OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE 101 +#define OBJ_EVENT_GFX_RIVAL_BRENDAN_ACRO_BIKE 102 +#define OBJ_EVENT_GFX_RIVAL_BRENDAN_SURFING 103 +#define OBJ_EVENT_GFX_RIVAL_BRENDAN_FIELD_MOVE 104 +#define OBJ_EVENT_GFX_RIVAL_MAY_NORMAL 105 +#define OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE 106 +#define OBJ_EVENT_GFX_RIVAL_MAY_ACRO_BIKE 107 +#define OBJ_EVENT_GFX_RIVAL_MAY_SURFING 108 +#define OBJ_EVENT_GFX_RIVAL_MAY_FIELD_MOVE 109 +#define OBJ_EVENT_GFX_CAMERAMAN 110 +#define OBJ_EVENT_GFX_BRENDAN_UNDERWATER 111 +#define OBJ_EVENT_GFX_MAY_UNDERWATER 112 +#define OBJ_EVENT_GFX_MOVING_BOX 113 +#define OBJ_EVENT_GFX_CABLE_CAR 114 +#define OBJ_EVENT_GFX_SCIENTIST_2 115 +#define OBJ_EVENT_GFX_MAN_7 116 +#define OBJ_EVENT_GFX_AQUA_MEMBER_M 117 +#define OBJ_EVENT_GFX_AQUA_MEMBER_F 118 +#define OBJ_EVENT_GFX_MAGMA_MEMBER_M 119 +#define OBJ_EVENT_GFX_MAGMA_MEMBER_F 120 +#define OBJ_EVENT_GFX_SIDNEY 121 +#define OBJ_EVENT_GFX_PHOEBE 122 +#define OBJ_EVENT_GFX_GLACIA 123 +#define OBJ_EVENT_GFX_DRAKE 124 +#define OBJ_EVENT_GFX_ROXANNE 125 +#define OBJ_EVENT_GFX_BRAWLY 126 +#define OBJ_EVENT_GFX_WATTSON 127 +#define OBJ_EVENT_GFX_FLANNERY 128 +#define OBJ_EVENT_GFX_NORMAN 129 +#define OBJ_EVENT_GFX_WINONA 130 +#define OBJ_EVENT_GFX_LIZA 131 +#define OBJ_EVENT_GFX_TATE 132 +#define OBJ_EVENT_GFX_WALLACE 133 +#define OBJ_EVENT_GFX_STEVEN 134 +#define OBJ_EVENT_GFX_WALLY 135 +#define OBJ_EVENT_GFX_LITTLE_BOY_3 136 +#define OBJ_EVENT_GFX_BRENDAN_FISHING 137 +#define OBJ_EVENT_GFX_MAY_FISHING 138 +#define OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN 139 +#define OBJ_EVENT_GFX_SS_TIDAL 140 +#define OBJ_EVENT_GFX_SUBMARINE_SHADOW 141 +#define OBJ_EVENT_GFX_PICHU_DOLL 142 +#define OBJ_EVENT_GFX_PIKACHU_DOLL 143 +#define OBJ_EVENT_GFX_MARILL_DOLL 144 +#define OBJ_EVENT_GFX_TOGEPI_DOLL 145 +#define OBJ_EVENT_GFX_CYNDAQUIL_DOLL 146 +#define OBJ_EVENT_GFX_CHIKORITA_DOLL 147 +#define OBJ_EVENT_GFX_TOTODILE_DOLL 148 +#define OBJ_EVENT_GFX_JIGGLYPUFF_DOLL 149 +#define OBJ_EVENT_GFX_MEOWTH_DOLL 150 +#define OBJ_EVENT_GFX_CLEFAIRY_DOLL 151 +#define OBJ_EVENT_GFX_DITTO_DOLL 152 +#define OBJ_EVENT_GFX_SMOOCHUM_DOLL 153 +#define OBJ_EVENT_GFX_TREECKO_DOLL 154 +#define OBJ_EVENT_GFX_TORCHIC_DOLL 155 +#define OBJ_EVENT_GFX_MUDKIP_DOLL 156 +#define OBJ_EVENT_GFX_DUSKULL_DOLL 157 +#define OBJ_EVENT_GFX_WYNAUT_DOLL 158 +#define OBJ_EVENT_GFX_BALTOY_DOLL 159 +#define OBJ_EVENT_GFX_KECLEON_DOLL 160 +#define OBJ_EVENT_GFX_AZURILL_DOLL 161 +#define OBJ_EVENT_GFX_SKITTY_DOLL 162 +#define OBJ_EVENT_GFX_SWABLU_DOLL 163 +#define OBJ_EVENT_GFX_GULPIN_DOLL 164 +#define OBJ_EVENT_GFX_LOTAD_DOLL 165 +#define OBJ_EVENT_GFX_SEEDOT_DOLL 166 +#define OBJ_EVENT_GFX_PIKA_CUSHION 167 +#define OBJ_EVENT_GFX_ROUND_CUSHION 168 +#define OBJ_EVENT_GFX_KISS_CUSHION 169 +#define OBJ_EVENT_GFX_ZIGZAG_CUSHION 170 +#define OBJ_EVENT_GFX_SPIN_CUSHION 171 +#define OBJ_EVENT_GFX_DIAMOND_CUSHION 172 +#define OBJ_EVENT_GFX_BALL_CUSHION 173 +#define OBJ_EVENT_GFX_GRASS_CUSHION 174 +#define OBJ_EVENT_GFX_FIRE_CUSHION 175 +#define OBJ_EVENT_GFX_WATER_CUSHION 176 +#define OBJ_EVENT_GFX_BIG_SNORLAX_DOLL 177 +#define OBJ_EVENT_GFX_BIG_RHYDON_DOLL 178 +#define OBJ_EVENT_GFX_BIG_LAPRAS_DOLL 179 +#define OBJ_EVENT_GFX_BIG_VENUSAUR_DOLL 180 +#define OBJ_EVENT_GFX_BIG_CHARIZARD_DOLL 181 +#define OBJ_EVENT_GFX_BIG_BLASTOISE_DOLL 182 +#define OBJ_EVENT_GFX_BIG_WAILMER_DOLL 183 +#define OBJ_EVENT_GFX_BIG_REGIROCK_DOLL 184 +#define OBJ_EVENT_GFX_BIG_REGICE_DOLL 185 +#define OBJ_EVENT_GFX_BIG_REGISTEEL_DOLL 186 +#define OBJ_EVENT_GFX_LATIAS 187 +#define OBJ_EVENT_GFX_LATIOS 188 +#define OBJ_EVENT_GFX_BOY_5 189 +#define OBJ_EVENT_GFX_CONTEST_JUDGE 190 +#define OBJ_EVENT_GFX_BRENDAN_WATERING 191 +#define OBJ_EVENT_GFX_MAY_WATERING 192 +#define OBJ_EVENT_GFX_BRENDAN_DECORATING 193 +#define OBJ_EVENT_GFX_MAY_DECORATING 194 +#define OBJ_EVENT_GFX_ARCHIE 195 +#define OBJ_EVENT_GFX_MAXIE 196 +#define OBJ_EVENT_GFX_KYOGRE_1 197 +#define OBJ_EVENT_GFX_GROUDON_1 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_1 204 +#define OBJ_EVENT_GFX_KYOGRE_2 205 +#define OBJ_EVENT_GFX_GROUDON_2 206 +#define OBJ_EVENT_GFX_RAYQUAZA 207 +#define OBJ_EVENT_GFX_ZIGZAGOON 208 +#define OBJ_EVENT_GFX_PIKACHU 209 +#define OBJ_EVENT_GFX_AZUMARILL 210 +#define OBJ_EVENT_GFX_WINGULL 211 +#define OBJ_EVENT_GFX_KECLEON_2 212 +#define OBJ_EVENT_GFX_TUBER_M_SWIMMING 213 +#define OBJ_EVENT_GFX_AZURILL 214 +#define OBJ_EVENT_GFX_MOM 215 +#define OBJ_EVENT_GFX_LINK_BRENDAN 216 +#define OBJ_EVENT_GFX_LINK_MAY 217 // These are dynamic object gfx ids. // They correspond with the values of the VAR_OBJ_GFX_ID_X vars. // More info about them in include/constants/vars.h -#define EVENT_OBJ_GFX_VAR_0 240 -#define EVENT_OBJ_GFX_VAR_1 241 -#define EVENT_OBJ_GFX_VAR_2 242 -#define EVENT_OBJ_GFX_VAR_3 243 -#define EVENT_OBJ_GFX_VAR_4 244 -#define EVENT_OBJ_GFX_VAR_5 245 -#define EVENT_OBJ_GFX_VAR_6 246 -#define EVENT_OBJ_GFX_VAR_7 247 -#define EVENT_OBJ_GFX_VAR_8 248 -#define EVENT_OBJ_GFX_VAR_9 249 -#define EVENT_OBJ_GFX_VAR_A 250 -#define EVENT_OBJ_GFX_VAR_B 251 -#define EVENT_OBJ_GFX_VAR_C 252 -#define EVENT_OBJ_GFX_VAR_D 253 -#define EVENT_OBJ_GFX_VAR_E 254 -#define EVENT_OBJ_GFX_VAR_F 255 +#define OBJ_EVENT_GFX_VAR_0 240 +#define OBJ_EVENT_GFX_VAR_1 241 +#define OBJ_EVENT_GFX_VAR_2 242 +#define OBJ_EVENT_GFX_VAR_3 243 +#define OBJ_EVENT_GFX_VAR_4 244 +#define OBJ_EVENT_GFX_VAR_5 245 +#define OBJ_EVENT_GFX_VAR_6 246 +#define OBJ_EVENT_GFX_VAR_7 247 +#define OBJ_EVENT_GFX_VAR_8 248 +#define OBJ_EVENT_GFX_VAR_9 249 +#define OBJ_EVENT_GFX_VAR_A 250 +#define OBJ_EVENT_GFX_VAR_B 251 +#define OBJ_EVENT_GFX_VAR_C 252 +#define OBJ_EVENT_GFX_VAR_D 253 +#define OBJ_EVENT_GFX_VAR_E 254 +#define OBJ_EVENT_GFX_VAR_F 255 #define NUM_OBJECT_GRAPHICS_INFO 217 #define SPRITE_VAR 239 @@ -252,4 +252,4 @@ #define TRACKS_FOOT 1 #define TRACKS_BIKE_TIRE 2 -#endif // GUARD_CONSTANTS_EVENT_OBJECTS_H +#endif // GUARD_CONSTANTS_OBJECT_EVENTS_H diff --git a/include/constants/flags.h b/include/constants/flags.h index 753024403..a6fa4c806 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -357,7 +357,7 @@ #define FLAG_HIDDEN_ITEM_61 0x2B9 -// event object hide/show flags +// object event hide/show flags #define FLAG_HIDE_BIRCH_STARTERS_BAG 0x2BC #define FLAG_HIDE_BIRCH_BATTLE_POOCHYENA 0x2D0 diff --git a/include/constants/vars.h b/include/constants/vars.h index de62e4e8a..795498212 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -25,9 +25,9 @@ #define VAR_TEMP_F 0x400F // object gfx id vars -// These 0x10 vars are used to dynamically control a event object's sprite. +// These 0x10 vars are used to dynamically control an object event's sprite. // For example, the rival's sprite id is dynamically set based on the player's gender. -// See VarGetEventObjectGraphicsId(). +// See VarGetObjectEventGraphicsId(). #define VAR_OBJ_GFX_ID_0 0x4010 #define VAR_OBJ_GFX_ID_1 0x4011 #define VAR_OBJ_GFX_ID_2 0x4012 -- cgit v1.2.3 From 667c53e25b4db2c5fc3bcbdb50825843dfaded4e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 21 Nov 2019 14:14:14 -0500 Subject: Fix event object include guards and constant filenames --- include/constants/bg_event_constants.h | 13 -- include/constants/event_bg.h | 13 ++ include/constants/event_object_movement.h | 221 +++++++++++++++++++++ .../constants/event_object_movement_constants.h | 221 --------------------- include/constants/event_objects.h | 6 +- 5 files changed, 237 insertions(+), 237 deletions(-) delete mode 100755 include/constants/bg_event_constants.h create mode 100755 include/constants/event_bg.h create mode 100755 include/constants/event_object_movement.h delete mode 100755 include/constants/event_object_movement_constants.h (limited to 'include/constants') diff --git a/include/constants/bg_event_constants.h b/include/constants/bg_event_constants.h deleted file mode 100755 index a915bc509..000000000 --- a/include/constants/bg_event_constants.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef GUARD_CONSTANTS_BG_EVENT_H -#define GUARD_CONSTANTS_BG_EVENT_H - -#define BG_EVENT_PLAYER_FACING_ANY 0 -#define BG_EVENT_PLAYER_FACING_NORTH 1 -#define BG_EVENT_PLAYER_FACING_SOUTH 2 -#define BG_EVENT_PLAYER_FACING_EAST 3 -#define BG_EVENT_PLAYER_FACING_WEST 4 - -#define BG_EVENT_HIDDEN_ITEM 7 -#define BG_EVENT_SECRET_BASE 8 - -#endif // GUARD_CONSTANTS_BG_EVENT_H diff --git a/include/constants/event_bg.h b/include/constants/event_bg.h new file mode 100755 index 000000000..64f3331b8 --- /dev/null +++ b/include/constants/event_bg.h @@ -0,0 +1,13 @@ +#ifndef GUARD_CONSTANTS_EVENT_BG_H +#define GUARD_CONSTANTS_EVENT_BG_H + +#define BG_EVENT_PLAYER_FACING_ANY 0 +#define BG_EVENT_PLAYER_FACING_NORTH 1 +#define BG_EVENT_PLAYER_FACING_SOUTH 2 +#define BG_EVENT_PLAYER_FACING_EAST 3 +#define BG_EVENT_PLAYER_FACING_WEST 4 + +#define BG_EVENT_HIDDEN_ITEM 7 +#define BG_EVENT_SECRET_BASE 8 + +#endif // GUARD_CONSTANTS_EVENT_BG_H diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h new file mode 100755 index 000000000..a93a2ac05 --- /dev/null +++ b/include/constants/event_object_movement.h @@ -0,0 +1,221 @@ +#ifndef GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H +#define GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H + +#define MOVEMENT_TYPE_NONE 0x0 +#define MOVEMENT_TYPE_LOOK_AROUND 0x1 +#define MOVEMENT_TYPE_WANDER_AROUND 0x2 +#define MOVEMENT_TYPE_WANDER_UP_AND_DOWN 0x3 +#define MOVEMENT_TYPE_WANDER_DOWN_AND_UP 0x4 +#define MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT 0x5 +#define MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT 0x6 +#define MOVEMENT_TYPE_FACE_UP 0x7 +#define MOVEMENT_TYPE_FACE_DOWN 0x8 +#define MOVEMENT_TYPE_FACE_LEFT 0x9 +#define MOVEMENT_TYPE_FACE_RIGHT 0xA +#define MOVEMENT_TYPE_PLAYER 0xB +#define MOVEMENT_TYPE_BERRY_TREE_GROWTH 0xC +#define MOVEMENT_TYPE_FACE_DOWN_AND_UP 0xD +#define MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT 0xE +#define MOVEMENT_TYPE_FACE_UP_AND_LEFT 0xF +#define MOVEMENT_TYPE_FACE_UP_AND_RIGHT 0x10 +#define MOVEMENT_TYPE_FACE_DOWN_AND_LEFT 0x11 +#define MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT 0x12 +#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT 0x13 +#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT 0x14 +#define MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT 0x15 +#define MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT 0x16 +#define MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE 0x17 +#define MOVEMENT_TYPE_ROTATE_CLOCKWISE 0x18 +#define MOVEMENT_TYPE_WALK_UP_AND_DOWN 0x19 +#define MOVEMENT_TYPE_WALK_DOWN_AND_UP 0x1A +#define MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT 0x1B +#define MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT 0x1C +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN 0x1D +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP 0x1E +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT 0x1F +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT 0x20 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN 0x21 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP 0x22 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT 0x23 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT 0x24 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT 0x25 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT 0x26 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN 0x27 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP 0x28 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT 0x29 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT 0x2A +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN 0x2B +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP 0x2C +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT 0x2D +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT 0x2E +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP 0x2F +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN 0x30 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT 0x31 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT 0x32 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN 0x33 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP 0x34 +#define MOVEMENT_TYPE_COPY_PLAYER 0x35 +#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE 0x36 +#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE 0x37 +#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE 0x38 +#define MOVEMENT_TYPE_TREE_DISGUISE 0x39 +#define MOVEMENT_TYPE_MOUNTAIN_DISGUISE 0x3A +#define MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS 0x3B +#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS 0x3C +#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS 0x3D +#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS 0x3E +#define MOVEMENT_TYPE_HIDDEN 0x3F +#define MOVEMENT_TYPE_WALK_IN_PLACE_DOWN 0x40 +#define MOVEMENT_TYPE_WALK_IN_PLACE_UP 0x41 +#define MOVEMENT_TYPE_WALK_IN_PLACE_LEFT 0x42 +#define MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT 0x43 +#define MOVEMENT_TYPE_JOG_IN_PLACE_DOWN 0x44 +#define MOVEMENT_TYPE_JOG_IN_PLACE_UP 0x45 +#define MOVEMENT_TYPE_JOG_IN_PLACE_LEFT 0x46 +#define MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT 0x47 +#define MOVEMENT_TYPE_RUN_IN_PLACE_DOWN 0x48 +#define MOVEMENT_TYPE_RUN_IN_PLACE_UP 0x49 +#define MOVEMENT_TYPE_RUN_IN_PLACE_LEFT 0x4A +#define MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT 0x4B +#define MOVEMENT_TYPE_INVISIBLE 0x4C + +#define MOVEMENT_ACTION_FACE_DOWN 0x0 +#define MOVEMENT_ACTION_FACE_UP 0x1 +#define MOVEMENT_ACTION_FACE_LEFT 0x2 +#define MOVEMENT_ACTION_FACE_RIGHT 0x3 +#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0x4 +#define MOVEMENT_ACTION_WALK_SLOW_UP 0x5 +#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0x6 +#define MOVEMENT_ACTION_WALK_SLOW_RIGHT 0x7 +#define MOVEMENT_ACTION_WALK_NORMAL_DOWN 0x8 +#define MOVEMENT_ACTION_WALK_NORMAL_UP 0x9 +#define MOVEMENT_ACTION_WALK_NORMAL_LEFT 0xA +#define MOVEMENT_ACTION_WALK_NORMAL_RIGHT 0xB +#define MOVEMENT_ACTION_JUMP_2_DOWN 0xC +#define MOVEMENT_ACTION_JUMP_2_UP 0xD +#define MOVEMENT_ACTION_JUMP_2_LEFT 0xE +#define MOVEMENT_ACTION_JUMP_2_RIGHT 0xF +#define MOVEMENT_ACTION_DELAY_1 0x10 +#define MOVEMENT_ACTION_DELAY_2 0x11 +#define MOVEMENT_ACTION_DELAY_4 0x12 +#define MOVEMENT_ACTION_DELAY_8 0x13 +#define MOVEMENT_ACTION_DELAY_16 0x14 +#define MOVEMENT_ACTION_WALK_FAST_DOWN 0x15 +#define MOVEMENT_ACTION_WALK_FAST_UP 0x16 +#define MOVEMENT_ACTION_WALK_FAST_LEFT 0x17 +#define MOVEMENT_ACTION_WALK_FAST_RIGHT 0x18 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN 0x19 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP 0x1A +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT 0x1B +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT 0x1C +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN 0x1D +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP 0x1E +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT 0x1F +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT 0x20 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN 0x21 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x22 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x23 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x24 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x25 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x26 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x27 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x28 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x29 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x2A +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x2B +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x2C +#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x2D +#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x2E +#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x2F +#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x30 +#define MOVEMENT_ACTION_SLIDE_DOWN 0x31 +#define MOVEMENT_ACTION_SLIDE_UP 0x32 +#define MOVEMENT_ACTION_SLIDE_LEFT 0x33 +#define MOVEMENT_ACTION_SLIDE_RIGHT 0x34 +#define MOVEMENT_ACTION_PLAYER_RUN_DOWN 0x35 +#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x36 +#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x37 +#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x38 +#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION 0x39 +#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x3A +#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x3B +#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x3C +#define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT 0x3D +#define MOVEMENT_ACTION_FACE_PLAYER 0x3E +#define MOVEMENT_ACTION_FACE_AWAY_PLAYER 0x3F +#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION 0x40 +#define MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION 0x41 +#define MOVEMENT_ACTION_JUMP_DOWN 0x42 +#define MOVEMENT_ACTION_JUMP_UP 0x43 +#define MOVEMENT_ACTION_JUMP_LEFT 0x44 +#define MOVEMENT_ACTION_JUMP_RIGHT 0x45 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN 0x46 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP 0x47 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT 0x48 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT 0x49 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP 0x4A +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN 0x4B +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT 0x4C +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT 0x4D +#define MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION 0x4E +#define MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN 0x4F +#define MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT 0x50 +#define MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT 0x51 +#define MOVEMENT_ACTION_DISABLE_ANIMATION 0x52 +#define MOVEMENT_ACTION_RESTORE_ANIMATION 0x53 +#define MOVEMENT_ACTION_SET_INVISIBLE 0x54 +#define MOVEMENT_ACTION_SET_VISIBLE 0x55 +#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK 0x56 +#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK 0x57 +#define MOVEMENT_ACTION_EMOTE_HEART 0x58 +#define MOVEMENT_ACTION_REVEAL_TRAINER 0x59 +#define MOVEMENT_ACTION_ROCK_SMASH_BREAK 0x5A +#define MOVEMENT_ACTION_CUT_TREE 0x5B +#define MOVEMENT_ACTION_SET_FIXED_PRIORITY 0x5C +#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY 0x5D +#define MOVEMENT_ACTION_INIT_AFFINE_ANIM 0x5E +#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM 0x5F +#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x60 +#define MOVEMENT_ACTION_WALK_DOWN_AFFINE_1 0x61 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x62 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x63 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x64 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT 0x65 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN 0x66 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP 0x67 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT 0x68 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT 0x69 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN 0x6A +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP 0x6B +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT 0x6C +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT 0x6D +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN 0x6E +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP 0x6F +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT 0x70 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT 0x71 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN 0x72 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP 0x73 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT 0x74 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT 0x75 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN 0x76 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP 0x77 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT 0x78 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT 0x79 +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN 0x7A +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP 0x7B +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT 0x7C +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT 0x7D +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN 0x7E +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP 0x7F +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT 0x80 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT 0x81 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN 0x82 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x83 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x84 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x85 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x86 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x87 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x88 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x89 + +#endif // GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H diff --git a/include/constants/event_object_movement_constants.h b/include/constants/event_object_movement_constants.h deleted file mode 100755 index 81d2417a1..000000000 --- a/include/constants/event_object_movement_constants.h +++ /dev/null @@ -1,221 +0,0 @@ -#ifndef GUARD_CONSTANTS_EVENTOBJMV_H -#define GUARD_CONSTANTS_EVENTOBJMV_H - -#define MOVEMENT_TYPE_NONE 0x0 -#define MOVEMENT_TYPE_LOOK_AROUND 0x1 -#define MOVEMENT_TYPE_WANDER_AROUND 0x2 -#define MOVEMENT_TYPE_WANDER_UP_AND_DOWN 0x3 -#define MOVEMENT_TYPE_WANDER_DOWN_AND_UP 0x4 -#define MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT 0x5 -#define MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT 0x6 -#define MOVEMENT_TYPE_FACE_UP 0x7 -#define MOVEMENT_TYPE_FACE_DOWN 0x8 -#define MOVEMENT_TYPE_FACE_LEFT 0x9 -#define MOVEMENT_TYPE_FACE_RIGHT 0xA -#define MOVEMENT_TYPE_PLAYER 0xB -#define MOVEMENT_TYPE_BERRY_TREE_GROWTH 0xC -#define MOVEMENT_TYPE_FACE_DOWN_AND_UP 0xD -#define MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT 0xE -#define MOVEMENT_TYPE_FACE_UP_AND_LEFT 0xF -#define MOVEMENT_TYPE_FACE_UP_AND_RIGHT 0x10 -#define MOVEMENT_TYPE_FACE_DOWN_AND_LEFT 0x11 -#define MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT 0x12 -#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT 0x13 -#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT 0x14 -#define MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT 0x15 -#define MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT 0x16 -#define MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE 0x17 -#define MOVEMENT_TYPE_ROTATE_CLOCKWISE 0x18 -#define MOVEMENT_TYPE_WALK_UP_AND_DOWN 0x19 -#define MOVEMENT_TYPE_WALK_DOWN_AND_UP 0x1A -#define MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT 0x1B -#define MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT 0x1C -#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN 0x1D -#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP 0x1E -#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT 0x1F -#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT 0x20 -#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN 0x21 -#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP 0x22 -#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT 0x23 -#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT 0x24 -#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT 0x25 -#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT 0x26 -#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN 0x27 -#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP 0x28 -#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT 0x29 -#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT 0x2A -#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN 0x2B -#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP 0x2C -#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT 0x2D -#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT 0x2E -#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP 0x2F -#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN 0x30 -#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT 0x31 -#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT 0x32 -#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN 0x33 -#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP 0x34 -#define MOVEMENT_TYPE_COPY_PLAYER 0x35 -#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE 0x36 -#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE 0x37 -#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE 0x38 -#define MOVEMENT_TYPE_TREE_DISGUISE 0x39 -#define MOVEMENT_TYPE_MOUNTAIN_DISGUISE 0x3A -#define MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS 0x3B -#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS 0x3C -#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS 0x3D -#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS 0x3E -#define MOVEMENT_TYPE_HIDDEN 0x3F -#define MOVEMENT_TYPE_WALK_IN_PLACE_DOWN 0x40 -#define MOVEMENT_TYPE_WALK_IN_PLACE_UP 0x41 -#define MOVEMENT_TYPE_WALK_IN_PLACE_LEFT 0x42 -#define MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT 0x43 -#define MOVEMENT_TYPE_JOG_IN_PLACE_DOWN 0x44 -#define MOVEMENT_TYPE_JOG_IN_PLACE_UP 0x45 -#define MOVEMENT_TYPE_JOG_IN_PLACE_LEFT 0x46 -#define MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT 0x47 -#define MOVEMENT_TYPE_RUN_IN_PLACE_DOWN 0x48 -#define MOVEMENT_TYPE_RUN_IN_PLACE_UP 0x49 -#define MOVEMENT_TYPE_RUN_IN_PLACE_LEFT 0x4A -#define MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT 0x4B -#define MOVEMENT_TYPE_INVISIBLE 0x4C - -#define MOVEMENT_ACTION_FACE_DOWN 0x0 -#define MOVEMENT_ACTION_FACE_UP 0x1 -#define MOVEMENT_ACTION_FACE_LEFT 0x2 -#define MOVEMENT_ACTION_FACE_RIGHT 0x3 -#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0x4 -#define MOVEMENT_ACTION_WALK_SLOW_UP 0x5 -#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0x6 -#define MOVEMENT_ACTION_WALK_SLOW_RIGHT 0x7 -#define MOVEMENT_ACTION_WALK_NORMAL_DOWN 0x8 -#define MOVEMENT_ACTION_WALK_NORMAL_UP 0x9 -#define MOVEMENT_ACTION_WALK_NORMAL_LEFT 0xA -#define MOVEMENT_ACTION_WALK_NORMAL_RIGHT 0xB -#define MOVEMENT_ACTION_JUMP_2_DOWN 0xC -#define MOVEMENT_ACTION_JUMP_2_UP 0xD -#define MOVEMENT_ACTION_JUMP_2_LEFT 0xE -#define MOVEMENT_ACTION_JUMP_2_RIGHT 0xF -#define MOVEMENT_ACTION_DELAY_1 0x10 -#define MOVEMENT_ACTION_DELAY_2 0x11 -#define MOVEMENT_ACTION_DELAY_4 0x12 -#define MOVEMENT_ACTION_DELAY_8 0x13 -#define MOVEMENT_ACTION_DELAY_16 0x14 -#define MOVEMENT_ACTION_WALK_FAST_DOWN 0x15 -#define MOVEMENT_ACTION_WALK_FAST_UP 0x16 -#define MOVEMENT_ACTION_WALK_FAST_LEFT 0x17 -#define MOVEMENT_ACTION_WALK_FAST_RIGHT 0x18 -#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN 0x19 -#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP 0x1A -#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT 0x1B -#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT 0x1C -#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN 0x1D -#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP 0x1E -#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT 0x1F -#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT 0x20 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN 0x21 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x22 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x23 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x24 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x25 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x26 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x27 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x28 -#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x29 -#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x2A -#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x2B -#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x2C -#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x2D -#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x2E -#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x2F -#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x30 -#define MOVEMENT_ACTION_SLIDE_DOWN 0x31 -#define MOVEMENT_ACTION_SLIDE_UP 0x32 -#define MOVEMENT_ACTION_SLIDE_LEFT 0x33 -#define MOVEMENT_ACTION_SLIDE_RIGHT 0x34 -#define MOVEMENT_ACTION_PLAYER_RUN_DOWN 0x35 -#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x36 -#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x37 -#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x38 -#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION 0x39 -#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x3A -#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x3B -#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x3C -#define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT 0x3D -#define MOVEMENT_ACTION_FACE_PLAYER 0x3E -#define MOVEMENT_ACTION_FACE_AWAY_PLAYER 0x3F -#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION 0x40 -#define MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION 0x41 -#define MOVEMENT_ACTION_JUMP_DOWN 0x42 -#define MOVEMENT_ACTION_JUMP_UP 0x43 -#define MOVEMENT_ACTION_JUMP_LEFT 0x44 -#define MOVEMENT_ACTION_JUMP_RIGHT 0x45 -#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN 0x46 -#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP 0x47 -#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT 0x48 -#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT 0x49 -#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP 0x4A -#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN 0x4B -#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT 0x4C -#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT 0x4D -#define MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION 0x4E -#define MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN 0x4F -#define MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT 0x50 -#define MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT 0x51 -#define MOVEMENT_ACTION_DISABLE_ANIMATION 0x52 -#define MOVEMENT_ACTION_RESTORE_ANIMATION 0x53 -#define MOVEMENT_ACTION_SET_INVISIBLE 0x54 -#define MOVEMENT_ACTION_SET_VISIBLE 0x55 -#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK 0x56 -#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK 0x57 -#define MOVEMENT_ACTION_EMOTE_HEART 0x58 -#define MOVEMENT_ACTION_REVEAL_TRAINER 0x59 -#define MOVEMENT_ACTION_ROCK_SMASH_BREAK 0x5A -#define MOVEMENT_ACTION_CUT_TREE 0x5B -#define MOVEMENT_ACTION_SET_FIXED_PRIORITY 0x5C -#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY 0x5D -#define MOVEMENT_ACTION_INIT_AFFINE_ANIM 0x5E -#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM 0x5F -#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x60 -#define MOVEMENT_ACTION_WALK_DOWN_AFFINE_1 0x61 -#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x62 -#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x63 -#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x64 -#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT 0x65 -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN 0x66 -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP 0x67 -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT 0x68 -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT 0x69 -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN 0x6A -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP 0x6B -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT 0x6C -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT 0x6D -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN 0x6E -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP 0x6F -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT 0x70 -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT 0x71 -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN 0x72 -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP 0x73 -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT 0x74 -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT 0x75 -#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN 0x76 -#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP 0x77 -#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT 0x78 -#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT 0x79 -#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN 0x7A -#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP 0x7B -#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT 0x7C -#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT 0x7D -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN 0x7E -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP 0x7F -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT 0x80 -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT 0x81 -#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN 0x82 -#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x83 -#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x84 -#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x85 -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x86 -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x87 -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x88 -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x89 - -#endif // GUARD_CONSTANTS_EVENTOBJMV_H diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index eeb18e7cb..0bf530cf7 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -1,5 +1,5 @@ -#ifndef GUARD_CONSTANTS_OBJECT_EVENTS_H -#define GUARD_CONSTANTS_OBJECT_EVENTS_H +#ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H +#define GUARD_CONSTANTS_EVENT_OBJECTS_H #define OBJ_EVENT_GFX_BRENDAN_NORMAL 0 #define OBJ_EVENT_GFX_BRENDAN_MACH_BIKE 1 @@ -252,4 +252,4 @@ #define TRACKS_FOOT 1 #define TRACKS_BIKE_TIRE 2 -#endif // GUARD_CONSTANTS_OBJECT_EVENTS_H +#endif // GUARD_CONSTANTS_EVENT_OBJECTS_H -- cgit v1.2.3 From 6c5f3e3470e6c6f6a64e26f64240f41fe40833c2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 26 Jan 2020 12:32:22 -0500 Subject: Sync with pret/pokeemerald:959 --- include/constants/event_objects.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'include/constants') diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 0bf530cf7..21cb3f7f4 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -220,28 +220,28 @@ #define OBJ_EVENT_GFX_LINK_BRENDAN 216 #define OBJ_EVENT_GFX_LINK_MAY 217 +#define NUM_OBJ_EVENT_GFX 218 + // These are dynamic object gfx ids. // They correspond with the values of the VAR_OBJ_GFX_ID_X vars. // More info about them in include/constants/vars.h -#define OBJ_EVENT_GFX_VAR_0 240 -#define OBJ_EVENT_GFX_VAR_1 241 -#define OBJ_EVENT_GFX_VAR_2 242 -#define OBJ_EVENT_GFX_VAR_3 243 -#define OBJ_EVENT_GFX_VAR_4 244 -#define OBJ_EVENT_GFX_VAR_5 245 -#define OBJ_EVENT_GFX_VAR_6 246 -#define OBJ_EVENT_GFX_VAR_7 247 -#define OBJ_EVENT_GFX_VAR_8 248 -#define OBJ_EVENT_GFX_VAR_9 249 -#define OBJ_EVENT_GFX_VAR_A 250 -#define OBJ_EVENT_GFX_VAR_B 251 -#define OBJ_EVENT_GFX_VAR_C 252 -#define OBJ_EVENT_GFX_VAR_D 253 -#define OBJ_EVENT_GFX_VAR_E 254 -#define OBJ_EVENT_GFX_VAR_F 255 - -#define NUM_OBJECT_GRAPHICS_INFO 217 -#define SPRITE_VAR 239 +#define OBJ_EVENT_GFX_VARS 240 +#define OBJ_EVENT_GFX_VAR_0 (OBJ_EVENT_GFX_VARS + 0x0) +#define OBJ_EVENT_GFX_VAR_1 (OBJ_EVENT_GFX_VARS + 0x1) +#define OBJ_EVENT_GFX_VAR_2 (OBJ_EVENT_GFX_VARS + 0x2) +#define OBJ_EVENT_GFX_VAR_3 (OBJ_EVENT_GFX_VARS + 0x3) +#define OBJ_EVENT_GFX_VAR_4 (OBJ_EVENT_GFX_VARS + 0x4) +#define OBJ_EVENT_GFX_VAR_5 (OBJ_EVENT_GFX_VARS + 0x5) +#define OBJ_EVENT_GFX_VAR_6 (OBJ_EVENT_GFX_VARS + 0x6) +#define OBJ_EVENT_GFX_VAR_7 (OBJ_EVENT_GFX_VARS + 0x7) +#define OBJ_EVENT_GFX_VAR_8 (OBJ_EVENT_GFX_VARS + 0x8) +#define OBJ_EVENT_GFX_VAR_9 (OBJ_EVENT_GFX_VARS + 0x9) +#define OBJ_EVENT_GFX_VAR_A (OBJ_EVENT_GFX_VARS + 0xA) +#define OBJ_EVENT_GFX_VAR_B (OBJ_EVENT_GFX_VARS + 0xB) +#define OBJ_EVENT_GFX_VAR_C (OBJ_EVENT_GFX_VARS + 0xC) +#define OBJ_EVENT_GFX_VAR_D (OBJ_EVENT_GFX_VARS + 0xD) +#define OBJ_EVENT_GFX_VAR_E (OBJ_EVENT_GFX_VARS + 0xE) +#define OBJ_EVENT_GFX_VAR_F (OBJ_EVENT_GFX_VARS + 0xF) // 255 #define SHADOW_SIZE_S 0 #define SHADOW_SIZE_M 1 -- cgit v1.2.3