add pokedex order data

2 files changed, 143 insertions, 143 deletions

diff --git a/asm/emerald.s b/asm/emerald.s
index 6e7ff6529..105868f98 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -99891,7 +99891,7 @@ _0803AE0A:
 	muls r0, r7
 	add r0, r8
 	ldrh r0, [r0]
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	ldrb r1, [r4]
@@ -99919,7 +99919,7 @@ _0803AE60:
 	muls r0, r7
 	add r0, r8
 	ldrh r0, [r0]
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	ldrb r1, [r4]
@@ -100493,7 +100493,7 @@ _0803B334:
 	muls r0, r5
 	adds r0, r6
 	ldrh r0, [r0]
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	ldrb r1, [r4]
@@ -105386,7 +105386,7 @@ _0803DEC2:
 	adds r5, r1, r0
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_806D098
+	bl GetEvolutionTargetSpecies
 	lsls r0, 16
 	lsrs r4, r0, 16
 	cmp r4, 0
@@ -132587,7 +132587,7 @@ atk4E_switch3: @ 804CAE8
 	muls r0, r5
 	adds r0, r4
 	ldrh r0, [r0]
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	ldrb r1, [r6]
@@ -138123,7 +138123,7 @@ _0804FA82:
 	adds r1, 0x48
 	adds r0, r1
 	ldr r0, [r0]
-	bl getNature
+	bl GetNatureFromPersonality
 	ldr r1, =0x0831c4f8
 	lsls r0, 24
 	lsrs r0, 24
@@ -149041,7 +149041,7 @@ _080556A0:
 	muls r0, r1
 	add r0, r8
 	ldrh r0, [r0]
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x1
@@ -150671,7 +150671,7 @@ _08056480:
 	muls r0, r1
 	adds r0, r2
 	ldrh r0, [r0]
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x1
@@ -151082,7 +151082,7 @@ atkF1_802D95C: @ 8056850
 	bl pokemon_getattr
 	adds r4, r0, 0
 	adds r0, r5, 0
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x1
@@ -151108,7 +151108,7 @@ atkF1_802D95C: @ 8056850
 	.pool
 _080568A8:
 	adds r0, r5, 0
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x3
@@ -151177,7 +151177,7 @@ _0805692A:
 _08056938:
 	bl Window_FreeMemory
 	adds r0, r4, 0
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r3, =0x02024084
@@ -163293,7 +163293,7 @@ _0805D20E:
 	ldr r1, =0x020240cc
 	adds r0, r1
 	ldr r0, [r0]
-	bl getNature
+	bl GetNatureFromPersonality
 	lsls r0, 24
 	lsrs r0, 22
 	adds r0, r4, r0
@@ -163804,7 +163804,7 @@ _0805D680:
 	adds r1, 0x48
 	adds r0, r1
 	ldr r0, [r0]
-	bl getNature
+	bl GetNatureFromPersonality
 	lsls r0, 24
 	lsrs r0, 24
 	adds r0, r4
@@ -183785,7 +183785,7 @@ _08067EB0:
 	lsls r0, 16
 	orrs r4, r0
 	adds r0, r4, 0
-	bl getNature
+	bl GetNatureFromPersonality
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
@@ -183874,7 +183874,7 @@ _08067F38:
 	lsls r0, 16
 	lsrs r5, r0, 16
 	adds r0, r4, 0
-	bl getNature
+	bl GetNatureFromPersonality
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r6, r0
@@ -183900,7 +183900,7 @@ _08067F9E:
 	lsls r0, 16
 	orrs r4, r0
 	adds r0, r4, 0
-	bl getNature
+	bl GetNatureFromPersonality
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r6, r0
@@ -184724,7 +184724,7 @@ _08068664:
 	lsls r0, 16
 	orrs r4, r0
 	adds r0, r4, 0
-	bl getNature
+	bl GetNatureFromPersonality
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
@@ -185210,7 +185210,7 @@ _08068A68:
 	lsls r0, 16
 	lsrs r4, r0, 16
 	adds r0, r5, 0
-	bl get_nature
+	bl GetNature
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r2, r6, 24
@@ -185691,7 +185691,7 @@ _08068E5E:
 	adds r0, 0x5
 	str r0, [sp, 0x8]
 	adds r0, r5, 0
-	bl get_nature
+	bl GetNature
 	lsls r0, 24
 	lsrs r0, 24
 	add r4, sp, 0x8
@@ -185723,7 +185723,7 @@ _08068EA4:
 	adds r0, 0x5
 	str r0, [sp, 0xC]
 	adds r0, r5, 0
-	bl get_nature
+	bl GetNature
 	lsls r0, 24
 	lsrs r0, 24
 	add r4, sp, 0xC
@@ -185755,7 +185755,7 @@ _08068EEA:
 	adds r0, 0x5
 	str r0, [sp, 0x10]
 	adds r0, r5, 0
-	bl get_nature
+	bl GetNature
 	lsls r0, 24
 	lsrs r0, 24
 	add r4, sp, 0x10
@@ -185787,7 +185787,7 @@ _08068F30:
 	adds r0, 0x5
 	str r0, [sp, 0x14]
 	adds r0, r5, 0
-	bl get_nature
+	bl GetNature
 	lsls r0, 24
 	lsrs r0, 24
 	add r4, sp, 0x14
@@ -185819,7 +185819,7 @@ _08068F76:
 	adds r0, 0x5
 	str r0, [sp, 0x18]
 	adds r0, r5, 0
-	bl get_nature
+	bl GetNature
 	lsls r0, 24
 	lsrs r0, 24
 	add r4, sp, 0x18
@@ -193174,7 +193174,7 @@ _0806C994:
 	mov r0, r8
 	movs r1, 0x2
 	ldr r2, [sp, 0xC]
-	bl sub_806D098
+	bl GetEvolutionTargetSpecies
 	lsls r0, 16
 	lsrs r1, r0, 16
 	cmp r1, 0
@@ -194033,9 +194033,9 @@ _0806D04E:
 	.pool
 	thumb_func_end sub_806CF78
 
-	thumb_func_start get_nature
-@ u8 get_nature(pokemon *mon)
-get_nature: @ 806D070
+	thumb_func_start GetNature
+@ u8 GetNature(pokemon *mon)
+GetNature: @ 806D070
 	push {lr}
 	movs r1, 0
 	movs r2, 0
@@ -194046,10 +194046,10 @@ get_nature: @ 806D070
 	lsrs r0, 24
 	pop {r1}
 	bx r1
-	thumb_func_end get_nature
+	thumb_func_end GetNature
 
-	thumb_func_start getNature
-getNature: @ 806D088
+	thumb_func_start GetNatureFromPersonality
+GetNatureFromPersonality: @ 806D088
 	push {lr}
 	movs r1, 0x19
 	bl __umodsi3
@@ -194057,10 +194057,10 @@ getNature: @ 806D088
 	lsrs r0, 24
 	pop {r1}
 	bx r1
-	thumb_func_end getNature
+	thumb_func_end GetNatureFromPersonality
 
-	thumb_func_start sub_806D098
-sub_806D098: @ 806D098
+	thumb_func_start GetEvolutionTargetSpecies
+GetEvolutionTargetSpecies: @ 806D098
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -194466,17 +194466,17 @@ _0806D3B0:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_806D098
+	thumb_func_end GetEvolutionTargetSpecies
 
-	thumb_func_start sub_806D3C0
-sub_806D3C0: @ 806D3C0
+	thumb_func_start HoennPokedexNumToSpecies
+HoennPokedexNumToSpecies: @ 806D3C0
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r2, 0
 	beq _0806D404
 	movs r1, 0
-	ldr r3, =0x0831d94c
+	ldr r3, =gSpeciesToHoennPokedexNum
 	ldrh r0, [r3]
 	cmp r0, r2
 	beq _0806D3EC
@@ -194509,17 +194509,17 @@ _0806D406:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_806D3C0
+	thumb_func_end HoennPokedexNumToSpecies
 
