Remove most static wram addresses. Use labels instead.

For unknown addresses, use "w<address>".

Label overleads are still an issue.

1 files changed, 16 insertions, 16 deletions

diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm
index 62fd9fce..06143eab 100755
--- a/scripts/vermilioncity.asm
+++ b/scripts/vermilioncity.asm
@@ -1,6 +1,6 @@
 VermilionCityScript: ; 197a1 (6:57a1)
 	call EnableAutoTextBoxDrawing
-	ld hl, $d126
+	ld hl, wd126
 	bit 6, [hl]
 	res 6, [hl]
 	push hl
@@ -17,11 +17,11 @@ VermilionCityScript_197c0: ; 197c0 (6:57c0)
 	call Random
 	ld a, [$ffd4]
 	and $e
-	ld [$d743], a
+	ld [wd743], a
 	ret
 
 VermilionCityScript_197cb: ; 197cb (6:57cb)
-	ld hl, $d803
+	ld hl, wd803
 	bit 2, [hl]
 	ret z
 	bit 3, [hl]
@@ -39,7 +39,7 @@ VermilionCityScriptPointers: ; 197dc (6:57dc)
 	dw VermilionCityScript4
 
 VermilionCityScript0: ; 197e6 (6:57e6)
-	ld a, [$c109]
+	ld a, [wSpriteStateData1 + 9]
 	and a
 	ret nz
 	ld hl, CoordsData_19823
@@ -47,11 +47,11 @@ VermilionCityScript0: ; 197e6 (6:57e6)
 	ret nc
 	xor a
 	ld [hJoyHeld], a
-	ld [$cf0d], a
+	ld [wcf0d], a
 	ld a, $3
 	ld [$ff8c], a
 	call DisplayTextID
-	ld a, [$d803]
+	ld a, [wd803]
 	bit 2, a
 	jr nz, .asm_19810 ; 0x19804 $a
 	ld b, $3f
@@ -62,9 +62,9 @@ VermilionCityScript0: ; 197e6 (6:57e6)
 	ret nz
 .asm_19810
 	ld a, $40
-	ld [$ccd3], a
+	ld [wccd3], a
 	ld a, $1
-	ld [$cd38], a
+	ld [wcd38], a
 	call Func_3486
 	ld a, $1
 	ld [W_VERMILIONCITYCURSCRIPT], a
@@ -86,17 +86,17 @@ VermilionCityScript2: ; 19833 (6:5833)
 	ld a, $ff
 	ld [wJoyIgnore], a
 	ld a, $40
-	ld [$ccd3], a
-	ld [$ccd4], a
+	ld [wccd3], a
+	ld [wccd4], a
 	ld a, $2
-	ld [$cd38], a
+	ld [wcd38], a
 	call Func_3486
 	ld a, $3
 	ld [W_VERMILIONCITYCURSCRIPT], a
 	ret
 
 VermilionCityScript3: ; 1984e (6:584e)
-	ld a, [$cd38]
+	ld a, [wcd38]
 	and a
 	ret nz
 	xor a
@@ -107,7 +107,7 @@ VermilionCityScript3: ; 1984e (6:584e)
 	ret
 
 VermilionCityScript1: ; 1985f (6:585f)
-	ld a, [$cd38]
+	ld a, [wcd38]
 	and a
 	ret nz
 	ld c, $a
@@ -137,7 +137,7 @@ VermilionCityText1: ; 19889 (6:5889)
 
 VermilionCityText2: ; 1988e (6:588e)
 	db $08 ; asm
-	ld a, [$d803]
+	ld a, [wd803]
 	bit 2, a
 	jr nz, .asm_359bd ; 0x19894
 	ld hl, VermilionCityText_198a7
@@ -159,10 +159,10 @@ VermilionCityText_198ac: ; 198ac (6:58ac)
 
 VermilionCityText3: ; 198b1 (6:58b1)
 	db $08 ; asm
-	ld a, [$d803]
+	ld a, [wd803]
 	bit 2, a
 	jr nz, .asm_3e0e9 ; 0x198b7
-	ld a, [$c109]
+	ld a, [wSpriteStateData1 + 9]
 	cp $c
 	jr z, .asm_07af3 ; 0x198be
 	ld hl, VermilionCityCoords1