notwa/mm
1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2025-02-05 13:23:23 -08:00
Code Issues Releases Wiki Activity

don't shuffle cutscenes

Browse source
This commit is contained in:
Connor Olding 2016-02-02 03:00:17 -08:00
parent 4c60e8f05d
commit 188cda6a5a
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Lua/inject/beta.asm
View file

@ -6,6 +6,7 @@
[week_event_reg]: 0xEF8 [week_event_reg]: 0xEF8
[voidout_type]: 0x3CB0 [voidout_type]: 0x3CB0
[voidout_exit]: 0x3CC4 [voidout_exit]: 0x3CC4
[exit_mod_setter]: 0x3F4A
[scene_flags_ingame]: 0x3F68 [scene_flags_ingame]: 0x3F68
[global_context]: 0x803E6B20 [global_context]: 0x803E6B20
@ -25,7 +26,6 @@
/* TODO: /* TODO:
short term: short term:
don't shuffle termina field skull kid cutscene
test beating each boss and other cutscene stuff (odolwa works) test beating each boss and other cutscene stuff (odolwa works)
allow peeking thru curiosity shop at any time allow peeking thru curiosity shop at any time
set up wallet sizes not unlike mm randomizer set up wallet sizes not unlike mm randomizer
@ -355,6 +355,10 @@ shuffle_exit:
// if this was a void out, don't shuffle // if this was a void out, don't shuffle
bnez t1, + bnez t1, +
mov s0, a0 mov s0, a0
// if this is a cutscene, don't shuffle
lh t2, @exit_mod_setter(t0)
bnei t2, 0xFFEF, +
nop
// implicitly passes a0 // implicitly passes a0
jal unset_alt_scene jal unset_alt_scene
nop nop