1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2024-11-04 22:49:03 -08:00

skip loading scene/room actors/objects

This commit is contained in:
Connor Olding 2016-01-09 09:19:21 -08:00
parent 5eff669148
commit c3c9d632e0
2 changed files with 22 additions and 1 deletions

View file

@ -20,3 +20,24 @@
[upgrades_2_offset]: 0xBA
.include "spawn.asm"
[whatever]: 0x807D0000 // stupid hack since i can't store/restore PC (not yet!)
.org @whatever
push 5, ra
lhu t0, 0(a1)
andi t0, t0, 0x07FF
bnei t0, 0x0C5, + // skip if not title screen actor
nop
jal 0x800BB2D0 // original code
nop
+:
jpop 5, ra
.org 0x800B9430 // part of scene actor loading routine
jal @whatever
.org 0x8012FC18 // scene command 0x0B (objects)
// don't load any objects manually,
// since spawn.asm handles that automatically
jr
nop

View file

@ -98,7 +98,7 @@ simple_spawn: // args: a0 (actor to spawn)
li t9, 0x0000007F
sw t9, 0x28(sp) // unknown
li t9, 0x000003FF
sw t9, 0x2C(sp) // unknown
sw t9, 0x2C(sp) // spawn time? (probably MM only)
li t9, 0x00000000
sw t9, 0x30(sp) // unknown
jal @actor_spawn