summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-02-08 00:03:32 -0800
committeryenatch <yenatch@gmail.com>2015-02-10 00:53:03 -0800
commit8e033210694533bc1233a851d6914e1f0cb90232 (patch)
tree9c526de647aecbdb2dc81da6cb939ffa1d7d707d /data
parent0683bc87701e6b4c357fb7b21927c17ceb87a6de (diff)
Blindly use wram labels for everything except mobile, part 1.
Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
Diffstat (limited to 'data')
-rw-r--r--data/battle_tower.asm34
-rw-r--r--data/odd_eggs.asm42
-rw-r--r--data/wild/fish.asm6
3 files changed, 41 insertions, 41 deletions
diff --git a/data/battle_tower.asm b/data/battle_tower.asm
index e4b79c0d4..efbc2f64f 100644
--- a/data/battle_tower.asm
+++ b/data/battle_tower.asm
@@ -4,14 +4,14 @@ Function1f8000: ; 1f8000
ld a, $3
ld [rSVBK], a
xor a
- ld hl, $d100
+ ld hl, wd100
ld bc, $00e0
call ByteFill
ld a, $ff
- ld [$d10c], a
- ld [$d147], a
- ld [$d182], a
- ld de, $d100
+ ld [wd10c], a
+ ld [wd147], a
+ ld [wd182], a
+ ld de, wd100
ld a, [hRandomAdd]
ld b, a
.asm_1f8022
@@ -99,22 +99,22 @@ Function1f8081: ; 1f8081
ld b, a
ld a, [hld]
ld c, a
- ld a, [$d10b]
+ ld a, [wd10b]
cp b
jr z, .asm_1f8089
- ld a, [$d10c]
+ ld a, [wd10c]
cp c
jr z, .asm_1f8089
- ld a, [$d146]
+ ld a, [wd146]
cp b
jr z, .asm_1f8089
- ld a, [$d147]
+ ld a, [wd147]
cp c
jr z, .asm_1f8089
- ld a, [$d181]
+ ld a, [wd181]
cp b
jr z, .asm_1f8089
- ld a, [$d182]
+ ld a, [wd182]
cp c
jr z, .asm_1f8089
ld a, [$be51]
@@ -138,13 +138,13 @@ Function1f8081: ; 1f8081
ld bc, $3b
call CopyBytes
- ld a, [$d265]
+ ld a, [wd265]
push af
push de
ld hl, -$3b
add hl, de
ld a, [hl]
- ld [$d265], a
+ ld [wd265], a
ld bc, $0030
add hl, bc
push hl
@@ -156,7 +156,7 @@ Function1f8081: ; 1f8081
call CopyBytes
pop de
pop af
- ld [$d265], a
+ ld [wd265], a
pop bc
dec c
jp nz, .loop
@@ -167,11 +167,11 @@ Function1f8081: ; 1f8081
ld [$be55], a
ld a, [$be53]
ld [$be56], a
- ld a, [$d10b]
+ ld a, [wd10b]
ld [$be51], a
- ld a, [$d146]
+ ld a, [wd146]
ld [$be52], a
- ld a, [$d181]
+ ld a, [wd181]
ld [$be53], a
call CloseSRAM
ret
diff --git a/data/odd_eggs.asm b/data/odd_eggs.asm
index 14a86d012..65e173198 100644
--- a/data/odd_eggs.asm
+++ b/data/odd_eggs.asm
@@ -43,44 +43,44 @@ GiveOddEgg: ; 1fb4b6
ld a, OddEgg2 - OddEgg1
call AddNTimes
- ld de, $c608
+ ld de, wEnemyMoveStruct
ld bc, $0046
call CopyBytes
ld a, EGG_TICKET
ld [CurItem], a
ld a, $1
- ld [$d10c], a
+ ld [wd10c], a
ld a, $ff
- ld [$d107], a
+ ld [wd107], a
ld hl, NumItems
call TossItem
ld a, EGG
- ld [$cd2a], a
+ ld [wcd2a], a
- ld a, $cd29 % $100
- ld [$cd20], a
- ld a, $cd29 / $100
- ld [$cd21], a
- ld a, $c608 % $100
- ld [$cd22], a
- ld a, $c608 / $100
- ld [$cd23], a
+ ld a, wcd29 % $100
+ ld [CreditsPos], a
+ ld a, wcd29 / $100
+ ld [wcd21], a
+ ld a, wEnemyMoveStruct % $100
+ ld [wcd22], a
+ ld a, wEnemyMoveStruct / $100
+ ld [wcd23], a
ld hl, .Odd
- ld de, $cd2b
+ ld de, wcd2b
ld bc, PKMN_NAME_LENGTH
call CopyBytes
- ld a, $cd2b % $100
- ld [$cd24], a
- ld a, $cd2b / $100
- ld [$cd25], a
- ld a, $c638 % $100
- ld [$cd26], a
- ld a, $c638 / $100
- ld [$cd27], a
+ ld a, wcd2b % $100
+ ld [wcd24], a
+ ld a, wcd2b / $100
+ ld [wcd25], a
+ ld a, BattleMonHappiness % $100
+ ld [wcd26], a
+ ld a, BattleMonHappiness / $100
+ ld [wcd27], a
callba Function11b98f
ret
; 1fb546
diff --git a/data/wild/fish.asm b/data/wild/fish.asm
index 44a30a0b2..0bb7a812c 100644
--- a/data/wild/fish.asm
+++ b/data/wild/fish.asm
@@ -122,7 +122,7 @@ GetFishGroupHeader: ; 9245b
; Return fishing encounter group header d in de.
push hl
- ld hl, $dc1e
+ ld hl, wdc1e
bit 2, [hl]
pop hl
jr z, .end
@@ -141,14 +141,14 @@ GetFishGroupHeader: ; 9245b
ret
.group11
- ld a, [$dfce]
+ ld a, [wdfce]
cp 1
jr nz, .end
ld d, 6
jr .end
.group12
- ld a, [$dfce]
+ ld a, [wdfce]
cp 2
jr nz, .end
ld d, 7