1 files changed, 16 insertions, 16 deletions
diff --git a/asm/contest.s b/asm/contest.s
index 453ecb04c..978421c3d 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -102,7 +102,7 @@ LoadContestBgAfterMoveAnim: @ 80D7724
 	movs r4, 0
 	movs r5, 0xA0
 _080D775E:
-	ldr r0, =0x0201a004
+	ldr r0, =gHeap+0x1A004
 	adds r0, r5, r0
 	ldr r1, =gUnknown_02039F26
 	adds r1, r4, r1
@@ -576,7 +576,7 @@ _080D7B4E:
 	ldr r1, =gReservedSpritePaletteCount
 	movs r0, 0x4
 	strb r0, [r1]
-	ldr r0, =0x02000000
+	ldr r0, =gHeap
 	movs r1, 0xD0
 	lsls r1, 9
 	adds r0, r1
@@ -928,7 +928,7 @@ _080D7ED8:
 	ldr r4, =0x06002000
 	adds r1, r4, 0
 	bl LZDecompressVram
-	ldr r3, =0x02018000
+	ldr r3, =gHeap+0x18000
 	movs r5, 0x80
 	lsls r5, 6
 	ldr r1, =0x040000d4
@@ -976,7 +976,7 @@ _080D7F40:
 	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r1, [r0, 0x2C]
-	ldr r2, =0x0201aa04
+	ldr r2, =gHeap+0x1AA04
 	ldr r0, =0x040000d4
 	str r1, [r0]
 	str r2, [r0, 0x4]
@@ -1022,7 +1022,7 @@ _080D7F7C:
 	mov r0, sp
 	adds r2, r6, 0
 	bl CpuSet
-	ldr r1, =0x0201a004
+	ldr r1, =gHeap+0x1A004
 	ldr r0, =0x040000d4
 	mov r2, r8
 	str r2, [r0]
@@ -1393,7 +1393,7 @@ sub_80D833C: @ 80D833C
 	strh r1, [r0]
 	bl sub_80DCD48
 	ldr r1, =gPlttBufferUnfaded
-	ldr r2, =0x0201a204
+	ldr r2, =gHeap+0x1A204
 	ldr r0, =0x040000d4
 	str r1, [r0]
 	str r2, [r0, 0x4]
@@ -2070,7 +2070,7 @@ _080D897C:
 	movs r0, 0
 	bl sub_80DED60
 	ldr r1, =gPlttBufferFaded
-	ldr r0, =0x0201a604
+	ldr r0, =gHeap+0x1A604
 	movs r2, 0x80
 	lsls r2, 3
 	ldr r4, =0x040000d4
@@ -5012,7 +5012,7 @@ _080DA33A:
 sub_80DA348: @ 80DA348
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r2, =0x0201a204
+	ldr r2, =gHeap+0x1A204
 	ldr r3, =gPlttBufferUnfaded
 	ldr r1, =0x040000d4
 	str r2, [r1]
@@ -10211,7 +10211,7 @@ sub_80DCCD8: @ 80DCCD8
 	thumb_func_start sub_80DCD08
 sub_80DCD08: @ 80DCD08
 	push {lr}
-	ldr r0, =0x02000000
+	ldr r0, =gHeap
 	movs r1, 0xD0
 	lsls r1, 9
 	adds r2, r0, r1
@@ -10250,7 +10250,7 @@ sub_80DCD48: @ 80DCD48
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080DCE44
-	ldr r0, =0x02000000
+	ldr r0, =gHeap
 	movs r1, 0xD0
 	lsls r1, 9
 	adds r0, r1
@@ -10639,7 +10639,7 @@ sub_80DD04C: @ 80DD04C
 	movs r4, 0
 	movs r5, 0xA0
 _080DD052:
-	ldr r0, =0x0201a004
+	ldr r0, =gHeap+0x1A004
 	adds r0, r5, r0
 	ldr r1, =gUnknown_02039F26
 	adds r1, r4, r1
@@ -12351,7 +12351,7 @@ sub_80DDE30: @ 80DDE30
 	ldrsh r0, [r4, r1]
 	cmp r0, 0
 	bne _080DDE78
-	ldr r0, =0x02019000
+	ldr r0, =gHeap+0x19000
 	ldr r1, =0x06002000
 	movs r2, 0x80
 	lsls r2, 5
@@ -12360,7 +12360,7 @@ sub_80DDE30: @ 80DDE30
 	b _080DDE8C
 	.pool
 _080DDE78:
-	ldr r0, =0x02018000
+	ldr r0, =gHeap+0x18000
 	ldr r1, =0x06002000
 	movs r2, 0x80
 	lsls r2, 5
@@ -15417,7 +15417,7 @@ sub_80DF704: @ 80DF704
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
-	ldr r0, =0x02000000
+	ldr r0, =gHeap
 	movs r1, 0xD0
 	lsls r1, 9
 	adds r2, r0, r1
@@ -15468,7 +15468,7 @@ sub_80DF750: @ 80DF750
 	bne _080DF766
 	b _080DF924
 _080DF766:
-	ldr r0, =0x02000000
+	ldr r0, =gHeap
 	movs r1, 0xD0
 	lsls r1, 9
 	adds r0, r1
@@ -15493,7 +15493,7 @@ _080DF784:
 	lsrs r7, r0, 24
 	cmp r7, 0x3
 	bls _080DF784
-	ldr r0, =0x02000000
+	ldr r0, =gHeap
 	movs r1, 0xD0
 	lsls r1, 9
 	adds r0, r1