Fix labels

10 files changed, 23 insertions, 23 deletions

diff --git a/Add-a-new-Pack-pocket.md b/Add-a-new-Pack-pocket.md
index c9632eb..01d8c84 100644
--- a/Add-a-new-Pack-pocket.md
+++ b/Add-a-new-Pack-pocket.md
@@ -454,7 +454,7 @@ Here's the first jumptable corresponding to those constants. It's the "core" jum
  	ld hl, BallsPocketMenuHeader
  	call CopyMenuHeader
  	ld a, [wBallsPocketCursor]
- 	ld [wMenuCursorBuffer], a
+ 	ld [wMenuCursorPosition], a
  	ld a, [wBallsPocketScrollPosition]
  	ld [wMenuScrollPosition], a
  	call ScrollingMenu
@@ -483,7 +483,7 @@ Here's the first jumptable corresponding to those constants. It's the "core" jum
 +	ld hl, BerryPocketMenuHeader
 +	call CopyMenuHeader
 +	ld a, [wBerryPocketCursor]
-+	ld [wMenuCursorBuffer], a
++	ld [wMenuCursorPosition], a
 +	ld a, [wBerryPocketScrollPosition]
 +	ld [wMenuScrollPosition], a
 +	call ScrollingMenu
@@ -554,7 +554,7 @@ This is another jumptable, but for using the Pack during battle. Again, we add p
  	ld hl, BallsPocketMenuHeader
  	call CopyMenuHeader
  	ld a, [wBallsPocketCursor]
- 	ld [wMenuCursorBuffer], a
+ 	ld [wMenuCursorPosition], a
  	ld a, [wBallsPocketScrollPosition]
  	ld [wMenuScrollPosition], a
  	call ScrollingMenu
@@ -583,7 +583,7 @@ This is another jumptable, but for using the Pack during battle. Again, we add p
 +	ld hl, BerryPocketMenuHeader
 +	call CopyMenuHeader
 +	ld a, [wBerryPocketCursor]
-+	ld [wMenuCursorBuffer], a
++	ld [wMenuCursorPosition], a
 +	ld a, [wBerryPocketScrollPosition]
 +	ld [wMenuScrollPosition], a
 +	call ScrollingMenu
@@ -621,7 +621,7 @@ Just like before, we insert the Berry pocket between the Ball and Key Item pocke
  	ld hl, PC_Mart_BallsPocketMenuHeader
  	call CopyMenuHeader
  	ld a, [wBallsPocketCursor]
- 	ld [wMenuCursorBuffer], a
+ 	ld [wMenuCursorPosition], a
  	ld a, [wBallsPocketScrollPosition]
  	ld [wMenuScrollPosition], a
  	call ScrollingMenu
@@ -637,7 +637,7 @@ Just like before, we insert the Berry pocket between the Ball and Key Item pocke
 +	ld hl, PC_Mart_BerryPocketMenuHeader
 +	call CopyMenuHeader
 +	ld a, [wBerryPocketCursor]
-+	ld [wMenuCursorBuffer], a
++	ld [wMenuCursorPosition], a
 +	ld a, [wBerryPocketScrollPosition]
 +	ld [wMenuScrollPosition], a
 +	call ScrollingMenu
diff --git a/Allow-more-trainer-parties,-with-individual-DVs,-stat-experience,-and-nicknames.md b/Allow-more-trainer-parties,-with-individual-DVs,-stat-experience,-and-nicknames.md
index f52a890..f080370 100644
--- a/Allow-more-trainer-parties,-with-individual-DVs,-stat-experience,-and-nicknames.md
+++ b/Allow-more-trainer-parties,-with-individual-DVs,-stat-experience,-and-nicknames.md
@@ -392,7 +392,7 @@ LoadEnemyMon:
 	...
 
  	ld a, [wTempEnemyMonSpecies]
- 	ld [wNamedObjectIndexBuffer], a
+ 	ld [wNamedObjectIndex], a
 -
 -	call GetPokemonName
 
