mirror/gen1recomp
1
0
Fork 0
mirror of https://github.com/bryanthaboi/gen1recomp synced 2026-10-02 15:50:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

CLOSES #2290, CLOSES #2338, CLOSES #2186, CLOSES #2305, CLOSES #2332, CLOSES #2320, CLOSES #2344, CLOSES #2291, CLOSES #2335, CLOSES #2340, CLOSES #2385, CLOSES #2352, CLOSES #2378, CLOSES #2403, CLOSES #2404, CLOSES #2405, CLOSES #2367, CLOSES #2037, CLOSES #2177, CLOSES #2368, CLOSES #2382, CLOSES #1951

Browse Source 
CLOSES #2290, CLOSES #2338, CLOSES #2186, CLOSES #2305, CLOSES #2332, CLOSES #2320, CLOSES #2344, CLOSES #2291, CLOSES #2335, CLOSES #2340, CLOSES #2385, CLOSES #2352, CLOSES #2378, CLOSES #2403, CLOSES #2404, CLOSES #2405, CLOSES #2367, CLOSES #2037, CLOSES #2177, CLOSES #2368, CLOSES #2382, CLOSES #1951
This commit is contained in:
bryanthaboi
2026-09-22 16:27:28 -04:00
parent 78a3defa72
commit 23617f43b4
134 changed files with 11244 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/BagMenu.lua
+22 -5
View File
@@ -245,8 +245,9 @@ local function vanillaUseOn(game, battle, id, target, list, moveIndex, picker)
local function teach()
-- PIKAHAPPY_USEDTMHM on a successful teach (item_effects.asm:2500)
local function taught()
require("src.world.PikachuFollower")
.modifyHappiness(game.save, "USEDTMHM", target)
local PikachuFollower = require("src.world.PikachuFollower")
PikachuFollower.modifyHappiness(game.save, "USEDTMHM", target)
PikachuFollower.onMoveLearned(game.save, target, moveId)
end
if #target.moves < 4 then
table.insert(target.moves, { id = moveId, pp = mdef.pp })
@@ -311,8 +312,9 @@ local function vanillaUseOn(game, battle, id, target, list, moveIndex, picker)
local alarm = battle.lowHealthAlarmActive and battle:lowHealthAlarmActive()
local opts = nil
if not alarm then
opts = TextBox.soundOpts(game, "Pokeflute",
{ auto = { wait = false, delay = 0, promptFirst = true } })
opts = TextBox.soundOpts(game, function()
return require("src.core.Sound").playPokefluteInBattle(game.data)
end, { auto = { wait = false, delay = 0, promptFirst = true } })
end
showMessages(game, head, function()
showMessages(game, tail, function() spent({}) end)
@@ -436,6 +438,8 @@ local function vanillaUseOn(game, battle, id, target, list, moveIndex, picker)
local mdef = game.data.moves[moveId]
if #target.moves < 4 then
table.insert(target.moves, { id = moveId, pp = mdef.pp })
require("src.world.PikachuFollower")
.onMoveLearned(game.save, target, moveId)
local name = target.nickname or def.name
showMessages(game, { Strings("%s learned\n%s!", name, mdef.name) },
nextStep, TextBox.soundOpts(game, "Get_Item1"))
@@ -475,6 +479,19 @@ local function vanillaUseOn(game, battle, id, target, list, moveIndex, picker)
return
end
-- engine/items/item_effects.asm:2004-2006
if result == "ppmaxed" then
local menu = game.stack:top()
if not (menu and picker and menu.owner == picker and menu.held
and menu.ask) then
menu = nil
end
showMessages(game, payload, function()
if menu then menu:ask() else closePicker() end
end)
return
end
-- .chooseMon loops on a refusal, so the TM/HM picker stays up for another
-- pick (engine/items/item_effects.asm:2234, :2237) (#1686)
local machineDef = game.data.items[id]
@@ -526,7 +543,7 @@ local function pickTargetAndUse(game, battle, id, list)
require("src.ui.Screens").push(game, "MoveSelectMenu", mon, prompt,
function(moveIndex)
useOn(game, battle, id, mon, list, moveIndex, picker)
end)
end, nil, picker)
end,
}
-- TM/HM: open the party menu in Gen 1's TM/HM display mode so each mon