dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #595 from GriffinRichards/gbagfx-pals

Browse Source 
Automatically constrain png pixels to bit depth
This commit is contained in:
GriffinR
2023-01-15 16:29:32 -05:00
committed by GitHub
parent 6510656f4f 7710148fbc
commit 15b3674ec0
29 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/tilesets/graphics.h
+4 -2
View File
@@ -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"),
src/data/tilesets/headers.h
+4 -4
View File
@@ -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,
src/field_door.c
+5 -1
View File
@@ -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},