@@ -1270,7 +1270,7 @@ Edit [engine/overworld/wildmons.asm](../blob/master/engine/overworld/wildmons.as
 -	ld a, BANK(Trainers)
 +	ld a, [wTrainerGroupBank]
  	call GetFarByte
- 	ld [wNamedObjectIndexBuffer], a
+ 	ld [wNamedObjectIndex], a
  	call GetPokemonName
  	ld hl, wStringBuffer1
  	ld de, wStringBuffer4
diff --git a/Color-party-menu-icons-by-species.md b/Color-party-menu-icons-by-species.md
index 07a9ba2..2ca2add 100644
--- a/Color-party-menu-icons-by-species.md
+++ b/Color-party-menu-icons-by-species.md
@@ -398,7 +398,7 @@ Edit [engine/gfx/mon_icons.asm](../blob/master/engine/gfx/mon_icons.asm) again:
 +	call LoadPartyMenuMonIconColors
  	ld a, [wCurIconTile]
  	push af
- 	ldh a, [hObjectStructIndexBuffer]
+ 	ldh a, [hObjectStructIndex]
  	ld hl, wPartySpecies
  	ld e, a
  	ld d, 0
diff --git a/Disable-jumping-over-ledges-onto-obstacle-tiles-or-NPCs.md b/Disable-jumping-over-ledges-onto-obstacle-tiles-or-NPCs.md
index 20bd6da..2c8e7e4 100644
--- a/Disable-jumping-over-ledges-onto-obstacle-tiles-or-NPCs.md
+++ b/Disable-jumping-over-ledges-onto-obstacle-tiles-or-NPCs.md
@@ -25,7 +25,7 @@ Edit `DoPlayerMovement` in [engine/overworld/player_movement.asm](../blob/master
 +	jr c, .DontJump
 +; make sure there's no NPC across the ledge
 +	xor a
-+	ldh [hMapObjectIndexBuffer], a
++	ldh [hMapObjectIndex], a
 +	farcall IsNPCAtCoord
 +	jr c, .DontJump
 
diff --git a/Evolution-moves.md b/Evolution-moves.md
index 039d1be..20180e8 100644
--- a/Evolution-moves.md
+++ b/Evolution-moves.md
@@ -353,7 +353,7 @@ Edit [engine/pokemon/evolve.asm](../blob/master/engine/pokemon/evolve.asm):
 +
 +	ld a, d
 +	ld [wPutativeTMHMMove], a
-+	ld [wNamedObjectIndexBuffer], a
++	ld [wNamedObjectIndex], a
 +	call GetMoveName
 +	call CopyName1
 +	predef LearnMove
diff --git a/Infinitely-reusable-TMs.md b/Infinitely-reusable-TMs.md
index 532e661..3b8ee53 100644
--- a/Infinitely-reusable-TMs.md
+++ b/Infinitely-reusable-TMs.md
@@ -85,7 +85,7 @@ Edit [engine/items/tmhm.asm](../blob/master/engine/items/tmhm.asm) again:
 ```diff
  .okay
  	predef GetTMHMMove
- 	ld a, [wNamedObjectIndexBuffer]
+ 	ld a, [wNamedObjectIndex]
  	ld [wPutativeTMHMMove], a
  	call GetMoveName
  	pop hl
@@ -156,9 +156,9 @@ Edit [engine/items/mart.asm](../blob/master/engine/items/mart.asm):
 +	ld a, e
 +	ld [wBuffer2], a
 +	ld a, 1
-+	ld [wItemQuantityChangeBuffer], a
++	ld [wItemQuantityChange], a
 +	ld a, 99
-+	ld [wItemQuantityBuffer], a
++	ld [wItemQuantity], a
 +	farcall BuySell_MultiplyPrice
 +	push hl
 +	ld hl, hMoneyTemp
diff --git a/Puddles-that-splash-when-you-walk.md b/Puddles-that-splash-when-you-walk.md
index 2d81226..6f0e4d9 100644
--- a/Puddles-that-splash-when-you-walk.md
+++ b/Puddles-that-splash-when-you-walk.md
@@ -452,7 +452,7 @@ Edit [engine/overworld/movement.asm](../blob/master/engine/overworld/movement.as
 
  .skip_grass
  	ld hl, wCenteredObject
- 	ldh a, [hMapObjectIndexBuffer]
+ 	ldh a, [hMapObjectIndex]
  	cp [hl]
  	jr z, .player
 
diff --git a/Show-an-icon-for-the-current-weather.md b/Show-an-icon-for-the-current-weather.md
index 3522dcf..272c2c9 100644
--- a/Show-an-icon-for-the-current-weather.md
+++ b/Show-an-icon-for-the-current-weather.md
@@ -19,7 +19,7 @@ Edit [engine/battle/core.asm](../blob/master/engine/battle/core.asm)
  .battle_player_moves
 	call MoveInfoBox
 +	call GetWeatherImage
-	ld a, [wMoveSwapBuffer]
+	ld a, [wSwappedMove]
  ...
  .place_textbox_start_over
 +	push hl
diff --git a/Show-move-names-when-you-receive-a-TM-or-HM.md b/Show-move-names-when-you-receive-a-TM-or-HM.md
index 268e42c..4b2a3c8 100644
--- a/Show-move-names-when-you-receive-a-TM-or-HM.md
+++ b/Show-move-names-when-you-receive-a-TM-or-HM.md
@@ -15,7 +15,7 @@ Edit [engine/overworld/scripting.asm](../blob/master/engine/overworld/scripting.
 ```diff
 +AppendTMHMMoveName::
 +; a = item ID
-+	ld a, [wNamedObjectIndexBuffer]
++	ld a, [wNamedObjectIndex]
 +	cp TM01
 +	ret c
 +; save item name buffer
@@ -29,7 +29,7 @@ Edit [engine/overworld/scripting.asm](../blob/master/engine/overworld/scripting.
 +	predef GetTMHMMove
 +	ld a, [wTempTMHM]
 +; wStringBuffer1 = move name
-+	ld [wNamedObjectIndexBuffer], a
++	ld [wNamedObjectIndex], a
 +	call GetMoveName
 +; hl = item name buffer
 +	pop hl
@@ -40,7 +40,7 @@ Edit [engine/overworld/scripting.asm](../blob/master/engine/overworld/scripting.
 +	jp CopyName2
 ```
 
-This routine assumes that you've loaded the item ID in `[wNamedObjectIndexBuffer]`, and the *end* of the item name buffer in `de`. Then it converts the item ID to the corresponding TM/HM number, then converts that to the corresponding move ID, gets the name of the move, and appends that to the item name buffer (which is why we started with the end of the buffer).
+This routine assumes that you've loaded the item ID in `[wNamedObjectIndex]`, and the *end* of the item name buffer in `de`. Then it converts the item ID to the corresponding TM/HM number, then converts that to the corresponding move ID, gets the name of the move, and appends that to the item name buffer (which is why we started with the end of the buffer).
 
 (The move name is written to `wStringBuffer1`, so you can't also use that for the TM/HM name. You'd end up with issues like TM01 being called "DYNADYNAMICPUNCH".)
 
@@ -80,7 +80,7 @@ Edit [engine/overworld/scripting.asm](../blob/master/engine/overworld/scripting.
  	call GetScriptByte
  	call GetVarAction
  	ld a, [de]
- 	ld [wItemQuantityChangeBuffer], a
+ 	ld [wItemQuantityChange], a
  	ld hl, wNumItems
  	call ReceiveItem
  	ld a, TRUE
@@ -110,7 +110,7 @@ Edit [engine/events/misc_scripts.asm](../blob/master/engine/events/misc_scripts.
  	xor a
  	ld [wScriptVar], a
  	ld a, [wItemBallItemID]
- 	ld [wNamedObjectIndexBuffer], a
+ 	ld [wNamedObjectIndex], a
  	call GetItemName
  	ld hl, wStringBuffer3
  	call CopyName2
@@ -119,7 +119,7 @@ Edit [engine/events/misc_scripts.asm](../blob/master/engine/events/misc_scripts.
  	ld a, [wItemBallItemID]
  	ld [wCurItem], a
  	ld a, [wItemBallQuantity]
- 	ld [wItemQuantityChangeBuffer], a
+ 	ld [wItemQuantityChange], a
  	ld hl, wNumItems
  	call ReceiveItem
  	ret nc
diff --git a/Sideways-stairs-with-diagonal-movement.md b/Sideways-stairs-with-diagonal-movement.md
index 9e2502c..f7960f8 100644
--- a/Sideways-stairs-with-diagonal-movement.md
+++ b/Sideways-stairs-with-diagonal-movement.md
@@ -248,7 +248,7 @@ Then edit [engine/overworld/movement.asm](../blob/master/engine/overworld/moveme
 +	ld [hl], OBJECT_ACTION_STEP
 +
 +	ld hl, wCenteredObject
-+	ldh a, [hMapObjectIndexBuffer]
++	ldh a, [hMapObjectIndex]
 +	cp [hl]
 +	jr z, .player
 +