summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2015-02-14 01:40:38 -0700
committerIIMarckus <iimarckus@gmail.com>2015-02-14 01:40:38 -0700
commitb028e138347e9de72277c525b11d0592ba14498d (patch)
tree3b1a85ad3b00e847c656ab681efdafa702239ba6
parentd7bc1d12f23a6d800169b887592807cf92b4974a (diff)
Give an internal Pokédex status variable its own label.
This new label is used in revision 1.1 of Pokémon Crystal.
-rw-r--r--engine/pokedex.asm8
-rw-r--r--main.asm10
-rw-r--r--wram.asm1
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