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

always cleanse swamp after beating odolwa

Browse source
This commit is contained in:
Connor Olding 2016-01-30 12:13:02 -08:00
parent e6e32772f9
commit 00509592dc
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Lua/inject/beta.asm
View file

@ -23,9 +23,8 @@
/* TODO: /* TODO:
short term: short term:
shuffle boss entrances fix/shuffle cleansed/unfrozen scenes that lead to each other
ALWAYS cleanse swamp, even if woodfall temple isn't raised test beating each boss and other cutscene stuff (odolwa works)
test beating each boss and other cutscene stuff
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
@ -251,7 +250,7 @@ shuffle_exit_return:
shuffle_hook: shuffle_hook:
push 4, s0, ra push 4, s0, ra
jal shuffle_exit jal shuffle_exit // immediately pass a0 to here
nop nop
mov s0, v0 mov s0, v0
// handle alt scenes depending on game state // handle alt scenes depending on game state
@ -275,7 +274,7 @@ shuffle_hook:
li a1, 33 li a1, 33
jal get_event_flag jal get_event_flag
li a2, 7 li a2, 7
beqz v0, shuffle_hook_done beqz v0, shuffle_hook_more
nop nop
andi t9, s0, 0x01FF andi t9, s0, 0x01FF
andi t0, s0, 0xFE00 andi t0, s0, 0xFE00
@ -294,7 +293,16 @@ shuffle_hook:
li at, 0xB600 li at, 0xB600
addu s0, t9, at addu s0, t9, at
+: +:
shuffle_hook_done: shuffle_hook_more:
// set woodfall temple as raised after beating odolwa
// otherwise the swamp won't be cleansed
li at, 0x8601
bne s0, at, +
li a1, 20
li a0, @week_event_reg
jal set_event_flag
li a2, 0
+:
mov a0, s0 mov a0, s0
pop 4, s0, ra pop 4, s0, ra
j shuffle_hook_return j shuffle_hook_return