Small improvements on MarioMove + enum for flutterstate + name + enum for water type by TheAzack9 · Pull Request #397 · doldecomp/sms

TheAzack9 · 2026-11-06T14:32:51Z

Mostly minor stuff i did for MarioMove, but i digressed and made some enums and named some stuff as well 😅

Should've been multiple PRs..

decomp-dev · 2026-11-06T14:37:01Z

Report for GMSJ01 (`8c67e6a` - `2a7f90c`)

📈 Matched code: 52.81% (+0.04%, +1580 bytes)

✅ 4 new matches

Unit	Item	Bytes	Before	After
`mario/Enemy/wireTrap`	`JGeometry::TVec3<float>::set<float>(float, float, float)`	+16	0.00%	100.00%
`mario/Player/MarioMove`	`TMario::getJumpSlideControl() const`	+1	99.82%	100.00%
`mario/Enemy/gesso`	`TGesso::rollCheck()`	+1	99.96%	100.00%
`mario/Enemy/smallEnemy`	`TSmallEnemy::changeByJuice()`	+1	99.95%	100.00%

📈 2 improvements in unmatched items

Unit	Item	Bytes	Before	After
`mario/Enemy/wireTrap`	`TWireTrap::load(JSUMemoryInputStream&)`	+38	92.99%	99.82%
`mario/Player/MarioMove`	`TMario::gunExec()`	+16	98.29%	99.78%

Report for GMSJ01_01 (`8c67e6a` - `2a7f90c`)

📈 Matched code: 51.99% (+0.05%, +1724 bytes)
📈 Matched data: 81.10% (+0.05%, +336 bytes)

✅ 6 new matches

Unit	Item	Bytes	Before	After
`mario/Player/MarioRun`	`TMario::considerRotateStart()`	+133	7.86%	100.00%
`mario/Enemy/wireTrap`	`JGeometry::TVec3<float>::set<float>(float, float, float)`	+16	0.00%	100.00%
`mario/Player/WaterGun`	`.data`	+12	96.43%	100.00%
`mario/Enemy/gesso`	`TGesso::rollCheck()`	+1	99.96%	100.00%
`mario/Enemy/smallEnemy`	`TSmallEnemy::changeByJuice()`	+1	99.95%	100.00%
`mario/Player/MarioMove`	`TMario::getJumpSlideControl() const`	+1	99.82%	100.00%

📈 17 improvements in unmatched items

Unit	Item	Bytes	Before	After
`mario/Player/WaterGun`	`TWaterGun::isEmitting()`	+251	0.00%	99.92%
`mario/Player/MarioJump`	`TMario::doJumping()`	+139	80.82%	99.94%
`mario/Player/MarioWait`	`TMario::squating()`	+130	84.20%	99.91%
`mario/Player/MarioJump`	`TMario::rocketCheck()`	+128	50.51%	99.89%
`mario/Player/WaterGun`	`TNozzleBase::animation(int)`	+128	89.33%	99.94%
`mario/Player/WaterGun`	`TNozzleTrigger::animation(int)`	+128	90.78%	99.96%
`mario/Player/WaterGun`	`TNozzleDeform::animation(int)`	+128	93.30%	99.94%
`mario/Player/Yoshi`	`TYoshi::thinkUpper()`	+128	69.59%	99.88%
`mario/Player/MarioDraw`	`MarioHeadCtrl(J3DNode*, int)`	+121	87.94%	99.74%
`mario/Player/MarioDraw`	`TMario::setAnimation(int, float)`	+121	80.10%	94.76%
`mario/Player/MarioJump`	`TMario::rocketing()`	+121	88.76%	99.91%
`mario/Player/MarioSpecial`	`TMario::wireRolling()`	+121	63.14%	69.70%
`mario/Player/MarioSound`	`TMario::soundMovement()`	+120	98.26%	99.99%
`mario/Player/MarioSpecial`	`TMario::wireHanging()`	+109	54.41%	61.59%
`mario/Player/WaterGun`	`TWaterGun::movement()`	+64	95.29%	99.83%
`mario/Enemy/wireTrap`	`TWireTrap::load(JSUMemoryInputStream&)`	+38	92.99%	99.82%
`mario/Player/MarioMove`	`TMario::gunExec()`	+16	98.29%	99.78%

