Skip to content

Name remaining mndiagram data and split its animation table - #3453

Merged
itsgrimetime merged 3 commits into
doldecomp:masterfrom
itsgrimetime:pr/mndiagram-data-names
Sep 13, 2026
Merged

itsgrimetime merged 3 commits into
doldecomp:masterfrom
itsgrimetime:pr/mndiagram-data-names

Conversation

@itsgrimetime

@itsgrimetime itsgrimetime commented Sep 11, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • name the grid screen GObj, string terminator, intro animation settings, and popup text offsets
  • split the trailing animation-settings blob into typed popup-exit, arrow, and cursor settings
  • read the named settings directly where the original addressing permits it
  • retain the documented mnDiagram_AnimTable overlay only for accesses that must be addressed from the contiguous table base
  • keep the short structural documentation inline with the source, consistent with Doxygen gotchas #2938

Verification

  • rebased onto current upstream/master; the previously stacked Name the mndiagram fighter and name display-order arrays #3451 history is no longer part of this PR
  • ninja
  • python configure.py progress
  • 1130/1130 objects matching and linked
  • rebuilt DOL SHA-1: 08e0bf20134dfcb260699671004527b2d6bb1a45
  • git diff --check
  • clang-format clean

@decomp-dev

decomp-dev Bot commented Sep 11, 2026

Copy link
Copy Markdown

Report for GALE01 (7db3249 - 0e7f58f)

No changes

@itsgrimetime itsgrimetime mentioned this pull request Sep 11, 2026
4 tasks
@itsgrimetime
itsgrimetime force-pushed the pr/mndiagram-data-names branch 2 times, most recently from 075cecb to 04e29af Compare September 11, 2026 21:57
@itsgrimetime itsgrimetime added the ai-assisted Utilizes a LLM to do the heavy lifting label Sep 12, 2026
- mnDiagram_804D6C10 -> mnDiagram_ScreenGObj: the grid screen's GObj, set in
  mnDiagram_CreateScreen and read by the input and popup procs.
- mnDiagram_804D4FA4 -> mnDiagram_StringTerminator, after
  mnName_StringTerminator; drop the unused externs for the two anonymous
  .sdata strings that followed it.
- mnDiagram_803EE768 -> mnDiagram_IntroAnim: AnimLoopSettings for the screen
  intro animation, paired with the existing exit-animation table.
- mnDiagram_803EE728 -> mnDiagram_PopupTextOffsets: three offsets passed to
  lb_8000B1CC to place the popup's HSD_Text objects relative to their JObjs.

main.dol OK; mndiagram remains 100% matched.
Replace the f32[9] mnDiagram_PopupExitAnimFrames blob with three
AnimLoopSettings symbols (mnDiagram_PopupExitAnim, mnDiagram_ArrowAnim,
mnDiagram_CursorAnim) and read them, mnDiagram_IntroAnim, and
mnDiagram_PopupTextOffsets directly where the compiler allows it. The
mnDiagram_AnimTable overlay remains for the accesses that must be addressed
from the table base: the popup text offsets in mnDiagram_PopupAnimProc and
mnDiagram_CreatePopupTexts, cursor_anim, and the assert strings in
mnDiagram_CreatePopup.

main.dol OK; mndiagram remains 100% matched.
@itsgrimetime
itsgrimetime force-pushed the pr/mndiagram-data-names branch from 04e29af to 3c7d5dc Compare September 12, 2026 17:42
@itsgrimetime
itsgrimetime marked this pull request as ready for review September 12, 2026 19:05
@itsgrimetime
itsgrimetime enabled auto-merge (squash) September 13, 2026 04:38
@itsgrimetime
itsgrimetime merged commit f7cf71c into doldecomp:master Sep 13, 2026
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ai-assisted Utilizes a LLM to do the heavy lifting

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant