aboutsummaryrefslogtreecommitdiffstats
path: root/engine/menu/pokedex.asm
diff options
context:
space:
mode:
authorDaniel Harding <corrnondacqb@yahoo.com>2015-07-03 16:03:10 -0500
committerDaniel Harding <corrnondacqb@yahoo.com>2015-07-03 16:03:10 -0500
commitec4c53559379f3bf7bd332905ba144e1d998f38b (patch)
treef8ee8f2d9c8042b55edb1a4761833511ab1695b1 /engine/menu/pokedex.asm
parentMerge pull request #96 from dannye/master (diff)
parentNo more ldh (diff)
downloadpokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.gz
pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.xz
pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.zip
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'engine/menu/pokedex.asm')
-rwxr-xr-xengine/menu/pokedex.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index 4351ae4c..e2e53d45 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -1,7 +1,7 @@
ShowPokedexMenu: ; 40000 (10:4000)
call GBPalWhiteOut
call ClearScreen
- call UpdateSprites ; move sprites
+ call UpdateSprites
ld a,[wListScrollOffset]
push af
xor a
@@ -140,7 +140,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d)
.choseCry
ld a,[wd11e]
call GetCryData ; get cry data
- call PlaySound ; play sound
+ call PlaySound
jr .handleMenuInput
.choseArea
predef LoadTownMap_Nest ; display pokemon areas
@@ -573,8 +573,8 @@ HeightWeightText: ; 40448 (10:4448)
db "HT ?",$60,"??",$61,$4E,"WT ???lb@"
; XXX does anything point to this?
-Unknown_4045D: ; 4045d (10:445d)
- db $54,$50
+PokeText: ; 4045d (10:445d)
+ db "#@"
; horizontal line that divides the pokedex text description from the rest of the data
PokedexDataDividerLine: ; 4045f (10:445f)