Rename off-by-one wram labels

26 files changed, 102 insertions, 102 deletions

diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 45fbc1d5..42603824 100644
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -16,7 +16,7 @@ DrawFrameBlock:
 	inc a
 	ld [wFBTileCounter], a
 	ld a, $2
-	ld [wdef5], a
+	ld [wdef4], a
 	ld a, [wSubAnimTransform]
 	dec a
 	jr z, .flipHorizontalAndVertical   ; SUBANIMTYPE_HVFLIP
@@ -50,9 +50,9 @@ DrawFrameBlock:
 	ld [de], a ; store X
 	cp 88
 	jr c, .asm_78056
-	ld a, [wdef5]
+	ld a, [wdef4]
 	inc a
-	ld [wdef5], a
+	ld [wdef4], a
 .asm_78056
 	inc hl
 	inc de
@@ -62,7 +62,7 @@ DrawFrameBlock:
 	inc de
 	ld a, [hli]
 	ld b, a
-	ld a, [wdef5]
+	ld a, [wdef4]
 	or b
 	ld [de], a ; store flags
 	inc de
@@ -84,9 +84,9 @@ DrawFrameBlock:
 	ld [de], a ; store X
 	cp 88
 	jr c, .asm_78087
-	ld a, [wdef5]
+	ld a, [wdef4]
 	inc a
-	ld [wdef5], a
+	ld [wdef4], a
 .asm_78087
 	inc hl
 	inc de
@@ -107,7 +107,7 @@ DrawFrameBlock:
 	jr z, .storeFlags1
 	ld b, 0
 .storeFlags1
-	ld a, [wdef5]
+	ld a, [wdef4]
 	or b
 	ld [de], a
 	inc de
@@ -127,9 +127,9 @@ DrawFrameBlock:
 	ld [de], a ; store X
 	cp 88
 	jr c, .asm_780c8
-	ld a, [wdef5]
+	ld a, [wdef4]
 	inc a
-	ld [wdef5], a
+	ld [wdef4], a
 .asm_780c8
 	inc hl
 	inc de
@@ -147,7 +147,7 @@ DrawFrameBlock:
 	res OAM_X_FLIP, a
 .storeFlags2
 	ld b, a
-	ld a, [wdef5]
+	ld a, [wdef4]
 	or b
 	ld [de], a
 	inc de
@@ -1184,14 +1184,14 @@ _AnimationWaterDroplets:
 	ld hl, wShadowOAM
 .loop
 	ld a, $1
-	ld [wdef5], a
+	ld [wdef4], a
 	ld a, [wBaseCoordY]
 	ld [hli], a ; Y
 	cp 40
 	jr c, .asm_792d7
-	ld a, [wdef5]
+	ld a, [wdef4]
 	inc a
-	ld [wdef5], a
+	ld [wdef4], a
 .asm_792d7
 	ld a, [wBaseCoordX]
 	add 27
@@ -1199,14 +1199,14 @@ _AnimationWaterDroplets:
 	ld [hli], a ; X
 	cp 88
 	jr c, .asm_792ee
-	ld a, [wdef5]
+	ld a, [wdef4]
 	add $2
 	and $3
-	ld [wdef5], a
+	ld [wdef4], a
 .asm_792ee
 	ld a, [wDropletTile]
 	ld [hli], a ; tile
-	ld a, [wdef5]
+	ld a, [wdef4]
 	ld [hli], a ; attribute
 	ld a, [wBaseCoordX]
 	cp 144
@@ -1351,28 +1351,28 @@ BattleAnimWriteOAMEntry:
 ; tile = d
 ; attributes = variable (depending on coords)
 	ld a, $1
-	ld [wdef5], a
+	ld [wdef4], a
 	ld a, e
 	add 8
 	ld e, a
 	ld [hli], a
 	cp 40
 	jr c, .asm_793d8
-	ld a, [wdef5]
+	ld a, [wdef4]
 	inc a
-	ld [wdef5], a
+	ld [wdef4], a
 .asm_793d8
 	ld a, [wBaseCoordX]
 	ld [hli], a
 	cp 88
 	jr c, .asm_793e8
