Remove most static wram addresses. Use labels instead.

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

Label overleads are still an issue.

1 files changed, 20 insertions, 20 deletions

diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm
index 6d56c19d..336d40e9 100755
--- a/scripts/saffrongym.asm
+++ b/scripts/saffrongym.asm
@@ -1,5 +1,5 @@
 SaffronGymScript: ; 5d00d (17:500d)
-	ld hl, $d126
+	ld hl, wd126
 	bit 6, [hl]
 	res 6, [hl]
 	call nz, .extra
@@ -36,7 +36,7 @@ SaffronGymScriptPointers: ; 5d053 (17:5053)
 	dw SaffronGymScript3
 
 SaffronGymScript3: ; 5d05b (17:505b)
-	ld a, [W_ISINBATTLE] ; $d057
+	ld a, [W_ISINBATTLE] ; W_ISINBATTLE
 	cp $ff
 	jp z, SaffronGymText_5d048
 	ld a, $f0
@@ -46,7 +46,7 @@ SaffronGymText_5d068: ; 5d068 (17:5068)
 	ld a, $a
 	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
 	call DisplayTextID
-	ld hl, $d7b3
+	ld hl, wd7b3
 	set 1, [hl]
 	ld bc, (TM_46 << 8) | 1
 	call GiveItem
@@ -54,7 +54,7 @@ SaffronGymText_5d068: ; 5d068 (17:5068)
 	ld a, $b
 	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
 	call DisplayTextID
-	ld hl, $d7b3
+	ld hl, wd7b3
 	set 0, [hl]
 	jr .asm_5d091
 .BagFull
@@ -64,14 +64,14 @@ SaffronGymText_5d068: ; 5d068 (17:5068)
 .asm_5d091
 	ld hl, W_OBTAINEDBADGES
 	set 5, [hl]
-	ld hl, $d72a
+	ld hl, wd72a
 	set 5, [hl]
 
 	; deactivate gym trainers
-	ld a, [$d7b3]
+	ld a, [wd7b3]
 	or %11111100
-	ld [$d7b3], a
-	ld hl, $d7b4
+	ld [wd7b3], a
+	ld hl, wd7b4
 	set 0, [hl]
 
 	jp SaffronGymText_5d048
@@ -94,7 +94,7 @@ SaffronGymTrainerHeaders: ; 5d0c3 (17:50c3)
 SaffronGymTrainerHeader0: ; 5d0c3 (17:50c3)
 	db $2 ; flag's bit
 	db ($3 << 4) ; trainer's view range
-	dw $d7b3 ; flag's byte
+	dw wd7b3 ; flag's byte
 	dw SaffronGymBattleText1 ; 0x51f0 TextBeforeBattle
 	dw SaffronGymAfterBattleText1 ; 0x51fa TextAfterBattle
 	dw SaffronGymEndBattleText1 ; 0x51f5 TextEndBattle
@@ -103,7 +103,7 @@ SaffronGymTrainerHeader0: ; 5d0c3 (17:50c3)
 SaffronGymTrainerHeader1: ; 5d0cf (17:50cf)
 	db $3 ; flag's bit
 	db ($3 << 4) ; trainer's view range
-	dw $d7b3 ; flag's byte
+	dw wd7b3 ; flag's byte
 	dw SaffronGymBattleText2 ; 0x51ff TextBeforeBattle
 	dw SaffronGymAfterBattleText2 ; 0x5209 TextAfterBattle
 	dw SaffronGymEndBattleText2 ; 0x5204 TextEndBattle
@@ -112,7 +112,7 @@ SaffronGymTrainerHeader1: ; 5d0cf (17:50cf)
 SaffronGymTrainerHeader2: ; 5d0db (17:50db)
 	db $4 ; flag's bit
 	db ($3 << 4) ; trainer's view range
-	dw $d7b3 ; flag's byte
+	dw wd7b3 ; flag's byte
 	dw SaffronGymBattleText3 ; 0x520e TextBeforeBattle
 	dw SaffronGymAfterBattleText3 ; 0x5218 TextAfterBattle
 	dw SaffronGymEndBattleText3 ; 0x5213 TextEndBattle
