diff --git a/Lua/inject.lua b/Lua/inject.lua index b8d1fa7..d5caa9f 100644 --- a/Lua/inject.lua +++ b/Lua/inject.lua @@ -11,6 +11,12 @@ local injection_points = { ow_addr = 0x1749D0, ow_before = 0x0C05CEC6, }, + ['M JP10'] = { + inject_addr = 0x780000, + inject_maxlen = 0x5A800, + ow_addr = 0x1701A8, + ow_before = 0x0C05BCD4, + }, ['O US10'] = { inject_addr = 0x3BC000, inject_maxlen = 0x1E800, @@ -110,5 +116,9 @@ end if oot then inject('spawn oot.asm') else - inject('spawn mm.asm') + if version == 'M JP10' or version == 'M JP11' then + inject('spawn mm early.asm') + else + inject('spawn mm.asm') + end end diff --git a/Lua/inject/spawn mm early.asm b/Lua/inject/spawn mm early.asm new file mode 100644 index 0000000..e6aa926 --- /dev/null +++ b/Lua/inject/spawn mm early.asm @@ -0,0 +1,24 @@ +[actor_spawn]: 0x800BC98C +[object_spawn]: 0x80130D50 +[max_actor_no]: 0x2B1 + +[global_context]: 0x803E6CF0 +[buttons_offset]: 0x14 +[actor_spawn_offset]: 0x1CA0 +[object_spawn_offset]: 0x17D68 + +[link_actor]: 0x803FFFA0 +[actor_x]: 0x24 +[actor_y]: 0x28 +[actor_z]: 0x2C +[actor_horiz_angle]: 0x32 + +[link_save]: 0x801EF460 +[rupees_offset]: 0x3A +[upgrades_offset]: 0xB8 +[upgrades_2_offset]: 0xBA + +.include "spawn.asm" + +actor_object_table: +.include "actor object table mm.asm"