Added a time multiplier for the final frog song to make it more lenient - #849
Conversation
|
Oh I seem to have bungled it up. Please wait with reviewing. |
…/OoT3D_Randomizer into feature/more-time-on-frog-song # Conflicts: # code/src/actors/frog.c # code/src/main.c
|
Fixed it, it's ready for review again |
| mov r2,r0 | ||
| pop {r0,r1,r3-r12,lr} | ||
| strh r2,[r1,#0x42] | ||
| b 0x381208 |
There was a problem hiding this comment.
Will this branch be linked to the correct offset for the EU version? Or do I need to do something else with it?
There was a problem hiding this comment.
This is fine, addresses outside the range 0x419E18-0x4A5AFF are the same in both versions. And there are a lot of hard-coded addresses in hooks.s still, so this won't be an outlier
There was a problem hiding this comment.
Personally I'd recommend using a bl in the hook and bx lr here, there are times where hard-coded addresses are the only feasible option but I'd prefer to keep them to a minimum.
This isn't always available as an option, but because the function we're patching has already stored the link register on the stack and it won't be used again until the next bl where it'll be overwritten a couple lines later it's safe to do in this instance.
There was a problem hiding this comment.
Oh I will change that then!
HylianFreddy
left a comment
HylianFreddy
left a comment
There was a problem hiding this comment.
This looks good to me, I just have some code style suggestions.
Co-authored-by: HylianFreddy <82058772+HylianFreddy@users.noreply.github.com>
Co-authored-by: HylianFreddy <82058772+HylianFreddy@users.noreply.github.com>
Co-authored-by: HylianFreddy <82058772+HylianFreddy@users.noreply.github.com>
3 participants
No description provided.