From b028e138347e9de72277c525b11d0592ba14498d Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Sat, 14 Feb 2015 01:40:38 -0700 Subject: [PATCH] =?UTF-8?q?Give=20an=20internal=20Pok=C3=A9dex=20status=20?= =?UTF-8?q?variable=20its=20own=20label.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This new label is used in revision 1.1 of Pokémon Crystal. --- engine/pokedex.asm | 8 ++++---- main.asm | 10 +++++----- wram.asm | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 004836f62..f1a1d978c 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -314,7 +314,7 @@ Function401ae: ; 401ae (10:41ae) Function40217: ; 40217 (10:4217) call LowVolume xor a - ld [wcf65], a + ld [wPokedexStatus], a xor a ld [hBGMapMode], a ; $ff00+$d4 call ClearSprites @@ -373,9 +373,9 @@ Function40258: ; 40258 (10:4258) ; 40292 (10:4292) Function40292: ; 40292 - ld a, [wcf65] + ld a, [wPokedexStatus] xor $1 - ld [wcf65], a + ld [wPokedexStatus], a call Function40bb1 ld [wc2d6], a callba Function4424d @@ -386,7 +386,7 @@ Function40292: ; 40292 Function402aa: ; 402aa (10:42aa) call Function41401 xor a - ld [wcf65], a + ld [wPokedexStatus], a xor a ld [hBGMapMode], a ; $ff00+$d4 call Function407fd diff --git a/main.asm b/main.asm index cf4b7fbc0..52d7fd1f9 100644 --- a/main.asm +++ b/main.asm @@ -38165,7 +38165,7 @@ Function4424d: ; 4424d push af call FarString pop bc - ld a, [wcf65] + ld a, [wPokedexStatus] or a ret z push bc @@ -89618,21 +89618,21 @@ Functionfb877: ; fb877 call ClearTileMap call Function1ad2 call ClearSprites - ld a, [wcf65] + ld a, [wPokedexStatus] push af ld a, [hSCX] add $5 ld [hSCX], a xor a - ld [wcf65], a + ld [wPokedexStatus], a callba Function41a7f call Functiona80 ld a, $1 - ld [wcf65], a + ld [wPokedexStatus], a callba Function4424d call Functiona80 pop af - ld [wcf65], a + ld [wPokedexStatus], a call MaxVolume call Function4b6 ld a, [hSCX] diff --git a/wram.asm b/wram.asm index 609702da3..05454ecd8 100644 --- a/wram.asm +++ b/wram.asm @@ -1165,6 +1165,7 @@ CurSpecies:: ; cf60 wcf61:: ds 2 wcf63:: ds 1 wcf64:: ds 1 +wPokedexStatus:: wcf65:: ds 1 wcf66:: ds 1