Resolve issue #575: Rename text commands

This commit is contained in:
Rangi
2018-11-17 13:33:03 -05:00
parent c05a2d255b
commit 3202c4f3df
123 changed files with 1869 additions and 1745 deletions

View File

@@ -35,4 +35,4 @@ BugContest_SetCaughtContestMon:
.caughttext
; Caught @ !
text_far UnknownText_0x1c10c0
db "@"
text_end

View File

@@ -35,9 +35,9 @@ BugCatchingContestReturnToGateScript:
BugCatchingContestText_BeeepTimesUp:
; ANNOUNCER: BEEEP! Time's up!
text_far UnknownText_0x1bd2ca
db "@"
text_end
BugCatchingContestText_ContestIsOver:
; ANNOUNCER: The Contest is over!
text_far UnknownText_0x1bd2e7
db "@"
text_end

View File

@@ -89,7 +89,7 @@ DisplayCaughtContestMonStats:
SwitchMonText:
; Switch #MON?
text_far UnknownText_0x1c10cf
db "@"
text_end
DisplayAlreadyCaughtText:
call GetPokemonName
@@ -99,7 +99,7 @@ DisplayAlreadyCaughtText:
.AlreadyCaughtText:
; You already caught a @ .
text_far UnknownText_0x1c10dd
db "@"
text_end
DummyPredef2F:
DummyPredef38:

View File

@@ -27,7 +27,7 @@ _BugContestJudging:
BugContest_FirstPlaceText:
text_far ContestJudging_FirstPlaceText
start_asm
text_asm
ld de, SFX_1ST_PLACE
call PlaySFX
call WaitSFX
@@ -37,12 +37,12 @@ BugContest_FirstPlaceText:
BugContest_FirstPlaceScoreText:
; The winning score was @ points!
text_far ContestJudging_FirstPlaceScoreText
db "@"
text_end
BugContest_SecondPlaceText:
; Placing second was @ , who caught a @ !@ @
text_far ContestJudging_SecondPlaceText
start_asm
text_asm
ld de, SFX_2ND_PLACE
call PlaySFX
call WaitSFX
@@ -52,12 +52,12 @@ BugContest_SecondPlaceText:
BugContest_SecondPlaceScoreText:
; The score was @ points!
text_far ContestJudging_SecondPlaceScoreText
db "@"
text_end
BugContest_ThirdPlaceText:
; Placing third was @ , who caught a @ !@ @
text_far ContestJudging_ThirdPlaceText
start_asm
text_asm
ld de, SFX_3RD_PLACE
call PlaySFX
call WaitSFX
@@ -67,7 +67,7 @@ BugContest_ThirdPlaceText:
BugContest_ThirdPlaceScoreText:
; The score was @ points!
text_far ContestJudging_ThirdPlaceScoreText
db "@"
text_end
LoadContestantName:
; If a = 1, get your name.