-	thumb_func_start poke_something_2
-poke_something_2: @ 806D40C
+	thumb_func_start NationalPokedexNumToSpecies
+NationalPokedexNumToSpecies: @ 806D40C
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r2, 0
 	beq _0806D450
 	movs r1, 0
-	ldr r3, =0x0831dc82
+	ldr r3, =gSpeciesToNationalPokedexNum
 	ldrh r0, [r3]
 	cmp r0, r2
 	beq _0806D438
@@ -194552,17 +194552,17 @@ _0806D452:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end poke_something_2
+	thumb_func_end NationalPokedexNumToSpecies
 
-	thumb_func_start sub_806D458
-sub_806D458: @ 806D458
+	thumb_func_start NationalToHoennOrder
+NationalToHoennOrder: @ 806D458
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r2, 0
 	beq _0806D49C
 	movs r1, 0
-	ldr r3, =0x0831dfb8
+	ldr r3, =gHoennToNationalOrder
 	ldrh r0, [r3]
 	cmp r0, r2
 	beq _0806D484
@@ -194595,16 +194595,16 @@ _0806D49E:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_806D458
+	thumb_func_end NationalToHoennOrder
 
-	thumb_func_start species_to_pokedex_index
-species_to_pokedex_index: @ 806D4A4
+	thumb_func_start SpeciesToNationalPokedexNum
+SpeciesToNationalPokedexNum: @ 806D4A4
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
 	cmp r1, 0
 	beq _0806D4C0
-	ldr r0, =0x0831dc82
+	ldr r0, =gSpeciesToNationalPokedexNum
 	subs r1, 0x1
 	lsls r1, 1
 	adds r1, r0
@@ -194617,16 +194617,16 @@ _0806D4C0:
 _0806D4C2:
 	pop {r1}
 	bx r1
-	thumb_func_end species_to_pokedex_index
+	thumb_func_end SpeciesToNationalPokedexNum
 
-	thumb_func_start sub_806D4C8
-sub_806D4C8: @ 806D4C8
+	thumb_func_start SpeciesToHoennPokedexNum
+SpeciesToHoennPokedexNum: @ 806D4C8
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
 	cmp r1, 0
 	beq _0806D4E4
-	ldr r0, =0x0831d94c
+	ldr r0, =gSpeciesToHoennPokedexNum
 	subs r1, 0x1
 	lsls r1, 1
 	adds r1, r0
@@ -194639,16 +194639,16 @@ _0806D4E4:
 _0806D4E6:
 	pop {r1}
 	bx r1
-	thumb_func_end sub_806D4C8
+	thumb_func_end SpeciesToHoennPokedexNum
 
-	thumb_func_start sub_806D4EC
-sub_806D4EC: @ 806D4EC
+	thumb_func_start HoennToNationalOrder
+HoennToNationalOrder: @ 806D4EC
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
 	cmp r1, 0
 	beq _0806D508
-	ldr r0, =0x0831dfb8
+	ldr r0, =gHoennToNationalOrder
 	subs r1, 0x1
 	lsls r1, 1
 	adds r1, r0
@@ -194661,7 +194661,7 @@ _0806D508:
 _0806D50A:
 	pop {r1}
 	bx r1
-	thumb_func_end sub_806D4EC
+	thumb_func_end HoennToNationalOrder
 
 	thumb_func_start speciesid_conv
 speciesid_conv: @ 806D510
@@ -196645,13 +196645,13 @@ sub_806E3C0: @ 806E3C0
 	cmp r0, 0
 	beq _0806E3DA
 	adds r0, r4, 0
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	b _0806E3F2
 _0806E3DA:
 	adds r0, r4, 0
-	bl sub_806D4C8
+	bl SpeciesToHoennPokedexNum
 	adds r4, r0, 0
 	cmp r4, 0xCA
 	bls _0806E3F0
@@ -196672,7 +196672,7 @@ sub_806E3F8: @ 806E3F8
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
-	bl sub_806D4C8
+	bl SpeciesToHoennPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, 0xCA
@@ -197197,7 +197197,7 @@ sub_806E858: @ 806E858
 	push {r4,lr}
 	lsls r4, r1, 24
 	lsrs r4, 24
