Rename off-by-one wram labels

9 files changed, 15 insertions, 15 deletions

diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm
index ee9a2299..3c1de8e4 100644
--- a/scripts/BillsHouse.asm
+++ b/scripts/BillsHouse.asm
@@ -39,7 +39,7 @@ BillsHouseScript_1e09e:
 	ret
 
 BillsHouseScript0:
-	ld a, [wd472]
+	ld a, [wd471]
 	bit 7, a
 	jr z, .asm_1e0d2
 	callfar CheckPikachuFaintedOrStatused
@@ -158,7 +158,7 @@ BillsHouseScript5:
 	predef ShowObject
 	ld c, 8
 	call DelayFrames
-	ld hl, wd472
+	ld hl, wd471
 	bit 7, [hl]
 	jr z, .asm_1e1c6
 	call CheckPikachuFollowingPlayer
diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm
index 2ebf51df..a81e1df1 100644
--- a/scripts/CinnabarGym.asm
+++ b/scripts/CinnabarGym.asm
@@ -104,7 +104,7 @@ PikachuMovementData_74f9e:
 	db $3f
 
 CinnabarGymScript_74fa3:
-	ld a, [wd472]
+	ld a, [wd471]
 	bit 7, a
 	ret z
 	push hl
diff --git a/scripts/CinnabarGym_2.asm b/scripts/CinnabarGym_2.asm
index 4c296cf7..9a59eec4 100644
--- a/scripts/CinnabarGym_2.asm
+++ b/scripts/CinnabarGym_2.asm
@@ -4,7 +4,7 @@ CinnabarGymScript_753de:
 
 CinnabarGymScript_753e9:
 	push hl
-	ld hl, wd475
+	ld hl, wd474
 	bit 7, [hl]
 	res 7, [hl]
 	pop hl
@@ -12,7 +12,7 @@ CinnabarGymScript_753e9:
 
 CinnabarGymScript_753f3:
 	push hl
-	ld hl, wd475
+	ld hl, wd474
 	bit 7, [hl]
 	pop hl
 	ret
diff --git a/scripts/MtMoonB2F_2.asm b/scripts/MtMoonB2F_2.asm
index a319b87f..c2515abd 100644
--- a/scripts/MtMoonB2F_2.asm
+++ b/scripts/MtMoonB2F_2.asm
@@ -1,5 +1,5 @@
 MtMoonB2FScript_ApplyPikachuMovementData:
-	ld a, [wd472]
+	ld a, [wd471]
 	bit 7, a
 	ret z
 	ld a, [wWalkBikeSurfState]
diff --git a/scripts/Museum2F.asm b/scripts/Museum2F.asm
index a791c921..6a0a15a4 100644
--- a/scripts/Museum2F.asm
+++ b/scripts/Museum2F.asm
@@ -30,7 +30,7 @@ Museum2FBrunetteGirlText:
 
 Museum2FHikerText:
 	text_asm
-	ld a, [wd472]
+	ld a, [wd471]
 	bit 7, a
 	jr nz, .asm_5c1f6
 	ld hl, Museum2FText_5c20e
diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm
index b8d8898f..87b35924 100644
--- a/scripts/PewterGym.asm
+++ b/scripts/PewterGym.asm
@@ -189,7 +189,7 @@ PewterGymGuideText:
 	ld a, [wCurrentMenuItem]
 	and a
 	jr nz, .PewterGymGuideBeginAdviceText
-	ld a, [wd472]
+	ld a, [wd471]
 	bit 7, a
 	jp nz, .asm_5c3fa
 	ld hl, PewterGymGuideBeginAdviceText
diff --git a/scripts/PewterPokecenter_2.asm b/scripts/PewterPokecenter_2.asm
index cd0933f0..d52b06af 100644
--- a/scripts/PewterPokecenter_2.asm
+++ b/scripts/PewterPokecenter_2.asm
@@ -59,7 +59,7 @@ PewterJigglypuff::
 	ld c, 48
 	call DelayFrames
 	call PlayDefaultMusic
-	ld a, [wd472]
+	ld a, [wd471]
 	bit 7, a
 	ret z
 	callfar CheckPikachuFaintedOrStatused
diff --git a/scripts/PokemonFanClub.asm b/scripts/PokemonFanClub.asm
index f14b126b..f9814f23 100644
--- a/scripts/PokemonFanClub.asm
+++ b/scripts/PokemonFanClub.asm
@@ -34,7 +34,7 @@ PokemonFanClubScript_59a39:
 	ret
 
 PokemonFanClubScript_59a44:
-	ld a, [wd472]
+	ld a, [wd471]
 	bit 7, a
 	ret z
 	callfar CheckPikachuFaintedOrStatused
diff --git a/scripts/SummerBeachHouse.asm b/scripts/SummerBeachHouse.asm
index e1a0ccca..3842b45c 100644
--- a/scripts/SummerBeachHouse.asm
+++ b/scripts/SummerBeachHouse.asm
@@ -13,7 +13,7 @@ SummerBeachHouse_TextPointers:
 
 SummerBeachHouseSurfinDudeText:
 	text_asm
-	ld a, [wd472]
+	ld a, [wd471]
 	vc_patch Bypass_need_Pikachu_with_Surf_for_minigame
 IF DEF (_YELLOW_VC)
 	bit 7, a
@@ -81,7 +81,7 @@ SummerBeachHousePikachuText:
 SummerBeachHousePoster1Text:
 	text_asm
 	ld hl, .SummerBeachHousePoster1Text2
-	ld a, [wd472]
+	ld a, [wd471]
 	bit 6, a
 	jr z, .next
 	ld hl, .SummerBeachHousePoster1Text1
@@ -99,7 +99,7 @@ SummerBeachHousePoster1Text:
 SummerBeachHousePoster2Text:
 	text_asm
 	ld hl, .SummerBeachHousePoster2Text2
-	ld a, [wd472]
+	ld a, [wd471]
 	bit 6, a
 	jr z, .next
 	ld hl, .SummerBeachHousePoster2Text1
@@ -117,7 +117,7 @@ SummerBeachHousePoster2Text:
 SummerBeachHousePoster3Text:
 	text_asm
 	ld hl, .SummerBeachHousePoster3Text2
-	ld a, [wd472]
+	ld a, [wd471]
 	bit 6, a
 	jr z, .next
 	ld hl, .SummerBeachHousePoster3Text1
@@ -136,7 +136,7 @@ SummerBeachHousePrinterText:
 	text_asm
 	ld a, 1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld a, [wd472]
+	ld a, [wd471]
 	vc_patch Bypass_need_Pikachu_with_Surf_for_high_score
 IF DEF(_YELLOW_VC)
 	bit 7, a