diff options
author | YamaArashi <shadow962@live.com> | 2015-10-10 21:03:09 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2015-10-10 21:03:09 -0700 |
commit | 9fa2098029ee1fa7d1d1344cb03287a4d409ae39 (patch) | |
tree | 56967b8ccf2ad7ba2438978a88d581649d8d084b /asm | |
parent | fcaed9692feba557539c094cba9123b72f48c899 (diff) |
add pokemon and move names, plus pokemon constants
Diffstat (limited to 'asm')
-rw-r--r-- | asm/charmap.s | 81 | ||||
-rw-r--r-- | asm/emerald.s | 377 |
2 files changed, 271 insertions, 187 deletions
diff --git a/asm/charmap.s b/asm/charmap.s new file mode 100644 index 000000000..8c703aef1 --- /dev/null +++ b/asm/charmap.s @@ -0,0 +1,81 @@ + .charmap " ", 0x00 + .charmap "é", 0x1B + .charmap "0", 0xA1 + .charmap "1", 0xA2 + .charmap "2", 0xA3 + .charmap "3", 0xA4 + .charmap "4", 0xA5 + .charmap "5", 0xA6 + .charmap "6", 0xA7 + .charmap "7", 0xA8 + .charmap "8", 0xA9 + .charmap "9", 0xAA + .charmap "!", 0xAB + .charmap "?", 0xAC + .charmap ".", 0xAD + .charmap "-", 0xAE + .charmap "·", 0xAF + .charmap "…", 0xB0 + .charmap "“", 0xB1 + .charmap "”", 0xB2 + .charmap "‘", 0xB3 + .charmap "’", 0xB4 + .charmap "♂", 0xB5 + .charmap "♀", 0xB6 + .charmap "¥", 0xB7 + .charmap ",", 0xB8 + .charmap "×", 0xB9 + .charmap "/", 0xBA + .charmap "A", 0xBB + .charmap "B", 0xBC + .charmap "C", 0xBD + .charmap "D", 0xBE + .charmap "E", 0xBF + .charmap "F", 0xC0 + .charmap "G", 0xC1 + .charmap "H", 0xC2 + .charmap "I", 0xC3 + .charmap "J", 0xC4 + .charmap "K", 0xC5 + .charmap "L", 0xC6 + .charmap "M", 0xC7 + .charmap "N", 0xC8 + .charmap "O", 0xC9 + .charmap "P", 0xCA + .charmap "Q", 0xCB + .charmap "R", 0xCC + .charmap "S", 0xCD + .charmap "T", 0xCE + .charmap "U", 0xCF + .charmap "V", 0xD0 + .charmap "W", 0xD1 + .charmap "X", 0xD2 + .charmap "Y", 0xD3 + .charmap "Z", 0xD4 + .charmap "a", 0xD5 + .charmap "b", 0xD6 + .charmap "c", 0xD7 + .charmap "d", 0xD8 + .charmap "e", 0xD9 + .charmap "f", 0xDA + .charmap "g", 0xDB + .charmap "h", 0xDC + .charmap "i", 0xDD + .charmap "j", 0xDE + .charmap "k", 0xDF + .charmap "l", 0xE0 + .charmap "m", 0xE1 + .charmap "n", 0xE2 + .charmap "o", 0xE3 + .charmap "p", 0xE4 + .charmap "q", 0xE5 + .charmap "r", 0xE6 + .charmap "s", 0xE7 + .charmap "t", 0xE8 + .charmap "u", 0xE9 + .charmap "v", 0xEA + .charmap "w", 0xEB + .charmap "x", 0xEC + .charmap "y", 0xED + .charmap "z", 0xEE + .charmap "$", 0xFF diff --git a/asm/emerald.s b/asm/emerald.s index 4f31e3f53..ba4624aff 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -1,5 +1,8 @@ .include "constants/gba_constants.s" + .include "constants/misc_constants.s" + .include "constants/species_constants.s" .include "asm/macros.s" + .include "asm/charmap.s" .syntax unified @@ -26698,7 +26701,7 @@ sub_80156E0: ; 80156E0 lsrs r0, 22 movs r1, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -29692,7 +29695,7 @@ sub_8017B3C: ; 8017B3C movs r0, 0xB mov r2, r8 muls r2, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r2, r0 str r5, [sp] str r4, [sp, 0x4] @@ -30147,7 +30150,7 @@ sub_8017EA0: ; 8017EA0 ldrh r2, [r4, 0xA] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy movs r4, 0 @@ -30175,7 +30178,7 @@ sub_8017EA0: ; 8017EA0 ldrh r1, [r5, 0x2] movs r0, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 adds r0, r6, 0 adds r0, 0x88 @@ -95244,7 +95247,7 @@ sub_80385E8: ; 80385E8 ldrh r1, [r0, 0x4] movs r0, 0xB muls r0, r1 - ldr r1, =gUnknown_083185C8 + ldr r1, =gSpeciesNames adds r0, r1 ldrb r0, [r0] adds r5, r2, 0 @@ -95312,7 +95315,7 @@ sub_80385E8: ; 80385E8 ldrh r1, [r0, 0x4] movs r0, 0xB muls r0, r1 - ldr r1, =gUnknown_083185C8 + ldr r1, =gSpeciesNames adds r0, r1 ldrb r0, [r0] mov r8, r2 @@ -95406,7 +95409,7 @@ sub_80385E8: ; 80385E8 ldrh r1, [r0, 0x4] movs r0, 0xB muls r0, r1 - ldr r1, =gUnknown_083185C8 + ldr r1, =gSpeciesNames adds r0, r1 ldrb r0, [r0] adds r5, r2, 0 @@ -95480,7 +95483,7 @@ sub_80385E8: ; 80385E8 ldrh r1, [r0, 0x4] movs r0, 0xB muls r0, r1 - ldr r1, =gUnknown_083185C8 + ldr r1, =gSpeciesNames adds r0, r1 ldrb r0, [r0] mov r8, r2 @@ -156902,7 +156905,7 @@ sub_8059AAC: ; 8059AAC ldrh r1, [r4] movs r0, 0xD muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 adds r0, r7, 0 bl gf_strcpy @@ -191208,7 +191211,7 @@ get_pokemon_name: ; 806B914 movs r0, 0xCE lsls r0, 1 mov r12, r0 - ldr r7, =gUnknown_083185C8 + ldr r7, =gSpeciesNames movs r0, 0xB muls r0, r5 adds r3, r0, r7 @@ -195018,7 +195021,7 @@ sub_806D778: ; 806D778 movs r6, 0xB adds r0, r7, 0 muls r0, r6 - ldr r4, =gUnknown_083185C8 + ldr r4, =gSpeciesNames adds r0, r4 mov r1, r9 bl sub_8008C44 @@ -208510,7 +208513,7 @@ sub_80741E8: ; 80741E8 @08074236: movs r0, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 add r0, sp, 0x4 bl sub_8008C44 @@ -216836,7 +216839,7 @@ shedinja_maker_maybe: ; 8078458 bne @08078766 adds r0, r4, 0 movs r1, 0x2 - ldr r2, =gUnknown_083192CD + ldr r2, =gSpeciesNames + SPECIES_SHEDINJA * POKEMON_NAME_LENGTH bl pokemon_setattr @08078766: adds r4, 0x64 @@ -219288,7 +219291,7 @@ sub_8079AA4: ; 8079AA4 adds r1, r0, 0 movs r0, 0xD muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 adds r0, r6, 0 bl gf_strcat @@ -227904,7 +227907,7 @@ sub_807E73C: ; 807E73C ldrh r1, [r4, 0x38] movs r6, 0xB muls r1, r6 - ldr r5, =gUnknown_083185C8 + ldr r5, =gSpeciesNames adds r1, r5 bl gf_strcpy ldr r0, =0x02021dc4 @@ -227947,7 +227950,7 @@ sub_807E784: ; 807E784 ldrh r2, [r4, 0xC] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy add sp, 0x20 @@ -289034,7 +289037,7 @@ s7D_load_pokename: ; 809AFBC ldr r2, [r4] movs r1, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 adds r0, r2, 0 bl gf_strcpy @@ -289069,7 +289072,7 @@ s7E_load_first_pokenames: ; 809AFFC bl pokemon_getattr movs r1, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -289227,7 +289230,7 @@ s82_load_item_name: ; 809B150 ldr r2, [r4] movs r1, 0xD muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 adds r0, r2, 0 bl gf_strcpy @@ -336244,7 +336247,7 @@ sub_80B2AF4: ; 80B2AF4 movs r1, 0 movs r0, 0xB mov r10, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames mov r9, r0 @080B2B20: lsls r0, r1, 1 @@ -356924,7 +356927,7 @@ sub_80BD23C: ; 80BD23C beq @080BD264 movs r0, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r4, r1, r0 b @080BD266 .align 2, 0 @@ -362489,7 +362492,7 @@ sub_80C020C: ; 80C020C beq @080C028C movs r0, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r0, r1, r0 b @080C028E .align 2, 0 @@ -363652,7 +363655,7 @@ sub_80C0B44: ; 80C0B44 cmp r5, 0 beq @080C0BC0 movs r4, 0 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames movs r0, 0xB adds r1, r5, 0 muls r1, r0 @@ -364235,7 +364238,7 @@ sub_80C0F30: ; 80C0F30 bl NationalPokedexNumToSpecies lsls r0, 16 lsrs r2, r0, 16 - ldr r1, =gUnknown_083185C8 + ldr r1, =gSpeciesNames movs r0, 0xB muls r0, r2 adds r0, r1 @@ -391073,7 +391076,7 @@ sub_80CEC00: ; 80CEC00 ldrh r1, [r0] movs r0, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 adds r0, r2, 0 movs r2, 0 @@ -410264,7 +410267,7 @@ sub_80D8490: ; 80D8490 movs r0, 0xD adds r1, r4, 0 muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 adds r0, r5, 0 bl gf_strcpy @@ -411315,7 +411318,7 @@ sub_80D8B38: ; 80D8B38 adds r2, r1, 0 movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy b @080D8F48 @@ -412680,7 +412683,7 @@ sub_80D8B38: ; 80D8B38 ldrh r2, [r5, 0x6] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy b @080D9AAE @@ -413120,7 +413123,7 @@ sub_80D8B38: ; 80D8B38 ldrh r2, [r1, 0x6] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r4, =0x02021fc4 @@ -413212,7 +413215,7 @@ sub_80D8B38: ; 80D8B38 ldrh r2, [r1, 0x6] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r4, =0x02021fc4 @@ -420061,7 +420064,7 @@ sub_80DD45C: ; 80DD45C ldrh r2, [r1, 0x6] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r3, =gUnknown_0858C2B4 @@ -426944,7 +426947,7 @@ sub_80E0AC8: ; 80E0AC8 lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -434490,7 +434493,7 @@ sub_80E48E8: ; 80E48E8 ldrh r1, [r0] movs r0, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 add r0, sp, 0xC bl gf_strcpy @@ -449968,7 +449971,7 @@ sub_80EC728: ; 80EC728 ldrh r1, [r5, 0x28] movs r0, 0xB muls r0, r1 - ldr r1, =gUnknown_083185C8 + ldr r1, =gSpeciesNames adds r0, r1 adds r1, r5, 0 adds r1, 0x2A @@ -455538,7 +455541,7 @@ sub_80EF64C: ; 80EF64C bl pokemon_getattr movs r1, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -455614,7 +455617,7 @@ sub_80EF704: ; 80EF704 bl pokemon_getattr movs r1, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 adds r0, r6, 0 bl gf_strcpy @@ -455805,7 +455808,7 @@ sub_80EF88C: ; 80EF88C bl pokemon_getattr movs r1, 0xB muls r0, r1 - ldr r1, =gUnknown_083185C8 + ldr r1, =gSpeciesNames adds r0, r1 adds r1, r6, 0 bl sub_8008C44 @@ -455980,7 +455983,7 @@ sub_80EF9E8: ; 80EF9E8 ldr r0, [r4] movs r1, 0xB muls r1, r5 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy adds r0, r5, 0 @@ -456376,7 +456379,7 @@ sub_80EFBDC: ; 80EFBDC @080EFCD0: movs r0, 0xB muls r4, r0 - ldr r7, =gUnknown_083185C8 + ldr r7, =gSpeciesNames adds r0, r4, r7 bl sub_8008C24 lsls r0, 16 @@ -459645,7 +459648,7 @@ sub_80F16EC: ; 80F16EC ldrh r1, [r4, 0x2] movs r0, 0xB muls r0, r1 - ldr r1, =gUnknown_083185C8 + ldr r1, =gSpeciesNames adds r0, r1 adds r1, r4, 0 adds r1, 0x8 @@ -459668,7 +459671,7 @@ sub_80F16EC: ; 80F16EC ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021dc4 @@ -459779,14 +459782,14 @@ sub_80F16EC: ; 80F16EC ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021dc4 ldrh r2, [r4, 0x14] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 @@ -459807,7 +459810,7 @@ sub_80F16EC: ; 80F16EC ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy bl sub_80F577C @@ -459819,7 +459822,7 @@ sub_80F16EC: ; 80F16EC ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy @080F194C: @@ -459896,7 +459899,7 @@ sub_80F1974: ; 80F1974 ldrh r2, [r4, 0xA] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldrh r0, [r4, 0x16] @@ -459976,7 +459979,7 @@ sub_80F1974: ; 80F1974 ldrh r2, [r4, 0x14] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy b @080F1AA6 @@ -459992,7 +459995,7 @@ sub_80F1974: ; 80F1974 ldrh r2, [r4, 0x14] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldrb r0, [r4, 0x1B] @@ -460092,7 +460095,7 @@ sub_80F1974: ; 80F1974 ldrh r2, [r4, 0xA] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy bl sub_80F577C @@ -460414,7 +460417,7 @@ sub_80F1E48: ; 80F1E48 ldrh r2, [r5, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 @@ -460566,7 +460569,7 @@ sub_80F1E48: ; 80F1E48 ldrh r2, [r5, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldrh r0, [r5, 0x2] @@ -460618,7 +460621,7 @@ sub_80F1E48: ; 80F1E48 ldrh r2, [r5, 0x1C] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldrh r0, [r5, 0x1C] @@ -460713,7 +460716,7 @@ sub_80F211C: ; 80F211C ldrh r2, [r5, 0x10] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 @@ -460776,7 +460779,7 @@ sub_80F211C: ; 80F211C ldrh r2, [r5, 0x10] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 @@ -460800,7 +460803,7 @@ sub_80F211C: ; 80F211C ldrh r2, [r5, 0x10] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy @080F2286: @@ -460820,7 +460823,7 @@ sub_80F211C: ; 80F211C ldrh r2, [r5, 0x10] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 @@ -460845,7 +460848,7 @@ sub_80F211C: ; 80F211C ldrh r1, [r5, 0x10] movs r4, 0xB muls r1, r4 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021dc4 @@ -460863,7 +460866,7 @@ sub_80F211C: ; 80F211C ldrh r1, [r5, 0x10] movs r4, 0xB muls r1, r4 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021dc4 @@ -460939,7 +460942,7 @@ sub_80F2370: ; 80F2370 ldrh r2, [r4, 0xC] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r1, =0x0203a030 @@ -460962,7 +460965,7 @@ sub_80F2370: ; 80F2370 ldrh r2, [r4, 0xE] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldrb r0, [r4, 0x11] @@ -461132,7 +461135,7 @@ sub_80F24D8: ; 80F24D8 ldrh r2, [r5, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r1, =0x0203a030 @@ -461429,7 +461432,7 @@ sub_80F28A4: ; 80F28A4 ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 @@ -461453,7 +461456,7 @@ sub_80F28A4: ; 80F28A4 ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 @@ -461512,7 +461515,7 @@ sub_80F29A0: ; 80F29A0 ldrh r2, [r4, 0xC] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy bl sub_80F577C @@ -461604,7 +461607,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 @@ -461652,7 +461655,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldrb r1, [r6, 0xF] @@ -461697,7 +461700,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy @080F2BB2: @@ -461716,7 +461719,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 @@ -461782,7 +461785,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldrb r1, [r6, 0xF] @@ -461880,7 +461883,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames b @080F2F72 .align 2, 0 .pool @@ -461889,7 +461892,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames b @080F2F72 .align 2, 0 .pool @@ -461898,7 +461901,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames b @080F2F72 .align 2, 0 .pool @@ -461907,7 +461910,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldrb r0, [r6, 0x1C] @@ -461969,7 +461972,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames b @080F2F72 .align 2, 0 .pool @@ -461978,7 +461981,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames b @080F2F72 .align 2, 0 .pool @@ -461987,7 +461990,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames b @080F2F72 .align 2, 0 .pool @@ -461996,7 +461999,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames b @080F2F72 .align 2, 0 .pool @@ -462005,7 +462008,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames b @080F2F72 .align 2, 0 .pool @@ -462014,7 +462017,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldrb r0, [r6, 0x1C] @@ -462076,7 +462079,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames b @080F2F72 .align 2, 0 .pool @@ -462085,7 +462088,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames b @080F2F72 .align 2, 0 .pool @@ -462094,7 +462097,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames b @080F2F72 .align 2, 0 .pool @@ -462103,7 +462106,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames b @080F2F72 .align 2, 0 .pool @@ -462112,7 +462115,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames b @080F2F72 .align 2, 0 .pool @@ -462121,7 +462124,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames b @080F2F72 .align 2, 0 .pool @@ -462130,7 +462133,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames b @080F2F72 .align 2, 0 .pool @@ -462139,14 +462142,14 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 ldrh r2, [r6, 0x10] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames @080F2F72: adds r1, r2 bl gf_strcpy @@ -462161,7 +462164,7 @@ sub_80F2A10: ; 80F2A10 ldrh r1, [r6, 0x12] movs r5, 0xB muls r1, r5 - ldr r4, =gUnknown_083185C8 + ldr r4, =gSpeciesNames adds r1, r4 bl gf_strcpy ldr r0, =0x02021dc4 @@ -462266,7 +462269,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy b @080F30EA @@ -462281,7 +462284,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy b @080F30EA @@ -462301,7 +462304,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 @@ -462331,7 +462334,7 @@ sub_80F2A10: ; 80F2A10 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy bl sub_80F577C @@ -462446,14 +462449,14 @@ sub_80F3140: ; 80F3140 ldrh r2, [r4, 0x16] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 ldrh r2, [r4, 0x14] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r1, =0x0203a030 @@ -462472,7 +462475,7 @@ sub_80F3140: ; 80F3140 ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r1, =0x0203a030 @@ -462520,14 +462523,14 @@ sub_80F3140: ; 80F3140 ldrh r2, [r4, 0x16] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 ldrh r2, [r4, 0x14] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r1, =0x0203a030 @@ -462550,7 +462553,7 @@ sub_80F3140: ; 80F3140 ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy bl sub_80F577C @@ -462954,7 +462957,7 @@ sub_80F363C: ; 80F363C ldrh r1, [r1] movs r6, 0xB muls r1, r6 - ldr r5, =gUnknown_083185C8 + ldr r5, =gSpeciesNames adds r1, r5 bl gf_strcpy ldr r0, =0x02021dc4 @@ -462964,7 +462967,7 @@ sub_80F363C: ; 80F363C ldrh r2, [r1] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 @@ -463000,7 +463003,7 @@ sub_80F363C: ; 80F363C ldrh r1, [r1] movs r6, 0xB muls r1, r6 - ldr r5, =gUnknown_083185C8 + ldr r5, =gSpeciesNames adds r1, r5 bl gf_strcpy ldr r0, =0x02021ec4 @@ -463080,7 +463083,7 @@ sub_80F3828: ; 80F3828 ldrh r2, [r4, 0x4] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldrb r1, [r4, 0x3] @@ -463100,7 +463103,7 @@ sub_80F3828: ; 80F3828 ldrh r2, [r4, 0x4] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldrb r1, [r4, 0x2] @@ -463173,7 +463176,7 @@ sub_80F3904: ; 80F3904 ldrh r2, [r4, 0x8] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy movs r0, 0x2 @@ -463195,7 +463198,7 @@ sub_80F3904: ; 80F3904 ldrh r2, [r4, 0x4] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy bl sub_80F577C @@ -463956,7 +463959,7 @@ sub_80F4028: ; 80F4028 ldrh r2, [r6, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 @@ -463979,7 +463982,7 @@ sub_80F4028: ; 80F4028 ldrh r1, [r6, 0x2] movs r5, 0xB muls r1, r5 - ldr r4, =gUnknown_083185C8 + ldr r4, =gSpeciesNames adds r1, r4 bl gf_strcpy ldr r0, =0x02021ec4 @@ -464033,7 +464036,7 @@ sub_80F4028: ; 80F4028 ldrh r2, [r6, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 @@ -464056,7 +464059,7 @@ sub_80F4028: ; 80F4028 ldrh r1, [r6, 0x2] movs r5, 0xB muls r1, r5 - ldr r4, =gUnknown_083185C8 + ldr r4, =gSpeciesNames adds r1, r4 bl gf_strcpy ldr r0, =0x02021ec4 @@ -464114,14 +464117,14 @@ sub_80F4028: ; 80F4028 ldrh r2, [r6, 0xC] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021dc4 ldrh r2, [r6, 0xA] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 b @080F42A8 .align 2, 0 @@ -464136,7 +464139,7 @@ sub_80F4028: ; 80F4028 ldrh r1, [r6, 0x2] movs r5, 0xB muls r1, r5 - ldr r4, =gUnknown_083185C8 + ldr r4, =gSpeciesNames adds r1, r4 bl gf_strcpy ldr r0, =0x02021ec4 @@ -464177,7 +464180,7 @@ sub_80F4028: ; 80F4028 ldrh r1, [r6, 0x2] movs r4, 0xB muls r1, r4 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 @@ -464424,14 +464427,14 @@ sub_80F4360: ; 80F4360 ldrh r2, [r5, 0x8] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 ldrh r1, [r5, 0xA] movs r4, 0xD muls r1, r4 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r0, =0x0203a030 @@ -464576,7 +464579,7 @@ sub_80F466C: ; 80F466C ldrh r1, [r6, 0x6] movs r5, 0xB muls r1, r5 - ldr r4, =gUnknown_083185C8 + ldr r4, =gSpeciesNames adds r1, r4 bl gf_strcpy ldr r0, =0x02021ec4 @@ -464600,14 +464603,14 @@ sub_80F466C: ; 80F466C ldrh r2, [r6, 0x4] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 ldrh r2, [r6, 0x2] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r1, =0x0203a030 @@ -464621,7 +464624,7 @@ sub_80F466C: ; 80F466C ldrh r2, [r6, 0x6] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldrb r1, [r6, 0x10] @@ -464663,7 +464666,7 @@ sub_80F466C: ; 80F466C ldrh r1, [r6, 0x8] movs r5, 0xD muls r1, r5 - ldr r4, =gUnknown_0831977C + ldr r4, =gMoveNames adds r1, r4 bl gf_strcpy ldr r0, =0x02021dc4 @@ -464683,7 +464686,7 @@ sub_80F466C: ; 80F466C ldrh r1, [r6, 0x8] movs r5, 0xD muls r1, r5 - ldr r4, =gUnknown_0831977C + ldr r4, =gMoveNames adds r1, r4 bl gf_strcpy ldr r0, =0x02021dc4 @@ -464698,7 +464701,7 @@ sub_80F466C: ; 80F466C ldrh r2, [r6, 0x8] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 @080F4820: bl gf_strcpy @@ -464714,7 +464717,7 @@ sub_80F466C: ; 80F466C ldrh r1, [r6, 0xE] movs r5, 0xD muls r1, r5 - ldr r4, =gUnknown_0831977C + ldr r4, =gMoveNames adds r1, r4 bl gf_strcpy ldr r0, =0x02021dc4 @@ -465472,7 +465475,7 @@ sub_80F4D9C: ; 80F4D9C ldrh r1, [r6, 0x4] movs r5, 0xB muls r1, r5 - ldr r4, =gUnknown_083185C8 + ldr r4, =gSpeciesNames adds r1, r4 bl gf_strcpy ldr r0, =0x02021dc4 @@ -465492,7 +465495,7 @@ sub_80F4D9C: ; 80F4D9C ldrh r1, [r6, 0x4] movs r5, 0xB muls r1, r5 - ldr r4, =gUnknown_083185C8 + ldr r4, =gSpeciesNames adds r1, r4 bl gf_strcpy ldr r0, =0x02021dc4 @@ -465507,7 +465510,7 @@ sub_80F4D9C: ; 80F4D9C ldrh r1, [r6, 0x4] movs r5, 0xB muls r1, r5 - ldr r4, =gUnknown_083185C8 + ldr r4, =gSpeciesNames adds r1, r4 bl gf_strcpy ldr r0, =0x02021dc4 @@ -465531,7 +465534,7 @@ sub_80F4D9C: ; 80F4D9C ldrh r2, [r6, 0xA] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 @080F4FEC: bl gf_strcpy @@ -474543,7 +474546,7 @@ sub_80F9A14: ; 80F9A14 ldr r0, =0x02021cc4 movs r1, 0xB muls r1, r4 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldrh r1, [r5] @@ -483291,7 +483294,7 @@ task08_0809AD8C: ; 80FDFBC lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -549559,7 +549562,7 @@ sub_811EB64: ; 811EB64 @0811EB80: movs r0, 0xB muls r0, r2 - ldr r1, =gUnknown_083185C8 + ldr r1, =gSpeciesNames adds r0, r1 b @0811EBB2 .align 2, 0 @@ -549567,7 +549570,7 @@ sub_811EB64: ; 811EB64 @0811EB90: movs r0, 0xD muls r0, r2 - ldr r1, =gUnknown_0831977C + ldr r1, =gMoveNames adds r0, r1 b @0811EBB2 .align 2, 0 @@ -593452,7 +593455,7 @@ sub_81344C8: ; 81344C8 adds r1, r4, 0 muls r1, r0 mov r9, r1 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames add r9, r0 ldr r0, =gUnknown_085B1DE4 ldr r1, [r0, 0x4] @@ -603820,7 +603823,7 @@ sub_81398C0: ; 81398C0 lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -606244,7 +606247,7 @@ sub_813AC7C: ; 813AC7C ldrh r2, [r1] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy b @0813ACD2 @@ -606260,7 +606263,7 @@ sub_813AC7C: ; 813AC7C ldrh r2, [r1] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy @0813ACD2: @@ -611996,7 +611999,7 @@ evolution_cutscene: ; 813DA8C mov r2, r10 muls r2, r1 adds r1, r2, 0 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy adds r0, r4, 0 @@ -612626,7 +612629,7 @@ sub_813E1D4: ; 813E1D4 ldr r0, =0x02021dc4 movs r1, 0xB muls r1, r5 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy ldr r1, =0x02021cc0 @@ -612852,7 +612855,7 @@ sub_813E3DC: ; 813E3DC ldrh r2, [r1, 0xC] movs r1, 0xB muls r2, r1 - ldr r1, =gUnknown_083185C8 + ldr r1, =gSpeciesNames adds r2, r1 movs r1, 0x2 bl pokemon_setattr @@ -643658,7 +643661,7 @@ battle_pick_message: ; 814E0C4 ldrh r2, [r2] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy @0814E544: @@ -644790,7 +644793,7 @@ sub_814E764: ; 814E764 @0814EF8A: movs r0, 0xD muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r4, r1, r0 b @0814F5C0 .align 2, 0 @@ -645717,7 +645720,7 @@ sub_814F648: ; 814F648 orrs r1, r0 movs r0, 0xD muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 b @0814F8BE .align 2, 0 @@ -680752,7 +680755,7 @@ sub_8160868: ; 8160868 bl sub_8161054 movs r1, 0xD muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -681026,7 +681029,7 @@ sub_8160868: ; 8160868 mov r8, r1 mov r1, r8 muls r1, r0 - ldr r6, =gUnknown_0831977C + ldr r6, =gMoveNames adds r1, r6 adds r0, r2, 0 bl gf_strcpy @@ -681309,7 +681312,7 @@ sub_8160F50: ; 8160F50 ldr r0, =0x02021dc4 movs r1, 0xD muls r1, r5 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r4, =0x02021fc4 @@ -681626,7 +681629,7 @@ sub_8161280: ; 8161280 mov r8, r4 movs r0, 0xD mov r12, r0 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames mov r9, r2 @081612C2: mov r7, r8 @@ -688016,7 +688019,7 @@ sub_81646BC: ; 81646BC mov r2, r9 muls r2, r1 adds r1, r2, 0 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r0, =0x02021dc4 @@ -688024,7 +688027,7 @@ sub_81646BC: ; 81646BC mov r2, r10 muls r2, r1 adds r1, r2, 0 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy pop {r3-r5} @@ -718910,7 +718913,7 @@ sub_8174A88: ; 8174A88 lsrs r1, 23 movs r2, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy adds r6, r0, 0 @@ -776743,7 +776746,7 @@ sub_81924E0: ; 81924E0 mov r3, r10 muls r3, r0 adds r0, r3, 0 - ldr r1, =gUnknown_083185C8 + ldr r1, =gSpeciesNames adds r0, r1 str r0, [sp, 0xC] adds r0, r7, 0x1 @@ -777679,7 +777682,7 @@ sub_8192F08: ; 8192F08 ldrh r1, [r0] movs r0, 0xD muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 ldr r0, =0x02021dc4 bl gf_strcpy @@ -784925,7 +784928,7 @@ sub_8196B98: ; 8196B98 ldrh r1, [r0] movs r0, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 mov r0, r8 bl gf_strcpy @@ -785000,7 +785003,7 @@ sub_8196C70: ; 8196C70 ldrh r1, [r0, 0x4] movs r0, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 adds r0, r7, 0 bl gf_strcpy @@ -794854,7 +794857,7 @@ sub_819B9E8: ; 819B9E8 ldr r4, =0x02021fc4 movs r1, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -800891,7 +800894,7 @@ sub_819EB4C: ; 819EB4C ldr r4, =0x02021fc4 movs r0, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -801249,7 +801252,7 @@ sub_819EE08: ; 819EE08 ldr r4, =0x02021fc4 movs r0, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -801329,7 +801332,7 @@ sub_819EEF0: ; 819EEF0 ldr r4, =0x02021fc4 movs r0, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -804110,7 +804113,7 @@ sub_81A04E4: ; 81A04E4 mov r10, r1 movs r6, 0x6 movs r4, 0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames mov r9, r0 ldr r0, =0x03005d90 ldr r3, [r0] @@ -804179,7 +804182,7 @@ sub_81A04E4: ; 81A04E4 ldrh r0, [r3, 0x2] movs r2, 0xB muls r0, r2 - ldr r1, =gUnknown_083185C8 + ldr r1, =gSpeciesNames adds r0, r1 str r0, [sp, 0x10] ldrh r0, [r3] @@ -804198,7 +804201,7 @@ sub_81A04E4: ; 81A04E4 ldrh r0, [r3, 0x4] movs r2, 0xD muls r0, r2 - ldr r1, =gUnknown_0831977C + ldr r1, =gMoveNames adds r0, r1 str r0, [sp, 0xC] ldrh r0, [r3, 0x6] @@ -805547,7 +805550,7 @@ sub_81A0FFC: ; 81A0FFC ldrh r1, [r0] movs r0, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 b @081A1174 .align 2, 0 @@ -805558,7 +805561,7 @@ sub_81A0FFC: ; 81A0FFC ldrh r1, [r0, 0x2] movs r0, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 b @081A1174 .align 2, 0 @@ -805569,7 +805572,7 @@ sub_81A0FFC: ; 81A0FFC ldrh r1, [r0] movs r0, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 b @081A1174 .align 2, 0 @@ -805580,7 +805583,7 @@ sub_81A0FFC: ; 81A0FFC ldrh r1, [r0, 0x4] movs r0, 0xD muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 b @081A1174 .align 2, 0 @@ -805591,7 +805594,7 @@ sub_81A0FFC: ; 81A0FFC ldrh r1, [r0, 0x6] movs r0, 0xD muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 b @081A1174 .align 2, 0 @@ -805709,7 +805712,7 @@ sub_81A0FFC: ; 81A0FFC ldrh r1, [r1] movs r0, 0xB muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 adds r0, r5, 0 bl gf_strcpy @@ -810999,7 +811002,7 @@ sub_81A3DD0: ; 81A3DD0 ldr r0, =0x02021cc4 movs r1, 0xB muls r1, r6 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcat @081A3ED6: @@ -825517,7 +825520,7 @@ get_name: ; 81AB39C lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -840313,7 +840316,7 @@ sub_81B2BF4: ; 81B2BF4 movs r0, 0xB adds r1, r5, 0 muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 mov r0, r9 bl sub_8008C44 @@ -847692,7 +847695,7 @@ sub_81B6A10: ; 81B6A10 movs r0, 0xD adds r2, r4, 0 muls r2, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r2, r0 lsls r0, r5, 4 adds r0, 0x1 @@ -847939,7 +847942,7 @@ sub_81B6BEC: ; 81B6BEC ldr r0, =0x02021cc4 movs r1, 0xD muls r1, r4 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy adds r0, r5, 0 @@ -848140,7 +848143,7 @@ sub_81B6DC4: ; 81B6DC4 ldrsh r2, [r7, r1] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy movs r0, 0 @@ -848245,7 +848248,7 @@ sub_81B6EB4: ; 81B6EB4 ldrsh r2, [r6, r1] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r4, =0x02021fc4 @@ -848551,7 +848554,7 @@ sub_81B7154: ; 81B7154 ldr r0, =0x02021dc4 movs r1, 0xD muls r1, r4 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r0, =gUnknown_085E9BB8 @@ -848624,7 +848627,7 @@ sub_81B7230: ; 81B7230 ldrsh r2, [r1, r3] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r4, =0x02021fc4 @@ -848715,7 +848718,7 @@ sub_81B72C8: ; 81B72C8 ldrsh r2, [r7, r1] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r4, =0x02021fc4 @@ -848768,7 +848771,7 @@ sub_81B72C8: ; 81B72C8 ldrsh r2, [r1, r3] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r0, =gUnknown_085E9AE9 @@ -849346,7 +849349,7 @@ sub_81B787C: ; 81B787C ldrh r2, [r6] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r4, =0x02021fc4 @@ -849401,7 +849404,7 @@ sub_81B7910: ; 81B7910 ldr r0, =0x02021dc4 movs r1, 0xD muls r1, r5 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy ldr r4, =0x02021fc4 @@ -850030,7 +850033,7 @@ sub_81B7E4C: ; 81B7E4C ldrsh r2, [r7, r1] movs r1, 0xD muls r1, r2 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy movs r0, 0x2 @@ -853095,7 +853098,7 @@ sub_81B9718: ; 81B9718 ldr r0, =0x02021dc4 movs r1, 0xD muls r1, r4 - ldr r2, =gUnknown_0831977C + ldr r2, =gMoveNames adds r1, r2 bl gf_strcpy pop {r4,r5} @@ -870143,7 +870146,7 @@ sub_81C2628: ; 81C2628 ldrh r2, [r7, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, =gUnknown_083185C8 + ldr r2, =gSpeciesNames adds r1, r2 bl gf_strcpy str r6, [sp] @@ -872454,7 +872457,7 @@ sub_81C3B08: ; 81C3B08 movs r0, 0xD adds r1, r5, 0 muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 lsls r0, r7, 4 mov r9, r0 @@ -872941,7 +872944,7 @@ sub_81C3F44: ; 81C3F44 movs r0, 0xD adds r1, r5, 0 muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 movs r0, 0 str r0, [sp] @@ -872958,7 +872961,7 @@ sub_81C3F44: ; 81C3F44 movs r0, 0xD adds r1, r5, 0 muls r1, r0 - ldr r0, =gUnknown_0831977C + ldr r0, =gMoveNames adds r1, r0 movs r0, 0 str r0, [sp] @@ -892176,7 +892179,7 @@ sub_81CD624: ; 81CD624 movs r0, 0xB adds r1, r7, 0 muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 adds r0, r5, 0 bl sub_8008C44 @@ -903439,7 +903442,7 @@ sub_81D2CD0: ; 81D2CD0 movs r0, 0xB adds r1, r7, 0 muls r1, r0 - ldr r0, =gUnknown_083185C8 + ldr r0, =gSpeciesNames adds r1, r0 adds r0, r5, 0 bl sub_8008C44 |