From 657a2fb24e56e0093ef1f7586bac75f100a651c0 Mon Sep 17 00:00:00 2001 From: BlueZangoose <113498143+BlueZangoose@users.noreply.github.com> Date: Thu, 15 Jun 2023 01:35:14 +0100 Subject: [PATCH] =?UTF-8?q?Fixed=20Pok=C3=A9dex=20display=20during=20start?= =?UTF-8?q?er=20selection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/events/starter_dex.asm | 4 +++- scripts/BrunswickGrotto.asm | 3 ++- scripts/CelesteHillOutside.asm | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/engine/events/starter_dex.asm b/engine/events/starter_dex.asm index 09cd3978..0dbe39b3 100644 --- a/engine/events/starter_dex.asm +++ b/engine/events/starter_dex.asm @@ -1,8 +1,10 @@ ; this function temporarily makes the starters (and once Ivysaur) seen ; so that the full Pokedex information gets displayed in Oak's lab StarterDex: - ld a, 1 << (DEX_BULBASAUR - 1) | 1 << (DEX_CHARMANDER - 1) | 1 << (DEX_SQUIRTLE - 1) | 1 << (DEX_PIKACHU - 1) | 1 << (DEX_EEVEE - 1) + ld a, 1 << (DEX_BULBASAUR - 1) | 1 << (DEX_CHARMANDER - 1) | 1 << (DEX_SQUIRTLE - 1) ;first byte of Pokédex flag array (values 0-7) ld [wPokedexOwned], a + ld a, 1 << (DEX_PIKACHU - 9) | 1 << (DEX_EEVEE - 9) ;second byte of Pokédex flag array (values 8-15) + ld [wPokedexOwned + 1], a predef ShowPokedexData xor a ld [wPokedexOwned], a diff --git a/scripts/BrunswickGrotto.asm b/scripts/BrunswickGrotto.asm index a978ee74..614b6376 100644 --- a/scripts/BrunswickGrotto.asm +++ b/scripts/BrunswickGrotto.asm @@ -3,4 +3,5 @@ BrunswickGrotto_Script: BrunswickGrotto_TextPointers: - text_end ; unused \ No newline at end of file + text_end ; unused + \ No newline at end of file diff --git a/scripts/CelesteHillOutside.asm b/scripts/CelesteHillOutside.asm index 227ad91c..a12c4a0d 100644 --- a/scripts/CelesteHillOutside.asm +++ b/scripts/CelesteHillOutside.asm @@ -3,4 +3,4 @@ CelesteHillOutside_Script: CelesteHillOutside_TextPointers: - text_end ; unused \ No newline at end of file + text_end ; unused