Keep tutorials in sync with pokecrystal

11 files changed, 32 insertions, 32 deletions

diff --git a/Add-a-new-Mart.md b/Add-a-new-Mart.md
index 5b3a7d5..b9492b8 100644
--- a/Add-a-new-Mart.md
+++ b/Add-a-new-Mart.md
@@ -174,20 +174,20 @@ Edit [engine/items/mart.asm](../blob/master/engine/items/mart.asm):
  	call FarReadMart
  	call LoadStandardMenuHeader
  	ld hl, Text_Pharmacist_Intro
- 	call MartTextBox
+ 	call MartTextbox
  	call BuyMenu
  	ld hl, Text_Pharmacist_ComeAgain
- 	call MartTextBox
+ 	call MartTextbox
  	ret
 +
 +ShadyShop:
 +	call FarReadMart
 +	call LoadStandardMenuHeader
 +	ld hl, Text_ShadyShop_Intro
-+	call MartTextBox
++	call MartTextbox
 +	call BuyMenu
 +	ld hl, Text_ShadyShop_ComeAgain
-+	call MartTextBox
++	call MartTextbox
 +	ret
 
  ...
diff --git a/Add-a-new-field-move-effect.md b/Add-a-new-field-move-effect.md
index 7eda60b..57c67cb 100644
--- a/Add-a-new-field-move-effect.md
+++ b/Add-a-new-field-move-effect.md
@@ -153,13 +153,13 @@ Edit [engine/events/overworld.asm](../blob/master/engine/events/overworld.asm):
 +
 +.FailEarthquake_Bike:
 +	ld hl, CantEarthquakeOnBikeText
-+	call MenuTextBoxBackup
++	call MenuTextboxBackup
 +	ld a, $80
 +	ret
 +
 +.FailEarthquake_Surf:
 +	ld hl, CantEarthquakeOnWaterText
-+	call MenuTextBoxBackup
++	call MenuTextboxBackup
 +	ld a, $80
 +	ret
 +
diff --git a/Automatic-battle-weather-on-certain-maps.md b/Automatic-battle-weather-on-certain-maps.md
index 7422a38..378a3b9 100644
--- a/Automatic-battle-weather-on-certain-maps.md
+++ b/Automatic-battle-weather-on-certain-maps.md
@@ -96,8 +96,8 @@ Edit [engine/battle/core.asm](../blob/master/engine/battle/core.asm):
 +	push hl
 +	call Call_PlayBattleAnim ; uses de
 +	pop hl
-+	call StdBattleTextBox ; uses hl
-+	jp EmptyBattleTextBox
++	call StdBattleTextbox ; uses hl
++	jp EmptyBattleTextbox
 +
 +GetAutomaticBattleWeather:
 +	ld hl, AutomaticWeatherMaps
@@ -133,7 +133,7 @@ Here we define two routines, `StartAutomaticBattleWeather` and `GetAutomaticBatt
 1. Set `[wBattleWeather]` to the right weather ID
 2. Set `[wWeatherCount]` to 255 turns (the maximum possible in one byte)
 3. Call `Call_PlayBattleAnim` to play the right animation, stored in `de`
-4. Call `StdBattleTextBox` to show the right starting text, stored in `hl`
+4. Call `StdBattleTextbox` to show the right starting text, stored in `hl`
 5. Clear the text it just printed so the player's turn can start
 
 These steps are adapted from the individual weather move effects in [engine/battle/move_effects/sunny_day.asm](../blob/master/engine/battle/move_effects/sunny_day.asm), [rain_dance.asm](../blob/master/engine/battle/move_effects/rain_dance.asm), and [sandstorm.asm](../blob/master/engine/battle/move_effects/sandstorm.asm). The relevant data values are read from `AutomaticWeatherEffects`.
diff --git a/Automatically-reuse-Repel.md b/Automatically-reuse-Repel.md
index 64f27aa..c96f188 100644
--- a/Automatically-reuse-Repel.md
+++ b/Automatically-reuse-Repel.md
@@ -116,7 +116,7 @@ Edit [engine/events/misc_scripts_2.asm](../blob/master/engine/events/misc_script
 
  .text
  	; REPEL's effect wore off.
- 	text_far UnknownText_0x1bd308
+ 	text_far _RepelWoreOffText
  	text_end
 
 +UseAnotherRepelScript::
@@ -130,11 +130,11 @@ Edit [engine/events/misc_scripts_2.asm](../blob/master/engine/events/misc_script
 +	end
 +
 +.text:
-+	text_far UseAnotherRepelText
++	text_far _UseAnotherRepelText
 +	text_end
 ```
 