-	bl get_nature
+	bl GetNature
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x085b25a0
@@ -197219,7 +197219,7 @@ sub_806E880: @ 806E880
 	push {r4,lr}
 	lsls r4, r1, 24
 	lsrs r4, 24
-	bl getNature
+	bl GetNatureFromPersonality
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x085b25a0
@@ -198216,7 +198216,7 @@ sub_806F01C: @ 806F01C
 	adds r1, r5, 0
 	bl pokedex_flag_operation
 	adds r0, r4, 0
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, 0xC9
@@ -198226,7 +198226,7 @@ sub_806F01C: @ 806F01C
 	str r7, [r0, 0x1C]
 _0806F05C:
 	adds r0, r6, 0
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	lsls r0, 16
 	movs r1, 0x9A
 	lsls r1, 17
@@ -200530,7 +200530,7 @@ _08070160:
 	movs r1, 0
 	movs r2, 0
 	bl pokemon_getattr_encrypted
-	bl getNature
+	bl GetNatureFromPersonality
 	lsls r0, 24
 	lsrs r7, r0, 24
 _08070176:
@@ -200542,7 +200542,7 @@ _08070176:
 	lsrs r0, 16
 	orrs r4, r0
 	adds r0, r4, 0
-	bl getNature
+	bl GetNatureFromPersonality
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r7, r0
@@ -203037,7 +203037,7 @@ sub_80714B8: @ 80714B8
 	mov r2, sp
 	bl pokemon_setattr
 	adds r0, r4, 0
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	adds r4, r0, 0
 	lsls r4, 16
 	lsrs r4, 16
@@ -206409,7 +206409,7 @@ sub_80730D4: @ 80730D4
 	movs r1, 0x5
 	mov r8, r1
 	adds r0, r4, 0
-	bl get_nature
+	bl GetNature
 	lsls r0, 24
 	mov r4, sp
 	adds r4, 0x6
@@ -208645,7 +208645,7 @@ sub_8074310: @ 8074310
 	bl pokemon_getattr
 	lsls r0, 16
 	lsrs r0, 16
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x1
@@ -222458,7 +222458,7 @@ sub_807B464: @ 807B464
 	bl pokemon_getattr
 	adds r5, r0, 0
 	adds r0, r4, 0
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	adds r4, r0, 0
 	lsls r4, 16
 	lsrs r4, 16
@@ -225252,7 +225252,7 @@ _0807CEDC:
 	adds r0, r5
 	movs r1, 0x1
 	movs r2, 0
-	bl sub_806D098
+	bl GetEvolutionTargetSpecies
 	lsls r0, 16
 	lsrs r4, r0, 16
 	cmp r4, 0
@@ -227412,7 +227412,7 @@ _0807E328:
 	adds r0, r5
 	movs r1, 0x1
 	movs r2, 0
-	bl sub_806D098
+	bl GetEvolutionTargetSpecies
 	lsls r0, 16
 	lsrs r4, r0, 16
 	cmp r4, 0
@@ -227533,7 +227533,7 @@ _0807E444:
 	adds r0, r5
 	movs r1, 0x1
 	movs r2, 0
-	bl sub_806D098
+	bl GetEvolutionTargetSpecies
 	lsls r0, 16
 	lsrs r4, r0, 16
 	cmp r4, 0
@@ -355844,7 +355844,7 @@ _080BC976:
 	lsls r0, r7, 16
 	lsrs r6, r0, 16
 	adds r0, r6, 0
-	bl sub_806D4EC
+	bl HoennToNationalOrder
 	strh r0, [r5, 0x4]
 	mov r2, r8
 	ldr r1, [r2]
@@ -356021,7 +356021,7 @@ _080BCADA:
 	ldrh r0, [r0]
 	strh r0, [r5, 0x4]
 	ldrh r0, [r5, 0x4]
-	bl sub_806D458
+	bl NationalToHoennOrder
 	lsls r0, 16
 	lsrs r0, 16
 	adds r7, r4, 0
