From 7137d8f9633c2ed793df4c3f60349ac154b06a3a Mon Sep 17 00:00:00 2001 From: PyroDonkey <173381138+PyroDonkey@users.noreply.github.com> Date: Mon, 9 Nov 2026 13:38:14 -0700 Subject: [PATCH 1/4] smbw: fix Course853_Main (Pole Block Allure) autoscroll camera vertical framing Lower points 0-3 of autoscroll rail 1776580222928036096 in Y to keep the Wonder Flower and lower poles on-screen in 4:3 while maintaining vertical clearance. --- super-mario-bros-wonder/docs/DEVELOPMENT.md | 27 +++++++++ .../BancMapUnit/Course853_Main.bcett.byml.zs | Bin 0 -> 20841 bytes super-mario-bros-wonder/tools/build_stage.py | 52 ++++++++++++++++-- 3 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 super-mario-bros-wonder/mod/Native 4x3 Aspect Ratio/romfs/BancMapUnit/Course853_Main.bcett.byml.zs diff --git a/super-mario-bros-wonder/docs/DEVELOPMENT.md b/super-mario-bros-wonder/docs/DEVELOPMENT.md index a45e001..ac521ee 100644 --- a/super-mario-bros-wonder/docs/DEVELOPMENT.md +++ b/super-mario-bros-wonder/docs/DEVELOPMENT.md @@ -519,3 +519,30 @@ This supersedes §§38 and 41 for Course408. Rebuild and verification: `build_st The maintainer play-tested the current build in Windows/Eden and approved Course401, Course404, Course407 and Course408. Course409 remains stock on the TODO list. Course408 is described in §42; Course401 keeps its 14 ice-block Y moves, Course407 keeps the A01 pillar translate/scale, and Course404 keeps its `Course404_Main` BOSS entry. Completion and retry were not separately reported for these four courses. The mod now ships 124 romfs files (115 layouts + 9 stage archives). Patch SHA-256: `636492eb2b6a2bac8098d70f409aaf4b38ca1109d4ff3e842791e83e5962aadf`. Stage verification covers all nine stage files with 0 problems; `scripts/check_repo.py` passes. + +## 44. 2026-11-09: Course853_Main (Pole Block Allure) autoscroll rail repositioning + +**Context & Findings:** +In *Sunbaked Desert Special: Pole Block Allure* (`Course853_Main`, RootAreaHash `2118979906`), the camera autoscroll is driven by `AutoScrollControlSignalFrame` (`6045299945089365584`) bound to Rail `1776580222928036096` with `setYfree = False`. The stock rail points were authored to climb rapidly: Pt 0 `(0.0, 17.0)` -> Pt 1 `(13.0, 17.0)` -> Pt 2 `(38.0, 25.5)` -> Pt 3 `(63.0, 41.0)` -> Pt 4 `(96.0, 55.0)`. +In 4:3 (height 15.75, width 21.0), this climb lifts the camera far above Mario and the gameplay poles (which sit at $Y \in [4.5, 15.5]$): +- At Pt 3 ($X = 63.0, Y = 41.0$), the camera bottom edge reaches $Y = 33.12$. The Wonder Flower (`ItemWonderHole` 4542071052577928248) sits at $X = 71.50, Y = 25.50$ inside `EnemyBalloonKiller` at $Y = 28.50$, placing it **7.62 blocks below the bottom edge of the screen**, completely off-screen and nearly impossible to hit. +- Lower poles (Pole 1 at $Y = 8.5$, Pole 2 at $Y = 14.5$, Pole 3 at $Y = 15.5$, Snake Pole 2 at $Y = 21.5$) suffer severe bottom clipping and poor tracking. +- An initial experiment with global zoom override ($G = 20.67$) was evaluated and rejected: zooming out only expands the view around the high rail center, failing to bring the camera down to Mario's eye level. + +**Solution (`RAIL_EDITS` in `tools/build_stage.py`):** +Lowered Rail `1776580222928036096` points 0–3 in Y to an intermediate vertical profile: +- Pt 0: `(0.0, 17.0, 0.0)` -> `(0.0, 14.5, 0.0)` ($-2.5$) +- Pt 1: `(13.0, 17.0, 0.0)` -> `(13.0, 14.5, 0.0)` ($-2.5$) +- Pt 2: `(38.0, 25.5, 0.0)` -> `(38.0, 22.75, 0.0)` ($-2.75$) +- Pt 3: `(63.0, 41.0, 0.0)` -> `(63.0, 36.0, 0.0)` ($-5.0$) +- Pt 4+: Kept at stock `(96.0, 55.0, 0.0)` for the upper post-wonder platform. + +**Verified Framing Results in Native 4:3 ($G = 15.75$):** +- Start Platform ($Y = 4.5$): ground clearance $-2.12\text{ blk}$ from camera bottom (centered view). +- Pole 1 ($Y = 8.5$): $+1.88\text{ blk}$ above bottom. +- Pole 2 ($Y = 14.5$): $+5.40\text{ blk}$ above bottom, $+10.35\text{ blk}$ below top. +- Pole 3 ($Y = 15.5$): $+1.78\text{ blk}$ above bottom. +- Snake Pole 2 ($Y = 21.5$): $+2.65\text{ blk}$ above bottom. +- Wonder Flower ($Y = 25.5$): $+4.00\text{ blk}$ above bottom, $+11.75\text{ blk}$ below top (solid margin with ample upper headroom). +- Balloon Killer carrier ($Y = 28.5$): $+5.94\text{ blk}$ above bottom ($+9.81\text{ blk}$ below top). +Stage verification passes with 0 problems (4 bytes modified, passes all BYML invariants). diff --git a/super-mario-bros-wonder/mod/Native 4x3 Aspect Ratio/romfs/BancMapUnit/Course853_Main.bcett.byml.zs b/super-mario-bros-wonder/mod/Native 4x3 Aspect Ratio/romfs/BancMapUnit/Course853_Main.bcett.byml.zs new file mode 100644 index 0000000000000000000000000000000000000000..bd5013782c25e7088fe83ba84f8ed1f80d57fbac GIT binary patch literal 20841 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 E1kcbOvH$=8 literal 0 HcmV?d00001 diff --git a/super-mario-bros-wonder/tools/build_stage.py b/super-mario-bros-wonder/tools/build_stage.py index 8ec69b1..34b741e 100644 --- a/super-mario-bros-wonder/tools/build_stage.py +++ b/super-mario-bros-wonder/tools/build_stage.py @@ -151,6 +151,26 @@ ('Course152_Sub4', 1, 2, 0, (79.0, -7.0, 0.0), (79.0, -10.0, 0.0)), ('Course152_Sub4', 1, 2, 21, (92.0, -7.0, 0.0), (92.0, -10.0, 0.0)), ] +# (course, rail_hash, point_idx, orig_xyz, new_xyz) +# Course853_Main (Sunbaked Desert Special: Pole Block Allure - Autoscroll rail intermediate vertical centering): +# In 4:3 (height 15.75, width 21.0), the authored autoscroll rail 1776580222928036096 climb (Y = 17 -> 25.5 -> 41) +# lifts the camera far above Mario and the poles (which sit at Y = 4.5..15.5). At pt 3 (X = 63, Y = 41), the camera +# bottom reaches Y = 33.12, causing the Wonder Flower (ItemWonderHole at Y = 25.5) and lower poles to be cut off +# below the screen by 7.62 blocks. +# Lower points 0-3 vertically to an intermediate 50% position between stock and the low-profile tuning: +# - Pt 0: (0.0, 17.0, 0.0) -> (0.0, 14.5, 0.0) (-2.5) +# - Pt 1: (13.0, 17.0, 0.0) -> (13.0, 14.5, 0.0) (-2.5) +# - Pt 2: (38.0, 25.5, 0.0) -> (38.0, 22.75, 0.0)(-2.75) +# - Pt 3: (63.0, 41.0, 0.0) -> (63.0, 36.0, 0.0) (-5.0) +# This keeps the Wonder Flower (Y = 25.5) +4.00 blocks above the bottom edge while preserving plenty of upper +# headroom for climbing Snake Pole 1 (Y = 29.5) and Snake Pole 2 (Y = 21.5). +RAIL_EDITS = [ + ('Course853_Main', 1776580222928036096, 0, (0.0, 17.0, 0.0), (0.0, 14.5, 0.0)), + ('Course853_Main', 1776580222928036096, 1, (13.0, 17.0, 0.0), (13.0, 14.5, 0.0)), + ('Course853_Main', 1776580222928036096, 2, (38.0, 25.5, 0.0), (38.0, 22.75, 0.0)), + ('Course853_Main', 1776580222928036096, 3, (63.0, 41.0, 0.0), (63.0, 36.0, 0.0)), +] + def bcett(romfs, course): @@ -160,11 +180,13 @@ def bcett(romfs, course): def edits_by_course(): out = {} for e in EDITS: - out.setdefault(e[0], {'actors': [], 'bg': [], 'gyaml': []})['actors'].append(e) + out.setdefault(e[0], {'actors': [], 'bg': [], 'gyaml': [], 'rails': []})['actors'].append(e) for b_edit in BG_EDITS: - out.setdefault(b_edit[0], {'actors': [], 'bg': [], 'gyaml': []})['bg'].append(b_edit) + out.setdefault(b_edit[0], {'actors': [], 'bg': [], 'gyaml': [], 'rails': []})['bg'].append(b_edit) for g_edit in GYAML_EDITS: - out.setdefault(g_edit[0], {'actors': [], 'bg': [], 'gyaml': []})['gyaml'].append(g_edit) + out.setdefault(g_edit[0], {'actors': [], 'bg': [], 'gyaml': [], 'rails': []})['gyaml'].append(g_edit) + for r_edit in RAIL_EDITS: + out.setdefault(r_edit[0], {'actors': [], 'bg': [], 'gyaml': [], 'rails': []})['rails'].append(r_edit) return out @@ -259,6 +281,28 @@ def apply(d, course_edits): for eslot, _ in b.vec3(p, 'Translate'): allowed.update(range(eslot, eslot + 4)) + rails_slots = b.array_slots(root['Rails'][2]) if 'Rails' in root else [] + all_rpts = [] + for s in rails_slots: + rdict = b.hash_entries(s[2]) + if 'Points' in rdict: + for ps in b.array_slots(rdict['Points'][2]): + all_rpts.append(b.hash_entries(ps[2])) + for course, rhash, pidx, orig, new in course_edits.get('rails', []): + matching_rails = [b.hash_entries(s[2]) for s in rails_slots if b.hash_of(b.hash_entries(s[2])) == rhash] + assert len(matching_rails) == 1, f'{course} rail {rhash}: {len(matching_rails)} matches' + rdict = matching_rails[0] + pts = b.array_slots(rdict['Points'][2]) + p = b.hash_entries(pts[pidx][2]) + node = p['Translate'][2] + sharers = [pt for pt in all_rpts if pt['Translate'][2] == node] + assert len(sharers) == 1, f'{course} Rail {rhash} Pt {pidx}: Translate shared by {len(sharers)} points' + cur = [v for _, v in b.vec3(p, 'Translate')] + assert cur == list(orig), f'{course} Rail {rhash} Pt {pidx}: {cur}, expected {orig}' + b.set_vec3(p, 'Translate', new) + for eslot, _ in b.vec3(p, 'Translate'): + allowed.update(range(eslot, eslot + 4)) + for course, hashes, original, replacement in course_edits.get('gyaml', []): allowed.update(replace_actor_gyaml(d, hashes, original, replacement)) return allowed @@ -303,7 +347,7 @@ def verify(orig_romfs, mod_romfs): elif bytes(ship) != bytes(ref): problems.append(f'{course}: edited values differ from the edit tables') elif diff: - n_total = len(edits.get('actors', [])) + len(edits.get('bg', [])) + len(edits.get('gyaml', [])) + n_total = len(edits.get('actors', [])) + len(edits.get('bg', [])) + len(edits.get('gyaml', [])) + len(edits.get('rails', [])) print(f'{course}: {len(diff)} byte(s) differ, all inside {n_total} edit(s)') for p in problems: print('PROBLEM:', p) From 146df80b59dbef9b36365b77ce0db0159813e46b Mon Sep 17 00:00:00 2001 From: PyroDonkey <173381138+PyroDonkey@users.noreply.github.com> Date: Mon, 9 Nov 2026 14:16:18 -0700 Subject: [PATCH 2/4] smbw: shift Course853_Main wonder finish Balloon Killer cannon left by 3.0 blocks Shifts ObjectBalloonKillerHodaiLeft from X = 251.5 to 248.5 so it enters the 4:3 camera view and fires its purple balloon creature when Mario approaches on the lower pole. --- super-mario-bros-wonder/docs/DEVELOPMENT.md | 9 +++++++-- .../BancMapUnit/Course853_Main.bcett.byml.zs | Bin 20841 -> 20841 bytes super-mario-bros-wonder/tools/build_stage.py | 10 ++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/super-mario-bros-wonder/docs/DEVELOPMENT.md b/super-mario-bros-wonder/docs/DEVELOPMENT.md index ac521ee..b07cd47 100644 --- a/super-mario-bros-wonder/docs/DEVELOPMENT.md +++ b/super-mario-bros-wonder/docs/DEVELOPMENT.md @@ -457,7 +457,8 @@ In Course408 (Break Time! Floating Wonder Tokens), the maintainer requested zoom **Build and verification:** - Stage build wrote mod/Native 4x3 Aspect Ratio/romfs/BancMapUnit/Course408_Course.bcett.byml.zs. - uild_stage.py --verify reports 0 problems (7 bytes differ, all inside 3 edits). -- Verified with erify_pchtxt.py (291 lines, 11 hooks, 0 errors). +- Verified with +erify_pchtxt.py (291 lines, 11 hooks, 0 errors). ## 39. 2026-11-06: Course407 top-right background void coverage @@ -545,4 +546,8 @@ Lowered Rail `1776580222928036096` points 0–3 in Y to an intermediate vertical - Snake Pole 2 ($Y = 21.5$): $+2.65\text{ blk}$ above bottom. - Wonder Flower ($Y = 25.5$): $+4.00\text{ blk}$ above bottom, $+11.75\text{ blk}$ below top (solid margin with ample upper headroom). - Balloon Killer carrier ($Y = 28.5$): $+5.94\text{ blk}$ above bottom ($+9.81\text{ blk}$ below top). -Stage verification passes with 0 problems (4 bytes modified, passes all BYML invariants). +- **Wonder Finish Balloon Killer Cannon Framing (`ObjectBalloonKillerHodaiLeft`):** + At the Wonder sequence finale, Mario arrives on the lower snake pole ($X \in [230.5, 240.5], Y = 133.5$) beneath the Wonder Seed (`ItemWonderFinishWonderSead` at $X = 240.5, Y = 144.24$). The green cannon (`ObjectBalloonKillerHodaiLeft` 15389084515446315917) sits atop the sand platform Wall 5 ($X \in [247.0, 252.0]$) at $X = 251.5, Y = 134.0$, firing a purple balloon creature to the left for Mario to bounce up to the Wonder Seed and upper pole. + In stock 16:9 ($W = 27.56$), the cannon sat $+2.75\text{ blk}$ inside the right screen edge ($X = 254.25$). In 4:3 ($W = 21.0$), when Mario stands at the end of the pole ($X = 240.5$), the right screen edge only reaches $X = 251.0$. Because `ObjectBalloonKillerHodaiLeft` has `'IsFirstInCamera': True`, sitting off-screen at $X = 251.5$ prevented it from ever triggering its firing cycle, softlocking the player with no balloon creature spawned. + Shifted the cannon left by $3.0$ blocks in X via `EDITS` ($X = 251.5 \to 248.5$). The cannon remains securely planted on Wall 5 ($[247.0, 252.0]$) and enters the 4:3 viewport with $+2.50\text{ blk}$ of margin when Mario is at $X = 240.5$, triggering its shot immediately upon approach. +Stage verification passes with 0 problems (5 bytes modified, passes all BYML invariants). diff --git a/super-mario-bros-wonder/mod/Native 4x3 Aspect Ratio/romfs/BancMapUnit/Course853_Main.bcett.byml.zs b/super-mario-bros-wonder/mod/Native 4x3 Aspect Ratio/romfs/BancMapUnit/Course853_Main.bcett.byml.zs index bd5013782c25e7088fe83ba84f8ed1f80d57fbac..064b5bf47f171c8e544c1de43931fa530d2ff959 100644 GIT binary patch delta 2446 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 M2csbnv+z546;dA9Q2+n{ delta 2446 zcmV;9332x6q5ouJ`Kg4vcJ%#uQY!p|krrd$s}Y6oHOLCY&0MV1I2iDu zdZvs%+e5*&?U;ux7U)TL&>F0X%&;j<0z?8s0^dME|6Q0eAB_860Vf4rWvo?nkYM~^qIhiEin&oj;g&eNUC!+q!Z6&2xda4+1A4bQg6 zc<3Z{Ja2foc-rKw@mK|Ew+8U)cyPRR9K5udx(9%7!=vIk<DW+?tK?`XO08kjoJ9S z>0R><+2(HerE<3e|Frq;-mPWhbz|{d-99_HU3*RcA};AJ%}#4)wTr6lnp`{No)Bj` zKOJ8U9q*Qoo18T|!a6)nJDYBUR(GwF)-lo4C9!pA%-Z8NxZO>+xmGIeHeinC?ko{y z+TQ8nbnG)!e>!!IFS;yUl@4l#jwz)(2D0Jw%`wjr&-s>_(}e<=Lj}^U@o_d9-7Ew7 z+UKfs&^aZU<=j!rL(OrVyXDki*lT{$(vUfAg)|<+R>PQL5HJ%E6ZjU}Q3zDEJbl1>KwN?Ko;0B8<7;oH z$x&)?f1ap-r2r!o`h|d@gCThcH}n$C;~|mxRDKFSy%8WkCFOXqo1Mf?-zTT;KLqJC zblRQ5TLQ%W0Nwy@0k8qULiqsUn~*DP6MmcKP2VQIDcj_=(o~J|ndnS!rZ}da$yy{* zUxF{Km$*yUsPEDqj0f4l?Kp@f66`7Ul$5ece{CH0D@wn)J84Zlr^!#P&l1JG&w4)&X-8;s)@o9ZlU$nOueM`CZ`A;-7^5K{nF^!H!LPWtj ze;RO6w`hBa>MOdcDca-gdL6yS0=75pH4UB3xAb~QH%4hPT%m8AsAjq}1_|}{{rx;j z1eeI0$c>&T+h$XDNfe~N2O(mw)gVGA5m^yM5iJF&tspYKg&6gEht7xoLw=w`J^II? zDG;oz!|Ut%d46WDOTSu%;)d9U(0ONMe?!wSRv~$zcA+$&v%e5EtVL)}$W2K7=PXR9 z`ix@H>GU@}PJRZiLjRFQx|GhOAN_pCgYsVRgQkO;gOGg&6}>&P_{&F7w?DE3Ll9EX zP|zOd?!Z9vChi^*#uC61y34NwYw$UBLhDdCblv5Jih;bd3^WQ|LXBL|VK26(e>|hb zu3}O#=9XBJTXqA5`xkTeLNClM3>!98qHTAhu;b6^yb2M5Oh(3u5oXh!D$4gnKgUn- zzTo+WmMuS_PUm#@sGTNjiO~c&qt2z%m}TvWfwJLDgOS1Dl2ov)RDT9T(?kar{Gxxo z6-a-4jgth}aAJK;znWjjuOU_he>yaRHHvFXjFPWauc!zZAHxQNZjKW)(VAc&D9PZv z5VjDm$R+QD@SD4@k~PlV2iphN1IHWA2fw-dSnSVT2U`bMD>N=Q4t{fYRZy*L!^|?P zOehtakEvY3i8G6h^#)%Cat)RZj17WQbGp_V20nwHfmSNMg@KjnRri8>f2|F?y{=5J zeHmY}i@haQsI>IS+XdEL;zn-9QQH-W6?_%&TwVpie-BtcmXFnM^;p8Wv;^Y>-~?SIH^Fd;BqQOF-UVAEu?s;N zK^VcCRu(}qjqA#MCBFJ*VXutx1Lp((0Y7OyaO|@m(Z}%-tblq%TBWVXR&ZESt7I8p zrLHPhg%d!llz3EeRAwqMvPrchgB#bzv++l;G%~5C*i-1K@l|p>f7R5AYNw^h2aZxa zlax^^NIw?QMXZ6Tfu_~)hk;+3$G!)@-$S!aoMR^}78{0j0=5$${C?k{w>}ATRCla`j&)}!hRP{D0%|9ufW z>cSzs7)+{O>OqslG*s#Ham(0}GmabN-*1v{!f8Y1LTCH{n+t|T>_uub1 zfO|ET%xTb|VZ+zPhTre2UNSB;G&Hon3Cr*I8Mt9luo*IBpl)?I*S!6Hf0kWha#5*N zGb{}lNG<#C_ZWIudptCl<u+F&7R zfoQ?EromTb?)Q5Qb+HRv6_OQ*6@1b;nPnJ{mHtv++V{$K#CIiY3N&Z4TD>OBlr$+N zN_{=IH@6I)6k*o_mUYXvWmhjK?IC5*>+>gjlf{vle?hFxUNS7%l&py*Q>w9$4TJ0y zehNN?o(-*rg4Tz#=!uVlunu2qn}d{rlvPEi(Pk8>7A=yqME5Qq7Payx^b@q#3D|!x z0^*!7Hnx8li$e?dv~-nxJ&nFG?U;2enl{!1lgEfyuWN@ZsPpidpA2*J?1&-6Kt)8W M2csbnv+z5472*xhasU7T diff --git a/super-mario-bros-wonder/tools/build_stage.py b/super-mario-bros-wonder/tools/build_stage.py index 34b741e..82e078d 100644 --- a/super-mario-bros-wonder/tools/build_stage.py +++ b/super-mario-bros-wonder/tools/build_stage.py @@ -128,6 +128,16 @@ (23.5, 48.0, -167.5), (23.5, 49.5, -167.5)), ('Course407_Course', 3373664933504165692, 'DVWaKaiganFarIwaA01', 'Scale', (0.699999988079071, 0.699999988079071, 0.699999988079071), (0.82, 0.82, 0.82)), + # Course853_Main (Sunbaked Desert Special: Pole Block Allure - Wonder finish balloon killer cannon framing): + # In 16:9, ObjectBalloonKillerHodaiLeft was placed at X = 251.5 on Wall 5 [247.0, 252.0], framing it 2.75 blocks + # inside the 16:9 screen right edge (254.25) when Mario stands on the lower pole at X = 240.5. + # In 4:3 (width 21.0), the right edge of the screen reaches only X = 251.0 when Mario is at X = 240.5. + # Because ObjectBalloonKillerHodaiLeft requires 'IsFirstInCamera': True to begin firing, being off-screen + # prevented it from ever shooting the purple balloon creature, trapping Mario on the pole. + # Shifting the cannon left by 3.0 blocks (X = 251.5 -> 248.5) keeps it firmly on Wall 5 while placing it 2.50 blocks + # inside the 4:3 screen, matching stock framing and ensuring it fires immediately upon approach. + ('Course853_Main', 15389084515446315917, 'ObjectBalloonKillerHodaiLeft', 'Translate', + (251.5, 134.0, 0.0), (248.5, 134.0, 0.0)), ] # (course, actor hashes, original Gyaml, replacement Gyaml). Both variants have matching static-map/physics From e67d9bbea7dbcb279f7a5fb43b3c6ad97fed4e81 Mon Sep 17 00:00:00 2001 From: PyroDonkey <173381138+PyroDonkey@users.noreply.github.com> Date: Mon, 9 Nov 2026 16:14:15 -0700 Subject: [PATCH 3/4] smbw: move Course853_Main finale camera stop right and restore the stock cannon The finale cannon (ObjectBalloonKillerHodaiLeft, X 251.5, IsFirstInCamera) never fired in 4:3: rail X is the view's left edge, so the stock stop at X 226.75 frames [226.75, 247.75] and the cannon sits 3.75 blocks past the right edge. Move autoscroll rail 1776580222928036096 point 12 to X 231.335 (view [231.335, 252.335]) and drop the earlier 3.0-block cannon shift. The stop is measured from Eden captures: with the cannon body 0.335 blocks inside the right edge it fires, so 252.0 + 0.335 - 21.0 = 231.335. The pole's first 0.8 blocks fall off the left edge; pole start to cannon centre is exactly the 21.0-block 4:3 width. DEVELOPMENT.md section 45 corrects section 44's camera model (rail X is the left edge, rail Y the top edge). Co-Authored-By: Claude Sonnet 5.5 --- super-mario-bros-wonder/docs/DEVELOPMENT.md | 10 ++++++++ .../BancMapUnit/Course853_Main.bcett.byml.zs | Bin 20841 -> 20846 bytes super-mario-bros-wonder/tools/build_stage.py | 22 ++++++++++-------- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/super-mario-bros-wonder/docs/DEVELOPMENT.md b/super-mario-bros-wonder/docs/DEVELOPMENT.md index b07cd47..13566a7 100644 --- a/super-mario-bros-wonder/docs/DEVELOPMENT.md +++ b/super-mario-bros-wonder/docs/DEVELOPMENT.md @@ -551,3 +551,13 @@ Lowered Rail `1776580222928036096` points 0–3 in Y to an intermediate vertical In stock 16:9 ($W = 27.56$), the cannon sat $+2.75\text{ blk}$ inside the right screen edge ($X = 254.25$). In 4:3 ($W = 21.0$), when Mario stands at the end of the pole ($X = 240.5$), the right screen edge only reaches $X = 251.0$. Because `ObjectBalloonKillerHodaiLeft` has `'IsFirstInCamera': True`, sitting off-screen at $X = 251.5$ prevented it from ever triggering its firing cycle, softlocking the player with no balloon creature spawned. Shifted the cannon left by $3.0$ blocks in X via `EDITS` ($X = 251.5 \to 248.5$). The cannon remains securely planted on Wall 5 ($[247.0, 252.0]$) and enters the 4:3 viewport with $+2.50\text{ blk}$ of margin when Mario is at $X = 240.5$, triggering its shot immediately upon approach. Stage verification passes with 0 problems (5 bytes modified, passes all BYML invariants). + +## 45. 2026-11-09: Course853_Main finale camera stop moved right (corrects section 44's cannon cause) + +**Correction to section 44:** the camera model there (rail point = view centre) is wrong for SMBW autoscrolls. As in section 22, rail X is the view's left edge (the game adds the current half-width) and rail Y is the view's top edge (section 22: fixed Y = rail Y - half-height). The finale confirms it: the last rail point (226.75, 147.0) is the left edge of the authored room (`CameraArea` 12037923009706981632 spans X 226.75..254.25), and with Y as the top edge the pole (133.5), cannon (134.0) and Wonder Seed (144.24) all fit between 147.0 and 131.25; Y as the centre would put the pole off-screen in stock 16:9. The Y numbers quoted in section 44 ("camera bottom 33.12", "+4.00 blk above bottom") therefore do not hold; the Y retune itself was play-tested and stays. + +**Cause of the dead cannon:** the stock stop leaves the 4:3 view left-aligned at [226.75, 247.75]. After 2 s still, cave G pans towards Mario inside [0, 2 delta], but Mario at the pole end (X 240.5) only pulls the view to [230.0, 251.0], so `ObjectBalloonKillerHodaiLeft` (X 251.5, `IsFirstInCamera: True`) is never inside the camera and never starts firing. A cannon-only shift (section 44, 251.5 -> 248.5) would still leave it 0.75 blocks outside the left-aligned view, so it was dropped. + +**Fix (`RAIL_EDITS`):** final point 12 of rail `1776580222928036096`, `(226.75, 147.0, 0.0)` -> `(231.335, 147.0, 0.0)`. Earlier candidates 232.0 and 233.3056 were derived from the stock 16:9 offsets and were never loaded in Eden (it still held the section 44 build, SHA-256 prefix 121bbf30...). The final value comes from two Eden captures of that build (1440x1080, 21.0 blocks wide = 68.571 px per block): capture 1 shows the stock stop, with the pole end block at pixel 942 = X 240.49, so the view is [226.75, 247.75] and the shifted cannon (248.5) is off-screen; capture 2 shows the view 1.59 blocks further right, [228.34, 249.34], with the cannon body 0.335 blocks inside the right edge, already fired. `InsideCameraMarginX` is not stored in the cannon's AI graph, so that observed margin is the reference. With the stock cannon (body right edge 252.0) the same margin gives 252.0 + 0.335 - 21.0 = 231.335, view [231.335, 252.335]. Y is unchanged (bottom 131.25, pole 133.5, cannon 134..136, seed 144.24). Trade-off: pole start to cannon centre is exactly 21.0 blocks, the 4:3 width, so the pole's first 0.8 blocks (ball at X 230.5) fall off the left edge; the capture-2 framing (pole ball visible) is only possible with the cannon shifted left 3.0. Other effects to watch: the last segment (pt 11 -> 12, 180 frames) now covers 11.3 blocks in X instead of 6.75, and cave G's stopped-scroll pan can reach a right edge up to about 258.9. + +**Status:** built; `build_stage.py --verify` 0 problems (Course853_Main 5 rail edits, no actor edits), 16 unit tests, `verify_pchtxt.py` and `check_repo.py` OK. Not yet play-tested in Eden. The section 44 cannon shift (`EDITS`) was removed at the maintainer's request, so the cannon is back at its stock position (251.5, 134.0); the camera stop is the only finale change. diff --git a/super-mario-bros-wonder/mod/Native 4x3 Aspect Ratio/romfs/BancMapUnit/Course853_Main.bcett.byml.zs b/super-mario-bros-wonder/mod/Native 4x3 Aspect Ratio/romfs/BancMapUnit/Course853_Main.bcett.byml.zs index 064b5bf47f171c8e544c1de43931fa530d2ff959..4544b5e15b966960abf4a1c5edb79039bc68483c 100644 GIT binary patch delta 4429 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 delta 4444 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 i`Si5N)k*(YBryE9r$L3m1&eQ`8rLP}R7KD?x 248.5) keeps it firmly on Wall 5 while placing it 2.50 blocks - # inside the 4:3 screen, matching stock framing and ensuring it fires immediately upon approach. - ('Course853_Main', 15389084515446315917, 'ObjectBalloonKillerHodaiLeft', 'Translate', - (251.5, 134.0, 0.0), (248.5, 134.0, 0.0)), ] # (course, actor hashes, original Gyaml, replacement Gyaml). Both variants have matching static-map/physics @@ -174,11 +164,23 @@ # - Pt 3: (63.0, 41.0, 0.0) -> (63.0, 36.0, 0.0) (-5.0) # This keeps the Wonder Flower (Y = 25.5) +4.00 blocks above the bottom edge while preserving plenty of upper # headroom for climbing Snake Pole 1 (Y = 29.5) and Snake Pole 2 (Y = 21.5). +# Pt 12 (final stop): rail X is the view's LEFT edge (docs/DEVELOPMENT.md section 22, SetAutoScrollPos adds the current +# half-width), so the stock stop (226.75) frames [226.75, 247.75] in 4:3 versus [226.75, 254.31] in 16:9. The finale +# cannon ObjectBalloonKillerHodaiLeft (X = 251.5, body 251..252, IsFirstInCamera) was therefore 3.75 blocks past the +# 4:3 right edge and never started firing. The camera-margin value it tests is not stored in its AI graph, so the stop +# is taken from an Eden capture of a build with the cannon at X = 248.5 (body 248..249): there the cannon sat 0.335 +# blocks inside the right edge (view [228.34, 249.34], measured from screenshots calibrated on the pole end block at +# 240.5) and had fired. The stock cannon body ends at 252.0, so stop X = 252.0 + 0.335 - 21.0 = 231.335 frames +# [231.335, 252.335]: whole cannon and Wall 5 (247..252) in view, pole end (X = 240.5) and Wonder Seed +# (240.5, 144.24) in view. The pole's first 0.8 blocks (ball at X 230.5) fall off the left edge: pole start to +# cannon centre is exactly 21.0, the 4:3 width, so both cannot be fully framed with the stock cannon. +# Y = 147.0 is untouched (rail Y is the view's top edge, so the pole at 133.5 and the cannon at 134.0 stay in frame). RAIL_EDITS = [ ('Course853_Main', 1776580222928036096, 0, (0.0, 17.0, 0.0), (0.0, 14.5, 0.0)), ('Course853_Main', 1776580222928036096, 1, (13.0, 17.0, 0.0), (13.0, 14.5, 0.0)), ('Course853_Main', 1776580222928036096, 2, (38.0, 25.5, 0.0), (38.0, 22.75, 0.0)), ('Course853_Main', 1776580222928036096, 3, (63.0, 41.0, 0.0), (63.0, 36.0, 0.0)), + ('Course853_Main', 1776580222928036096, 12, (226.75, 147.0, 0.0), (231.335, 147.0, 0.0)), ] From 254ce86f5b7ca1975624e2c9d38e0386e0d828d6 Mon Sep 17 00:00:00 2001 From: PyroDonkey <173381138+PyroDonkey@users.noreply.github.com> Date: Tue, 10 Nov 2026 07:00:21 -0700 Subject: [PATCH 4/4] smbw: record Course853_Main as confirmed in game; layout_count 127 Co-Authored-By: Claude Opus 5.5 --- .github/release-games.json | 2 +- super-mario-bros-wonder/AGENTS.md | 7 ++++--- super-mario-bros-wonder/docs/DEVELOPMENT.md | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/release-games.json b/.github/release-games.json index 80e7d18..868fea1 100644 --- a/.github/release-games.json +++ b/.github/release-games.json @@ -9,7 +9,7 @@ "title_id": "010015100B514000", "game_version": "1.2.1", "build_id": "FF773E90972D544EB79406EAA65396D53C43EFB9", - "layout_count": 126 + "layout_count": 127 } } } diff --git a/super-mario-bros-wonder/AGENTS.md b/super-mario-bros-wonder/AGENTS.md index 2d866d1..3f038df 100644 --- a/super-mario-bros-wonder/AGENTS.md +++ b/super-mario-bros-wonder/AGENTS.md @@ -6,9 +6,9 @@ Read the root [`../AGENTS.md`](../AGENTS.md) first. This file is the **source of - Title ID `010015100B514000`, **version 1.2.1 only**, build ID `FF773E90972D544EB79406EAA65396D53C43EFB9`. - Tested on Eden (yuzu family) with Graphics > Aspect Ratio > **Force 4:3**, on Windows (where agents can probe memory and take screenshots) and on the tester's Retroid Pocket Nova (Android). Other emulators and console are untested. -- Mod folder: `mod/Native 4x3 Aspect Ratio/` = `exefs/1.2.1.pchtxt` + `romfs/Layout/*.Nin_NX_NVN.blarc.zs` (115 changed archives) + `romfs/BancMapUnit/*.bcett.byml.zs` (11 stage edits: Course152_Sub4, Course411_Course, Course415_Course, Course417_Course, Course403_Course, Course400_Course, Course401_Course, Course408_Course, Course407_Course, World001, Course022_Main) + `README.txt` (ships with the mod; holds no install steps, only the link to `README.md#install`, the one install guide). Named "Nova Aspect Ratio 4x3 Native" before v1.0.0; don't rename it again. +- Mod folder: `mod/Native 4x3 Aspect Ratio/` = `exefs/1.2.1.pchtxt` + `romfs/Layout/*.Nin_NX_NVN.blarc.zs` (115 changed archives) + `romfs/BancMapUnit/*.bcett.byml.zs` (12 stage edits: Course152_Sub4, Course411_Course, Course415_Course, Course417_Course, Course403_Course, Course400_Course, Course401_Course, Course408_Course, Course407_Course, World001, Course022_Main, Course853_Main) + `README.txt` (ships with the mod; holds no install steps, only the link to `README.md#install`, the one install guide). Named "Nova Aspect Ratio 4x3 Native" before v1.0.0; don't rename it again. - Installed for testing at `%APPDATA%\eden\load\010015100B514000\Native 4x3 Aspect Ratio`. Sync with the game closed: `robocopy "mod\Native 4x3 Aspect Ratio" "%APPDATA%\eden\load\010015100B514000\Native 4x3 Aspect Ratio" /MIR` (mirror: deletes archives the build no longer ships). -- Releases: tag prefix `smbw` (`.github/release-games.json`); procedure in the root AGENTS.md "Releasing". `layout_count` there counts every file under `romfs/` (115 layouts + 11 stage files = 126); bump it when that number changes. +- Releases: tag prefix `smbw` (`.github/release-games.json`); procedure in the root AGENTS.md "Releasing". `layout_count` there counts every file under `romfs/` (115 layouts + 12 stage files = 127); bump it when that number changes. ## Local inputs (outside the repo) @@ -97,6 +97,7 @@ Shipped patch `exefs/1.2.1.pchtxt`: 11 hooks (`verify_pchtxt.py`). Includes area 10. `Course407_Course` (Break Time! Watery Wonder Tokens), **approved in Eden on 2026-11-07**: revert `DVWaKaiganFarIwaA02`; adjust `DVWaKaiganFarIwaA01` (Hash `3373664933504165692`) from Translate $(23.5, 48.0, -167.5)$ / Scale $(0.7, 0.7, 0.7)$ to Translate $(23.5, 49.5, -167.5)$ / Scale $(0.82, 0.82, 0.82)$. 11. `World001` (Pipe-Rock Plateau world map), **confirmed in Eden (2026-11-09: the tester reached the lost Toad)**: subregion 22 (underground area: sign, ? block, courses 9/10, KO arena) has a fixed camera on `WorldMapCameraLookAtTag` obj479 (Hash 2929358336); its X moves 87.25 -> 91.25 so the hidden warp pipe obj513 (x 103, to the lost-Toad room) and Mario beside it are on screen (4:3 view about x 76.5-106.0; entry pipe obj29 kept). An earlier subregion 17 limit-area edit targeted the wrong area and was reverted. All nine world maps surveyed for fixed or boxed cameras cropping objects 16:9 showed (2026-11-09); only the World006 (Fungi Mines) pipe from Sunbaked Desert beside Captain Toad was a real candidate, and the tester checked it fine in game. Details: DEVELOPMENT.md section 46. 12. `Course022_Main` (W2 Outmaway Valley, Wonder autoscroll), **seed fix confirmed in Eden (2026-11-09)**: the finish Wonder Seed (obj8927, GravityOn at x 693.5) is created by `CourseDisplayBoxSwitch` obj8878 when it enters the view, timed to drop onto the tip of the goal pole carried round by the rolling snow hill. The left-aligned 4:3 scroll view (21.0 wide at G 15.75) reached the box 6.5556 blocks of scroll late, so the seed missed the pole and fell out of the course (reported 2026-11-09). All three display-box switches of the section move X -6.5556 (obj8878 715.5 -> 708.9444; the Mini Lucky Coin switches obj8931 574.5 -> 567.9444, obj8932 596.5 -> 589.9444) so they fire at the stock scroll position. The tester confirmed the seed lands on the pole; the coin switches were not separately reported. Details: DEVELOPMENT.md section 47. +13. `Course853_Main` (Sunbaked Desert Special: Pole Block Allure, autoscroll), **confirmed in Eden (2026-11-09)**: `RAIL_EDITS` on autoscroll rail `1776580222928036096`. Points 0-3 lowered in Y (17.0/17.0/25.5/41.0 -> 14.5/14.5/22.75/36.0) so the camera stays near the poles and the Wonder Flower is on screen. Final point 12 X 226.75 -> 231.335 (rail X is the view's left edge, rail Y its top) so the finale cannon `ObjectBalloonKillerHodaiLeft` (stock position 251.5, `IsFirstInCamera`) enters the 4:3 view and fires; the pole's first 0.8 blocks fall off the left edge as a trade-off. No actor edits. The tester confirmed the cannon fires and the Wonder Seed is reachable. Details: DEVELOPMENT.md sections 44-45 (section 45 corrects section 44's camera model). **Layouts (`build.py`, built from the 1.2.1 originals since 2026-10-30):** 115 of the game's 235 archives ship (114 changed top-level layouts incl. the 1.2.1-only `AmiiboReadWindow`, plus `LCursor`); the other 120 are unchanged and fall back to the game's copies. top-level RootPane scale y 0.75 (`ROOT_SY`); HUD/header/footer edge-anchored (+/-180 root-local units, TransY keys shifted too); full-screen layers grown x4/3 (captures and fades height only, artwork uniform); parts layouts untouched; curated per-screen tables `FORCE_SHIFT`, `NO_SHIFT_SUBTREE`, `NO_SHIFT_LAYOUT`, `NO_FILL`. 638 float writes, 46 fill panes, `verify.py` clean. Until 2026-10-30 the mod was built from won-aar's older cache and shipped all 234 archives, so 30 screens (incl. Pause, MainMenu, Title, CourseList, talk windows, button icons) carried pre-1.2.1 layouts; the 1.2.1 rebuild applies identical edits. **Play-tested after the 1.2.1 rebuild (2026-10-31): menus, HUD, pause, maps, transitions, course clear, cursor and amiibo look good.** @@ -127,7 +128,7 @@ Shipped patch `exefs/1.2.1.pchtxt`: 11 hooks (`verify_pchtxt.py`). Includes area Boss/fixed-room table (all delta 0): Course150_Sub4 607466214 G 21.0; Course151_Sub2 101336182, Course152_Sub4 1778226157, Course153_Sub3 1019598315, Course411_Course 1607468536, Course415_Course 3684305666, Course417_Course 2579434623, Course403_Course 177084102, Course008_Sub2 3214359175, Course400_Course 2214662437, Course401 1219170747, Course404_Main 1725897490, and Course407 2395215932 G 20.6667 (152's own zoom actor 17.5 multiplies the base); Course408 1474562704 uses G = 18.5, delta = 0.0 with its stock-height CameraArea and horizontal X lock. Course401, Course408, Course404, and Course407 are approved in Eden on 2026-11-07; Course409 is stock and remains on the TODO list. Course403, Course415 and Course417 visual framing is user-approved with gameplay checks still open. Course400 visual framing approved; Hoppo spawn elevation fix awaiting retry. Course411's earlier framing fix is user-confirmed; regression on the current build is not yet reported. Autoscroll end stops table (`TABLE_ENDS` after `BOSS`, surveyed by `scan_autoscroll_ends.py`): areas with intermediate pauses >= 120 frames (Course002_Main 885847797, Course022_Main 2740185052, Course062_Sub1 3839196513, Course102_Main 4167497323, Course290_Main 2931365200, Course857_Main 3856421716) mapped to rail end X + 13.7778; camera unlocks only when |fixed X + delta - key| <= 0.05. Optional lines commented after `@stop` (zone-lock disable, fixed zoom-outs 17-20) are not needed. -**Confirmed in game:** Outmaway Valley Wonder Seed landing on the goal pole (Course022_Main display-box switch moved -6.5556), World001 underground area hidden warp pipe (subregion 22 look-at x 91.25), badge houses and one-screen rooms, pause/menu blur, course-entry iris, HUD and key glyphs vs stock, Select a User card, Poplin shop, kingdom map, Pipe-Rock Plateau Palace arena + pipes, wide-level base 15.75 (Outmaway Valley), airship autoscroll + Wonder Flower (Course101, re-checked with the [0, 2*delta] cave G on 2026-11-03), Piranha Plants on Parade (Course002_Main: camera stays locked during mid-scroll singing pause and unlocks at the final stop to reach the Wonder Seed, issue #1), Puffy Lifts seed (Course021), course-clear photo and View photo, menu pointer, Badge Challenge restart wipe, W4 Bowser Jr. (Course152_Sub4: water tint plane Scale Y 1.5, cave Y fight camera at 3.25, Royal Seed reachable, cave K swim AI, wall terrain to y = -10.0 for corner voids). +**Confirmed in game:** Pole Block Allure (Course853_Main autoscroll rail: framing and finale cannon), Outmaway Valley Wonder Seed landing on the goal pole (Course022_Main display-box switch moved -6.5556), World001 underground area hidden warp pipe (subregion 22 look-at x 91.25), badge houses and one-screen rooms, pause/menu blur, course-entry iris, HUD and key glyphs vs stock, Select a User card, Poplin shop, kingdom map, Pipe-Rock Plateau Palace arena + pipes, wide-level base 15.75 (Outmaway Valley), airship autoscroll + Wonder Flower (Course101, re-checked with the [0, 2*delta] cave G on 2026-11-03), Piranha Plants on Parade (Course002_Main: camera stays locked during mid-scroll singing pause and unlocks at the final stop to reach the Wonder Seed, issue #1), Puffy Lifts seed (Course021), course-clear photo and View photo, menu pointer, Badge Challenge restart wipe, W4 Bowser Jr. (Course152_Sub4: water tint plane Scale Y 1.5, cave Y fight camera at 3.25, Royal Seed reachable, cave K swim AI, wall terrain to y = -10.0 for corner voids). **Not yet checked in game:** the Mini Lucky Coins on Outmaway Valley's rolling hill (Course022_Main coin display-box switches moved -6.5556); Course061_Sub2 (Chase Killers) seed after its stopped autoscroll (x 595.0, rail end 570.75: the pre-fix reach was only 0.03 past it); Course857_Main short scroll stops (104 and 100 frames, under cave G's 120-frame hold, so a `CourseDisplayBoxSwitch` at x 211.5 fires later than stock); whether 151/153 also release their arena area after the cutscene; Course150 arena since its delta became 0; Bowser Jr. rooms 151-153 (extra height; alternate zoom path when subject+0x1BE != 0 bypasses caves B/F1); WipeTo*/WipeWarp; pits, level ends and Wonder zooms at 15.75; last boss and airship boss rooms; multiplayer; Android flashing bars (WipeCourseIn's kept-fill capture reads 180 rows past the frame). diff --git a/super-mario-bros-wonder/docs/DEVELOPMENT.md b/super-mario-bros-wonder/docs/DEVELOPMENT.md index 6444f53..218e2c5 100644 --- a/super-mario-bros-wonder/docs/DEVELOPMENT.md +++ b/super-mario-bros-wonder/docs/DEVELOPMENT.md @@ -560,7 +560,7 @@ Stage verification passes with 0 problems (5 bytes modified, passes all BYML inv **Fix (`RAIL_EDITS`):** final point 12 of rail `1776580222928036096`, `(226.75, 147.0, 0.0)` -> `(231.335, 147.0, 0.0)`. Earlier candidates 232.0 and 233.3056 were derived from the stock 16:9 offsets and were never loaded in Eden (it still held the section 44 build, SHA-256 prefix 121bbf30...). The final value comes from two Eden captures of that build (1440x1080, 21.0 blocks wide = 68.571 px per block): capture 1 shows the stock stop, with the pole end block at pixel 942 = X 240.49, so the view is [226.75, 247.75] and the shifted cannon (248.5) is off-screen; capture 2 shows the view 1.59 blocks further right, [228.34, 249.34], with the cannon body 0.335 blocks inside the right edge, already fired. `InsideCameraMarginX` is not stored in the cannon's AI graph, so that observed margin is the reference. With the stock cannon (body right edge 252.0) the same margin gives 252.0 + 0.335 - 21.0 = 231.335, view [231.335, 252.335]. Y is unchanged (bottom 131.25, pole 133.5, cannon 134..136, seed 144.24). Trade-off: pole start to cannon centre is exactly 21.0 blocks, the 4:3 width, so the pole's first 0.8 blocks (ball at X 230.5) fall off the left edge; the capture-2 framing (pole ball visible) is only possible with the cannon shifted left 3.0. Other effects to watch: the last segment (pt 11 -> 12, 180 frames) now covers 11.3 blocks in X instead of 6.75, and cave G's stopped-scroll pan can reach a right edge up to about 258.9. -**Status:** built; `build_stage.py --verify` 0 problems (Course853_Main 5 rail edits, no actor edits), 16 unit tests, `verify_pchtxt.py` and `check_repo.py` OK. Not yet play-tested in Eden. The section 44 cannon shift (`EDITS`) was removed at the maintainer's request, so the cannon is back at its stock position (251.5, 134.0); the camera stop is the only finale change. +**Status:** built; `build_stage.py --verify` 0 problems (Course853_Main 5 rail edits, no actor edits), 16 unit tests, `verify_pchtxt.py` and `check_repo.py` OK. **Confirmed in Eden on 2026-11-09:** at the new stop the cannon fires and the Wonder Seed is reachable; the maintainer also play-tested the section 44 Y retune. The section 44 cannon shift (`EDITS`) was removed at the maintainer's request, so the cannon is back at its stock position (251.5, 134.0); the camera stop is the only finale change. ## 46. 2026-11-09: World 1 map, hidden warp pipe off-screen (World001 subregion 22 look-at moved)