Merge branch 'master' of https://github.com/pret/pokecrystal.wiki

4 files changed, 37 insertions, 7 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 7590af1..90d14b8 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
@@ -1324,3 +1324,7 @@ Anyway, we're done now. Just like [step 1](#1-refactor-trainer-types-to-use-bit-
 ## 6. Add a trainer type flag for variable parties
 
 [TODO](https://hax.iimarckus.org/topic/7137/)
+
+## 7. Change the Stat Exp code to EVs for those who've done [this](https://github.com/pret/pokecrystal/wiki/Replace-stat-experience-with-EVs) tutorial.
+
+TODO
diff --git a/Correct-grammar-for-plural-trainers-like-Twins.md b/Correct-grammar-for-plural-trainers-like-Twins.md
index ace43a8..73e4687 100644
--- a/Correct-grammar-for-plural-trainers-like-Twins.md
+++ b/Correct-grammar-for-plural-trainers-like-Twins.md
@@ -124,12 +124,16 @@ Edit [engine/battle/core.asm](../blob/master/engine/battle/core.asm) again:
 ```diff
  BattleStartMessage:
  	...
+	farcall Battle_GetTrainerName
 
 +	ld hl, WantToBattlePluralText
 +	call IsPluralTrainer
 +	jr z, .PlaceBattleStartText
  	ld hl, WantsToBattleText
  	jr .PlaceBattleStartText
+
+ .wild
+ 	...
 ```
 
 
@@ -140,6 +144,7 @@ Edit [engine/battle/core.asm](../blob/master/engine/battle/core.asm) again:
 ```diff
  WinTrainerBattle:
  	...
+ 	callfar Battle_GetTrainerName
 +	ld hl, BattleText_PluralEnemyWereDefeated
 +	call IsPluralTrainer
 +	jr z, .got_defeat_phrase
@@ -155,7 +160,9 @@ Edit [engine/battle/core.asm](../blob/master/engine/battle/core.asm) again:
 
 ```diff
  OfferSwitch:
- 	...
+ 	ld a, [wCurPartyMon]
+ 	push af
+ 	callfar Battle_GetTrainerName
 +	ld hl, BattleText_PluralEnemyAreAboutToUseWillPlayerChangeMon
 +	call IsPluralTrainer
 +	jr z, .got_switch_phrase
diff --git a/Don't-gain-experience-at-level-100.md b/Don't-gain-experience-at-level-100.md
index 8665313..3ec8639 100644
--- a/Don't-gain-experience-at-level-100.md
+++ b/Don't-gain-experience-at-level-100.md
@@ -30,17 +30,17 @@ Anyway, just edit one file, [engine/battle/core.asm](../blob/master/engine/battl
  
  	...
 
- .skip
+ .stat_exp_awarded
  	inc de
  	inc de
  	dec c
- 	jr nz, .loop1
+ 	jr nz, .stat_exp_loop
 +	pop bc
 +	ld hl, MON_LEVEL
 +	add hl, bc
 +	ld a, [hl]
 +	cp MAX_LEVEL
-+	jp nc, .skip_stats
++	jp nc, .next_mon
 +	push bc
  	xor a
  	ldh [hMultiplicand + 0], a
@@ -57,7 +57,7 @@ Anyway, just edit one file, [engine/battle/core.asm](../blob/master/engine/battl
 
  	...
 
- .skip_stats
+ .next_mon
  	ld a, [wPartyCount]
  	ld b, a
  	ld a, [wCurPartyMon]
diff --git a/Infinitely-reusable-TMs.md b/Infinitely-reusable-TMs.md
index de81acc..91ea008 100644
--- a/Infinitely-reusable-TMs.md
+++ b/Infinitely-reusable-TMs.md
@@ -297,7 +297,7 @@ Pretty self-explanatory.
 
 If TMs are untossable and infinite-use, it's wasteful to have multiple ways of getting the same TM.
 
-Ten TMs can be acquired more than once in Pokémon Crystal:
+Eleven TMs can be acquired more than once in Pokémon Crystal:
 
 - TM02 Headbutt: Ilex Forest (gift); Goldenrod Dept. Store (¥2000 after receiving the gift)
 - TM08 Rock Smash: Route 36 (gift); Goldenrod Dept. Store (¥2000 after receiving the gift)
@@ -307,10 +307,29 @@ Ten TMs can be acquired more than once in Pokémon Crystal:
 - TM18 Rain Dance: Slowpoke Well (item ball); Celadon Dept. Store (¥2000)
 - TM21 Frustration: Goldenrod Dept. Store (weekly gift)
 - TM27 Return: Goldenrod Dept. Store (weekly gift)
+- TM29 Psychic: Mr Psychic (gift); Celadon Game Corner Prize (3500 coins)
 - TM37 Sandstorm: Route 27 (gift); Celadon Dept. Store (¥2000)
 - TM47 Steel Wing: Route 28 (gift); Rock Tunnel (item ball)
 
-First, edit [maps/DarkCaveBlackthornEntrance.asm](../blob/master/maps/DarkCaveBlackthornEntrance.asm):
+First, edit [maps/MrPsychicsHouse.asm](..blobs/master/maps/MrPsychicsHouse.asm):
+
+```diff
+MrPsychic:
+	faceplayer
+	opentext
+-	checkevent EVENT_GOT_TM29_PSYCHIC
++	checkitem TM_PSYCHIC_M
+	iftrue .AlreadyGotItem
+	writetext MrPsychicText1
+	buttonsound
+	verbosegiveitem TM_PSYCHIC_M
+	iffalse .Done
+-	setevent EVENT_GOT_TM29_PSYCHIC
+```
+
+This change just makes the check an item check instead of event check so that if TM29 has been purchased from the Celadon Game Corner Mr. Psychic doesn't give the player another one.
+
+Now edit [maps/DarkCaveBlackthornEntrance.asm](../blob/master/maps/DarkCaveBlackthornEntrance.asm):
 
 ```diff
  DarkCaveBlackthornEntranceTMSnore: