Skip to content

Commit

Permalink
1.70: sprite updates for AOF3/CFTE/RoDSM2/SamSho/RedEarth/SF3/MvC2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Preppy
Preppy committed Jan 13, 2021
1 parent d7273c3 commit 672e07a
Show file tree
Hide file tree
Showing 22 changed files with 1,460 additions and 1,403 deletions.
198 changes: 102 additions & 96 deletions palmod/Game/AOF3_A_DEF.h
View file

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions palmod/Game/CFTE_SNES_DEF.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,23 +72,23 @@ const sGame_PaletteDataset CFTE_BONKER_PALETTES[] =

const sGame_PaletteDataset CFTE_PORTRAITS_VSMODE_PALETTES[] =
{
{ L"Bad Mr. Frosty", 0x244043, 0x244103 },
{ L"Taffy", 0x244103, 0x2441C3 },
{ L"Tiny", 0x2441C3, 0x244283 },
{ L"Blob", 0x244283, 0x244343 },
{ L"Blue Suede Goo", 0x244343, 0x244403 },
{ L"Ickybod Clay", 0x244403, 0x2444C3 },
{ L"Helga", 0x2444C3, 0x244583 },
{ L"Bonker", 0x244583, 0x244643 },
{ L"Bad Mr. Frosty", 0x244043, 0x244103, indexCFTESprites_BadMrFrosty, 0x10 },
{ L"Taffy", 0x244103, 0x2441C3, indexCFTESprites_Taffy, 0x10 },
{ L"Tiny", 0x2441C3, 0x244283, indexCFTESprites_Tiny, 0x10 },
{ L"Blob", 0x244283, 0x244343, indexCFTESprites_TheBlob, 0x10 },
{ L"Blue Suede Goo", 0x244343, 0x244403, indexCFTESprites_BlueSuedeGoo, 0x10 },
{ L"Ickybod Clay", 0x244403, 0x2444C3, indexCFTESprites_IckyBodClay, 0x10 },
{ L"Helga", 0x2444C3, 0x244583, indexCFTESprites_Helga, 0x10 },
{ L"Bonker", 0x244583, 0x244643, indexCFTESprites_Bonker, 0x10 },
};

const sGame_PaletteDataset CFTE_BONUS_PALETTES[] =
{
{ L"Interplay Logo", 0x1F0A3B, 0x1F0A5B, indexCFTESprites_Bonus, 0x00 },
{ L"Visual Concepts Logo", 0x1EEA8B, 0x1EEB8B },
{ L"Clay Fighter Logo", 0x1B2EF9, 0x1B2F59 },
{ L"Visual Concepts Logo", 0x1EEA8B, 0x1EEB8B, indexCFTESprites_Bonus, 0x03 },
{ L"Clay Fighter Logo", 0x1B2EF9, 0x1B2F59, indexCFTESprites_Bonus, 0x02 },
{ L"Clay Fighter Logo Subtitle", 0x107A0, 0x107C0 },
{ L"Intro Gradient", 0x1ABC84, 0x1ABCA4 },
{ L"Intro Gradient", 0x1ABC84, 0x1ABCA4, indexCFTESprites_Bonus, 0x01 },
{ L"Title Screen BG", 0x1A6B0D, 0x1A6B2D },
{ L"Mode Select Text", 0x1A0C06, 0x1A0C26 },
{ L"Pre-Match 'VS.' Icon", 0x10760, 0x10780 },
Expand Down
199 changes: 94 additions & 105 deletions palmod/Game/GameDef.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ struct sSupportedGameList

const int nGameLoadROMListMask = 0xf0000;
extern sSupportedGameList* pSupportedGameList;
extern int nNumberOfLoadROMOptions;
extern const int nNumberOfLoadROMOptions;

constexpr auto MVC2_D_NUMUNIT = 59;
constexpr auto MVC2_D_NUMUNIT_WITH_TEAMVIEW = MVC2_D_NUMUNIT + 1;
Expand Down Expand Up @@ -513,6 +513,23 @@ enum CHARACTERS_CPS2
indexCPS2_SFA2_Bonus, // 0x7f
indexCPS2_SFA2_Stages, // 0x80
indexCPS2_VSAV1_Stages, // 0x81

indexSM2Sprites_Biff, // 0x82
indexSM2Sprites_Grater, // 0x83
indexSM2Sprites_Gunloc, // 0x84
indexSM2Sprites_Haggar, // 0x85
indexSM2Sprites_Jumbo, // 0x86
indexSM2Sprites_Oni, // 0x87
indexSM2Sprites_Ortega, // 0x88
indexSM2Sprites_Rasta, // 0x89
indexSM2Sprites_Rip, // 0x8a
indexSM2Sprites_Scorpion, // 0x8b
indexSM2Sprites_Stingray, // 0x8c
indexSM2Sprites_Tim, // 0x8d
indexSM2Sprites_Widow, // 0x8e
indexSM2Sprites_Wraith, // 0x8f
indexSM2Sprites_Bonus, // 0x90
indexSM2Sprites_Stages, // 0x91
};

