From 40c17c906b2b3f65b3b04b1933b90238a7ac5566 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Mon, 26 May 2014 14:04:56 -0700
Subject: Remove most static wram addresses. Use labels instead.

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

Label overleads are still an issue.
---
 scripts/fanclub.asm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'scripts/fanclub.asm')

diff --git a/scripts/fanclub.asm b/scripts/fanclub.asm
index 8ea8d36d..f9a839fa 100755
--- a/scripts/fanclub.asm
+++ b/scripts/fanclub.asm
@@ -3,7 +3,7 @@ FanClubScript: ; 59b70 (16:5b70)
 
 FanClubBikeInBag:
 ; check if any bike paraphernalia in bag
-	ld a, [$d771]
+	ld a, [wd771]
 	bit 1, a ; got bike voucher?
 	ret nz
 	ld b, BICYCLE
@@ -25,18 +25,18 @@ FanClubTextPointers: ; 59b84 (16:5b84)
 FanClubText1:
 ; pikachu fan
 	db $08 ; asm
-	ld a, [$d771]
+	ld a, [wd771]
 	bit 7, a
 	jr nz, .mineisbetter
 	ld hl, .normaltext
 	call PrintText
-	ld hl, $d771
+	ld hl, wd771
 	set 6, [hl]
 	jr .done
 .mineisbetter
 	ld hl, .bettertext
 	call PrintText
-	ld hl, $d771
+	ld hl, wd771
 	res 7, [hl]
 .done
 	jp TextScriptEnd
@@ -52,18 +52,18 @@ FanClubText1:
 FanClubText2:
 ; seel fan
 	db $08 ; asm
-	ld a, [$d771]
+	ld a, [wd771]
 	bit 6, a
 	jr nz, .mineisbetter
 	ld hl, .normaltext
 	call PrintText
-	ld hl, $d771
+	ld hl, wd771
 	set 7, [hl]
 	jr .done
 .mineisbetter
 	ld hl, .bettertext
 	call PrintText
-	ld hl, $d771
+	ld hl, wd771
 	res 6, [hl]
 .done
 	jp TextScriptEnd
@@ -113,7 +113,7 @@ FanClubText5:
 	ld hl, .meetchairtext
 	call PrintText
 	call YesNoChoice
-	ld a, [$cc26]
+	ld a, [wCurrentMenuItem]
 	and a
 	jr nz, .nothanks
 
@@ -125,7 +125,7 @@ FanClubText5:
 	jr nc, .BagFull
 	ld hl, .receivedvouchertext
 	call PrintText
-	ld hl, $d771
+	ld hl, wd771
 	set 1, [hl]
 	jr .done
 .BagFull
-- 
cgit v1.3.1-sl0p