From 75f2be2e29c49ae850c62399818840375fef492c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 28 Apr 2021 16:17:44 -0400 Subject: Name map groups --- data/maps/map_groups.json | 174 ++++++++++++++++++++--------------------- include/constants/map_groups.h | 86 ++++++++++---------- tools/mapjson/mapjson.cpp | 6 +- 3 files changed, 135 insertions(+), 131 deletions(-) diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index a468baa37..7da5d998d 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -1,57 +1,57 @@ { "group_order": [ - "gMapGroup0", - "gMapGroup1", - "gMapGroup2", - "gMapGroup3", - "gMapGroup4", - "gMapGroup5", - "gMapGroup6", - "gMapGroup7", - "gMapGroup8", - "gMapGroup9", - "gMapGroup10", - "gMapGroup11", - "gMapGroup12", - "gMapGroup13", - "gMapGroup14", - "gMapGroup15", - "gMapGroup16", - "gMapGroup17", - "gMapGroup18", - "gMapGroup19", - "gMapGroup20", - "gMapGroup21", - "gMapGroup22", - "gMapGroup23", - "gMapGroup24", - "gMapGroup25", - "gMapGroup26", - "gMapGroup27", - "gMapGroup28", - "gMapGroup29", - "gMapGroup30", - "gMapGroup31", - "gMapGroup32", - "gMapGroup33", - "gMapGroup34", - "gMapGroup35", - "gMapGroup36", - "gMapGroup37", - "gMapGroup38", - "gMapGroup39", - "gMapGroup40", - "gMapGroup41", - "gMapGroup42" - ], - "gMapGroup0": [ + "gMapGroup_Link", + "gMapGroup_Dungeons", + "gMapGroup_SpecialArea", + "gMapGroup_TownsAndRoutes", + "gMapGroup_IndoorPallet", + "gMapGroup_IndoorViridian", + "gMapGroup_IndoorPewter", + "gMapGroup_IndoorCerulean", + "gMapGroup_IndoorLavender", + "gMapGroup_IndoorVermilion", + "gMapGroup_IndoorCeladon", + "gMapGroup_IndoorFuchsia", + "gMapGroup_IndoorCinnabar", + "gMapGroup_IndoorIndigoPlateau", + "gMapGroup_IndoorSaffron", + "gMapGroup_IndoorRoute2", + "gMapGroup_IndoorRoute4", + "gMapGroup_IndoorRoute5", + "gMapGroup_IndoorRoute6", + "gMapGroup_IndoorRoute7", + "gMapGroup_IndoorRoute8", + "gMapGroup_IndoorRoute10", + "gMapGroup_IndoorRoute11", + "gMapGroup_IndoorRoute12", + "gMapGroup_IndoorRoute15", + "gMapGroup_IndoorRoute16", + "gMapGroup_IndoorRoute18", + "gMapGroup_IndoorUnused1", + "gMapGroup_IndoorRoute22", + "gMapGroup_IndoorUnused2", + "gMapGroup_IndoorRoute25", + "gMapGroup_IndoorSevenIsland", + "gMapGroup_IndoorOneIsland", + "gMapGroup_IndoorTwoIsland", + "gMapGroup_IndoorThreeIsland", + "gMapGroup_IndoorFourIsland", + "gMapGroup_IndoorFiveIsland", + "gMapGroup_IndoorSixIsland", + "gMapGroup_IndoorThreeIslandRoute", + "gMapGroup_IndoorFiveIslandRoute", + "gMapGroup_IndoorTwoIslandRoute", + "gMapGroup_IndoorSixIslandRoute", + "gMapGroup_IndoorSevenIslandRoute" + ], + "gMapGroup_Link": [ "BattleColosseum_2P", "TradeCenter", "RecordCorner", "BattleColosseum_4P", "UnionRoom" ], - "gMapGroup1": [ + "gMapGroup_Dungeons": [ "ViridianForest", "MtMoon_1F", "MtMoon_B1F", @@ -176,7 +176,7 @@ "SixIsland_PatternBush", "SixIsland_AlteringCave" ], - "gMapGroup2": [ + "gMapGroup_SpecialArea": [ "NavelRock_Exterior", "TrainerTower_1F", "TrainerTower_2F", @@ -238,7 +238,7 @@ "BirthIsland_Harbor", "NavelRock_Harbor" ], - "gMapGroup3": [ + "gMapGroup_TownsAndRoutes": [ "PalletTown", "ViridianCity", "PewterCity", @@ -306,13 +306,13 @@ "SevenIsland_SevaultCanyon", "SevenIsland_TanobyRuins" ], - "gMapGroup4": [ + "gMapGroup_IndoorPallet": [ "PalletTown_PlayersHouse_1F", "PalletTown_PlayersHouse_2F", "PalletTown_RivalsHouse", "PalletTown_ProfessorOaksLab" ], - "gMapGroup5": [ + "gMapGroup_IndoorViridian": [ "ViridianCity_House1", "ViridianCity_Gym", "ViridianCity_House2", @@ -320,7 +320,7 @@ "ViridianCity_PokemonCenter_1F", "ViridianCity_PokemonCenter_2F" ], - "gMapGroup6": [ + "gMapGroup_IndoorPewter": [ "PewterCity_Museum_1F", "PewterCity_Museum_2F", "PewterCity_Gym", @@ -330,7 +330,7 @@ "PewterCity_PokemonCenter_2F", "PewterCity_House2" ], - "gMapGroup7": [ + "gMapGroup_IndoorCerulean": [ "CeruleanCity_House1", "CeruleanCity_House2", "CeruleanCity_House3", @@ -342,7 +342,7 @@ "CeruleanCity_House4", "CeruleanCity_House5" ], - "gMapGroup8": [ + "gMapGroup_IndoorLavender": [ "LavenderTown_PokemonCenter_1F", "LavenderTown_PokemonCenter_2F", "LavenderTown_VolunteerPokemonHouse", @@ -350,7 +350,7 @@ "LavenderTown_House2", "LavenderTown_Mart" ], - "gMapGroup9": [ + "gMapGroup_IndoorVermilion": [ "VermilionCity_House1", "VermilionCity_PokemonCenter_1F", "VermilionCity_PokemonCenter_2F", @@ -360,7 +360,7 @@ "VermilionCity_Gym", "VermilionCity_House3" ], - "gMapGroup10": [ + "gMapGroup_IndoorCeladon": [ "CeladonCity_DepartmentStore_1F", "CeladonCity_DepartmentStore_2F", "CeladonCity_DepartmentStore_3F", @@ -382,7 +382,7 @@ "CeladonCity_House1", "CeladonCity_Hotel" ], - "gMapGroup11": [ + "gMapGroup_IndoorFuchsia": [ "FuchsiaCity_SafariZone_Entrance", "FuchsiaCity_Mart", "FuchsiaCity_SafariZone_Office", @@ -394,7 +394,7 @@ "FuchsiaCity_House2", "FuchsiaCity_House3" ], - "gMapGroup12": [ + "gMapGroup_IndoorCinnabar": [ "CinnabarIsland_Gym", "CinnabarIsland_PokemonLab_Entrance", "CinnabarIsland_PokemonLab_Lounge", @@ -404,11 +404,11 @@ "CinnabarIsland_PokemonCenter_2F", "CinnabarIsland_Mart" ], - "gMapGroup13": [ + "gMapGroup_IndoorIndigoPlateau": [ "IndigoPlateau_PokemonCenter_1F", "IndigoPlateau_PokemonCenter_2F" ], - "gMapGroup14": [ + "gMapGroup_IndoorSaffron": [ "SaffronCity_CopycatsHouse_1F", "SaffronCity_CopycatsHouse_2F", "SaffronCity_Dojo", @@ -420,69 +420,69 @@ "SaffronCity_MrPsychicsHouse", "SaffronCity_PokemonTrainerFanClub" ], - "gMapGroup15": [ + "gMapGroup_IndoorRoute2": [ "Route2_ViridianForest_SouthEntrance", "Route2_House", "Route2_EastBuilding", "Route2_ViridianForest_NorthEntrance" ], - "gMapGroup16": [ + "gMapGroup_IndoorRoute4": [ "Route4_PokemonCenter_1F", "Route4_PokemonCenter_2F" ], - "gMapGroup17": [ + "gMapGroup_IndoorRoute5": [ "Route5_PokemonDayCare", "Route5_SouthEntrance" ], - "gMapGroup18": [ + "gMapGroup_IndoorRoute6": [ "Route6_NorthEntrance", "UnknownMap_18_01" ], - "gMapGroup19": [ + "gMapGroup_IndoorRoute7": [ "Route7_EastEntrance" ], - "gMapGroup20": [ + "gMapGroup_IndoorRoute8": [ "Route8_WestEntrance" ], - "gMapGroup21": [ + "gMapGroup_IndoorRoute10": [ "Route10_PokemonCenter_1F", "Route10_PokemonCenter_2F" ], - "gMapGroup22": [ + "gMapGroup_IndoorRoute11": [ "Route11_EastEntrance_1F", "Route11_EastEntrance_2F" ], - "gMapGroup23": [ + "gMapGroup_IndoorRoute12": [ "Route12_NorthEntrance_1F", "Route12_NorthEntrance_2F", "Route12_FishingHouse" ], - "gMapGroup24": [ + "gMapGroup_IndoorRoute15": [ "Route15_WestEntrance_1F", "Route15_WestEntrance_2F" ], - "gMapGroup25": [ + "gMapGroup_IndoorRoute16": [ "Route16_House", "Route16_NorthEntrance_1F", "Route16_NorthEntrance_2F" ], - "gMapGroup26": [ + "gMapGroup_IndoorRoute18": [ "Route18_EastEntrance_1F", "Route18_EastEntrance_2F" ], - "gMapGroup27": [ + "gMapGroup_IndoorUnused1": [ "UnusedHouse_27_00" ], - "gMapGroup28": [ + "gMapGroup_IndoorRoute22": [ "Route22_NorthEntrance" ], - "gMapGroup29": [ + "gMapGroup_IndoorUnused2": [ "UnusedHouse_29_00" ], - "gMapGroup30": [ + "gMapGroup_IndoorRoute25": [ "Route25_SeaCottage" ], - "gMapGroup31": [ + "gMapGroup_IndoorSevenIsland": [ "SevenIsland_House_Room1", "SevenIsland_House_Room2", "SevenIsland_Mart", @@ -491,21 +491,21 @@ "UnusedHouse_31_05", "SevenIsland_Harbor" ], - "gMapGroup32": [ + "gMapGroup_IndoorOneIsland": [ "OneIsland_PokemonCenter_1F", "OneIsland_PokemonCenter_2F", "OneIsland_House1", "OneIsland_House2", "OneIsland_Harbor" ], - "gMapGroup33": [ + "gMapGroup_IndoorTwoIsland": [ "TwoIsland_JoyfulGameCorner", "TwoIsland_House", "TwoIsland_PokemonCenter_1F", "TwoIsland_PokemonCenter_2F", "TwoIsland_Harbor" ], - "gMapGroup34": [ + "gMapGroup_IndoorThreeIsland": [ "ThreeIsland_House1", "ThreeIsland_PokemonCenter_1F", "ThreeIsland_PokemonCenter_2F", @@ -515,7 +515,7 @@ "ThreeIsland_House4", "ThreeIsland_House5" ], - "gMapGroup35": [ + "gMapGroup_IndoorFourIsland": [ "FourIsland_PokemonDayCare", "FourIsland_PokemonCenter_1F", "FourIsland_PokemonCenter_2F", @@ -525,34 +525,34 @@ "FourIsland_House2", "FourIsland_Mart" ], - "gMapGroup36": [ + "gMapGroup_IndoorFiveIsland": [ "FiveIsland_PokemonCenter_1F", "FiveIsland_PokemonCenter_2F", "FiveIsland_Harbor", "FiveIsland_House1", "FiveIsland_House2" ], - "gMapGroup37": [ + "gMapGroup_IndoorSixIsland": [ "SixIsland_PokemonCenter_1F", "SixIsland_PokemonCenter_2F", "SixIsland_Harbor", "SixIsland_House", "SixIsland_Mart" ], - "gMapGroup38": [ + "gMapGroup_IndoorThreeIslandRoute": [ "ThreeIsland_Harbor" ], - "gMapGroup39": [ + "gMapGroup_IndoorFiveIslandRoute": [ "FiveIsland_ResortGorgeous_House" ], - "gMapGroup40": [ + "gMapGroup_IndoorTwoIslandRoute": [ "TwoIsland_CapeBrink_House" ], - "gMapGroup41": [ + "gMapGroup_IndoorSixIslandRoute": [ "SixIsland_WaterPath_House1", "SixIsland_WaterPath_House2" ], - "gMapGroup42": [ + "gMapGroup_IndoorSevenIslandRoute": [ "SevenIsland_SevaultCanyon_House" ], "connections_include_order": [ diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 788ea7bda..11dd15002 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -5,14 +5,14 @@ // DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json // -// Map Group 0 +// gMapGroup_Link #define MAP_BATTLE_COLOSSEUM_2P (0 | (0 << 8)) #define MAP_TRADE_CENTER (1 | (0 << 8)) #define MAP_RECORD_CORNER (2 | (0 << 8)) #define MAP_BATTLE_COLOSSEUM_4P (3 | (0 << 8)) #define MAP_UNION_ROOM (4 | (0 << 8)) -// Map Group 1 +// gMapGroup_Dungeons #define MAP_VIRIDIAN_FOREST (0 | (1 << 8)) #define MAP_MT_MOON_1F (1 | (1 << 8)) #define MAP_MT_MOON_B1F (2 | (1 << 8)) @@ -137,7 +137,7 @@ #define MAP_SIX_ISLAND_PATTERN_BUSH (121 | (1 << 8)) #define MAP_SIX_ISLAND_ALTERING_CAVE (122 | (1 << 8)) -// Map Group 2 +// gMapGroup_SpecialArea #define MAP_NAVEL_ROCK_EXTERIOR (0 | (2 << 8)) #define MAP_TRAINER_TOWER_1F (1 | (2 << 8)) #define MAP_TRAINER_TOWER_2F (2 | (2 << 8)) @@ -199,7 +199,7 @@ #define MAP_BIRTH_ISLAND_HARBOR (58 | (2 << 8)) #define MAP_NAVEL_ROCK_HARBOR (59 | (2 << 8)) -// Map Group 3 +// gMapGroup_TownsAndRoutes #define MAP_PALLET_TOWN (0 | (3 << 8)) #define MAP_VIRIDIAN_CITY (1 | (3 << 8)) #define MAP_PEWTER_CITY (2 | (3 << 8)) @@ -267,13 +267,13 @@ #define MAP_SEVEN_ISLAND_SEVAULT_CANYON (64 | (3 << 8)) #define MAP_SEVEN_ISLAND_TANOBY_RUINS (65 | (3 << 8)) -// Map Group 4 +// gMapGroup_IndoorPallet #define MAP_PALLET_TOWN_PLAYERS_HOUSE_1F (0 | (4 << 8)) #define MAP_PALLET_TOWN_PLAYERS_HOUSE_2F (1 | (4 << 8)) #define MAP_PALLET_TOWN_RIVALS_HOUSE (2 | (4 << 8)) #define MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB (3 | (4 << 8)) -// Map Group 5 +// gMapGroup_IndoorViridian #define MAP_VIRIDIAN_CITY_HOUSE1 (0 | (5 << 8)) #define MAP_VIRIDIAN_CITY_GYM (1 | (5 << 8)) #define MAP_VIRIDIAN_CITY_HOUSE2 (2 | (5 << 8)) @@ -281,7 +281,7 @@ #define MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F (4 | (5 << 8)) #define MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F (5 | (5 << 8)) -// Map Group 6 +// gMapGroup_IndoorPewter #define MAP_PEWTER_CITY_MUSEUM_1F (0 | (6 << 8)) #define MAP_PEWTER_CITY_MUSEUM_2F (1 | (6 << 8)) #define MAP_PEWTER_CITY_GYM (2 | (6 << 8)) @@ -291,7 +291,7 @@ #define MAP_PEWTER_CITY_POKEMON_CENTER_2F (6 | (6 << 8)) #define MAP_PEWTER_CITY_HOUSE2 (7 | (6 << 8)) -// Map Group 7 +// gMapGroup_IndoorCerulean #define MAP_CERULEAN_CITY_HOUSE1 (0 | (7 << 8)) #define MAP_CERULEAN_CITY_HOUSE2 (1 | (7 << 8)) #define MAP_CERULEAN_CITY_HOUSE3 (2 | (7 << 8)) @@ -303,7 +303,7 @@ #define MAP_CERULEAN_CITY_HOUSE4 (8 | (7 << 8)) #define MAP_CERULEAN_CITY_HOUSE5 (9 | (7 << 8)) -// Map Group 8 +// gMapGroup_IndoorLavender #define MAP_LAVENDER_TOWN_POKEMON_CENTER_1F (0 | (8 << 8)) #define MAP_LAVENDER_TOWN_POKEMON_CENTER_2F (1 | (8 << 8)) #define MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE (2 | (8 << 8)) @@ -311,7 +311,7 @@ #define MAP_LAVENDER_TOWN_HOUSE2 (4 | (8 << 8)) #define MAP_LAVENDER_TOWN_MART (5 | (8 << 8)) -// Map Group 9 +// gMapGroup_IndoorVermilion #define MAP_VERMILION_CITY_HOUSE1 (0 | (9 << 8)) #define MAP_VERMILION_CITY_POKEMON_CENTER_1F (1 | (9 << 8)) #define MAP_VERMILION_CITY_POKEMON_CENTER_2F (2 | (9 << 8)) @@ -321,7 +321,7 @@ #define MAP_VERMILION_CITY_GYM (6 | (9 << 8)) #define MAP_VERMILION_CITY_HOUSE3 (7 | (9 << 8)) -// Map Group 10 +// gMapGroup_IndoorCeladon #define MAP_CELADON_CITY_DEPARTMENT_STORE_1F (0 | (10 << 8)) #define MAP_CELADON_CITY_DEPARTMENT_STORE_2F (1 | (10 << 8)) #define MAP_CELADON_CITY_DEPARTMENT_STORE_3F (2 | (10 << 8)) @@ -343,7 +343,7 @@ #define MAP_CELADON_CITY_HOUSE1 (18 | (10 << 8)) #define MAP_CELADON_CITY_HOTEL (19 | (10 << 8)) -// Map Group 11 +// gMapGroup_IndoorFuchsia #define MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE (0 | (11 << 8)) #define MAP_FUCHSIA_CITY_MART (1 | (11 << 8)) #define MAP_FUCHSIA_CITY_SAFARI_ZONE_OFFICE (2 | (11 << 8)) @@ -355,7 +355,7 @@ #define MAP_FUCHSIA_CITY_HOUSE2 (8 | (11 << 8)) #define MAP_FUCHSIA_CITY_HOUSE3 (9 | (11 << 8)) -// Map Group 12 +// gMapGroup_IndoorCinnabar #define MAP_CINNABAR_ISLAND_GYM (0 | (12 << 8)) #define MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE (1 | (12 << 8)) #define MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE (2 | (12 << 8)) @@ -365,11 +365,11 @@ #define MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F (6 | (12 << 8)) #define MAP_CINNABAR_ISLAND_MART (7 | (12 << 8)) -// Map Group 13 +// gMapGroup_IndoorIndigoPlateau #define MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F (0 | (13 << 8)) #define MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F (1 | (13 << 8)) -// Map Group 14 +// gMapGroup_IndoorSaffron #define MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F (0 | (14 << 8)) #define MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F (1 | (14 << 8)) #define MAP_SAFFRON_CITY_DOJO (2 | (14 << 8)) @@ -381,69 +381,69 @@ #define MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE (8 | (14 << 8)) #define MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (14 << 8)) -// Map Group 15 +// gMapGroup_IndoorRoute2 #define MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE (0 | (15 << 8)) #define MAP_ROUTE2_HOUSE (1 | (15 << 8)) #define MAP_ROUTE2_EAST_BUILDING (2 | (15 << 8)) #define MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE (3 | (15 << 8)) -// Map Group 16 +// gMapGroup_IndoorRoute4 #define MAP_ROUTE4_POKEMON_CENTER_1F (0 | (16 << 8)) #define MAP_ROUTE4_POKEMON_CENTER_2F (1 | (16 << 8)) -// Map Group 17 +// gMapGroup_IndoorRoute5 #define MAP_ROUTE5_POKEMON_DAY_CARE (0 | (17 << 8)) #define MAP_ROUTE5_SOUTH_ENTRANCE (1 | (17 << 8)) -// Map Group 18 +// gMapGroup_IndoorRoute6 #define MAP_ROUTE6_NORTH_ENTRANCE (0 | (18 << 8)) #define MAP_UNKNOWN_MAP_18_01 (1 | (18 << 8)) -// Map Group 19 +// gMapGroup_IndoorRoute7 #define MAP_ROUTE7_EAST_ENTRANCE (0 | (19 << 8)) -// Map Group 20 +// gMapGroup_IndoorRoute8 #define MAP_ROUTE8_WEST_ENTRANCE (0 | (20 << 8)) -// Map Group 21 +// gMapGroup_IndoorRoute10 #define MAP_ROUTE10_POKEMON_CENTER_1F (0 | (21 << 8)) #define MAP_ROUTE10_POKEMON_CENTER_2F (1 | (21 << 8)) -// Map Group 22 +// gMapGroup_IndoorRoute11 #define MAP_ROUTE11_EAST_ENTRANCE_1F (0 | (22 << 8)) #define MAP_ROUTE11_EAST_ENTRANCE_2F (1 | (22 << 8)) -// Map Group 23 +// gMapGroup_IndoorRoute12 #define MAP_ROUTE12_NORTH_ENTRANCE_1F (0 | (23 << 8)) #define MAP_ROUTE12_NORTH_ENTRANCE_2F (1 | (23 << 8)) #define MAP_ROUTE12_FISHING_HOUSE (2 | (23 << 8)) -// Map Group 24 +// gMapGroup_IndoorRoute15 #define MAP_ROUTE15_WEST_ENTRANCE_1F (0 | (24 << 8)) #define MAP_ROUTE15_WEST_ENTRANCE_2F (1 | (24 << 8)) -// Map Group 25 +// gMapGroup_IndoorRoute16 #define MAP_ROUTE16_HOUSE (0 | (25 << 8)) #define MAP_ROUTE16_NORTH_ENTRANCE_1F (1 | (25 << 8)) #define MAP_ROUTE16_NORTH_ENTRANCE_2F (2 | (25 << 8)) -// Map Group 26 +// gMapGroup_IndoorRoute18 #define MAP_ROUTE18_EAST_ENTRANCE_1F (0 | (26 << 8)) #define MAP_ROUTE18_EAST_ENTRANCE_2F (1 | (26 << 8)) -// Map Group 27 +// gMapGroup_IndoorUnused1 #define MAP_UNUSED_HOUSE_27_00 (0 | (27 << 8)) -// Map Group 28 +// gMapGroup_IndoorRoute22 #define MAP_ROUTE22_NORTH_ENTRANCE (0 | (28 << 8)) -// Map Group 29 +// gMapGroup_IndoorUnused2 #define MAP_UNUSED_HOUSE_29_00 (0 | (29 << 8)) -// Map Group 30 +// gMapGroup_IndoorRoute25 #define MAP_ROUTE25_SEA_COTTAGE (0 | (30 << 8)) -// Map Group 31 +// gMapGroup_IndoorSevenIsland #define MAP_SEVEN_ISLAND_HOUSE_ROOM1 (0 | (31 << 8)) #define MAP_SEVEN_ISLAND_HOUSE_ROOM2 (1 | (31 << 8)) #define MAP_SEVEN_ISLAND_MART (2 | (31 << 8)) @@ -452,21 +452,21 @@ #define MAP_UNUSED_HOUSE_31_05 (5 | (31 << 8)) #define MAP_SEVEN_ISLAND_HARBOR (6 | (31 << 8)) -// Map Group 32 +// gMapGroup_IndoorOneIsland #define MAP_ONE_ISLAND_POKEMON_CENTER_1F (0 | (32 << 8)) #define MAP_ONE_ISLAND_POKEMON_CENTER_2F (1 | (32 << 8)) #define MAP_ONE_ISLAND_HOUSE1 (2 | (32 << 8)) #define MAP_ONE_ISLAND_HOUSE2 (3 | (32 << 8)) #define MAP_ONE_ISLAND_HARBOR (4 | (32 << 8)) -// Map Group 33 +// gMapGroup_IndoorTwoIsland #define MAP_TWO_ISLAND_JOYFUL_GAME_CORNER (0 | (33 << 8)) #define MAP_TWO_ISLAND_HOUSE (1 | (33 << 8)) #define MAP_TWO_ISLAND_POKEMON_CENTER_1F (2 | (33 << 8)) #define MAP_TWO_ISLAND_POKEMON_CENTER_2F (3 | (33 << 8)) #define MAP_TWO_ISLAND_HARBOR (4 | (33 << 8)) -// Map Group 34 +// gMapGroup_IndoorThreeIsland #define MAP_THREE_ISLAND_HOUSE1 (0 | (34 << 8)) #define MAP_THREE_ISLAND_POKEMON_CENTER_1F (1 | (34 << 8)) #define MAP_THREE_ISLAND_POKEMON_CENTER_2F (2 | (34 << 8)) @@ -476,7 +476,7 @@ #define MAP_THREE_ISLAND_HOUSE4 (6 | (34 << 8)) #define MAP_THREE_ISLAND_HOUSE5 (7 | (34 << 8)) -// Map Group 35 +// gMapGroup_IndoorFourIsland #define MAP_FOUR_ISLAND_POKEMON_DAY_CARE (0 | (35 << 8)) #define MAP_FOUR_ISLAND_POKEMON_CENTER_1F (1 | (35 << 8)) #define MAP_FOUR_ISLAND_POKEMON_CENTER_2F (2 | (35 << 8)) @@ -486,34 +486,34 @@ #define MAP_FOUR_ISLAND_HOUSE2 (6 | (35 << 8)) #define MAP_FOUR_ISLAND_MART (7 | (35 << 8)) -// Map Group 36 +// gMapGroup_IndoorFiveIsland #define MAP_FIVE_ISLAND_POKEMON_CENTER_1F (0 | (36 << 8)) #define MAP_FIVE_ISLAND_POKEMON_CENTER_2F (1 | (36 << 8)) #define MAP_FIVE_ISLAND_HARBOR (2 | (36 << 8)) #define MAP_FIVE_ISLAND_HOUSE1 (3 | (36 << 8)) #define MAP_FIVE_ISLAND_HOUSE2 (4 | (36 << 8)) -// Map Group 37 +// gMapGroup_IndoorSixIsland #define MAP_SIX_ISLAND_POKEMON_CENTER_1F (0 | (37 << 8)) #define MAP_SIX_ISLAND_POKEMON_CENTER_2F (1 | (37 << 8)) #define MAP_SIX_ISLAND_HARBOR (2 | (37 << 8)) #define MAP_SIX_ISLAND_HOUSE (3 | (37 << 8)) #define MAP_SIX_ISLAND_MART (4 | (37 << 8)) -// Map Group 38 +// gMapGroup_IndoorThreeIslandRoute #define MAP_THREE_ISLAND_HARBOR (0 | (38 << 8)) -// Map Group 39 +// gMapGroup_IndoorFiveIslandRoute #define MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE (0 | (39 << 8)) -// Map Group 40 +// gMapGroup_IndoorTwoIslandRoute #define MAP_TWO_ISLAND_CAPE_BRINK_HOUSE (0 | (40 << 8)) -// Map Group 41 +// gMapGroup_IndoorSixIslandRoute #define MAP_SIX_ISLAND_WATER_PATH_HOUSE1 (0 | (41 << 8)) #define MAP_SIX_ISLAND_WATER_PATH_HOUSE2 (1 | (41 << 8)) -// Map Group 42 +// gMapGroup_IndoorSevenIslandRoute #define MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE (0 | (42 << 8)) #define MAP_GROUPS_COUNT 43 diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 44afcaf22..0b07f1208 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -78,6 +78,10 @@ string generate_map_header_text(Json map_data, Json layouts_data) { ostringstream text; + text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" + << map_data["name"].string_value() + << "/map.json\n@\n\n"; + text << map_data["name"].string_value() << "::\n" << "\t.4byte " << layout["name"].string_value() << "\n"; @@ -514,7 +518,7 @@ string generate_map_constants_text(string groups_filepath, Json groups_data) { int group_num = 0; for (auto &group : groups_data["group_order"].array_items()) { - text << "// Map Group " << group_num << "\n"; + text << "// " << group.string_value() << "\n"; vector map_ids; size_t max_length = 0; -- cgit v1.2.3 From cb90fda18d63e0d780b6766d2fce95193127e208 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 May 2021 13:27:37 -0400 Subject: Refactor some field effect graphics --- graphics/object_events/pics/effects/fly_blob.png | Bin 0 -> 1006 bytes .../object_events/pics/effects/lavaridge_warp.png | Bin 0 -> 420 bytes .../object_events/pics/effects/pop_out_of_ash.png | Bin 0 -> 353 bytes .../object_events/pics/effects/small_sparkle.png | Bin 0 -> 188 bytes .../pics/effects/underwater_bubbles.png | Bin 0 -> 556 bytes graphics_file_rules.mk | 5 +- include/constants/field_effects.h | 37 ++++++++++ .../field_effect_object_template_pointers.h | 80 ++++++++++----------- src/data/field_effects/field_effect_objects.h | 38 +++++----- src/data/object_events/object_event_graphics.h | 38 +++------- src/event_object_movement.c | 4 +- src/field_effect.c | 8 +-- src/pokemon.c | 2 +- 13 files changed, 118 insertions(+), 94 deletions(-) create mode 100644 graphics/object_events/pics/effects/fly_blob.png create mode 100644 graphics/object_events/pics/effects/lavaridge_warp.png create mode 100644 graphics/object_events/pics/effects/pop_out_of_ash.png create mode 100644 graphics/object_events/pics/effects/small_sparkle.png create mode 100644 graphics/object_events/pics/effects/underwater_bubbles.png diff --git a/graphics/object_events/pics/effects/fly_blob.png b/graphics/object_events/pics/effects/fly_blob.png new file mode 100644 index 000000000..124d755a0 Binary files /dev/null and b/graphics/object_events/pics/effects/fly_blob.png differ diff --git a/graphics/object_events/pics/effects/lavaridge_warp.png b/graphics/object_events/pics/effects/lavaridge_warp.png new file mode 100644 index 000000000..57bb24beb Binary files /dev/null and b/graphics/object_events/pics/effects/lavaridge_warp.png differ diff --git a/graphics/object_events/pics/effects/pop_out_of_ash.png b/graphics/object_events/pics/effects/pop_out_of_ash.png new file mode 100644 index 000000000..1a1dfc296 Binary files /dev/null and b/graphics/object_events/pics/effects/pop_out_of_ash.png differ diff --git a/graphics/object_events/pics/effects/small_sparkle.png b/graphics/object_events/pics/effects/small_sparkle.png new file mode 100644 index 000000000..ef62dffbb Binary files /dev/null and b/graphics/object_events/pics/effects/small_sparkle.png differ diff --git a/graphics/object_events/pics/effects/underwater_bubbles.png b/graphics/object_events/pics/effects/underwater_bubbles.png new file mode 100644 index 000000000..7ebbf24b1 Binary files /dev/null and b/graphics/object_events/pics/effects/underwater_bubbles.png differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 72dd013b0..abd2da07f 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -13,7 +13,7 @@ RAYQUAZAGFXDIR := graphics/rayquaza_scene ROULETTEGFXDIR := graphics/roulette SLOTMACHINEGFXDIR := graphics/slot_machine PSSGFXDIR := graphics/pokemon_storage -EVENTOBJGFXDIR := graphics/event_objects +EVENTOBJGFXDIR := graphics/object_events MISCGFXDIR := graphics/misc TEXTWINDOWGFXDIR := graphics/text_window SLOTMACHINEGFXDIR := graphics/slot_machine @@ -432,6 +432,9 @@ $(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whisca $(EVENTOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 11 +$(EVENTOBJGFXDIR)/pics/effects/underwater_bubbles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 8 diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 92795246a..276d073b1 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -72,4 +72,41 @@ #define FLDEFF_DESTROY_DEOXYS_ROCK 68 #define FLDEFF_UNK_45 69 // TODO: related to fame checker photos +#define FLDEFFGFX_SHADOW_SMALL 0 +#define FLDEFFGFX_SHADOW_MEDIUM 1 +#define FLDEFFGFX_SHADOW_LARGE 2 +#define FLDEFFGFX_SHADOW_EXTRA_LARGE 3 +#define FLDEFFGFX_04 4 +#define FLDEFFGFX_05 5 +#define FLDEFFGFX_06 6 +#define FLDEFFGFX_07 7 +#define FLDEFFGFX_08 8 +#define FLDEFFGFX_09 9 +#define FLDEFFGFX_10 10 +#define FLDEFFGFX_11 11 +#define FLDEFFGFX_12 12 +#define FLDEFFGFX_13 13 +#define FLDEFFGFX_14 14 +#define FLDEFFGFX_15 15 +#define FLDEFFGFX_16 16 +#define FLDEFFGFX_17 17 +#define FLDEFFGFX_18 18 +#define FLDEFFGFX_19 19 +#define FLDEFFGFX_20 20 +#define FLDEFFGFX_REFLECTION 21 +#define FLDEFFGFX_22 22 +#define FLDEFFGFX_23 23 +#define FLDEFFGFX_24 24 +#define FLDEFFGFX_25 25 +#define FLDEFFGFX_FLY_BLOB 26 +#define FLDEFFGFX_27 27 +#define FLDEFFGFX_28 28 +#define FLDEFFGFX_29 29 +#define FLDEFFGFX_30 30 +#define FLDEFFGFX_31 31 +#define FLDEFFGFX_32 32 +#define FLDEFFGFX_33 33 +#define FLDEFFGFX_34 34 +#define FLDEFFGFX_35 35 + #endif // GUARD_CONSTANTS_FIELD_EFFECTS_H diff --git a/src/data/field_effects/field_effect_object_template_pointers.h b/src/data/field_effects/field_effect_object_template_pointers.h index 39321bb3d..be9cbeef9 100644 --- a/src/data/field_effects/field_effect_object_template_pointers.h +++ b/src/data/field_effects/field_effect_object_template_pointers.h @@ -1,7 +1,7 @@ -const struct SpriteTemplate gUnknown_83A537C; -const struct SpriteTemplate gUnknown_83A5394; -const struct SpriteTemplate gUnknown_83A53AC; -const struct SpriteTemplate gUnknown_83A53C4; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowS; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowM; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowL; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowXL; const struct SpriteTemplate gUnknown_83A5420; const struct SpriteTemplate gUnknown_83A5488; const struct SpriteTemplate gUnknown_83A54E4; @@ -35,40 +35,40 @@ const struct SpriteTemplate gUnknown_83A5FA4; const struct SpriteTemplate gUnknown_83A5FE0; const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = { - &gUnknown_83A537C, - &gUnknown_83A5394, - &gUnknown_83A53AC, - &gUnknown_83A53C4, - &gUnknown_83A5420, - &gUnknown_83A5488, - &gUnknown_83A54E4, - &gUnknown_83A556C, - &gUnknown_83A5604, - &gUnknown_83A5648, - &gUnknown_83A5698, - &gUnknown_83A56F4, - &gUnknown_83A583C, - &gUnknown_83A589C, - &gUnknown_83A58E0, - &gUnknown_83A593C, - &gUnknown_83A59A4, - &gUnknown_83A5A30, - &gUnknown_83A5A88, - &gUnknown_83A5AD8, - &gUnknown_83A5B74, - &gUnknown_83A5C34, - NULL, - &gUnknown_83A5750, - &gUnknown_83A5CB4, - &gUnknown_83A5D34, - &gUnknown_83A5E00, - &gUnknown_83A57EC, - &gUnknown_83A5D84, - &gUnknown_83A5B1C, - &gUnknown_83A5E38, - &gUnknown_83A5E64, - &gUnknown_83A5EC0, - &gUnknown_83A5F24, - &gUnknown_83A5FA4, - &gUnknown_83A5FE0, + [FLDEFFGFX_SHADOW_SMALL] = &gFieldEffectObjectTemplate_ShadowS, + [FLDEFFGFX_SHADOW_MEDIUM] = &gFieldEffectObjectTemplate_ShadowM, + [FLDEFFGFX_SHADOW_LARGE] = &gFieldEffectObjectTemplate_ShadowL, + [FLDEFFGFX_SHADOW_EXTRA_LARGE] = &gFieldEffectObjectTemplate_ShadowXL, + [FLDEFFGFX_04] = &gUnknown_83A5420, + [FLDEFFGFX_05] = &gUnknown_83A5488, + [FLDEFFGFX_06] = &gUnknown_83A54E4, + [FLDEFFGFX_07] = &gUnknown_83A556C, + [FLDEFFGFX_08] = &gUnknown_83A5604, + [FLDEFFGFX_09] = &gUnknown_83A5648, + [FLDEFFGFX_10] = &gUnknown_83A5698, + [FLDEFFGFX_11] = &gUnknown_83A56F4, + [FLDEFFGFX_12] = &gUnknown_83A583C, + [FLDEFFGFX_13] = &gUnknown_83A589C, + [FLDEFFGFX_14] = &gUnknown_83A58E0, + [FLDEFFGFX_15] = &gUnknown_83A593C, + [FLDEFFGFX_16] = &gUnknown_83A59A4, + [FLDEFFGFX_17] = &gUnknown_83A5A30, + [FLDEFFGFX_18] = &gUnknown_83A5A88, + [FLDEFFGFX_19] = &gUnknown_83A5AD8, + [FLDEFFGFX_20] = &gUnknown_83A5B74, + [FLDEFFGFX_REFLECTION] = &gUnknown_83A5C34, + [FLDEFFGFX_22] = NULL, + [FLDEFFGFX_23] = &gUnknown_83A5750, + [FLDEFFGFX_24] = &gUnknown_83A5CB4, + [FLDEFFGFX_25] = &gUnknown_83A5D34, + [FLDEFFGFX_FLY_BLOB] = &gUnknown_83A5E00, + [FLDEFFGFX_27] = &gUnknown_83A57EC, + [FLDEFFGFX_28] = &gUnknown_83A5D84, + [FLDEFFGFX_29] = &gUnknown_83A5B1C, + [FLDEFFGFX_30] = &gUnknown_83A5E38, + [FLDEFFGFX_31] = &gUnknown_83A5E64, + [FLDEFFGFX_32] = &gUnknown_83A5EC0, + [FLDEFFGFX_33] = &gUnknown_83A5F24, + [FLDEFFGFX_34] = &gUnknown_83A5FA4, + [FLDEFFGFX_35] = &gUnknown_83A5FE0, }; diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h index 0f2694de2..e8d5c4f50 100644 --- a/src/data/field_effects/field_effect_objects.h +++ b/src/data/field_effects/field_effect_objects.h @@ -1,62 +1,62 @@ const struct SpritePalette gUnknown_83A5340 = { .data = gUnknown_8398FA8, .tag = 0x1004 }; const struct SpritePalette gUnknown_83A5348 = { .data = gUnknown_8398FC8, .tag = 0x1005 }; -const union AnimCmd gUnknown_83A5350[] = +const union AnimCmd gSpriteAnimCmd_FieldShadow0[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5358[] = +const union AnimCmd *const gSpriteAnimTable_FieldShadow[] = { - gUnknown_83A5350, + gSpriteAnimCmd_FieldShadow0, }; -const struct SpriteFrameImage gUnknown_83A535C[] = { obj_frame_tiles(gUnknown_8398048) }; -const struct SpriteFrameImage gUnknown_83A5364[] = { obj_frame_tiles(gUnknown_8398068) }; -const struct SpriteFrameImage gUnknown_83A536C[] = { obj_frame_tiles(gUnknown_83980A8) }; -const struct SpriteFrameImage gUnknown_83A5374[] = { obj_frame_tiles(gUnknown_8398128) }; +const struct SpriteFrameImage gSpriteFrameImage_FieldShadowS[] = {obj_frame_tiles(gSpriteImageGfx_FieldShadowS) }; +const struct SpriteFrameImage gSpriteFrameImage_FieldShadowM[] = {obj_frame_tiles(gSpriteImageGfx_FieldShadowM) }; +const struct SpriteFrameImage gSpriteFrameImage_FieldShadowL[] = {obj_frame_tiles(gSpriteImageGfx_FieldShadowL) }; +const struct SpriteFrameImage gSpriteFrameImage_FieldShadowXL[] = { obj_frame_tiles(gSpriteImageGfx_FieldShadowXL) }; -const struct SpriteTemplate gUnknown_83A537C = +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowS = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_8x8, - .anims = gUnknown_83A5358, - .images = gUnknown_83A535C, + .anims = gSpriteAnimTable_FieldShadow, + .images = gSpriteFrameImage_FieldShadowS, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateShadowFieldEffect, }; -const struct SpriteTemplate gUnknown_83A5394 = +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowM = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_16x8, - .anims = gUnknown_83A5358, - .images = gUnknown_83A5364, + .anims = gSpriteAnimTable_FieldShadow, + .images = gSpriteFrameImage_FieldShadowM, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateShadowFieldEffect, }; -const struct SpriteTemplate gUnknown_83A53AC = +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowL = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_32x8, - .anims = gUnknown_83A5358, - .images = gUnknown_83A536C, + .anims = gSpriteAnimTable_FieldShadow, + .images = gSpriteFrameImage_FieldShadowL, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateShadowFieldEffect, }; -const struct SpriteTemplate gUnknown_83A53C4 = +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowXL = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_64x32, - .anims = gUnknown_83A5358, - .images = gUnknown_83A5374, + .anims = gSpriteAnimTable_FieldShadow, + .images = gSpriteFrameImage_FieldShadowXL, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateShadowFieldEffect, }; diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 87451cae1..8597bea5a 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -186,10 +186,10 @@ const u32 gObjectEventPic_SurfBlob[] = INCBIN_U32("graphics/object_events/pics/m const u32 gObjectEventPic_Policeman[] = INCBIN_U32("graphics/object_events/pics/people/policeman.4bpp"); const u16 gUnknown_8398008[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal"); const u16 gUnknown_8398028[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal"); -const u32 gUnknown_8398048[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_small.4bpp"); -const u32 gUnknown_8398068[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_medium.4bpp"); -const u32 gUnknown_83980A8[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_large.4bpp"); -const u32 gUnknown_8398128[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_extra_large.4bpp"); +const u32 gSpriteImageGfx_FieldShadowS[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_small.4bpp"); +const u32 gSpriteImageGfx_FieldShadowM[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_medium.4bpp"); +const u32 gSpriteImageGfx_FieldShadowL[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_large.4bpp"); +const u32 gSpriteImageGfx_FieldShadowXL[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_extra_large.4bpp"); const u32 filler_8398188[0x48] = {}; const u16 gUnknown_8398648[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); const u32 gUnknown_8398668[] = INCBIN_U32("graphics/field_effects/fldeff_cut.4bpp"); @@ -236,26 +236,10 @@ const u32 gUnknown_839B008[] = INCBIN_U32("graphics/object_events/pics/unknown/8 const u32 gUnknown_839B708[] = INCBIN_U32("graphics/object_events/pics/unknown/839B708.4bpp"); const u32 gUnknown_839BE08[] = INCBIN_U32("graphics/object_events/pics/unknown/839BE08.4bpp"); const u32 gUnknown_839C508[] = INCBIN_U32("graphics/object_events/pics/unknown/839C508.4bpp"); -const u16 gUnknown_839C588[] = INCBIN_U16("graphics/object_events/palettes/839C588.gbapal"); -const u32 gUnknown_839C5A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839C5A8.4bpp"); -const u32 gUnknown_839C628[] = INCBIN_U32("graphics/object_events/pics/unknown/839C628.4bpp"); -const u32 gUnknown_839C6A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839C6A8.4bpp"); -const u32 gUnknown_839C728[] = INCBIN_U32("graphics/object_events/pics/unknown/839C728.4bpp"); -const u32 gUnknown_839C7A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839C7A8.4bpp"); -const u32 gUnknown_839C828[] = INCBIN_U32("graphics/object_events/pics/unknown/839C828.4bpp"); -const u32 gUnknown_839C8A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839C8A8.4bpp"); -const u32 gUnknown_839C928[] = INCBIN_U32("graphics/object_events/pics/unknown/839C928.4bpp"); -const u32 gUnknown_839C9A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839C9A8.4bpp"); -const u32 gUnknown_839CA28[] = INCBIN_U32("graphics/object_events/pics/unknown/839CA28.4bpp"); -const u32 gUnknown_839CAA8[] = INCBIN_U32("graphics/object_events/pics/unknown/839CAA8.4bpp"); -const u32 gUnknown_839CBA8[] = INCBIN_U32("graphics/object_events/pics/unknown/839CBA8.4bpp"); -const u32 gUnknown_839CCA8[] = INCBIN_U32("graphics/object_events/pics/unknown/839CCA8.4bpp"); -const u32 gUnknown_839CDA8[] = INCBIN_U32("graphics/object_events/pics/unknown/839CDA8.4bpp"); -const u32 gUnknown_839CEA8[] = INCBIN_U32("graphics/object_events/pics/unknown/839CEA8.4bpp"); -const u32 gUnknown_839CFA8[] = INCBIN_U32("graphics/object_events/pics/unknown/839CFA8.4bpp"); -const u32 gUnknown_839D0A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839D0A8.4bpp"); -const u32 gUnknown_839D1A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839D1A8.4bpp"); -const u32 gUnknown_839D2A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839D2A8.4bpp"); -const u32 gUnknown_839D328[] = INCBIN_U32("graphics/object_events/pics/unknown/839D328.4bpp"); -const u16 gUnknown_839D3A8[] = INCBIN_U16("graphics/object_events/palettes/839D3A8.gbapal"); -const u32 gUnknown_839D3C8[] = INCBIN_U32("graphics/object_events/pics/unknown/839D3C8.4bpp"); +const u16 gUnknown_839C588[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.gbapal"); +const u16 gUnknown_839C5A8[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.4bpp"); +const u16 gUnknown_839C828[] = INCBIN_U16("graphics/object_events/pics/effects/lavaridge_warp.4bpp"); +const u16 gUnknown_839CAA8[] = INCBIN_U16("graphics/object_events/pics/effects/underwater_bubbles.4bpp"); +const u16 gUnknown_839D2A8[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.4bpp"); +const u16 gUnknown_839D3A8[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.gbapal"); +const u16 gUnknown_839D3C8[] = INCBIN_U16("graphics/object_events/pics/effects/fly_blob.4bpp"); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 6b9445d8e..5d2b5a1bf 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1243,13 +1243,13 @@ void ResetObjectEvents(void) static void CreateReflectionEffectSprites(void) { - u8 spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31); + u8 spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_REFLECTION], 0, 0, 31); gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; InitSpriteAffineAnim(&gSprites[spriteId]); StartSpriteAffineAnim(&gSprites[spriteId], 0); gSprites[spriteId].invisible = TRUE; - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_REFLECTION], 0, 0, 31); gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; InitSpriteAffineAnim(&gSprites[spriteId]); StartSpriteAffineAnim(&gSprites[spriteId], 1); diff --git a/src/field_effect.c b/src/field_effect.c index c2b507882..e193ab3b5 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1903,7 +1903,7 @@ u8 FldEff_LavaridgeGymWarp(void) { u8 spriteId; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[33], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_33], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); gSprites[spriteId].oam.priority = gFieldEffectArguments[3]; gSprites[spriteId].coordOffsetEnabled = TRUE; return spriteId; @@ -1996,7 +1996,7 @@ u8 FldEff_PopOutOfAsh(void) { u8 spriteId; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[32], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_32], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); gSprites[spriteId].oam.priority = gFieldEffectArguments[3]; gSprites[spriteId].coordOffsetEnabled = TRUE; return spriteId; @@ -3048,7 +3048,7 @@ static void sub_8086D94(struct Sprite * sprite); u8 FldEff_NpcFlyOut(void) { - u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[26], 0x78, 0, 1); + u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFGFX_FLY_BLOB], 0x78, 0, 1); struct Sprite * sprite = &gSprites[spriteId]; sprite->oam.paletteNum = 0; @@ -3239,7 +3239,7 @@ static u8 sub_8087168(void) { u8 spriteId; struct Sprite * sprite; - spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[26], 0xff, 0xb4, 0x1); + spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFGFX_FLY_BLOB], 0xff, 0xb4, 0x1); sprite = &gSprites[spriteId]; sprite->oam.paletteNum = 0; sprite->oam.priority = 1; diff --git a/src/pokemon.c b/src/pokemon.c index c59fd226e..350395763 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3770,7 +3770,7 @@ static void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord } } gBattleTypeFlags = 8; - gTrainerBattleOpponent_A = 0x400; + gTrainerBattleOpponent_A = SECRET_BASE_OPPONENT; } u8 GetSecretBaseTrainerPicIndex(void) -- cgit v1.2.3 From 7f5075336072486bc3261b20551f9a035768d42b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 May 2021 14:09:21 -0400 Subject: Sync field_effect_object_template_pointers.h with Emerald --- graphics/object_events/palettes/8398FC8.pal | 18 +-- graphics/object_events/pics/unknown/839A288.png | Bin 106 -> 175 bytes graphics/object_events/pics/unknown/839A988.png | Bin 149 -> 216 bytes graphics/object_events/pics/unknown/839BE08.png | Bin 181 -> 256 bytes graphics/object_events/pics/unknown/839C508.png | Bin 82 -> 150 bytes include/constants/field_effects.h | 72 +++++------ .../field_effect_object_template_pointers.h | 144 +++++++++++---------- src/data/field_effects/field_effect_objects.h | 70 +++++----- src/data/object_events/object_event_graphics.h | 1 + src/event_object_movement.c | 4 +- src/field_effect.c | 8 +- src/field_effect_helpers.c | 69 +++++----- src/teachy_tv.c | 3 +- 13 files changed, 189 insertions(+), 200 deletions(-) diff --git a/graphics/object_events/palettes/8398FC8.pal b/graphics/object_events/palettes/8398FC8.pal index 26f8fc1f4..ad39c8c9a 100644 --- a/graphics/object_events/palettes/8398FC8.pal +++ b/graphics/object_events/palettes/8398FC8.pal @@ -1,6 +1,6 @@ JASC-PAL 0100 -32 +16 255 0 238 189 255 139 131 213 98 @@ -17,19 +17,3 @@ JASC-PAL 115 205 164 65 180 139 24 164 106 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/object_events/pics/unknown/839A288.png b/graphics/object_events/pics/unknown/839A288.png index 99fae019c..cf20349ee 100644 Binary files a/graphics/object_events/pics/unknown/839A288.png and b/graphics/object_events/pics/unknown/839A288.png differ diff --git a/graphics/object_events/pics/unknown/839A988.png b/graphics/object_events/pics/unknown/839A988.png index fcd4ed22c..9f86e194b 100644 Binary files a/graphics/object_events/pics/unknown/839A988.png and b/graphics/object_events/pics/unknown/839A988.png differ diff --git a/graphics/object_events/pics/unknown/839BE08.png b/graphics/object_events/pics/unknown/839BE08.png index 230a4842b..b42965d57 100644 Binary files a/graphics/object_events/pics/unknown/839BE08.png and b/graphics/object_events/pics/unknown/839BE08.png differ diff --git a/graphics/object_events/pics/unknown/839C508.png b/graphics/object_events/pics/unknown/839C508.png index cf0f22e19..90a3244ef 100644 Binary files a/graphics/object_events/pics/unknown/839C508.png and b/graphics/object_events/pics/unknown/839C508.png differ diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 276d073b1..8c3ece863 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -72,41 +72,41 @@ #define FLDEFF_DESTROY_DEOXYS_ROCK 68 #define FLDEFF_UNK_45 69 // TODO: related to fame checker photos -#define FLDEFFGFX_SHADOW_SMALL 0 -#define FLDEFFGFX_SHADOW_MEDIUM 1 -#define FLDEFFGFX_SHADOW_LARGE 2 -#define FLDEFFGFX_SHADOW_EXTRA_LARGE 3 -#define FLDEFFGFX_04 4 -#define FLDEFFGFX_05 5 -#define FLDEFFGFX_06 6 -#define FLDEFFGFX_07 7 -#define FLDEFFGFX_08 8 -#define FLDEFFGFX_09 9 -#define FLDEFFGFX_10 10 -#define FLDEFFGFX_11 11 -#define FLDEFFGFX_12 12 -#define FLDEFFGFX_13 13 -#define FLDEFFGFX_14 14 -#define FLDEFFGFX_15 15 -#define FLDEFFGFX_16 16 -#define FLDEFFGFX_17 17 -#define FLDEFFGFX_18 18 -#define FLDEFFGFX_19 19 -#define FLDEFFGFX_20 20 -#define FLDEFFGFX_REFLECTION 21 -#define FLDEFFGFX_22 22 -#define FLDEFFGFX_23 23 -#define FLDEFFGFX_24 24 -#define FLDEFFGFX_25 25 -#define FLDEFFGFX_FLY_BLOB 26 -#define FLDEFFGFX_27 27 -#define FLDEFFGFX_28 28 -#define FLDEFFGFX_29 29 -#define FLDEFFGFX_30 30 -#define FLDEFFGFX_31 31 -#define FLDEFFGFX_32 32 -#define FLDEFFGFX_33 33 -#define FLDEFFGFX_34 34 -#define FLDEFFGFX_35 35 +#define FLDEFFOBJ_SHADOW_S 0 +#define FLDEFFOBJ_SHADOW_M 1 +#define FLDEFFOBJ_SHADOW_L 2 +#define FLDEFFOBJ_SHADOW_XL 3 +#define FLDEFFOBJ_TALL_GRASS 4 +#define FLDEFFOBJ_RIPPLE 5 +#define FLDEFFOBJ_ASH 6 +#define FLDEFFOBJ_SURF_BLOB 7 +#define FLDEFFOBJ_ARROW 8 +#define FLDEFFOBJ_GROUND_IMPACT_DUST 9 +#define FLDEFFOBJ_JUMP_TALL_GRASS 10 +#define FLDEFFOBJ_SAND_FOOTPRINTS 11 +#define FLDEFFOBJ_JUMP_BIG_SPLASH 12 +#define FLDEFFOBJ_SPLASH 13 +#define FLDEFFOBJ_JUMP_SMALL_SPLASH 14 +#define FLDEFFOBJ_LONG_GRASS 15 +#define FLDEFFOBJ_JUMP_LONG_GRASS 16 +#define FLDEFFOBJ_UNUSED_GRASS 17 +#define FLDEFFOBJ_UNUSED_GRASS_2 18 +#define FLDEFFOBJ_UNUSED_SAND 19 +#define FLDEFFOBJ_WATER_SURFACING 20 +#define FLDEFFOBJ_REFLECTION_DISTORTION 21 +#define FLDEFFOBJ_SPARKLE 22 +#define FLDEFFOBJ_DEEP_SAND_FOOTPRINTS 23 +#define FLDEFFOBJ_TREE_DISGUISE 24 +#define FLDEFFOBJ_MOUNTAIN_DISGUISE 25 +#define FLDEFFOBJ_BIRD 26 +#define FLDEFFOBJ_BIKE_TIRE_TRACKS 27 +#define FLDEFFOBJ_SAND_DISGUISE 28 +#define FLDEFFOBJ_SAND_PILE 29 +#define FLDEFFOBJ_SHORT_GRASS 30 +#define FLDEFFOBJ_HOT_SPRINGS_WATER 31 +#define FLDEFFOBJ_ASH_PUFF 32 +#define FLDEFFOBJ_ASH_LAUNCH 33 +#define FLDEFFOBJ_BUBBLES 34 +#define FLDEFFOBJ_SMALL_SPARKLE 35 #endif // GUARD_CONSTANTS_FIELD_EFFECTS_H diff --git a/src/data/field_effects/field_effect_object_template_pointers.h b/src/data/field_effects/field_effect_object_template_pointers.h index be9cbeef9..92a0a77f1 100644 --- a/src/data/field_effects/field_effect_object_template_pointers.h +++ b/src/data/field_effects/field_effect_object_template_pointers.h @@ -1,74 +1,76 @@ -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowS; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowM; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowL; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowXL; -const struct SpriteTemplate gUnknown_83A5420; -const struct SpriteTemplate gUnknown_83A5488; -const struct SpriteTemplate gUnknown_83A54E4; -const struct SpriteTemplate gUnknown_83A556C; -const struct SpriteTemplate gUnknown_83A5604; -const struct SpriteTemplate gUnknown_83A5648; -const struct SpriteTemplate gUnknown_83A5698; -const struct SpriteTemplate gUnknown_83A56F4; -const struct SpriteTemplate gUnknown_83A583C; -const struct SpriteTemplate gUnknown_83A589C; -const struct SpriteTemplate gUnknown_83A58E0; -const struct SpriteTemplate gUnknown_83A593C; -const struct SpriteTemplate gUnknown_83A59A4; -const struct SpriteTemplate gUnknown_83A5A30; -const struct SpriteTemplate gUnknown_83A5A88; -const struct SpriteTemplate gUnknown_83A5AD8; -const struct SpriteTemplate gUnknown_83A5B74; -const struct SpriteTemplate gUnknown_83A5C34; -const struct SpriteTemplate gUnknown_83A5750; -const struct SpriteTemplate gUnknown_83A5CB4; -const struct SpriteTemplate gUnknown_83A5D34; -const struct SpriteTemplate gUnknown_83A5E00; -const struct SpriteTemplate gUnknown_83A57EC; -const struct SpriteTemplate gUnknown_83A5D84; -const struct SpriteTemplate gUnknown_83A5B1C; -const struct SpriteTemplate gUnknown_83A5E38; -const struct SpriteTemplate gUnknown_83A5E64; -const struct SpriteTemplate gUnknown_83A5EC0; -const struct SpriteTemplate gUnknown_83A5F24; -const struct SpriteTemplate gUnknown_83A5FA4; -const struct SpriteTemplate gUnknown_83A5FE0; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge; +const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass; +const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple; +const struct SpriteTemplate gFieldEffectObjectTemplate_Ash; +const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob; +const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow; +const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash; +const struct SpriteTemplate gFieldEffectObjectTemplate_Splash; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash; +const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass; +const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass; +const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2; +const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand; +const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing; +const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion; +const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints; +const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise; +const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise; +const struct SpriteTemplate gFieldEffectObjectTemplate_Bird; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass; +const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater; +const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff; +const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch; +const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles; +const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle; + +#define gFieldEffectObjectTemplate_Sparkle NULL const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = { - [FLDEFFGFX_SHADOW_SMALL] = &gFieldEffectObjectTemplate_ShadowS, - [FLDEFFGFX_SHADOW_MEDIUM] = &gFieldEffectObjectTemplate_ShadowM, - [FLDEFFGFX_SHADOW_LARGE] = &gFieldEffectObjectTemplate_ShadowL, - [FLDEFFGFX_SHADOW_EXTRA_LARGE] = &gFieldEffectObjectTemplate_ShadowXL, - [FLDEFFGFX_04] = &gUnknown_83A5420, - [FLDEFFGFX_05] = &gUnknown_83A5488, - [FLDEFFGFX_06] = &gUnknown_83A54E4, - [FLDEFFGFX_07] = &gUnknown_83A556C, - [FLDEFFGFX_08] = &gUnknown_83A5604, - [FLDEFFGFX_09] = &gUnknown_83A5648, - [FLDEFFGFX_10] = &gUnknown_83A5698, - [FLDEFFGFX_11] = &gUnknown_83A56F4, - [FLDEFFGFX_12] = &gUnknown_83A583C, - [FLDEFFGFX_13] = &gUnknown_83A589C, - [FLDEFFGFX_14] = &gUnknown_83A58E0, - [FLDEFFGFX_15] = &gUnknown_83A593C, - [FLDEFFGFX_16] = &gUnknown_83A59A4, - [FLDEFFGFX_17] = &gUnknown_83A5A30, - [FLDEFFGFX_18] = &gUnknown_83A5A88, - [FLDEFFGFX_19] = &gUnknown_83A5AD8, - [FLDEFFGFX_20] = &gUnknown_83A5B74, - [FLDEFFGFX_REFLECTION] = &gUnknown_83A5C34, - [FLDEFFGFX_22] = NULL, - [FLDEFFGFX_23] = &gUnknown_83A5750, - [FLDEFFGFX_24] = &gUnknown_83A5CB4, - [FLDEFFGFX_25] = &gUnknown_83A5D34, - [FLDEFFGFX_FLY_BLOB] = &gUnknown_83A5E00, - [FLDEFFGFX_27] = &gUnknown_83A57EC, - [FLDEFFGFX_28] = &gUnknown_83A5D84, - [FLDEFFGFX_29] = &gUnknown_83A5B1C, - [FLDEFFGFX_30] = &gUnknown_83A5E38, - [FLDEFFGFX_31] = &gUnknown_83A5E64, - [FLDEFFGFX_32] = &gUnknown_83A5EC0, - [FLDEFFGFX_33] = &gUnknown_83A5F24, - [FLDEFFGFX_34] = &gUnknown_83A5FA4, - [FLDEFFGFX_35] = &gUnknown_83A5FE0, + [FLDEFFOBJ_SHADOW_S] = &gFieldEffectObjectTemplate_ShadowSmall, + [FLDEFFOBJ_SHADOW_M] = &gFieldEffectObjectTemplate_ShadowMedium, + [FLDEFFOBJ_SHADOW_L] = &gFieldEffectObjectTemplate_ShadowLarge, + [FLDEFFOBJ_SHADOW_XL] = &gFieldEffectObjectTemplate_ShadowExtraLarge, + [FLDEFFOBJ_TALL_GRASS] = &gFieldEffectObjectTemplate_TallGrass, + [FLDEFFOBJ_RIPPLE] = &gFieldEffectObjectTemplate_Ripple, + [FLDEFFOBJ_ASH] = &gFieldEffectObjectTemplate_Ash, + [FLDEFFOBJ_SURF_BLOB] = &gFieldEffectObjectTemplate_SurfBlob, + [FLDEFFOBJ_ARROW] = &gFieldEffectObjectTemplate_Arrow, + [FLDEFFOBJ_GROUND_IMPACT_DUST] = &gFieldEffectObjectTemplate_GroundImpactDust, + [FLDEFFOBJ_JUMP_TALL_GRASS] = &gFieldEffectObjectTemplate_JumpTallGrass, + [FLDEFFOBJ_SAND_FOOTPRINTS] = &gFieldEffectObjectTemplate_SandFootprints, + [FLDEFFOBJ_JUMP_BIG_SPLASH] = &gFieldEffectObjectTemplate_JumpBigSplash, + [FLDEFFOBJ_SPLASH] = &gFieldEffectObjectTemplate_Splash, + [FLDEFFOBJ_JUMP_SMALL_SPLASH] = &gFieldEffectObjectTemplate_JumpSmallSplash, + [FLDEFFOBJ_LONG_GRASS] = &gFieldEffectObjectTemplate_LongGrass, + [FLDEFFOBJ_JUMP_LONG_GRASS] = &gFieldEffectObjectTemplate_JumpLongGrass, + [FLDEFFOBJ_UNUSED_GRASS] = &gFieldEffectObjectTemplate_UnusedGrass, + [FLDEFFOBJ_UNUSED_GRASS_2] = &gFieldEffectObjectTemplate_UnusedGrass2, + [FLDEFFOBJ_UNUSED_SAND] = &gFieldEffectObjectTemplate_UnusedSand, + [FLDEFFOBJ_WATER_SURFACING] = &gFieldEffectObjectTemplate_WaterSurfacing, + [FLDEFFOBJ_REFLECTION_DISTORTION] = &gFieldEffectObjectTemplate_ReflectionDistortion, + [FLDEFFOBJ_SPARKLE] = gFieldEffectObjectTemplate_Sparkle, + [FLDEFFOBJ_DEEP_SAND_FOOTPRINTS] = &gFieldEffectObjectTemplate_DeepSandFootprints, + [FLDEFFOBJ_TREE_DISGUISE] = &gFieldEffectObjectTemplate_TreeDisguise, + [FLDEFFOBJ_MOUNTAIN_DISGUISE] = &gFieldEffectObjectTemplate_MountainDisguise, + [FLDEFFOBJ_BIRD] = &gFieldEffectObjectTemplate_Bird, + [FLDEFFOBJ_BIKE_TIRE_TRACKS] = &gFieldEffectObjectTemplate_BikeTireTracks, + [FLDEFFOBJ_SAND_DISGUISE] = &gFieldEffectObjectTemplate_SandDisguisePlaceholder, + [FLDEFFOBJ_SAND_PILE] = &gFieldEffectObjectTemplate_SandPile, + [FLDEFFOBJ_SHORT_GRASS] = &gFieldEffectObjectTemplate_ShortGrass, + [FLDEFFOBJ_HOT_SPRINGS_WATER] = &gFieldEffectObjectTemplate_HotSpringsWater, + [FLDEFFOBJ_ASH_PUFF] = &gFieldEffectObjectTemplate_AshPuff, + [FLDEFFOBJ_ASH_LAUNCH] = &gFieldEffectObjectTemplate_AshLaunch, + [FLDEFFOBJ_BUBBLES] = &gFieldEffectObjectTemplate_Bubbles, + [FLDEFFOBJ_SMALL_SPARKLE] = &gFieldEffectObjectTemplate_SmallSparkle, }; diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h index e8d5c4f50..86888c056 100644 --- a/src/data/field_effects/field_effect_objects.h +++ b/src/data/field_effects/field_effect_objects.h @@ -17,7 +17,7 @@ const struct SpriteFrameImage gSpriteFrameImage_FieldShadowM[] = {obj_frame_tile const struct SpriteFrameImage gSpriteFrameImage_FieldShadowL[] = {obj_frame_tiles(gSpriteImageGfx_FieldShadowL) }; const struct SpriteFrameImage gSpriteFrameImage_FieldShadowXL[] = { obj_frame_tiles(gSpriteImageGfx_FieldShadowXL) }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowS = +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, @@ -28,7 +28,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowS = .callback = UpdateShadowFieldEffect, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowM = +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, @@ -39,7 +39,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowM = .callback = UpdateShadowFieldEffect, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowL = +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, @@ -50,7 +50,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowL = .callback = UpdateShadowFieldEffect, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowXL = +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, @@ -85,7 +85,7 @@ const union AnimCmd *const gUnknown_83A541C[] = gUnknown_83A5404, }; -const struct SpriteTemplate gUnknown_83A5420 = +const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1005, @@ -123,7 +123,7 @@ const union AnimCmd *const gUnknown_83A5484[] = gUnknown_83A5460, }; -const struct SpriteTemplate gUnknown_83A5488 = +const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1005, @@ -158,7 +158,7 @@ const union AnimCmd *const gUnknown_83A54E0[] = gUnknown_83A54C8, }; -const struct SpriteTemplate gUnknown_83A54E4 = +const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1005, @@ -215,7 +215,7 @@ const union AnimCmd *const gUnknown_83A555C[] = gUnknown_83A5550, }; -const struct SpriteTemplate gUnknown_83A556C = +const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, @@ -274,7 +274,7 @@ const union AnimCmd *const gUnknown_83A55F4[] = gUnknown_83A55E8, }; -const struct SpriteTemplate gUnknown_83A5604 = +const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, @@ -305,7 +305,7 @@ const union AnimCmd *const gUnknown_83A5644[] = gUnknown_83A5634, }; -const struct SpriteTemplate gUnknown_83A5648 = +const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1004, @@ -338,7 +338,7 @@ const union AnimCmd *const gUnknown_83A5694[] = gUnknown_83A5680, }; -const struct SpriteTemplate gUnknown_83A5698 = +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1005, @@ -388,7 +388,7 @@ const union AnimCmd *const gUnknown_83A56E0[] = gUnknown_83A56D8, }; -const struct SpriteTemplate gUnknown_83A56F4 = +const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1004, @@ -438,7 +438,7 @@ const union AnimCmd *const gUnknown_83A573C[] = gUnknown_83A5734, }; -const struct SpriteTemplate gUnknown_83A5750 = +const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1004, @@ -518,7 +518,7 @@ const union AnimCmd *const gUnknown_83A57C8[] = gUnknown_83A57C0, }; -const struct SpriteTemplate gUnknown_83A57EC = +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1004, @@ -551,7 +551,7 @@ const union AnimCmd *const gUnknown_83A5838[] = gUnknown_83A5824, }; -const struct SpriteTemplate gUnknown_83A583C = +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1004, @@ -594,7 +594,7 @@ const union AnimCmd *const gUnknown_83A5894[] = gUnknown_83A5870, }; -const struct SpriteTemplate gUnknown_83A589C = +const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1004, @@ -625,7 +625,7 @@ const union AnimCmd *const gUnknown_83A58DC[] = gUnknown_83A58CC, }; -const struct SpriteTemplate gUnknown_83A58E0 = +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1004, @@ -661,7 +661,7 @@ const union AnimCmd *const gUnknown_83A5938[] = gUnknown_83A5918, }; -const struct SpriteTemplate gUnknown_83A593C = +const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1005, @@ -698,7 +698,7 @@ const union AnimCmd *const gUnknown_83A59A0[] = gUnknown_83A5984, }; -const struct SpriteTemplate gUnknown_83A59A4 = +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1005, @@ -741,7 +741,7 @@ const union AnimCmd *const gUnknown_83A5A2C[] = gUnknown_83A5A04, }; -const struct SpriteTemplate gUnknown_83A5A30 = +const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1005, @@ -776,7 +776,7 @@ const union AnimCmd *const gUnknown_83A5A84[] = gUnknown_83A5A68, }; -const struct SpriteTemplate gUnknown_83A5A88 = +const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2 = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1005, @@ -809,7 +809,7 @@ const union AnimCmd *const gUnknown_83A5AD4[] = gUnknown_83A5AC0, }; -const struct SpriteTemplate gUnknown_83A5AD8 = +const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1004, @@ -840,7 +840,7 @@ const union AnimCmd *const gUnknown_83A5B18[] = gUnknown_83A5B08, }; -const struct SpriteTemplate gUnknown_83A5B1C = +const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1004, @@ -875,7 +875,7 @@ const union AnimCmd *const gUnknown_83A5B70[] = gUnknown_83A5B54, }; -const struct SpriteTemplate gUnknown_83A5B74 = +const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1004, @@ -920,7 +920,7 @@ const union AffineAnimCmd *const gUnknown_83A5C2C[] = gUnknown_83A5BDC, }; -const struct SpriteTemplate gUnknown_83A5C34 = +const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion = { .tileTag = 0x0, .paletteTag = SPRITE_INVALID_TAG, @@ -966,7 +966,7 @@ const union AnimCmd *const gUnknown_83A5CAC[] = gUnknown_83A5C8C, }; -const struct SpriteTemplate gUnknown_83A5CB4 = +const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, @@ -1012,7 +1012,7 @@ const union AnimCmd *const gUnknown_83A5D2C[] = gUnknown_83A5D0C, }; -const struct SpriteTemplate gUnknown_83A5D34 = +const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, @@ -1034,7 +1034,7 @@ const struct SpriteFrameImage gUnknown_83A5D4C[] = overworld_frame(gUnknown_839BE08, 2, 4, 6), }; -const struct SpriteTemplate gUnknown_83A5D84 = +const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, @@ -1093,7 +1093,7 @@ const union AnimCmd *const gUnknown_83A5DEC[] = gUnknown_83A5DE4, }; -const struct SpriteTemplate gUnknown_83A5E00 = +const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, @@ -1122,7 +1122,7 @@ const union AnimCmd *const gUnknown_83A5E34[] = gUnknown_83A5E28, }; -const struct SpriteTemplate gUnknown_83A5E38 = +const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1005, @@ -1149,7 +1149,7 @@ const union AnimCmd *const gUnknown_83A5E60[] = gUnknown_83A5E58, }; -const struct SpriteTemplate gUnknown_83A5E64 = +const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1005, @@ -1184,7 +1184,7 @@ const union AnimCmd *const gUnknown_83A5EBC[] = gUnknown_83A5EA4, }; -const struct SpriteTemplate gUnknown_83A5EC0 = +const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x100D, @@ -1221,7 +1221,7 @@ const union AnimCmd *const gUnknown_83A5F20[] = gUnknown_83A5F08, }; -const struct SpriteTemplate gUnknown_83A5F24 = +const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x100D, @@ -1262,7 +1262,7 @@ const union AnimCmd *const gUnknown_83A5FA0[] = gUnknown_83A5F7C, }; -const struct SpriteTemplate gUnknown_83A5FA4 = +const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1004, @@ -1292,7 +1292,7 @@ const union AnimCmd *const gUnknown_83A5FDC[] = gUnknown_83A5FCC, }; -const struct SpriteTemplate gUnknown_83A5FE0 = +const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x100F, diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 8597bea5a..d2fcfd9c8 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -199,6 +199,7 @@ const u32 gUnknown_8398928[] = INCBIN_U32("graphics/object_events/pics/unknown/8 const u32 gUnknown_8398BA8[] = INCBIN_U32("graphics/object_events/pics/unknown/8398BA8.4bpp"); const u16 gUnknown_8398FA8[] = INCBIN_U16("graphics/object_events/palettes/8398FA8.gbapal"); const u16 gUnknown_8398FC8[] = INCBIN_U16("graphics/object_events/palettes/8398FC8.gbapal"); +const u16 filler_8398FE8[16] = {0}; const u32 gUnknown_8399008[] = INCBIN_U32("graphics/object_events/pics/unknown/8399008.4bpp"); const u32 gUnknown_83990C8[] = INCBIN_U32("graphics/object_events/pics/unknown/83990C8.4bpp"); const u32 gUnknown_8399188[] = INCBIN_U32("graphics/object_events/pics/unknown/8399188.4bpp"); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 5d2b5a1bf..fcd0623c9 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1243,13 +1243,13 @@ void ResetObjectEvents(void) static void CreateReflectionEffectSprites(void) { - u8 spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_REFLECTION], 0, 0, 31); + u8 spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_REFLECTION_DISTORTION], 0, 0, 31); gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; InitSpriteAffineAnim(&gSprites[spriteId]); StartSpriteAffineAnim(&gSprites[spriteId], 0); gSprites[spriteId].invisible = TRUE; - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_REFLECTION], 0, 0, 31); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_REFLECTION_DISTORTION], 0, 0, 31); gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; InitSpriteAffineAnim(&gSprites[spriteId]); StartSpriteAffineAnim(&gSprites[spriteId], 1); diff --git a/src/field_effect.c b/src/field_effect.c index e193ab3b5..e5d94e889 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1903,7 +1903,7 @@ u8 FldEff_LavaridgeGymWarp(void) { u8 spriteId; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_33], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_ASH_LAUNCH], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); gSprites[spriteId].oam.priority = gFieldEffectArguments[3]; gSprites[spriteId].coordOffsetEnabled = TRUE; return spriteId; @@ -1996,7 +1996,7 @@ u8 FldEff_PopOutOfAsh(void) { u8 spriteId; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_32], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_ASH_PUFF], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); gSprites[spriteId].oam.priority = gFieldEffectArguments[3]; gSprites[spriteId].coordOffsetEnabled = TRUE; return spriteId; @@ -3048,7 +3048,7 @@ static void sub_8086D94(struct Sprite * sprite); u8 FldEff_NpcFlyOut(void) { - u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFGFX_FLY_BLOB], 0x78, 0, 1); + u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIRD], 0x78, 0, 1); struct Sprite * sprite = &gSprites[spriteId]; sprite->oam.paletteNum = 0; @@ -3239,7 +3239,7 @@ static u8 sub_8087168(void) { u8 spriteId; struct Sprite * sprite; - spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFGFX_FLY_BLOB], 0xff, 0xb4, 0x1); + spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIRD], 0xff, 0xb4, 0x1); sprite = &gSprites[spriteId]; sprite->oam.paletteNum = 0; sprite->oam.priority = 1; diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 55095086c..b10df5d1b 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -7,6 +7,7 @@ #include "fieldmap.h" #include "metatile_behavior.h" #include "constants/field_effects.h" +#include "constants/event_objects.h" #include "constants/songs.h" #define OBJ_EVENT_PAL_TAG_NONE 0x11FF // duplicate of define in event_object_movement.c @@ -164,7 +165,7 @@ u8 CreateWarpArrowSprite(void) u8 spriteId; struct Sprite * sprite; - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[8], 0, 0, 0x52); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_ARROW], 0, 0, 0x52); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -201,17 +202,17 @@ void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y) } const u8 gShadowEffectTemplateIds[] = { - 0, - 1, - 2, - 3 + [SHADOW_SIZE_S] = FLDEFFOBJ_SHADOW_S, + [SHADOW_SIZE_M] = FLDEFFOBJ_SHADOW_M, + [SHADOW_SIZE_L] = FLDEFFOBJ_SHADOW_L, + [SHADOW_SIZE_XL] = FLDEFFOBJ_SHADOW_XL }; const u16 gShadowVerticalOffsets[] = { - 4, - 4, - 4, - 16 + [SHADOW_SIZE_S] = 4, + [SHADOW_SIZE_M] = 4, + [SHADOW_SIZE_L] = 4, + [SHADOW_SIZE_XL] = 16 }; u32 FldEff_Shadow(void) @@ -273,7 +274,7 @@ u32 FldEff_TallGrass(void) x = gFieldEffectArguments[0]; y = gFieldEffectArguments[1]; sub_8063BC4(&x, &y, 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[4], x, y, 0); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_TALL_GRASS], x, y, 0); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -340,7 +341,7 @@ u32 FldEff_JumpTallGrass(void) struct Sprite * sprite; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 12); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[10], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_TALL_GRASS], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -380,7 +381,7 @@ u32 FldEff_LongGrass(void) x = gFieldEffectArguments[0]; y = gFieldEffectArguments[1]; sub_8063BC4(&x, &y, 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[15], x, y, 0); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_LONG_GRASS], x, y, 0); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -443,7 +444,7 @@ u32 FldEff_JumpLongGrass(void) struct Sprite * sprite; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[16], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_LONG_GRASS], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -464,7 +465,7 @@ u32 FldEff_ShortGrass(void) objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEvent = &gObjectEvents[objectEventId]; - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[30], 0, 0, 0); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SHORT_GRASS], 0, 0, 0); if (spriteId != MAX_SPRITES) { sprite = &(gSprites[spriteId]); @@ -521,7 +522,7 @@ u32 FldEff_SandFootprints(void) struct Sprite * sprite; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[11], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SAND_FOOTPRINTS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -539,7 +540,7 @@ u32 FldEff_DeepSandFootprints(void) struct Sprite * sprite; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[23], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_DEEP_SAND_FOOTPRINTS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -557,7 +558,7 @@ u32 FldEff_BikeTireTracks(void) struct Sprite * sprite; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[27], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIKE_TIRE_TRACKS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -610,7 +611,7 @@ u32 FldEff_Splash(void) objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEvent = &gObjectEvents[objectEventId]; - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SPLASH], 0, 0, 0); if (spriteId != MAX_SPRITES) { graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); @@ -649,7 +650,7 @@ u32 FldEff_JumpSmallSplash(void) struct Sprite * sprite; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 12); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[14], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_SMALL_SPLASH], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -667,7 +668,7 @@ u32 FldEff_JumpBigSplash(void) struct Sprite * sprite; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[12], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_BIG_SPLASH], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -689,7 +690,7 @@ u32 FldEff_FeetInFlowingWater(void) objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEvent = &gObjectEvents[objectEventId]; - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SPLASH], 0, 0, 0); if (spriteId != MAX_SPRITES) { graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); @@ -743,7 +744,7 @@ u32 FldEff_Ripple(void) u8 spriteId; struct Sprite * sprite; - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[5], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_RIPPLE], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -763,7 +764,7 @@ u32 FldEff_HotSpringsWater(void) objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEvent = &gObjectEvents[objectEventId]; - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[31], 0, 0, 0); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_HOT_SPRINGS_WATER], 0, 0, 0); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -805,7 +806,7 @@ u32 FldEff_Unknown19(void) struct Sprite * sprite; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[17], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_UNUSED_GRASS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -822,7 +823,7 @@ u32 FldEff_Unknown20(void) struct Sprite * sprite; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[18], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_UNUSED_GRASS_2], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -839,7 +840,7 @@ u32 FldEff_Unknown21(void) struct Sprite * sprite; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[19], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_UNUSED_SAND], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -856,7 +857,7 @@ u32 FldEff_Unknown22(void) struct Sprite * sprite; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[20], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_WATER_SURFACING], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -888,7 +889,7 @@ u32 FldEff_Ash(void) x = gFieldEffectArguments[0]; y = gFieldEffectArguments[1]; sub_8063BC4(&x, &y, 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[6], x, y, gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_ASH], x, y, gFieldEffectArguments[2]); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -944,7 +945,7 @@ u32 FldEff_SurfBlob(void) struct Sprite * sprite; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[7], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x96); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SURF_BLOB], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x96); if (spriteId !=MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -1104,7 +1105,7 @@ u32 FldEff_Dust(void) struct Sprite * sprite; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 12); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[9], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_GROUND_IMPACT_DUST], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -1126,7 +1127,7 @@ u32 FldEff_SandPile(void) objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEvent = &gObjectEvents[objectEventId]; - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[29], 0, 0, 0); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SAND_PILE], 0, 0, 0); if (spriteId != MAX_SPRITES) { graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); @@ -1180,7 +1181,7 @@ u32 FldEff_Bubbles(void) struct Sprite * sprite; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 0); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[34], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x52); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BUBBLES], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x52); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -1208,7 +1209,7 @@ u32 FldEff_BerryTreeGrowthSparkle(void) struct Sprite * sprite; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 4); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[22], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SPARKLE], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; @@ -1328,7 +1329,7 @@ u32 FldEff_Sparkle(void) gFieldEffectArguments[0] += 7; gFieldEffectArguments[1] += 7; sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); - spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[35], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x52); + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SMALL_SPARKLE], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x52); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = gFieldEffectArguments[2]; diff --git a/src/teachy_tv.c b/src/teachy_tv.c index 0ad510721..f7cd182bb 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -25,6 +25,7 @@ #include "graphics.h" #include "fieldmap.h" #include "strings.h" +#include "constants/field_effects.h" struct TeachyTvCtrlBlk { @@ -1107,7 +1108,7 @@ static void TeachyTvGrassAnimationMain(u8 taskId, s16 x, s16 y, u8 subpriority, if (sResources->grassAnimDisabled != 1 && TeachyTvGrassAnimationCheckIfNeedsToGenerateGrassObj(x - 0x10, y)) { - spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[4], 0, 0, subpriority); + spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_TALL_GRASS], 0, 0, subpriority); obj = &gSprites[spriteId]; obj->pos2.x = x; obj->pos2.y = y + 8; -- cgit v1.2.3 From 014dd7f0be6533cf08a137c7cba263edd01181fb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 May 2021 15:22:13 -0400 Subject: Sync field_effect_objects.h from Emerald --- data/field_effect_scripts.s | 52 +- .../object_events/pics/effects/jump_big_splash.png | Bin 0 -> 292 bytes graphics/object_events/pics/effects/long_grass.png | Bin 0 -> 439 bytes graphics/object_events/pics/unknown/8399788.png | Bin 608 -> 689 bytes graphics/object_events/pics/unknown/8399C08.png | Bin 282 -> 355 bytes graphics/object_events/pics/unknown/839B708.png | Bin 280 -> 420 bytes graphics/object_events/pics/unknown/839BE08.png | Bin 256 -> 339 bytes graphics_file_rules.mk | 6 + include/constants/field_effects.h | 95 +-- include/event_object_movement.h | 2 +- include/field_effect.h | 2 +- include/field_effect_helpers.h | 2 +- .../field_effect_object_template_pointers.h | 5 +- src/data/field_effects/field_effect_objects.h | 883 +++++++++++---------- src/data/object_events/object_event_graphics.h | 418 +++++----- src/field_effect.c | 2 +- src/field_effect_helpers.c | 8 +- src/teachy_tv.c | 2 +- 18 files changed, 766 insertions(+), 711 deletions(-) create mode 100644 graphics/object_events/pics/effects/jump_big_splash.png create mode 100644 graphics/object_events/pics/effects/long_grass.png diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 43698653d..98201382c 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -90,11 +90,11 @@ gFldEffScript_Shadow:: @ 81D97D6 end gFldEffScript_TallGrass:: @ 81D97DC - loadfadedpal_callnative gUnknown_83A5348, FldEff_TallGrass + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_TallGrass end gFldEffScript_Ripple:: @ 81D97E6 - loadfadedpal_callnative gUnknown_83A5348, FldEff_Ripple + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ripple end gFldEffScript_FieldMoveShowMon:: @ 81D97F0 @@ -102,7 +102,7 @@ gFldEffScript_FieldMoveShowMon:: @ 81D97F0 end gFldEffScript_Ash:: @ 81D97F6 - loadfadedpal_callnative gUnknown_83A5348, FldEff_Ash + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ash end gFldEffScript_SurfBlob:: @ 81D9800 @@ -114,54 +114,54 @@ gFldEffScript_UseSurf:: @ 81D9806 end gFldEffScript_Dust:: @ 81D980C - loadfadedpal_callnative gUnknown_83A5340, FldEff_Dust + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Dust end gFldEffScript_UseSecretPowerCave:: @ 81D9816 end gFldEffScript_JumpTallGrass:: @ 81D9817 - loadfadedpal_callnative gUnknown_83A5348, FldEff_JumpTallGrass + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpTallGrass end gFldEffScript_SandFootprints:: @ 81D9821 - loadfadedpal_callnative gUnknown_83A5340, FldEff_SandFootprints + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandFootprints end gFldEffScript_JumpBigSplash:: @ 81D982B - loadfadedpal_callnative gUnknown_83A5340, FldEff_JumpBigSplash + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpBigSplash end gFldEffScript_Splash:: @ 81D9835 - loadfadedpal_callnative gUnknown_83A5340, FldEff_Splash + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Splash end gFldEffScript_JumpSmallSplash:: @ 81D983F - loadfadedpal_callnative gUnknown_83A5340, FldEff_JumpSmallSplash + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpSmallSplash end gFldEffScript_LongGrass:: @ 81D9849 - loadfadedpal_callnative gUnknown_83A5348, FldEff_LongGrass + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_LongGrass end gFldEffScript_JumpLongGrass:: @ 81D9853 - loadfadedpal_callnative gUnknown_83A5348, FldEff_JumpLongGrass + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpLongGrass end gFldEffScript_Unknown19:: @ 81D985D - loadfadedpal_callnative gUnknown_83A5348, FldEff_Unknown19 + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Unknown19 end gFldEffScript_Unknown20:: @ 81D9867 - loadfadedpal_callnative gUnknown_83A5348, FldEff_Unknown20 + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Unknown20 end gFldEffScript_Unknown21:: @ 81D9871 - loadfadedpal_callnative gUnknown_83A5340, FldEff_Unknown21 + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Unknown21 end gFldEffScript_Unknown22:: @ 81D987B - loadfadedpal_callnative gUnknown_83A5340, FldEff_Unknown22 + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Unknown22 end gFldEffScript_BerryTreeGrowthSparkle:: @ 81D9885 @@ -169,12 +169,12 @@ gFldEffScript_BerryTreeGrowthSparkle:: @ 81D9885 end gFldEffScript_DeepSandFootprints:: @ 81D988B - loadfadedpal_callnative gUnknown_83A5340, FldEff_DeepSandFootprints + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_DeepSandFootprints end gFldEffScript_PokecenterHeal:: @ 81D9895 loadfadedpal gUnknown_83CBE9C - loadfadedpal_callnative gUnknown_83A5340, FldEff_PokecenterHeal + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_PokecenterHeal end gFldEffScript_UseSecretPowerTree:: @ 81D98A4 @@ -208,11 +208,11 @@ gFldEffScript_QuestionMarkIcon:: @ 81D98C4 end gFldEffScript_FeetInFlowingWater:: @ 81D98CA - loadfadedpal_callnative gUnknown_83A5340, FldEff_FeetInFlowingWater + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_FeetInFlowingWater end gFldEffScript_BikeTireTracks:: @ 81D98D4 - loadfadedpal_callnative gUnknown_83A5340, FldEff_BikeTireTracks + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_BikeTireTracks end gFldEffScript_SandDisguise:: @ 81D98DE @@ -232,15 +232,15 @@ gFldEffScript_UseDig:: @ 81D98F0 end gFldEffScript_SandPile:: @ 81D98F6 - loadfadedpal_callnative gUnknown_83A5340, FldEff_SandPile + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandPile end gFldEffScript_ShortGrass:: @ 81D9900 - loadfadedpal_callnative gUnknown_83A5348, FldEff_ShortGrass + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_ShortGrass end gFldEffScript_HotSpringsWater:: @ 81D990A - loadfadedpal_callnative gUnknown_83A5348, FldEff_HotSpringsWater + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_HotSpringsWater end gFldEffScript_UseWaterfall:: @ 81D9914 @@ -267,11 +267,11 @@ gFldEffScript_Nop48:: @ 81D9932 end gFldEffScript_PopOutOfAsh:: @ 81D9933 - loadfadedpal_callnative gUnknown_83A5ED8, FldEff_PopOutOfAsh + loadfadedpal_callnative gSpritePalette_Ash, FldEff_PopOutOfAsh end gFldEffScript_LavaridgeGymWarp:: @ 81D993D - loadfadedpal_callnative gUnknown_83A5ED8, FldEff_LavaridgeGymWarp + loadfadedpal_callnative gSpritePalette_Ash, FldEff_LavaridgeGymWarp end gFldEffScript_SweetScent:: @ 81D9947 @@ -282,11 +282,11 @@ gFldEffScript_SandPillar:: @ 81D994D end gFldEffScript_Bubbles:: @ 81D994E - loadfadedpal_callnative gUnknown_83A5340, FldEff_Bubbles + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Bubbles end gFldEffScript_Sparkle:: @ 81D9958 - loadfadedpal_callnative gUnknown_83A5FF8, FldEff_Sparkle + loadfadedpal_callnative gSpritePalette_SmallSparkle, FldEff_Sparkle end gFldEffScript_SecretPowerCave:: @ 81D9962 diff --git a/graphics/object_events/pics/effects/jump_big_splash.png b/graphics/object_events/pics/effects/jump_big_splash.png new file mode 100644 index 000000000..6c3829bfd Binary files /dev/null and b/graphics/object_events/pics/effects/jump_big_splash.png differ diff --git a/graphics/object_events/pics/effects/long_grass.png b/graphics/object_events/pics/effects/long_grass.png new file mode 100644 index 000000000..94a9a4ae0 Binary files /dev/null and b/graphics/object_events/pics/effects/long_grass.png differ diff --git a/graphics/object_events/pics/unknown/8399788.png b/graphics/object_events/pics/unknown/8399788.png index 5178c54d9..1f918a0d0 100644 Binary files a/graphics/object_events/pics/unknown/8399788.png and b/graphics/object_events/pics/unknown/8399788.png differ diff --git a/graphics/object_events/pics/unknown/8399C08.png b/graphics/object_events/pics/unknown/8399C08.png index b7a8966ad..aff184fe8 100644 Binary files a/graphics/object_events/pics/unknown/8399C08.png and b/graphics/object_events/pics/unknown/8399C08.png differ diff --git a/graphics/object_events/pics/unknown/839B708.png b/graphics/object_events/pics/unknown/839B708.png index 06c9e2589..cde53348c 100644 Binary files a/graphics/object_events/pics/unknown/839B708.png and b/graphics/object_events/pics/unknown/839B708.png differ diff --git a/graphics/object_events/pics/unknown/839BE08.png b/graphics/object_events/pics/unknown/839BE08.png index b42965d57..1e88e9c28 100644 Binary files a/graphics/object_events/pics/unknown/839BE08.png and b/graphics/object_events/pics/unknown/839BE08.png differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index abd2da07f..e87b08888 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -435,6 +435,12 @@ $(EVENTOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png $(EVENTOBJGFXDIR)/pics/effects/underwater_bubbles.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 +$(EVENTOBJGFXDIR)/pics/unknown/839BE08.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/pics/unknown/839B708.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 8 diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 8c3ece863..47b5f2bed 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -1,16 +1,16 @@ #ifndef GUARD_CONSTANTS_FIELD_EFFECTS_H #define GUARD_CONSTANTS_FIELD_EFFECTS_H -#define FLDEFF_EXCLAMATION_MARK_ICON 0 -#define FLDEFF_USE_CUT_ON_GRASS 1 -#define FLDEFF_USE_CUT_ON_TREE 2 -#define FLDEFF_SHADOW 3 -#define FLDEFF_TALL_GRASS 4 -#define FLDEFF_RIPPLE 5 -#define FLDEFF_FIELD_MOVE_SHOW_MON 6 -#define FLDEFF_ASH 7 -#define FLDEFF_SURF_BLOB 8 -#define FLDEFF_USE_SURF 9 +#define FLDEFF_EXCLAMATION_MARK_ICON 0 +#define FLDEFF_USE_CUT_ON_GRASS 1 +#define FLDEFF_USE_CUT_ON_TREE 2 +#define FLDEFF_SHADOW 3 +#define FLDEFF_TALL_GRASS 4 +#define FLDEFF_RIPPLE 5 +#define FLDEFF_FIELD_MOVE_SHOW_MON 6 +#define FLDEFF_ASH 7 +#define FLDEFF_SURF_BLOB 8 +#define FLDEFF_USE_SURF 9 #define FLDEFF_DUST 10 #define FLDEFF_USE_SECRET_POWER_CAVE 11 #define FLDEFF_JUMP_TALL_GRASS 12 @@ -72,41 +72,46 @@ #define FLDEFF_DESTROY_DEOXYS_ROCK 68 #define FLDEFF_UNK_45 69 // TODO: related to fame checker photos -#define FLDEFFOBJ_SHADOW_S 0 -#define FLDEFFOBJ_SHADOW_M 1 -#define FLDEFFOBJ_SHADOW_L 2 -#define FLDEFFOBJ_SHADOW_XL 3 -#define FLDEFFOBJ_TALL_GRASS 4 -#define FLDEFFOBJ_RIPPLE 5 +#define FLDEFF_PAL_TAG_GENERAL_0 0x1004 +#define FLDEFF_PAL_TAG_GENERAL_1 0x1005 +#define FLDEFF_PAL_TAG_ASH 0x100D +#define FLDEFF_PAL_TAG_SMALL_SPARKLE 0x100F + +#define FLDEFFOBJ_SHADOW_S 0 +#define FLDEFFOBJ_SHADOW_M 1 +#define FLDEFFOBJ_SHADOW_L 2 +#define FLDEFFOBJ_SHADOW_XL 3 +#define FLDEFFOBJ_TALL_GRASS 4 +#define FLDEFFOBJ_RIPPLE 5 #define FLDEFFOBJ_ASH 6 -#define FLDEFFOBJ_SURF_BLOB 7 -#define FLDEFFOBJ_ARROW 8 -#define FLDEFFOBJ_GROUND_IMPACT_DUST 9 -#define FLDEFFOBJ_JUMP_TALL_GRASS 10 -#define FLDEFFOBJ_SAND_FOOTPRINTS 11 -#define FLDEFFOBJ_JUMP_BIG_SPLASH 12 -#define FLDEFFOBJ_SPLASH 13 -#define FLDEFFOBJ_JUMP_SMALL_SPLASH 14 -#define FLDEFFOBJ_LONG_GRASS 15 -#define FLDEFFOBJ_JUMP_LONG_GRASS 16 -#define FLDEFFOBJ_UNUSED_GRASS 17 -#define FLDEFFOBJ_UNUSED_GRASS_2 18 -#define FLDEFFOBJ_UNUSED_SAND 19 -#define FLDEFFOBJ_WATER_SURFACING 20 -#define FLDEFFOBJ_REFLECTION_DISTORTION 21 -#define FLDEFFOBJ_SPARKLE 22 -#define FLDEFFOBJ_DEEP_SAND_FOOTPRINTS 23 -#define FLDEFFOBJ_TREE_DISGUISE 24 -#define FLDEFFOBJ_MOUNTAIN_DISGUISE 25 -#define FLDEFFOBJ_BIRD 26 -#define FLDEFFOBJ_BIKE_TIRE_TRACKS 27 -#define FLDEFFOBJ_SAND_DISGUISE 28 -#define FLDEFFOBJ_SAND_PILE 29 -#define FLDEFFOBJ_SHORT_GRASS 30 -#define FLDEFFOBJ_HOT_SPRINGS_WATER 31 -#define FLDEFFOBJ_ASH_PUFF 32 -#define FLDEFFOBJ_ASH_LAUNCH 33 -#define FLDEFFOBJ_BUBBLES 34 -#define FLDEFFOBJ_SMALL_SPARKLE 35 +#define FLDEFFOBJ_SURF_BLOB 7 +#define FLDEFFOBJ_ARROW 8 +#define FLDEFFOBJ_GROUND_IMPACT_DUST 9 +#define FLDEFFOBJ_JUMP_TALL_GRASS 10 +#define FLDEFFOBJ_SAND_FOOTPRINTS 11 +#define FLDEFFOBJ_JUMP_BIG_SPLASH 12 +#define FLDEFFOBJ_SPLASH 13 +#define FLDEFFOBJ_JUMP_SMALL_SPLASH 14 +#define FLDEFFOBJ_LONG_GRASS 15 +#define FLDEFFOBJ_JUMP_LONG_GRASS 16 +#define FLDEFFOBJ_UNUSED_GRASS 17 +#define FLDEFFOBJ_UNUSED_GRASS_2 18 +#define FLDEFFOBJ_UNUSED_SAND 19 +#define FLDEFFOBJ_WATER_SURFACING 20 +#define FLDEFFOBJ_REFLECTION_DISTORTION 21 +#define FLDEFFOBJ_SPARKLE 22 +#define FLDEFFOBJ_DEEP_SAND_FOOTPRINTS 23 +#define FLDEFFOBJ_TREE_DISGUISE 24 +#define FLDEFFOBJ_MOUNTAIN_DISGUISE 25 +#define FLDEFFOBJ_BIRD 26 +#define FLDEFFOBJ_BIKE_TIRE_TRACKS 27 +#define FLDEFFOBJ_SAND_DISGUISE 28 +#define FLDEFFOBJ_SAND_PILE 29 +#define FLDEFFOBJ_SHORT_GRASS 30 +#define FLDEFFOBJ_HOT_SPRINGS_WATER 31 +#define FLDEFFOBJ_ASH_PUFF 32 +#define FLDEFFOBJ_ASH_LAUNCH 33 +#define FLDEFFOBJ_BUBBLES 34 +#define FLDEFFOBJ_SMALL_SPARKLE 35 #endif // GUARD_CONSTANTS_FIELD_EFFECTS_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 25fd988ea..f9b29a3f2 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -196,7 +196,7 @@ u8 GetMoveDirectionAnimNum(u8 direction); // Exported data declarations extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; -extern const struct SpritePalette gUnknown_83A5348; +extern const struct SpritePalette gSpritePalette_GeneralFieldEffect1; extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[]; extern const struct OamData gObjectEventBaseOam_32x32; extern const u16 gUnknown_8398648[]; diff --git a/include/field_effect.h b/include/field_effect.h index a0673c517..48143b0d3 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -26,7 +26,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, bool8 unused); void ReturnToFieldFromFlyMapSelect(void); void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b); void SpriteCB_PopOutOfAsh(struct Sprite * sprite); -void SpriteCB_LavaridgeGymWarp(struct Sprite * sprite); +void SpriteCB_AshLaunch(struct Sprite * sprite); void FieldEffectActiveListClear(void); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index a842c5dc6..689f6d87b 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -25,7 +25,7 @@ u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y); void SetSpriteInvisible(u8 spriteId); void sub_80DC4A4(u8 spriteId, u8 value, s16 data1); -void sub_80DCCE0(struct Sprite * sprite); +void UpdateJumpImpactEffect(struct Sprite * sprite); void UpdateShadowFieldEffect(struct Sprite * sprite); void UpdateBubblesFieldEffect(struct Sprite * sprite); void UpdateSparkleFieldEffect(struct Sprite * sprite); diff --git a/src/data/field_effects/field_effect_object_template_pointers.h b/src/data/field_effects/field_effect_object_template_pointers.h index 92a0a77f1..1f5c27ed4 100644 --- a/src/data/field_effects/field_effect_object_template_pointers.h +++ b/src/data/field_effects/field_effect_object_template_pointers.h @@ -21,6 +21,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand; const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing; const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion; const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints; +/*const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle;*/ const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise; const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise; const struct SpriteTemplate gFieldEffectObjectTemplate_Bird; @@ -34,8 +35,6 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch; const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles; const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle; -#define gFieldEffectObjectTemplate_Sparkle NULL - const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = { [FLDEFFOBJ_SHADOW_S] = &gFieldEffectObjectTemplate_ShadowSmall, [FLDEFFOBJ_SHADOW_M] = &gFieldEffectObjectTemplate_ShadowMedium, @@ -59,7 +58,7 @@ const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = { [FLDEFFOBJ_UNUSED_SAND] = &gFieldEffectObjectTemplate_UnusedSand, [FLDEFFOBJ_WATER_SURFACING] = &gFieldEffectObjectTemplate_WaterSurfacing, [FLDEFFOBJ_REFLECTION_DISTORTION] = &gFieldEffectObjectTemplate_ReflectionDistortion, - [FLDEFFOBJ_SPARKLE] = gFieldEffectObjectTemplate_Sparkle, + [FLDEFFOBJ_SPARKLE] = NULL, [FLDEFFOBJ_DEEP_SAND_FOOTPRINTS] = &gFieldEffectObjectTemplate_DeepSandFootprints, [FLDEFFOBJ_TREE_DISGUISE] = &gFieldEffectObjectTemplate_TreeDisguise, [FLDEFFOBJ_MOUNTAIN_DISGUISE] = &gFieldEffectObjectTemplate_MountainDisguise, diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h index 86888c056..7a764d3d5 100644 --- a/src/data/field_effects/field_effect_objects.h +++ b/src/data/field_effects/field_effect_objects.h @@ -1,29 +1,29 @@ -const struct SpritePalette gUnknown_83A5340 = { .data = gUnknown_8398FA8, .tag = 0x1004 }; -const struct SpritePalette gUnknown_83A5348 = { .data = gUnknown_8398FC8, .tag = 0x1005 }; +const struct SpritePalette gSpritePalette_GeneralFieldEffect0 = { .data = gFieldEffectObjectPalette0, .tag = FLDEFF_PAL_TAG_GENERAL_0 }; +const struct SpritePalette gSpritePalette_GeneralFieldEffect1 = { .data = gFieldEffectObjectPalette1, .tag = FLDEFF_PAL_TAG_GENERAL_1 }; -const union AnimCmd gSpriteAnimCmd_FieldShadow0[] = +static const union AnimCmd sAnim_Shadow[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd *const gSpriteAnimTable_FieldShadow[] = +static const union AnimCmd *const sAnimTable_Shadow[] = { - gSpriteAnimCmd_FieldShadow0, + sAnim_Shadow, }; -const struct SpriteFrameImage gSpriteFrameImage_FieldShadowS[] = {obj_frame_tiles(gSpriteImageGfx_FieldShadowS) }; -const struct SpriteFrameImage gSpriteFrameImage_FieldShadowM[] = {obj_frame_tiles(gSpriteImageGfx_FieldShadowM) }; -const struct SpriteFrameImage gSpriteFrameImage_FieldShadowL[] = {obj_frame_tiles(gSpriteImageGfx_FieldShadowL) }; -const struct SpriteFrameImage gSpriteFrameImage_FieldShadowXL[] = { obj_frame_tiles(gSpriteImageGfx_FieldShadowXL) }; +static const struct SpriteFrameImage sPicTable_ShadowSmall[] = {obj_frame_tiles(gFieldEffectObjectPic_ShadowSmall) }; +static const struct SpriteFrameImage sPicTable_ShadowMedium[] = {obj_frame_tiles(gFieldEffectObjectPic_ShadowMedium) }; +static const struct SpriteFrameImage sPicTable_ShadowLarge[] = {obj_frame_tiles(gFieldEffectObjectPic_ShadowLarge) }; +static const struct SpriteFrameImage sPicTable_ShadowExtraLarge[] = { obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge) }; const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_8x8, - .anims = gSpriteAnimTable_FieldShadow, - .images = gSpriteFrameImage_FieldShadowS, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowSmall, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateShadowFieldEffect, }; @@ -33,8 +33,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_16x8, - .anims = gSpriteAnimTable_FieldShadow, - .images = gSpriteFrameImage_FieldShadowM, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowMedium, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateShadowFieldEffect, }; @@ -44,8 +44,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_32x8, - .anims = gSpriteAnimTable_FieldShadow, - .images = gSpriteFrameImage_FieldShadowL, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowLarge, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateShadowFieldEffect, }; @@ -55,22 +55,22 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_64x32, - .anims = gSpriteAnimTable_FieldShadow, - .images = gSpriteFrameImage_FieldShadowXL, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowExtraLarge, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateShadowFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A53DC[] = +static const struct SpriteFrameImage sPicTable_TallGrass[] = { - overworld_frame(gUnknown_839A008, 2, 2, 0), - overworld_frame(gUnknown_839A008, 2, 2, 1), - overworld_frame(gUnknown_839A008, 2, 2, 2), - overworld_frame(gUnknown_839A008, 2, 2, 3), - overworld_frame(gUnknown_839A008, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 4), }; -const union AnimCmd gUnknown_83A5404[] = +static const union AnimCmd sAnim_TallGrass[] = { ANIMCMD_FRAME(1, 10), ANIMCMD_FRAME(2, 10), @@ -80,32 +80,32 @@ const union AnimCmd gUnknown_83A5404[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A541C[] = +static const union AnimCmd *const sAnimTable_TallGrass[] = { - gUnknown_83A5404, + sAnim_TallGrass, }; const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A541C, - .images = gUnknown_83A53DC, + .anims = sAnimTable_TallGrass, + .images = sPicTable_TallGrass, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateTallGrassFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5438[] = +static const struct SpriteFrameImage sPicTable_Ripple[] = { - overworld_frame(gUnknown_83986A8, 2, 2, 0), - overworld_frame(gUnknown_83986A8, 2, 2, 1), - overworld_frame(gUnknown_83986A8, 2, 2, 2), - overworld_frame(gUnknown_83986A8, 2, 2, 3), - overworld_frame(gUnknown_83986A8, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 4), }; -const union AnimCmd gUnknown_83A5460[] = +static const union AnimCmd sAnim_Ripple[] = { ANIMCMD_FRAME(0, 12), ANIMCMD_FRAME(1, 9), @@ -118,32 +118,32 @@ const union AnimCmd gUnknown_83A5460[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5484[] = +static const union AnimCmd *const sAnimTable_Ripple[] = { - gUnknown_83A5460, + sAnim_Ripple, }; const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5484, - .images = gUnknown_83A5438, + .anims = sAnimTable_Ripple, + .images = sPicTable_Ripple, .affineAnims = gDummySpriteAffineAnimTable, .callback = WaitFieldEffectSpriteAnim, }; -const struct SpriteFrameImage gUnknown_83A54A0[] = +static const struct SpriteFrameImage sPicTable_Ash[] = { - overworld_frame(gUnknown_8398928, 2, 2, 0), - overworld_frame(gUnknown_8398928, 2, 2, 1), - overworld_frame(gUnknown_8398928, 2, 2, 2), - overworld_frame(gUnknown_8398928, 2, 2, 3), - overworld_frame(gUnknown_8398928, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 4), }; -const union AnimCmd gUnknown_83A54C8[] = +static const union AnimCmd sAnim_Ash[] = { ANIMCMD_FRAME(0, 12), ANIMCMD_FRAME(1, 12), @@ -153,23 +153,23 @@ const union AnimCmd gUnknown_83A54C8[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A54E0[] = +static const union AnimCmd *const sAnimTable_Ash[] = { - gUnknown_83A54C8, + sAnim_Ash, }; const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A54E0, - .images = gUnknown_83A54A0, + .anims = sAnimTable_Ash, + .images = sPicTable_Ash, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateAshFieldEffect, }; -const struct SpriteFrameImage gObjectEventPicTable_SurfBlob[] = +static const struct SpriteFrameImage gObjectEventPicTable_SurfBlob[] = { overworld_frame(gObjectEventPic_SurfBlob, 2, 8, 0), overworld_frame(gObjectEventPic_SurfBlob, 2, 8, 1), @@ -179,40 +179,40 @@ const struct SpriteFrameImage gObjectEventPicTable_SurfBlob[] = overworld_frame(gObjectEventPic_SurfBlob, 2, 8, 5), }; -const union AnimCmd gUnknown_83A552C[] = +static const union AnimCmd sSurfBlobAnim_FaceSouth[] = { ANIMCMD_FRAME(0, 48), ANIMCMD_FRAME(1, 48), ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_83A5538[] = +static const union AnimCmd sSurfBlobAnim_FaceNorth[] = { ANIMCMD_FRAME(2, 48), ANIMCMD_FRAME(3, 48), ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_83A5544[] = +static const union AnimCmd sSurfBlobAnim_FaceWest[] = { ANIMCMD_FRAME(4, 48), ANIMCMD_FRAME(5, 48), ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_83A5550[] = +static const union AnimCmd sSurfBlobAnim_FaceEast[] = { ANIMCMD_FRAME(4, 48, .hFlip = TRUE), ANIMCMD_FRAME(5, 48, .hFlip = TRUE), ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_83A555C[] = +static const union AnimCmd *const sAnimTable_SurfBlob[] = { - gUnknown_83A552C, - gUnknown_83A5538, - gUnknown_83A5544, - gUnknown_83A5550, + [DIR_SOUTH - 1] = sSurfBlobAnim_FaceSouth, + [DIR_NORTH - 1] = sSurfBlobAnim_FaceNorth, + [DIR_WEST - 1] = sSurfBlobAnim_FaceWest, + [DIR_EAST - 1] = sSurfBlobAnim_FaceEast, }; const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = @@ -220,58 +220,58 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_32x32, - .anims = gUnknown_83A555C, + .anims = sAnimTable_SurfBlob, .images = gObjectEventPicTable_SurfBlob, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateSurfBlobFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5584[] = +static const struct SpriteFrameImage sPicTable_Arrow[] = { - overworld_frame(gUnknown_8398BA8, 2, 2, 0), - overworld_frame(gUnknown_8398BA8, 2, 2, 1), - overworld_frame(gUnknown_8398BA8, 2, 2, 2), - overworld_frame(gUnknown_8398BA8, 2, 2, 3), - overworld_frame(gUnknown_8398BA8, 2, 2, 4), - overworld_frame(gUnknown_8398BA8, 2, 2, 5), - overworld_frame(gUnknown_8398BA8, 2, 2, 6), - overworld_frame(gUnknown_8398BA8, 2, 2, 7), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 5), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 6), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 7), }; -const union AnimCmd gUnknown_83A55C4[] = +static const union AnimCmd sArrowAnim_South[] = { ANIMCMD_FRAME(2, 32), ANIMCMD_FRAME(3, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_83A55D0[] = +static const union AnimCmd sArrowAnim_North[] = { ANIMCMD_FRAME(0, 32), ANIMCMD_FRAME(1, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_83A55DC[] = +static const union AnimCmd sArrowAnim_West[] = { ANIMCMD_FRAME(4, 32), ANIMCMD_FRAME(5, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_83A55E8[] = +static const union AnimCmd sArrowAnim_East[] = { ANIMCMD_FRAME(6, 32), ANIMCMD_FRAME(7, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_83A55F4[] = +static const union AnimCmd *const sAnimTable_Arrow[] = { - gUnknown_83A55C4, - gUnknown_83A55D0, - gUnknown_83A55DC, - gUnknown_83A55E8, + [DIR_SOUTH - 1] = sArrowAnim_South, + [DIR_NORTH - 1] = sArrowAnim_North, + [DIR_WEST - 1] = sArrowAnim_West, + [DIR_EAST - 1] = sArrowAnim_East, }; const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = @@ -279,20 +279,20 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A55F4, - .images = gUnknown_83A5584, + .anims = sAnimTable_Arrow, + .images = sPicTable_Arrow, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -const struct SpriteFrameImage gUnknown_83A561C[] = +static const struct SpriteFrameImage sPicTable_GroundImpactDust[] = { - overworld_frame(gUnknown_8399008, 2, 1, 0), - overworld_frame(gUnknown_8399008, 2, 1, 1), - overworld_frame(gUnknown_8399008, 2, 1, 2), + overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 2), }; -const union AnimCmd gUnknown_83A5634[] = +static const union AnimCmd sAnim_GroundImpactDust[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(1, 8), @@ -300,31 +300,31 @@ const union AnimCmd gUnknown_83A5634[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5644[] = +static const union AnimCmd *const sAnimTable_GroundImpactDust[] = { - gUnknown_83A5634, + sAnim_GroundImpactDust, }; const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, - .anims = gUnknown_83A5644, - .images = gUnknown_83A561C, + .anims = sAnimTable_GroundImpactDust, + .images = sPicTable_GroundImpactDust, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80DCCE0, + .callback = UpdateJumpImpactEffect, }; -const struct SpriteFrameImage gUnknown_83A5660[] = +static const struct SpriteFrameImage sPicTable_JumpTallGrass[] = { - overworld_frame(gUnknown_8399188, 2, 1, 0), - overworld_frame(gUnknown_8399188, 2, 1, 1), - overworld_frame(gUnknown_8399188, 2, 1, 2), - overworld_frame(gUnknown_8399188, 2, 1, 3), + overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 2), + overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 3), }; -const union AnimCmd gUnknown_83A5680[] = +static const union AnimCmd sAnim_JumpTallGrass[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(1, 8), @@ -333,211 +333,211 @@ const union AnimCmd gUnknown_83A5680[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5694[] = +static const union AnimCmd *const sAnimTable_JumpTallGrass[] = { - gUnknown_83A5680, + sAnim_JumpTallGrass, }; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x8, - .anims = gUnknown_83A5694, - .images = gUnknown_83A5660, + .anims = sAnimTable_JumpTallGrass, + .images = sPicTable_JumpTallGrass, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80DCCE0, + .callback = UpdateJumpImpactEffect, }; -const struct SpriteFrameImage gUnknown_83A56B0[] = +static const struct SpriteFrameImage sPicTable_SandFootprints[] = { - overworld_frame(gUnknown_839A388, 2, 2, 0), - overworld_frame(gUnknown_839A388, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 1), }; -const union AnimCmd gUnknown_83A56C0[] = +static const union AnimCmd sSandFootprintsAnim_South[] = { ANIMCMD_FRAME(0, 1, .vFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A56C8[] = +static const union AnimCmd sSandFootprintsAnim_North[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A56D0[] = +static const union AnimCmd sSandFootprintsAnim_West[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A56D8[] = +static const union AnimCmd sSandFootprintsAnim_East[] = { ANIMCMD_FRAME(1, 1, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A56E0[] = +static const union AnimCmd *const sAnimTable_SandFootprints[] = { - gUnknown_83A56C0, - gUnknown_83A56C0, - gUnknown_83A56C8, - gUnknown_83A56D0, - gUnknown_83A56D8, + [DIR_NONE] = sSandFootprintsAnim_South, + [DIR_SOUTH] = sSandFootprintsAnim_South, + [DIR_NORTH] = sSandFootprintsAnim_North, + [DIR_WEST] = sSandFootprintsAnim_West, + [DIR_EAST] = sSandFootprintsAnim_East, }; const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A56E0, - .images = gUnknown_83A56B0, + .anims = sAnimTable_SandFootprints, + .images = sPicTable_SandFootprints, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateFootprintsTireTracksFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A570C[] = +static const struct SpriteFrameImage sPicTable_DeepSandFootprints[] = { - overworld_frame(gUnknown_839A488, 2, 2, 0), - overworld_frame(gUnknown_839A488, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 1), }; -const union AnimCmd gUnknown_83A571C[] = +static const union AnimCmd sDeepSandFootprintsAnim_South[] = { ANIMCMD_FRAME(0, 1, .vFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5724[] = +static const union AnimCmd sDeepSandFootprintsAnim_North[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A572C[] = +static const union AnimCmd sDeepSandFootprintsAnim_West[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5734[] = +static const union AnimCmd sDeepSandFootprintsAnim_East[] = { ANIMCMD_FRAME(1, 1, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A573C[] = +static const union AnimCmd *const sAnimTable_DeepSandFootprints[] = { - gUnknown_83A571C, - gUnknown_83A571C, - gUnknown_83A5724, - gUnknown_83A572C, - gUnknown_83A5734, + [DIR_NONE] = sDeepSandFootprintsAnim_South, + [DIR_SOUTH] = sDeepSandFootprintsAnim_South, + [DIR_NORTH] = sDeepSandFootprintsAnim_North, + [DIR_WEST] = sDeepSandFootprintsAnim_West, + [DIR_EAST] = sDeepSandFootprintsAnim_East, }; const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A573C, - .images = gUnknown_83A570C, + .anims = sAnimTable_DeepSandFootprints, + .images = sPicTable_DeepSandFootprints, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateFootprintsTireTracksFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5768[] = +static const struct SpriteFrameImage sPicTable_BikeTireTracks[] = { - overworld_frame(gUnknown_839A588, 2, 2, 0), - overworld_frame(gUnknown_839A588, 2, 2, 1), - overworld_frame(gUnknown_839A588, 2, 2, 2), - overworld_frame(gUnknown_839A588, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 3), }; -const union AnimCmd gUnknown_83A5788[] = +static const union AnimCmd sBikeTireTracksAnim_South[] = { ANIMCMD_FRAME(2, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5790[] = +static const union AnimCmd sBikeTireTracksAnim_North[] = { ANIMCMD_FRAME(2, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5798[] = +static const union AnimCmd sBikeTireTracksAnim_West[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A57A0[] = +static const union AnimCmd sBikeTireTracksAnim_East[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A57A8[] = +static const union AnimCmd sBikeTireTracksAnim_SECornerTurn[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A57B0[] = +static const union AnimCmd sBikeTireTracksAnim_SWCornerTurn[] = { ANIMCMD_FRAME(0, 1, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A57B8[] = +static const union AnimCmd sBikeTireTracksAnim_NWCornerTurn[] = { ANIMCMD_FRAME(3, 1, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A57C0[] = +static const union AnimCmd sBikeTireTracksAnim_NECornerTurn[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A57C8[] = +static const union AnimCmd *const sAnimTable_BikeTireTracks[] = { - gUnknown_83A5788, - gUnknown_83A5788, - gUnknown_83A5790, - gUnknown_83A5798, - gUnknown_83A57A0, - gUnknown_83A57A8, - gUnknown_83A57B0, - gUnknown_83A57B8, - gUnknown_83A57C0, + [DIR_NONE] = sBikeTireTracksAnim_South, + [DIR_SOUTH] = sBikeTireTracksAnim_South, + [DIR_NORTH] = sBikeTireTracksAnim_North, + [DIR_WEST] = sBikeTireTracksAnim_West, + [DIR_EAST] = sBikeTireTracksAnim_East, + [DIR_SOUTHWEST] = sBikeTireTracksAnim_SECornerTurn, + [DIR_SOUTHEAST] = sBikeTireTracksAnim_SWCornerTurn, + [DIR_NORTHWEST] = sBikeTireTracksAnim_NWCornerTurn, + [DIR_NORTHEAST] = sBikeTireTracksAnim_NECornerTurn, }; const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A57C8, - .images = gUnknown_83A5768, + .anims = sAnimTable_BikeTireTracks, + .images = sPicTable_BikeTireTracks, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateFootprintsTireTracksFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5804[] = +static const struct SpriteFrameImage sPicTable_JumpBigSplash[] = { - overworld_frame(gUnknown_839AA48, 2, 2, 0), - overworld_frame(gUnknown_839AA48, 2, 2, 1), - overworld_frame(gUnknown_839AA48, 2, 2, 2), - overworld_frame(gUnknown_839AA48, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 3), }; -const union AnimCmd gUnknown_83A5824[] = +static const union AnimCmd sAnim_JumpBigSplash[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(1, 8), @@ -546,36 +546,36 @@ const union AnimCmd gUnknown_83A5824[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5838[] = +static const union AnimCmd *const sAnimTable_JumpBigSplash[] = { - gUnknown_83A5824, + sAnim_JumpBigSplash, }; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5838, - .images = gUnknown_83A5804, + .anims = sAnimTable_JumpBigSplash, + .images = sPicTable_JumpBigSplash, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80DCCE0, + .callback = UpdateJumpImpactEffect, }; -const struct SpriteFrameImage gUnknown_83A5854[] = +static const struct SpriteFrameImage sPicTable_Splash[] = { - overworld_frame(gUnknown_839AC48, 2, 1, 0), - overworld_frame(gUnknown_839AC48, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 1), }; -const union AnimCmd gUnknown_83A5864[] = +static const union AnimCmd sAnim_Splash_0[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5870[] = +static const union AnimCmd sAnim_Splash_1[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -588,31 +588,31 @@ const union AnimCmd gUnknown_83A5870[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_83A5894[] = +static const union AnimCmd *const sAnimTable_Splash[] = { - gUnknown_83A5864, - gUnknown_83A5870, + sAnim_Splash_0, + sAnim_Splash_1, }; const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, - .anims = gUnknown_83A5894, - .images = gUnknown_83A5854, + .anims = sAnimTable_Splash, + .images = sPicTable_Splash, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateSplashFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A58B4[] = +static const struct SpriteFrameImage sPicTable_JumpSmallSplash[] = { - overworld_frame(gUnknown_839ACC8, 2, 1, 0), - overworld_frame(gUnknown_839ACC8, 2, 1, 1), - overworld_frame(gUnknown_839ACC8, 2, 1, 2), + overworld_frame(gFieldEffectObjectPic_JumpSmallSplash, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_JumpSmallSplash, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_JumpSmallSplash, 2, 1, 2), }; -const union AnimCmd gUnknown_83A58CC[] = +static const union AnimCmd sAnim_JumpSmallSplash[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -620,31 +620,31 @@ const union AnimCmd gUnknown_83A58CC[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A58DC[] = +static const union AnimCmd *const sAnimTable_JumpSmallSplash[] = { - gUnknown_83A58CC, + sAnim_JumpSmallSplash, }; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, - .anims = gUnknown_83A58DC, - .images = gUnknown_83A58B4, + .anims = sAnimTable_JumpSmallSplash, + .images = sPicTable_JumpSmallSplash, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80DCCE0, + .callback = UpdateJumpImpactEffect, }; -const struct SpriteFrameImage gUnknown_83A58F8[] = +static const struct SpriteFrameImage sPicTable_LongGrass[] = { - overworld_frame(gUnknown_8399E08, 2, 2, 0), - overworld_frame(gUnknown_8399E08, 2, 2, 1), - overworld_frame(gUnknown_8399E08, 2, 2, 2), - overworld_frame(gUnknown_8399E08, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 3), }; -const union AnimCmd gUnknown_83A5918[] = +static const union AnimCmd sAnim_LongGrass[] = { ANIMCMD_FRAME(1, 3), ANIMCMD_FRAME(2, 3), @@ -656,33 +656,33 @@ const union AnimCmd gUnknown_83A5918[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5938[] = +static const union AnimCmd *const sAnimTable_LongGrass[] = { - gUnknown_83A5918, + sAnim_LongGrass, }; const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5938, - .images = gUnknown_83A58F8, + .anims = sAnimTable_LongGrass, + .images = sPicTable_LongGrass, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateLongGrassFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5954[] = +static const struct SpriteFrameImage sPicTable_JumpLongGrass[] = { - overworld_frame(gUnknown_8399488, 2, 2, 0), - overworld_frame(gUnknown_8399488, 2, 2, 1), - overworld_frame(gUnknown_8399488, 2, 2, 2), - overworld_frame(gUnknown_8399488, 2, 2, 3), - overworld_frame(gUnknown_8399488, 2, 2, 4), - overworld_frame(gUnknown_8399488, 2, 2, 6), + overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 6), }; -const union AnimCmd gUnknown_83A5984[] = +static const union AnimCmd sAnim_JumpLongGrass[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -693,36 +693,36 @@ const union AnimCmd gUnknown_83A5984[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A59A0[] = +static const union AnimCmd *const sAnimTable_JumpLongGrass[] = { - gUnknown_83A5984, + sAnim_JumpLongGrass, }; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A59A0, - .images = gUnknown_83A5954, + .anims = sAnimTable_JumpLongGrass, + .images = sPicTable_JumpLongGrass, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80DCCE0, + .callback = UpdateJumpImpactEffect, }; -const struct SpriteFrameImage gUnknown_83A59BC[] = +static const struct SpriteFrameImage sPicTable_UnusedGrass[] = { - overworld_frame(gUnknown_8399788, 2, 2, 0), - overworld_frame(gUnknown_8399788, 2, 2, 1), - overworld_frame(gUnknown_8399788, 2, 2, 2), - overworld_frame(gUnknown_8399788, 2, 2, 3), - overworld_frame(gUnknown_8399788, 2, 2, 4), - overworld_frame(gUnknown_8399788, 2, 2, 5), - overworld_frame(gUnknown_8399788, 2, 2, 6), - overworld_frame(gUnknown_8399788, 2, 2, 7), - overworld_frame(gUnknown_8399788, 2, 2, 8), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 5), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 6), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 7), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 8), }; -const union AnimCmd gUnknown_83A5A04[] = +static const union AnimCmd sAnim_UnusedGrass[] = { ANIMCMD_FRAME(0, 10), ANIMCMD_FRAME(1, 4), @@ -736,31 +736,31 @@ const union AnimCmd gUnknown_83A5A04[] = ANIMCMD_JUMP(7), }; -const union AnimCmd *const gUnknown_83A5A2C[] = +static const union AnimCmd *const sAnimTable_UnusedGrass[] = { - gUnknown_83A5A04, + sAnim_UnusedGrass, }; const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5A2C, - .images = gUnknown_83A59BC, + .anims = sAnimTable_UnusedGrass, + .images = sPicTable_UnusedGrass, .affineAnims = gDummySpriteAffineAnimTable, .callback = WaitFieldEffectSpriteAnim, }; -const struct SpriteFrameImage gUnknown_83A5A48[] = +static const struct SpriteFrameImage sPicTable_UnusedGrass2[] = { - overworld_frame(gUnknown_8399C08, 2, 2, 0), - overworld_frame(gUnknown_8399C08, 2, 2, 1), - overworld_frame(gUnknown_8399C08, 2, 2, 2), - overworld_frame(gUnknown_8399C08, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_UnusedGrass2, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_UnusedGrass2, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_UnusedGrass2, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_UnusedGrass2, 2, 2, 3), }; -const union AnimCmd gUnknown_83A5A68[] = +static const union AnimCmd sAnim_UnusedGrass2[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -771,31 +771,31 @@ const union AnimCmd gUnknown_83A5A68[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_83A5A84[] = +static const union AnimCmd *const sAnimTable_UnusedGrass2[] = { - gUnknown_83A5A68, + sAnim_UnusedGrass2, }; const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2 = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5A84, - .images = gUnknown_83A5A48, + .anims = sAnimTable_UnusedGrass2, + .images = sPicTable_UnusedGrass2, .affineAnims = gDummySpriteAffineAnimTable, .callback = WaitFieldEffectSpriteAnim, }; -const struct SpriteFrameImage gUnknown_83A5AA0[] = +static const struct SpriteFrameImage sPicTable_UnusedSand[] = { - overworld_frame(gUnknown_839A788, 2, 2, 0), - overworld_frame(gUnknown_839A788, 2, 2, 1), - overworld_frame(gUnknown_839A788, 2, 2, 2), - overworld_frame(gUnknown_839A788, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_UnusedSand, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_UnusedSand, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_UnusedSand, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_UnusedSand, 2, 2, 3), }; -const union AnimCmd gUnknown_83A5AC0[] = +static const union AnimCmd sAnim_UnusedSand[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -804,30 +804,30 @@ const union AnimCmd gUnknown_83A5AC0[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_83A5AD4[] = +static const union AnimCmd *const sAnimTable_UnusedSand[] = { - gUnknown_83A5AC0, + sAnim_UnusedSand, }; const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5AD4, - .images = gUnknown_83A5AA0, + .anims = sAnimTable_UnusedSand, + .images = sPicTable_UnusedSand, .affineAnims = gDummySpriteAffineAnimTable, .callback = WaitFieldEffectSpriteAnim, }; -const struct SpriteFrameImage gUnknown_83A5AF0[] = +static const struct SpriteFrameImage sPicTable_SandPile[] = { - overworld_frame(gUnknown_839A988, 2, 1, 0), - overworld_frame(gUnknown_839A988, 2, 1, 1), - overworld_frame(gUnknown_839A988, 2, 1, 2), + overworld_frame(gFieldEffectObjectPic_SandPile, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_SandPile, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_SandPile, 2, 1, 2), }; -const union AnimCmd gUnknown_83A5B08[] = +static const union AnimCmd sAnim_SandPile[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -835,31 +835,31 @@ const union AnimCmd gUnknown_83A5B08[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5B18[] = +static const union AnimCmd *const sAnimTable_SandPile[] = { - gUnknown_83A5B08, + sAnim_SandPile, }; const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, - .anims = gUnknown_83A5B18, - .images = gUnknown_83A5AF0, + .anims = sAnimTable_SandPile, + .images = sPicTable_SandPile, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateSandPileFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5B34[] = +static const struct SpriteFrameImage sPicTable_WaterSurfacing[] = { - overworld_frame(gUnknown_839AD88, 2, 2, 0), - overworld_frame(gUnknown_839AD88, 2, 2, 1), - overworld_frame(gUnknown_839AD88, 2, 2, 2), - overworld_frame(gUnknown_839AD88, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_WaterSurfacing, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_WaterSurfacing, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_WaterSurfacing, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_WaterSurfacing, 2, 2, 3), }; -const union AnimCmd gUnknown_83A5B54[] = +static const union AnimCmd sAnim_WaterSurfacing[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -870,23 +870,23 @@ const union AnimCmd gUnknown_83A5B54[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_83A5B70[] = +static const union AnimCmd *const sAnimTable_WaterSurfacing[] = { - gUnknown_83A5B54, + sAnim_WaterSurfacing, }; const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5B70, - .images = gUnknown_83A5B34, + .anims = sAnimTable_WaterSurfacing, + .images = sPicTable_WaterSurfacing, .affineAnims = gDummySpriteAffineAnimTable, .callback = WaitFieldEffectSpriteAnim, }; -const union AffineAnimCmd gUnknown_83A5B8C[] = +const union AffineAnimCmd sAffineAnim_ReflectionDistortion_0[] = { AFFINEANIMCMD_FRAME(-256, 256, 128, 0), AFFINEANIMCMD_FRAME(1, 0, 0, 4), @@ -900,7 +900,7 @@ const union AffineAnimCmd gUnknown_83A5B8C[] = AFFINEANIMCMD_JUMP(1), }; -const union AffineAnimCmd gUnknown_83A5BDC[] = +const union AffineAnimCmd sAffineAnim_ReflectionDistortion_1[] = { AFFINEANIMCMD_FRAME(256, 256, 128, 0), AFFINEANIMCMD_FRAME(-1, 0, 0, 4), @@ -914,10 +914,10 @@ const union AffineAnimCmd gUnknown_83A5BDC[] = AFFINEANIMCMD_JUMP(1), }; -const union AffineAnimCmd *const gUnknown_83A5C2C[] = +const union AffineAnimCmd *const sAffineAnims_ReflectionDistortion[] = { - gUnknown_83A5B8C, - gUnknown_83A5BDC, + sAffineAnim_ReflectionDistortion_0, + sAffineAnim_ReflectionDistortion_1, }; const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion = @@ -927,28 +927,79 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion = .oam = &gDummyOamData, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_83A5C2C, + .affineAnims = sAffineAnims_ReflectionDistortion, .callback = SpriteCallbackDummy, }; -const struct SpriteFrameImage gUnknown_83A5C4C[] = +/* +static const struct SpriteFrameImage sPicTable_Sparkle[] = { + overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 5), +}; + +static const union AnimCmd sAnim_Sparkle[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(5, 8), + ANIMCMD_LOOP(0), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(5, 4), + ANIMCMD_LOOP(3), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(5, 8), + ANIMCMD_END, +}; + +static const union AnimCmd *const sAnimTable_Sparkle[] = +{ + sAnim_Sparkle, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle = { + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_Sparkle, + .images = sPicTable_Sparkle, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = WaitFieldEffectSpriteAnim, +}; +*/ + +static const struct SpriteFrameImage sPicTable_TreeDisguise[] = { - overworld_frame(gUnknown_839B008, 2, 4, 0), - overworld_frame(gUnknown_839B008, 2, 4, 1), - overworld_frame(gUnknown_839B008, 2, 4, 2), - overworld_frame(gUnknown_839B008, 2, 4, 3), - overworld_frame(gUnknown_839B008, 2, 4, 4), - overworld_frame(gUnknown_839B008, 2, 4, 5), - overworld_frame(gUnknown_839B008, 2, 4, 6), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 0), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 1), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 2), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 3), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 4), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 5), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 6), }; -const union AnimCmd gUnknown_83A5C84[] = +static const union AnimCmd sAnim_TreeDisguise[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5C8C[] = +static const union AnimCmd sAnim_TreeDisguiseReveal[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -960,10 +1011,10 @@ const union AnimCmd gUnknown_83A5C8C[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5CAC[] = +static const union AnimCmd *const sAnimTable_TreeDisguise[] = { - gUnknown_83A5C84, - gUnknown_83A5C8C, + sAnim_TreeDisguise, + sAnim_TreeDisguiseReveal, }; const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = @@ -971,30 +1022,30 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_16x32, - .anims = gUnknown_83A5CAC, - .images = gUnknown_83A5C4C, + .anims = sAnimTable_TreeDisguise, + .images = sPicTable_TreeDisguise, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateDisguiseFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5CCC[] = +static const struct SpriteFrameImage sPicTable_MountainDisguise[] = { - overworld_frame(gUnknown_839B708, 2, 4, 0), - overworld_frame(gUnknown_839B708, 2, 4, 1), - overworld_frame(gUnknown_839B708, 2, 4, 2), - overworld_frame(gUnknown_839B708, 2, 4, 3), - overworld_frame(gUnknown_839B708, 2, 4, 4), - overworld_frame(gUnknown_839B708, 2, 4, 5), - overworld_frame(gUnknown_839B708, 2, 4, 6), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 0), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 1), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 2), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 3), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 4), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 5), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 6), }; -const union AnimCmd gUnknown_83A5D04[] = +static const union AnimCmd sAnim_MountainDisguise[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5D0C[] = +static const union AnimCmd sAnim_MountainDisguiseReveal[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -1006,10 +1057,10 @@ const union AnimCmd gUnknown_83A5D0C[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5D2C[] = +static const union AnimCmd *const sAnimTable_MountainDisguise[] = { - gUnknown_83A5D04, - gUnknown_83A5D0C, + sAnim_MountainDisguise, + sAnim_MountainDisguiseReveal, }; const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = @@ -1017,21 +1068,21 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_16x32, - .anims = gUnknown_83A5D2C, - .images = gUnknown_83A5CCC, + .anims = sAnimTable_MountainDisguise, + .images = sPicTable_MountainDisguise, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateDisguiseFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5D4C[] = +static const struct SpriteFrameImage sPicTable_SandDisguisePlaceholder[] = { - overworld_frame(gUnknown_839BE08, 2, 4, 0), - overworld_frame(gUnknown_839BE08, 2, 4, 1), - overworld_frame(gUnknown_839BE08, 2, 4, 2), - overworld_frame(gUnknown_839BE08, 2, 4, 3), - overworld_frame(gUnknown_839BE08, 2, 4, 4), - overworld_frame(gUnknown_839BE08, 2, 4, 5), - overworld_frame(gUnknown_839BE08, 2, 4, 6), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 0), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 1), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 2), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 3), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 4), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 5), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 6), }; const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = @@ -1039,58 +1090,58 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_16x32, - .anims = gUnknown_83A5CAC, - .images = gUnknown_83A5D4C, + .anims = sAnimTable_TreeDisguise, + .images = sPicTable_SandDisguisePlaceholder, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateDisguiseFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5D9C[] = +static const struct SpriteFrameImage sPicTable_Bird[] = { - overworld_frame(gUnknown_839D3C8, 8, 8, 0), - overworld_frame(gUnknown_839D3C8, 8, 8, 1), - overworld_frame(gUnknown_839D3C8, 8, 8, 2), - overworld_frame(gUnknown_839D3C8, 8, 8, 3), - overworld_frame(gUnknown_839D3C8, 8, 8, 4), + overworld_frame(gFieldEffectObjectPic_Bird, 8, 8, 0), + overworld_frame(gFieldEffectObjectPic_Bird, 8, 8, 1), + overworld_frame(gFieldEffectObjectPic_Bird, 8, 8, 2), + overworld_frame(gFieldEffectObjectPic_Bird, 8, 8, 3), + overworld_frame(gFieldEffectObjectPic_Bird, 8, 8, 4), }; -const union AnimCmd gUnknown_83A5DC4[] = +static const union AnimCmd sAnim_Bird_0[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5DCC[] = +static const union AnimCmd sAnim_Bird_1[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5DD4[] = +static const union AnimCmd sAnim_Bird_2[] = { ANIMCMD_FRAME(2, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5DDC[] = +static const union AnimCmd sAnim_Bird_3[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5DE4[] = +static const union AnimCmd sAnim_Bird_4[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5DEC[] = +static const union AnimCmd *const sAnimTable_Bird[] = { - gUnknown_83A5DC4, - gUnknown_83A5DCC, - gUnknown_83A5DD4, - gUnknown_83A5DDC, - gUnknown_83A5DE4, + sAnim_Bird_0, + sAnim_Bird_1, + sAnim_Bird_2, + sAnim_Bird_3, + sAnim_Bird_4, }; const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = @@ -1098,78 +1149,78 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_64x64, - .anims = gUnknown_83A5DEC, - .images = gUnknown_83A5D9C, + .anims = sAnimTable_Bird, + .images = sPicTable_Bird, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -const struct SpriteFrameImage gUnknown_83A5E18[] = +static const struct SpriteFrameImage sPicTable_ShortGrass[] = { - overworld_frame(gUnknown_839A288, 2, 2, 0), - overworld_frame(gUnknown_839A288, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 1), }; -const union AnimCmd gUnknown_83A5E28[] = +static const union AnimCmd sAnim_ShortGrass[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5E34[] = +static const union AnimCmd *const sAnimTable_ShortGrass[] = { - gUnknown_83A5E28, + sAnim_ShortGrass, }; const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5E34, - .images = gUnknown_83A5E18, + .anims = sAnimTable_ShortGrass, + .images = sPicTable_ShortGrass, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateShortGrassFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5E50[] = +static const struct SpriteFrameImage sPicTable_HotSpringsWater[] = { - overworld_frame(gUnknown_839C508, 2, 2, 0), + obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater), }; -const union AnimCmd gUnknown_83A5E58[] = +static const union AnimCmd sAnim_HotSpringsWater[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5E60[] = +static const union AnimCmd *const sAnimTable_HotSpringsWater[] = { - gUnknown_83A5E58, + sAnim_HotSpringsWater, }; const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5E60, - .images = gUnknown_83A5E50, + .anims = sAnimTable_HotSpringsWater, + .images = sPicTable_HotSpringsWater, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateHotSpringsWaterFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5E7C[] = +static const struct SpriteFrameImage sPicTable_AshPuff[] = { - overworld_frame(gUnknown_839C5A8, 2, 2, 0), - overworld_frame(gUnknown_839C5A8, 2, 2, 1), - overworld_frame(gUnknown_839C5A8, 2, 2, 2), - overworld_frame(gUnknown_839C5A8, 2, 2, 3), - overworld_frame(gUnknown_839C5A8, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_AshPuff, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_AshPuff, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_AshPuff, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_AshPuff, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_AshPuff, 2, 2, 4), }; -const union AnimCmd gUnknown_83A5EA4[] = +static const union AnimCmd sAnim_AshPuff[] = { ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(1, 6), @@ -1179,34 +1230,34 @@ const union AnimCmd gUnknown_83A5EA4[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5EBC[] = +static const union AnimCmd *const sAnimTable_AshPuff[] = { - gUnknown_83A5EA4, + sAnim_AshPuff, }; const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x100D, + .paletteTag = FLDEFF_PAL_TAG_ASH, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5EBC, - .images = gUnknown_83A5E7C, + .anims = sAnimTable_AshPuff, + .images = sPicTable_AshPuff, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCB_PopOutOfAsh, }; -const struct SpritePalette gUnknown_83A5ED8 = { .data = gUnknown_839C588, .tag = 0x100D }; +const struct SpritePalette gSpritePalette_Ash = { .data = gFieldEffectPal_Ash, .tag = FLDEFF_PAL_TAG_ASH }; -const struct SpriteFrameImage gUnknown_83A5EE0[] = +static const struct SpriteFrameImage sPicTable_AshLaunch[] = { - overworld_frame(gUnknown_839C828, 2, 2, 0), - overworld_frame(gUnknown_839C828, 2, 2, 1), - overworld_frame(gUnknown_839C828, 2, 2, 2), - overworld_frame(gUnknown_839C828, 2, 2, 3), - overworld_frame(gUnknown_839C828, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 4), }; -const union AnimCmd gUnknown_83A5F08[] = +static const union AnimCmd sAnim_AshLaunch[] = { ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(1, 6), @@ -1216,35 +1267,35 @@ const union AnimCmd gUnknown_83A5F08[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5F20[] = +static const union AnimCmd *const sAnimTable_AshLaunch[] = { - gUnknown_83A5F08, + sAnim_AshLaunch, }; const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x100D, + .paletteTag = FLDEFF_PAL_TAG_ASH, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5F20, - .images = gUnknown_83A5EE0, + .anims = sAnimTable_AshLaunch, + .images = sPicTable_AshLaunch, .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCB_LavaridgeGymWarp, + .callback = SpriteCB_AshLaunch, }; -const struct SpriteFrameImage gUnknown_83A5F3C[] = +static const struct SpriteFrameImage sPicTable_Bubbles[] = { - overworld_frame(gUnknown_839CAA8, 2, 4, 0), - overworld_frame(gUnknown_839CAA8, 2, 4, 1), - overworld_frame(gUnknown_839CAA8, 2, 4, 2), - overworld_frame(gUnknown_839CAA8, 2, 4, 3), - overworld_frame(gUnknown_839CAA8, 2, 4, 4), - overworld_frame(gUnknown_839CAA8, 2, 4, 5), - overworld_frame(gUnknown_839CAA8, 2, 4, 6), - overworld_frame(gUnknown_839CAA8, 2, 4, 7), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 0), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 1), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 2), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 3), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 4), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 5), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 6), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 7), }; -const union AnimCmd gUnknown_83A5F7C[] = +static const union AnimCmd sAnim_Bubbles[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -1257,29 +1308,29 @@ const union AnimCmd gUnknown_83A5F7C[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5FA0[] = +static const union AnimCmd *const sAnimTable_Bubbles[] = { - gUnknown_83A5F7C, + sAnim_Bubbles, }; const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x32, - .anims = gUnknown_83A5FA0, - .images = gUnknown_83A5F3C, + .anims = sAnimTable_Bubbles, + .images = sPicTable_Bubbles, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateBubblesFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5FBC[] = +static const struct SpriteFrameImage sPicTable_SmallSparkle[] = { - overworld_frame(gUnknown_839D2A8, 2, 2, 0), - overworld_frame(gUnknown_839D2A8, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_SmallSparkle, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_SmallSparkle, 2, 2, 1), }; -const union AnimCmd gUnknown_83A5FCC[] = +static const union AnimCmd sAnim_SmallSparkle[] = { ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(1, 5), @@ -1287,20 +1338,20 @@ const union AnimCmd gUnknown_83A5FCC[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5FDC[] = +static const union AnimCmd *const sAnimTable_SmallSparkle[] = { - gUnknown_83A5FCC, + sAnim_SmallSparkle, }; const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x100F, + .paletteTag = FLDEFF_PAL_TAG_SMALL_SPARKLE, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5FDC, - .images = gUnknown_83A5FBC, + .anims = sAnimTable_SmallSparkle, + .images = sPicTable_SmallSparkle, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateSparkleFieldEffect, }; -const struct SpritePalette gUnknown_83A5FF8 = { .data = gUnknown_839D3A8, .tag = 0x100F }; +const struct SpritePalette gSpritePalette_SmallSparkle = { .data = gFieldEffectPal_SmallSparkle, .tag = FLDEFF_PAL_TAG_SMALL_SPARKLE }; diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index d2fcfd9c8..1bf1c7df2 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -14,37 +14,37 @@ const u16 gObjectEventPaletteNull11[16] = {}; const u16 gObjectEventPaletteNull12[16] = {}; const u16 gObjectEventPaletteNull13[16] = {}; const u16 gObjectEventPaletteNull14[16] = {}; -const u32 gObjectEventPic_RedNormal[] = INCBIN_U32("graphics/object_events/pics/people/red_normal.4bpp"); -const u32 gObjectEventPic_RedSurfRun[] = INCBIN_U32("graphics/object_events/pics/people/red_surf_run.4bpp"); -const u32 gObjectEventPic_GreenNormal[] = INCBIN_U32("graphics/object_events/pics/people/green_normal.4bpp"); -const u32 gObjectEventPic_GreenSurfRun[] = INCBIN_U32("graphics/object_events/pics/people/green_surf_run.4bpp"); +const u16 gObjectEventPic_RedNormal[] = INCBIN_U16("graphics/object_events/pics/people/red_normal.4bpp"); +const u16 gObjectEventPic_RedSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/red_surf_run.4bpp"); +const u16 gObjectEventPic_GreenNormal[] = INCBIN_U16("graphics/object_events/pics/people/green_normal.4bpp"); +const u16 gObjectEventPic_GreenSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/green_surf_run.4bpp"); const u16 gUnknown_835E968[] = INCBIN_U16("graphics/object_events/palettes/1.gbapal"); const u16 gUnknown_835E988[] = INCBIN_U16("graphics/object_events/palettes/2.gbapal"); -const u32 gObjectEventPic_RedItem[] = INCBIN_U32("graphics/object_events/pics/people/red_item.4bpp"); -const u32 gObjectEventPic_GreenItem[] = INCBIN_U32("graphics/object_events/pics/people/green_item.4bpp"); -const u32 gObjectEventPic_RedSurf[] = INCBIN_U32("graphics/object_events/pics/people/red_surf.4bpp"); -const u32 gObjectEventPic_GreenSurf[] = INCBIN_U32("graphics/object_events/pics/people/green_surf.4bpp"); -const u32 gObjectEventPic_RedBike[] = INCBIN_U32("graphics/object_events/pics/people/red_bike.4bpp"); -const u32 gObjectEventPic_RedVSSeekerBike[] = INCBIN_U32("graphics/object_events/pics/people/red_vs_seeker_bike.4bpp"); -const u32 gObjectEventPic_GreenBike[] = INCBIN_U32("graphics/object_events/pics/people/green_bike.4bpp"); -const u32 gObjectEventPic_GreenVSSeekerBike[] = INCBIN_U32("graphics/object_events/pics/people/green_vs_seeker_bike.4bpp"); -const u32 gObjectEventPic_RSBrendan[] = INCBIN_U32("graphics/object_events/pics/people/rs_brendan.4bpp"); -const u32 gObjectEventPic_RSMay[] = INCBIN_U32("graphics/object_events/pics/people/rs_may.4bpp"); -const u32 gObjectEventPic_RedFish[] = INCBIN_U32("graphics/object_events/pics/people/red_fish.4bpp"); -const u32 gObjectEventPic_GreenFish[] = INCBIN_U32("graphics/object_events/pics/people/green_fish.4bpp"); -const u32 gObjectEventPic_Pokedex[] = INCBIN_U32("graphics/object_events/pics/misc/pokedex.4bpp"); -const u32 gObjectEventPic_TownMap[] = INCBIN_U32("graphics/object_events/pics/misc/town_map.4bpp"); -const u32 gObjectEventPic_UnusedMan[] = INCBIN_U32("graphics/object_events/pics/people/unused_man.4bpp"); // Unused -const u32 gObjectEventPic_Giovanni[] = INCBIN_U32("graphics/object_events/pics/people/giovanni.4bpp"); -const u32 gObjectEventPic_Blaine[] = INCBIN_U32("graphics/object_events/pics/people/blaine.4bpp"); -const u32 gObjectEventPic_Sabrina[] = INCBIN_U32("graphics/object_events/pics/people/sabrina.4bpp"); -const u32 gObjectEventPic_Daisy[] = INCBIN_U32("graphics/object_events/pics/people/daisy.4bpp"); -const u32 gObjectEventPic_Lorelei[] = INCBIN_U32("graphics/object_events/pics/people/lorelei.4bpp"); -const u32 gObjectEventPic_Erika[] = INCBIN_U32("graphics/object_events/pics/people/erika.4bpp"); -const u32 gObjectEventPic_Koga[] = INCBIN_U32("graphics/object_events/pics/people/koga.4bpp"); -const u32 gObjectEventPic_Brock[] = INCBIN_U32("graphics/object_events/pics/people/brock.4bpp"); -const u32 gObjectEventPic_LtSurge[] = INCBIN_U32("graphics/object_events/pics/people/lt_surge.4bpp"); -const u32 gObjectEventPic_Bill[] = INCBIN_U32("graphics/object_events/pics/people/bill.4bpp"); +const u16 gObjectEventPic_RedItem[] = INCBIN_U16("graphics/object_events/pics/people/red_item.4bpp"); +const u16 gObjectEventPic_GreenItem[] = INCBIN_U16("graphics/object_events/pics/people/green_item.4bpp"); +const u16 gObjectEventPic_RedSurf[] = INCBIN_U16("graphics/object_events/pics/people/red_surf.4bpp"); +const u16 gObjectEventPic_GreenSurf[] = INCBIN_U16("graphics/object_events/pics/people/green_surf.4bpp"); +const u16 gObjectEventPic_RedBike[] = INCBIN_U16("graphics/object_events/pics/people/red_bike.4bpp"); +const u16 gObjectEventPic_RedVSSeekerBike[] = INCBIN_U16("graphics/object_events/pics/people/red_vs_seeker_bike.4bpp"); +const u16 gObjectEventPic_GreenBike[] = INCBIN_U16("graphics/object_events/pics/people/green_bike.4bpp"); +const u16 gObjectEventPic_GreenVSSeekerBike[] = INCBIN_U16("graphics/object_events/pics/people/green_vs_seeker_bike.4bpp"); +const u16 gObjectEventPic_RSBrendan[] = INCBIN_U16("graphics/object_events/pics/people/rs_brendan.4bpp"); +const u16 gObjectEventPic_RSMay[] = INCBIN_U16("graphics/object_events/pics/people/rs_may.4bpp"); +const u16 gObjectEventPic_RedFish[] = INCBIN_U16("graphics/object_events/pics/people/red_fish.4bpp"); +const u16 gObjectEventPic_GreenFish[] = INCBIN_U16("graphics/object_events/pics/people/green_fish.4bpp"); +const u16 gObjectEventPic_Pokedex[] = INCBIN_U16("graphics/object_events/pics/misc/pokedex.4bpp"); +const u16 gObjectEventPic_TownMap[] = INCBIN_U16("graphics/object_events/pics/misc/town_map.4bpp"); +const u16 gObjectEventPic_UnusedMan[] = INCBIN_U16("graphics/object_events/pics/people/unused_man.4bpp"); // Unused +const u16 gObjectEventPic_Giovanni[] = INCBIN_U16("graphics/object_events/pics/people/giovanni.4bpp"); +const u16 gObjectEventPic_Blaine[] = INCBIN_U16("graphics/object_events/pics/people/blaine.4bpp"); +const u16 gObjectEventPic_Sabrina[] = INCBIN_U16("graphics/object_events/pics/people/sabrina.4bpp"); +const u16 gObjectEventPic_Daisy[] = INCBIN_U16("graphics/object_events/pics/people/daisy.4bpp"); +const u16 gObjectEventPic_Lorelei[] = INCBIN_U16("graphics/object_events/pics/people/lorelei.4bpp"); +const u16 gObjectEventPic_Erika[] = INCBIN_U16("graphics/object_events/pics/people/erika.4bpp"); +const u16 gObjectEventPic_Koga[] = INCBIN_U16("graphics/object_events/pics/people/koga.4bpp"); +const u16 gObjectEventPic_Brock[] = INCBIN_U16("graphics/object_events/pics/people/brock.4bpp"); +const u16 gObjectEventPic_LtSurge[] = INCBIN_U16("graphics/object_events/pics/people/lt_surge.4bpp"); +const u16 gObjectEventPic_Bill[] = INCBIN_U16("graphics/object_events/pics/people/bill.4bpp"); const u16 gUnknown_836D828[] = INCBIN_U16("graphics/object_events/palettes/3.gbapal"); const u16 gUnknown_836D848[] = INCBIN_U16("graphics/object_events/palettes/4.gbapal"); const u16 gUnknown_836D868[] = INCBIN_U16("graphics/object_events/palettes/5.gbapal"); @@ -53,194 +53,188 @@ const u16 gUnknown_836D8A8[] = INCBIN_U16("graphics/object_events/palettes/7.gba const u16 gUnknown_836D8C8[] = INCBIN_U16("graphics/object_events/palettes/8.gbapal"); const u16 gUnknown_836D8E8[] = INCBIN_U16("graphics/object_events/palettes/9.gbapal"); const u16 gUnknown_836D908[] = INCBIN_U16("graphics/object_events/palettes/10.gbapal"); -const u32 gObjectEventPic_LittleBoy[] = INCBIN_U32("graphics/object_events/pics/people/little_boy.4bpp"); -const u32 gObjectEventPic_LittleGirl[] = INCBIN_U32("graphics/object_events/pics/people/little_girl.4bpp"); -const u32 gObjectEventPic_SittingBoy[] = INCBIN_U32("graphics/object_events/pics/people/sitting_boy.4bpp"); -const u32 gObjectEventPic_Lass[] = INCBIN_U32("graphics/object_events/pics/people/lass.4bpp"); -const u32 gObjectEventPic_Youngster[] = INCBIN_U32("graphics/object_events/pics/people/youngster.4bpp"); -const u32 gObjectEventPic_Boy[] = INCBIN_U32("graphics/object_events/pics/people/boy.4bpp"); -const u32 gObjectEventPic_Woman1[] = INCBIN_U32("graphics/object_events/pics/people/woman_1.4bpp"); -const u32 gObjectEventPic_Woman3[] = INCBIN_U32("graphics/object_events/pics/people/woman_3.4bpp"); -const u32 gObjectEventPic_BugCatcher[] = INCBIN_U32("graphics/object_events/pics/people/bug_catcher.4bpp"); -const u32 gObjectEventPic_BattleGirl[] = INCBIN_U32("graphics/object_events/pics/people/battle_girl.4bpp"); -const u32 gObjectEventPic_RichBoy[] = INCBIN_U32("graphics/object_events/pics/people/rich_boy.4bpp"); // Unused -const u32 gObjectEventPic_FatMan[] = INCBIN_U32("graphics/object_events/pics/people/fat_man.4bpp"); -const u32 gObjectEventPic_BaldingMan[] = INCBIN_U32("graphics/object_events/pics/people/balding_man.4bpp"); -const u32 gObjectEventPic_Woman2[] = INCBIN_U32("graphics/object_events/pics/people/woman_2.4bpp"); -const u32 gObjectEventPic_OldMan1[] = INCBIN_U32("graphics/object_events/pics/people/old_man_1.4bpp"); -const u32 gObjectEventPic_OldManLyingDown[] = INCBIN_U32("graphics/object_events/pics/people/old_man_lying_down.4bpp"); -const u32 gObjectEventPic_WorkerM[] = INCBIN_U32("graphics/object_events/pics/people/worker_m.4bpp"); -const u32 gObjectEventPic_WorkerF[] = INCBIN_U32("graphics/object_events/pics/people/worker_f.4bpp"); -const u32 gObjectEventPic_Beauty[] = INCBIN_U32("graphics/object_events/pics/people/beauty.4bpp"); -const u32 gObjectEventPic_Chef[] = INCBIN_U32("graphics/object_events/pics/people/chef.4bpp"); -const u32 gObjectEventPic_OldMan2[] = INCBIN_U32("graphics/object_events/pics/people/old_man_2.4bpp"); -const u32 gObjectEventPic_OldWoman[] = INCBIN_U32("graphics/object_events/pics/people/old_woman.4bpp"); -const u32 gObjectEventPic_Camper[] = INCBIN_U32("graphics/object_events/pics/people/camper.4bpp"); -const u32 gObjectEventPic_Picnicker[] = INCBIN_U32("graphics/object_events/pics/people/picnicker.4bpp"); -const u32 gObjectEventPic_CooltrainerM[] = INCBIN_U32("graphics/object_events/pics/people/cooltrainer_m.4bpp"); -const u32 gObjectEventPic_CooltrainerF[] = INCBIN_U32("graphics/object_events/pics/people/cooltrainer_f.4bpp"); -const u32 gObjectEventPic_Psyduck[] = INCBIN_U32("graphics/object_events/pics/pokemon/psyduck.4bpp"); -const u32 gObjectEventPic_SuperNerd[] = INCBIN_U32("graphics/object_events/pics/people/super_nerd.4bpp"); -const u32 gObjectEventPic_Channeler[] = INCBIN_U32("graphics/object_events/pics/people/channeler.4bpp"); -const u32 gObjectEventPic_RocketF[] = INCBIN_U32("graphics/object_events/pics/people/rocket_f.4bpp"); -const u32 gObjectEventPic_SwimmerMWater[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_m_water.4bpp"); -const u32 gObjectEventPic_SwimmerFWater[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_f_water.4bpp"); -const u32 gObjectEventPic_SwimmerMLand[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_m_land.4bpp"); -const u32 gObjectEventPic_SwimmerFLand[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_f_land.4bpp"); -const u32 gObjectEventPic_Blackbelt[] = INCBIN_U32("graphics/object_events/pics/people/blackbelt.4bpp"); -const u32 gObjectEventPic_Scientist[] = INCBIN_U32("graphics/object_events/pics/people/scientist.4bpp"); -const u32 gObjectEventPic_Gentleman[] = INCBIN_U32("graphics/object_events/pics/people/gentleman.4bpp"); -const u32 gObjectEventPic_Sailor[] = INCBIN_U32("graphics/object_events/pics/people/sailor.4bpp"); -const u32 gObjectEventPic_Captain[] = INCBIN_U32("graphics/object_events/pics/people/captain.4bpp"); -const u32 gObjectEventPic_Fisher[] = INCBIN_U32("graphics/object_events/pics/people/fisher.4bpp"); -const u32 gObjectEventPic_TeachyTVHost[] = INCBIN_U32("graphics/object_events/pics/people/teachy_tv_host.4bpp"); -const u32 gObjectEventPic_UnusedWoman[] = INCBIN_U32("graphics/object_events/pics/people/unused_woman.4bpp"); -const u32 gObjectEventPic_TuberF[] = INCBIN_U32("graphics/object_events/pics/people/tuber_f.4bpp"); -const u32 gObjectEventPic_TuberMWater[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m_water.4bpp"); -const u32 gObjectEventPic_TuberMLand[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m_land.4bpp"); -const u32 gObjectEventPic_Hiker[] = INCBIN_U32("graphics/object_events/pics/people/hiker.4bpp"); -const u32 gObjectEventPic_Biker[] = INCBIN_U32("graphics/object_events/pics/people/biker.4bpp"); -const u32 gObjectEventPic_GymGuy[] = INCBIN_U32("graphics/object_events/pics/people/gym_guy.4bpp"); -const u32 gObjectEventPic_Man[] = INCBIN_U32("graphics/object_events/pics/people/man.4bpp"); -const u32 gObjectEventPic_Rocker[] = INCBIN_U32("graphics/object_events/pics/people/rocker.4bpp"); -const u32 gObjectEventPic_ProfOak[] = INCBIN_U32("graphics/object_events/pics/people/prof_oak.4bpp"); -const u32 gObjectEventPic_Blue[] = INCBIN_U32("graphics/object_events/pics/people/blue.4bpp"); -const u32 gObjectEventPic_Nurse[] = INCBIN_U32("graphics/object_events/pics/people/nurse.4bpp"); -const u32 gObjectEventPic_CableClubReceptionist[] = INCBIN_U32("graphics/object_events/pics/people/cable_club_receptionist.4bpp"); -const u32 gObjectEventPic_UnionRoomReceptionist[] = INCBIN_U32("graphics/object_events/pics/people/union_room_receptionist.4bpp"); -const u32 gObjectEventPic_UnusedMaleReceptionist[] = INCBIN_U32("graphics/object_events/pics/people/unused_male_receptionist.4bpp"); -const u32 gObjectEventPic_ItemBall[] = INCBIN_U32("graphics/object_events/pics/misc/item_ball.4bpp"); -const u32 gObjectEventPic_MrFuji[] = INCBIN_U32("graphics/object_events/pics/people/mr_fuji.4bpp"); -const u32 gObjectEventPic_Bruno[] = INCBIN_U32("graphics/object_events/pics/people/bruno.4bpp"); -const u32 gObjectEventPic_Clerk[] = INCBIN_U32("graphics/object_events/pics/people/clerk.4bpp"); -const u32 gObjectEventPic_MGDeliveryman[] = INCBIN_U32("graphics/object_events/pics/people/mg_deliveryman.4bpp"); -const u32 gObjectEventPic_TrainerTowerDude[] = INCBIN_U32("graphics/object_events/pics/people/trainer_tower_dude.4bpp"); -const u32 gObjectEventPic_Cameraman[] = INCBIN_U32("graphics/object_events/pics/people/cameraman.4bpp"); // Unused -const u32 gObjectEventPic_RocketM[] = INCBIN_U32("graphics/object_events/pics/people/rocket_m.4bpp"); -const u32 gObjectEventPic_Celio[] = INCBIN_U32("graphics/object_events/pics/people/celio.4bpp"); -const u32 gObjectEventPic_Lapras[] = INCBIN_U32("graphics/object_events/pics/pokemon/lapras.4bpp"); -const u32 gObjectEventPic_Zapdos[] = INCBIN_U32("graphics/object_events/pics/pokemon/zapdos.4bpp"); -const u32 gObjectEventPic_Moltres[] = INCBIN_U32("graphics/object_events/pics/pokemon/moltres.4bpp"); -const u32 gObjectEventPic_Articuno[] = INCBIN_U32("graphics/object_events/pics/pokemon/articuno.4bpp"); -const u32 gObjectEventPic_Mewtwo[] = INCBIN_U32("graphics/object_events/pics/pokemon/mewtwo.4bpp"); -const u32 gObjectEventPic_Mew[] = INCBIN_U32("graphics/object_events/pics/pokemon/mew.4bpp"); -const u32 gObjectEventPic_Entei[] = INCBIN_U32("graphics/object_events/pics/pokemon/entei.4bpp"); -const u32 gObjectEventPic_Raikou[] = INCBIN_U32("graphics/object_events/pics/pokemon/raikou.4bpp"); -const u32 gObjectEventPic_Suicune[] = INCBIN_U32("graphics/object_events/pics/pokemon/suicune.4bpp"); -const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/object_events/pics/pokemon/lugia.4bpp"); -const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/object_events/pics/pokemon/ho_oh.4bpp"); -const u32 gObjectEventPic_Celebi[] = INCBIN_U32("graphics/object_events/pics/pokemon/celebi.4bpp"); -const u32 gObjectEventPic_DeoxysD[] = INCBIN_U32("graphics/object_events/pics/pokemon/deoxys_d.4bpp"); -const u32 gObjectEventPic_DeoxysA[] = INCBIN_U32("graphics/object_events/pics/pokemon/deoxys_a.4bpp"); -const u32 gObjectEventPic_DeoxysN[] = INCBIN_U32("graphics/object_events/pics/pokemon/deoxys_n.4bpp"); -const u32 gObjectEventPic_Agatha[] = INCBIN_U32("graphics/object_events/pics/people/agatha.4bpp"); -const u32 gObjectEventPic_Misty[] = INCBIN_U32("graphics/object_events/pics/people/misty.4bpp"); -const u32 gObjectEventPic_Lance[] = INCBIN_U32("graphics/object_events/pics/people/lance.4bpp"); -const u32 gObjectEventPic_GBAKid[] = INCBIN_U32("graphics/object_events/pics/people/gba_kid.4bpp"); -const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/object_events/pics/people/mom.4bpp"); -const u32 gObjectEventPic_Pidgeot[] = INCBIN_U32("graphics/object_events/pics/pokemon/pidgeot.4bpp"); -const u32 gObjectEventPic_Omanyte[] = INCBIN_U32("graphics/object_events/pics/pokemon/omanyte.4bpp"); -const u32 gObjectEventPic_Kangaskhan[] = INCBIN_U32("graphics/object_events/pics/pokemon/kangaskhan.4bpp"); -const u32 gObjectEventPic_NidoranF[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidoran_f.4bpp"); -const u32 gObjectEventPic_NidoranM[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidoran_m.4bpp"); -const u32 gObjectEventPic_Nidorino[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidorino.4bpp"); -const u32 gObjectEventPic_Meowth[] = INCBIN_U32("graphics/object_events/pics/pokemon/meowth.4bpp"); -const u32 gObjectEventPic_Seel[] = INCBIN_U32("graphics/object_events/pics/pokemon/seel.4bpp"); -const u32 gObjectEventPic_Voltorb[] = INCBIN_U32("graphics/object_events/pics/pokemon/voltorb.4bpp"); -const u32 gObjectEventPic_Slowpoke[] = INCBIN_U32("graphics/object_events/pics/pokemon/slowpoke.4bpp"); -const u32 gObjectEventPic_Slowbro[] = INCBIN_U32("graphics/object_events/pics/pokemon/slowbro.4bpp"); -const u32 gObjectEventPic_Machop[] = INCBIN_U32("graphics/object_events/pics/pokemon/machop.4bpp"); -const u32 gObjectEventPic_Wigglytuff[] = INCBIN_U32("graphics/object_events/pics/pokemon/wigglytuff.4bpp"); -const u32 gObjectEventPic_Doduo[] = INCBIN_U32("graphics/object_events/pics/pokemon/doduo.4bpp"); -const u32 gObjectEventPic_Fearow[] = INCBIN_U32("graphics/object_events/pics/pokemon/fearow.4bpp"); -const u32 gObjectEventPic_Kabuto[] = INCBIN_U32("graphics/object_events/pics/pokemon/kabuto.4bpp"); -const u32 gObjectEventPic_Machoke[] = INCBIN_U32("graphics/object_events/pics/pokemon/machoke.4bpp"); -const u32 gObjectEventPic_Snorlax[] = INCBIN_U32("graphics/object_events/pics/pokemon/snorlax.4bpp"); -const u32 gObjectEventPic_Spearow[] = INCBIN_U32("graphics/object_events/pics/pokemon/spearow.4bpp"); -const u32 gObjectEventPic_Cubone[] = INCBIN_U32("graphics/object_events/pics/pokemon/cubone.4bpp"); -const u32 gObjectEventPic_Poliwrath[] = INCBIN_U32("graphics/object_events/pics/pokemon/poliwrath.4bpp"); -const u32 gObjectEventPic_Chansey[] = INCBIN_U32("graphics/object_events/pics/pokemon/chansey.4bpp"); -const u32 gObjectEventPic_Pikachu[] = INCBIN_U32("graphics/object_events/pics/pokemon/pikachu.4bpp"); -const u32 gObjectEventPic_Jigglypuff[] = INCBIN_U32("graphics/object_events/pics/pokemon/jigglypuff.4bpp"); -const u32 gObjectEventPic_Pidgey[] = INCBIN_U32("graphics/object_events/pics/pokemon/pidgey.4bpp"); -const u32 gObjectEventPic_Clefairy[] = INCBIN_U32("graphics/object_events/pics/pokemon/clefairy.4bpp"); -const u32 gObjectEventPic_CutTree[] = INCBIN_U32("graphics/object_events/pics/misc/cut_tree.4bpp"); -const u32 gObjectEventPic_RockSmashRock[] = INCBIN_U32("graphics/object_events/pics/misc/rock_smash_rock.4bpp"); -const u32 gObjectEventPic_StrengthBoulder[] = INCBIN_U32("graphics/object_events/pics/misc/strength_boulder.4bpp"); -const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/object_events/pics/misc/fossil.4bpp"); -const u32 gObjectEventPic_Ruby[] = INCBIN_U32("graphics/object_events/pics/misc/ruby.4bpp"); -const u32 gObjectEventPic_Sapphire[] = INCBIN_U32("graphics/object_events/pics/misc/sapphire.4bpp"); -const u32 gObjectEventPic_OldAmber[] = INCBIN_U32("graphics/object_events/pics/misc/old_amber.4bpp"); -const u32 gObjectEventPic_GymSign[] = INCBIN_U32("graphics/object_events/pics/misc/gym_sign.4bpp"); -const u32 gObjectEventPic_Sign[] = INCBIN_U32("graphics/object_events/pics/misc/sign.4bpp"); -const u32 gObjectEventPic_WoodenSign[] = INCBIN_U32("graphics/object_events/pics/misc/wooden_sign.4bpp"); -const u32 gObjectEventPic_Clipboard[] = INCBIN_U32("graphics/object_events/pics/misc/clipboard.4bpp"); +const u16 gObjectEventPic_LittleBoy[] = INCBIN_U16("graphics/object_events/pics/people/little_boy.4bpp"); +const u16 gObjectEventPic_LittleGirl[] = INCBIN_U16("graphics/object_events/pics/people/little_girl.4bpp"); +const u16 gObjectEventPic_SittingBoy[] = INCBIN_U16("graphics/object_events/pics/people/sitting_boy.4bpp"); +const u16 gObjectEventPic_Lass[] = INCBIN_U16("graphics/object_events/pics/people/lass.4bpp"); +const u16 gObjectEventPic_Youngster[] = INCBIN_U16("graphics/object_events/pics/people/youngster.4bpp"); +const u16 gObjectEventPic_Boy[] = INCBIN_U16("graphics/object_events/pics/people/boy.4bpp"); +const u16 gObjectEventPic_Woman1[] = INCBIN_U16("graphics/object_events/pics/people/woman_1.4bpp"); +const u16 gObjectEventPic_Woman3[] = INCBIN_U16("graphics/object_events/pics/people/woman_3.4bpp"); +const u16 gObjectEventPic_BugCatcher[] = INCBIN_U16("graphics/object_events/pics/people/bug_catcher.4bpp"); +const u16 gObjectEventPic_BattleGirl[] = INCBIN_U16("graphics/object_events/pics/people/battle_girl.4bpp"); +const u16 gObjectEventPic_RichBoy[] = INCBIN_U16("graphics/object_events/pics/people/rich_boy.4bpp"); // Unused +const u16 gObjectEventPic_FatMan[] = INCBIN_U16("graphics/object_events/pics/people/fat_man.4bpp"); +const u16 gObjectEventPic_BaldingMan[] = INCBIN_U16("graphics/object_events/pics/people/balding_man.4bpp"); +const u16 gObjectEventPic_Woman2[] = INCBIN_U16("graphics/object_events/pics/people/woman_2.4bpp"); +const u16 gObjectEventPic_OldMan1[] = INCBIN_U16("graphics/object_events/pics/people/old_man_1.4bpp"); +const u16 gObjectEventPic_OldManLyingDown[] = INCBIN_U16("graphics/object_events/pics/people/old_man_lying_down.4bpp"); +const u16 gObjectEventPic_WorkerM[] = INCBIN_U16("graphics/object_events/pics/people/worker_m.4bpp"); +const u16 gObjectEventPic_WorkerF[] = INCBIN_U16("graphics/object_events/pics/people/worker_f.4bpp"); +const u16 gObjectEventPic_Beauty[] = INCBIN_U16("graphics/object_events/pics/people/beauty.4bpp"); +const u16 gObjectEventPic_Chef[] = INCBIN_U16("graphics/object_events/pics/people/chef.4bpp"); +const u16 gObjectEventPic_OldMan2[] = INCBIN_U16("graphics/object_events/pics/people/old_man_2.4bpp"); +const u16 gObjectEventPic_OldWoman[] = INCBIN_U16("graphics/object_events/pics/people/old_woman.4bpp"); +const u16 gObjectEventPic_Camper[] = INCBIN_U16("graphics/object_events/pics/people/camper.4bpp"); +const u16 gObjectEventPic_Picnicker[] = INCBIN_U16("graphics/object_events/pics/people/picnicker.4bpp"); +const u16 gObjectEventPic_CooltrainerM[] = INCBIN_U16("graphics/object_events/pics/people/cooltrainer_m.4bpp"); +const u16 gObjectEventPic_CooltrainerF[] = INCBIN_U16("graphics/object_events/pics/people/cooltrainer_f.4bpp"); +const u16 gObjectEventPic_Psyduck[] = INCBIN_U16("graphics/object_events/pics/pokemon/psyduck.4bpp"); +const u16 gObjectEventPic_SuperNerd[] = INCBIN_U16("graphics/object_events/pics/people/super_nerd.4bpp"); +const u16 gObjectEventPic_Channeler[] = INCBIN_U16("graphics/object_events/pics/people/channeler.4bpp"); +const u16 gObjectEventPic_RocketF[] = INCBIN_U16("graphics/object_events/pics/people/rocket_f.4bpp"); +const u16 gObjectEventPic_SwimmerMWater[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_m_water.4bpp"); +const u16 gObjectEventPic_SwimmerFWater[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_f_water.4bpp"); +const u16 gObjectEventPic_SwimmerMLand[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_m_land.4bpp"); +const u16 gObjectEventPic_SwimmerFLand[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_f_land.4bpp"); +const u16 gObjectEventPic_Blackbelt[] = INCBIN_U16("graphics/object_events/pics/people/blackbelt.4bpp"); +const u16 gObjectEventPic_Scientist[] = INCBIN_U16("graphics/object_events/pics/people/scientist.4bpp"); +const u16 gObjectEventPic_Gentleman[] = INCBIN_U16("graphics/object_events/pics/people/gentleman.4bpp"); +const u16 gObjectEventPic_Sailor[] = INCBIN_U16("graphics/object_events/pics/people/sailor.4bpp"); +const u16 gObjectEventPic_Captain[] = INCBIN_U16("graphics/object_events/pics/people/captain.4bpp"); +const u16 gObjectEventPic_Fisher[] = INCBIN_U16("graphics/object_events/pics/people/fisher.4bpp"); +const u16 gObjectEventPic_TeachyTVHost[] = INCBIN_U16("graphics/object_events/pics/people/teachy_tv_host.4bpp"); +const u16 gObjectEventPic_UnusedWoman[] = INCBIN_U16("graphics/object_events/pics/people/unused_woman.4bpp"); +const u16 gObjectEventPic_TuberF[] = INCBIN_U16("graphics/object_events/pics/people/tuber_f.4bpp"); +const u16 gObjectEventPic_TuberMWater[] = INCBIN_U16("graphics/object_events/pics/people/tuber_m_water.4bpp"); +const u16 gObjectEventPic_TuberMLand[] = INCBIN_U16("graphics/object_events/pics/people/tuber_m_land.4bpp"); +const u16 gObjectEventPic_Hiker[] = INCBIN_U16("graphics/object_events/pics/people/hiker.4bpp"); +const u16 gObjectEventPic_Biker[] = INCBIN_U16("graphics/object_events/pics/people/biker.4bpp"); +const u16 gObjectEventPic_GymGuy[] = INCBIN_U16("graphics/object_events/pics/people/gym_guy.4bpp"); +const u16 gObjectEventPic_Man[] = INCBIN_U16("graphics/object_events/pics/people/man.4bpp"); +const u16 gObjectEventPic_Rocker[] = INCBIN_U16("graphics/object_events/pics/people/rocker.4bpp"); +const u16 gObjectEventPic_ProfOak[] = INCBIN_U16("graphics/object_events/pics/people/prof_oak.4bpp"); +const u16 gObjectEventPic_Blue[] = INCBIN_U16("graphics/object_events/pics/people/blue.4bpp"); +const u16 gObjectEventPic_Nurse[] = INCBIN_U16("graphics/object_events/pics/people/nurse.4bpp"); +const u16 gObjectEventPic_CableClubReceptionist[] = INCBIN_U16("graphics/object_events/pics/people/cable_club_receptionist.4bpp"); +const u16 gObjectEventPic_UnionRoomReceptionist[] = INCBIN_U16("graphics/object_events/pics/people/union_room_receptionist.4bpp"); +const u16 gObjectEventPic_UnusedMaleReceptionist[] = INCBIN_U16("graphics/object_events/pics/people/unused_male_receptionist.4bpp"); +const u16 gObjectEventPic_ItemBall[] = INCBIN_U16("graphics/object_events/pics/misc/item_ball.4bpp"); +const u16 gObjectEventPic_MrFuji[] = INCBIN_U16("graphics/object_events/pics/people/mr_fuji.4bpp"); +const u16 gObjectEventPic_Bruno[] = INCBIN_U16("graphics/object_events/pics/people/bruno.4bpp"); +const u16 gObjectEventPic_Clerk[] = INCBIN_U16("graphics/object_events/pics/people/clerk.4bpp"); +const u16 gObjectEventPic_MGDeliveryman[] = INCBIN_U16("graphics/object_events/pics/people/mg_deliveryman.4bpp"); +const u16 gObjectEventPic_TrainerTowerDude[] = INCBIN_U16("graphics/object_events/pics/people/trainer_tower_dude.4bpp"); +const u16 gObjectEventPic_Cameraman[] = INCBIN_U16("graphics/object_events/pics/people/cameraman.4bpp"); // Unused +const u16 gObjectEventPic_RocketM[] = INCBIN_U16("graphics/object_events/pics/people/rocket_m.4bpp"); +const u16 gObjectEventPic_Celio[] = INCBIN_U16("graphics/object_events/pics/people/celio.4bpp"); +const u16 gObjectEventPic_Lapras[] = INCBIN_U16("graphics/object_events/pics/pokemon/lapras.4bpp"); +const u16 gObjectEventPic_Zapdos[] = INCBIN_U16("graphics/object_events/pics/pokemon/zapdos.4bpp"); +const u16 gObjectEventPic_Moltres[] = INCBIN_U16("graphics/object_events/pics/pokemon/moltres.4bpp"); +const u16 gObjectEventPic_Articuno[] = INCBIN_U16("graphics/object_events/pics/pokemon/articuno.4bpp"); +const u16 gObjectEventPic_Mewtwo[] = INCBIN_U16("graphics/object_events/pics/pokemon/mewtwo.4bpp"); +const u16 gObjectEventPic_Mew[] = INCBIN_U16("graphics/object_events/pics/pokemon/mew.4bpp"); +const u16 gObjectEventPic_Entei[] = INCBIN_U16("graphics/object_events/pics/pokemon/entei.4bpp"); +const u16 gObjectEventPic_Raikou[] = INCBIN_U16("graphics/object_events/pics/pokemon/raikou.4bpp"); +const u16 gObjectEventPic_Suicune[] = INCBIN_U16("graphics/object_events/pics/pokemon/suicune.4bpp"); +const u16 gObjectEventPic_Lugia[] = INCBIN_U16("graphics/object_events/pics/pokemon/lugia.4bpp"); +const u16 gObjectEventPic_HoOh[] = INCBIN_U16("graphics/object_events/pics/pokemon/ho_oh.4bpp"); +const u16 gObjectEventPic_Celebi[] = INCBIN_U16("graphics/object_events/pics/pokemon/celebi.4bpp"); +const u16 gObjectEventPic_DeoxysD[] = INCBIN_U16("graphics/object_events/pics/pokemon/deoxys_d.4bpp"); +const u16 gObjectEventPic_DeoxysA[] = INCBIN_U16("graphics/object_events/pics/pokemon/deoxys_a.4bpp"); +const u16 gObjectEventPic_DeoxysN[] = INCBIN_U16("graphics/object_events/pics/pokemon/deoxys_n.4bpp"); +const u16 gObjectEventPic_Agatha[] = INCBIN_U16("graphics/object_events/pics/people/agatha.4bpp"); +const u16 gObjectEventPic_Misty[] = INCBIN_U16("graphics/object_events/pics/people/misty.4bpp"); +const u16 gObjectEventPic_Lance[] = INCBIN_U16("graphics/object_events/pics/people/lance.4bpp"); +const u16 gObjectEventPic_GBAKid[] = INCBIN_U16("graphics/object_events/pics/people/gba_kid.4bpp"); +const u16 gObjectEventPic_Mom[] = INCBIN_U16("graphics/object_events/pics/people/mom.4bpp"); +const u16 gObjectEventPic_Pidgeot[] = INCBIN_U16("graphics/object_events/pics/pokemon/pidgeot.4bpp"); +const u16 gObjectEventPic_Omanyte[] = INCBIN_U16("graphics/object_events/pics/pokemon/omanyte.4bpp"); +const u16 gObjectEventPic_Kangaskhan[] = INCBIN_U16("graphics/object_events/pics/pokemon/kangaskhan.4bpp"); +const u16 gObjectEventPic_NidoranF[] = INCBIN_U16("graphics/object_events/pics/pokemon/nidoran_f.4bpp"); +const u16 gObjectEventPic_NidoranM[] = INCBIN_U16("graphics/object_events/pics/pokemon/nidoran_m.4bpp"); +const u16 gObjectEventPic_Nidorino[] = INCBIN_U16("graphics/object_events/pics/pokemon/nidorino.4bpp"); +const u16 gObjectEventPic_Meowth[] = INCBIN_U16("graphics/object_events/pics/pokemon/meowth.4bpp"); +const u16 gObjectEventPic_Seel[] = INCBIN_U16("graphics/object_events/pics/pokemon/seel.4bpp"); +const u16 gObjectEventPic_Voltorb[] = INCBIN_U16("graphics/object_events/pics/pokemon/voltorb.4bpp"); +const u16 gObjectEventPic_Slowpoke[] = INCBIN_U16("graphics/object_events/pics/pokemon/slowpoke.4bpp"); +const u16 gObjectEventPic_Slowbro[] = INCBIN_U16("graphics/object_events/pics/pokemon/slowbro.4bpp"); +const u16 gObjectEventPic_Machop[] = INCBIN_U16("graphics/object_events/pics/pokemon/machop.4bpp"); +const u16 gObjectEventPic_Wigglytuff[] = INCBIN_U16("graphics/object_events/pics/pokemon/wigglytuff.4bpp"); +const u16 gObjectEventPic_Doduo[] = INCBIN_U16("graphics/object_events/pics/pokemon/doduo.4bpp"); +const u16 gObjectEventPic_Fearow[] = INCBIN_U16("graphics/object_events/pics/pokemon/fearow.4bpp"); +const u16 gObjectEventPic_Kabuto[] = INCBIN_U16("graphics/object_events/pics/pokemon/kabuto.4bpp"); +const u16 gObjectEventPic_Machoke[] = INCBIN_U16("graphics/object_events/pics/pokemon/machoke.4bpp"); +const u16 gObjectEventPic_Snorlax[] = INCBIN_U16("graphics/object_events/pics/pokemon/snorlax.4bpp"); +const u16 gObjectEventPic_Spearow[] = INCBIN_U16("graphics/object_events/pics/pokemon/spearow.4bpp"); +const u16 gObjectEventPic_Cubone[] = INCBIN_U16("graphics/object_events/pics/pokemon/cubone.4bpp"); +const u16 gObjectEventPic_Poliwrath[] = INCBIN_U16("graphics/object_events/pics/pokemon/poliwrath.4bpp"); +const u16 gObjectEventPic_Chansey[] = INCBIN_U16("graphics/object_events/pics/pokemon/chansey.4bpp"); +const u16 gObjectEventPic_Pikachu[] = INCBIN_U16("graphics/object_events/pics/pokemon/pikachu.4bpp"); +const u16 gObjectEventPic_Jigglypuff[] = INCBIN_U16("graphics/object_events/pics/pokemon/jigglypuff.4bpp"); +const u16 gObjectEventPic_Pidgey[] = INCBIN_U16("graphics/object_events/pics/pokemon/pidgey.4bpp"); +const u16 gObjectEventPic_Clefairy[] = INCBIN_U16("graphics/object_events/pics/pokemon/clefairy.4bpp"); +const u16 gObjectEventPic_CutTree[] = INCBIN_U16("graphics/object_events/pics/misc/cut_tree.4bpp"); +const u16 gObjectEventPic_RockSmashRock[] = INCBIN_U16("graphics/object_events/pics/misc/rock_smash_rock.4bpp"); +const u16 gObjectEventPic_StrengthBoulder[] = INCBIN_U16("graphics/object_events/pics/misc/strength_boulder.4bpp"); +const u16 gObjectEventPic_Fossil[] = INCBIN_U16("graphics/object_events/pics/misc/fossil.4bpp"); +const u16 gObjectEventPic_Ruby[] = INCBIN_U16("graphics/object_events/pics/misc/ruby.4bpp"); +const u16 gObjectEventPic_Sapphire[] = INCBIN_U16("graphics/object_events/pics/misc/sapphire.4bpp"); +const u16 gObjectEventPic_OldAmber[] = INCBIN_U16("graphics/object_events/pics/misc/old_amber.4bpp"); +const u16 gObjectEventPic_GymSign[] = INCBIN_U16("graphics/object_events/pics/misc/gym_sign.4bpp"); +const u16 gObjectEventPic_Sign[] = INCBIN_U16("graphics/object_events/pics/misc/sign.4bpp"); +const u16 gObjectEventPic_WoodenSign[] = INCBIN_U16("graphics/object_events/pics/misc/wooden_sign.4bpp"); +const u16 gObjectEventPic_Clipboard[] = INCBIN_U16("graphics/object_events/pics/misc/clipboard.4bpp"); const u16 gUnknown_8394EA8[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal"); -const u32 gObjectEventPic_BirthIslandStone[] = INCBIN_U32("graphics/object_events/pics/misc/birth_island_stone.4bpp"); -const u32 gObjectEventPic_LaprasDoll[] = INCBIN_U32("graphics/object_events/pics/misc/lapras_doll.4bpp"); +const u16 gObjectEventPic_BirthIslandStone[] = INCBIN_U16("graphics/object_events/pics/misc/birth_island_stone.4bpp"); +const u16 gObjectEventPic_LaprasDoll[] = INCBIN_U16("graphics/object_events/pics/misc/lapras_doll.4bpp"); const u16 gUnknown_83952C8[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal"); -const u32 gObjectEventPic_Seagallop[] = INCBIN_U32("graphics/object_events/pics/misc/seagallop.4bpp"); +const u16 gObjectEventPic_Seagallop[] = INCBIN_U16("graphics/object_events/pics/misc/seagallop.4bpp"); const u16 gUnknown_8395AE8[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal"); -const u32 gObjectEventPic_SSAnne[] = INCBIN_U32("graphics/object_events/pics/misc/ss_anne.4bpp"); -const u32 gObjectEventPic_SurfBlob[] = INCBIN_U32("graphics/object_events/pics/misc/surf_blob.4bpp"); -const u32 gObjectEventPic_Policeman[] = INCBIN_U32("graphics/object_events/pics/people/policeman.4bpp"); +const u16 gObjectEventPic_SSAnne[] = INCBIN_U16("graphics/object_events/pics/misc/ss_anne.4bpp"); +const u16 gObjectEventPic_SurfBlob[] = INCBIN_U16("graphics/object_events/pics/misc/surf_blob.4bpp"); +const u16 gObjectEventPic_Policeman[] = INCBIN_U16("graphics/object_events/pics/people/policeman.4bpp"); const u16 gUnknown_8398008[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal"); const u16 gUnknown_8398028[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal"); -const u32 gSpriteImageGfx_FieldShadowS[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_small.4bpp"); -const u32 gSpriteImageGfx_FieldShadowM[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_medium.4bpp"); -const u32 gSpriteImageGfx_FieldShadowL[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_large.4bpp"); -const u32 gSpriteImageGfx_FieldShadowXL[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_extra_large.4bpp"); -const u32 filler_8398188[0x48] = {}; +const u16 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_small.4bpp"); +const u16 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_medium.4bpp"); +const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_large.4bpp"); +const u16 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_extra_large.4bpp"); +const u16 filler_8398188[0x90] = {}; const u16 gUnknown_8398648[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); -const u32 gUnknown_8398668[] = INCBIN_U32("graphics/field_effects/fldeff_cut.4bpp"); +const u16 gUnknown_8398668[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); const u16 gUnknown_8398688[] = INCBIN_U16("graphics/field_effects/fldeff_cut.gbapal"); -const u32 gUnknown_83986A8[] = INCBIN_U32("graphics/object_events/pics/unknown/83986A8.4bpp"); -const u32 gUnknown_8398928[] = INCBIN_U32("graphics/object_events/pics/unknown/8398928.4bpp"); -const u32 gUnknown_8398BA8[] = INCBIN_U32("graphics/object_events/pics/unknown/8398BA8.4bpp"); -const u16 gUnknown_8398FA8[] = INCBIN_U16("graphics/object_events/palettes/8398FA8.gbapal"); -const u16 gUnknown_8398FC8[] = INCBIN_U16("graphics/object_events/palettes/8398FC8.gbapal"); +const u16 gFieldEffectObjectPic_Ripple[] = INCBIN_U16("graphics/object_events/pics/unknown/83986A8.4bpp"); +const u16 gFieldEffectObjectPic_Ash[] = INCBIN_U16("graphics/object_events/pics/unknown/8398928.4bpp"); +const u16 gFieldEffectObjectPic_Arrow[] = INCBIN_U16("graphics/object_events/pics/unknown/8398BA8.4bpp"); +const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/object_events/palettes/8398FA8.gbapal"); +const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/object_events/palettes/8398FC8.gbapal"); const u16 filler_8398FE8[16] = {0}; -const u32 gUnknown_8399008[] = INCBIN_U32("graphics/object_events/pics/unknown/8399008.4bpp"); -const u32 gUnknown_83990C8[] = INCBIN_U32("graphics/object_events/pics/unknown/83990C8.4bpp"); -const u32 gUnknown_8399188[] = INCBIN_U32("graphics/object_events/pics/unknown/8399188.4bpp"); -const u32 gUnknown_8399288[] = INCBIN_U32("graphics/object_events/pics/unknown/8399288.4bpp"); -const u32 gUnknown_8399488[] = INCBIN_U32("graphics/object_events/pics/unknown/8399488.4bpp"); -const u32 gUnknown_8399788[] = INCBIN_U32("graphics/object_events/pics/unknown/8399788.4bpp"); -const u32 gUnknown_8399C08[] = INCBIN_U32("graphics/object_events/pics/unknown/8399C08.4bpp"); -const u32 gUnknown_8399E08[] = INCBIN_U32("graphics/object_events/pics/unknown/8399E08.4bpp"); -const u32 gUnknown_8399E88[] = INCBIN_U32("graphics/object_events/pics/unknown/8399E88.4bpp"); -const u32 gUnknown_8399F08[] = INCBIN_U32("graphics/object_events/pics/unknown/8399F08.4bpp"); -const u32 gUnknown_8399F88[] = INCBIN_U32("graphics/object_events/pics/unknown/8399F88.4bpp"); -const u32 gUnknown_839A008[] = INCBIN_U32("graphics/object_events/pics/unknown/839A008.4bpp"); -const u32 gUnknown_839A288[] = INCBIN_U32("graphics/object_events/pics/unknown/839A288.4bpp"); -const u32 gUnknown_839A388[] = INCBIN_U32("graphics/object_events/pics/unknown/839A388.4bpp"); -const u32 gUnknown_839A408[] = INCBIN_U32("graphics/object_events/pics/unknown/839A408.4bpp"); -const u32 gUnknown_839A488[] = INCBIN_U32("graphics/object_events/pics/unknown/839A488.4bpp"); -const u32 gUnknown_839A508[] = INCBIN_U32("graphics/object_events/pics/unknown/839A508.4bpp"); -const u32 gUnknown_839A588[] = INCBIN_U32("graphics/object_events/pics/unknown/839A588.4bpp"); -const u32 gUnknown_839A608[] = INCBIN_U32("graphics/object_events/pics/unknown/839A608.4bpp"); -const u32 gUnknown_839A688[] = INCBIN_U32("graphics/object_events/pics/unknown/839A688.4bpp"); -const u32 gUnknown_839A708[] = INCBIN_U32("graphics/object_events/pics/unknown/839A708.4bpp"); -const u32 gUnknown_839A788[] = INCBIN_U32("graphics/object_events/pics/unknown/839A788.4bpp"); -const u32 gUnknown_839A988[] = INCBIN_U32("graphics/object_events/pics/unknown/839A988.4bpp"); -const u32 gUnknown_839AA48[] = INCBIN_U32("graphics/object_events/pics/unknown/839AA48.4bpp"); -const u32 gUnknown_839AAC8[] = INCBIN_U32("graphics/object_events/pics/unknown/839AAC8.4bpp"); -const u32 gUnknown_839AB48[] = INCBIN_U32("graphics/object_events/pics/unknown/839AB48.4bpp"); -const u32 gUnknown_839ABC8[] = INCBIN_U32("graphics/object_events/pics/unknown/839ABC8.4bpp"); -const u32 gUnknown_839AC48[] = INCBIN_U32("graphics/object_events/pics/unknown/839AC48.4bpp"); -const u32 gUnknown_839AC88[] = INCBIN_U32("graphics/object_events/pics/unknown/839AC88.4bpp"); -const u32 gUnknown_839ACC8[] = INCBIN_U32("graphics/object_events/pics/unknown/839ACC8.4bpp"); -const u32 gUnknown_839AD08[] = INCBIN_U32("graphics/object_events/pics/unknown/839AD08.4bpp"); -const u32 gUnknown_839AD48[] = INCBIN_U32("graphics/object_events/pics/unknown/839AD48.4bpp"); -const u32 gUnknown_839AD88[] = INCBIN_U32("graphics/object_events/pics/unknown/839AD88.4bpp"); -const u32 gUnknown_839B008[] = INCBIN_U32("graphics/object_events/pics/unknown/839B008.4bpp"); -const u32 gUnknown_839B708[] = INCBIN_U32("graphics/object_events/pics/unknown/839B708.4bpp"); -const u32 gUnknown_839BE08[] = INCBIN_U32("graphics/object_events/pics/unknown/839BE08.4bpp"); -const u32 gUnknown_839C508[] = INCBIN_U32("graphics/object_events/pics/unknown/839C508.4bpp"); -const u16 gUnknown_839C588[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.gbapal"); -const u16 gUnknown_839C5A8[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.4bpp"); -const u16 gUnknown_839C828[] = INCBIN_U16("graphics/object_events/pics/effects/lavaridge_warp.4bpp"); -const u16 gUnknown_839CAA8[] = INCBIN_U16("graphics/object_events/pics/effects/underwater_bubbles.4bpp"); -const u16 gUnknown_839D2A8[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.4bpp"); -const u16 gUnknown_839D3A8[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.gbapal"); -const u16 gUnknown_839D3C8[] = INCBIN_U16("graphics/object_events/pics/effects/fly_blob.4bpp"); +const u16 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U16("graphics/object_events/pics/unknown/8399008.4bpp"); +const u16 gUnknown_83990C8[] = INCBIN_U16("graphics/object_events/pics/unknown/83990C8.4bpp"); +const u16 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399188.4bpp"); +const u16 gUnknown_8399288[] = INCBIN_U16("graphics/object_events/pics/unknown/8399288.4bpp"); +const u16 gFieldEffectObjectPic_JumpLongGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399488.4bpp"); +const u16 gFieldEffectObjectPic_UnusedGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399788.4bpp"); +const u16 gFieldEffectObjectPic_UnusedGrass2[] = INCBIN_U16("graphics/object_events/pics/unknown/8399C08.4bpp"); +const u16 gFieldEffectObjectPic_LongGrass[] = INCBIN_U16("graphics/object_events/pics/effects/long_grass.4bpp"); +const u16 gFieldEffectObjectPic_TallGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/839A008.4bpp"); +const u16 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/839A288.4bpp"); +const u16 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U16("graphics/object_events/pics/unknown/839A388.4bpp"); +const u16 gUnknown_839A408[] = INCBIN_U16("graphics/object_events/pics/unknown/839A408.4bpp"); +const u16 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U16("graphics/object_events/pics/unknown/839A488.4bpp"); +const u16 gUnknown_839A508[] = INCBIN_U16("graphics/object_events/pics/unknown/839A508.4bpp"); +const u16 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U16("graphics/object_events/pics/unknown/839A588.4bpp"); +const u16 gUnknown_839A608[] = INCBIN_U16("graphics/object_events/pics/unknown/839A608.4bpp"); +const u16 gUnknown_839A688[] = INCBIN_U16("graphics/object_events/pics/unknown/839A688.4bpp"); +const u16 gUnknown_839A708[] = INCBIN_U16("graphics/object_events/pics/unknown/839A708.4bpp"); +const u16 gFieldEffectObjectPic_UnusedSand[] = INCBIN_U16("graphics/object_events/pics/unknown/839A788.4bpp"); +const u16 gFieldEffectObjectPic_SandPile[] = INCBIN_U16("graphics/object_events/pics/unknown/839A988.4bpp"); +const u16 gFieldEffectObjectPic_JumpBigSplash[] = INCBIN_U16("graphics/object_events/pics/effects/jump_big_splash.4bpp"); +const u16 gFieldEffectObjectPic_Splash[] = INCBIN_U16("graphics/object_events/pics/unknown/839AC48.4bpp"); +const u16 gUnknown_839AC88[] = INCBIN_U16("graphics/object_events/pics/unknown/839AC88.4bpp"); +const u16 gFieldEffectObjectPic_JumpSmallSplash[] = INCBIN_U16("graphics/object_events/pics/unknown/839ACC8.4bpp"); +const u16 gUnknown_839AD08[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD08.4bpp"); +const u16 gUnknown_839AD48[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD48.4bpp"); +const u16 gFieldEffectObjectPic_WaterSurfacing[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD88.4bpp"); +const u16 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U16("graphics/object_events/pics/unknown/839B008.4bpp"); +const u16 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U16("graphics/object_events/pics/unknown/839B708.4bpp"); +const u16 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U16("graphics/object_events/pics/unknown/839BE08.4bpp"); +const u16 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U16("graphics/object_events/pics/unknown/839C508.4bpp"); +const u16 gFieldEffectPal_Ash[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.gbapal"); +const u16 gFieldEffectObjectPic_AshPuff[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.4bpp"); +const u16 gFieldEffectObjectPic_AshLaunch[] = INCBIN_U16("graphics/object_events/pics/effects/lavaridge_warp.4bpp"); +const u16 gFieldEffectObjectPic_Bubbles[] = INCBIN_U16("graphics/object_events/pics/effects/underwater_bubbles.4bpp"); +const u16 gFieldEffectObjectPic_SmallSparkle[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.4bpp"); +const u16 gFieldEffectPal_SmallSparkle[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.gbapal"); +const u16 gFieldEffectObjectPic_Bird[] = INCBIN_U16("graphics/object_events/pics/effects/fly_blob.4bpp"); diff --git a/src/field_effect.c b/src/field_effect.c index e5d94e889..4cab3cff8 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1909,7 +1909,7 @@ u8 FldEff_LavaridgeGymWarp(void) return spriteId; } -void SpriteCB_LavaridgeGymWarp(struct Sprite * sprite) +void SpriteCB_AshLaunch(struct Sprite * sprite) { if (sprite->animEnded) { diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index b10df5d1b..a311a10f9 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -1223,17 +1223,17 @@ u32 FldEff_BerryTreeGrowthSparkle(void) u32 ShowTreeDisguiseFieldEffect(void) { - return ShowDisguiseFieldEffect(FLDEFF_TREE_DISGUISE, 24, 4); + return ShowDisguiseFieldEffect(FLDEFF_TREE_DISGUISE, FLDEFFOBJ_TREE_DISGUISE, 4); } u32 ShowMountainDisguiseFieldEffect(void) { - return ShowDisguiseFieldEffect(FLDEFF_MOUNTAIN_DISGUISE, 25, 3); + return ShowDisguiseFieldEffect(FLDEFF_MOUNTAIN_DISGUISE, FLDEFFOBJ_MOUNTAIN_DISGUISE, 3); } u32 ShowSandDisguiseFieldEffect(void) { - return ShowDisguiseFieldEffect(FLDEFF_SAND_DISGUISE, 28, 2); + return ShowDisguiseFieldEffect(FLDEFF_SAND_DISGUISE, FLDEFFOBJ_SAND_DISGUISE, 2); } static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum) @@ -1356,7 +1356,7 @@ void UpdateSparkleFieldEffect(struct Sprite * sprite) FieldEffectStop(sprite, FLDEFF_SPARKLE); } -void sub_80DCCE0(struct Sprite * sprite) +void UpdateJumpImpactEffect(struct Sprite * sprite) { if (sprite->animEnded) { diff --git a/src/teachy_tv.c b/src/teachy_tv.c index f7cd182bb..15c1e094c 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -531,7 +531,7 @@ static void TeachyTvLoadGraphic(void) LZDecompressWram(gUnknown_8E86D6C, sResources->buffer4); LoadCompressedPalette(gUnknown_8E86F98, 0, 0x80); LoadPalette(&src, 0, sizeof(src)); - LoadSpritePalette(&gUnknown_83A5348); + LoadSpritePalette(&gSpritePalette_GeneralFieldEffect1); TeachyTvLoadBg3Map(sResources->buffer3); } -- cgit v1.2.3 From 9ce96141c8ac2316fca20b542be87ed7a151b4d0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 May 2021 16:23:01 -0400 Subject: Move event gfx resources, 1 --- graphics/field_effects/palettes/ash.pal | 19 ++++++++ graphics/field_effects/palettes/general_0.pal | 19 ++++++++ graphics/field_effects/palettes/general_1.pal | 19 ++++++++ graphics/field_effects/palettes/small_sparkle.pal | 19 ++++++++ graphics/field_effects/pics/bike_tire_tracks.png | Bin 0 -> 198 bytes graphics/field_effects/pics/bird.png | Bin 0 -> 1006 bytes .../field_effects/pics/deep_sand_footprints.png | Bin 0 -> 209 bytes graphics/field_effects/pics/hot_springs_water.png | Bin 0 -> 150 bytes graphics/field_effects/pics/jump_big_splash.png | Bin 0 -> 292 bytes graphics/field_effects/pics/jump_small_splash.png | Bin 0 -> 209 bytes graphics/field_effects/pics/lavaridge_warp.png | Bin 0 -> 420 bytes graphics/field_effects/pics/long_grass.png | Bin 0 -> 439 bytes graphics/field_effects/pics/pop_out_of_ash.png | Bin 0 -> 353 bytes graphics/field_effects/pics/sand_footprints.png | Bin 0 -> 189 bytes graphics/field_effects/pics/shadow_extra_large.png | Bin 0 -> 98 bytes graphics/field_effects/pics/shadow_large.png | Bin 0 -> 89 bytes graphics/field_effects/pics/shadow_medium.png | Bin 0 -> 88 bytes graphics/field_effects/pics/shadow_small.png | Bin 0 -> 86 bytes graphics/field_effects/pics/small_sparkle.png | Bin 0 -> 188 bytes graphics/field_effects/pics/splash.png | Bin 0 -> 180 bytes graphics/field_effects/pics/underwater_bubbles.png | Bin 0 -> 556 bytes graphics/object_events/palettes/8398FA8.pal | 19 -------- graphics/object_events/palettes/8398FC8.pal | 19 -------- graphics/object_events/pics/effects/fly_blob.png | Bin 1006 -> 0 bytes .../object_events/pics/effects/jump_big_splash.png | Bin 292 -> 0 bytes .../object_events/pics/effects/lavaridge_warp.png | Bin 420 -> 0 bytes graphics/object_events/pics/effects/long_grass.png | Bin 439 -> 0 bytes .../object_events/pics/effects/pop_out_of_ash.png | Bin 353 -> 0 bytes .../pics/effects/shadow_extra_large.png | Bin 98 -> 0 bytes .../object_events/pics/effects/shadow_large.png | Bin 89 -> 0 bytes .../object_events/pics/effects/shadow_medium.png | Bin 88 -> 0 bytes .../object_events/pics/effects/shadow_small.png | Bin 86 -> 0 bytes .../object_events/pics/effects/small_sparkle.png | Bin 188 -> 0 bytes .../pics/effects/underwater_bubbles.png | Bin 556 -> 0 bytes graphics/object_events/pics/unknown/839C508.png | Bin 150 -> 0 bytes graphics_file_rules.mk | 9 ++-- src/data/object_events/object_event_graphics.h | 54 +++++++++------------ 37 files changed, 104 insertions(+), 73 deletions(-) create mode 100644 graphics/field_effects/palettes/ash.pal create mode 100644 graphics/field_effects/palettes/general_0.pal create mode 100644 graphics/field_effects/palettes/general_1.pal create mode 100644 graphics/field_effects/palettes/small_sparkle.pal create mode 100644 graphics/field_effects/pics/bike_tire_tracks.png create mode 100644 graphics/field_effects/pics/bird.png create mode 100644 graphics/field_effects/pics/deep_sand_footprints.png create mode 100644 graphics/field_effects/pics/hot_springs_water.png create mode 100644 graphics/field_effects/pics/jump_big_splash.png create mode 100644 graphics/field_effects/pics/jump_small_splash.png create mode 100644 graphics/field_effects/pics/lavaridge_warp.png create mode 100644 graphics/field_effects/pics/long_grass.png create mode 100644 graphics/field_effects/pics/pop_out_of_ash.png create mode 100644 graphics/field_effects/pics/sand_footprints.png create mode 100644 graphics/field_effects/pics/shadow_extra_large.png create mode 100644 graphics/field_effects/pics/shadow_large.png create mode 100644 graphics/field_effects/pics/shadow_medium.png create mode 100644 graphics/field_effects/pics/shadow_small.png create mode 100644 graphics/field_effects/pics/small_sparkle.png create mode 100644 graphics/field_effects/pics/splash.png create mode 100644 graphics/field_effects/pics/underwater_bubbles.png delete mode 100644 graphics/object_events/palettes/8398FA8.pal delete mode 100644 graphics/object_events/palettes/8398FC8.pal delete mode 100644 graphics/object_events/pics/effects/fly_blob.png delete mode 100644 graphics/object_events/pics/effects/jump_big_splash.png delete mode 100644 graphics/object_events/pics/effects/lavaridge_warp.png delete mode 100644 graphics/object_events/pics/effects/long_grass.png delete mode 100644 graphics/object_events/pics/effects/pop_out_of_ash.png delete mode 100644 graphics/object_events/pics/effects/shadow_extra_large.png delete mode 100644 graphics/object_events/pics/effects/shadow_large.png delete mode 100644 graphics/object_events/pics/effects/shadow_medium.png delete mode 100644 graphics/object_events/pics/effects/shadow_small.png delete mode 100644 graphics/object_events/pics/effects/small_sparkle.png delete mode 100644 graphics/object_events/pics/effects/underwater_bubbles.png delete mode 100644 graphics/object_events/pics/unknown/839C508.png diff --git a/graphics/field_effects/palettes/ash.pal b/graphics/field_effects/palettes/ash.pal new file mode 100644 index 000000000..e3a76c035 --- /dev/null +++ b/graphics/field_effects/palettes/ash.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +98 98 98 +213 213 139 +172 172 90 +139 139 65 +230 246 205 +189 238 180 +131 222 180 +98 172 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/field_effects/palettes/general_0.pal b/graphics/field_effects/palettes/general_0.pal new file mode 100644 index 000000000..40f7022bf --- /dev/null +++ b/graphics/field_effects/palettes/general_0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 238 +246 230 197 +238 213 180 +222 180 148 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +98 156 180 +0 0 0 +0 0 0 +238 230 164 +222 213 139 +213 189 115 +197 180 90 +0 0 0 diff --git a/graphics/field_effects/palettes/general_1.pal b/graphics/field_effects/palettes/general_1.pal new file mode 100644 index 000000000..ad39c8c9a --- /dev/null +++ b/graphics/field_effects/palettes/general_1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 238 +189 255 139 +131 213 98 +57 139 49 +57 82 0 +49 65 0 +98 172 238 +98 172 197 +139 205 246 +148 230 255 +0 0 0 +0 0 0 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/graphics/field_effects/palettes/small_sparkle.pal b/graphics/field_effects/palettes/small_sparkle.pal new file mode 100644 index 000000000..b170eb1f5 --- /dev/null +++ b/graphics/field_effects/palettes/small_sparkle.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 172 74 +255 255 255 +205 246 255 +156 213 255 +74 197 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/field_effects/pics/bike_tire_tracks.png b/graphics/field_effects/pics/bike_tire_tracks.png new file mode 100644 index 000000000..b86f558ba Binary files /dev/null and b/graphics/field_effects/pics/bike_tire_tracks.png differ diff --git a/graphics/field_effects/pics/bird.png b/graphics/field_effects/pics/bird.png new file mode 100644 index 000000000..124d755a0 Binary files /dev/null and b/graphics/field_effects/pics/bird.png differ diff --git a/graphics/field_effects/pics/deep_sand_footprints.png b/graphics/field_effects/pics/deep_sand_footprints.png new file mode 100644 index 000000000..7068aba6c Binary files /dev/null and b/graphics/field_effects/pics/deep_sand_footprints.png differ diff --git a/graphics/field_effects/pics/hot_springs_water.png b/graphics/field_effects/pics/hot_springs_water.png new file mode 100644 index 000000000..90a3244ef Binary files /dev/null and b/graphics/field_effects/pics/hot_springs_water.png differ diff --git a/graphics/field_effects/pics/jump_big_splash.png b/graphics/field_effects/pics/jump_big_splash.png new file mode 100644 index 000000000..6c3829bfd Binary files /dev/null and b/graphics/field_effects/pics/jump_big_splash.png differ diff --git a/graphics/field_effects/pics/jump_small_splash.png b/graphics/field_effects/pics/jump_small_splash.png new file mode 100644 index 000000000..ea8e763f5 Binary files /dev/null and b/graphics/field_effects/pics/jump_small_splash.png differ diff --git a/graphics/field_effects/pics/lavaridge_warp.png b/graphics/field_effects/pics/lavaridge_warp.png new file mode 100644 index 000000000..57bb24beb Binary files /dev/null and b/graphics/field_effects/pics/lavaridge_warp.png differ diff --git a/graphics/field_effects/pics/long_grass.png b/graphics/field_effects/pics/long_grass.png new file mode 100644 index 000000000..94a9a4ae0 Binary files /dev/null and b/graphics/field_effects/pics/long_grass.png differ diff --git a/graphics/field_effects/pics/pop_out_of_ash.png b/graphics/field_effects/pics/pop_out_of_ash.png new file mode 100644 index 000000000..1a1dfc296 Binary files /dev/null and b/graphics/field_effects/pics/pop_out_of_ash.png differ diff --git a/graphics/field_effects/pics/sand_footprints.png b/graphics/field_effects/pics/sand_footprints.png new file mode 100644 index 000000000..68b5de234 Binary files /dev/null and b/graphics/field_effects/pics/sand_footprints.png differ diff --git a/graphics/field_effects/pics/shadow_extra_large.png b/graphics/field_effects/pics/shadow_extra_large.png new file mode 100644 index 000000000..567c63948 Binary files /dev/null and b/graphics/field_effects/pics/shadow_extra_large.png differ diff --git a/graphics/field_effects/pics/shadow_large.png b/graphics/field_effects/pics/shadow_large.png new file mode 100644 index 000000000..8cf80f166 Binary files /dev/null and b/graphics/field_effects/pics/shadow_large.png differ diff --git a/graphics/field_effects/pics/shadow_medium.png b/graphics/field_effects/pics/shadow_medium.png new file mode 100644 index 000000000..264230afd Binary files /dev/null and b/graphics/field_effects/pics/shadow_medium.png differ diff --git a/graphics/field_effects/pics/shadow_small.png b/graphics/field_effects/pics/shadow_small.png new file mode 100644 index 000000000..204d6afad Binary files /dev/null and b/graphics/field_effects/pics/shadow_small.png differ diff --git a/graphics/field_effects/pics/small_sparkle.png b/graphics/field_effects/pics/small_sparkle.png new file mode 100644 index 000000000..ef62dffbb Binary files /dev/null and b/graphics/field_effects/pics/small_sparkle.png differ diff --git a/graphics/field_effects/pics/splash.png b/graphics/field_effects/pics/splash.png new file mode 100644 index 000000000..060e3f4e7 Binary files /dev/null and b/graphics/field_effects/pics/splash.png differ diff --git a/graphics/field_effects/pics/underwater_bubbles.png b/graphics/field_effects/pics/underwater_bubbles.png new file mode 100644 index 000000000..7ebbf24b1 Binary files /dev/null and b/graphics/field_effects/pics/underwater_bubbles.png differ diff --git a/graphics/object_events/palettes/8398FA8.pal b/graphics/object_events/palettes/8398FA8.pal deleted file mode 100644 index 40f7022bf..000000000 --- a/graphics/object_events/palettes/8398FA8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 238 -246 230 197 -238 213 180 -222 180 148 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -98 156 180 -0 0 0 -0 0 0 -238 230 164 -222 213 139 -213 189 115 -197 180 90 -0 0 0 diff --git a/graphics/object_events/palettes/8398FC8.pal b/graphics/object_events/palettes/8398FC8.pal deleted file mode 100644 index ad39c8c9a..000000000 --- a/graphics/object_events/palettes/8398FC8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 238 -189 255 139 -131 213 98 -57 139 49 -57 82 0 -49 65 0 -98 172 238 -98 172 197 -139 205 246 -148 230 255 -0 0 0 -0 0 0 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/graphics/object_events/pics/effects/fly_blob.png b/graphics/object_events/pics/effects/fly_blob.png deleted file mode 100644 index 124d755a0..000000000 Binary files a/graphics/object_events/pics/effects/fly_blob.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/jump_big_splash.png b/graphics/object_events/pics/effects/jump_big_splash.png deleted file mode 100644 index 6c3829bfd..000000000 Binary files a/graphics/object_events/pics/effects/jump_big_splash.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/lavaridge_warp.png b/graphics/object_events/pics/effects/lavaridge_warp.png deleted file mode 100644 index 57bb24beb..000000000 Binary files a/graphics/object_events/pics/effects/lavaridge_warp.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/long_grass.png b/graphics/object_events/pics/effects/long_grass.png deleted file mode 100644 index 94a9a4ae0..000000000 Binary files a/graphics/object_events/pics/effects/long_grass.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/pop_out_of_ash.png b/graphics/object_events/pics/effects/pop_out_of_ash.png deleted file mode 100644 index 1a1dfc296..000000000 Binary files a/graphics/object_events/pics/effects/pop_out_of_ash.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/shadow_extra_large.png b/graphics/object_events/pics/effects/shadow_extra_large.png deleted file mode 100644 index 567c63948..000000000 Binary files a/graphics/object_events/pics/effects/shadow_extra_large.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/shadow_large.png b/graphics/object_events/pics/effects/shadow_large.png deleted file mode 100644 index 8cf80f166..000000000 Binary files a/graphics/object_events/pics/effects/shadow_large.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/shadow_medium.png b/graphics/object_events/pics/effects/shadow_medium.png deleted file mode 100644 index 264230afd..000000000 Binary files a/graphics/object_events/pics/effects/shadow_medium.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/shadow_small.png b/graphics/object_events/pics/effects/shadow_small.png deleted file mode 100644 index 204d6afad..000000000 Binary files a/graphics/object_events/pics/effects/shadow_small.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/small_sparkle.png b/graphics/object_events/pics/effects/small_sparkle.png deleted file mode 100644 index ef62dffbb..000000000 Binary files a/graphics/object_events/pics/effects/small_sparkle.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/underwater_bubbles.png b/graphics/object_events/pics/effects/underwater_bubbles.png deleted file mode 100644 index 7ebbf24b1..000000000 Binary files a/graphics/object_events/pics/effects/underwater_bubbles.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839C508.png b/graphics/object_events/pics/unknown/839C508.png deleted file mode 100644 index 90a3244ef..000000000 Binary files a/graphics/object_events/pics/unknown/839C508.png and /dev/null differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index e87b08888..8e39e0a91 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -14,6 +14,7 @@ ROULETTEGFXDIR := graphics/roulette SLOTMACHINEGFXDIR := graphics/slot_machine PSSGFXDIR := graphics/pokemon_storage EVENTOBJGFXDIR := graphics/object_events +FIELDEFFECTSGFXDIR := graphics/field_effects MISCGFXDIR := graphics/misc TEXTWINDOWGFXDIR := graphics/text_window SLOTMACHINEGFXDIR := graphics/slot_machine @@ -429,12 +430,12 @@ $(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludico $(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp @cat $^ >$@ -$(EVENTOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png - $(GFX) $< $@ -num_tiles 11 - -$(EVENTOBJGFXDIR)/pics/effects/underwater_bubbles.4bpp: %.4bpp: %.png +$(FIELDEFFECTSGFXDIR)/pics/underwater_bubbles.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 +$(FIELDEFFECTSGFXDIR)/pics/bike_tire_tracks.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + $(EVENTOBJGFXDIR)/pics/unknown/839BE08.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 1bf1c7df2..ce0315624 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -186,10 +186,10 @@ const u16 gObjectEventPic_SurfBlob[] = INCBIN_U16("graphics/object_events/pics/m const u16 gObjectEventPic_Policeman[] = INCBIN_U16("graphics/object_events/pics/people/policeman.4bpp"); const u16 gUnknown_8398008[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal"); const u16 gUnknown_8398028[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal"); -const u16 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_small.4bpp"); -const u16 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_medium.4bpp"); -const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_large.4bpp"); -const u16 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_extra_large.4bpp"); +const u16 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U16("graphics/field_effects/pics/shadow_small.4bpp"); +const u16 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U16("graphics/field_effects/pics/shadow_medium.4bpp"); +const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_large.4bpp"); +const u16 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_extra_large.4bpp"); const u16 filler_8398188[0x90] = {}; const u16 gUnknown_8398648[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); const u16 gUnknown_8398668[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); @@ -197,44 +197,36 @@ const u16 gUnknown_8398688[] = INCBIN_U16("graphics/field_effects/fldeff_cut.gba const u16 gFieldEffectObjectPic_Ripple[] = INCBIN_U16("graphics/object_events/pics/unknown/83986A8.4bpp"); const u16 gFieldEffectObjectPic_Ash[] = INCBIN_U16("graphics/object_events/pics/unknown/8398928.4bpp"); const u16 gFieldEffectObjectPic_Arrow[] = INCBIN_U16("graphics/object_events/pics/unknown/8398BA8.4bpp"); -const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/object_events/palettes/8398FA8.gbapal"); -const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/object_events/palettes/8398FC8.gbapal"); +const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/general_0.gbapal"); +const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/general_1.gbapal"); const u16 filler_8398FE8[16] = {0}; const u16 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U16("graphics/object_events/pics/unknown/8399008.4bpp"); -const u16 gUnknown_83990C8[] = INCBIN_U16("graphics/object_events/pics/unknown/83990C8.4bpp"); +UNUSED const u16 gFieldEffectObjectPic_UnusedGrass3[] = INCBIN_U16("graphics/object_events/pics/unknown/83990C8.4bpp"); const u16 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399188.4bpp"); -const u16 gUnknown_8399288[] = INCBIN_U16("graphics/object_events/pics/unknown/8399288.4bpp"); +UNUSED const u16 gFieldEffectObjectPic_UnusedGrass4[] = INCBIN_U16("graphics/object_events/pics/unknown/8399288.4bpp"); const u16 gFieldEffectObjectPic_JumpLongGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399488.4bpp"); const u16 gFieldEffectObjectPic_UnusedGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399788.4bpp"); const u16 gFieldEffectObjectPic_UnusedGrass2[] = INCBIN_U16("graphics/object_events/pics/unknown/8399C08.4bpp"); -const u16 gFieldEffectObjectPic_LongGrass[] = INCBIN_U16("graphics/object_events/pics/effects/long_grass.4bpp"); +const u16 gFieldEffectObjectPic_LongGrass[] = INCBIN_U16("graphics/field_effects/pics/long_grass.4bpp"); const u16 gFieldEffectObjectPic_TallGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/839A008.4bpp"); const u16 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/839A288.4bpp"); -const u16 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U16("graphics/object_events/pics/unknown/839A388.4bpp"); -const u16 gUnknown_839A408[] = INCBIN_U16("graphics/object_events/pics/unknown/839A408.4bpp"); -const u16 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U16("graphics/object_events/pics/unknown/839A488.4bpp"); -const u16 gUnknown_839A508[] = INCBIN_U16("graphics/object_events/pics/unknown/839A508.4bpp"); -const u16 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U16("graphics/object_events/pics/unknown/839A588.4bpp"); -const u16 gUnknown_839A608[] = INCBIN_U16("graphics/object_events/pics/unknown/839A608.4bpp"); -const u16 gUnknown_839A688[] = INCBIN_U16("graphics/object_events/pics/unknown/839A688.4bpp"); -const u16 gUnknown_839A708[] = INCBIN_U16("graphics/object_events/pics/unknown/839A708.4bpp"); +const u16 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U16("graphics/field_effects/pics/sand_footprints.4bpp"); +const u16 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U16("graphics/field_effects/pics/deep_sand_footprints.4bpp"); +const u16 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U16("graphics/field_effects/pics/bike_tire_tracks.4bpp"); const u16 gFieldEffectObjectPic_UnusedSand[] = INCBIN_U16("graphics/object_events/pics/unknown/839A788.4bpp"); const u16 gFieldEffectObjectPic_SandPile[] = INCBIN_U16("graphics/object_events/pics/unknown/839A988.4bpp"); -const u16 gFieldEffectObjectPic_JumpBigSplash[] = INCBIN_U16("graphics/object_events/pics/effects/jump_big_splash.4bpp"); -const u16 gFieldEffectObjectPic_Splash[] = INCBIN_U16("graphics/object_events/pics/unknown/839AC48.4bpp"); -const u16 gUnknown_839AC88[] = INCBIN_U16("graphics/object_events/pics/unknown/839AC88.4bpp"); -const u16 gFieldEffectObjectPic_JumpSmallSplash[] = INCBIN_U16("graphics/object_events/pics/unknown/839ACC8.4bpp"); -const u16 gUnknown_839AD08[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD08.4bpp"); -const u16 gUnknown_839AD48[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD48.4bpp"); +const u16 gFieldEffectObjectPic_JumpBigSplash[] = INCBIN_U16("graphics/field_effects/pics/jump_big_splash.4bpp"); +const u16 gFieldEffectObjectPic_Splash[] = INCBIN_U16("graphics/field_effects/pics/splash.4bpp"); +const u16 gFieldEffectObjectPic_JumpSmallSplash[] = INCBIN_U16("graphics/field_effects/pics/jump_small_splash.4bpp"); const u16 gFieldEffectObjectPic_WaterSurfacing[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD88.4bpp"); const u16 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U16("graphics/object_events/pics/unknown/839B008.4bpp"); const u16 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U16("graphics/object_events/pics/unknown/839B708.4bpp"); const u16 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U16("graphics/object_events/pics/unknown/839BE08.4bpp"); -const u16 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U16("graphics/object_events/pics/unknown/839C508.4bpp"); -const u16 gFieldEffectPal_Ash[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.gbapal"); -const u16 gFieldEffectObjectPic_AshPuff[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.4bpp"); -const u16 gFieldEffectObjectPic_AshLaunch[] = INCBIN_U16("graphics/object_events/pics/effects/lavaridge_warp.4bpp"); -const u16 gFieldEffectObjectPic_Bubbles[] = INCBIN_U16("graphics/object_events/pics/effects/underwater_bubbles.4bpp"); -const u16 gFieldEffectObjectPic_SmallSparkle[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.4bpp"); -const u16 gFieldEffectPal_SmallSparkle[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.gbapal"); -const u16 gFieldEffectObjectPic_Bird[] = INCBIN_U16("graphics/object_events/pics/effects/fly_blob.4bpp"); +const u16 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U16("graphics/field_effects/pics/hot_springs_water.4bpp"); +const u16 gFieldEffectPal_Ash[] = INCBIN_U16("graphics/field_effects/palettes/ash.gbapal"); +const u16 gFieldEffectObjectPic_AshPuff[] = INCBIN_U16("graphics/field_effects/pics/pop_out_of_ash.4bpp"); +const u16 gFieldEffectObjectPic_AshLaunch[] = INCBIN_U16("graphics/field_effects/pics/lavaridge_warp.4bpp"); +const u16 gFieldEffectObjectPic_Bubbles[] = INCBIN_U16("graphics/field_effects/pics/underwater_bubbles.4bpp"); +const u16 gFieldEffectObjectPic_SmallSparkle[] = INCBIN_U16("graphics/field_effects/pics/small_sparkle.4bpp"); +const u16 gFieldEffectPal_SmallSparkle[] = INCBIN_U16("graphics/field_effects/palettes/small_sparkle.gbapal"); +const u16 gFieldEffectObjectPic_Bird[] = INCBIN_U16("graphics/field_effects/pics/bird.4bpp"); -- cgit v1.2.3 From e4c733d95d7bd5559c7f0b27f7f9e1466fd867c8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 May 2021 16:54:07 -0400 Subject: Move field effect graphics resources, 2 --- graphics/field_effects/pics/arrow.png | Bin 0 -> 271 bytes graphics/field_effects/pics/ash.png | Bin 0 -> 289 bytes graphics/field_effects/pics/ground_impact_dust.png | Bin 0 -> 212 bytes graphics/field_effects/pics/jump_long_grass.png | Bin 0 -> 488 bytes graphics/field_effects/pics/jump_tall_grass.png | Bin 0 -> 217 bytes graphics/field_effects/pics/mountain_disguise.png | Bin 0 -> 420 bytes graphics/field_effects/pics/ripple.png | Bin 0 -> 263 bytes graphics/field_effects/pics/sand_disguise.png | Bin 0 -> 339 bytes graphics/field_effects/pics/sand_pile.png | Bin 0 -> 216 bytes graphics/field_effects/pics/short_grass.png | Bin 0 -> 175 bytes graphics/field_effects/pics/tall_grass.png | Bin 0 -> 371 bytes graphics/field_effects/pics/tree_disguise.png | Bin 0 -> 447 bytes graphics/field_effects/pics/unused_grass.png | Bin 0 -> 689 bytes graphics/field_effects/pics/unused_grass_2.png | Bin 0 -> 355 bytes graphics/field_effects/pics/unused_grass_3.png | Bin 0 -> 284 bytes graphics/field_effects/pics/unused_grass_4.png | Bin 0 -> 397 bytes graphics/field_effects/pics/unused_sand.png | Bin 0 -> 286 bytes graphics/field_effects/pics/water_surfacing.png | Bin 0 -> 330 bytes graphics/object_events/pics/unknown/83986A8.png | Bin 214 -> 0 bytes graphics/object_events/pics/unknown/8398928.png | Bin 238 -> 0 bytes graphics/object_events/pics/unknown/8398BA8.png | Bin 251 -> 0 bytes graphics/object_events/pics/unknown/8399008.png | Bin 146 -> 0 bytes graphics/object_events/pics/unknown/83990C8.png | Bin 212 -> 0 bytes graphics/object_events/pics/unknown/8399188.png | Bin 156 -> 0 bytes graphics/object_events/pics/unknown/8399288.png | Bin 326 -> 0 bytes graphics/object_events/pics/unknown/8399488.png | Bin 420 -> 0 bytes graphics/object_events/pics/unknown/8399788.png | Bin 689 -> 0 bytes graphics/object_events/pics/unknown/8399C08.png | Bin 355 -> 0 bytes graphics/object_events/pics/unknown/8399E08.png | Bin 160 -> 0 bytes graphics/object_events/pics/unknown/8399E88.png | Bin 153 -> 0 bytes graphics/object_events/pics/unknown/8399F08.png | Bin 155 -> 0 bytes graphics/object_events/pics/unknown/8399F88.png | Bin 161 -> 0 bytes graphics/object_events/pics/unknown/839A008.png | Bin 308 -> 0 bytes graphics/object_events/pics/unknown/839A288.png | Bin 175 -> 0 bytes graphics/object_events/pics/unknown/839A388.png | Bin 97 -> 0 bytes graphics/object_events/pics/unknown/839A408.png | Bin 94 -> 0 bytes graphics/object_events/pics/unknown/839A488.png | Bin 112 -> 0 bytes graphics/object_events/pics/unknown/839A508.png | Bin 106 -> 0 bytes graphics/object_events/pics/unknown/839A588.png | Bin 97 -> 0 bytes graphics/object_events/pics/unknown/839A608.png | Bin 84 -> 0 bytes graphics/object_events/pics/unknown/839A688.png | Bin 79 -> 0 bytes graphics/object_events/pics/unknown/839A708.png | Bin 106 -> 0 bytes graphics/object_events/pics/unknown/839A788.png | Bin 213 -> 0 bytes graphics/object_events/pics/unknown/839A988.png | Bin 216 -> 0 bytes graphics/object_events/pics/unknown/839AA48.png | Bin 125 -> 0 bytes graphics/object_events/pics/unknown/839AAC8.png | Bin 128 -> 0 bytes graphics/object_events/pics/unknown/839AB48.png | Bin 129 -> 0 bytes graphics/object_events/pics/unknown/839ABC8.png | Bin 101 -> 0 bytes graphics/object_events/pics/unknown/839AC48.png | Bin 93 -> 0 bytes graphics/object_events/pics/unknown/839AC88.png | Bin 96 -> 0 bytes graphics/object_events/pics/unknown/839ACC8.png | Bin 102 -> 0 bytes graphics/object_events/pics/unknown/839AD08.png | Bin 110 -> 0 bytes graphics/object_events/pics/unknown/839AD48.png | Bin 87 -> 0 bytes graphics/object_events/pics/unknown/839AD88.png | Bin 269 -> 0 bytes graphics/object_events/pics/unknown/839B008.png | Bin 329 -> 0 bytes graphics/object_events/pics/unknown/839B708.png | Bin 420 -> 0 bytes graphics/object_events/pics/unknown/839BE08.png | Bin 339 -> 0 bytes graphics/object_events/pics/unknown/839C5A8.png | Bin 109 -> 0 bytes graphics/object_events/pics/unknown/839C628.png | Bin 125 -> 0 bytes graphics/object_events/pics/unknown/839C6A8.png | Bin 140 -> 0 bytes graphics/object_events/pics/unknown/839C728.png | Bin 128 -> 0 bytes graphics/object_events/pics/unknown/839C7A8.png | Bin 123 -> 0 bytes graphics/object_events/pics/unknown/839C828.png | Bin 121 -> 0 bytes graphics/object_events/pics/unknown/839C8A8.png | Bin 156 -> 0 bytes graphics/object_events/pics/unknown/839C928.png | Bin 162 -> 0 bytes graphics/object_events/pics/unknown/839C9A8.png | Bin 152 -> 0 bytes graphics/object_events/pics/unknown/839CA28.png | Bin 146 -> 0 bytes graphics/object_events/pics/unknown/839CAA8.png | Bin 123 -> 0 bytes graphics/object_events/pics/unknown/839CBA8.png | Bin 144 -> 0 bytes graphics/object_events/pics/unknown/839CCA8.png | Bin 168 -> 0 bytes graphics/object_events/pics/unknown/839CDA8.png | Bin 168 -> 0 bytes graphics/object_events/pics/unknown/839CEA8.png | Bin 168 -> 0 bytes graphics/object_events/pics/unknown/839CFA8.png | Bin 145 -> 0 bytes graphics/object_events/pics/unknown/839D0A8.png | Bin 124 -> 0 bytes graphics/object_events/pics/unknown/839D1A8.png | Bin 96 -> 0 bytes graphics/object_events/pics/unknown/839D2A8.png | Bin 88 -> 0 bytes graphics/object_events/pics/unknown/839D328.png | Bin 108 -> 0 bytes graphics/object_events/pics/unknown/839D3C8.png | Bin 990 -> 0 bytes graphics_file_rules.mk | 7 ++-- src/data/object_events/object_event_graphics.h | 36 ++++++++++----------- 80 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 graphics/field_effects/pics/arrow.png create mode 100644 graphics/field_effects/pics/ash.png create mode 100644 graphics/field_effects/pics/ground_impact_dust.png create mode 100644 graphics/field_effects/pics/jump_long_grass.png create mode 100644 graphics/field_effects/pics/jump_tall_grass.png create mode 100644 graphics/field_effects/pics/mountain_disguise.png create mode 100644 graphics/field_effects/pics/ripple.png create mode 100644 graphics/field_effects/pics/sand_disguise.png create mode 100644 graphics/field_effects/pics/sand_pile.png create mode 100644 graphics/field_effects/pics/short_grass.png create mode 100644 graphics/field_effects/pics/tall_grass.png create mode 100644 graphics/field_effects/pics/tree_disguise.png create mode 100644 graphics/field_effects/pics/unused_grass.png create mode 100644 graphics/field_effects/pics/unused_grass_2.png create mode 100644 graphics/field_effects/pics/unused_grass_3.png create mode 100644 graphics/field_effects/pics/unused_grass_4.png create mode 100644 graphics/field_effects/pics/unused_sand.png create mode 100644 graphics/field_effects/pics/water_surfacing.png delete mode 100644 graphics/object_events/pics/unknown/83986A8.png delete mode 100644 graphics/object_events/pics/unknown/8398928.png delete mode 100644 graphics/object_events/pics/unknown/8398BA8.png delete mode 100644 graphics/object_events/pics/unknown/8399008.png delete mode 100644 graphics/object_events/pics/unknown/83990C8.png delete mode 100644 graphics/object_events/pics/unknown/8399188.png delete mode 100644 graphics/object_events/pics/unknown/8399288.png delete mode 100644 graphics/object_events/pics/unknown/8399488.png delete mode 100644 graphics/object_events/pics/unknown/8399788.png delete mode 100644 graphics/object_events/pics/unknown/8399C08.png delete mode 100644 graphics/object_events/pics/unknown/8399E08.png delete mode 100644 graphics/object_events/pics/unknown/8399E88.png delete mode 100644 graphics/object_events/pics/unknown/8399F08.png delete mode 100644 graphics/object_events/pics/unknown/8399F88.png delete mode 100644 graphics/object_events/pics/unknown/839A008.png delete mode 100644 graphics/object_events/pics/unknown/839A288.png delete mode 100644 graphics/object_events/pics/unknown/839A388.png delete mode 100644 graphics/object_events/pics/unknown/839A408.png delete mode 100644 graphics/object_events/pics/unknown/839A488.png delete mode 100644 graphics/object_events/pics/unknown/839A508.png delete mode 100644 graphics/object_events/pics/unknown/839A588.png delete mode 100644 graphics/object_events/pics/unknown/839A608.png delete mode 100644 graphics/object_events/pics/unknown/839A688.png delete mode 100644 graphics/object_events/pics/unknown/839A708.png delete mode 100644 graphics/object_events/pics/unknown/839A788.png delete mode 100644 graphics/object_events/pics/unknown/839A988.png delete mode 100644 graphics/object_events/pics/unknown/839AA48.png delete mode 100644 graphics/object_events/pics/unknown/839AAC8.png delete mode 100644 graphics/object_events/pics/unknown/839AB48.png delete mode 100644 graphics/object_events/pics/unknown/839ABC8.png delete mode 100644 graphics/object_events/pics/unknown/839AC48.png delete mode 100644 graphics/object_events/pics/unknown/839AC88.png delete mode 100644 graphics/object_events/pics/unknown/839ACC8.png delete mode 100644 graphics/object_events/pics/unknown/839AD08.png delete mode 100644 graphics/object_events/pics/unknown/839AD48.png delete mode 100644 graphics/object_events/pics/unknown/839AD88.png delete mode 100644 graphics/object_events/pics/unknown/839B008.png delete mode 100644 graphics/object_events/pics/unknown/839B708.png delete mode 100644 graphics/object_events/pics/unknown/839BE08.png delete mode 100644 graphics/object_events/pics/unknown/839C5A8.png delete mode 100644 graphics/object_events/pics/unknown/839C628.png delete mode 100644 graphics/object_events/pics/unknown/839C6A8.png delete mode 100644 graphics/object_events/pics/unknown/839C728.png delete mode 100644 graphics/object_events/pics/unknown/839C7A8.png delete mode 100644 graphics/object_events/pics/unknown/839C828.png delete mode 100644 graphics/object_events/pics/unknown/839C8A8.png delete mode 100644 graphics/object_events/pics/unknown/839C928.png delete mode 100644 graphics/object_events/pics/unknown/839C9A8.png delete mode 100644 graphics/object_events/pics/unknown/839CA28.png delete mode 100644 graphics/object_events/pics/unknown/839CAA8.png delete mode 100644 graphics/object_events/pics/unknown/839CBA8.png delete mode 100644 graphics/object_events/pics/unknown/839CCA8.png delete mode 100644 graphics/object_events/pics/unknown/839CDA8.png delete mode 100644 graphics/object_events/pics/unknown/839CEA8.png delete mode 100644 graphics/object_events/pics/unknown/839CFA8.png delete mode 100644 graphics/object_events/pics/unknown/839D0A8.png delete mode 100644 graphics/object_events/pics/unknown/839D1A8.png delete mode 100644 graphics/object_events/pics/unknown/839D2A8.png delete mode 100644 graphics/object_events/pics/unknown/839D328.png delete mode 100644 graphics/object_events/pics/unknown/839D3C8.png diff --git a/graphics/field_effects/pics/arrow.png b/graphics/field_effects/pics/arrow.png new file mode 100644 index 000000000..7a294019d Binary files /dev/null and b/graphics/field_effects/pics/arrow.png differ diff --git a/graphics/field_effects/pics/ash.png b/graphics/field_effects/pics/ash.png new file mode 100644 index 000000000..d38792ca3 Binary files /dev/null and b/graphics/field_effects/pics/ash.png differ diff --git a/graphics/field_effects/pics/ground_impact_dust.png b/graphics/field_effects/pics/ground_impact_dust.png new file mode 100644 index 000000000..7c6e2d348 Binary files /dev/null and b/graphics/field_effects/pics/ground_impact_dust.png differ diff --git a/graphics/field_effects/pics/jump_long_grass.png b/graphics/field_effects/pics/jump_long_grass.png new file mode 100644 index 000000000..b83277f1d Binary files /dev/null and b/graphics/field_effects/pics/jump_long_grass.png differ diff --git a/graphics/field_effects/pics/jump_tall_grass.png b/graphics/field_effects/pics/jump_tall_grass.png new file mode 100644 index 000000000..571c6f0d9 Binary files /dev/null and b/graphics/field_effects/pics/jump_tall_grass.png differ diff --git a/graphics/field_effects/pics/mountain_disguise.png b/graphics/field_effects/pics/mountain_disguise.png new file mode 100644 index 000000000..cde53348c Binary files /dev/null and b/graphics/field_effects/pics/mountain_disguise.png differ diff --git a/graphics/field_effects/pics/ripple.png b/graphics/field_effects/pics/ripple.png new file mode 100644 index 000000000..67316d3cb Binary files /dev/null and b/graphics/field_effects/pics/ripple.png differ diff --git a/graphics/field_effects/pics/sand_disguise.png b/graphics/field_effects/pics/sand_disguise.png new file mode 100644 index 000000000..1e88e9c28 Binary files /dev/null and b/graphics/field_effects/pics/sand_disguise.png differ diff --git a/graphics/field_effects/pics/sand_pile.png b/graphics/field_effects/pics/sand_pile.png new file mode 100644 index 000000000..9f86e194b Binary files /dev/null and b/graphics/field_effects/pics/sand_pile.png differ diff --git a/graphics/field_effects/pics/short_grass.png b/graphics/field_effects/pics/short_grass.png new file mode 100644 index 000000000..cf20349ee Binary files /dev/null and b/graphics/field_effects/pics/short_grass.png differ diff --git a/graphics/field_effects/pics/tall_grass.png b/graphics/field_effects/pics/tall_grass.png new file mode 100644 index 000000000..850e92c21 Binary files /dev/null and b/graphics/field_effects/pics/tall_grass.png differ diff --git a/graphics/field_effects/pics/tree_disguise.png b/graphics/field_effects/pics/tree_disguise.png new file mode 100644 index 000000000..9bf3e7b32 Binary files /dev/null and b/graphics/field_effects/pics/tree_disguise.png differ diff --git a/graphics/field_effects/pics/unused_grass.png b/graphics/field_effects/pics/unused_grass.png new file mode 100644 index 000000000..1f918a0d0 Binary files /dev/null and b/graphics/field_effects/pics/unused_grass.png differ diff --git a/graphics/field_effects/pics/unused_grass_2.png b/graphics/field_effects/pics/unused_grass_2.png new file mode 100644 index 000000000..aff184fe8 Binary files /dev/null and b/graphics/field_effects/pics/unused_grass_2.png differ diff --git a/graphics/field_effects/pics/unused_grass_3.png b/graphics/field_effects/pics/unused_grass_3.png new file mode 100644 index 000000000..ed70516c9 Binary files /dev/null and b/graphics/field_effects/pics/unused_grass_3.png differ diff --git a/graphics/field_effects/pics/unused_grass_4.png b/graphics/field_effects/pics/unused_grass_4.png new file mode 100644 index 000000000..3f3c79a25 Binary files /dev/null and b/graphics/field_effects/pics/unused_grass_4.png differ diff --git a/graphics/field_effects/pics/unused_sand.png b/graphics/field_effects/pics/unused_sand.png new file mode 100644 index 000000000..605862952 Binary files /dev/null and b/graphics/field_effects/pics/unused_sand.png differ diff --git a/graphics/field_effects/pics/water_surfacing.png b/graphics/field_effects/pics/water_surfacing.png new file mode 100644 index 000000000..d7c2156eb Binary files /dev/null and b/graphics/field_effects/pics/water_surfacing.png differ diff --git a/graphics/object_events/pics/unknown/83986A8.png b/graphics/object_events/pics/unknown/83986A8.png deleted file mode 100644 index d05031f54..000000000 Binary files a/graphics/object_events/pics/unknown/83986A8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/8398928.png b/graphics/object_events/pics/unknown/8398928.png deleted file mode 100644 index a80b8680b..000000000 Binary files a/graphics/object_events/pics/unknown/8398928.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/8398BA8.png b/graphics/object_events/pics/unknown/8398BA8.png deleted file mode 100644 index d77d0dfbb..000000000 Binary files a/graphics/object_events/pics/unknown/8398BA8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/8399008.png b/graphics/object_events/pics/unknown/8399008.png deleted file mode 100644 index 95b472557..000000000 Binary files a/graphics/object_events/pics/unknown/8399008.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/83990C8.png b/graphics/object_events/pics/unknown/83990C8.png deleted file mode 100644 index 931eba7d6..000000000 Binary files a/graphics/object_events/pics/unknown/83990C8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/8399188.png b/graphics/object_events/pics/unknown/8399188.png deleted file mode 100644 index 215d422ec..000000000 Binary files a/graphics/object_events/pics/unknown/8399188.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/8399288.png b/graphics/object_events/pics/unknown/8399288.png deleted file mode 100644 index 43765df43..000000000 Binary files a/graphics/object_events/pics/unknown/8399288.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/8399488.png b/graphics/object_events/pics/unknown/8399488.png deleted file mode 100644 index 5ee8decee..000000000 Binary files a/graphics/object_events/pics/unknown/8399488.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/8399788.png b/graphics/object_events/pics/unknown/8399788.png deleted file mode 100644 index 1f918a0d0..000000000 Binary files a/graphics/object_events/pics/unknown/8399788.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/8399C08.png b/graphics/object_events/pics/unknown/8399C08.png deleted file mode 100644 index aff184fe8..000000000 Binary files a/graphics/object_events/pics/unknown/8399C08.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/8399E08.png b/graphics/object_events/pics/unknown/8399E08.png deleted file mode 100644 index dc862d6b7..000000000 Binary files a/graphics/object_events/pics/unknown/8399E08.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/8399E88.png b/graphics/object_events/pics/unknown/8399E88.png deleted file mode 100644 index d0cc84b83..000000000 Binary files a/graphics/object_events/pics/unknown/8399E88.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/8399F08.png b/graphics/object_events/pics/unknown/8399F08.png deleted file mode 100644 index adb1a1fba..000000000 Binary files a/graphics/object_events/pics/unknown/8399F08.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/8399F88.png b/graphics/object_events/pics/unknown/8399F88.png deleted file mode 100644 index 0209125e8..000000000 Binary files a/graphics/object_events/pics/unknown/8399F88.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839A008.png b/graphics/object_events/pics/unknown/839A008.png deleted file mode 100644 index 3b79059b1..000000000 Binary files a/graphics/object_events/pics/unknown/839A008.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839A288.png b/graphics/object_events/pics/unknown/839A288.png deleted file mode 100644 index cf20349ee..000000000 Binary files a/graphics/object_events/pics/unknown/839A288.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839A388.png b/graphics/object_events/pics/unknown/839A388.png deleted file mode 100644 index 3b7170512..000000000 Binary files a/graphics/object_events/pics/unknown/839A388.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839A408.png b/graphics/object_events/pics/unknown/839A408.png deleted file mode 100644 index 5f260a6fb..000000000 Binary files a/graphics/object_events/pics/unknown/839A408.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839A488.png b/graphics/object_events/pics/unknown/839A488.png deleted file mode 100644 index ff782e7a8..000000000 Binary files a/graphics/object_events/pics/unknown/839A488.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839A508.png b/graphics/object_events/pics/unknown/839A508.png deleted file mode 100644 index c4f247a8c..000000000 Binary files a/graphics/object_events/pics/unknown/839A508.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839A588.png b/graphics/object_events/pics/unknown/839A588.png deleted file mode 100644 index 63edde656..000000000 Binary files a/graphics/object_events/pics/unknown/839A588.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839A608.png b/graphics/object_events/pics/unknown/839A608.png deleted file mode 100644 index 60008b509..000000000 Binary files a/graphics/object_events/pics/unknown/839A608.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839A688.png b/graphics/object_events/pics/unknown/839A688.png deleted file mode 100644 index 9ede2749b..000000000 Binary files a/graphics/object_events/pics/unknown/839A688.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839A708.png b/graphics/object_events/pics/unknown/839A708.png deleted file mode 100644 index e8c55ddfb..000000000 Binary files a/graphics/object_events/pics/unknown/839A708.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839A788.png b/graphics/object_events/pics/unknown/839A788.png deleted file mode 100644 index a16d93402..000000000 Binary files a/graphics/object_events/pics/unknown/839A788.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839A988.png b/graphics/object_events/pics/unknown/839A988.png deleted file mode 100644 index 9f86e194b..000000000 Binary files a/graphics/object_events/pics/unknown/839A988.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839AA48.png b/graphics/object_events/pics/unknown/839AA48.png deleted file mode 100644 index 369e522ba..000000000 Binary files a/graphics/object_events/pics/unknown/839AA48.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839AAC8.png b/graphics/object_events/pics/unknown/839AAC8.png deleted file mode 100644 index 1e21258d7..000000000 Binary files a/graphics/object_events/pics/unknown/839AAC8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839AB48.png b/graphics/object_events/pics/unknown/839AB48.png deleted file mode 100644 index 272bb1319..000000000 Binary files a/graphics/object_events/pics/unknown/839AB48.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839ABC8.png b/graphics/object_events/pics/unknown/839ABC8.png deleted file mode 100644 index 2a748583f..000000000 Binary files a/graphics/object_events/pics/unknown/839ABC8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839AC48.png b/graphics/object_events/pics/unknown/839AC48.png deleted file mode 100644 index 4900af580..000000000 Binary files a/graphics/object_events/pics/unknown/839AC48.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839AC88.png b/graphics/object_events/pics/unknown/839AC88.png deleted file mode 100644 index b0194c78f..000000000 Binary files a/graphics/object_events/pics/unknown/839AC88.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839ACC8.png b/graphics/object_events/pics/unknown/839ACC8.png deleted file mode 100644 index adb52f29b..000000000 Binary files a/graphics/object_events/pics/unknown/839ACC8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839AD08.png b/graphics/object_events/pics/unknown/839AD08.png deleted file mode 100644 index 890068ec3..000000000 Binary files a/graphics/object_events/pics/unknown/839AD08.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839AD48.png b/graphics/object_events/pics/unknown/839AD48.png deleted file mode 100644 index 8b2fbb553..000000000 Binary files a/graphics/object_events/pics/unknown/839AD48.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839AD88.png b/graphics/object_events/pics/unknown/839AD88.png deleted file mode 100644 index 7c3fbb7ca..000000000 Binary files a/graphics/object_events/pics/unknown/839AD88.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839B008.png b/graphics/object_events/pics/unknown/839B008.png deleted file mode 100644 index 196adbba4..000000000 Binary files a/graphics/object_events/pics/unknown/839B008.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839B708.png b/graphics/object_events/pics/unknown/839B708.png deleted file mode 100644 index cde53348c..000000000 Binary files a/graphics/object_events/pics/unknown/839B708.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839BE08.png b/graphics/object_events/pics/unknown/839BE08.png deleted file mode 100644 index 1e88e9c28..000000000 Binary files a/graphics/object_events/pics/unknown/839BE08.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839C5A8.png b/graphics/object_events/pics/unknown/839C5A8.png deleted file mode 100644 index 53dc362af..000000000 Binary files a/graphics/object_events/pics/unknown/839C5A8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839C628.png b/graphics/object_events/pics/unknown/839C628.png deleted file mode 100644 index 0217e5a7c..000000000 Binary files a/graphics/object_events/pics/unknown/839C628.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839C6A8.png b/graphics/object_events/pics/unknown/839C6A8.png deleted file mode 100644 index 830497ee8..000000000 Binary files a/graphics/object_events/pics/unknown/839C6A8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839C728.png b/graphics/object_events/pics/unknown/839C728.png deleted file mode 100644 index bea1171fc..000000000 Binary files a/graphics/object_events/pics/unknown/839C728.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839C7A8.png b/graphics/object_events/pics/unknown/839C7A8.png deleted file mode 100644 index ecc4aae1a..000000000 Binary files a/graphics/object_events/pics/unknown/839C7A8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839C828.png b/graphics/object_events/pics/unknown/839C828.png deleted file mode 100644 index daf690bc6..000000000 Binary files a/graphics/object_events/pics/unknown/839C828.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839C8A8.png b/graphics/object_events/pics/unknown/839C8A8.png deleted file mode 100644 index e6e4495d9..000000000 Binary files a/graphics/object_events/pics/unknown/839C8A8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839C928.png b/graphics/object_events/pics/unknown/839C928.png deleted file mode 100644 index 3252c12f8..000000000 Binary files a/graphics/object_events/pics/unknown/839C928.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839C9A8.png b/graphics/object_events/pics/unknown/839C9A8.png deleted file mode 100644 index 8461222d3..000000000 Binary files a/graphics/object_events/pics/unknown/839C9A8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839CA28.png b/graphics/object_events/pics/unknown/839CA28.png deleted file mode 100644 index 691427c8f..000000000 Binary files a/graphics/object_events/pics/unknown/839CA28.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839CAA8.png b/graphics/object_events/pics/unknown/839CAA8.png deleted file mode 100644 index c0abb16b7..000000000 Binary files a/graphics/object_events/pics/unknown/839CAA8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839CBA8.png b/graphics/object_events/pics/unknown/839CBA8.png deleted file mode 100644 index e7dc7746e..000000000 Binary files a/graphics/object_events/pics/unknown/839CBA8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839CCA8.png b/graphics/object_events/pics/unknown/839CCA8.png deleted file mode 100644 index d702ef9cd..000000000 Binary files a/graphics/object_events/pics/unknown/839CCA8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839CDA8.png b/graphics/object_events/pics/unknown/839CDA8.png deleted file mode 100644 index e0c2c531f..000000000 Binary files a/graphics/object_events/pics/unknown/839CDA8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839CEA8.png b/graphics/object_events/pics/unknown/839CEA8.png deleted file mode 100644 index 778a4ee24..000000000 Binary files a/graphics/object_events/pics/unknown/839CEA8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839CFA8.png b/graphics/object_events/pics/unknown/839CFA8.png deleted file mode 100644 index 14b409734..000000000 Binary files a/graphics/object_events/pics/unknown/839CFA8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839D0A8.png b/graphics/object_events/pics/unknown/839D0A8.png deleted file mode 100644 index 5691f1333..000000000 Binary files a/graphics/object_events/pics/unknown/839D0A8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839D1A8.png b/graphics/object_events/pics/unknown/839D1A8.png deleted file mode 100644 index 8f2ddd84c..000000000 Binary files a/graphics/object_events/pics/unknown/839D1A8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839D2A8.png b/graphics/object_events/pics/unknown/839D2A8.png deleted file mode 100644 index b46950eb0..000000000 Binary files a/graphics/object_events/pics/unknown/839D2A8.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839D328.png b/graphics/object_events/pics/unknown/839D328.png deleted file mode 100644 index d0afd946b..000000000 Binary files a/graphics/object_events/pics/unknown/839D328.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839D3C8.png b/graphics/object_events/pics/unknown/839D3C8.png deleted file mode 100644 index 1e9a0bbc2..000000000 Binary files a/graphics/object_events/pics/unknown/839D3C8.png and /dev/null differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 8e39e0a91..59e2be4ee 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -436,10 +436,13 @@ $(FIELDEFFECTSGFXDIR)/pics/underwater_bubbles.4bpp: %.4bpp: %.png $(FIELDEFFECTSGFXDIR)/pics/bike_tire_tracks.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pics/unknown/839BE08.4bpp: %.4bpp: %.png +$(FIELDEFFECTSGFXDIR)/pics/sand_disguise.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/pics/unknown/839B708.4bpp: %.4bpp: %.png +$(FIELDEFFECTSGFXDIR)/pics/mountain_disguise.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(FIELDEFFECTSGFXDIR)/pics/tree_disguise.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index ce0315624..7863a5954 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -194,34 +194,34 @@ const u16 filler_8398188[0x90] = {}; const u16 gUnknown_8398648[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); const u16 gUnknown_8398668[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); const u16 gUnknown_8398688[] = INCBIN_U16("graphics/field_effects/fldeff_cut.gbapal"); -const u16 gFieldEffectObjectPic_Ripple[] = INCBIN_U16("graphics/object_events/pics/unknown/83986A8.4bpp"); -const u16 gFieldEffectObjectPic_Ash[] = INCBIN_U16("graphics/object_events/pics/unknown/8398928.4bpp"); -const u16 gFieldEffectObjectPic_Arrow[] = INCBIN_U16("graphics/object_events/pics/unknown/8398BA8.4bpp"); +const u16 gFieldEffectObjectPic_Ripple[] = INCBIN_U16("graphics/field_effects/pics/ripple.4bpp"); +const u16 gFieldEffectObjectPic_Ash[] = INCBIN_U16("graphics/field_effects/pics/ash.4bpp"); +const u16 gFieldEffectObjectPic_Arrow[] = INCBIN_U16("graphics/field_effects/pics/arrow.4bpp"); const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/general_0.gbapal"); const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/general_1.gbapal"); const u16 filler_8398FE8[16] = {0}; -const u16 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U16("graphics/object_events/pics/unknown/8399008.4bpp"); -UNUSED const u16 gFieldEffectObjectPic_UnusedGrass3[] = INCBIN_U16("graphics/object_events/pics/unknown/83990C8.4bpp"); -const u16 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399188.4bpp"); -UNUSED const u16 gFieldEffectObjectPic_UnusedGrass4[] = INCBIN_U16("graphics/object_events/pics/unknown/8399288.4bpp"); -const u16 gFieldEffectObjectPic_JumpLongGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399488.4bpp"); -const u16 gFieldEffectObjectPic_UnusedGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399788.4bpp"); -const u16 gFieldEffectObjectPic_UnusedGrass2[] = INCBIN_U16("graphics/object_events/pics/unknown/8399C08.4bpp"); +const u16 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U16("graphics/field_effects/pics/ground_impact_dust.4bpp"); +UNUSED const u16 gFieldEffectObjectPic_UnusedGrass3[] = INCBIN_U16("graphics/field_effects/pics/unused_grass_3.4bpp"); +const u16 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U16("graphics/field_effects/pics/jump_tall_grass.4bpp"); +UNUSED const u16 gFieldEffectObjectPic_UnusedGrass4[] = INCBIN_U16("graphics/field_effects/pics/unused_grass_4.4bpp"); +const u16 gFieldEffectObjectPic_JumpLongGrass[] = INCBIN_U16("graphics/field_effects/pics/jump_long_grass.4bpp"); +const u16 gFieldEffectObjectPic_UnusedGrass[] = INCBIN_U16("graphics/field_effects/pics/unused_grass.4bpp"); +const u16 gFieldEffectObjectPic_UnusedGrass2[] = INCBIN_U16("graphics/field_effects/pics/unused_grass_2.4bpp"); const u16 gFieldEffectObjectPic_LongGrass[] = INCBIN_U16("graphics/field_effects/pics/long_grass.4bpp"); -const u16 gFieldEffectObjectPic_TallGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/839A008.4bpp"); -const u16 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/839A288.4bpp"); +const u16 gFieldEffectObjectPic_TallGrass[] = INCBIN_U16("graphics/field_effects/pics/tall_grass.4bpp"); +const u16 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U16("graphics/field_effects/pics/short_grass.4bpp"); const u16 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U16("graphics/field_effects/pics/sand_footprints.4bpp"); const u16 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U16("graphics/field_effects/pics/deep_sand_footprints.4bpp"); const u16 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U16("graphics/field_effects/pics/bike_tire_tracks.4bpp"); -const u16 gFieldEffectObjectPic_UnusedSand[] = INCBIN_U16("graphics/object_events/pics/unknown/839A788.4bpp"); -const u16 gFieldEffectObjectPic_SandPile[] = INCBIN_U16("graphics/object_events/pics/unknown/839A988.4bpp"); +const u16 gFieldEffectObjectPic_UnusedSand[] = INCBIN_U16("graphics/field_effects/pics/unused_sand.4bpp"); +const u16 gFieldEffectObjectPic_SandPile[] = INCBIN_U16("graphics/field_effects/pics/sand_pile.4bpp"); const u16 gFieldEffectObjectPic_JumpBigSplash[] = INCBIN_U16("graphics/field_effects/pics/jump_big_splash.4bpp"); const u16 gFieldEffectObjectPic_Splash[] = INCBIN_U16("graphics/field_effects/pics/splash.4bpp"); const u16 gFieldEffectObjectPic_JumpSmallSplash[] = INCBIN_U16("graphics/field_effects/pics/jump_small_splash.4bpp"); -const u16 gFieldEffectObjectPic_WaterSurfacing[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD88.4bpp"); -const u16 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U16("graphics/object_events/pics/unknown/839B008.4bpp"); -const u16 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U16("graphics/object_events/pics/unknown/839B708.4bpp"); -const u16 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U16("graphics/object_events/pics/unknown/839BE08.4bpp"); +const u16 gFieldEffectObjectPic_WaterSurfacing[] = INCBIN_U16("graphics/field_effects/pics/water_surfacing.4bpp"); +const u16 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U16("graphics/field_effects/pics/tree_disguise.4bpp"); +const u16 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U16("graphics/field_effects/pics/mountain_disguise.4bpp"); +const u16 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U16("graphics/field_effects/pics/sand_disguise.4bpp"); const u16 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U16("graphics/field_effects/pics/hot_springs_water.4bpp"); const u16 gFieldEffectPal_Ash[] = INCBIN_U16("graphics/field_effects/palettes/ash.gbapal"); const u16 gFieldEffectObjectPic_AshPuff[] = INCBIN_U16("graphics/field_effects/pics/pop_out_of_ash.4bpp"); -- cgit v1.2.3 From fecbee43d33b6b858f9cb1099fcc00ec7d360070 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 4 May 2021 09:51:48 -0400 Subject: Name gObjectEventPal_xxx objects --- src/data/object_events/object_event_graphics.h | 32 ++++++++++----------- src/event_object_movement.c | 39 ++++++++++++++------------ 2 files changed, 37 insertions(+), 34 deletions(-) diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 7863a5954..c161ebe73 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -1,4 +1,4 @@ -const u16 gUnknown_835B968[] = INCBIN_U16("graphics/object_events/palettes/0.gbapal"); +const u16 gObjectEventPal_8[] = INCBIN_U16("graphics/object_events/palettes/0.gbapal"); const u16 gUnknown_835B988[] = INCBIN_U16("graphics/object_events/palettes/unk_835B988.gbapal"); const u16 gObjectEventPaletteNull1[16] = {}; const u16 gObjectEventPaletteNull2[16] = {}; @@ -18,8 +18,8 @@ const u16 gObjectEventPic_RedNormal[] = INCBIN_U16("graphics/object_events/pics/ const u16 gObjectEventPic_RedSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/red_surf_run.4bpp"); const u16 gObjectEventPic_GreenNormal[] = INCBIN_U16("graphics/object_events/pics/people/green_normal.4bpp"); const u16 gObjectEventPic_GreenSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/green_surf_run.4bpp"); -const u16 gUnknown_835E968[] = INCBIN_U16("graphics/object_events/palettes/1.gbapal"); -const u16 gUnknown_835E988[] = INCBIN_U16("graphics/object_events/palettes/2.gbapal"); +const u16 gObjectEventPal_9[] = INCBIN_U16("graphics/object_events/palettes/1.gbapal"); +const u16 gObjectEventPal_10[] = INCBIN_U16("graphics/object_events/palettes/2.gbapal"); const u16 gObjectEventPic_RedItem[] = INCBIN_U16("graphics/object_events/pics/people/red_item.4bpp"); const u16 gObjectEventPic_GreenItem[] = INCBIN_U16("graphics/object_events/pics/people/green_item.4bpp"); const u16 gObjectEventPic_RedSurf[] = INCBIN_U16("graphics/object_events/pics/people/red_surf.4bpp"); @@ -45,14 +45,14 @@ const u16 gObjectEventPic_Koga[] = INCBIN_U16("graphics/object_events/pics/peopl const u16 gObjectEventPic_Brock[] = INCBIN_U16("graphics/object_events/pics/people/brock.4bpp"); const u16 gObjectEventPic_LtSurge[] = INCBIN_U16("graphics/object_events/pics/people/lt_surge.4bpp"); const u16 gObjectEventPic_Bill[] = INCBIN_U16("graphics/object_events/pics/people/bill.4bpp"); -const u16 gUnknown_836D828[] = INCBIN_U16("graphics/object_events/palettes/3.gbapal"); -const u16 gUnknown_836D848[] = INCBIN_U16("graphics/object_events/palettes/4.gbapal"); -const u16 gUnknown_836D868[] = INCBIN_U16("graphics/object_events/palettes/5.gbapal"); -const u16 gUnknown_836D888[] = INCBIN_U16("graphics/object_events/palettes/6.gbapal"); -const u16 gUnknown_836D8A8[] = INCBIN_U16("graphics/object_events/palettes/7.gbapal"); -const u16 gUnknown_836D8C8[] = INCBIN_U16("graphics/object_events/palettes/8.gbapal"); -const u16 gUnknown_836D8E8[] = INCBIN_U16("graphics/object_events/palettes/9.gbapal"); -const u16 gUnknown_836D908[] = INCBIN_U16("graphics/object_events/palettes/10.gbapal"); +const u16 gObjectEventPal_0[] = INCBIN_U16("graphics/object_events/palettes/3.gbapal"); +const u16 gObjectEventPal_1[] = INCBIN_U16("graphics/object_events/palettes/4.gbapal"); +const u16 gObjectEventPal_2[] = INCBIN_U16("graphics/object_events/palettes/5.gbapal"); +const u16 gObjectEventPal_3[] = INCBIN_U16("graphics/object_events/palettes/6.gbapal"); +const u16 gObjectEventPal_4[] = INCBIN_U16("graphics/object_events/palettes/7.gbapal"); +const u16 gObjectEventPal_5[] = INCBIN_U16("graphics/object_events/palettes/8.gbapal"); +const u16 gObjectEventPal_6[] = INCBIN_U16("graphics/object_events/palettes/9.gbapal"); +const u16 gObjectEventPal_7[] = INCBIN_U16("graphics/object_events/palettes/10.gbapal"); const u16 gObjectEventPic_LittleBoy[] = INCBIN_U16("graphics/object_events/pics/people/little_boy.4bpp"); const u16 gObjectEventPic_LittleGirl[] = INCBIN_U16("graphics/object_events/pics/people/little_girl.4bpp"); const u16 gObjectEventPic_SittingBoy[] = INCBIN_U16("graphics/object_events/pics/people/sitting_boy.4bpp"); @@ -175,17 +175,17 @@ const u16 gObjectEventPic_GymSign[] = INCBIN_U16("graphics/object_events/pics/mi const u16 gObjectEventPic_Sign[] = INCBIN_U16("graphics/object_events/pics/misc/sign.4bpp"); const u16 gObjectEventPic_WoodenSign[] = INCBIN_U16("graphics/object_events/pics/misc/wooden_sign.4bpp"); const u16 gObjectEventPic_Clipboard[] = INCBIN_U16("graphics/object_events/pics/misc/clipboard.4bpp"); -const u16 gUnknown_8394EA8[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal"); +const u16 gObjectEventPal_20[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal"); const u16 gObjectEventPic_BirthIslandStone[] = INCBIN_U16("graphics/object_events/pics/misc/birth_island_stone.4bpp"); const u16 gObjectEventPic_LaprasDoll[] = INCBIN_U16("graphics/object_events/pics/misc/lapras_doll.4bpp"); -const u16 gUnknown_83952C8[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal"); +const u16 gObjectEventPal_21[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal"); const u16 gObjectEventPic_Seagallop[] = INCBIN_U16("graphics/object_events/pics/misc/seagallop.4bpp"); -const u16 gUnknown_8395AE8[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal"); +const u16 gObjectEventPal_11[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal"); const u16 gObjectEventPic_SSAnne[] = INCBIN_U16("graphics/object_events/pics/misc/ss_anne.4bpp"); const u16 gObjectEventPic_SurfBlob[] = INCBIN_U16("graphics/object_events/pics/misc/surf_blob.4bpp"); const u16 gObjectEventPic_Policeman[] = INCBIN_U16("graphics/object_events/pics/people/policeman.4bpp"); -const u16 gUnknown_8398008[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal"); -const u16 gUnknown_8398028[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal"); +const u16 gObjectEventPal_12[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal"); +const u16 gObjectEventPal_13[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal"); const u16 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U16("graphics/field_effects/pics/shadow_small.4bpp"); const u16 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U16("graphics/field_effects/pics/shadow_medium.4bpp"); const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_large.4bpp"); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index fcd0623c9..fa5232e8e 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -495,24 +495,24 @@ const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = #include "data/object_events/object_event_graphics_info.h" static const struct SpritePalette sObjectEventSpritePalettes[] = { - {gUnknown_836D828, OBJ_EVENT_PAL_TAG_0}, - {gUnknown_836D848, OBJ_EVENT_PAL_TAG_1}, - {gUnknown_836D868, OBJ_EVENT_PAL_TAG_2}, - {gUnknown_836D888, OBJ_EVENT_PAL_TAG_3}, - {gUnknown_836D8A8, OBJ_EVENT_PAL_TAG_4}, - {gUnknown_836D8C8, OBJ_EVENT_PAL_TAG_5}, - {gUnknown_836D8E8, OBJ_EVENT_PAL_TAG_6}, - {gUnknown_836D908, OBJ_EVENT_PAL_TAG_7}, - {gUnknown_835B968, OBJ_EVENT_PAL_TAG_8}, - {gUnknown_835E968, OBJ_EVENT_PAL_TAG_9}, - {gUnknown_835E988, OBJ_EVENT_PAL_TAG_10}, - {gUnknown_8398008, OBJ_EVENT_PAL_TAG_12}, - {gUnknown_8398028, OBJ_EVENT_PAL_TAG_13}, - {gUnknown_835B968, OBJ_EVENT_PAL_TAG_17}, - {gUnknown_835E968, OBJ_EVENT_PAL_TAG_18}, - {gUnknown_8394EA8, OBJ_EVENT_PAL_TAG_20}, - {gUnknown_8395AE8, OBJ_EVENT_PAL_TAG_11}, - {gUnknown_83952C8, OBJ_EVENT_PAL_TAG_21}, + {gObjectEventPal_0, OBJ_EVENT_PAL_TAG_0}, + {gObjectEventPal_1, OBJ_EVENT_PAL_TAG_1}, + {gObjectEventPal_2, OBJ_EVENT_PAL_TAG_2}, + {gObjectEventPal_3, OBJ_EVENT_PAL_TAG_3}, + {gObjectEventPal_4, OBJ_EVENT_PAL_TAG_4}, + {gObjectEventPal_5, OBJ_EVENT_PAL_TAG_5}, + {gObjectEventPal_6, OBJ_EVENT_PAL_TAG_6}, + {gObjectEventPal_7, OBJ_EVENT_PAL_TAG_7}, + {gObjectEventPal_8, OBJ_EVENT_PAL_TAG_8}, + {gObjectEventPal_9, OBJ_EVENT_PAL_TAG_9}, + {gObjectEventPal_10, OBJ_EVENT_PAL_TAG_10}, + {gObjectEventPal_12, OBJ_EVENT_PAL_TAG_12}, + {gObjectEventPal_13, OBJ_EVENT_PAL_TAG_13}, + {gObjectEventPal_8, OBJ_EVENT_PAL_TAG_17}, + {gObjectEventPal_9, OBJ_EVENT_PAL_TAG_18}, + {gObjectEventPal_20, OBJ_EVENT_PAL_TAG_20}, + {gObjectEventPal_11, OBJ_EVENT_PAL_TAG_11}, + {gObjectEventPal_21, OBJ_EVENT_PAL_TAG_21}, {}, }; @@ -521,6 +521,9 @@ const u16 gPlayerReflectionPaletteTags[] = { OBJ_EVENT_PAL_TAG_9, OBJ_EVENT_PAL_TAG_9, OBJ_EVENT_PAL_TAG_9, +}; + +const u16 gUnusedPlayerReflectionPaletteTags[] = { OBJ_EVENT_PAL_TAG_18, OBJ_EVENT_PAL_TAG_18, OBJ_EVENT_PAL_TAG_18, -- cgit v1.2.3 From e07dd9507b3073a322fc88bc5f315a17c5a7552d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 8 May 2021 10:27:52 -0400 Subject: Name used object event palette tags --- include/event_object_movement.h | 10 +- include/global.fieldmap.h | 4 +- include/sprite.h | 2 +- src/data/object_events/object_event_graphics.h | 18 +- .../object_events/object_event_graphics_info.h | 308 ++++++++++----------- src/event_object_movement.c | 200 ++++++------- src/field_effect_helpers.c | 10 +- src/fldeff_cut.c | 2 +- src/scrcmd.c | 8 +- src/sprite.c | 24 +- 10 files changed, 296 insertions(+), 290 deletions(-) diff --git a/include/event_object_movement.h b/include/event_object_movement.h index f9b29a3f2..c1a9787f3 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -91,11 +91,11 @@ void ObjectEventTurn(struct ObjectEvent *, u8); void ObjectEventTurnByLocalIdAndMap(u8, u8, u8, u8); void ObjectEventForceSetHeldMovement(struct ObjectEvent *, u8); const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8); -void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); +void ShowOrHideObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 state); void FreeAndReserveObjectSpritePalettes(void); -void sub_808E82C(u8, u8, u8, s16, s16); -void sub_805F400(u8, u8, u8); -void sub_805F3A8(u8, u8, u8, u8); +void SetObjectPositionByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); +void UnfixObjectPriorityByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup); +void SetObjectPriorityByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority); void sub_808E75C(s16, s16); void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup); void ShiftObjectEventCoords(struct ObjectEvent *, s16, s16); @@ -161,7 +161,7 @@ bool32 RfuUnionObjectIsInvisible(u8 objectEventId); void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo); bool32 RfuUnionObjectIsWarping(u8 objectEventId); u8 sub_80641C0(u32 direction); -void sub_805F378(s16 x, s16 y); +void EnableObjectGroundEffectsByXY(s16 x, s16 y); void MoveObjectEventToMapCoords(struct ObjectEvent *objectEvent, s16 x, s16 y); u8 CreateCopySpriteAt(struct Sprite * sprite, s16 x, s16 y, u8 subpriority); u16 GetObjectPaletteTag(u8 paletteIndex); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 28737b520..7544fe418 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -249,8 +249,8 @@ struct ObjectEvent struct ObjectEventGraphicsInfo { /*0x00*/ u16 tileTag; - /*0x02*/ u16 paletteTag1; - /*0x04*/ u16 paletteTag2; + /*0x02*/ u16 paletteTag; + /*0x04*/ u16 reflectionPaletteTag; /*0x06*/ u16 size; /*0x08*/ s16 width; /*0x0A*/ s16 height; diff --git a/include/sprite.h b/include/sprite.h index 8f95eb788..80480e201 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -317,7 +317,7 @@ u8 SpriteTileAllocBitmapOp(u16 bit, u8 op); void ClearSpriteCopyRequests(void); void ResetAffineAnimData(void); void sub_8007FFC(struct Sprite* sprite, s16 a2, s16 a3); -void sub_80075C0(struct Sprite *sprite); +void FreeSpriteTilesIfNotUsingSheet(struct Sprite *sprite); s16 AllocSpriteTiles(u16 tileCount); void obj_pos2_update_enable(struct Sprite* sprite, s16 xmod, s16 ymod); diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index c161ebe73..c39bf1672 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -1,4 +1,4 @@ -const u16 gObjectEventPal_8[] = INCBIN_U16("graphics/object_events/palettes/0.gbapal"); +const u16 gObjectEventPal_Player[] = INCBIN_U16("graphics/object_events/palettes/0.gbapal"); const u16 gUnknown_835B988[] = INCBIN_U16("graphics/object_events/palettes/unk_835B988.gbapal"); const u16 gObjectEventPaletteNull1[16] = {}; const u16 gObjectEventPaletteNull2[16] = {}; @@ -19,7 +19,7 @@ const u16 gObjectEventPic_RedSurfRun[] = INCBIN_U16("graphics/object_events/pics const u16 gObjectEventPic_GreenNormal[] = INCBIN_U16("graphics/object_events/pics/people/green_normal.4bpp"); const u16 gObjectEventPic_GreenSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/green_surf_run.4bpp"); const u16 gObjectEventPal_9[] = INCBIN_U16("graphics/object_events/palettes/1.gbapal"); -const u16 gObjectEventPal_10[] = INCBIN_U16("graphics/object_events/palettes/2.gbapal"); +const u16 gObjectEventPal_PlayerReflection[] = INCBIN_U16("graphics/object_events/palettes/2.gbapal"); const u16 gObjectEventPic_RedItem[] = INCBIN_U16("graphics/object_events/pics/people/red_item.4bpp"); const u16 gObjectEventPic_GreenItem[] = INCBIN_U16("graphics/object_events/pics/people/green_item.4bpp"); const u16 gObjectEventPic_RedSurf[] = INCBIN_U16("graphics/object_events/pics/people/red_surf.4bpp"); @@ -45,10 +45,10 @@ const u16 gObjectEventPic_Koga[] = INCBIN_U16("graphics/object_events/pics/peopl const u16 gObjectEventPic_Brock[] = INCBIN_U16("graphics/object_events/pics/people/brock.4bpp"); const u16 gObjectEventPic_LtSurge[] = INCBIN_U16("graphics/object_events/pics/people/lt_surge.4bpp"); const u16 gObjectEventPic_Bill[] = INCBIN_U16("graphics/object_events/pics/people/bill.4bpp"); -const u16 gObjectEventPal_0[] = INCBIN_U16("graphics/object_events/palettes/3.gbapal"); -const u16 gObjectEventPal_1[] = INCBIN_U16("graphics/object_events/palettes/4.gbapal"); -const u16 gObjectEventPal_2[] = INCBIN_U16("graphics/object_events/palettes/5.gbapal"); -const u16 gObjectEventPal_3[] = INCBIN_U16("graphics/object_events/palettes/6.gbapal"); +const u16 gObjectEventPal_NpcBlue[] = INCBIN_U16("graphics/object_events/palettes/3.gbapal"); +const u16 gObjectEventPal_NpcPink[] = INCBIN_U16("graphics/object_events/palettes/4.gbapal"); +const u16 gObjectEventPal_NpcGreen[] = INCBIN_U16("graphics/object_events/palettes/5.gbapal"); +const u16 gObjectEventPal_NpcWhite[] = INCBIN_U16("graphics/object_events/palettes/6.gbapal"); const u16 gObjectEventPal_4[] = INCBIN_U16("graphics/object_events/palettes/7.gbapal"); const u16 gObjectEventPal_5[] = INCBIN_U16("graphics/object_events/palettes/8.gbapal"); const u16 gObjectEventPal_6[] = INCBIN_U16("graphics/object_events/palettes/9.gbapal"); @@ -175,12 +175,12 @@ const u16 gObjectEventPic_GymSign[] = INCBIN_U16("graphics/object_events/pics/mi const u16 gObjectEventPic_Sign[] = INCBIN_U16("graphics/object_events/pics/misc/sign.4bpp"); const u16 gObjectEventPic_WoodenSign[] = INCBIN_U16("graphics/object_events/pics/misc/wooden_sign.4bpp"); const u16 gObjectEventPic_Clipboard[] = INCBIN_U16("graphics/object_events/pics/misc/clipboard.4bpp"); -const u16 gObjectEventPal_20[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal"); +const u16 gObjectEventPal_Meteorite[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal"); const u16 gObjectEventPic_BirthIslandStone[] = INCBIN_U16("graphics/object_events/pics/misc/birth_island_stone.4bpp"); const u16 gObjectEventPic_LaprasDoll[] = INCBIN_U16("graphics/object_events/pics/misc/lapras_doll.4bpp"); -const u16 gObjectEventPal_21[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal"); +const u16 gObjectEventPal_Seagallop[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal"); const u16 gObjectEventPic_Seagallop[] = INCBIN_U16("graphics/object_events/pics/misc/seagallop.4bpp"); -const u16 gObjectEventPal_11[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal"); +const u16 gObjectEventPal_SSAnne[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal"); const u16 gObjectEventPic_SSAnne[] = INCBIN_U16("graphics/object_events/pics/misc/ss_anne.4bpp"); const u16 gObjectEventPic_SurfBlob[] = INCBIN_U16("graphics/object_events/pics/misc/surf_blob.4bpp"); const u16 gObjectEventPic_Policeman[] = INCBIN_U16("graphics/object_events/pics/people/policeman.4bpp"); diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h index 41a883b40..5ff04e790 100644 --- a/src/data/object_events/object_event_graphics_info.h +++ b/src/data/object_events/object_event_graphics_info.h @@ -1,154 +1,154 @@ -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_RedNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenSurf, gObjectEventPicTable_RedSurf, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Policeman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Policeman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSBrendan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RSBrendan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSMay = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RSMay, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleBoy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleGirl, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SittingBoy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SittingBoy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lass, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Youngster, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman1, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman3, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BattleGirl, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BugCatcher, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_FatMan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaldingMan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BaldingMan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman2, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan1 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan1, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_WorkerM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_WorkerF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Beauty, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chef = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Chef, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan2 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan2, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldWoman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Camper, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Picnicker, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_CooltrainerM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_CooltrainerF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SuperNerd, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Channeler = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Channeler, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RocketF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerMWater = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerMWater, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFWater = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerFWater, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerMLand = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerMLand, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFLand = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerFLand, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Blackbelt, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Gentleman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sailor, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Captain = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Captain, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisher = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Fisher, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TeachyTVHost = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TeachyTVHost, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWoman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnusedWoman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMWater = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberMWater, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMLand = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberMLand, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Hiker, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Biker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Biker, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GymGuy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GymGuy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Nurse, gObjectEventPicTable_Nurse, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMaleReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnusedMaleReceptionist, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ItemBall, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfOak = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ProfOak, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rocker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Rocker, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrFuji = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MrFuji, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bruno = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Bruno, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldManLyingDown = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldManLyingDown, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CutTree = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_CutTree, gObjectEventPicTable_CutTree, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clerk = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Clerk, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MGDeliveryman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MGDeliveryman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TrainerTowerDude = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TrainerTowerDude, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableClubReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_CableClubReceptionist, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnionRoomReceptionist, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RockSmashRock = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_RockSmashRock, gObjectEventPicTable_RockSmashRock, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_StrengthBoulder = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_StrengthBoulder, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_GreenNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GreenBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenSurf, gObjectEventPicTable_GreenSurf, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A45F4 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RocketM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celio = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Celio, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Agatha = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Agatha, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brock = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brock, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Misty = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Misty, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LtSurge = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LtSurge, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Erika = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Erika, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Koga = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Koga, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giovanni = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Giovanni, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blaine = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Blaine, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sabrina = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sabrina, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bill = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Bill, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Daisy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Daisy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lorelei = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lorelei, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lance = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lance, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blue = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Blue, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_RedFish, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_GreenFish, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_RedVSSeekerBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_GreenVSSeekerBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TownMap = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 32, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TownMap, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pokedex = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Pokedex, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GBAKid = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GBAKid, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Snorlax = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Snorlax, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Fossil, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Ruby = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Ruby, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sapphire = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Sapphire, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldAmber = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_OldAmber, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GymSign = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GymSign, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sign = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Sign, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TrainerTips = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WoodenSign, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clipboard = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Clipboard, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Meteorite = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_20, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LaprasDoll = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_LaprasDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spearow = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Spearow, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Omanyte = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Omanyte, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kangaskhan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kangaskhan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Psyduck = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Psyduck, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NidoranF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_NidoranF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NidoranM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_NidoranM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nidorino = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Nidorino, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Meowth = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Meowth, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seel = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Seel, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Voltorb = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Voltorb, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Slowpoke = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Slowpoke, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Slowbro = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Slowbro, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Machop = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Machop, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wigglytuff = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wigglytuff, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Doduo = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Doduo, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fearow = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Fearow, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lapras = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lapras, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zapdos = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Zapdos, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Moltres = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Moltres, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Articuno = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Articuno, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysD = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DeoxysD, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysA = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DeoxysA, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysN = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DeoxysN, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mewtwo = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mewtwo, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mew, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Entei = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Entei, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Raikou = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Raikou, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Suicune = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Suicune, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lugia, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_HoOh, gObjectEventPicTable_HoOh, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celebi = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Celebi, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cubone = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cubone, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Machoke = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Machoke, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kabuto = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kabuto, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poliwrath = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Poliwrath, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pidgeot = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pidgeot, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chansey = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Chansey, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pikachu, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Jigglypuff = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Jigglypuff, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pidgey = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pidgey, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clefairy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Clefairy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mom, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seagallop = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_21, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Seagallop, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSAnne = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_11, OBJ_EVENT_PAL_TAG_NONE, 4096, 128, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_128x64, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSAnne, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_RedNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenSurf, gObjectEventPicTable_RedSurf, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Policeman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Policeman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSBrendan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RSBrendan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSMay = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RSMay, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleGirl, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SittingBoy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SittingBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lass, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Youngster, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BattleGirl, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BugCatcher, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_FatMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaldingMan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BaldingMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan1 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_WorkerM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_WorkerF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Beauty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chef = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Chef, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan2 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Camper, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Picnicker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_CooltrainerM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_CooltrainerF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SuperNerd, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Channeler = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Channeler, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RocketF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerMWater = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerMWater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFWater = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerFWater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerMLand = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerMLand, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFLand = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerFLand, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Blackbelt, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Gentleman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sailor, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Captain = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Captain, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisher = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Fisher, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TeachyTVHost = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TeachyTVHost, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWoman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnusedWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMWater = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberMWater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMLand = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberMLand, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Hiker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Biker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Biker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GymGuy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GymGuy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Nurse, gObjectEventPicTable_Nurse, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMaleReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnusedMaleReceptionist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ItemBall, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfOak = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ProfOak, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rocker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Rocker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrFuji = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MrFuji, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bruno = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Bruno, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldManLyingDown = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldManLyingDown, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CutTree = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_CutTree, gObjectEventPicTable_CutTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clerk = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Clerk, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MGDeliveryman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MGDeliveryman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TrainerTowerDude = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TrainerTowerDude, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableClubReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_CableClubReceptionist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnionRoomReceptionist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RockSmashRock = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_RockSmashRock, gObjectEventPicTable_RockSmashRock, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_StrengthBoulder = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_StrengthBoulder, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_GreenNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GreenBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenSurf, gObjectEventPicTable_GreenSurf, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A45F4 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RocketM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celio = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Celio, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Agatha = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Agatha, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brock = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brock, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Misty = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Misty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LtSurge = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LtSurge, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Erika = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Erika, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Koga = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Koga, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giovanni = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Giovanni, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blaine = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Blaine, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sabrina = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sabrina, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bill = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Bill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Daisy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Daisy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lorelei = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lorelei, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lance = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lance, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blue = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Blue, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_RedFish, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_GreenFish, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_RedVSSeekerBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_GreenVSSeekerBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TownMap = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 32, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TownMap, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pokedex = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Pokedex, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GBAKid = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GBAKid, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Snorlax = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Snorlax, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Fossil, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Ruby = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Ruby, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sapphire = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Sapphire, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldAmber = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_OldAmber, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GymSign = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GymSign, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sign = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Sign, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TrainerTips = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WoodenSign, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clipboard = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Clipboard, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Meteorite = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_METEORITE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LaprasDoll = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_LaprasDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spearow = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Spearow, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Omanyte = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Omanyte, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kangaskhan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kangaskhan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Psyduck = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Psyduck, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NidoranF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_NidoranF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NidoranM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_NidoranM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nidorino = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Nidorino, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Meowth = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Meowth, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seel = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Seel, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Voltorb = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Voltorb, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Slowpoke = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Slowpoke, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Slowbro = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Slowbro, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Machop = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Machop, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wigglytuff = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wigglytuff, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Doduo = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Doduo, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fearow = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Fearow, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lapras = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lapras, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zapdos = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Zapdos, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Moltres = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Moltres, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Articuno = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Articuno, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysD = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DeoxysD, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysA = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DeoxysA, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysN = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DeoxysN, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mewtwo = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mewtwo, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mew, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Entei = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Entei, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Raikou = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Raikou, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Suicune = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Suicune, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lugia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_HoOh, gObjectEventPicTable_HoOh, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celebi = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Celebi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cubone = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cubone, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Machoke = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Machoke, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kabuto = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kabuto, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poliwrath = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Poliwrath, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pidgeot = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pidgeot, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chansey = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Chansey, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pikachu, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Jigglypuff = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Jigglypuff, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pidgey = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pidgey, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clefairy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Clefairy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mom, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seagallop = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_SEAGALLOP, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Seagallop, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSAnne = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_SS_ANNE, OBJ_EVENT_PAL_TAG_NONE, 4096, 128, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_128x64, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSAnne, gDummySpriteAffineAnimTable}; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index fa5232e8e..c9524ee02 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -74,7 +74,7 @@ static void RemoveObjectEventIfOutsideView(struct ObjectEvent *); static void sub_805EE3C(u8, s16, s16); static void SetPlayerAvatarObjectEventIdAndObjectId(u8, u8); static void sub_805EFF4(struct ObjectEvent *); -static u8 sub_805F510(const struct SpritePalette *); +static u8 TryLoadObjectPalette(const struct SpritePalette *spritePalette); static u8 FindObjectEventPaletteIndexByTag(u16); static bool8 ObjectEventDoesZCoordMatch(struct ObjectEvent *, u8); static void ObjectCB_CameraObject(struct Sprite *); @@ -449,32 +449,33 @@ const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = [MOVEMENT_TYPE_WANDER_AROUND_SLOWEST] = DIR_SOUTH, }; -#define OBJ_EVENT_PAL_TAG_0 0x1103 -#define OBJ_EVENT_PAL_TAG_1 0x1104 -#define OBJ_EVENT_PAL_TAG_2 0x1105 -#define OBJ_EVENT_PAL_TAG_3 0x1106 +#define OBJ_EVENT_PAL_TAG_PLAYER_RED 0x1100 +#define OBJ_EVENT_PAL_TAG_9 0x1101 +#define OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION 0x1102 +#define OBJ_EVENT_PAL_TAG_NPC_BLUE 0x1103 +#define OBJ_EVENT_PAL_TAG_NPC_PINK 0x1104 +#define OBJ_EVENT_PAL_TAG_NPC_GREEN 0x1105 +#define OBJ_EVENT_PAL_TAG_NPC_WHITE 0x1106 #define OBJ_EVENT_PAL_TAG_4 0x1107 #define OBJ_EVENT_PAL_TAG_5 0x1108 #define OBJ_EVENT_PAL_TAG_6 0x1109 #define OBJ_EVENT_PAL_TAG_7 0x110A -#define OBJ_EVENT_PAL_TAG_8 0x1100 -#define OBJ_EVENT_PAL_TAG_9 0x1101 -#define OBJ_EVENT_PAL_TAG_10 0x1102 -#define OBJ_EVENT_PAL_TAG_11 0x1115 #define OBJ_EVENT_PAL_TAG_12 0x110B #define OBJ_EVENT_PAL_TAG_13 0x110C #define OBJ_EVENT_PAL_TAG_14 0x110D #define OBJ_EVENT_PAL_TAG_15 0x110E #define OBJ_EVENT_PAL_TAG_16 0x110F -#define OBJ_EVENT_PAL_TAG_17 0x1110 +#define OBJ_EVENT_PAL_TAG_PLAYER_GREEN 0x1110 #define OBJ_EVENT_PAL_TAG_18 0x1111 #define OBJ_EVENT_PAL_TAG_19 0x1112 -#define OBJ_EVENT_PAL_TAG_20 0x1113 -#define OBJ_EVENT_PAL_TAG_21 0x1114 +#define OBJ_EVENT_PAL_TAG_METEORITE 0x1113 +#define OBJ_EVENT_PAL_TAG_SEAGALLOP 0x1114 +#define OBJ_EVENT_PAL_TAG_SS_ANNE 0x1115 #define OBJ_EVENT_PAL_TAG_22 0x1116 #define OBJ_EVENT_PAL_TAG_23 0x1117 #define OBJ_EVENT_PAL_TAG_24 0x1118 #define OBJ_EVENT_PAL_TAG_25 0x1119 +#define OBJ_EVENT_PAL_TAG_x011A 0x111A #define OBJ_EVENT_PAL_TAG_26 0x111B #define OBJ_EVENT_PAL_TAG_27 0x111C #define OBJ_EVENT_PAL_TAG_28 0x111D @@ -495,24 +496,24 @@ const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = #include "data/object_events/object_event_graphics_info.h" static const struct SpritePalette sObjectEventSpritePalettes[] = { - {gObjectEventPal_0, OBJ_EVENT_PAL_TAG_0}, - {gObjectEventPal_1, OBJ_EVENT_PAL_TAG_1}, - {gObjectEventPal_2, OBJ_EVENT_PAL_TAG_2}, - {gObjectEventPal_3, OBJ_EVENT_PAL_TAG_3}, - {gObjectEventPal_4, OBJ_EVENT_PAL_TAG_4}, - {gObjectEventPal_5, OBJ_EVENT_PAL_TAG_5}, - {gObjectEventPal_6, OBJ_EVENT_PAL_TAG_6}, - {gObjectEventPal_7, OBJ_EVENT_PAL_TAG_7}, - {gObjectEventPal_8, OBJ_EVENT_PAL_TAG_8}, - {gObjectEventPal_9, OBJ_EVENT_PAL_TAG_9}, - {gObjectEventPal_10, OBJ_EVENT_PAL_TAG_10}, - {gObjectEventPal_12, OBJ_EVENT_PAL_TAG_12}, - {gObjectEventPal_13, OBJ_EVENT_PAL_TAG_13}, - {gObjectEventPal_8, OBJ_EVENT_PAL_TAG_17}, - {gObjectEventPal_9, OBJ_EVENT_PAL_TAG_18}, - {gObjectEventPal_20, OBJ_EVENT_PAL_TAG_20}, - {gObjectEventPal_11, OBJ_EVENT_PAL_TAG_11}, - {gObjectEventPal_21, OBJ_EVENT_PAL_TAG_21}, + {gObjectEventPal_NpcBlue, OBJ_EVENT_PAL_TAG_NPC_BLUE}, + {gObjectEventPal_NpcPink, OBJ_EVENT_PAL_TAG_NPC_PINK}, + {gObjectEventPal_NpcGreen, OBJ_EVENT_PAL_TAG_NPC_GREEN}, + {gObjectEventPal_NpcWhite, OBJ_EVENT_PAL_TAG_NPC_WHITE}, + {gObjectEventPal_4, OBJ_EVENT_PAL_TAG_4}, + {gObjectEventPal_5, OBJ_EVENT_PAL_TAG_5}, + {gObjectEventPal_6, OBJ_EVENT_PAL_TAG_6}, + {gObjectEventPal_7, OBJ_EVENT_PAL_TAG_7}, + {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_RED}, + {gObjectEventPal_9, OBJ_EVENT_PAL_TAG_9}, + {gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION}, + {gObjectEventPal_12, OBJ_EVENT_PAL_TAG_12}, + {gObjectEventPal_13, OBJ_EVENT_PAL_TAG_13}, + {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_GREEN}, + {gObjectEventPal_9, OBJ_EVENT_PAL_TAG_18}, + {gObjectEventPal_Meteorite, OBJ_EVENT_PAL_TAG_METEORITE}, + {gObjectEventPal_SSAnne, OBJ_EVENT_PAL_TAG_SS_ANNE}, + {gObjectEventPal_Seagallop, OBJ_EVENT_PAL_TAG_SEAGALLOP}, {}, }; @@ -538,9 +539,9 @@ const u16 gUnknownPaletteTags_83A5200[] = { }; const struct PairedPalettes gPlayerReflectionPaletteSets[] = { - {OBJ_EVENT_PAL_TAG_8, gPlayerReflectionPaletteTags}, - {OBJ_EVENT_PAL_TAG_17, gPlayerReflectionPaletteTags}, - {OBJ_EVENT_PAL_TAG_22, gUnknownPaletteTags_83A5200}, + {OBJ_EVENT_PAL_TAG_PLAYER_RED, gPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_PLAYER_GREEN, gPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_22, gUnknownPaletteTags_83A5200}, {OBJ_EVENT_PAL_TAG_NONE, NULL}, }; @@ -572,18 +573,18 @@ const u16 gUnknownPaletteTags_83A5240[] = { OBJ_EVENT_PAL_TAG_19, }; -const u16 gUnknownPaletteTags_83A5248[] = { - OBJ_EVENT_PAL_TAG_20, - OBJ_EVENT_PAL_TAG_20, - OBJ_EVENT_PAL_TAG_20, - OBJ_EVENT_PAL_TAG_20, +const u16 gMeteoriteReflectionPaletteTags[] = { + OBJ_EVENT_PAL_TAG_METEORITE, + OBJ_EVENT_PAL_TAG_METEORITE, + OBJ_EVENT_PAL_TAG_METEORITE, + OBJ_EVENT_PAL_TAG_METEORITE, }; -const u16 gUnknownPaletteTags_83A5250[] = { - OBJ_EVENT_PAL_TAG_21, - OBJ_EVENT_PAL_TAG_21, - OBJ_EVENT_PAL_TAG_21, - OBJ_EVENT_PAL_TAG_21, +const u16 gSeagallopReflectionPaletteTags[] = { + OBJ_EVENT_PAL_TAG_SEAGALLOP, + OBJ_EVENT_PAL_TAG_SEAGALLOP, + OBJ_EVENT_PAL_TAG_SEAGALLOP, + OBJ_EVENT_PAL_TAG_SEAGALLOP, }; const u16 gUnknownPaletteTags_83A5258[] = { @@ -601,10 +602,10 @@ const u16 gUnknownPaletteTags_83A5260[] = { }; const u16 gUnknownPaletteTags_83A5268[] = { - 0x111a, - 0x111a, - 0x111a, - 0x111a, + OBJ_EVENT_PAL_TAG_x011A, + OBJ_EVENT_PAL_TAG_x011A, + OBJ_EVENT_PAL_TAG_x011A, + OBJ_EVENT_PAL_TAG_x011A, }; const u16 gUnknownPaletteTags_83A5270[] = { @@ -615,28 +616,28 @@ const u16 gUnknownPaletteTags_83A5270[] = { }; const struct PairedPalettes gSpecialObjectReflectionPaletteSets[] = { - {OBJ_EVENT_PAL_TAG_8, gPlayerReflectionPaletteTags}, - {OBJ_EVENT_PAL_TAG_17, gPlayerReflectionPaletteTags}, - {OBJ_EVENT_PAL_TAG_12, gUnknownPaletteTags_83A5228}, - {OBJ_EVENT_PAL_TAG_14, gUnknownPaletteTags_83A5230}, - {OBJ_EVENT_PAL_TAG_15, gUnknownPaletteTags_83A5238}, - {OBJ_EVENT_PAL_TAG_19, gUnknownPaletteTags_83A5240}, - {OBJ_EVENT_PAL_TAG_20, gUnknownPaletteTags_83A5248}, - {OBJ_EVENT_PAL_TAG_21, gUnknownPaletteTags_83A5250}, - {OBJ_EVENT_PAL_TAG_23, gUnknownPaletteTags_83A5260}, - {OBJ_EVENT_PAL_TAG_25, gUnknownPaletteTags_83A5268}, - {OBJ_EVENT_PAL_TAG_2, gUnknownPaletteTags_83A5270}, - {OBJ_EVENT_PAL_TAG_26, gUnknownPaletteTags_83A5258}, + {OBJ_EVENT_PAL_TAG_PLAYER_RED, gPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_PLAYER_GREEN, gPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_12, gUnknownPaletteTags_83A5228}, + {OBJ_EVENT_PAL_TAG_14, gUnknownPaletteTags_83A5230}, + {OBJ_EVENT_PAL_TAG_15, gUnknownPaletteTags_83A5238}, + {OBJ_EVENT_PAL_TAG_19, gUnknownPaletteTags_83A5240}, + {OBJ_EVENT_PAL_TAG_METEORITE, gMeteoriteReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_SEAGALLOP, gSeagallopReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_23, gUnknownPaletteTags_83A5260}, + {OBJ_EVENT_PAL_TAG_25, gUnknownPaletteTags_83A5268}, + {OBJ_EVENT_PAL_TAG_NPC_GREEN, gUnknownPaletteTags_83A5270}, + {OBJ_EVENT_PAL_TAG_26, gUnknownPaletteTags_83A5258}, {OBJ_EVENT_PAL_TAG_NONE, NULL}, }; const u16 gUnknownPaletteTags_83A52E0[] = { - OBJ_EVENT_PAL_TAG_8, + OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_9, - OBJ_EVENT_PAL_TAG_0, - OBJ_EVENT_PAL_TAG_1, - OBJ_EVENT_PAL_TAG_2, - OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_NPC_BLUE, + OBJ_EVENT_PAL_TAG_NPC_PINK, + OBJ_EVENT_PAL_TAG_NPC_GREEN, + OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_4, OBJ_EVENT_PAL_TAG_5, OBJ_EVENT_PAL_TAG_6, @@ -644,12 +645,12 @@ const u16 gUnknownPaletteTags_83A52E0[] = { }; const u16 gUnknownPaletteTags_83A52F4[] = { - OBJ_EVENT_PAL_TAG_8, - OBJ_EVENT_PAL_TAG_17, - OBJ_EVENT_PAL_TAG_0, - OBJ_EVENT_PAL_TAG_1, - OBJ_EVENT_PAL_TAG_2, - OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_PLAYER_RED, + OBJ_EVENT_PAL_TAG_PLAYER_GREEN, + OBJ_EVENT_PAL_TAG_NPC_BLUE, + OBJ_EVENT_PAL_TAG_NPC_PINK, + OBJ_EVENT_PAL_TAG_NPC_GREEN, + OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_4, OBJ_EVENT_PAL_TAG_5, OBJ_EVENT_PAL_TAG_6, @@ -657,12 +658,12 @@ const u16 gUnknownPaletteTags_83A52F4[] = { }; const u16 gUnknownPaletteTags_83A5308[] = { - OBJ_EVENT_PAL_TAG_8, + OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_9, - OBJ_EVENT_PAL_TAG_0, - OBJ_EVENT_PAL_TAG_1, - OBJ_EVENT_PAL_TAG_2, - OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_NPC_BLUE, + OBJ_EVENT_PAL_TAG_NPC_PINK, + OBJ_EVENT_PAL_TAG_NPC_GREEN, + OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_4, OBJ_EVENT_PAL_TAG_5, OBJ_EVENT_PAL_TAG_6, @@ -670,12 +671,12 @@ const u16 gUnknownPaletteTags_83A5308[] = { }; const u16 gUnknownPaletteTags_83A531C[] = { - OBJ_EVENT_PAL_TAG_8, + OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_9, - OBJ_EVENT_PAL_TAG_0, - OBJ_EVENT_PAL_TAG_1, - OBJ_EVENT_PAL_TAG_2, - OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_NPC_BLUE, + OBJ_EVENT_PAL_TAG_NPC_PINK, + OBJ_EVENT_PAL_TAG_NPC_GREEN, + OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_4, OBJ_EVENT_PAL_TAG_5, OBJ_EVENT_PAL_TAG_6, @@ -1607,11 +1608,11 @@ static u8 TrySetupObjectEventSprite(struct ObjectEventTemplate *objectEventTempl graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (graphicsInfo->paletteSlot == 0) { - LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); + LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); } else if (graphicsInfo->paletteSlot == 10) { - LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); + LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); } if (objectEvent->movementType == MOVEMENT_TYPE_INVISIBLE) @@ -1714,7 +1715,7 @@ void MakeObjectTemplateFromObjectEventGraphicsInfo(u16 graphicsId, void (*callba const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); spriteTemplate->tileTag = graphicsInfo->tileTag; - spriteTemplate->paletteTag = graphicsInfo->paletteTag1; + spriteTemplate->paletteTag = graphicsInfo->paletteTag; spriteTemplate->oam = graphicsInfo->oam; spriteTemplate->anims = graphicsInfo->anims; spriteTemplate->images = graphicsInfo->images; @@ -1788,7 +1789,7 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) sprite->data[1] = z; if (graphicsInfo->paletteSlot == 10) { - LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); + LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); } if (subspriteTables != NULL) @@ -1825,7 +1826,7 @@ u8 sub_805EB44(u8 graphicsId, u8 a1, s16 x, s16 y) sprite->data[0] = a1; if (graphicsInfo->paletteSlot == 10) { - LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); + LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); } if (subspriteTables != NULL) @@ -1948,11 +1949,11 @@ static void sub_805EE3C(u8 objectEventId, s16 x, s16 y) *(u16 *)&spriteTemplate.paletteTag = SPRITE_INVALID_TAG; if (graphicsInfo->paletteSlot == 0) { - LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); + LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); } if (graphicsInfo->paletteSlot > 9) { - LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); + LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); } *(u16 *)&spriteTemplate.paletteTag = SPRITE_INVALID_TAG; spriteId = CreateSprite(&spriteTemplate, 0, 0, 0); @@ -2019,17 +2020,17 @@ void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 graphicsId) sprite = &gSprites[objectEvent->spriteId]; if (graphicsInfo->paletteSlot == 0) { - PatchObjectPalette(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); + PatchObjectPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); } if (graphicsInfo->paletteSlot == 10) { - LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot); + LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); } var = sprite->images->size / TILE_SIZE_4BPP; if (!sprite->usingSheet) { - sub_80075C0(sprite); + FreeSpriteTilesIfNotUsingSheet(sprite); } sprite->oam.shape = graphicsInfo->oam->shape; sprite->oam.size = graphicsInfo->oam->size; @@ -2115,7 +2116,7 @@ static void SetObjectEventDynamicGraphicsId(struct ObjectEvent *objectEvent) } } -void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGroup, u8 state) +void ShowOrHideObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 state) { u8 objectEventId; @@ -2132,7 +2133,7 @@ void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, *(u8*)(mapGroup) = objectEvent->mapGroup; } -void sub_805F378(s16 x, s16 y) +void EnableObjectGroundEffectsByXY(s16 x, s16 y) { u8 objectEventId; struct ObjectEvent *objectEvent; @@ -2145,7 +2146,7 @@ void sub_805F378(s16 x, s16 y) } } -void sub_805F3A8(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority) +void SetObjectPriorityByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority) { u8 objectEventId; struct ObjectEvent *objectEvent; @@ -2160,7 +2161,7 @@ void sub_805F3A8(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority) } } -void sub_805F400(u8 localId, u8 mapNum, u8 mapGroup) +void UnfixObjectPriorityByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { u8 objectEventId; struct ObjectEvent *objectEvent; @@ -2173,7 +2174,7 @@ void sub_805F400(u8 localId, u8 mapNum, u8 mapGroup) } } -void sub_808E82C(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) +void SetObjectPositionByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { u8 objectEventId; struct Sprite *sprite; @@ -2196,9 +2197,13 @@ static void LoadObjectEventPalette(u16 paletteTag) { u16 i = FindObjectEventPaletteIndexByTag(paletteTag); +#ifdef BUGFIX + if (sObjectEventSpritePalettes[i].tag != OBJ_EVENT_PAL_TAG_NONE) +#else if (i != OBJ_EVENT_PAL_TAG_NONE) // always true +#endif { - sub_805F510(&sObjectEventSpritePalettes[i]); + TryLoadObjectPalette(&sObjectEventSpritePalettes[i]); } } @@ -2212,10 +2217,11 @@ void Unused_LoadObjectEventPaletteSet(u16 *paletteTags) } } -static u8 sub_805F510(const struct SpritePalette *spritePalette) +static u8 TryLoadObjectPalette(const struct SpritePalette *spritePalette) { if (IndexOfSpritePaletteTag(spritePalette->tag) != 0xFF) { + // Already loaded return 0xFF; } return LoadSpritePalette(spritePalette); diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index a311a10f9..fd4198712 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -78,15 +78,15 @@ static void LoadObjectRegularReflectionPalette(struct ObjectEvent * objectEvent, const struct ObjectEventGraphicsInfo * graphicsInfo; graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); - if (graphicsInfo->paletteTag2 != OBJ_EVENT_PAL_TAG_NONE) + if (graphicsInfo->reflectionPaletteTag != OBJ_EVENT_PAL_TAG_NONE) { if (graphicsInfo->paletteSlot == 0) { - LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag1, paletteIndex); + LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, paletteIndex); } else if (graphicsInfo->paletteSlot == 10) { - LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag1, paletteIndex); + LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, paletteIndex); } else { @@ -103,9 +103,9 @@ static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent * objectEve const struct ObjectEventGraphicsInfo * graphicsInfo; graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); - if (graphicsInfo->paletteTag2 != OBJ_EVENT_PAL_TAG_NONE) + if (graphicsInfo->reflectionPaletteTag != OBJ_EVENT_PAL_TAG_NONE) { - PatchObjectPalette(graphicsInfo->paletteTag2, paletteNum); + PatchObjectPalette(graphicsInfo->reflectionPaletteTag, paletteNum); UpdateSpritePaletteWithWeather(paletteNum); } } diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 2286f49ed..c731072c6 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -219,7 +219,7 @@ bool8 FldEff_CutGrass(void) if (MetatileAtCoordsIsGrassTile(x, y) == TRUE) { SetCutGrassMetatileAt(x, y); - sub_805F378(x, y); + EnableObjectGroundEffectsByXY(x, y); } } } diff --git a/src/scrcmd.c b/src/scrcmd.c index 69acf7b7b..224da3ef4 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1106,7 +1106,7 @@ bool8 ScrCmd_showobject_at(struct ScriptContext * ctx) u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); - npc_by_local_id_and_map_set_field_1_bit_x20(localId, mapNum, mapGroup, 0); + ShowOrHideObjectByLocalIdAndMap(localId, mapNum, mapGroup, 0); return FALSE; } @@ -1116,7 +1116,7 @@ bool8 ScrCmd_hideobject_at(struct ScriptContext * ctx) u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); - npc_by_local_id_and_map_set_field_1_bit_x20(localId, mapNum, mapGroup, 1); + ShowOrHideObjectByLocalIdAndMap(localId, mapNum, mapGroup, 1); return FALSE; } @@ -1127,7 +1127,7 @@ bool8 ScrCmd_setobjectpriority(struct ScriptContext * ctx) u8 mapNum = ScriptReadByte(ctx); u8 priority = ScriptReadByte(ctx); - sub_805F3A8(localId, mapNum, mapGroup, priority + 83); + SetObjectPriorityByLocalIdAndMap(localId, mapNum, mapGroup, priority + 83); return FALSE; } @@ -1137,7 +1137,7 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext * ctx) u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); - sub_805F400(localId, mapNum, mapGroup); + UnfixObjectPriorityByLocalIdAndMap(localId, mapNum, mapGroup); return FALSE; } diff --git a/src/sprite.c b/src/sprite.c index a71edce1c..af03aaf11 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -11,17 +11,17 @@ (sSpriteTileRanges + 1)[index * 2] = count; \ } -#define ALLOC_SPRITE_TILE(n) \ -{ \ - gSpriteTileAllocBitmap[(n) / 8] |= (1 << ((n) % 8)); \ +#define ALLOC_SPRITE_TILE(n) \ +{ \ + gSpriteTileAllocBitmap[(n) >> 3] |= (1 << ((n) & 7)); \ } -#define FREE_SPRITE_TILE(n) \ -{ \ - gSpriteTileAllocBitmap[(n) / 8] &= ~(1 << ((n) % 8)); \ +#define FREE_SPRITE_TILE(n) \ +{ \ + gSpriteTileAllocBitmap[(n) >> 3] &= ~(1 << ((n) & 7)); \ } -#define SPRITE_TILE_IS_ALLOCATED(n) ((gSpriteTileAllocBitmap[(n) / 8] >> ((n) % 8)) & 1) +#define SPRITE_TILE_IS_ALLOCATED(n) ((gSpriteTileAllocBitmap[(n) >> 3] >> ((n) & 7)) & 1) struct SpriteCopyRequest @@ -782,17 +782,17 @@ u8 SpriteTileAllocBitmapOp(u16 bit, u8 op) u8 val = bit % 8; u8 retVal = 0; - if (op == 0) + if (op == 0) // clear { val = ~(1 << val); gSpriteTileAllocBitmap[index] &= val; } - else if (op == 1) + else if (op == 1) // set { val = (1 << val); gSpriteTileAllocBitmap[index] |= val; } - else + else // check { retVal = 1 << shift; retVal &= gSpriteTileAllocBitmap[index]; @@ -801,7 +801,7 @@ u8 SpriteTileAllocBitmapOp(u16 bit, u8 op) return retVal; } -void sub_80075C0(struct Sprite *sprite) +void FreeSpriteTilesIfNotUsingSheet(struct Sprite *sprite) { if (!sprite->usingSheet) { @@ -809,7 +809,7 @@ void sub_80075C0(struct Sprite *sprite) int end = (sprite->images[0].size / TILE_SIZE_4BPP) + sprite->oam.tileNum; for (i = sprite->oam.tileNum; i < end; i++) - gSpriteTileAllocBitmap[i >> 3] &= ~(1 << (i & 7)); + FREE_SPRITE_TILE(i); } } -- cgit v1.2.3 From a64b074e7dd28a88719515ebe3ea152d42dbf1ff Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 8 May 2021 11:34:38 -0400 Subject: Rename palette tags and files --- graphics/field_effects/pics/shadow_extra_large.png | Bin 98 -> 165 bytes graphics/field_effects/pics/shadow_large.png | Bin 89 -> 157 bytes graphics/field_effects/pics/shadow_medium.png | Bin 88 -> 156 bytes graphics/field_effects/pics/shadow_small.png | Bin 86 -> 156 bytes graphics/object_events/palettes/0.pal | 19 ---- graphics/object_events/palettes/1.pal | 19 ---- graphics/object_events/palettes/10.pal | 19 ---- graphics/object_events/palettes/16.pal | 19 ---- graphics/object_events/palettes/17.pal | 19 ---- graphics/object_events/palettes/19.pal | 19 ---- graphics/object_events/palettes/2.pal | 19 ---- graphics/object_events/palettes/20.pal | 19 ---- graphics/object_events/palettes/21.pal | 19 ---- graphics/object_events/palettes/3.pal | 19 ---- graphics/object_events/palettes/4.pal | 19 ---- graphics/object_events/palettes/5.pal | 19 ---- graphics/object_events/palettes/6.pal | 19 ---- graphics/object_events/palettes/7.pal | 19 ---- graphics/object_events/palettes/8.pal | 19 ---- graphics/object_events/palettes/9.pal | 19 ---- graphics/object_events/palettes/meteorite.pal | 19 ++++ graphics/object_events/palettes/npc_blue.pal | 19 ++++ .../object_events/palettes/npc_blue_reflection.pal | 19 ++++ graphics/object_events/palettes/npc_green.pal | 19 ++++ .../palettes/npc_green_reflection.pal | 19 ++++ graphics/object_events/palettes/npc_pink.pal | 19 ++++ .../object_events/palettes/npc_pink_reflection.pal | 19 ++++ graphics/object_events/palettes/npc_white.pal | 19 ++++ .../palettes/npc_white_reflection.pal | 19 ++++ graphics/object_events/palettes/player.pal | 19 ++++ .../object_events/palettes/player_reflection.pal | 19 ++++ .../palettes/player_reflection_dummy.pal | 19 ++++ graphics/object_events/palettes/seagallop.pal | 19 ++++ graphics/object_events/palettes/ss_anne.pal | 19 ++++ include/event_object_movement.h | 2 +- src/data/object_events/object_event_graphics.h | 28 ++--- .../object_events/object_event_graphics_info.h | 26 ++--- src/event_object_movement.c | 120 ++++++++++----------- src/overworld.c | 12 +-- 39 files changed, 360 insertions(+), 398 deletions(-) delete mode 100644 graphics/object_events/palettes/0.pal delete mode 100644 graphics/object_events/palettes/1.pal delete mode 100644 graphics/object_events/palettes/10.pal delete mode 100644 graphics/object_events/palettes/16.pal delete mode 100644 graphics/object_events/palettes/17.pal delete mode 100644 graphics/object_events/palettes/19.pal delete mode 100644 graphics/object_events/palettes/2.pal delete mode 100644 graphics/object_events/palettes/20.pal delete mode 100644 graphics/object_events/palettes/21.pal delete mode 100644 graphics/object_events/palettes/3.pal delete mode 100644 graphics/object_events/palettes/4.pal delete mode 100644 graphics/object_events/palettes/5.pal delete mode 100644 graphics/object_events/palettes/6.pal delete mode 100644 graphics/object_events/palettes/7.pal delete mode 100644 graphics/object_events/palettes/8.pal delete mode 100644 graphics/object_events/palettes/9.pal create mode 100644 graphics/object_events/palettes/meteorite.pal create mode 100644 graphics/object_events/palettes/npc_blue.pal create mode 100644 graphics/object_events/palettes/npc_blue_reflection.pal create mode 100644 graphics/object_events/palettes/npc_green.pal create mode 100644 graphics/object_events/palettes/npc_green_reflection.pal create mode 100644 graphics/object_events/palettes/npc_pink.pal create mode 100644 graphics/object_events/palettes/npc_pink_reflection.pal create mode 100644 graphics/object_events/palettes/npc_white.pal create mode 100644 graphics/object_events/palettes/npc_white_reflection.pal create mode 100644 graphics/object_events/palettes/player.pal create mode 100644 graphics/object_events/palettes/player_reflection.pal create mode 100644 graphics/object_events/palettes/player_reflection_dummy.pal create mode 100644 graphics/object_events/palettes/seagallop.pal create mode 100644 graphics/object_events/palettes/ss_anne.pal diff --git a/graphics/field_effects/pics/shadow_extra_large.png b/graphics/field_effects/pics/shadow_extra_large.png index 567c63948..e632205e7 100644 Binary files a/graphics/field_effects/pics/shadow_extra_large.png and b/graphics/field_effects/pics/shadow_extra_large.png differ diff --git a/graphics/field_effects/pics/shadow_large.png b/graphics/field_effects/pics/shadow_large.png index 8cf80f166..e11f5e0bf 100644 Binary files a/graphics/field_effects/pics/shadow_large.png and b/graphics/field_effects/pics/shadow_large.png differ diff --git a/graphics/field_effects/pics/shadow_medium.png b/graphics/field_effects/pics/shadow_medium.png index 264230afd..59cf53206 100644 Binary files a/graphics/field_effects/pics/shadow_medium.png and b/graphics/field_effects/pics/shadow_medium.png differ diff --git a/graphics/field_effects/pics/shadow_small.png b/graphics/field_effects/pics/shadow_small.png index 204d6afad..b231fc083 100644 Binary files a/graphics/field_effects/pics/shadow_small.png and b/graphics/field_effects/pics/shadow_small.png differ diff --git a/graphics/object_events/palettes/0.pal b/graphics/object_events/palettes/0.pal deleted file mode 100644 index 3097a6556..000000000 --- a/graphics/object_events/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -131 123 164 -172 123 65 -255 197 148 -222 148 115 -123 65 65 -65 65 213 -57 57 123 -115 164 197 -106 41 41 -238 238 255 -180 180 213 -255 106 74 -197 57 57 -255 222 90 -189 156 57 -0 0 0 diff --git a/graphics/object_events/palettes/1.pal b/graphics/object_events/palettes/1.pal deleted file mode 100644 index 5537faa0f..000000000 --- a/graphics/object_events/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -197 255 246 -238 189 180 -255 255 230 -255 230 197 -205 148 148 -123 164 238 -115 131 197 -172 213 255 -172 123 98 -255 255 255 -222 222 255 -255 230 172 -255 172 172 -255 255 172 -230 205 115 -82 82 82 diff --git a/graphics/object_events/palettes/10.pal b/graphics/object_events/palettes/10.pal deleted file mode 100644 index ae8272ec4..000000000 --- a/graphics/object_events/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -98 172 238 -255 255 255 -255 255 230 -255 230 197 -205 148 148 -230 205 131 -205 180 106 -164 139 65 -255 197 139 -246 156 106 -205 115 90 -222 222 230 -180 180 180 -139 139 148 -255 255 255 -82 82 82 diff --git a/graphics/object_events/palettes/16.pal b/graphics/object_events/palettes/16.pal deleted file mode 100644 index 3097a6556..000000000 --- a/graphics/object_events/palettes/16.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -131 123 164 -172 123 65 -255 197 148 -222 148 115 -123 65 65 -65 65 213 -57 57 123 -115 164 197 -106 41 41 -238 238 255 -180 180 213 -255 106 74 -197 57 57 -255 222 90 -189 156 57 -0 0 0 diff --git a/graphics/object_events/palettes/17.pal b/graphics/object_events/palettes/17.pal deleted file mode 100644 index 5537faa0f..000000000 --- a/graphics/object_events/palettes/17.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -197 255 246 -238 189 180 -255 255 230 -255 230 197 -205 148 148 -123 164 238 -115 131 197 -172 213 255 -172 123 98 -255 255 255 -222 222 255 -255 230 172 -255 172 172 -255 255 172 -230 205 115 -82 82 82 diff --git a/graphics/object_events/palettes/19.pal b/graphics/object_events/palettes/19.pal deleted file mode 100644 index c20bacb57..000000000 --- a/graphics/object_events/palettes/19.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 156 197 -32 32 32 -82 82 82 -139 139 139 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/object_events/palettes/2.pal b/graphics/object_events/palettes/2.pal deleted file mode 100644 index 0cebd6c4d..000000000 --- a/graphics/object_events/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 diff --git a/graphics/object_events/palettes/20.pal b/graphics/object_events/palettes/20.pal deleted file mode 100644 index c25501332..000000000 --- a/graphics/object_events/palettes/20.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -65 123 180 -238 246 255 -222 230 238 -189 205 230 -156 164 189 -139 139 156 -98 98 123 -57 57 106 -197 98 98 -172 65 106 -32 74 156 -197 148 0 -246 213 24 -222 238 255 -255 255 255 -74 106 139 diff --git a/graphics/object_events/palettes/21.pal b/graphics/object_events/palettes/21.pal deleted file mode 100644 index cf19fedfa..000000000 --- a/graphics/object_events/palettes/21.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -57 115 180 -49 131 197 -65 65 82 -139 106 57 -32 82 139 -189 90 32 -222 156 49 -246 205 74 -172 148 90 -82 82 106 -213 213 238 -106 106 139 -131 139 172 -205 180 123 -255 255 255 -16 16 24 diff --git a/graphics/object_events/palettes/3.pal b/graphics/object_events/palettes/3.pal deleted file mode 100644 index c62e8ce06..000000000 --- a/graphics/object_events/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -246 189 148 -222 148 115 -123 65 65 -255 222 74 -213 172 32 -131 98 0 -164 139 238 -106 82 189 -65 57 98 -238 115 65 -172 65 57 -74 49 49 -255 255 255 -0 0 0 diff --git a/graphics/object_events/palettes/4.pal b/graphics/object_events/palettes/4.pal deleted file mode 100644 index e245ba013..000000000 --- a/graphics/object_events/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -246 189 148 -222 148 115 -123 65 65 -255 164 180 -213 106 123 -139 65 82 -148 197 238 -98 131 205 -57 57 74 -197 197 213 -139 139 148 -74 74 90 -255 255 255 -0 0 0 diff --git a/graphics/object_events/palettes/5.pal b/graphics/object_events/palettes/5.pal deleted file mode 100644 index 0c60b08a5..000000000 --- a/graphics/object_events/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -246 189 148 -222 148 115 -123 65 65 -222 189 65 -164 131 32 -82 82 32 -131 205 49 -57 139 0 -32 65 16 -222 148 189 -164 74 131 -82 32 65 -255 255 255 -0 0 0 diff --git a/graphics/object_events/palettes/6.pal b/graphics/object_events/palettes/6.pal deleted file mode 100644 index 1646e805e..000000000 --- a/graphics/object_events/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -246 189 148 -222 148 115 -123 65 65 -205 172 98 -123 115 65 -57 57 24 -230 106 74 -148 57 41 -82 16 0 -197 197 213 -139 139 148 -74 74 90 -255 255 255 -0 0 0 diff --git a/graphics/object_events/palettes/7.pal b/graphics/object_events/palettes/7.pal deleted file mode 100644 index 9fdd95ccc..000000000 --- a/graphics/object_events/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -98 172 238 -255 255 255 -255 255 230 -255 230 197 -205 148 148 -255 255 139 -246 230 65 -238 197 32 -197 222 238 -156 180 230 -131 148 205 -255 197 139 -246 156 106 -205 115 90 -255 255 255 -82 82 82 diff --git a/graphics/object_events/palettes/8.pal b/graphics/object_events/palettes/8.pal deleted file mode 100644 index d0e386c7c..000000000 --- a/graphics/object_events/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -98 172 238 -255 255 255 -255 255 230 -255 230 197 -205 148 148 -255 222 238 -255 180 205 -238 164 172 -205 255 255 -180 230 255 -123 164 213 -222 222 230 -180 180 180 -139 139 148 -255 255 255 -82 82 82 diff --git a/graphics/object_events/palettes/9.pal b/graphics/object_events/palettes/9.pal deleted file mode 100644 index ae24bbfe4..000000000 --- a/graphics/object_events/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -98 172 238 -255 255 255 -255 255 230 -255 230 197 -205 148 148 -238 222 98 -222 197 74 -197 172 65 -164 238 148 -131 205 123 -106 172 74 -246 156 213 -213 131 189 -189 115 148 -255 255 255 -82 82 82 diff --git a/graphics/object_events/palettes/meteorite.pal b/graphics/object_events/palettes/meteorite.pal new file mode 100644 index 000000000..c20bacb57 --- /dev/null +++ b/graphics/object_events/palettes/meteorite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 156 197 +32 32 32 +82 82 82 +139 139 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/object_events/palettes/npc_blue.pal b/graphics/object_events/palettes/npc_blue.pal new file mode 100644 index 000000000..c62e8ce06 --- /dev/null +++ b/graphics/object_events/palettes/npc_blue.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +246 189 148 +222 148 115 +123 65 65 +255 222 74 +213 172 32 +131 98 0 +164 139 238 +106 82 189 +65 57 98 +238 115 65 +172 65 57 +74 49 49 +255 255 255 +0 0 0 diff --git a/graphics/object_events/palettes/npc_blue_reflection.pal b/graphics/object_events/palettes/npc_blue_reflection.pal new file mode 100644 index 000000000..9fdd95ccc --- /dev/null +++ b/graphics/object_events/palettes/npc_blue_reflection.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 172 238 +255 255 255 +255 255 230 +255 230 197 +205 148 148 +255 255 139 +246 230 65 +238 197 32 +197 222 238 +156 180 230 +131 148 205 +255 197 139 +246 156 106 +205 115 90 +255 255 255 +82 82 82 diff --git a/graphics/object_events/palettes/npc_green.pal b/graphics/object_events/palettes/npc_green.pal new file mode 100644 index 000000000..0c60b08a5 --- /dev/null +++ b/graphics/object_events/palettes/npc_green.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +246 189 148 +222 148 115 +123 65 65 +222 189 65 +164 131 32 +82 82 32 +131 205 49 +57 139 0 +32 65 16 +222 148 189 +164 74 131 +82 32 65 +255 255 255 +0 0 0 diff --git a/graphics/object_events/palettes/npc_green_reflection.pal b/graphics/object_events/palettes/npc_green_reflection.pal new file mode 100644 index 000000000..ae24bbfe4 --- /dev/null +++ b/graphics/object_events/palettes/npc_green_reflection.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 172 238 +255 255 255 +255 255 230 +255 230 197 +205 148 148 +238 222 98 +222 197 74 +197 172 65 +164 238 148 +131 205 123 +106 172 74 +246 156 213 +213 131 189 +189 115 148 +255 255 255 +82 82 82 diff --git a/graphics/object_events/palettes/npc_pink.pal b/graphics/object_events/palettes/npc_pink.pal new file mode 100644 index 000000000..e245ba013 --- /dev/null +++ b/graphics/object_events/palettes/npc_pink.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +246 189 148 +222 148 115 +123 65 65 +255 164 180 +213 106 123 +139 65 82 +148 197 238 +98 131 205 +57 57 74 +197 197 213 +139 139 148 +74 74 90 +255 255 255 +0 0 0 diff --git a/graphics/object_events/palettes/npc_pink_reflection.pal b/graphics/object_events/palettes/npc_pink_reflection.pal new file mode 100644 index 000000000..d0e386c7c --- /dev/null +++ b/graphics/object_events/palettes/npc_pink_reflection.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 172 238 +255 255 255 +255 255 230 +255 230 197 +205 148 148 +255 222 238 +255 180 205 +238 164 172 +205 255 255 +180 230 255 +123 164 213 +222 222 230 +180 180 180 +139 139 148 +255 255 255 +82 82 82 diff --git a/graphics/object_events/palettes/npc_white.pal b/graphics/object_events/palettes/npc_white.pal new file mode 100644 index 000000000..1646e805e --- /dev/null +++ b/graphics/object_events/palettes/npc_white.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +246 189 148 +222 148 115 +123 65 65 +205 172 98 +123 115 65 +57 57 24 +230 106 74 +148 57 41 +82 16 0 +197 197 213 +139 139 148 +74 74 90 +255 255 255 +0 0 0 diff --git a/graphics/object_events/palettes/npc_white_reflection.pal b/graphics/object_events/palettes/npc_white_reflection.pal new file mode 100644 index 000000000..ae8272ec4 --- /dev/null +++ b/graphics/object_events/palettes/npc_white_reflection.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 172 238 +255 255 255 +255 255 230 +255 230 197 +205 148 148 +230 205 131 +205 180 106 +164 139 65 +255 197 139 +246 156 106 +205 115 90 +222 222 230 +180 180 180 +139 139 148 +255 255 255 +82 82 82 diff --git a/graphics/object_events/palettes/player.pal b/graphics/object_events/palettes/player.pal new file mode 100644 index 000000000..3097a6556 --- /dev/null +++ b/graphics/object_events/palettes/player.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 123 164 +172 123 65 +255 197 148 +222 148 115 +123 65 65 +65 65 213 +57 57 123 +115 164 197 +106 41 41 +238 238 255 +180 180 213 +255 106 74 +197 57 57 +255 222 90 +189 156 57 +0 0 0 diff --git a/graphics/object_events/palettes/player_reflection.pal b/graphics/object_events/palettes/player_reflection.pal new file mode 100644 index 000000000..5537faa0f --- /dev/null +++ b/graphics/object_events/palettes/player_reflection.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 255 246 +238 189 180 +255 255 230 +255 230 197 +205 148 148 +123 164 238 +115 131 197 +172 213 255 +172 123 98 +255 255 255 +222 222 255 +255 230 172 +255 172 172 +255 255 172 +230 205 115 +82 82 82 diff --git a/graphics/object_events/palettes/player_reflection_dummy.pal b/graphics/object_events/palettes/player_reflection_dummy.pal new file mode 100644 index 000000000..0cebd6c4d --- /dev/null +++ b/graphics/object_events/palettes/player_reflection_dummy.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 diff --git a/graphics/object_events/palettes/seagallop.pal b/graphics/object_events/palettes/seagallop.pal new file mode 100644 index 000000000..c25501332 --- /dev/null +++ b/graphics/object_events/palettes/seagallop.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +65 123 180 +238 246 255 +222 230 238 +189 205 230 +156 164 189 +139 139 156 +98 98 123 +57 57 106 +197 98 98 +172 65 106 +32 74 156 +197 148 0 +246 213 24 +222 238 255 +255 255 255 +74 106 139 diff --git a/graphics/object_events/palettes/ss_anne.pal b/graphics/object_events/palettes/ss_anne.pal new file mode 100644 index 000000000..cf19fedfa --- /dev/null +++ b/graphics/object_events/palettes/ss_anne.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +57 115 180 +49 131 197 +65 65 82 +139 106 57 +32 82 139 +189 90 32 +222 156 49 +246 205 74 +172 148 90 +82 82 106 +213 213 238 +106 106 139 +131 139 172 +205 180 123 +255 255 255 +16 16 24 diff --git a/include/event_object_movement.h b/include/event_object_movement.h index c1a9787f3..119fa7f07 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -71,7 +71,7 @@ void LoadPlayerObjectReflectionPalette(u16, u8); void LoadSpecialObjectReflectionPalette(u16, u8); void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16); void PatchObjectPalette(u16, u8); -void sub_805EDF0(s16, s16); +void ReloadMapObjectsWithOffset(s16 x, s16 y); void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); void sub_8063AD4(s16, s16, s16 *, s16 *); u8 GetFaceDirectionAnimNum(u8); diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index c39bf1672..50f0b8bc1 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -1,4 +1,4 @@ -const u16 gObjectEventPal_Player[] = INCBIN_U16("graphics/object_events/palettes/0.gbapal"); +const u16 gObjectEventPal_Player[] = INCBIN_U16("graphics/object_events/palettes/player.gbapal"); const u16 gUnknown_835B988[] = INCBIN_U16("graphics/object_events/palettes/unk_835B988.gbapal"); const u16 gObjectEventPaletteNull1[16] = {}; const u16 gObjectEventPaletteNull2[16] = {}; @@ -18,8 +18,8 @@ const u16 gObjectEventPic_RedNormal[] = INCBIN_U16("graphics/object_events/pics/ const u16 gObjectEventPic_RedSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/red_surf_run.4bpp"); const u16 gObjectEventPic_GreenNormal[] = INCBIN_U16("graphics/object_events/pics/people/green_normal.4bpp"); const u16 gObjectEventPic_GreenSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/green_surf_run.4bpp"); -const u16 gObjectEventPal_9[] = INCBIN_U16("graphics/object_events/palettes/1.gbapal"); -const u16 gObjectEventPal_PlayerReflection[] = INCBIN_U16("graphics/object_events/palettes/2.gbapal"); +const u16 gObjectEventPal_PlayerReflection[] = INCBIN_U16("graphics/object_events/palettes/player_reflection.gbapal"); +const u16 gObjectEventPal_PlayerReflectionDummy[] = INCBIN_U16("graphics/object_events/palettes/player_reflection_dummy.gbapal"); const u16 gObjectEventPic_RedItem[] = INCBIN_U16("graphics/object_events/pics/people/red_item.4bpp"); const u16 gObjectEventPic_GreenItem[] = INCBIN_U16("graphics/object_events/pics/people/green_item.4bpp"); const u16 gObjectEventPic_RedSurf[] = INCBIN_U16("graphics/object_events/pics/people/red_surf.4bpp"); @@ -45,14 +45,14 @@ const u16 gObjectEventPic_Koga[] = INCBIN_U16("graphics/object_events/pics/peopl const u16 gObjectEventPic_Brock[] = INCBIN_U16("graphics/object_events/pics/people/brock.4bpp"); const u16 gObjectEventPic_LtSurge[] = INCBIN_U16("graphics/object_events/pics/people/lt_surge.4bpp"); const u16 gObjectEventPic_Bill[] = INCBIN_U16("graphics/object_events/pics/people/bill.4bpp"); -const u16 gObjectEventPal_NpcBlue[] = INCBIN_U16("graphics/object_events/palettes/3.gbapal"); -const u16 gObjectEventPal_NpcPink[] = INCBIN_U16("graphics/object_events/palettes/4.gbapal"); -const u16 gObjectEventPal_NpcGreen[] = INCBIN_U16("graphics/object_events/palettes/5.gbapal"); -const u16 gObjectEventPal_NpcWhite[] = INCBIN_U16("graphics/object_events/palettes/6.gbapal"); -const u16 gObjectEventPal_4[] = INCBIN_U16("graphics/object_events/palettes/7.gbapal"); -const u16 gObjectEventPal_5[] = INCBIN_U16("graphics/object_events/palettes/8.gbapal"); -const u16 gObjectEventPal_6[] = INCBIN_U16("graphics/object_events/palettes/9.gbapal"); -const u16 gObjectEventPal_7[] = INCBIN_U16("graphics/object_events/palettes/10.gbapal"); +const u16 gObjectEventPal_NpcBlue[] = INCBIN_U16("graphics/object_events/palettes/npc_blue.gbapal"); +const u16 gObjectEventPal_NpcPink[] = INCBIN_U16("graphics/object_events/palettes/npc_pink.gbapal"); +const u16 gObjectEventPal_NpcGreen[] = INCBIN_U16("graphics/object_events/palettes/npc_green.gbapal"); +const u16 gObjectEventPal_NpcWhite[] = INCBIN_U16("graphics/object_events/palettes/npc_white.gbapal"); +const u16 gObjectEventPal_NpcBlueReflection[] = INCBIN_U16("graphics/object_events/palettes/npc_blue_reflection.gbapal"); +const u16 gObjectEventPal_NpcPinkReflection[] = INCBIN_U16("graphics/object_events/palettes/npc_pink_reflection.gbapal"); +const u16 gObjectEventPal_NpcGreenReflection[] = INCBIN_U16("graphics/object_events/palettes/npc_green_reflection.gbapal"); +const u16 gObjectEventPal_NpcWhiteReflection[] = INCBIN_U16("graphics/object_events/palettes/npc_white_reflection.gbapal"); const u16 gObjectEventPic_LittleBoy[] = INCBIN_U16("graphics/object_events/pics/people/little_boy.4bpp"); const u16 gObjectEventPic_LittleGirl[] = INCBIN_U16("graphics/object_events/pics/people/little_girl.4bpp"); const u16 gObjectEventPic_SittingBoy[] = INCBIN_U16("graphics/object_events/pics/people/sitting_boy.4bpp"); @@ -175,12 +175,12 @@ const u16 gObjectEventPic_GymSign[] = INCBIN_U16("graphics/object_events/pics/mi const u16 gObjectEventPic_Sign[] = INCBIN_U16("graphics/object_events/pics/misc/sign.4bpp"); const u16 gObjectEventPic_WoodenSign[] = INCBIN_U16("graphics/object_events/pics/misc/wooden_sign.4bpp"); const u16 gObjectEventPic_Clipboard[] = INCBIN_U16("graphics/object_events/pics/misc/clipboard.4bpp"); -const u16 gObjectEventPal_Meteorite[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal"); +const u16 gObjectEventPal_Meteorite[] = INCBIN_U16("graphics/object_events/palettes/meteorite.gbapal"); const u16 gObjectEventPic_BirthIslandStone[] = INCBIN_U16("graphics/object_events/pics/misc/birth_island_stone.4bpp"); const u16 gObjectEventPic_LaprasDoll[] = INCBIN_U16("graphics/object_events/pics/misc/lapras_doll.4bpp"); -const u16 gObjectEventPal_Seagallop[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal"); +const u16 gObjectEventPal_Seagallop[] = INCBIN_U16("graphics/object_events/palettes/seagallop.gbapal"); const u16 gObjectEventPic_Seagallop[] = INCBIN_U16("graphics/object_events/pics/misc/seagallop.4bpp"); -const u16 gObjectEventPal_SSAnne[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal"); +const u16 gObjectEventPal_SSAnne[] = INCBIN_U16("graphics/object_events/palettes/ss_anne.gbapal"); const u16 gObjectEventPic_SSAnne[] = INCBIN_U16("graphics/object_events/pics/misc/ss_anne.4bpp"); const u16 gObjectEventPic_SurfBlob[] = INCBIN_U16("graphics/object_events/pics/misc/surf_blob.4bpp"); const u16 gObjectEventPic_Policeman[] = INCBIN_U16("graphics/object_events/pics/people/policeman.4bpp"); diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h index 5ff04e790..bfdf8ec44 100644 --- a/src/data/object_events/object_event_graphics_info.h +++ b/src/data/object_events/object_event_graphics_info.h @@ -1,7 +1,7 @@ -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_RedNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_RedNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenSurf, gObjectEventPicTable_RedSurf, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Policeman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Policeman, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSBrendan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RSBrendan, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSMay = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RSMay, gDummySpriteAffineAnimTable}; @@ -67,11 +67,11 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableClubReception const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnionRoomReceptionist, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RockSmashRock = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_RockSmashRock, gObjectEventPicTable_RockSmashRock, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_StrengthBoulder = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_StrengthBoulder, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_GreenNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GreenBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_GreenNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GreenBike, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenSurf, gObjectEventPicTable_GreenSurf, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A45F4 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A45F4 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RocketM, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celio = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Celio, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Agatha = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Agatha, gDummySpriteAffineAnimTable}; @@ -88,12 +88,12 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Daisy = {SPRITE_IN const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lorelei = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lorelei, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lance = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lance, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blue = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Blue, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_RedFish, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_GreenFish, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_RedVSSeekerBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_GreenVSSeekerBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_RedFish, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_GreenFish, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_RedVSSeekerBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_GreenVSSeekerBike, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TownMap = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 32, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TownMap, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pokedex = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Pokedex, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GBAKid = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GBAKid, gDummySpriteAffineAnimTable}; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index c9524ee02..98cedf601 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -71,7 +71,7 @@ static void GetObjectEventMovingCameraOffset(s16 *, s16 *); static struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8, u8, u8); static void LoadObjectEventPalette(u16); static void RemoveObjectEventIfOutsideView(struct ObjectEvent *); -static void sub_805EE3C(u8, s16, s16); +static void ReloadMapObjectWithOffset(u8 objectEventId, s16 x, s16 y); static void SetPlayerAvatarObjectEventIdAndObjectId(u8, u8); static void sub_805EFF4(struct ObjectEvent *); static u8 TryLoadObjectPalette(const struct SpritePalette *spritePalette); @@ -450,23 +450,23 @@ const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = }; #define OBJ_EVENT_PAL_TAG_PLAYER_RED 0x1100 -#define OBJ_EVENT_PAL_TAG_9 0x1101 -#define OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION 0x1102 +#define OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION 0x1101 +#define OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY 0x1102 #define OBJ_EVENT_PAL_TAG_NPC_BLUE 0x1103 #define OBJ_EVENT_PAL_TAG_NPC_PINK 0x1104 #define OBJ_EVENT_PAL_TAG_NPC_GREEN 0x1105 #define OBJ_EVENT_PAL_TAG_NPC_WHITE 0x1106 -#define OBJ_EVENT_PAL_TAG_4 0x1107 -#define OBJ_EVENT_PAL_TAG_5 0x1108 -#define OBJ_EVENT_PAL_TAG_6 0x1109 -#define OBJ_EVENT_PAL_TAG_7 0x110A +#define OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION 0x1107 +#define OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION 0x1108 +#define OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION 0x1109 +#define OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION 0x110A #define OBJ_EVENT_PAL_TAG_12 0x110B #define OBJ_EVENT_PAL_TAG_13 0x110C #define OBJ_EVENT_PAL_TAG_14 0x110D #define OBJ_EVENT_PAL_TAG_15 0x110E #define OBJ_EVENT_PAL_TAG_16 0x110F #define OBJ_EVENT_PAL_TAG_PLAYER_GREEN 0x1110 -#define OBJ_EVENT_PAL_TAG_18 0x1111 +#define OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION 0x1111 #define OBJ_EVENT_PAL_TAG_19 0x1112 #define OBJ_EVENT_PAL_TAG_METEORITE 0x1113 #define OBJ_EVENT_PAL_TAG_SEAGALLOP 0x1114 @@ -496,39 +496,39 @@ const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = #include "data/object_events/object_event_graphics_info.h" static const struct SpritePalette sObjectEventSpritePalettes[] = { - {gObjectEventPal_NpcBlue, OBJ_EVENT_PAL_TAG_NPC_BLUE}, - {gObjectEventPal_NpcPink, OBJ_EVENT_PAL_TAG_NPC_PINK}, - {gObjectEventPal_NpcGreen, OBJ_EVENT_PAL_TAG_NPC_GREEN}, - {gObjectEventPal_NpcWhite, OBJ_EVENT_PAL_TAG_NPC_WHITE}, - {gObjectEventPal_4, OBJ_EVENT_PAL_TAG_4}, - {gObjectEventPal_5, OBJ_EVENT_PAL_TAG_5}, - {gObjectEventPal_6, OBJ_EVENT_PAL_TAG_6}, - {gObjectEventPal_7, OBJ_EVENT_PAL_TAG_7}, - {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_RED}, - {gObjectEventPal_9, OBJ_EVENT_PAL_TAG_9}, - {gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION}, - {gObjectEventPal_12, OBJ_EVENT_PAL_TAG_12}, - {gObjectEventPal_13, OBJ_EVENT_PAL_TAG_13}, - {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_GREEN}, - {gObjectEventPal_9, OBJ_EVENT_PAL_TAG_18}, - {gObjectEventPal_Meteorite, OBJ_EVENT_PAL_TAG_METEORITE}, - {gObjectEventPal_SSAnne, OBJ_EVENT_PAL_TAG_SS_ANNE}, - {gObjectEventPal_Seagallop, OBJ_EVENT_PAL_TAG_SEAGALLOP}, + {gObjectEventPal_NpcBlue, OBJ_EVENT_PAL_TAG_NPC_BLUE}, + {gObjectEventPal_NpcPink, OBJ_EVENT_PAL_TAG_NPC_PINK}, + {gObjectEventPal_NpcGreen, OBJ_EVENT_PAL_TAG_NPC_GREEN}, + {gObjectEventPal_NpcWhite, OBJ_EVENT_PAL_TAG_NPC_WHITE}, + {gObjectEventPal_NpcBlueReflection, OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION}, + {gObjectEventPal_NpcPinkReflection, OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION}, + {gObjectEventPal_NpcGreenReflection, OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION}, + {gObjectEventPal_NpcWhiteReflection, OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION}, + {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_RED}, + {gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION}, + {gObjectEventPal_PlayerReflectionDummy, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY}, + {gObjectEventPal_12, OBJ_EVENT_PAL_TAG_12}, + {gObjectEventPal_13, OBJ_EVENT_PAL_TAG_13}, + {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_GREEN}, + {gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION}, + {gObjectEventPal_Meteorite, OBJ_EVENT_PAL_TAG_METEORITE}, + {gObjectEventPal_SSAnne, OBJ_EVENT_PAL_TAG_SS_ANNE}, + {gObjectEventPal_Seagallop, OBJ_EVENT_PAL_TAG_SEAGALLOP}, {}, }; const u16 gPlayerReflectionPaletteTags[] = { - OBJ_EVENT_PAL_TAG_9, - OBJ_EVENT_PAL_TAG_9, - OBJ_EVENT_PAL_TAG_9, - OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, + OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, + OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, + OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, }; const u16 gUnusedPlayerReflectionPaletteTags[] = { - OBJ_EVENT_PAL_TAG_18, - OBJ_EVENT_PAL_TAG_18, - OBJ_EVENT_PAL_TAG_18, - OBJ_EVENT_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION, }; const u16 gUnknownPaletteTags_83A5200[] = { @@ -609,10 +609,10 @@ const u16 gUnknownPaletteTags_83A5268[] = { }; const u16 gUnknownPaletteTags_83A5270[] = { - OBJ_EVENT_PAL_TAG_6, - OBJ_EVENT_PAL_TAG_6, - OBJ_EVENT_PAL_TAG_6, - OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, }; const struct PairedPalettes gSpecialObjectReflectionPaletteSets[] = { @@ -633,15 +633,15 @@ const struct PairedPalettes gSpecialObjectReflectionPaletteSets[] = { const u16 gUnknownPaletteTags_83A52E0[] = { OBJ_EVENT_PAL_TAG_PLAYER_RED, - OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NPC_WHITE, - OBJ_EVENT_PAL_TAG_4, - OBJ_EVENT_PAL_TAG_5, - OBJ_EVENT_PAL_TAG_6, - OBJ_EVENT_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION, }; const u16 gUnknownPaletteTags_83A52F4[] = { @@ -651,36 +651,36 @@ const u16 gUnknownPaletteTags_83A52F4[] = { OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NPC_WHITE, - OBJ_EVENT_PAL_TAG_4, - OBJ_EVENT_PAL_TAG_5, - OBJ_EVENT_PAL_TAG_6, - OBJ_EVENT_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION, }; const u16 gUnknownPaletteTags_83A5308[] = { OBJ_EVENT_PAL_TAG_PLAYER_RED, - OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NPC_WHITE, - OBJ_EVENT_PAL_TAG_4, - OBJ_EVENT_PAL_TAG_5, - OBJ_EVENT_PAL_TAG_6, - OBJ_EVENT_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION, }; const u16 gUnknownPaletteTags_83A531C[] = { OBJ_EVENT_PAL_TAG_PLAYER_RED, - OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NPC_WHITE, - OBJ_EVENT_PAL_TAG_4, - OBJ_EVENT_PAL_TAG_5, - OBJ_EVENT_PAL_TAG_6, - OBJ_EVENT_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION, }; const u16 *const gObjectPaletteTagSets[] = { @@ -1904,7 +1904,7 @@ static void RemoveObjectEventIfOutsideView(struct ObjectEvent *objectEvent) RemoveObjectEvent(objectEvent); } -void sub_805EDF0(s16 x, s16 y) +void ReloadMapObjectsWithOffset(s16 x, s16 y) { u8 i; @@ -1913,13 +1913,13 @@ void sub_805EDF0(s16 x, s16 y) { if (gObjectEvents[i].active) { - sub_805EE3C(i, x, y); + ReloadMapObjectWithOffset(i, x, y); } } CreateReflectionEffectSprites(); } -static void sub_805EE3C(u8 objectEventId, s16 x, s16 y) +static void ReloadMapObjectWithOffset(u8 objectEventId, s16 x, s16 y) { u8 spriteId; struct Sprite *sprite; diff --git a/src/overworld.c b/src/overworld.c index 2083b7578..66ca5e336 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -151,7 +151,7 @@ static void InitOverworldGraphicsRegisters(void); static void sub_8057024(bool32 a0); static void sub_8057074(void); static void mli4_mapscripts_and_other(void); -static void sub_8057100(void); +static void ReloadObjectsAndRunReturnToFieldMapScript(void); static void sub_8057114(void); static void SetCameraToTrackGuestPlayer(void); static void SetCameraToTrackGuestPlayer_2(void); @@ -1933,7 +1933,7 @@ static bool32 sub_8056CD8(u8 *state) InitOverworldBgs(); QuestLog_InitPalettesBackup(); sub_8057024(FALSE); - sub_8057100(); + ReloadObjectsAndRunReturnToFieldMapScript(); sub_8057114(); (*state)++; break; @@ -1971,7 +1971,7 @@ static bool32 map_loading_iteration_2_link(u8 *state) break; case 2: CreateLinkPlayerSprites(); - sub_8057100(); + ReloadObjectsAndRunReturnToFieldMapScript(); SetCameraToTrackGuestPlayer_2(); SetHelpContextForMap(); (*state)++; @@ -2141,9 +2141,9 @@ static void mli4_mapscripts_and_other(void) TryRunOnWarpIntoMapScript(); } -static void sub_8057100(void) +static void ReloadObjectsAndRunReturnToFieldMapScript(void) { - sub_805EDF0(0, 0); + ReloadMapObjectsWithOffset(0, 0); RunOnReturnToFieldMapScript(); } @@ -2267,7 +2267,7 @@ static bool32 LoadMap_QLPlayback(u8 *state) (*state)++; break; case 3: - sub_8057100(); + ReloadObjectsAndRunReturnToFieldMapScript(); sub_8057114(); (*state)++; break; -- cgit v1.2.3 From c94617db967571b838284e85de16b4f677b5728f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 8 May 2021 11:41:38 -0400 Subject: Match pal tag names with their values --- src/data/object_events/object_event_graphics.h | 4 +- src/event_object_movement.c | 84 +++++++++++++------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 50f0b8bc1..dc77cc8ec 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -184,8 +184,8 @@ const u16 gObjectEventPal_SSAnne[] = INCBIN_U16("graphics/object_events/palettes const u16 gObjectEventPic_SSAnne[] = INCBIN_U16("graphics/object_events/pics/misc/ss_anne.4bpp"); const u16 gObjectEventPic_SurfBlob[] = INCBIN_U16("graphics/object_events/pics/misc/surf_blob.4bpp"); const u16 gObjectEventPic_Policeman[] = INCBIN_U16("graphics/object_events/pics/people/policeman.4bpp"); -const u16 gObjectEventPal_12[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal"); -const u16 gObjectEventPal_13[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal"); +const u16 gObjectEventPal_11[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal"); +const u16 gObjectEventPal_12[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal"); const u16 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U16("graphics/field_effects/pics/shadow_small.4bpp"); const u16 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U16("graphics/field_effects/pics/shadow_medium.4bpp"); const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_large.4bpp"); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 98cedf601..87dc373c7 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -460,14 +460,14 @@ const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = #define OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION 0x1108 #define OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION 0x1109 #define OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION 0x110A -#define OBJ_EVENT_PAL_TAG_12 0x110B -#define OBJ_EVENT_PAL_TAG_13 0x110C -#define OBJ_EVENT_PAL_TAG_14 0x110D -#define OBJ_EVENT_PAL_TAG_15 0x110E -#define OBJ_EVENT_PAL_TAG_16 0x110F +#define OBJ_EVENT_PAL_TAG_11 0x110B +#define OBJ_EVENT_PAL_TAG_12 0x110C +#define OBJ_EVENT_PAL_TAG_13 0x110D +#define OBJ_EVENT_PAL_TAG_14 0x110E +#define OBJ_EVENT_PAL_TAG_15 0x110F #define OBJ_EVENT_PAL_TAG_PLAYER_GREEN 0x1110 #define OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION 0x1111 -#define OBJ_EVENT_PAL_TAG_19 0x1112 +#define OBJ_EVENT_PAL_TAG_18 0x1112 #define OBJ_EVENT_PAL_TAG_METEORITE 0x1113 #define OBJ_EVENT_PAL_TAG_SEAGALLOP 0x1114 #define OBJ_EVENT_PAL_TAG_SS_ANNE 0x1115 @@ -475,16 +475,16 @@ const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = #define OBJ_EVENT_PAL_TAG_23 0x1117 #define OBJ_EVENT_PAL_TAG_24 0x1118 #define OBJ_EVENT_PAL_TAG_25 0x1119 -#define OBJ_EVENT_PAL_TAG_x011A 0x111A -#define OBJ_EVENT_PAL_TAG_26 0x111B -#define OBJ_EVENT_PAL_TAG_27 0x111C -#define OBJ_EVENT_PAL_TAG_28 0x111D -#define OBJ_EVENT_PAL_TAG_29 0x111E -#define OBJ_EVENT_PAL_TAG_30 0x111F -#define OBJ_EVENT_PAL_TAG_31 0x1120 -#define OBJ_EVENT_PAL_TAG_32 0x1121 -#define OBJ_EVENT_PAL_TAG_33 0x1122 -#define OBJ_EVENT_PAL_TAG_34 0x1123 +#define OBJ_EVENT_PAL_TAG_26 0x111A +#define OBJ_EVENT_PAL_TAG_27 0x111B +#define OBJ_EVENT_PAL_TAG_28 0x111C +#define OBJ_EVENT_PAL_TAG_29 0x111D +#define OBJ_EVENT_PAL_TAG_30 0x111E +#define OBJ_EVENT_PAL_TAG_31 0x111F +#define OBJ_EVENT_PAL_TAG_32 0x1120 +#define OBJ_EVENT_PAL_TAG_33 0x1121 +#define OBJ_EVENT_PAL_TAG_34 0x1122 +#define OBJ_EVENT_PAL_TAG_35 0x1123 #define OBJ_EVENT_PAL_TAG_NONE 0x11FF #include "data/object_events/object_event_graphics_info_pointers.h" @@ -507,8 +507,8 @@ static const struct SpritePalette sObjectEventSpritePalettes[] = { {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_RED}, {gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION}, {gObjectEventPal_PlayerReflectionDummy, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY}, + {gObjectEventPal_11, OBJ_EVENT_PAL_TAG_11}, {gObjectEventPal_12, OBJ_EVENT_PAL_TAG_12}, - {gObjectEventPal_13, OBJ_EVENT_PAL_TAG_13}, {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_GREEN}, {gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION}, {gObjectEventPal_Meteorite, OBJ_EVENT_PAL_TAG_METEORITE}, @@ -546,31 +546,31 @@ const struct PairedPalettes gPlayerReflectionPaletteSets[] = { }; const u16 gUnknownPaletteTags_83A5228[] = { + OBJ_EVENT_PAL_TAG_12, + OBJ_EVENT_PAL_TAG_12, + OBJ_EVENT_PAL_TAG_12, + OBJ_EVENT_PAL_TAG_12, +}; + +const u16 gUnknownPaletteTags_83A5230[] = { OBJ_EVENT_PAL_TAG_13, OBJ_EVENT_PAL_TAG_13, OBJ_EVENT_PAL_TAG_13, OBJ_EVENT_PAL_TAG_13, }; -const u16 gUnknownPaletteTags_83A5230[] = { +const u16 gUnknownPaletteTags_83A5238[] = { OBJ_EVENT_PAL_TAG_14, OBJ_EVENT_PAL_TAG_14, OBJ_EVENT_PAL_TAG_14, OBJ_EVENT_PAL_TAG_14, }; -const u16 gUnknownPaletteTags_83A5238[] = { - OBJ_EVENT_PAL_TAG_15, - OBJ_EVENT_PAL_TAG_15, - OBJ_EVENT_PAL_TAG_15, - OBJ_EVENT_PAL_TAG_15, -}; - const u16 gUnknownPaletteTags_83A5240[] = { - OBJ_EVENT_PAL_TAG_19, - OBJ_EVENT_PAL_TAG_19, - OBJ_EVENT_PAL_TAG_19, - OBJ_EVENT_PAL_TAG_19, + OBJ_EVENT_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_18, }; const u16 gMeteoriteReflectionPaletteTags[] = { @@ -588,10 +588,10 @@ const u16 gSeagallopReflectionPaletteTags[] = { }; const u16 gUnknownPaletteTags_83A5258[] = { - OBJ_EVENT_PAL_TAG_26, - OBJ_EVENT_PAL_TAG_26, - OBJ_EVENT_PAL_TAG_26, - OBJ_EVENT_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_27, + OBJ_EVENT_PAL_TAG_27, + OBJ_EVENT_PAL_TAG_27, + OBJ_EVENT_PAL_TAG_27, }; const u16 gUnknownPaletteTags_83A5260[] = { @@ -602,10 +602,10 @@ const u16 gUnknownPaletteTags_83A5260[] = { }; const u16 gUnknownPaletteTags_83A5268[] = { - OBJ_EVENT_PAL_TAG_x011A, - OBJ_EVENT_PAL_TAG_x011A, - OBJ_EVENT_PAL_TAG_x011A, - OBJ_EVENT_PAL_TAG_x011A, + OBJ_EVENT_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_26, }; const u16 gUnknownPaletteTags_83A5270[] = { @@ -618,16 +618,16 @@ const u16 gUnknownPaletteTags_83A5270[] = { const struct PairedPalettes gSpecialObjectReflectionPaletteSets[] = { {OBJ_EVENT_PAL_TAG_PLAYER_RED, gPlayerReflectionPaletteTags}, {OBJ_EVENT_PAL_TAG_PLAYER_GREEN, gPlayerReflectionPaletteTags}, - {OBJ_EVENT_PAL_TAG_12, gUnknownPaletteTags_83A5228}, - {OBJ_EVENT_PAL_TAG_14, gUnknownPaletteTags_83A5230}, - {OBJ_EVENT_PAL_TAG_15, gUnknownPaletteTags_83A5238}, - {OBJ_EVENT_PAL_TAG_19, gUnknownPaletteTags_83A5240}, + {OBJ_EVENT_PAL_TAG_11, gUnknownPaletteTags_83A5228}, + {OBJ_EVENT_PAL_TAG_13, gUnknownPaletteTags_83A5230}, + {OBJ_EVENT_PAL_TAG_14, gUnknownPaletteTags_83A5238}, + {OBJ_EVENT_PAL_TAG_18, gUnknownPaletteTags_83A5240}, {OBJ_EVENT_PAL_TAG_METEORITE, gMeteoriteReflectionPaletteTags}, {OBJ_EVENT_PAL_TAG_SEAGALLOP, gSeagallopReflectionPaletteTags}, {OBJ_EVENT_PAL_TAG_23, gUnknownPaletteTags_83A5260}, {OBJ_EVENT_PAL_TAG_25, gUnknownPaletteTags_83A5268}, {OBJ_EVENT_PAL_TAG_NPC_GREEN, gUnknownPaletteTags_83A5270}, - {OBJ_EVENT_PAL_TAG_26, gUnknownPaletteTags_83A5258}, + {OBJ_EVENT_PAL_TAG_27, gUnknownPaletteTags_83A5258}, {OBJ_EVENT_PAL_TAG_NONE, NULL}, }; -- cgit v1.2.3 From d30ba3b1fe3b0809897111f37a42aff1a5c390b9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 8 May 2021 14:28:08 -0400 Subject: Port pal tag names from Emerald --- graphics/object_events/palettes/11.pal | 19 -- graphics/object_events/palettes/12.pal | 19 -- .../object_events/palettes/bridge_reflection.pal | 19 ++ .../palettes/player_reflection_dummy.pal | 19 -- .../object_events/palettes/rs_quinty_plump.pal | 19 ++ .../palettes/rs_quinty_plump_reflection.pal | 19 ++ src/data/object_events/object_event_graphics.h | 6 +- .../object_events/object_event_graphics_info.h | 26 +- src/event_object_movement.c | 334 ++++++++++----------- 9 files changed, 236 insertions(+), 244 deletions(-) delete mode 100644 graphics/object_events/palettes/11.pal delete mode 100644 graphics/object_events/palettes/12.pal create mode 100644 graphics/object_events/palettes/bridge_reflection.pal delete mode 100644 graphics/object_events/palettes/player_reflection_dummy.pal create mode 100644 graphics/object_events/palettes/rs_quinty_plump.pal create mode 100644 graphics/object_events/palettes/rs_quinty_plump_reflection.pal diff --git a/graphics/object_events/palettes/11.pal b/graphics/object_events/palettes/11.pal deleted file mode 100644 index b36c29ab1..000000000 --- a/graphics/object_events/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -41 41 32 -41 41 41 -90 90 82 -139 139 115 -180 180 164 -213 156 16 -238 197 16 -255 222 98 -0 90 197 -0 131 238 -156 180 205 -213 230 238 -255 255 255 -0 139 0 -0 205 0 diff --git a/graphics/object_events/palettes/12.pal b/graphics/object_events/palettes/12.pal deleted file mode 100644 index b69e9ac0a..000000000 --- a/graphics/object_events/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -139 139 131 -139 139 139 -189 189 180 -238 238 213 -255 255 255 -255 255 115 -255 255 115 -255 255 197 -98 189 255 -98 230 255 -255 255 255 -255 255 255 -255 255 255 -98 238 98 -98 255 98 diff --git a/graphics/object_events/palettes/bridge_reflection.pal b/graphics/object_events/palettes/bridge_reflection.pal new file mode 100644 index 000000000..0cebd6c4d --- /dev/null +++ b/graphics/object_events/palettes/bridge_reflection.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 diff --git a/graphics/object_events/palettes/player_reflection_dummy.pal b/graphics/object_events/palettes/player_reflection_dummy.pal deleted file mode 100644 index 0cebd6c4d..000000000 --- a/graphics/object_events/palettes/player_reflection_dummy.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 diff --git a/graphics/object_events/palettes/rs_quinty_plump.pal b/graphics/object_events/palettes/rs_quinty_plump.pal new file mode 100644 index 000000000..b36c29ab1 --- /dev/null +++ b/graphics/object_events/palettes/rs_quinty_plump.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +41 41 32 +41 41 41 +90 90 82 +139 139 115 +180 180 164 +213 156 16 +238 197 16 +255 222 98 +0 90 197 +0 131 238 +156 180 205 +213 230 238 +255 255 255 +0 139 0 +0 205 0 diff --git a/graphics/object_events/palettes/rs_quinty_plump_reflection.pal b/graphics/object_events/palettes/rs_quinty_plump_reflection.pal new file mode 100644 index 000000000..b69e9ac0a --- /dev/null +++ b/graphics/object_events/palettes/rs_quinty_plump_reflection.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +139 139 131 +139 139 139 +189 189 180 +238 238 213 +255 255 255 +255 255 115 +255 255 115 +255 255 197 +98 189 255 +98 230 255 +255 255 255 +255 255 255 +255 255 255 +98 238 98 +98 255 98 diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index dc77cc8ec..7d0f57e3c 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -19,7 +19,7 @@ const u16 gObjectEventPic_RedSurfRun[] = INCBIN_U16("graphics/object_events/pics const u16 gObjectEventPic_GreenNormal[] = INCBIN_U16("graphics/object_events/pics/people/green_normal.4bpp"); const u16 gObjectEventPic_GreenSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/green_surf_run.4bpp"); const u16 gObjectEventPal_PlayerReflection[] = INCBIN_U16("graphics/object_events/palettes/player_reflection.gbapal"); -const u16 gObjectEventPal_PlayerReflectionDummy[] = INCBIN_U16("graphics/object_events/palettes/player_reflection_dummy.gbapal"); +const u16 gObjectEventPal_BridgeReflection[] = INCBIN_U16("graphics/object_events/palettes/bridge_reflection.gbapal"); const u16 gObjectEventPic_RedItem[] = INCBIN_U16("graphics/object_events/pics/people/red_item.4bpp"); const u16 gObjectEventPic_GreenItem[] = INCBIN_U16("graphics/object_events/pics/people/green_item.4bpp"); const u16 gObjectEventPic_RedSurf[] = INCBIN_U16("graphics/object_events/pics/people/red_surf.4bpp"); @@ -184,8 +184,8 @@ const u16 gObjectEventPal_SSAnne[] = INCBIN_U16("graphics/object_events/palettes const u16 gObjectEventPic_SSAnne[] = INCBIN_U16("graphics/object_events/pics/misc/ss_anne.4bpp"); const u16 gObjectEventPic_SurfBlob[] = INCBIN_U16("graphics/object_events/pics/misc/surf_blob.4bpp"); const u16 gObjectEventPic_Policeman[] = INCBIN_U16("graphics/object_events/pics/people/policeman.4bpp"); -const u16 gObjectEventPal_11[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal"); -const u16 gObjectEventPal_12[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal"); +const u16 gObjectEventPal_RSQuintyPlump[] = INCBIN_U16("graphics/object_events/palettes/rs_quinty_plump.gbapal"); +const u16 gObjectEventPal_RSQuintyPlumpReflection[] = INCBIN_U16("graphics/object_events/palettes/rs_quinty_plump_reflection.gbapal"); const u16 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U16("graphics/field_effects/pics/shadow_small.4bpp"); const u16 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U16("graphics/field_effects/pics/shadow_medium.4bpp"); const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_large.4bpp"); diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h index bfdf8ec44..71f3ea5f8 100644 --- a/src/data/object_events/object_event_graphics_info.h +++ b/src/data/object_events/object_event_graphics_info.h @@ -1,7 +1,7 @@ -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_RedNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_RedNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenSurf, gObjectEventPicTable_RedSurf, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Policeman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Policeman, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSBrendan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RSBrendan, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSMay = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RSMay, gDummySpriteAffineAnimTable}; @@ -67,11 +67,11 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableClubReception const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnionRoomReceptionist, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RockSmashRock = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_RockSmashRock, gObjectEventPicTable_RockSmashRock, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_StrengthBoulder = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_StrengthBoulder, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_GreenNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GreenBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_GreenNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GreenBike, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenSurf, gObjectEventPicTable_GreenSurf, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A45F4 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A45F4 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RocketM, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celio = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Celio, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Agatha = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Agatha, gDummySpriteAffineAnimTable}; @@ -88,12 +88,12 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Daisy = {SPRITE_IN const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lorelei = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lorelei, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lance = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lance, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blue = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Blue, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_RedFish, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_GreenFish, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_RedVSSeekerBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_GreenVSSeekerBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_RedFish, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_GreenFish, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_RedVSSeekerBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_GreenVSSeekerBike, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TownMap = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 32, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TownMap, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pokedex = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Pokedex, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GBAKid = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GBAKid, gDummySpriteAffineAnimTable}; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 87dc373c7..116d17ec0 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -177,11 +177,11 @@ static u8 setup##_callback(struct ObjectEvent *objectEvent, struct Sprite *sprit EWRAM_DATA u8 sCurrentReflectionType = 0; EWRAM_DATA u16 sCurrentSpecialObjectPaletteTag = 0; -const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0}; +const u8 gReflectionEffectPaletteMap[16] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0}; -const struct SpriteTemplate gCameraSpriteTemplate = { +static const struct SpriteTemplate gCameraSpriteTemplate = { .tileTag = 0, - .paletteTag = 0xFFFF, + .paletteTag = SPRITE_INVALID_TAG, .oam = &gDummyOamData, .anims = gDummySpriteAnimTable, .images = NULL, @@ -281,7 +281,7 @@ static void (*const sMovementTypeCallbacks[])(struct Sprite *) = { [MOVEMENT_TYPE_WANDER_AROUND_SLOWEST] = MovementType_WanderAroundSlowest, }; -const bool8 gRangedMovementTypes[NUM_FIELD_MAP_OBJECT_TEMPLATES] = { +static const bool8 gRangedMovementTypes[NUM_FIELD_MAP_OBJECT_TEMPLATES] = { [MOVEMENT_TYPE_NONE] = FALSE, [MOVEMENT_TYPE_LOOK_AROUND] = FALSE, [MOVEMENT_TYPE_WANDER_AROUND] = TRUE, @@ -365,7 +365,7 @@ const bool8 gRangedMovementTypes[NUM_FIELD_MAP_OBJECT_TEMPLATES] = { [MOVEMENT_TYPE_WANDER_AROUND_SLOWEST] = TRUE, }; -const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = { +static const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = { [MOVEMENT_TYPE_NONE] = DIR_SOUTH, [MOVEMENT_TYPE_LOOK_AROUND] = DIR_SOUTH, [MOVEMENT_TYPE_WANDER_AROUND] = DIR_SOUTH, @@ -451,7 +451,7 @@ const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = #define OBJ_EVENT_PAL_TAG_PLAYER_RED 0x1100 #define OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION 0x1101 -#define OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY 0x1102 +#define OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION 0x1102 #define OBJ_EVENT_PAL_TAG_NPC_BLUE 0x1103 #define OBJ_EVENT_PAL_TAG_NPC_PINK 0x1104 #define OBJ_EVENT_PAL_TAG_NPC_GREEN 0x1105 @@ -460,31 +460,23 @@ const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = #define OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION 0x1108 #define OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION 0x1109 #define OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION 0x110A -#define OBJ_EVENT_PAL_TAG_11 0x110B -#define OBJ_EVENT_PAL_TAG_12 0x110C -#define OBJ_EVENT_PAL_TAG_13 0x110D -#define OBJ_EVENT_PAL_TAG_14 0x110E -#define OBJ_EVENT_PAL_TAG_15 0x110F +#define OBJ_EVENT_PAL_TAG_RS_QUINTY_PLUMP 0x110B +#define OBJ_EVENT_PAL_TAG_RS_QUINTY_PLUMP_REFLECTION 0x110C +#define OBJ_EVENT_PAL_TAG_RS_TRUCK 0x110D +#define OBJ_EVENT_PAL_TAG_RS_MACHOKE 0x110E +#define OBJ_EVENT_PAL_TAG_RS_POOCHYENA 0x110F #define OBJ_EVENT_PAL_TAG_PLAYER_GREEN 0x1110 #define OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION 0x1111 -#define OBJ_EVENT_PAL_TAG_18 0x1112 +#define OBJ_EVENT_PAL_TAG_RS_MOVING_BOX 0x1112 #define OBJ_EVENT_PAL_TAG_METEORITE 0x1113 #define OBJ_EVENT_PAL_TAG_SEAGALLOP 0x1114 #define OBJ_EVENT_PAL_TAG_SS_ANNE 0x1115 -#define OBJ_EVENT_PAL_TAG_22 0x1116 -#define OBJ_EVENT_PAL_TAG_23 0x1117 -#define OBJ_EVENT_PAL_TAG_24 0x1118 -#define OBJ_EVENT_PAL_TAG_25 0x1119 -#define OBJ_EVENT_PAL_TAG_26 0x111A -#define OBJ_EVENT_PAL_TAG_27 0x111B -#define OBJ_EVENT_PAL_TAG_28 0x111C -#define OBJ_EVENT_PAL_TAG_29 0x111D -#define OBJ_EVENT_PAL_TAG_30 0x111E -#define OBJ_EVENT_PAL_TAG_31 0x111F -#define OBJ_EVENT_PAL_TAG_32 0x1120 -#define OBJ_EVENT_PAL_TAG_33 0x1121 -#define OBJ_EVENT_PAL_TAG_34 0x1122 -#define OBJ_EVENT_PAL_TAG_35 0x1123 +#define OBJ_EVENT_PAL_TAG_RS_PLAYER_UNDERWATER 0x1116 +#define OBJ_EVENT_PAL_TAG_RS_KYOGRE 0x1117 +#define OBJ_EVENT_PAL_TAG_RS_KYOGRE_REFLECTION 0x1118 +#define OBJ_EVENT_PAL_TAG_RS_GROUDON 0x1119 +#define OBJ_EVENT_PAL_TAG_RS_GROUDON_REFLECTION 0x111A +#define OBJ_EVENT_PAL_TAG_RS_SUBMARINE_SHADOW 0x111B #define OBJ_EVENT_PAL_TAG_NONE 0x11FF #include "data/object_events/object_event_graphics_info_pointers.h" @@ -496,142 +488,142 @@ const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = #include "data/object_events/object_event_graphics_info.h" static const struct SpritePalette sObjectEventSpritePalettes[] = { - {gObjectEventPal_NpcBlue, OBJ_EVENT_PAL_TAG_NPC_BLUE}, - {gObjectEventPal_NpcPink, OBJ_EVENT_PAL_TAG_NPC_PINK}, - {gObjectEventPal_NpcGreen, OBJ_EVENT_PAL_TAG_NPC_GREEN}, - {gObjectEventPal_NpcWhite, OBJ_EVENT_PAL_TAG_NPC_WHITE}, - {gObjectEventPal_NpcBlueReflection, OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION}, - {gObjectEventPal_NpcPinkReflection, OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION}, - {gObjectEventPal_NpcGreenReflection, OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION}, - {gObjectEventPal_NpcWhiteReflection, OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION}, - {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_RED}, - {gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION}, - {gObjectEventPal_PlayerReflectionDummy, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY}, - {gObjectEventPal_11, OBJ_EVENT_PAL_TAG_11}, - {gObjectEventPal_12, OBJ_EVENT_PAL_TAG_12}, - {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_GREEN}, - {gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION}, - {gObjectEventPal_Meteorite, OBJ_EVENT_PAL_TAG_METEORITE}, - {gObjectEventPal_SSAnne, OBJ_EVENT_PAL_TAG_SS_ANNE}, - {gObjectEventPal_Seagallop, OBJ_EVENT_PAL_TAG_SEAGALLOP}, + {gObjectEventPal_NpcBlue, OBJ_EVENT_PAL_TAG_NPC_BLUE}, + {gObjectEventPal_NpcPink, OBJ_EVENT_PAL_TAG_NPC_PINK}, + {gObjectEventPal_NpcGreen, OBJ_EVENT_PAL_TAG_NPC_GREEN}, + {gObjectEventPal_NpcWhite, OBJ_EVENT_PAL_TAG_NPC_WHITE}, + {gObjectEventPal_NpcBlueReflection, OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION}, + {gObjectEventPal_NpcPinkReflection, OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION}, + {gObjectEventPal_NpcGreenReflection, OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION}, + {gObjectEventPal_NpcWhiteReflection, OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION}, + {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_RED}, + {gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION}, + {gObjectEventPal_BridgeReflection, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION}, + {gObjectEventPal_RSQuintyPlump, OBJ_EVENT_PAL_TAG_RS_QUINTY_PLUMP}, + {gObjectEventPal_RSQuintyPlumpReflection, OBJ_EVENT_PAL_TAG_RS_QUINTY_PLUMP_REFLECTION}, + {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_GREEN}, + {gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION}, + {gObjectEventPal_Meteorite, OBJ_EVENT_PAL_TAG_METEORITE}, + {gObjectEventPal_SSAnne, OBJ_EVENT_PAL_TAG_SS_ANNE}, + {gObjectEventPal_Seagallop, OBJ_EVENT_PAL_TAG_SEAGALLOP}, {}, }; -const u16 gPlayerReflectionPaletteTags[] = { +static const u16 sPlayerReflectionPaletteTags[] = { OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, }; -const u16 gUnusedPlayerReflectionPaletteTags[] = { +static const u16 sUnusedPlayerReflectionPaletteTags[] = { OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION, OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION, OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION, OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION, }; -const u16 gUnknownPaletteTags_83A5200[] = { - OBJ_EVENT_PAL_TAG_22, - OBJ_EVENT_PAL_TAG_22, - OBJ_EVENT_PAL_TAG_22, - OBJ_EVENT_PAL_TAG_22, +static const u16 sPlayerUnderwaterReflectionPaletteTags[] = { + OBJ_EVENT_PAL_TAG_RS_PLAYER_UNDERWATER, + OBJ_EVENT_PAL_TAG_RS_PLAYER_UNDERWATER, + OBJ_EVENT_PAL_TAG_RS_PLAYER_UNDERWATER, + OBJ_EVENT_PAL_TAG_RS_PLAYER_UNDERWATER, }; -const struct PairedPalettes gPlayerReflectionPaletteSets[] = { - {OBJ_EVENT_PAL_TAG_PLAYER_RED, gPlayerReflectionPaletteTags}, - {OBJ_EVENT_PAL_TAG_PLAYER_GREEN, gPlayerReflectionPaletteTags}, - {OBJ_EVENT_PAL_TAG_22, gUnknownPaletteTags_83A5200}, +static const struct PairedPalettes gPlayerReflectionPaletteSets[] = { + {OBJ_EVENT_PAL_TAG_PLAYER_RED, sPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_PLAYER_GREEN, sPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_RS_PLAYER_UNDERWATER, sPlayerUnderwaterReflectionPaletteTags}, {OBJ_EVENT_PAL_TAG_NONE, NULL}, }; -const u16 gUnknownPaletteTags_83A5228[] = { - OBJ_EVENT_PAL_TAG_12, - OBJ_EVENT_PAL_TAG_12, - OBJ_EVENT_PAL_TAG_12, - OBJ_EVENT_PAL_TAG_12, +static const u16 sRSQuintyPlumpReflectionPaletteTags[] = { + OBJ_EVENT_PAL_TAG_RS_QUINTY_PLUMP_REFLECTION, + OBJ_EVENT_PAL_TAG_RS_QUINTY_PLUMP_REFLECTION, + OBJ_EVENT_PAL_TAG_RS_QUINTY_PLUMP_REFLECTION, + OBJ_EVENT_PAL_TAG_RS_QUINTY_PLUMP_REFLECTION, }; -const u16 gUnknownPaletteTags_83A5230[] = { - OBJ_EVENT_PAL_TAG_13, - OBJ_EVENT_PAL_TAG_13, - OBJ_EVENT_PAL_TAG_13, - OBJ_EVENT_PAL_TAG_13, +static const u16 sRSTruckReflectionPaletteTags[] = { + OBJ_EVENT_PAL_TAG_RS_TRUCK, + OBJ_EVENT_PAL_TAG_RS_TRUCK, + OBJ_EVENT_PAL_TAG_RS_TRUCK, + OBJ_EVENT_PAL_TAG_RS_TRUCK, }; -const u16 gUnknownPaletteTags_83A5238[] = { - OBJ_EVENT_PAL_TAG_14, - OBJ_EVENT_PAL_TAG_14, - OBJ_EVENT_PAL_TAG_14, - OBJ_EVENT_PAL_TAG_14, +static const u16 sRSMachokeReflectionPaletteTags[] = { + OBJ_EVENT_PAL_TAG_RS_MACHOKE, + OBJ_EVENT_PAL_TAG_RS_MACHOKE, + OBJ_EVENT_PAL_TAG_RS_MACHOKE, + OBJ_EVENT_PAL_TAG_RS_MACHOKE, }; -const u16 gUnknownPaletteTags_83A5240[] = { - OBJ_EVENT_PAL_TAG_18, - OBJ_EVENT_PAL_TAG_18, - OBJ_EVENT_PAL_TAG_18, - OBJ_EVENT_PAL_TAG_18, +static const u16 sRSMovingBoxReflectionPaletteTags[] = { + OBJ_EVENT_PAL_TAG_RS_MOVING_BOX, + OBJ_EVENT_PAL_TAG_RS_MOVING_BOX, + OBJ_EVENT_PAL_TAG_RS_MOVING_BOX, + OBJ_EVENT_PAL_TAG_RS_MOVING_BOX, }; -const u16 gMeteoriteReflectionPaletteTags[] = { +static const u16 sMeteoriteReflectionPaletteTags[] = { OBJ_EVENT_PAL_TAG_METEORITE, OBJ_EVENT_PAL_TAG_METEORITE, OBJ_EVENT_PAL_TAG_METEORITE, OBJ_EVENT_PAL_TAG_METEORITE, }; -const u16 gSeagallopReflectionPaletteTags[] = { +static const u16 sSeagallopReflectionPaletteTags[] = { OBJ_EVENT_PAL_TAG_SEAGALLOP, OBJ_EVENT_PAL_TAG_SEAGALLOP, OBJ_EVENT_PAL_TAG_SEAGALLOP, OBJ_EVENT_PAL_TAG_SEAGALLOP, }; -const u16 gUnknownPaletteTags_83A5258[] = { - OBJ_EVENT_PAL_TAG_27, - OBJ_EVENT_PAL_TAG_27, - OBJ_EVENT_PAL_TAG_27, - OBJ_EVENT_PAL_TAG_27, +static const u16 sRSSubmarineShadowReflectionPaletteTags[] = { + OBJ_EVENT_PAL_TAG_RS_SUBMARINE_SHADOW, + OBJ_EVENT_PAL_TAG_RS_SUBMARINE_SHADOW, + OBJ_EVENT_PAL_TAG_RS_SUBMARINE_SHADOW, + OBJ_EVENT_PAL_TAG_RS_SUBMARINE_SHADOW, }; -const u16 gUnknownPaletteTags_83A5260[] = { - OBJ_EVENT_PAL_TAG_24, - OBJ_EVENT_PAL_TAG_24, - OBJ_EVENT_PAL_TAG_24, - OBJ_EVENT_PAL_TAG_24, +static const u16 sRSKyogreReflectionPaletteTags[] = { + OBJ_EVENT_PAL_TAG_RS_KYOGRE_REFLECTION, + OBJ_EVENT_PAL_TAG_RS_KYOGRE_REFLECTION, + OBJ_EVENT_PAL_TAG_RS_KYOGRE_REFLECTION, + OBJ_EVENT_PAL_TAG_RS_KYOGRE_REFLECTION, }; -const u16 gUnknownPaletteTags_83A5268[] = { - OBJ_EVENT_PAL_TAG_26, - OBJ_EVENT_PAL_TAG_26, - OBJ_EVENT_PAL_TAG_26, - OBJ_EVENT_PAL_TAG_26, +static const u16 sRSGroudonReflectionPaletteTags[] = { + OBJ_EVENT_PAL_TAG_RS_GROUDON_REFLECTION, + OBJ_EVENT_PAL_TAG_RS_GROUDON_REFLECTION, + OBJ_EVENT_PAL_TAG_RS_GROUDON_REFLECTION, + OBJ_EVENT_PAL_TAG_RS_GROUDON_REFLECTION, }; -const u16 gUnknownPaletteTags_83A5270[] = { +static const u16 sGreenNPCReflectionPaletteTags[] = { OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, }; -const struct PairedPalettes gSpecialObjectReflectionPaletteSets[] = { - {OBJ_EVENT_PAL_TAG_PLAYER_RED, gPlayerReflectionPaletteTags}, - {OBJ_EVENT_PAL_TAG_PLAYER_GREEN, gPlayerReflectionPaletteTags}, - {OBJ_EVENT_PAL_TAG_11, gUnknownPaletteTags_83A5228}, - {OBJ_EVENT_PAL_TAG_13, gUnknownPaletteTags_83A5230}, - {OBJ_EVENT_PAL_TAG_14, gUnknownPaletteTags_83A5238}, - {OBJ_EVENT_PAL_TAG_18, gUnknownPaletteTags_83A5240}, - {OBJ_EVENT_PAL_TAG_METEORITE, gMeteoriteReflectionPaletteTags}, - {OBJ_EVENT_PAL_TAG_SEAGALLOP, gSeagallopReflectionPaletteTags}, - {OBJ_EVENT_PAL_TAG_23, gUnknownPaletteTags_83A5260}, - {OBJ_EVENT_PAL_TAG_25, gUnknownPaletteTags_83A5268}, - {OBJ_EVENT_PAL_TAG_NPC_GREEN, gUnknownPaletteTags_83A5270}, - {OBJ_EVENT_PAL_TAG_27, gUnknownPaletteTags_83A5258}, +static const struct PairedPalettes gSpecialObjectReflectionPaletteSets[] = { + {OBJ_EVENT_PAL_TAG_PLAYER_RED, sPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_PLAYER_GREEN, sPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_RS_QUINTY_PLUMP, sRSQuintyPlumpReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_RS_TRUCK, sRSTruckReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_RS_MACHOKE, sRSMachokeReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_RS_MOVING_BOX, sRSMovingBoxReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_METEORITE, sMeteoriteReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_SEAGALLOP, sSeagallopReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_RS_KYOGRE, sRSKyogreReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_RS_GROUDON, sRSGroudonReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_NPC_GREEN, sGreenNPCReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_RS_SUBMARINE_SHADOW, sRSSubmarineShadowReflectionPaletteTags}, {OBJ_EVENT_PAL_TAG_NONE, NULL}, }; -const u16 gUnknownPaletteTags_83A52E0[] = { +static const u16 sObjectPaletteTags0[] = { OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, OBJ_EVENT_PAL_TAG_NPC_BLUE, @@ -644,7 +636,7 @@ const u16 gUnknownPaletteTags_83A52E0[] = { OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION, }; -const u16 gUnknownPaletteTags_83A52F4[] = { +static const u16 sObjectPaletteTags1[] = { OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_NPC_BLUE, @@ -657,7 +649,7 @@ const u16 gUnknownPaletteTags_83A52F4[] = { OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION, }; -const u16 gUnknownPaletteTags_83A5308[] = { +static const u16 sObjectPaletteTags2[] = { OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, OBJ_EVENT_PAL_TAG_NPC_BLUE, @@ -670,7 +662,7 @@ const u16 gUnknownPaletteTags_83A5308[] = { OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION, }; -const u16 gUnknownPaletteTags_83A531C[] = { +static const u16 sObjectPaletteTags3[] = { OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, OBJ_EVENT_PAL_TAG_NPC_BLUE, @@ -683,23 +675,23 @@ const u16 gUnknownPaletteTags_83A531C[] = { OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION, }; -const u16 *const gObjectPaletteTagSets[] = { - gUnknownPaletteTags_83A52E0, - gUnknownPaletteTags_83A52F4, - gUnknownPaletteTags_83A5308, - gUnknownPaletteTags_83A531C, +static const u16 *const gObjectPaletteTagSets[] = { + sObjectPaletteTags0, + sObjectPaletteTags1, + sObjectPaletteTags2, + sObjectPaletteTags3, }; //#include "data/object_events/berry_tree_graphics_tables.h" #include "data/field_effects/field_effect_objects.h" -const s16 gMovementDelaysMedium[] = {32, 64, 96, 128}; -const s16 gMovementDelaysLong[] = {32, 64, 128, 192}; -const s16 gMovementDelaysShort[] = {32, 48, 64, 80}; +static const s16 gMovementDelaysMedium[] = {32, 64, 96, 128}; +static const s16 gMovementDelaysLong[] = {32, 64, 128, 192}; +static const s16 gMovementDelaysShort[] = {32, 48, 64, 80}; #include "data/object_events/movement_type_func_tables.h" -const u8 gFaceDirectionAnimNums[] = { +static const u8 gFaceDirectionAnimNums[] = { [DIR_NONE] = 0x00, [DIR_SOUTH] = 0x00, [DIR_NORTH] = 0x01, @@ -711,7 +703,7 @@ const u8 gFaceDirectionAnimNums[] = { [DIR_NORTHEAST] = 0x01, }; -const u8 gMoveDirectionAnimNums[] = { +static const u8 gMoveDirectionAnimNums[] = { [DIR_NONE] = 0x4, [DIR_SOUTH] = 0x4, [DIR_NORTH] = 0x5, @@ -723,7 +715,7 @@ const u8 gMoveDirectionAnimNums[] = { [DIR_NORTHEAST] = 0x5, }; -const u8 gMoveDirectionFastAnimNums[] = { +static const u8 gMoveDirectionFastAnimNums[] = { [DIR_NONE] = 0x8, [DIR_SOUTH] = 0x8, [DIR_NORTH] = 0x9, @@ -735,7 +727,7 @@ const u8 gMoveDirectionFastAnimNums[] = { [DIR_NORTHEAST] = 0x9, }; -const u8 gMoveDirectionFasterAnimNums[] = { +static const u8 gMoveDirectionFasterAnimNums[] = { [DIR_NONE] = 0xC, [DIR_SOUTH] = 0xC, [DIR_NORTH] = 0xD, @@ -747,7 +739,7 @@ const u8 gMoveDirectionFasterAnimNums[] = { [DIR_NORTHEAST] = 0xD, }; -const u8 gMoveDirectionFastestAnimNums[] = { +static const u8 gMoveDirectionFastestAnimNums[] = { [DIR_NONE] = 0x10, [DIR_SOUTH] = 0x10, [DIR_NORTH] = 0x11, @@ -759,7 +751,7 @@ const u8 gMoveDirectionFastestAnimNums[] = { [DIR_NORTHEAST] = 0x11, }; -const u8 gJumpSpecialDirectionAnimNums[] = { +static const u8 gJumpSpecialDirectionAnimNums[] = { [DIR_NONE] = 0x14, [DIR_SOUTH] = 0x14, [DIR_NORTH] = 0x15, @@ -771,7 +763,7 @@ const u8 gJumpSpecialDirectionAnimNums[] = { [DIR_NORTHEAST] = 0x15, }; -const u8 gAcroWheelieDirectionAnimNums[] = { +static const u8 gAcroWheelieDirectionAnimNums[] = { [DIR_NONE] = 0x14, [DIR_SOUTH] = 0x14, [DIR_NORTH] = 0x15, @@ -783,7 +775,7 @@ const u8 gAcroWheelieDirectionAnimNums[] = { [DIR_NORTHEAST] = 0x15, }; -const u8 gUnrefAnimNums_080634A0[] = { +static const u8 gUnrefAnimNums_080634A0[] = { [DIR_NONE] = 0x18, [DIR_SOUTH] = 0x18, [DIR_NORTH] = 0x19, @@ -795,7 +787,7 @@ const u8 gUnrefAnimNums_080634A0[] = { [DIR_NORTHEAST] = 0x19, }; -const u8 gAcroEndWheelieDirectionAnimNums[] = { +static const u8 gAcroEndWheelieDirectionAnimNums[] = { [DIR_NONE] = 0x1C, [DIR_SOUTH] = 0x1C, [DIR_NORTH] = 0x1D, @@ -807,7 +799,7 @@ const u8 gAcroEndWheelieDirectionAnimNums[] = { [DIR_NORTHEAST] = 0x1D, }; -const u8 gUnknown_83A6465[] = { +static const u8 gUnknown_83A6465[] = { [DIR_NONE] = 0x18, [DIR_SOUTH] = 0x18, [DIR_NORTH] = 0x19, @@ -819,7 +811,7 @@ const u8 gUnknown_83A6465[] = { [DIR_NORTHEAST] = 0x1B, }; -const u8 gAcroUnusedActionDirectionAnimNums[] = { +static const u8 gAcroUnusedActionDirectionAnimNums[] = { [DIR_NONE] = 0x20, [DIR_SOUTH] = 0x20, [DIR_NORTH] = 0x21, @@ -831,7 +823,7 @@ const u8 gAcroUnusedActionDirectionAnimNums[] = { [DIR_NORTHEAST] = 0x21, }; -const u8 gAcroWheeliePedalDirectionAnimNums[] = { +static const u8 gAcroWheeliePedalDirectionAnimNums[] = { [DIR_NONE] = 0x24, [DIR_SOUTH] = 0x24, [DIR_NORTH] = 0x25, @@ -843,7 +835,7 @@ const u8 gAcroWheeliePedalDirectionAnimNums[] = { [DIR_NORTHEAST] = 0x25, }; -const u8 gFishingDirectionAnimNums[] = { +static const u8 gFishingDirectionAnimNums[] = { [DIR_NONE] = 0x0, [DIR_SOUTH] = 0x0, [DIR_NORTH] = 0x1, @@ -855,7 +847,7 @@ const u8 gFishingDirectionAnimNums[] = { [DIR_NORTHEAST] = 0x1, }; -const u8 gFishingNoCatchDirectionAnimNums[] = { +static const u8 gFishingNoCatchDirectionAnimNums[] = { [DIR_NONE] = 0x4, [DIR_SOUTH] = 0x4, [DIR_NORTH] = 0x5, @@ -867,7 +859,7 @@ const u8 gFishingNoCatchDirectionAnimNums[] = { [DIR_NORTHEAST] = 0x5, }; -const u8 gFishingBiteDirectionAnimNums[] = { +static const u8 gFishingBiteDirectionAnimNums[] = { [DIR_NONE] = 0x8, [DIR_SOUTH] = 0x8, [DIR_NORTH] = 0x9, @@ -879,7 +871,7 @@ const u8 gFishingBiteDirectionAnimNums[] = { [DIR_NORTHEAST] = 0x9, }; -const u8 gRunningDirectionAnimNums[] = { +static const u8 gRunningDirectionAnimNums[] = { [DIR_NONE] = 0x14, [DIR_SOUTH] = 0x14, [DIR_NORTH] = 0x15, @@ -891,7 +883,7 @@ const u8 gRunningDirectionAnimNums[] = { [DIR_NORTHEAST] = 0x15, }; -const u8 gTrainerFacingDirectionMovementTypes[] = { +static const u8 gTrainerFacingDirectionMovementTypes[] = { [DIR_NONE] = 0x08, [DIR_SOUTH] = 0x08, [DIR_NORTH] = 0x07, @@ -929,7 +921,7 @@ static const struct Coords16 sDirectionToVectors[] = { [DIR_NORTHEAST] = { 1, -1}, }; -const u8 gFaceDirectionMovementActions[] = { +static const u8 gFaceDirectionMovementActions[] = { [DIR_NONE] = MOVEMENT_ACTION_FACE_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_FACE_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_FACE_UP, @@ -937,7 +929,7 @@ const u8 gFaceDirectionMovementActions[] = { [DIR_EAST] = MOVEMENT_ACTION_FACE_RIGHT, }; -const u8 gFaceDirectionFastMovementActions[] = { +static const u8 gFaceDirectionFastMovementActions[] = { [DIR_NONE] = MOVEMENT_ACTION_FACE_DOWN_FAST, [DIR_SOUTH] = MOVEMENT_ACTION_FACE_DOWN_FAST, [DIR_NORTH] = MOVEMENT_ACTION_FACE_UP_FAST, @@ -945,7 +937,7 @@ const u8 gFaceDirectionFastMovementActions[] = { [DIR_EAST] = MOVEMENT_ACTION_FACE_RIGHT_FAST, }; -const u8 gUnknown_83A64F6[] = { +static const u8 gUnknown_83A64F6[] = { [DIR_NONE] = MOVEMENT_ACTION_0x9B, [DIR_SOUTH] = MOVEMENT_ACTION_0x9B, [DIR_NORTH] = MOVEMENT_ACTION_0x9C, @@ -953,7 +945,7 @@ const u8 gUnknown_83A64F6[] = { [DIR_EAST] = MOVEMENT_ACTION_0x9E, }; -const u8 gUnknown_83A64FB[] = { +static const u8 gUnknown_83A64FB[] = { [DIR_NONE] = MOVEMENT_ACTION_WALK_SLOWEST_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_SLOWEST_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_WALK_SLOWEST_UP, @@ -961,7 +953,7 @@ const u8 gUnknown_83A64FB[] = { [DIR_EAST] = MOVEMENT_ACTION_WALK_SLOWEST_RIGHT, }; -const u8 gUnknown_83A6500[] = { +static const u8 gUnknown_83A6500[] = { [DIR_NONE] = MOVEMENT_ACTION_WALK_SLOW_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_SLOW_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_WALK_SLOW_UP, @@ -969,7 +961,7 @@ const u8 gUnknown_83A6500[] = { [DIR_EAST] = MOVEMENT_ACTION_WALK_SLOW_RIGHT, }; -const u8 gUnknown_83A6505[] = { +static const u8 gUnknown_83A6505[] = { [DIR_NONE] = MOVEMENT_ACTION_WALK_NORMAL_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_NORMAL_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_WALK_NORMAL_UP, @@ -977,7 +969,7 @@ const u8 gUnknown_83A6505[] = { [DIR_EAST] = MOVEMENT_ACTION_WALK_NORMAL_RIGHT, }; -const u8 gUnknown_83A650A[] = { +static const u8 gUnknown_83A650A[] = { [DIR_NONE] = MOVEMENT_ACTION_WALK_FAST_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_FAST_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_WALK_FAST_UP, @@ -985,7 +977,7 @@ const u8 gUnknown_83A650A[] = { [DIR_EAST] = MOVEMENT_ACTION_WALK_FAST_RIGHT, }; -const u8 gUnknown_83A650F[] = { +static const u8 gUnknown_83A650F[] = { [DIR_NONE] = MOVEMENT_ACTION_0xA0, [DIR_SOUTH] = MOVEMENT_ACTION_0xA0, [DIR_NORTH] = MOVEMENT_ACTION_0xA1, @@ -993,7 +985,7 @@ const u8 gUnknown_83A650F[] = { [DIR_EAST] = MOVEMENT_ACTION_0xA3, }; -const u8 gUnknown_83A6514[] = { +static const u8 gUnknown_83A6514[] = { [DIR_NONE] = MOVEMENT_ACTION_FACE_DOWN_SLOW, [DIR_SOUTH] = MOVEMENT_ACTION_FACE_DOWN_SLOW, [DIR_NORTH] = MOVEMENT_ACTION_FACE_UP_SLOW, @@ -1001,7 +993,7 @@ const u8 gUnknown_83A6514[] = { [DIR_EAST] = MOVEMENT_ACTION_FACE_RIGHT_SLOW, }; -const u8 gUnknown_83A6519[] = { +static const u8 gUnknown_83A6519[] = { [DIR_NONE] = MOVEMENT_ACTION_WALK_FASTEST_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_FASTEST_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_WALK_FASTEST_UP, @@ -1009,7 +1001,7 @@ const u8 gUnknown_83A6519[] = { [DIR_EAST] = MOVEMENT_ACTION_WALK_FASTEST_RIGHT, }; -const u8 gUnknown_83A651E[] = { +static const u8 gUnknown_83A651E[] = { [DIR_NONE] = MOVEMENT_ACTION_SLIDE_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_SLIDE_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_SLIDE_UP, @@ -1017,7 +1009,7 @@ const u8 gUnknown_83A651E[] = { [DIR_EAST] = MOVEMENT_ACTION_SLIDE_RIGHT, }; -const u8 gUnknown_83A6523[] = { +static const u8 gUnknown_83A6523[] = { [DIR_NONE] = MOVEMENT_ACTION_PLAYER_RUN_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_PLAYER_RUN_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_PLAYER_RUN_UP, @@ -1025,7 +1017,7 @@ const u8 gUnknown_83A6523[] = { [DIR_EAST] = MOVEMENT_ACTION_PLAYER_RUN_RIGHT, }; -const u8 gUnknown_83A6528[] = { +static const u8 gUnknown_83A6528[] = { [DIR_NONE] = MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW, [DIR_SOUTH] = MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW, [DIR_NORTH] = MOVEMENT_ACTION_PLAYER_RUN_UP_SLOW, @@ -1033,7 +1025,7 @@ const u8 gUnknown_83A6528[] = { [DIR_EAST] = MOVEMENT_ACTION_PLAYER_RUN_RIGHT_SLOW, }; -const u8 gUnknown_83A652D[] = { +static const u8 gUnknown_83A652D[] = { [DIR_NONE] = MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP, @@ -1041,7 +1033,7 @@ const u8 gUnknown_83A652D[] = { [DIR_EAST] = MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT, }; -const u8 gUnknown_83A6532[] = { +static const u8 gUnknown_83A6532[] = { [DIR_NONE] = MOVEMENT_ACTION_JUMP_2_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_JUMP_2_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_JUMP_2_UP, @@ -1049,7 +1041,7 @@ const u8 gUnknown_83A6532[] = { [DIR_EAST] = MOVEMENT_ACTION_JUMP_2_RIGHT, }; -const u8 gUnknown_83A6537[] = { +static const u8 gUnknown_83A6537[] = { [DIR_NONE] = MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_JUMP_IN_PLACE_UP, @@ -1057,7 +1049,7 @@ const u8 gUnknown_83A6537[] = { [DIR_EAST] = MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT, }; -const u8 gUnknown_83A653C[] = { +static const u8 gUnknown_83A653C[] = { [DIR_NONE] = MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP, @@ -1065,7 +1057,7 @@ const u8 gUnknown_83A653C[] = { [DIR_EAST] = MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT, }; -const u8 gUnknown_83A6541[] = { +static const u8 gUnknown_83A6541[] = { [DIR_NONE] = MOVEMENT_ACTION_JUMP_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_JUMP_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_JUMP_UP, @@ -1073,7 +1065,7 @@ const u8 gUnknown_83A6541[] = { [DIR_EAST] = MOVEMENT_ACTION_JUMP_RIGHT, }; -const u8 gUnknown_83A6546[] = { +static const u8 gUnknown_83A6546[] = { [DIR_NONE] = MOVEMENT_ACTION_JUMP_SPECIAL_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_JUMP_SPECIAL_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_JUMP_SPECIAL_UP, @@ -1081,7 +1073,7 @@ const u8 gUnknown_83A6546[] = { [DIR_EAST] = MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT, }; -const u8 gUnknown_83A654B[] = { +static const u8 gUnknown_83A654B[] = { [DIR_NONE] = MOVEMENT_ACTION_0xA6, [DIR_SOUTH] = MOVEMENT_ACTION_0xA6, [DIR_NORTH] = MOVEMENT_ACTION_0xA7, @@ -1089,7 +1081,7 @@ const u8 gUnknown_83A654B[] = { [DIR_EAST] = MOVEMENT_ACTION_0xA9, }; -const u8 gUnknown_83A6550[] = { +static const u8 gUnknown_83A6550[] = { [DIR_NONE] = MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP, @@ -1097,7 +1089,7 @@ const u8 gUnknown_83A6550[] = { [DIR_EAST] = MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT, }; -const u8 gUnknown_83A6555[] = { +static const u8 gUnknown_83A6555[] = { [DIR_NONE] = MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP, @@ -1105,7 +1097,7 @@ const u8 gUnknown_83A6555[] = { [DIR_EAST] = MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT, }; -const u8 gUnknown_83A655A[] = { +static const u8 gUnknown_83A655A[] = { [DIR_NONE] = MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP, @@ -1113,7 +1105,7 @@ const u8 gUnknown_83A655A[] = { [DIR_EAST] = MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT, }; -const u8 gUnknown_83A655F[] = { +static const u8 gUnknown_83A655F[] = { [DIR_NONE] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP, @@ -1121,7 +1113,7 @@ const u8 gUnknown_83A655F[] = { [DIR_EAST] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT, }; -const u8 gUnknown_83A6564[] = { +static const u8 gUnknown_83A6564[] = { [DIR_NONE] = MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP, @@ -1129,7 +1121,7 @@ const u8 gUnknown_83A6564[] = { [DIR_EAST] = MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT, }; -const u8 gUnknown_83A6569[] = { +static const u8 gUnknown_83A6569[] = { [DIR_NONE] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP, @@ -1137,7 +1129,7 @@ const u8 gUnknown_83A6569[] = { [DIR_EAST] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT, }; -const u8 gUnknown_83A656E[] = { +static const u8 gUnknown_83A656E[] = { [DIR_NONE] = MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP, @@ -1145,7 +1137,7 @@ const u8 gUnknown_83A656E[] = { [DIR_EAST] = MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT, }; -const u8 gUnknown_83A6573[] = { +static const u8 gUnknown_83A6573[] = { [DIR_NONE] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP, @@ -1153,7 +1145,7 @@ const u8 gUnknown_83A6573[] = { [DIR_EAST] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT, }; -const u8 gUnknown_83A6578[] = { +static const u8 gUnknown_83A6578[] = { [DIR_NONE] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP, @@ -1161,7 +1153,7 @@ const u8 gUnknown_83A6578[] = { [DIR_EAST] = MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT, }; -const u8 gUnknown_83A657D[] = { +static const u8 gUnknown_83A657D[] = { [DIR_NONE] = MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP, @@ -1169,7 +1161,7 @@ const u8 gUnknown_83A657D[] = { [DIR_EAST] = MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT, }; -const u8 gUnknown_83A6582[] = { +static const u8 gUnknown_83A6582[] = { [DIR_NONE] = MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP, @@ -1177,7 +1169,7 @@ const u8 gUnknown_83A6582[] = { [DIR_EAST] = MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT, }; -const u8 gUnknown_83A6587[] = { +static const u8 gUnknown_83A6587[] = { [DIR_NONE] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP, @@ -1185,7 +1177,7 @@ const u8 gUnknown_83A6587[] = { [DIR_EAST] = MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT, }; -const u8 gUnknown_83A658C[] = { +static const u8 gUnknown_83A658C[] = { [DIR_NONE] = MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN, [DIR_SOUTH] = MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN, [DIR_NORTH] = MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP, @@ -1193,7 +1185,7 @@ const u8 gUnknown_83A658C[] = { [DIR_EAST] = MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT, }; -const u8 gOppositeDirections[] = { +static const u8 gOppositeDirections[] = { DIR_NORTH, DIR_SOUTH, DIR_EAST, @@ -1204,14 +1196,14 @@ const u8 gOppositeDirections[] = { DIR_SOUTHWEST, }; -const u8 gUnknown_83A6599[][4] = { +static const u8 gUnknown_83A6599[][4] = { {2, 1, 4, 3}, {1, 2, 3, 4}, {3, 4, 2, 1}, {4, 3, 1, 2} }; -const u8 gUnknown_83A65A9[][4] = { +static const u8 gUnknown_83A65A9[][4] = { {2, 1, 4, 3}, {1, 2, 3, 4}, {4, 3, 1, 2}, -- cgit v1.2.3 From f12ce45033534445bc86fc955a0923148286c74c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 8 May 2021 14:28:57 -0400 Subject: Fix visual alignment of pal tag defines --- src/event_object_movement.c | 58 ++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 116d17ec0..d216852c1 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -449,35 +449,35 @@ static const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLA [MOVEMENT_TYPE_WANDER_AROUND_SLOWEST] = DIR_SOUTH, }; -#define OBJ_EVENT_PAL_TAG_PLAYER_RED 0x1100 -#define OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION 0x1101 -#define OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION 0x1102 -#define OBJ_EVENT_PAL_TAG_NPC_BLUE 0x1103 -#define OBJ_EVENT_PAL_TAG_NPC_PINK 0x1104 -#define OBJ_EVENT_PAL_TAG_NPC_GREEN 0x1105 -#define OBJ_EVENT_PAL_TAG_NPC_WHITE 0x1106 -#define OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION 0x1107 -#define OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION 0x1108 -#define OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION 0x1109 -#define OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION 0x110A -#define OBJ_EVENT_PAL_TAG_RS_QUINTY_PLUMP 0x110B -#define OBJ_EVENT_PAL_TAG_RS_QUINTY_PLUMP_REFLECTION 0x110C -#define OBJ_EVENT_PAL_TAG_RS_TRUCK 0x110D -#define OBJ_EVENT_PAL_TAG_RS_MACHOKE 0x110E -#define OBJ_EVENT_PAL_TAG_RS_POOCHYENA 0x110F -#define OBJ_EVENT_PAL_TAG_PLAYER_GREEN 0x1110 -#define OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION 0x1111 -#define OBJ_EVENT_PAL_TAG_RS_MOVING_BOX 0x1112 -#define OBJ_EVENT_PAL_TAG_METEORITE 0x1113 -#define OBJ_EVENT_PAL_TAG_SEAGALLOP 0x1114 -#define OBJ_EVENT_PAL_TAG_SS_ANNE 0x1115 -#define OBJ_EVENT_PAL_TAG_RS_PLAYER_UNDERWATER 0x1116 -#define OBJ_EVENT_PAL_TAG_RS_KYOGRE 0x1117 -#define OBJ_EVENT_PAL_TAG_RS_KYOGRE_REFLECTION 0x1118 -#define OBJ_EVENT_PAL_TAG_RS_GROUDON 0x1119 -#define OBJ_EVENT_PAL_TAG_RS_GROUDON_REFLECTION 0x111A -#define OBJ_EVENT_PAL_TAG_RS_SUBMARINE_SHADOW 0x111B -#define OBJ_EVENT_PAL_TAG_NONE 0x11FF +#define OBJ_EVENT_PAL_TAG_PLAYER_RED 0x1100 +#define OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION 0x1101 +#define OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION 0x1102 +#define OBJ_EVENT_PAL_TAG_NPC_BLUE 0x1103 +#define OBJ_EVENT_PAL_TAG_NPC_PINK 0x1104 +#define OBJ_EVENT_PAL_TAG_NPC_GREEN 0x1105 +#define OBJ_EVENT_PAL_TAG_NPC_WHITE 0x1106 +#define OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION 0x1107 +#define OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION 0x1108 +#define OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION 0x1109 +#define OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION 0x110A +#define OBJ_EVENT_PAL_TAG_RS_QUINTY_PLUMP 0x110B +#define OBJ_EVENT_PAL_TAG_RS_QUINTY_PLUMP_REFLECTION 0x110C +#define OBJ_EVENT_PAL_TAG_RS_TRUCK 0x110D +#define OBJ_EVENT_PAL_TAG_RS_MACHOKE 0x110E +#define OBJ_EVENT_PAL_TAG_RS_POOCHYENA 0x110F +#define OBJ_EVENT_PAL_TAG_PLAYER_GREEN 0x1110 +#define OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION 0x1111 +#define OBJ_EVENT_PAL_TAG_RS_MOVING_BOX 0x1112 +#define OBJ_EVENT_PAL_TAG_METEORITE 0x1113 +#define OBJ_EVENT_PAL_TAG_SEAGALLOP 0x1114 +#define OBJ_EVENT_PAL_TAG_SS_ANNE 0x1115 +#define OBJ_EVENT_PAL_TAG_RS_PLAYER_UNDERWATER 0x1116 +#define OBJ_EVENT_PAL_TAG_RS_KYOGRE 0x1117 +#define OBJ_EVENT_PAL_TAG_RS_KYOGRE_REFLECTION 0x1118 +#define OBJ_EVENT_PAL_TAG_RS_GROUDON 0x1119 +#define OBJ_EVENT_PAL_TAG_RS_GROUDON_REFLECTION 0x111A +#define OBJ_EVENT_PAL_TAG_RS_SUBMARINE_SHADOW 0x111B +#define OBJ_EVENT_PAL_TAG_NONE 0x11FF #include "data/object_events/object_event_graphics_info_pointers.h" #include "data/field_effects/field_effect_object_template_pointers.h" -- cgit v1.2.3 From c05af7f3941ab1aae6b45dfd0290b0d378a4aa72 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 8 May 2021 14:36:03 -0400 Subject: Rename NUM_FIELD_MAP_OBJECT_TEMPLATES --> MOVEMENT_TYPES_COUNT --- include/constants/event_object_movement.h | 1 + src/event_object_movement.c | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index 008d3a117..62c5a2ef2 100644 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -83,6 +83,7 @@ #define MOVEMENT_TYPE_VS_SEEKER_4E 0x4E #define MOVEMENT_TYPE_VS_SEEKER_4F 0x4F #define MOVEMENT_TYPE_WANDER_AROUND_SLOWEST 0x50 +#define MOVEMENT_TYPES_COUNT 0x51 #define MOVEMENT_ACTION_FACE_DOWN 0x0 #define MOVEMENT_ACTION_FACE_UP 0x1 diff --git a/src/event_object_movement.c b/src/event_object_movement.c index d216852c1..a671ada34 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -18,8 +18,6 @@ #include "constants/event_object_movement.h" #include "constants/event_objects.h" -#define NUM_FIELD_MAP_OBJECT_TEMPLATES 0x51 - static void MoveCoordsInDirection(u32, s16 *, s16 *, s16, s16); static bool8 ObjectEventExecSingleMovementAction(struct ObjectEvent *, struct Sprite *); static u8 GetCollisionInDirection(struct ObjectEvent *, u8); @@ -197,7 +195,7 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = { #include "data/object_events/object_event_graphics.h" -static void (*const sMovementTypeCallbacks[])(struct Sprite *) = { +static void (*const sMovementTypeCallbacks[MOVEMENT_TYPES_COUNT])(struct Sprite *) = { [MOVEMENT_TYPE_NONE] = MovementType_None, [MOVEMENT_TYPE_LOOK_AROUND] = MovementType_LookAround, [MOVEMENT_TYPE_WANDER_AROUND] = MovementType_WanderAround, @@ -281,7 +279,7 @@ static void (*const sMovementTypeCallbacks[])(struct Sprite *) = { [MOVEMENT_TYPE_WANDER_AROUND_SLOWEST] = MovementType_WanderAroundSlowest, }; -static const bool8 gRangedMovementTypes[NUM_FIELD_MAP_OBJECT_TEMPLATES] = { +static const bool8 gRangedMovementTypes[MOVEMENT_TYPES_COUNT] = { [MOVEMENT_TYPE_NONE] = FALSE, [MOVEMENT_TYPE_LOOK_AROUND] = FALSE, [MOVEMENT_TYPE_WANDER_AROUND] = TRUE, @@ -365,7 +363,7 @@ static const bool8 gRangedMovementTypes[NUM_FIELD_MAP_OBJECT_TEMPLATES] = { [MOVEMENT_TYPE_WANDER_AROUND_SLOWEST] = TRUE, }; -static const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = { +static const u8 gInitialMovementTypeFacingDirections[MOVEMENT_TYPES_COUNT] = { [MOVEMENT_TYPE_NONE] = DIR_SOUTH, [MOVEMENT_TYPE_LOOK_AROUND] = DIR_SOUTH, [MOVEMENT_TYPE_WANDER_AROUND] = DIR_SOUTH, -- cgit v1.2.3 From 7deccc36b74a9c8344d8f48d9b2e65ae913a3b88 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 13 May 2021 12:51:45 -0400 Subject: Name unused house maps/map groups --- data/event_scripts.s | 8 ++++---- data/maps/Route19_UnusedHouse/map.json | 21 +++++++++++++++++++++ data/maps/Route19_UnusedHouse/scripts.inc | 2 ++ data/maps/Route23_UnusedHouse/map.json | 21 +++++++++++++++++++++ data/maps/Route23_UnusedHouse/scripts.inc | 2 ++ data/maps/Route6_UnusedHouse/map.json | 21 +++++++++++++++++++++ data/maps/Route6_UnusedHouse/scripts.inc | 2 ++ data/maps/SevenIsland_UnusedHouse/map.json | 21 +++++++++++++++++++++ data/maps/SevenIsland_UnusedHouse/scripts.inc | 2 ++ data/maps/UnknownMap_18_01/map.json | 21 --------------------- data/maps/UnknownMap_18_01/scripts.inc | 2 -- data/maps/UnusedHouse_27_00/map.json | 21 --------------------- data/maps/UnusedHouse_27_00/scripts.inc | 2 -- data/maps/UnusedHouse_29_00/map.json | 21 --------------------- data/maps/UnusedHouse_29_00/scripts.inc | 2 -- data/maps/UnusedHouse_31_05/map.json | 21 --------------------- data/maps/UnusedHouse_31_05/scripts.inc | 2 -- data/maps/map_groups.json | 16 ++++++++-------- include/constants/map_groups.h | 12 ++++++------ 19 files changed, 110 insertions(+), 110 deletions(-) create mode 100644 data/maps/Route19_UnusedHouse/map.json create mode 100644 data/maps/Route19_UnusedHouse/scripts.inc create mode 100644 data/maps/Route23_UnusedHouse/map.json create mode 100644 data/maps/Route23_UnusedHouse/scripts.inc create mode 100644 data/maps/Route6_UnusedHouse/map.json create mode 100644 data/maps/Route6_UnusedHouse/scripts.inc create mode 100644 data/maps/SevenIsland_UnusedHouse/map.json create mode 100644 data/maps/SevenIsland_UnusedHouse/scripts.inc delete mode 100644 data/maps/UnknownMap_18_01/map.json delete mode 100644 data/maps/UnknownMap_18_01/scripts.inc delete mode 100644 data/maps/UnusedHouse_27_00/map.json delete mode 100644 data/maps/UnusedHouse_27_00/scripts.inc delete mode 100644 data/maps/UnusedHouse_29_00/map.json delete mode 100644 data/maps/UnusedHouse_29_00/scripts.inc delete mode 100644 data/maps/UnusedHouse_31_05/map.json delete mode 100644 data/maps/UnusedHouse_31_05/scripts.inc diff --git a/data/event_scripts.s b/data/event_scripts.s index cbc607230..d1f46fef1 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -440,7 +440,7 @@ gStdScriptsEnd:: .include "data/maps/Route5_PokemonDayCare/scripts.inc" .include "data/maps/Route5_SouthEntrance/scripts.inc" .include "data/maps/Route6_NorthEntrance/scripts.inc" - .include "data/maps/UnknownMap_18_01/scripts.inc" + .include "data/maps/Route6_UnusedHouse/scripts.inc" .include "data/maps/Route7_EastEntrance/scripts.inc" .include "data/maps/Route8_WestEntrance/scripts.inc" .include "data/maps/Route10_PokemonCenter_1F/scripts.inc" @@ -457,16 +457,16 @@ gStdScriptsEnd:: .include "data/maps/Route16_NorthEntrance_2F/scripts.inc" .include "data/maps/Route18_EastEntrance_1F/scripts.inc" .include "data/maps/Route18_EastEntrance_2F/scripts.inc" - .include "data/maps/UnusedHouse_27_00/scripts.inc" + .include "data/maps/Route19_UnusedHouse/scripts.inc" .include "data/maps/Route22_NorthEntrance/scripts.inc" - .include "data/maps/UnusedHouse_29_00/scripts.inc" + .include "data/maps/Route23_UnusedHouse/scripts.inc" .include "data/maps/Route25_SeaCottage/scripts.inc" .include "data/maps/SevenIsland_House_Room1/scripts.inc" .include "data/maps/SevenIsland_House_Room2/scripts.inc" .include "data/maps/SevenIsland_Mart/scripts.inc" .include "data/maps/SevenIsland_PokemonCenter_1F/scripts.inc" .include "data/maps/SevenIsland_PokemonCenter_2F/scripts.inc" - .include "data/maps/UnusedHouse_31_05/scripts.inc" + .include "data/maps/SevenIsland_UnusedHouse/scripts.inc" .include "data/maps/SevenIsland_Harbor/scripts.inc" .include "data/maps/OneIsland_PokemonCenter_1F/scripts.inc" .include "data/maps/OneIsland_PokemonCenter_2F/scripts.inc" diff --git a/data/maps/Route19_UnusedHouse/map.json b/data/maps/Route19_UnusedHouse/map.json new file mode 100644 index 000000000..33a86a9b8 --- /dev/null +++ b/data/maps/Route19_UnusedHouse/map.json @@ -0,0 +1,21 @@ +{ + "id": "MAP_ROUTE19_UNUSED_HOUSE", + "name": "Route19_UnusedHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_ROUTE3", + "region_map_section": "MAPSEC_ROUTE_19", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Route19_UnusedHouse/scripts.inc b/data/maps/Route19_UnusedHouse/scripts.inc new file mode 100644 index 000000000..5f807660c --- /dev/null +++ b/data/maps/Route19_UnusedHouse/scripts.inc @@ -0,0 +1,2 @@ +Route19_UnusedHouse_MapScripts:: @ 81704FA + .byte 0 diff --git a/data/maps/Route23_UnusedHouse/map.json b/data/maps/Route23_UnusedHouse/map.json new file mode 100644 index 000000000..c8f7f260c --- /dev/null +++ b/data/maps/Route23_UnusedHouse/map.json @@ -0,0 +1,21 @@ +{ + "id": "MAP_ROUTE23_UNUSED_HOUSE", + "name": "Route23_UnusedHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_VICTORY_ROAD", + "region_map_section": "MAPSEC_ROUTE_23", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Route23_UnusedHouse/scripts.inc b/data/maps/Route23_UnusedHouse/scripts.inc new file mode 100644 index 000000000..276915e12 --- /dev/null +++ b/data/maps/Route23_UnusedHouse/scripts.inc @@ -0,0 +1,2 @@ +Route23_UnusedHouse_MapScripts:: @ 8170522 + .byte 0 diff --git a/data/maps/Route6_UnusedHouse/map.json b/data/maps/Route6_UnusedHouse/map.json new file mode 100644 index 000000000..6db713c52 --- /dev/null +++ b/data/maps/Route6_UnusedHouse/map.json @@ -0,0 +1,21 @@ +{ + "id": "MAP_ROUTE6_UNUSED_HOUSE", + "name": "Route6_UnusedHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_ROUTE3", + "region_map_section": "MAPSEC_ROUTE_6", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Route6_UnusedHouse/scripts.inc b/data/maps/Route6_UnusedHouse/scripts.inc new file mode 100644 index 000000000..365de06a3 --- /dev/null +++ b/data/maps/Route6_UnusedHouse/scripts.inc @@ -0,0 +1,2 @@ +Route6_UnusedHouse_MapScripts:: @ 816FA8C + .byte 0 diff --git a/data/maps/SevenIsland_UnusedHouse/map.json b/data/maps/SevenIsland_UnusedHouse/map.json new file mode 100644 index 000000000..d9f8f1666 --- /dev/null +++ b/data/maps/SevenIsland_UnusedHouse/map.json @@ -0,0 +1,21 @@ +{ + "id": "MAP_SEVEN_ISLAND_UNUSED_HOUSE", + "name": "SevenIsland_UnusedHouse", + "layout": "LAYOUT_HOUSE4", + "music": "MUS_SEVII_67", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/SevenIsland_UnusedHouse/scripts.inc b/data/maps/SevenIsland_UnusedHouse/scripts.inc new file mode 100644 index 000000000..d6014463c --- /dev/null +++ b/data/maps/SevenIsland_UnusedHouse/scripts.inc @@ -0,0 +1,2 @@ +SevenIsland_UnusedHouse_MapScripts:: @ 8170BE3 + .byte 0 diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/UnknownMap_18_01/map.json deleted file mode 100644 index 603f2bc97..000000000 --- a/data/maps/UnknownMap_18_01/map.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_18_01", - "name": "UnknownMap_18_01", - "layout": "LAYOUT_HOUSE2", - "music": "MUS_ROUTE3", - "region_map_section": "MAPSEC_ROUTE_6", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_INDOOR", - "allow_cycling": false, - "allow_escaping": false, - "allow_running": false, - "show_map_name": false, - "floor_number": 0, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, - "object_events": [], - "warp_events": [], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/UnknownMap_18_01/scripts.inc b/data/maps/UnknownMap_18_01/scripts.inc deleted file mode 100644 index 15459c3a9..000000000 --- a/data/maps/UnknownMap_18_01/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_18_01_MapScripts:: @ 816FA8C - .byte 0 diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/UnusedHouse_27_00/map.json deleted file mode 100644 index 0d5b626e3..000000000 --- a/data/maps/UnusedHouse_27_00/map.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id": "MAP_UNUSED_HOUSE_27_00", - "name": "UnusedHouse_27_00", - "layout": "LAYOUT_HOUSE2", - "music": "MUS_ROUTE3", - "region_map_section": "MAPSEC_ROUTE_19", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_INDOOR", - "allow_cycling": false, - "allow_escaping": false, - "allow_running": false, - "show_map_name": false, - "floor_number": 0, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, - "object_events": [], - "warp_events": [], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/UnusedHouse_27_00/scripts.inc b/data/maps/UnusedHouse_27_00/scripts.inc deleted file mode 100644 index 973665fa1..000000000 --- a/data/maps/UnusedHouse_27_00/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnusedHouse_27_00_MapScripts:: @ 81704FA - .byte 0 diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/UnusedHouse_29_00/map.json deleted file mode 100644 index f5563c4cb..000000000 --- a/data/maps/UnusedHouse_29_00/map.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id": "MAP_UNUSED_HOUSE_29_00", - "name": "UnusedHouse_29_00", - "layout": "LAYOUT_HOUSE2", - "music": "MUS_VICTORY_ROAD", - "region_map_section": "MAPSEC_ROUTE_23", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_INDOOR", - "allow_cycling": false, - "allow_escaping": false, - "allow_running": false, - "show_map_name": false, - "floor_number": 0, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, - "object_events": [], - "warp_events": [], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/UnusedHouse_29_00/scripts.inc b/data/maps/UnusedHouse_29_00/scripts.inc deleted file mode 100644 index d0a4cc1a8..000000000 --- a/data/maps/UnusedHouse_29_00/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnusedHouse_29_00_MapScripts:: @ 8170522 - .byte 0 diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/UnusedHouse_31_05/map.json deleted file mode 100644 index 9e850ee52..000000000 --- a/data/maps/UnusedHouse_31_05/map.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id": "MAP_UNUSED_HOUSE_31_05", - "name": "UnusedHouse_31_05", - "layout": "LAYOUT_HOUSE4", - "music": "MUS_SEVII_67", - "region_map_section": "MAPSEC_SEVEN_ISLAND", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_INDOOR", - "allow_cycling": false, - "allow_escaping": false, - "allow_running": false, - "show_map_name": false, - "floor_number": 0, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, - "object_events": [], - "warp_events": [], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/UnusedHouse_31_05/scripts.inc b/data/maps/UnusedHouse_31_05/scripts.inc deleted file mode 100644 index ee5cfa2cb..000000000 --- a/data/maps/UnusedHouse_31_05/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnusedHouse_31_05_MapScripts:: @ 8170BE3 - .byte 0 diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 7da5d998d..ad423a9db 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -27,9 +27,9 @@ "gMapGroup_IndoorRoute15", "gMapGroup_IndoorRoute16", "gMapGroup_IndoorRoute18", - "gMapGroup_IndoorUnused1", + "gMapGroup_IndoorRoute19", "gMapGroup_IndoorRoute22", - "gMapGroup_IndoorUnused2", + "gMapGroup_IndoorRoute23", "gMapGroup_IndoorRoute25", "gMapGroup_IndoorSevenIsland", "gMapGroup_IndoorOneIsland", @@ -436,7 +436,7 @@ ], "gMapGroup_IndoorRoute6": [ "Route6_NorthEntrance", - "UnknownMap_18_01" + "Route6_UnusedHouse" ], "gMapGroup_IndoorRoute7": [ "Route7_EastEntrance" @@ -470,14 +470,14 @@ "Route18_EastEntrance_1F", "Route18_EastEntrance_2F" ], - "gMapGroup_IndoorUnused1": [ - "UnusedHouse_27_00" + "gMapGroup_IndoorRoute19": [ + "Route19_UnusedHouse" ], "gMapGroup_IndoorRoute22": [ "Route22_NorthEntrance" ], - "gMapGroup_IndoorUnused2": [ - "UnusedHouse_29_00" + "gMapGroup_IndoorRoute23": [ + "Route23_UnusedHouse" ], "gMapGroup_IndoorRoute25": [ "Route25_SeaCottage" @@ -488,7 +488,7 @@ "SevenIsland_Mart", "SevenIsland_PokemonCenter_1F", "SevenIsland_PokemonCenter_2F", - "UnusedHouse_31_05", + "SevenIsland_UnusedHouse", "SevenIsland_Harbor" ], "gMapGroup_IndoorOneIsland": [ diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 11dd15002..b22eca15c 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -397,7 +397,7 @@ // gMapGroup_IndoorRoute6 #define MAP_ROUTE6_NORTH_ENTRANCE (0 | (18 << 8)) -#define MAP_UNKNOWN_MAP_18_01 (1 | (18 << 8)) +#define MAP_ROUTE6_UNUSED_HOUSE (1 | (18 << 8)) // gMapGroup_IndoorRoute7 #define MAP_ROUTE7_EAST_ENTRANCE (0 | (19 << 8)) @@ -431,14 +431,14 @@ #define MAP_ROUTE18_EAST_ENTRANCE_1F (0 | (26 << 8)) #define MAP_ROUTE18_EAST_ENTRANCE_2F (1 | (26 << 8)) -// gMapGroup_IndoorUnused1 -#define MAP_UNUSED_HOUSE_27_00 (0 | (27 << 8)) +// gMapGroup_IndoorRoute19 +#define MAP_ROUTE19_UNUSED_HOUSE (0 | (27 << 8)) // gMapGroup_IndoorRoute22 #define MAP_ROUTE22_NORTH_ENTRANCE (0 | (28 << 8)) -// gMapGroup_IndoorUnused2 -#define MAP_UNUSED_HOUSE_29_00 (0 | (29 << 8)) +// gMapGroup_IndoorRoute23 +#define MAP_ROUTE23_UNUSED_HOUSE (0 | (29 << 8)) // gMapGroup_IndoorRoute25 #define MAP_ROUTE25_SEA_COTTAGE (0 | (30 << 8)) @@ -449,7 +449,7 @@ #define MAP_SEVEN_ISLAND_MART (2 | (31 << 8)) #define MAP_SEVEN_ISLAND_POKEMON_CENTER_1F (3 | (31 << 8)) #define MAP_SEVEN_ISLAND_POKEMON_CENTER_2F (4 | (31 << 8)) -#define MAP_UNUSED_HOUSE_31_05 (5 | (31 << 8)) +#define MAP_SEVEN_ISLAND_UNUSED_HOUSE (5 | (31 << 8)) #define MAP_SEVEN_ISLAND_HARBOR (6 | (31 << 8)) // gMapGroup_IndoorOneIsland -- cgit v1.2.3