diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_controllers.h | 2 | ||||
| -rw-r--r-- | include/berry.h | 10 | ||||
| -rw-r--r-- | include/constants/event_objects.h | 474 | ||||
| -rw-r--r-- | include/constants/flags.h | 2 | ||||
| -rw-r--r-- | include/constants/vars.h | 4 | ||||
| -rw-r--r-- | include/decoration.h | 2 | ||||
| -rw-r--r-- | include/event_data.h | 2 | ||||
| -rw-r--r-- | include/event_obj_lock.h | 12 | ||||
| -rw-r--r-- | include/event_object_movement.h | 510 | ||||
| -rw-r--r-- | include/field_control_avatar.h | 2 | ||||
| -rw-r--r-- | include/field_effect.h | 40 | ||||
| -rw-r--r-- | include/field_effect_helpers.h | 8 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 2 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 16 | ||||
| -rw-r--r-- | include/global.h | 6 | ||||
| -rw-r--r-- | include/overworld.h | 18 | ||||
| -rw-r--r-- | include/shop.h | 2 | ||||
| -rw-r--r-- | include/trainer_see.h | 2 |
18 files changed, 557 insertions, 557 deletions
diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 5dae99ecd..695daabbc 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -193,4 +193,4 @@ void BtlController_EmitLinkStandbyMsg(u8 a, u8 b); void BtlController_EmitResetActionMoveSelection(u8 a, u8 b); void BtlController_EmitCmd55(u8 a, u8 b); -#endif // GUARD_BATTLE_CONTROLLERS_H
\ No newline at end of file +#endif // GUARD_BATTLE_CONTROLLERS_H diff --git a/include/berry.h b/include/berry.h index 259ada634..9a7773779 100644 --- a/include/berry.h +++ b/include/berry.h @@ -39,7 +39,7 @@ void debug_sub_80C2C18(const u8 *name, u8 holdEffect, u8 holdEffectParam); void SetEnigmaBerry(u8 *src); bool32 IsEnigmaBerryValid(void); const struct Berry *GetBerryInfo(u8 berry); -bool32 EventObjectInteractionWaterBerryTree(void); +bool32 ObjectEventInteractionWaterBerryTree(void); bool8 IsPlayerFacingUnplantedSoil(void); bool8 TryToWaterBerryTree(void); void ClearBerryTrees(void); @@ -51,11 +51,11 @@ u8 GetStageByBerryTreeId(u8); u8 ItemIdToBerryType(u16 item); void GetBerryNameByBerryType(u8 berry, u8 *string); void ResetBerryTreeSparkleFlag(u8 id); -void EventObjectInteractionGetBerryTreeData(void); +void ObjectEventInteractionGetBerryTreeData(void); void Berry_FadeAndGoToBerryBagMenu(void); -void EventObjectInteractionPlantBerryTree(void); -void EventObjectInteractionPickBerryTree(void); -void EventObjectInteractionRemoveBerryTree(void); +void ObjectEventInteractionPlantBerryTree(void); +void ObjectEventInteractionPickBerryTree(void); +void ObjectEventInteractionRemoveBerryTree(void); bool8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); void debug_sub_80C2D24(u8 spicy, u8 dry, u8 sweet, u8 bitter, u8 sour, u8 smoothness); 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 diff --git a/include/decoration.h b/include/decoration.h index 7676c0add..9f78bc491 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -182,7 +182,7 @@ bool8 sub_80FEFA4(void); void sub_80FF394(u16, u16, u16); void sub_80FF6AC(u8); void sub_80FF960(u8); -void AddDecorationIconObjectFromEventObject(struct UnkStruct_02038900 *, u8); +void AddDecorationIconObjectFromObjectEvent(struct UnkStruct_02038900 *, u8); void SetUpPlacingDecorationPlayerAvatar(u8, struct UnkStruct_02038900 *); void sub_8100038(u8); void sub_81000A0(u8); diff --git a/include/event_data.h b/include/event_data.h index 44d1e8e41..50a26a437 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -19,7 +19,7 @@ bool32 CanResetRTC(void); u16 *GetVarPointer(u16 id); u16 VarGet(u16 id); bool8 VarSet(u16 id, u16 value); -u8 VarGetEventObjectGraphicsId(u8 id); +u8 VarGetObjectEventGraphicsId(u8 id); u8 *GetFlagPointer(u16 id); u8 FlagSet(u16 id); u8 FlagClear(u16 id); diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h index 538edc579..7a293cc01 100644 --- a/include/event_obj_lock.h +++ b/include/event_obj_lock.h @@ -1,16 +1,16 @@ -#ifndef GUARD_EVENT_OBJ_LOCK_H -#define GUARD_EVENT_OBJ_LOCK_H +#ifndef GUARD_OBJ_EVENT_LOCK_H +#define GUARD_OBJ_EVENT_LOCK_H bool8 walkrun_is_standing_still(void); void sub_8064CDC(u8 taskId); bool8 sub_8064CFC(void); -void ScriptFreezeEventObjects(void); +void ScriptFreezeObjectEvents(void); void sub_8064D38(u8 taskId); bool8 sub_8064DB4(void); -void LockSelectedEventObject(void); -void ScriptUnfreezeEventObjects(void); +void LockSelectedObjectEvent(void); +void ScriptUnfreezeObjectEvents(void); void unref_sub_8064E5C(void); void sub_8064EAC(void); void sub_8064ED4(void); -#endif // GUARD_EVENT_OBJ_LOCK_H +#endif // GUARD_OBJ_EVENT_LOCK_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index b3040d6df..949fb87d2 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -27,23 +27,23 @@ extern const u8 gReflectionEffectPaletteMap[]; #define movement_type_def(setup, table) \ -static u8 setup##_callback(struct EventObject *, struct Sprite *);\ +static u8 setup##_callback(struct ObjectEvent *, struct Sprite *);\ void setup(struct Sprite *sprite)\ {\ - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, setup##_callback);\ }\ -static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ +static u8 setup##_callback(struct ObjectEvent *objectEvent, struct Sprite *sprite)\ {\ - return table[sprite->data[1]](eventObject, sprite);\ + return table[sprite->data[1]](objectEvent, sprite);\ } #define movement_type_empty_callback(setup) \ -static u8 setup##_callback(struct EventObject *, struct Sprite *);\ +static u8 setup##_callback(struct ObjectEvent *, struct Sprite *);\ void setup(struct Sprite *sprite)\ {\ - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, setup##_callback);\ }\ -static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ +static u8 setup##_callback(struct ObjectEvent *objectEvent, struct Sprite *sprite)\ {\ return 0;\ } @@ -54,18 +54,18 @@ struct ReflectionPaletteSet const u16 *reflectionPaletteTags; }; -extern const u16 gEventObjectPalette19[]; +extern const u16 gObjectEventPalette19[]; -extern const u32 gEventObjectPic_MovingBox[32]; -extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[]; +extern const u32 gObjectEventPic_MovingBox[32]; +extern const struct SpriteFrameImage gObjectEventPicTable_PechaBerryTree[]; extern const u8 gFieldEffectPic_CutGrass[]; extern const u16 gFieldEffectObjectPalette6[]; -void sub_805C058(struct EventObject *eventObject, s16 a, s16 b); -void SetEventObjectDirection(struct EventObject *pObject, u8 unk_18); +void sub_805C058(struct ObjectEvent *objectEvent, s16 a, s16 b); +void SetObjectEventDirection(struct ObjectEvent *pObject, u8 unk_18); void MoveCoords(u8 direction, s16 *x, s16 *y); -void UpdateEventObjectCurrentMovement(struct EventObject *pObject, struct Sprite *pSprite, u8 (*d8)(struct EventObject *, struct Sprite *)); +void UpdateObjectEventCurrentMovement(struct ObjectEvent *pObject, struct Sprite *pSprite, u8 (*d8)(struct ObjectEvent *, struct Sprite *)); u8 GetVectorDirection(s16 a0, s16 a1, s16 a2, s16 a3); u8 GetLimitedVectorDirection_SouthNorth(s16 a0, s16 a1, s16 a2, s16 a3); @@ -79,15 +79,15 @@ u8 GetLimitedVectorDirection_SouthNorthEast(s16 a0, s16 a1, s16 a2, s16 a3); u8 GetLimitedVectorDirection_NorthWestEast(s16 a0, s16 a1, s16 a2, s16 a3); u8 GetLimitedVectorDirection_SouthWestEast(s16 a0, s16 a1, s16 a2, s16 a3); -u8 CopyablePlayerMovement_None(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 CopyablePlayerMovement_FaceDirection(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 CopyablePlayerMovement_GoSpeed0(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 CopyablePlayerMovement_GoSpeed1(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 CopyablePlayerMovement_GoSpeed2(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 CopyablePlayerMovement_Slide(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 cph_IM_DIFFERENT(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 CopyablePlayerMovement_GoSpeed4(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 CopyablePlayerMovement_Jump(struct EventObject *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_None(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_FaceDirection(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_GoSpeed0(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_GoSpeed1(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_GoSpeed2(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_Slide(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 cph_IM_DIFFERENT(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_GoSpeed4(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_Jump(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); extern struct FieldCamera gFieldCamera; extern u16 gTotalCameraPixelOffsetY; @@ -150,189 +150,189 @@ void MovementType_JogInPlace(struct Sprite *); void MovementType_RunInPlace(struct Sprite *); void MovementType_Invisible(struct Sprite *); -u8 MovementType_WanderAround_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step5(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step6(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step5(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step6(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step5(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step6(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDirection_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDirection_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_CopyPlayer_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_CopyPlayer_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_CopyPlayer_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_CopyPlayer_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_Hidden_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_MoveInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_JogInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_MoveInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_RunInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_MoveInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_Invisible_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_Invisible_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_Invisible_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_WanderAround_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step5(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step6(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step5(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step6(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step5(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step6(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDirection_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDirection_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_CopyPlayer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_CopyPlayer_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_CopyPlayer_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_CopyPlayerInGrass_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_CopyPlayer_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Hidden_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_MoveInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_JogInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_MoveInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RunInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_MoveInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Invisible_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Invisible_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Invisible_Step2(struct ObjectEvent *, struct Sprite *); u8 GetMoveDirectionAnimNum(u8); u8 GetMoveDirectionFastAnimNum(u8); @@ -342,24 +342,24 @@ u8 GetMoveDirectionFastestAnimNum(u8); u32 state_to_direction(u8, u32, u32); -void ResetEventObjects(); -u8 GetFirstInactiveEventObjectId(void); -u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8); -bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); -u8 GetEventObjectIdByXY(s16, s16); -void RemoveEventObjectByLocalIdAndMap(u8, u8, u8); -u8 SpawnSpecialEventObject(struct EventObjectTemplate *); +void ResetObjectEvents(); +u8 GetFirstInactiveObjectEventId(void); +u8 GetObjectEventIdByLocalIdAndMap(u8, u8, u8); +bool8 TryGetObjectEventIdByLocalIdAndMap(u8, u8, u8, u8 *); +u8 GetObjectEventIdByXY(s16, s16); +void RemoveObjectEventByLocalIdAndMap(u8, u8, u8); +u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *); u8 show_sprite(u8, u8, u8); -u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority); +u8 AddPseudoObjectEvent(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority); u8 sub_805B410(u8, u8, s16, s16, u8, u8); -void TrySpawnEventObjects(s16, s16); +void TrySpawnObjectEvents(s16, s16); void sub_805B710(u16 i, u16 i1); -void EventObjectSetGraphicsId(struct EventObject *, u8); -void EventObjectTurn(struct EventObject *, u8); -void EventObjectTurnByLocalIdAndMap(u8, u8, u8, u8); -const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8); +void ObjectEventSetGraphicsId(struct ObjectEvent *, u8); +void ObjectEventTurn(struct ObjectEvent *, u8); +void ObjectEventTurnByLocalIdAndMap(u8, u8, u8, u8); +const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8); void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); -void EventObjectGetLocalIdAndMap(struct EventObject *, void *, void *, void *); +void ObjectEventGetLocalIdAndMap(struct ObjectEvent *, void *, void *, void *); void sub_805BCC0(s16 x, s16 y); void sub_805BCF0(u8, u8, u8, u8); void sub_805BD48(u8, u8, u8); @@ -369,44 +369,44 @@ void sub_805BDF8(u16); void PatchObjectPalette(u16, u8); void LoadPlayerObjectReflectionPalette(u16, u8); void LoadSpecialObjectReflectionPalette(u16, u8); -void ShiftEventObjectCoords(struct EventObject *pObject, s16 x, s16 y); +void ShiftObjectEventCoords(struct ObjectEvent *pObject, s16 x, s16 y); void sub_805C0F8(u8, u8, u8, s16, s16); -void ShiftStillEventObjectCoords(struct EventObject *pObject); -u8 GetEventObjectIdByXYZ(u16, u16, u8); -void UpdateEventObjectsForCameraUpdate(s16, s16); +void ShiftStillObjectEventCoords(struct ObjectEvent *pObject); +u8 GetObjectEventIdByXYZ(u16, u16, u8); +void UpdateObjectEventsForCameraUpdate(s16, s16); u8 AddCameraObject(u8); void CameraObjectReset1(void); -const u8 *GetEventObjectScriptPointerByEventObjectId(u8); -u8 EventObjectGetBerryTreeId(u8); -struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8, u8, u8); -void OverrideTemplateCoordsForEventObject(struct EventObject *pObject); -void OverrideMovementTypeForEventObject(struct EventObject *, u8); -void TryOverrideTemplateCoordsForEventObject(u8, u8, u8); -void InitEventObjectPalettes(u8); +const u8 *GetObjectEventScriptPointerByObjectEventId(u8); +u8 ObjectEventGetBerryTreeId(u8); +struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8, u8, u8); +void OverrideTemplateCoordsForObjectEvent(struct ObjectEvent *pObject); +void OverrideMovementTypeForObjectEvent(struct ObjectEvent *, u8); +void TryOverrideTemplateCoordsForObjectEvent(u8, u8, u8); +void InitObjectEventPalettes(u8); u8 GetFaceDirectionAnimNum(u8); u8 GetMoveDirectionAnimNum(u8 unk_19); u8 GetAcroWheelieDirectionAnimNum(u8); u8 GetFishingDirectionAnimNum(u8); u8 GetFishingNoCatchDirectionAnimNum(u8); u8 GetFishingBiteDirectionAnimNum(u8); -void SetTrainerMovementType(struct EventObject *, u8); +void SetTrainerMovementType(struct ObjectEvent *, u8); u8 GetTrainerFacingDirectionMovementType(u8); -u8 GetCollisionAtCoords(struct EventObject *, s16, s16, u32); -u8 GetCollisionFlagsAtCoords(struct EventObject *, s16, s16, u8); +u8 GetCollisionAtCoords(struct ObjectEvent *, s16, s16, u32); +u8 GetCollisionFlagsAtCoords(struct ObjectEvent *, s16, s16, u8); bool8 IsBerryTreeSparkling(u8, u8, u8); void sub_8060288(u8, u8, u8); void sub_8060388(s16, s16, s16 *, s16 *); void sub_80603CC(s16 x, s16 y, s16 *pInt, s16 *pInt1); -void EventObjectMoveDestCoords(struct EventObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); -bool8 EventObjectIsMovementOverridden(struct EventObject *); -bool8 EventObjectIsHeldMovementActive(struct EventObject *); -bool8 EventObjectSetHeldMovement(struct EventObject *, u8); -void EventObjectForceSetHeldMovement(struct EventObject *pObject, u8 a); -void EventObjectClearHeldMovementIfActive(struct EventObject *); -void EventObjectClearHeldMovement(struct EventObject *); -bool8 EventObjectCheckHeldMovementStatus(struct EventObject *); -u8 EventObjectClearHeldMovementIfFinished(struct EventObject *); -u8 EventObjectGetHeldMovementActionId(struct EventObject *); +void ObjectEventMoveDestCoords(struct ObjectEvent *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); +bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *); +bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *); +bool8 ObjectEventSetHeldMovement(struct ObjectEvent *, u8); +void ObjectEventForceSetHeldMovement(struct ObjectEvent *pObject, u8 a); +void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *); +void ObjectEventClearHeldMovement(struct ObjectEvent *); +bool8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *); +u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *); +u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *); u8 GetFaceDirectionMovementAction(u32); u8 GetWalkSlowMovementAction(u32); u8 GetWalkNormalMovementAction(u32); @@ -424,7 +424,7 @@ u8 GetWalkInPlaceSlowMovementAction(u32); u8 GetWalkInPlaceNormalMovementAction(u32); u8 GetWalkInPlaceFastMovementAction(u32); u8 GetWalkInPlaceFastestMovementAction(u32); -u8 EventObjectFaceOppositeDirection(struct EventObject *, u8); +u8 ObjectEventFaceOppositeDirection(struct ObjectEvent *, u8); u8 GetAcroWheelieFaceDirectionMovementAction(u8); u8 GetAcroPopWheelieFaceDirectionMovementAction(u8); u8 GetAcroEndWheelieFaceDirectionMovementAction(u8); @@ -436,23 +436,23 @@ u8 GetAcroPopWheelieMoveDirectionMovementAction(u8); u8 GetAcroWheelieMoveDirectionMovementAction(u8); u8 GetAcroEndWheelieMoveDirectionMovementAction(u8); u8 GetOppositeDirection(u8); -u8 SpawnSpecialEventObjectParametrized(u8, u8, u8, s16, s16, u8); +u8 SpawnSpecialObjectEventParametrized(u8, u8, u8, s16, s16, u8); void CameraObjectSetFollowedObjectId(u8); -u8 TryInitLocalEventObject(u8); +u8 TryInitLocalObjectEvent(u8); u8 CreateCopySpriteAt(struct Sprite *, s16, s16, u8); u16 GetObjectPaletteTag(u8); void sub_8060470(s16 *, s16 *, s16, s16); -bool8 FreezeEventObject(struct EventObject *); -void FreezeEventObjects(void); -void FreezeEventObjectsExceptOne(u8); -void UnfreezeEventObjects(void); -void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible); -void TurnEventObject(u8, u8); -void UnfreezeEventObject(struct EventObject *eventObject); +bool8 FreezeObjectEvent(struct ObjectEvent *); +void FreezeObjectEvents(void); +void FreezeObjectEventsExceptOne(u8); +void UnfreezeObjectEvents(void); +void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible); +void TurnObjectEvent(u8, u8); +void UnfreezeObjectEvent(struct ObjectEvent *objectEvent); void sub_806467C(struct Sprite *sprite, u8 direction); bool8 sub_806468C(struct Sprite *sprite); void sub_80646E4(struct Sprite *sprite, u8 a2, u8 a3, u8 a4); -void DoShadowFieldEffect(struct EventObject *eventObject); +void DoShadowFieldEffect(struct ObjectEvent *objectEvent); u8 sub_8064704(struct Sprite *); u8 sub_806478C(struct Sprite *); void SetAndStartSpriteAnim(struct Sprite *sprite, u8 a2, u8 a3); @@ -460,7 +460,7 @@ bool8 IsZCoordMismatchAt(u8 z, s16 x, s16 y); bool8 AreZCoordsCompatible(u8 z1, u8 z2); u8 GetLedgeJumpDirection(s16, s16, u8); u8 ZCoordToPriority(u8); -void EventObjectUpdateZCoord(struct EventObject *pObject); +void ObjectEventUpdateZCoord(struct ObjectEvent *pObject); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); #endif // GUARD_EVENTOBJMV_H diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index df6482688..bcb2b449e 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -30,7 +30,7 @@ const u8 *GetInteractedLinkPlayerScript(struct MapPosition *, u8, u8); void ClearPoisonStepCounter(void); void RestartWildEncounterImmunitySteps(void); u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *); -const u8 *GetEventObjectScriptPointerPlayerFacing(void); +const u8 *GetObjectEventScriptPointerPlayerFacing(void); u8 TrySetDiveWarp(void); bool8 dive_warp(struct MapPosition*, u16); diff --git a/include/field_effect.h b/include/field_effect.h index a1c175eb8..6bf98d4f7 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -88,11 +88,11 @@ bool8 sub_8086E50(struct Task *); bool8 sub_8086EB0(struct Task *); bool8 sub_8086ED4(struct Task *); -bool8 sub_8086FB0(struct Task *, struct EventObject *); -bool8 waterfall_1_do_anim_probably(struct Task *, struct EventObject *); -bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct EventObject *); -bool8 sub_8087030(struct Task *, struct EventObject *); -bool8 sub_8087058(struct Task *, struct EventObject *); +bool8 sub_8086FB0(struct Task *, struct ObjectEvent *); +bool8 waterfall_1_do_anim_probably(struct Task *, struct ObjectEvent *); +bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct ObjectEvent *); +bool8 sub_8087030(struct Task *, struct ObjectEvent *); +bool8 sub_8087058(struct Task *, struct ObjectEvent *); bool8 sub_8087124(struct Task *); bool8 dive_2_unknown(struct Task *); @@ -100,25 +100,25 @@ bool8 dive_3_unknown(struct Task *); void sub_80871B8(u8); -bool8 sub_808722C(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_8087264(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_8087298(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80872E4(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80873D8(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80873F4(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_808722C(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_8087264(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_8087298(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_80872E4(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_80873D8(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_80873F4(struct Task *, struct ObjectEvent *, struct Sprite *); -bool8 sub_80874CC(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80874FC(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_8087548(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_808759C(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80874CC(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_80874FC(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_8087548(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_808759C(struct Task *, struct ObjectEvent *, struct Sprite *); void sub_8087654(u8); -bool8 sub_80876C8(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80876F8(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_8087774(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80877AC(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80877D4(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80876C8(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_80876F8(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_8087774(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_80877AC(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_80877D4(struct Task *, struct ObjectEvent *, struct Sprite *); void sub_8087AA4(struct Task *); void sub_8087AC8(struct Task *); diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 8462b6ff8..2754ecddd 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -3,8 +3,8 @@ extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; -void sub_812869C(struct EventObject *); -bool8 sub_81286C4(struct EventObject *); +void sub_812869C(struct ObjectEvent *); +bool8 sub_81286C4(struct ObjectEvent *); void UpdateShadowFieldEffect(struct Sprite *); void sub_8087638(struct Sprite *); void sub_808788C(struct Sprite *); @@ -29,8 +29,8 @@ void sub_8127ED0(u8, u8); void sub_8127F28(u8, u8, s16); u8 sub_8128124(u8 id); void StartAshFieldEffect(s16, s16, u16, s16); -void InitObjectReflectionSprite(struct EventObject *eventObj, struct Sprite *sprite, u8 a); -u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct EventObject *eventObject); +void InitObjectReflectionSprite(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a); +u32 StartFieldEffectForObjectEvent(u8 fieldEffectId, struct ObjectEvent *objectEvent); u8 FindTallGrassFieldEffectSpriteId(u8, u8, u8, s16, s16); #endif // GUARD_FIELD_EFFECT_HELPERS_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 0c2deb8be..491fd809e 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -14,7 +14,7 @@ enum { // MovementType_None2 void player_step(u8 a, u16 b, u16 c); -u8 CheckForEventObjectCollision(struct EventObject *a, s16 b, s16 c, u8 d, u8 e); +u8 CheckForObjectEventCollision(struct ObjectEvent *a, s16 b, s16 c, u8 d, u8 e); void SetPlayerAvatarTransitionFlags(u16 a); void sub_8059204(void); u8 PlayerGetCopyableMovement(void); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 27b2b5593..1bba31073 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -56,7 +56,7 @@ struct BackupMapLayout u16 *map; }; -struct EventObjectTemplate +struct ObjectEventTemplate { /*0x00*/ u8 localId; /*0x01*/ u8 graphicsId; @@ -116,12 +116,12 @@ struct BgEvent struct MapEvents { - u8 eventObjectCount; + u8 objectEventCount; u8 warpCount; u8 coordEventCount; u8 bgEventCount; - struct EventObjectTemplate *eventObjects; + struct ObjectEventTemplate *objectEvents; struct WarpEvent *warps; struct CoordEvent *coordEvents; struct BgEvent *bgEvents; @@ -159,7 +159,7 @@ struct MapHeader /* 0x1B */ u8 battleType; }; -struct EventObject +struct ObjectEvent { /*0x00*/ u32 active:1; u32 singleMovementActive:1; @@ -221,7 +221,7 @@ struct EventObject /*size = 0x24*/ }; -struct EventObjectGraphicsInfo +struct ObjectEventGraphicsInfo { /*0x00*/ u16 tileTag; /*0x02*/ u16 paletteTag; @@ -302,7 +302,7 @@ struct PlayerAvatar /* 0x202E858 */ /*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving. /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning. /*0x04*/ u8 spriteId; - /*0x05*/ u8 eventObjectId; + /*0x05*/ u8 objectEventId; /*0x06*/ bool8 preventStep; /*0x07*/ u8 gender; /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie @@ -324,8 +324,8 @@ struct Camera s32 y; }; -extern struct EventObject gEventObjects[]; -extern u8 gSelectedEventObject; +extern struct ObjectEvent gObjectEvents[]; +extern u8 gSelectedObjectEvent; extern struct MapHeader gMapHeader; extern struct PlayerAvatar gPlayerAvatar; diff --git a/include/global.h b/include/global.h index ba9e20813..5e71bd821 100644 --- a/include/global.h +++ b/include/global.h @@ -119,7 +119,7 @@ enum LanguageId #define DAYCARE_MON_COUNT 2 #define POKEBLOCKS_COUNT 40 #define PARTY_SIZE 6 -#define EVENT_OBJECTS_COUNT 16 +#define OBJECT_EVENTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 288 #define VARS_COUNT 256 @@ -698,8 +698,8 @@ struct SaveBlock1 /* 0x02025734 */ /*0x972*/ u8 filler_972[0x6]; /*0x978*/ u16 trainerRematchStepCounter; /*0x97A*/ u8 trainerRematches[100]; - /*0x9E0*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT]; - /*0xC20*/ struct EventObjectTemplate eventObjectTemplates[64]; + /*0x9E0*/ struct ObjectEvent objectEvents[OBJECT_EVENTS_COUNT]; + /*0xC20*/ struct ObjectEventTemplate objectEventTemplates[64]; /*0x1220*/ u8 flags[FLAGS_COUNT]; /*0x1340*/ u16 vars[VARS_COUNT]; /*0x1540*/ u32 gameStats[NUM_GAME_STATS]; diff --git a/include/overworld.h b/include/overworld.h index 958eb57ff..833c0aea0 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -9,11 +9,11 @@ struct InitialPlayerAvatarState u8 direction; }; -struct LinkPlayerEventObject +struct LinkPlayerObjectEvent { u8 active; u8 linkPlayerId; - u8 eventObjId; + u8 objEventId; u8 mode; }; @@ -35,10 +35,10 @@ void ResetGameStats(void); void IncrementGameStat(u8 index); u32 GetGameStat(u8 index); void SetGameStat(u8, u32); -// LoadEventObjTemplatesFromHeader -// LoadSaveblockEventObjScripts -void Overworld_SetEventObjTemplateCoords(u8, s16, s16); -void Overworld_SetEventObjTemplateMovementType(u8, u8); +// LoadObjEventTemplatesFromHeader +// LoadSaveblockObjEventScripts +void Overworld_SetObjEventTemplateCoords(u8, s16, s16); +void Overworld_SetObjEventTemplateMovementType(u8, u8); // mapdata_load_assets_to_gpu_and_full_redraw // ApplyCurrentWarp // SetWarpData @@ -188,9 +188,9 @@ bool32 sub_8055870(void); u32 sub_80558AC(void); u32 sub_8055910(void); u32 sub_8055940(void); -// ClearLinkPlayerEventObject -void ClearLinkPlayerEventObjects(void); -// ZeroEventObject +// ClearLinkPlayerObjectEvent +void ClearLinkPlayerObjectEvents(void); +// ZeroObjectEvent // unref_sub_8055A6C // unref_sub_8055A9C u8 sub_8055AE8(u8); diff --git a/include/shop.h b/include/shop.h index 4de58eaf2..849b1bef2 100644 --- a/include/shop.h +++ b/include/shop.h @@ -11,7 +11,7 @@ enum // shop view window NPC info enum enum { - EVENT_OBJ_ID, + OBJ_EVENT_ID, X_COORD, Y_COORD, ANIM_NUM diff --git a/include/trainer_see.h b/include/trainer_see.h index d67117743..78487aa57 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -5,7 +5,7 @@ #include "task.h" bool8 CheckTrainers(void); -void sub_8084794(struct EventObject *var); +void sub_8084794(struct ObjectEvent *var); void ScrSpecial_EndTrainerApproach(void); #endif // GUARD_TRAINER_SEE_H |