Dump and label pokedex scroll bar data

3 files changed, 164 insertions, 12 deletions

diff --git a/data/dex_scroll_offsets.asm b/data/dex_scroll_offsets.asm
new file mode 100755
index 0000000..11541f0
--- /dev/null
+++ b/data/dex_scroll_offsets.asm
@@ -0,0 +1,153 @@
+DexScrollBarOffsets:

+; Vertical pixel offsets for the right-hand side scroll bar in the Pokedex screen.

+	db $00  ; BULBASAUR

+	db $00  ; IVYSAUR

+	db $00  ; VENUSAUR

+	db $01  ; CHARMANDER

+	db $01  ; CHARMELEON

+	db $02  ; CHARIZARD

+	db $02  ; SQUIRTLE

+	db $02  ; WARTORTLE

+	db $03  ; BLASTOISE

+	db $03  ; CATERPIE

+	db $04  ; METAPOD

+	db $04  ; BUTTERFREE

+	db $04  ; WEEDLE

+	db $05  ; KAKUNA

+	db $05  ; BEEDRILL

+	db $06  ; PIDGEY

+	db $06  ; PIDGEOTTO

+	db $06  ; PIDGEOT

+	db $07  ; RATTATA

+	db $07  ; RATICATE

+	db $08  ; SPEAROW

+	db $08  ; FEAROW

+	db $08  ; EKANS

+	db $09  ; ARBOK

+	db $09  ; PIKACHU

+	db $0A  ; RAICHU

+	db $0A  ; SANDSHREW

+	db $0A  ; SANDSLASH

+	db $0B  ; NIDORAN_F

+	db $0B  ; NIDORINA

+	db $0C  ; NIDOQUEEN

+	db $0C  ; NIDORAN_M

+	db $0C  ; NIDORINO

+	db $0D  ; NIDOKING

+	db $0D  ; CLEFAIRY

+	db $0E  ; CLEFABLE

+	db $0E  ; VULPIX

+	db $0E  ; NINETALES

+	db $0F  ; JIGGLYPUFF

+	db $0F  ; WIGGLYTUFF

+	db $10  ; ZUBAT

+	db $10  ; GOLBAT

+	db $10  ; ODDISH

+	db $11  ; GLOOM

+	db $11  ; VILEPLUME

+	db $12  ; PARAS

+	db $12  ; PARASECT

+	db $12  ; VENONAT

+	db $13  ; VENOMOTH

+	db $13  ; DIGLETT

+	db $14  ; DUGTRIO

+	db $14  ; MEOWTH

+	db $14  ; PERSIAN

+	db $15  ; PSYDUCK

+	db $15  ; GOLDUCK

+	db $16  ; MANKEY

+	db $16  ; PRIMEAPE

+	db $16  ; GROWLITHE

+	db $17  ; ARCANINE

+	db $17  ; POLIWAG

+	db $18  ; POLIWHIRL

+	db $18  ; POLIWRATH

+	db $18  ; ABRA

+	db $19  ; KADABRA

+	db $19  ; ALAKAZAM

+	db $1A  ; MACHOP

+	db $1A  ; MACHOKE

+	db $1A  ; MACHAMP

+	db $1B  ; BELLSPROUT

+	db $1B  ; WEEPINBELL

+	db $1C  ; VICTREEBEL

+	db $1C  ; TENTACOOL

+	db $1C  ; TENTACRUEL

+	db $1D  ; GEODUDE

+	db $1D  ; GRAVELER

+	db $1E  ; GOLEM

+	db $1E  ; PONYTA

+	db $1E  ; RAPIDASH

+	db $1F  ; SLOWPOKE

+	db $1F  ; SLOWBRO

+	db $20  ; MAGNEMITE

+	db $20  ; MAGNETON

+	db $20  ; FARFETCH_D

+	db $21  ; DODUO

+	db $21  ; DODRIO

+	db $22  ; SEEL

+	db $22  ; DEWGONG

+	db $22  ; GRIMER

+	db $23  ; MUK

+	db $23  ; SHELLDER

+	db $24  ; CLOYSTER

+	db $24  ; GASTLY

+	db $24  ; HAUNTER

+	db $25  ; GENGAR

+	db $25  ; ONIX

+	db $26  ; DROWZEE

+	db $26  ; HYPNO

+	db $26  ; KRABBY

+	db $27  ; KINGLER

+	db $27  ; VOLTORB

+	db $28  ; ELECTRODE

+	db $28  ; EXEGGCUTE

+	db $28  ; EXEGGUTOR

+	db $29  ; CUBONE

+	db $29  ; MAROWAK

+	db $2A  ; HITMONLEE

