tmerritt/disasm
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Promote Donkey Kong (JU): Pass 3 complete, whole-ROM byte-identical

Browse Source 
Pass 3 named the 10 data regions in prg.s, then the project was promoted
out of _wip/ so `make` now proves header + PRG + CHR against the original
ROM instead of only the PRG bank.

Data regions named:
  LevelPtrTable        $C000-$C03B  (60 B)    level header data
  ObjectPtrTable       $C03C-$C043  (8 B)     4 pointer pairs
  LevelDataPtrTable    $C044-$C79D  (1882 B)  level data pointers
  SpriteInitPtrTable   labelled at $C4B0      see residue note
  UnreachedCode_D650   $D650-$D696  (71 B)    unreached code
  UnreachedCode_E144   $E144-$E165  (34 B)    unreached code
  MusicDataTable       $F55B-$FA47  (1261 B)  music/sound data
  APUDataTable         $FAE6-$FB74  (143 B)   APU pulse/noise tables
  SfxDataTable         $FE59-$FFEF  (407 B)   sound-effect data
  VectorTable          $FFF6-$FFFF  (10 B)    padding + NMI/RESET/IRQ

Promotion (per the AGENTS.md checklist):
  - git mv "_wip/Donkey Kong (JU)" "Donkey Kong (JU)"
  - add copilot/rom.nes -> ../Donkey Kong (JU).nes symlink
  - add header.s / chr.s (one-line .incbin of header.bin / chr.bin)
  - linker.cfg gains HEADER ($0000/16 B) and CHR ($0000/8 KB)
  - Makefile switched from `cmp reconstructed_prg.bin prg.bin` to
    `cmp reconstructed.nes rom.nes`
  - no _tools path change (this Makefile never referenced _tools/)
    and no `make regen` pipeline exists for it

Doc corrections:
  - project OVERVIEW.md said Mirroring Vertical; header byte 6 = $00
    means Horizontal (the root index was right) — fixed
  - root OVERVIEW.md: row 18 now BYTE-IDENTICAL, tier paragraph and
    summary table refreshed (they had drifted around the Lunar Pool and
    Urban Champion promotions), new per-project detail entry
  - counts corrected to 19 top-level / 17 _wip in OVERVIEW.md,
    TODO.md and AGENTS.md

Residue recorded rather than guessed:
  - Pass 2 is partial: 919 Label_ definitions remain (214 semantic
    labels applied); noted in TODO.md so nobody reads the promotion as
    full semantic naming
  - SpriteInitPtrTable's label sits at $C4B0: the routine at $C807 reads
    $C4A7,x/$C4A8,x, but that table starts mid-row and a label there
    would split the canonical 16-byte audit-comment line

Verification:
  make clean && make  -> "Byte-identical ROM verified."
  verify_pass1.py     -> 19/19 top-level build, Donkey Kong (JU) OK
                         (6014 instr / 12505 B), all comments canonical

Doc-drift sweep: build tiers, mirroring, and stale status tails

Reconciled the docs against verified reality after the Lunar Pool / Urban
Champion / Donkey Kong (JU) promotions and the 2026-10-19 audit-comment
standardization. No source behaviour changed except the two build fixes below.

Build tier (whole-ROM vs PRG-only)
  - AGENTS.md: the 17 `_wip/` projects are real disassemblies at the PRG-build
    tier, not "skeletons"; header.s/chr.s/rom.nes are promotion additions;
    verify_pass1.py covers the top-level projects.
  - Root OVERVIEW.md: `_wip` prose, audit-comment narrative and summary table
    refreshed (37.5% figure, SEEDED vs OK wording, re-trace false alarm).
  - Promoted projects whose build blocks still claimed `make` emits
    `reconstructed_prg.bin` compared to `prg.bin` (Balloon Fight, Baseball,
    CIRCUS, Clu Clu Land, Excitebike, NES PowerPad, Pac-Man (USA), Tennis):
    now describe the whole-ROM `reconstructed.nes` vs `rom.nes`.
  - Lunar Pool / Urban Champion / CIRCUS also had stale `cd "_wip/..."`
    build paths and "Promotion" items; retargeted to their top-level folders.

