From 3682c082eacab071c773d7ba47d07d597634839b Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Wed, 20 Sep 2023 18:27:43 -0700 Subject: [PATCH] fix some struct notes --- TODO.md | 1 + src/CommandFormats.hh | 4 ++-- src/Episode3/DataIndexes.hh | 9 ++++----- src/Episode3/Server.cc | 2 +- system/ep3/maps-free/m000507p_e.bind | Bin 23064 -> 23064 bytes 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/TODO.md b/TODO.md index f2303d8c..6cb0aca9 100644 --- a/TODO.md +++ b/TODO.md @@ -22,6 +22,7 @@ - Send 6xB4x4C, etc. commands when joining a spectator team - maybe this makes it load faster? - Figure out why spectators crash during replays sometimes - Spectator teams sometimes stop receiving commands during live battles? + - It may be possible to send spectators back to the waiting room after a non-tournament battle by sending 6xB4x05 with environment 0x19, then 6xB4x3B again; try this ## PSOBB diff --git a/src/CommandFormats.hh b/src/CommandFormats.hh index b688f76f..8115bfbc 100644 --- a/src/CommandFormats.hh +++ b/src/CommandFormats.hh @@ -6224,8 +6224,8 @@ struct G_Unknown_GC_Ep3_6xB3x3A_CAx3A { // battle. A 6xB4x05 and 6xB6x41 command shouldhave been sent before this, to // set the map state that should appear for the new spectator. -struct G_LoadCurrentEnvironment_GC_Ep3_6xB4x05 { - G_CardBattleCommandHeader header = {0xB4, sizeof(G_LoadCurrentEnvironment_GC_Ep3_6xB4x05) / 4, 0, 0x3B, 0, 0, 0}; +struct G_LoadCurrentEnvironment_GC_Ep3_6xB4x3B { + G_CardBattleCommandHeader header = {0xB4, sizeof(G_LoadCurrentEnvironment_GC_Ep3_6xB4x3B) / 4, 0, 0x3B, 0, 0, 0}; parray unused; } __packed__; diff --git a/src/Episode3/DataIndexes.hh b/src/Episode3/DataIndexes.hh index 4a99bc6e..385b9107 100644 --- a/src/Episode3/DataIndexes.hh +++ b/src/Episode3/DataIndexes.hh @@ -995,7 +995,7 @@ struct MapDefinition { // .mnmd format; also the format of (decompressed) quests // camera zones are evaluated continuously during the battle, and the camera // will move to focus on the part of the field where the SCs/FCs are. (Or, // more accurately, where the corresponding entry in camera_zone_specs says - // to focus.) camera_zone_maps is indexed as [team_id][camera_zone_num][x][y]; + // to focus.) camera_zone_maps is indexed as [team_id][camera_zone_num][y][x]; // camera_zone_specs is indexed as [team_id][camera_zone_num]. Unused entries // (beyond num_camera_zones) in both arrays should be filled with FF bytes. /* 0118 */ parray, 0x10>, 10>, 2> camera_zone_maps; @@ -1099,9 +1099,8 @@ struct MapDefinition { // .mnmd format; also the format of (decompressed) quests // this map. Unused entries should be set to FFFF. /* 59B0 */ parray reward_card_ids; - // These fields appear to be used for the purpose of determining which cards - // to drop after the battle is complete. If either is negative, the player's - // actual CLv is used instead. + // These fields are used when determining which cards to drop after the battle + // is complete. If either is negative, the player's CLv is used instead. /* 59D0 */ be_int32_t win_level_override; /* 59D4 */ be_int32_t loss_level_override; @@ -1114,7 +1113,7 @@ struct MapDefinition { // .mnmd format; also the format of (decompressed) quests // map_category specifies where the map should appear in the maps menu. If // this is 0, 1, or 2, the map appears in the Quest section; otherwise, it // appears in the Free Battle section instead. It's not known if this controls - // anything else. + // anything else, or what the difference is in behavior between 0, 1, and 2. /* 59DC */ uint8_t map_category; // This field determines block graphics to be used in the Cyber environment. diff --git a/src/Episode3/Server.cc b/src/Episode3/Server.cc index 85370d23..55871d4a 100644 --- a/src/Episode3/Server.cc +++ b/src/Episode3/Server.cc @@ -295,7 +295,7 @@ void Server::send_commands_for_joining_spectator(Channel& c, bool is_trial) cons c.send(0xC9, 0x00, this->prepare_6xB4x1C_names_update()); c.send(0xC9, 0x00, this->prepare_6xB4x50_trap_tile_locations()); { - G_LoadCurrentEnvironment_GC_Ep3_6xB4x05 cmd_3B; + G_LoadCurrentEnvironment_GC_Ep3_6xB4x3B cmd_3B; c.send(0xC9, 0x00, &cmd_3B, sizeof(cmd_3B)); } } diff --git a/system/ep3/maps-free/m000507p_e.bind b/system/ep3/maps-free/m000507p_e.bind index 57536d3d87eb7ee99bc62c984ac39f3278c4ec87..5ca59cc9245d5d34c44f094d618da4f45231d95c 100755 GIT binary patch delta 26 icmbQSg>l9f#tpvGlUb#^H{XzEv}1n6z&}}$!v+9{E(pQ^ delta 29 lcmbQSg>l9f#tpvGlc!2MPm=c7d_$Vij`=qO|71lD8vv_43K#$Y