mirror of
https://github.com/RetroPortingToolKit/psxrecomp
synced 2026-10-28 10:59:16 -04:00
45e6bc9cab
Conflict resolutions: - recompiler/src/main_psx.cpp: keep both — canonicalize via psx_ram_canon_code_addr (rbengine 8MB mirror fold), then compare 29-bit physical addresses (master KUSEG dispatch fix, PR #155). - runtime/src/main.cpp: keep both — text-base pin for high-loading EXEs (rbengine) plus PSX_OVERLAY_REGION_FLOOR env override (master). - runtime/src/text_xlate.cpp: keep rbengine's build-flavour capture default (PSX_NO_DEBUG_TOOLS) which subsumes master's default-off fix. Verified: psxrecomp-game rebuilds; test_kuseg_dispatch_lookup.py passes. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01TdzpVVH912V9ktt4n4kntj