From aa4967e28623ffb905dc3479535e856b8bec91a2 Mon Sep 17 00:00:00 2001 From: Zach Robinson Date: Fri, 18 Mar 2022 15:04:45 -0700 Subject: [PATCH] updated previews: KOF, SamSho, UMK3, Garou --- palmod/Game/GGXXACR_S_DEF.h | 56 +++---- palmod/Game/Game_SAMSHO5_A.cpp | 2 +- palmod/Game/Game_UMK3_DS.cpp | 4 +- palmod/Game/Garou_A_DEF.h | 16 +- palmod/Game/ImgIdDef.h | 29 ++++ palmod/Game/KOF02UM_S_DEF.h | 4 +- palmod/Game/KOF02_A_DEF.h | 16 +- palmod/Game/KOF98AE2016_A_DEF.h | 54 +++--- palmod/Game/SAMSHO5SP_A_DEF.h | 280 ++++++++++++++++++-------------- palmod/Game/SAMSHO5_A_DEF.h | 232 +++++++++++++------------- palmod/Game/UMK3_DS_DEF.h | 170 +++++++++---------- palmod/ImgDat.cpp | 4 +- 12 files changed, 466 insertions(+), 401 deletions(-) diff --git a/palmod/Game/GGXXACR_S_DEF.h b/palmod/Game/GGXXACR_S_DEF.h index 5790388f..d35b37f4 100644 --- a/palmod/Game/GGXXACR_S_DEF.h +++ b/palmod/Game/GGXXACR_S_DEF.h @@ -753,20 +753,20 @@ const std::vector GGXXACR_S_JS_EXTRAS = const std::vector 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 }, @@ -784,14 +784,14 @@ const std::vector 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 }, @@ -1634,12 +1634,12 @@ const std::vector 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 }, diff --git a/palmod/Game/Game_SAMSHO5_A.cpp b/palmod/Game/Game_SAMSHO5_A.cpp index 20c2c2d4..e4c96506 100644 --- a/palmod/Game/Game_SAMSHO5_A.cpp +++ b/palmod/Game/Game_SAMSHO5_A.cpp @@ -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 diff --git a/palmod/Game/Game_UMK3_DS.cpp b/palmod/Game/Game_UMK3_DS.cpp index 899797ae..892d9cb2 100644 --- a/palmod/Game/Game_UMK3_DS.cpp +++ b/palmod/Game/Game_UMK3_DS.cpp @@ -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; diff --git a/palmod/Game/Garou_A_DEF.h b/palmod/Game/Garou_A_DEF.h index b40f9833..02f2012a 100644 --- a/palmod/Game/Garou_A_DEF.h +++ b/palmod/Game/Garou_A_DEF.h @@ -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 }, @@ -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 }, @@ -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 }, @@ -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 }, diff --git a/palmod/Game/ImgIdDef.h b/palmod/Game/ImgIdDef.h index c6bc209b..1bde8d6a 100644 --- a/palmod/Game/ImgIdDef.h +++ b/palmod/Game/ImgIdDef.h @@ -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 diff --git a/palmod/Game/KOF02UM_S_DEF.h b/palmod/Game/KOF02UM_S_DEF.h index 11e2fd05..96f7be0e 100644 --- a/palmod/Game/KOF02UM_S_DEF.h +++ b/palmod/Game/KOF02UM_S_DEF.h @@ -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 }, @@ -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 }, diff --git a/palmod/Game/KOF02_A_DEF.h b/palmod/Game/KOF02_A_DEF.h index 1d291567..4d0af74f 100644 --- a/palmod/Game/KOF02_A_DEF.h +++ b/palmod/Game/KOF02_A_DEF.h @@ -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[] = diff --git a/palmod/Game/KOF98AE2016_A_DEF.h b/palmod/Game/KOF98AE2016_A_DEF.h index 6d533bf5..306f0ae8 100644 --- a/palmod/Game/KOF98AE2016_A_DEF.h +++ b/palmod/Game/KOF98AE2016_A_DEF.h @@ -2,6 +2,8 @@ const std::vector KOF98ae_A_IMGIDS_USED = { + indexKOF96Sprites_Goenitz, // 0x251 + indexKOF98Sprites_Kyo, indexKOF98Sprites_Benimaru, indexKOF98Sprites_Daimon, @@ -41,12 +43,9 @@ const std::vector KOF98ae_A_IMGIDS_USED = indexKOF98Sprites_Rugal, indexKOF98Sprites_Shingo, // 25 - indexKOF99Sprites_Kyo, // 0x194 - indexKOF01Sprites_Leona, // 0x1c4 //Used for KOF98AE2016 Romhack - indexKOF02Sprites_Goenitz, indexKOF02Sprites_Geese, //indexKOF98Sprites_Krauser, //indexKOF98Sprites_MrBig, @@ -54,7 +53,6 @@ const std::vector KOF98ae_A_IMGIDS_USED = indexKOF97Sprites_Orochi, indexKOF97Sprites_IoriOrochi, // 0x1F7 indexKOF97Sprites_LeonaOrochi, // 0x1F8 - indexKOF02UMSprites_KyoKusa, indexKOF95Sprites_Eiji, @@ -70,10 +68,10 @@ const std::vector KOF98ae_A_IMGIDS_USED = const sGame_PaletteDataset KOF98AE2016_A_Kyo_A[] = { - { L"Kyo A - Main", 0x1be7f0, 0x1be810, indexKOF02UMSprites_KyoKusa }, + { L"Kyo A - Main", 0x1be7f0, 0x1be810, indexKOF98Sprites_Kyo }, { L"Extra 1", 0x1be810, 0x1be830 }, { L"Extra 2", 0x1be830, 0x1be850 }, - { L"Max Mode", 0x1be850, 0x1be870, indexKOF02UMSprites_KyoKusa }, + { L"Max Mode", 0x1be850, 0x1be870, indexKOF98Sprites_Kyo }, { L"Extra 3", 0x1be870, 0x1be890 }, { L"Extra 4", 0x1be890, 0x1be8b0 }, { L"Order Select", 0x1be8b0, 0x1be8d0 }, @@ -83,10 +81,10 @@ const sGame_PaletteDataset KOF98AE2016_A_Kyo_A[] = const sGame_PaletteDataset KOF98AE2016_A_Kyo_B[] = { - { L"Kyo B - Main", 0x1be9f0, 0x1bea10, indexKOF02UMSprites_KyoKusa }, + { L"Kyo B - Main", 0x1be9f0, 0x1bea10, indexKOF98Sprites_Kyo }, { L"Extra 1", 0x1bea10, 0x1bea30 }, { L"Extra 2", 0x1bea30, 0x1bea50 }, - { L"Max Mode", 0x1bea50, 0x1bea70, indexKOF02UMSprites_KyoKusa }, + { L"Max Mode", 0x1bea50, 0x1bea70, indexKOF98Sprites_Kyo }, { L"Extra 3", 0x1bea70, 0x1bea90 }, { L"Extra 4", 0x1bea90, 0x1beab0 }, { L"Order Select", 0x1beab0, 0x1bead0 }, @@ -96,10 +94,10 @@ const sGame_PaletteDataset KOF98AE2016_A_Kyo_B[] = const sGame_PaletteDataset KOF98AE2016_A_Kyo_C[] = { - { L"Kyo C - Main", 0x1bebf0, 0x1bec10, indexKOF02UMSprites_KyoKusa }, + { L"Kyo C - Main", 0x1bebf0, 0x1bec10, indexKOF98Sprites_Kyo }, { L"Extra 1", 0x1bec10, 0x1bec30 }, { L"Extra 2", 0x1bec30, 0x1bec50 }, - { L"Max Mode", 0x1bec50, 0x1bec70, indexKOF02UMSprites_KyoKusa }, + { L"Max Mode", 0x1bec50, 0x1bec70, indexKOF98Sprites_Kyo }, { L"Extra 3", 0x1bec70, 0x1bec90 }, { L"Extra 4", 0x1bec90, 0x1becb0 }, { L"Order Select", 0x1becb0, 0x1becd0 }, @@ -109,10 +107,10 @@ const sGame_PaletteDataset KOF98AE2016_A_Kyo_C[] = const sGame_PaletteDataset KOF98AE2016_A_Kyo_D[] = { - { L"Kyo D - Main", 0x1bedf0, 0x1bee10, indexKOF02UMSprites_KyoKusa }, + { L"Kyo D - Main", 0x1bedf0, 0x1bee10, indexKOF98Sprites_Kyo }, { L"Extra 1", 0x1bee10, 0x1bee30 }, { L"Extra 2", 0x1bee30, 0x1bee50 }, - { L"Max Mode", 0x1bee50, 0x1bee70, indexKOF02UMSprites_KyoKusa }, + { L"Max Mode", 0x1bee50, 0x1bee70, indexKOF98Sprites_Kyo }, { L"Extra 3", 0x1bee70, 0x1bee90 }, { L"Extra 4", 0x1bee90, 0x1beeb0 }, { L"Order Select", 0x1beeb0, 0x1beed0 }, @@ -2254,10 +2252,10 @@ const sGame_PaletteDataset KOF98AE2016_A_OmegaRugal_D[] = const sGame_PaletteDataset KOF98AE2016_A_Goenitz_A[] = { - { L"Goenitz A - Main", 0x1b97f0, 0x1b9810, indexKOF02Sprites_Goenitz }, + { L"Goenitz A - Main", 0x1b97f0, 0x1b9810, indexKOF96Sprites_Goenitz }, { L"Extra 1", 0x1b9810, 0x1b9830 }, { L"Extra 2", 0x1b9830, 0x1b9850 }, - { L"Max Mode", 0x1b9850, 0x1b9870, indexKOF02Sprites_Goenitz }, + { L"Max Mode", 0x1b9850, 0x1b9870, indexKOF96Sprites_Goenitz }, { L"Extra 3", 0x1b9870, 0x1b9890 }, { L"Extra 4", 0x1b9890, 0x1b98b0 }, { L"Extra 5", 0x1b98b0, 0x1b98d0 }, @@ -2274,10 +2272,10 @@ const sGame_PaletteDataset KOF98AE2016_A_Goenitz_A[] = const sGame_PaletteDataset KOF98AE2016_A_Goenitz_B[] = { - { L"Goenitz B - Main", 0x1b99f0, 0x1b9a10, indexKOF02Sprites_Goenitz }, + { L"Goenitz B - Main", 0x1b99f0, 0x1b9a10, indexKOF96Sprites_Goenitz }, { L"Extra 1", 0x1b9a10, 0x1b9a30 }, { L"Extra 2", 0x1b9a30, 0x1b9a50 }, - { L"Max Mode", 0x1b9a50, 0x1b9a70, indexKOF02Sprites_Goenitz }, + { L"Max Mode", 0x1b9a50, 0x1b9a70, indexKOF96Sprites_Goenitz }, { L"Extra 3", 0x1b9a70, 0x1b9a90 }, { L"Extra 4", 0x1b9a90, 0x1b9ab0 }, { L"Extra 5", 0x1b9ab0, 0x1b9ad0 }, @@ -2294,10 +2292,10 @@ const sGame_PaletteDataset KOF98AE2016_A_Goenitz_B[] = const sGame_PaletteDataset KOF98AE2016_A_Goenitz_C[] = { - { L"Goenitz C - Main", 0x1b9bf0, 0x1b9c10, indexKOF02Sprites_Goenitz }, + { L"Goenitz C - Main", 0x1b9bf0, 0x1b9c10, indexKOF96Sprites_Goenitz }, { L"Extra 1", 0x1b9c10, 0x1b9c30 }, { L"Extra 2", 0x1b9c30, 0x1b9c50 }, - { L"Max Mode", 0x1b9c50, 0x1b9c70, indexKOF02Sprites_Goenitz }, + { L"Max Mode", 0x1b9c50, 0x1b9c70, indexKOF96Sprites_Goenitz }, { L"Extra 3", 0x1b9c70, 0x1b9c90 }, { L"Extra 4", 0x1b9c90, 0x1b9cb0 }, { L"Extra 5", 0x1b9cb0, 0x1b9cd0 }, @@ -2314,10 +2312,10 @@ const sGame_PaletteDataset KOF98AE2016_A_Goenitz_C[] = const sGame_PaletteDataset KOF98AE2016_A_Goenitz_D[] = { - { L"Goenitz D - Main", 0x1b9df0, 0x1b9e10, indexKOF02Sprites_Goenitz }, + { L"Goenitz D - Main", 0x1b9df0, 0x1b9e10, indexKOF96Sprites_Goenitz }, { L"Extra 1", 0x1b9e10, 0x1b9e30 }, { L"Extra 2", 0x1b9e30, 0x1b9e50 }, - { L"Max Mode", 0x1b9e50, 0x1b9e70, indexKOF02Sprites_Goenitz }, + { L"Max Mode", 0x1b9e50, 0x1b9e70, indexKOF96Sprites_Goenitz }, { L"Extra 3", 0x1b9e70, 0x1b9e90 }, { L"Extra 4", 0x1b9e90, 0x1b9eb0 }, { L"Extra 5", 0x1b9eb0, 0x1b9ed0 }, @@ -3055,10 +3053,10 @@ const sGame_PaletteDataset KOF98AE2016_A_OLeona_D[] = const sGame_PaletteDataset KOF98AE2016_A_KyoEX_A[] = { - { L"Kyo (EX) A - Main", 0x1d97f0, 0x1d9810, indexKOF99Sprites_Kyo }, + { L"Kyo (EX) A - Main", 0x1d97f0, 0x1d9810, indexKOF98Sprites_Kyo }, { L"Extra 1", 0x1d9810, 0x1d9830 }, { L"Extra 2", 0x1d9830, 0x1d9850 }, - { L"Max Mode", 0x1d9850, 0x1d9870, indexKOF99Sprites_Kyo }, + { L"Max Mode", 0x1d9850, 0x1d9870, indexKOF98Sprites_Kyo }, { L"Extra 3", 0x1d9870, 0x1d9890 }, { L"Extra 4", 0x1d9890, 0x1d98b0 }, { L"Order Select", 0x1d98b0, 0x1d98d0, indexKOF98Sprites_OrderSelect, indexKOF98Sprites_Kyo }, @@ -3068,10 +3066,10 @@ const sGame_PaletteDataset KOF98AE2016_A_KyoEX_A[] = const sGame_PaletteDataset KOF98AE2016_A_KyoEX_B[] = { - { L"Kyo (EX) B - Main", 0x1d99f0, 0x1d9a10, indexKOF99Sprites_Kyo }, + { L"Kyo (EX) B - Main", 0x1d99f0, 0x1d9a10, indexKOF98Sprites_Kyo }, { L"Extra 1", 0x1d9a10, 0x1d9a30 }, { L"Extra 2", 0x1d9a30, 0x1d9a50 }, - { L"Max Mode", 0x1d9a50, 0x1d9a70, indexKOF99Sprites_Kyo }, + { L"Max Mode", 0x1d9a50, 0x1d9a70, indexKOF98Sprites_Kyo }, { L"Extra 3", 0x1d9a70, 0x1d9a90 }, { L"Extra 4", 0x1d9a90, 0x1d9ab0 }, { L"Order Select", 0x1d9ab0, 0x1d9ad0, indexKOF98Sprites_OrderSelect, indexKOF98Sprites_Kyo }, @@ -3081,10 +3079,10 @@ const sGame_PaletteDataset KOF98AE2016_A_KyoEX_B[] = const sGame_PaletteDataset KOF98AE2016_A_KyoEX_C[] = { - { L"Kyo (EX) C - Main", 0x1d9bf0, 0x1d9c10, indexKOF99Sprites_Kyo }, + { L"Kyo (EX) C - Main", 0x1d9bf0, 0x1d9c10, indexKOF98Sprites_Kyo }, { L"Extra 1", 0x1d9c10, 0x1d9c30 }, { L"Extra 2", 0x1d9c30, 0x1d9c50 }, - { L"Max Mode", 0x1d9c50, 0x1d9c70, indexKOF99Sprites_Kyo }, + { L"Max Mode", 0x1d9c50, 0x1d9c70, indexKOF98Sprites_Kyo }, { L"Extra 3", 0x1d9c70, 0x1d9c90 }, { L"Extra 4", 0x1d9c90, 0x1d9cb0 }, { L"Order Select", 0x1d9cb0, 0x1d9cd0, indexKOF98Sprites_OrderSelect, indexKOF98Sprites_Kyo }, @@ -3094,10 +3092,10 @@ const sGame_PaletteDataset KOF98AE2016_A_KyoEX_C[] = const sGame_PaletteDataset KOF98AE2016_A_KyoEX_D[] = { - { L"Kyo (EX) D - Main", 0x1d9df0, 0x1d9e10, indexKOF99Sprites_Kyo }, + { L"Kyo (EX) D - Main", 0x1d9df0, 0x1d9e10, indexKOF98Sprites_Kyo }, { L"Extra 1", 0x1d9e10, 0x1d9e30 }, { L"Extra 2", 0x1d9e30, 0x1d9e50 }, - { L"Max Mode", 0x1d9e50, 0x1d9e70, indexKOF99Sprites_Kyo }, + { L"Max Mode", 0x1d9e50, 0x1d9e70, indexKOF98Sprites_Kyo }, { L"Extra 3", 0x1d9e70, 0x1d9e90 }, { L"Extra 4", 0x1d9e90, 0x1d9eb0 }, { L"Order Select", 0x1d9eb0, 0x1d9ed0, indexKOF98Sprites_OrderSelect, indexKOF98Sprites_Kyo }, diff --git a/palmod/Game/SAMSHO5SP_A_DEF.h b/palmod/Game/SAMSHO5SP_A_DEF.h index 52e3398b..ce80d98f 100644 --- a/palmod/Game/SAMSHO5SP_A_DEF.h +++ b/palmod/Game/SAMSHO5SP_A_DEF.h @@ -37,7 +37,37 @@ const std::vector SAMSHO5SP_A_IMGIDS_USED = indexSamSho5Sprites_Yunfei, indexSamSho5Sprites_Zankuro, indexSamSho5Sprites_Portrait, - indexSamSho5Sprites_Bonus + indexSamSho5Sprites_Bonus, + + indexSS5_Basara, // 0x31 + indexSS5_Charlotte, // 0x32 + indexSS5_Enja, // 0x33 + indexSS5_Gaira, // 0x34 + indexSS5_Galford, // 0x35 + indexSS5_Gaoh, // 0x36 + indexSS5_Genjuro, // 0x37 + indexSS5_Hanzo, // 0x38 + indexSS5_Haohmaru, // 0x39 + indexSS5_Jubei, // 0x3A + indexSS5_Kazuki, // 0x3B + indexSS5_Kusaregedo, // 0x3C + indexSS5_Kyoshiro, // 0x3D + indexSS5_Mina, // 0x3E + indexSS5_Nakoruru, // 0x3F + indexSS5_Rasetsumaru, // 0x40 + indexSS5_Rera, // 0x41 + indexSS5_Rimururu, // 0x42 + indexSS5_Sankuro, // 0x43 + indexSS5_Shizumaru, // 0x44 + indexSS5_Sogetsu, // 0x45 + indexSS5_Suija, // 0x46 + indexSS5_TamTam, // 0x47 + indexSS5_Ukyo, // 0x48 + indexSS5_Yoshitora, // 0x49 + indexSS5_Yumeji, // 0x4A + indexSS5_Yunfei, // 0x4B + indexSS5_Bonus, // 0x4c + indexSS5_Stages, // 0x4d }; const sGame_PaletteDataset SAMSHOW5SP_A_Amakusa_PALETTES_A[] = @@ -428,11 +458,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Galford_PALETTES_A[] = { L"Galford A (Frozen/Wet)", 0xd9140, 0xd9180, indexSamSho5Sprites_Galford }, { L"Galford A (Ki)", 0xd9180, 0xd91c0, indexSamSho5Sprites_Galford }, { L"Galford A (Issen Trail)", 0xd9200, 0xd9240, indexSamSho5Sprites_Galford }, - { L"Galford A (Plasma Factor)", 0xd92a0, 0xd92c0 }, - { L"Galford A (Plasma Blade)", 0xd92c0, 0xd92e0 }, - { L"Galford A (Strike Heads/Poppy)", 0xd92e0, 0xd9300 }, - { L"Galford A (Replica Effect)", 0xd9320, 0xd9340 }, - { L"Galford A (Replica Attack/Slash Effects)", 0xd9340, 0xd9360 }, + { L"Galford A (Plasma Factor)", 0xd92a0, 0xd92c0, indexSS5_Galford, 0x08 }, + { L"Galford A (Plasma Blade)", 0xd92c0, 0xd92e0, indexSS5_Galford, 0x07 }, + { L"Galford A (Strike Heads/Poppy)", 0xd92e0, 0xd9300, indexSS5_Galford, 0x0b }, + { L"Galford A (Replica Effect)", 0xd9320, 0xd9340, indexSS5_Galford, 0x0a }, + { L"Galford A (Replica Attack/Slash Effects)", 0xd9340, 0xd9360, indexSS5_Galford, 0x09 }, { L"Galford A (Imitate Replica)", 0xd9360, 0xd9380 }, }; @@ -448,11 +478,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Galford_PALETTES_B[] = { L"Galford B (Frozen/Wet)", 0xd9540, 0xd9580, indexSamSho5Sprites_Galford }, { L"Galford B (Ki)", 0xd9580, 0xd95c0, indexSamSho5Sprites_Galford }, { L"Galford B (Issen Trail)", 0xd9600, 0xd9640, indexSamSho5Sprites_Galford }, - { L"Galford B (Plasma Factor)", 0xd96a0, 0xd96c0 }, - { L"Galford B (Plasma Blade)", 0xd96c0, 0xd96e0 }, - { L"Galford B (Strike Heads/Poppy)", 0xd96e0, 0xd9700 }, - { L"Galford B (Replica Effect)", 0xd9720, 0xd9740 }, - { L"Galford B (Replica Attack/Slash Effects)", 0xd9740, 0xd9760 }, + { L"Galford B (Plasma Factor)", 0xd96a0, 0xd96c0, indexSS5_Galford, 0x08 }, + { L"Galford B (Plasma Blade)", 0xd96c0, 0xd96e0, indexSS5_Galford, 0x07 }, + { L"Galford B (Strike Heads/Poppy)", 0xd96e0, 0xd9700, indexSS5_Galford, 0x0b }, + { L"Galford B (Replica Effect)", 0xd9720, 0xd9740, indexSS5_Galford, 0x0a }, + { L"Galford B (Replica Attack/Slash Effects)", 0xd9740, 0xd9760, indexSS5_Galford, 0x09 }, { L"Galford B (Imitate Replica)", 0xd9760, 0xd9780 }, }; @@ -468,11 +498,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Galford_PALETTES_C[] = { L"Galford C (Frozen/Wet)", 0xd9940, 0xd9980, indexSamSho5Sprites_Galford }, { L"Galford C (Ki)", 0xd9980, 0xd99c0, indexSamSho5Sprites_Galford }, { L"Galford C (Issen Trail)", 0xd9a00, 0xd9a40, indexSamSho5Sprites_Galford }, - { L"Galford C (Plasma Factor)", 0xd9aa0, 0xd9ac0 }, - { L"Galford C (Plasma Blade)", 0xd9ac0, 0xd9ae0 }, - { L"Galford C (Strike Heads/Poppy)", 0xd9ae0, 0xd9b00 }, - { L"Galford C (Replica Effect)", 0xd9b20, 0xd9b40 }, - { L"Galford C (Replica Attack/Slash Effects)", 0xd9b40, 0xd9b60 }, + { L"Galford C (Plasma Factor)", 0xd9aa0, 0xd9ac0, indexSS5_Galford, 0x08 }, + { L"Galford C (Plasma Blade)", 0xd9ac0, 0xd9ae0, indexSS5_Galford, 0x07 }, + { L"Galford C (Strike Heads/Poppy)", 0xd9ae0, 0xd9b00, indexSS5_Galford, 0x0b }, + { L"Galford C (Replica Effect)", 0xd9b20, 0xd9b40, indexSS5_Galford, 0x0a }, + { L"Galford C (Replica Attack/Slash Effects)", 0xd9b40, 0xd9b60, indexSS5_Galford, 0x09 }, { L"Galford C (Imitate Replica)", 0xd9b60, 0xd9b80 }, }; @@ -488,11 +518,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Galford_PALETTES_D[] = { L"Galford D (Frozen/Wet)", 0xd9d40, 0xd9d80, indexSamSho5Sprites_Galford }, { L"Galford D (Ki)", 0xd9d80, 0xd9dc0, indexSamSho5Sprites_Galford }, { L"Galford D (Issen Trail)", 0xd9e00, 0xd9e40, indexSamSho5Sprites_Galford }, - { L"Galford D (Plasma Factor)", 0xd9ea0, 0xd9ec0 }, - { L"Galford D (Plasma Blade)", 0xd9ec0, 0xd9ee0 }, - { L"Galford D (Strike Heads/Poppy)", 0xd9ee0, 0xd9f00 }, - { L"Galford D (Replica Effect)", 0xd9f20, 0xd9f40 }, - { L"Galford D (Replica Attack/Slash Effects)", 0xd9f40, 0xd9f60 }, + { L"Galford D (Plasma Factor)", 0xd9ea0, 0xd9ec0, indexSS5_Galford, 0x08 }, + { L"Galford D (Plasma Blade)", 0xd9ec0, 0xd9ee0, indexSS5_Galford, 0x07 }, + { L"Galford D (Strike Heads/Poppy)", 0xd9ee0, 0xd9f00, indexSS5_Galford, 0x0b }, + { L"Galford D (Replica Effect)", 0xd9f20, 0xd9f40, indexSS5_Galford, 0x0a }, + { L"Galford D (Replica Attack/Slash Effects)", 0xd9f40, 0xd9f60, indexSS5_Galford, 0x09 }, { L"Galford D (Imitate Replica)", 0xd9f60, 0xd9f80 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Gaoh_PALETTES_A[] = @@ -506,11 +536,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Gaoh_PALETTES_A[] = { L"Gaoh A (Frozen/Wet)", 0xef140, 0xef180, indexSamSho5Sprites_Gaoh }, { L"Gaoh A (Ki)", 0xef180, 0xef1c0, indexSamSho5Sprites_Gaoh }, { L"Gaoh A (Issen Trail)", 0xef200, 0xef240, indexSamSho5Sprites_Gaoh }, - { L"Gaoh A (Overkill 1)", 0xef280, 0xef2c0, indexSamSho5Sprites_Gaoh }, - { L"Gaoh A (Overkill 2)", 0xef2c0, 0xef2e0 }, - { L"Gaoh A (Overkill 3)", 0xef2e0, 0xef300 }, - { L"Gaoh A (Slash Effects)", 0xef340, 0xef360 }, - { L"Gaoh A (Misc Specials)", 0xef360, 0xef380 }, + { L"Gaoh A (Overkill 1)", 0xef280, 0xef2c0, indexSS5_Gaoh, 0x08 }, + { L"Gaoh A (Overkill 2)", 0xef2c0, 0xef2e0, indexSS5_Gaoh, 0x09, &pairNext }, + { L"Gaoh A (Overkill 3)", 0xef2e0, 0xef300, indexSS5_Gaoh, 0x0a }, + { L"Gaoh A (Slash Effects)", 0xef340, 0xef360, indexSS5_Gaoh, 0x0b }, + { L"Gaoh A (Misc Specials)", 0xef360, 0xef380, indexSS5_Gaoh, 0x07 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Gaoh_PALETTES_B[] = @@ -524,11 +554,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Gaoh_PALETTES_B[] = { L"Gaoh B (Frozen/Wet)", 0xef540, 0xef580, indexSamSho5Sprites_Gaoh }, { L"Gaoh B (Ki)", 0xef580, 0xef5c0, indexSamSho5Sprites_Gaoh }, { L"Gaoh B (Issen Trail)", 0xef600, 0xef640, indexSamSho5Sprites_Gaoh }, - { L"Gaoh B (Overkill 1)", 0xef680, 0xef6c0, indexSamSho5Sprites_Gaoh }, - { L"Gaoh B (Overkill 2)", 0xef6c0, 0xef6e0 }, - { L"Gaoh B (Overkill 3)", 0xef6e0, 0xef700 }, - { L"Gaoh B (Slash Effects)", 0xef740, 0xef760 }, - { L"Gaoh B (Misc Specials)", 0xef760, 0xef780 }, + { L"Gaoh B (Overkill 1)", 0xef680, 0xef6c0, indexSS5_Gaoh, 0x08 }, + { L"Gaoh B (Overkill 2)", 0xef6c0, 0xef6e0, indexSS5_Gaoh, 0x09, &pairNext }, + { L"Gaoh B (Overkill 3)", 0xef6e0, 0xef700, indexSS5_Gaoh, 0x0a }, + { L"Gaoh B (Slash Effects)", 0xef740, 0xef760, indexSS5_Gaoh, 0x0b }, + { L"Gaoh B (Misc Specials)", 0xef760, 0xef780, indexSS5_Gaoh, 0x07 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Gaoh_PALETTES_C[] = @@ -542,11 +572,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Gaoh_PALETTES_C[] = { L"Gaoh C (Frozen/Wet)", 0xef940, 0xef980, indexSamSho5Sprites_Gaoh }, { L"Gaoh C (Ki)", 0xef980, 0xef9c0, indexSamSho5Sprites_Gaoh }, { L"Gaoh C (Issen Trail)", 0xefa00, 0xefa40, indexSamSho5Sprites_Gaoh }, - { L"Gaoh C (Overkill 1)", 0xefa80, 0xefac0, indexSamSho5Sprites_Gaoh }, - { L"Gaoh C (Overkill 2)", 0xefac0, 0xefae0 }, - { L"Gaoh C (Overkill 3)", 0xefae0, 0xefb00 }, - { L"Gaoh C (Slash Effects)", 0xefb40, 0xefb60 }, - { L"Gaoh C (Misc Specials)", 0xefb60, 0xefb80 }, + { L"Gaoh C (Overkill 1)", 0xefa80, 0xefac0, indexSS5_Gaoh, 0x08 }, + { L"Gaoh C (Overkill 2)", 0xefac0, 0xefae0, indexSS5_Gaoh, 0x09, &pairNext }, + { L"Gaoh C (Overkill 3)", 0xefae0, 0xefb00, indexSS5_Gaoh, 0x0a }, + { L"Gaoh C (Slash Effects)", 0xefb40, 0xefb60, indexSS5_Gaoh, 0x0b }, + { L"Gaoh C (Misc Specials)", 0xefb60, 0xefb80, indexSS5_Gaoh, 0x07 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Gaoh_PALETTES_D[] = @@ -560,11 +590,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Gaoh_PALETTES_D[] = { L"Gaoh D (Frozen/Wet)", 0xefd40, 0xefd80, indexSamSho5Sprites_Gaoh }, { L"Gaoh D (Ki)", 0xefd80, 0xefdc0, indexSamSho5Sprites_Gaoh }, { L"Gaoh D (Issen Trail)", 0xefe00, 0xefe40, indexSamSho5Sprites_Gaoh }, - { L"Gaoh D (Overkill 1)", 0xefe80, 0xefec0, indexSamSho5Sprites_Gaoh }, - { L"Gaoh D (Overkill 2)", 0xefec0, 0xefee0 }, - { L"Gaoh D (Overkill 3)", 0xefee0, 0xeff00 }, - { L"Gaoh D (Slash Effects)", 0xeff40, 0xeff60 }, - { L"Gaoh D (Misc Specials)", 0xeff60, 0xeff80 }, + { L"Gaoh D (Overkill 1)", 0xefe80, 0xefec0, indexSS5_Gaoh, 0x08 }, + { L"Gaoh D (Overkill 2)", 0xefec0, 0xefee0, indexSS5_Gaoh, 0x09, &pairNext }, + { L"Gaoh D (Overkill 3)", 0xefee0, 0xeff00, indexSS5_Gaoh, 0x0a }, + { L"Gaoh D (Slash Effects)", 0xeff40, 0xeff60, indexSS5_Gaoh, 0x0b }, + { L"Gaoh D (Misc Specials)", 0xeff60, 0xeff80, indexSS5_Gaoh, 0x07 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Genjuro_PALETTES_A[] = @@ -582,7 +612,7 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Genjuro_PALETTES_A[] = { L"Genjuro A (Darker Card Effect)", 0xdc1e0, 0xdc200 }, { L"Genjuro A (Issen Trail)", 0xdc200, 0xdc240, indexSamSho5Sprites_Genjuro }, { L"Genjuro A (Oukazan 1)", 0xdc280, 0xdc2a0 }, - { L"Genjuro A (Bowl/Specials Slash Effect)", 0xdc2a0, 0xdc2c0 }, + { L"Genjuro A (Bowl/Specials Slash Effect)", 0xdc2a0, 0xdc2c0, indexSS5_Genjuro, 0x07 }, { L"Genjuro A (Oukazan 2/Slash Effects)", 0xdc340, 0xdc360 }, { L"Genjuro A (White & Blue Card)", 0xdc3e0, 0xdc400 }, }; @@ -602,7 +632,7 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Genjuro_PALETTES_B[] = { L"Genjuro B (Darker Card Effect)", 0xdc5e0, 0xdc600 }, { L"Genjuro B (Issen Trail)", 0xdc600, 0xdc640, indexSamSho5Sprites_Genjuro }, { L"Genjuro B (Oukazan 1)", 0xdc680, 0xdc6a0 }, - { L"Genjuro B (Bowl/Specials Slash Effect)", 0xdc6a0, 0xdc6c0 }, + { L"Genjuro B (Bowl/Specials Slash Effect)", 0xdc6a0, 0xdc6c0, indexSS5_Genjuro, 0x07 }, { L"Genjuro B (Oukazan 2/Slash Effects)", 0xdc740, 0xdc760 }, { L"Genjuro B (White & Blue Card)", 0xdc7e0, 0xdc800 }, }; @@ -622,7 +652,7 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Genjuro_PALETTES_C[] = { L"Genjuro C (Darker Card Effect)", 0xdc9e0, 0xdca00 }, { L"Genjuro C (Issen Trail)", 0xdca00, 0xdca40, indexSamSho5Sprites_Genjuro }, { L"Genjuro C (Oukazan 1)", 0xdca80, 0xdcaa0 }, - { L"Genjuro C (Bowl/Specials Slash Effect)", 0xdcaa0, 0xdcac0 }, + { L"Genjuro C (Bowl/Specials Slash Effect)", 0xdcaa0, 0xdcac0, indexSS5_Genjuro, 0x07 }, { L"Genjuro C (Oukazan 2/Slash Effects)", 0xdcb40, 0xdcb60 }, { L"Genjuro C (White & Blue Card)", 0xdcbe0, 0xdcc00 }, }; @@ -642,7 +672,7 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Genjuro_PALETTES_D[] = { L"Genjuro D (Darker Card Effect)", 0xdcde0, 0xdce00 }, { L"Genjuro D (Issen Trail)", 0xdce00, 0xdce40, indexSamSho5Sprites_Genjuro }, { L"Genjuro D (Oukazan 1)", 0xdce80, 0xdcea0 }, - { L"Genjuro D (Bowl/Specials Slash Effect)", 0xdcea0, 0xdcec0 }, + { L"Genjuro D (Bowl/Specials Slash Effect)", 0xdcea0, 0xdcec0, indexSS5_Genjuro, 0x07 }, { L"Genjuro D (Oukazan 2/Slash Effects)", 0xdcf40, 0xdcf60 }, { L"Genjuro D (White & Blue Card)", 0xdcfe0, 0xdd000 }, }; @@ -658,10 +688,10 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Hanzo_PALETTES_A[] = { L"Hanzo A (Frozen/Wet)", 0xd8140, 0xd8180, indexSamSho5Sprites_Hanzo }, { L"Hanzo A (Ki)", 0xd8180, 0xd81c0, indexSamSho5Sprites_Hanzo }, { L"Hanzo A (Issen Trail)", 0xd8200, 0xd8240, indexSamSho5Sprites_Hanzo }, - { L"Hanzo A (Baku'en Ryuu/Mozu Otoshi)", 0xd8280, 0xd82a0 }, + { L"Hanzo A (Baku'en Ryuu/Mozu Otoshi)", 0xd8280, 0xd82a0, indexSS5_Hanzo, 0x07 }, { L"Hanzo A (Bone Break Effect)", 0xd82a0, 0xd82c0 }, - { L"Hanzo A (Ninpou Effect/Shuriken)", 0xd8320, 0xd8340 }, - { L"Hanzo A (Flame Pose/Slash Effects)", 0xd8340, 0xd8360 }, + { L"Hanzo A (Ninpou Effect/Shuriken)", 0xd8320, 0xd8340, indexSS5_Hanzo, 0x09 }, + { L"Hanzo A (Flame Pose/Slash Effects)", 0xd8340, 0xd8360, indexSS5_Hanzo, 0x08 }, { L"Hanzo A (Migawari no Jutsu)", 0xd8360, 0xd8380 }, }; @@ -676,10 +706,10 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Hanzo_PALETTES_B[] = { L"Hanzo B (Frozen/Wet)", 0xd8540, 0xd8580, indexSamSho5Sprites_Hanzo }, { L"Hanzo B (Ki)", 0xd8580, 0xd85c0, indexSamSho5Sprites_Hanzo }, { L"Hanzo B (Issen Trail)", 0xd8600, 0xd8640, indexSamSho5Sprites_Hanzo }, - { L"Hanzo B (Baku'en Ryuu/Mozu Otoshi)", 0xd8680, 0xd86a0 }, + { L"Hanzo B (Baku'en Ryuu/Mozu Otoshi)", 0xd8680, 0xd86a0, indexSS5_Hanzo, 0x07 }, { L"Hanzo B (Bone Break Effect)", 0xd86a0, 0xd86c0 }, - { L"Hanzo B (Ninpou Effect/Shuriken)", 0xd8720, 0xd8740 }, - { L"Hanzo B (Flame Pose/Slash Effects)", 0xd8740, 0xd8760 }, + { L"Hanzo B (Ninpou Effect/Shuriken)", 0xd8720, 0xd8740, indexSS5_Hanzo, 0x09 }, + { L"Hanzo B (Flame Pose/Slash Effects)", 0xd8740, 0xd8760, indexSS5_Hanzo, 0x08 }, { L"Hanzo B (Migawari no Jutsu)", 0xd8760, 0xd8780 }, }; @@ -694,10 +724,10 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Hanzo_PALETTES_C[] = { L"Hanzo C (Frozen/Wet)", 0xd8940, 0xd8980, indexSamSho5Sprites_Hanzo }, { L"Hanzo C (Ki)", 0xd8980, 0xd89c0, indexSamSho5Sprites_Hanzo }, { L"Hanzo C (Issen Trail)", 0xd8a00, 0xd8a40, indexSamSho5Sprites_Hanzo }, - { L"Hanzo C (Baku'en Ryuu/Mozu Otoshi)", 0xd8a80, 0xd8aa0 }, + { L"Hanzo C (Baku'en Ryuu/Mozu Otoshi)", 0xd8a80, 0xd8aa0, indexSS5_Hanzo, 0x07 }, { L"Hanzo C (Bone Break Effect)", 0xd8aa0, 0xd8ac0 }, - { L"Hanzo C (Ninpou Effect/Shuriken)", 0xd8b20, 0xd8b40 }, - { L"Hanzo C (Flame Pose/Slash Effects)", 0xd8b40, 0xd8b60 }, + { L"Hanzo C (Ninpou Effect/Shuriken)", 0xd8b20, 0xd8b40, indexSS5_Hanzo, 0x09 }, + { L"Hanzo C (Flame Pose/Slash Effects)", 0xd8b40, 0xd8b60, indexSS5_Hanzo, 0x08 }, { L"Hanzo C (Migawari no Jutsu)", 0xd8b60, 0xd8b80 }, }; @@ -712,10 +742,10 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Hanzo_PALETTES_D[] = { L"Hanzo D (Frozen/Wet)", 0xd8d40, 0xd8d80, indexSamSho5Sprites_Hanzo }, { L"Hanzo D (Ki)", 0xd8d80, 0xd8dc0, indexSamSho5Sprites_Hanzo }, { L"Hanzo D (Issen Trail)", 0xd8e00, 0xd8e40, indexSamSho5Sprites_Hanzo }, - { L"Hanzo D (Baku'en Ryuu/Mozu Otoshi)", 0xd8e80, 0xd8ea0 }, + { L"Hanzo D (Baku'en Ryuu/Mozu Otoshi)", 0xd8e80, 0xd8ea0, indexSS5_Hanzo, 0x07 }, { L"Hanzo D (Bone Break Effect)", 0xd8ea0, 0xd8ec0 }, - { L"Hanzo D (Ninpou Effect/Shuriken)", 0xd8f20, 0xd8f40 }, - { L"Hanzo D (Flame Pose/Slash Effects)", 0xd8f40, 0xd8f60 }, + { L"Hanzo D (Ninpou Effect/Shuriken)", 0xd8f20, 0xd8f40, indexSS5_Hanzo, 0x09 }, + { L"Hanzo D (Flame Pose/Slash Effects)", 0xd8f40, 0xd8f60, indexSS5_Hanzo, 0x08 }, { L"Hanzo D (Migawari no Jutsu)", 0xd8f60, 0xd8f80 }, }; @@ -1002,13 +1032,13 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Kyoshiro_PALETTES_A[] = { L"Kyoshiro A (Shocked)", 0xda100, 0xda140, indexSamSho5Sprites_Kyoshiro }, { L"Kyoshiro A (Frozen/Wet)", 0xda140, 0xda180, indexSamSho5Sprites_Kyoshiro }, { L"Kyoshiro A (Ki)", 0xda180, 0xda1c0, indexSamSho5Sprites_Kyoshiro }, - { L"Kyoshiro A (Ootsunami)", 0xda1c0, 0xda1e0 }, + { L"Kyoshiro A (Ootsunami)", 0xda1c0, 0xda1e0, indexSS5_Kyoshiro, 0x08 }, { L"Kyoshiro A (Toad Effect/Overkill)", 0xda1e0, 0xda200, indexSamSho5Sprites_Kyoshiro, 0x1 }, { L"Kyoshiro A (Issen Trail)", 0xda200, 0xda240, indexSamSho5Sprites_Kyoshiro }, - { L"Kyoshiro A (Choubi Jishi/Kaen Kyokubu)", 0xda2a0, 0xda2c0 }, - { L"Kyoshiro A (Overkill Curtains)", 0xda320, 0xda340 }, + { L"Kyoshiro A (Choubi Jishi/Kaen Kyokubu)", 0xda2a0, 0xda2c0, indexSS5_Kyoshiro, 0x07 }, + { L"Kyoshiro A (Overkill Curtains)", 0xda320, 0xda340, indexSS5_Kyoshiro, 0x09 }, { L"Kyoshiro A (Spin/Slash Effects)", 0xda340, 0xda360 }, - { L"Kyoshiro A (Overkill Kuroko)", 0xda380, 0xda3a0 }, + { L"Kyoshiro A (Overkill Kuroko)", 0xda380, 0xda3a0, indexSS5_Kyoshiro, 0x0a }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Kyoshiro_PALETTES_B[] = @@ -1022,13 +1052,13 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Kyoshiro_PALETTES_B[] = { L"Kyoshiro B (Shocked)", 0xda500, 0xda540, indexSamSho5Sprites_Kyoshiro }, { L"Kyoshiro B (Frozen/Wet)", 0xda540, 0xda580, indexSamSho5Sprites_Kyoshiro }, { L"Kyoshiro B (Ki)", 0xda580, 0xda5c0, indexSamSho5Sprites_Kyoshiro }, - { L"Kyoshiro B (Ootsunami)", 0xda5c0, 0xda5e0 }, + { L"Kyoshiro B (Ootsunami)", 0xda5c0, 0xda5e0, indexSS5_Kyoshiro, 0x08 }, { L"Kyoshiro B (Toad Effect/Overkill)", 0xda5e0, 0xda600, indexSamSho5Sprites_Kyoshiro, 0x1 }, { L"Kyoshiro B (Issen Trail)", 0xda600, 0xda640, indexSamSho5Sprites_Kyoshiro }, - { L"Kyoshiro B (Choubi Jishi/Kaen Kyokubu)", 0xda6a0, 0xda6c0 }, - { L"Kyoshiro B (Overkill Curtains)", 0xda720, 0xda740 }, + { L"Kyoshiro B (Choubi Jishi/Kaen Kyokubu)", 0xda6a0, 0xda6c0, indexSS5_Kyoshiro, 0x07 }, + { L"Kyoshiro B (Overkill Curtains)", 0xda720, 0xda740, indexSS5_Kyoshiro, 0x09 }, { L"Kyoshiro B (Spin/Slash Effects)", 0xda740, 0xda760 }, - { L"Kyoshiro B (Overkill Kuroko)", 0xda780, 0xda7a0 }, + { L"Kyoshiro B (Overkill Kuroko)", 0xda780, 0xda7a0, indexSS5_Kyoshiro, 0x0a }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Kyoshiro_PALETTES_C[] = @@ -1042,13 +1072,13 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Kyoshiro_PALETTES_C[] = { L"Kyoshiro C (Shocked)", 0xda900, 0xda940, indexSamSho5Sprites_Kyoshiro }, { L"Kyoshiro C (Frozen/Wet)", 0xda940, 0xda980, indexSamSho5Sprites_Kyoshiro }, { L"Kyoshiro C (Ki)", 0xda980, 0xda9c0, indexSamSho5Sprites_Kyoshiro }, - { L"Kyoshiro C (Ootsunami)", 0xda9c0, 0xda9e0 }, + { L"Kyoshiro C (Ootsunami)", 0xda9c0, 0xda9e0, indexSS5_Kyoshiro, 0x08 }, { L"Kyoshiro C (Toad Effect/Overkill)", 0xda9e0, 0xdaa00, indexSamSho5Sprites_Kyoshiro, 0x1 }, { L"Kyoshiro C (Issen Trail)", 0xdaa00, 0xdaa40, indexSamSho5Sprites_Kyoshiro }, - { L"Kyoshiro C (Choubi Jishi/Kaen Kyokubu)", 0xdaaa0, 0xdaac0 }, - { L"Kyoshiro C (Overkill Curtains)", 0xdab20, 0xdab40 }, + { L"Kyoshiro C (Choubi Jishi/Kaen Kyokubu)", 0xdaaa0, 0xdaac0, indexSS5_Kyoshiro, 0x07 }, + { L"Kyoshiro C (Overkill Curtains)", 0xdab20, 0xdab40, indexSS5_Kyoshiro, 0x09 }, { L"Kyoshiro C (Spin/Slash Effects)", 0xdab40, 0xdab60 }, - { L"Kyoshiro C (Overkill Kuroko)", 0xdab80, 0xdaba0 }, + { L"Kyoshiro C (Overkill Kuroko)", 0xdab80, 0xdaba0, indexSS5_Kyoshiro, 0x0a }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Kyoshiro_PALETTES_D[] = @@ -1062,13 +1092,13 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Kyoshiro_PALETTES_D[] = { L"Kyoshiro D (Shocked)", 0xdad00, 0xdad40, indexSamSho5Sprites_Kyoshiro }, { L"Kyoshiro D (Frozen/Wet)", 0xdad40, 0xdad80, indexSamSho5Sprites_Kyoshiro }, { L"Kyoshiro D (Ki)", 0xdad80, 0xdadc0, indexSamSho5Sprites_Kyoshiro }, - { L"Kyoshiro D (Ootsunami)", 0xdadc0, 0xdade0 }, + { L"Kyoshiro D (Ootsunami)", 0xdadc0, 0xdade0, indexSS5_Kyoshiro, 0x08 }, { L"Kyoshiro D (Toad Effect/Overkill)", 0xdade0, 0xdae00, indexSamSho5Sprites_Kyoshiro, 0x1 }, { L"Kyoshiro D (Issen Trail)", 0xdae00, 0xdae40, indexSamSho5Sprites_Kyoshiro }, - { L"Kyoshiro D (Choubi Jishi/Kaen Kyokubu)", 0xdaea0, 0xdaec0 }, - { L"Kyoshiro D (Overkill Curtains)", 0xdaf20, 0xdaf40 }, + { L"Kyoshiro D (Choubi Jishi/Kaen Kyokubu)", 0xdaea0, 0xdaec0, indexSS5_Kyoshiro, 0x07 }, + { L"Kyoshiro D (Overkill Curtains)", 0xdaf20, 0xdaf40, indexSS5_Kyoshiro, 0x09 }, { L"Kyoshiro D (Spin/Slash Effects)", 0xdaf40, 0xdaf60 }, - { L"Kyoshiro D (Overkill Kuroko)", 0xdaf80, 0xdafa0 }, + { L"Kyoshiro D (Overkill Kuroko)", 0xdaf80, 0xdafa0, indexSS5_Kyoshiro, 0x0a }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Mina_PALETTES_A[] = @@ -1083,11 +1113,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Mina_PALETTES_A[] = { L"Mina A (Frozen/Wet)", 0xed140, 0xed180, indexSamSho5Sprites_Mina, 0x00 }, { L"Mina A (Ki)", 0xed180, 0xed1c0, indexSamSho5Sprites_Mina, 0x00 }, { L"Mina A (Issen Trail)", 0xed200, 0xed240, indexSamSho5Sprites_Mina, 0x00 }, - { L"Mina A (Sleeping Champuru)", 0xed2a0, 0xed2c0 }, - { L"Mina A (Champuru Tears)", 0xed2c0, 0xed2e0 }, - { L"Mina A (Mina Gown and Hat)", 0xed320, 0xed340 }, - { L"Mina A (Normal Arrow Effect)", 0xed360, 0xed380 }, - { L"Mina A (Misc Specials)", 0xed380, 0xed3a0 }, + { L"Mina A (Sleeping Champuru)", 0xed2a0, 0xed2c0, indexSS5_Mina, 0x0b, &pairNext }, + { L"Mina A (Champuru Tears)", 0xed2c0, 0xed2e0, indexSS5_Mina, 0x07 }, + { L"Mina A (Mina Gown and Hat)", 0xed320, 0xed340, indexSS5_Mina, 0x08 }, + { L"Mina A (Normal Arrow Effect)", 0xed360, 0xed380, indexSS5_Mina, 0x0a }, + { L"Mina A (Misc Specials)", 0xed380, 0xed3a0, indexSS5_Mina, 0x09 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Mina_PALETTES_B[] = @@ -1102,11 +1132,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Mina_PALETTES_B[] = { L"Mina B (Frozen/Wet)", 0xed540, 0xed580, indexSamSho5Sprites_Mina, 0x00 }, { L"Mina B (Ki)", 0xed580, 0xed5c0, indexSamSho5Sprites_Mina, 0x00 }, { L"Mina B (Issen Trail)", 0xed600, 0xed640, indexSamSho5Sprites_Mina, 0x00 }, - { L"Mina B (Sleeping Champuru)", 0xed6a0, 0xed6c0 }, - { L"Mina B (Champuru Tears)", 0xed6c0, 0xed6e0 }, - { L"Mina B (Mina Gown and Hat)", 0xed720, 0xed740 }, - { L"Mina B (Normal Arrow Effect)", 0xed760, 0xed780 }, - { L"Mina B (Misc Specials)", 0xed780, 0xed7a0 }, + { L"Mina B (Sleeping Champuru)", 0xed6a0, 0xed6c0, indexSS5_Mina, 0x0b, &pairNext }, + { L"Mina B (Champuru Tears)", 0xed6c0, 0xed6e0, indexSS5_Mina, 0x07 }, + { L"Mina B (Mina Gown and Hat)", 0xed720, 0xed740, indexSS5_Mina, 0x08 }, + { L"Mina B (Normal Arrow Effect)", 0xed760, 0xed780, indexSS5_Mina, 0x0a }, + { L"Mina B (Misc Specials)", 0xed780, 0xed7a0, indexSS5_Mina, 0x09 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Mina_PALETTES_C[] = @@ -1121,11 +1151,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Mina_PALETTES_C[] = { L"Mina C (Frozen/Wet)", 0xed940, 0xed980, indexSamSho5Sprites_Mina, 0x00 }, { L"Mina C (Ki)", 0xed980, 0xed9c0, indexSamSho5Sprites_Mina, 0x00 }, { L"Mina C (Issen Trail)", 0xeda00, 0xeda40, indexSamSho5Sprites_Mina, 0x00 }, - { L"Mina C (Sleeping Champuru)", 0xedaa0, 0xedac0 }, - { L"Mina C (Champuru Tears)", 0xedac0, 0xedae0 }, - { L"Mina C (Mina Gown and Hat)", 0xedb20, 0xedb40 }, - { L"Mina C (Normal Arrow Effect)", 0xedb60, 0xedb80 }, - { L"Mina C (Misc Specials)", 0xedb80, 0xedba0 }, + { L"Mina C (Sleeping Champuru)", 0xedaa0, 0xedac0, indexSS5_Mina, 0x0b, &pairNext }, + { L"Mina C (Champuru Tears)", 0xedac0, 0xedae0, indexSS5_Mina, 0x07 }, + { L"Mina C (Mina Gown and Hat)", 0xedb20, 0xedb40, indexSS5_Mina, 0x08 }, + { L"Mina C (Normal Arrow Effect)", 0xedb60, 0xedb80, indexSS5_Mina, 0x0a }, + { L"Mina C (Misc Specials)", 0xedb80, 0xedba0, indexSS5_Mina, 0x09 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Mina_PALETTES_D[] = @@ -1140,11 +1170,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Mina_PALETTES_D[] = { L"Mina D (Frozen/Wet)", 0xedd40, 0xedd80, indexSamSho5Sprites_Mina, 0x00 }, { L"Mina D (Ki)", 0xedd80, 0xeddc0, indexSamSho5Sprites_Mina, 0x00 }, { L"Mina D (Issen Trail)", 0xede00, 0xede40, indexSamSho5Sprites_Mina, 0x00 }, - { L"Mina D (Sleeping Champuru)", 0xedea0, 0xedec0 }, - { L"Mina D (Champuru Tears)", 0xedec0, 0xedee0 }, - { L"Mina D (Mina Gown and Hat)", 0xedf20, 0xedf40 }, - { L"Mina D (Normal Arrow Effect)", 0xedf60, 0xedf80 }, - { L"Mina D (Misc Specials)", 0xedf80, 0xedfa0 }, + { L"Mina D (Sleeping Champuru)", 0xedea0, 0xedec0, indexSS5_Mina, 0x0b, &pairNext }, + { L"Mina D (Champuru Tears)", 0xedec0, 0xedee0, indexSS5_Mina, 0x07 }, + { L"Mina D (Mina Gown and Hat)", 0xedf20, 0xedf40, indexSS5_Mina, 0x08 }, + { L"Mina D (Normal Arrow Effect)", 0xedf60, 0xedf80, indexSS5_Mina, 0x0a }, + { L"Mina D (Misc Specials)", 0xedf80, 0xedfa0, indexSS5_Mina, 0x09 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Mizuki_PALETTES_A[] = @@ -1254,8 +1284,8 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Nakoruru_PALETTES_A[] = { L"Nakoruru A (Shocked)", 0xd6100, 0xd6140, indexSamSho5Sprites_Nakoruru }, { L"Nakoruru A (Frozen/Wet)", 0xd6140, 0xd6180, indexSamSho5Sprites_Nakoruru }, { L"Nakoruru A (Ki)", 0xd6180, 0xd61c0, indexSamSho5Sprites_Nakoruru }, - { L"Nakoruru A (Annu/Rera Mutsube)", 0xd62e0, 0xd6300 }, - { L"Nakoruru A (Kamui Rimse/Slash Effect)", 0xd6340, 0xd6360 }, + { L"Nakoruru A (Annu/Rera Mutsube)", 0xd62e0, 0xd6300, indexSS5_Nakoruru, 0x07 }, + { L"Nakoruru A (Kamui Rimse/Slash Effect)", 0xd6340, 0xd6360, indexSS5_Nakoruru, 0x08 }, { L"Nakoruru A (Issen Trail)", 0xd6200, 0xd6240, indexSamSho5Sprites_Nakoruru }, { L"Nakoruru A (Elerushi Kamui Rimse)", 0xd6360, 0xd6380 }, }; @@ -1271,8 +1301,8 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Nakoruru_PALETTES_B[] = { L"Nakoruru B (Shocked)", 0xd6500, 0xd6540, indexSamSho5Sprites_Nakoruru }, { L"Nakoruru B (Frozen/Wet)", 0xd6540, 0xd6580, indexSamSho5Sprites_Nakoruru }, { L"Nakoruru B (Ki)", 0xd6580, 0xd65c0, indexSamSho5Sprites_Nakoruru }, - { L"Nakoruru B (Annu/Rera Mutsube)", 0xd66e0, 0xd6700 }, - { L"Nakoruru B (Kamui Rimse/Slash Effect)", 0xd6740, 0xd6760 }, + { L"Nakoruru B (Annu/Rera Mutsube)", 0xd66e0, 0xd6700, indexSS5_Nakoruru, 0x07 }, + { L"Nakoruru B (Kamui Rimse/Slash Effect)", 0xd6740, 0xd6760, indexSS5_Nakoruru, 0x08 }, { L"Nakoruru B (Issen Trail)", 0xd6600, 0xd6640, indexSamSho5Sprites_Nakoruru }, { L"Nakoruru B (Elerushi Kamui Rimse)", 0xd6760, 0xd6780 }, }; @@ -1288,8 +1318,8 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Nakoruru_PALETTES_C[] = { L"Nakoruru C (Shocked)", 0xd6900, 0xd6940, indexSamSho5Sprites_Nakoruru }, { L"Nakoruru C (Frozen/Wet)", 0xd6940, 0xd6980, indexSamSho5Sprites_Nakoruru }, { L"Nakoruru C (Ki)", 0xd6980, 0xd69c0, indexSamSho5Sprites_Nakoruru }, - { L"Nakoruru C (Annu/Rera Mutsube)", 0xd6ae0, 0xd6b00 }, - { L"Nakoruru C (Kamui Rimse/Slash Effect)", 0xd6b40, 0xd6b60 }, + { L"Nakoruru C (Annu/Rera Mutsube)", 0xd6ae0, 0xd6b00, indexSS5_Nakoruru, 0x07 }, + { L"Nakoruru C (Kamui Rimse/Slash Effect)", 0xd6b40, 0xd6b60, indexSS5_Nakoruru, 0x08 }, { L"Nakoruru C (Issen Trail)", 0xd6a00, 0xd6a40, indexSamSho5Sprites_Nakoruru }, { L"Nakoruru C (Elerushi Kamui Rimse)", 0xd6b60, 0xd6b80 }, }; @@ -1305,8 +1335,8 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Nakoruru_PALETTES_D[] = { L"Nakoruru D (Shocked)", 0xd6d00, 0xd6d40, indexSamSho5Sprites_Nakoruru }, { L"Nakoruru D (Frozen/Wet)", 0xd6d40, 0xd6d80, indexSamSho5Sprites_Nakoruru }, { L"Nakoruru D (Ki)", 0xd6d80, 0xd6dc0, indexSamSho5Sprites_Nakoruru }, - { L"Nakoruru D (Annu/Rera Mutsube)", 0xd6ee0, 0xd6f00 }, - { L"Nakoruru D (Kamui Rimse/Slash Effect)", 0xd6f40, 0xd6f60 }, + { L"Nakoruru D (Annu/Rera Mutsube)", 0xd6ee0, 0xd6f00, indexSS5_Nakoruru, 0x07 }, + { L"Nakoruru D (Kamui Rimse/Slash Effect)", 0xd6f40, 0xd6f60, indexSS5_Nakoruru, 0x08 }, { L"Nakoruru D (Issen Trail)", 0xd6e00, 0xd6e40, indexSamSho5Sprites_Nakoruru }, { L"Nakoruru D (Elerushi Kamui Rimse)", 0xd6f60, 0xd6f80 }, }; @@ -1467,7 +1497,7 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Rimururu_PALETTES_A[] = { L"Rimururu A (Frozen/Wet)", 0xd7140, 0xd7180, indexSamSho5Sprites_Rimururu }, { L"Rimururu A (Ki)", 0xd7180, 0xd71c0, indexSamSho5Sprites_Rimururu }, { L"Rimururu A (Issen Trail)", 0xd7200, 0xd7240, indexSamSho5Sprites_Rimururu }, - { L"Rimururu A (Slash Effects)", 0xd7340, 0xd7360 }, + { L"Rimururu A (Slash Effects)", 0xd7340, 0xd7360, indexSS5_Rimururu, 0x07 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Rimururu_PALETTES_B[] = @@ -1482,7 +1512,7 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Rimururu_PALETTES_B[] = { L"Rimururu B (Frozen/Wet)", 0xd7540, 0xd7580, indexSamSho5Sprites_Rimururu }, { L"Rimururu B (Ki)", 0xd7580, 0xd75c0, indexSamSho5Sprites_Rimururu }, { L"Rimururu B (Issen Trail)", 0xd7600, 0xd7640, indexSamSho5Sprites_Rimururu }, - { L"Rimururu B (Slash Effects)", 0xd7740, 0xd7760 }, + { L"Rimururu B (Slash Effects)", 0xd7740, 0xd7760, indexSS5_Rimururu, 0x07 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Rimururu_PALETTES_C[] = @@ -1497,7 +1527,7 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Rimururu_PALETTES_C[] = { L"Rimururu C (Frozen/Wet)", 0xd7940, 0xd7980, indexSamSho5Sprites_Rimururu }, { L"Rimururu C (Ki)", 0xd7980, 0xd79c0, indexSamSho5Sprites_Rimururu }, { L"Rimururu C (Issen Trail)", 0xd7a00, 0xd7a40, indexSamSho5Sprites_Rimururu }, - { L"Rimururu C (Slash Effects)", 0xd7b40, 0xd7b60 }, + { L"Rimururu C (Slash Effects)", 0xd7b40, 0xd7b60, indexSS5_Rimururu, 0x07 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Rimururu_PALETTES_D[] = @@ -1512,7 +1542,7 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Rimururu_PALETTES_D[] = { L"Rimururu D (Frozen/Wet)", 0xd7d40, 0xd7d80, indexSamSho5Sprites_Rimururu }, { L"Rimururu D (Ki)", 0xd7d80, 0xd7dc0, indexSamSho5Sprites_Rimururu }, { L"Rimururu D (Issen Trail)", 0xd7e00, 0xd7e40, indexSamSho5Sprites_Rimururu }, - { L"Rimururu D (Slash Effects)", 0xd7f40, 0xd7f60 }, + { L"Rimururu D (Slash Effects)", 0xd7f40, 0xd7f60, indexSS5_Rimururu, 0x07 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Shizumaru_PALETTES_A[] = @@ -1739,7 +1769,7 @@ const sGame_PaletteDataset SAMSHOW5SP_A_TamTam_PALETTES_A[] = { L"Tam Tam A (Magnus Dios Zahl)", 0xe4280, 0xe42a0 }, { L"Tam Tam A (WFT/Overkill Tribesmen)", 0xe42a0, 0xe42c0 }, { L"Tam Tam A (Ahaooh Gaboora/Overkill)", 0xe42c0, 0xe4300 }, - { L"Tam Tam A (Cham Cham)", 0xe4300, 0xe4320 }, + { L"Tam Tam A (Cham Cham)", 0xe4300, 0xe4320, indexSS5_TamTam, 0x07 }, { L"Tam Tam A (Ahaooh Gaboora Startup/Slash Effect/Misc)", 0xe4340, 0xe4360 }, { L"Tam Tam A (Ahaooh Gaboora Tribesmen)", 0xe4380, 0xe43a0 }, }; @@ -1760,7 +1790,7 @@ const sGame_PaletteDataset SAMSHOW5SP_A_TamTam_PALETTES_B[] = { L"Tam Tam B (Magnus Dios Zahl)", 0xe4680, 0xe46a0 }, { L"Tam Tam B (WFT/Overkill Tribesmen)", 0xe46a0, 0xe46c0 }, { L"Tam Tam B (Ahaooh Gaboora/Overkill)", 0xe46c0, 0xe4700 }, - { L"Tam Tam B (Cham Cham)", 0xe4700, 0xe4720 }, + { L"Tam Tam B (Cham Cham)", 0xe4700, 0xe4720, indexSS5_TamTam, 0x07 }, { L"Tam Tam B (Ahaooh Gaboora Startup/Slash Effect/Misc)", 0xe4740, 0xe4760 }, { L"Tam Tam B (Ahaooh Gaboora Tribesmen)", 0xe4780, 0xe47a0 }, }; @@ -1781,7 +1811,7 @@ const sGame_PaletteDataset SAMSHOW5SP_A_TamTam_PALETTES_C[] = { L"Tam Tam C (Magnus Dios Zahl)", 0xe4a80, 0xe4aa0 }, { L"Tam Tam C (WFT/Overkill Tribesmen)", 0xe4aa0, 0xe4ac0 }, { L"Tam Tam C (Ahaooh Gaboora/Overkill)", 0xe4ac0, 0xe4b00 }, - { L"Tam Tam C (Cham Cham)", 0xe4b00, 0xe4b20 }, + { L"Tam Tam C (Cham Cham)", 0xe4b00, 0xe4b20, indexSS5_TamTam, 0x07 }, { L"Tam Tam C (Ahaooh Gaboora Startup/Slash Effect/Misc)", 0xe4b40, 0xe4b60 }, { L"Tam Tam C (Ahaooh Gaboora Tribesmen)", 0xe4b80, 0xe4ba0 }, }; @@ -1802,7 +1832,7 @@ const sGame_PaletteDataset SAMSHOW5SP_A_TamTam_PALETTES_D[] = { L"Tam Tam D (Magnus Dios Zahl)", 0xe4e80, 0xe4ea0 }, { L"Tam Tam D (WFT/Overkill Tribesmen)", 0xe4ea0, 0xe4ec0 }, { L"Tam Tam D (Ahaooh Gaboora/Overkill)", 0xe4ec0, 0xe4f00 }, - { L"Tam Tam D (Cham Cham)", 0xe4f00, 0xe4f20 }, + { L"Tam Tam D (Cham Cham)", 0xe4f00, 0xe4f20, indexSS5_TamTam, 0x07 }, { L"Tam Tam D (Ahaooh Gaboora Startup/Slash Effect/Misc)", 0xe4f40, 0xe4f60 }, { L"Tam Tam D (Ahaooh Gaboora Tribesmen)", 0xe4f80, 0xe4fa0 }, }; @@ -1818,11 +1848,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Ukyo_PALETTES_A[] = { L"Ukyo A (Shocked)", 0xdb100, 0xdb140, indexSamSho5Sprites_Ukyo }, { L"Ukyo A (Frozen/Wet)", 0xdb140, 0xdb180, indexSamSho5Sprites_Ukyo }, { L"Ukyo A (Ki)", 0xdb180, 0xdb1c0, indexSamSho5Sprites_Ukyo }, - { L"Ukyo A (Tsubame Gaeshi Flame)", 0xdb1c0, 0xdb1e0 }, + { L"Ukyo A (Tsubame Gaeshi Flame)", 0xdb1c0, 0xdb1e0, indexSS5_Ukyo, 0x09 }, { L"Ukyo A (Issen Trail)", 0xdb200, 0xdb240, indexSamSho5Sprites_Ukyo }, - { L"Ukyo A (Zanzou Fumikomi)", 0xdb280, 0xdb2a0 }, - { L"Ukyo A (Overkill Symbols)", 0xdb2e0, 0xdb300 }, - { L"Ukyo A (HiKen/Slash Effects)", 0xdb340, 0xdb360 }, + { L"Ukyo A (Zanzou Fumikomi)", 0xdb280, 0xdb2a0, indexSS5_Ukyo, 0x0a }, + { L"Ukyo A (Overkill Symbols)", 0xdb2e0, 0xdb300, indexSS5_Ukyo, 0x08 }, + { L"Ukyo A (HiKen/Slash Effects)", 0xdb340, 0xdb360, indexSS5_Ukyo, 0x07 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Ukyo_PALETTES_B[] = @@ -1836,11 +1866,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Ukyo_PALETTES_B[] = { L"Ukyo B (Shocked)", 0xdb500, 0xdb540, indexSamSho5Sprites_Ukyo }, { L"Ukyo B (Frozen/Wet)", 0xdb540, 0xdb580, indexSamSho5Sprites_Ukyo }, { L"Ukyo B (Ki)", 0xdb580, 0xdb5c0, indexSamSho5Sprites_Ukyo }, - { L"Ukyo B (Tsubame Gaeshi Flame)", 0xdb5c0, 0xdb5e0 }, + { L"Ukyo B (Tsubame Gaeshi Flame)", 0xdb5c0, 0xdb5e0, indexSS5_Ukyo, 0x09 }, { L"Ukyo B (Issen Trail)", 0xdb600, 0xdb640, indexSamSho5Sprites_Ukyo }, - { L"Ukyo B (Zanzou Fumikomi)", 0xdb680, 0xdb6a0 }, - { L"Ukyo B (Overkill Symbols)", 0xdb6e0, 0xdb700 }, - { L"Ukyo B (HiKen/Slash Effects)", 0xdb740, 0xdb760 }, + { L"Ukyo B (Zanzou Fumikomi)", 0xdb680, 0xdb6a0, indexSS5_Ukyo, 0x0a }, + { L"Ukyo B (Overkill Symbols)", 0xdb6e0, 0xdb700, indexSS5_Ukyo, 0x08 }, + { L"Ukyo B (HiKen/Slash Effects)", 0xdb740, 0xdb760, indexSS5_Ukyo, 0x07 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Ukyo_PALETTES_C[] = @@ -1854,11 +1884,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Ukyo_PALETTES_C[] = { L"Ukyo C (Shocked)", 0xdb900, 0xdb940, indexSamSho5Sprites_Ukyo }, { L"Ukyo C (Frozen/Wet)", 0xdb940, 0xdb980, indexSamSho5Sprites_Ukyo }, { L"Ukyo C (Ki)", 0xdb980, 0xdb9c0, indexSamSho5Sprites_Ukyo }, - { L"Ukyo C (Tsubame Gaeshi Flame)", 0xdb9c0, 0xdb9e0 }, + { L"Ukyo C (Tsubame Gaeshi Flame)", 0xdb9c0, 0xdb9e0, indexSS5_Ukyo, 0x09 }, { L"Ukyo C (Issen Trail)", 0xdba00, 0xdba40, indexSamSho5Sprites_Ukyo }, - { L"Ukyo C (Zanzou Fumikomi)", 0xdba80, 0xdbaa0 }, - { L"Ukyo C (Overkill Symbols)", 0xdbae0, 0xdbb00 }, - { L"Ukyo C (HiKen/Slash Effects)", 0xdbb40, 0xdbb60 }, + { L"Ukyo C (Zanzou Fumikomi)", 0xdba80, 0xdbaa0, indexSS5_Ukyo, 0x0a }, + { L"Ukyo C (Overkill Symbols)", 0xdbae0, 0xdbb00, indexSS5_Ukyo, 0x08 }, + { L"Ukyo C (HiKen/Slash Effects)", 0xdbb40, 0xdbb60, indexSS5_Ukyo, 0x07 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Ukyo_PALETTES_D[] = @@ -1872,11 +1902,11 @@ const sGame_PaletteDataset SAMSHOW5SP_A_Ukyo_PALETTES_D[] = { L"Ukyo D (Shocked)", 0xdbd00, 0xdbd40, indexSamSho5Sprites_Ukyo }, { L"Ukyo D (Frozen/Wet)", 0xdbd40, 0xdbd80, indexSamSho5Sprites_Ukyo }, { L"Ukyo D (Ki)", 0xdbd80, 0xdbdc0, indexSamSho5Sprites_Ukyo }, - { L"Ukyo D (Tsubame Gaeshi Flame)", 0xdbdc0, 0xdbde0 }, + { L"Ukyo D (Tsubame Gaeshi Flame)", 0xdbdc0, 0xdbde0, indexSS5_Ukyo, 0x09 }, { L"Ukyo D (Issen Trail)", 0xdbe00, 0xdbe40, indexSamSho5Sprites_Ukyo }, - { L"Ukyo D (Zanzou Fumikomi)", 0xdbe80, 0xdbea0 }, - { L"Ukyo D (Overkill Symbols)", 0xdbee0, 0xdbf00 }, - { L"Ukyo D (HiKen/Slash Effects)", 0xdbf40, 0xdbf60 }, + { L"Ukyo D (Zanzou Fumikomi)", 0xdbe80, 0xdbea0, indexSS5_Ukyo, 0x0a }, + { L"Ukyo D (Overkill Symbols)", 0xdbee0, 0xdbf00, indexSS5_Ukyo, 0x08 }, + { L"Ukyo D (HiKen/Slash Effects)", 0xdbf40, 0xdbf60, indexSS5_Ukyo, 0x07 }, }; const sGame_PaletteDataset SAMSHOW5SP_A_Yoshitora_PALETTES_A[] = diff --git a/palmod/Game/SAMSHO5_A_DEF.h b/palmod/Game/SAMSHO5_A_DEF.h index 7f434326..73612418 100644 --- a/palmod/Game/SAMSHO5_A_DEF.h +++ b/palmod/Game/SAMSHO5_A_DEF.h @@ -367,12 +367,12 @@ const sGame_PaletteDataset SAMSHO5_A_Galford_PALETTES_A[] = { L"Galford A Issen Trail", 0xd9200, 0xd9240, indexSamSho5Sprites_Galford, 0, &pairNext2 }, { L"Galford A SON", 0xd9240, 0xd9280, indexSamSho5Sprites_Galford, 0, &pairNext }, { L"Poppy A", 0xd9280, 0xd92a0, indexSamSho5Sprites_Galford, 1 }, - { L"Galford A Plasma Sword", 0xd92a0, 0xd92c0 }, - { L"Galford A Plasma Effect 1", 0xd92c0, 0xd92e0 }, - { L"Galford A Plasma Effect 2", 0xd92e0, 0xd9300 }, - { L"Galford A Smoke", 0xd9320, 0xd9340 }, - { L"Galford A Trunk", 0xd9360, 0xd9380 }, - { L"Galford A Slash Effect", 0xd9340, 0xd9360 }, + { L"Galford A Plasma Factor", 0xd92a0, 0xd92c0, indexSS5_Galford, 0x08 }, + { L"Galford A Plasma Blade", 0xd92c0, 0xd92e0, indexSS5_Galford, 0x07 }, + { L"Galford A Strike Heads/Poppy", 0xd92e0, 0xd9300, indexSS5_Galford, 0x0b }, + { L"Galford A Replica Effect", 0xd9320, 0xd9340, indexSS5_Galford, 0x0a }, + { L"Galford A Imitate Replica", 0xd9360, 0xd9380 }, + { L"Galford A Replica Attack/Slash Effects", 0xd9340, 0xd9360, indexSS5_Galford, 0x09 }, }; const sGame_PaletteDataset SAMSHO5_A_Galford_PALETTES_B[] = @@ -387,12 +387,12 @@ const sGame_PaletteDataset SAMSHO5_A_Galford_PALETTES_B[] = { L"Galford B Issen Trail", 0xd9600, 0xd9640, indexSamSho5Sprites_Galford, 0, &pairNext2 }, { L"Galford B SON", 0xd9640, 0xd9680, indexSamSho5Sprites_Galford, 0, &pairNext }, { L"Poppy B", 0xd9680, 0xd96a0, indexSamSho5Sprites_Galford, 1 }, - { L"Galford B Plasma Sword", 0xd96a0, 0xd96c0 }, - { L"Galford B Plasma Effect 1", 0xd96c0, 0xd96e0 }, - { L"Galford B Plasma Effect 2", 0xd96e0, 0xd9700 }, - { L"Galford B Smoke", 0xd9720, 0xd9740 }, - { L"Galford B Trunk", 0xd9760, 0xd9780 }, - { L"Galford B Slash Effect", 0xd9740, 0xd9760 }, + { L"Galford B Plasma Factor", 0xd96a0, 0xd96c0, indexSS5_Galford, 0x08 }, + { L"Galford B Plasma Blade", 0xd96c0, 0xd96e0, indexSS5_Galford, 0x07 }, + { L"Galford B Strike Heads/Poppy", 0xd96e0, 0xd9700, indexSS5_Galford, 0x0b }, + { L"Galford B Replica Effect", 0xd9720, 0xd9740, indexSS5_Galford, 0x0a }, + { L"Galford B Imitate Replica", 0xd9760, 0xd9780 }, + { L"Galford B Replica Attack/Slash Effects", 0xd9740, 0xd9760, indexSS5_Galford, 0x09 }, }; const sGame_PaletteDataset SAMSHO5_A_Galford_PALETTES_C[] = @@ -407,12 +407,12 @@ const sGame_PaletteDataset SAMSHO5_A_Galford_PALETTES_C[] = { L"Galford C Issen Trail", 0xd9a00, 0xd9a40, indexSamSho5Sprites_Galford, 0, &pairNext2 }, { L"Galford C SON", 0xd9a40, 0xd9a80, indexSamSho5Sprites_Galford, 0, &pairNext }, { L"Poppy C", 0xd9a80, 0xd9aa0, indexSamSho5Sprites_Galford, 1 }, - { L"Galford C Plasma Sword", 0xd9aa0, 0xd9ac0 }, - { L"Galford C Plasma Effect 1", 0xd9ac0, 0xd9ae0 }, - { L"Galford C Plasma Effect 2", 0xd9ae0, 0xd9b00 }, - { L"Galford C Smoke", 0xd9b20, 0xd9b40 }, - { L"Galford C Trunk", 0xd9b60, 0xd9b80 }, - { L"Galford C Slash Effect", 0xd9b40, 0xd9b60 }, + { L"Galford C Plasma Factor", 0xd9aa0, 0xd9ac0, indexSS5_Galford, 0x08 }, + { L"Galford C Plasma Blade", 0xd9ac0, 0xd9ae0, indexSS5_Galford, 0x07 }, + { L"Galford C Strike Heads/Poppy", 0xd9ae0, 0xd9b00, indexSS5_Galford, 0x0b }, + { L"Galford C Replica Effect", 0xd9b20, 0xd9b40, indexSS5_Galford, 0x0a }, + { L"Galford C Imitate Replica", 0xd9b60, 0xd9b80 }, + { L"Galford C Replica Attack/Slash Effects", 0xd9b40, 0xd9b60, indexSS5_Galford, 0x09 }, }; const sGame_PaletteDataset SAMSHO5_A_Galford_PALETTES_D[] = @@ -427,12 +427,12 @@ const sGame_PaletteDataset SAMSHO5_A_Galford_PALETTES_D[] = { L"Galford D Issen Trail", 0xd9e00, 0xd9e40, indexSamSho5Sprites_Galford, 0, &pairNext2 }, { L"Galford D SON", 0xd9e40, 0xd9e80, indexSamSho5Sprites_Galford, 0, &pairNext }, { L"Poppy D", 0xd9e80, 0xd9ea0, indexSamSho5Sprites_Galford, 1 }, - { L"Galford D Plasma Sword", 0xd9ea0, 0xd9ec0 }, - { L"Galford D Plasma Effect 1", 0xd9ec0, 0xd9ee0 }, - { L"Galford D Plasma Effect 2", 0xd9ee0, 0xd9f00 }, - { L"Galford D Smoke", 0xd9f20, 0xd9f40 }, - { L"Galford D Trunk", 0xd9f60, 0xd9f80 }, - { L"Galford D Slash Effect", 0xd9f40, 0xd9f60 }, + { L"Galford D Plasma Factor", 0xd9ea0, 0xd9ec0, indexSS5_Galford, 0x08 }, + { L"Galford D Plasma Blade", 0xd9ec0, 0xd9ee0, indexSS5_Galford, 0x07 }, + { L"Galford D Strike Heads/Poppy", 0xd9ee0, 0xd9f00, indexSS5_Galford, 0x0b }, + { L"Galford D Replica Effect", 0xd9f20, 0xd9f40, indexSS5_Galford, 0x0a }, + { L"Galford D Imitate Replica", 0xd9f60, 0xd9f80 }, + { L"Galford D Replica Attack/Slash Effects", 0xd9f40, 0xd9f60, indexSS5_Galford, 0x09 }, }; const sGame_PaletteDataset SAMSHO5_A_Gaoh_PALETTES_A[] = { @@ -445,11 +445,13 @@ const sGame_PaletteDataset SAMSHO5_A_Gaoh_PALETTES_A[] = { L"Gaoh A KI", 0xef180, 0xef1c0, indexSamSho5Sprites_Gaoh }, { L"Gaoh A Issen Trail", 0xef200, 0xef240, indexSamSho5Sprites_Gaoh }, { L"Gaoh A SON", 0xef240, 0xef280, indexSamSho5Sprites_Gaoh }, - { L"Ankiou A", 0xef080, 0xef0c0 }, - { L"Ankiou A Naraku Boe", 0xef1c0, 0xef200 }, - { L"Ankiou A SON", 0xef2c0, 0xef300 }, - { L"Gaoh A Special Slash/Naraku Boe Effect", 0xef320, 0xef340 }, - { L"Gaoh A Slash Effect", 0xef300, 0xef320 }, + { L"Ankiou A 1/2", 0xef080, 0xef0a0, indexSS5_Gaoh, 0x09, &pairNext }, + { L"Ankiou A 2/2", 0xef0a0, 0xef0c0, indexSS5_Gaoh, 0x0a }, + { L"Ankiou A Naraku Boe", 0xef1c0, 0xef200, indexSS5_Gaoh, 0x08 }, + { L"Ankiou A SON 1/2", 0xef2c0, 0xef2e0, indexSS5_Gaoh, 0x09, &pairNext }, + { L"Ankiou A SON 2/2", 0xef2e0, 0xef300, indexSS5_Gaoh, 0x0a }, + { L"Gaoh A Special Slash/Naraku Boe Effect", 0xef320, 0xef340, indexSS5_Gaoh, 0x07 }, + { L"Gaoh A Slash Effect", 0xef300, 0xef320, indexSS5_Gaoh, 0x0b }, }; const sGame_PaletteDataset SAMSHO5_A_Gaoh_PALETTES_B[] = @@ -463,11 +465,13 @@ const sGame_PaletteDataset SAMSHO5_A_Gaoh_PALETTES_B[] = { L"Gaoh B KI", 0xef580, 0xef5c0, indexSamSho5Sprites_Gaoh }, { L"Gaoh B Issen Trail", 0xef600, 0xef640, indexSamSho5Sprites_Gaoh }, { L"Gaoh B SON", 0xef640, 0xef680, indexSamSho5Sprites_Gaoh }, - { L"Ankiou B", 0xef480, 0xef4c0 }, - { L"Ankiou B Naraku Boe", 0xef5c0, 0xef600 }, - { L"Ankiou B SON", 0xef6c0, 0xef700 }, - { L"Gaoh B Special Slash/Naraku Boe Effect", 0xef720, 0xef740 }, - { L"Gaoh B Slash Effect", 0xef700, 0xef720 }, + { L"Ankiou B 1/2", 0xef480, 0xef4a0, indexSS5_Gaoh, 0x09, &pairNext }, + { L"Ankiou B 2/2", 0xef4a0, 0xef4c0, indexSS5_Gaoh, 0x0a }, + { L"Ankiou B Naraku Boe", 0xef5c0, 0xef600, indexSS5_Gaoh, 0x08 }, + { L"Ankiou B SON 1/2", 0xef6c0, 0xef6e0, indexSS5_Gaoh, 0x09, &pairNext }, + { L"Ankiou B SON 2/2", 0xef6e0, 0xef700, indexSS5_Gaoh, 0x0a }, + { L"Gaoh B Special Slash/Naraku Boe Effect", 0xef720, 0xef740, indexSS5_Gaoh, 0x07 }, + { L"Gaoh B Slash Effect", 0xef700, 0xef720, indexSS5_Gaoh, 0x0b }, }; const sGame_PaletteDataset SAMSHO5_A_Gaoh_PALETTES_C[] = @@ -481,11 +485,13 @@ const sGame_PaletteDataset SAMSHO5_A_Gaoh_PALETTES_C[] = { L"Gaoh C KI", 0xef980, 0xef9c0, indexSamSho5Sprites_Gaoh }, { L"Gaoh C Issen Trail", 0xefa00, 0xefa40, indexSamSho5Sprites_Gaoh }, { L"Gaoh C SON", 0xefa40, 0xefa80, indexSamSho5Sprites_Gaoh }, - { L"Ankiou C", 0xef880, 0xef8c0 }, - { L"Ankiou C Naraku Boe", 0xef9c0, 0xefa00 }, - { L"Ankiou C SON", 0xefac0, 0xefb00 }, - { L"Gaoh C Special Slash/Naraku Boe Effect", 0xefb20, 0xefb40 }, - { L"Gaoh C Slash Effect", 0xefb00, 0xefb20 }, + { L"Ankiou C 1/2", 0xef880, 0xef8a0, indexSS5_Gaoh, 0x09, &pairNext }, + { L"Ankiou C 2/2", 0xef8a0, 0xef8c0, indexSS5_Gaoh, 0x0a }, + { L"Ankiou C Naraku Boe", 0xef9c0, 0xefa00, indexSS5_Gaoh, 0x08 }, + { L"Ankiou C SON 1/2", 0xefac0, 0xefae0, indexSS5_Gaoh, 0x09, &pairNext }, + { L"Ankiou C SON 2/2", 0xefae0, 0xefb00, indexSS5_Gaoh, 0x0a }, + { L"Gaoh C Special Slash/Naraku Boe Effect", 0xefb20, 0xefb40, indexSS5_Gaoh, 0x07 }, + { L"Gaoh C Slash Effect", 0xefb00, 0xefb20, indexSS5_Gaoh, 0x0b }, }; const sGame_PaletteDataset SAMSHO5_A_Gaoh_PALETTES_D[] = @@ -499,11 +505,13 @@ const sGame_PaletteDataset SAMSHO5_A_Gaoh_PALETTES_D[] = { L"Gaoh D KI", 0xefd80, 0xefdc0, indexSamSho5Sprites_Gaoh }, { L"Gaoh D Issen Trail", 0xefe00, 0xefe40, indexSamSho5Sprites_Gaoh }, { L"Gaoh D SON", 0xefe40, 0xefe80, indexSamSho5Sprites_Gaoh }, - { L"Ankiou D", 0xefc80, 0xefcc0 }, - { L"Ankiou D Naraku Boe", 0xefdc0, 0xefe00 }, - { L"Ankiou D SON", 0xefec0, 0xeff00 }, - { L"Gaoh D Special Slash/Naraku Boe Effect", 0xeff20, 0xeff40 }, - { L"Gaoh D Slash Effect", 0xeff00, 0xeff20 }, + { L"Ankiou D 1/2", 0xefc80, 0xefca0, indexSS5_Gaoh, 0x09, &pairNext }, + { L"Ankiou D 2/2", 0xefca0, 0xefcc0, indexSS5_Gaoh, 0x0a }, + { L"Ankiou D Naraku Boe", 0xefdc0, 0xefe00, indexSS5_Gaoh, 0x08 }, + { L"Ankiou D SON 1/2", 0xefec0, 0xefee0, indexSS5_Gaoh, 0x09, &pairNext }, + { L"Ankiou D SON 2/2", 0xefee0, 0xeff00, indexSS5_Gaoh, 0x0a }, + { L"Gaoh D Special Slash/Naraku Boe Effect", 0xeff20, 0xeff40, indexSS5_Gaoh, 0x07 }, + { L"Gaoh D Slash Effect", 0xeff00, 0xeff20, indexSS5_Gaoh, 0x0b }, }; const sGame_PaletteDataset SAMSHO5_A_Genjuro_PALETTES_A[] = @@ -517,7 +525,7 @@ const sGame_PaletteDataset SAMSHO5_A_Genjuro_PALETTES_A[] = { L"Genjuro A KI", 0xdc180, 0xdc1c0, indexSamSho5Sprites_Genjuro }, { L"Genjuro A Issen Trail", 0xdc200, 0xdc240, indexSamSho5Sprites_Genjuro }, { L"Genjuro A SON", 0xdc240, 0xdc280, indexSamSho5Sprites_Genjuro }, - { L"Genjuro A Special Slash/Bowl", 0xdc2a0, 0xdc2c0 }, + { L"Genjuro A Special Slash/Bowl", 0xdc2a0, 0xdc2c0, indexSS5_Genjuro, 0x07 }, { L"Genjuro A Darkest Card", 0xdc0a0, 0xdc0c0 }, { L"Genjuro A Colored Card", 0xdc1c0, 0xdc1e0 }, { L"Genjuro A Darker Card", 0xdc1e0, 0xdc200 }, @@ -538,7 +546,7 @@ const sGame_PaletteDataset SAMSHO5_A_Genjuro_PALETTES_B[] = { L"Genjuro B KI", 0xdc580, 0xdc5c0, indexSamSho5Sprites_Genjuro }, { L"Genjuro B Issen Trail", 0xdc600, 0xdc640, indexSamSho5Sprites_Genjuro }, { L"Genjuro B SON", 0xdc640, 0xdc680, indexSamSho5Sprites_Genjuro }, - { L"Genjuro B Special Slash/Bowl", 0xdc6a0, 0xdc6c0 }, + { L"Genjuro B Special Slash/Bowl", 0xdc6a0, 0xdc6c0, indexSS5_Genjuro, 0x07 }, { L"Genjuro B Darkest Card", 0xdc4a0, 0xdc4c0 }, { L"Genjuro B Colored Card", 0xdc5c0, 0xdc5e0 }, { L"Genjuro B Darker Card", 0xdc5e0, 0xdc600 }, @@ -559,7 +567,7 @@ const sGame_PaletteDataset SAMSHO5_A_Genjuro_PALETTES_C[] = { L"Genjuro C KI", 0xdc980, 0xdc9c0, indexSamSho5Sprites_Genjuro }, { L"Genjuro C Issen Trail", 0xdca00, 0xdca40, indexSamSho5Sprites_Genjuro }, { L"Genjuro C SON", 0xdca40, 0xdca80, indexSamSho5Sprites_Genjuro }, - { L"Genjuro C Special Slash/Bowl", 0xdcaa0, 0xdcac0 }, + { L"Genjuro C Special Slash/Bowl", 0xdcaa0, 0xdcac0, indexSS5_Genjuro, 0x07 }, { L"Genjuro C Darkest Card", 0xdc8a0, 0xdc8c0 }, { L"Genjuro C Colored Card", 0xdc9c0, 0xdc9e0 }, { L"Genjuro C Darker Card", 0xdc9e0, 0xdca00 }, @@ -580,7 +588,7 @@ const sGame_PaletteDataset SAMSHO5_A_Genjuro_PALETTES_D[] = { L"Genjuro D KI", 0xdcd80, 0xdcdc0, indexSamSho5Sprites_Genjuro }, { L"Genjuro D Issen Trail", 0xdce00, 0xdce40, indexSamSho5Sprites_Genjuro }, { L"Genjuro D SON", 0xdce40, 0xdce80, indexSamSho5Sprites_Genjuro }, - { L"Genjuro D Special Slash/Bowl", 0xdcea0, 0xdcec0 }, + { L"Genjuro D Special Slash/Bowl", 0xdcea0, 0xdcec0, indexSS5_Genjuro, 0x07 }, { L"Genjuro D Darkest Card", 0xdcca0, 0xdccc0 }, { L"Genjuro D Colored Card", 0xdcdc0, 0xdcde0 }, { L"Genjuro D Darker Card", 0xdcde0, 0xdce00 }, @@ -601,11 +609,11 @@ const sGame_PaletteDataset SAMSHO5_A_Hanzo_PALETTES_A[] = { L"Hanzo A KI", 0xd8180, 0xd81c0, indexSamSho5Sprites_Hanzo }, { L"Hanzo A Issen Trail", 0xd8200, 0xd8240, indexSamSho5Sprites_Hanzo }, { L"Hanzo A SON", 0xd8240, 0xd8280, indexSamSho5Sprites_Hanzo }, - { L"Hanzo A Fire Effects", 0xd8280, 0xd82a0 }, - { L"Hanzo A X-Ray/Smoke/Windsplitter", 0xd8320, 0xd8340 }, + { L"Hanzo A Fire Effects", 0xd8280, 0xd82a0, indexSS5_Hanzo, 0x07 }, + { L"Hanzo A X-Ray/Smoke/Windsplitter", 0xd8320, 0xd8340, indexSS5_Hanzo, 0x09 }, { L"Hanzo A X-Ray Sparks", 0xd82a0, 0xd82c0 }, { L"Hanzo A Trunk", 0xd8360, 0xd8380 }, - { L"Hanzo A Slash Effect", 0xd8340, 0xd8360 }, + { L"Hanzo A Slash Effect", 0xd8340, 0xd8360, indexSS5_Hanzo, 0x08 }, }; const sGame_PaletteDataset SAMSHO5_A_Hanzo_PALETTES_B[] = @@ -619,11 +627,11 @@ const sGame_PaletteDataset SAMSHO5_A_Hanzo_PALETTES_B[] = { L"Hanzo B KI", 0xd8580, 0xd85c0, indexSamSho5Sprites_Hanzo }, { L"Hanzo B Issen Trail", 0xd8600, 0xd8640, indexSamSho5Sprites_Hanzo }, { L"Hanzo B SON", 0xd8640, 0xd8680, indexSamSho5Sprites_Hanzo }, - { L"Hanzo B Fire Effects", 0xd8680, 0xd86a0 }, - { L"Hanzo B X-Ray/Smoke/Windsplitter", 0xd8720, 0xd8740 }, + { L"Hanzo B Fire Effects", 0xd8680, 0xd86a0, indexSS5_Hanzo, 0x07 }, + { L"Hanzo B X-Ray/Smoke/Windsplitter", 0xd8720, 0xd8740, indexSS5_Hanzo, 0x09 }, { L"Hanzo B X-Ray Sparks", 0xd86a0, 0xd86c0 }, { L"Hanzo B Trunk", 0xd8760, 0xd8780 }, - { L"Hanzo B Slash Effect", 0xd8740, 0xd8760 }, + { L"Hanzo B Slash Effect", 0xd8740, 0xd8760, indexSS5_Hanzo, 0x08 }, }; const sGame_PaletteDataset SAMSHO5_A_Hanzo_PALETTES_C[] = @@ -637,11 +645,11 @@ const sGame_PaletteDataset SAMSHO5_A_Hanzo_PALETTES_C[] = { L"Hanzo C KI", 0xd8980, 0xd89c0, indexSamSho5Sprites_Hanzo }, { L"Hanzo C Issen Trail", 0xd8a00, 0xd8a40, indexSamSho5Sprites_Hanzo }, { L"Hanzo C SON", 0xd8a40, 0xd8a80, indexSamSho5Sprites_Hanzo }, - { L"Hanzo C Fire Effects", 0xd8a80, 0xd8aa0 }, - { L"Hanzo C X-Ray/Smoke/Windsplitter", 0xd8b20, 0xd8b40 }, + { L"Hanzo C Fire Effects", 0xd8a80, 0xd8aa0, indexSS5_Hanzo, 0x07 }, + { L"Hanzo C X-Ray/Smoke/Windsplitter", 0xd8b20, 0xd8b40, indexSS5_Hanzo, 0x09 }, { L"Hanzo C X-Ray Sparks", 0xd8aa0, 0xd8ac0 }, { L"Hanzo C Trunk", 0xd8b60, 0xd8b80 }, - { L"Hanzo C Slash Effect", 0xd8b40, 0xd8b60 }, + { L"Hanzo C Slash Effect", 0xd8b40, 0xd8b60, indexSS5_Hanzo, 0x08 }, }; const sGame_PaletteDataset SAMSHO5_A_Hanzo_PALETTES_D[] = @@ -655,11 +663,11 @@ const sGame_PaletteDataset SAMSHO5_A_Hanzo_PALETTES_D[] = { L"Hanzo D KI", 0xd8d80, 0xd8dc0, indexSamSho5Sprites_Hanzo }, { L"Hanzo D Issen Trail", 0xd8e00, 0xd8e40, indexSamSho5Sprites_Hanzo }, { L"Hanzo D SON", 0xd8e40, 0xd8e80, indexSamSho5Sprites_Hanzo }, - { L"Hanzo D Fire Effects", 0xd8e80, 0xd8ea0 }, - { L"Hanzo D X-Ray/Smoke/Windsplitter", 0xd8f20, 0xd8f40 }, + { L"Hanzo D Fire Effects", 0xd8e80, 0xd8ea0, indexSS5_Hanzo, 0x07 }, + { L"Hanzo D X-Ray/Smoke/Windsplitter", 0xd8f20, 0xd8f40, indexSS5_Hanzo, 0x09 }, { L"Hanzo D X-Ray Sparks", 0xd8ea0, 0xd8ec0 }, { L"Hanzo D Trunk", 0xd8f60, 0xd8f80 }, - { L"Hanzo D Slash Effect", 0xd8f40, 0xd8f60 }, + { L"Hanzo D Slash Effect", 0xd8f40, 0xd8f60, indexSS5_Hanzo, 0x08 }, }; const sGame_PaletteDataset SAMSHO5_A_Haohmaru_PALETTES_A[] = @@ -941,10 +949,10 @@ const sGame_PaletteDataset SAMSHO5_A_Kyoshiro_PALETTES_A[] = { L"Kyoshiro A KI", 0xda180, 0xda1c0, indexSamSho5Sprites_Kyoshiro, 0, &pairNext4 }, { L"Kyoshiro A Issen Trail", 0xda200, 0xda240, indexSamSho5Sprites_Kyoshiro, 0, &pairNext3 }, { L"Kyoshiro A SON", 0xda240, 0xda280, indexSamSho5Sprites_Kyoshiro, 0, &pairNext2 }, - { L"Kyoshiro A Tsunami Crunch", 0xda1c0, 0xda1e0 }, + { L"Kyoshiro A Tsunami Crunch", 0xda1c0, 0xda1e0, indexSS5_Kyoshiro, 0x08 }, { L"Kyoshiro A Toad", 0xda280, 0xda2a0, indexSamSho5Sprites_Kyoshiro, 1 }, - { L"Kyoshiro A Toad Dust", 0xda1e0, 0xda200 }, - { L"Kyoshiro A Fire Effect", 0xda2a0, 0xda2c0 }, + { L"Kyoshiro A Toad Dust", 0xda1e0, 0xda200, indexSamSho5Sprites_Kyoshiro, 0x1 }, + { L"Kyoshiro A Fire Effect", 0xda2a0, 0xda2c0, indexSS5_Kyoshiro, 0x07 }, { L"Kyoshiro A Slash Effect", 0xda340, 0xda360 }, }; @@ -959,10 +967,10 @@ const sGame_PaletteDataset SAMSHO5_A_Kyoshiro_PALETTES_B[] = { L"Kyoshiro B KI", 0xda580, 0xda5c0, indexSamSho5Sprites_Kyoshiro, 0, &pairNext4 }, { L"Kyoshiro B Issen Trail", 0xda600, 0xda640, indexSamSho5Sprites_Kyoshiro, 0, &pairNext3 }, { L"Kyoshiro B SON", 0xda640, 0xda680, indexSamSho5Sprites_Kyoshiro, 0, &pairNext2 }, - { L"Kyoshiro B Tsunami Crunch", 0xda5c0, 0xda5e0 }, + { L"Kyoshiro B Tsunami Crunch", 0xda5c0, 0xda5e0, indexSS5_Kyoshiro, 0x08 }, { L"Kyoshiro B Toad", 0xda680, 0xda6a0, indexSamSho5Sprites_Kyoshiro, 1 }, - { L"Kyoshiro B Toad Dust", 0xda5e0, 0xda600 }, - { L"Kyoshiro B Fire Effect", 0xda6a0, 0xda6c0 }, + { L"Kyoshiro B Toad Dust", 0xda5e0, 0xda600, indexSamSho5Sprites_Kyoshiro, 0x1 }, + { L"Kyoshiro B Fire Effect", 0xda6a0, 0xda6c0, indexSS5_Kyoshiro, 0x07 }, { L"Kyoshiro B Slash Effect", 0xda740, 0xda760 }, }; @@ -977,10 +985,10 @@ const sGame_PaletteDataset SAMSHO5_A_Kyoshiro_PALETTES_C[] = { L"Kyoshiro C KI", 0xda980, 0xda9c0, indexSamSho5Sprites_Kyoshiro, 0, &pairNext4 }, { L"Kyoshiro C Issen Trail", 0xdaa00, 0xdaa40, indexSamSho5Sprites_Kyoshiro, 0, &pairNext3 }, { L"Kyoshiro C SON", 0xdaa40, 0xdaa80, indexSamSho5Sprites_Kyoshiro, 0, &pairNext2 }, - { L"Kyoshiro C Tsunami Crunch", 0xda9c0, 0xda9e0 }, + { L"Kyoshiro C Tsunami Crunch", 0xda9c0, 0xda9e0, indexSS5_Kyoshiro, 0x08 }, { L"Kyoshiro C Toad", 0xdaa80, 0xdaaa0, indexSamSho5Sprites_Kyoshiro, 1 }, - { L"Kyoshiro C Toad Dust", 0xda9e0, 0xdaa00 }, - { L"Kyoshiro C Fire Effect", 0xdaaa0, 0xdaac0 }, + { L"Kyoshiro C Toad Dust", 0xda9e0, 0xdaa00, indexSamSho5Sprites_Kyoshiro, 0x1 }, + { L"Kyoshiro C Fire Effect", 0xdaaa0, 0xdaac0, indexSS5_Kyoshiro, 0x07 }, { L"Kyoshiro C Slash Effect", 0xdab40, 0xdab60 }, }; @@ -995,10 +1003,10 @@ const sGame_PaletteDataset SAMSHO5_A_Kyoshiro_PALETTES_D[] = { L"Kyoshiro D KI", 0xdad80, 0xdadc0, indexSamSho5Sprites_Kyoshiro, 0, &pairNext4 }, { L"Kyoshiro D Issen Trail", 0xdae00, 0xdae40, indexSamSho5Sprites_Kyoshiro, 0, &pairNext3 }, { L"Kyoshiro D SON", 0xdae40, 0xdae80, indexSamSho5Sprites_Kyoshiro, 0, &pairNext2 }, - { L"Kyoshiro D Tsunami Crunch", 0xdadc0, 0xdade0 }, + { L"Kyoshiro D Tsunami Crunch", 0xdadc0, 0xdade0, indexSS5_Kyoshiro, 0x08 }, { L"Kyoshiro D Toad", 0xdae80, 0xdaea0, indexSamSho5Sprites_Kyoshiro, 1 }, - { L"Kyoshiro D Toad Dust", 0xdade0, 0xdae00 }, - { L"Kyoshiro D Fire Effect", 0xdaea0, 0xdaec0 }, + { L"Kyoshiro D Toad Dust", 0xdade0, 0xdae00, indexSamSho5Sprites_Kyoshiro, 0x1 }, + { L"Kyoshiro D Fire Effect", 0xdaea0, 0xdaec0, indexSS5_Kyoshiro, 0x07 }, { L"Kyoshiro D Slash Effect", 0xdaf40, 0xdaf60 }, }; @@ -1013,12 +1021,12 @@ const sGame_PaletteDataset SAMSHO5_A_Mina_PALETTES_A[] = { L"Mina A KI", 0xed180, 0xed1c0, indexSamSho5Sprites_Mina, 0, &pairNext4 }, { L"Mina A Issen Trail", 0xed200, 0xed240, indexSamSho5Sprites_Mina, 0, &pairNext3 }, { L"Mina A SON", 0xed240, 0xed280, indexSamSho5Sprites_Mina, 0, &pairNext2 }, - { L"Mina A Intro Cloth", 0xed320, 0xed340 }, + { L"Mina A Intro Cloth", 0xed320, 0xed340, indexSS5_Mina, 0x08 }, { L"Chanpuru A", 0xed280, 0xed2a0, indexSamSho5Sprites_Mina, 1 }, - { L"Chanpuru A Surprised/Crying", 0xed2c0, 0xed2e0 }, - { L"Chanpuru A Leaf", 0xed380, 0xed3a0 }, - { L"Mina A Special Arrow Effect", 0xed360, 0xed380 }, - { L"Mina A Arrow Effect", 0xed340, 0xed360 }, + { L"Chanpuru A Surprised/Crying", 0xed2c0, 0xed2e0, indexSS5_Mina, 0x07 }, + { L"Chanpuru A Leaf", 0xed380, 0xed3a0, indexSS5_Mina, 0x0b }, + { L"Mina A Special Arrow Effect", 0xed360, 0xed380, indexSS5_Mina, 0x09 }, + { L"Mina A Arrow Effect", 0xed340, 0xed360, indexSS5_Mina, 0x0a }, }; const sGame_PaletteDataset SAMSHO5_A_Mina_PALETTES_B[] = @@ -1032,12 +1040,12 @@ const sGame_PaletteDataset SAMSHO5_A_Mina_PALETTES_B[] = { L"Mina B KI", 0xed580, 0xed5c0, indexSamSho5Sprites_Mina, 0, &pairNext4 }, { L"Mina B Issen Trail", 0xed600, 0xed640, indexSamSho5Sprites_Mina, 0, &pairNext3 }, { L"Mina B SON", 0xed640, 0xed680, indexSamSho5Sprites_Mina, 0, &pairNext2 }, - { L"Mina B Intro Cloth", 0xed720, 0xed740 }, + { L"Mina B Intro Cloth", 0xed720, 0xed740, indexSS5_Mina, 0x08 }, { L"Chanpuru B", 0xed680, 0xed6a0, indexSamSho5Sprites_Mina, 1 }, - { L"Chanpuru B Surprised/Crying", 0xed6c0, 0xed6e0 }, - { L"Chanpuru B Leaf", 0xed780, 0xed7a0 }, - { L"Mina B Special Arrow Effect", 0xed760, 0xed780 }, - { L"Mina B Arrow Effect", 0xed740, 0xed760 }, + { L"Chanpuru B Surprised/Crying", 0xed6c0, 0xed6e0, indexSS5_Mina, 0x07 }, + { L"Chanpuru B Leaf", 0xed780, 0xed7a0, indexSS5_Mina, 0x0b }, + { L"Mina B Special Arrow Effect", 0xed760, 0xed780, indexSS5_Mina, 0x09 }, + { L"Mina B Arrow Effect", 0xed740, 0xed760, indexSS5_Mina, 0x0a }, }; const sGame_PaletteDataset SAMSHO5_A_Mina_PALETTES_C[] = @@ -1051,12 +1059,12 @@ const sGame_PaletteDataset SAMSHO5_A_Mina_PALETTES_C[] = { L"Mina C KI", 0xed980, 0xed9c0, indexSamSho5Sprites_Mina, 0, &pairNext4 }, { L"Mina C Issen Trail", 0xeda00, 0xeda40, indexSamSho5Sprites_Mina, 0, &pairNext3 }, { L"Mina C SON", 0xeda40, 0xeda80, indexSamSho5Sprites_Mina, 0, &pairNext2 }, - { L"Mina C Intro Cloth", 0xedb20, 0xedb40 }, + { L"Mina C Intro Cloth", 0xedb20, 0xedb40, indexSS5_Mina, 0x08 }, { L"Chanpuru C", 0xeda80, 0xedaa0, indexSamSho5Sprites_Mina, 1 }, - { L"Chanpuru C Surprised/Crying", 0xedac0, 0xedae0 }, - { L"Chanpuru C Leaf", 0xedb80, 0xedba0 }, - { L"Mina C Special Arrow Effect", 0xedb60, 0xedb80 }, - { L"Mina C Arrow Effect", 0xedb40, 0xedb60 }, + { L"Chanpuru C Surprised/Crying", 0xedac0, 0xedae0, indexSS5_Mina, 0x07 }, + { L"Chanpuru C Leaf", 0xedb80, 0xedba0, indexSS5_Mina, 0x0b }, + { L"Mina C Special Arrow Effect", 0xedb60, 0xedb80, indexSS5_Mina, 0x09 }, + { L"Mina C Arrow Effect", 0xedb40, 0xedb60, indexSS5_Mina, 0x0a }, }; const sGame_PaletteDataset SAMSHO5_A_Mina_PALETTES_D[] = @@ -1070,12 +1078,12 @@ const sGame_PaletteDataset SAMSHO5_A_Mina_PALETTES_D[] = { L"Mina D KI", 0xedd80, 0xeddc0, indexSamSho5Sprites_Mina, 0, &pairNext4 }, { L"Mina D Issen Trail", 0xede00, 0xede40, indexSamSho5Sprites_Mina, 0, &pairNext3 }, { L"Mina D SON", 0xede40, 0xede80, indexSamSho5Sprites_Mina, 0, &pairNext2 }, - { L"Mina D Intro Cloth", 0xedf20, 0xedf40 }, + { L"Mina D Intro Cloth", 0xedf20, 0xedf40, indexSS5_Mina, 0x08 }, { L"Chanpuru D", 0xede80, 0xedea0, indexSamSho5Sprites_Mina, 1 }, - { L"Chanpuru D Surprised/Crying", 0xedec0, 0xedee0 }, - { L"Chanpuru D Leaf", 0xedf80, 0xedfa0 }, - { L"Mina D Special Arrow Effect", 0xedf60, 0xedf80 }, - { L"Mina D Arrow Effect", 0xedf40, 0xedf60 }, + { L"Chanpuru D Surprised/Crying", 0xedec0, 0xedee0, indexSS5_Mina, 0x07 }, + { L"Chanpuru D Leaf", 0xedf80, 0xedfa0, indexSS5_Mina, 0x0b }, + { L"Mina D Special Arrow Effect", 0xedf60, 0xedf80, indexSS5_Mina, 0x09 }, + { L"Mina D Arrow Effect", 0xedf40, 0xedf60, indexSS5_Mina, 0x0a }, }; const sGame_PaletteDataset SAMSHO5_A_Nakoruru_PALETTES_A[] = @@ -1091,7 +1099,7 @@ const sGame_PaletteDataset SAMSHO5_A_Nakoruru_PALETTES_A[] = { L"Nakoruru A SON", 0xd6240, 0xd6280, indexSamSho5Sprites_Nakoruru, 0, &pairNext2 }, { L"Nakoruru A Nubuke Kamui Trail", 0xd6080, 0xd60c0, indexSamSho5Sprites_Nakoruru, 0, &pairNext }, { L"Mamahaha A", 0xd6280, 0xd62a0, indexSamSho5Sprites_Nakoruru, 1 }, - { L"Nakoruru A KI/Slash Effect", 0xd6340, 0xd6360 }, + { L"Nakoruru A KI/Slash Effect", 0xd6340, 0xd6360, indexSS5_Nakoruru, 0x08 }, { L"Nakoruru A Elely Kamui Rimse", 0xd6360, 0xd6380 }, }; @@ -1108,7 +1116,7 @@ const sGame_PaletteDataset SAMSHO5_A_Nakoruru_PALETTES_B[] = { L"Nakoruru B SON", 0xd6640, 0xd6680, indexSamSho5Sprites_Nakoruru, 0, &pairNext2 }, { L"Nakoruru B Nubuke Kamui Trail", 0xd6480, 0xd64c0, indexSamSho5Sprites_Nakoruru, 0, &pairNext }, { L"Mamahaha B", 0xd6680, 0xd66a0, indexSamSho5Sprites_Nakoruru, 1 }, - { L"Nakoruru B KI/Slash Effect", 0xd6740, 0xd6760 }, + { L"Nakoruru B KI/Slash Effect", 0xd6740, 0xd6760, indexSS5_Nakoruru, 0x08 }, { L"Nakoruru B Elely Kamui Rimse", 0xd6760, 0xd6780 }, }; @@ -1125,7 +1133,7 @@ const sGame_PaletteDataset SAMSHO5_A_Nakoruru_PALETTES_C[] = { L"Nakoruru C SON", 0xd6a40, 0xd6a80, indexSamSho5Sprites_Nakoruru, 0, &pairNext2 }, { L"Nakoruru C Nubuke Kamui Trail", 0xd6880, 0xd68c0, indexSamSho5Sprites_Nakoruru, 0, &pairNext }, { L"Mamahaha C", 0xd6a80, 0xd6aa0, indexSamSho5Sprites_Nakoruru, 1 }, - { L"Nakoruru C KI/Slash Effect", 0xd6b40, 0xd6b60 }, + { L"Nakoruru C KI/Slash Effect", 0xd6b40, 0xd6b60, indexSS5_Nakoruru, 0x08 }, { L"Nakoruru C Elely Kamui Rimse", 0xd6b60, 0xd6b80 }, }; @@ -1142,7 +1150,7 @@ const sGame_PaletteDataset SAMSHO5_A_Nakoruru_PALETTES_D[] = { L"Nakoruru D SON", 0xd6e40, 0xd6e80, indexSamSho5Sprites_Nakoruru, 0, &pairNext2 }, { L"Nakoruru D Nubuke Kamui Trail", 0xd6c80, 0xd6cc0, indexSamSho5Sprites_Nakoruru, 0, &pairNext }, { L"Mamahaha D", 0xd6e80, 0xd6ea0, indexSamSho5Sprites_Nakoruru, 1 }, - { L"Nakoruru D KI/Slash Effect", 0xd6f40, 0xd6f60 }, + { L"Nakoruru D KI/Slash Effect", 0xd6f40, 0xd6f60, indexSS5_Nakoruru, 0x08 }, { L"Nakoruru D Elely Kamui Rimse", 0xd6f60, 0xd6f80 }, }; @@ -1298,7 +1306,7 @@ const sGame_PaletteDataset SAMSHO5_A_Rimururu_PALETTES_A[] = { L"Rimururu A Issen Trail", 0xd7200, 0xd7240, indexSamSho5Sprites_Rimururu }, { L"Rimururu A SON", 0xd7240, 0xd7280, indexSamSho5Sprites_Rimururu }, { L"Konru A", 0xd72c0, 0xd72e0, indexSamSho5Sprites_Rimururu, 0x01 }, - { L"Rimururu A Slash Effect", 0xd7340, 0xd7360 }, + { L"Rimururu A Slash Effect", 0xd7340, 0xd7360, indexSS5_Rimururu, 0x07 }, }; const sGame_PaletteDataset SAMSHO5_A_Rimururu_PALETTES_B[] = @@ -1313,7 +1321,7 @@ const sGame_PaletteDataset SAMSHO5_A_Rimururu_PALETTES_B[] = { L"Rimururu B Issen Trail", 0xd7600, 0xd7640, indexSamSho5Sprites_Rimururu }, { L"Rimururu B SON", 0xd7640, 0xd7680, indexSamSho5Sprites_Rimururu }, { L"Konru B", 0xd76c0, 0xd76e0, indexSamSho5Sprites_Rimururu, 0x01 }, - { L"Rimururu B Slash Effect", 0xd7740, 0xd7760 }, + { L"Rimururu B Slash Effect", 0xd7740, 0xd7760, indexSS5_Rimururu, 0x07 }, }; const sGame_PaletteDataset SAMSHO5_A_Rimururu_PALETTES_C[] = @@ -1328,7 +1336,7 @@ const sGame_PaletteDataset SAMSHO5_A_Rimururu_PALETTES_C[] = { L"Rimururu C Issen Trail", 0xd7a00, 0xd7a40, indexSamSho5Sprites_Rimururu }, { L"Rimururu C SON", 0xd7a40, 0xd7a80, indexSamSho5Sprites_Rimururu }, { L"Konru C", 0xd7ac0, 0xd7ae0, indexSamSho5Sprites_Rimururu, 0x01 }, - { L"Rimururu C Slash Effect", 0xd7b40, 0xd7b60 }, + { L"Rimururu C Slash Effect", 0xd7b40, 0xd7b60, indexSS5_Rimururu, 0x07 }, }; const sGame_PaletteDataset SAMSHO5_A_Rimururu_PALETTES_D[] = @@ -1343,7 +1351,7 @@ const sGame_PaletteDataset SAMSHO5_A_Rimururu_PALETTES_D[] = { L"Rimururu D Issen Trail", 0xd7e00, 0xd7e40, indexSamSho5Sprites_Rimururu }, { L"Rimururu D SON", 0xd7e40, 0xd7e80, indexSamSho5Sprites_Rimururu }, { L"Konru D", 0xd7ec0, 0xd7ee0, indexSamSho5Sprites_Rimururu, 0x01 }, - { L"Rimururu D Slash Effect", 0xd7f40, 0xd7f60 }, + { L"Rimururu D Slash Effect", 0xd7f40, 0xd7f60, indexSS5_Rimururu, 0x07 }, }; const sGame_PaletteDataset SAMSHO5_A_Shizumaru_PALETTES_A[] = @@ -1650,9 +1658,9 @@ const sGame_PaletteDataset SAMSHO5_A_Ukyo_PALETTES_A[] = { L"Ukyo A Issen Trail", 0xdb200, 0xdb240, indexSamSho5Sprites_Ukyo }, { L"Ukyo A SON", 0xdb240, 0xdb280, indexSamSho5Sprites_Ukyo }, { L"Ukyo A Tsubame Gaeshi Trail", 0xdb0a0, 0xdb0c0 }, - { L"Ukyo A Tsubame Gaeshi Flame", 0xdb1c0, 0xdb1e0 }, - { L"Ukyo A Special Slash Effect", 0xdb280, 0xdb2a0 }, - { L"Ukyo A Slash Effect", 0xdb340, 0xdb360 }, + { L"Ukyo A Tsubame Gaeshi Flame", 0xdb1c0, 0xdb1e0, indexSS5_Ukyo, 0x09 }, + { L"Ukyo A Special Slash Effect", 0xdb280, 0xdb2a0, indexSS5_Ukyo, 0x0a }, + { L"Ukyo A Slash Effect", 0xdb340, 0xdb360, indexSS5_Ukyo, 0x07 }, }; const sGame_PaletteDataset SAMSHO5_A_Ukyo_PALETTES_B[] = @@ -1667,9 +1675,9 @@ const sGame_PaletteDataset SAMSHO5_A_Ukyo_PALETTES_B[] = { L"Ukyo B Issen Trail", 0xdb600, 0xdb640, indexSamSho5Sprites_Ukyo }, { L"Ukyo B SON", 0xdb640, 0xdb680, indexSamSho5Sprites_Ukyo }, { L"Ukyo B Tsubame Gaeshi Trail", 0xdb4a0, 0xdb4c0 }, - { L"Ukyo B Tsubame Gaeshi Flame", 0xdb5c0, 0xdb5e0 }, - { L"Ukyo B Special Slash Effect", 0xdb680, 0xdb6a0 }, - { L"Ukyo B Slash Effect", 0xdb740, 0xdb760 }, + { L"Ukyo B Tsubame Gaeshi Flame", 0xdb5c0, 0xdb5e0, indexSS5_Ukyo, 0x09 }, + { L"Ukyo B Special Slash Effect", 0xdb680, 0xdb6a0, indexSS5_Ukyo, 0x0a }, + { L"Ukyo B Slash Effect", 0xdb740, 0xdb760, indexSS5_Ukyo, 0x07 }, }; const sGame_PaletteDataset SAMSHO5_A_Ukyo_PALETTES_C[] = @@ -1684,9 +1692,9 @@ const sGame_PaletteDataset SAMSHO5_A_Ukyo_PALETTES_C[] = { L"Ukyo C Issen Trail", 0xdba00, 0xdba40, indexSamSho5Sprites_Ukyo }, { L"Ukyo C SON", 0xdba40, 0xdba80, indexSamSho5Sprites_Ukyo }, { L"Ukyo C Tsubame Gaeshi Trail", 0xdb8a0, 0xdb8c0 }, - { L"Ukyo C Tsubame Gaeshi Flame", 0xdb9c0, 0xdb9e0 }, - { L"Ukyo C Special Slash Effect", 0xdba80, 0xdbaa0 }, - { L"Ukyo C Slash Effect", 0xdbb40, 0xdbb60 }, + { L"Ukyo C Tsubame Gaeshi Flame", 0xdb9c0, 0xdb9e0, indexSS5_Ukyo, 0x09 }, + { L"Ukyo C Special Slash Effect", 0xdba80, 0xdbaa0, indexSS5_Ukyo, 0x0a }, + { L"Ukyo C Slash Effect", 0xdbb40, 0xdbb60, indexSS5_Ukyo, 0x07 }, }; const sGame_PaletteDataset SAMSHO5_A_Ukyo_PALETTES_D[] = @@ -1701,9 +1709,9 @@ const sGame_PaletteDataset SAMSHO5_A_Ukyo_PALETTES_D[] = { L"Ukyo D Issen Trail", 0xdbe00, 0xdbe40, indexSamSho5Sprites_Ukyo }, { L"Ukyo D SON", 0xdbe40, 0xdbe80, indexSamSho5Sprites_Ukyo }, { L"Ukyo D Tsubame Gaeshi Trail", 0xdbca0, 0xdbcc0 }, - { L"Ukyo D Tsubame Gaeshi Flame", 0xdbdc0, 0xdbde0 }, - { L"Ukyo D Special Slash Effect", 0xdbe80, 0xdbea0 }, - { L"Ukyo D Slash Effect", 0xdbf40, 0xdbf60 }, + { L"Ukyo D Tsubame Gaeshi Flame", 0xdbdc0, 0xdbde0, indexSS5_Ukyo, 0x09 }, + { L"Ukyo D Special Slash Effect", 0xdbe80, 0xdbea0, indexSS5_Ukyo, 0x0a }, + { L"Ukyo D Slash Effect", 0xdbf40, 0xdbf60, indexSS5_Ukyo, 0x07 }, }; const sGame_PaletteDataset SAMSHO5_A_Yoshitora_PALETTES_A[] = diff --git a/palmod/Game/UMK3_DS_DEF.h b/palmod/Game/UMK3_DS_DEF.h index 84b843ef..23f02d4e 100644 --- a/palmod/Game/UMK3_DS_DEF.h +++ b/palmod/Game/UMK3_DS_DEF.h @@ -9,302 +9,302 @@ const std::vector UMK3_DS_IMGIDS_USED = { - indexUMK3Sprites_Cyrax, // 0xC9 - indexUMK3Sprites_Ermac, // 0xCA - indexUMK3Sprites_Jade, // 0xCB - indexUMK3Sprites_Jax, // 0xCC - indexUMK3Sprites_Kabal, // 0xCD - indexUMK3Sprites_Kano, // 0xCE - indexUMK3Sprites_Kitana, // 0xCF - indexUMK3Sprites_KungLao, // 0xD0 - indexUMK3Sprites_LiuKang, // 0xD1 - indexUMK3Sprites_Mileena, // 0xD2 - indexUMK3Sprites_Motaro, // 0xD3 - indexUMK3Sprites_Nightwolf, // 0xD4 - indexUMK3Sprites_NoobSaibot, // 0xD5 - indexUMK3Sprites_Rain, // 0xD6 - indexUMK3Sprites_Reptile, // 0xD7 - indexUMK3Sprites_Scorpion, // 0xD8 - indexUMK3Sprites_Sektor, // 0xD9 - indexUMK3Sprites_ShangTsung, // 0xDA - indexUMK3Sprites_ShaoKahn, // 0xDB - indexUMK3Sprites_Sheeva, // 0xDC - indexUMK3Sprites_Sindel, // 0xDD - indexUMK3Sprites_Smoke, // 0xDE - indexUMK3Sprites_SmokeHuman, // 0xDF - indexUMK3Sprites_Sonya, // 0xE0 - indexUMK3Sprites_Stryker, // 0xE1 - indexUMK3Sprites_SubZero, // 0xE2 - indexUMK3Sprites_SubZeroClassic, // 0xE3 - indexUMK3Sprites_Bonus, // 0xE4 - indexUMK3Sprites_Stages, // 0xE5 + 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 + }; const sGame_PaletteDataset UMK3_DS_CYRAX_PALETTES_P1[] = { - { L"Cyrax P1", 0x2107BC, 0x21083C, indexUMK3Sprites_Sektor, 0x00 }, + { L"Cyrax P1", 0x2107BC, 0x21083C, indexUMK3Sprites_DS_Sektor, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_CYRAX_PALETTES_P2[] = { - { L"Cyrax P2", 0x21083E, 0x2108BE, indexUMK3Sprites_Sektor, 0x00 }, + { L"Cyrax P2", 0x21083E, 0x2108BE, indexUMK3Sprites_DS_Sektor, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_ERMAC_PALETTES_P1[] = { - { L"Ermac P1", 0x1B26A0, 0x1B2720, indexUMK3Sprites_Scorpion, 0x00 }, + { L"Ermac P1", 0x1B26A0, 0x1B2720, indexUMK3Sprites_DS_Scorpion, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_ERMAC_PALETTES_P2[] = { - { L"Ermac P2", 0x1B355C, 0x1B35DC, indexUMK3Sprites_Scorpion, 0x00 }, + { L"Ermac P2", 0x1B355C, 0x1B35DC, indexUMK3Sprites_DS_Scorpion, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_JADE_PALETTES_P1[] = { - { L"Jade P1", 0x21696A, 0x2169EA, indexUMK3Sprites_Jade, 0x00 }, + { L"Jade P1", 0x21696A, 0x2169EA, indexUMK3Sprites_DS_Jade, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_JADE_PALETTES_P2[] = { - { L"Jade P2", 0x1B33D6, 0x1B3456, indexUMK3Sprites_Jade, 0x00 }, + { L"Jade P2", 0x1B33D6, 0x1B3456, indexUMK3Sprites_DS_Jade, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_JAX_PALETTES_P1[] = { - { L"Jax P1", 0x20FF9E, 0x21001E, indexUMK3Sprites_Jax, 0x00 }, + { L"Jax P1", 0x20FF9E, 0x21001E, indexUMK3Sprites_DS_Jax, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_JAX_PALETTES_P2[] = { - { L"Jax P2", 0x210020, 0x2100A0, indexUMK3Sprites_Jax, 0x00 }, + { L"Jax P2", 0x210020, 0x2100A0, indexUMK3Sprites_DS_Jax, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_KABAL_PALETTES_P1[] = { - { L"Kabal P1", 0x210C62, 0x210CE2, indexUMK3Sprites_Kabal, 0x00 }, + { L"Kabal P1", 0x210C62, 0x210CE2, indexUMK3Sprites_DS_Kabal, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_KABAL_PALETTES_P2[] = { - { L"Kabal P2", 0x210CE4, 0x210D64, indexUMK3Sprites_Kabal, 0x00 }, + { L"Kabal P2", 0x210CE4, 0x210D64, indexUMK3Sprites_DS_Kabal, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_KANO_PALETTES_P1[] = { - { L"Kano P1", 0x20FCC2, 0x20FD42, indexUMK3Sprites_Kano, 0x00 }, + { L"Kano P1", 0x20FCC2, 0x20FD42, indexUMK3Sprites_DS_Kano, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_KANO_PALETTES_P2[] = { - { L"Kano P2", 0x20FD44, 0x20FDC4, indexUMK3Sprites_Kano, 0x00 }, + { L"Kano P2", 0x20FD44, 0x20FDC4, indexUMK3Sprites_DS_Kano, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_KITANA_PALETTES_P1[] = { - { L"Kitana P1", 0x216866, 0x2168E6, indexUMK3Sprites_Kitana, 0x00 }, + { L"Kitana P1", 0x216866, 0x2168E6, indexUMK3Sprites_DS_Kitana, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_KITANA_PALETTES_P2[] = { - { L"Kitana P2", 0x1B32D2, 0x1B3352, indexUMK3Sprites_Kitana, 0x00 }, + { L"Kitana P2", 0x1B32D2, 0x1B3352, indexUMK3Sprites_DS_Kitana, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_KUNGLAO_PALETTES_P1[] = { - { L"Kung Lao P1", 0x210ABE, 0x210B3E, indexUMK3Sprites_KungLao, 0x00 }, + { L"Kung Lao P1", 0x210ABE, 0x210B3E, indexUMK3Sprites_DS_KungLao, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_KUNGLAO_PALETTES_P2[] = { - { L"Kung Lao P2", 0x210B40, 0x210BC0, indexUMK3Sprites_KungLao, 0x00 }, + { L"Kung Lao P2", 0x210B40, 0x210BC0, indexUMK3Sprites_DS_KungLao, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_LIUKANG_PALETTES_P1[] = { - { L"Liu Kang P1", 0x21174C, 0x2117CC, indexUMK3Sprites_LiuKang, 0x00 }, + { L"Liu Kang P1", 0x21174C, 0x2117CC, indexUMK3Sprites_DS_LiuKang, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_LIUKANG_PALETTES_P2[] = { - { L"Liu Kang P2", 0x2117CE, 0x21184E, indexUMK3Sprites_LiuKang, 0x00 }, + { L"Liu Kang P2", 0x2117CE, 0x21184E, indexUMK3Sprites_DS_LiuKang, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_MILEENA_PALETTES_P1[] = { - { L"Mileena P1", 0x2168E8, 0x216968, indexUMK3Sprites_Mileena, 0x00 }, + { L"Mileena P1", 0x2168E8, 0x216968, indexUMK3Sprites_DS_Mileena, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_MILEENA_PALETTES_P2[] = { - { L"Mileena P2", 0x1B3354, 0x1B33D4, indexUMK3Sprites_Mileena, 0x00 }, + { L"Mileena P2", 0x1B3354, 0x1B33D4, indexUMK3Sprites_DS_Mileena, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_NIGHTWOLF_PALETTES_P1[] = { - { L"Nightwolf P1", 0x210128, 0x2101A8, indexUMK3Sprites_Nightwolf, 0x00 }, + { L"Nightwolf P1", 0x210128, 0x2101A8, indexUMK3Sprites_DS_Nightwolf, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_NIGHTWOLF_PALETTES_P2[] = { - { L"Nightwolf P2", 0x1B28A8, 0x1B2928, indexUMK3Sprites_Nightwolf, 0x00 }, + { L"Nightwolf P2", 0x1B28A8, 0x1B2928, indexUMK3Sprites_DS_Nightwolf, 0x00 }, }; #ifdef NOTFOUND const sGame_PaletteDataset UMK3_DS_NOOB_PALETTES_P1[] = { - { L"Noob Saibot P1", 0x3EAF8F, 0x3EAFAF, indexUMK3Sprites_Scorpion, 0x00 }, + { L"Noob Saibot P1", 0x3EAF8F, 0x3EAFAF, indexUMK3Sprites_DS_Scorpion, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_NOOB_PALETTES_P2[] = { - { L"Noob Saibot P2", 0x8C4ED, 0x8C50D, indexUMK3Sprites_Scorpion, 0x00 }, + { L"Noob Saibot P2", 0x8C4ED, 0x8C50D, indexUMK3Sprites_DS_Scorpion, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_RAIN_PALETTES_P1[] = { - { L"Rain P1", 0x3EAFAF, 0x3EAFCF, indexUMK3Sprites_Scorpion, 0x00 }, + { L"Rain P1", 0x3EAFAF, 0x3EAFCF, indexUMK3Sprites_DS_Scorpion, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_RAIN_PALETTES_P2[] = { - { L"Rain P2", 0x8C4AD, 0x8C4CD, indexUMK3Sprites_Scorpion, 0x00 }, + { L"Rain P2", 0x8C4AD, 0x8C4CD, indexUMK3Sprites_DS_Scorpion, 0x00 }, }; #endif const sGame_PaletteDataset UMK3_DS_REPTILE_PALETTES_P1[] = { - { L"Reptile P1", 0x216AF4, 0x216B74, indexUMK3Sprites_Reptile, 0x00 }, + { L"Reptile P1", 0x216AF4, 0x216B74, indexUMK3Sprites_DS_Reptile, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_REPTILE_PALETTES_P2[] = { - { L"Reptile P2", 0x1B34DA, 0x1B355A, indexUMK3Sprites_Reptile, 0x00 }, + { L"Reptile P2", 0x1B34DA, 0x1B355A, indexUMK3Sprites_DS_Reptile, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_SCORPION_PALETTES_P1[] = { - { L"Scorpion P1", 0x216A72, 0x216AF2, indexUMK3Sprites_Scorpion, 0x00 }, + { L"Scorpion P1", 0x216A72, 0x216AF2, indexUMK3Sprites_DS_Scorpion, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_SCORPION_PALETTES_P2[] = { - { L"Scorpion P2", 0x1B3458, 0x1B34D8, indexUMK3Sprites_Scorpion, 0x00 }, + { L"Scorpion P2", 0x1B3458, 0x1B34D8, indexUMK3Sprites_DS_Scorpion, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_SEKTOR_PALETTES_P1[] = { - { L"Sektor P1", 0x2106B8, 0x210738, indexUMK3Sprites_Sektor, 0x00 }, + { L"Sektor P1", 0x2106B8, 0x210738, indexUMK3Sprites_DS_Sektor, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_SEKTOR_PALETTES_P2[] = { - { L"Sektor P2", 0x21073A, 0x2107BA, indexUMK3Sprites_Sektor, 0x00 }, + { L"Sektor P2", 0x21073A, 0x2107BA, indexUMK3Sprites_DS_Sektor, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_SHANG_PALETTES_P1[] = { - { L"Shang Tsung P1", 0x210F7E, 0x210FFE, indexUMK3Sprites_ShangTsung, 0x00 }, + { L"Shang Tsung P1", 0x210F7E, 0x210FFE, indexUMK3Sprites_DS_ShangTsung, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_SHANG_PALETTES_P2[] = { - { L"Shang Tsung P2", 0x211000, 0x211080, indexUMK3Sprites_ShangTsung, 0x00 }, + { L"Shang Tsung P2", 0x211000, 0x211080, indexUMK3Sprites_DS_ShangTsung, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_SINDEL_PALETTES_P1[] = { - { L"Sindel P1", 0x2104DE, 0x21055E, indexUMK3Sprites_Sindel, 0x00 }, + { L"Sindel P1", 0x2104DE, 0x21055E, indexUMK3Sprites_DS_Sindel, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_SINDEL_PALETTES_P2[] = { - { L"Sindel P2", 0x1B29AA, 0x1B2A2A, indexUMK3Sprites_Sindel, 0x00 }, + { L"Sindel P2", 0x1B29AA, 0x1B2A2A, indexUMK3Sprites_DS_Sindel, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_SMOKE_PALETTES_P1[] = { - { L"Smoke P1", 0x1B27A4, 0x1B2824, indexUMK3Sprites_Sektor, 0x00 }, + { L"Smoke P1", 0x1B27A4, 0x1B2824, indexUMK3Sprites_DS_Sektor, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_SMOKE_PALETTES_P2[] = { - { L"Smoke P2", 0x1B2826, 0x1B28A6, indexUMK3Sprites_Sektor, 0x00 }, + { L"Smoke P2", 0x1B2826, 0x1B28A6, indexUMK3Sprites_DS_Sektor, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_SMOKE_HUMAN_PALETTES_P1[] = { - { L"Smoke (Human) P1", 0x1B3660, 0x1B36E0, indexUMK3Sprites_SmokeHuman, 0x00 }, + { L"Smoke (Human) P1", 0x1B3660, 0x1B36E0, indexUMK3Sprites_DS_SmokeHuman, 0x00 }, }; #ifdef NOTFOUND const sGame_PaletteDataset UMK3_DS_SMOKE_HUMAN_PALETTES_P2[] = { - { L"Smoke (Human) P2", 0x8C48D, 0x8C4AD, indexUMK3Sprites_SmokeHuman, 0x00 }, + { L"Smoke (Human) P2", 0x8C48D, 0x8C4AD, indexUMK3Sprites_DS_SmokeHuman, 0x00 }, }; #endif const sGame_PaletteDataset UMK3_DS_SONYA_PALETTES_P1[] = { - { L"Sonya P1", 0x21AB34, 0x21ABB4, indexUMK3Sprites_Sonya, 0x00 }, + { L"Sonya P1", 0x21AB34, 0x21ABB4, indexUMK3Sprites_DS_SonyaBlade, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_SONYA_PALETTES_P2[] = { - { L"Sonya P2", 0x20FE7A, 0x20FEFA, indexUMK3Sprites_Sonya, 0x00 }, + { L"Sonya P2", 0x20FE7A, 0x20FEFA, indexUMK3Sprites_DS_SonyaBlade, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_STRYKER_PALETTES_P1[] = { - { L"Stryker P1", 0x2103B2, 0x210432, indexUMK3Sprites_Stryker, 0x00 }, + { L"Stryker P1", 0x2103B2, 0x210432, indexUMK3Sprites_DS_Stryker, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_STRYKER_PALETTES_P2[] = { - { L"Stryker P2", 0x1B292A, 0x1B29AA, indexUMK3Sprites_Stryker, 0x00 }, + { L"Stryker P2", 0x1B292A, 0x1B29AA, indexUMK3Sprites_DS_Stryker, 0x00 }, }; -const sGame_PaletteDataset UMK3_DS_SUBZERO_HUMAN_PALETTES_P1[] = +const sGame_PaletteDataset UMK3_DS_SUBZERO_PALETTES_P1[] = { - { L"Sub-Zero P1", 0x1B2722, 0x1B27A2, indexUMK3Sprites_SubZero, 0x00 }, + { L"Sub-Zero P1", 0x1B2722, 0x1B27A2, indexUMK3Sprites_DS_Scorpion, 0x00 }, }; -const sGame_PaletteDataset UMK3_DS_SUBZERO_HUMAN_PALETTES_P2[] = +const sGame_PaletteDataset UMK3_DS_SUBZERO_PALETTES_P2[] = { - { L"Sub-Zero P2", 0x1B35DE, 0x1B365E, indexUMK3Sprites_SubZero, 0x00 }, + { L"Sub-Zero P2", 0x1B35DE, 0x1B365E, indexUMK3Sprites_DS_Scorpion, 0x00 }, }; -const sGame_PaletteDataset UMK3_DS_SUBZERO_PALETTES_P1[] = +const sGame_PaletteDataset UMK3_DS_SUBZERO_HUMAN_PALETTES_P1[] = { - { L"Sub-Zero (Original) P1", 0x2101E8, 0x210268, indexUMK3Sprites_Scorpion, 0x00 }, + { L"Sub-Zero (Human) P1", 0x2101E8, 0x210268, indexUMK3Sprites_DS_SubZeroKuaiLiang, 0x00 }, }; -const sGame_PaletteDataset UMK3_DS_SUBZERO_PALETTES_P2[] = +const sGame_PaletteDataset UMK3_DS_SUBZERO_HUMAN_PALETTES_P2[] = { - { L"Sub-Zero (Original) P2", 0x21026A, 0x2102EA, indexUMK3Sprites_Scorpion, 0x00 }, + { L"Sub-Zero (Human) P2", 0x21026A, 0x2102EA, indexUMK3Sprites_DS_SubZeroKuaiLiang, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_SHEEVA_PALETTES_P1[] = { - { L"Sheeva P1", 0x210E5A, 0x210EDA, indexUMK3Sprites_Sheeva, 0x00 }, + { L"Sheeva P1", 0x210E5A, 0x210EDA, indexUMK3Sprites_DS_Sheeva, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_SHEEVA_PALETTES_P2[] = { - { L"Sheeva P2", 0x210EDC, 0x210F5C, indexUMK3Sprites_Sheeva, 0x00 }, + { L"Sheeva P2", 0x210EDC, 0x210F5C, indexUMK3Sprites_DS_Sheeva, 0x00 }, }; #ifdef NOTFOUND const sGame_PaletteDataset UMK3_DS_MOTARO_PALETTES[] = { - { L"Motaro", 0x3FCCAE, 0x3FCCCE, indexUMK3Sprites_Motaro, 0x00 }, + { L"Motaro", 0x3FCCAE, 0x3FCCCE, indexUMK3Sprites_DS_Motaro, 0x00 }, }; const sGame_PaletteDataset UMK3_DS_SHAOKAHN_PALETTES[] = { - { L"Shao Khan", 0x3FC279, 0x3FC299, indexUMK3Sprites_ShaoKahn, 0x00 }, + { L"Shao Khan", 0x3FC279, 0x3FC299, indexUMK3Sprites_DS_ShaoKahn, 0x00 }, }; #endif diff --git a/palmod/ImgDat.cpp b/palmod/ImgDat.cpp index b1a3fe5c..7d028f2b 100644 --- a/palmod/ImgDat.cpp +++ b/palmod/ImgDat.cpp @@ -297,9 +297,9 @@ void CImgDat::SanityCheckImgDat(ULONGLONG nFileSize, UINT32 nCurrentDatestamp, U // not super critical for daily updates, but still useful const UINT16 nExpectedYear = 2022; const UINT8 nExpectedMonth = 3; - const UINT8 nExpectedDay = 11; + const UINT8 nExpectedDay = 16; const UINT8 nExpectedRevision = 0; - const ULONGLONG nExpectedFileSize = 158092332; + const ULONGLONG nExpectedFileSize = 158742023; const UINT32 nExpectedDatestamp = (nExpectedYear << 16) | (nExpectedMonth << 8) | (nExpectedDay);