@@ -356099,7 +356099,7 @@ _080BCB82:
 	ldrh r0, [r0]
 	strh r0, [r5, 0x4]
 	ldrh r0, [r5, 0x4]
-	bl sub_806D458
+	bl NationalToHoennOrder
 	lsls r0, 16
 	lsrs r0, 16
 	ldrh r3, [r5]
@@ -356166,7 +356166,7 @@ _080BCC16:
 	ldrh r0, [r0]
 	strh r0, [r5, 0x4]
 	ldrh r0, [r5, 0x4]
-	bl sub_806D458
+	bl NationalToHoennOrder
 	lsls r0, 16
 	lsrs r0, 16
 	adds r7, r4, 0
@@ -356233,7 +356233,7 @@ _080BCCAA:
 	ldrh r0, [r0]
 	strh r0, [r5, 0x4]
 	ldrh r0, [r5, 0x4]
-	bl sub_806D458
+	bl NationalToHoennOrder
 	lsls r0, 16
 	lsrs r0, 16
 	ldrh r2, [r5]
@@ -356300,7 +356300,7 @@ _080BCD3E:
 	ldrh r0, [r0]
 	strh r0, [r5, 0x4]
 	ldrh r0, [r5, 0x4]
-	bl sub_806D458
+	bl NationalToHoennOrder
 	lsls r0, 16
 	lsrs r0, 16
 	adds r7, r4, 0
@@ -356827,7 +356827,7 @@ sub_80BD154: @ 80BD154
 	cmp r0, 0
 	bne _080BD194
 	adds r0, r6, 0
-	bl sub_806D458
+	bl NationalToHoennOrder
 	lsls r0, 16
 	lsrs r6, r0, 16
 _080BD194:
@@ -356921,7 +356921,7 @@ sub_80BD23C: @ 80BD23C
 	lsrs r6, r1, 24
 	lsls r2, 24
 	lsrs r5, r2, 24
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	adds r1, r0, 0
 	cmp r1, 0
 	beq _080BD264
@@ -357992,7 +357992,7 @@ _080BDAE8:
 	strh r0, [r4, 0x2E]
 	strh r6, [r4, 0x30]
 	mov r0, r8
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	strh r0, [r4, 0x32]
 	mov r4, r9
 	ldr r0, [r4]
@@ -360088,7 +360088,7 @@ _080BED04:
 	ldr r0, =0x02039b54
 	ldr r0, [r0]
 	ldrh r0, [r0]
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0
@@ -360588,7 +360588,7 @@ _080BF15C:
 	ldr r0, =0x02039b54
 	ldr r0, [r0]
 	ldrh r0, [r0]
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r5, =0x02039b4c
@@ -361079,7 +361079,7 @@ _080BF5F2:
 	ldr r0, =0x02039b54
 	ldr r0, [r0]
 	ldrh r0, [r0]
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	lsls r0, 16
 	lsrs r0, 16
 	bl sub_8145534
@@ -362231,7 +362231,7 @@ _080C0044:
 	cmp r6, 0
 	bne _080C0074
 	adds r0, r4, 0
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0
@@ -362359,7 +362359,7 @@ _080C0168:
 	lsls r4, 3
 	adds r4, r0
 	ldrh r0, [r4, 0xA]
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	lsls r0, 16
 	lsrs r0, 16
 	ldrh r1, [r4, 0x22]
@@ -362463,7 +362463,7 @@ _080C0234:
 	bne _080C024C
 	lsls r4, r6, 16
 	lsrs r0, r4, 16
-	bl sub_806D458
+	bl NationalToHoennOrder
 	lsls r0, 16
 	lsrs r5, r0, 16
 	b _080C0250
@@ -362485,7 +362485,7 @@ _080C0250:
 	movs r2, 0x19
 	bl sub_80BE8DC
 	lsrs r0, r4, 16
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	lsls r0, 16
 	lsrs r1, r0, 16
 	cmp r1, 0
