Z2mario - #420

Draft

jroweboy wants to merge 128 commits into

Ellendar:5.2from

jroweboy:z2mario

Commits on May 29, 2026

Add UI option for z2mario
jroweboy
committed
884fa86
Initial port of the beta z2mario code
jroweboy
committed
514c900
WIP - Bringing files over from z2mario
jroweboy
committed
5178b21
wip
jroweboy
committed
64e7932
Back in action finally
jroweboy
committed
1df5458
Fix lives screen mario, and prevent shooting fire without fire active
jroweboy
committed
0e707df
First public teaser video made
jroweboy
committed
14be772
Make mario big when gaining life
jroweboy
committed
a4b6bae
Add mostly working hammer
jroweboy
committed
6888a9b
Fix hammer to actually work properly
jroweboy
committed
7b28389
Make shield spell hold up a real shield
jroweboy
committed
c506ce4
Break blocks with hammer
jroweboy
committed
e324c82
Revert to .net8 temporarily
jroweboy
committed
6c82116
Fix issue with .net8 sucking
jroweboy
committed
3ceef55
Major bug fixing efforts
jroweboy
committed
8ae8c28
WIP Dark Mario fight
jroweboy
committed
cdca535
Bring it back to .net 10
jroweboy
committed
5da8499
Work around NMI interrupting audio playback
jroweboy
committed
83419c6
WIP boss fight collision and proper motion
jroweboy
committed
db486fa
Mostly working boss. New title screen logo
jroweboy
committed
88bf6ef
working towards finally getting the final boss done
jroweboy
committed
d152080
Fix up boss death animation
jroweboy
committed
4fa285e
Mostly working boss behavior finally
jroweboy
committed
5e861c9
Finally. The boss is finally mostly working
jroweboy
committed
9c29ef1
Finish boss design
jroweboy
committed
ca40299
Disable demo code and remove shadow fireball hack
jroweboy
committed
134d4a2
Reset the custom music tracks on death
jroweboy
committed
2b5f4b4
Remove unused boss fireball check
jroweboy
committed
8833197
Fixup the title screen to properly support removing the RANDOMIZER line
jroweboy
committed
4c2d6d7
Skip bounce recoil when processing projectiles
jroweboy
committed
c1277aa
Remove a buncha unused code
jroweboy
committed
4adfc9c
SO MANY FIXES FOR EVERYTHING
jroweboy
committed
55b14a2
Re-add in an rts that is used but freed
jroweboy
committed
d2a5714
Rename the fields on the stats screen
jroweboy
committed
cb4258e
Fix second time the title screen is drawn
jroweboy
committed
8acbf59
Basic tanooki tail rendering
jroweboy
committed
2818a21
Update banks for the sprites to account for the tanooki suit
jroweboy
committed
0ac6dc1
Keep tail between screens and shrink on too much damage
jroweboy
committed
a3e844d
Add tail swipe animation
jroweboy
committed
a077ce3
Port smb3 tail sfx
jroweboy
committed
ab22e6d
Add tail swipe hitbox
jroweboy
committed
3228e43
Add a brick break hitbox to the tail
jroweboy
committed
6456f47
Fix tail swipe hitbox and animations
jroweboy
committed
16a9a0c
Various fixes
jroweboy
committed
643e413
Fixup hammer recoil and remove lots of unused variables
jroweboy
committed
e7b7500
Remove more dead code, fix elevator areatype issue, mostly fix hammer offscreen
jroweboy
committed
e2dfc64
Add HOT NEW L O R E for z2mario
jroweboy
committed
d84b8fa
Clear out shield on death and lives screen
jroweboy
committed
732adef
Remove unused smb1 noise sfx and try to make indoor theme play
jroweboy
committed
d020770
Add 1up and lives sprite
jroweboy
committed
0a2f28e
Put tail sprite behind mud
jroweboy
committed
12b5f5c
Don't clamp mario position when scroll locked
jroweboy
committed
3b833f8
Fix fairy glitching through top of elevator
jroweboy
committed
e046994
Remove unused tail sprite, remove house music, try to fix final cutscene with tanooki
jroweboy
committed
4d1ad53
Fix boss fireball spawn position and add UNLIKE LINK instead of the end
jroweboy
committed
22197d1
Add TANOOKI spell name
jroweboy
committed
7a3cd80
Fix elimination mode playing music in title screen instead of delete sfx
jroweboy
committed
2659486
Fix hammer giving mario speed and add darunia chimney support
jroweboy
committed
c298b2a
Free up space by putting ganon laugh in PRG1F
jroweboy
committed
8e91f22
Fix moa sfx when using custom music
jroweboy
committed
09b8aea
Add house to global music handler
jroweboy
committed
96c0949
Fix issues after rebase
jroweboy
committed
8dd1d76
Fix up ram inc issues
jroweboy
committed
ffada8a
Add original ftm modules for the z2mario music tracks
jroweboy
committed
0d61515
Start trying to fix shadow sprites on boss defeat
jroweboy
committed
3b33440
Fix shadow sprite and remove music workaround (will update z2ft to get it later)
jroweboy
committed
a9358d9
Fix cutoff sfx so that it properly kills sfx
jroweboy
committed
f353c7e
Allow the speedup patch to run for z2 mario mode only
jroweboy
committed
7f82ca1
Fix tail swipe issue when using it while silent
jroweboy
committed
66afee8
Fix tile collision for bricks added later
jroweboy
committed
394cb01