-	ld a, [wdef5]
+	ld a, [wdef4]
 	add $2
-	ld [wdef5], a
+	ld [wdef4], a
 .asm_793e8
 	ld a, d
 	ld [hli], a
-	ld a, [wdef5]
+	ld a, [wdef4]
 	ld [hli], a
 	ret
 
@@ -1578,7 +1578,7 @@ AnimationSpiralBallsInward:
 	cp $ff
 	jr z, .done
 	ld a, $2
-	ld [wdef5], a
+	ld [wdef4], a
 	ld a, [wSpiralBallsBaseY]
 	add [hl]
 	ld [de], a ; Y
@@ -1590,7 +1590,7 @@ AnimationSpiralBallsInward:
 	cp 88
 	jr c, .asm_79524
 	ld a, $3
-	ld [wdef5], a
+	ld [wdef4], a
 .asm_79524
 	inc hl
 	inc de
@@ -1598,7 +1598,7 @@ AnimationSpiralBallsInward:
 	ld a, [de]
 	and $f0
 	ld b, a
-	ld a, [wdef5]
+	ld a, [wdef4]
 	or b
 	ld [de], a
 	inc de
@@ -2534,7 +2534,7 @@ FallingObjects_UpdateOAMEntry:
 	ld hl, wShadowOAM
 	add hl, de
 	ld a, $1
-	ld [wdef5], a
+	ld [wdef4], a
 	ld a, [hl]
 	inc a
 	inc a
@@ -2545,9 +2545,9 @@ FallingObjects_UpdateOAMEntry:
 	ld [hli], a ; Y
 	cp 40
 	jr c, .asm_79e51
-	ld a, [wdef5]
+	ld a, [wdef4]
 	inc a
-	ld [wdef5], a
+	ld [wdef4], a
 .asm_79e51
 	ld a, [wFallingObjectMovementByte]
 	ld b, a
@@ -2567,10 +2567,10 @@ FallingObjects_UpdateOAMEntry:
 	ld [hli], a ; X
 	cp 88
 	jr c, .asm_79e75
-	ld a, [wdef5]
+	ld a, [wdef4]
 	add $2
 	and $3
-	ld [wdef5], a
+	ld [wdef4], a
 .asm_79e75
 	inc hl
 	xor a ; no horizontal flip
@@ -2583,16 +2583,16 @@ FallingObjects_UpdateOAMEntry:
 	ld [hli], a ; X
 	cp 88
 	jr c, .asm_79e5c
-	ld a, [wdef5]
+	ld a, [wdef4]
 	add $2
 	and $3
-	ld [wdef5], a
+	ld [wdef4], a
 .asm_79e5c
 	inc hl
 	ld a, (1 << OAM_X_FLIP)
 .next2
 	ld b, a
-	ld a, [wdef5]
+	ld a, [wdef4]
 	or b
 	ld [hl], a ; attribute
 	ret
diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm
index 3f16850a..0b0aac7d 100644
--- a/engine/battle/draw_hud_pokeball_gfx.asm
+++ b/engine/battle/draw_hud_pokeball_gfx.asm
@@ -28,7 +28,7 @@ SetupOwnPartyPokeballs:
 	ld a, 8
 	ld [wHUDPokeballGfxOffsetX], a
 	xor a
-	ld [wdef5], a
+	ld [wdef4], a
 	ld hl, wShadowOAM
 	jp WritePokeballOAMData
 
@@ -44,7 +44,7 @@ SetupEnemyPartyPokeballs:
 	ld a, -8
 	ld [wHUDPokeballGfxOffsetX], a
 	ld a, $1
-	ld [wdef5], a
+	ld [wdef4], a
 	ld hl, wShadowOAMSprite06
 	jp WritePokeballOAMData
 
@@ -108,7 +108,7 @@ WritePokeballOAMData:
 	ld [hli], a
 	ld a, [de]
 	ld [hli], a
-	ld a, [wdef5]
+	ld a, [wdef4]
 	ld [hli], a
 	ld a, [wBaseCoordX]
 	ld b, a
