Sync with pokecrystal

9 files changed, 26 insertions, 26 deletions

diff --git a/Add-a-new-Pack-pocket.md b/Add-a-new-Pack-pocket.md
index f57b1d5..6041928 100644
--- a/Add-a-new-Pack-pocket.md
+++ b/Add-a-new-Pack-pocket.md
@@ -190,7 +190,7 @@ Edit [engine/menus/intro_menu.asm](../blob/master/engine/menus/intro_menu.asm):
 +	ld hl, wNumBerries
 +	call .InitList
 
- 	ld hl, wPCItems
+ 	ld hl, wNumPCItems
  	call .InitList
 ```
 
@@ -355,10 +355,10 @@ And edit `GetPocketCapacity`:
  .not_bag
  	ld c, MAX_PC_ITEMS
  	ld a, e
- 	cp LOW(wPCItems)
+ 	cp LOW(wNumPCItems)
  	jr nz, .not_pc
  	ld a, d
- 	cp HIGH(wPCItems)
+ 	cp HIGH(wNumPCItems)
  	ret z
 
  .not_pc
diff --git a/Add-a-new-Unown-form.md b/Add-a-new-Unown-form.md
index 77ab899..b9a4dff 100644
--- a/Add-a-new-Unown-form.md
+++ b/Add-a-new-Unown-form.md
@@ -568,7 +568,7 @@ Finally, edit [maps/RuinsOfAlphInnerChamber.asm](../blob/master/maps/RuinsOfAlph
  RuinsOfAlphInnerChamberStatue:
 +	checkflag ENGINE_UNLOCKED_UNOWNS_EXCLAMATION_QUESTION
 +	iftrue .already_unlocked
-+	checkcode VAR_UNOWNCOUNT
++	readvar VAR_UNOWNCOUNT
 +	ifless 26, .dont_unlock
 +	opentext
 +	writetext RuinsOfAlphInnerChamberStatueText
diff --git a/Add-a-new-Unown-puzzle-chamber.md b/Add-a-new-Unown-puzzle-chamber.md
index 531a07e..642de69 100644
--- a/Add-a-new-Unown-puzzle-chamber.md
+++ b/Add-a-new-Unown-puzzle-chamber.md
@@ -19,7 +19,7 @@ Create **gfx/unown_puzzle/relicanth.png**:
 Then edit [constants/script_constants.asm](../blob/master/constants/script_constants.asm):
 
 ```diff
- ; UnownPuzzle writebyte arguments
+ ; UnownPuzzle setval arguments
  ; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/games/unown_puzzle.asm)
  	const_def
  	const UNOWNPUZZLE_KABUTO     ; 0
@@ -71,7 +71,7 @@ Now you can create a map with a script like this:
 ```
 RuinsOfAlphRelicanthChamberPuzzle:
 	refreshscreen
-	writebyte UNOWNPUZZLE_RELICANTH
+	setval UNOWNPUZZLE_RELICANTH
 	special UnownPuzzle
 	closetext
 	iftrue .PuzzleComplete
@@ -91,7 +91,7 @@ And it will work the way you expect.
 Edit [constants/script_constants.asm](../blob/master/constants/script_constants.asm) again:
 
 ```diff
- ; DisplayUnownWords writebyte arguments
+ ; DisplayUnownWords setval arguments
  ; UnownWalls and MenuHeaders_UnownWalls indexes (see data/events/unown_walls.asm)
  	const_def
  	const UNOWNWORDS_ESCAPE ; 0
@@ -146,7 +146,7 @@ Now you can create a map with a script like this:
 RuinsOfAlphRelicanthChamberWallPatternLeft:
 	opentext
 	writetext RuinsOfAlphRelicanthChamberWallPatternLeftText
-	writebyte UNOWNWORDS_WHIRL
+	setval UNOWNWORDS_WHIRL
 	special DisplayUnownWords
 	closetext
 	end
diff --git a/Infinitely-reusable-TMs.md b/Infinitely-reusable-TMs.md
index b53a8d5..a288f08 100644
--- a/Infinitely-reusable-TMs.md
+++ b/Infinitely-reusable-TMs.md
@@ -227,12 +227,12 @@ Edit [maps/GoldenrodGameCorner.asm](../blob/master/maps/GoldenrodGameCorner.asm)
  	playsound SFX_TRANSACTION
  	writetext GoldenrodGameCornerPrizeVendorHereYouGoText
  	waitbutton
- 	jump GoldenrodGameCornerTMVendor_LoopScript
+ 	sjump GoldenrodGameCornerTMVendor_LoopScript
 +
 +GoldenrodGameCornerPrizeVendor_AlreadyHaveTMScript:
 +	writetext GoldenrodGameCornerPrizeVendorAlreadyHaveTMText
 +	waitbutton
-+	jump GoldenrodGameCornerTMVendor_LoopScript
++	sjump GoldenrodGameCornerTMVendor_LoopScript
 
  ...
 