Mirroring (header byte 6 bit 0: 0 = Horizontal, 1 = Vertical)
  - Corrected DK Jr. prose "horizontal mirroring (flag 6 = $01)" -> vertical,
    and both `_wip/Pac-Man` variant notes "Both use vertical mirroring" ->
    horizontal (both are byte-6 = $00).
  - Re-audited every project OVERVIEW: 0 rows and 0 prose claims now disagree.

Stale status tails
  - Retitled/restatused the `_wip` OVERVIEWs to their real `prg.s` (Golf,
    Ice Climber (U), Lode Runner, Millipede, Pac-Man Tengen, Pac-Man (U),
    Popeye 0/1, Raid, Raid a2, Hogan's Alley, Mario Bros); Golf's
    skeleton-era contents rows and Next Steps corrected.
  - Dropped the skeleton-era "## Next Steps (per `PROMPTS.md`)" heading and
    the "(from the skeleton)" wording across all project OVERVIEWs.
  - Rewrote Lunar Pool / Urban Champion Next Steps (both already Pass 1-3
    complete and promoted; their tails still described pending Pass 2 and
    promotion); fixed root row 13 (Wild Gunman) and row 20 (Duck Hunt).

Also lands two code fixes carried with this sweep:
  - `_wip/Hogan's Alley (JU)`: $E9F1-$E9FD and $EA13-$EA14 reclassified as
    data with canonical audit comments (the seeded build had decoded a data
    table base as code, breaking the build since 2ae09f7). `make` ->
    BYTE-IDENTICAL again; reconstructed_prg.bin/.lbl refreshed.
  - `_wip/Pyramid (U)`: `Label_D72E` -> `NMI:` (byte-identical).

Verification:
  make (Hogan's Alley, Pyramid)      -> BYTE-IDENTICAL, BYTE-IDENTICAL
  _tools/verify_pass1.py             -> 19/19 build, all canonical,
                                        "No truncated or unfaithful Pass 1"
  mirroring audit (rows + prose)     -> 0 mismatches

Donkey Kong (JU): complete Pass 2 — all 919 Label_ definitions named

The last non-zero Label_ residue in the repo is now gone. Every one of the
919 address-derived definitions in copilot/prg.s is replaced:

* 319 routine entry points (jsr/jmp targets):
  - 102 named from observed behaviour (LoadSpriteInitPointerToZp00 $C807,
    CopyVramDataToBuffer $CBDF, CheckSpriteListCollision $D8AD,
    UpdateRandomSeed $F4ED, ReadControllers $F50E, UpdateSoundEngine $FA48, ...)
  - 217 left as SubC<addr> — honest residue where the body is too
    context-dependent to name without guessing (Golf: 108, Mario Bros: 223)
  - the 77 already-named entries untouched
* 600 internal branch targets named <Routine>_Block / <Routine>_Block_n in
  address order within their owning routine (DK Jr./Balloon Fight convention).
  Ownership is control-flow containment, so a loop that physically precedes
  its own entry lands correctly (FlushPpuBuffer_Block $F1EC under $F228).
* Two proposal collisions disambiguated by indexing zero-page slot:
  UpdateObjectListZp5D/DispatchObjectStateZp5E ($DA16/$DA4C) vs
  UpdateObjectListZpAE/DispatchObjectStateZpAF ($E1E9/$E250).

jsr/jmp operands stay numeric (Wild Gunman style); only branch operands are
symbolic. Applied with _tools/pass2.py apply (919 defs + 2,622 refs rewritten,
comments re-aligned); the ROM still rebuilds byte-identically and
verify_pass1.py reports 19/19 canonical with no truncated split.

Docs synced: project OVERVIEW.md gains a Pass 2 Details section, root
OVERVIEW.md rows + conventions, TODO.md section 4 closed. dk_full_map.tsv now
records the complete applied map (its zp rows remain unapplied proposals).

_wip status correction: five false "Pass 2 complete" claims + map audit

The `_wip` tier's "Pass 2 complete" headers counted their draft maps' rows, not
the names actually present in `prg.s`, and described the count of *neutral*
`ZpXX` slots in `locals.inc` as "zero-page semantic aliases". Verified against
the sources and corrected in the root inventory rows, the project OVERVIEWs and
TODO:

  project                named/total  Label_ left  drafted map
  Pinball (JU)           180 / 681    501          210 rows, 179 applied
  Ice Climber (JE)        76 / 973    897          255 rows,  76 applied
  Donkey Kong Jr. Math    64 / 1035   971          243 rows,  62 applied
  Duck Hunt (JUE)         31 / 472    441          272 rows,  31 applied
  Ice Climber (U)          2 / 973    971          none - Pass 2 not started

No `_wip` project is Pass 2 complete. Ice Climber (U) was the worst case: the
2026-10-19 sweep itself restated it "Pass 2 complete" while describing its 971
`Label_` definitions in the same paragraph - a copy-paste from (JE); (U) has no
map file at all.

Drafted maps audited row by row against the committed split: they are not
applicable. 100/243 (DK Jr. Math), 96/255 (Ice Climber (JE)) and 17/210
(Pinball) rows point at addresses that are not instruction boundaries - they
were built against an older code/data split - while most of the rest are
unlabelled boundaries that no operand references, or (Duck Hunt) competing
candidate names for one label (`Label_C2BF` alone carries 205). Rows that are
both insertable and corroborated by control flow: 0 in every map. Recorded as
stale and kept for provenance; Pass 2 here needs a fresh map derived from the
committed split.

Also corrected while verifying:
- Mario Bros entry counts (docs said 252 / 90 + 165 / 477 sites / 156 neutral
  slots; the file holds 262 distinct `jsr`/`jmp` targets = 39 semantic + 223
  `SubC<addr>`, 478 sites, 151 slots).
- root `_wip` prose line/label ranges (4,482-17,180 lines, 192-971 `Label_`,
  11,126 total) and the Ice Climber code figure (74.6% / 6,112 instr, not
  74.7% / 6,113).
- TODO §4 re-scoped to the promoted tier, with the `_wip` residue table added.

Verification: `make` across all 17 `_wip` projects -> BYTE-IDENTICAL (17/17);
`_tools/verify_pass1.py` -> 19/19 build, all canonical, "No truncated or
unfaithful Pass 1 found". No source bytes changed.

Balloon Fight (JU): apply locals.inc/symbols.inc names to prg.s (Pass 3)

Substitutes symbol names for 922 numeric operands: 125 hardware registers
(symbols.inc) and 797 of 813 zero-page/RAM operands (locals.inc). The 15
multi-alias addresses were resolved per routine; 16 operands stay numeric
because $13 is used there as a plain high-byte scratch beside Temp12 and
none of its three aliases fits.

- _tools/apply_symbols.py: the substitution tool (dry run by default;
  --sites supplies per-routine choices for multi-alias addresses, --report
  lists the residue). Only the operand token is rewritten, so the
  `; CPU:$.... PRG:....  XX XX` audit comments survive byte for byte.
- prg.s: operand tokens only. make prints "Byte-identical ROM verified."
- OVERVIEW.md (project): instruction quotes now match prg.s, new
  alias-reuse table, and section 10 rewritten from the stale "497 Label_"
  prose to the real naming state and the 16-site residue.
- OVERVIEW.md (root), TODO.md, AGENTS.md: status, counts, tool list.

verify_pass1.py: 19/19 OK, all audit comments canonical.

Bomberman (U): apply locals.inc/symbols.inc names to prg.s (Pass 3)

Substitutes 362 zero-page operands in copilot/prg.s with the names already
declared in copilot/locals.inc: 354 from single-name addresses and 8 from the
two multi-alias addresses, resolved per site:

  $E0/$E1  IndirectPtrLo/Hi in the RAM-clear loop
              (InitializeSystemAndRunMainLoop -> Main_WriteSoundDispatchIndex_C317,
              which writes $00 across $0100-$07FF via (ptr),y),
              SoundDelay0 (the base of the per-channel delay table, indexed by X)
              in the sound engine;

No symbols.inc substitution was needed: copilot/prg.s contains no numeric
hardware operands ($2000-$4017) at all. All 362 operands were already written
with two hex digits, so no ca65 `a:` prefix was required.

make -> Byte-identical ROM verified. Operand token only; mnemonics, spacing and
the trailing `; CPU:$.... PRG:....  XX XX` audit comments are untouched.

Remaining numeric operands (758) address bytes that no .inc file names:
505 zero-page (133 addresses), 171 RAM $0100-$07FF (46 addresses) and 82
table reads in $8000+ (54 addresses).

Bomberman (U): substitute 24 in-file table labels at ROM operand sites

Uses the new `--labels` option of `apply_symbols.py` with the
ld65 `-Ln` output (`reconstructed.lbl`). Only labels that prg.s
actually defines and that live in the PRG (+) are considered,
so CHR/header segment labels cannot leak in.

24 numeric operands (`lda ,x`, `adc ,y`, etc.) now read
`lda SystemPaletteData,x`, `adc GameplayObjectClassTable,y`, etc.
All 24 point at exact label addresses; the remaining 58 ROM-space
numeric operands point at interior bytes or unlabelled tables and
stay numeric.

make -> Byte-identical ROM verified.

Bomberman (U): update docs for Pass 3 symbol application

- Project OVERVIEW.md: corrected source file from main.s to prg.s/header.s/chr.s;
  output name from reconstructed_bomberman.nes to reconstructed.nes;
  rewritten §10 Zero-Page/RAM Symbols table to match locals.inc (with aliases
  and unnamed residue documented);
  fixed §4 step 1/4 to use IndirectPtrLo/Hi and SoundDelay0 names;
  fixed §11 InesHeader location (now header.s);
  added §2 Pass 3 summary table;
  added §13 notes on legacy main.s and Main_WriteSoundDispatchIndex_C317 misnomer.

- Root OVERVIEW.md §3: updated source line count (7,553), file list, and added
  Pass 3 summary.

Both builds verified byte-identical.

Pass 3 symbol application to all 19 top-level projects (2026-10-19)

Ran _tools/apply_symbols.py --write on all 19 promoted projects to substitute
symbolic names from symbols.inc (hardware registers) and locals.inc (zero-page
RAM aliases, forward references) into prg.s operands. The tool preserves the
canonical audit comments (; CPU:$XXXX PRG:XXXX AA BB) and preserves byte
identity — all projects still rebuild byte-identical to their original ROMs.

Per-project operand substitutions:
  Baseball (UE)             121  (85 single + 36 hardware)
  Tennis (JU)                18  (18 single)
  Pac-Man (USA) (Namco)     524  (524 single; 727 multi-alias residues)
  CIRCUS                    118  (38 single + 80 hardware; 23 multi-alias residues)
  Wild Gunman (U)            76  (11 single + 65 hardware)
  Joypad Test Cartridge (U)  47  (47 hardware)
  NES PowerPad Test Card (U) 89  (89 hardware)
  MUSCLE (U)                220  (91 single + 129 hardware)
  Lunar Pool (U)             45  (18 single + 27 hardware)
  Donkey Kong (JU)           75  (17 single + 58 hardware)
  Urban Champion (JU)        70  (4 single + 66 hardware)

Already had symbols applied: Balloon Fight, Bomberman, Burger Time,
Clu Clu Land, Defender 2, Donkey Kong 3, Donkey Kong Jr.

Skipped: Excitebike (JU) — inline prg.s definitions conflict with locals.inc
values and source operands don't match ROM byte encodings; automatic
substitution breaks byte identity.

Documentation updated:
  OVERVIEW.md — added Pass 3 symbol notes to all 19 project entries,
  added Urban Champion as section #36
  TODO.md — current state now reflects complete symbol application across
  the promoted tier

Verification: python3 _tools/verify_pass1.py reports all 19 projects OK/SEEDED,
all canonical comments, no truncated or unfaithful Pass 1.
This commit is contained in:
tmerritt committed 2026-10-19 14:55:08 -04:00
1 parent 53ad50ffb6
commit 71ada15de0
79 files changed
+9455 -7687
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Tennis (JU)/copilot/prg.s
+18 -18
View File
@@ -864,7 +864,7 @@ DispatchInlineAddressTable:
lda (MathResultLo),y ; CPU:$C3AB PRG:03AB ??
sta MathResultHi ; CPU:$C3AD PRG:03AD ??
stx MathResultLo ; CPU:$C3AF PRG:03AF ??
jmp ($0014) ; CPU:$C3B1 PRG:03B1 ??
jmp (MathResultLo) ; CPU:$C3B1 PRG:03B1 ??
; =============================================================================
; Add16BitZp12ToZp14
@@ -1502,9 +1502,9 @@ Flow_C639:
clc ; CPU:$C688 PRG:0688 ??
ldy #$02 ; CPU:$C68A PRG:068A ??
Flow_C640:
lda $009D,y ; CPU:$C68C PRG:068C ??
adc $0097,y ; CPU:$C68E PRG:068E ??
sta $009D,y ; CPU:$C690 PRG:0690 ??
lda a:ProjectedXLo,y ; CPU:$C68C PRG:068C ??
adc a:MathCarryByte,y ; CPU:$C68E PRG:068E ??
sta a:ProjectedXLo,y ; CPU:$C690 PRG:0690 ??
dey ; CPU:$C692 PRG:0692 ??
bpl Flow_C640 ; CPU:$C694 PRG:0694 ??
Flow_C64C:
@@ -1526,9 +1526,9 @@ Flow_C663:
clc ; CPU:$C6B2 PRG:06B2 ??
ldy #$02 ; CPU:$C6B4 PRG:06B4 ??
Flow_C66A:
lda $009E,y ; CPU:$C6B6 PRG:06B6 ??
adc $0097,y ; CPU:$C6B8 PRG:06B8 ??
sta $009E,y ; CPU:$C6BA PRG:06BA ??
lda a:ProjectedXHi,y ; CPU:$C6B6 PRG:06B6 ??
adc a:MathCarryByte,y ; CPU:$C6B8 PRG:06B8 ??
sta a:ProjectedXHi,y ; CPU:$C6BA PRG:06BA ??
dey ; CPU:$C6BC PRG:06BC ??
bpl Flow_C66A ; CPU:$C6BE PRG:06BE ??
bcc Flow_C67A ; CPU:$C6C0 PRG:06C0 ??
@@ -1567,8 +1567,8 @@ Flow_C68E:
sec ; CPU:$C6E0 PRG:06E0 ??
ldy #$02 ; CPU:$C6E2 PRG:06E2 ??
Flow_C697:
lda $009D,y ; CPU:$C6E4 PRG:06E4 ??
sbc $0098,y ; CPU:$C6E6 PRG:06E6 ??
lda a:ProjectedXLo,y ; CPU:$C6E4 PRG:06E4 ??
sbc a:MathVectorXHi,y ; CPU:$C6E6 PRG:06E6 ??
sta $00A1,y ; CPU:$C6E8 PRG:06E8 ??
dey ; CPU:$C6EA PRG:06EA ??
bpl Flow_C697 ; CPU:$C6EC PRG:06EC ??
@@ -1576,7 +1576,7 @@ Flow_C697:
ldy #$02 ; CPU:$C6F0 PRG:06F0 ??
Flow_C6A7:
lda $00A1,y ; CPU:$C6F2 PRG:06F2 ??
sta $009D,y ; CPU:$C6F4 PRG:06F4 ??
sta a:ProjectedXLo,y ; CPU:$C6F4 PRG:06F4 ??
dey ; CPU:$C6F6 PRG:06F6 ??
bpl Flow_C6A7 ; CPU:$C6F8 PRG:06F8 ??
sec ; CPU:$C6FA PRG:06FA ??
@@ -1598,8 +1598,8 @@ Flow_C6C4:
sec ; CPU:$C716 PRG:0716 ??
ldy #$02 ; CPU:$C718 PRG:0718 ??
Flow_C6CD:
lda $009E,y ; CPU:$C71A PRG:071A ??
sbc $0098,y ; CPU:$C71C PRG:071C ??
lda a:ProjectedXHi,y ; CPU:$C71A PRG:071A ??
sbc a:MathVectorXHi,y ; CPU:$C71C PRG:071C ??
sta $00A1,y ; CPU:$C71E PRG:071E ??
dey ; CPU:$C720 PRG:0720 ??
bpl Flow_C6CD ; CPU:$C722 PRG:0722 ??
@@ -1607,7 +1607,7 @@ Flow_C6CD:
ldy #$02 ; CPU:$C726 PRG:0726 ??
Flow_C6DD:
lda $00A1,y ; CPU:$C728 PRG:0728 ??
sta $009E,y ; CPU:$C72A PRG:072A ??
sta a:ProjectedXHi,y ; CPU:$C72A PRG:072A ??
dey ; CPU:$C72C PRG:072C ??
bpl Flow_C6DD ; CPU:$C72E PRG:072E ??
sec ; CPU:$C730 PRG:0730 ??
@@ -2074,7 +2074,7 @@ Flow_C956:
lda $C965,x ; CPU:$C998 PRG:0998 ??
tay ; CPU:$C99A PRG:099A ??
lda $C966,x ; CPU:$C99C PRG:099C ??
sta $00F1,y ; CPU:$C99E PRG:099E ??
sta a:AudioChannelControl,y ; CPU:$C99E PRG:099E ??
rts ; CPU:$C9A0 PRG:09A0 ??
; -----------------------------------------------------------------------------
@@ -7149,7 +7149,7 @@ Flow_E792:
beq Flow_E7B8 ; CPU:$E7C1 PRG:27C1 ??
cmp #$02 ; CPU:$E7C3 PRG:27C3 ??
beq Flow_E7DA ; CPU:$E7C5 PRG:27C5 ??
lda $0058,y ; CPU:$E7C7 PRG:27C7 ??
lda a:ScoreLo,y ; CPU:$E7C7 PRG:27C7 ??
beq Flow_E7AB ; CPU:$E7C9 PRG:27C9 ??
dec ScoreLo ; CPU:$E7CB PRG:27CB ??
dec ScoreHi ; CPU:$E7CD PRG:27CD ??
@@ -7168,7 +7168,7 @@ Flow_E7B8:
beq Flow_E7B1 ; CPU:$E7E1 PRG:27E1 ??
cmp #$03 ; CPU:$E7E3 PRG:27E3 ??
bne Flow_E7D1 ; CPU:$E7E5 PRG:27E5 ??
lda $0058,y ; CPU:$E7E7 PRG:27E7 ??
lda a:ScoreLo,y ; CPU:$E7E7 PRG:27E7 ??
cmp #$03 ; CPU:$E7E9 PRG:27E9 ??
bne Flow_E7D1 ; CPU:$E7EB PRG:27EB ??
inc ScoreUpdatePhase ; CPU:$E7ED PRG:27ED ??
@@ -7192,7 +7192,7 @@ Flow_E7E4:
lda ScoreLo,x ; CPU:$E809 PRG:2809 ??
cmp #$07 ; CPU:$E80B PRG:280B ??
bcc Flow_E7F3 ; CPU:$E80D PRG:280D ??
sbc $0058,y ; CPU:$E80F PRG:280F ??
sbc a:ScoreLo,y ; CPU:$E80F PRG:280F ??
bmi Flow_E7F3 ; CPU:$E811 PRG:2811 ??
cmp #$02 ; CPU:$E813 PRG:2813 ??
bcs Flow_E7B1 ; CPU:$E815 PRG:2815 ??
@@ -7258,7 +7258,7 @@ Flow_E82C:
beq Flow_E876 ; CPU:$E863 PRG:2863 ??
cmp #$06 ; CPU:$E865 PRG:2865 ??
bne Flow_E84B ; CPU:$E867 PRG:2867 ??
lda $0051,y ; CPU:$E869 PRG:2869 ??
lda a:PlayerPointScore,y ; CPU:$E869 PRG:2869 ??
cmp #$06 ; CPU:$E86B PRG:286B ??
beq Flow_E86F ; CPU:$E86D PRG:286D ??
cmp #$05 ; CPU:$E86F PRG:286F ??