From afb899016938d03911eaafb85c7caa1c67680210 Mon Sep 17 00:00:00 2001 From: Rangi <35663410+Rangi42@users.noreply.github.com> Date: Tue, 28 Jan 2025 23:31:15 -0500 Subject: Miscellaneous cleanup (#488) Co-authored-by: SatoMew --- home/pokemon.asm | 6 +++++- home/text.asm | 2 +- home/yes_no.asm | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'home') diff --git a/home/pokemon.asm b/home/pokemon.asm index 7cc5f2d1..afa0d129 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -114,7 +114,11 @@ LoadFrontSpriteByMonIndex:: cp NUM_POKEMON + 1 jr c, .validDexNumber ; dex >#151 invalid .invalidDexNumber - ld a, RHYDON ; $1 + ; This is the so-called "Rhydon trap" or "Rhydon glitch" + ; to fail-safe invalid dex numbers + ; (see https://glitchcity.wiki/wiki/Rhydon_trap + ; or https://bulbapedia.bulbagarden.net/wiki/Rhydon_glitch) + ld a, RHYDON ld [wCurPartySpecies], a ret .validDexNumber diff --git a/home/text.asm b/home/text.asm index da884125..112956da 100644 --- a/home/text.asm +++ b/home/text.asm @@ -111,7 +111,7 @@ NextChar:: inc de jp PlaceNextChar -NullChar:: ; unused +NullChar:: ld b, h ld c, l pop hl diff --git a/home/yes_no.asm b/home/yes_no.asm index 3f5a5a45..8d995832 100644 --- a/home/yes_no.asm +++ b/home/yes_no.asm @@ -26,7 +26,7 @@ YesNoChoicePokeCenter:: lb bc, 8, 12 jr DisplayYesNoChoice -WideYesNoChoice:: ; unused +WideYesNoChoice:: ; unreferenced call SaveScreenTilesToBuffer1 ld a, WIDE_YES_NO_MENU ld [wTwoOptionMenuID], a -- cgit v1.3.1-sl0p