From 0b33c25b399311f8c2165e1638f7afde7cd8e226 Mon Sep 17 00:00:00 2001 From: zig-for Date: Thu, 11 May 2023 08:52:29 -0700 Subject: [PATCH] Fix pokemon lua on bizhawk 2.9 (#1794) --------- Co-authored-by: Alchav <59858495+Alchav@users.noreply.github.com> --- data/lua/connector_pkmn_rb.lua | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/data/lua/connector_pkmn_rb.lua b/data/lua/connector_pkmn_rb.lua index 1c214c4a..7a1a3d0b 100644 --- a/data/lua/connector_pkmn_rb.lua +++ b/data/lua/connector_pkmn_rb.lua @@ -57,19 +57,22 @@ function generateLocationsChecked() events = uRange(EventFlagAddress, 0x140) missables = uRange(MissableAddress, 0x20) hiddenitems = uRange(HiddenItemsAddress, 0x0E) + rod = {u8(RodAddress)} dexsanity = uRange(DexSanityAddress, 19) - rod = u8(RodAddress) + data = {} - table.foreach(events, function(k, v) table.insert(data, v) end) - table.foreach(missables, function(k, v) table.insert(data, v) end) - table.foreach(hiddenitems, function(k, v) table.insert(data, v) end) - table.insert(data, rod) + categories = {events, missables, hiddenitems, rod} + if compat > 1 then + table.insert(categories, dexsanity) + end + for _, category in ipairs(categories) do + for _, v in ipairs(category) do + table.insert(data, v) + end + end - if compat > 1 then - table.foreach(dexsanity, function(k, v) table.insert(data, v) end) - end return data end