Resolve issue #575: Rename text commands

home/map.asm

@@ -1108,21 +1108,21 @@ ObjectEvent::
 
 ObjectEventText::
 	text_far _ObjectEventText
-	db "@"
+	text_end
 
 BGEvent::
 	jumptext BGEventText
 
 BGEventText::
 	text_far UnknownText_0x1c46fc
-	db "@"
+	text_end
 
 CoordinatesEvent::
 	jumptext CoordinatesEventText
 
 CoordinatesEventText::
 	text_far UnknownText_0x1c4706
-	db "@"
+	text_end
 
 CheckObjectMask::
 	ldh a, [hMapObjectIndexBuffer]

home/text.asm

@@ -135,7 +135,9 @@ TestText::
 RadioTerminator::
 	ld hl, .stop
 	ret
-.stop	db "@"
+
+.stop:
+	text_end
 
 PrintText::
 	call SetUpTextBox
@@ -557,7 +559,8 @@ DoneText::
 	dec de
 	ret
 
-.stop: db "@"
+.stop:
+	text_end
 
 NullChar::
 	ld a, "?"
@@ -641,7 +644,8 @@ PokeFluteTerminatorCharacter::
 	ld hl, .stop
 	ret
 
-.stop: db "@"
+.stop:
+	text_end
 
 PlaceHLTextAtBC::
 	ld a, [wTextBoxFlags]
@@ -657,7 +661,7 @@ PlaceHLTextAtBC::
 
 DoTextUntilTerminator::
 	ld a, [hli]
-	cp "@"
+	cp TX_END
 	ret z
 	call .TextCommand
 	jr DoTextUntilTerminator
@@ -692,7 +696,7 @@ TextCommands::
 	dw TextCommand_SCROLL           ; TX_SCROLL
 	dw TextCommand_START_ASM        ; TX_START_ASM
 	dw TextCommand_NUM              ; TX_NUM
-	dw TextCommand_EXIT             ; TX_EXIT
+	dw TextCommand_PAUSE            ; TX_PAUSE
 	dw TextCommand_SOUND            ; TX_SOUND_DEX_FANFARE_50_79
 	dw TextCommand_DOTS             ; TX_DOTS
 	dw TextCommand_LINK_WAIT_BUTTON ; TX_LINK_WAIT_BUTTON
@@ -722,7 +726,7 @@ TextCommand_START::
 	ret
 
 TextCommand_RAM::
-; text_from_ram
+; text_ram
 ; write text from a ram address
 ; little endian
 ; [$01][addr]
@@ -864,19 +868,19 @@ TextCommand_SCROLL::
 	ret
 
 TextCommand_START_ASM::
-; start_asm
+; text_asm
 
 	bit 7, h
 	jr nz, .not_rom
 	jp hl
 
 .not_rom
-	ld a, "@"
+	ld a, TX_END
 	ld [hl], a
 	ret
 
 TextCommand_NUM::
-; deciram
+; text_decimal
 ; [$09][addr][hi:bytes lo:digits]
 	ld a, [hli]
 	ld e, a
@@ -900,8 +904,8 @@ TextCommand_NUM::
 	pop hl
 	ret
 
-TextCommand_EXIT::
-; interpret_data
+TextCommand_PAUSE::
+; text_pause
 	push hl
 	push bc
 	call GetJoypad
@@ -951,7 +955,7 @@ TextCommand_SOUND::
 	ret
 
 Unreferenced_Function1522::
-; play_cry
+; sound_cry
 	push de
 	ld e, [hl]
 	inc hl
@@ -973,7 +977,7 @@ TextSFX::
 	db -1
 
 TextCommand_DOTS::
-; limited_interpret_data
+; text_dots
 ; [$0C][num]
 	ld a, [hli]
 	ld d, a
@@ -1002,7 +1006,7 @@ TextCommand_DOTS::
 	ret
 
 TextCommand_LINK_WAIT_BUTTON::
-; link_wait_button
+; text_linkwaitbutton
 ; wait for key down
 ; display arrow
 	push hl
@@ -1042,7 +1046,7 @@ TextCommand_STRINGBUFFER::
 	ret
 
 TextCommand_DAY::
-; current_day
+; text_today
 
 	call GetWeekday
 	push hl