@@ -179,7 +179,7 @@ SetupPlayerAndEnemyPokeballs:
 	ld a, 8
 	ld [wHUDPokeballGfxOffsetX], a
 	xor a
-	ld [wdef5], a
+	ld [wdef4], a
 	ld hl, wShadowOAM
 	call WritePokeballOAMData
 	ld hl, wEnemyMons
@@ -190,7 +190,7 @@ SetupPlayerAndEnemyPokeballs:
 	ld [hli], a
 	ld [hl], $68
 	ld a, $1
-	ld [wdef5], a
+	ld [wdef4], a
 	ld hl, wShadowOAMSprite06
 	jp WritePokeballOAMData
 
diff --git a/engine/events/black_out.asm b/engine/events/black_out.asm
index 2a74125a..c45c3101 100644
--- a/engine/events/black_out.asm
+++ b/engine/events/black_out.asm
@@ -1,7 +1,7 @@
 ResetStatusAndHalveMoneyOnBlackout::
 ; Reset player status on blackout.
 	xor a
-	ld [wd435], a
+	ld [wd434], a
 	xor a ; gamefreak copypasting functions (double xor a)
 	ld [wBattleResult], a
 	ld [wWalkBikeSurfState], a
diff --git a/engine/events/hidden_objects/cinnabar_gym_quiz.asm b/engine/events/hidden_objects/cinnabar_gym_quiz.asm
index f5a2db44..da280345 100644
--- a/engine/events/hidden_objects/cinnabar_gym_quiz.asm
+++ b/engine/events/hidden_objects/cinnabar_gym_quiz.asm
@@ -9,7 +9,7 @@ CinnabarGymQuiz::
 	text_asm
 	xor a
 	ld [wOpponentAfterWrongAnswer], a
-	ld hl, wd475
+	ld hl, wd474
 	res 7, [hl]
 	ld a, [wHiddenObjectFunctionArgument]
 	push af
@@ -125,7 +125,7 @@ CinnabarGymQuiz_AskQuestion:
 	ldh a, [hGymGateIndex]
 	add $2
 	ld [wOpponentAfterWrongAnswer], a
-	ld hl, wd475
+	ld hl, wd474
 	set 7, [hl]
 	ret
 
diff --git a/engine/events/pikachu_happiness.asm b/engine/events/pikachu_happiness.asm
index 0d79e32b..0aee04f9 100644
--- a/engine/events/pikachu_happiness.asm
+++ b/engine/events/pikachu_happiness.asm
@@ -73,7 +73,7 @@ ModifyPikachuHappiness::
 	jr c, .decreased
 	cp b
 	jr nc, .done
-	ld a, [wd49c]
+	ld a, [wd49b]
 	and a
 	jr nz, .done
 	jr .update_mood
diff --git a/engine/events/poison.asm b/engine/events/poison.asm
index 3b0acbe4..467d1a5f 100644
--- a/engine/events/poison.asm
+++ b/engine/events/poison.asm
@@ -148,5 +148,5 @@ Func_c4c7:
 	ret nz
 .asm_c4ef
 	xor a
-	ld [wd49c], a
+	ld [wd49b], a
 	ret
diff --git a/engine/events/try_pikachu_movement.asm b/engine/events/try_pikachu_movement.asm
index 70cf65b4..9dd25008 100644
--- a/engine/events/try_pikachu_movement.asm
+++ b/engine/events/try_pikachu_movement.asm
@@ -1,5 +1,5 @@
 TryApplyPikachuMovementData::
-	ld a, [wd472]
+	ld a, [wd471]
 	bit 7, a
 	ret z
 	ld a, [wWalkBikeSurfState]
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index c39e223b..89a20113 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -562,7 +562,7 @@ ItemUseBall:
 
 .skipShowingPokedexData
 	ld a, $1
-	ld [wd49c], a
+	ld [wd49b], a
 	ld a, $85
 	ld [wPikachuMood], a
 	ld a, [wPartyCount]
@@ -819,7 +819,7 @@ ItemUseEvoStone:
 	ld hl, RefusingText
 	call PrintText
 	ld a, $4