@@ -363236,7 +363236,7 @@ _080C085A:
 	adds r4, r0, 0x1
 	lsls r0, r4, 16
 	lsrs r0, 16
-	bl sub_806D4EC
+	bl HoennToNationalOrder
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0
@@ -363245,7 +363245,7 @@ _080C086C:
 	adds r4, r0, 0x1
 	lsls r0, r4, 16
 	lsrs r0, 16
-	bl sub_806D4EC
+	bl HoennToNationalOrder
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x1
@@ -363321,7 +363321,7 @@ _080C08E8:
 	lsls r0, 16
 	lsrs r4, r0, 16
 	adds r0, r4, 0
-	bl sub_806D4EC
+	bl HoennToNationalOrder
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x1
@@ -363650,7 +363650,7 @@ _080C0B62:
 	cmp r4, 0xA
 	bls _080C0B62
 	adds r0, r5, 0
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	adds r5, r0, 0
 	cmp r5, 0
 	beq _080C0BC0
@@ -363891,7 +363891,7 @@ sub_80C0D30: @ 80C0D30
 	lsrs r1, 16
 	ldr r4, =0x0856e694
 	adds r0, r1, 0
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	lsls r0, 16
 	lsrs r0, 14
 	adds r0, r4
@@ -364094,7 +364094,7 @@ sub_80C0E9C: @ 80C0E9C
 	lsrs r5, 16
 	lsls r6, 16
 	lsrs r6, 16
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	adds r1, r0, 0
 	adds r0, r1, 0
 	str r1, [sp, 0x10]
@@ -364235,7 +364235,7 @@ _080C0FBA:
 	lsls r4, r5, 2
 	adds r0, r4
 	ldrh r0, [r0]
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	lsls r0, 16
 	lsrs r2, r0, 16
 	ldr r1, =0x083185c8
@@ -364319,7 +364319,7 @@ _080C105A:
 	lsls r4, r5, 2
 	adds r0, r4
 	ldrh r0, [r0]
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	lsls r0, 16
 	lsrs r2, r0, 16
 	lsls r0, r2, 3
@@ -364396,7 +364396,7 @@ _080C10E0:
 	bge _080C112A
 	ldrh r0, [r1]
 	str r3, [sp, 0x10]
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	lsls r0, 16
 	lsrs r2, r0, 16
 	ldr r1, =0x083203cc
@@ -364459,7 +364459,7 @@ _080C116C:
 	cmp r0, 0
 	bge _080C11C0
 	ldrh r0, [r2]
-	bl poke_something_2
+	bl NationalPokedexNumToSpecies
 	lsls r0, 16
 	lsrs r2, r0, 16
 	ldr r1, =0x083203cc
@@ -456029,7 +456029,7 @@ _080EFA5A:
 	b _080EFA7E
 _080EFA62:
 	adds r0, r4, 0
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0
@@ -458138,7 +458138,7 @@ sub_80F0B24: @ 80F0B24
 	lsrs r0, 16
 	lsls r1, 24
 	lsrs r4, r1, 24
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0
@@ -468098,7 +468098,7 @@ sub_80F66B4: @ 80F66B4
 	movs r4, 0x3
 _080F66DA:
 	ldrh r0, [r5]
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x2
@@ -473554,7 +473554,7 @@ sub_80F9244: @ 80F9244
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r0, r5, 0
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r5, r0, 16
 	cmp r4, 0x1
@@ -474363,7 +474363,7 @@ sub_80F989C: @ 80F989C
 	lsrs r0, 16
 	lsls r6, 16
 	lsrs r6, 16
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0
@@ -550357,7 +550357,7 @@ _0811F128:
 	bcs _0811F172
 _0811F146:
 	ldrh r0, [r5]
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0
@@ -551215,7 +551215,7 @@ _0811F780:
 	.4byte _0811F7EE
 _0811F7D8:
 	adds r0, r4, 0
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0
@@ -551229,7 +551229,7 @@ _0811F7EE:
 	cmp r0, 0
 	beq _0811F808
 	adds r0, r4, 0
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0
@@ -593446,7 +593446,7 @@ sub_81344C8: @ 81344C8
 	lsls r4, 16
 	lsrs r4, 16
 	adds r0, r4, 0
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	add r1, sp, 0xC
@@ -598179,7 +598179,7 @@ sub_8136C8C: @ 8136C8C
 	lsrs r0, 24
 	mov r8, r0
 	ldr r0, =0x02024744
