From 1024d5efaf5d82817cb36e91f0b34ab274d5758e Mon Sep 17 00:00:00 2001 From: Wlowscha <54003515+Wlowscha@users.noreply.github.com> Date: Sat, 8 Feb 2025 01:43:42 +0100 Subject: [PATCH] Fixed logic for cursor coming down from filter bar --- src/ui/pokedex-ui-handler.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/pokedex-ui-handler.ts index 9d1a49682e2..51994af0e9d 100644 --- a/src/ui/pokedex-ui-handler.ts +++ b/src/ui/pokedex-ui-handler.ts @@ -928,19 +928,15 @@ export default class PokedexUiHandler extends MessageUiHandler { case Button.DOWN: if (this.filterBar.openDropDown) { success = this.filterBar.incDropDownCursor(); - } else if (this.filterBarCursor === this.filterBar.numFilters - 1) { - // DOWN from the last filter - this.setFilterMode(false); - this.cursorObj.setVisible(false); - success = true; } else if (numberOfStarters > 0) { // DOWN from filter bar to top of Pokemon list this.setFilterMode(false); this.scrollCursor = 0; this.updateScroll(); const proportion = this.filterBarCursor / Math.max(1, this.filterBar.numFilters - 1); - const targetCol = Math.min(8, Math.floor(proportion * 11)); + const targetCol = Math.min(8, Math.floor(proportion * 8)); this.setCursor(Math.min(targetCol, numberOfStarters)); + console.log(this.filterBar.numFilters, proportion, targetCol); success = true; } break;