-Again, we have not yet defined `UseAnotherRepelText`, so let's finish up with that.
+Again, we have not yet defined `_UseAnotherRepelText`, so let's finish up with that.
 
 
 ## 5. Define the "Use another?" message
@@ -142,12 +142,12 @@ Again, we have not yet defined `UseAnotherRepelText`, so let's finish up with th
 Edit [data/text/common_1.asm](../blob/master/data/text/common_1.asm):
 
 ```diff
- UnknownText_0x1bd308::
+ _RepelWoreOffText::
  	text "REPEL's effect"
  	line "wore off."
  	done
 
-+UseAnotherRepelText::
++_UseAnotherRepelText::
 +	text "REPEL's effect"
 +	line "wore off."
 +
diff --git a/Correct-grammar-for-plural-trainers-like-Twins.md b/Correct-grammar-for-plural-trainers-like-Twins.md
index 73e4687..dd37d2b 100644
--- a/Correct-grammar-for-plural-trainers-like-Twins.md
+++ b/Correct-grammar-for-plural-trainers-like-Twins.md
@@ -150,7 +150,7 @@ Edit [engine/battle/core.asm](../blob/master/engine/battle/core.asm) again:
 +	jr z, .got_defeat_phrase
  	ld hl, BattleText_EnemyWasDefeated
 +.got_defeat_phrase:
- 	call StdBattleTextBox
+ 	call StdBattleTextbox
 ```
 
 
@@ -168,7 +168,7 @@ Edit [engine/battle/core.asm](../blob/master/engine/battle/core.asm) again:
 +	jr z, .got_switch_phrase
 	ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangeMon
 +.got_switch_phrase:
- 	call StdBattleTextBox
+ 	call StdBattleTextbox
  	...
 ```
 
diff --git a/Expand-tilesets-from-192-to-255-tiles.md b/Expand-tilesets-from-192-to-255-tiles.md
index 8249b05..c7b2769 100644
--- a/Expand-tilesets-from-192-to-255-tiles.md
+++ b/Expand-tilesets-from-192-to-255-tiles.md
@@ -456,7 +456,7 @@ Edit [engine/gfx/load_font.asm](../blob/master/engine/gfx/load_font.asm) again:
 
 ```diff
  LoadFrame:
- 	ld a, [wTextBoxFrame]
+ 	ld a, [wTextboxFrame]
  	maskbits NUM_FRAMES
  	ld bc, 6 * LEN_1BPP_TILE
  	ld hl, Frames
@@ -468,8 +468,8 @@ Edit [engine/gfx/load_font.asm](../blob/master/engine/gfx/load_font.asm) again:
  	lb bc, BANK(Frames), 6 ; "┌" to "┘"
  	call Get1bpp_2
  	ld hl, vTiles2 tile " " ; $7f
- 	ld de, TextBoxSpaceGFX
- 	lb bc, BANK(TextBoxSpaceGFX), 1
+ 	ld de, TextboxSpaceGFX
+ 	lb bc, BANK(TextboxSpaceGFX), 1
  	call Get1bpp_2
  	ret
 ```
@@ -478,7 +478,7 @@ Edit [mobile/mobile_41.asm](../blob/master/mobile/mobile_41.asm) again:
 
 ```diff
  Function10649b:
- 	ld a, [wTextBoxFrame]
+ 	ld a, [wTextboxFrame]
  	maskbits NUM_FRAMES
  	ld bc, 6 * LEN_1BPP_TILE
  	ld hl, Frames
@@ -491,9 +491,9 @@ Edit [mobile/mobile_41.asm](../blob/master/mobile/mobile_41.asm) again:
  	ld b, BANK(Frames)
  	call Function1064c3
  	ld hl, vTiles2 tile " " ; $7f
- 	ld de, TextBoxSpaceGFX
+ 	ld de, TextboxSpaceGFX
  	ld c, 1
