mirror of
https://github.com/bryanthaboi/gen1recomp.git
synced 2026-08-21 05:00:43 +02:00
fix(gen2): honor battle party grid navigation
This commit is contained in:
@@ -2290,6 +2290,7 @@ function BattleState:openParty(forced)
|
||||
-- :2702; engine/pokemon/party_menu.asm:660-679). Only the voluntary list
|
||||
-- carries BattleMonMenu; PickPartyMonInBattle has no submenu.
|
||||
prompt = forced and "which" or "choose",
|
||||
battle = true,
|
||||
battleSubmenu = not forced,
|
||||
onCancel = function()
|
||||
stack:pop()
|
||||
@@ -2762,6 +2763,7 @@ function BattleState:openShiftParty()
|
||||
self.phase = "submenu"
|
||||
Screens.push(self.game, "Gen2PartyMenu", {
|
||||
prompt = "which",
|
||||
battle = true,
|
||||
onCancel = function()
|
||||
stack:pop()
|
||||
self.phase = "resolving"
|
||||
@@ -3135,6 +3137,7 @@ function BattleState:useOnPartyMon(itemId, action)
|
||||
self.phase = "submenu"
|
||||
Screens.push(self.game, "Gen2PartyMenu", {
|
||||
prompt = "useItem",
|
||||
battle = true,
|
||||
party = self.battle.party or (self.save and self.save.party),
|
||||
onCancel = function()
|
||||
stack:pop()
|
||||
|
||||
Reference in New Issue
Block a user