-	ld [wd49c], a
+	ld [wd49b], a
 	ld a, $82
 	ld [wPikachuMood], a
 	jr .canceledItemUse
@@ -2124,7 +2124,7 @@ FishingInit:
 	ld a, SFX_HEAL_AILMENT
 	call PlaySound
 	ld a, $2
-	ld [wd49c], a
+	ld [wd49b], a
 	ld a, $81
 	ld [wPikachuMood], a
 	ld c, 80
@@ -2507,7 +2507,7 @@ ItemUseTMHM:
 	jr nz, .notTeachingThunderboltOrThunderToPikachu
 .teachingThunderboltOrThunderToPlayerPikachu
 	ld a, $5
-	ld [wd49c], a
+	ld [wd49b], a
 	ld a, $85
 	ld [wPikachuMood], a
 .notTeachingThunderboltOrThunderToPikachu
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index 04032dfd..d2b027f5 100644
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -176,7 +176,7 @@ StartMenu_Pokemon::
 .surfingPikachu
 	ld a, $2
 .continue
-	ld [wd473], a
+	ld [wd472], a
 	ld a, SURFBOARD
 	ld [wCurItem], a
 	ld [wPseudoItemID], a
@@ -188,7 +188,7 @@ StartMenu_Pokemon::
 	jp .goBackToMap
 .reloadNormalSprite
 	xor a
-	ld [wd473], a
+	ld [wd472], a
 	jp .loop
 .strength
 	bit BIT_RAINBOWBADGE, a
diff --git a/engine/overworld/sprite_collisions.asm b/engine/overworld/sprite_collisions.asm
index 186ff504..2a514a0a 100644
--- a/engine/overworld/sprite_collisions.asm
+++ b/engine/overworld/sprite_collisions.asm
@@ -277,7 +277,7 @@ DetectCollisionBetweenSprites:
 	and $f0 ; collision with pikachu?
 	jr nz, .asm_4cd9
 	xor a
-	ld [wd434], a
+	ld [wd433], a
 	ldh a, [hCollidingSpriteOffset]
 	cp $f
 	jr nz, .asm_4cd9
@@ -352,7 +352,7 @@ Func_4d0a:
 .asm_4d19
 	ld a, c
 	and b
-	ld [wd434], a
+	ld [wd433], a
 	ld a, c
 	inc l
 	inc l
diff --git a/engine/pikachu/pikachu_emotions.asm b/engine/pikachu/pikachu_emotions.asm
index de6230a6..a29fd781 100644
--- a/engine/pikachu/pikachu_emotions.asm
+++ b/engine/pikachu/pikachu_emotions.asm
@@ -1,5 +1,5 @@
 IsPlayerTalkingToPikachu::
-	ld a, [wd436]
+	ld a, [wd435]
 	and a
 	ret z
 	ldh a, [hSpriteIndex]
@@ -8,7 +8,7 @@ IsPlayerTalkingToPikachu::
 	call InitializePikachuTextID
 	xor a
 	ldh [hSpriteIndex], a
-	ld [wd436], a
+	ld [wd435], a
 	ret
 
 InitializePikachuTextID::
@@ -343,7 +343,7 @@ MapSpecificPikachuExpression:
 	ldpikaemotion a, PikachuEmotion22
 	jr c, .play_emotion
 .notInLavenderTower
-	ld a, [wd49c]
+	ld a, [wd49b]
 	and a
 	jr z, .mood_based_emotion
 	dec a
diff --git a/engine/pikachu/pikachu_follow.asm b/engine/pikachu/pikachu_follow.asm
index a33da505..14331682 100644
--- a/engine/pikachu/pikachu_follow.asm
+++ b/engine/pikachu/pikachu_follow.asm
@@ -140,7 +140,7 @@ CalculatePikachuPlacementCoords::
 	inc hl
 	ld [hl], $fe
 	push hl
-	ld hl, wd472
+	ld hl, wd471
 	set 5, [hl]
 	pop hl
 	ret
@@ -614,15 +614,15 @@ Func_fc862:
 	add hl, bc
 	ld [hl], $6
 	xor a
+	ld [wd431], a
 	ld [wd432], a
