From e9b6b681bde6023298968b07f0a4e8d4a659e176 Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Sun, 1 Oct 2023 15:51:53 -0700 Subject: [PATCH] fix Ep3 spectator test --- src/Episode3/DataIndexes.hh | 6 +++++ tests/GC-Episode3BattleWithSpectator.test.txt | 24 +++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/Episode3/DataIndexes.hh b/src/Episode3/DataIndexes.hh index 87060e82..84824832 100644 --- a/src/Episode3/DataIndexes.hh +++ b/src/Episode3/DataIndexes.hh @@ -1109,6 +1109,12 @@ struct MapDefinition { // .mnmd format; also the format of (decompressed) quests // battle start time) // 50 = blocked by metal box (appears as improperly-z-buffered teal cube in // preview; behaves like 10 and 20 in game) + // The assist cards that each trap type can contain are: + // 40: Dice Fever, Heavy Fog, Muscular, Immortality, Snail Pace + // 41: Gold Rush, Charity, Requiem + // 42: Powerless Rain, Trash 1, Empty Hand, Skip Draw + // 43: Brave Wind, Homesick, Fly + // 44: Dice+1, Battle Royale, Reverse Card, Giant Garden, Fix /* 1C68 */ parray, 0x10> modification_tiles; /* 1D68 */ parray unknown_a5; diff --git a/tests/GC-Episode3BattleWithSpectator.test.txt b/tests/GC-Episode3BattleWithSpectator.test.txt index e6d10604..261025c7 100644 --- a/tests/GC-Episode3BattleWithSpectator.test.txt +++ b/tests/GC-Episode3BattleWithSpectator.test.txt @@ -9763,52 +9763,52 @@ I 17097 2023-09-19 21:54:07 - [Commands] Sending to C-4 (Tali) (version=GC comma 1140 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 1150 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 1160 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | -1170 | 00 00 00 00 04 00 01 00 00 00 04 00 EF EF 51 12 | Q +1170 | 00 00 00 00 04 00 01 00 00 00 04 00 94 F3 96 0C | 1180 | 03 01 00 00 00 00 01 00 11 11 11 11 54 61 6C 69 | Tali 1190 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 11A0 | 00 00 00 00 00 00 00 00 00 00 00 00 01 00 03 00 | 11B0 | FF FF FF FF 6E F5 DF FF 00 00 00 00 00 00 00 00 | n 11C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 11D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | -11E0 | 00 00 00 00 00 00 00 00 FF FF FF FF 00 00 00 00 | +11E0 | 00 00 00 00 00 00 00 00 FF FF FF FF FF FF FF FF | 11F0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 1200 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 1210 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | -1220 | FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 | +1220 | FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 | 1230 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 1240 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | -1250 | 00 00 00 00 00 00 00 00 FF FF FF FF 00 00 00 00 | +1250 | 00 00 00 00 00 00 00 00 FF FF FF FF FF FF FF FF | 1260 | 00 00 00 00 00 00 01 00 22 22 22 22 54 61 6C 69 | """"Tali 1270 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 1280 | 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 | 1290 | FF FF FF FF 6E F5 DF FF 00 00 00 00 00 00 00 00 | n 12A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 12B0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | -12C0 | 00 00 00 00 00 00 00 00 FF FF FF FF 00 00 00 00 | +12C0 | 00 00 00 00 00 00 00 00 FF FF FF FF FF FF FF FF | 12D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 12E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 12F0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | -1300 | FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 | +1300 | FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 | 1310 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 1320 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | -1330 | 00 00 00 00 00 00 00 00 FF FF FF FF 00 00 00 00 | +1330 | 00 00 00 00 00 00 00 00 FF FF FF FF FF FF FF FF | 1340 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 1350 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 1360 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | -1370 | FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 | +1370 | FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 | 1380 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 1390 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | -13A0 | 00 00 00 00 00 00 00 00 FF FF FF FF 00 00 00 00 | +13A0 | 00 00 00 00 00 00 00 00 FF FF FF FF FF FF FF FF | 13B0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 13C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 13D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | -13E0 | FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 | +13E0 | FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 | 13F0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 1400 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | -1410 | 00 00 00 00 00 00 00 00 FF FF FF FF 00 00 00 00 | +1410 | 00 00 00 00 00 00 00 00 FF FF FF FF FF FF FF FF | 1420 | 00 00 00 00 09 4A 35 36 37 38 00 00 00 00 00 00 | J5678 1430 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | -1440 | 00 00 00 00 00 00 01 00 22 22 22 22 7F 00 00 01 | +1440 | 00 00 00 00 00 00 01 00 22 22 22 22 7F 00 00 01 | """" 1450 | 04 00 00 00 54 61 6C 69 00 00 00 00 00 00 00 00 | Tali 1460 | 00 00 00 00 05 00 00 00 01 00 00 00 08 00 00 00 | 1470 | 00 06 00 00 00 00 00 00 00 00 00 00 00 00 81 00 |