const UINT16 MVC2_IMG_UNITS[MVC2_D_NUM_IMG_UNITS] =
Expand Down Expand Up @@ -1687,8 +1704,8 @@ enum KOFSpriteList
indexKOF99Sprites_Bonus, // 0x1a2

indexAoF3Sprites_Jin, // 0x1A3
indexAoF3Sprites_Kasumi, // 0x1A4
indexAoF3Sprites_Karman, // 0x1A5
indexAoF3Sprites_Karman, // 0x1A4
indexAoF3Sprites_Kasumi, // 0x1A5
indexAoF3Sprites_Lenny, // 0x1A6
indexAoF3Sprites_Robert, // 0x1A7
indexAoF3Sprites_Rody, // 0x1A8
Expand All @@ -1702,42 +1719,6 @@ enum KOFSpriteList
indexKOFSprites_Last,
};

enum SamuraiShodownSpriteList
{
indexSamSho5Sprites_Amakusa = 0,
indexSamSho5Sprites_Basara, // 1
indexSamSho5Sprites_Charlotte, // 2
indexSamSho5Sprites_Enja, // 3
indexSamSho5Sprites_Gaira, // 4
indexSamSho5Sprites_Galford, // 5
indexSamSho5Sprites_Gaoh, // 6
indexSamSho5Sprites_Genjuro, // 7
indexSamSho5Sprites_Hanzo, // 8
indexSamSho5Sprites_Haohmaru, // 9
indexSamSho5Sprites_Jubei, // a
indexSamSho5Sprites_Kazuki, // b
indexSamSho5Sprites_Kusaregedo, // c
indexSamSho5Sprites_Kyoshiro, // d
indexSamSho5Sprites_Mina, // e
indexSamSho5Sprites_Mizuki, // f
indexSamSho5Sprites_Nakoruru, // 10
indexSamSho5Sprites_Rasetsumaru, // 11
indexSamSho5Sprites_Rera, // 12
indexSamSho5Sprites_Rimururu, // 13
indexSamSho5Sprites_Shizumaru, // 14
indexSamSho5Sprites_Sogetsu, // 15
indexSamSho5Sprites_Suija, // 16
indexSamSho5Sprites_TamTam, // 17
indexSamSho5Sprites_Ukyo, // 18
indexSamSho5Sprites_Yoshitora, // 19
indexSamSho5Sprites_Yunfei, // 1a
indexSamSho5Sprites_Zankuro, // 1b
indexSamSho5Sprites_Portrait, // 1c
indexSamSho5Sprites_Bonus, // 1d

indexSamuraiShodownSprites_Last,
};

