pokedex data

2 files changed, 14 insertions, 14 deletions

diff --git a/asm/macros/pokemon_data.s b/asm/macros/pokemon_data.s
index 122392163..f18462d34 100644
--- a/asm/macros/pokemon_data.s
+++ b/asm/macros/pokemon_data.s
@@ -1,8 +1,8 @@
-	.macro pokedex_entry category_name, height, width, text_pointer, pokemon_scale, pokemon_offset, trainer_scale, trainer_offset
-	.charmapstr "\category_name", 12
+	.macro pokedex_entry pokemon_name, height, width, pokemon_scale, pokemon_offset, trainer_scale, trainer_offset
 	.2byte \height @ in decimeters
 	.2byte \width @ in hectograms
-	.4byte \text_pointer
+	.4byte DexDescription_\pokemon_name\()_1
+	.4byte DexDescription_\pokemon_name\()_2
 	.2byte 0 @ unused
 	.2byte \pokemon_scale
 	.2byte \pokemon_offset
diff --git a/asm/rom5.s b/asm/rom5.s
index 12612b7c4..fe56433c3 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -41966,7 +41966,7 @@ _0808F4F8: .4byte 0x0202ffbc
 _0808F4FC: .4byte gUnknown_0840DFF9
 _0808F500: .4byte gUnknown_0840E013
 _0808F504: .4byte gUnknown_0840E01D
-_0808F508: .4byte gUnknown_083B1858
+_0808F508: .4byte gPokedexEntries
 _0808F50C:
 	ldr r0, _0808F524
 	movs r1, 0x2
@@ -41978,7 +41978,7 @@ _0808F50C:
 	bl gpu_pal_apply
 	b _0808F67C
 	.align 2, 0
-_0808F524: .4byte gPokedexEntries
+_0808F524: .4byte gUnknown_083A05F8
 _0808F528: .4byte 0x0202eaca
 _0808F52C:
 	ldr r0, _0808F56C
@@ -43531,7 +43531,7 @@ _080901D4:
 	.align 2, 0
 _0809025C: .4byte 0x02024ea4
 _08090260: .4byte 0x02020004
-_08090264: .4byte gUnknown_083B1858
+_08090264: .4byte gPokedexEntries
 _08090268: .4byte 0x0202ffbc
 _0809026C: .4byte gUnknown_083B4EC4
 _08090270: .4byte 0x03001770
@@ -43604,7 +43604,7 @@ _08090278:
 	.align 2, 0
 _08090300: .4byte 0x0202ffbc
 _08090304: .4byte 0x02020004
-_08090308: .4byte gUnknown_083B1858
+_08090308: .4byte gPokedexEntries
 _0809030C: .4byte gUnknown_083B4EC4
 _08090310: .4byte 0x03001770
 _08090314: .4byte 0x0000043c
@@ -44374,7 +44374,7 @@ _080908D6:
 _0809094C: .4byte gUnknown_0840DFF9
 _08090950: .4byte gUnknown_0840E013
 _08090954: .4byte gUnknown_0840E01D
-_08090958: .4byte gUnknown_083B1858
+_08090958: .4byte gPokedexEntries
 _0809095C: .4byte 0x03004b20
 _08090960:
 	adds r0, r6, 0
@@ -44574,7 +44574,7 @@ _08090AA4:
 	b _08090B44
 	.align 2, 0
 _08090B00: .4byte 0x03004b20
-_08090B04: .4byte gUnknown_083B1858
+_08090B04: .4byte gPokedexEntries
 _08090B08: .4byte 0x06007aca
 _08090B0C:
 	ldr r0, _08090B34
@@ -44803,7 +44803,7 @@ sub_8090C68: @ 8090C68
 _08090CD0: .4byte 0x0202ffbc
 _08090CD4: .4byte 0x0202ffb4
 _08090CD8: .4byte 0x0000064e
-_08090CDC: .4byte gUnknown_083B1858
+_08090CDC: .4byte gPokedexEntries
 _08090CE0: .4byte 0x06007aca
 _08090CE4:
 	movs r0, 0x2
@@ -44843,7 +44843,7 @@ _08090D2A:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08090D30: .4byte gUnknown_083B1858
+_08090D30: .4byte gPokedexEntries
 _08090D34: .4byte 0x0000064e
 _08090D38: .4byte 0x06007aca
 	thumb_func_end sub_8090C68
@@ -44860,7 +44860,7 @@ sub_8090D3C: @ 8090D3C
 	adds r0, r1
 	bx lr
 	.align 2, 0
-_08090D50: .4byte gUnknown_083B1858
+_08090D50: .4byte gPokedexEntries
 	thumb_func_end sub_8090D3C
 
 	thumb_func_start sub_8090D54
@@ -44885,7 +44885,7 @@ _08090D6A:
 	ldrh r0, [r1, 0xC]
 	b _08090D88
 	.align 2, 0
-_08090D78: .4byte gUnknown_083B1858
+_08090D78: .4byte gPokedexEntries
 _08090D7C:
 	ldr r0, _08090D8C
 	lsls r1, r2, 3
@@ -44897,7 +44897,7 @@ _08090D88:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08090D8C: .4byte gUnknown_083B1858
+_08090D8C: .4byte gPokedexEntries
 	thumb_func_end sub_8090D54
 
 	thumb_func_start sub_8090D90