From 177a596f33064f78d17807cf8a29cb203a40b975 Mon Sep 17 00:00:00 2001 From: sora10pls <17801814+sora10pls@users.noreply.github.com> Date: Tue, 19 Dec 2023 10:50:47 -0500 Subject: [PATCH] Update some enums per sudachi2 --- .../Schemas/Entity/PokemonTriggerID.fbs | 30 ++--- .../Schemas/Entity/PokemonUniquePathData.fbs | 100 ++++++++++++++ .../Schemas/PokeData/PokeDataSymbol.fbs | 2 + .../Schemas/PokeData/PokeDataTrade.fbs | 2 + .../Schemas/Shared/GemType.fbs | 1 + .../Schemas/Shared/ItemID.fbs | 126 ++++++++++++++++++ .../Schemas/Shared/MahoippuViewID.fbs | 11 ++ .../Schemas/Shared/PayType.fbs | 1 + .../Schemas/Shared/RibbonType.fbs | 1 + .../Schemas/Shared/ShopKind.fbs | 3 + .../Schemas/Talk/CheckCategory.fbs | 11 ++ .../Schemas/Dressup/DressupItemDataArray.fbs | 2 + .../Schemas/Dressup/DressupShopDataArray.fbs | 8 ++ .../Schemas/Shop/ShopWazamachineDataArray.fbs | 9 ++ pkNX.WinForms/Dumping/GameDumperSV.cs | 12 ++ 15 files changed, 304 insertions(+), 15 deletions(-) create mode 100644 pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/MahoippuViewID.fbs diff --git a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Entity/PokemonTriggerID.fbs b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Entity/PokemonTriggerID.fbs index 2146e1d4..401905ff 100644 --- a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Entity/PokemonTriggerID.fbs +++ b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Entity/PokemonTriggerID.fbs @@ -11,14 +11,14 @@ enum PokemonTriggerID : int { DUMMY_7 = 7, DUMMY_8 = 8, DUMMY_9 = 9, - DUMMY_10 = 10, - DUMMY_11 = 11, - DUMMY_12 = 12, - DUMMY_13 = 13, - DUMMY_14 = 14, - DUMMY_15 = 15, - DUMMY_16 = 16, - DUMMY_17 = 17, + PATCH_0_EQUAL_EATING_EMOTION = 10, + PATCH_0_NOT_EATING_EMOTION = 11, + PATCH_0_EQUAL_RESTING_EMOTION = 12, + PATCH_0_NOT_RESTING_EMOTION = 13, + PATCH_0_EQUAL_SLEEPING_EMOTION = 14, + PATCH_0_NOT_SLEEPING_EMOTION = 15, + PATCH_0_EQUAL_EATING2_EMOTION = 16, + PATCH_0_NOT_EATING2_EMOTION = 17, DUMMY_18 = 18, DUMMY_19 = 19, DUMMY_20 = 20, @@ -305,12 +305,12 @@ enum PokemonTriggerID : int { DUMMY_301 = 301, DUMMY_302 = 302, DUMMY_303 = 303, - DUMMY_304 = 304, - DUMMY_305 = 305, - DUMMY_306 = 306, - DUMMY_307 = 307, - DUMMY_308 = 308, - DUMMY_309 = 309, + GREATER_THAN_TIMER_20f = 304, + GREATER_THAN_TIMER_38f = 305, + GREATER_THAN_TIMER_50f = 306, + GREATER_THAN_TIMER_56f = 307, + GREATER_THAN_TIMER_80f = 308, + GREATER_THAN_TIMER_100f = 309, GREATER_TIMER_100 = 310, GREATER_TIMER_10 = 311, GREATER_TIMER_20 = 312, @@ -422,7 +422,7 @@ enum PokemonTriggerID : int { DUMMY_418 = 418, DUMMY_419 = 419, CONDITION_PLAYER_STATE_STAND_BY = 420, - DUMMY_421 = 421, + PATCH_0_CONDITION_PLAYER_SQUAT = 421, DUMMY_422 = 422, DUMMY_423 = 423, DUMMY_424 = 424, diff --git a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Entity/PokemonUniquePathData.fbs b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Entity/PokemonUniquePathData.fbs index 8cf7ae10..dfa266bc 100644 --- a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Entity/PokemonUniquePathData.fbs +++ b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Entity/PokemonUniquePathData.fbs @@ -1002,4 +1002,104 @@ table PokemonUniquePathData (fs_serializer) { Path997:string (required); Path998:string (required); Path999:string (required); + Path1000:string; + Path1001:string; + Path1002:string; + Path1003:string; + Path1004:string; + Path1005:string; + Path1006:string; + Path1007:string; + Path1008:string; + Path1009:string; + Path1010:string; + Path1011:string; + Path1012:string; + Path1013:string; + Path1014:string; + Path1015:string; + Path1016:string; + Path1017:string; + Path1018:string; + Path1019:string; + Path1020:string; + Path1021:string; + Path1022:string; + Path1023:string; + Path1024:string; + Path1025:string; + Path1026:string; + Path1027:string; + Path1028:string; + Path1029:string; + Path1030:string; + Path1031:string; + Path1032:string; + Path1033:string; + Path1034:string; + Path1035:string; + Path1036:string; + Path1037:string; + Path1038:string; + Path1039:string; + Path1040:string; + Path1041:string; + Path1042:string; + Path1043:string; + Path1044:string; + Path1045:string; + Path1046:string; + Path1047:string; + Path1048:string; + Path1049:string; + Path1050:string; + Path1051:string; + Path1052:string; + Path1053:string; + Path1054:string; + Path1055:string; + Path1056:string; + Path1057:string; + Path1058:string; + Path1059:string; + Path1060:string; + Path1061:string; + Path1062:string; + Path1063:string; + Path1064:string; + Path1065:string; + Path1066:string; + Path1067:string; + Path1068:string; + Path1069:string; + Path1070:string; + Path1071:string; + Path1072:string; + Path1073:string; + Path1074:string; + Path1075:string; + Path1076:string; + Path1077:string; + Path1078:string; + Path1079:string; + Path1080:string; + Path1081:string; + Path1082:string; + Path1083:string; + Path1084:string; + Path1085:string; + Path1086:string; + Path1087:string; + Path1088:string; + Path1089:string; + Path1090:string; + Path1091:string; + Path1092:string; + Path1093:string; + Path1094:string; + Path1095:string; + Path1096:string; + Path1097:string; + Path1098:string; + Path1099:string; } diff --git a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/PokeData/PokeDataSymbol.fbs b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/PokeData/PokeDataSymbol.fbs index 889e83d2..d85b1462 100644 --- a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/PokeData/PokeDataSymbol.fbs +++ b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/PokeData/PokeDataSymbol.fbs @@ -5,6 +5,7 @@ include "../Shared/TalentType.fbs"; include "../Shared/TokuseiType.fbs"; include "../Shared/SizeType.fbs"; include "../Shared/GemType.fbs"; +include "../Shared/MahoippuViewID.fbs"; include "../PokeData/WazaSet.fbs"; include "../Entity/ParamSet.fbs"; @@ -30,4 +31,5 @@ table PokeDataSymbol { ScaleType:SizeType; ScaleValue:short; GemType:GemType; + MahoippuViewId:MahoippuViewID; } diff --git a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/PokeData/PokeDataTrade.fbs b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/PokeData/PokeDataTrade.fbs index 9f4aacf8..cb0cebba 100644 --- a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/PokeData/PokeDataTrade.fbs +++ b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/PokeData/PokeDataTrade.fbs @@ -8,6 +8,7 @@ include "../Shared/TalentType.fbs"; include "../Shared/RareType.fbs"; include "../Shared/SizeType.fbs"; include "../Shared/BallType.fbs"; +include "../Shared/RibbonType.fbs"; include "../Entity/ParamSet.fbs"; include "../PokeData/WazaSet.fbs"; @@ -45,4 +46,5 @@ table PokeDataTrade { ParentNameLabel:ulong; TrainerId:long; ParentSex:SexType; + SetRibbon:RibbonType; } diff --git a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/GemType.fbs b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/GemType.fbs index 80f6f9e6..f1f25d36 100644 --- a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/GemType.fbs +++ b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/GemType.fbs @@ -21,4 +21,5 @@ enum GemType : int { DRAGON = 17, AKU = 18, FAIRY = 19, + NIJI = 101, } diff --git a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/ItemID.fbs b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/ItemID.fbs index 8aac212d..b2d3ed9e 100644 --- a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/ItemID.fbs +++ b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/ItemID.fbs @@ -141,6 +141,7 @@ enum ItemID : int { ITEMID_OUZYANOSIRUSI = 221, ITEMID_GINNOKONA = 222, ITEMID_OMAMORIKOBAN = 223, + ITEMID_KOKORONOSIZUKU = 225, ITEMID_KEMURIDAMA = 228, ITEMID_KAWARAZUNOISI = 229, ITEMID_KIAINOHATIMAKI = 230, @@ -148,6 +149,7 @@ enum ItemID : int { ITEMID_PINTORENZU = 232, ITEMID_METARUKOOTO = 233, ITEMID_TABENOKOSI = 234, + ITEMID_RYUUNOUROKO = 235, ITEMID_DENKIDAMA = 236, ITEMID_YAWARAKAISUNA = 237, ITEMID_KATAIISI = 238, @@ -164,6 +166,7 @@ enum ItemID : int { ITEMID_MOKUTAN = 249, ITEMID_RYUUNOKIBA = 250, ITEMID_SIRUKUNOSUKAAHU = 251, + ITEMID_APPUGUREEDO = 252, ITEMID_KAIGARANOSUZU = 253, ITEMID_KOUKAKURENZU = 265, ITEMID_TIKARANOHATIMAKI = 266, @@ -213,6 +216,10 @@ enum ItemID : int { ITEMID_RYUUNOPUREETO = 311, ITEMID_KOWAMOTEPUREETO = 312, ITEMID_KOUTETUPUREETO = 313, + ITEMID_PUROTEKUTAA = 321, + ITEMID_EREKIBUUSUTAA = 322, + ITEMID_MAGUMABUUSUTAA = 323, + ITEMID_AYASIIPATTI = 324, ITEMID_REIKAINONUNO = 325, ITEMID_SURUDOITUME = 326, ITEMID_SURUDOIKIBA = 327, @@ -344,6 +351,8 @@ enum ItemID : int { ITEMID_WAZAMASIN93 = 618, ITEMID_WAZAMASIN94 = 619, ITEMID_WAZAMASIN95 = 620, + ITEMID_IDENSINOKUSABI = 628, + ITEMID_IDENSINOKUSABI_1 = 629, ITEMID_HIKARUOMAMORI = 632, ITEMID_UTUSIKAGAMI = 638, ITEMID_ZYAKUTENHOKEN = 639, @@ -377,8 +386,19 @@ enum ItemID : int { ITEMID_SAIKOSIIDO = 882, ITEMID_MISUTOSIIDO = 883, ITEMID_GURASUSIIDO = 884, + ITEMID_SORUPURASU = 943, + ITEMID_RUNAPURASU = 944, + ITEMID_SORUPURASU_1 = 945, + ITEMID_RUNAPURASU_1 = 946, ITEMID_KUTITATURUGI = 1103, ITEMID_KUTITATATE = 1104, + ITEMID_ITIGONOAMEZAIKU = 1109, + ITEMID_HAATONOHAMEZAIKU = 1110, + ITEMID_BERIIAMEZAIKU = 1111, + ITEMID_YOTUBAAMEZAIKU = 1112, + ITEMID_OHANAAMEZAIKU = 1113, + ITEMID_SUTAAAMEZAIKU = 1114, + ITEMID_RIBONAMEZAIKU = 1115, ITEMID_AMAAIRINGO = 1116, ITEMID_SUPPAIRINGO = 1117, ITEMID_NODOAME = 1118, @@ -417,8 +437,10 @@ enum ItemID : int { ITEMID_KAKETAPOTTO = 1254, ITEMID_HOKAKUOMAMORI = 1267, ITEMID_ROTOMUNOKATAROGU = 1278, + ITEMID_GARANATUNOEDA = 1581, ITEMID_GARANATUBURESU = 1582, ITEMID_KEIKENOMAMORI = 1587, + ITEMID_AKASINOOMAMORI = 1589, ITEMID_KIDUNANODADUNA = 1590, ITEMID_KIDUNANODADUNA_KAIZYO = 1591, ITEMID_GARANATURIISU = 1592, @@ -805,6 +827,34 @@ enum ItemID : int { ITEMID_WAZAMASIN199 = 2259, ITEMID_WAZAMASIN200 = 2260, ITEMID_WAZAMASIN201 = 2261, + ITEMID_WAZAMASIN202 = 2262, + ITEMID_WAZAMASIN203 = 2263, + ITEMID_WAZAMASIN204 = 2264, + ITEMID_WAZAMASIN205 = 2265, + ITEMID_WAZAMASIN206 = 2266, + ITEMID_WAZAMASIN207 = 2267, + ITEMID_WAZAMASIN208 = 2268, + ITEMID_WAZAMASIN209 = 2269, + ITEMID_WAZAMASIN210 = 2270, + ITEMID_WAZAMASIN211 = 2271, + ITEMID_WAZAMASIN212 = 2272, + ITEMID_WAZAMASIN213 = 2273, + ITEMID_WAZAMASIN214 = 2274, + ITEMID_WAZAMASIN215 = 2275, + ITEMID_WAZAMASIN216 = 2276, + ITEMID_WAZAMASIN217 = 2277, + ITEMID_WAZAMASIN218 = 2278, + ITEMID_WAZAMASIN219 = 2279, + ITEMID_WAZAMASIN220 = 2280, + ITEMID_WAZAMASIN221 = 2281, + ITEMID_WAZAMASIN222 = 2282, + ITEMID_WAZAMASIN223 = 2283, + ITEMID_WAZAMASIN224 = 2284, + ITEMID_WAZAMASIN225 = 2285, + ITEMID_WAZAMASIN226 = 2286, + ITEMID_WAZAMASIN227 = 2287, + ITEMID_WAZAMASIN228 = 2288, + ITEMID_WAZAMASIN229 = 2289, ITEMID_PIKUNIKKUSETTO = 2311, ITEMID_SUITOU1 = 2313, ITEMID_SUITOU2 = 2314, @@ -966,4 +1016,80 @@ enum ItemID : int { ITEMID_KIBIDANGO9 = 2479, ITEMID_ZIDORIBOU = 2480, ITEMID_TERAOMAMORI = 2481, + ITEMID_HUKUGOUKINZOKU = 2482, + ITEMID_OSYAREKAADO2 = 2483, + ITEMID_SOZAI281 = 2484, + ITEMID_SOZAI282 = 2485, + ITEMID_SOZAI283 = 2486, + ITEMID_SOZAI284 = 2487, + ITEMID_SOZAI285 = 2488, + ITEMID_SOZAI286 = 2489, + ITEMID_SOZAI287 = 2490, + ITEMID_SOZAI288 = 2491, + ITEMID_SOZAI289 = 2492, + ITEMID_SOZAI290 = 2493, + ITEMID_SOZAI291 = 2494, + ITEMID_SOZAI292 = 2495, + ITEMID_SOZAI293 = 2496, + ITEMID_SOZAI294 = 2497, + ITEMID_SOZAI295 = 2498, + ITEMID_SOZAI296 = 2499, + ITEMID_SOZAI297 = 2500, + ITEMID_SOZAI298 = 2501, + ITEMID_SOZAI299 = 2502, + ITEMID_SOZAI300 = 2503, + ITEMID_SOZAI301 = 2504, + ITEMID_SOZAI302 = 2505, + ITEMID_SOZAI303 = 2506, + ITEMID_SOZAI304 = 2507, + ITEMID_SOZAI305 = 2508, + ITEMID_SOZAI306 = 2509, + ITEMID_SOZAI307 = 2510, + ITEMID_SOZAI308 = 2511, + ITEMID_SOZAI309 = 2512, + ITEMID_SOZAI310 = 2513, + ITEMID_SOZAI311 = 2514, + ITEMID_SOZAI312 = 2515, + ITEMID_SOZAI313 = 2516, + ITEMID_SOZAI314 = 2517, + ITEMID_SOZAI315 = 2518, + ITEMID_SOZAI316 = 2519, + ITEMID_SOZAI317 = 2520, + ITEMID_SOZAI318 = 2521, + ITEMID_DENSETSUKII1 = 2522, + ITEMID_DENSETSUKII2 = 2523, + ITEMID_DENSETSUKII3 = 2524, + ITEMID_DENSETSUKII4 = 2525, + ITEMID_DENSETSUKII5 = 2526, + ITEMID_DENSETSUKII6 = 2527, + ITEMID_DENSETSUKII7 = 2528, + ITEMID_DENSETSUKII8 = 2529, + ITEMID_DENSETSUKII9 = 2530, + ITEMID_DENSETSUKII10 = 2531, + ITEMID_DENSETSUKII11 = 2532, + ITEMID_DENSETSUKII12 = 2533, + ITEMID_DENSETSUKII13 = 2534, + ITEMID_DENSETSUKII14 = 2535, + ITEMID_DENSETSUKII15 = 2536, + ITEMID_DENSETSUKII16 = 2537, + ITEMID_DENSETSUKII17 = 2538, + ITEMID_DENSETSUKII18 = 2539, + ITEMID_DENSETSUKII19 = 2540, + ITEMID_DENSETSUKII20 = 2541, + ITEMID_DENSETSUKII21 = 2542, + ITEMID_DENSETSUKII22 = 2543, + ITEMID_DENSETSUKII23 = 2544, + ITEMID_DENSETSUKII24 = 2545, + ITEMID_DENSETSUKII25 = 2546, + ITEMID_TAAKOIZUDISUKU = 2547, + ITEMID_RANCHIPIKKU20 = 2548, + ITEMID_CHENJAA19 = 2549, + ITEMID_GOKUZYOUMOMON = 2550, + ITEMID_TEEBURUKABAA21 = 2551, + ITEMID_ISU22 = 2552, + ITEMID_SINKUROMASHINN = 2553, + ITEMID_INSEKI_4 = 2554, + ITEMID_GENSYO2A = 2555, + ITEMID_GENSYO2B = 2556, + ITEMID_ZERONOHIHOU = 2557, } diff --git a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/MahoippuViewID.fbs b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/MahoippuViewID.fbs new file mode 100644 index 00000000..667a42c0 --- /dev/null +++ b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/MahoippuViewID.fbs @@ -0,0 +1,11 @@ +namespace pkNX.Structures.FlatBuffers.SV; + +enum MahoippuViewID : int { + STRAWBERRY = 0, + BERRY = 1, + HEART = 2, + STAR = 3, + CLOVER = 4, + FLOWER = 5, + RIBBON = 6, +} diff --git a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/PayType.fbs b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/PayType.fbs index 52ba03ef..d0bfbf82 100644 --- a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/PayType.fbs +++ b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/PayType.fbs @@ -3,4 +3,5 @@ namespace pkNX.Structures.FlatBuffers.SV; enum PayType : int { OKOZUKAI = 0, LP = 1, + BP = 2, } diff --git a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/RibbonType.fbs b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/RibbonType.fbs index 80994a3c..f2ba730f 100644 --- a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/RibbonType.fbs +++ b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/RibbonType.fbs @@ -112,4 +112,5 @@ enum RibbonType : int TITAN_OYABUN = 108, TITAN_STRONGEST = 109, TITAN_NUSHI = 110, + SUDACHI_PARTNER = 111, } diff --git a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/ShopKind.fbs b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/ShopKind.fbs index e5bd8e55..73ae8817 100644 --- a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/ShopKind.fbs +++ b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Shared/Schemas/Shared/ShopKind.fbs @@ -16,4 +16,7 @@ enum ShopKind : int { SUPERMARKET = 12, KOUBAI = 13, PICNIC = 14, + SYOUTEN = 15, + BBKOUBAI = 16, + BBZIHANKI = 17, } diff --git a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Trainers/Schemas/Talk/CheckCategory.fbs b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Trainers/Schemas/Talk/CheckCategory.fbs index 9c4b4448..6a8c5de4 100644 --- a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Trainers/Schemas/Talk/CheckCategory.fbs +++ b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.Trainers/Schemas/Talk/CheckCategory.fbs @@ -23,4 +23,15 @@ enum CheckCategory : int { turnEndAndTurnCount = 19, WazaDisadvantageCheck = 20, WazaAdvantageAttackCheck = 21, + PokemonNoCheck = 22, + ChengeGemActAfter = 23, + TurnEndAndWazaCriticalCheck = 24, + HpCheckWithEnemyPokemonNo = 25, + GemEnabled = 26, + WazaCriticalAttackCheck = 27, + WazaAdvantageAttackCheck2 = 28, + WazaSickDokuCheck = 29, + FirstDamage2 = 30, + PokemonBelowNumCheck = 31, + PokemonNoCheck2 = 32, } diff --git a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.UI/Schemas/Dressup/DressupItemDataArray.fbs b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.UI/Schemas/Dressup/DressupItemDataArray.fbs index ed189317..7bd2c660 100644 --- a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.UI/Schemas/Dressup/DressupItemDataArray.fbs +++ b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.UI/Schemas/Dressup/DressupItemDataArray.fbs @@ -18,6 +18,8 @@ enum DressupBlandType : int { Ruggle = 12, Ortiga = 13, ROTOM = 14, + WONDERWEAR = 15, + KABUREYA = 16, } enum DressupItemType : int { diff --git a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.UI/Schemas/Dressup/DressupShopDataArray.fbs b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.UI/Schemas/Dressup/DressupShopDataArray.fbs index f8cfb9b0..f4442a45 100644 --- a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.UI/Schemas/Dressup/DressupShopDataArray.fbs +++ b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.UI/Schemas/Dressup/DressupShopDataArray.fbs @@ -1,8 +1,16 @@ namespace pkNX.Structures.FlatBuffers.SV; attribute "fs_serializer"; +enum DressupHairsalonUnlockType : int +{ + NONE = 0, + OSYARE_CARD1 = 1, + OSYARE_CARD2 = 2, +} + table DressupShopData { ShopId:string (required); + UnlockType:DressupHairsalonUnlockType; DressupItemid1:int; DressupItemid2:int; DressupItemid3:int; diff --git a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.UI/Schemas/Shop/ShopWazamachineDataArray.fbs b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.UI/Schemas/Shop/ShopWazamachineDataArray.fbs index f7e55c3b..31912484 100644 --- a/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.UI/Schemas/Shop/ShopWazamachineDataArray.fbs +++ b/pkNX.Structures.FlatBuffers.SV/pkNX.Structures.FlatBuffers.SV.UI/Schemas/Shop/ShopWazamachineDataArray.fbs @@ -4,6 +4,14 @@ include "Shared/CondEnum.fbs"; namespace pkNX.Structures.FlatBuffers.SV; attribute "fs_serializer"; +enum AddRegion : int +{ + NONE = 0, + TITAN = 1, + SUDACHI1 = 2, + SUDACHI2 = 3, +} + table ShopWazamachineData { WazaNo:int; WazaItemID:ItemID = ITEMID_NONE; @@ -19,6 +27,7 @@ table ShopWazamachineData { Item03:ItemID = ITEMID_NONE; ItemNum03:int; DevNo03:int; + AddRegion:AddRegion; } table ShopWazamachineDataArray (fs_serializer) { diff --git a/pkNX.WinForms/Dumping/GameDumperSV.cs b/pkNX.WinForms/Dumping/GameDumperSV.cs index 3471f123..4239f342 100644 --- a/pkNX.WinForms/Dumping/GameDumperSV.cs +++ b/pkNX.WinForms/Dumping/GameDumperSV.cs @@ -1047,6 +1047,7 @@ public void DumpSpecific() "world/data/ui/item_machine/effect_table/effect_table_array.bfbs", "world/data/ui/item_machine/base_param/base_param_array.bfbs", + // Delivery Outbreak "world/data/encount/delivery_outbreak/delivery_outbreak_pokedata/delivery_outbreak_pokedata_array.bfbs", "world/data/encount/delivery_outbreak/delivery_outbreak_zone_main/delivery_outbreak_zone_main_array.bfbs", "world/data/encount/delivery_outbreak/delivery_outbreak_zone_su1/delivery_outbreak_zone_su1_array.bfbs", @@ -1156,6 +1157,11 @@ public void DumpSpecific() "world/data/ui/pokedex/memo_poke_data_dlc1/memo_poke_data_dlc1_array.bfbs", "world/data/ui/pokedex/reward_data_dlc1/reward_data_dlc1_array.bfbs", + "world/data/ui/pokedex/blacklist_dlc2/blacklist_dlc2_array.bfbs", + "world/data/ui/pokedex/distribution_data_dlc2/distribution_data_dlc2_array.bfbs", + "world/data/ui/pokedex/memo_poke_data_dlc2/memo_poke_data_dlc2_array.bfbs", + "world/data/ui/pokedex/reward_data_dlc2/reward_data_dlc2_array.bfbs", + // UI "world/data/ui/shop/shop_data/shop_data_array.bfbs", "world/data/ui/status/ribbon/ribbon_array.bfbs", @@ -1208,6 +1214,12 @@ public void DumpSpecific() "world/data/raid/su1_raid_enemy_04/su1_raid_enemy_04_array.bfbs", "world/data/raid/su1_raid_enemy_05/su1_raid_enemy_05_array.bfbs", "world/data/raid/su1_raid_enemy_06/su1_raid_enemy_06_array.bfbs", + "world/data/raid/su2_raid_enemy_01/su2_raid_enemy_01_array.bfbs", + "world/data/raid/su2_raid_enemy_02/su2_raid_enemy_02_array.bfbs", + "world/data/raid/su2_raid_enemy_03/su2_raid_enemy_03_array.bfbs", + "world/data/raid/su2_raid_enemy_04/su2_raid_enemy_04_array.bfbs", + "world/data/raid/su2_raid_enemy_05/su2_raid_enemy_05_array.bfbs", + "world/data/raid/su2_raid_enemy_06/su2_raid_enemy_06_array.bfbs", // Coin "world/data/field/coin_symbol/coin_symbol_manager/coin_symbol_manager_data.bfbs",