@@ -271,12 +271,12 @@ And edit [maps/CeladonGameCornerPrizeRoom.asm](../blob/master/maps/CeladonGameCo
  	playsound SFX_TRANSACTION
  	writetext CeladonPrizeRoom_HereYouGoText
  	waitbutton
- 	jump CeladonPrizeRoom_tmcounterloop
+ 	sjump CeladonPrizeRoom_tmcounterloop
 +
 +CeladonPrizeRoom_alreadyhavetm:
 +	writetext CeladonPrizeRoom_AlreadyHaveTMText
 +	waitbutton
-+	jump CeladonPrizeRoom_tmcounterloop
++	sjump CeladonPrizeRoom_tmcounterloop
 
  ...
 
@@ -358,12 +358,12 @@ Now edit [maps/GoldenrodDeptStore5F.asm](../blob/master/maps/GoldenrodDeptStore5
 -	iftrue .headbutt
 -	checkevent EVENT_GOT_TM08_ROCK_SMASH
 -	iftrue .onlyrocksmash
--	jump .neither
+-	sjump .neither
 -
 -.headbutt
 -	checkevent EVENT_GOT_TM08_ROCK_SMASH
 -	iftrue .both
--	jump .onlyheadbutt
+-	sjump .onlyheadbutt
 -
 -.neither
 -	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_1
diff --git a/Lose-money-proportional-to-badges-and-level.md b/Lose-money-proportional-to-badges-and-level.md
index 770df22..7a74931 100644
--- a/Lose-money-proportional-to-badges-and-level.md
+++ b/Lose-money-proportional-to-badges-and-level.md
@@ -105,10 +105,10 @@ Edit [engine/events/whiteout.asm](../blob/master/engine/events/whiteout.asm):
 +	callasm CheckWildBattlePanic
 +	iffalse .wild_whiteout_text
 +	writetext .WhitedOutToTrainerText
-+	jump .text_done
++	sjump .text_done
 +.wild_whiteout_text
 +	writetext .WhitedOutToWildMonText
-+	jump .text_done
++	sjump .text_done
 +.plain_whiteout_text
  	writetext .WhitedOutText
 +.text_done
diff --git a/Rock-Climb.md b/Rock-Climb.md
index 8ebfe6b..5a77950 100644
--- a/Rock-Climb.md
+++ b/Rock-Climb.md
@@ -247,7 +247,7 @@ Edit [engine/events/overworld.asm](../blob/master/engine/events/overworld.asm):
 +	closetext
 +	waitsfx
 +	playsound SFX_STRENGTH
-+	checkcode VAR_FACING
++	readvar VAR_FACING
 +	if_equal DOWN, .Down
 +.loop_up
 +	applymovement PLAYER, .RockClimbUpStep
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 64bd264..638276d 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
@@ -57,7 +57,7 @@ Edit [engine/overworld/scripting.asm](../blob/master/engine/overworld/scripting.
  	call Script_giveitem
  	call CurItemName
  	ld de, wStringBuffer1
- 	ld a, MEM_BUFFER_1
+ 	ld a, STRING_BUFFER_4
  	call CopyConvertedText
 +	ld de, wStringBuffer4 + STRLEN("TM##")
 +	call AppendTMHMMoveName
@@ -67,7 +67,7 @@ Edit [engine/overworld/scripting.asm](../blob/master/engine/overworld/scripting.
 ```
 
 ```diff
- Script_verbosegiveitem2:
+ Script_verbosegiveitemvar:
  ; script command 0x9f
  ; parameters: item, var
 
@@ -90,7 +90,7 @@ Edit [engine/overworld/scripting.asm](../blob/master/engine/overworld/scripting.
  	ld [wScriptVar], a
  	call CurItemName
  	ld de, wStringBuffer1
- 	ld a, MEM_BUFFER_1
+ 	ld a, STRING_BUFFER_4
  	call CopyConvertedText
 +	ld de, wStringBuffer4 + STRLEN("TM##")
 +	call AppendTMHMMoveName
@@ -133,8 +133,8 @@ Edit [engine/events/misc_scripts_2.asm](../blob/master/engine/events/misc_script
 ```diff
  HiddenItemScript::
  	opentext
- 	copybytetovar wEngineBuffer3
- 	itemtotext USE_SCRIPT_VAR, MEM_BUFFER_0
+ 	readmem wEngineBuffer3
+ 	getitemname STRING_BUFFER_3, USE_SCRIPT_VAR
 +	callasm .append_tmhm_move_name
  	writetext .found_text
  	giveitem ITEM_FROM_MEM
@@ -142,7 +142,7 @@ Edit [engine/events/misc_scripts_2.asm](../blob/master/engine/events/misc_script
  	callasm SetMemEvent
  	specialsound
  	itemnotify
- 	jump .finish
+ 	sjump .finish
 
  .bag_full
  	buttonsound
diff --git a/Survive-poisoning-with-1-HP.md b/Survive-poisoning-with-1-HP.md
index 5b9b74c..87c03fa 100644
--- a/Survive-poisoning-with-1-HP.md
+++ b/Survive-poisoning-with-1-HP.md
@@ -65,7 +65,7 @@ Edit [engine/events/poisonstep.asm](../blob/master/engine/events/poisonstep.asm)
  	end
 -
 -.whiteout
--	farjump Script_OverworldWhiteout
+-	farsjump Script_OverworldWhiteout
 
 -.CheckWhitedOut:
 +.CheckRecovered:
diff --git a/Tips-and-tricks.md b/Tips-and-tricks.md
index 01736ec..fb3ad2e 100644
--- a/Tips-and-tricks.md
+++ b/Tips-and-tricks.md
@@ -110,7 +110,7 @@ In your cutscene script, to show the placeholder and make the player invisible:
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .ShowGirlPlaceholder
 	appear YOURMAP_CHRIS_PLACEHOLDER
-	jump .HidePlayer
+	sjump .HidePlayer
 .ShowGirlPlaceholder
 	appear YOURMAP_KRIS_PLACEHOLDER
 .HidePlayer
@@ -124,7 +124,7 @@ And to make the player visible again and disappear the placeholder:
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .HideGirlPlaceholder
 	disappear YOURMAP_CHRIS_PLACEHOLDER
-	jump .HidPlaceholder
+	sjump .HidPlaceholder
 .HideGirlPlaceholder
 	disappear YOURMAP_KRIS_PLACEHOLDER
 .HidPlaceholder