Skip to content

Commit

Permalink
updated previews: KOF, SamSho, UMK3, Garou
Browse files Browse the repository at this point in the history
  • Loading branch information
@Preppy
Preppy committed Mar 18, 2022
1 parent af98619 commit aa4967e
Show file tree
Hide file tree
Showing 12 changed files with 466 additions and 401 deletions.
56 changes: 28 additions & 28 deletions palmod/Game/GGXXACR_S_DEF.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -753,20 +753,20 @@ const std::vector<sGame_PaletteDataset> GGXXACR_S_JS_EXTRAS =

const std::vector<sGame_PaletteDataset> GGXXACR_S_KR_EXTRAS =
{
{ L"Bellowing Roar (P) 1/5", 0x291bd0, 0x291c10 },
{ L"Bellowing Roar (P) 2/5", 0x292b00, 0x292b40 },
{ L"Bellowing Roar (P) 3/5", 0x293a50, 0x293a90 },
{ L"Bellowing Roar (P) 4/5", 0x294aa0, 0x294ae0 },
{ L"Bellowing Roar (P) 5/5", 0x295f40, 0x295f80 },
{ L"Bellowing Roar (S) 1/5", 0x296af0, 0x296b30 },
{ L"Bellowing Roar (S) 2/5", 0x298cd0, 0x298d10 },
{ L"Bellowing Roar (S) 3/5", 0x29b5d0, 0x29b610 },
{ L"Bellowing Roar (S) 4/5", 0x29def0, 0x29df30 },
{ L"Bellowing Roar (S) 5/5", 0x2a1150, 0x2a1190 },
{ L"Air B. Roar/Reflex Roar 1/4", 0x2a30c0, 0x2a3100 },
{ L"Air B. Roar/Reflex Roar 2/4", 0x2aab60, 0x2aaba0 },
{ L"Air B. Roar/Reflex Roar 3/4", 0x2b0720, 0x2b0760 },
{ L"Air B. Roar/Reflex Roar 4/4", 0x2b0cc0, 0x2b0d00 },
{ L"Bellowing Roar (P) 1/5", 0x291bd0, 0x291c10, indexGGXXSprites_ACR_Kliff, 0x09 },
{ L"Bellowing Roar (P) 2/5", 0x292b00, 0x292b40, indexGGXXSprites_ACR_Kliff, 0x09 },
{ L"Bellowing Roar (P) 3/5", 0x293a50, 0x293a90, indexGGXXSprites_ACR_Kliff, 0x09 },
{ L"Bellowing Roar (P) 4/5", 0x294aa0, 0x294ae0, indexGGXXSprites_ACR_Kliff, 0x09 },
{ L"Bellowing Roar (P) 5/5", 0x295f40, 0x295f80, indexGGXXSprites_ACR_Kliff, 0x09 },
{ L"Bellowing Roar (S) 1/5", 0x296af0, 0x296b30, indexGGXXSprites_ACR_Kliff, 0x0a },
{ L"Bellowing Roar (S) 2/5", 0x298cd0, 0x298d10, indexGGXXSprites_ACR_Kliff, 0x0a },
{ L"Bellowing Roar (S) 3/5", 0x29b5d0, 0x29b610, indexGGXXSprites_ACR_Kliff, 0x0a },
{ L"Bellowing Roar (S) 4/5", 0x29def0, 0x29df30, indexGGXXSprites_ACR_Kliff, 0x0a },
{ L"Bellowing Roar (S) 5/5", 0x2a1150, 0x2a1190, indexGGXXSprites_ACR_Kliff, 0x0a },
{ L"Air B. Roar/Reflex Roar 1/4", 0x2a30c0, 0x2a3100, indexGGXXSprites_ACR_Kliff, 0x08 },
{ L"Air B. Roar/Reflex Roar 2/4", 0x2aab60, 0x2aaba0, indexGGXXSprites_ACR_Kliff, 0x08 },
{ L"Air B. Roar/Reflex Roar 3/4", 0x2b0720, 0x2b0760, indexGGXXSprites_ACR_Kliff, 0x08 },
{ L"Air B. Roar/Reflex Roar 4/4", 0x2b0cc0, 0x2b0d00, indexGGXXSprites_ACR_Kliff, 0x08 },
{ L"Scale Ripper Dust 1/17", 0x2b1aa0, 0x2b1ae0 },
{ L"Scale Ripper Dust 2/17", 0x2b1cb0, 0x2b1cf0 },
{ L"Scale Ripper Dust 3/17", 0x2b2030, 0x2b2070 },
Expand All @@ -784,14 +784,14 @@ const std::vector<sGame_PaletteDataset> GGXXACR_S_KR_EXTRAS =
{ L"Scale Ripper Dust 15/17", 0x2b65e0, 0x2b6620 },
{ L"Scale Ripper Dust 16/17", 0x2b67d0, 0x2b6810 },
{ L"Scale Ripper Dust 17/17", 0x2b69a0, 0x2b69e0 },
{ L"Sole Survivor 1/6", 0x2b6b60, 0x2b6ba0 },
{ L"Sole Survivor 2/6", 0x2b6ea0, 0x2b6ee0 },
{ L"Sole Survivor 3/6", 0x2b7270, 0x2b72b0 },
{ L"Sole Survivor 4/6", 0x2b7730, 0x2b7770 },
{ L"Sole Survivor 5/6", 0x2b7f10, 0x2b7f50 },
{ L"Sole Survivor 6/6", 0x2b8870, 0x2b88b0 },
{ L"IK Dragons 1/2", 0x2b9640, 0x2b9680 },
{ L"IK Dragons 2/2", 0x2c3c90, 0x2c3cd0 },
{ L"Sole Survivor 1/6", 0x2b6b60, 0x2b6ba0, indexGGXXSprites_ACR_Kliff, 0x0d },
{ L"Sole Survivor 2/6", 0x2b6ea0, 0x2b6ee0, indexGGXXSprites_ACR_Kliff, 0x0d },
{ L"Sole Survivor 3/6", 0x2b7270, 0x2b72b0, indexGGXXSprites_ACR_Kliff, 0x0d },
{ L"Sole Survivor 4/6", 0x2b7730, 0x2b7770, indexGGXXSprites_ACR_Kliff, 0x0d },
{ L"Sole Survivor 5/6", 0x2b7f10, 0x2b7f50, indexGGXXSprites_ACR_Kliff, 0x0d },
{ L"Sole Survivor 6/6", 0x2b8870, 0x2b88b0, indexGGXXSprites_ACR_Kliff, 0x0d },
{ L"IK Dragons 1/2", 0x2b9640, 0x2b9680, indexGGXXSprites_ACR_Kliff, 0x0b },
{ L"IK Dragons 2/2", 0x2c3c90, 0x2c3cd0, indexGGXXSprites_ACR_Kliff, 0x0c },
{ L"\"BAKAMON!\" 1/4", 0x2ce990, 0x2ce9d0 },
{ L"\"BAKAMON!\" 2/4 ", 0x2ced10, 0x2ced50 },
{ L"\"BAKAMON!\" 3/4", 0x2cef70, 0x2cefb0 },
Expand Down Expand Up @@ -1634,12 +1634,12 @@ const std::vector<sGame_PaletteDataset> GGXXACR_S_HUDMenu =

{ L"Combo Counter", 0x2d00, 0x2d40 },
{ L"Character names", 0x2e0, 0x320 },
{ L"Text (Normal) (1/3)", 0x7bcf0, 0x7bd30 },
{ L"Text (Normal) (2/3)", 0x7c1f0, 0x7c230 },
{ L"Text (Normal) (3/3)", 0x7c7d0, 0x7c810 },
{ L"Text (Original) (1/3)", 0x89FF0, 0x8A030 }, // This looks wrong, but it's correct
{ L"Text (Original) (2/3)", 0x8A510, 0x8A550 },
{ L"Text (Original) (3/3)", 0x8AAB0, 0x8AAF0 },
{ L"Text (Normal) (1/3)", 0x7bcf0, 0x7bd30, indexGGXXSprites_ACR_Bonus, 0x10, &pairNextAndNext },
{ L"Text (Normal) (2/3)", 0x7c1f0, 0x7c230, indexGGXXSprites_ACR_Bonus, 0x11 },
{ L"Text (Normal) (3/3)", 0x7c7d0, 0x7c810, indexGGXXSprites_ACR_Bonus, 0x12 },
{ L"Text (Original) (1/3)", 0x89FF0, 0x8A030, indexGGXXSprites_ACR_Bonus, 0x13, &pairNextAndNext }, // This looks wrong, but it's correct
{ L"Text (Original) (2/3)", 0x8A510, 0x8A550, indexGGXXSprites_ACR_Bonus, 0x14 },
{ L"Text (Original) (3/3)", 0x8AAB0, 0x8AAF0, indexGGXXSprites_ACR_Bonus, 0x15 },
{ L"Zappa summon/Move List icons", 0x7E450, 0x7E490 },

{ L"Stagger joystick (1/3)", 0x1EE040, 0x1EE080, indexGGXXSprites_ACR_Bonus, 0x0f },
Expand Down
2 changes: 1 addition & 1 deletion palmod/Game/Game_SAMSHO5_A.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ CGame_SAMSHO5_A::CGame_SAMSHO5_A(UINT32 nConfirmedROMSize, SupportedGamesList nR
m_nTotalInternalUnits = SAMSHO5_A_NUMUNIT;
m_nExtraUnit = SAMSHO5_A_EXTRALOC;

m_nSafeCountForThisRom = GetExtraCt(m_nExtraUnit) + 1665;
m_nSafeCountForThisRom = GetExtraCt(m_nExtraUnit) + 1673;
m_pszExtraFilename = EXTRA_FILENAME_SAMSHO5_A;
m_nTotalPaletteCount = m_nTotalPaletteCountForSAMSHO5;
// This magic number is used to warn users if their Extra file is trying to write somewhere potentially unusual
Expand Down
4 changes: 2 additions & 2 deletions palmod/Game/Game_UMK3_DS.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ CGame_UMK3_DS::CGame_UMK3_DS(UINT32 nConfirmedROMSize)

nGameFlag = UMK3_DS;

nImgGameFlag = IMGDAT_SECTION_SNES;
m_prgGameImageSet.clear(); // we don't have useful images yet
nImgGameFlag = IMGDAT_SECTION_DS;
m_prgGameImageSet = UMK3_DS_IMGIDS_USED;

nFileAmt = 1;

Expand Down
16 changes: 8 additions & 8 deletions palmod/Game/Garou_A_DEF.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,9 @@ const sGame_PaletteDataset Garou_A_TERRY_PALETTES_A[] =
{ L"Terry A - Super Trail Palette", 0xf5e0, 0xf600, indexGarouATerryBogard },
{ L"Terry A - Guard Crash Flash", 0xf600, 0xf620, indexGarouATerryBogard },
{ L"Terry A - Just Defense Palette", 0xf620, 0xf640, indexGarouATerryBogard },
{ L"Terry A - Buster Wolf Effects", 0xf640, 0xf660, indexGarouATerryBogard, 0x08 },
{ L"Terry A - Burn Knuckle/Power Dunk/Buster Wolf Effects", 0xf640, 0xf660, indexGarouATerryBogard, 0x08 },
{ L"Terry A - Power Wave Lighting", 0xf660, 0xf680, indexGarouATerryBogard, 0x0a },
{ L"Terry A - Burn Knuckle/Power Dunk/Buster Wolf Main", 0xf680, 0xf6a0, indexGarouATerryBogard, 0x0a },
{ L"Terry A - Power Wave", 0xf680, 0xf6a0, indexGarouATerryBogard, 0x0a },
{ L"Terry A - Crack Shoot Effects", 0xf6a0, 0xf6c0, indexGarouATerryBogard, 0x09 },
{ L"Terry A - Unused", 0xf6c0, 0xf6e0 },
{ L"Terry A - Terry Extras (Winpose Stuff)", 0xf6e0, 0xf700, indexGarouATerryBogard, 0x01 },
Expand All @@ -259,9 +259,9 @@ const sGame_PaletteDataset Garou_A_TERRY_PALETTES_B[] =
{ L"Terry B - Super Trail Palette", 0xf7e0, 0xf800, indexGarouATerryBogard },
{ L"Terry B - Guard Crash Flash", 0xf800, 0xf820, indexGarouATerryBogard },
{ L"Terry B - Just Defense Palette", 0xf820, 0xf840, indexGarouATerryBogard },
{ L"Terry B - Buster Wolf Effects", 0xf840, 0xf860, indexGarouATerryBogard, 0x08 },
{ L"Terry B - Burn Knuckle/Power Dunk/Buster Wolf Effects", 0xf840, 0xf860, indexGarouATerryBogard, 0x08 },
{ L"Terry B - Power Wave Lighting", 0xf860, 0xf880, indexGarouATerryBogard, 0x0a },
{ L"Terry B - Burn Knuckle/Power Dunk/Buster Wolf Main", 0xf880, 0xf8a0, indexGarouATerryBogard, 0x0a },
{ L"Terry B - Power Wave", 0xf880, 0xf8a0, indexGarouATerryBogard, 0x0a },
{ L"Terry B - Crack Shoot Effects", 0xf8a0, 0xf8c0, indexGarouATerryBogard, 0x09 },
{ L"Terry B - Unused", 0xf8c0, 0xf8e0 },
{ L"Terry B - Terry Extras (Winpose Stuff)", 0xf8e0, 0xf900, indexGarouATerryBogard, 0x01 },
Expand All @@ -279,9 +279,9 @@ const sGame_PaletteDataset Garou_A_TERRY_PALETTES_C[] =
{ L"Terry C - Super Trail Palette", 0xf9e0, 0xfa00, indexGarouATerryBogard },
{ L"Terry C - Guard Crash Flash", 0xfa00, 0xfa20, indexGarouATerryBogard },
{ L"Terry C - Just Defense Palette", 0xfa20, 0xfa40, indexGarouATerryBogard },
{ L"Terry C - Buster Wolf Effects", 0xfa40, 0xfa60, indexGarouATerryBogard, 0x08 },
{ L"Terry C - Burn Knuckle/Power Dunk/Buster Wolf Effects", 0xfa40, 0xfa60, indexGarouATerryBogard, 0x08 },
{ L"Terry C - Power Wave Lighting", 0xfa60, 0xfa80, indexGarouATerryBogard, 0x0a },
{ L"Terry C - Burn Knuckle/Power Dunk/Buster Wolf Main", 0xfa80, 0xfaa0, indexGarouATerryBogard, 0x0a },
{ L"Terry C - Power Wave", 0xfa80, 0xfaa0, indexGarouATerryBogard, 0x0a },
{ L"Terry C - Crack Shoot Effects", 0xfaa0, 0xfac0, indexGarouATerryBogard, 0x09 },
{ L"Terry C - Unused", 0xfac0, 0xfae0 },
{ L"Terry C - Terry Extras (Winpose Stuff)", 0xfae0, 0xfb00, indexGarouATerryBogard, 0x01 },
Expand All @@ -299,9 +299,9 @@ const sGame_PaletteDataset Garou_A_TERRY_PALETTES_D[] =
{ L"Terry D - Super Trail Palette", 0xfbe0, 0xfc00, indexGarouATerryBogard },
{ L"Terry D - Guard Crash Flash", 0xfc00, 0xfc20, indexGarouATerryBogard },
{ L"Terry D - Just Defense Palette", 0xfc20, 0xfc40, indexGarouATerryBogard },
{ L"Terry D - Buster Wolf Effects", 0xfc40, 0xfc60, indexGarouATerryBogard, 0x08 },
{ L"Terry D - Burn Knuckle/Power Dunk/Buster Wolf Effects", 0xfc40, 0xfc60, indexGarouATerryBogard, 0x08 },
{ L"Terry D - Power Wave Lighting", 0xfc60, 0xfc80, indexGarouATerryBogard, 0x0a },
{ L"Terry D - Burn Knuckle/Power Dunk/Buster Wolf Main", 0xfc80, 0xfca0, indexGarouATerryBogard, 0x0a },
{ L"Terry D - Power Wave", 0xfc80, 0xfca0, indexGarouATerryBogard, 0x0a },
{ L"Terry D - Crack Shoot Effects", 0xfca0, 0xfcc0, indexGarouATerryBogard, 0x09 },
{ L"Terry D - Unused", 0xfcc0, 0xfce0 },
{ L"Terry D - Terry Extras (Winpose Stuff)", 0xfce0, 0xfd00, indexGarouATerryBogard, 0x01 },
Expand Down
29 changes: 29 additions & 0 deletions palmod/Game/ImgIdDef.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2199,6 +2199,35 @@ enum SupportedNintendoDS_PaletteListIndex
indexDBZEB_VegetaSSJ1, // 0x45
indexDBZEB_ZAssists, // 0x46
indexDBZEB_Bonus, // 0x47

indexUMK3Sprites_DS_Cyrax, // 0x48
indexUMK3Sprites_DS_Ermac, // 0x49
indexUMK3Sprites_DS_Jade, // 0x4A
indexUMK3Sprites_DS_Jax, // 0x4B
indexUMK3Sprites_DS_Kabal, // 0x4C
indexUMK3Sprites_DS_Kano, // 0x4D
indexUMK3Sprites_DS_Kitana, // 0x4E
indexUMK3Sprites_DS_KungLao, // 0x4F
indexUMK3Sprites_DS_LiuKang, // 0x50
indexUMK3Sprites_DS_Mileena, // 0x51
indexUMK3Sprites_DS_Motaro, // 0x52
indexUMK3Sprites_DS_Nightwolf, // 0x53
indexUMK3Sprites_DS_NoobSaibot, // 0x54
indexUMK3Sprites_DS_Reptile, // 0x55
indexUMK3Sprites_DS_Scorpion, // 0x56
indexUMK3Sprites_DS_Sektor, // 0x57
indexUMK3Sprites_DS_ShangTsung, // 0x58
indexUMK3Sprites_DS_ShaoKhan, // 0x59
indexUMK3Sprites_DS_Sheeva, // 0x5A
indexUMK3Sprites_DS_Sindel, // 0x5B
indexUMK3Sprites_DS_Smoke, // 0x5C
indexUMK3Sprites_DS_SmokeHuman, // 0x5D
indexUMK3Sprites_DS_SonyaBlade, // 0x5E
indexUMK3Sprites_DS_Stryker, // 0x5F
indexUMK3Sprites_DS_SubZeroBiHan, // 0x60
indexUMK3Sprites_DS_SubZeroKuaiLiang, // 0x61
indexUMK3Sprites_DS_Stages, // 0x62
indexUMK3Sprites_DS_Bonus, // 0x63
};

enum SupportedPGM_SpriteListIndex
Expand Down
4 changes: 2 additions & 2 deletions palmod/Game/KOF02UM_S_DEF.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5240,7 +5240,7 @@ const sGame_PaletteDataset KOF02UM_S_HUD_PALETTES[] =
{ L"FIGHT / TIME OVER Text", 0x53840, 0x53880 },
{ L"Bottom half of FIGHT text", 0x538e0, 0x53900 },
{ L"COUNTER, GUARD CRASH", 0x53820, 0x53840 },
{ L"Win Text KO", 0x53880, 0x538a0 },
{ L"Win Text KO", 0x53880, 0x538a0, indexKOF02UMSprites_Bonus, 0x04 },
{ L"Winner Text Outline", 0x538a0, 0x538c0 },
{ L"MAX2 Background Effect 1P", 0x57e20, 0x57e40, indexKOF02UMSprites_Bonus, 0x01 },
{ L"MAX2 Background Effect 2P", 0x57e00, 0x57e20, indexKOF02UMSprites_Bonus, 0x01 },
Expand All @@ -5256,7 +5256,7 @@ const sGame_PaletteDataset KOF02UM_S_EXTRA_PALETTES[] =
{ L"Blood Effects", 0x3c0, 0x3e0 },
{ L"Grab Sparks", 0x380, 0x3a0 },
{ L"Hitspark Effects", 0xa00, 0xa20 },
{ L"Blocksparks Effects", 0x2a0, 0x2c0 },
{ L"Blocksparks Effects", 0x2a0, 0x2c0, indexKOF02UMSprites_Bonus, 0x05 },
{ L"Special/Super Blocksparks", 0x2c0, 0x2e0 },
{ L"MAX Mode and SDM Flash", 0x4c0, 0x4e0 },
{ L"MAX Flash", 0xa80, 0xaa0 },
Expand Down
16 changes: 8 additions & 8 deletions palmod/Game/KOF02_A_DEF.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4182,17 +4182,17 @@ const sGame_PaletteDataset KOF02_A_BONUS_SELECT_PALETTES[] =
{ L"Character Select Icons 2/3", 0xb9162, 0xb9362, indexKOF02Sprites_Bonus, 0x01 },
{ L"Character Select Icons 3/3", 0xb9362, 0xb9462, indexKOF02Sprites_Bonus, 0x02 },
//^ These follow the typical character order for 2002, up to Angel, where it ends. Each is 0x20 in length. The extra black row is unused.
{ L"Character Select Background 1P", 0xb4d62, 0xb4d82 },
{ L"Character Select Background 2P", 0xb4d82, 0xb4da2 },
{ L"Character Select Player Text", 0xb4da2, 0xb4ea2 },
{ L"Character Select Background 1P", 0xb4d62, 0xb4d82, indexKOF02Sprites_Bonus, 0x09 },
{ L"Character Select Background 2P", 0xb4d82, 0xb4da2, indexKOF02Sprites_Bonus, 0x09 },
{ L"Character Select Player Text", 0xb4da2, 0xb4ea2, indexKOF02Sprites_Bonus, 0x08 },
//^ Each palette is 0x20 long, don't question SNK on that decision.


{ L"Character Select Name", 0xb4ea2, 0xb4ec2 },
{ L"Character Select Order Name", 0xb5062, 0xb5082 },
{ L"Character Select Order Numbers", 0xb4ec2, 0xb4f02 },
{ L"How to Play Joystick", 0xb4c02, 0xb4c22 },
{ L"How to Play Buttons", 0xb4d02, 0xb4d42 },
{ L"Character Select Name", 0xb4ea2, 0xb4ec2, indexKOF02Sprites_Bonus, 0x07 },
{ L"Character Select Order Name", 0xb5062, 0xb5082, indexKOF02Sprites_Bonus, 0x0a },
{ L"Character Select Order Numbers", 0xb4ec2, 0xb4f02, indexKOF02Sprites_Bonus, 0x0b },
{ L"How to Play Joystick", 0xb4c02, 0xb4c22, indexKOF02Sprites_Bonus, 0x0d },
{ L"How to Play Buttons", 0xb4d02, 0xb4d42, indexKOF02Sprites_Bonus, 0x0c },
};

const sGame_PaletteDataset KOF02_A_BONUS_HUD_PALETTES[] =
Expand Down
Loading

0 comments on commit aa4967e

Please sign in to comment.