Skip to content

Add Double Magic Model and Clean Magic 1 ZOBJ#2413

Merged
fenhl merged 2 commits into
OoTRandomizer:Devfrom
Maplesstar:MagicScroll2
Apr 30, 2025
Merged

Add Double Magic Model and Clean Magic 1 ZOBJ#2413
fenhl merged 2 commits into
OoTRandomizer:Devfrom
Maplesstar:MagicScroll2

Conversation

@Maplesstar
Copy link
Copy Markdown

@Maplesstar Maplesstar commented Apr 27, 2025

Edited now that the typo is fixed: It loads on RetroArch and Bizhawk for sure. No other platforms tested.
image

PR also removes the Shine displaylist from the magic 1 zobj since the last edits no longer use it so the model is a little smaller.

Removed Shine DL from magic 1 since it was unused.
@fenhl fenhl added Type: Enhancement New feature or request Status: Help Wanted Extra attention is needed Status: Needs Review Someone should be looking at it Status: Needs Testing Probably should be tested Component: Misc A catch-all label Type: Maintenance Code style, infrastructure, updating dependencies labels Apr 27, 2025
@fenhl
Copy link
Copy Markdown
Collaborator

fenhl commented Apr 27, 2025

Project64 reports the following errors:

Break point found at MemoryExceptionFilter.cpp
33

and

CN64System::RunRSP()
Unknown memory action

Emulation stopping

@flagrama
Copy link
Copy Markdown

flagrama commented Apr 27, 2025

image

Offset 0xfda does not look like the right offset to have there to me. Offsets should end with either a 0 or 8. Anything else is the middle of a RSP command.

@Maplesstar
Copy link
Copy Markdown
Author

image
It works now on Bizhawk. Thank you, Flag.

@fenhl
Copy link
Copy Markdown
Collaborator

fenhl commented Apr 30, 2025

Can confirm it works on Project64 as well now.

Are you aware of anything else wrong with this PR? If not, please mark it as ready for review.

@fenhl fenhl removed Status: Needs Testing Probably should be tested Status: Help Wanted Extra attention is needed labels Apr 30, 2025
@fenhl fenhl added Status: Waiting for Author Changes or response requested and removed Status: Needs Review Someone should be looking at it labels Apr 30, 2025
@Maplesstar Maplesstar marked this pull request as ready for review April 30, 2025 13:02
@Maplesstar
Copy link
Copy Markdown
Author

Last time I think the visual issue showed up on VC? So that probably should be checked too

@fenhl fenhl added Status: Needs Testing Probably should be tested and removed Status: Waiting for Author Changes or response requested Status: Needs Testing Probably should be tested labels Apr 30, 2025
@fenhl fenhl added this to the next milestone Apr 30, 2025
@fenhl fenhl merged commit d3559b8 into OoTRandomizer:Dev Apr 30, 2025
3 checks passed
@Maplesstar Maplesstar deleted the MagicScroll2 branch April 30, 2025 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Component: Misc A catch-all label Type: Enhancement New feature or request Type: Maintenance Code style, infrastructure, updating dependencies

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants