Merge origin/CTR-Netplay into integrate/game-codegen-hooks-into-rollback

Keep both psx_bss.h (BSS rings) and nd_intro_ot.h from CTR-Netplay.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Alex Vanderveen
2026-08-08 22:53:34 -04:00
10 changed files with 922 additions and 34 deletions
+6
View File
@@ -8954,6 +8954,12 @@ int main(int argc, char** argv) {
game_id = gc.id;
game_region = gc.region;
game_players = gc.players;
/* CTR ND intro: an older workaround (PSX_ND_SIB_FLAP_LAST=1) skipped
* wide additive 0x36 in OT ranks 1600..2099 to unmask sibling flaps.
* After the AVSZ3 MAC0 fix (unshifted product → correct MAC0>>17 OT
* indices), flaps/rain sort without that skip — and FLAP_LAST=1
* shreds the crate glow fountain. Default is off; opt in via env
* (dma.c) only for experiments. */
apply_offline_pad_count(game_players, multitap_enabled);
game_has_disc_crc = gc.has_disc_crc;
game_disc_crc = gc.disc_crc;