- 	ld b, BANK(TextBoxSpaceGFX)
+ 	ld b, BANK(TextboxSpaceGFX)
  	call Function1064c3
  	ret
 ```
@@ -592,7 +592,7 @@ Edit [engine/pokegear/pokegear.asm](../blob/master/engine/pokegear/pokegear.asm)
  	push de
  	hlcoord 0, 12
  	lb bc, 4, 18
- 	call TextBox
+ 	call Textbox
  	hlcoord 1, 14
 -	ld [hl], $72
 +	ld [hl], "“"
diff --git a/Print-text-when-you-lose-a-trainer-battle.md b/Print-text-when-you-lose-a-trainer-battle.md
index 263dae9..006c5cd 100644
--- a/Print-text-when-you-lose-a-trainer-battle.md
+++ b/Print-text-when-you-lose-a-trainer-battle.md
@@ -70,7 +70,7 @@ Anyway, it's quite simple to enable this feature. Edit [engine/battle/core.asm](
  	ld c, 40
  	call DelayFrames
  
- 	call EmptyBattleTextBox
+ 	call EmptyBattleTextbox
  	ld c, BATTLETOWERTEXT_WIN_TEXT
  	farcall BattleTowerText
  	call WaitPressAorB_BlinkCursor
diff --git a/Remove-Pokémon-sprite-animations.md b/Remove-Pokémon-sprite-animations.md
index 1077f4d..039be3d 100644
--- a/Remove-Pokémon-sprite-animations.md
+++ b/Remove-Pokémon-sprite-animations.md
@@ -465,7 +465,7 @@ Edit [engine/pokemon/stats_screen.asm](../blob/master/engine/pokemon/stats_scree
  	ld a, [wCurPartySpecies]
  	call IsAPokemon
  	ret c
- 	call StatsScreen_LoadTextBoxSpaceGFX
+ 	call StatsScreen_LoadTextboxSpaceGFX
  	ld de, vTiles2 tile $00
  	predef GetAnimatedFrontpic
 -	hlcoord 0, 0
diff --git a/Rock-Climb.md b/Rock-Climb.md
index 5a77950..f90b46b 100644
--- a/Rock-Climb.md
+++ b/Rock-Climb.md
@@ -319,7 +319,7 @@ Edit [engine/overworld/events.asm](../blob/master/engine/overworld/events.asm):
  	...
 
  .headbutt
- 	ld a, [wEngineBuffer1]
+ 	ld a, [wFacingTileID]
  	call CheckHeadbuttTreeTile
 -	jr nz, .surf
 +	jr nz, .rock_climb
@@ -328,7 +328,7 @@ Edit [engine/overworld/events.asm](../blob/master/engine/overworld/events.asm):
 	jr .noevent
 +
 +.rock_climb
-+	ld a, [wEngineBuffer1]
++	ld a, [wFacingTileID]
 +	call CheckRockyWallTile
 +	jr nz, .surf
 +	farcall TryRockClimbOW
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 638276d..7e26d04 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
@@ -109,16 +109,16 @@ Edit [engine/events/misc_scripts.asm](../blob/master/engine/events/misc_scripts.
  .TryReceiveItem:
  	xor a
  	ld [wScriptVar], a
- 	ld a, [wEngineBuffer1]
+ 	ld a, [wItemBallItemID]
  	ld [wNamedObjectIndexBuffer], a
  	call GetItemName
  	ld hl, wStringBuffer3
  	call CopyName2
 +	ld de, wStringBuffer3 + STRLEN("TM##")
 +	farcall AppendTMHMMoveName
- 	ld a, [wEngineBuffer1]
+ 	ld a, [wItemBallItemID]
  	ld [wCurItem], a
- 	ld a, [wCurFruit]
+ 	ld a, [wItemBallQuantity]
  	ld [wItemQuantityChangeBuffer], a
  	ld hl, wNumItems
  	call ReceiveItem
@@ -133,7 +133,7 @@ Edit [engine/events/misc_scripts_2.asm](../blob/master/engine/events/misc_script
 ```diff
  HiddenItemScript::
  	opentext
- 	readmem wEngineBuffer3
+ 	readmem wHiddenItemID
  	getitemname STRING_BUFFER_3, USE_SCRIPT_VAR
 +	callasm .append_tmhm_move_name
  	writetext .found_text
diff --git a/Survive-poisoning-with-1-HP.md b/Survive-poisoning-with-1-HP.md
index 87c03fa..7df677b 100644
--- a/Survive-poisoning-with-1-HP.md
+++ b/Survive-poisoning-with-1-HP.md
@@ -71,7 +71,7 @@ Edit [engine/events/poisonstep.asm](../blob/master/engine/events/poisonstep.asm)
 +.CheckRecovered:
  	xor a
  	ld [wCurPartyMon], a
- 	ld de, wEngineBuffer2
+ 	ld de, wPoisonStepPartyFlags
  .party_loop
  	push de
  	ld a, [de]