const UINT16 KOF94_A_IMG_UNITS[] =
{
indexKOF94Sprites_Andy, // 0x164
Expand Down Expand Up @@ -2475,8 +2456,8 @@ const UINT16 NGBC_A_IMG_UNITS[] =
const UINT16 AOF3_A_IMG_UNITS[] =
{
indexAoF3Sprites_Jin, // 0x1A3
indexAoF3Sprites_Kasumi, // 0x1A4
indexAoF3Sprites_Karman, // 0x1A5
indexAoF3Sprites_Karman, // 0x1A4
indexAoF3Sprites_Kasumi, // 0x1A5
indexAoF3Sprites_Lenny, // 0x1A6
indexAoF3Sprites_Robert, // 0x1A7
indexAoF3Sprites_Rody, // 0x1A8
Expand Down Expand Up @@ -2720,57 +2701,60 @@ const UINT16 SVCPLUSA_A_IMG_UNITS[] =
indexSVCSprites_ShinAkuma, // 74
};

enum SupportedSamSho5SP_A_PaletteListIndex
{
indexSamSho5_A_Amakusa = 0,
indexSamSho5_A_Basara,
indexSamSho5_A_Charlotte,
indexSamSho5_A_Enja,
indexSamSho5_A_Gaira,
indexSamSho5_A_Galford,
indexSamSho5_A_Gaoh,
indexSamSho5_A_Genjuro,
indexSamSho5_A_Hanzo,
indexSamSho5_A_Haohmaru,
indexSamSho5_A_Jubei,
indexSamSho5_A_Kazuki,
indexSamSho5_A_Kusaregedo,
indexSamSho5_A_Kyoshiro,
indexSamSho5_A_Mina,
indexSamSho5_A_Mizuki,
indexSamSho5_A_Nakoruru,
indexSamSho5_A_Rasetsumaru,
indexSamSho5_A_Rera,
indexSamSho5_A_Rimururu,
indexSamSho5_A_Shizumaru,
indexSamSho5_A_Sogetsu,
indexSamSho5_A_Suija,
indexSamSho5_A_TamTam,
indexSamSho5_A_Ukyo,
indexSamSho5_A_Yoshitora,
indexSamSho5_A_Yunfei,
indexSamSho5_A_Zankuro,
indexSamSho5_A_Bonus,

indexSamSho5_A_Last,
};

const UINT16 SAMSHO3_A_IMG_UNITS[] =
enum SamuraiShodownSpriteList
{
indexSamSho5Sprites_Amakusa,
indexSamSho5Sprites_Basara,
indexSamSho5Sprites_Gaira,
indexSamSho5Sprites_Galford,
indexSamSho5Sprites_Genjuro,
indexSamSho5Sprites_Hanzo,
indexSamSho5Sprites_Haohmaru,
indexSamSho5Sprites_Kyoshiro,
indexSamSho5Sprites_Nakoruru,
indexSamSho5Sprites_Rera, // not in the game: just want the shikuru sprite for nakoruru Bust form
indexSamSho5Sprites_Rimururu,
indexSamSho5Sprites_Shizumaru,
indexSamSho5Sprites_Ukyo,
indexSamSho5Sprites_Zankuro,
indexSamSho5Sprites_Amakusa = 0,
indexSamSho5Sprites_Basara, // 1
indexSamSho5Sprites_Charlotte, // 2
indexSamSho5Sprites_Enja, // 3
indexSamSho5Sprites_Gaira, // 4
indexSamSho5Sprites_Galford, // 5
indexSamSho5Sprites_Gaoh, // 6
indexSamSho5Sprites_Genjuro, // 7
indexSamSho5Sprites_Hanzo, // 8
indexSamSho5Sprites_Haohmaru, // 9
indexSamSho5Sprites_Jubei, // a
indexSamSho5Sprites_Kazuki, // b
indexSamSho5Sprites_Kusaregedo, // c
indexSamSho5Sprites_Kyoshiro, // d
indexSamSho5Sprites_Mina, // e
indexSamSho5Sprites_Mizuki, // f
indexSamSho5Sprites_Nakoruru, // 10
indexSamSho5Sprites_Rasetsumaru, // 11
indexSamSho5Sprites_Rera, // 12
indexSamSho5Sprites_Rimururu, // 13
indexSamSho5Sprites_Shizumaru, // 14
indexSamSho5Sprites_Sogetsu, // 15
indexSamSho5Sprites_Suija, // 16
indexSamSho5Sprites_TamTam, // 17
indexSamSho5Sprites_Ukyo, // 18
indexSamSho5Sprites_Yoshitora, // 19
indexSamSho5Sprites_Yunfei, // 1a
indexSamSho5Sprites_Zankuro, // 1b
indexSamSho5Sprites_Portrait, // 1c
indexSamSho5Sprites_Bonus, // 1d
indexSamSho5Sprites_Stages, // 1e

indexSamSho3Sprites_Amakusa, // 1F
indexSamSho3Sprites_Basara, // 20
indexSamSho3Sprites_Gaira, // 21
indexSamSho3Sprites_Galford, // 22
indexSamSho3Sprites_Genjuro, // 23
indexSamSho3Sprites_Hanzo, // 24
indexSamSho3Sprites_Haohmaru, // 25
indexSamSho3Sprites_Jubei, // 26
indexSamSho3Sprites_KimUngChe, // 27
indexSamSho3Sprites_Kuroko, // 28
indexSamSho3Sprites_Kyoshiro, // 29
indexSamSho3Sprites_Nakoruru, // 2A
indexSamSho3Sprites_Rimururu, // 2B
indexSamSho3Sprites_Shizumaru, // 2C
indexSamSho3Sprites_Ukyo, // 2D
indexSamSho3Sprites_Zankuro, // 2E
indexSamSho3Sprites_Bonus, // 2F
indexSamSho3Sprites_Stages, // 30

indexSamuraiShodownSprites_Last,
};

const UINT16 SAMSHO4_A_IMG_UNITS[] =
Expand Down Expand Up @@ -2848,24 +2832,26 @@ enum SupportedKarnovsR_A_PaletteListIndex
indexKarnovsRSprites_Yungmie, // 0x0b
indexKarnovsRSprites_Zazie, // 0x0c
indexKarnovsRSprites_Bonus, // 0x0d
indexKarnovsRSprites_Stages, // 0x0e
};

