diff --git a/graphics/door_anims/dept_store.png b/graphics/door_anims/dept_store.png index 914b1d56c..07efce86a 100644 Binary files a/graphics/door_anims/dept_store.png and b/graphics/door_anims/dept_store.png differ diff --git a/graphics/door_anims/general.png b/graphics/door_anims/general.png index 44b047626..0e0b67c2d 100644 Binary files a/graphics/door_anims/general.png and b/graphics/door_anims/general.png differ diff --git a/graphics/door_anims/hideout_elevator.png b/graphics/door_anims/hideout_elevator.png index 5aedc200d..2483e7775 100644 Binary files a/graphics/door_anims/hideout_elevator.png and b/graphics/door_anims/hideout_elevator.png differ diff --git a/graphics/door_anims/joyful_game_corner.png b/graphics/door_anims/joyful_game_corner.png index c9ae5f3bf..a334a057e 100644 Binary files a/graphics/door_anims/joyful_game_corner.png and b/graphics/door_anims/joyful_game_corner.png differ diff --git a/graphics/door_anims/one_island_poke_center.png b/graphics/door_anims/one_island_poke_center.png index d651b5d40..21f670f2d 100644 Binary files a/graphics/door_anims/one_island_poke_center.png and b/graphics/door_anims/one_island_poke_center.png differ diff --git a/graphics/door_anims/pallet.png b/graphics/door_anims/pallet.png index 7882f461d..1bc68a6e7 100644 Binary files a/graphics/door_anims/pallet.png and b/graphics/door_anims/pallet.png differ diff --git a/graphics/door_anims/pewter.png b/graphics/door_anims/pewter.png index 35dc63e92..c22f07f82 100644 Binary files a/graphics/door_anims/pewter.png and b/graphics/door_anims/pewter.png differ diff --git a/graphics/door_anims/pokemon_fan_club.png b/graphics/door_anims/pokemon_fan_club.png index cd04984cb..4775d54a7 100644 Binary files a/graphics/door_anims/pokemon_fan_club.png and b/graphics/door_anims/pokemon_fan_club.png differ diff --git a/graphics/door_anims/rocket_warehouse.png b/graphics/door_anims/rocket_warehouse.png index 6e1037ee2..46fa84b2d 100644 Binary files a/graphics/door_anims/rocket_warehouse.png and b/graphics/door_anims/rocket_warehouse.png differ diff --git a/graphics/door_anims/safari_zone.png b/graphics/door_anims/safari_zone.png index a713663fd..fae7fd50e 100644 Binary files a/graphics/door_anims/safari_zone.png and b/graphics/door_anims/safari_zone.png differ diff --git a/graphics/door_anims/saffron.png b/graphics/door_anims/saffron.png index 21962600b..3f9ca5640 100644 Binary files a/graphics/door_anims/saffron.png and b/graphics/door_anims/saffron.png differ diff --git a/graphics/door_anims/sevii_123.png b/graphics/door_anims/sevii_123.png index e49c7c3db..00dca20b8 100644 Binary files a/graphics/door_anims/sevii_123.png and b/graphics/door_anims/sevii_123.png differ diff --git a/graphics/door_anims/sevii_45.png b/graphics/door_anims/sevii_45.png index e8f7d9c7b..00dca20b8 100644 Binary files a/graphics/door_anims/sevii_45.png and b/graphics/door_anims/sevii_45.png differ diff --git a/graphics/door_anims/sevii_67.png b/graphics/door_anims/sevii_67.png index e146010ab..00dca20b8 100644 Binary files a/graphics/door_anims/sevii_67.png and b/graphics/door_anims/sevii_67.png differ diff --git a/graphics/door_anims/silph_co.png b/graphics/door_anims/silph_co.png index cc50aeaeb..729de5df0 100644 Binary files a/graphics/door_anims/silph_co.png and b/graphics/door_anims/silph_co.png differ diff --git a/graphics/door_anims/silph_co_elevator.png b/graphics/door_anims/silph_co_elevator.png index 11b1981b0..17d3a5ab6 100644 Binary files a/graphics/door_anims/silph_co_elevator.png and b/graphics/door_anims/silph_co_elevator.png differ diff --git a/graphics/door_anims/sliding_double.png b/graphics/door_anims/sliding_double.png index b07c2a619..dc7a03bf7 100644 Binary files a/graphics/door_anims/sliding_double.png and b/graphics/door_anims/sliding_double.png differ diff --git a/graphics/door_anims/sliding_single.png b/graphics/door_anims/sliding_single.png index b57a39158..b9d489fc8 100644 Binary files a/graphics/door_anims/sliding_single.png and b/graphics/door_anims/sliding_single.png differ diff --git a/graphics/door_anims/ss_anne.png b/graphics/door_anims/ss_anne.png index 1a5f91bb2..c45063432 100644 Binary files a/graphics/door_anims/ss_anne.png and b/graphics/door_anims/ss_anne.png differ diff --git a/graphics/door_anims/teleporter.png b/graphics/door_anims/teleporter.png index f28d6531c..c3fe56b4a 100644 Binary files a/graphics/door_anims/teleporter.png and b/graphics/door_anims/teleporter.png differ diff --git a/graphics/door_anims/trainer_tower_lobby_elevator.png b/graphics/door_anims/trainer_tower_lobby_elevator.png index ed1d5305b..23ace6b75 100644 Binary files a/graphics/door_anims/trainer_tower_lobby_elevator.png and b/graphics/door_anims/trainer_tower_lobby_elevator.png differ diff --git a/graphics/door_anims/trainer_tower_roof_elevator.png b/graphics/door_anims/trainer_tower_roof_elevator.png index 87111311b..774cedf75 100644 Binary files a/graphics/door_anims/trainer_tower_roof_elevator.png and b/graphics/door_anims/trainer_tower_roof_elevator.png differ diff --git a/graphics/door_anims/vermilion.png b/graphics/door_anims/vermilion.png index 374552c1a..a747def44 100644 Binary files a/graphics/door_anims/vermilion.png and b/graphics/door_anims/vermilion.png differ diff --git a/graphics/door_anims/viridian.png b/graphics/door_anims/viridian.png index 28e3ca689..85333a386 100644 Binary files a/graphics/door_anims/viridian.png and b/graphics/door_anims/viridian.png differ diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index a9642eeac..4816800fe 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -94,7 +94,7 @@ // gTileset_VermilionCity #define METATILE_VermilionCity_Door 0x29E -#define METATILE_VermilionCity_PokemonFanClubDoor 0x2E1 // Used to reference door tiles in field_door.c, but the metatile in the tileset is dummied +#define METATILE_VermilionCity_SSAnneWarp 0x2E1 // gTileset_VermilionGym #define METATILE_VermilionGym_Floor 0x281 diff --git a/src/data/tilesets/graphics.h b/src/data/tilesets/graphics.h index f82df8a6e..5e6791a66 100644 --- a/src/data/tilesets/graphics.h +++ b/src/data/tilesets/graphics.h @@ -922,9 +922,11 @@ const u16 gTilesetPalettes_SeaCottage[][16] = INCBIN_U16("data/tilesets/secondary/sea_cottage/palettes/15.gbapal"), }; -const u32 gTilesetTiles_SilphCo[] = INCBIN_U32("data/tilesets/secondary/condominiums/tiles.4bpp.lz"); +// Shared by SilphCo +const u32 gTilesetTiles_Condominiums[] = INCBIN_U32("data/tilesets/secondary/condominiums/tiles.4bpp.lz"); -const u16 gTilesetPalettes_SilphCo[][16] = +// Shared by SilphCo +const u16 gTilesetPalettes_Condominiums[][16] = { INCBIN_U16("data/tilesets/secondary/condominiums/palettes/00.gbapal"), INCBIN_U16("data/tilesets/secondary/condominiums/palettes/01.gbapal"), diff --git a/src/data/tilesets/headers.h b/src/data/tilesets/headers.h index 2e4ddb901..676bd2105 100644 --- a/src/data/tilesets/headers.h +++ b/src/data/tilesets/headers.h @@ -497,8 +497,8 @@ const struct Tileset gTileset_SilphCo = { .isCompressed = TRUE, .isSecondary = TRUE, - .tiles = gTilesetTiles_SilphCo, - .palettes = gTilesetPalettes_SilphCo, + .tiles = gTilesetTiles_Condominiums, + .palettes = gTilesetPalettes_Condominiums, .metatiles = gMetatiles_SilphCo, .metatileAttributes = gMetatileAttributes_SilphCo, .callback = InitTilesetAnim_SilphCo, @@ -585,8 +585,8 @@ const struct Tileset gTileset_Condominiums = { .isCompressed = TRUE, .isSecondary = TRUE, - .tiles = gTilesetTiles_SilphCo, - .palettes = gTilesetPalettes_SilphCo, + .tiles = gTilesetTiles_Condominiums, + .palettes = gTilesetPalettes_Condominiums, .metatiles = gMetatiles_Condominiums, .metatileAttributes = gMetatileAttributes_Condominiums, .callback = NULL, diff --git a/src/field_door.c b/src/field_door.c index e9f403d7c..c2cd4e6f0 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -251,7 +251,11 @@ static const struct DoorGraphics sDoorGraphics[] = { {METATILE_CeruleanCity_Door, DOOR_SOUND_NORMAL, 0, sDoorAnimTiles_Cerulean, sDoorAnimPalettes_Cerulean}, {METATILE_LavenderTown_Door, DOOR_SOUND_NORMAL, 0, sDoorAnimTiles_Lavender, sDoorAnimPalettes_Lavender}, {METATILE_VermilionCity_Door, DOOR_SOUND_NORMAL, 0, sDoorAnimTiles_Vermilion, sDoorAnimPalettes_Vermilion}, - {METATILE_VermilionCity_PokemonFanClubDoor, DOOR_SOUND_NORMAL, 0, sDoorAnimTiles_PokemonFanClub, sDoorAnimPalettes_PokemonFanClub}, +/* Below was presumably intended for the door to the Pokemon Fan Club. The metatile is surrounded by metatiles for the fan club building. + Its animation tiles are similar to the Vermilion door above, and the building on the map uses that metatile instead. The unused tiles + have the pokeball above the door in view, but on the map the pokeball above the door is too high to be in view. + The metatile below was subsequently re-used for the warp to enter the SS Anne from the harbor, which has no door. */ + {METATILE_VermilionCity_SSAnneWarp, DOOR_SOUND_NORMAL, 0, sDoorAnimTiles_PokemonFanClub, sDoorAnimPalettes_PokemonFanClub}, {METATILE_CeladonCity_DeptStoreDoor, DOOR_SOUND_SLIDING, 0, sDoorAnimTiles_DeptStore, sDoorAnimPalettes_DeptStore}, {METATILE_FuchsiaCity_Door, DOOR_SOUND_NORMAL, 0, sDoorAnimTiles_Fuchsia, sDoorAnimPalettes_Fuchsia}, {METATILE_FuchsiaCity_SafariZoneDoor, DOOR_SOUND_SLIDING, 0, sDoorAnimTiles_SafariZone, sDoorAnimPalettes_SafariZone},