summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asm/rom.s134
-rw-r--r--data/data2.s7
-rw-r--r--data/text/species_names.s413
3 files changed, 482 insertions, 72 deletions
diff --git a/asm/rom.s b/asm/rom.s
index 2e9713989..bedb3012b 100644
--- a/asm/rom.s
+++ b/asm/rom.s
@@ -32731,7 +32731,7 @@ _0800FA18:
bl create_pokemon_set_level
b _0800FC74
.align 2
-_0800FA58: .4byte gUnknown_081F716C
+_0800FA58: .4byte gSpeciesNames
_0800FA5C:
adds r0, r2, 0
adds r0, 0x24
@@ -32825,7 +32825,7 @@ _0800FAE8:
ble _0800FAE8
b _0800FC74
.align 2
-_0800FB14: .4byte gUnknown_081F716C
+_0800FB14: .4byte gSpeciesNames
_0800FB18: .4byte gBattleMoves + 0x4 ; PP offset
_0800FB1C:
adds r0, r2, 0
@@ -32900,7 +32900,7 @@ _0800FB5E:
bl pokemon_setattr
b _0800FC74
.align 2
-_0800FBAC: .4byte gUnknown_081F716C
+_0800FBAC: .4byte gSpeciesNames
_0800FBB0:
adds r0, r4, 0
adds r0, 0x24
@@ -33044,7 +33044,7 @@ _0800FCB4:
pop {r1}
bx r1
.align 2
-_0800FCC4: .4byte gUnknown_081F716C
+_0800FCC4: .4byte gSpeciesNames
_0800FCC8: .4byte gBattleMoves + 0x4 ; PP offset
_0800FCCC: .4byte gUnknown_081F04FC
_0800FCD0: .4byte 0x020239f8
@@ -124149,7 +124149,7 @@ GetSpeciesName: ; 803DDA0
adds r2, r6, 0
b _0803DDC6
.align 2
-_0803DDBC: .4byte gUnknown_081F716C
+_0803DDBC: .4byte gSpeciesNames
_0803DDC0:
adds r3, 0x1
adds r2, 0x1
@@ -127969,7 +127969,7 @@ _0803FBA8:
bx r0
.align 2
_0803FBB4: .4byte 0x020231cc
-_0803FBB8: .4byte gUnknown_081F716C
+_0803FBB8: .4byte gSpeciesNames
thumb_func_end sub_803FB68
thumb_func_start sub_803FBBC
@@ -130315,7 +130315,7 @@ _08040D54:
adds r1, r0
b _08040D70
.align 2
-_08040D64: .4byte gUnknown_081F716C
+_08040D64: .4byte gSpeciesNames
_08040D68:
ldr r1, _08040D88
cmp r0, 0x20
@@ -146945,7 +146945,7 @@ _0804905E:
_0804906C: .4byte 0x030045c0
_08049070: .4byte 0x0000012f
_08049074: .4byte gUnknown_0820C3B0
-_08049078: .4byte gUnknown_081F7E71
+_08049078: .4byte gSpeciesNames + 0xD05
_0804907C:
movs r0, 0
_0804907E:
@@ -155733,7 +155733,7 @@ sub_804D89C: ; 804D89C
_0804D8D0: .4byte 0x0202e8cc
_0804D8D4: .4byte gUnknown_08215AC4
_0804D8D8: .4byte 0x020231cc
-_0804D8DC: .4byte gUnknown_081F716C
+_0804D8DC: .4byte gSpeciesNames
_0804D8E0: .4byte 0x020232cc
thumb_func_end sub_804D89C
@@ -155778,7 +155778,7 @@ _0804D934: .4byte 0x0202e8ce
_0804D938: .4byte 0x03004360
_0804D93C: .4byte 0x020231cc
_0804D940: .4byte 0x020232cc
-_0804D944: .4byte gUnknown_081F716C
+_0804D944: .4byte gSpeciesNames
thumb_func_end sub_804D8E4
thumb_func_start sub_804D948
@@ -211680,7 +211680,7 @@ s7D_load_pokename: ; 8067380
bx r1
.align 2
_080673B8: .4byte gUnknown_083762F0
-_080673BC: .4byte gUnknown_081F716C
+_080673BC: .4byte gSpeciesNames
thumb_func_end s7D_load_pokename
thumb_func_start s7E_load_first_pokenames
@@ -211717,7 +211717,7 @@ s7E_load_first_pokenames: ; 80673C0
.align 2
_08067400: .4byte gUnknown_083762F0
_08067404: .4byte 0x03004360
-_08067408: .4byte gUnknown_081F716C
+_08067408: .4byte gSpeciesNames
thumb_func_end s7E_load_first_pokenames
thumb_func_start s7F_load_pokename_team
@@ -271258,7 +271258,7 @@ sub_8083D70: ; 8083D70
bx r1
.align 2
_08083DE4: .4byte 0x03004360
-_08083DE8: .4byte gUnknown_081F716C
+_08083DE8: .4byte gSpeciesNames
_08083DEC: .4byte gUnknown_0839B24D
_08083DF0: .4byte gUnknown_0839B255
_08083DF4: .4byte 0x03004ae8
@@ -292000,7 +292000,7 @@ _0808E032:
bls _0808E032
b _0808E070
.align 2
-_0808E054: .4byte gUnknown_081F716C
+_0808E054: .4byte gSpeciesNames
_0808E058:
movs r4, 0
subs r5, 0x11
@@ -298146,7 +298146,7 @@ _08091212:
bls _08091212
b _0809124C
.align 2
-_08091234: .4byte gUnknown_081F716C
+_08091234: .4byte gSpeciesNames
_08091238:
movs r4, 0
movs r1, 0xAE
@@ -298228,7 +298228,7 @@ _080912AC:
b _080912E6
.align 2
_080912CC: .4byte gUnknown_083B5558
-_080912D0: .4byte gUnknown_081F716C
+_080912D0: .4byte gSpeciesNames
_080912D4:
movs r4, 0
movs r1, 0xAE
@@ -299566,7 +299566,7 @@ _08091D08: .4byte 0x00000181
_08091D0C: .4byte 0x0202ffb4
_08091D10: .4byte 0x0000060c
_08091D14: .4byte gUnknown_083B57BC
-_08091D18: .4byte gUnknown_081F716C
+_08091D18: .4byte gSpeciesNames
_08091D1C: .4byte gBaseStats
_08091D20:
movs r5, 0
@@ -320683,7 +320683,7 @@ _0809C394: .4byte 0x000011fa
_0809C398: .4byte 0x00001234
_0809C39C: .4byte 0x0000123d
_0809C3A0: .4byte 0x000011f0
-_0809C3A4: .4byte gUnknown_081F716C
+_0809C3A4: .4byte gSpeciesNames
_0809C3A8: .4byte 0x00001259
_0809C3AC: .4byte 0x00001261
_0809C3B0: .4byte 0x00001262
@@ -329593,7 +329593,7 @@ sub_80A0958: ; 80A0958
bx r0
.align 2
_080A0A24: .4byte 0x020231cc
-_080A0A28: .4byte gUnknown_081F716C
+_080A0A28: .4byte gSpeciesNames
thumb_func_end sub_80A0958
thumb_func_start sub_80A0A2C
@@ -377009,7 +377009,7 @@ sub_80B78F8: ; 80B78F8
.align 2
_080B7914: .4byte 0x020231cc
_080B7918: .4byte 0x02000000
-_080B791C: .4byte gUnknown_081F716C
+_080B791C: .4byte gSpeciesNames
thumb_func_end sub_80B78F8
thumb_func_start nullsub_62
@@ -390323,7 +390323,7 @@ _080BDF64:
b _080BDFDE
.align 2
_080BDF98: .4byte 0x0000ffff
-_080BDF9C: .4byte gUnknown_081F716C
+_080BDF9C: .4byte gSpeciesNames
_080BDFA0: .4byte 0x02027e6c
_080BDFA4: .4byte 0x03005d38
_080BDFA8: .4byte 0x02024ea4
@@ -392873,7 +392873,7 @@ _080BF384:
_080BF38C: .4byte 0x0202e8dc
_080BF390: .4byte 0x020231cc
_080BF394: .4byte 0x03004360
-_080BF398: .4byte gUnknown_081F716C
+_080BF398: .4byte gSpeciesNames
_080BF39C: .4byte 0x03005d38
_080BF3A0: .4byte 0x02027e6c
thumb_func_end sub_80BF334
@@ -392963,7 +392963,7 @@ _080BF448:
_080BF450: .4byte 0x0202e8dc
_080BF454: .4byte 0x020231cc
_080BF458: .4byte 0x03004360
-_080BF45C: .4byte gUnknown_081F716C
+_080BF45C: .4byte gSpeciesNames
_080BF460: .4byte 0x020232cc
_080BF464: .4byte 0x03005d38
_080BF468: .4byte 0x02027e6c
@@ -393078,7 +393078,7 @@ sub_80BF4F4: ; 80BF4F4
.align 2
_080BF530: .4byte 0x03004360
_080BF534: .4byte 0x020231cc
-_080BF538: .4byte gUnknown_081F716C
+_080BF538: .4byte gSpeciesNames
_080BF53C:
movs r0, 0
_080BF53E:
@@ -393254,7 +393254,7 @@ sub_80BF638: ; 80BF638
bx r1
.align 2
_080BF66C: .4byte gUnknown_083D1464
-_080BF670: .4byte gUnknown_081F716C
+_080BF670: .4byte gSpeciesNames
thumb_func_end sub_80BF638
thumb_func_start sub_80BF674
@@ -393631,7 +393631,7 @@ _080BF8F4:
adds r1, r5, r4
b _080BF91E
.align 2
-_080BF910: .4byte gUnknown_081F716C
+_080BF910: .4byte gSpeciesNames
_080BF914:
cmp r6, 0x1
bne _080BF926
@@ -395763,7 +395763,7 @@ _080C0980:
b _080C0B78
.align 2
_080C09C0: .4byte 0x020231cc
-_080C09C4: .4byte gUnknown_081F716C
+_080C09C4: .4byte gSpeciesNames
_080C09C8: .4byte 0x020387e8
_080C09CC:
ldr r1, _080C09D4
@@ -395792,7 +395792,7 @@ _080C09D8:
b _080C0B74
.align 2
_080C0A04: .4byte 0x020231cc
-_080C0A08: .4byte gUnknown_081F716C
+_080C0A08: .4byte gSpeciesNames
_080C0A0C: .4byte 0x020232cc
_080C0A10:
ldr r0, _080C0A2C
@@ -395914,7 +395914,7 @@ _080C0AEC:
b _080C0B78
.align 2
_080C0B1C: .4byte 0x020231cc
-_080C0B20: .4byte gUnknown_081F716C
+_080C0B20: .4byte gSpeciesNames
_080C0B24: .4byte 0x020232cc
_080C0B28: .4byte gUnknown_081F8320
_080C0B2C: .4byte 0x020233cc
@@ -395937,7 +395937,7 @@ _080C0B34:
.align 2
_080C0B58: .4byte 0x020231cc
_080C0B5C: .4byte 0x020232cc
-_080C0B60: .4byte gUnknown_081F716C
+_080C0B60: .4byte gSpeciesNames
_080C0B64:
ldr r0, _080C0B8C
ldrh r2, [r4, 0x2]
@@ -395962,7 +395962,7 @@ _080C0B7A:
bx r0
.align 2
_080C0B8C: .4byte 0x020231cc
-_080C0B90: .4byte gUnknown_081F716C
+_080C0B90: .4byte gSpeciesNames
_080C0B94: .4byte 0x020387e8
_080C0B98: .4byte gUnknown_083D1524
thumb_func_end DoTVShowBravoTrainerPokemonProfile
@@ -396037,7 +396037,7 @@ _080C0C18:
.align 2
_080C0C40: .4byte 0x020231cc
_080C0C44: .4byte 0x020232cc
-_080C0C48: .4byte gUnknown_081F716C
+_080C0C48: .4byte gSpeciesNames
_080C0C4C: .4byte 0x020387e8
_080C0C50:
ldr r1, _080C0C58
@@ -396103,7 +396103,7 @@ _080C0CB0:
.align 2
_080C0CD0: .4byte 0x020231cc
_080C0CD4: .4byte 0x020232cc
-_080C0CD8: .4byte gUnknown_081F716C
+_080C0CD8: .4byte gSpeciesNames
_080C0CDC:
ldr r0, _080C0D08
adds r1, r4, 0
@@ -396128,7 +396128,7 @@ _080C0CFE:
.align 2
_080C0D08: .4byte 0x020231cc
_080C0D0C: .4byte 0x020232cc
-_080C0D10: .4byte gUnknown_081F716C
+_080C0D10: .4byte gSpeciesNames
_080C0D14: .4byte 0x020387e8
_080C0D18:
ldr r1, _080C0D20
@@ -396236,7 +396236,7 @@ _080C0DDE:
.align 2
_080C0DF0: .4byte 0x020231cc
_080C0DF4: .4byte 0x020232cc
-_080C0DF8: .4byte gUnknown_081F716C
+_080C0DF8: .4byte gSpeciesNames
_080C0DFC: .4byte gUnknown_083D1548
thumb_func_end sub_80C0B9C
@@ -396572,7 +396572,7 @@ _080C10C0:
.align 2
_080C10F4: .4byte 0x020231cc
_080C10F8: .4byte 0x020232cc
-_080C10FC: .4byte gUnknown_081F716C
+_080C10FC: .4byte gSpeciesNames
_080C1100: .4byte 0x020233cc
_080C1104: .4byte 0x020387e8
_080C1108:
@@ -396780,7 +396780,7 @@ _080C127C:
.align 2
_080C12C4: .4byte 0x020231cc
_080C12C8: .4byte 0x020232cc
-_080C12CC: .4byte gUnknown_081F716C
+_080C12CC: .4byte gSpeciesNames
_080C12D0: .4byte 0x020387e8
_080C12D4:
movs r0, 0
@@ -396847,7 +396847,7 @@ _080C1354:
.align 2
_080C135C: .4byte 0x020231cc
_080C1360: .4byte 0x020232cc
-_080C1364: .4byte gUnknown_081F716C
+_080C1364: .4byte gSpeciesNames
_080C1368: .4byte 0x020387e8
_080C136C:
movs r7, 0x12
@@ -396951,7 +396951,7 @@ _080C141C:
.align 2
_080C1450: .4byte 0x020231cc
_080C1454: .4byte 0x020232cc
-_080C1458: .4byte gUnknown_081F716C
+_080C1458: .4byte gSpeciesNames
_080C145C: .4byte 0x020233cc
_080C1460: .4byte 0x020387e8
_080C1464:
@@ -397013,7 +397013,7 @@ _080C14B0:
.align 2
_080C14D8: .4byte 0x020231cc
_080C14DC: .4byte 0x020232cc
-_080C14E0: .4byte gUnknown_081F716C
+_080C14E0: .4byte gSpeciesNames
_080C14E4: .4byte 0x020233cc
_080C14E8:
movs r0, 0x6
@@ -397040,7 +397040,7 @@ _080C150A:
.align 2
_080C1514: .4byte 0x020231cc
_080C1518: .4byte 0x020232cc
-_080C151C: .4byte gUnknown_081F716C
+_080C151C: .4byte gSpeciesNames
_080C1520: .4byte 0x020387e8
_080C1524:
ldr r0, _080C1564
@@ -397073,7 +397073,7 @@ _080C1524:
.align 2
_080C1564: .4byte 0x020231cc
_080C1568: .4byte 0x020232cc
-_080C156C: .4byte gUnknown_081F716C
+_080C156C: .4byte gSpeciesNames
_080C1570: .4byte 0x020233cc
_080C1574: .4byte 0x020387e8
_080C1578:
@@ -397094,7 +397094,7 @@ _080C1578:
b _080C15C2
.align 2
_080C159C: .4byte 0x020231cc
-_080C15A0: .4byte gUnknown_081F716C
+_080C15A0: .4byte gSpeciesNames
_080C15A4: .4byte 0x020232cc
_080C15A8:
ldr r0, _080C15C8
@@ -397114,7 +397114,7 @@ _080C15C2:
b _080C15DC
.align 2
_080C15C8: .4byte 0x020231cc
-_080C15CC: .4byte gUnknown_081F716C
+_080C15CC: .4byte gSpeciesNames
_080C15D0: .4byte 0x020232cc
_080C15D4: .4byte 0x020387e8
_080C15D8:
@@ -397191,7 +397191,7 @@ _080C1650:
.align 2
_080C1674: .4byte 0x020231cc
_080C1678: .4byte 0x020232cc
-_080C167C: .4byte gUnknown_081F716C
+_080C167C: .4byte gSpeciesNames
_080C1680: .4byte 0x020387e8
_080C1684:
ldr r0, _080C16B8
@@ -397221,7 +397221,7 @@ _080C1684:
_080C16B8: .4byte 0x020231cc
_080C16BC: .4byte 0x020232cc
_080C16C0: .4byte 0x020233cc
-_080C16C4: .4byte gUnknown_081F716C
+_080C16C4: .4byte gSpeciesNames
_080C16C8: .4byte 0x020387e8
_080C16CC:
ldr r1, _080C16D4
@@ -397394,7 +397394,7 @@ _080C1864:
.align 2
_080C1888: .4byte 0x020231cc
_080C188C: .4byte 0x020232cc
-_080C1890: .4byte gUnknown_081F716C
+_080C1890: .4byte gSpeciesNames
_080C1894: .4byte 0x020387e8
_080C1898:
bl GenerateRandomNumber
@@ -397705,7 +397705,7 @@ _080C1B46:
.align 2
_080C1B78: .4byte 0x020231cc
_080C1B7C: .4byte 0x020232cc
-_080C1B80: .4byte gUnknown_081F716C
+_080C1B80: .4byte gSpeciesNames
_080C1B84: .4byte 0x020233cc
_080C1B88:
ldr r0, _080C1BB0
@@ -397728,7 +397728,7 @@ _080C1B88:
.align 2
_080C1BB0: .4byte 0x020231cc
_080C1BB4: .4byte 0x020232cc
-_080C1BB8: .4byte gUnknown_081F716C
+_080C1BB8: .4byte gSpeciesNames
_080C1BBC: .4byte 0x020233cc
_080C1BC0:
ldr r0, _080C1BE8
@@ -397797,7 +397797,7 @@ _080C1C40: .4byte 0x0202e8cc
_080C1C44: .4byte 0x02027e6c
_080C1C48: .4byte 0x020231cc
_080C1C4C: .4byte 0x020232cc
-_080C1C50: .4byte gUnknown_081F716C
+_080C1C50: .4byte gSpeciesNames
_080C1C54: .4byte gUnknown_083D14BC
_080C1C58: .4byte 0x020387e8
thumb_func_end DoTVShowPokemonNewsMassOutbreak
@@ -397947,7 +397947,7 @@ _080C1D44:
_080C1D88: .4byte 0x020231cc
_080C1D8C: .4byte 0x02025734
_080C1D90: .4byte 0x00002b10
-_080C1D94: .4byte gUnknown_081F716C
+_080C1D94: .4byte gSpeciesNames
_080C1D98: .4byte 0x020232cc
_080C1D9C: .4byte 0x00002b14
_080C1DA0: .4byte gUnknown_081F8320
@@ -398003,7 +398003,7 @@ _080C1E10: .4byte 0x02025734
_080C1E14: .4byte 0x00002b16
_080C1E18: .4byte 0x020232cc
_080C1E1C: .4byte 0x00002b10
-_080C1E20: .4byte gUnknown_081F716C
+_080C1E20: .4byte gSpeciesNames
_080C1E24: .4byte 0x020233cc
_080C1E28: .4byte 0x00002b12
_080C1E2C: .4byte 0x0202e8dc
@@ -398071,7 +398071,7 @@ _080C1E84:
.align 2
_080C1EB0: .4byte 0x020231cc
_080C1EB4: .4byte 0x020232cc
-_080C1EB8: .4byte gUnknown_081F716C
+_080C1EB8: .4byte gSpeciesNames
_080C1EBC:
ldr r0, _080C1EF8
adds r1, r4, 0
@@ -398101,7 +398101,7 @@ _080C1EE4:
.align 2
_080C1EF8: .4byte 0x020231cc
_080C1EFC: .4byte 0x020232cc
-_080C1F00: .4byte gUnknown_081F716C
+_080C1F00: .4byte gSpeciesNames
_080C1F04: .4byte gUnknown_083D15EC
thumb_func_end DoTVShowPokemonAngler
@@ -398166,7 +398166,7 @@ _080C1F6C:
b _080C1FB6
.align 2
_080C1F84: .4byte 0x020231cc
-_080C1F88: .4byte gUnknown_081F716C
+_080C1F88: .4byte gSpeciesNames
_080C1F8C:
ldr r0, _080C1FC8
adds r1, r4, 0
@@ -398198,7 +398198,7 @@ _080C1FB6:
_080C1FC8: .4byte 0x020231cc
_080C1FCC: .4byte 0x020232cc
_080C1FD0: .4byte 0x020233cc
-_080C1FD4: .4byte gUnknown_081F716C
+_080C1FD4: .4byte gSpeciesNames
_080C1FD8: .4byte gUnknown_083D15F4
thumb_func_end DoTVShowTheWorldOfMasters
@@ -405833,7 +405833,7 @@ sub_80C5B1C: ; 80C5B1C
.align 2
_080C5B58: .4byte 0x020233cc
_080C5B5C: .4byte 0x020231cc
-_080C5B60: .4byte gUnknown_081F716C
+_080C5B60: .4byte gSpeciesNames
_080C5B64: .4byte 0x020232cc
_080C5B68: .4byte gUnknown_0842C9E1
_080C5B6C:
@@ -483365,7 +483365,7 @@ _080EB270:
adds r1, r0
b _080EB2A2
.align 2
-_080EB27C: .4byte gUnknown_081F716C
+_080EB27C: .4byte gSpeciesNames
_080EB280:
movs r0, 0xD
muls r1, r0
@@ -483459,7 +483459,7 @@ _080EB324:
adds r1, r0
b _080EB356
.align 2
-_080EB330: .4byte gUnknown_081F716C
+_080EB330: .4byte gSpeciesNames
_080EB334:
movs r0, 0xD
muls r1, r0
@@ -483618,7 +483618,7 @@ _080EB448:
adds r1, r0
b _080EB498
.align 2
-_080EB454: .4byte gUnknown_081F716C
+_080EB454: .4byte gSpeciesNames
_080EB458:
movs r0, 0xD
adds r1, r2, 0
@@ -483872,7 +483872,7 @@ _080EB610:
adds r1, r0
b _080EB660
.align 2
-_080EB61C: .4byte gUnknown_081F716C
+_080EB61C: .4byte gSpeciesNames
_080EB620:
movs r0, 0xD
adds r1, r2, 0
@@ -548068,7 +548068,7 @@ _0810A4D8:
_0810A568: .4byte gUnknown_083F76BE
_0810A56C: .4byte 0x04000040
_0810A570: .4byte gUnknown_0840E5CD
-_0810A574: .4byte gUnknown_081F716C
+_0810A574: .4byte gSpeciesNames
_0810A578: .4byte 0x04000044
thumb_func_end sub_810A42C
@@ -563349,7 +563349,7 @@ _08111C40: .4byte 0x0300428c
_08111C44: .4byte 0x030028f8
_08111C48: .4byte 0x020231cc
_08111C4C: .4byte 0x020232cc
-_08111C50: .4byte gUnknown_081F716C
+_08111C50: .4byte gSpeciesNames
_08111C54: .4byte gUnknown_081E8354
_08111C58: .4byte gUnknown_081E7C74
_08111C5C: .4byte gUnknown_081FAF4C
@@ -563989,7 +563989,7 @@ sub_81120E4: ; 81120E4
.align 2
_08112234: .4byte 0x020231cc
_08112238: .4byte 0x020232cc
-_0811223C: .4byte gUnknown_081F716C
+_0811223C: .4byte gSpeciesNames
_08112240: .4byte 0x020211c8
_08112244: .4byte 0x02014800
_08112248: .4byte gUnknown_081E8354
@@ -564185,7 +564185,7 @@ _081123E2:
_081123F4: .4byte gEvolutionTable
_081123F8: .4byte 0x03004350
_081123FC: .4byte 0x03004360
-_08112400: .4byte gUnknown_081F716C
+_08112400: .4byte gSpeciesNames
_08112404: .4byte 0x0000012f
_08112408: .4byte gUnknown_083F868C
thumb_func_end sub_81122B4
@@ -635611,7 +635611,7 @@ _081351E6:
_081351F0: .4byte 0x020231cc
_081351F4: .4byte gUnknown_08400E29
_081351F8: .4byte gUnknown_08400E2E
-_081351FC: .4byte gUnknown_081F716C
+_081351FC: .4byte gSpeciesNames
thumb_func_end sub_81350E0
thumb_func_start sub_8135200
@@ -663759,7 +663759,7 @@ _08143204:
beq _08143244
b _0814324A
.align 2
-_08143238: .4byte gUnknown_081F716C
+_08143238: .4byte gSpeciesNames
_0814323C: .4byte 0x000001ff
_08143240:
movs r0, 0xB5
diff --git a/data/data2.s b/data/data2.s
index c2998b827..66f29af15 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -436,11 +436,8 @@ gUnknown_081F0500: ; 81F0500
gUnknown_081F050C: ; 81F050C
.incbin "baserom.gba", 0x001f050c, 0x6c60
-gUnknown_081F716C: ; 81F716C
- .incbin "baserom.gba", 0x001f716c, 0xd05
-
-gUnknown_081F7E71: ; 81F7E71
- .incbin "baserom.gba", 0x001f7e71, 0x4af
+; 81F716C
+ .include "data/text/species_names.s"
gUnknown_081F8320: ; 81F8320
.incbin "baserom.gba", 0x001f8320, 0x1254
diff --git a/data/text/species_names.s b/data/text/species_names.s
new file mode 100644
index 000000000..1347be003
--- /dev/null
+++ b/data/text/species_names.s
@@ -0,0 +1,413 @@
+gSpeciesNames: ; 83185C8
+ .charmapstr "??????????$", 11
+ .charmapstr "BULBASAUR$", 11
+ .charmapstr "IVYSAUR$", 11
+ .charmapstr "VENUSAUR$", 11
+ .charmapstr "CHARMANDER$", 11
+ .charmapstr "CHARMELEON$", 11
+ .charmapstr "CHARIZARD$", 11
+ .charmapstr "SQUIRTLE$", 11
+ .charmapstr "WARTORTLE$", 11
+ .charmapstr "BLASTOISE$", 11
+ .charmapstr "CATERPIE$", 11
+ .charmapstr "METAPOD$", 11
+ .charmapstr "BUTTERFREE$", 11
+ .charmapstr "WEEDLE$", 11
+ .charmapstr "KAKUNA$", 11
+ .charmapstr "BEEDRILL$", 11
+ .charmapstr "PIDGEY$", 11
+ .charmapstr "PIDGEOTTO$", 11
+ .charmapstr "PIDGEOT$", 11
+ .charmapstr "RATTATA$", 11
+ .charmapstr "RATICATE$", 11
+ .charmapstr "SPEAROW$", 11
+ .charmapstr "FEAROW$", 11
+ .charmapstr "EKANS$", 11
+ .charmapstr "ARBOK$", 11
+ .charmapstr "PIKACHU$", 11
+ .charmapstr "RAICHU$", 11
+ .charmapstr "SANDSHREW$", 11
+ .charmapstr "SANDSLASH$", 11
+ .charmapstr "NIDORAN♀$", 11
+ .charmapstr "NIDORINA$", 11
+ .charmapstr "NIDOQUEEN$", 11
+ .charmapstr "NIDORAN♂$", 11
+ .charmapstr "NIDORINO$", 11
+ .charmapstr "NIDOKING$", 11
+ .charmapstr "CLEFAIRY$", 11
+ .charmapstr "CLEFABLE$", 11
+ .charmapstr "VULPIX$", 11
+ .charmapstr "NINETALES$", 11
+ .charmapstr "JIGGLYPUFF$", 11
+ .charmapstr "WIGGLYTUFF$", 11
+ .charmapstr "ZUBAT$", 11
+ .charmapstr "GOLBAT$", 11
+ .charmapstr "ODDISH$", 11
+ .charmapstr "GLOOM$", 11
+ .charmapstr "VILEPLUME$", 11
+ .charmapstr "PARAS$", 11
+ .charmapstr "PARASECT$", 11
+ .charmapstr "VENONAT$", 11
+ .charmapstr "VENOMOTH$", 11
+ .charmapstr "DIGLETT$", 11
+ .charmapstr "DUGTRIO$", 11
+ .charmapstr "MEOWTH$", 11
+ .charmapstr "PERSIAN$", 11
+ .charmapstr "PSYDUCK$", 11
+ .charmapstr "GOLDUCK$", 11
+ .charmapstr "MANKEY$", 11
+ .charmapstr "PRIMEAPE$", 11
+ .charmapstr "GROWLITHE$", 11
+ .charmapstr "ARCANINE$", 11
+ .charmapstr "POLIWAG$", 11
+ .charmapstr "POLIWHIRL$", 11
+ .charmapstr "POLIWRATH$", 11
+ .charmapstr "ABRA$", 11
+ .charmapstr "KADABRA$", 11
+ .charmapstr "ALAKAZAM$", 11
+ .charmapstr "MACHOP$", 11
+ .charmapstr "MACHOKE$", 11
+ .charmapstr "MACHAMP$", 11
+ .charmapstr "BELLSPROUT$", 11
+ .charmapstr "WEEPINBELL$", 11
+ .charmapstr "VICTREEBEL$", 11
+ .charmapstr "TENTACOOL$", 11
+ .charmapstr "TENTACRUEL$", 11
+ .charmapstr "GEODUDE$", 11
+ .charmapstr "GRAVELER$", 11
+ .charmapstr "GOLEM$", 11
+ .charmapstr "PONYTA$", 11
+ .charmapstr "RAPIDASH$", 11
+ .charmapstr "SLOWPOKE$", 11
+ .charmapstr "SLOWBRO$", 11
+ .charmapstr "MAGNEMITE$", 11
+ .charmapstr "MAGNETON$", 11
+ .charmapstr "FARFETCH’D$", 11
+ .charmapstr "DODUO$", 11
+ .charmapstr "DODRIO$", 11
+ .charmapstr "SEEL$", 11
+ .charmapstr "DEWGONG$", 11
+ .charmapstr "GRIMER$", 11
+ .charmapstr "MUK$", 11
+ .charmapstr "SHELLDER$", 11
+ .charmapstr "CLOYSTER$", 11
+ .charmapstr "GASTLY$", 11
+ .charmapstr "HAUNTER$", 11
+ .charmapstr "GENGAR$", 11
+ .charmapstr "ONIX$", 11
+ .charmapstr "DROWZEE$", 11
+ .charmapstr "HYPNO$", 11
+ .charmapstr "KRABBY$", 11
+ .charmapstr "KINGLER$", 11
+ .charmapstr "VOLTORB$", 11
+ .charmapstr "ELECTRODE$", 11
+ .charmapstr "EXEGGCUTE$", 11
+ .charmapstr "EXEGGUTOR$", 11
+ .charmapstr "CUBONE$", 11
+ .charmapstr "MAROWAK$", 11
+ .charmapstr "HITMONLEE$", 11
+ .charmapstr "HITMONCHAN$", 11
+ .charmapstr "LICKITUNG$", 11
+ .charmapstr "KOFFING$", 11
+ .charmapstr "WEEZING$", 11
+ .charmapstr "RHYHORN$", 11
+ .charmapstr "RHYDON$", 11
+ .charmapstr "CHANSEY$", 11
+ .charmapstr "TANGELA$", 11
+ .charmapstr "KANGASKHAN$", 11
+ .charmapstr "HORSEA$", 11
+ .charmapstr "SEADRA$", 11
+ .charmapstr "GOLDEEN$", 11
+ .charmapstr "SEAKING$", 11
+ .charmapstr "STARYU$", 11
+ .charmapstr "STARMIE$", 11
+ .charmapstr "MR. MIME$", 11
+ .charmapstr "SCYTHER$", 11
+ .charmapstr "JYNX$", 11
+ .charmapstr "ELECTABUZZ$", 11
+ .charmapstr "MAGMAR$", 11
+ .charmapstr "PINSIR$", 11
+ .charmapstr "TAUROS$", 11
+ .charmapstr "MAGIKARP$", 11
+ .charmapstr "GYARADOS$", 11
+ .charmapstr "LAPRAS$", 11
+ .charmapstr "DITTO$", 11
+ .charmapstr "EEVEE$", 11
+ .charmapstr "VAPOREON$", 11
+ .charmapstr "JOLTEON$", 11
+ .charmapstr "FLAREON$", 11
+ .charmapstr "PORYGON$", 11
+ .charmapstr "OMANYTE$", 11
+ .charmapstr "OMASTAR$", 11
+ .charmapstr "KABUTO$", 11
+ .charmapstr "KABUTOPS$", 11
+ .charmapstr "AERODACTYL$", 11
+ .charmapstr "SNORLAX$", 11
+ .charmapstr "ARTICUNO$", 11
+ .charmapstr "ZAPDOS$", 11
+ .charmapstr "MOLTRES$", 11
+ .charmapstr "DRATINI$", 11
+ .charmapstr "DRAGONAIR$", 11
+ .charmapstr "DRAGONITE$", 11
+ .charmapstr "MEWTWO$", 11
+ .charmapstr "MEW$", 11
+ .charmapstr "CHIKORITA$", 11
+ .charmapstr "BAYLEEF$", 11
+ .charmapstr "MEGANIUM$", 11
+ .charmapstr "CYNDAQUIL$", 11
+ .charmapstr "QUILAVA$", 11
+ .charmapstr "TYPHLOSION$", 11
+ .charmapstr "TOTODILE$", 11
+ .charmapstr "CROCONAW$", 11
+ .charmapstr "FERALIGATR$", 11
+ .charmapstr "SENTRET$", 11
+ .charmapstr "FURRET$", 11
+ .charmapstr "HOOTHOOT$", 11
+ .charmapstr "NOCTOWL$", 11
+ .charmapstr "LEDYBA$", 11
+ .charmapstr "LEDIAN$", 11
+ .charmapstr "SPINARAK$", 11
+ .charmapstr "ARIADOS$", 11
+ .charmapstr "CROBAT$", 11
+ .charmapstr "CHINCHOU$", 11
+ .charmapstr "LANTURN$", 11
+ .charmapstr "PICHU$", 11
+ .charmapstr "CLEFFA$", 11
+ .charmapstr "IGGLYBUFF$", 11
+ .charmapstr "TOGEPI$", 11
+ .charmapstr "TOGETIC$", 11
+ .charmapstr "NATU$", 11
+ .charmapstr "XATU$", 11
+ .charmapstr "MAREEP$", 11
+ .charmapstr "FLAAFFY$", 11
+ .charmapstr "AMPHAROS$", 11
+ .charmapstr "BELLOSSOM$", 11
+ .charmapstr "MARILL$", 11
+ .charmapstr "AZUMARILL$", 11
+ .charmapstr "SUDOWOODO$", 11
+ .charmapstr "POLITOED$", 11
+ .charmapstr "HOPPIP$", 11
+ .charmapstr "SKIPLOOM$", 11
+ .charmapstr "JUMPLUFF$", 11
+ .charmapstr "AIPOM$", 11
+ .charmapstr "SUNKERN$", 11
+ .charmapstr "SUNFLORA$", 11
+ .charmapstr "YANMA$", 11
+ .charmapstr "WOOPER$", 11
+ .charmapstr "QUAGSIRE$", 11
+ .charmapstr "ESPEON$", 11
+ .charmapstr "UMBREON$", 11
+ .charmapstr "MURKROW$", 11
+ .charmapstr "SLOWKING$", 11
+ .charmapstr "MISDREAVUS$", 11
+ .charmapstr "UNOWN$", 11
+ .charmapstr "WOBBUFFET$", 11
+ .charmapstr "GIRAFARIG$", 11
+ .charmapstr "PINECO$", 11
+ .charmapstr "FORRETRESS$", 11
+ .charmapstr "DUNSPARCE$", 11
+ .charmapstr "GLIGAR$", 11
+ .charmapstr "STEELIX$", 11
+ .charmapstr "SNUBBULL$", 11
+ .charmapstr "GRANBULL$", 11
+ .charmapstr "QWILFISH$", 11
+ .charmapstr "SCIZOR$", 11
+ .charmapstr "SHUCKLE$", 11
+ .charmapstr "HERACROSS$", 11
+ .charmapstr "SNEASEL$", 11
+ .charmapstr "TEDDIURSA$", 11
+ .charmapstr "URSARING$", 11
+ .charmapstr "SLUGMA$", 11
+ .charmapstr "MAGCARGO$", 11
+ .charmapstr "SWINUB$", 11
+ .charmapstr "PILOSWINE$", 11
+ .charmapstr "CORSOLA$", 11
+ .charmapstr "REMORAID$", 11
+ .charmapstr "OCTILLERY$", 11
+ .charmapstr "DELIBIRD$", 11
+ .charmapstr "MANTINE$", 11
+ .charmapstr "SKARMORY$", 11
+ .charmapstr "HOUNDOUR$", 11
+ .charmapstr "HOUNDOOM$", 11
+ .charmapstr "KINGDRA$", 11
+ .charmapstr "PHANPY$", 11
+ .charmapstr "DONPHAN$", 11
+ .charmapstr "PORYGON2$", 11
+ .charmapstr "STANTLER$", 11
+ .charmapstr "SMEARGLE$", 11
+ .charmapstr "TYROGUE$", 11
+ .charmapstr "HITMONTOP$", 11
+ .charmapstr "SMOOCHUM$", 11
+ .charmapstr "ELEKID$", 11
+ .charmapstr "MAGBY$", 11
+ .charmapstr "MILTANK$", 11
+ .charmapstr "BLISSEY$", 11
+ .charmapstr "RAIKOU$", 11
+ .charmapstr "ENTEI$", 11
+ .charmapstr "SUICUNE$", 11
+ .charmapstr "LARVITAR$", 11
+ .charmapstr "PUPITAR$", 11
+ .charmapstr "TYRANITAR$", 11
+ .charmapstr "LUGIA$", 11
+ .charmapstr "HO-OH$", 11
+ .charmapstr "CELEBI$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "?$", 11
+ .charmapstr "TREECKO$", 11
+ .charmapstr "GROVYLE$", 11
+ .charmapstr "SCEPTILE$", 11
+ .charmapstr "TORCHIC$", 11
+ .charmapstr "COMBUSKEN$", 11
+ .charmapstr "BLAZIKEN$", 11
+ .charmapstr "MUDKIP$", 11
+ .charmapstr "MARSHTOMP$", 11
+ .charmapstr "SWAMPERT$", 11
+ .charmapstr "POOCHYENA$", 11
+ .charmapstr "MIGHTYENA$", 11
+ .charmapstr "ZIGZAGOON$", 11
+ .charmapstr "LINOONE$", 11
+ .charmapstr "WURMPLE$", 11
+ .charmapstr "SILCOON$", 11
+ .charmapstr "BEAUTIFLY$", 11
+ .charmapstr "CASCOON$", 11
+ .charmapstr "DUSTOX$", 11
+ .charmapstr "LOTAD$", 11
+ .charmapstr "LOMBRE$", 11
+ .charmapstr "LUDICOLO$", 11
+ .charmapstr "SEEDOT$", 11
+ .charmapstr "NUZLEAF$", 11
+ .charmapstr "SHIFTRY$", 11
+ .charmapstr "NINCADA$", 11
+ .charmapstr "NINJASK$", 11
+ .charmapstr "SHEDINJA$", 11
+ .charmapstr "TAILLOW$", 11
+ .charmapstr "SWELLOW$", 11
+ .charmapstr "SHROOMISH$", 11
+ .charmapstr "BRELOOM$", 11
+ .charmapstr "SPINDA$", 11
+ .charmapstr "WINGULL$", 11
+ .charmapstr "PELIPPER$", 11
+ .charmapstr "SURSKIT$", 11
+ .charmapstr "MASQUERAIN$", 11
+ .charmapstr "WAILMER$", 11
+ .charmapstr "WAILORD$", 11
+ .charmapstr "SKITTY$", 11
+ .charmapstr "DELCATTY$", 11
+ .charmapstr "KECLEON$", 11
+ .charmapstr "BALTOY$", 11
+ .charmapstr "CLAYDOL$", 11
+ .charmapstr "NOSEPASS$", 11
+ .charmapstr "TORKOAL$", 11
+ .charmapstr "SABLEYE$", 11
+ .charmapstr "BARBOACH$", 11
+ .charmapstr "WHISCASH$", 11
+ .charmapstr "LUVDISC$", 11
+ .charmapstr "CORPHISH$", 11
+ .charmapstr "CRAWDAUNT$", 11
+ .charmapstr "FEEBAS$", 11
+ .charmapstr "MILOTIC$", 11
+ .charmapstr "CARVANHA$", 11
+ .charmapstr "SHARPEDO$", 11
+ .charmapstr "TRAPINCH$", 11
+ .charmapstr "VIBRAVA$", 11
+ .charmapstr "FLYGON$", 11
+ .charmapstr "MAKUHITA$", 11
+ .charmapstr "HARIYAMA$", 11
+ .charmapstr "ELECTRIKE$", 11
+ .charmapstr "MANECTRIC$", 11
+ .charmapstr "NUMEL$", 11
+ .charmapstr "CAMERUPT$", 11
+ .charmapstr "SPHEAL$", 11
+ .charmapstr "SEALEO$", 11
+ .charmapstr "WALREIN$", 11
+ .charmapstr "CACNEA$", 11
+ .charmapstr "CACTURNE$", 11
+ .charmapstr "SNORUNT$", 11
+ .charmapstr "GLALIE$", 11
+ .charmapstr "LUNATONE$", 11
+ .charmapstr "SOLROCK$", 11
+ .charmapstr "AZURILL$", 11
+ .charmapstr "SPOINK$", 11
+ .charmapstr "GRUMPIG$", 11
+ .charmapstr "PLUSLE$", 11
+ .charmapstr "MINUN$", 11
+ .charmapstr "MAWILE$", 11
+ .charmapstr "MEDITITE$", 11
+ .charmapstr "MEDICHAM$", 11
+ .charmapstr "SWABLU$", 11
+ .charmapstr "ALTARIA$", 11
+ .charmapstr "WYNAUT$", 11
+ .charmapstr "DUSKULL$", 11
+ .charmapstr "DUSCLOPS$", 11
+ .charmapstr "ROSELIA$", 11
+ .charmapstr "SLAKOTH$", 11
+ .charmapstr "VIGOROTH$", 11
+ .charmapstr "SLAKING$", 11
+ .charmapstr "GULPIN$", 11
+ .charmapstr "SWALOT$", 11
+ .charmapstr "TROPIUS$", 11
+ .charmapstr "WHISMUR$", 11
+ .charmapstr "LOUDRED$", 11
+ .charmapstr "EXPLOUD$", 11
+ .charmapstr "CLAMPERL$", 11
+ .charmapstr "HUNTAIL$", 11
+ .charmapstr "GOREBYSS$", 11
+ .charmapstr "ABSOL$", 11
+ .charmapstr "SHUPPET$", 11
+ .charmapstr "BANETTE$", 11
+ .charmapstr "SEVIPER$", 11
+ .charmapstr "ZANGOOSE$", 11
+ .charmapstr "RELICANTH$", 11
+ .charmapstr "ARON$", 11
+ .charmapstr "LAIRON$", 11
+ .charmapstr "AGGRON$", 11
+ .charmapstr "CASTFORM$", 11
+ .charmapstr "VOLBEAT$", 11
+ .charmapstr "ILLUMISE$", 11
+ .charmapstr "LILEEP$", 11
+ .charmapstr "CRADILY$", 11
+ .charmapstr "ANORITH$", 11
+ .charmapstr "ARMALDO$", 11
+ .charmapstr "RALTS$", 11
+ .charmapstr "KIRLIA$", 11
+ .charmapstr "GARDEVOIR$", 11
+ .charmapstr "BAGON$", 11
+ .charmapstr "SHELGON$", 11
+ .charmapstr "SALAMENCE$", 11
+ .charmapstr "BELDUM$", 11
+ .charmapstr "METANG$", 11
+ .charmapstr "METAGROSS$", 11
+ .charmapstr "REGIROCK$", 11
+ .charmapstr "REGICE$", 11
+ .charmapstr "REGISTEEL$", 11
+ .charmapstr "KYOGRE$", 11
+ .charmapstr "GROUDON$", 11
+ .charmapstr "RAYQUAZA$", 11
+ .charmapstr "LATIAS$", 11
+ .charmapstr "LATIOS$", 11
+ .charmapstr "JIRACHI$", 11
+ .charmapstr "DEOXYS$", 11
+ .charmapstr "CHIMECHO$", 11