const UINT16 KARNOVSR_A_IMG_UNITS[] =
{
indexKarnovsRSprites_Clown,
indexKarnovsRSprites_Felin,
indexKarnovsRSprites_Jean,
indexKarnovsRSprites_Karnov,
indexKarnovsRSprites_Lee,
indexKarnovsRSprites_Marstorius,
indexKarnovsRSprites_Matlok,
indexKarnovsRSprites_Mizoguchi,
indexKarnovsRSprites_Ray,
indexKarnovsRSprites_Ryoko,
indexKarnovsRSprites_Samchay,
indexKarnovsRSprites_Yungmie,
indexKarnovsRSprites_Zazie,
indexKarnovsRSprites_Clown, // 0x00
indexKarnovsRSprites_Felin, // 0x01
indexKarnovsRSprites_Jean, // 0x02
indexKarnovsRSprites_Karnov, // 0x03
indexKarnovsRSprites_Lee, // 0x04
indexKarnovsRSprites_Marstorius, // 0x05
indexKarnovsRSprites_Matlok, // 0x06
indexKarnovsRSprites_Mizoguchi, // 0x07
indexKarnovsRSprites_Ray, // 0x08
indexKarnovsRSprites_Ryoko, // 0x09
indexKarnovsRSprites_Samchay, // 0x0a
indexKarnovsRSprites_Yungmie, // 0x0b
indexKarnovsRSprites_Zazie, // 0x0c
indexKarnovsRSprites_Bonus, // 0x0d
indexKarnovsRSprites_Stages, // 0x0e
};

enum SupportedRedEarth_A_PaletteListIndex
Expand Down Expand Up @@ -3114,6 +3100,7 @@ enum SupportedSNES_PaletteListIndex
indexCFTESprites_TheBlob, // 0x1d
indexCFTESprites_Tiny, // 0x1e
indexCFTESprites_Bonus, // 0x1f
indexCFTESprites_Stages, // 0x20
};

const UINT16 MMPR_SNES_IMG_UNITS[] =
Expand Down Expand Up @@ -3156,6 +3143,7 @@ const UINT16 CFTE_SNES_IMG_UNITS[] =
indexCFTESprites_TheBlob, // 0x1d
indexCFTESprites_Tiny, // 0x1e
indexCFTESprites_Bonus, // 0x1f
indexCFTESprites_Stages, // 0x20
};