-	ld [wd433], a
 	ld hl, wSpritePikachuStateData2WalkAnimationCounter - wSpritePikachuStateData1
 	add hl, bc
 	ld [hl], $11
 asm_fc87f:
-	ld a, [wd432]
+	ld a, [wd431]
 	ld e, a
-	ld a, [wd433]
+	ld a, [wd432]
 	ld d, a
 	call Func_fc82e
 	jr c, Func_fc8c7
@@ -648,11 +648,11 @@ asm_fc87f:
 	adc 0
 	ld h, a
 	ld a, [hli]
-	ld [wd432], a
+	ld [wd431], a
 	add e
 	ld e, a
 	ld a, [hl]
-	ld [wd433], a
+	ld [wd432], a
 	add d
 	ld d, a
 	ld hl, wSpritePikachuStateData1YPixels - wSpritePikachuStateData1
@@ -1278,7 +1278,7 @@ Func_fcc23:
 	ld a, [wPikachuOverworldStateFlags]
 	bit 7, a
 	jr nz, .asm_fcc40
-	ld a, [wd472]
+	ld a, [wd471]
 	bit 7, a
 	jr z, .asm_fcc40
 	ld a, [wWalkBikeSurfState]
diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm
index 19250ba2..079ab917 100644
--- a/engine/pokemon/evos_moves.asm
+++ b/engine/pokemon/evos_moves.asm
@@ -373,7 +373,7 @@ LearnMoveFromLevelUp:
 	jr nz, .done
 .foundThunderOrThunderbolt
 	ld a, $5
-	ld [wd49c], a
+	ld [wd49b], a
 	ld a, $85
 	ld [wPikachuMood], a
 .done
diff --git a/home/map_objects.asm b/home/map_objects.asm
index 2359c7ca..c959f2db 100644
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -71,11 +71,11 @@ IsItemInBag::
 	ret
 
 IsSurfingPikachuInParty::
-; set bit 6 of wd472 if true
+; set bit 6 of wd471 if true
 ; also calls Func_3467, which is a bankswitch to IsStarterPikachuInOurParty
-	ld a, [wd472]
+	ld a, [wd471]
 	and $3f
-	ld [wd472], a
+	ld [wd471], a
 	ld hl, wPartyMon1
 	ld c, PARTY_LENGTH
 	ld b, SURF
@@ -99,9 +99,9 @@ IsSurfingPikachuInParty::
 	cp b
 	jr nz, .noSurf
 .hasSurf
-	ld a, [wd472]
+	ld a, [wd471]
 	set 6, a
-	ld [wd472], a
+	ld [wd471], a
 .noSurf
 	pop hl
 .notPikachu
@@ -119,9 +119,9 @@ Func_3467::
 	pop bc
 	pop hl
 	ret nc
-	ld a, [wd472]
+	ld a, [wd471]
 	set 7, a
-	ld [wd472], a
+	ld [wd471], a
 	ret
 
 DisplayPokedex::
diff --git a/home/overworld.asm b/home/overworld.asm
index 2b32eb16..a661ec04 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -93,7 +93,7 @@ OverworldLoopLessDelay::
 	and a
 	jp z, OverworldLoop ; jump if a hidden object or bookshelf was found, but not if a card key door was found
 	xor a
-	ld [wd436], a ; new yellow address
+	ld [wd435], a ; new yellow address
 	call IsSpriteOrSignInFrontOfPlayer
 	call Func_0ffe
 	ldh a, [hTextID]
@@ -127,7 +127,7 @@ OverworldLoopLessDelay::
 	ld hl, wMiscFlags
 	res BIT_TURNING, [hl]
 	xor a
-	ld [wd435], a
+	ld [wd434], a
 	ld a, 1
 	ld [wCheckFor180DegreeTurn], a
 	ld a, [wPlayerMovingDirection] ; the direction that was pressed last time
@@ -186,7 +186,7 @@ OverworldLoopLessDelay::
 	cp b
 	jr z, .noDirectionChange
 	ld a, $8
-	ld [wd435], a
+	ld [wd434], a
 ; unlike in red/blue, yellow does not have the 180 degrees odd code
 	ld hl, wMiscFlags
 	set BIT_TURNING, [hl]