Commits on May 30, 2026

Commits on Jun 2, 2026

Clean up csproj files and use a consistent style
jroweboy
committed
bb6fe96

Commits on Jun 3, 2026

Fix tanooki getting stuck and player palette on sideview change
jroweboy
committed
3919da3
Fix issues with game over screen
jroweboy
committed
b8ef08d

Commits on Jun 9, 2026

Add a version hash for the vanilla z2mario romhack
jroweboy
committed
8ab47ef
Add flute twister stub
jroweboy
committed
c202105

Commits on Jun 10, 2026

First attempt at making the flute warp work
jroweboy
committed
3e3f252

Commits on Jun 19, 2026

Builds but almost certainly contains logical bugs.

Ellendar
authored and
jroweboy
committed
a3a91a3
Flag/seed pasting convenience, filename formatting

pmcneill
authored and
jroweboy
committed
230488b
Adds version option for filenames

pmcneill
authored and
jroweboy
committed
fb13114
Fix warnings

initsu
authored and
jroweboy
committed
81e4f4b
Update dependencies

initsu
authored and
jroweboy
committed
7756bb5
Keep level 9 XP costs when not shuffling XP

initsu
authored and
jroweboy
committed
937c31b
Revert "Merge pull request #418 from Ellendar/main"

Ellendar
authored and
jroweboy
committed
35ca591
Restoring changes inadvertently removed.

Ellendar
authored and
jroweboy
committed
0502baa
Always write P-bag cave collectable to ROM

initsu
authored and
jroweboy
committed
4ad0d0e
Allow headerless and different header ROMs

initsu
authored and
jroweboy
committed
985a35a
Ask for a new ROM output folder if ROM writing throws

initsu
authored and
jroweboy
committed
533c8fd

Commits on Jul 11, 2026

WIP Flute still mostly working this time for real
jroweboy
committed
09f3421

Commits on Jul 13, 2026

Fix outstanding issues with flute -> palace warp
jroweboy
committed
b34ecf7
Play 1up sound when grabbing a link doll
jroweboy
committed
ad65903
Make small mario throw hammers but use a nonglitchy frame unless fire
jroweboy
committed
e0f32a0
Skip over upstab hitbox check which triggered on marios swimming frame
jroweboy
committed
fe46958
Fix fairy bouncing phasing through sometimes
jroweboy
committed
59231c7
Clear out some mario specific code on screen transition
jroweboy
committed
f323924

Commits on Jul 14, 2026

Commits on Jul 15, 2026

Replace flute song for warp whistle
jroweboy
committed
023d561
WIP new texts for mario hints
jroweboy
committed
93b1a47

Commits on Jul 17, 2026

Add tanooki statue and spell spell star power
jroweboy
committed
6ac2a69
Allow flute warps to different locations
jroweboy
committed
1b05573

Commits on Jul 18, 2026

Commits on Jul 19, 2026

Update IRQ to prevent horrible things from happening
jroweboy
committed
d283708
Make hammer throw from mario at small height when small
jroweboy
committed
87c5000

Commits on Jul 20, 2026

Commits on Jul 22, 2026

Commits on Jul 23, 2026

Fix up dialog support for mario mode
jroweboy
committed
eb353ab
I will PHYSICALLY EXPLODE if i have to fix another sfx bug.
jroweboy
committed
c5b5a79
It was technically a bug with the assembler and not SFX
jroweboy
committed
c7db952
!
jroweboy
committed
55141ae
More jump branches
jroweboy
committed
c902582

Commits on Jul 27, 2026

Fix player turning into link when bridge is built
jroweboy
committed
a159ee8
Clear out the current chr to fix the title screen on second quest
jroweboy
committed
06c048a
*boom* (i exploded)
jroweboy
committed
b620b7a