notwa/mm
1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2024-11-05 02:59:03 -08:00
Code Issues Releases Wiki Activity

use shorter turtle cutscenes

Browse source
This commit is contained in:
Connor Olding 2016-01-30 19:09:51 -08:00
parent 93115a1d63
commit 8df8f7ba8d
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Lua/inject/beta.asm
View file

@ -23,14 +23,12 @@
/* TODO: /* TODO:
short term: short term:
fix/shuffle cleansed/unfrozen scenes that lead to each other
test beating each boss and other cutscene stuff (odolwa works) test beating each boss and other cutscene stuff (odolwa works)
fix death warps so they won't spawn you out of bounds fix death warps so they won't spawn you out of bounds
make sure koume spawns in the woods make sure koume spawns in the woods
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
allow buying of biggest bomb bag without an existing bomb bag allow buying of biggest bomb bag without an existing bomb bag
make turtle cutscene shorter (just set first time flag by default)
long term: long term:
add/fix generic grottos add/fix generic grottos
@ -150,14 +148,20 @@ load_hook:
sb t0, @have_tatl(s0) sb t0, @have_tatl(s0)
li a0, 0x0063 // inside clock tower li a0, 0x0063 // inside clock tower
li a1, 1 // second word li a1, 1 // second word
li a2, 0 // first bit ("You've met with a terrible fate")
jal set_scene_flag jal set_scene_flag
nop li a2, 0 // first bit ("You've met with a terrible fate")
li a0, @week_event_reg li a0, @week_event_reg
li a1, 31 li a1, 31
li a2, 2 // Tatl reminding you about the four directions
jal set_event_flag jal set_event_flag
nop li a2, 2 // Tatl reminding you about the four directions
li a0, @week_event_reg
li a1, 93
jal set_event_flag
li a2, 3 // woken turtle once (shortens cutscene)
li a0, @week_event_reg
li a1, 53
jal set_event_flag
li a2, 6 // taken turtle once (skips pirates getting wrekt)
+: +:
addi a0, s0, @player_name addi a0, s0, @player_name
li a2, 0xFFFFFFFF li a2, 0xFFFFFFFF
@ -322,7 +326,6 @@ shuffle_hook:
jal set_alt_scene jal set_alt_scene
mov a0, v0 mov a0, v0
mov s0, v0 mov s0, v0
shuffle_hook_more:
// set woodfall temple as raised after beating odolwa // set woodfall temple as raised after beating odolwa
// otherwise the swamp won't be cleansed // otherwise the swamp won't be cleansed
li at, 0x8601 li at, 0x8601