summaryrefslogtreecommitdiff
path: root/asm/emerald.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/emerald.s')
-rw-r--r--asm/emerald.s27
1 files changed, 14 insertions, 13 deletions
diff --git a/asm/emerald.s b/asm/emerald.s
index f95026054..578c974b0 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -2,6 +2,7 @@
.include "constants/misc_constants.s"
.include "constants/species_constants.s"
.include "constants/ability_constants.s"
+ .include "constants/move_constants.s"
.include "constants/item_constants.s"
.include "constants/type_constants.s"
.include "constants/pokemon_data_constants.s"
@@ -186233,7 +186234,7 @@ sub_8069270: ; 8069270
lsls r0, 24
lsrs r0, 24
mov r10, r0
- ldr r0, =gUnknown_0832937C
+ ldr r0, =gLevelUpLearnsetPointers
lsls r6, r4, 2
adds r0, r6, r0
ldr r0, [r0]
@@ -186245,7 +186246,7 @@ sub_8069270: ; 8069270
mov r9, r2
movs r3, 0
@080692AE:
- ldr r0, =gUnknown_0832937C
+ ldr r0, =gLevelUpLearnsetPointers
adds r7, r6, r0
ldr r0, [r7]
adds r0, r3, r0
@@ -186329,7 +186330,7 @@ sub_8069318: ; 8069318
mov r1, sp
ldrb r1, [r1]
strb r1, [r4]
- ldr r2, =gUnknown_0832937C
+ ldr r2, =gLevelUpLearnsetPointers
mov r5, r9
lsls r3, r5, 2
adds r5, r3, r2
@@ -186371,7 +186372,7 @@ sub_8069318: ; 8069318
cmp r0, r4
bne @08069384
@080693B0:
- ldr r3, =gUnknown_0832937C
+ ldr r3, =gLevelUpLearnsetPointers
mov r1, r9
lsls r4, r1, 2
adds r1, r4, r3
@@ -196277,7 +196278,7 @@ sub_806E0B4: ; 806E0B4
cmp r5, 0x3
ble @0806E0EA
movs r5, 0
- ldr r6, =gUnknown_0832937C
+ ldr r6, =gLevelUpLearnsetPointers
lsls r1, r7, 2
adds r2, r1, r6
ldr r3, [r2]
@@ -196311,7 +196312,7 @@ sub_806E0B4: ; 806E0B4
cmp r1, r0
beq @0806E168
ldr r0, [sp, 0x14]
- ldr r1, =gUnknown_0832937C
+ ldr r1, =gLevelUpLearnsetPointers
adds r6, r0, r1
ldr r2, =0x000001ff
mov r8, r2
@@ -196347,7 +196348,7 @@ sub_806E0B4: ; 806E0B4
cmp r2, r0
beq @0806E1AC
ldr r1, [sp, 0x14]
- ldr r2, =gUnknown_0832937C
+ ldr r2, =gLevelUpLearnsetPointers
adds r6, r1, r2
ldr r0, =0x000001ff
mov r8, r0
@@ -196417,7 +196418,7 @@ sub_806E204: ; 806E204
lsls r0, 16
movs r5, 0
movs r4, 0
- ldr r1, =gUnknown_0832937C
+ ldr r1, =gLevelUpLearnsetPointers
lsrs r0, 14
adds r0, r1
ldr r2, [r0]
@@ -196503,7 +196504,7 @@ sub_806E25C: ; 806E25C
cmp r5, 0x3
ble @0806E2A0
movs r5, 0
- ldr r3, =gUnknown_0832937C
+ ldr r3, =gLevelUpLearnsetPointers
ldr r2, [sp, 0x38]
adds r1, r2, r3
ldr r0, [r1]
@@ -196539,7 +196540,7 @@ sub_806E25C: ; 806E25C
cmp r1, r0
beq @0806E322
ldr r0, [sp, 0x38]
- ldr r1, =gUnknown_0832937C
+ ldr r1, =gLevelUpLearnsetPointers
adds r6, r0, r1
ldr r2, =0x000001ff
mov r8, r2
@@ -196576,7 +196577,7 @@ sub_806E25C: ; 806E25C
cmp r2, r0
beq @0806E368
ldr r2, [sp, 0x38]
- ldr r0, =gUnknown_0832937C
+ ldr r0, =gLevelUpLearnsetPointers
adds r6, r2, r0
ldr r2, =0x000001ff
mov r8, r2
@@ -803415,7 +803416,7 @@ sub_819FF98: ; 819FF98
adds r1, r3
ldrh r1, [r1]
str r1, [sp, 0x8]
- ldr r1, =gUnknown_0832937C
+ ldr r1, =gLevelUpLearnsetPointers
ldr r2, [sp, 0x8]
lsls r0, r2, 2
adds r0, r1
@@ -803685,7 +803686,7 @@ sub_81A01E8: ; 81A01E8
bne @081A0204
movs r4, 0x32
@081A0204:
- ldr r1, =gUnknown_0832937C
+ ldr r1, =gLevelUpLearnsetPointers
lsls r0, r2, 2
adds r0, r1
ldr r6, [r0]