+	db $2A  ; HITMONCHAN

+	db $2A  ; LICKITUNG

+	db $2B  ; KOFFING

+	db $2B  ; WEEZING

+	db $2C  ; RHYHORN

+	db $2C  ; RHYDON

+	db $2C  ; CHANSEY

+	db $2D  ; TANGELA

+	db $2D  ; KANGASKHAN

+	db $2E  ; HORSEA

+	db $2E  ; SEADRA

+	db $2E  ; GOLDEEN

+	db $2F  ; SEAKING

+	db $2F  ; STARYU

+	db $30  ; STARMIE

+	db $30  ; MR_MIME

+	db $30  ; SCYTHER

+	db $31  ; JYNX

+	db $31  ; ELECTABUZZ

+	db $32  ; MAGMAR

+	db $32  ; PINSIR

+	db $32  ; TAUROS

+	db $33  ; MAGIKARP

+	db $33  ; GYARADOS

+	db $34  ; LAPRAS

+	db $34  ; DITTO

+	db $34  ; EEVEE

+	db $35  ; VAPOREON

+	db $35  ; JOLTEON

+	db $36  ; FLAREON

+	db $36  ; PORYGON

+	db $36  ; OMANYTE

+	db $37  ; OMASTAR

+	db $37  ; KABUTO

+	db $38  ; KABUTOPS

+	db $38  ; AERODACTYL

+	db $38  ; SNORLAX

+	db $39  ; ARTICUNO

+	db $39  ; ZAPDOS

+	db $3A  ; MOLTRES

+	db $3A  ; DRATINI

+	db $3A  ; DRAGONAIR

+	db $3B  ; DRAGONITE

+	db $3B  ; MEWTWO

+	db $3C  ; MEW

diff --git a/data/oam_frames.asm b/data/oam_frames.asm
index 0d56c95..ed41271 100755
--- a/data/oam_frames.asm
+++ b/data/oam_frames.asm
@@ -102,9 +102,9 @@ OAMDataPointers: ; 0x4000
 	dw OAMData_64

 	dw OAMData_65

 	dw OAMData_66

-	dw OAMData_67

-	dw OAMData_68

-	dw OAMData_69

+	dw DexScrollBarFrame1OAM

+	dw DexScrollBarFrame2OAM

+	dw DexScrollBarFrame3OAM

 	dw PokeDexTextOAM

 	dw OAMData_6b

 	dw Digit0OAM

@@ -981,15 +981,15 @@ OAMData_66: ; 0x48e0
 	db $10, $08, $75, $17

 	db $80 ; terminator

 

-OAMData_67: ; 0x48ed

+DexScrollBarFrame1OAM: ; 0x48ed

 	db $10, $08, $78, $00

 	db $80 ; terminator

 

-OAMData_68: ; 0x48f2

+DexScrollBarFrame2OAM: ; 0x48f2

 	db $10, $08, $79, $00

 	db $80 ; terminator

 

-OAMData_69: ; 0x48f7

+DexScrollBarFrame3OAM: ; 0x48f7

 	db $10, $08, $79, $11

 	db $80 ; terminator

 

diff --git a/main.asm b/main.asm
index 30eb42c..53e0177 100755
--- a/main.asm
+++ b/main.asm
@@ -31328,7 +31328,7 @@ Func_285db: ; 0x285db
 	ld a, [wCurPokedexIndex]
 	ld c, a
 	ld b, $0
-	ld hl, Data_2b136
+	ld hl, DexScrollBarOffsets
 	add hl, bc
 	ld a, [hl]
 	add $49
@@ -31340,7 +31340,7 @@ Func_285db: ; 0x285db
 	and $3
 	ld e, a
 	ld d, $0
-	ld hl, Data_28687
+	ld hl, DexScrollBarOAMIds
 	add hl, de
 	ld a, [hl]
 	call LoadOAMData
@@ -31405,8 +31405,8 @@ PointerTable_2867f: ; 0x2867f
 	dw Func_286dd
 	dw Func_28765
 
-Data_28687:
-	dr $28687, $2868b
+DexScrollBarOAMIds:
+	db $67, $68, $69, $68
 
 DrawCornerInfoPokedexScreen: ; 0x2868b
 ; If player is holding SELECT button, it draws the seen/own count in the top-right corner.
@@ -33104,8 +33104,7 @@ INCLUDE "text/pokedex_species.asm"
 Data_2a85d:
 	dr $2a85d, $2b136
 
-Data_2b136:
-	dr $2b136, $2b1cd
+INCLUDE "data/dex_scroll_offsets.asm"
 
 SECTION "bankb", ROMX, BANK[$b]