summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-09-09 16:00:05 -0500
committerBryan Bishop <kanzure@gmail.com>2013-09-09 16:00:05 -0500
commit33d7ef72fef045198f0ab472332e6472a54a034f (patch)
treeb2a7700302bac3f0377ca2f841b61d09e8e1fb0b /wram.asm
parent3a2dbb5289e745dfb5f26844148c0981f14e8fcf (diff)
parent608d0d86e47b09f1c1ddbcf3b9c51e0ac628d7ed (diff)
Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/wram.asm b/wram.asm
index 6b302f31c..6b4b29f4c 100644
--- a/wram.asm
+++ b/wram.asm
@@ -2026,12 +2026,12 @@ PartyMon6Nickname: ; de78
PartyMonNicknamesEnd
SECTION "Pokedex",WRAMX[$de99],BANK[1]
-PokedexSeen: ; de99
- ds 32
-EndPokedexSeen:
-PokedexCaught: ; deb9
+PokedexCaught: ; de99
ds 32
EndPokedexCaught:
+PokedexSeen: ; deb9
+ ds 32
+EndPokedexSeen:
UnownDex: ; ded9
ds 26
UnlockedUnowns: ; def3