summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-04-24 20:03:13 -0700
committerMarcus Huderle <huderlem@gmail.com>2017-04-24 20:07:13 -0700
commit3fac8501418ee66be63a3cfb3a957bef26a36ffd (patch)
treeb37c41125ef9b14739825c43a527aa2ed5b61fd1
parent7df6bdace8c4b1c1881d751fe7c3b0e4d8f9a9f0 (diff)
Label LoadDexVWFCharacter routine
-rwxr-xr-xhome.asm7
-rwxr-xr-xmain.asm11
-rwxr-xr-xtext/pokedex_species.asm4
3 files changed, 14 insertions, 8 deletions
diff --git a/home.asm b/home.asm
index 94ff987..a1e3273 100755
--- a/home.asm
+++ b/home.asm
@@ -3967,13 +3967,14 @@ CallTable_2049: ; 0x2049
padded_dab HandleFieldSelectScreen
; end of call table
-Func_206d: ; 0x206d
+LoadDexVWFCharacter: ; 0x206d
+; Loads a single variable-width-font character used in various parts of the Pokedex screen.
ld a, [hLoadedROMBank]
push af
- ld a, Bank(Func_8d17)
+ ld a, Bank(LoadDexVWFCharacter_)
ld [hLoadedROMBank], a
ld [MBC5RomBank], a
- call Func_8d17
+ call LoadDexVWFCharacter_
jr c, .asm_2084
pop af
ld [hLoadedROMBank], a
diff --git a/main.asm b/main.asm
index 2931ced..30eb42c 100755
--- a/main.asm
+++ b/main.asm
@@ -1980,7 +1980,8 @@ CollisionXDeltas: ; 0x8b17
dw $07B4
dw $FF08
-Func_8d17: ; 0x8d17
+LoadDexVWFCharacter_: ; 0x8d17
+; Loads a single variable-width-font character used in various parts of the Pokedex screen.
ld a, [$ff92]
cp $80
jp c, Func_8e01
@@ -31900,7 +31901,7 @@ Func_289c8: ; 0x289c8
add hl, bc
bit 1, [hl]
ld hl, Data_28a12
- jr z, .asm_289fe
+ jr z, .pokemonNotOwned
ld a, [wCurPokedexIndex]
ld c, a
ld b, $0
@@ -31923,7 +31924,7 @@ Func_289c8: ; 0x289c8
add hl, bc ; value * 23
ld bc, MonSpeciesNames
add hl, bc
-.asm_289fe
+.pokemonNotOwned
ld a, $ff
ld [wd860], a
ld a, $4
@@ -32522,7 +32523,7 @@ Func_28d97: ; 0x28d97
add hl, bc
ld a, [hl]
ld [$ff93], a
- call Func_206d
+ call LoadDexVWFCharacter
.asm_28dc8
pop hl
jr nc, .asm_28daa
@@ -32590,7 +32591,7 @@ Func_28e09: ; 0x28e09
add hl, bc
ld a, [hl]
ld [$ff93], a
- call Func_206d
+ call LoadDexVWFCharacter
pop hl
jr nc, .asm_28e1c
nop
diff --git a/text/pokedex_species.asm b/text/pokedex_species.asm
index e999d72..1cb96da 100755
--- a/text/pokedex_species.asm
+++ b/text/pokedex_species.asm
@@ -1,3 +1,7 @@
+; THESE ARE NOT POINTERS. THEY ARE VARIABLE-WIDTH-FONT CHARACTERS.
+; VARIABLE-WIDTH-FONT STILL NEEDS DOCUMENTATION.
+; SEE LoadDexVWFCharacter.
+
MonSpeciesNames: ; 0x29fa6
; SEED
dw $7282, $6482, $6482, $6382, $4081, $4081, $4081, $4081, $4081, $4081, $4081