text_asm, text_ram, text_decimal

5 files changed, 13 insertions, 57 deletions

diff --git a/Add-a-new-Mart.md b/Add-a-new-Mart.md
index 4df0b12..5b3a7d5 100644
--- a/Add-a-new-Mart.md
+++ b/Add-a-new-Mart.md
@@ -278,7 +278,7 @@ And edit [data/text/common_3.asm](../blob/master/data/text/common_3.asm):
 +ShadyShop_CostsThisMuchText::
 +	text "That'll cost ya"
 +	line "¥@"
-+	deciram hMoneyTemp, 3, 6
++	text_decimal hMoneyTemp, 3, 6
 +	text ". 'Kay?"
 +	done
 +
diff --git a/Add-a-new-field-move-effect.md b/Add-a-new-field-move-effect.md
index 4a7a50d..7eda60b 100644
--- a/Add-a-new-field-move-effect.md
+++ b/Add-a-new-field-move-effect.md
@@ -176,7 +176,7 @@ Edit [engine/events/overworld.asm](../blob/master/engine/events/overworld.asm):
 +	jumptext TheGroundShookText
 +
 +UsedEarthquakeText:
-+	text_from_ram wStringBuffer3
++	text_ram wStringBuffer3
 +	text " used"
 +	line "EARTHQUAKE!"
 +	done
diff --git a/Correct-grammar-for-plural-trainers-like-Twins.md b/Correct-grammar-for-plural-trainers-like-Twins.md
index 884ca7c..ace43a8 100644
--- a/Correct-grammar-for-plural-trainers-like-Twins.md
+++ b/Correct-grammar-for-plural-trainers-like-Twins.md
@@ -47,7 +47,7 @@ Edit [data/text/battle.asm](../blob/master/data/text/battle.asm):
  	text "<ENEMY>"
  	line "is about to use"
  	cont "@"
- 	text_from_ram wEnemyMonNick
+ 	text_ram wEnemyMonNick
  	text "."
 
  	para "Will <PLAYER>"
@@ -58,7 +58,7 @@ Edit [data/text/battle.asm](../blob/master/data/text/battle.asm):
 +	text "<ENEMY>"
 +	line "are about to use"
 +	cont "@"
-+	text_from_ram wEnemyMonNick
++	text_ram wEnemyMonNick
 +	text "."
 +
 +	para "Will <PLAYER>"
diff --git a/Remove-the-redundant-move-grammar-table.md b/Remove-the-redundant-move-grammar-table.md
index 8fe0956..9b5ac0b 100644
--- a/Remove-the-redundant-move-grammar-table.md
+++ b/Remove-the-redundant-move-grammar-table.md
@@ -47,7 +47,7 @@ _UsedInsteadText::
 	text_end
 
 _MoveNameText::
-	text_from_ram wStringBuffer2
+	text_ram wStringBuffer2
 -	text_end
 -
 -	text_end ; unused
@@ -82,7 +82,7 @@ Edit [engine/battle/used_move_text.asm](../blob/master/engine/battle/used_move_t
  UsedMoveText:
  ; this is a stream of text and asm from 105db9 to 105ef6
  	text_far _ActorNameText
- 	start_asm
+ 	text_asm
  	ldh a, [hBattleTurn]
  	and a
  	jr nz, .start
@@ -140,14 +140,14 @@ Edit [engine/battle/used_move_text.asm](../blob/master/engine/battle/used_move_t
 
 -UsedMove1Text:
 -	text_far _UsedMove1Text
--	start_asm
+-	text_asm
 -	jr UsedMoveText_CheckObedience
 -
 -UsedMove2Text:
 -	text_far _UsedMove2Text
 +UsedMoveInsteadText:
 +	text_far _UsedMoveText
-	start_asm
+	text_asm
 -UsedMoveText_CheckObedience:
  ; check obedience
  	ld a, [wAlreadyDisobeyed]
@@ -159,63 +159,19 @@ Edit [engine/battle/used_move_text.asm](../blob/master/engine/battle/used_move_t
  
  .UsedInsteadText:
  	text_far _UsedInsteadText
- 	start_asm
+ 	text_asm
  .GetMoveNameText:
  	ld hl, MoveNameText
  	ret
  
  MoveNameText:
  	text_far _MoveNameText
--	start_asm
++	text_end
+-	text_asm
 -; get start address
 -	ld hl, .endusedmovetexts
 -
--; get move id
--	ld a, [wMoveGrammar]
--
--; 2-byte pointer
--	add a
--
--; seek
--	push bc
--	ld b, $0
--	ld c, a
--	add hl, bc
--	pop bc
--
--; get pointer to usedmovetext ender
--	ld a, [hli]
--	ld h, [hl]
--	ld l, a
--	ret
--
--.endusedmovetexts
--; entries correspond to MoveGrammar sets
--	dw EndUsedMove1Text
--	dw EndUsedMove2Text
--	dw EndUsedMove3Text
--	dw EndUsedMove4Text
--	dw EndUsedMove5Text
--
--EndUsedMove1Text:
--	text_far _EndUsedMove1Text
--	text_end
--
--EndUsedMove2Text:
--	text_far _EndUsedMove2Text
--	text_end
--
--EndUsedMove3Text:
--	text_far _EndUsedMove3Text
--	text_end
--
--EndUsedMove4Text:
--	text_far _EndUsedMove4Text
--	text_end
--
--EndUsedMove5Text:
--	text_far _EndUsedMove5Text
-	text_end
+-	...
 -
 -GetMoveGrammar:
 -	...
diff --git a/Rock-Climb.md b/Rock-Climb.md
index 079eac9..8ebfe6b 100644
--- a/Rock-Climb.md
+++ b/Rock-Climb.md
@@ -123,7 +123,7 @@ Edit [data/text/common_2.asm](../blob/master/data/text/common_2.asm):
 +	done
 +
 +_UsedRockClimbText::
-+	text_from_ram wStringBuffer2
++	text_ram wStringBuffer2
 +	text " used"
 +	line "ROCK CLIMB!"
 +	prompt