diff --git a/Lua/inject/spawn mm early.asm b/Lua/inject/spawn mm early.asm index e6aa926..a4ed662 100644 --- a/Lua/inject/spawn mm early.asm +++ b/Lua/inject/spawn mm early.asm @@ -1,5 +1,6 @@ [actor_spawn]: 0x800BC98C [object_spawn]: 0x80130D50 +[object_index]: 0x80131078 [max_actor_no]: 0x2B1 [global_context]: 0x803E6CF0 @@ -19,6 +20,3 @@ [upgrades_2_offset]: 0xBA .include "spawn.asm" - -actor_object_table: -.include "actor object table mm.asm" diff --git a/Lua/inject/spawn mm.asm b/Lua/inject/spawn mm.asm index 834b616..e4c4cc3 100644 --- a/Lua/inject/spawn mm.asm +++ b/Lua/inject/spawn mm.asm @@ -1,5 +1,6 @@ [actor_spawn]: 0x800BAE14 [object_spawn]: 0x8012F2E0 +[object_index]: 0x8012F608 [max_actor_no]: 0x2B1 [global_context]: 0x803E6B20 @@ -19,6 +20,3 @@ [upgrades_2_offset]: 0xBA .include "spawn.asm" - -actor_object_table: -.include "actor object table mm.asm" diff --git a/Lua/inject/spawn.asm b/Lua/inject/spawn.asm index 98a9c89..54ec1f4 100644 --- a/Lua/inject/spawn.asm +++ b/Lua/inject/spawn.asm @@ -129,7 +129,7 @@ hold_delay: nop // NOTE: this allows object 0002 to load in places it's not meant to. // this can mess up door graphics (among other things?) - jal object_spawn + jal @object_spawn nop //subiu v0, r0, -1 // original code +: