summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2015-03-01 17:37:29 -0800
committerMarcus Huderle <huderlem@gmail.com>2015-03-01 17:37:29 -0800
commit68f4c6e10201dbd8d9df3f891fe044287caaebc8 (patch)
tree7c327e0b04e79c1f2bd22dba794fb5c01c6a283c
parente491b0c90e07c827ae831754f257a6b30ba7414d (diff)
Add labels for Pokedex seen/owned flags.
-rwxr-xr-xmain.asm2
-rwxr-xr-xwram.asm11
2 files changed, 11 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index 4180630..9484124 100755
--- a/main.asm
+++ b/main.asm
@@ -3991,7 +3991,7 @@ Func_82a8: ; 0x82a8
call Func_54f
.asm_82c6
ld hl, $a10c
- ld de, $d962
+ ld de, wPokedexFlags
ld bc, $0098
call Func_f0c
jr c, .asm_82de
diff --git a/wram.asm b/wram.asm
index f219e2a..4d30045 100755
--- a/wram.asm
+++ b/wram.asm
@@ -20,7 +20,16 @@ wSoundTestCurrentBackgroundMusic:: ; d91a
wSoundTextCurrentSoundEffect:: ; 0xd91b
ds 1
- ds 225
+ ds 70
+
+wPokedexFlags:: ; 0xd962
+; Each pokemon is represented by one byte in the normal Pokedex order
+; byte == 0: mon hasn't been seen
+; byte == 1: mon has been seen
+; byte >= 2: mon has been captured
+ ds 151
+
+ ds 4 ; TODO: these change when byte in wPokedexFlags change
wRedHighScores:: ; 0xd9fd
wRedHighScore1Points:: ; 0xd9fd