Report for GMSP01_NX (`8c67e6a` - `2a7f90c`)

📈 Matched code: 52.07% (+0.05%, +1724 bytes)
📈 Matched data: 82.27% (+0.05%, +336 bytes)

✅ 6 new matches

Unit	Item	Bytes	Before	After
`mario/Player/MarioRun`	`TMario::considerRotateStart()`	+133	7.86%	100.00%
`mario/Enemy/wireTrap`	`JGeometry::TVec3<float>::set<float>(float, float, float)`	+16	0.00%	100.00%
`mario/Player/WaterGun`	`.data`	+12	96.43%	100.00%
`mario/Enemy/gesso`	`TGesso::rollCheck()`	+1	99.96%	100.00%
`mario/Enemy/smallEnemy`	`TSmallEnemy::changeByJuice()`	+1	99.95%	100.00%
`mario/Player/MarioMove`	`TMario::getJumpSlideControl() const`	+1	99.82%	100.00%

📈 17 improvements in unmatched items

Unit	Item	Bytes	Before	After
`mario/Player/WaterGun`	`TWaterGun::isEmitting()`	+251	0.00%	99.79%
`mario/Player/MarioJump`	`TMario::doJumping()`	+139	80.82%	99.94%
`mario/Player/MarioWait`	`TMario::squating()`	+130	84.19%	99.90%
`mario/Player/WaterGun`	`TNozzleBase::animation(int)`	+129	89.24%	99.85%
`mario/Player/WaterGun`	`TNozzleDeform::animation(int)`	+129	93.22%	99.85%
`mario/Player/MarioJump`	`TMario::rocketCheck()`	+128	50.49%	99.88%
`mario/Player/WaterGun`	`TNozzleTrigger::animation(int)`	+128	90.69%	99.87%
`mario/Player/Yoshi`	`TYoshi::thinkUpper()`	+128	69.59%	99.88%
`mario/Player/MarioDraw`	`MarioHeadCtrl(J3DNode*, int)`	+121	87.94%	99.74%
`mario/Player/MarioDraw`	`TMario::setAnimation(int, float)`	+121	80.10%	94.76%
`mario/Player/MarioSpecial`	`TMario::wireRolling()`	+121	63.14%	69.70%
`mario/Player/MarioJump`	`TMario::rocketing()`	+120	88.73%	99.88%
`mario/Player/MarioSound`	`TMario::soundMovement()`	+120	98.25%	99.99%
`mario/Player/MarioSpecial`	`TMario::wireHanging()`	+109	54.40%	61.58%
`mario/Player/WaterGun`	`TWaterGun::movement()`	+64	95.04%	99.57%
`mario/Enemy/wireTrap`	`TWireTrap::load(JSUMemoryInputStream&)`	+38	92.99%	99.82%
`mario/Player/MarioMove`	`TMario::gunExec()`	+17	98.26%	99.75%

Report for GMSE01 (`8c67e6a` - `2a7f90c`)

📈 Matched code: 51.75% (+0.05%, +1724 bytes)
📈 Matched data: 80.48% (+0.05%, +336 bytes)

✅ 6 new matches

Unit	Item	Bytes	Before	After
`mario/Player/MarioRun`	`TMario::considerRotateStart()`	+133	7.86%	100.00%
`mario/Enemy/wireTrap`	`JGeometry::TVec3<float>::set<float>(float, float, float)`	+16	0.00%	100.00%
`mario/Player/WaterGun`	`.data`	+12	96.43%	100.00%
`mario/Enemy/gesso`	`TGesso::rollCheck()`	+1	99.96%	100.00%
`mario/Enemy/smallEnemy`	`TSmallEnemy::changeByJuice()`	+1	99.95%	100.00%
`mario/Player/MarioMove`	`TMario::getJumpSlideControl() const`	+1	99.82%	100.00%