-	bl get_nature
+	bl GetNature
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r5, =0x03005d8c
@@ -600041,7 +600041,7 @@ _08137B7C:
 	cmp r0, 0xC8
 	bne _08137BB8
 	ldr r0, =0x00000199
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x1
@@ -600051,7 +600051,7 @@ _08137B7C:
 	bne _08137BEA
 	movs r0, 0xCD
 	lsls r0, 1
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x1
@@ -600066,7 +600066,7 @@ _08137BB8:
 	cmp r0, 0xC9
 	bne _08137BF8
 	ldr r0, =0x00000199
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x1
@@ -600076,7 +600076,7 @@ _08137BB8:
 	beq _08137C04
 	movs r0, 0xCD
 	lsls r0, 1
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x1
@@ -602904,7 +602904,7 @@ sub_81391D0: @ 81391D0
 	muls r0, r1
 	ldr r1, =0x020244ec
 	adds r0, r1
-	bl get_nature
+	bl GetNature
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x02021cc4
@@ -605670,7 +605670,7 @@ _0813A7C6:
 	muls r0, r1
 	ldr r1, =0x020244ec
 	adds r0, r1
-	bl get_nature
+	bl GetNature
 	lsls r0, 24
 	ldr r1, =0x085b3040
 	lsrs r0, 22
@@ -612933,13 +612933,13 @@ _0813E4A0:
 	lsls r4, 3
 	adds r4, r0
 	ldrh r0, [r4, 0xC]
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x2
 	bl pokedex_flag_operation
 	ldrh r0, [r4, 0xC]
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x3
@@ -613461,13 +613461,13 @@ _0813E99E:
 	mov r0, r9
 	bl sub_806D778
 	ldrh r0, [r4, 0xC]
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x2
 	bl pokedex_flag_operation
 	ldrh r0, [r4, 0xC]
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x3
@@ -614685,13 +614685,13 @@ _0813F4F2:
 	mov r0, r9
 	bl sub_806D778
 	ldrh r0, [r4, 0xC]
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x2
 	bl pokedex_flag_operation
 	ldrh r0, [r4, 0xC]
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x3
@@ -654519,7 +654519,7 @@ _08153D4C:
 	cmp r4, r0
 	beq _08153D86
 	adds r0, r4, 0
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	adds r4, r0, 0
 	lsls r4, 16
 	lsrs r4, 16
@@ -689494,7 +689494,7 @@ _08165440:
 	cmp r7, 0
 	bne _08165440
 	ldr r0, [sp, 0x44]
-	bl getNature
+	bl GetNatureFromPersonality
 	ldrb r1, [r5, 0x4]
 	lsls r0, 24
 	lsrs r0, 24
@@ -694192,7 +694192,7 @@ sub_8167BA0: @ 8167BA0
 	muls r0, r1
 	ldr r1, =0x020244ec
 	adds r0, r1
-	bl get_nature
+	bl GetNature
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -723721,7 +723721,7 @@ sub_8177388: @ 8177388
 	bl sub_8133EDC
 	lsls r0, 16
 	lsrs r0, 16
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	mov r10, r0
@@ -729053,7 +729053,7 @@ sub_817A1C4: @ 817A1C4
 	ldr r4, [r1]
 	adds r4, r0
 	adds r0, r5, 0
-	bl get_nature
+	bl GetNature
 	lsls r0, 24
 	lsrs r0, 24
 	adds r1, r4, 0
@@ -729222,7 +729222,7 @@ sub_817A358: @ 817A358
 	mov r2, r8
 	strb r2, [r0]
 	adds r0, r5, 0
-	bl get_nature
+	bl GetNature
 	mov r2, r9
 	ldr r1, [r2]
 	ldr r2, =0x0000105a
