diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/object_events/object_event_graphics_info_pointers.h | 308 | ||||
| -rw-r--r-- | src/event_object_movement.c | 8 |
2 files changed, 312 insertions, 4 deletions
diff --git a/src/data/object_events/object_event_graphics_info_pointers.h b/src/data/object_events/object_event_graphics_info_pointers.h new file mode 100644 index 000000000..5710ea3ee --- /dev/null +++ b/src/data/object_events/object_event_graphics_info_pointers.h @@ -0,0 +1,308 @@ +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3BB0; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3BD4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3BF8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3C1C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4858; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A48A0; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A48C4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4564; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4588; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A45AC; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A45D0; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A487C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A48E8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A490C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3C64; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3C88; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3CAC; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3CD0; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3D3C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3DA8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3DF0; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3CF4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3D18; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3D60; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3DCC; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4390; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A43B4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3E14; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3E5C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3EEC; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3E38; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3D84; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3E80; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3F34; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4420; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3F58; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A424C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4228; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4270; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3F7C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3FA0; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3FC4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3FE8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4078; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A409C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A40C0; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A40E4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3EA4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3EC8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4618; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4054; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4978; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A400C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A42B8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4108; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A412C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4294; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A41BC; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4030; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3F10; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A3C40; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4150; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4174; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4198; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4300; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A44D4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A44F8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4324; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4468; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A448C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A44B0; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A436C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4834; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A47A4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4810; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4660; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A47C8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A47EC; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A43D8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A43FC; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4684; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A46A8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A46CC; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A46F0; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4714; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4780; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A475C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4738; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A50EC; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A463C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A41E0; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A42DC; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4348; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4930; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4954; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4444; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A451C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4540; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A49C0; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A49E4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4A08; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4A2C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4A50; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4A74; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4A98; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4ABC; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4AE0; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4B04; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A5110; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A499C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4B28; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4F84; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4FF0; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A50C8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A5014; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A5080; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A50A4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A5038; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4B4C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4B70; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A505C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4B94; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4BB8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4BDC; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4C00; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4C24; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4C48; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4C6C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4C90; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4CB4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4CD8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4CFC; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4D20; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4D44; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4FA8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4D68; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4D8C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4DB0; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4DD4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4E64; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4E88; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4EAC; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4EF4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4ED0; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4F18; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4F3C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4F60; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4FCC; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4DF8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4E1C; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A4E40; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A5134; + + +const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM_OBJ_EVENT_GFX] = { + [OBJ_EVENT_GFX_RED_NORMAL] = &gObjectEventGraphicsInfo_83A3BB0, + [OBJ_EVENT_GFX_RED_BIKE] = &gObjectEventGraphicsInfo_83A3BD4, + [OBJ_EVENT_GFX_RED_SURF] = &gObjectEventGraphicsInfo_83A3BF8, + [OBJ_EVENT_GFX_RED_ITEM] = &gObjectEventGraphicsInfo_83A3C1C, + [OBJ_EVENT_GFX_RED_FISH] = &gObjectEventGraphicsInfo_83A4858, + [OBJ_EVENT_GFX_RED_ITEM_COPY] = &gObjectEventGraphicsInfo_83A48A0, + [OBJ_EVENT_GFX_RED_VS_SEEKER] = &gObjectEventGraphicsInfo_83A48C4, + [OBJ_EVENT_GFX_GREEN_NORMAL] = &gObjectEventGraphicsInfo_83A4564, + [OBJ_EVENT_GFX_GREEN_BIKE] = &gObjectEventGraphicsInfo_83A4588, + [OBJ_EVENT_GFX_GREEN_SURF] = &gObjectEventGraphicsInfo_83A45AC, + [OBJ_EVENT_GFX_GREEN_ITEM] = &gObjectEventGraphicsInfo_83A45D0, + [OBJ_EVENT_GFX_GREEN_FISH] = &gObjectEventGraphicsInfo_83A487C, + [OBJ_EVENT_GFX_GREEN_ITEM_COPY] = &gObjectEventGraphicsInfo_83A48E8, + [OBJ_EVENT_GFX_GREEN_VS_SEEKER] = &gObjectEventGraphicsInfo_83A490C, + [OBJ_EVENT_GFX_RS_BRENDAN] = &gObjectEventGraphicsInfo_83A3C64, + [OBJ_EVENT_GFX_RS_MAY] = &gObjectEventGraphicsInfo_83A3C88, + [OBJ_EVENT_GFX_LITTLE_BOY] = &gObjectEventGraphicsInfo_83A3CAC, + [OBJ_EVENT_GFX_LITTLE_GIRL] = &gObjectEventGraphicsInfo_83A3CD0, + [OBJ_EVENT_GFX_YOUNGSTER] = &gObjectEventGraphicsInfo_83A3D3C, + [OBJ_EVENT_GFX_BOY] = &gObjectEventGraphicsInfo_83A3DA8, + [OBJ_EVENT_GFX_BUG_CATCHER] = &gObjectEventGraphicsInfo_83A3DF0, + [OBJ_EVENT_GFX_SITTING_BOY] = &gObjectEventGraphicsInfo_83A3CF4, + [OBJ_EVENT_GFX_LASS] = &gObjectEventGraphicsInfo_83A3D18, + [OBJ_EVENT_GFX_WOMAN_1] = &gObjectEventGraphicsInfo_83A3D60, + [OBJ_EVENT_GFX_BATTLE_GIRL] = &gObjectEventGraphicsInfo_83A3DCC, + [OBJ_EVENT_GFX_MAN] = &gObjectEventGraphicsInfo_83A4390, + [OBJ_EVENT_GFX_ROCKER] = &gObjectEventGraphicsInfo_83A43B4, + [OBJ_EVENT_GFX_FAT_MAN] = &gObjectEventGraphicsInfo_83A3E14, + [OBJ_EVENT_GFX_WOMAN_2] = &gObjectEventGraphicsInfo_83A3E5C, + [OBJ_EVENT_GFX_BEAUTY] = &gObjectEventGraphicsInfo_83A3EEC, + [OBJ_EVENT_GFX_BALDING_MAN] = &gObjectEventGraphicsInfo_83A3E38, + [OBJ_EVENT_GFX_WOMAN_3] = &gObjectEventGraphicsInfo_83A3D84, + [OBJ_EVENT_GFX_OLD_MAN_1] = &gObjectEventGraphicsInfo_83A3E80, + [OBJ_EVENT_GFX_OLD_MAN_2] = &gObjectEventGraphicsInfo_83A3F34, + [OBJ_EVENT_GFX_OLD_MAN_LYING_DOWN] = &gObjectEventGraphicsInfo_83A4420, + [OBJ_EVENT_GFX_OLD_WOMAN] = &gObjectEventGraphicsInfo_83A3F58, + [OBJ_EVENT_GFX_TUBER_M_1] = &gObjectEventGraphicsInfo_83A424C, + [OBJ_EVENT_GFX_TUBER_F] = &gObjectEventGraphicsInfo_83A4228, + [OBJ_EVENT_GFX_TUBER_M_2] = &gObjectEventGraphicsInfo_83A4270, + [OBJ_EVENT_GFX_CAMPER] = &gObjectEventGraphicsInfo_83A3F7C, + [OBJ_EVENT_GFX_PICNICKER] = &gObjectEventGraphicsInfo_83A3FA0, + [OBJ_EVENT_GFX_COOLTRAINER_M] = &gObjectEventGraphicsInfo_83A3FC4, + [OBJ_EVENT_GFX_COOLTRAINER_F] = &gObjectEventGraphicsInfo_83A3FE8, + [OBJ_EVENT_GFX_SWIMMER_M_WATER] = &gObjectEventGraphicsInfo_83A4078, + [OBJ_EVENT_GFX_SWIMMER_F_WATER] = &gObjectEventGraphicsInfo_83A409C, + [OBJ_EVENT_GFX_SWIMMER_M_LAND] = &gObjectEventGraphicsInfo_83A40C0, + [OBJ_EVENT_GFX_SWIMMER_F_LAND] = &gObjectEventGraphicsInfo_83A40E4, + [OBJ_EVENT_GFX_WORKER_M] = &gObjectEventGraphicsInfo_83A3EA4, + [OBJ_EVENT_GFX_WORKER_F] = &gObjectEventGraphicsInfo_83A3EC8, + [OBJ_EVENT_GFX_ROCKET_M] = &gObjectEventGraphicsInfo_83A4618, + [OBJ_EVENT_GFX_ROCKET_F] = &gObjectEventGraphicsInfo_83A4054, + [OBJ_EVENT_GFX_GBA_KID] = &gObjectEventGraphicsInfo_83A4978, + [OBJ_EVENT_GFX_SUPER_NERD] = &gObjectEventGraphicsInfo_83A400C, + [OBJ_EVENT_GFX_BIKER] = &gObjectEventGraphicsInfo_83A42B8, + [OBJ_EVENT_GFX_BLACKBELT] = &gObjectEventGraphicsInfo_83A4108, + [OBJ_EVENT_GFX_SCIENTIST] = &gObjectEventGraphicsInfo_83A412C, + [OBJ_EVENT_GFX_HIKER] = &gObjectEventGraphicsInfo_83A4294, + [OBJ_EVENT_GFX_FISHER] = &gObjectEventGraphicsInfo_83A41BC, + [OBJ_EVENT_GFX_CHANNELER] = &gObjectEventGraphicsInfo_83A4030, + [OBJ_EVENT_GFX_CHEF] = &gObjectEventGraphicsInfo_83A3F10, + [OBJ_EVENT_GFX_POLICEMAN] = &gObjectEventGraphicsInfo_83A3C40, + [OBJ_EVENT_GFX_GENTLEMAN] = &gObjectEventGraphicsInfo_83A4150, + [OBJ_EVENT_GFX_SAILOR] = &gObjectEventGraphicsInfo_83A4174, + [OBJ_EVENT_GFX_CAPTAIN] = &gObjectEventGraphicsInfo_83A4198, + [OBJ_EVENT_GFX_NURSE] = &gObjectEventGraphicsInfo_83A4300, + [OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST] = &gObjectEventGraphicsInfo_83A44D4, + [OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST] = &gObjectEventGraphicsInfo_83A44F8, + [OBJ_EVENT_GFX_UNUSED_MALE_RECEPTIONIST] = &gObjectEventGraphicsInfo_83A4324, + [OBJ_EVENT_GFX_CLERK] = &gObjectEventGraphicsInfo_83A4468, + [OBJ_EVENT_GFX_MG_DELIVERYMAN] = &gObjectEventGraphicsInfo_83A448C, + [OBJ_EVENT_GFX_TRAINER_TOWER_DUDE] = &gObjectEventGraphicsInfo_83A44B0, + [OBJ_EVENT_GFX_PROF_OAK] = &gObjectEventGraphicsInfo_83A436C, + [OBJ_EVENT_GFX_BLUE] = &gObjectEventGraphicsInfo_83A4834, + [OBJ_EVENT_GFX_BILL] = &gObjectEventGraphicsInfo_83A47A4, + [OBJ_EVENT_GFX_LANCE] = &gObjectEventGraphicsInfo_83A4810, + [OBJ_EVENT_GFX_AGATHA] = &gObjectEventGraphicsInfo_83A4660, + [OBJ_EVENT_GFX_DAISY] = &gObjectEventGraphicsInfo_83A47C8, + [OBJ_EVENT_GFX_LORELEI] = &gObjectEventGraphicsInfo_83A47EC, + [OBJ_EVENT_GFX_MR_FUJI] = &gObjectEventGraphicsInfo_83A43D8, + [OBJ_EVENT_GFX_BRUNO] = &gObjectEventGraphicsInfo_83A43FC, + [OBJ_EVENT_GFX_BROCK] = &gObjectEventGraphicsInfo_83A4684, + [OBJ_EVENT_GFX_MISTY] = &gObjectEventGraphicsInfo_83A46A8, + [OBJ_EVENT_GFX_LT_SURGE] = &gObjectEventGraphicsInfo_83A46CC, + [OBJ_EVENT_GFX_ERIKA] = &gObjectEventGraphicsInfo_83A46F0, + [OBJ_EVENT_GFX_KOGA] = &gObjectEventGraphicsInfo_83A4714, + [OBJ_EVENT_GFX_SABRINA] = &gObjectEventGraphicsInfo_83A4780, + [OBJ_EVENT_GFX_BLAINE] = &gObjectEventGraphicsInfo_83A475C, + [OBJ_EVENT_GFX_GIOVANNI] = &gObjectEventGraphicsInfo_83A4738, + [OBJ_EVENT_GFX_MOM] = &gObjectEventGraphicsInfo_83A50EC, + [OBJ_EVENT_GFX_CELIO] = &gObjectEventGraphicsInfo_83A463C, + [OBJ_EVENT_GFX_TEACHY_TV_HOST] = &gObjectEventGraphicsInfo_83A41E0, + [OBJ_EVENT_GFX_GYM_GUY] = &gObjectEventGraphicsInfo_83A42DC, + [OBJ_EVENT_GFX_ITEM_BALL] = &gObjectEventGraphicsInfo_83A4348, + [OBJ_EVENT_GFX_TOWN_MAP] = &gObjectEventGraphicsInfo_83A4930, + [OBJ_EVENT_GFX_POKEDEX] = &gObjectEventGraphicsInfo_83A4954, + [OBJ_EVENT_GFX_CUT_TREE] = &gObjectEventGraphicsInfo_83A4444, + [OBJ_EVENT_GFX_ROCK_SMASH_ROCK] = &gObjectEventGraphicsInfo_83A451C, + [OBJ_EVENT_GFX_STRENGTH_BOULDER] = &gObjectEventGraphicsInfo_83A4540, + [OBJ_EVENT_GFX_FOSSIL] = &gObjectEventGraphicsInfo_83A49C0, + [OBJ_EVENT_GFX_RUBY] = &gObjectEventGraphicsInfo_83A49E4, + [OBJ_EVENT_GFX_SAPPHIRE] = &gObjectEventGraphicsInfo_83A4A08, + [OBJ_EVENT_GFX_OLD_AMBER] = &gObjectEventGraphicsInfo_83A4A2C, + [OBJ_EVENT_GFX_GYM_SIGN] = &gObjectEventGraphicsInfo_83A4A50, + [OBJ_EVENT_GFX_SIGN] = &gObjectEventGraphicsInfo_83A4A74, + [OBJ_EVENT_GFX_TRAINER_TIPS] = &gObjectEventGraphicsInfo_83A4A98, + [OBJ_EVENT_GFX_CLIPBOARD] = &gObjectEventGraphicsInfo_83A4ABC, + [OBJ_EVENT_GFX_METEORITE] = &gObjectEventGraphicsInfo_83A4AE0, + [OBJ_EVENT_GFX_LAPRAS_DOLL] = &gObjectEventGraphicsInfo_83A4B04, + [OBJ_EVENT_GFX_SEAGALLOP] = &gObjectEventGraphicsInfo_83A5110, + [OBJ_EVENT_GFX_SNORLAX] = &gObjectEventGraphicsInfo_83A499C, + [OBJ_EVENT_GFX_SPEAROW] = &gObjectEventGraphicsInfo_83A4B28, + [OBJ_EVENT_GFX_CUBONE] = &gObjectEventGraphicsInfo_83A4F84, + [OBJ_EVENT_GFX_POLIWRATH] = &gObjectEventGraphicsInfo_83A4FF0, + [OBJ_EVENT_GFX_CLEFAIRY] = &gObjectEventGraphicsInfo_83A50C8, + [OBJ_EVENT_GFX_PIDGEOT] = &gObjectEventGraphicsInfo_83A5014, + [OBJ_EVENT_GFX_JIGGLYPUFF] = &gObjectEventGraphicsInfo_83A5080, + [OBJ_EVENT_GFX_PIDGEY] = &gObjectEventGraphicsInfo_83A50A4, + [OBJ_EVENT_GFX_CHANSEY] = &gObjectEventGraphicsInfo_83A5038, + [OBJ_EVENT_GFX_OMANYTE] = &gObjectEventGraphicsInfo_83A4B4C, + [OBJ_EVENT_GFX_KANGASKHAN] = &gObjectEventGraphicsInfo_83A4B70, + [OBJ_EVENT_GFX_PIKACHU] = &gObjectEventGraphicsInfo_83A505C, + [OBJ_EVENT_GFX_PSYDUCK] = &gObjectEventGraphicsInfo_83A4B94, + [OBJ_EVENT_GFX_NIDORAN_F] = &gObjectEventGraphicsInfo_83A4BB8, + [OBJ_EVENT_GFX_NIDORAN_M] = &gObjectEventGraphicsInfo_83A4BDC, + [OBJ_EVENT_GFX_NIDORINO] = &gObjectEventGraphicsInfo_83A4C00, + [OBJ_EVENT_GFX_MEOWTH] = &gObjectEventGraphicsInfo_83A4C24, + [OBJ_EVENT_GFX_SEEL] = &gObjectEventGraphicsInfo_83A4C48, + [OBJ_EVENT_GFX_VOLTORB] = &gObjectEventGraphicsInfo_83A4C6C, + [OBJ_EVENT_GFX_SLOWPOKE] = &gObjectEventGraphicsInfo_83A4C90, + [OBJ_EVENT_GFX_SLOWBRO] = &gObjectEventGraphicsInfo_83A4CB4, + [OBJ_EVENT_GFX_MACHOP] = &gObjectEventGraphicsInfo_83A4CD8, + [OBJ_EVENT_GFX_WIGGLYTUFF] = &gObjectEventGraphicsInfo_83A4CFC, + [OBJ_EVENT_GFX_DODUO] = &gObjectEventGraphicsInfo_83A4D20, + [OBJ_EVENT_GFX_FEAROW] = &gObjectEventGraphicsInfo_83A4D44, + [OBJ_EVENT_GFX_MACHOKE] = &gObjectEventGraphicsInfo_83A4FA8, + [OBJ_EVENT_GFX_LAPRAS] = &gObjectEventGraphicsInfo_83A4D68, + [OBJ_EVENT_GFX_ZAPDOS] = &gObjectEventGraphicsInfo_83A4D8C, + [OBJ_EVENT_GFX_MOLTRES] = &gObjectEventGraphicsInfo_83A4DB0, + [OBJ_EVENT_GFX_ARTICUNO] = &gObjectEventGraphicsInfo_83A4DD4, + [OBJ_EVENT_GFX_MEWTWO] = &gObjectEventGraphicsInfo_83A4E64, + [OBJ_EVENT_GFX_MEW] = &gObjectEventGraphicsInfo_83A4E88, + [OBJ_EVENT_GFX_ENTEI] = &gObjectEventGraphicsInfo_83A4EAC, + [OBJ_EVENT_GFX_SUICUNE] = &gObjectEventGraphicsInfo_83A4EF4, + [OBJ_EVENT_GFX_RAIKOU] = &gObjectEventGraphicsInfo_83A4ED0, + [OBJ_EVENT_GFX_LUGIA] = &gObjectEventGraphicsInfo_83A4F18, + [OBJ_EVENT_GFX_HO_OH] = &gObjectEventGraphicsInfo_83A4F3C, + [OBJ_EVENT_GFX_CELEBI] = &gObjectEventGraphicsInfo_83A4F60, + [OBJ_EVENT_GFX_KABUTO] = &gObjectEventGraphicsInfo_83A4FCC, + [OBJ_EVENT_GFX_DEOXYS_D] = &gObjectEventGraphicsInfo_83A4DF8, + [OBJ_EVENT_GFX_DEOXYS_A] = &gObjectEventGraphicsInfo_83A4E1C, + [OBJ_EVENT_GFX_DEOXYS_N] = &gObjectEventGraphicsInfo_83A4E40, + [OBJ_EVENT_GFX_SS_ANNE] = &gObjectEventGraphicsInfo_83A5134, +}; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 87e78ed92..c30f50584 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -123,8 +123,8 @@ EWRAM_DATA u8 sCurrentReflectionType = 0; EWRAM_DATA u16 sCurrentSpecialObjectPaletteTag = 0; extern const u8 gRangedMovementTypes[NUM_FIELD_MAP_OBJECT_TEMPLATES]; -extern const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES]; extern void (*const sMovementTypeCallbacks[])(struct Sprite *); +extern const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES]; extern const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM_OBJ_EVENT_GFX]; extern const struct SpritePalette sObjectEventSpritePalettes[]; extern const struct PairedPalettes gPlayerReflectionPaletteSets[]; @@ -884,7 +884,7 @@ extern const u32 gUnknown_8394E28[]; #define OBJ_EVENT_PAL_TAG_34 0x1123 #define OBJ_EVENT_PAL_TAG_NONE 0x11FF -/*#include "data/object_events/object_event_graphics_info_pointers.h"*/ +#include "data/object_events/object_event_graphics_info_pointers.h" #include "data/field_effects/field_effect_object_template_pointers.h" #include "data/object_events/object_event_pic_tables.h" #include "data/object_events/object_event_anims.h" @@ -2719,8 +2719,8 @@ const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId) if (graphicsId >= OBJ_EVENT_GFX_VARS) graphicsId = VarGetObjectEventGraphicsId(graphicsId - OBJ_EVENT_GFX_VARS); - if (graphicsId >= 152) - graphicsId = 16; + if (graphicsId >= NUM_OBJ_EVENT_GFX) + graphicsId = OBJ_EVENT_GFX_LITTLE_BOY; return gObjectEventGraphicsInfoPointers[graphicsId]; } |