@@ -239,7 +239,7 @@ OverworldLoopLessDelay::
 	ld hl, wMiscFlags
 	res BIT_TURNING, [hl]
 	xor a
-	ld [wd435], a
+	ld [wd434], a
 	call DoBikeSpeedup
 	call AdvancePlayerSprite
 	ld a, [wWalkCounter]
@@ -1169,7 +1169,7 @@ IsSpriteInFrontOfPlayer2::
 	cp $f
 	jr nz, .dontwritetowd436
 	ld a, $FF
-	ld [wd436], a
+	ld [wd435], a
 .dontwritetowd436
 	scf
 	ret
@@ -1245,7 +1245,7 @@ CollisionCheckOnLand::
 	ldh a, [hJoyHeld]
 	and $2
 	jr nz, .asm_0a5c
-	ld hl, wd435
+	ld hl, wd434
 	ld a, [hl]
 	and a
 	jr z, .asm_0a5c
@@ -1746,13 +1746,13 @@ RunMapScript::
 LoadWalkingPlayerSpriteGraphics::
 ; new sprite copy stuff
 	xor a
-	ld [wd473], a
+	ld [wd472], a
 	ld b, BANK(RedSprite)
 	ld de, RedSprite
 	jr LoadPlayerSpriteGraphicsCommon
 
 LoadSurfingPlayerSpriteGraphics2::
-	ld a, [wd473]
+	ld a, [wd472]
 	and a
 	jr z, .asm_0d75
 	dec a
@@ -1760,7 +1760,7 @@ LoadSurfingPlayerSpriteGraphics2::
 	dec a
 	jr z, .asm_0d7c
 .asm_0d75
-	ld a, [wd472]
+	ld a, [wd471]
 	bit 6, a
 	jr z, LoadSurfingPlayerSpriteGraphics
 .asm_0d7c
diff --git a/home/play_time.asm b/home/play_time.asm
index b7f4b4c5..fe243610 100644
--- a/home/play_time.asm
+++ b/home/play_time.asm
@@ -1,6 +1,6 @@
 TrackPlayTime::
 	call CountDownIgnoreInputBitReset
-	ld hl, wd47a
+	ld hl, wd479
 	bit 0, [hl]
 	jr nz, .maxIGT
 	ld a, [wStatusFlags6]
@@ -35,7 +35,7 @@ TrackPlayTime::
 	ld [wPlayTimeHours], a
 	cp $ff
 	ret nz
-	ld hl, wd47a
+	ld hl, wd479
 	set 0, [hl]
 .maxIGT
 	ld a, 59
diff --git a/ram/wram.asm b/ram/wram.asm
index a28d3c39..c72329fb 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -1986,11 +1986,11 @@ wDestinationWarpID:: db
 
 wPikachuOverworldStateFlags:: db
 wPikachuSpawnState:: db
+wd431:: db
 wd432:: db
 wd433:: db
 wd434:: db
 wd435:: db
-wd436:: db
 wPikachuFollowCommandBufferSize:: db
 wPikachuFollowCommandBuffer:: ds 16
 
@@ -2044,12 +2044,12 @@ ENDU
 
 wPikachuHappiness:: db
 wPikachuMood:: db
+wd471:: db
 wd472:: db
-wd473:: db
 	ds 1
-wd475:: db
+wd474:: db
 	ds 4
-wd47a:: db
+wd479:: db
 	ds 24
 wd492:: db
 	ds 1
@@ -2059,7 +2059,7 @@ wPrinterSettings:: db
 wUnknownSerialFlag_d499:: db
 wPrinterConnectionOpen:: db
 wPrinterOpcode:: db
-wd49c:: db
+wd49b:: db
 
 	ds 19
 
@@ -2492,7 +2492,7 @@ wGBCPal:: ds PALETTE_SIZE
 wLastBGP:: db
 wLastOBP0:: db
 wLastOBP1:: db
-wdef5:: db
+wdef4:: db
 wBGPPalsBuffer:: ds NUM_ACTIVE_PALS * PALETTE_SIZE
 
 
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