@@ -738946,7 +738946,7 @@ sub_817F594: @ 817F594
 	muls r0, r1
 	ldr r1, =0x020244ec
 	adds r0, r1
-	bl get_nature
+	bl GetNature
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r6, 1
@@ -770077,7 +770077,7 @@ _0818F11C:
 	movs r2, 0x64
 	muls r0, r2
 	add r0, r9
-	bl get_nature
+	bl GetNature
 	ldr r1, [r5]
 	adds r1, r7
 	ldr r3, =0x00000f0a
@@ -779525,7 +779525,7 @@ _08193FEE:
 	adds r0, r5, 0
 	str r2, [sp, 0x7C]
 	str r3, [sp, 0x80]
-	bl getNature
+	bl GetNatureFromPersonality
 	ldrb r1, [r4, 0xC]
 	lsls r0, 24
 	lsrs r0, 24
@@ -785464,7 +785464,7 @@ _0819702E:
 	bls _08197078
 	movs r0, 0xCD
 	lsls r0, 1
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x1
@@ -785477,7 +785477,7 @@ _0819702E:
 	lsrs r4, r0, 16
 _08197050:
 	ldr r0, =0x00000199
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x1
@@ -795228,7 +795228,7 @@ sub_819BCF8: @ 819BCF8
 	bl pokemon_getattr
 	lsls r0, 16
 	lsrs r0, 16
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	add r1, sp, 0xC
@@ -801407,7 +801407,7 @@ _0819EFF2:
 	bl pokemon_getattr
 	lsls r0, 16
 	lsrs r0, 16
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	add r1, sp, 0xC
@@ -810909,7 +810909,7 @@ sub_81A3DD0: @ 81A3DD0
 	lsls r1, 24
 	lsrs r4, r1, 24
 	adds r0, r6, 0
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x1
@@ -811299,7 +811299,7 @@ _081A40EC:
 	mov r4, r8
 _081A4112:
 	adds r0, r2, 0
-	bl species_to_pokedex_index
+	bl SpeciesToNationalPokedexNum
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x1
@@ -812951,7 +812951,7 @@ _081A4E96:
 	ldr r2, =0x0861156c
 	adds r4, r2
 	adds r0, r7, 0
-	bl getNature
+	bl GetNatureFromPersonality
 	ldrb r1, [r4, 0x5]
 	lsls r0, 24
 	lsrs r0, 24
@@ -836312,7 +836312,7 @@ _081B0C66:
 	adds r0, r6, 0
 	movs r1, 0x3
 	adds r2, r4, 0
-	bl sub_806D098
+	bl GetEvolutionTargetSpecies
 	lsls r0, 16
 	cmp r0, 0
 	bne _081B0C56
@@ -849291,7 +849291,7 @@ sub_81B7810: @ 81B7810
 	adds r0, r7, 0
 	movs r1, 0
 	movs r2, 0
-	bl sub_806D098
+	bl GetEvolutionTargetSpecies
 	lsls r0, 16
 	lsrs r4, r0, 16
 	cmp r4, 0
@@ -865740,7 +865740,7 @@ _081C01DC:
 	bne _081C0254
 _081C01F8:
 	adds r0, r5, 0
-	bl get_nature
+	bl GetNature
 	adds r1, r6, 0
 	adds r1, 0x33
 	strb r0, [r1]
@@ -865775,7 +865775,7 @@ _081C01F8:
 	.pool
 _081C0254:
 	adds r0, r5, 0
-	bl get_nature
+	bl GetNature
 	adds r1, r7, 0
 	adds r1, 0xA3
 	strb r0, [r1]
diff --git a/asm/macros.s b/asm/macros.s
index 0a8999cc0..9ea9009f5 100644
--- a/asm/macros.s
+++ b/asm/macros.s
@@ -62,4 +62,4 @@
 	.byte \text_color << 4 @ low nybble seems unused
 	.byte (\shadow_color << 4) | \bg_color
 	.2byte 0 @ padding
-	.endm
\ No newline at end of file
+	.endm