Replace wd265, from PR #548

4 files changed, 26 insertions, 22 deletions

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 e693d56..bfac78d 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
@@ -384,7 +384,7 @@ LoadEnemyMon:
 	...
 
  	ld a, [wTempEnemyMonSpecies]
- 	ld [wd265], a
+ 	ld [wNamedObjectIndexBuffer], a
 -
 -	call GetPokemonName
 
diff --git a/Evolution-moves.md b/Evolution-moves.md
index 0b845f6..a74de2b 100644
--- a/Evolution-moves.md
+++ b/Evolution-moves.md
@@ -312,12 +312,12 @@ Edit [engine/pokemon/evolve.asm](../blob/master/engine/pokemon/evolve.asm):
  	...
 
  	ld a, [wCurSpecies]
- 	ld [wd265], a
+ 	ld [wTempSpecies], a
  	xor a
  	ld [wMonType], a
 +	call LearnEvolutionMove
  	call LearnLevelMoves
- 	ld a, [wd265]
+ 	ld a, [wTempSpecies]
  	dec a
  	call SetSeenAndCaughtMon
 
@@ -328,7 +328,7 @@ Edit [engine/pokemon/evolve.asm](../blob/master/engine/pokemon/evolve.asm):
  	ret
 +
 +LearnEvolutionMove:
-+	ld a, [wd265]
++	ld a, [wTempSpecies]
 +	ld [wCurPartySpecies], a
 +	dec a
 +	ld c, a
@@ -356,12 +356,12 @@ Edit [engine/pokemon/evolve.asm](../blob/master/engine/pokemon/evolve.asm):
 +
 +	ld a, d
 +	ld [wPutativeTMHMMove], a
-+	ld [wd265], a
++	ld [wNamedObjectIndexBuffer], a
 +	call GetMoveName
 +	call CopyName1
 +	predef LearnMove
 +	ld a, [wCurPartySpecies]
-+	ld [wd265], a
++	ld [wTempSpecies], a
 +
 +.has_move
 +	pop hl
diff --git a/Infinitely-reusable-TMs.md b/Infinitely-reusable-TMs.md
index a89482d..0acf793 100644
--- a/Infinitely-reusable-TMs.md
+++ b/Infinitely-reusable-TMs.md
@@ -34,7 +34,7 @@ Edit [engine/items/tmhm.asm](../blob/master/engine/items/tmhm.asm):
 
 -ConsumeTM:
 -	call ConvertCurItemIntoCurTMHM
--	ld a, [wd265]
+-	ld a, [wTempTMHM]
 -	dec a
 -	ld hl, wTMsHMs
 -	ld b, 0
@@ -84,7 +84,7 @@ Edit [engine/items/tmhm.asm](../blob/master/engine/items/tmhm.asm) again:
 ```diff
  .okay
  	predef GetTMHMMove
- 	ld a, [wd265]
+ 	ld a, [wNamedObjectIndexBuffer]
  	ld [wPutativeTMHMMove], a
  	call GetMoveName
  	pop hl
@@ -106,8 +106,8 @@ Edit [engine/items/tmhm.asm](../blob/master/engine/items/tmhm.asm) again:
 -	pop bc
 -	push bc
 -	ld a, b
--	ld [wd265], a
--	ld de, wd265
+-	ld [wTempTMHM], a
+-	ld de, wTempTMHM
 -	lb bc, 1, 2
 -	call PrintNum
 -.hm2
diff --git a/Remove-the-redundant-move-grammar-table.md b/Remove-the-redundant-move-grammar-table.md
index 7df3440..59b2ffc 100644
--- a/Remove-the-redundant-move-grammar-table.md
+++ b/Remove-the-redundant-move-grammar-table.md
@@ -95,7 +95,8 @@ Edit [engine/battle/used_move_text.asm](../blob/master/engine/battle/used_move_t
  
  	ld a, BATTLE_VARS_MOVE_ANIM
  	call GetBattleVar
- 	ld [wd265], a
+-	ld [wMoveGrammar], a
++	ld [wTempByteValue], a
  
  	push hl
  	farcall CheckUserIsCharging
@@ -104,13 +105,14 @@ Edit [engine/battle/used_move_text.asm](../blob/master/engine/battle/used_move_t
 +	jr nz, .ok
 
  	; update last move
- 	ld a, [wd265]
+-	ld a, [wMoveGrammar]
++	ld a, [wTempByteValue]
  	ld [hl], a
  	ld [de], a
 
 -.grammar
 -	call GetMoveGrammar
--; wd265 now contains MoveGrammar
+-; wMoveGrammar now contains MoveGrammar
 -
 -; everything except 'instead' made redundant in localization
 -
@@ -121,7 +123,7 @@ Edit [engine/battle/used_move_text.asm](../blob/master/engine/battle/used_move_t
 -	ret nz
 -
 -	; check move grammar
--	ld a, [wd265]
+-	ld a, [wMoveGrammar]
 -	cp $3
 -	ld hl, UsedMove2Text
 -	ret c
@@ -163,7 +165,7 @@ Edit [engine/battle/used_move_text.asm](../blob/master/engine/battle/used_move_t
 -	ld hl, .endusedmovetexts
 -
 -; get move id
--	ld a, [wd265]
+-	ld a, [wMoveGrammar]
 -
 -; 2-byte pointer
 -	add a
@@ -206,13 +208,13 @@ Edit [engine/battle/used_move_text.asm](../blob/master/engine/battle/used_move_t
 	db "@"
 -
 -GetMoveGrammar:
--; store move grammar type in wd265
+-; store move grammar type in wMoveGrammar
 -
 -	push bc
--; c = move id
--	ld a, [wd265]
--	ld c, a
--	ld b, $0
+-; wMoveGrammar contains move id
+-	ld a, [wMoveGrammar]
+-	ld c, a ; move id
+-	ld b, 0 ; grammar index
 -
 -; read grammar table
 -	ld hl, MoveGrammar
@@ -232,9 +234,9 @@ Edit [engine/battle/used_move_text.asm](../blob/master/engine/battle/used_move_t
 -	jr .loop
 -
 -.end
--; wd265 now contains move grammar
+-; wMoveGrammar now contains move grammar
 -	ld a, b
--	ld [wd265], a
+-	ld [wMoveGrammar], a
 -
 -; we're done
 -	pop bc
@@ -243,6 +245,8 @@ Edit [engine/battle/used_move_text.asm](../blob/master/engine/battle/used_move_t
 -INCLUDE "data/moves/grammar.asm"
 ```
 
+(If you're using an older version of pokecrystal that has `wd265` instead of `wMoveGrammar`, you don't need to replace `wd265` with `wTempByteValue`, but do need to make the other changes.)
+
 Now moves will still print correctly, but without wasting time and space on using certain grammar.
 
 ![Screenshot](screenshots/used-move-instead.png)