summaryrefslogtreecommitdiff
path: root/battle
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-02-10 15:14:21 -0800
committeryenatch <yenatch@gmail.com>2015-02-10 15:14:21 -0800
commit62b473d6c65a50134dda1511351fcab2cf476cf7 (patch)
tree52a4afb16cdbd715b8d6731a5bdc95091583b1ee /battle
parent80b0d8cd2d61d6ca291717eb09b7926eaf62da80 (diff)
Blind wram labels part 3.
Diffstat (limited to 'battle')
-rw-r--r--battle/anim_commands.asm10
-rw-r--r--battle/anim_objects.asm10
-rw-r--r--battle/bg_effects.asm12
3 files changed, 16 insertions, 16 deletions
diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm
index e37daf8c4..e138363fc 100644
--- a/battle/anim_commands.asm
+++ b/battle/anim_commands.asm
@@ -685,7 +685,7 @@ BattleAnimCmd_D5: ; cc485 (33:4485)
ld a, [BattleAnimByte]
and $f
ld c, a
- ld hl, wd300
+ ld hl, w5_d300
xor a
ld [BattleAnimTemps], a
.asm_cc492
@@ -792,7 +792,7 @@ BattleAnimCmd_D7: ; cc506 (33:4506)
BattleAnimCmd_D9: ; cc52c (33:452c)
- ld hl, wd300
+ ld hl, w5_d300
.asm_cc52f
ld a, [hl]
and a
@@ -847,7 +847,7 @@ Functioncc561: ; cc561 (33:4561)
BattleAnimCmd_DA: ; cc57e (33:457e)
- ld hl, wd300
+ ld hl, w5_d300
.asm_cc581
ld a, [hl]
and a
@@ -1470,7 +1470,7 @@ Functioncc94b: ; cc94b
Functioncc96e: ; cc96e
ld a, $0
- ld [wd418], a
+ ld [w5_d418], a
ld hl, OTPartyMon3HP
ld e, $a
.asm_cc978
@@ -1492,7 +1492,7 @@ Functioncc96e: ; cc96e
add hl, bc
dec e
jr nz, .asm_cc978
- ld a, [wd418]
+ ld a, [w5_d418]
ld l, a
ld h, $c4
.asm_cc997
diff --git a/battle/anim_objects.asm b/battle/anim_objects.asm
index d988ad026..776e09812 100644
--- a/battle/anim_objects.asm
+++ b/battle/anim_objects.asm
@@ -17,7 +17,7 @@ Functioncc9a1: ; cc9a1 (33:49a1)
.asm_cc9b3
ld c, l
ld b, h
- ld hl, wd40e
+ ld hl, w5_d40e
inc [hl]
call Functioncc9c4
ret
@@ -46,7 +46,7 @@ Functioncc9c4: ; cc9c4 (33:49c4)
ld d, h
ld hl, $0
add hl, bc
- ld a, [wd40e]
+ ld a, [w5_d40e]
ld [hli], a
ld a, [de]
inc de
@@ -111,7 +111,7 @@ Functioncca09: ; cca09
ld a, [hli]
ld h, [hl]
ld l, a
- ld a, [wd418]
+ ld a, [w5_d418]
ld e, a
ld d, $c4
.asm_cca3c
@@ -178,7 +178,7 @@ Functioncca09: ; cca09
inc hl
inc de
ld a, e
- ld [wd418], a
+ ld [w5_d418], a
cp $a0
jr nc, .asm_ccaa7
dec c
@@ -287,7 +287,7 @@ Functionccaaa: ; ccaaa
Functionccb31: ; ccb31 (33:4b31)
push hl
push bc
- ld hl, wd300
+ ld hl, w5_d300
ld b, a
ld c, $5
.asm_ccb39
diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm
index c182aad33..80462f984 100644
--- a/battle/bg_effects.asm
+++ b/battle/bg_effects.asm
@@ -399,7 +399,7 @@ Jumptable_c8217: ; c8217 (32:4217)
Functionc8223: ; c8223 (32:4223)
call Functionc9042
jr z, .asm_c8230
- ld hl, wd40e
+ ld hl, w5_d40e
inc [hl]
call EndBattleBGEffect
ret
@@ -465,7 +465,7 @@ Jumptable_c8284: ; c8284 (32:4284)
Functionc8290: ; c8290 (32:4290)
call Functionc9042
jr z, .asm_c829d
- ld hl, wd40e
+ ld hl, w5_d40e
inc [hl]
call EndBattleBGEffect
ret
@@ -912,8 +912,8 @@ Functionc8561: ; c8561 (32:4561)
ret
Functionc8565: ; c8565 (32:4565)
- ld hl, wd422
- ld de, wd422 + 1
+ ld hl, w5_d422
+ ld de, w5_d422 + 1
ld c, $3f
ld a, [hl]
push af
@@ -926,7 +926,7 @@ Functionc8565: ; c8565 (32:4565)
pop af
ld [hl], a
ld de, LYOverridesBackup
- ld hl, wd422
+ ld hl, w5_d422
ld bc, $0
.asm_c8580
ld a, [$ffc7]
@@ -2749,7 +2749,7 @@ Functionc8f69: ; c8f69 (32:4f69)
ld [BattleAnimTemps + 2], a
ld a, $40
ld [BattleAnimTemps + 3], a
- ld bc, wd422
+ ld bc, w5_d422
.asm_c8f7e
ld a, [BattleAnimTemps + 2]
ld d, a