📈 17 improvements in unmatched items

Unit	Item	Bytes	Before	After
`mario/Player/WaterGun`	`TWaterGun::isEmitting()`	+251	0.00%	99.92%
`mario/Player/MarioJump`	`TMario::doJumping()`	+139	80.82%	99.94%
`mario/Player/MarioWait`	`TMario::squating()`	+130	84.20%	99.91%
`mario/Player/MarioJump`	`TMario::rocketCheck()`	+128	50.51%	99.89%
`mario/Player/WaterGun`	`TNozzleBase::animation(int)`	+128	89.33%	99.94%
`mario/Player/WaterGun`	`TNozzleTrigger::animation(int)`	+128	90.78%	99.96%
`mario/Player/WaterGun`	`TNozzleDeform::animation(int)`	+128	93.30%	99.94%
`mario/Player/Yoshi`	`TYoshi::thinkUpper()`	+128	69.59%	99.88%
`mario/Player/MarioDraw`	`MarioHeadCtrl(J3DNode*, int)`	+121	87.94%	99.74%
`mario/Player/MarioDraw`	`TMario::setAnimation(int, float)`	+121	80.10%	94.76%
`mario/Player/MarioJump`	`TMario::rocketing()`	+121	88.76%	99.91%
`mario/Player/MarioSpecial`	`TMario::wireRolling()`	+121	63.14%	69.70%
`mario/Player/MarioSound`	`TMario::soundMovement()`	+120	98.26%	99.99%
`mario/Player/MarioSpecial`	`TMario::wireHanging()`	+109	54.41%	61.59%
`mario/Player/WaterGun`	`TWaterGun::movement()`	+64	95.29%	99.83%
`mario/Enemy/wireTrap`	`TWireTrap::load(JSUMemoryInputStream&)`	+38	92.99%	99.82%
`mario/Player/MarioMove`	`TMario::gunExec()`	+16	98.29%	99.78%

Report for GMSP01 (`8c67e6a` - `2a7f90c`)

📈 Matched code: 52.34% (+0.05%, +1724 bytes)
📈 Matched data: 83.04% (+0.05%, +336 bytes)

✅ 6 new matches

Unit	Item	Bytes	Before	After
`mario/Player/MarioRun`	`TMario::considerRotateStart()`	+133	7.86%	100.00%
`mario/Enemy/wireTrap`	`JGeometry::TVec3<float>::set<float>(float, float, float)`	+16	0.00%	100.00%
`mario/Player/WaterGun`	`.data`	+12	96.43%	100.00%
`mario/Enemy/gesso`	`TGesso::rollCheck()`	+1	99.96%	100.00%
`mario/Enemy/smallEnemy`	`TSmallEnemy::changeByJuice()`	+1	99.95%	100.00%
`mario/Player/MarioMove`	`TMario::getJumpSlideControl() const`	+1	99.82%	100.00%

📈 17 improvements in unmatched items

Unit	Item	Bytes	Before	After
`mario/Player/WaterGun`	`TWaterGun::isEmitting()`	+251	0.00%	99.92%
`mario/Player/MarioJump`	`TMario::doJumping()`	+139	80.82%	99.94%
`mario/Player/MarioWait`	`TMario::squating()`	+130	84.20%	99.91%
`mario/Player/MarioJump`	`TMario::rocketCheck()`	+128	50.51%	99.89%
`mario/Player/WaterGun`	`TNozzleBase::animation(int)`	+128	89.33%	99.94%
`mario/Player/WaterGun`	`TNozzleTrigger::animation(int)`	+128	90.78%	99.96%
`mario/Player/WaterGun`	`TNozzleDeform::animation(int)`	+128	93.30%	99.94%
`mario/Player/Yoshi`	`TYoshi::thinkUpper()`	+128	69.59%	99.88%
`mario/Player/MarioDraw`	`MarioHeadCtrl(J3DNode*, int)`	+121	87.94%	99.74%
`mario/Player/MarioDraw`	`TMario::setAnimation(int, float)`	+121	80.10%	94.76%
`mario/Player/MarioJump`	`TMario::rocketing()`	+121	88.76%	99.91%
`mario/Player/MarioSpecial`	`TMario::wireRolling()`	+121	63.14%	69.70%
`mario/Player/MarioSound`	`TMario::soundMovement()`	+120	98.26%	99.99%
`mario/Player/MarioSpecial`	`TMario::wireHanging()`	+109	54.41%	61.59%
`mario/Player/WaterGun`	`TWaterGun::movement()`	+64	95.29%	99.83%
`mario/Enemy/wireTrap`	`TWireTrap::load(JSUMemoryInputStream&)`	+38	92.99%	99.82%
`mario/Player/MarioMove`	`TMario::gunExec()`	+16	98.29%	99.78%