enum SupportedNEOGEO_PaletteListIndex
Expand Down Expand Up @@ -3209,13 +3197,13 @@ const UINT16 NEOBOMBERMAN_A_IMG_UNITS[] =
enum eIMGDat_Sections
{
IMGDAT_SECTION_BREAKREV = 0,
IMGDAT_SECTION_CPS2, // Used for MVC2, MVC, SFA3, XMVSF, MSH, MSHVSF, etc CPS2 games
IMGDAT_SECTION_CVS2, // CVS2: has both Capcom and SNK images
IMGDAT_SECTION_GAROU, // Garou
IMGDAT_SECTION_JOJOS,
IMGDAT_SECTION_KARNOVSR,
IMGDAT_SECTION_KOF, // KOF98 + KOF02UM
IMGDAT_SECTION_MATRIM, // Matrimelee
IMGDAT_SECTION_CPS2, // Used for MVC2, MVC, SFA3, XMVSF, MSH, MSHVSF, etc CPS2 games
IMGDAT_SECTION_NEOGEO, // generic set for NeoGeo games
IMGDAT_SECTION_REDEARTH,
IMGDAT_SECTION_SAMSHO, // Samurai Shodown games
Expand All @@ -3236,6 +3224,7 @@ const stPairedPaletteInfo pairNextNext = { 2, 0, 0 };
const stPairedPaletteInfo pairNext3 = { 3, 0, 0 };
const stPairedPaletteInfo pairNext4 = { 4, 0, 0 };
const stPairedPaletteInfo pairNext6 = { 6, 0, 0 };
const stPairedPaletteInfo pairNext8 = { 8, 0, 0 };
const stPairedPaletteInfo pairNext10 = { 10, 0, 0 };
const stPairedPaletteInfo pairPrevious = { -1, 0, 0 };

Expand Down
16 changes: 14 additions & 2 deletions palmod/Game/Game_AOF3_A.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ CGame_AOF3_A::CGame_AOF3_A(UINT32 nConfirmedROMSize, int nROMToLoad /*= 1*/)
m_nTotalInternalUnits = UsePaletteSetForP1() ? AOF3_A_P1_NUMUNIT : AOF3_A_P2_NUMUNIT;
m_nExtraUnit = UsePaletteSetForP1() ? AOF3_A_P1_EXTRALOC : AOF3_A_P2_EXTRALOC;

m_nSafeCountForThisRom = GetExtraCt(m_nExtraUnit) + (UsePaletteSetForP1() ? 203 : 63);
m_nSafeCountForThisRom = GetExtraCt(m_nExtraUnit) + (UsePaletteSetForP1() ? 209 : 63);
m_pszExtraFilename = UsePaletteSetForP1() ? EXTRA_FILENAME_AOF3_A_P1 : EXTRA_FILENAME_AOF3_A_P2;
m_nTotalPaletteCount = UsePaletteSetForP1() ? m_nTotalPaletteCountForAOF3_P1 : m_nTotalPaletteCountForAOF3_P2;
// This magic number is used to warn users if their Extra file is trying to write somewhere potentially unusual
Expand Down Expand Up @@ -778,10 +778,22 @@ BOOL CGame_AOF3_A::UpdatePalImg(int Node01, int Node02, int Node03, int Node04)
)
);

sDescTreeNode* charUnit = GetMainTree()->GetDescTree(Node01, -1);
INT8 nNodeDistance = 0;
INT8 nPeerNodeDistance = nPeerPaletteDistance;

if ((nPeerPaletteDistance > 2) && (wcsstr(charUnit->szDesc, L"Sinclair")))
{
// Sinclair reaches into the Shared node for Sword Portrait
nSrcAmt = 1;
nNodeDistance = (Node02 == 0) ? 3 : 2;
nPeerNodeDistance = -Node03;
}

//Set each palette
sDescNode* JoinedNode[2] = {
GetMainTree()->GetDescNode(Node01, Node02, Node03, -1),
GetMainTree()->GetDescNode(Node01, Node02, Node03 + nPeerPaletteDistance, -1)
GetMainTree()->GetDescNode(Node01, Node02 + nNodeDistance, Node03 + nPeerNodeDistance, -1)
};

//Set each palette
Expand Down
Loading

0 comments on commit 672e07a

Please sign in to comment.