diff options
Diffstat (limited to 'text')
| -rw-r--r-- | text/common.asm | 36 | ||||
| -rw-r--r-- | text/common_3.asm | 12 | ||||
| -rw-r--r-- | text/common_4.asm | 12 | ||||
| -rw-r--r-- | text/types.asm | 3 |
4 files changed, 32 insertions, 31 deletions
diff --git a/text/common.asm b/text/common.asm index 74e143b13..896fdfe24 100644 --- a/text/common.asm +++ b/text/common.asm @@ -230,7 +230,7 @@ MartSignText: para "#MON MART" done -UnknownText_0x1b05bf: ; 0x1b05bf +ContestResults_ReadyToJudgeText: ; 0x1b05bf text "We will now judge" line "the #MON you've" cont "caught." @@ -246,7 +246,7 @@ UnknownText_0x1b05bf: ; 0x1b05bf done ; 0x1b0621 -UnknownText_0x1b0621: ; 0x1b0621 +ContestResults_PlayerWonAPrizeText: ; 0x1b0621 text "<PLAYER>, the No.@" text_from_ram StringBuffer3 text "" @@ -257,7 +257,7 @@ UnknownText_0x1b0621: ; 0x1b0621 done ; 0x1b0648 -UnknownText_0x1b0648: ; 0x1b0648 +ReceivedItemText: ; 0x1b0648 text "<PLAYER> received" line "@" text_from_ram StringBuffer4 @@ -265,26 +265,26 @@ UnknownText_0x1b0648: ; 0x1b0648 done ; 0x1b065b -UnknownText_0x1b065b: ; 0x1b065b +ContestResults_JoinUsNextTimeText: ; 0x1b065b text "Please join us for" line "the next Contest!" done ; 0x1b0681 -UnknownText_0x1b0681: ; 0x1b0681 +ContestResults_ConsolationPrizeText: ; 0x1b0681 text "Everyone else gets" line "a BERRY as a con-" cont "solation prize!" done ; 0x1b06b7 -UnknownText_0x1b06b7: ; 0x1b06b7 +ContestResults_DidNotWinText: ; 0x1b06b7 text "We hope you do" line "better next time." done ; 0x1b06d9 -UnknownText_0x1b06d9: ; 0x1b06d9 +ContestResults_ReturnPartyText: ; 0x1b06d9 text "We'll return the" line "#MON we kept" @@ -293,7 +293,7 @@ UnknownText_0x1b06d9: ; 0x1b06d9 done ; 0x1b070d -UnknownText_0x1b070d: ; 0x1b070d +ContestResults_PartyFullText: ; 0x1b070d text "Your party's full," line "so the #MON was" @@ -302,14 +302,14 @@ UnknownText_0x1b070d: ; 0x1b070d done ; 0x1b074e -UnknownText_0x1b074e: ; 0x1b074e +GymStatue_CityGymText: ; 0x1b074e text_from_ram StringBuffer3 text "" line "#MON GYM" done ; 0x1b075c -UnknownText_0x1b075c: ; 0x1b075c +GymStatue_WinningTrainersText: ; 0x1b075c text "LEADER: @" text_from_ram StringBuffer4 text "" @@ -318,13 +318,13 @@ UnknownText_0x1b075c: ; 0x1b075c done ; 0x1b077f -UnknownText_0x1b077f: ; 0x1b077f +CoinVendor_WelcomeText: ; 0x1b077f text "Welcome to the" line "GAME CORNER." done ; 0x1b079c -UnknownText_0x1b079c: ; 0x1b079c +CoinVendor_NoCoinCaseText: ; 0x1b079c text "Do you need game" line "coins?" @@ -334,7 +334,7 @@ UnknownText_0x1b079c: ; 0x1b079c done ; 0x1b07e3 -UnknownText_0x1b07e3: ; 0x1b07e3 +CoinVendor_IntroText: ; 0x1b07e3 text "Do you need some" line "game coins?" @@ -344,31 +344,31 @@ UnknownText_0x1b07e3: ; 0x1b07e3 done ; 0x1b0830 -UnknownText_0x1b0830: ; 0x1b0830 +CoinVendor_Buy50CoinsText: ; 0x1b0830 text "Thank you!" line "Here are 50 coins." done ; 0x1b084f -UnknownText_0x1b084f: ; 0x1b084f +CoinVendor_Buy500CoinsText: ; 0x1b084f text "Thank you! Here" line "are 500 coins." done ; 0x1b086f -UnknownText_0x1b086f: ; 0x1b086f +CoinVendor_NotEnoughMoneyText: ; 0x1b086f text "You don't have" line "enough money." done ; 0x1b088c -UnknownText_0x1b088c: ; 0x1b088c +CoinVendor_CoinCaseFullText: ; 0x1b088c text "Whoops! Your COIN" line "CASE is full." done ; 0x1b08ad -UnknownText_0x1b08ad: ; 0x1b08ad +CoinVendor_CancelText: ; 0x1b08ad text "No coins for you?" line "Come again!" done diff --git a/text/common_3.asm b/text/common_3.asm index 7b15baf5e..c73e91d74 100644 --- a/text/common_3.asm +++ b/text/common_3.asm @@ -1139,7 +1139,7 @@ UnknownText_0x1c10dd: ; 1c10dd prompt ; 1c10fa -UnknownText_0x1c10fa: ; 1c10fa +ContestJudging_FirstPlaceText: ; 1c10fa text "This Bug-Catching" line "Contest winner is@" interpret_data @@ -1154,7 +1154,7 @@ UnknownText_0x1c10fa: ; 1c10fa db "@" ; 1c113f -UnknownText_0x1c113f: ; 1c113f +ContestJudging_FirstPlaceScoreText: ; 1c113f text "" para "The winning score" line "was @" @@ -1163,7 +1163,7 @@ UnknownText_0x1c113f: ; 1c113f prompt ; 1c1166 -UnknownText_0x1c1166: ; 1c1166 +ContestJudging_SecondPlaceText: ; 1c1166 text "Placing second was" line "@" text_from_ram wd016 @@ -1175,7 +1175,7 @@ UnknownText_0x1c1166: ; 1c1166 db "@" ; 1c1196 -UnknownText_0x1c1196: ; 1c1196 +ContestJudging_SecondPlaceScoreText: ; 1c1196 text "" para "The score was" line "@" @@ -1184,7 +1184,7 @@ UnknownText_0x1c1196: ; 1c1196 prompt ; 1c11b5 -UnknownText_0x1c11b5: ; 1c11b5 +ContestJudging_ThirdPlaceText: ; 1c11b5 text "Placing third was" line "@" text_from_ram wd016 @@ -1196,7 +1196,7 @@ UnknownText_0x1c11b5: ; 1c11b5 db "@" ; 1c11e4 -UnknownText_0x1c11e4: ; 1c11e4 +ContestJudging_ThirdPlaceScoreText: ; 1c11e4 text "" para "The score was" line "@" diff --git a/text/common_4.asm b/text/common_4.asm index 0278a20b9..09bfff312 100644 --- a/text/common_4.asm +++ b/text/common_4.asm @@ -542,7 +542,7 @@ UnknownText_0x1c4c08: ; 0x1c4c08 text_from_ram StringBuffer2 text "(S)" line "will be ¥@" - deciram $ffc3, $36 + deciram hMoneyTemp, $36 text "." done ; 0x1c4c28 @@ -574,7 +574,7 @@ UnknownText_0x1c4cae: ; 0x1c4cae text_from_ram StringBuffer2 text "(S)" line "will be ¥@" - deciram $ffc3, $36 + deciram hMoneyTemp, $36 text "." done ; 0x1c4cce @@ -619,7 +619,7 @@ UnknownText_0x1c4db0: ; 0x1c4db0 text_from_ram StringBuffer2 text " costs" line "¥@" - deciram $ffc3, $36 + deciram hMoneyTemp, $36 text ". Want it?" done ; 0x1c4dcd @@ -671,7 +671,7 @@ UnknownText_0x1c4e89: ; 0x1c4e89 text_from_ram StringBuffer2 text "(S)" line "will cost ¥@" - deciram $ffc3, $36 + deciram hMoneyTemp, $36 text "." done ; 0x1c4eab @@ -713,7 +713,7 @@ UnknownText_0x1c4f33: ; 0x1c4f33 UnknownText_0x1c4f3e: ; 0x1c4f3e text "I can pay you" line "¥@" - deciram $ffc3, $36 + deciram hMoneyTemp, $36 text "." para "Is that OK?" @@ -763,7 +763,7 @@ UnknownText_0x1c500d: ; 0x1c500d UnknownText_0x1c502e: ; 0x1c502e text "Got ¥@" - deciram $ffc3, $36 + deciram hMoneyTemp, $36 text " for" line "@" text_from_ram StringBuffer2 diff --git a/text/types.asm b/text/types.asm index b04cab7f7..824e7e746 100644 --- a/text/types.asm +++ b/text/types.asm @@ -85,8 +85,9 @@ GetTypeName: ; 50964 ld hl, TypeNames ld e, a ld d, 0 +rept 2 add hl, de - add hl, de +endr ld a, [hli] ld h, [hl] ld l, a |