@@ -121,7 +121,7 @@ SaffronGymTrainerHeader2: ; 5d0db (17:50db)
 SaffronGymTrainerHeader3: ; 5d0e7 (17:50e7)
 	db $5 ; flag's bit
 	db ($3 << 4) ; trainer's view range
-	dw $d7b3 ; flag's byte
+	dw wd7b3 ; flag's byte
 	dw SaffronGymBattleText4 ; 0x521d TextBeforeBattle
 	dw SaffronGymAfterBattleText4 ; 0x5227 TextAfterBattle
 	dw SaffronGymEndBattleText4 ; 0x5222 TextEndBattle
@@ -130,7 +130,7 @@ SaffronGymTrainerHeader3: ; 5d0e7 (17:50e7)
 SaffronGymTrainerHeader4: ; 5d0f3 (17:50f3)
 	db $6 ; flag's bit
 	db ($3 << 4) ; trainer's view range
-	dw $d7b3 ; flag's byte
+	dw wd7b3 ; flag's byte
 	dw SaffronGymBattleText5 ; 0x522c TextBeforeBattle
 	dw SaffronGymAfterBattleText5 ; 0x5236 TextAfterBattle
 	dw SaffronGymEndBattleText5 ; 0x5231 TextEndBattle
@@ -139,7 +139,7 @@ SaffronGymTrainerHeader4: ; 5d0f3 (17:50f3)
 SaffronGymTrainerHeader5: ; 5d0ff (17:50ff)
 	db $7 ; flag's bit
 	db ($3 << 4) ; trainer's view range
-	dw $d7b3 ; flag's byte
+	dw wd7b3 ; flag's byte
 	dw SaffronGymBattleText6 ; 0x523b TextBeforeBattle
 	dw SaffronGymAfterBattleText6 ; 0x5245 TextAfterBattle
 	dw SaffronGymEndBattleText6 ; 0x5240 TextEndBattle
@@ -148,7 +148,7 @@ SaffronGymTrainerHeader5: ; 5d0ff (17:50ff)
 SaffronGymTrainerHeader6: ; 5d10b (17:510b)
 	db $8 ; flag's bit
 	db ($3 << 4) ; trainer's view range
-	dw $d7b3 ; flag's byte
+	dw wd7b3 ; flag's byte
 	dw SaffronGymBattleText7 ; 0x524a TextBeforeBattle
 	dw SaffronGymAfterBattleText7 ; 0x5254 TextAfterBattle
 	dw SaffronGymEndBattleText7 ; 0x524f TextEndBattle
@@ -158,7 +158,7 @@ SaffronGymTrainerHeader6: ; 5d10b (17:510b)
 
 SaffronGymText1: ; 5d118 (17:5118)
 	db $08 ; asm
-	ld a, [$d7b3]
+	ld a, [wd7b3]
 	bit 1, a
 	jr z, .asm_e3544 ; 0x5d11e
 	bit 0, a
@@ -173,18 +173,18 @@ SaffronGymText1: ; 5d118 (17:5118)
 .asm_e3544 ; 0x5d134
 	ld hl, SaffronGymText_5d162
 	call PrintText
-	ld hl, $d72d
+	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
 	ld hl, SaffronGymText_5d167
 	ld de, SaffronGymText_5d167
 	call PreBattleSaveRegisters
 	ldh a, [$8c]
-	ld [$cf13], a
+	ld [wcf13], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $6
-	ld [$d05c], a
+	ld [W_GYMLEADERNO], a
 	ld a, $3
 	ld [W_SAFFRONGYMCURSCRIPT], a
 .asm_34c2c ; 0x5d15f
@@ -262,7 +262,7 @@ SaffronGymText8: ; 5d1c3 (17:51c3)
 
 SaffronGymText9: ; 5d1cd (17:51cd)
 	db $08 ; asm
-	ld a, [$d7b3]
+	ld a, [wd7b3]
 	bit 1, a
 	jr nz, .asm_13f3c ; 0x5d1d3
 	ld hl, SaffronGymText_5d1e6