MagiHotline

LGTM

Mrkol · 2026-11-07T13:45:51Z

will you fix TSeal or do we merge and fix later?

TheAzack9 · 2026-11-07T19:46:01Z

will you fix TSeal or do we merge and fix later?

I will take another look at it and probably add the getter for the water manager as well 🤔 Will put this in draft until i have time to clean it up :)

MagiHotline approved these changes Nov 7, 2026

View reviewed changes

TheAzack9 marked this pull request as draft November 7, 2026 19:46

TheAzack9 marked this pull request as ready for review November 9, 2026 18:43

TheAzack9 added 9 commits November 9, 2026 19:00

use isStatus instead of equality checks

1651271

Name mWaterType and add isWaterType fabricated function

a8f8ef9

gunExec closer

5919559

match getJumpSlideControl

090c4a4

Create enum for yoshi flutterstate

41e26e9

Use water type setter

e34d867

Formatting

1cda3bb

Add getWaterType getter to ModelWaterManager

a36254d

Add getter for mSpine

70dc46e

TheAzack9 force-pushed the az-mariomove branch from 9939494 to 70dc46e Compare November 9, 2026 19:00

TheAzack9 added 2 commits November 9, 2026 19:27

Fix isEmitting in non-jp

41e5046

Messed up the not check

2a7f90c

Mrkol merged commit 185e4c9 into doldecomp:main Nov 9, 2026
6 checks passed

Navigation Menu

Repository navigation

Small improvements on MarioMove + enum for flutterstate + name + enum for water type - #397

Small improvements on MarioMove + enum for flutterstate + name + enum for water type#397
Mrkol merged 11 commits into
doldecomp:mainfrom
TheAzack9:az-mariomove

TheAzack9 commented Nov 6, 2026

Uh oh!

decomp-dev Bot commented Nov 6, 2026 •

edited

Loading

Uh oh!

MagiHotline left a comment

Uh oh!

Mrkol commented Nov 7, 2026

Uh oh!

TheAzack9 commented Nov 7, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

TheAzack9 commented Nov 6, 2026

Uh oh!

decomp-dev Bot commented Nov 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Report for GMSJ01 (8c67e6a - 2a7f90c)

Report for GMSJ01_01 (8c67e6a - 2a7f90c)

Report for GMSP01_NX (8c67e6a - 2a7f90c)

Report for GMSE01 (8c67e6a - 2a7f90c)

Report for GMSP01 (8c67e6a - 2a7f90c)

Uh oh!

MagiHotline left a comment

Choose a reason for hiding this comment

Uh oh!

Mrkol commented Nov 7, 2026

Uh oh!

TheAzack9 commented Nov 7, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

decomp-dev Bot commented Nov 6, 2026 •

edited

Loading

Report for GMSJ01 (`8c67e6a` - `2a7f90c`)

Report for GMSJ01_01 (`8c67e6a` - `2a7f90c`)

Report for GMSP01_NX (`8c67e6a` - `2a7f90c`)

Report for GMSE01 (`8c67e6a` - `2a7f90c`)

Report for GMSP01 (`8c67e6a` - `2a7f90c`)