summaryrefslogtreecommitdiff
path: root/asm/rom_81BAD84.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/rom_81BAD84.s')
-rw-r--r--asm/rom_81BAD84.s1356
1 files changed, 678 insertions, 678 deletions
diff --git a/asm/rom_81BAD84.s b/asm/rom_81BAD84.s
index dccf10f5e..caa355533 100644
--- a/asm/rom_81BAD84.s
+++ b/asm/rom_81BAD84.s
@@ -75,7 +75,7 @@ sub_81BADF4: @ 81BADF4
bx_exec_buffer_A_ch0_tbl3: @ 81BAE10
push {lr}
ldr r2, =gUnknown_02024068
- ldr r1, =gUnknown_0832A328
+ ldr r1, =gBitTable
ldr r0, =gUnknown_02024064
ldrb r3, [r0]
lsls r0, r3, 2
@@ -224,7 +224,7 @@ sub_81BAF48: @ 81BAF48
lsls r0, 24
cmp r0, 0
beq _081BAFA0
- ldr r0, =gUnknown_02022FEC
+ ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
@@ -400,7 +400,7 @@ _081BB07A:
lsls r0, 24
cmp r0, 0
beq _081BB134
- ldr r0, =gUnknown_02022FEC
+ ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
@@ -428,7 +428,7 @@ _081BB07A:
ldrh r2, [r1]
movs r1, 0x64
muls r1, r2
- ldr r2, =gUnknown_020244EC
+ ldr r2, =gPlayerParty
adds r1, r2
movs r2, 0
bl healthbar_draw_field_maybe
@@ -464,7 +464,7 @@ _081BB134:
ldrh r2, [r1]
movs r1, 0x64
muls r1, r2
- ldr r2, =gUnknown_020244EC
+ ldr r2, =gPlayerParty
adds r1, r2
movs r2, 0
bl healthbar_draw_field_maybe
@@ -568,7 +568,7 @@ _081BB25C:
ldrh r2, [r0]
movs r0, 0x64
muls r0, r2
- ldr r2, =gUnknown_020244EC
+ ldr r2, =gPlayerParty
adds r0, r2
bl sub_805E990
bl dp01_tbl3_exec_completed
@@ -633,23 +633,23 @@ _081BB2E2:
movs r0, 0x64
mov r1, r10
muls r1, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r6, r1, r0
adds r0, r6, 0
movs r1, 0xB
- bl pokemon_getattr
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
movs r1, 0x38
- bl pokemon_getattr
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
movs r1, 0x19
- bl pokemon_getattr
+ bl GetMonData
str r0, [sp, 0x4]
ldr r3, =gExperienceTables
adds r4, 0x1
@@ -790,23 +790,23 @@ sub_81BB414: @ 81BB414
movs r0, 0x64
adds r6, r1, 0
muls r6, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r6, r0
adds r0, r6, 0
movs r1, 0x38
- bl pokemon_getattr
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
movs r1, 0xB
- bl pokemon_getattr
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
movs r1, 0x19
- bl pokemon_getattr
+ bl GetMonData
adds r3, r0, 0
ldr r6, =gExperienceTables
lsls r1, r4, 2
@@ -907,21 +907,21 @@ _081BB514:
movs r0, 0x64
mov r1, r9
muls r1, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x38
- bl pokemon_getattr
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x19
- bl pokemon_getattr
+ bl GetMonData
str r0, [sp, 0x4]
adds r0, r5, 0
movs r1, 0xB
- bl pokemon_getattr
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r3, =gExperienceTables
@@ -1069,11 +1069,11 @@ sub_81BB688: @ 81BB688
movs r0, 0x64
adds r1, r4, 0
muls r1, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r7, r1, r0
adds r0, r7, 0
movs r1, 0x38
- bl pokemon_getattr
+ bl GetMonData
bl battle_type_is_double
lsls r0, 24
lsrs r0, 24
@@ -1102,7 +1102,7 @@ _081BB708:
ldrb r0, [r0]
movs r1, 0x64
muls r1, r4
- ldr r2, =gUnknown_020244EC
+ ldr r2, =gPlayerParty
adds r1, r2
movs r2, 0
bl healthbar_draw_field_maybe
@@ -1135,10 +1135,10 @@ sub_81BB740: @ 81BB740
ldrb r1, [r4, 0x8]
movs r0, 0x64
muls r0, r1
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x38
- bl pokemon_getattr
+ bl GetMonData
ldrb r0, [r4, 0xC]
ldr r1, =gUnknown_03005D60
lsls r0, 2
@@ -1179,10 +1179,10 @@ sub_81BB78C: @ 81BB78C
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
- bl pokemon_getattr
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl nullsub_24
@@ -1476,7 +1476,7 @@ sub_81BB9F4: @ 81BB9F4
ldrh r0, [r0]
movs r6, 0x64
muls r0, r6
- ldr r5, =gUnknown_020244EC
+ ldr r5, =gPlayerParty
adds r0, r5
bl sub_805E990
ldr r1, =gUnknown_020241E4
@@ -1544,7 +1544,7 @@ sub_81BBAE8: @ 81BBAE8
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r1, r0
adds r0, r2, 0
bl sub_8172EF0
@@ -1601,7 +1601,7 @@ dp01_tbl3_exec_completed: @ 81BBB8C
adds r0, r1
ldr r1, =bx_exec_buffer_A_ch0_tbl3
str r1, [r0]
- ldr r0, =gUnknown_02022FEC
+ ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x2
ands r0, r1
@@ -1624,7 +1624,7 @@ dp01_tbl3_exec_completed: @ 81BBB8C
.pool
_081BBBE0:
ldr r2, =gUnknown_02024068
- ldr r1, =gUnknown_0832A328
+ ldr r1, =gBitTable
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -1838,16 +1838,16 @@ _081BBE08:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
- bl pokemon_getattr
+ bl GetMonData
mov r1, sp
strh r0, [r1]
adds r0, r4, 0
movs r1, 0xC
- bl pokemon_getattr
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2E]
movs r6, 0
@@ -1875,12 +1875,12 @@ _081BBE54:
adds r1, r6, 0
adds r1, 0xD
mov r0, r8
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r4]
adds r1, r6, 0
adds r1, 0x11
mov r0, r8
- bl pokemon_getattr
+ bl GetMonData
mov r2, r9
adds r1, r2, r6
strb r0, [r1]
@@ -1891,25 +1891,25 @@ _081BBE54:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
- bl pokemon_getattr
+ bl GetMonData
mov r1, r10
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x20
- bl pokemon_getattr
+ bl GetMonData
ldr r2, [sp, 0x80]
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x19
- bl pokemon_getattr
+ bl GetMonData
str r0, [sp, 0x44]
adds r0, r4, 0
movs r1, 0x27
- bl pokemon_getattr
+ bl GetMonData
mov r3, sp
movs r5, 0x1F
ands r0, r5
@@ -1921,7 +1921,7 @@ _081BBE54:
strb r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x28
- bl pokemon_getattr
+ bl GetMonData
mov r3, sp
movs r6, 0x1F
ands r0, r6
@@ -1933,7 +1933,7 @@ _081BBE54:
strh r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x29
- bl pokemon_getattr
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 2
@@ -1945,7 +1945,7 @@ _081BBE54:
strb r1, [r3, 0x15]
adds r0, r4, 0
movs r1, 0x2A
- bl pokemon_getattr
+ bl GetMonData
movs r1, 0x1F
ands r1, r0
lsls r1, 15
@@ -1956,7 +1956,7 @@ _081BBE54:
str r0, [sp, 0x14]
adds r0, r4, 0
movs r1, 0x2B
- bl pokemon_getattr
+ bl GetMonData
mov r3, sp
ands r0, r6
lsls r0, 4
@@ -1967,7 +1967,7 @@ _081BBE54:
strh r1, [r3, 0x16]
adds r0, r4, 0
movs r1, 0x2C
- bl pokemon_getattr
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 1
@@ -1979,55 +1979,55 @@ _081BBE54:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0
- bl pokemon_getattr
+ bl GetMonData
str r0, [sp, 0x48]
adds r0, r4, 0
movs r1, 0x37
- bl pokemon_getattr
+ bl GetMonData
str r0, [sp, 0x4C]
adds r0, r4, 0
movs r1, 0x38
- bl pokemon_getattr
+ bl GetMonData
ldr r1, [sp, 0x7C]
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x39
- bl pokemon_getattr
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x28]
adds r0, r4, 0
movs r1, 0x3A
- bl pokemon_getattr
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2C]
adds r0, r4, 0
movs r1, 0x3B
- bl pokemon_getattr
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2]
adds r0, r4, 0
movs r1, 0x3C
- bl pokemon_getattr
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x4]
adds r0, r4, 0
movs r1, 0x3D
- bl pokemon_getattr
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x6]
adds r0, r4, 0
movs r1, 0x3E
- bl pokemon_getattr
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x8]
adds r0, r4, 0
movs r1, 0x3F
- bl pokemon_getattr
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0xA]
adds r0, r4, 0
movs r1, 0x2D
- bl pokemon_getattr
+ bl GetMonData
mov r3, sp
movs r1, 0x1
ands r0, r1
@@ -2040,7 +2040,7 @@ _081BBE54:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x2E
- bl pokemon_getattr
+ bl GetMonData
mov r3, sp
lsls r0, 7
ldrb r2, [r3, 0x17]
@@ -2050,19 +2050,19 @@ _081BBE54:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x1
- bl pokemon_getattr
+ bl GetMonData
str r0, [sp, 0x54]
adds r0, r4, 0
movs r1, 0x2
ldr r2, [sp, 0x8C]
- bl pokemon_getattr
+ bl GetMonData
ldr r0, [sp, 0x84]
ldr r1, [sp, 0x8C]
- bl CopyString_Limit10
+ bl StringCopy10
adds r0, r4, 0
movs r1, 0x7
ldr r2, [sp, 0x88]
- bl pokemon_getattr
+ bl GetMonData
mov r2, sp
movs r6, 0
_081BC00C:
@@ -2078,7 +2078,7 @@ _081BC00C:
_081BC02C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
b _081BC3A6
@@ -2086,7 +2086,7 @@ _081BC02C:
_081BC03C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xC
b _081BC3A6
@@ -2100,20 +2100,20 @@ _081BC04C:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r1, r0
mov r8, r9
_081BC062:
adds r1, r6, 0
adds r1, 0xD
adds r0, r4, 0
- bl pokemon_getattr
+ bl GetMonData
mov r1, r8
strh r0, [r1]
adds r1, r6, 0
adds r1, 0x11
adds r0, r4, 0
- bl pokemon_getattr
+ bl GetMonData
mov r2, r10
adds r1, r2, r6
strb r0, [r1]
@@ -2124,10 +2124,10 @@ _081BC062:
ble _081BC062
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x15
- bl pokemon_getattr
+ bl GetMonData
mov r1, r9
strb r0, [r1, 0xC]
mov r2, r9
@@ -2145,7 +2145,7 @@ _081BC0A0:
_081BC0B4:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldrb r1, [r3]
lsls r1, 9
@@ -2160,14 +2160,14 @@ _081BC0D0:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r2, =gUnknown_020244EC
+ ldr r2, =gPlayerParty
mov r8, r2
_081BC0DC:
adds r1, r6, 0
adds r1, 0x11
mov r2, r8
adds r0, r4, r2
- bl pokemon_getattr
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -2175,10 +2175,10 @@ _081BC0DC:
ble _081BC0DC
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x15
- bl pokemon_getattr
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -2187,7 +2187,7 @@ _081BC0DC:
_081BC10C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldrb r1, [r3]
lsls r1, 9
@@ -2200,7 +2200,7 @@ _081BC10C:
_081BC128:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x1
b _081BC142
@@ -2208,11 +2208,11 @@ _081BC128:
_081BC138:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x19
_081BC142:
- bl pokemon_getattr
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -2231,7 +2231,7 @@ _081BC142:
_081BC168:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x1A
b _081BC466
@@ -2239,7 +2239,7 @@ _081BC168:
_081BC178:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x1B
b _081BC466
@@ -2247,7 +2247,7 @@ _081BC178:
_081BC188:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x1C
b _081BC466
@@ -2255,7 +2255,7 @@ _081BC188:
_081BC198:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x1D
b _081BC466
@@ -2263,7 +2263,7 @@ _081BC198:
_081BC1A8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x1E
b _081BC466
@@ -2271,7 +2271,7 @@ _081BC1A8:
_081BC1B8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x1F
b _081BC466
@@ -2279,7 +2279,7 @@ _081BC1B8:
_081BC1C8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x20
b _081BC466
@@ -2287,7 +2287,7 @@ _081BC1C8:
_081BC1D8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x22
b _081BC466
@@ -2295,7 +2295,7 @@ _081BC1D8:
_081BC1E8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x23
b _081BC466
@@ -2303,7 +2303,7 @@ _081BC1E8:
_081BC1F8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x24
b _081BC466
@@ -2311,7 +2311,7 @@ _081BC1F8:
_081BC208:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x25
b _081BC466
@@ -2319,7 +2319,7 @@ _081BC208:
_081BC218:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x26
b _081BC466
@@ -2328,31 +2328,31 @@ _081BC228:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x27
- bl pokemon_getattr
+ bl GetMonData
strb r0, [r7]
adds r0, r4, 0
movs r1, 0x28
- bl pokemon_getattr
+ bl GetMonData
strb r0, [r7, 0x1]
adds r0, r4, 0
movs r1, 0x29
- bl pokemon_getattr
+ bl GetMonData
strb r0, [r7, 0x2]
adds r0, r4, 0
movs r1, 0x2A
- bl pokemon_getattr
+ bl GetMonData
strb r0, [r7, 0x3]
adds r0, r4, 0
movs r1, 0x2B
- bl pokemon_getattr
+ bl GetMonData
strb r0, [r7, 0x4]
adds r0, r4, 0
movs r1, 0x2C
- bl pokemon_getattr
+ bl GetMonData
strb r0, [r7, 0x5]
movs r6, 0x6
b _081BC46E
@@ -2360,7 +2360,7 @@ _081BC228:
_081BC278:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x27
b _081BC466
@@ -2368,7 +2368,7 @@ _081BC278:
_081BC288:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x28
b _081BC466
@@ -2376,7 +2376,7 @@ _081BC288:
_081BC298:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x29
b _081BC466
@@ -2384,7 +2384,7 @@ _081BC298:
_081BC2A8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2A
b _081BC466
@@ -2392,7 +2392,7 @@ _081BC2A8:
_081BC2B8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2B
b _081BC466
@@ -2400,7 +2400,7 @@ _081BC2B8:
_081BC2C8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2C
b _081BC466
@@ -2408,7 +2408,7 @@ _081BC2C8:
_081BC2D8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0
b _081BC302
@@ -2416,7 +2416,7 @@ _081BC2D8:
_081BC2E8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x9
b _081BC3A6
@@ -2424,11 +2424,11 @@ _081BC2E8:
_081BC2F8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x37
_081BC302:
- bl pokemon_getattr
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -2449,7 +2449,7 @@ _081BC302:
_081BC32C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x38
b _081BC466
@@ -2457,7 +2457,7 @@ _081BC32C:
_081BC33C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x39
b _081BC3A6
@@ -2465,7 +2465,7 @@ _081BC33C:
_081BC34C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x3A
b _081BC3A6
@@ -2473,7 +2473,7 @@ _081BC34C:
_081BC35C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x3B
b _081BC3A6
@@ -2481,7 +2481,7 @@ _081BC35C:
_081BC36C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x3C
b _081BC3A6
@@ -2489,7 +2489,7 @@ _081BC36C:
_081BC37C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x3D
b _081BC3A6
@@ -2497,7 +2497,7 @@ _081BC37C:
_081BC38C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x3E
b _081BC3A6
@@ -2505,11 +2505,11 @@ _081BC38C:
_081BC39C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x3F
_081BC3A6:
- bl pokemon_getattr
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
strb r0, [r7]
@@ -2521,7 +2521,7 @@ _081BC3A6:
_081BC3BC:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x16
b _081BC466
@@ -2529,7 +2529,7 @@ _081BC3BC:
_081BC3CC:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x17
b _081BC466
@@ -2537,7 +2537,7 @@ _081BC3CC:
_081BC3DC:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x18
b _081BC466
@@ -2545,7 +2545,7 @@ _081BC3DC:
_081BC3EC:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x21
b _081BC466
@@ -2553,7 +2553,7 @@ _081BC3EC:
_081BC3FC:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2F
b _081BC466
@@ -2561,7 +2561,7 @@ _081BC3FC:
_081BC40C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x30
b _081BC466
@@ -2569,7 +2569,7 @@ _081BC40C:
_081BC41C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x32
b _081BC466
@@ -2577,7 +2577,7 @@ _081BC41C:
_081BC42C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x33
b _081BC466
@@ -2585,7 +2585,7 @@ _081BC42C:
_081BC43C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x34
b _081BC466
@@ -2593,7 +2593,7 @@ _081BC43C:
_081BC44C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x35
b _081BC466
@@ -2601,11 +2601,11 @@ _081BC44C:
_081BC45C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x36
_081BC466:
- bl pokemon_getattr
+ bl GetMonData
strb r0, [r7]
movs r6, 0x1
_081BC46E:
@@ -2768,7 +2768,7 @@ _081BC61C:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
@@ -2835,7 +2835,7 @@ _081BC682:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
@@ -2948,7 +2948,7 @@ _081BC682:
_081BC7B4:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -2961,7 +2961,7 @@ _081BC7B4:
_081BC7D4:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -2980,7 +2980,7 @@ _081BC7F4:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r7, r1, r0
adds r6, r3, 0
adds r6, 0x8
@@ -3005,7 +3005,7 @@ _081BC80E:
ble _081BC80E
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x15
mov r2, r9
@@ -3015,7 +3015,7 @@ _081BC80E:
_081BC84C:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r3, =gUnknown_02023064
ldr r1, =gUnknown_02024064
@@ -3031,7 +3031,7 @@ _081BC874:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r0
ldr r5, =gUnknown_02024064
ldrb r2, [r5]
@@ -3073,7 +3073,7 @@ _081BC874:
_081BC8D8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r3, =gUnknown_02023064
ldr r1, =gUnknown_02024064
@@ -3092,7 +3092,7 @@ _081BC8F0:
_081BC908:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3105,7 +3105,7 @@ _081BC908:
_081BC928:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3118,7 +3118,7 @@ _081BC928:
_081BC948:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3131,7 +3131,7 @@ _081BC948:
_081BC968:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3144,7 +3144,7 @@ _081BC968:
_081BC988:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3157,7 +3157,7 @@ _081BC988:
_081BC9A8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3170,7 +3170,7 @@ _081BC9A8:
_081BC9C8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3183,7 +3183,7 @@ _081BC9C8:
_081BC9E8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3196,7 +3196,7 @@ _081BC9E8:
_081BCA08:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3209,7 +3209,7 @@ _081BCA08:
_081BCA28:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3222,7 +3222,7 @@ _081BCA28:
_081BCA48:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3235,7 +3235,7 @@ _081BCA48:
_081BCA68:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3248,7 +3248,7 @@ _081BCA68:
_081BCA88:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3261,7 +3261,7 @@ _081BCA88:
_081BCAA8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3275,7 +3275,7 @@ _081BCAC8:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r0
ldr r5, =gUnknown_02024064
ldrb r2, [r5]
@@ -3322,7 +3322,7 @@ _081BCAC8:
_081BCB38:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3335,7 +3335,7 @@ _081BCB38:
_081BCB58:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3348,7 +3348,7 @@ _081BCB58:
_081BCB78:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3361,7 +3361,7 @@ _081BCB78:
_081BCB98:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3374,7 +3374,7 @@ _081BCB98:
_081BCBB8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3387,7 +3387,7 @@ _081BCBB8:
_081BCBD8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3401,7 +3401,7 @@ _081BCBE8:
_081BCBF8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3414,7 +3414,7 @@ _081BCBF8:
_081BCC18:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3427,7 +3427,7 @@ _081BCC18:
_081BCC38:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3440,7 +3440,7 @@ _081BCC38:
_081BCC58:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3453,7 +3453,7 @@ _081BCC58:
_081BCC78:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3466,7 +3466,7 @@ _081BCC78:
_081BCC98:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3479,7 +3479,7 @@ _081BCC98:
_081BCCB8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3492,7 +3492,7 @@ _081BCCB8:
_081BCCD8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3505,7 +3505,7 @@ _081BCCD8:
_081BCCF8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3518,7 +3518,7 @@ _081BCCF8:
_081BCD18:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3531,7 +3531,7 @@ _081BCD18:
_081BCD38:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3544,7 +3544,7 @@ _081BCD38:
_081BCD58:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3557,7 +3557,7 @@ _081BCD58:
_081BCD78:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3570,7 +3570,7 @@ _081BCD78:
_081BCD98:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3583,7 +3583,7 @@ _081BCD98:
_081BCDB8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3596,7 +3596,7 @@ _081BCDB8:
_081BCDD8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3609,7 +3609,7 @@ _081BCDD8:
_081BCDF8:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3622,7 +3622,7 @@ _081BCDF8:
_081BCE18:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3635,7 +3635,7 @@ _081BCE18:
_081BCE38:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3648,7 +3648,7 @@ _081BCE38:
_081BCE58:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3661,7 +3661,7 @@ _081BCE58:
_081BCE78:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3674,7 +3674,7 @@ _081BCE78:
_081BCE98:
movs r0, 0x64
muls r0, r5
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_02024064
ldrb r2, [r1]
@@ -3691,7 +3691,7 @@ _081BCEAE:
ldrh r2, [r0]
movs r0, 0x64
muls r0, r2
- ldr r2, =gUnknown_020244EC
+ ldr r2, =gPlayerParty
adds r0, r2
bl sub_805E990
add sp, 0x34
@@ -3722,7 +3722,7 @@ sub_81BCEE4: @ 81BCEE4
adds r0, r4, 0x1
adds r0, r2, r0
ldrb r0, [r0]
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
adds r5, r3, r0
movs r3, 0
@@ -3774,7 +3774,7 @@ sub_81BCF58: @ 81BCF58
ldrh r0, [r0]
movs r5, 0x64
muls r0, r5
- ldr r4, =gUnknown_020244EC
+ ldr r4, =gPlayerParty
adds r0, r4
bl sub_805DD7C
ldrb r0, [r6]
@@ -3784,7 +3784,7 @@ sub_81BCF58: @ 81BCF58
muls r0, r5
adds r0, r4
movs r1, 0xB
- bl pokemon_getattr
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -3903,7 +3903,7 @@ sub_81BD074: @ 81BD074
ldrh r2, [r0]
movs r0, 0x64
muls r0, r2
- ldr r2, =gUnknown_020244EC
+ ldr r2, =gPlayerParty
adds r0, r2
bl sub_805DD7C
ldrb r0, [r5]
@@ -3949,16 +3949,16 @@ sub_81BD0E4: @ 81BD0E4
ldrh r1, [r2]
movs r0, 0x64
muls r0, r1
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
- bl pokemon_getattr
+ bl GetMonData
mov r8, r0
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r0, =sub_805D714
- bl object_new_hidden_with_callback
+ bl CreateInvisibleSpriteWithCallback
ldr r1, =gUnknown_03005D7C
mov r9, r1
add r9, r6
@@ -4594,7 +4594,7 @@ _081BD6C8:
ldrh r2, [r0]
movs r0, 0x64
muls r0, r2
- ldr r2, =gUnknown_020244EC
+ ldr r2, =gPlayerParty
adds r0, r2
bl sub_805E990
movs r1, 0x40
@@ -5060,7 +5060,7 @@ sub_81BDAC8: @ 81BDAC8
ldr r0, =gUnknown_02023068
adds r4, r0
movs r0, 0xF
- bl sub_8130950
+ bl BattleAI_SetupAIData
bl sub_8130BA4
lsls r0, 24
lsrs r5, r0, 24
@@ -5077,7 +5077,7 @@ sub_81BDAC8: @ 81BDAC8
ands r0, r1
cmp r0, 0
beq _081BDB02
- ldr r1, =gUnknown_0202420C
+ ldr r1, =gEnemyMonIndex
ldrb r0, [r6]
strb r0, [r1]
_081BDB02:
@@ -5093,11 +5093,11 @@ _081BDB02:
beq _081BDB3C
movs r0, 0x1
bl battle_get_side_with_given_state
- ldr r4, =gUnknown_0202420C
+ ldr r4, =gEnemyMonIndex
strb r0, [r4]
ldr r0, =gUnknown_02024210
ldrb r1, [r0]
- ldr r2, =gUnknown_0832A328
+ ldr r2, =gBitTable
ldrb r0, [r4]
lsls r0, 2
adds r0, r2
@@ -5109,7 +5109,7 @@ _081BDB02:
bl battle_get_side_with_given_state
strb r0, [r4]
_081BDB3C:
- ldr r0, =gUnknown_0202420C
+ ldr r0, =gEnemyMonIndex
ldrb r2, [r0]
lsls r2, 8
orrs r2, r5
@@ -5156,10 +5156,10 @@ _081BDBA4:
bgt _081BDBD0
movs r0, 0x64
muls r0, r4
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x39
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0
beq _081BDBA2
ldr r1, =gUnknown_0202406E
@@ -5234,10 +5234,10 @@ sub_81BDC10: @ 81BDC10
ldrh r0, [r0]
movs r5, 0x64
muls r0, r5
- ldr r4, =gUnknown_020244EC
+ ldr r4, =gPlayerParty
adds r0, r4
movs r1, 0x3A
- bl pokemon_getattr
+ bl GetMonData
mov r8, r0
mov r1, r9
ldrb r0, [r1]
@@ -5247,7 +5247,7 @@ sub_81BDC10: @ 81BDC10
muls r0, r5
adds r0, r4
movs r1, 0x39
- bl pokemon_getattr
+ bl GetMonData
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -5266,10 +5266,10 @@ _081BDCA0:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x3A
- bl pokemon_getattr
+ bl GetMonData
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -5310,11 +5310,11 @@ sub_81BDD00: @ 81BDD00
movs r0, 0x64
adds r1, r7, 0
muls r1, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x38
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0x63
bls _081BDD38
bl dp01_tbl3_exec_completed
@@ -5325,7 +5325,7 @@ _081BDD38:
bl load_gfxc_health_bar
adds r0, r4, 0
movs r1, 0xB
- bl pokemon_getattr
+ bl GetMonData
ldrb r1, [r6]
lsls r1, 9
adds r0, r5, 0x2
@@ -5382,7 +5382,7 @@ sub_81BDD9C: @ 81BDD9C
ldrh r2, [r1]
movs r1, 0x64
muls r1, r2
- ldr r2, =gUnknown_020244EC
+ ldr r2, =gPlayerParty
adds r1, r2
movs r2, 0x9
bl healthbar_draw_field_maybe
@@ -5750,10 +5750,10 @@ sub_81BE098: @ 81BE098
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
- bl pokemon_getattr
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
@@ -6001,7 +6001,7 @@ _081BE2F4:
lsls r0, 24
cmp r0, 0
beq _081BE314
- ldr r0, =gUnknown_02022FEC
+ ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
@@ -6054,7 +6054,7 @@ _081BE344:
ldrh r2, [r0]
movs r0, 0x64
muls r0, r2
- ldr r2, =gUnknown_020244EC
+ ldr r2, =gPlayerParty
adds r0, r2
bl sub_805DD7C
ldrb r0, [r7]
@@ -6394,7 +6394,7 @@ nullsub_128: @ 81BE668
thumb_func_start sub_81BE66C
sub_81BE66C: @ 81BE66C
push {lr}
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
movs r0, 0xD0
@@ -6448,7 +6448,7 @@ sub_81BE6B8: @ 81BE6B8
b _081BE718
.pool
_081BE6CC:
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
movs r0, 0xD0
@@ -6490,7 +6490,7 @@ _081BE718:
thumb_func_start sub_81BE72C
sub_81BE72C: @ 81BE72C
push {r4,lr}
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
movs r0, 0xD0
@@ -6551,7 +6551,7 @@ sub_81BE79C: @ 81BE79C
b _081BE7EE
.pool
_081BE7B8:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0x1
@@ -6598,7 +6598,7 @@ sub_81BE808: @ 81BE808
sub sp, 0x4
lsls r0, 24
lsrs r5, r0, 24
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
@@ -7324,7 +7324,7 @@ _081BEDFA:
ldr r7, =gUnknown_0203CF10
adds r6, r2, 0
_081BEE14:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x30
@@ -7332,7 +7332,7 @@ _081BEE14:
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x30
@@ -7720,10 +7720,10 @@ _081BF170:
ldr r0, =0x000001ff
mov r8, r0
_081BF178:
- bl GenerateRandomNumber
+ bl Random
adds r4, r6, 0
ands r4, r0
- bl GenerateRandomNumber
+ bl Random
adds r1, r6, 0
ands r1, r0
ldr r0, =gUnknown_0203CF0C
@@ -8044,7 +8044,7 @@ _081BF430:
beq _081BF43C
b _081BF592
_081BF43C:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -8064,7 +8064,7 @@ _081BF45C:
beq _081BF468
b _081BF592
_081BF468:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -8172,13 +8172,13 @@ _081BF552:
bl sub_81BF7A4
cmp r0, 0x3
bne _081BF592
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _081BF592
- bl Reset
+ bl DoSoftReset
b _081BF592
.pool
_081BF574:
@@ -8186,7 +8186,7 @@ _081BF574:
bl sub_81BF7A4
cmp r0, 0x4
bne _081BF592
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -8805,7 +8805,7 @@ _081BFB0A:
sub_81BFB10: @ 81BFB10
push {r4,lr}
sub sp, 0x4
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -8854,7 +8854,7 @@ _081BFB9C:
b _081BFDE6
_081BFBAA:
bl remove_some_task
- ldr r1, =gUnknown_030022C0
+ ldr r1, =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -8870,7 +8870,7 @@ _081BFBBC:
.pool
_081BFBD0:
bl ResetAllObjectData
- ldr r1, =gUnknown_030022C0
+ ldr r1, =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -8896,7 +8896,7 @@ _081BFC04:
bne _081BFC10
b _081BFE18
_081BFC10:
- ldr r1, =gUnknown_030022C0
+ ldr r1, =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -8907,7 +8907,7 @@ _081BFC20:
b _081BFDE6
_081BFC26:
bl sub_81C1BA0
- ldr r1, =gUnknown_030022C0
+ ldr r1, =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -8935,7 +8935,7 @@ _081BFC58:
bne _081BFC6A
b _081BFE18
_081BFC6A:
- ldr r1, =gUnknown_030022C0
+ ldr r1, =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -8946,7 +8946,7 @@ _081BFC7C:
b _081BFDE6
_081BFC82:
bl sub_81C286C
- ldr r1, =gUnknown_030022C0
+ ldr r1, =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -8963,7 +8963,7 @@ _081BFC94:
.pool
_081BFCAC:
bl sub_81C0348
- ldr r1, =gUnknown_030022C0
+ ldr r1, =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -9019,7 +9019,7 @@ _081BFD34:
ldr r0, [r0]
adds r0, 0xC
bl sub_81C4984
- ldr r1, =gUnknown_030022C0
+ ldr r1, =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -9034,7 +9034,7 @@ _081BFD50:
.pool
_081BFD60:
bl sub_81C4A88
- ldr r1, =gUnknown_030022C0
+ ldr r1, =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -9068,7 +9068,7 @@ _081BFDB0:
movs r1, 0x10
movs r2, 0
bl BlendPalettes
- ldr r1, =gUnknown_030022C0
+ ldr r1, =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -9089,7 +9089,7 @@ _081BFDCC:
_081BFDE4:
strb r0, [r2, 0x8]
_081BFDE6:
- ldr r1, =gUnknown_030022C0
+ ldr r1, =gMain
movs r2, 0x87
lsls r2, 3
adds r1, r2
@@ -9427,35 +9427,35 @@ _081C012A:
_081C012C:
adds r0, r5, 0
movs r1, 0xB
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6]
adds r0, r5, 0
movs r1, 0x41
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x2]
adds r0, r5, 0
movs r1, 0x19
- bl pokemon_getattr
+ bl GetMonData
str r0, [r6, 0x10]
adds r0, r5, 0
movs r1, 0x38
- bl pokemon_getattr
+ bl GetMonData
strb r0, [r6, 0x5]
adds r0, r5, 0
movs r1, 0x2E
- bl pokemon_getattr
+ bl GetMonData
strb r0, [r6, 0x8]
adds r0, r5, 0
movs r1, 0xC
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x2E]
adds r0, r5, 0
movs r1, 0
- bl pokemon_getattr
+ bl GetMonData
str r0, [r6, 0xC]
adds r0, r5, 0
movs r1, 0x4
- bl pokemon_getattr
+ bl GetMonData
adds r1, r7, 0
adds r1, 0xA5
strb r0, [r1]
@@ -9468,7 +9468,7 @@ _081C012C:
_081C018C:
adds r0, r5, 0
movs r1, 0x2D
- bl pokemon_getattr
+ bl GetMonData
strb r0, [r6, 0x4]
b _081C0322
_081C0198:
@@ -9485,12 +9485,12 @@ _081C01AA:
adds r1, r4, 0
adds r1, 0xD
adds r0, r5, 0
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6]
adds r1, r4, 0
adds r1, 0x11
adds r0, r5, 0
- bl pokemon_getattr
+ bl GetMonData
mov r2, r8
adds r1, r2, r4
strb r0, [r1]
@@ -9500,13 +9500,13 @@ _081C01AA:
bls _081C01AA
adds r0, r5, 0
movs r1, 0x15
- bl pokemon_getattr
+ bl GetMonData
mov r1, r9
strb r0, [r1]
b _081C0322
_081C01DC:
ldr r1, [r7]
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
cmp r1, r0
beq _081C01F8
ldr r2, =0x000040bc
@@ -9527,27 +9527,27 @@ _081C01F8:
strb r0, [r1]
adds r0, r5, 0
movs r1, 0x39
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x20]
adds r0, r5, 0
movs r1, 0x3A
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x22]
adds r0, r5, 0
movs r1, 0x3B
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x24]
adds r0, r5, 0
movs r1, 0x3C
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x26]
adds r0, r5, 0
movs r1, 0x3E
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x28]
adds r0, r5, 0
movs r1, 0x3F
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x2A]
adds r0, r5, 0
movs r1, 0x3D
@@ -9561,32 +9561,32 @@ _081C0254:
strb r0, [r1]
adds r0, r5, 0
movs r1, 0x39
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x20]
adds r0, r5, 0
movs r1, 0x3A
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x22]
adds r0, r5, 0
movs r1, 0x54
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x24]
adds r0, r5, 0
movs r1, 0x55
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x26]
adds r0, r5, 0
movs r1, 0x57
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x28]
adds r0, r5, 0
movs r1, 0x58
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x2A]
adds r0, r5, 0
movs r1, 0x56
_081C02A0:
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x2C]
b _081C0322
_081C02A8:
@@ -9595,49 +9595,49 @@ _081C02A8:
adds r0, r5, 0
movs r1, 0x7
adds r2, r4, 0
- bl pokemon_getattr
+ bl GetMonData
adds r0, r5, 0
movs r1, 0x3
- bl pokemon_getattr
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl StopMusicWhileStringIsPrinted
+ bl ConvertInternationalString
adds r0, r5, 0
bl sub_81B205C
strb r0, [r6, 0x7]
adds r0, r5, 0
movs r1, 0x31
- bl pokemon_getattr
+ bl GetMonData
adds r1, r7, 0
adds r1, 0xA2
strb r0, [r1]
adds r0, r5, 0
movs r1, 0x1
- bl pokemon_getattr
+ bl GetMonData
str r0, [r6, 0x48]
adds r0, r5, 0
movs r1, 0x23
- bl pokemon_getattr
+ bl GetMonData
strb r0, [r6, 0x9]
adds r0, r5, 0
movs r1, 0x24
- bl pokemon_getattr
+ bl GetMonData
strb r0, [r6, 0xA]
adds r0, r5, 0
movs r1, 0x25
- bl pokemon_getattr
+ bl GetMonData
strb r0, [r6, 0xB]
adds r0, r5, 0
movs r1, 0x20
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r6, 0x30]
b _081C0322
_081C0314:
adds r0, r5, 0
movs r1, 0x52
- bl pokemon_getattr
+ bl GetMonData
strb r0, [r6, 0x6]
movs r0, 0x1
b _081C0332
@@ -9866,7 +9866,7 @@ sub_81C0510: @ 81C0510
ands r0, r1
cmp r0, 0
bne _081C05FE
- ldr r5, =gUnknown_030022C0
+ ldr r5, =gMain
ldrh r1, [r5, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -10367,7 +10367,7 @@ _081C099C:
muls r0, r4
adds r0, r7, r0
movs r1, 0x2D
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0
bne _081C0968
adds r0, r4, 0
@@ -10462,7 +10462,7 @@ sub_81C0A50: @ 81C0A50
push {r4,lr}
adds r4, r0, 0
movs r1, 0xB
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0
beq _081C0A84
ldr r0, =gUnknown_0203CF1C
@@ -10474,7 +10474,7 @@ sub_81C0A50: @ 81C0A50
bne _081C0A78
adds r0, r4, 0
movs r1, 0x2D
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0
bne _081C0A84
_081C0A78:
@@ -11018,7 +11018,7 @@ sub_81C0F44: @ 81C0F44
lsrs r0, 24
cmp r0, 0x1
beq _081C103A
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -11431,7 +11431,7 @@ sub_81C12E4: @ 81C12E4
lsrs r0, 24
cmp r0, 0x1
beq _081C13AA
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -11958,7 +11958,7 @@ _081C176A:
beq _081C177A
b _081C189A
_081C177A:
- ldr r6, =gUnknown_030022C0
+ ldr r6, =gMain
ldrh r1, [r6, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -12175,7 +12175,7 @@ sub_81C1940: @ 81C1940
bne _081C196C
b _081C1B74
_081C196C:
- ldr r6, =gUnknown_030022C0
+ ldr r6, =gMain
ldrh r1, [r6, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -13723,19 +13723,19 @@ sub_81C2628: @ 81C2628
ldr r0, =0x0000ffff
cmp r5, r0
beq _081C26CE
- ldr r6, =gUnknown_02021CC4
+ ldr r6, =gStringVar1
ldr r1, =gUnknown_085E8D4F
adds r0, r6, 0
- bl CopyString
- ldr r4, =gUnknown_02021DC4
+ bl StringCopy
+ ldr r4, =gStringVar2
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x2
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r0, r6, 0
adds r1, r4, 0
- bl AppendString
+ bl StringAppend
mov r0, r8
bl sub_806EBA4
lsls r0, 24
@@ -13785,19 +13785,19 @@ _081C26E8:
movs r0, 0x1
bl sub_81C228C
_081C26EE:
- ldr r4, =gUnknown_02021CC4
+ ldr r4, =gStringVar1
ldr r1, =gUnknown_085E8D4D
adds r0, r4, 0
- bl CopyString
- ldr r5, =gUnknown_02021DC4
+ bl StringCopy
+ ldr r5, =gStringVar2
ldrb r1, [r7, 0x5]
adds r0, r5, 0
movs r2, 0
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r0, r4, 0
adds r1, r5, 0
- bl AppendString
+ bl StringAppend
movs r6, 0
str r6, [sp]
movs r5, 0x1
@@ -13827,7 +13827,7 @@ _081C26EE:
muls r1, r2
ldr r2, =gSpeciesNames
adds r1, r2
- bl CopyString
+ bl StringCopy
str r6, [sp]
str r5, [sp, 0x4]
movs r0, 0x13
@@ -13858,7 +13858,7 @@ sub_81C2794: @ 81C2794
ldr r0, =gUnknown_0203CF1C
ldr r0, [r0]
adds r0, 0xC
- ldr r4, =gUnknown_02021CC4
+ ldr r4, =gStringVar1
adds r1, r4, 0
bl GetMonNickname
movs r0, 0
@@ -14738,17 +14738,17 @@ sub_81C2F5C: @ 81C2F5C
lsrs r0, 24
cmp r0, 0x1
beq _081C2FC0
- ldr r5, =gUnknown_02021CC4
+ ldr r5, =gStringVar1
ldr r1, =gUnknown_085E8D59
adds r0, r5, 0
- bl CopyString
+ bl StringCopy
ldr r1, =gUnknown_0203CF1C
ldr r1, [r1]
adds r1, 0xB8
ldrh r1, [r1]
movs r2, 0x2
movs r3, 0x5
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
movs r0, 0x1
adds r1, r5, 0
movs r2, 0x38
@@ -14882,7 +14882,7 @@ sub_81C307C: @ 81C307C
cmp r0, 0x1
bne _081C30E0
_081C30C2:
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_085EA5DB
bl sub_81AFC28
b _081C3182
@@ -14950,7 +14950,7 @@ _081C3158:
_081C316E:
ldr r1, =gUnknown_085EA544
_081C3170:
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
bl sub_81AFC28
adds r0, r6, 0
bl Free
@@ -14972,7 +14972,7 @@ sub_81C3194: @ 81C3194
bl sub_81C2D2C
lsls r0, 24
lsrs r0, 24
- ldr r1, =gUnknown_02021FC4
+ ldr r1, =gStringVar4
movs r2, 0
str r2, [sp]
str r2, [sp, 0x4]
@@ -15020,7 +15020,7 @@ _081C3202:
adds r0, r4, 0
movs r2, 0
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
movs r0, 0x3
adds r1, r4, 0
bl sub_81AFC0C
@@ -15038,7 +15038,7 @@ sub_81C3220: @ 81C3220
adds r6, r0, 0
adds r6, 0x70
ldr r1, [r0]
- ldr r0, =gUnknown_02024744
+ ldr r0, =gEnemyParty
cmp r1, r0
bne _081C326C
bl link_get_multiplayer_id
@@ -15055,10 +15055,10 @@ sub_81C3220: @ 81C3220
ldrh r4, [r0]
adds r0, r1, r2
ldrb r5, [r0, 0x13]
- ldr r0, =gUnknown_02021CC4
+ ldr r0, =gStringVar1
adds r2, 0x8
adds r1, r2
- bl CopyString
+ bl StringCopy
b _081C3282
.pool
_081C326C:
@@ -15066,11 +15066,11 @@ _081C326C:
adds r4, r0, 0
ldr r0, =0x0000ffff
ands r4, r0
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldrb r5, [r1, 0x8]
- ldr r0, =gUnknown_02021CC4
- bl CopyString
+ ldr r0, =gStringVar1
+ bl StringCopy
_081C3282:
adds r0, r6, 0
adds r0, 0x32
@@ -15082,10 +15082,10 @@ _081C3282:
ands r0, r1
cmp r4, r0
bne _081C32A4
- ldr r0, =gUnknown_02021CC4
+ ldr r0, =gStringVar1
adds r1, r6, 0
adds r1, 0x36
- bl CompareStringWithoutExtendedControlCodes
+ bl StringCompareWithoutExtCtrlCodes
cmp r0, 0
beq _081C32B4
_081C32A4:
@@ -15147,14 +15147,14 @@ _081C32FE:
thumb_func_start sub_81C3304
sub_81C3304: @ 81C3304
push {lr}
- ldr r0, =gUnknown_02022FEC
+ ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x80
lsls r1, 15
ands r0, r1
cmp r0, 0
beq _081C3354
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldr r1, =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -15238,13 +15238,13 @@ sub_81C335C: @ 81C335C
sub_81C33CC: @ 81C33CC
push {r4,r5,lr}
sub sp, 0x8
- ldr r5, =gUnknown_02021CC4
+ ldr r5, =gStringVar1
ldr r1, =gUnknown_085E8D59
adds r0, r5, 0
- bl CopyString
+ bl StringCopy
ldr r1, =gUnknown_085E8D38
adds r0, r5, 0
- bl AppendString
+ bl StringAppend
movs r0, 0x1
adds r1, r5, 0
movs r2, 0x38
@@ -15516,7 +15516,7 @@ _081C3628:
.pool
_081C3644:
ldrh r0, [r1]
- ldr r4, =gUnknown_02021CC4
+ ldr r4, =gStringVar1
adds r1, r4, 0
bl itemid_get_name
adds r5, r4, 0
@@ -15563,15 +15563,15 @@ sub_81C3690: @ 81C3690
b _081C36C8
.pool
_081C36B0:
- ldr r0, =gUnknown_02021CC4
+ ldr r0, =gStringVar1
ldrb r1, [r1]
movs r2, 0x1
movs r3, 0x2
- bl ConvertIntToDecimalString
- ldr r4, =gUnknown_02021FC4
+ bl ConvertIntToDecimalStringN
+ ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA3B4
adds r0, r4, 0
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
adds r5, r4, 0
_081C36C8:
movs r0, 0x1
@@ -15626,28 +15626,28 @@ sub_81C3710: @ 81C3710
mov r0, r9
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
ldr r0, [r4]
adds r0, 0x92
ldrh r1, [r0]
mov r0, r8
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
ldr r0, [r4]
adds r0, 0x94
ldrh r1, [r0]
adds r0, r6, 0
movs r2, 0x1
movs r3, 0x7
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
ldr r0, [r4]
adds r0, 0x96
ldrh r1, [r0]
adds r0, r5, 0
movs r2, 0x1
movs r3, 0x7
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
bl sub_81AFBF0
movs r0, 0
mov r1, r9
@@ -15661,7 +15661,7 @@ sub_81C3710: @ 81C3710
movs r0, 0x3
adds r1, r5, 0
bl sub_81AFC0C
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_0861CE82
bl sub_81AFC28
mov r0, r9
@@ -15690,7 +15690,7 @@ sub_81C37D8: @ 81C37D8
bl sub_81C2D2C
lsls r0, 24
lsrs r0, 24
- ldr r1, =gUnknown_02021FC4
+ ldr r1, =gStringVar4
movs r2, 0
str r2, [sp]
str r2, [sp, 0x4]
@@ -15708,7 +15708,7 @@ sub_81C3808: @ 81C3808
push {r4-r6,lr}
mov r6, r8
push {r6}
- ldr r0, =gUnknown_02021CC4
+ ldr r0, =gStringVar1
mov r8, r0
ldr r4, =gUnknown_0203CF1C
ldr r0, [r4]
@@ -15717,23 +15717,23 @@ sub_81C3808: @ 81C3808
mov r0, r8
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
- ldr r6, =gUnknown_02021DC4
+ bl ConvertIntToDecimalStringN
+ ldr r6, =gStringVar2
ldr r0, [r4]
adds r0, 0x9A
ldrh r1, [r0]
adds r0, r6, 0
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
- ldr r5, =gUnknown_02021EC4
+ bl ConvertIntToDecimalStringN
+ ldr r5, =gStringVar3
ldr r0, [r4]
adds r0, 0x9C
ldrh r1, [r0]
adds r0, r5, 0
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
bl sub_81AFBF0
movs r0, 0
mov r1, r8
@@ -15744,7 +15744,7 @@ sub_81C3808: @ 81C3808
movs r0, 0x2
adds r1, r5, 0
bl sub_81AFC0C
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_0861CE8E
bl sub_81AFC28
pop {r3}
@@ -15764,7 +15764,7 @@ sub_81C3890: @ 81C3890
bl sub_81C2D2C
lsls r0, 24
lsrs r0, 24
- ldr r1, =gUnknown_02021FC4
+ ldr r1, =gStringVar4
movs r2, 0
str r2, [sp]
str r2, [sp, 0x4]
@@ -15790,12 +15790,12 @@ sub_81C38C0: @ 81C38C0
bl sub_81C2D2C
lsls r0, 24
lsrs r6, r0, 24
- ldr r4, =gUnknown_02021CC4
+ ldr r4, =gStringVar1
ldr r1, [r5, 0x10]
adds r0, r4, 0
movs r2, 0x1
movs r3, 0x7
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x2A
@@ -15837,11 +15837,11 @@ sub_81C38C0: @ 81C38C0
_081C3948:
movs r1, 0
_081C394A:
- ldr r4, =gUnknown_02021CC4
+ ldr r4, =gStringVar1
adds r0, r4, 0
movs r2, 0x1
movs r3, 0x6
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x2A
@@ -16090,7 +16090,7 @@ sub_81C3B08: @ 81C3B08
mov r0, r8
movs r2, 0
bl sub_81C25A4
- ldr r0, =gUnknown_02021CC4
+ ldr r0, =gStringVar1
mov r8, r0
mov r5, r10
adds r5, 0x8C
@@ -16098,13 +16098,13 @@ sub_81C3B08: @ 81C3B08
ldrb r1, [r5]
movs r2, 0x1
movs r3, 0x2
- bl ConvertIntToDecimalString
- ldr r4, =gUnknown_02021DC4
+ bl ConvertIntToDecimalStringN
+ ldr r4, =gStringVar2
adds r0, r4, 0
adds r1, r6, 0
movs r2, 0x1
movs r3, 0x2
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
bl sub_81AFBF0
movs r0, 0
mov r1, r8
@@ -16112,7 +16112,7 @@ sub_81C3B08: @ 81C3B08
movs r0, 0x1
adds r1, r4, 0
bl sub_81AFC0C
- ldr r4, =gUnknown_02021FC4
+ ldr r4, =gStringVar4
ldr r1, =gUnknown_0861CE97
adds r0, r4, 0
bl sub_81AFC28
@@ -16204,12 +16204,12 @@ sub_81C3C5C: @ 81C3C5C
b _081C3CAC
.pool
_081C3C9C:
- ldr r4, =gUnknown_02021CC4
+ ldr r4, =gStringVar1
ldrb r1, [r2, 0x1]
adds r0, r4, 0
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r1, r4, 0
_081C3CAC:
movs r0, 0
@@ -16230,12 +16230,12 @@ _081C3CAC:
b _081C3CEC
.pool
_081C3CDC:
- ldr r4, =gUnknown_02021CC4
+ ldr r4, =gStringVar1
ldrb r1, [r1, 0x3]
adds r0, r4, 0
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r1, r4, 0
_081C3CEC:
movs r0, 0
@@ -16575,7 +16575,7 @@ _081C3FD0:
movs r3, 0x41
bl sub_81C25A4
_081C3FEC:
- ldr r4, =gUnknown_02021CC4
+ ldr r4, =gStringVar1
ldr r1, =gBattleMoves
lsls r0, r5, 1
adds r0, r5
@@ -16585,7 +16585,7 @@ _081C3FEC:
adds r0, r4, 0
movs r2, 0x1
movs r3, 0x2
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
bl sub_81AFBF0
movs r0, 0
adds r1, r4, 0
@@ -16593,7 +16593,7 @@ _081C3FEC:
movs r0, 0x1
adds r1, r4, 0
bl sub_81AFC0C
- ldr r4, =gUnknown_02021FC4
+ ldr r4, =gStringVar4
ldr r1, =gUnknown_0861CE97
adds r0, r4, 0
bl sub_81AFC28
@@ -17335,7 +17335,7 @@ _081C4610:
b _081C4770
.pool
_081C4620:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldr r1, =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -17376,7 +17376,7 @@ _081C4680:
cmp r3, 0
beq _081C46E4
ldr r1, [r2]
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
cmp r1, r0
beq _081C46A6
ldr r1, =0x000040bc
@@ -17414,7 +17414,7 @@ _081C46D6:
.pool
_081C46E4:
ldr r1, [r2]
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
cmp r1, r0
beq _081C4700
ldr r1, =0x000040bc
@@ -17746,7 +17746,7 @@ sub_81C4984: @ 81C4984
beq _081C49CE
adds r0, r5, 0
movs r1, 0x8
- bl pokemon_getattr
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -17795,7 +17795,7 @@ sub_81C49E0: @ 81C49E0
sub_81C4A08: @ 81C4A08
push {r4,lr}
movs r1, 0x26
- bl pokemon_getattr
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl ball_number_to_ball_processing_index
@@ -18574,7 +18574,7 @@ _081C5072:
sub_81C5078: @ 81C5078
push {lr}
sub sp, 0x4
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -18697,7 +18697,7 @@ _081C5188:
_081C51A0:
strb r0, [r2, 0x8]
_081C51A2:
- ldr r1, =gUnknown_030022C0
+ ldr r1, =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -18855,7 +18855,7 @@ _081C530A:
thumb_func_start sub_81C5314
sub_81C5314: @ 81C5314
push {r4-r7,lr}
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
ldr r1, =0x00000ca9
adds r0, r2, r1
@@ -18919,7 +18919,7 @@ _081C5382:
ldr r0, [r5]
adds r0, r4
ldr r1, =gUnknown_085E8DB4
- bl CopyString
+ bl StringCopy
ldr r1, [r5]
lsls r2, r6, 3
ldr r3, =0x00000824
@@ -18969,18 +18969,18 @@ sub_81C540C: @ 81C540C
lsrs r0, 24
cmp r0, 0x4
bne _081C5450
- ldr r0, =gUnknown_02021CC4
+ ldr r0, =gStringVar1
adds r1, r4, 0
subs r1, 0x84
movs r2, 0x2
movs r3, 0x2
- bl ConvertIntToDecimalString
- ldr r1, =gUnknown_02021DC4
+ bl ConvertIntToDecimalStringN
+ ldr r1, =gStringVar2
adds r0, r4, 0
bl itemid_get_name
ldr r1, =gUnknown_085E9210
adds r0, r5, 0
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
b _081C5458
.pool
_081C5450:
@@ -19022,7 +19022,7 @@ _081C5476:
negs r0, r0
cmp r4, r0
beq _081C54E0
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
lsls r3, r4, 1
ldr r1, =0x00000ca9
@@ -19104,8 +19104,8 @@ _081C5558:
movs r1, 0xFF
bl sub_81C5AB8
_081C5560:
- ldr r0, =gUnknown_02021CC4
- ldr r1, =gUnknown_03005D90
+ ldr r0, =gStringVar1
+ ldr r1, =gSaveBlock2Ptr
ldr r3, [r1]
ldr r2, =0x00000ca9
adds r1, r3, r2
@@ -19122,11 +19122,11 @@ _081C5560:
ldrb r1, [r3]
movs r2, 0x1
movs r3, 0x2
- bl ConvertIntToDecimalString
- ldr r4, =gUnknown_02021FC4
+ bl ConvertIntToDecimalStringN
+ ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0
adds r0, r4, 0
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x7
adds r1, r4, 0
movs r2, 0x77
@@ -19161,7 +19161,7 @@ sub_81C55D8: @ 81C55D8
negs r0, r0
cmp r3, r0
beq _081C561C
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
lsls r3, 1
ldr r1, =0x00000ca9
@@ -19182,18 +19182,18 @@ sub_81C55D8: @ 81C55D8
b _081C5638
.pool
_081C561C:
- ldr r0, =gUnknown_02021CC4
+ ldr r0, =gStringVar1
ldr r2, =gUnknown_085E91B0
ldr r1, =gUnknown_0203CF30
ldrb r1, [r1, 0x4]
lsls r1, 2
adds r1, r2
ldr r1, [r1]
- bl CopyString
- ldr r4, =gUnknown_02021FC4
+ bl StringCopy
+ ldr r4, =gStringVar4
ldr r1, =gUnknown_085E91C0
adds r0, r4, 0
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
_081C5638:
movs r0, 0x1
movs r1, 0
@@ -19315,7 +19315,7 @@ sub_81C5738: @ 81C5738
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
- ldr r2, =gUnknown_03005D90
+ ldr r2, =gSaveBlock2Ptr
ldr r6, [r2]
ldr r3, =0x00000ca9
adds r2, r6, r3
@@ -19369,7 +19369,7 @@ sub_81C57A8: @ 81C57A8
adds r7, r4, 0
lsls r1, 24
lsrs r5, r1, 24
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r3, [r0]
ldr r1, =0x00000ca9
adds r0, r3, r1
@@ -19464,7 +19464,7 @@ sub_81C586C: @ 81C586C
mov r7, r9
mov r6, r8
push {r6,r7}
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r3, [r0]
ldr r1, =0x00000ca9
adds r0, r3, r1
@@ -19556,7 +19556,7 @@ _081C58FE:
thumb_func_start sub_81C5924
sub_81C5924: @ 81C5924
push {r4-r6,lr}
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
ldr r1, =0x00000ca9
adds r0, r2, r1
@@ -19901,7 +19901,7 @@ _081C5BEA:
beq _081C5BF8
b _081C5D16
_081C5BF8:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x4
ands r0, r1
@@ -19970,7 +19970,7 @@ _081C5CA0:
bl audio_play
ldr r2, =gUnknown_0203CE7C
mov r12, r2
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
lsls r3, r6, 1
ldr r0, =0x00000ca9
@@ -20098,12 +20098,12 @@ _081C5DD8:
_081C5DDA:
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
- ldr r1, =gUnknown_02021CC4
+ ldr r1, =gStringVar1
bl itemid_get_name
- ldr r4, =gUnknown_02021FC4
+ ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DBE
adds r0, r4, 0
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x1
movs r1, 0
bl FillWindowPixelBuffer
@@ -20335,7 +20335,7 @@ _081C5FF8:
bl GetMenuCursorPos
lsls r0, 24
lsrs r4, r0, 24
- ldr r5, =gUnknown_030022C0
+ ldr r5, =gMain
ldrh r1, [r5, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -20691,12 +20691,12 @@ sub_81C62C4: @ 81C62C4
_081C62F4:
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
- ldr r1, =gUnknown_02021CC4
+ ldr r1, =gStringVar1
bl itemid_get_name
- ldr r4, =gUnknown_02021FC4
+ ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8EE0
adds r0, r4, 0
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x1
movs r1, 0
bl FillWindowPixelBuffer
@@ -20738,18 +20738,18 @@ sub_81C6350: @ 81C6350
adds r4, r0
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
- ldr r1, =gUnknown_02021CC4
+ ldr r1, =gStringVar1
bl itemid_get_name
- ldr r0, =gUnknown_02021DC4
+ ldr r0, =gStringVar2
movs r2, 0x10
ldrsh r1, [r4, r2]
movs r2, 0
movs r3, 0x2
- bl ConvertIntToDecimalString
- ldr r4, =gUnknown_02021FC4
+ bl ConvertIntToDecimalStringN
+ ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8F0E
adds r0, r4, 0
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x1
movs r1, 0
bl FillWindowPixelBuffer
@@ -20802,15 +20802,15 @@ sub_81C63D0: @ 81C63D0
sub_81C6404: @ 81C6404
push {r4,lr}
sub sp, 0xC
- ldr r0, =gUnknown_02021CC4
+ ldr r0, =gStringVar1
movs r1, 0x1
movs r2, 0x2
movs r3, 0x2
- bl ConvertIntToDecimalString
- ldr r4, =gUnknown_02021FC4
+ bl ConvertIntToDecimalStringN
+ ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0
adds r0, r4, 0
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x3
bl sub_81C6CEC
movs r0, 0x1
@@ -20841,16 +20841,16 @@ sub_81C645C: @ 81C645C
push {r4,lr}
sub sp, 0xC
adds r1, r0, 0
- ldr r0, =gUnknown_02021CC4
+ ldr r0, =gStringVar1
lsls r1, 16
asrs r1, 16
movs r2, 0x2
movs r3, 0x2
- bl ConvertIntToDecimalString
- ldr r4, =gUnknown_02021FC4
+ bl ConvertIntToDecimalStringN
+ ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0
adds r0, r4, 0
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x28
@@ -20899,7 +20899,7 @@ sub_81C64B4: @ 81C64B4
b _081C6544
.pool
_081C64E8:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -20953,18 +20953,18 @@ sub_81C654C: @ 81C654C
adds r6, r4, r5
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
- ldr r1, =gUnknown_02021CC4
+ ldr r1, =gStringVar1
bl itemid_get_name
- ldr r0, =gUnknown_02021DC4
+ ldr r0, =gStringVar2
movs r2, 0x10
ldrsh r1, [r6, r2]
movs r2, 0
movs r3, 0x2
- bl ConvertIntToDecimalString
- ldr r6, =gUnknown_02021FC4
+ bl ConvertIntToDecimalStringN
+ ldr r6, =gStringVar4
ldr r1, =gUnknown_085E8EF9
adds r0, r6, 0
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x1
movs r1, 0
bl FillWindowPixelBuffer
@@ -21001,7 +21001,7 @@ sub_81C65CC: @ 81C65CC
adds r4, r0, r1
ldr r6, =gUnknown_0203CF38
subs r7, r6, 0x2
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -21089,12 +21089,12 @@ sub_81C66AC: @ 81C66AC
lsrs r4, 24
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
- ldr r1, =gUnknown_02021CC4
+ ldr r1, =gStringVar1
bl itemid_get_name
- ldr r5, =gUnknown_02021FC4
+ ldr r5, =gStringVar4
ldr r1, =gUnknown_085E8E11
adds r0, r5, 0
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
ldr r2, =sub_81C66EC
adds r0, r4, 0
adds r1, r5, 0
@@ -21110,7 +21110,7 @@ sub_81C66EC: @ 81C66EC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -21243,7 +21243,7 @@ sub_81C67CC: @ 81C67CC
movs r1, 0x10
movs r2, 0x1
bl sub_81AF15C
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r3, [r0]
movs r0, 0x2
ldrsh r2, [r5, r0]
@@ -21261,12 +21261,12 @@ sub_81C67CC: @ 81C67CC
adds r3, r0
adds r3, r2
ldrh r0, [r3]
- ldr r1, =gUnknown_02021CC4
+ ldr r1, =gStringVar1
bl itemid_get_name
- ldr r6, =gUnknown_02021FC4
+ ldr r6, =gStringVar4
ldr r1, =gUnknown_085E8DFE
adds r0, r6, 0
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x1
movs r1, 0
bl FillWindowPixelBuffer
@@ -21316,7 +21316,7 @@ sub_81C68B0: @ 81C68B0
lsrs r0, 24
cmp r0, 0x1
beq _081C695C
- ldr r7, =gUnknown_030022C0
+ ldr r7, =gMain
ldrh r1, [r7, 0x2E]
movs r0, 0x4
ands r0, r1
@@ -21520,7 +21520,7 @@ sub_81C6A94: @ 81C6A94
mov r6, r8
push {r6,r7}
sub sp, 0x4
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
mov r9, r0
movs r0, 0x14
bl Alloc
@@ -21528,7 +21528,7 @@ sub_81C6A94: @ 81C6A94
movs r0, 0xA
bl Alloc
adds r5, r0, 0
- ldr r1, =gUnknown_03005D90
+ ldr r1, =gSaveBlock2Ptr
mov r8, r1
ldr r2, [r1]
ldr r4, =0x00000ca9
@@ -21566,7 +21566,7 @@ _081C6AF8:
muls r0, r6
add r0, r9
movs r1, 0xC
- bl pokemon_getattr
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r1, sp
@@ -22007,7 +22007,7 @@ sub_81C6E98: @ 81C6E98
ldr r0, =gUnknown_08D9ADD0
adds r1, r4, 0
bl LZDecompressWram
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, =0x00000ca9
adds r0, r1
@@ -22553,7 +22553,7 @@ _081C7338:
bl Free
movs r0, 0
str r0, [r4]
- bl InitKeypadData
+ bl InitKeys
pop {r4}
pop {r0}
bx r0
@@ -22592,21 +22592,21 @@ _081C738C:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x5
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0
beq _081C73BA
adds r0, r4, 0
movs r1, 0x6
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0
bne _081C73BA
adds r0, r4, 0
movs r1, 0x52
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0
bne _081C73E2
_081C73BA:
@@ -22881,7 +22881,7 @@ sub_81C75E0: @ 81C75E0
thumb_func_start sub_81C75F4
sub_81C75F4: @ 81C75F4
push {lr}
- bl InitKeypadData
+ bl InitKeys
pop {r0}
bx r0
thumb_func_end sub_81C75F4
@@ -26856,7 +26856,7 @@ sub_81C943C: @ 81C943C
movs r0, 0x1
b _081C951A
_081C944C:
- ldr r2, =gUnknown_030022C0
+ ldr r2, =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -26889,7 +26889,7 @@ _081C9488:
.4byte _081C94E0
.4byte _081C9516
_081C949C:
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r1, [r0, 0x15]
movs r0, 0x8
@@ -26967,7 +26967,7 @@ sub_81C9520: @ 81C9520
movs r0, 0x1
b _081C9580
_081C9530:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -27019,7 +27019,7 @@ c2_pre_battle_1: @ 81C9588
movs r0, 0x1
b _081C95F8
_081C9598:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -27081,7 +27081,7 @@ sub_81C9600: @ 81C9600
movs r0, 0x1
b _081C9634
_081C9616:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -27111,7 +27111,7 @@ sub_81C963C: @ 81C963C
movs r0, 0x1
b _081C96F6
_081C964E:
- ldr r2, =gUnknown_030022C0
+ ldr r2, =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -27204,7 +27204,7 @@ sub_81C96FC: @ 81C96FC
movs r0, 0x1
b _081C9792
_081C970C:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -27345,7 +27345,7 @@ sub_81C97F8: @ 81C97F8
sub_81C9814: @ 81C9814
push {r4,r5,lr}
adds r4, r0, 0
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -27464,7 +27464,7 @@ _081C98D8:
bl sub_81CAE08
cmp r0, 0
beq _081C9914
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x000009ca
adds r0, r1
@@ -29770,7 +29770,7 @@ sub_81CAB38: @ 81CAB38
sub_81CAB44: @ 81CAB44
push {r4,r5,lr}
adds r4, r0, 0
- ldr r3, =gUnknown_030022C0
+ ldr r3, =gMain
ldrh r1, [r3, 0x30]
movs r0, 0x40
ands r0, r1
@@ -29872,7 +29872,7 @@ sub_81CABFC: @ 81CABFC
sub_81CAC04: @ 81CAC04
push {r4,lr}
adds r4, r0, 0
- ldr r2, =gUnknown_030022C0
+ ldr r2, =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -29967,7 +29967,7 @@ _081CACAC:
sub_81CACB8: @ 81CACB8
push {lr}
adds r3, r0, 0
- ldr r2, =gUnknown_030022C0
+ ldr r2, =gMain
ldrh r1, [r2, 0x30]
movs r0, 0x40
ands r0, r1
@@ -30005,7 +30005,7 @@ _081CACF0:
sub_81CACF8: @ 81CACF8
push {lr}
adds r2, r0, 0
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -30283,7 +30283,7 @@ _081CAED4:
_081CAEDC:
cmp r4, 0x4E
beq _081CAEFC
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x000009ca
adds r0, r1
@@ -30383,17 +30383,17 @@ _081CAFA4:
bne _081CAFC4
ldrh r0, [r1, 0x1E]
bl sub_81D15BC
- ldr r1, =gUnknown_02021FC4
+ ldr r1, =gStringVar4
bl sub_81967AC
strb r0, [r6]
b _081CAFCC
.pool
_081CAFC4:
ldrh r0, [r1, 0x1E]
- ldr r1, =gUnknown_02021FC4
+ ldr r1, =gStringVar4
bl sub_81D189C
_081CAFCC:
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
_081CAFCE:
pop {r4-r6}
pop {r1}
@@ -30636,7 +30636,7 @@ _081CB170:
bl sub_81CAE08
cmp r0, 0
beq _081CB18A
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x000009ca
adds r0, r1
@@ -30656,7 +30656,7 @@ _081CB192:
beq _081CB1C0
adds r0, r4, 0
bl sub_81D1854
- ldr r1, =gUnknown_03005D8C
+ ldr r1, =gSaveBlock1Ptr
ldr r1, [r1]
ldr r2, =0x000009ca
adds r1, r2
@@ -30700,7 +30700,7 @@ sub_81CB1D0: @ 81CB1D0
ldrb r1, [r1, 0x14]
cmp r0, r1
bne _081CB258
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x000009ca
adds r0, r1
@@ -32212,7 +32212,7 @@ sub_81CBE0C: @ 81CBE0C
mov r0, sp
movs r2, 0
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r0, r4, 0
mov r1, sp
movs r2, 0x1
@@ -32253,7 +32253,7 @@ _081CBE68:
mov r0, sp
movs r2, 0
movs r3, 0x5
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r0, r4, 0
mov r1, sp
movs r2, 0x3
@@ -32346,7 +32346,7 @@ sub_81CBEF8: @ 81CBEF8
_081CBF1C:
ldr r1, =gUnknown_085EC00F
add r0, sp, 0xC
- bl CopyString
+ bl StringCopy
_081CBF24:
movs r0, 0x7
add r1, sp, 0xC
@@ -32674,7 +32674,7 @@ sub_81CC158: @ 81CC158
sub_81CC194: @ 81CC194
push {r4,lr}
adds r4, r0, 0
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2C]
movs r0, 0x1
ands r0, r1
@@ -33127,7 +33127,7 @@ _081CC51A:
sub_81CC524: @ 81CC524
push {lr}
bl sub_8124658
- ldr r1, =gUnknown_03005D90
+ ldr r1, =gSaveBlock2Ptr
ldr r3, [r1]
movs r1, 0x1
ands r1, r0
@@ -33207,7 +33207,7 @@ _081CC5AE:
sub_81CC5B4: @ 81CC5B4
push {lr}
adds r2, r0, 0
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -33352,7 +33352,7 @@ sub_81CC6D0: @ 81CC6D0
bl sub_81CC5E4
cmp r0, 0
bne _081CC6EC
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x15]
lsrs r0, 3
@@ -34222,7 +34222,7 @@ sub_81CCDE8: @ 81CCDE8
sub sp, 0xC
mov r9, r0
movs r5, 0
- ldr r6, =gUnknown_02021CC4
+ ldr r6, =gStringVar1
movs r4, 0x88
lsls r4, 21
lsls r1, 24
@@ -34234,7 +34234,7 @@ _081CCE08:
adds r0, r6, 0
movs r2, 0
movs r3, 0xC
- bl CopyStringPadded
+ bl StringCopyPadded
mov r1, r9
ldrb r0, [r1, 0x8]
lsrs r1, r4, 24
@@ -34484,7 +34484,7 @@ sub_81CCFD8: @ 81CCFD8
adds r0, r4, r1
bl sub_81D1ED4
bl sub_81CD970
- ldr r1, =gUnknown_030022B0
+ ldr r1, =gKeyRepeatStartDelay
movs r0, 0x14
strh r0, [r1]
ldr r0, =0x00006304
@@ -34515,7 +34515,7 @@ sub_81CD024: @ 81CD024
adds r0, r4, r1
bl sub_81D1ED4
bl sub_81CD9F8
- ldr r1, =gUnknown_030022B0
+ ldr r1, =gKeyRepeatStartDelay
movs r0, 0x14
strh r0, [r1]
ldr r0, =0x00006304
@@ -34560,7 +34560,7 @@ sub_81CD08C: @ 81CD08C
lsrs r2, r0, 24
cmp r2, 0
bne _081CD100
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -34643,7 +34643,7 @@ sub_81CD110: @ 81CD110
bne _081CD174
movs r0, 0x64
muls r0, r3
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x8
mov r2, sp
@@ -34719,7 +34719,7 @@ sub_81CD1E4: @ 81CD1E4
bl sub_81C763C
adds r2, r0, 0
movs r3, 0
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2C]
movs r0, 0x40
ands r0, r1
@@ -35291,7 +35291,7 @@ sub_81CD624: @ 81CD624
adds r0, r5, 0
movs r2, 0
movs r3, 0xC
- bl CopyStringPadded
+ bl StringCopyPadded
b _081CD80E
.pool
_081CD690:
@@ -35301,7 +35301,7 @@ _081CD690:
adds r3, r5, 0
bl sub_81D2C68
adds r0, r5, 0
- bl GetStringEnd_Limit7
+ bl StringGetEnd10
adds r0, r4, 0
adds r1, r6, 0
movs r2, 0xB
@@ -35314,11 +35314,11 @@ _081CD690:
movs r0, 0x64
adds r4, r6, 0
muls r4, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x38
- bl pokemon_getattr
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r8, r0
@@ -35353,7 +35353,7 @@ _081CD706:
ldr r0, =gSpeciesNames
adds r1, r0
adds r0, r5, 0
- bl CompareString
+ bl StringCompare
cmp r0, 0
bne _081CD71C
movs r6, 0xFF
@@ -35451,7 +35451,7 @@ _081CD790:
mov r1, r8
movs r2, 0
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r3, r0, 0
subs r4, r3, r4
lsls r4, 16
@@ -35668,10 +35668,10 @@ sub_81CD970: @ 81CD970
_081CD998:
movs r0, 0x64
muls r0, r4
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2D
- bl pokemon_getattr
+ bl GetMonData
adds r2, r0, 0
cmp r2, 0
bne _081CD9BE
@@ -37272,9 +37272,9 @@ sub_81CE738: @ 81CE738
lsrs r1, 16
movs r2, 0x1
movs r3, 0x4
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_085EBFD7
- bl CopyString
+ bl StringCopy
pop {r1}
bx r1
.pool
@@ -37403,7 +37403,7 @@ _081CE80C:
adds r5, 0x11
ldr r1, =gUnknown_085EBFD7
adds r0, r5, 0
- bl CopyString
+ bl StringCopy
ldr r0, =0x00001821
adds r6, r0
ldrb r0, [r6]
@@ -37421,7 +37421,7 @@ _081CE80C:
adds r0, r5, 0
movs r2, 0x1
movs r3, 0x4
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
ldrb r0, [r6]
str r7, [sp]
str r4, [sp, 0x4]
@@ -38331,7 +38331,7 @@ _081CF022:
sub_81CF030: @ 81CF030
push {r4,r5,lr}
adds r4, r0, 0
- ldr r2, =gUnknown_030022C0
+ ldr r2, =gMain
ldrh r1, [r2, 0x30]
movs r0, 0x40
ands r0, r1
@@ -38507,16 +38507,16 @@ _081CF158:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x5
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0
beq _081CF1AA
adds r0, r4, 0
movs r1, 0x6
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0
bne _081CF1A4
lsls r1, r5, 24
@@ -38528,7 +38528,7 @@ _081CF158:
str r0, [sp]
ldr r1, [r6, 0x14]
adds r0, r4, 0
- bl pokemon_getattr
+ bl GetMonData
lsls r0, 16
ldr r2, =0x0000ffff
ldr r1, [sp]
@@ -39386,13 +39386,13 @@ sub_81CF7F4: @ 81CF7F4
bl sub_81CF0F0
adds r7, r0, 0
bl sub_81AFBF0
- ldr r4, =gUnknown_02021CC4
+ ldr r4, =gStringVar1
movs r0, 0
adds r1, r4, 0
bl sub_81AFC0C
movs r0, 0xFF
strb r0, [r4]
- ldr r5, =gUnknown_02021DC4
+ ldr r5, =gStringVar2
ldr r1, =gUnknown_085EC029
adds r0, r5, 0
bl sub_81AFC28
@@ -39414,7 +39414,7 @@ sub_81CF7F4: @ 81CF7F4
adds r1, r7, 0
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
mov r1, r8
ldrb r0, [r1, 0x8]
mov r1, r10
@@ -39494,7 +39494,7 @@ sub_81CF8E4: @ 81CF8E4
movs r0, 0x64
adds r4, r1, 0
muls r4, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
bl pokemon_get_gender
@@ -39504,10 +39504,10 @@ sub_81CF8E4: @ 81CF8E4
bl level_by_exp
lsls r0, 24
lsrs r7, r0, 24
- ldr r2, =gUnknown_02021EC4
+ ldr r2, =gStringVar3
adds r0, r4, 0
movs r1, 0x2
- bl pokemon_getattr
+ bl GetMonData
b _081CF94A
.pool
_081CF924:
@@ -39522,14 +39522,14 @@ _081CF924:
bl sub_80690C0
lsls r0, 24
lsrs r7, r0, 24
- ldr r2, =gUnknown_02021EC4
+ ldr r2, =gStringVar3
adds r0, r4, 0
movs r1, 0x2
bl pokemon_getattr_encrypted
_081CF94A:
- ldr r4, =gUnknown_02021EC4
+ ldr r4, =gStringVar3
adds r0, r4, 0
- bl GetStringEnd_Limit7
+ bl StringGetEnd10
adds r0, r6, 0
movs r1, 0x1
adds r2, r4, 0
@@ -39550,9 +39550,9 @@ _081CF974:
_081CF97C:
ldr r1, =gUnknown_086235C8
_081CF97E:
- ldr r4, =gUnknown_02021CC4
+ ldr r4, =gStringVar1
adds r0, r4, 0
- bl CopyString
+ bl StringCopy
movs r1, 0xBA
strb r1, [r0]
adds r0, 0x1
@@ -39565,7 +39565,7 @@ _081CF97E:
adds r1, r7, 0
movs r2, 0
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r0, r6, 0
movs r1, 0x1
adds r2, r4, 0
@@ -39687,7 +39687,7 @@ _081CFA7A:
sub_81CFA88: @ 81CFA88
push {r4,r5,lr}
adds r4, r0, 0
- ldr r2, =gUnknown_030022C0
+ ldr r2, =gMain
ldrh r1, [r2, 0x30]
movs r0, 0x40
ands r0, r1
@@ -39863,26 +39863,26 @@ _081CFBB0:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x5
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0
beq _081CFC10
adds r0, r4, 0
movs r1, 0x6
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0
bne _081CFC0A
adds r0, r4, 0
movs r1, 0x4
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0
bne _081CFC0A
adds r0, r4, 0
movs r1, 0x52
- bl pokemon_getattr
+ bl GetMonData
adds r3, r0, 0
cmp r3, 0
beq _081CFC0A
@@ -40083,21 +40083,21 @@ _081CFD5C:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x5
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0
beq _081CFD8A
adds r0, r4, 0
movs r1, 0x6
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0
bne _081CFD8A
adds r0, r4, 0
movs r1, 0x53
- bl pokemon_getattr
+ bl GetMonData
cmp r0, 0
bne _081CFDB2
_081CFD8A:
@@ -40782,14 +40782,14 @@ sub_81D02B0: @ 81D02B0
add r0, sp, 0xC
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
movs r1, 0xBA
strb r1, [r0]
adds r0, 0x1
adds r1, r5, 0
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
movs r0, 0x1
add r1, sp, 0xC
movs r2, 0x38
@@ -40870,7 +40870,7 @@ sub_81D035C: @ 81D035C
movs r0, 0x64
adds r4, r1, 0
muls r4, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
bl pokemon_get_gender
@@ -40881,10 +40881,10 @@ sub_81D035C: @ 81D035C
lsls r0, 24
lsrs r0, 24
mov r8, r0
- ldr r2, =gUnknown_02021EC4
+ ldr r2, =gStringVar3
adds r0, r4, 0
movs r1, 0x2
- bl pokemon_getattr
+ bl GetMonData
b _081D03CC
.pool
_081D03A4:
@@ -40900,14 +40900,14 @@ _081D03A4:
lsls r0, 24
lsrs r0, 24
mov r8, r0
- ldr r2, =gUnknown_02021EC4
+ ldr r2, =gStringVar3
adds r0, r4, 0
movs r1, 0x2
bl pokemon_getattr_encrypted
_081D03CC:
- ldr r4, =gUnknown_02021EC4
+ ldr r4, =gStringVar3
adds r0, r4, 0
- bl GetStringEnd_Limit7
+ bl StringGetEnd10
adds r0, r6, 0
movs r1, 0x1
adds r2, r4, 0
@@ -40928,9 +40928,9 @@ _081D03F8:
_081D0400:
ldr r1, =gUnknown_086237E8
_081D0402:
- ldr r4, =gUnknown_02021CC4
+ ldr r4, =gStringVar1
adds r0, r4, 0
- bl CopyString
+ bl StringCopy
movs r1, 0xBA
strb r1, [r0]
adds r0, 0x1
@@ -40943,7 +40943,7 @@ _081D0402:
mov r1, r8
movs r2, 0
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r0, r6, 0
movs r1, 0x1
adds r2, r4, 0
@@ -40953,7 +40953,7 @@ _081D0402:
ldrh r1, [r7, 0x2]
movs r2, 0x1
movs r3, 0x2
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
pop {r3}
mov r8, r3
pop {r4-r7}
@@ -40982,10 +40982,10 @@ sub_81D0450: @ 81D0450
adds r1, 0x98
ldr r0, =sub_81D04C4
str r0, [r1]
- ldr r1, =gUnknown_030026FC
+ ldr r1, =gKeyRepeatContinueDelay
movs r0, 0x3
strh r0, [r1]
- ldr r1, =gUnknown_030022B0
+ ldr r1, =gKeyRepeatStartDelay
movs r0, 0xA
strh r0, [r1]
movs r0, 0x1
@@ -41025,7 +41025,7 @@ sub_81D04B8: @ 81D04B8
sub_81D04C4: @ 81D04C4
push {r4,lr}
adds r4, r0, 0
- ldr r2, =gUnknown_030022C0
+ ldr r2, =gMain
ldrh r1, [r2, 0x30]
movs r0, 0x40
ands r0, r1
@@ -41096,7 +41096,7 @@ _081D053E:
sub_81D0548: @ 81D0548
push {r4,lr}
adds r4, r0, 0
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x30]
movs r0, 0x40
ands r0, r1
@@ -41107,7 +41107,7 @@ sub_81D0548: @ 81D0548
cmp r0, 0
bne _081D05A4
_081D0562:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x30]
movs r0, 0x80
ands r0, r1
@@ -41118,7 +41118,7 @@ _081D0562:
cmp r0, 0
bne _081D05A4
_081D0578:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x30]
movs r0, 0x20
ands r0, r1
@@ -41129,7 +41129,7 @@ _081D0578:
cmp r0, 0
bne _081D05A4
_081D058E:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x30]
movs r0, 0x10
ands r0, r1
@@ -41144,7 +41144,7 @@ _081D05A4:
b _081D05CA
.pool
_081D05AC:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -41360,12 +41360,12 @@ sub_81D06E4: @ 81D06E4
movs r0, 0x64
adds r4, r1, 0
muls r4, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x2
adds r2, r5, 0
- bl pokemon_getattr
+ bl GetMonData
adds r0, r4, 0
bl level_by_exp
strb r0, [r7]
@@ -41390,7 +41390,7 @@ _081D0730:
bl pokemon_getattr_encrypted
_081D0752:
adds r0, r5, 0
- bl GetStringEnd_Limit7
+ bl StringGetEnd10
pop {r4-r7}
pop {r0}
bx r0
@@ -41416,19 +41416,19 @@ sub_81D0760: @ 81D0760
movs r0, 0x64
adds r4, r1, 0
muls r4, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r5]
adds r0, r4, 0
movs r1, 0
- bl pokemon_getattr
+ bl GetMonData
str r0, [r6]
adds r0, r4, 0
movs r1, 0x1
- bl pokemon_getattr
+ bl GetMonData
b _081D07D0
.pool
_081D07AC:
@@ -41474,10 +41474,10 @@ _081D07FA:
ldrb r1, [r1, 0x1]
movs r0, 0x64
muls r0, r1
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x52
- bl pokemon_getattr
+ bl GetMonData
_081D080A:
pop {r1}
bx r1
@@ -41503,10 +41503,10 @@ sub_81D0814: @ 81D0814
ldrb r1, [r1, 0x1]
movs r0, 0x64
muls r0, r1
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x53
- bl pokemon_getattr
+ bl GetMonData
b _081D0852
.pool
_081D0848:
@@ -42291,18 +42291,18 @@ sub_81D0E84: @ 81D0E84
add r0, sp, 0xC
movs r2, 0x3
bl memcpy
- ldr r4, =gUnknown_02021CC4
+ ldr r4, =gStringVar1
bl sub_81D07D8
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
movs r3, 0x2
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
bl sub_81AFBF0
movs r0, 0
adds r1, r4, 0
bl sub_81AFC0C
- ldr r4, =gUnknown_02021FC4
+ ldr r4, =gStringVar4
ldr r1, =gUnknown_085EC030
adds r0, r4, 0
bl sub_81AFC28
@@ -42376,7 +42376,7 @@ _081D0F2E:
b _081D0FAA
.pool
_081D0F60:
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, r5
ldr r1, =0x0000318f
@@ -42454,7 +42454,7 @@ sub_81D0FF0: @ 81D0FF0
adds r0, r5, 0
movs r1, 0x11
bl FillWindowPixelBuffer
- ldr r4, =gUnknown_02021EC4
+ ldr r4, =gStringVar3
mov r6, sp
adds r6, 0xD
adds r0, r4, 0
@@ -42487,9 +42487,9 @@ _081D1040:
_081D1048:
ldr r1, =gUnknown_08624BD8
_081D104A:
- ldr r5, =gUnknown_02021CC4
+ ldr r5, =gStringVar1
adds r0, r5, 0
- bl CopyString
+ bl StringCopy
movs r1, 0xBA
strb r1, [r0]
adds r0, 0x1
@@ -42503,7 +42503,7 @@ _081D104A:
ldrb r1, [r1]
movs r2, 0
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
lsls r4, r7, 24
lsrs r4, 24
movs r0, 0x1
@@ -42560,19 +42560,19 @@ sub_81D10D0: @ 81D10D0
adds r4, 0x1
bl sub_81D06D4
adds r6, r0, 0
- ldr r5, =gUnknown_02021CC4
+ ldr r5, =gStringVar1
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
movs r1, 0xBA
strb r1, [r0]
adds r0, 0x1
adds r1, r6, 0
movs r2, 0x1
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
movs r0, 0x1
adds r1, r5, 0
movs r2, 0x38
@@ -43309,7 +43309,7 @@ _081D168E:
sub_81D1694: @ 81D1694
push {lr}
adds r2, r0, 0
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldrb r0, [r2, 0x1]
ldrb r1, [r1, 0x8]
@@ -43470,7 +43470,7 @@ sub_81D1790: @ 81D1790
ldrh r0, [r1, 0x4]
cmp r0, 0x48
bhi _081D17B8
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, =0x000009ca
adds r0, r2
@@ -43491,7 +43491,7 @@ _081D17BA:
thumb_func_start sub_81D17C0
sub_81D17C0: @ 81D17C0
- ldr r1, =gUnknown_03005D8C
+ ldr r1, =gSaveBlock1Ptr
ldr r1, [r1]
ldr r2, =0x000009ca
adds r1, r2
@@ -43788,7 +43788,7 @@ _081D1974:
_081D1984:
ldr r1, [r4]
mov r0, r9
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -43860,7 +43860,7 @@ _081D19F8:
_081D1A0A:
ldr r1, [r4]
mov r0, r10
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
b _081D1A5C
.pool
_081D1A1C:
@@ -43875,7 +43875,7 @@ _081D1A24:
lsls r0, 24
cmp r0, 0
beq _081D1A50
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x000009ca
adds r0, r1
@@ -43895,7 +43895,7 @@ _081D1A50:
adds r0, r6
ldr r1, [r0]
mov r0, r10
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
_081D1A5C:
pop {r3-r5}
mov r8, r3
@@ -44308,7 +44308,7 @@ sub_81D1D44: @ 81D1D44
negs r0, r0
cmp r3, r0
beq _081D1DAC
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
lsls r1, r3, 3
adds r1, r3
lsls r1, 2
@@ -44317,18 +44317,18 @@ sub_81D1D44: @ 81D1D44
ldr r0, =0x00002cca
adds r1, r0
add r0, sp, 0x14
- bl CopyString
+ bl StringCopy
add r0, sp, 0x14
bl sub_81DB52C
add r0, sp, 0x14
- bl GetStringLength
+ bl StringLength
lsls r0, 16
lsrs r0, 16
cmp r0, 0x5
bhi _081D1D8C
add r0, sp, 0x14
movs r1, 0x1
- bl StopMusicWhileStringIsPrinted
+ bl ConvertInternationalString
_081D1D8C:
movs r0, 0
str r0, [sp]
@@ -45961,7 +45961,7 @@ _081D29C4:
add r0, sp, 0xC
movs r2, 0
movs r3, 0x2
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
lsls r3, r4, 24
lsrs r3, 24
mov r0, r10
@@ -45984,7 +45984,7 @@ _081D2A3C:
add r0, sp, 0xC
movs r2, 0
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
add r5, sp, 0xC
_081D2A4A:
movs r0, 0x19
@@ -46008,7 +46008,7 @@ _081D2A70:
add r0, sp, 0xC
movs r2, 0
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
add r5, sp, 0xC
_081D2A7E:
movs r0, 0x29
@@ -46258,20 +46258,20 @@ sub_81D2C68: @ 81D2C68
_081D2C7E:
movs r0, 0x64
muls r0, r1
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
adds r1, r2, 0
adds r2, r3, 0
- bl pokemon_getattr
+ bl GetMonData
b _081D2CCA
.pool
_081D2C94:
movs r0, 0x64
muls r0, r1
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
adds r1, r2, 0
- bl pokemon_getattr
+ bl GetMonData
b _081D2CCA
.pool
_081D2CA8:
@@ -46333,7 +46333,7 @@ sub_81D2CD0: @ 81D2CD0
adds r0, r5, 0
movs r2, 0
movs r3, 0xC
- bl CopyStringPadded
+ bl StringCopyPadded
b _081D2E70
.pool
_081D2D20:
@@ -46343,7 +46343,7 @@ _081D2D20:
adds r3, r5, 0
bl sub_81D2C68
adds r0, r5, 0
- bl GetStringEnd_Limit7
+ bl StringGetEnd10
adds r0, r4, 0
adds r1, r6, 0
movs r2, 0xB
@@ -46356,11 +46356,11 @@ _081D2D20:
movs r0, 0x64
adds r4, r6, 0
muls r4, r0
- ldr r0, =gUnknown_020244EC
+ ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x38
- bl pokemon_getattr
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r8, r0
@@ -46397,7 +46397,7 @@ _081D2D9A:
ldr r0, =gSpeciesNames
adds r1, r0
adds r0, r5, 0
- bl CompareString
+ bl StringCompare
cmp r0, 0
bne _081D2DB0
movs r6, 0xFF
@@ -46494,7 +46494,7 @@ _081D2E24:
mov r1, r8
movs r2, 0
movs r3, 0x3
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r3, r0, 0
strb r4, [r3]
adds r3, 0x1
@@ -47664,7 +47664,7 @@ _081D36CA:
ldr r1, =gUnknown_085EEA73
_081D3704:
adds r0, r6, 0
- bl CopyString
+ bl StringCopy
mov r0, r10
str r0, [sp]
mov r1, r9
@@ -47694,7 +47694,7 @@ _081D373A:
adds r0, r6, 0
movs r2, 0
movs r3, 0x2
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r2, r4, 0
adds r2, 0x38
mov r1, r10
@@ -47799,7 +47799,7 @@ _081D3808:
mov r0, r9
movs r2, 0
adds r3, r4, 0
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
movs r0, 0x4
subs r0, r4
lsls r4, r0, 1
@@ -47860,27 +47860,27 @@ sub_81D388C: @ 81D388C
adds r4, r0, 0
adds r5, r1, 0
movs r1, 0x3A
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r5]
adds r0, r4, 0
movs r1, 0x3B
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r5, 0x2]
adds r0, r4, 0
movs r1, 0x3C
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r5, 0x4]
adds r0, r4, 0
movs r1, 0x3D
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r5, 0x6]
adds r0, r4, 0
movs r1, 0x3E
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r5, 0x8]
adds r0, r4, 0
movs r1, 0x3F
- bl pokemon_getattr
+ bl GetMonData
strh r0, [r5, 0xA]
pop {r4,r5}
pop {r0}
@@ -47890,7 +47890,7 @@ sub_81D388C: @ 81D388C
thumb_func_start sub_81D38D4
sub_81D38D4: @ 81D38D4
push {lr}
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x00003d6d
adds r0, r1
@@ -47914,7 +47914,7 @@ sub_81D38FC: @ 81D38FC
movs r5, 0x9C
lsls r5, 2
adds r1, r5, 0
- bl sub_806F96C
+ bl CalcByteArraySum
adds r4, r5
ldr r1, [r4]
cmp r0, r1
@@ -47959,7 +47959,7 @@ _081D394C:
movs r1, 0x9D
lsls r1, 2
muls r1, r6
- bl sub_806F96C
+ bl CalcByteArraySum
ldr r1, [r7, 0x4]
cmp r0, r1
bne _081D3964
@@ -47985,7 +47985,7 @@ sub_81D396C: @ 81D396C
adds r0, 0x8
movs r1, 0xEE
lsls r1, 4
- bl sub_806F96C
+ bl CalcByteArraySum
ldr r1, [r4, 0x4]
cmp r0, r1
bne _081D398E
@@ -48119,7 +48119,7 @@ _081D3A7E:
adds r0, 0x8
movs r1, 0xEE
lsls r1, 4
- bl sub_806F96C
+ bl CalcByteArraySum
mov r2, r8
str r0, [r2, 0x4]
movs r0, 0x1E
@@ -49049,7 +49049,7 @@ sub_81D4238: @ 81D4238
sub_81D4258: @ 81D4258
push {lr}
sub sp, 0x4
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
@@ -49947,7 +49947,7 @@ sub_81D4998: @ 81D4998
bl VarGet
lsls r0, 16
lsrs r2, r0, 16
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
ldr r0, =0x0000391a
@@ -49979,7 +49979,7 @@ _081D49E0:
FieldObjectIsFarawayIslandMew: @ 81D49E8
push {lr}
adds r2, r0, 0
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
ldr r0, =0x0000391a
@@ -50001,7 +50001,7 @@ _081D4A0E:
thumb_func_start unown_chamber_related
unown_chamber_related: @ 81D4A14
push {lr}
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
ldr r0, =0x0000391a
@@ -50412,7 +50412,7 @@ sub_81D4D50: @ 81D4D50
strh r0, [r1]
movs r0, 0
strh r0, [r4]
- ldr r1, =gUnknown_03002710
+ ldr r1, =gIntrTable
ldr r0, =sub_81D3FAC
str r0, [r1, 0x4]
ldr r0, =sub_81D3F9C
@@ -50668,7 +50668,7 @@ _081D4F6C:
strh r0, [r5]
b _081D4FE6
_081D4F88:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -50921,7 +50921,7 @@ _081D5198:
strb r0, [r4, 0x8]
b _081D548A
_081D51AE:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -50936,7 +50936,7 @@ _081D51BC:
b _081D535A
.pool
_081D51D0:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -51190,7 +51190,7 @@ _081D5418:
lsls r0, 24
cmp r0, 0
beq _081D548A
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -51267,7 +51267,7 @@ sp194_trainer_tower: @ 81D5494
thumb_func_start sub_81D54BC
sub_81D54BC: @ 81D54BC
push {r4-r6,lr}
- ldr r4, =gUnknown_03005D90
+ ldr r4, =gSaveBlock2Ptr
ldr r1, [r4]
ldr r3, =0x00000ef9
adds r1, r3
@@ -51282,7 +51282,7 @@ sub_81D54BC: @ 81D54BC
negs r0, r0
ands r0, r2
strb r0, [r1]
- ldr r2, =gUnknown_03005D8C
+ ldr r2, =gSaveBlock1Ptr
ldr r0, [r2]
ldr r1, =0x00003d68
adds r0, r1
@@ -51476,7 +51476,7 @@ _081D560A:
mov r6, r9
cmp r6, 0x1
ble _081D55EE
- ldr r1, =gUnknown_03005D8C
+ ldr r1, =gSaveBlock1Ptr
ldr r0, [r1]
ldr r1, =0x00003d64
adds r0, r1
@@ -51524,7 +51524,7 @@ sub_81D56B0: @ 81D56B0
adds r1, 0x61
strb r1, [r0]
ldr r1, =gUnknown_0862A5F8
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, =0x00003d6e
adds r0, r2
@@ -51688,7 +51688,7 @@ sub_81D581C: @ 81D581C
bl sub_81D3B34
cmp r0, 0
bne _081D5844
- ldr r3, =gUnknown_03005D8C
+ ldr r3, =gSaveBlock1Ptr
ldr r1, [r3]
ldr r0, =0x00003d6e
adds r1, r0
@@ -51698,7 +51698,7 @@ sub_81D581C: @ 81D581C
b _081D5854
.pool
_081D5844:
- ldr r3, =gUnknown_03005D8C
+ ldr r3, =gSaveBlock1Ptr
ldr r1, [r3]
ldr r0, =0x00003d6e
adds r1, r0
@@ -51742,7 +51742,7 @@ _081D5854:
negs r0, r0
ands r0, r2
strb r0, [r1]
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
movs r1, 0xEE
lsls r1, 4
@@ -51770,7 +51770,7 @@ sub_81D58D8: @ 81D58D8
ldr r3, =gUnknown_020375F0
movs r0, 0
strh r0, [r3]
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x00003d6e
adds r2, r0, r1
@@ -51813,7 +51813,7 @@ sub_81D5924: @ 81D5924
ldrb r0, [r0, 0x6]
cmp r0, 0x4
bne _081D5952
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
mov r8, r0
ldr r0, [r0]
ldr r7, =0x00003d6e
@@ -51838,7 +51838,7 @@ _081D596C:
lsrs r0, 24
cmp r0, 0x1
bne _081D59BC
- ldr r1, =gUnknown_02021DC4
+ ldr r1, =gStringVar2
adds r0, r5, 0
bl itemid_get_name
mov r0, r8
@@ -51848,7 +51848,7 @@ _081D596C:
movs r2, 0x1
orrs r0, r2
strb r0, [r1]
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldr r0, =0x00000ef9
adds r1, r0
@@ -51876,7 +51876,7 @@ _081D59C0:
thumb_func_start sub_81D59D0
sub_81D59D0: @ 81D59D0
push {r4-r6,lr}
- ldr r4, =gUnknown_03005D8C
+ ldr r4, =gSaveBlock1Ptr
ldr r2, [r4]
ldr r6, =0x00003d6e
adds r0, r2, r6
@@ -51926,7 +51926,7 @@ _081D5A48:
movs r0, 0x1
strh r0, [r1]
_081D5A4E:
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
ldr r3, =0x00003d6e
adds r1, r3
@@ -51943,7 +51943,7 @@ _081D5A4E:
thumb_func_start sub_81D5A70
sub_81D5A70: @ 81D5A70
push {lr}
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r2, [r0]
ldr r1, =0x00003d6e
adds r0, r2, r1
@@ -51972,7 +51972,7 @@ _081D5AAE:
thumb_func_start sub_81D5AB4
sub_81D5AB4: @ 81D5AB4
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, =0x00003d6e
adds r1, r0
@@ -51987,7 +51987,7 @@ sub_81D5AB4: @ 81D5AB4
thumb_func_start sub_81D5AD0
sub_81D5AD0: @ 81D5AD0
push {lr}
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x00003d6e
adds r2, r0, r1
@@ -52030,7 +52030,7 @@ _081D5B20:
thumb_func_start sub_81D5B2C
sub_81D5B2C: @ 81D5B2C
push {r4-r7,lr}
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x00003d64
adds r0, r1
@@ -52062,21 +52062,21 @@ _081D5B40:
movs r1, 0x64
bl __divsi3
adds r4, r0, 0
- ldr r0, =gUnknown_02021CC4
+ ldr r0, =gStringVar1
adds r1, r6, 0
movs r2, 0x1
movs r3, 0x2
- bl ConvertIntToDecimalString
- ldr r0, =gUnknown_02021DC4
+ bl ConvertIntToDecimalStringN
+ ldr r0, =gStringVar2
adds r1, r5, 0
movs r2, 0x1
movs r3, 0x2
- bl ConvertIntToDecimalString
- ldr r0, =gUnknown_02021EC4
+ bl ConvertIntToDecimalStringN
+ ldr r0, =gStringVar3
adds r1, r4, 0
movs r2, 0x2
movs r3, 0x2
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
pop {r4-r7}
pop {r0}
bx r0
@@ -52092,11 +52092,11 @@ sub_81D5BBC: @ 81D5BBC
ldrb r0, [r1, 0x6]
cmp r0, 0x4
beq _081D5BEC
- ldr r0, =gUnknown_02021CC4
+ ldr r0, =gStringVar1
ldrb r1, [r1, 0x6]
movs r2, 0
movs r3, 0x1
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_020375F0
movs r0, 0
b _081D5BF0
@@ -52133,7 +52133,7 @@ sub_81D5C18: @ 81D5C18
lsls r0, 16
cmp r0, 0
beq _081D5C42
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x00003d6e
adds r0, r1
@@ -52222,7 +52222,7 @@ sub_81D5C8C: @ 81D5C8C
movs r0, 0
mov r8, r0
mov r10, r4
- ldr r1, =gUnknown_02021FC4
+ ldr r1, =gStringVar4
mov r9, r1
_081D5CD6:
lsls r3, r7, 24
@@ -52242,7 +52242,7 @@ _081D5CD6:
movs r2, 0
bl box_print
adds r7, 0xF
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r1, =0x00003718
adds r4, r1
ldr r0, [r0]
@@ -52258,11 +52258,11 @@ _081D5CD6:
adds r1, r5, 0
bl __umodsi3
adds r5, r0, 0
- ldr r0, =gUnknown_02021CC4
+ ldr r0, =gStringVar1
adds r1, r6, 0
movs r2, 0x1
movs r3, 0x2
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
adds r0, r5, 0
movs r1, 0x3C
bl __udivsi3
@@ -52271,25 +52271,25 @@ _081D5CD6:
movs r1, 0x3C
bl __umodsi3
adds r5, r0, 0
- ldr r0, =gUnknown_02021DC4
+ ldr r0, =gStringVar2
adds r1, r4, 0
movs r2, 0x1
movs r3, 0x2
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
movs r0, 0xA8
muls r0, r5
movs r1, 0x64
bl __udivsi3
adds r1, r0, 0
- ldr r0, =gUnknown_02021EC4
+ ldr r0, =gStringVar3
movs r2, 0x2
movs r3, 0x2
- bl ConvertIntToDecimalString
+ bl ConvertIntToDecimalStringN
mov r0, r9
ldr r1, =gUnknown_085EF895
- bl CopyString
+ bl StringCopy
ldr r1, =gUnknown_085EF8A3
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x1
mov r1, r9
movs r2, 0xD0
@@ -52350,7 +52350,7 @@ sub_81D5DF8: @ 81D5DF8
mov r5, r8
push {r5-r7}
sub sp, 0x8
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xC7
lsls r1, 4
@@ -52361,7 +52361,7 @@ sub_81D5DF8: @ 81D5DF8
beq _081D5F0E
bl sub_81D56B0
movs r7, 0
- ldr r4, =gUnknown_03005D90
+ ldr r4, =gSaveBlock2Ptr
ldr r3, =0x00000cb4
ldr r0, =0x0000ffff
adds r2, r0, 0
@@ -52380,7 +52380,7 @@ _081D5E26:
bls _081D5E26
movs r0, 0
str r0, [sp]
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
movs r2, 0xC7
lsls r2, 4
@@ -52468,7 +52468,7 @@ _081D5E64:
strh r0, [r5, 0xE]
ldr r0, =gUnknown_082C83F0
str r0, [r5, 0x10]
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r4, =0x00000cb4
adds r0, r4
@@ -52790,7 +52790,7 @@ _081D6176:
thumb_func_start battle_init
battle_init: @ 81D6180
lsls r0, 24
- ldr r1, =gUnknown_03005D90
+ ldr r1, =gSaveBlock2Ptr
ldr r1, [r1]
lsrs r0, 23
adds r1, r0
@@ -52820,12 +52820,12 @@ GetTrainerHillTrainerFlag: @ 81D619C
ldrb r1, [r1, 0x8]
adds r0, r1
lsls r0, 24
- ldr r1, =gUnknown_03005D90
+ ldr r1, =gSaveBlock2Ptr
ldr r1, [r1]
movs r2, 0xEE
lsls r2, 4
adds r1, r2
- ldr r2, =gUnknown_0832A328
+ ldr r2, =gBitTable
lsrs r0, 22
adds r0, r2
ldr r0, [r0]
@@ -52848,8 +52848,8 @@ sub_81D61E8: @ 81D61E8
movs r3, 0
ldr r0, =gUnknown_02038BCA
mov r8, r0
- ldr r6, =gUnknown_03005D90
- ldr r1, =gUnknown_0832A328
+ ldr r6, =gSaveBlock2Ptr
+ ldr r1, =gBitTable
mov r12, r1
adds r5, r6, 0
_081D6204:
@@ -52882,7 +52882,7 @@ _081D6240:
cmp r3, 0x1
bls _081D6204
_081D624A:
- ldr r0, =gUnknown_02022FEC
+ ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x80
lsls r1, 8
@@ -52891,7 +52891,7 @@ _081D624A:
beq _081D62A2
movs r3, 0
ldr r5, =gUnknown_02038BCC
- ldr r0, =gUnknown_0832A328
+ ldr r0, =gBitTable
mov r8, r0
_081D6260:
ldr r2, [r6]
@@ -52990,7 +52990,7 @@ _081D6316:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, =gUnknown_02024744
+ ldr r0, =gEnemyParty
adds r4, r0
mov r1, r8
lsls r0, r1, 4
@@ -53133,7 +53133,7 @@ sub_81D642C: @ 81D642C
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
- bl pokemon_getattr
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r5, =gExperienceTables
@@ -53187,7 +53187,7 @@ sub_81D6490: @ 81D6490
thumb_func_start sub_81D64AC
sub_81D64AC: @ 81D64AC
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
movs r1, 0xEE
lsls r1, 4
@@ -53217,7 +53217,7 @@ _081D64D4:
thumb_func_start sub_81D64DC
sub_81D64DC: @ 81D64DC
ldr r1, =gUnknown_020375F0
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ef9
adds r0, r2
@@ -53230,7 +53230,7 @@ sub_81D64DC: @ 81D64DC
thumb_func_start sub_81D64FC
sub_81D64FC: @ 81D64FC
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldr r0, =0x00000ef9
adds r1, r0
@@ -53244,7 +53244,7 @@ sub_81D64FC: @ 81D64FC
thumb_func_start sub_81D6518
sub_81D6518: @ 81D6518
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldr r0, =0x00000ef9
adds r1, r0
@@ -53286,7 +53286,7 @@ _081D6562:
thumb_func_start sub_81D6568
sub_81D6568: @ 81D6568
push {lr}
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x00003d6e
adds r0, r1
@@ -53312,7 +53312,7 @@ _081D6594:
thumb_func_start sub_81D65A0
sub_81D65A0: @ 81D65A0
push {r4,r5,lr}
- ldr r4, =gUnknown_03005D8C
+ ldr r4, =gSaveBlock1Ptr
ldr r2, [r4]
ldr r5, =gUnknown_020375E2
ldr r0, =0x00003d6e
@@ -53441,7 +53441,7 @@ _081D66A2:
bl sub_81D65E8
lsls r0, 24
lsrs r2, r0, 24
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r5, [r0]
ldr r1, =0x00003d6e
adds r0, r5, r1
@@ -57684,7 +57684,7 @@ sub_81D8AD8: @ 81D8AD8
ands r0, r1
cmp r0, 0
bne _081D8B1C
- bl GenerateRandomNumber
+ bl Random
movs r4, 0x7
adds r1, r4, 0
ands r1, r0
@@ -57693,7 +57693,7 @@ sub_81D8AD8: @ 81D8AD8
movs r0, 0x1
movs r2, 0
bl ChangeBgX
- bl GenerateRandomNumber
+ bl Random
ands r4, r0
subs r4, 0x4
lsls r4, 8
@@ -59464,11 +59464,11 @@ sub_81D99BC: @ 81D99BC
bl sub_80D2578
cmp r0, 0
bne _081D99DC
- ldr r4, =gUnknown_02021CC4
+ ldr r4, =gStringVar1
bl sub_80D2548
adds r1, r0, 0
adds r0, r4, 0
- bl CopyString
+ bl StringCopy
movs r0, 0x1
b _081D99DE
.pool
@@ -59484,11 +59484,11 @@ _081D99DE:
walda_maybe: @ 81D99E4
push {r4,lr}
sub sp, 0x8
- ldr r4, =gUnknown_02021DC4
+ ldr r4, =gStringVar2
bl sub_80D2548
adds r1, r0, 0
adds r0, r4, 0
- bl CopyString
+ bl StringCopy
movs r0, 0
str r0, [sp]
ldr r0, =sub_81D9A1C
@@ -59509,7 +59509,7 @@ walda_maybe: @ 81D99E4
sub_81D9A1C: @ 81D9A1C
push {r4,r5,lr}
ldr r4, =gUnknown_020375E0
- ldr r5, =gUnknown_02021DC4
+ ldr r5, =gStringVar2
adds r0, r5, 0
bl sub_81D9A98
strh r0, [r4]
@@ -59540,11 +59540,11 @@ _081D9A62:
adds r0, r5, 0
bl sub_80D255C
_081D9A68:
- ldr r4, =gUnknown_02021CC4
+ ldr r4, =gStringVar1
bl sub_80D2548
adds r1, r0, 0
adds r0, r4, 0
- bl CopyString
+ bl StringCopy
ldr r1, =gUnknown_03005DAC
ldr r0, =sub_80AF168
str r0, [r1]
@@ -59569,7 +59569,7 @@ _081D9AA6:
bl sub_80D2548
adds r1, r0, 0
adds r0, r4, 0
- bl CompareString
+ bl StringCompare
cmp r0, 0
beq _081D9ABA
movs r0, 0
@@ -59588,7 +59588,7 @@ sub_81D9AC4: @ 81D9AC4
mov r7, r8
push {r7}
sub sp, 0x10
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
adds r0, 0xA
bl sub_80842DC
@@ -59682,7 +59682,7 @@ sub_81D9B68: @ 81D9B68
lsrs r0, 16
mov r9, r0
adds r0, r5, 0
- bl GetStringLength
+ bl StringLength
lsls r0, 16
lsrs r0, 16
cmp r0, 0xF
@@ -60048,7 +60048,7 @@ _081D9E24:
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x32
b _081D9EB4
@@ -60059,7 +60059,7 @@ _081D9E44:
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x33
b _081D9EB4
@@ -60070,7 +60070,7 @@ _081D9E64:
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x34
b _081D9EB4
@@ -60081,7 +60081,7 @@ _081D9E84:
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x35
b _081D9EB4
@@ -60092,11 +60092,11 @@ _081D9EA4:
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, =gUnknown_020244EC
+ ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x36
_081D9EB4:
- bl pokemon_getattr
+ bl GetMonData
strb r0, [r4]
ldr r5, =gUnknown_02039E00
ldr r4, =gUnknown_02039F25
@@ -60550,7 +60550,7 @@ _081DA284:
lsls r0, 24
cmp r0, 0
beq _081DA2D4
- ldr r0, =gUnknown_03005D80
+ ldr r0, =gRngValue
movs r1, 0x4
bl sub_80FC4F4
cmp r0, 0x1
@@ -60563,7 +60563,7 @@ _081DA2AC:
lsls r0, 24
cmp r0, 0
beq _081DA2D4
- ldr r0, =gUnknown_03005D80
+ ldr r0, =gRngValue
ldr r4, =gUnknown_020223C4
adds r1, r4, 0
movs r2, 0x4
@@ -60905,7 +60905,7 @@ sub_81DA57C: @ 81DA57C
lsls r0, 24
cmp r0, 0
beq _081DA5CA
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -60955,7 +60955,7 @@ sub_81DA5D4: @ 81DA5D4
bcs _081DA61C
mov r4, r9
_081DA5F4:
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r4]
ldr r2, =0x000009ca
@@ -60987,7 +60987,7 @@ _081DA61C:
bcs _081DA654
mov r4, r9
_081DA62E:
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r4]
ldr r2, =0x000009ca
@@ -61009,7 +61009,7 @@ _081DA64C:
_081DA654:
cmp r6, 0
beq _081DA6BA
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r6, 0
@@ -61018,7 +61018,7 @@ _081DA654:
movs r5, 0
cmp r5, r7
bcs _081DA6BA
- ldr r2, =gUnknown_03005D8C
+ ldr r2, =gSaveBlock1Ptr
ldr r3, =0x000009ca
mov r4, r9
_081DA674:
@@ -61444,7 +61444,7 @@ sub_81DA9BC: @ 81DA9BC
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x32]
- bl sine2
+ bl Sin2
lsls r0, 16
asrs r0, 16
movs r2, 0x36
@@ -61453,7 +61453,7 @@ sub_81DA9BC: @ 81DA9BC
asrs r0, 12
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x32]
- bl cosine2
+ bl Cos2
lsls r0, 16
asrs r0, 16
movs r3, 0x36
@@ -62848,12 +62848,12 @@ sub_81DB468: @ 81DB468
ldr r1, =gPokedexEntries
adds r2, r1
adds r1, r2, 0
- bl CopyString
+ bl StringCopy
movs r1, 0
strb r1, [r0]
adds r0, 0x1
ldr r1, =gUnknown_085E8268
- bl CopyString
+ bl StringCopy
pop {r0}
bx r0
.pool
@@ -62868,7 +62868,7 @@ sub_81DB494: @ 81DB494
cmp r5, 0
beq _081DB4B6
adds r1, r5, 0
- bl CopyString
+ bl StringCopy
adds r4, r0, 0
lsls r0, r6, 24
lsrs r0, 24
@@ -62906,9 +62906,9 @@ sub_81DB4DC: @ 81DB4DC
adds r4, r0, 0
lsls r1, 24
lsrs r5, r1, 24
- bl StripExtendedControlCodes
+ bl StripExtCtrlCodes
adds r0, r4, 0
- bl GetStringLength
+ bl StringLength
lsls r0, 24
lsrs r1, r0, 24
cmp r5, 0xFC
@@ -62949,18 +62949,18 @@ _081DB51E:
sub_81DB52C: @ 81DB52C
push {r4,lr}
adds r4, r0, 0
- bl GetStringLength
+ bl StringLength
lsls r0, 16
lsrs r0, 16
cmp r0, 0x5
bhi _081DB546
adds r0, r4, 0
movs r1, 0x1
- bl StopMusicWhileStringIsPrinted
+ bl ConvertInternationalString
b _081DB54C
_081DB546:
adds r0, r4, 0
- bl StripExtendedControlCodes
+ bl StripExtCtrlCodes
_081DB54C:
pop {r4}
pop {r0}
@@ -62973,20 +62973,20 @@ sub_81DB554: @ 81DB554
adds r4, r0, 0
lsls r1, 24
lsrs r5, r1, 24
- bl GetStringLength
+ bl StringLength
lsls r0, 16
lsrs r0, 16
cmp r0, 0x5
bhi _081DB572
adds r0, r4, 0
movs r1, 0x1
- bl StopMusicWhileStringIsPrinted
+ bl ConvertInternationalString
b _081DB5A4
_081DB572:
cmp r5, 0xFC
bne _081DB57E
adds r0, r4, 0
- bl StripExtendedControlCodes
+ bl StripExtCtrlCodes
b _081DB5A4
_081DB57E:
adds r1, r4, 0
@@ -63060,12 +63060,12 @@ sub_81DB5E8: @ 81DB5E8
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r2, 0
- bl CopyString
+ bl StringCopy
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
adds r1, r4, 0
- bl StopMusicWhileStringIsPrinted
+ bl ConvertInternationalString
pop {r4,r5}
pop {r0}
bx r0