summaryrefslogtreecommitdiff
path: root/asm/ground.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/ground.s')
-rwxr-xr-xasm/ground.s48
1 files changed, 24 insertions, 24 deletions
diff --git a/asm/ground.s b/asm/ground.s
index 0ba721042..e846d1c70 100755
--- a/asm/ground.s
+++ b/asm/ground.s
@@ -1243,14 +1243,14 @@ _080E189C:
beq _080E18C8
cmp r0, 0x5
bne _080E1908
- ldr r0, _080E18C0 @ =gUnknown_030041B0
+ ldr r0, _080E18C0 @ =gBattle_BG3_X
ldrh r0, [r0]
strh r0, [r4, 0x22]
ldr r0, _080E18C4 @ =sub_80E1934
b _080E1926
.align 2, 0
_080E18BC: .4byte gAnimMovePower
-_080E18C0: .4byte gUnknown_030041B0
+_080E18C0: .4byte gBattle_BG3_X
_080E18C4: .4byte sub_80E1934
_080E18C8:
movs r0, 0
@@ -1351,16 +1351,16 @@ _080E1962:
ands r0, r1
cmp r0, 0
bne _080E198C
- ldr r1, _080E1988 @ =gUnknown_030041B0
+ ldr r1, _080E1988 @ =gBattle_BG3_X
ldrh r0, [r3, 0x26]
ldrh r2, [r3, 0x22]
adds r0, r2
strh r0, [r1]
b _080E1996
.align 2, 0
-_080E1988: .4byte gUnknown_030041B0
+_080E1988: .4byte gBattle_BG3_X
_080E198C:
- ldr r0, _080E19B4 @ =gUnknown_030041B0
+ ldr r0, _080E19B4 @ =gBattle_BG3_X
ldrh r1, [r3, 0x22]
ldrh r2, [r3, 0x26]
subs r1, r2
@@ -1382,7 +1382,7 @@ _080E1996:
strh r0, [r3, 0x24]
b _080E1A0C
.align 2, 0
-_080E19B4: .4byte gUnknown_030041B0
+_080E19B4: .4byte gBattle_BG3_X
_080E19B8:
ldrh r0, [r3, 0xA]
adds r0, 0x1
@@ -1397,16 +1397,16 @@ _080E19B8:
ands r1, r0
cmp r1, 0
bne _080E19E4
- ldr r1, _080E19E0 @ =gUnknown_030041B0
+ ldr r1, _080E19E0 @ =gBattle_BG3_X
ldrh r0, [r3, 0x24]
ldrh r2, [r3, 0x22]
adds r0, r2
strh r0, [r1]
b _080E19EE
.align 2, 0
-_080E19E0: .4byte gUnknown_030041B0
+_080E19E0: .4byte gBattle_BG3_X
_080E19E4:
- ldr r0, _080E1A14 @ =gUnknown_030041B0
+ ldr r0, _080E1A14 @ =gBattle_BG3_X
ldrh r1, [r3, 0x22]
ldrh r2, [r3, 0x24]
subs r1, r2
@@ -1433,9 +1433,9 @@ _080E1A0C:
strh r0, [r3, 0x8]
b _080E1A24
.align 2, 0
-_080E1A14: .4byte gUnknown_030041B0
+_080E1A14: .4byte gBattle_BG3_X
_080E1A18:
- ldr r1, _080E1A28 @ =gUnknown_030041B0
+ ldr r1, _080E1A28 @ =gBattle_BG3_X
ldrh r0, [r3, 0x22]
strh r0, [r1]
adds r0, r2, 0
@@ -1444,7 +1444,7 @@ _080E1A24:
pop {r0}
bx r0
.align 2, 0
-_080E1A28: .4byte gUnknown_030041B0
+_080E1A28: .4byte gBattle_BG3_X
thumb_func_end sub_80E1934
thumb_func_start sub_80E1A2C
@@ -1719,10 +1719,10 @@ _080E1BE2:
movs r0, 0xFF
ands r1, r0
strh r1, [r4, 0xC]
- ldr r2, _080E1C50 @ =gUnknown_030041B0
+ ldr r2, _080E1C50 @ =gBattle_BG3_X
ldrh r0, [r4, 0xA]
strh r0, [r2]
- ldr r0, _080E1C54 @ =gUnknown_030041B8
+ ldr r0, _080E1C54 @ =gBattle_BG3_Y
strh r1, [r0]
ldrh r0, [r6, 0x4]
strh r0, [r4, 0xE]
@@ -1736,8 +1736,8 @@ _080E1C40: .4byte gAnimBankAttacker
_080E1C44: .4byte sub_80E1C58
_080E1C48: .4byte gTasks
_080E1C4C: .4byte 0x000001ff
-_080E1C50: .4byte gUnknown_030041B0
-_080E1C54: .4byte gUnknown_030041B8
+_080E1C50: .4byte gBattle_BG3_X
+_080E1C54: .4byte gBattle_BG3_Y
thumb_func_end sub_80E1BB0
thumb_func_start sub_80E1C58
@@ -1757,10 +1757,10 @@ sub_80E1C58: @ 80E1C58
ldrsh r0, [r2, r4]
cmp r1, r0
bne _080E1C98
- ldr r0, _080E1C90 @ =gUnknown_030041B0
+ ldr r0, _080E1C90 @ =gBattle_BG3_X
movs r1, 0
strh r1, [r0]
- ldr r0, _080E1C94 @ =gUnknown_030041B8
+ ldr r0, _080E1C94 @ =gBattle_BG3_Y
strh r1, [r0]
adds r0, r3, 0
bl DestroyTask
@@ -1768,13 +1768,13 @@ sub_80E1C58: @ 80E1C58
.align 2, 0
_080E1C88: .4byte gTasks
_080E1C8C: .4byte gBattleAnimArgs
-_080E1C90: .4byte gUnknown_030041B0
-_080E1C94: .4byte gUnknown_030041B8
+_080E1C90: .4byte gBattle_BG3_X
+_080E1C94: .4byte gBattle_BG3_Y
_080E1C98:
- ldr r1, _080E1CAC @ =gUnknown_030041B0
+ ldr r1, _080E1CAC @ =gBattle_BG3_X
ldrh r0, [r2, 0xA]
strh r0, [r1]
- ldr r1, _080E1CB0 @ =gUnknown_030041B8
+ ldr r1, _080E1CB0 @ =gBattle_BG3_Y
ldrh r0, [r2, 0xC]
strh r0, [r1]
_080E1CA4:
@@ -1782,8 +1782,8 @@ _080E1CA4:
pop {r0}
bx r0
.align 2, 0
-_080E1CAC: .4byte gUnknown_030041B0
-_080E1CB0: .4byte gUnknown_030041B8
+_080E1CAC: .4byte gBattle_BG3_X
+_080E1CB0: .4byte gBattle_BG3_Y
thumb_func_end sub_80E1C58
.align 2, 0 @ Don't pad with nop.