diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_setup.h | 4 | ||||
| -rw-r--r-- | include/berry.h | 12 | ||||
| -rw-r--r-- | include/constants/event_objects.h | 263 | ||||
| -rw-r--r-- | include/constants/map_objects.h | 263 | ||||
| -rw-r--r-- | include/constants/vars.h | 2 | ||||
| -rw-r--r-- | include/data/decoration/tiles.h | 90 | ||||
| -rw-r--r-- | include/event_data.h | 2 | ||||
| -rw-r--r-- | include/event_obj_lock.h | 11 | ||||
| -rw-r--r-- | include/event_object_movement.h | 576 | ||||
| -rw-r--r-- | include/field_control_avatar.h | 2 | ||||
| -rw-r--r-- | include/field_effect.h | 44 | ||||
| -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 | 18 | ||||
| -rw-r--r-- | include/global.h | 6 | ||||
| -rw-r--r-- | include/load_save.h | 4 | ||||
| -rw-r--r-- | include/map_obj_lock.h | 11 | ||||
| -rw-r--r-- | include/mauville_old_man.h | 2 | ||||
| -rw-r--r-- | include/overworld.h | 16 | ||||
| -rw-r--r-- | include/pokenav.h | 2 | ||||
| -rw-r--r-- | include/rom_81BE66C.h | 2 | ||||
| -rw-r--r-- | include/trainer_see.h | 8 |
22 files changed, 674 insertions, 674 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h index e4bae6fdb..0caa3df27 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -51,8 +51,8 @@ void ChooseStarter(void); void ResetTrainerOpponentIds(void); void SetMapVarsToTrainer(void); const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data); -void ConfigureAndSetUpOneTrainerBattle(u8 trainerMapObjId, const u8 *trainerScript); -void ConfigureTwoTrainersBattle(u8 trainerMapObjId, const u8 *trainerScript); +void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript); +void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript); void SetUpTwoTrainersBattle(void); bool32 GetTrainerFlagFromScriptPointer(const u8 *data); void sub_80B16D8(void); diff --git a/include/berry.h b/include/berry.h index b6926ef68..1a8b7fa25 100644 --- a/include/berry.h +++ b/include/berry.h @@ -23,7 +23,7 @@ enum #define NUM_BERRIES 44 -extern const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[]; +extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[]; extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[]; extern const u8 *const gBerryTreePaletteSlotTablePointers[]; @@ -33,7 +33,7 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry); bool32 IsEnigmaBerryValid(void); const struct Berry *GetBerryInfo(u8 berry); struct BerryTree *GetBerryTreeInfo(u8 id); -bool32 FieldObjectInteractionWaterBerryTree(void); +bool32 EventObjectInteractionWaterBerryTree(void); bool8 IsPlayerFacingPlantedBerryTree(void); bool8 TryToWaterBerryTree(void); void ClearBerryTrees(void); @@ -54,10 +54,10 @@ u8 CalcBerryYield(struct BerryTree *tree); u8 GetBerryCountByBerryTreeId(u8 id); u16 GetStageDurationByBerryType(u8); void Bag_ChooseBerry(void); -void FieldObjectInteractionGetBerryTreeData(void); -void FieldObjectInteractionPlantBerryTree(void); -void FieldObjectInteractionPickBerryTree(void); -void FieldObjectInteractionRemoveBerryTree(void); +void EventObjectInteractionGetBerryTreeData(void); +void EventObjectInteractionPlantBerryTree(void); +void EventObjectInteractionPickBerryTree(void); +void EventObjectInteractionRemoveBerryTree(void); u8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h new file mode 100644 index 000000000..d04f0a1f9 --- /dev/null +++ b/include/constants/event_objects.h @@ -0,0 +1,263 @@ +#ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H +#define GUARD_CONSTANTS_EVENT_OBJECTS_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_RAYQUAZA_1 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_ANABEL 70 +#define EVENT_OBJ_GFX_TUCKER 71 +#define EVENT_OBJ_GFX_GRETA 72 +#define EVENT_OBJ_GFX_SPENSER 73 +#define EVENT_OBJ_GFX_NOLAND 74 +#define EVENT_OBJ_GFX_LUCY 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_VIGAROTH_CARRYING_BOX 95 +#define EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY 96 +#define EVENT_OBJ_GFX_BIRCHS_BAG 97 +#define EVENT_OBJ_GFX_ZIGZAGOON_1 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_2 207 +#define EVENT_OBJ_GFX_ZIGZAGOON_2 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 EVENT_OBJ_GFX_JUAN 218 +#define EVENT_OBJ_GFX_SCOTT 219 +#define EVENT_OBJ_GFX_POOCHYENA 220 +#define EVENT_OBJ_GFX_KYOGRE_3 221 +#define EVENT_OBJ_GFX_GROUDON_3 222 +#define EVENT_OBJ_GFX_MYSTERY_GIFT_MAN 223 +#define EVENT_OBJ_GFX_TRICK_HOUSE_STATUE 224 +#define EVENT_OBJ_GFX_KIRLIA 225 +#define EVENT_OBJ_GFX_DUSCLOPS 226 +#define EVENT_OBJ_GFX_UNION_ROOM_NURSE 227 +#define EVENT_OBJ_GFX_SUDOWOODO 228 +#define EVENT_OBJ_GFX_MEW 229 +#define EVENT_OBJ_GFX_RED 230 +#define EVENT_OBJ_GFX_LEAF 231 +#define EVENT_OBJ_GFX_DEOXYS 232 +#define EVENT_OBJ_GFX_DEOXYS_TRIANGLE 233 +#define EVENT_OBJ_GFX_BRANDON 234 +#define EVENT_OBJ_GFX_LINK_RS_BRENDAN 235 +#define EVENT_OBJ_GFX_LINK_RS_MAY 236 +#define EVENT_OBJ_GFX_LUGIA 237 +#define EVENT_OBJ_GFX_HOOH 238 +#define EVENT_OBJ_GFX_BARD_2 239 +#define EVENT_OBJ_GFX_HIPSTER 240 +#define EVENT_OBJ_GFX_TRADER 241 +#define EVENT_OBJ_GFX_STORYTELLER 242 +#define EVENT_OBJ_GFX_GIDDY 243 +#define EVENT_OBJ_GFX_PLACEHOLDER_1 244 +#define EVENT_OBJ_GFX_PLACEHOLDER_2 245 + +#define SHADOW_SIZE_S 0 +#define SHADOW_SIZE_M 1 +#define SHADOW_SIZE_L 2 +#define SHADOW_SIZE_XL 3 + +#define F_INANIMATE (1 << 6) +#define F_DISABLE_REFLECTION_PALETTE_LOAD (1 << 7) + +#define TRACKS_NONE 0 +#define TRACKS_FOOT 1 +#define TRACKS_BIKE_TIRE 2 + +#endif // GUARD_CONSTANTS_EVENT_OBJECTS_H diff --git a/include/constants/map_objects.h b/include/constants/map_objects.h deleted file mode 100644 index d5b983005..000000000 --- a/include/constants/map_objects.h +++ /dev/null @@ -1,263 +0,0 @@ -#ifndef GUARD_CONSTANTS_MAP_OBJECTS_H -#define GUARD_CONSTANTS_MAP_OBJECTS_H - -#define MAP_OBJ_GFX_BRENDAN_NORMAL 0 -#define MAP_OBJ_GFX_BRENDAN_MACH_BIKE 1 -#define MAP_OBJ_GFX_BRENDAN_SURFING 2 -#define MAP_OBJ_GFX_BRENDAN_FIELD_MOVE 3 -#define MAP_OBJ_GFX_QUINTY_PLUMP 4 -#define MAP_OBJ_GFX_LITTLE_BOY_1 5 -#define MAP_OBJ_GFX_LITTLE_GIRL_1 6 -#define MAP_OBJ_GFX_BOY_1 7 -#define MAP_OBJ_GFX_GIRL_1 8 -#define MAP_OBJ_GFX_BOY_2 9 -#define MAP_OBJ_GFX_GIRL_2 10 -#define MAP_OBJ_GFX_LITTLE_BOY_2 11 -#define MAP_OBJ_GFX_LITTLE_GIRL_2 12 -#define MAP_OBJ_GFX_BOY_3 13 -#define MAP_OBJ_GFX_GIRL_3 14 -#define MAP_OBJ_GFX_BOY_4 15 -#define MAP_OBJ_GFX_WOMAN_1 16 -#define MAP_OBJ_GFX_FAT_MAN 17 -#define MAP_OBJ_GFX_WOMAN_2 18 -#define MAP_OBJ_GFX_MAN_1 19 -#define MAP_OBJ_GFX_WOMAN_3 20 -#define MAP_OBJ_GFX_OLD_MAN_1 21 -#define MAP_OBJ_GFX_OLD_WOMAN_1 22 -#define MAP_OBJ_GFX_MAN_2 23 -#define MAP_OBJ_GFX_WOMAN_4 24 -#define MAP_OBJ_GFX_MAN_3 25 -#define MAP_OBJ_GFX_WOMAN_5 26 -#define MAP_OBJ_GFX_COOK 27 -#define MAP_OBJ_GFX_WOMAN_6 28 -#define MAP_OBJ_GFX_OLD_MAN_2 29 -#define MAP_OBJ_GFX_OLD_WOMAN_2 30 -#define MAP_OBJ_GFX_CAMPER 31 -#define MAP_OBJ_GFX_PICNICKER 32 -#define MAP_OBJ_GFX_MAN_4 33 -#define MAP_OBJ_GFX_WOMAN_7 34 -#define MAP_OBJ_GFX_YOUNGSTER 35 -#define MAP_OBJ_GFX_BUG_CATCHER 36 -#define MAP_OBJ_GFX_PSYCHIC_M 37 -#define MAP_OBJ_GFX_SCHOOL_KID_M 38 -#define MAP_OBJ_GFX_MANIAC 39 -#define MAP_OBJ_GFX_HEX_MANIAC 40 -#define MAP_OBJ_GFX_RAYQUAZA_1 41 -#define MAP_OBJ_GFX_SWIMMER_M 42 -#define MAP_OBJ_GFX_SWIMMER_F 43 -#define MAP_OBJ_GFX_BLACK_BELT 44 -#define MAP_OBJ_GFX_BEAUTY 45 -#define MAP_OBJ_GFX_SCIENTIST_1 46 -#define MAP_OBJ_GFX_LASS 47 -#define MAP_OBJ_GFX_GENTLEMAN 48 -#define MAP_OBJ_GFX_SAILOR 49 -#define MAP_OBJ_GFX_FISHERMAN 50 -#define MAP_OBJ_GFX_RUNNING_TRIATHLETE_M 51 -#define MAP_OBJ_GFX_RUNNING_TRIATHLETE_F 52 -#define MAP_OBJ_GFX_TUBER_F 53 -#define MAP_OBJ_GFX_TUBER_M 54 -#define MAP_OBJ_GFX_HIKER 55 -#define MAP_OBJ_GFX_CYCLING_TRIATHLETE_M 56 -#define MAP_OBJ_GFX_CYCLING_TRIATHLETE_F 57 -#define MAP_OBJ_GFX_NURSE 58 -#define MAP_OBJ_GFX_ITEM_BALL 59 -#define MAP_OBJ_GFX_BERRY_TREE 60 -#define MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES 61 -#define MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES 62 -#define MAP_OBJ_GFX_BRENDAN_ACRO_BIKE 63 -#define MAP_OBJ_GFX_PROF_BIRCH 64 -#define MAP_OBJ_GFX_MAN_5 65 -#define MAP_OBJ_GFX_MAN_6 66 -#define MAP_OBJ_GFX_REPORTER_M 67 -#define MAP_OBJ_GFX_REPORTER_F 68 -#define MAP_OBJ_GFX_BARD 69 -#define MAP_OBJ_GFX_ANABEL 70 -#define MAP_OBJ_GFX_TUCKER 71 -#define MAP_OBJ_GFX_GRETA 72 -#define MAP_OBJ_GFX_SPENSER 73 -#define MAP_OBJ_GFX_NOLAND 74 -#define MAP_OBJ_GFX_LUCY 75 -#define MAP_OBJ_GFX_UNUSED_NATU_DOLL 76 -#define MAP_OBJ_GFX_UNUSED_MAGNEMITE_DOLL 77 -#define MAP_OBJ_GFX_UNUSED_SQUIRTLE_DOLL 78 -#define MAP_OBJ_GFX_UNUSED_WOOPER_DOLL 79 -#define MAP_OBJ_GFX_UNUSED_PIKACHU_DOLL 80 -#define MAP_OBJ_GFX_UNUSED_PORYGON2_DOLL 81 -#define MAP_OBJ_GFX_CUTTABLE_TREE 82 -#define MAP_OBJ_GFX_MART_EMPLOYEE 83 -#define MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN 84 -#define MAP_OBJ_GFX_TEALA 85 -#define MAP_OBJ_GFX_BREAKABLE_ROCK 86 -#define MAP_OBJ_GFX_PUSHABLE_BOULDER 87 -#define MAP_OBJ_GFX_MR_BRINEYS_BOAT 88 -#define MAP_OBJ_GFX_MAY_NORMAL 89 -#define MAP_OBJ_GFX_MAY_MACH_BIKE 90 -#define MAP_OBJ_GFX_MAY_ACRO_BIKE 91 -#define MAP_OBJ_GFX_MAY_SURFING 92 -#define MAP_OBJ_GFX_MAY_FIELD_MOVE 93 -#define MAP_OBJ_GFX_TRUCK 94 -#define MAP_OBJ_GFX_VIGAROTH_CARRYING_BOX 95 -#define MAP_OBJ_GFX_VIGAROTH_FACING_AWAY 96 -#define MAP_OBJ_GFX_BIRCHS_BAG 97 -#define MAP_OBJ_GFX_ZIGZAGOON_1 98 -#define MAP_OBJ_GFX_ARTIST 99 -#define MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL 100 -#define MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE 101 -#define MAP_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE 102 -#define MAP_OBJ_GFX_RIVAL_BRENDAN_SURFING 103 -#define MAP_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE 104 -#define MAP_OBJ_GFX_RIVAL_MAY_NORMAL 105 -#define MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE 106 -#define MAP_OBJ_GFX_RIVAL_MAY_ACRO_BIKE 107 -#define MAP_OBJ_GFX_RIVAL_MAY_SURFING 108 -#define MAP_OBJ_GFX_RIVAL_MAY_FIELD_MOVE 109 -#define MAP_OBJ_GFX_CAMERAMAN 110 -#define MAP_OBJ_GFX_BRENDAN_UNDERWATER 111 -#define MAP_OBJ_GFX_MAY_UNDERWATER 112 -#define MAP_OBJ_GFX_MOVING_BOX 113 -#define MAP_OBJ_GFX_CABLE_CAR 114 -#define MAP_OBJ_GFX_SCIENTIST_2 115 -#define MAP_OBJ_GFX_MAN_7 116 -#define MAP_OBJ_GFX_AQUA_MEMBER_M 117 -#define MAP_OBJ_GFX_AQUA_MEMBER_F 118 -#define MAP_OBJ_GFX_MAGMA_MEMBER_M 119 -#define MAP_OBJ_GFX_MAGMA_MEMBER_F 120 -#define MAP_OBJ_GFX_SIDNEY 121 -#define MAP_OBJ_GFX_PHOEBE 122 -#define MAP_OBJ_GFX_GLACIA 123 -#define MAP_OBJ_GFX_DRAKE 124 -#define MAP_OBJ_GFX_ROXANNE 125 -#define MAP_OBJ_GFX_BRAWLY 126 -#define MAP_OBJ_GFX_WATTSON 127 -#define MAP_OBJ_GFX_FLANNERY 128 -#define MAP_OBJ_GFX_NORMAN 129 -#define MAP_OBJ_GFX_WINONA 130 -#define MAP_OBJ_GFX_LIZA 131 -#define MAP_OBJ_GFX_TATE 132 -#define MAP_OBJ_GFX_WALLACE 133 -#define MAP_OBJ_GFX_STEVEN 134 -#define MAP_OBJ_GFX_WALLY 135 -#define MAP_OBJ_GFX_LITTLE_BOY_3 136 -#define MAP_OBJ_GFX_BRENDAN_FISHING 137 -#define MAP_OBJ_GFX_MAY_FISHING 138 -#define MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN 139 -#define MAP_OBJ_GFX_SS_TIDAL 140 -#define MAP_OBJ_GFX_SUBMARINE_SHADOW 141 -#define MAP_OBJ_GFX_PICHU_DOLL 142 -#define MAP_OBJ_GFX_PIKACHU_DOLL 143 -#define MAP_OBJ_GFX_MARILL_DOLL 144 -#define MAP_OBJ_GFX_TOGEPI_DOLL 145 -#define MAP_OBJ_GFX_CYNDAQUIL_DOLL 146 -#define MAP_OBJ_GFX_CHIKORITA_DOLL 147 -#define MAP_OBJ_GFX_TOTODILE_DOLL 148 -#define MAP_OBJ_GFX_JIGGLYPUFF_DOLL 149 -#define MAP_OBJ_GFX_MEOWTH_DOLL 150 -#define MAP_OBJ_GFX_CLEFAIRY_DOLL 151 -#define MAP_OBJ_GFX_DITTO_DOLL 152 -#define MAP_OBJ_GFX_SMOOCHUM_DOLL 153 -#define MAP_OBJ_GFX_TREECKO_DOLL 154 -#define MAP_OBJ_GFX_TORCHIC_DOLL 155 -#define MAP_OBJ_GFX_MUDKIP_DOLL 156 -#define MAP_OBJ_GFX_DUSKULL_DOLL 157 -#define MAP_OBJ_GFX_WYNAUT_DOLL 158 -#define MAP_OBJ_GFX_BALTOY_DOLL 159 -#define MAP_OBJ_GFX_KECLEON_DOLL 160 -#define MAP_OBJ_GFX_AZURILL_DOLL 161 -#define MAP_OBJ_GFX_SKITTY_DOLL 162 -#define MAP_OBJ_GFX_SWABLU_DOLL 163 -#define MAP_OBJ_GFX_GULPIN_DOLL 164 -#define MAP_OBJ_GFX_LOTAD_DOLL 165 -#define MAP_OBJ_GFX_SEEDOT_DOLL 166 -#define MAP_OBJ_GFX_PIKA_CUSHION 167 -#define MAP_OBJ_GFX_ROUND_CUSHION 168 -#define MAP_OBJ_GFX_KISS_CUSHION 169 -#define MAP_OBJ_GFX_ZIGZAG_CUSHION 170 -#define MAP_OBJ_GFX_SPIN_CUSHION 171 -#define MAP_OBJ_GFX_DIAMOND_CUSHION 172 -#define MAP_OBJ_GFX_BALL_CUSHION 173 -#define MAP_OBJ_GFX_GRASS_CUSHION 174 -#define MAP_OBJ_GFX_FIRE_CUSHION 175 -#define MAP_OBJ_GFX_WATER_CUSHION 176 -#define MAP_OBJ_GFX_BIG_SNORLAX_DOLL 177 -#define MAP_OBJ_GFX_BIG_RHYDON_DOLL 178 -#define MAP_OBJ_GFX_BIG_LAPRAS_DOLL 179 -#define MAP_OBJ_GFX_BIG_VENUSAUR_DOLL 180 -#define MAP_OBJ_GFX_BIG_CHARIZARD_DOLL 181 -#define MAP_OBJ_GFX_BIG_BLASTOISE_DOLL 182 -#define MAP_OBJ_GFX_BIG_WAILMER_DOLL 183 -#define MAP_OBJ_GFX_BIG_REGIROCK_DOLL 184 -#define MAP_OBJ_GFX_BIG_REGICE_DOLL 185 -#define MAP_OBJ_GFX_BIG_REGISTEEL_DOLL 186 -#define MAP_OBJ_GFX_LATIAS 187 -#define MAP_OBJ_GFX_LATIOS 188 -#define MAP_OBJ_GFX_BOY_5 189 -#define MAP_OBJ_GFX_CONTEST_JUDGE 190 -#define MAP_OBJ_GFX_BRENDAN_WATERING 191 -#define MAP_OBJ_GFX_MAY_WATERING 192 -#define MAP_OBJ_GFX_BRENDAN_DECORATING 193 -#define MAP_OBJ_GFX_MAY_DECORATING 194 -#define MAP_OBJ_GFX_ARCHIE 195 -#define MAP_OBJ_GFX_MAXIE 196 -#define MAP_OBJ_GFX_KYOGRE_1 197 -#define MAP_OBJ_GFX_GROUDON_1 198 -#define MAP_OBJ_GFX_FOSSIL 199 -#define MAP_OBJ_GFX_REGIROCK 200 -#define MAP_OBJ_GFX_REGICE 201 -#define MAP_OBJ_GFX_REGISTEEL 202 -#define MAP_OBJ_GFX_SKITTY 203 -#define MAP_OBJ_GFX_KECLEON_1 204 -#define MAP_OBJ_GFX_KYOGRE_2 205 -#define MAP_OBJ_GFX_GROUDON_2 206 -#define MAP_OBJ_GFX_RAYQUAZA_2 207 -#define MAP_OBJ_GFX_ZIGZAGOON_2 208 -#define MAP_OBJ_GFX_PIKACHU 209 -#define MAP_OBJ_GFX_AZUMARILL 210 -#define MAP_OBJ_GFX_WINGULL 211 -#define MAP_OBJ_GFX_KECLEON_2 212 -#define MAP_OBJ_GFX_TUBER_M_SWIMMING 213 -#define MAP_OBJ_GFX_AZURILL 214 -#define MAP_OBJ_GFX_MOM 215 -#define MAP_OBJ_GFX_LINK_BRENDAN 216 -#define MAP_OBJ_GFX_LINK_MAY 217 -#define MAP_OBJ_GFX_JUAN 218 -#define MAP_OBJ_GFX_SCOTT 219 -#define MAP_OBJ_GFX_POOCHYENA 220 -#define MAP_OBJ_GFX_KYOGRE_3 221 -#define MAP_OBJ_GFX_GROUDON_3 222 -#define MAP_OBJ_GFX_MYSTERY_GIFT_MAN 223 -#define MAP_OBJ_GFX_TRICK_HOUSE_STATUE 224 -#define MAP_OBJ_GFX_KIRLIA 225 -#define MAP_OBJ_GFX_DUSCLOPS 226 -#define MAP_OBJ_GFX_UNION_ROOM_NURSE 227 -#define MAP_OBJ_GFX_SUDOWOODO 228 -#define MAP_OBJ_GFX_MEW 229 -#define MAP_OBJ_GFX_RED 230 -#define MAP_OBJ_GFX_LEAF 231 -#define MAP_OBJ_GFX_DEOXYS 232 -#define MAP_OBJ_GFX_DEOXYS_TRIANGLE 233 -#define MAP_OBJ_GFX_BRANDON 234 -#define MAP_OBJ_GFX_LINK_RS_BRENDAN 235 -#define MAP_OBJ_GFX_LINK_RS_MAY 236 -#define MAP_OBJ_GFX_LUGIA 237 -#define MAP_OBJ_GFX_HOOH 238 -#define MAP_OBJ_GFX_BARD_2 239 -#define MAP_OBJ_GFX_HIPSTER 240 -#define MAP_OBJ_GFX_TRADER 241 -#define MAP_OBJ_GFX_STORYTELLER 242 -#define MAP_OBJ_GFX_GIDDY 243 -#define MAP_OBJ_GFX_PLACEHOLDER_1 244 -#define MAP_OBJ_GFX_PLACEHOLDER_2 245 - -#define SHADOW_SIZE_S 0 -#define SHADOW_SIZE_M 1 -#define SHADOW_SIZE_L 2 -#define SHADOW_SIZE_XL 3 - -#define F_INANIMATE (1 << 6) -#define F_DISABLE_REFLECTION_PALETTE_LOAD (1 << 7) - -#define TRACKS_NONE 0 -#define TRACKS_FOOT 1 -#define TRACKS_BIKE_TIRE 2 - -#endif // GUARD_CONSTANTS_MAP_OBJECTS_H diff --git a/include/constants/vars.h b/include/constants/vars.h index 976c6a739..ed4a7797b 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -27,7 +27,7 @@ // object gfx id vars // These 0x10 vars are used to dynamically control a map object's sprite. // For example, the rival's sprite id is dynamically set based on the player's gender. -// See VarGetFieldObjectGraphicsId(). +// See VarGetEventObjectGraphicsId(). #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/data/decoration/tiles.h b/include/data/decoration/tiles.h index 9a3f8a222..6b3ed699f 100644 --- a/include/data/decoration/tiles.h +++ b/include/data/decoration/tiles.h @@ -464,183 +464,183 @@ const u16 DecorGfx_KISS_POSTER[] = { }; const u16 DecorGfx_PICHU_DOLL[] = { - MAP_OBJ_GFX_PICHU_DOLL + EVENT_OBJ_GFX_PICHU_DOLL }; const u16 DecorGfx_PIKACHU_DOLL[] = { - MAP_OBJ_GFX_PIKACHU_DOLL + EVENT_OBJ_GFX_PIKACHU_DOLL }; const u16 DecorGfx_MARILL_DOLL[] = { - MAP_OBJ_GFX_MARILL_DOLL + EVENT_OBJ_GFX_MARILL_DOLL }; const u16 DecorGfx_TOGEPI_DOLL[] = { - MAP_OBJ_GFX_TOGEPI_DOLL + EVENT_OBJ_GFX_TOGEPI_DOLL }; const u16 DecorGfx_CYNDAQUIL_DOLL[] = { - MAP_OBJ_GFX_CYNDAQUIL_DOLL + EVENT_OBJ_GFX_CYNDAQUIL_DOLL }; const u16 DecorGfx_CHIKORITA_DOLL[] = { - MAP_OBJ_GFX_CHIKORITA_DOLL + EVENT_OBJ_GFX_CHIKORITA_DOLL }; const u16 DecorGfx_TOTODILE_DOLL[] = { - MAP_OBJ_GFX_TOTODILE_DOLL + EVENT_OBJ_GFX_TOTODILE_DOLL }; const u16 DecorGfx_JIGGLYPUFF_DOLL[] = { - MAP_OBJ_GFX_JIGGLYPUFF_DOLL + EVENT_OBJ_GFX_JIGGLYPUFF_DOLL }; const u16 DecorGfx_MEOWTH_DOLL[] = { - MAP_OBJ_GFX_MEOWTH_DOLL + EVENT_OBJ_GFX_MEOWTH_DOLL }; const u16 DecorGfx_CLEFAIRY_DOLL[] = { - MAP_OBJ_GFX_CLEFAIRY_DOLL + EVENT_OBJ_GFX_CLEFAIRY_DOLL }; const u16 DecorGfx_DITTO_DOLL[] = { - MAP_OBJ_GFX_DITTO_DOLL + EVENT_OBJ_GFX_DITTO_DOLL }; const u16 DecorGfx_SMOOCHUM_DOLL[] = { - MAP_OBJ_GFX_SMOOCHUM_DOLL + EVENT_OBJ_GFX_SMOOCHUM_DOLL }; const u16 DecorGfx_TREECKO_DOLL[] = { - MAP_OBJ_GFX_TREECKO_DOLL + EVENT_OBJ_GFX_TREECKO_DOLL }; const u16 DecorGfx_TORCHIC_DOLL[] = { - MAP_OBJ_GFX_TORCHIC_DOLL + EVENT_OBJ_GFX_TORCHIC_DOLL }; const u16 DecorGfx_MUDKIP_DOLL[] = { - MAP_OBJ_GFX_MUDKIP_DOLL + EVENT_OBJ_GFX_MUDKIP_DOLL }; const u16 DecorGfx_DUSKULL_DOLL[] = { - MAP_OBJ_GFX_DUSKULL_DOLL + EVENT_OBJ_GFX_DUSKULL_DOLL }; const u16 DecorGfx_WYNAUT_DOLL[] = { - MAP_OBJ_GFX_WYNAUT_DOLL + EVENT_OBJ_GFX_WYNAUT_DOLL }; const u16 DecorGfx_BALTOY_DOLL[] = { - MAP_OBJ_GFX_BALTOY_DOLL + EVENT_OBJ_GFX_BALTOY_DOLL }; const u16 DecorGfx_KECLEON_DOLL[] = { - MAP_OBJ_GFX_KECLEON_DOLL + EVENT_OBJ_GFX_KECLEON_DOLL }; const u16 DecorGfx_AZURILL_DOLL[] = { - MAP_OBJ_GFX_AZURILL_DOLL + EVENT_OBJ_GFX_AZURILL_DOLL }; const u16 DecorGfx_SKITTY_DOLL[] = { - MAP_OBJ_GFX_SKITTY_DOLL + EVENT_OBJ_GFX_SKITTY_DOLL }; const u16 DecorGfx_SWABLU_DOLL[] = { - MAP_OBJ_GFX_SWABLU_DOLL + EVENT_OBJ_GFX_SWABLU_DOLL }; const u16 DecorGfx_GULPIN_DOLL[] = { - MAP_OBJ_GFX_GULPIN_DOLL + EVENT_OBJ_GFX_GULPIN_DOLL }; const u16 DecorGfx_LOTAD_DOLL[] = { - MAP_OBJ_GFX_LOTAD_DOLL + EVENT_OBJ_GFX_LOTAD_DOLL }; const u16 DecorGfx_SEEDOT_DOLL[] = { - MAP_OBJ_GFX_SEEDOT_DOLL + EVENT_OBJ_GFX_SEEDOT_DOLL }; const u16 DecorGfx_PIKA_CUSHION[] = { - MAP_OBJ_GFX_PIKA_CUSHION + EVENT_OBJ_GFX_PIKA_CUSHION }; const u16 DecorGfx_ROUND_CUSHION[] = { - MAP_OBJ_GFX_ROUND_CUSHION + EVENT_OBJ_GFX_ROUND_CUSHION }; const u16 DecorGfx_KISS_CUSHION[] = { - MAP_OBJ_GFX_KISS_CUSHION + EVENT_OBJ_GFX_KISS_CUSHION }; const u16 DecorGfx_ZIGZAG_CUSHION[] = { - MAP_OBJ_GFX_ZIGZAG_CUSHION + EVENT_OBJ_GFX_ZIGZAG_CUSHION }; const u16 DecorGfx_SPIN_CUSHION[] = { - MAP_OBJ_GFX_SPIN_CUSHION + EVENT_OBJ_GFX_SPIN_CUSHION }; const u16 DecorGfx_DIAMOND_CUSHION[] = { - MAP_OBJ_GFX_DIAMOND_CUSHION + EVENT_OBJ_GFX_DIAMOND_CUSHION }; const u16 DecorGfx_BALL_CUSHION[] = { - MAP_OBJ_GFX_BALL_CUSHION + EVENT_OBJ_GFX_BALL_CUSHION }; const u16 DecorGfx_GRASS_CUSHION[] = { - MAP_OBJ_GFX_GRASS_CUSHION + EVENT_OBJ_GFX_GRASS_CUSHION }; const u16 DecorGfx_FIRE_CUSHION[] = { - MAP_OBJ_GFX_FIRE_CUSHION + EVENT_OBJ_GFX_FIRE_CUSHION }; const u16 DecorGfx_WATER_CUSHION[] = { - MAP_OBJ_GFX_WATER_CUSHION + EVENT_OBJ_GFX_WATER_CUSHION }; const u16 DecorGfx_SNORLAX_DOLL[] = { - MAP_OBJ_GFX_BIG_SNORLAX_DOLL + EVENT_OBJ_GFX_BIG_SNORLAX_DOLL }; const u16 DecorGfx_RHYDON_DOLL[] = { - MAP_OBJ_GFX_BIG_RHYDON_DOLL + EVENT_OBJ_GFX_BIG_RHYDON_DOLL }; const u16 DecorGfx_LAPRAS_DOLL[] = { - MAP_OBJ_GFX_BIG_LAPRAS_DOLL + EVENT_OBJ_GFX_BIG_LAPRAS_DOLL }; const u16 DecorGfx_VENUSAUR_DOLL[] = { - MAP_OBJ_GFX_BIG_VENUSAUR_DOLL + EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL }; const u16 DecorGfx_CHARIZARD_DOLL[] = { - MAP_OBJ_GFX_BIG_CHARIZARD_DOLL + EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL }; const u16 DecorGfx_BLASTOISE_DOLL[] = { - MAP_OBJ_GFX_BIG_BLASTOISE_DOLL + EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL }; const u16 DecorGfx_WAILMER_DOLL[] = { - MAP_OBJ_GFX_BIG_WAILMER_DOLL + EVENT_OBJ_GFX_BIG_WAILMER_DOLL }; const u16 DecorGfx_REGIROCK_DOLL[] = { - MAP_OBJ_GFX_BIG_REGIROCK_DOLL + EVENT_OBJ_GFX_BIG_REGIROCK_DOLL }; const u16 DecorGfx_REGICE_DOLL[] = { - MAP_OBJ_GFX_BIG_REGICE_DOLL + EVENT_OBJ_GFX_BIG_REGICE_DOLL }; const u16 DecorGfx_REGISTEEL_DOLL[] = { - MAP_OBJ_GFX_BIG_REGISTEEL_DOLL + EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL }; #endif // GUARD_DATA_DECORATION_TILES diff --git a/include/event_data.h b/include/event_data.h index f829d3b87..e09b32d44 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -24,7 +24,7 @@ bool32 CanResetRTC(void); u16 *GetVarPointer(u16 id); u16 VarGet(u16 id); bool8 VarSet(u16 id, u16 value); -u8 VarGetFieldObjectGraphicsId(u8 id); +u8 VarGetEventObjectGraphicsId(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 new file mode 100644 index 000000000..59532fdcb --- /dev/null +++ b/include/event_obj_lock.h @@ -0,0 +1,11 @@ +#ifndef GUARD_EVENT_OBJ_LOCK_H +#define GUARD_EVENT_OBJ_LOCK_H + +bool8 sub_80983C4(void); +void ScriptFreezeEventObjects(void); +bool8 sub_809847C(void); +void LockSelectedEventObject(void); +void sub_8098630(void); +bool8 sub_8098734(void); + +#endif // GUARD_EVENT_OBJ_LOCK_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 293c2e3dc..ca2449a6d 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -1,5 +1,5 @@ -#ifndef GUARD_FIELD_MAP_OBJ_H -#define GUARD_FIELD_MAP_OBJ_H +#ifndef GUARD_FIELD_EVENT_OBJ_H +#define GUARD_FIELD_EVENT_OBJ_H #define NUM_OBJECT_GRAPHICS_INFO 239 #define SPRITE_VAR 240 @@ -47,40 +47,40 @@ struct UnkStruct_085094AC { #define GROUND_EFFECT_FLAG_SEAWEED (1 << 19) #define null_object_step(name, retval) \ -bool8 FieldObjectCB2_##name(struct MapObject *, struct Sprite *);\ -void FieldObjectCB_##name(struct Sprite *sprite)\ +bool8 EventObjectCB2_##name(struct EventObject *, struct Sprite *);\ +void EventObjectCB_##name(struct Sprite *sprite)\ {\ - FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, FieldObjectCB2_##name);\ + EventObjectStep(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_##name);\ }\ -bool8 FieldObjectCB2_##name(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 EventObjectCB2_##name(struct EventObject *eventObject, struct Sprite *sprite)\ {\ return (retval);\ } #define field_object_step(name, table) \ -extern bool8 (*const (table)[])(struct MapObject *, struct Sprite *);\ -bool8 FieldObjectCB2_##name(struct MapObject *, struct Sprite *);\ -void FieldObjectCB_##name(struct Sprite *sprite)\ +extern bool8 (*const (table)[])(struct EventObject *, struct Sprite *);\ +bool8 EventObjectCB2_##name(struct EventObject *, struct Sprite *);\ +void EventObjectCB_##name(struct Sprite *sprite)\ {\ - FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, FieldObjectCB2_##name);\ + EventObjectStep(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_##name);\ }\ -bool8 FieldObjectCB2_##name(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 EventObjectCB2_##name(struct EventObject *eventObject, struct Sprite *sprite)\ {\ - return (table)[sprite->data[1]](mapObject, sprite);\ + return (table)[sprite->data[1]](eventObject, sprite);\ } #define field_object_path(idx, table, sub, path, catch, coord)\ field_object_step(GoInDirectionSequence##idx, table)\ extern const u8 path[4];\ -bool8 sub(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 sub(struct EventObject *eventObject, struct Sprite *sprite)\ {\ u8 route[sizeof(path)];\ memcpy(route, path, sizeof(path));\ - if (mapObject->directionSequenceIndex == (catch) && mapObject->initialCoords.coord == mapObject->currentCoords.coord)\ + if (eventObject->directionSequenceIndex == (catch) && eventObject->initialCoords.coord == eventObject->currentCoords.coord)\ {\ - mapObject->directionSequenceIndex = (catch) + 1;\ + eventObject->directionSequenceIndex = (catch) + 1;\ }\ - return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, route);\ + return MoveEventObjectInNextDirectionInSequence(eventObject, sprite, route);\ }\ struct PairedPalettes { @@ -88,16 +88,16 @@ struct PairedPalettes { const u16 *data; }; -extern const struct SpriteFrameImage gFieldObjectPicTable_PechaBerryTree[]; +extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[]; void sub_808D438(void); u8 get_go_image_anim_num(u8); -u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8); -bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); -u8 GetFieldObjectIdByXY(s16, s16); -void FieldObjectSetDirection(struct MapObject *, u8); +u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8); +bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); +u8 GetEventObjectIdByXY(s16, s16); +void EventObjectSetDirection(struct EventObject *, u8); u8 sub_808D4F4(void); -void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8); +void RemoveEventObjectByLocalIdAndMap(u8, u8, u8); void npc_load_two_palettes__no_record(u16, u8); void npc_load_two_palettes__and_record(u16, u8); void sub_808EBA8(u8, u8, u8, s16, s16); @@ -105,185 +105,185 @@ void pal_patch_for_npc(u16, u8); void sub_808E16C(s16, s16); void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); void sub_8092FF0(s16, s16, s16 *, s16 *); -u8 FieldObjectDirectionToImageAnimId(u8); +u8 EventObjectDirectionToImageAnimId(u8); void sub_80930E0(s16 *, s16 *, s16, s16); -void FieldObjectClearAnim(struct MapObject *); -void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *); -void SpawnFieldObjectsInView(s16, s16); +void EventObjectClearAnim(struct EventObject *); +void EventObjectClearAnimIfSpecialAnimActive(struct EventObject *); +void SpawnEventObjectsInView(s16, s16); u8 sprite_new(u8, u8, s16, s16, u8, u8); -u8 AddPseudoFieldObject(u16, void (*)(struct Sprite *), s16, s16, u8); +u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16, s16, u8); u8 show_sprite(u8, u8, u8); -u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8); -u8 SpawnSpecialFieldObject(struct MapObjectTemplate *); +u8 SpawnSpecialEventObjectParametrized(u8, u8, u8, s16, s16, u8); +u8 SpawnSpecialEventObject(struct EventObjectTemplate *); void sub_8093038(s16, s16, s16 *, s16 *); void CameraObjectReset1(void); -void FieldObjectSetGraphicsId(struct MapObject *, u8); -void FieldObjectTurn(struct MapObject *, u8); -void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8); -const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8); +void EventObjectSetGraphicsId(struct EventObject *, u8); +void EventObjectTurn(struct EventObject *, u8); +void EventObjectTurnByLocalIdAndMap(u8, u8, u8, u8); +const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8); void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); void gpu_pal_allocator_reset__manage_upper_four(void); void sub_808E82C(u8, u8, u8, s16, s16); void sub_808E7E4(u8, u8, u8); void sub_808E78C(u8, u8, u8, u8); void sub_808E75C(s16, s16); -void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup); -void npc_coords_shift(struct MapObject *, s16, s16); -void sub_808EB08(struct MapObject *, s16, s16); +void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup); +void npc_coords_shift(struct EventObject *, s16, s16); +void sub_808EB08(struct EventObject *, s16, s16); void sub_808F254(u8, u8, u8); -void FieldObjectStep(struct MapObject *, struct Sprite *, bool8(struct MapObject *, struct Sprite *)); -u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8); +void EventObjectStep(struct EventObject *, struct Sprite *, bool8(struct EventObject *, struct Sprite *)); +u8 EventObjectFaceOppositeDirection(struct EventObject *, u8); u8 GetOppositeDirection(u8); u8 GetStepInPlaceDelay4AnimId(u32); u8 GetStepInPlaceDelay8AnimId(u32); u8 GetStepInPlaceDelay16AnimId(u32); u8 GetStepInPlaceDelay32AnimId(u32); -u8 npc_block_way(struct MapObject *, s16, s16, u32); +u8 npc_block_way(struct EventObject *, s16, s16, u32); void MoveCoords(u8, s16 *, s16 *); -bool8 FieldObjectIsSpecialAnimActive(struct MapObject *); -u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *); -u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z); -void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 movementType); +bool8 EventObjectIsSpecialAnimActive(struct EventObject *); +u8 EventObjectClearAnimIfSpecialAnimFinished(struct EventObject *); +u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z); +void npc_set_running_behaviour_etc(struct EventObject *eventObject, u8 movementType); u8 npc_running_behaviour_by_direction(u8 direction); -const u8 *GetFieldObjectScriptPointerByFieldObjectId(u8 mapObjectId); -u8 sub_8092C8C(struct MapObject *mapObject, s16 x, s16 y, u8 direction); +const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId); +u8 sub_8092C8C(struct EventObject *eventObject, s16 x, s16 y, u8 direction); u8 GetFaceDirectionAnimId(u32); u8 GetGoSpeed0AnimId(u32); u8 GetGoSpeed1AnimId(u32); u8 GetGoSpeed3AnimId(u32); u8 sub_80934BC(u32); -bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId); -bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *mapObject); -u8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject); -void sub_808F23C(const struct MapObject *mapObject, u8 movementType); -void sub_808F208(const struct MapObject *mapObject); -void npc_coords_shift_still(struct MapObject *pObject); -void FieldObjectMoveDestCoords(struct MapObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); +bool8 EventObjectSetSpecialAnim(struct EventObject *eventObject, u8 specialAnimId); +bool8 EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct EventObject *eventObject); +u8 EventObjectCheckIfSpecialAnimFinishedOrInactive(struct EventObject *eventObject); +void sub_808F23C(const struct EventObject *eventObject, u8 movementType); +void sub_808F208(const struct EventObject *eventObject); +void npc_coords_shift_still(struct EventObject *pObject); +void EventObjectMoveDestCoords(struct EventObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); u8 AddCameraObject(u8 linkedSpriteId); -void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y); +void UpdateEventObjectsForCameraUpdate(s16 x, s16 y); u8 GetSimpleGoAnimId(u32); u8 sub_8093514(u32); bool8 AreZCoordsCompatible(u8, u8); u8 ZCoordToPriority(u8); -void FieldObjectUpdateZCoord(struct MapObject *pObject); +void EventObjectUpdateZCoord(struct EventObject *pObject); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); bool8 IsZCoordMismatchAt(u8, s16, s16); void sub_8097AC8(struct Sprite *); -void npc_sync_anim_pause_bits(struct MapObject *); +void npc_sync_anim_pause_bits(struct EventObject *); void oamt_npc_ministep_reset(struct Sprite *, u8, u8); -u8 sub_8097F78(struct MapObject *); +u8 sub_8097F78(struct EventObject *); bool8 obj_npc_ministep(struct Sprite *sprite); bool8 sub_80976EC(struct Sprite *sprite); void sub_80976DC(struct Sprite *, u8); void sub_809783C(struct Sprite *, u8, u8, u8); -void DoShadowFieldEffect(struct MapObject *); +void DoShadowFieldEffect(struct EventObject *); u8 sub_809785C(struct Sprite *); u8 sub_80978E4(struct Sprite *); void obj_anim_image_set_and_seek(struct Sprite *, u8, u8); bool8 sub_80979BC(struct Sprite *); void sub_8097750(struct Sprite *); bool8 sub_8097758(struct Sprite *); -void sub_8097FA4(struct MapObject *); +void sub_8097FA4(struct EventObject *); void sub_8098044(u8); -void UnfreezeMapObjects(void); -void FreezeMapObjectsExceptOne(u8 mapObjectId); +void UnfreezeEventObjects(void); +void FreezeEventObjectsExceptOne(u8 eventObjectId); void sub_8097B78(u8, u8); void sub_8098074(u8 var1, u8 var2); -void FreezeMapObjects(void); -bool8 FreezeMapObject(struct MapObject *mapObject); +void FreezeEventObjects(void); +bool8 FreezeEventObject(struct EventObject *eventObject); u8 get_go_fast_image_anim_num(u8); u8 get_go_faster_image_anim_num(u8); u8 get_go_fastest_image_anim_num(u8); -void FieldObjectCB_NoMovement1(struct Sprite *); -void FieldObjectCB_LookRandomDirections(struct Sprite *); -void FieldObjectCB_GoRandomDirections(struct Sprite *); -void FieldObjectCB_RandomlyGoNorthOrSouth(struct Sprite *); -void FieldObjectCB_RandomlyGoNorthOrSouth(struct Sprite *); -void FieldObjectCB_RandomlyGoEastOrWest(struct Sprite *); -void FieldObjectCB_RandomlyGoEastOrWest(struct Sprite *); -void FieldObjectCB_FaceFixedDirection(struct Sprite *); -void FieldObjectCB_FaceFixedDirection(struct Sprite *); -void FieldObjectCB_FaceFixedDirection(struct Sprite *); -void FieldObjectCB_FaceFixedDirection(struct Sprite *); -void FieldObjectCB_NoMovement2(struct Sprite *); -void FieldObjectCB_BerryTree(struct Sprite *); -void FieldObjectCB_RandomlyLookNorthOrSouth(struct Sprite *); -void FieldObjectCB_RandomlyLookEastOrWest(struct Sprite *); -void FieldObjectCB_RandomlyLookNorthOrWest(struct Sprite *); -void FieldObjectCB_RandomlyLookNorthOrEast(struct Sprite *); -void FieldObjectCB_RandomlyLookSouthOrWest(struct Sprite *); -void FieldObjectCB_RandomlyLookSouthOrEast(struct Sprite *); -void FieldObjectCB_RandomlyLookNorthOrSouthOrWest(struct Sprite *); -void FieldObjectCB_RandomlyLookNorthOrSouthOrEast(struct Sprite *); -void FieldObjectCB_RandomlyLookNorthOrEastOrWest(struct Sprite *); -void FieldObjectCB_RandomlyLookSouthOrEastOrWest(struct Sprite *); -void FieldObjectCB_LookAroundCounterclockwise(struct Sprite *); -void FieldObjectCB_LookAroundClockwise(struct Sprite *); -void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); -void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); -void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); -void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence1(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence2(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence3(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence4(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence5(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence6(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence7(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence8(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence9(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence10(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence11(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence12(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence13(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence14(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence15(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence16(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence17(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence18(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence19(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence20(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence21(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence22(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence23(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence24(struct Sprite *); -void FieldObjectCB_CopyPlayer1(struct Sprite *); -void FieldObjectCB_CopyPlayer1(struct Sprite *); -void FieldObjectCB_CopyPlayer1(struct Sprite *); -void FieldObjectCB_CopyPlayer1(struct Sprite *); -void FieldObjectCB_TreeDisguise(struct Sprite *); -void FieldObjectCB_MountainDisguise(struct Sprite *); -void FieldObjectCB_CopyPlayer2(struct Sprite *); -void FieldObjectCB_CopyPlayer2(struct Sprite *); -void FieldObjectCB_CopyPlayer2(struct Sprite *); -void FieldObjectCB_CopyPlayer2(struct Sprite *); -void FieldObjectCB_Hidden1(struct Sprite *); -void FieldObjectCB_WalkInPlace1(struct Sprite *); -void FieldObjectCB_WalkInPlace1(struct Sprite *); -void FieldObjectCB_WalkInPlace1(struct Sprite *); -void FieldObjectCB_WalkInPlace1(struct Sprite *); -void FieldObjectCB_WalkInPlace2(struct Sprite *); -void FieldObjectCB_WalkInPlace2(struct Sprite *); -void FieldObjectCB_WalkInPlace2(struct Sprite *); -void FieldObjectCB_WalkInPlace2(struct Sprite *); -void FieldObjectCB_WalkInPlace3(struct Sprite *); -void FieldObjectCB_WalkInPlace3(struct Sprite *); -void FieldObjectCB_WalkInPlace3(struct Sprite *); -void FieldObjectCB_WalkInPlace3(struct Sprite *); -void FieldObjectCB_Hidden2(struct Sprite *); -void FieldObjectCB_WalkInPlace4(struct Sprite *); -void FieldObjectCB_WalkInPlace4(struct Sprite *); -void FieldObjectCB_WalkInPlace4(struct Sprite *); -void FieldObjectCB_WalkInPlace4(struct Sprite *); +void EventObjectCB_NoMovement1(struct Sprite *); +void EventObjectCB_LookRandomDirections(struct Sprite *); +void EventObjectCB_GoRandomDirections(struct Sprite *); +void EventObjectCB_RandomlyGoNorthOrSouth(struct Sprite *); +void EventObjectCB_RandomlyGoNorthOrSouth(struct Sprite *); +void EventObjectCB_RandomlyGoEastOrWest(struct Sprite *); +void EventObjectCB_RandomlyGoEastOrWest(struct Sprite *); +void EventObjectCB_FaceFixedDirection(struct Sprite *); +void EventObjectCB_FaceFixedDirection(struct Sprite *); +void EventObjectCB_FaceFixedDirection(struct Sprite *); +void EventObjectCB_FaceFixedDirection(struct Sprite *); +void EventObjectCB_NoMovement2(struct Sprite *); +void EventObjectCB_BerryTree(struct Sprite *); +void EventObjectCB_RandomlyLookNorthOrSouth(struct Sprite *); +void EventObjectCB_RandomlyLookEastOrWest(struct Sprite *); +void EventObjectCB_RandomlyLookNorthOrWest(struct Sprite *); +void EventObjectCB_RandomlyLookNorthOrEast(struct Sprite *); +void EventObjectCB_RandomlyLookSouthOrWest(struct Sprite *); +void EventObjectCB_RandomlyLookSouthOrEast(struct Sprite *); +void EventObjectCB_RandomlyLookNorthOrSouthOrWest(struct Sprite *); +void EventObjectCB_RandomlyLookNorthOrSouthOrEast(struct Sprite *); +void EventObjectCB_RandomlyLookNorthOrEastOrWest(struct Sprite *); +void EventObjectCB_RandomlyLookSouthOrEastOrWest(struct Sprite *); +void EventObjectCB_LookAroundCounterclockwise(struct Sprite *); +void EventObjectCB_LookAroundClockwise(struct Sprite *); +void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); +void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); +void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); +void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); +void EventObjectCB_GoInDirectionSequence1(struct Sprite *); +void EventObjectCB_GoInDirectionSequence2(struct Sprite *); +void EventObjectCB_GoInDirectionSequence3(struct Sprite *); +void EventObjectCB_GoInDirectionSequence4(struct Sprite *); +void EventObjectCB_GoInDirectionSequence5(struct Sprite *); +void EventObjectCB_GoInDirectionSequence6(struct Sprite *); +void EventObjectCB_GoInDirectionSequence7(struct Sprite *); +void EventObjectCB_GoInDirectionSequence8(struct Sprite *); +void EventObjectCB_GoInDirectionSequence9(struct Sprite *); +void EventObjectCB_GoInDirectionSequence10(struct Sprite *); +void EventObjectCB_GoInDirectionSequence11(struct Sprite *); +void EventObjectCB_GoInDirectionSequence12(struct Sprite *); +void EventObjectCB_GoInDirectionSequence13(struct Sprite *); +void EventObjectCB_GoInDirectionSequence14(struct Sprite *); +void EventObjectCB_GoInDirectionSequence15(struct Sprite *); +void EventObjectCB_GoInDirectionSequence16(struct Sprite *); +void EventObjectCB_GoInDirectionSequence17(struct Sprite *); +void EventObjectCB_GoInDirectionSequence18(struct Sprite *); +void EventObjectCB_GoInDirectionSequence19(struct Sprite *); +void EventObjectCB_GoInDirectionSequence20(struct Sprite *); +void EventObjectCB_GoInDirectionSequence21(struct Sprite *); +void EventObjectCB_GoInDirectionSequence22(struct Sprite *); +void EventObjectCB_GoInDirectionSequence23(struct Sprite *); +void EventObjectCB_GoInDirectionSequence24(struct Sprite *); +void EventObjectCB_CopyPlayer1(struct Sprite *); +void EventObjectCB_CopyPlayer1(struct Sprite *); +void EventObjectCB_CopyPlayer1(struct Sprite *); +void EventObjectCB_CopyPlayer1(struct Sprite *); +void EventObjectCB_TreeDisguise(struct Sprite *); +void EventObjectCB_MountainDisguise(struct Sprite *); +void EventObjectCB_CopyPlayer2(struct Sprite *); +void EventObjectCB_CopyPlayer2(struct Sprite *); +void EventObjectCB_CopyPlayer2(struct Sprite *); +void EventObjectCB_CopyPlayer2(struct Sprite *); +void EventObjectCB_Hidden1(struct Sprite *); +void EventObjectCB_WalkInPlace1(struct Sprite *); +void EventObjectCB_WalkInPlace1(struct Sprite *); +void EventObjectCB_WalkInPlace1(struct Sprite *); +void EventObjectCB_WalkInPlace1(struct Sprite *); +void EventObjectCB_WalkInPlace2(struct Sprite *); +void EventObjectCB_WalkInPlace2(struct Sprite *); +void EventObjectCB_WalkInPlace2(struct Sprite *); +void EventObjectCB_WalkInPlace2(struct Sprite *); +void EventObjectCB_WalkInPlace3(struct Sprite *); +void EventObjectCB_WalkInPlace3(struct Sprite *); +void EventObjectCB_WalkInPlace3(struct Sprite *); +void EventObjectCB_WalkInPlace3(struct Sprite *); +void EventObjectCB_Hidden2(struct Sprite *); +void EventObjectCB_WalkInPlace4(struct Sprite *); +void EventObjectCB_WalkInPlace4(struct Sprite *); +void EventObjectCB_WalkInPlace4(struct Sprite *); +void EventObjectCB_WalkInPlace4(struct Sprite *); -u8 sub_808F44C(struct MapObject *, struct Sprite *); -u8 sub_808F460(struct MapObject *, struct Sprite *); -u8 sub_808F48C(struct MapObject *, struct Sprite *); -u8 sub_808F4C8(struct MapObject *, struct Sprite *); -u8 sub_808F4E8(struct MapObject *, struct Sprite *); -u8 sub_808F534(struct MapObject *, struct Sprite *); -u8 sub_808F564(struct MapObject *, struct Sprite *); +u8 sub_808F44C(struct EventObject *, struct Sprite *); +u8 sub_808F460(struct EventObject *, struct Sprite *); +u8 sub_808F48C(struct EventObject *, struct Sprite *); +u8 sub_808F4C8(struct EventObject *, struct Sprite *); +u8 sub_808F4E8(struct EventObject *, struct Sprite *); +u8 sub_808F534(struct EventObject *, struct Sprite *); +u8 sub_808F564(struct EventObject *, struct Sprite *); u8 GetRegularRunningPastFacingDirection(s16, s16, s16, s16); u8 GetNorthSouthRunningPastFacingDirection(s16, s16, s16, s16); u8 GetEastWestRunningPastFacingDirection(s16, s16, s16, s16); @@ -295,146 +295,146 @@ u8 GetNonEastRunningPastFacingDirection(s16, s16, s16, s16); u8 GetNonWestRunningPastFacingDirection(s16, s16, s16, s16); u8 GetNonSouthRunningPastFacingDirection(s16, s16, s16, s16); u8 GetNonNorthRunningPastFacingDirection(s16, s16, s16, s16); -u8 sub_808F988(struct MapObject *, struct Sprite *); -u8 sub_808F99C(struct MapObject *, struct Sprite *); -u8 sub_808F9C8(struct MapObject *, struct Sprite *); -u8 sub_808FA0C(struct MapObject *, struct Sprite *); -u8 sub_808FA3C(struct MapObject *, struct Sprite *); -u8 sub_808FAC8(struct MapObject *, struct Sprite *); -u8 sub_808FADC(struct MapObject *, struct Sprite *); -u8 sub_808FB08(struct MapObject *, struct Sprite *); -u8 sub_808FB44(struct MapObject *, struct Sprite *); -u8 sub_808FB64(struct MapObject *, struct Sprite *); -u8 sub_808FBB0(struct MapObject *, struct Sprite *); -u8 sub_808FBE0(struct MapObject *, struct Sprite *); -u8 sub_808FC4C(struct MapObject *, struct Sprite *); -u8 sub_808FC60(struct MapObject *, struct Sprite *); -u8 sub_808FC8C(struct MapObject *, struct Sprite *); -u8 sub_808FCC8(struct MapObject *, struct Sprite *); -u8 sub_808FCE8(struct MapObject *, struct Sprite *); -u8 sub_808FD34(struct MapObject *, struct Sprite *); -u8 sub_808FD64(struct MapObject *, struct Sprite *); -u8 sub_808FDD0(struct MapObject *, struct Sprite *); -u8 sub_808FDFC(struct MapObject *, struct Sprite *); -u8 sub_808FE1C(struct MapObject *, struct Sprite *); -u8 do_berry_tree_growth_sparkle_1(struct MapObject *, struct Sprite *); -u8 sub_808FF48(struct MapObject *, struct Sprite *); -u8 do_berry_tree_growth_sparkle_2(struct MapObject *, struct Sprite *); -u8 sub_808FFB4(struct MapObject *, struct Sprite *); -u8 sub_8090004(struct MapObject *, struct Sprite *); -u8 sub_8090094(struct MapObject *, struct Sprite *); -u8 sub_80900A8(struct MapObject *, struct Sprite *); -u8 sub_80900D4(struct MapObject *, struct Sprite *); -u8 sub_8090118(struct MapObject *, struct Sprite *); -u8 sub_8090148(struct MapObject *, struct Sprite *); -u8 sub_80901D4(struct MapObject *, struct Sprite *); -u8 sub_80901E8(struct MapObject *, struct Sprite *); -u8 sub_8090214(struct MapObject *, struct Sprite *); -u8 sub_8090258(struct MapObject *, struct Sprite *); -u8 sub_8090288(struct MapObject *, struct Sprite *); -u8 sub_8090314(struct MapObject *, struct Sprite *); -u8 sub_8090328(struct MapObject *, struct Sprite *); -u8 sub_8090354(struct MapObject *, struct Sprite *); -u8 sub_8090398(struct MapObject *, struct Sprite *); -u8 sub_80903C8(struct MapObject *, struct Sprite *); -u8 sub_8090454(struct MapObject *, struct Sprite *); -u8 sub_8090468(struct MapObject *, struct Sprite *); -u8 sub_8090494(struct MapObject *, struct Sprite *); -u8 sub_80904D8(struct MapObject *, struct Sprite *); -u8 sub_8090508(struct MapObject *, struct Sprite *); -u8 sub_8090594(struct MapObject *, struct Sprite *); -u8 sub_80905A8(struct MapObject *, struct Sprite *); -u8 sub_80905D4(struct MapObject *, struct Sprite *); -u8 sub_8090618(struct MapObject *, struct Sprite *); -u8 sub_8090648(struct MapObject *, struct Sprite *); -u8 sub_80906D4(struct MapObject *, struct Sprite *); -u8 sub_80906E8(struct MapObject *, struct Sprite *); -u8 sub_8090714(struct MapObject *, struct Sprite *); -u8 sub_8090758(struct MapObject *, struct Sprite *); -u8 sub_8090788(struct MapObject *, struct Sprite *); -u8 sub_8090814(struct MapObject *, struct Sprite *); -u8 sub_8090828(struct MapObject *, struct Sprite *); -u8 sub_8090854(struct MapObject *, struct Sprite *); -u8 sub_8090898(struct MapObject *, struct Sprite *); -u8 sub_80908C8(struct MapObject *, struct Sprite *); -u8 sub_8090954(struct MapObject *, struct Sprite *); -u8 sub_8090968(struct MapObject *, struct Sprite *); -u8 sub_8090994(struct MapObject *, struct Sprite *); -u8 sub_80909D8(struct MapObject *, struct Sprite *); -u8 sub_8090A08(struct MapObject *, struct Sprite *); -u8 sub_8090A94(struct MapObject *, struct Sprite *); -u8 sub_8090AA8(struct MapObject *, struct Sprite *); -u8 sub_8090AD4(struct MapObject *, struct Sprite *); -u8 sub_8090B18(struct MapObject *, struct Sprite *); -u8 sub_8090B48(struct MapObject *, struct Sprite *); -u8 sub_8090BD4(struct MapObject *, struct Sprite *); -u8 sub_8090BE8(struct MapObject *, struct Sprite *); -u8 sub_8090C14(struct MapObject *, struct Sprite *); -u8 sub_8090C58(struct MapObject *, struct Sprite *); -u8 sub_8090C88(struct MapObject *, struct Sprite *); -u8 sub_8090D14(struct MapObject *, struct Sprite *); -u8 sub_8090D40(struct MapObject *, struct Sprite *); -u8 sub_8090D64(struct MapObject *, struct Sprite *); -u8 sub_8090D90(struct MapObject *, struct Sprite *); -u8 sub_8090E18(struct MapObject *, struct Sprite *); -u8 sub_8090E44(struct MapObject *, struct Sprite *); -u8 sub_8090E68(struct MapObject *, struct Sprite *); -u8 sub_8090E94(struct MapObject *, struct Sprite *); -u8 sub_8090F1C(struct MapObject *, struct Sprite *); -u8 sub_8090F30(struct MapObject *, struct Sprite *); -u8 sub_8090F68(struct MapObject *, struct Sprite *); -u8 sub_8091020(struct MapObject *, struct Sprite *); -u8 sub_8091048(struct MapObject *, struct Sprite *); -u8 sub_809117C(struct MapObject *, struct Sprite *); -u8 sub_8091110(struct MapObject *, struct Sprite *); -u8 sub_8091208(struct MapObject *, struct Sprite *); -u8 sub_8091294(struct MapObject *, struct Sprite *); -u8 sub_8091320(struct MapObject *, struct Sprite *); -u8 sub_80913AC(struct MapObject *, struct Sprite *); -u8 sub_8091438(struct MapObject *, struct Sprite *); -u8 sub_80914C4(struct MapObject *, struct Sprite *); -u8 sub_8091550(struct MapObject *, struct Sprite *); -u8 sub_80915DC(struct MapObject *, struct Sprite *); -u8 sub_8091668(struct MapObject *, struct Sprite *); -u8 sub_80916F4(struct MapObject *, struct Sprite *); -u8 sub_8091780(struct MapObject *, struct Sprite *); -u8 sub_809180C(struct MapObject *, struct Sprite *); -u8 sub_8091898(struct MapObject *, struct Sprite *); -u8 sub_8091924(struct MapObject *, struct Sprite *); -u8 sub_80919B0(struct MapObject *, struct Sprite *); -u8 sub_8091A3C(struct MapObject *, struct Sprite *); -u8 sub_8091AC8(struct MapObject *, struct Sprite *); -u8 sub_8091B54(struct MapObject *, struct Sprite *); -u8 sub_8091BE0(struct MapObject *, struct Sprite *); -u8 sub_8091C6C(struct MapObject *, struct Sprite *); -u8 sub_8091CF8(struct MapObject *, struct Sprite *); -u8 sub_8091D84(struct MapObject *, struct Sprite *); -u8 sub_8091E10(struct MapObject *, struct Sprite *); -u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *, struct Sprite *); -u8 sub_8091EC0(struct MapObject *, struct Sprite *); -u8 sub_8091F20(struct MapObject *, struct Sprite *); -bool8 sub_8091F48(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_8091F4C(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_8091F94(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_80920A4(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_809215C(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_8092214(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 cph_IM_DIFFERENT(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_8092314(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 oac_hopping(struct MapObject *, struct Sprite *, u8, bool8(u8)); -u8 mss_08062EA4(struct MapObject *, struct Sprite *); -u8 sub_80926AC(struct MapObject *, struct Sprite *); -u8 sub_8092718(struct MapObject *, struct Sprite *); -u8 sub_80926B8(struct MapObject *, struct Sprite *); -u8 sub_8092788(struct MapObject *, struct Sprite *); -u8 sub_80927F8(struct MapObject *, struct Sprite *); -u8 sub_8092868(struct MapObject *, struct Sprite *); -u8 sub_80928D8(struct MapObject *, struct Sprite *); -u8 sub_809290C(struct MapObject *, struct Sprite *); -u8 sub_809292C(struct MapObject *, struct Sprite *); +u8 sub_808F988(struct EventObject *, struct Sprite *); +u8 sub_808F99C(struct EventObject *, struct Sprite *); +u8 sub_808F9C8(struct EventObject *, struct Sprite *); +u8 sub_808FA0C(struct EventObject *, struct Sprite *); +u8 sub_808FA3C(struct EventObject *, struct Sprite *); +u8 sub_808FAC8(struct EventObject *, struct Sprite *); +u8 sub_808FADC(struct EventObject *, struct Sprite *); +u8 sub_808FB08(struct EventObject *, struct Sprite *); +u8 sub_808FB44(struct EventObject *, struct Sprite *); +u8 sub_808FB64(struct EventObject *, struct Sprite *); +u8 sub_808FBB0(struct EventObject *, struct Sprite *); +u8 sub_808FBE0(struct EventObject *, struct Sprite *); +u8 sub_808FC4C(struct EventObject *, struct Sprite *); +u8 sub_808FC60(struct EventObject *, struct Sprite *); +u8 sub_808FC8C(struct EventObject *, struct Sprite *); +u8 sub_808FCC8(struct EventObject *, struct Sprite *); +u8 sub_808FCE8(struct EventObject *, struct Sprite *); +u8 sub_808FD34(struct EventObject *, struct Sprite *); +u8 sub_808FD64(struct EventObject *, struct Sprite *); +u8 sub_808FDD0(struct EventObject *, struct Sprite *); +u8 sub_808FDFC(struct EventObject *, struct Sprite *); +u8 sub_808FE1C(struct EventObject *, struct Sprite *); +u8 do_berry_tree_growth_sparkle_1(struct EventObject *, struct Sprite *); +u8 sub_808FF48(struct EventObject *, struct Sprite *); +u8 do_berry_tree_growth_sparkle_2(struct EventObject *, struct Sprite *); +u8 sub_808FFB4(struct EventObject *, struct Sprite *); +u8 sub_8090004(struct EventObject *, struct Sprite *); +u8 sub_8090094(struct EventObject *, struct Sprite *); +u8 sub_80900A8(struct EventObject *, struct Sprite *); +u8 sub_80900D4(struct EventObject *, struct Sprite *); +u8 sub_8090118(struct EventObject *, struct Sprite *); +u8 sub_8090148(struct EventObject *, struct Sprite *); +u8 sub_80901D4(struct EventObject *, struct Sprite *); +u8 sub_80901E8(struct EventObject *, struct Sprite *); +u8 sub_8090214(struct EventObject *, struct Sprite *); +u8 sub_8090258(struct EventObject *, struct Sprite *); +u8 sub_8090288(struct EventObject *, struct Sprite *); +u8 sub_8090314(struct EventObject *, struct Sprite *); +u8 sub_8090328(struct EventObject *, struct Sprite *); +u8 sub_8090354(struct EventObject *, struct Sprite *); +u8 sub_8090398(struct EventObject *, struct Sprite *); +u8 sub_80903C8(struct EventObject *, struct Sprite *); +u8 sub_8090454(struct EventObject *, struct Sprite *); +u8 sub_8090468(struct EventObject *, struct Sprite *); +u8 sub_8090494(struct EventObject *, struct Sprite *); +u8 sub_80904D8(struct EventObject *, struct Sprite *); +u8 sub_8090508(struct EventObject *, struct Sprite *); +u8 sub_8090594(struct EventObject *, struct Sprite *); +u8 sub_80905A8(struct EventObject *, struct Sprite *); +u8 sub_80905D4(struct EventObject *, struct Sprite *); +u8 sub_8090618(struct EventObject *, struct Sprite *); +u8 sub_8090648(struct EventObject *, struct Sprite *); +u8 sub_80906D4(struct EventObject *, struct Sprite *); +u8 sub_80906E8(struct EventObject *, struct Sprite *); +u8 sub_8090714(struct EventObject *, struct Sprite *); +u8 sub_8090758(struct EventObject *, struct Sprite *); +u8 sub_8090788(struct EventObject *, struct Sprite *); +u8 sub_8090814(struct EventObject *, struct Sprite *); +u8 sub_8090828(struct EventObject *, struct Sprite *); +u8 sub_8090854(struct EventObject *, struct Sprite *); +u8 sub_8090898(struct EventObject *, struct Sprite *); +u8 sub_80908C8(struct EventObject *, struct Sprite *); +u8 sub_8090954(struct EventObject *, struct Sprite *); +u8 sub_8090968(struct EventObject *, struct Sprite *); +u8 sub_8090994(struct EventObject *, struct Sprite *); +u8 sub_80909D8(struct EventObject *, struct Sprite *); +u8 sub_8090A08(struct EventObject *, struct Sprite *); +u8 sub_8090A94(struct EventObject *, struct Sprite *); +u8 sub_8090AA8(struct EventObject *, struct Sprite *); +u8 sub_8090AD4(struct EventObject *, struct Sprite *); +u8 sub_8090B18(struct EventObject *, struct Sprite *); +u8 sub_8090B48(struct EventObject *, struct Sprite *); +u8 sub_8090BD4(struct EventObject *, struct Sprite *); +u8 sub_8090BE8(struct EventObject *, struct Sprite *); +u8 sub_8090C14(struct EventObject *, struct Sprite *); +u8 sub_8090C58(struct EventObject *, struct Sprite *); +u8 sub_8090C88(struct EventObject *, struct Sprite *); +u8 sub_8090D14(struct EventObject *, struct Sprite *); +u8 sub_8090D40(struct EventObject *, struct Sprite *); +u8 sub_8090D64(struct EventObject *, struct Sprite *); +u8 sub_8090D90(struct EventObject *, struct Sprite *); +u8 sub_8090E18(struct EventObject *, struct Sprite *); +u8 sub_8090E44(struct EventObject *, struct Sprite *); +u8 sub_8090E68(struct EventObject *, struct Sprite *); +u8 sub_8090E94(struct EventObject *, struct Sprite *); +u8 sub_8090F1C(struct EventObject *, struct Sprite *); +u8 sub_8090F30(struct EventObject *, struct Sprite *); +u8 sub_8090F68(struct EventObject *, struct Sprite *); +u8 sub_8091020(struct EventObject *, struct Sprite *); +u8 sub_8091048(struct EventObject *, struct Sprite *); +u8 sub_809117C(struct EventObject *, struct Sprite *); +u8 sub_8091110(struct EventObject *, struct Sprite *); +u8 sub_8091208(struct EventObject *, struct Sprite *); +u8 sub_8091294(struct EventObject *, struct Sprite *); +u8 sub_8091320(struct EventObject *, struct Sprite *); +u8 sub_80913AC(struct EventObject *, struct Sprite *); +u8 sub_8091438(struct EventObject *, struct Sprite *); +u8 sub_80914C4(struct EventObject *, struct Sprite *); +u8 sub_8091550(struct EventObject *, struct Sprite *); +u8 sub_80915DC(struct EventObject *, struct Sprite *); +u8 sub_8091668(struct EventObject *, struct Sprite *); +u8 sub_80916F4(struct EventObject *, struct Sprite *); +u8 sub_8091780(struct EventObject *, struct Sprite *); +u8 sub_809180C(struct EventObject *, struct Sprite *); +u8 sub_8091898(struct EventObject *, struct Sprite *); +u8 sub_8091924(struct EventObject *, struct Sprite *); +u8 sub_80919B0(struct EventObject *, struct Sprite *); +u8 sub_8091A3C(struct EventObject *, struct Sprite *); +u8 sub_8091AC8(struct EventObject *, struct Sprite *); +u8 sub_8091B54(struct EventObject *, struct Sprite *); +u8 sub_8091BE0(struct EventObject *, struct Sprite *); +u8 sub_8091C6C(struct EventObject *, struct Sprite *); +u8 sub_8091CF8(struct EventObject *, struct Sprite *); +u8 sub_8091D84(struct EventObject *, struct Sprite *); +u8 sub_8091E10(struct EventObject *, struct Sprite *); +u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct EventObject *, struct Sprite *); +u8 sub_8091EC0(struct EventObject *, struct Sprite *); +u8 sub_8091F20(struct EventObject *, struct Sprite *); +bool8 sub_8091F48(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_8091F4C(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_8091F94(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_80920A4(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_809215C(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_8092214(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 cph_IM_DIFFERENT(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_8092314(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 oac_hopping(struct EventObject *, struct Sprite *, u8, bool8(u8)); +u8 mss_08062EA4(struct EventObject *, struct Sprite *); +u8 sub_80926AC(struct EventObject *, struct Sprite *); +u8 sub_8092718(struct EventObject *, struct Sprite *); +u8 sub_80926B8(struct EventObject *, struct Sprite *); +u8 sub_8092788(struct EventObject *, struct Sprite *); +u8 sub_80927F8(struct EventObject *, struct Sprite *); +u8 sub_8092868(struct EventObject *, struct Sprite *); +u8 sub_80928D8(struct EventObject *, struct Sprite *); +u8 sub_809290C(struct EventObject *, struct Sprite *); +u8 sub_809292C(struct EventObject *, struct Sprite *); // Exported data declarations extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; -#endif //GUARD_FIELD_MAP_OBJ_H +#endif //GUARD_FIELD_EVENT_OBJ_H diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index b915d1419..3c4ad030f 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -30,7 +30,7 @@ u8 *sub_80682A8(struct MapPosition *, u8, u8); void overworld_poison_timer_set(void); void prev_quest_postbuffer_cursor_backup_reset(void); u8 *sub_8068E24(struct MapPosition *); -u8 *GetFieldObjectScriptPointerPlayerFacing(void); +u8 *GetEventObjectScriptPointerPlayerFacing(void); bool8 mapheader_trigger_activate_at__run_now(struct MapPosition *); bool8 sub_8068870(u16 a); bool8 sub_8068894(void); diff --git a/include/field_effect.h b/include/field_effect.h index b613df926..5e7cec4cb 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -148,33 +148,33 @@ bool8 sub_80B7270(struct Task *); bool8 sub_80B72D0(struct Task *); bool8 sub_80B72F4(struct Task *); -bool8 sub_80B73D0(struct Task *, struct MapObject *); -bool8 waterfall_1_do_anim_probably(struct Task *, struct MapObject *); -bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct MapObject *); -bool8 sub_80B7450(struct Task *, struct MapObject *); -bool8 sub_80B7478(struct Task *, struct MapObject *); +bool8 sub_80B73D0(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_80B7450(struct Task *, struct EventObject *); +bool8 sub_80B7478(struct Task *, struct EventObject *); bool8 dive_1_lock(struct Task *); bool8 dive_2_unknown(struct Task *); bool8 dive_3_unknown(struct Task *); -bool8 sub_80B764C(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7684(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B76B8(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7704(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B77F8(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7814(struct Task *, struct MapObject *, struct Sprite *); - -bool8 sub_80B78EC(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B791C(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7968(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B79BC(struct Task *, struct MapObject *, struct Sprite *); - -bool8 sub_80B7AE8(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7B18(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7B94(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7BCC(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7BF4(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B764C(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7684(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B76B8(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7704(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B77F8(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7814(struct Task *, struct EventObject *, struct Sprite *); + +bool8 sub_80B78EC(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B791C(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7968(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B79BC(struct Task *, struct EventObject *, struct Sprite *); + +bool8 sub_80B7AE8(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7B18(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7B94(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7BCC(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7BF4(struct Task *, struct EventObject *, struct Sprite *); void sub_80B7D14(struct Task *); void sub_80B7D34(struct Task *); diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index e7517acf1..547f515eb 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -11,12 +11,12 @@ // Exported ROM declarations u8 sub_8154228(void); -bool8 sub_8155DA0(struct MapObject *); -void sub_8155D78(struct MapObject *); +bool8 sub_8155DA0(struct EventObject *); +void sub_8155D78(struct EventObject *); void sub_81555AC(u8, u8); void ash(s16, s16, u16, s16); -void SetUpReflection(struct MapObject*, struct Sprite*, u8); -u32 StartFieldEffectForEventObject(u8, struct MapObject*); +void SetUpReflection(struct EventObject*, struct Sprite*, u8); +u32 StartFieldEffectForEventObject(u8, struct EventObject*); u8 sub_81546C8(u8, u8, u8, s16, s16); void sub_8155F80(struct Sprite*); void oamc_shadow(struct Sprite*); diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 0b9ea385c..970f47d5f 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -29,7 +29,7 @@ void PlayerAcroTurnJump(u8 a); void PlayerSetAnimId(u8 a, u8 b); bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction); void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction); -u8 CheckForFieldObjectCollision(struct MapObject *a, s16 b, s16 c, u8 d, u8 e); +u8 CheckForEventObjectCollision(struct EventObject *a, s16 b, s16 c, u8 d, u8 e); u8 PlayerGetZCoord(void); void SetPlayerAvatarTransitionFlags(u16 a); void sub_808BCE8(void); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 68277812d..7b38f9ddc 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -1,7 +1,7 @@ #ifndef GUARD_GLOBAL_FIELDMAP_H #define GUARD_GLOBAL_FIELDMAP_H -#define NUM_FIELD_OBJECTS 16 +#define NUM_EVENT_OBJECTS 16 enum { @@ -72,7 +72,7 @@ struct BackupMapData u16 *map; }; -struct MapObjectTemplate +struct EventObjectTemplate { /*0x00*/ u8 localId; /*0x01*/ u8 graphicsId; @@ -133,12 +133,12 @@ struct BgEvent struct MapEvents { - u8 mapObjectCount; + u8 eventObjectCount; u8 warpCount; u8 coordEventCount; u8 bgEventCount; - struct MapObjectTemplate *mapObjects; + struct EventObjectTemplate *eventObjects; struct WarpEvent *warps; struct CoordEvent *coordEvents; struct BgEvent *bgEvents; @@ -176,7 +176,7 @@ struct MapHeader /* 0x1B */ u8 battleType; }; -struct MapObject +struct EventObject { /*0x00*/ u32 active:1; u32 singleMovementActive:1; @@ -239,7 +239,7 @@ struct MapObject /*size = 0x24*/ }; -struct MapObjectGraphicsInfo +struct EventObjectGraphicsInfo { /*0x00*/ u16 tileTag; /*0x02*/ u16 paletteTag1; @@ -320,7 +320,7 @@ struct PlayerAvatar /*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 mapObjectId; + /*0x05*/ u8 eventObjectId; /*0x06*/ bool8 preventStep; /*0x07*/ u8 gender; /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie @@ -342,8 +342,8 @@ struct Camera s32 y; }; -extern struct MapObject gMapObjects[NUM_FIELD_OBJECTS]; -extern u8 gSelectedMapObject; +extern struct EventObject gEventObjects[NUM_EVENT_OBJECTS]; +extern u8 gSelectedEventObject; extern struct MapHeader gMapHeader; extern struct PlayerAvatar gPlayerAvatar; extern struct Camera gCamera; diff --git a/include/global.h b/include/global.h index 4a0fdb70a..d26184270 100644 --- a/include/global.h +++ b/include/global.h @@ -101,7 +101,7 @@ enum LanguageId // capacities of various saveblock objects #define DAYCARE_MON_COUNT 2 #define POKEBLOCKS_COUNT 40 -#define MAP_OBJECTS_COUNT 16 +#define EVENT_OBJECTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 300 #define VARS_COUNT 256 @@ -796,8 +796,8 @@ struct SaveBlock1 /*0x9C2*/ u8 field_9C2[6]; /*0x9C8*/ u16 trainerRematchStepCounter; /*0x9CA*/ u8 trainerRematches[100]; - /*0xA30*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; - /*0xC70*/ struct MapObjectTemplate mapObjectTemplates[64]; + /*0xA30*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT]; + /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[64]; /*0x1270*/ u8 flags[FLAGS_COUNT]; /*0x139C*/ u16 vars[VARS_COUNT]; /*0x159C*/ u32 gameStats[NUM_GAME_STATS]; diff --git a/include/load_save.h b/include/load_save.h index 0868316c8..5fb5f6c42 100644 --- a/include/load_save.h +++ b/include/load_save.h @@ -22,8 +22,8 @@ void sub_8076D5C(void); void sav2_gender2_inplace_and_xFE(void); void SavePlayerParty(void); void LoadPlayerParty(void); -void SaveMapObjects(void); -void LoadMapObjects(void); +void SaveEventObjects(void); +void LoadEventObjects(void); void SaveSerializedGame(void); void LoadSerializedGame(void); void LoadPlayerBag(void); diff --git a/include/map_obj_lock.h b/include/map_obj_lock.h deleted file mode 100644 index a10648f2f..000000000 --- a/include/map_obj_lock.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef GUARD_MAP_OBJ_LOCK_H -#define GUARD_MAP_OBJ_LOCK_H - -bool8 sub_80983C4(void); -void ScriptFreezeMapObjects(void); -bool8 sub_809847C(void); -void LockSelectedMapObject(void); -void sub_8098630(void); -bool8 sub_8098734(void); - -#endif // GUARD_MAP_OBJ_LOCK_H diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h index e318ac8bb..9d71e81aa 100644 --- a/include/mauville_old_man.h +++ b/include/mauville_old_man.h @@ -15,7 +15,7 @@ extern struct BardSong gBardSong; void SetMauvilleOldMan(void); u8 GetCurrentMauvilleOldMan(void); -void ScrSpecial_SetMauvilleOldManMapObjGfx(void); +void ScrSpecial_SetMauvilleOldManEventObjGfx(void); u8 sub_81201C8(void); void sub_8120B70(OldMan *dest); void sub_8120670(void); diff --git a/include/overworld.h b/include/overworld.h index 15d7bb362..ace988f4e 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -7,17 +7,17 @@ struct UnkPlayerStruct u8 player_field_1; }; -struct LinkPlayerMapObject +struct LinkPlayerEventObject { u8 active; u8 linkPlayerId; - u8 mapObjId; + u8 eventObjId; u8 mode; }; // Exported RAM declarations extern struct WarpData gUnknown_020322DC; -extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4]; +extern struct LinkPlayerEventObject gLinkPlayerEventObjects[4]; extern u16 *gBGTilemapBuffers1; extern u16 *gBGTilemapBuffers2; @@ -37,10 +37,10 @@ void IncrementGameStat(u8 index); u32 GetGameStat(u8 index); void SetGameStat(u8 index, u32 value); void ApplyNewEncryptionKeyToGameStats(u32 newKey); -void LoadMapObjTemplatesFromHeader(void); -void LoadSaveblockMapObjScripts(void); -void Overworld_SetMapObjTemplateCoords(u8 localId, s16 x, s16 y); -void Overworld_SetMapObjTemplateMovementType(u8 localId, u8 movementType); +void LoadEventObjTemplatesFromHeader(void); +void LoadSaveblockEventObjScripts(void); +void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y); +void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType); const struct MapData *get_mapdata_header(void); void ApplyCurrentWarp(void); void set_warp2_warp3_to_neg_1(void); @@ -141,6 +141,6 @@ bool32 sub_8087598(void); bool32 sub_80875C8(void); bool32 sub_8087634(void); bool32 sub_808766C(void); -void ZeroAllLinkPlayerMapObjects(void); +void ZeroAllLinkPlayerEventObjects(void); #endif // GUARD_OVERWORLD_H diff --git a/include/pokenav.h b/include/pokenav.h index 734a1ec3f..2bca4db94 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -21,7 +21,7 @@ void sub_81D1EC0(void); void sub_81D1D04(u8); bool8 sub_81D1C44(u8); void sub_81D5FB4(u16*); -bool8 sub_81D4A58(struct MapObject*); +bool8 sub_81D4A58(struct EventObject*); #endif //GUARD_POKENAV_H diff --git a/include/rom_81BE66C.h b/include/rom_81BE66C.h index 5b4f80249..900daf4e7 100644 --- a/include/rom_81BE66C.h +++ b/include/rom_81BE66C.h @@ -6,7 +6,7 @@ #define GUARD_ROM_81BE66C_H bool32 InTrainerHill(void); -bool8 FieldObjectIsFarawayIslandMew(struct MapObject *); +bool8 EventObjectIsFarawayIslandMew(struct EventObject *); u32 sub_81D427C(void); #endif //GUARD_ROM_81BE66C_H diff --git a/include/trainer_see.h b/include/trainer_see.h index 847380782..39f3cd8b0 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -3,7 +3,7 @@ struct ApproachingTrainer { - u8 mapObjectId; + u8 eventObjectId; u8 radius; // plus 1 const u8 *trainerScriptPtr; u8 taskId; @@ -17,14 +17,14 @@ extern u8 gUnknown_030060AC; extern u8 gApproachingTrainerId; bool8 CheckForTrainersWantingBattle(void); -void sub_80B4578(struct MapObject *var); +void sub_80B4578(struct EventObject *var); void EndTrainerApproach(void); void sub_80B45D0(void); u8 FldEff_ExclamationMarkIcon1(void); u8 FldEff_ExclamationMarkIcon2(void); u8 FldEff_HeartIcon(void); -u8 GetCurrentApproachingTrainerMapObjectId(void); -u8 GetChosenApproachingTrainerMapObjectId(u8 arrayId); +u8 GetCurrentApproachingTrainerEventObjectId(void); +u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId); void sub_80B4808(void); #endif // GUARD_TRAINER_SEE_H |