From dffcaeb4c07c0f728c6ec9e58ef22a5519c48dbc Mon Sep 17 00:00:00 2001 From: 1jamie Date: Mon, 21 Sep 2026 17:21:20 -0500 Subject: [PATCH] fix: use rawget for global bit library lookups and fix variable assignment in trainer fan club --- src/core/game3/trainer_fan_club.lua | 4 +++- src/import/gba/lz77.lua | 2 +- src/import/gba/pokemon_extract.lua | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/game3/trainer_fan_club.lua b/src/core/game3/trainer_fan_club.lua index aa5a4371..5d11716f 100644 --- a/src/core/game3/trainer_fan_club.lua +++ b/src/core/game3/trainer_fan_club.lua @@ -302,7 +302,9 @@ function TrainerFanClub.tryGainNewFanFromCounter(session, ctx, counterIdx) if timer + inc >= 20 then if TrainerFanClub.countFans(fanFlags) < 3 then TrainerFanClub.playerGainRandomTrainerFan(session, ctx) - _, gotInitialFans, fanFlags = TrainerFanClub.getFanClubData(session, ctx) + local _unused, newGotInitial, newFanFlags = TrainerFanClub.getFanClubData(session, ctx) + gotInitialFans = newGotInitial + fanFlags = newFanFlags timer = 0 else timer = 20 diff --git a/src/import/gba/lz77.lua b/src/import/gba/lz77.lua index 22999ddf..a21a040c 100644 --- a/src/import/gba/lz77.lua +++ b/src/import/gba/lz77.lua @@ -12,7 +12,7 @@ do end end -local bit = bit or bit32 +local bit = rawget(_G, "bit") or rawget(_G, "bit32") if not bit then local ok, mod = pcall(require, "bit") if ok and mod then bit = mod end diff --git a/src/import/gba/pokemon_extract.lua b/src/import/gba/pokemon_extract.lua index 3e56aa60..46b02ffb 100644 --- a/src/import/gba/pokemon_extract.lua +++ b/src/import/gba/pokemon_extract.lua @@ -97,7 +97,7 @@ do end end -local bit = bit or bit32 +local bit = rawget(_G, "bit") or rawget(_G, "bit32") if not bit then local ok, mod = pcall(require, "bit") if ok and mod then bit = mod end