diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-23 21:19:53 -0500 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-23 21:19:53 -0500 |
commit | f3c8f7520975cbfca8be57b0adb855bf42368d83 (patch) | |
tree | a91fb7a259e09c0e82b9fbee0bacda448472248d /text | |
parent | d972564175bcee324877f1e016fafd349c50e7d3 (diff) |
bug contest judgint labels
Diffstat (limited to 'text')
-rw-r--r-- | text/battle.asm | 2 | ||||
-rw-r--r-- | text/common_2.asm | 6 | ||||
-rw-r--r-- | text/common_3.asm | 24 | ||||
-rw-r--r-- | text/common_4.asm | 48 |
4 files changed, 40 insertions, 40 deletions
diff --git a/text/battle.asm b/text/battle.asm index 9167ac7af..c17765855 100644 --- a/text/battle.asm +++ b/text/battle.asm @@ -396,7 +396,7 @@ BattleText_StringBuffer1GrewToLevel: ; 0x80c9c line "level @" deciram CurPartyLevel, 1, 3 text "!@" - sound0 + sound_dex_fanfare_50_79 db "@" ; 0x80cb9 diff --git a/text/common_2.asm b/text/common_2.asm index ea01fd975..052ea9ebb 100644 --- a/text/common_2.asm +++ b/text/common_2.asm @@ -108,7 +108,7 @@ UnknownText_0x1bc14f: ; 0x1bc14f line "level @" deciram CurPartyLevel, 1, 3 text "!@" - sound0 + sound_dex_fanfare_50_79 text_waitbutton db "@" ; 0x1bc16d @@ -1575,7 +1575,7 @@ UnknownText_0x1bd3be: ; 0x1bd3be line "@" text_from_ram StringBuffer1 text "!@" - sound0x0F + sound_item text_waitbutton db "@" ; 0x1bd3d6 @@ -1613,7 +1613,7 @@ UnknownText_0x1bd429: ; 0x1bd429 ; 0x1bd445 UnknownText_0x1bd445: ; 0x1bd445 - sound0x0A + sound_dex_fanfare_80_109 interpret_data db "@" ; 0x1bd448 diff --git a/text/common_3.asm b/text/common_3.asm index fe0cef171..adc32f6cb 100644 --- a/text/common_3.asm +++ b/text/common_3.asm @@ -931,7 +931,7 @@ UnknownText_0x1c0dba: ; 1c0dba text_from_ram StringBuffer1 text " came" line "out of its EGG!@" - sound0x02 + sound_caught_mon text_waitbutton db "@" ; 1c0dd7 @@ -1145,7 +1145,7 @@ ContestJudging_FirstPlaceText: ; 1c10fa interpret_data text "…" para "@" - text_from_ram wd016 + text_from_ram wBugContestWinnerName text "," line "who caught a" cont "@" @@ -1158,7 +1158,7 @@ ContestJudging_FirstPlaceScoreText: ; 1c113f text "" para "The winning score" line "was @" - deciram wd004, 2, 3 + deciram wBugContestFirstPlaceScore, 2, 3 text " points!" prompt ; 1c1166 @@ -1166,7 +1166,7 @@ ContestJudging_FirstPlaceScoreText: ; 1c113f ContestJudging_SecondPlaceText: ; 1c1166 text "Placing second was" line "@" - text_from_ram wd016 + text_from_ram wBugContestWinnerName text "," para "who caught a" line "@" @@ -1179,7 +1179,7 @@ ContestJudging_SecondPlaceScoreText: ; 1c1196 text "" para "The score was" line "@" - deciram wd008, 2, 3 + deciram wBugContestSecondPlaceScore, 2, 3 text " points!" prompt ; 1c11b5 @@ -1187,7 +1187,7 @@ ContestJudging_SecondPlaceScoreText: ; 1c1196 ContestJudging_ThirdPlaceText: ; 1c11b5 text "Placing third was" line "@" - text_from_ram wd016 + text_from_ram wBugContestWinnerName text "," para "who caught a" line "@" @@ -1200,7 +1200,7 @@ ContestJudging_ThirdPlaceScoreText: ; 1c11e4 text "" para "The score was" line "@" - deciram wd00c, 2, 3 + deciram wBugContestThirdPlaceScore, 2, 3 text " points!" prompt ; 1c1203 @@ -1641,7 +1641,7 @@ UnknownText_0x1c1b03: ; 1c1b03 UnknownText_0x1c1b2c: ; 1c1b2c text "Took @" - text_from_ram wd050 + text_from_ram wd050_MonNick text "'s" line "@" text_from_ram StringBuffer1 @@ -1656,7 +1656,7 @@ UnknownText_0x1c1b2c: ; 1c1b2c UnknownText_0x1c1b57: ; 1c1b57 text "Made @" - text_from_ram wd050 + text_from_ram wd050_MonNick text "" line "hold @" text_from_ram StringBuffer2 @@ -1671,7 +1671,7 @@ UnknownText_0x1c1b6f: ; 1c1b6f ; 1c1b8e UnknownText_0x1c1b8e: ; 1c1b8e - text_from_ram wd050 + text_from_ram wd050_MonNick text " isn't" line "holding anything." prompt @@ -1688,13 +1688,13 @@ UnknownText_0x1c1bc4: ; 1c1bc4 text_from_ram StringBuffer1 text "" line "from @" - text_from_ram wd050 + text_from_ram wd050_MonNick text "." prompt ; 1c1bdc UnknownText_0x1c1bdc: ; 1c1bdc - text_from_ram wd050 + text_from_ram wd050_MonNick text " is" line "already holding" diff --git a/text/common_4.asm b/text/common_4.asm index 528b3f1d4..ad4a90d27 100644 --- a/text/common_4.asm +++ b/text/common_4.asm @@ -338,10 +338,10 @@ UnknownText_0x1c4797: ; 0x1c4797 UnknownText_0x1c47d4: ; 0x1c47d4 text "Hm… I see you met" line "@" - text_from_ram wd003 + text_from_ram wSeerNickname text " here:" cont "@" - text_from_ram wd00e + text_from_ram wSeerCaughtLocation text "!" prompt ; 0x1c47fa @@ -349,11 +349,11 @@ UnknownText_0x1c47d4: ; 0x1c47d4 UnknownText_0x1c47fa: ; 0x1c47fa text "The time was" line "@" - text_from_ram wd01f + text_from_ram wSeerTimeOfDay text "!" para "Its level was @" - text_from_ram wd036 + text_from_ram wSeerCaughtLevelString text "!" para "Am I good or what?" @@ -362,21 +362,21 @@ UnknownText_0x1c47fa: ; 0x1c47fa UnknownText_0x1c4837: ; 0x1c4837 text "Hm… @" - text_from_ram wd003 + text_from_ram wSeerNickname text "" line "came from @" - text_from_ram wd02a + text_from_ram wSeerOTName text "" cont "in a trade?" para "@" - text_from_ram wd00e + text_from_ram wSeerCaughtLocation text "" line "was where @" - text_from_ram wd02a + text_from_ram wSeerOTName text "" cont "met @" - text_from_ram wd003 + text_from_ram wSeerNickname text "!" prompt ; 0x1c487f @@ -393,7 +393,7 @@ UnknownText_0x1c487f: ; 0x1c487f para "I can't tell where" line "you met it, but it" cont "was at level @" - text_from_ram wd036 + text_from_ram wSeerCaughtLevelString text "." para "Am I good or what?" @@ -434,7 +434,7 @@ UnknownText_0x1c49c6: ; 0x1c49c6 line "grown a little." para "@" - text_from_ram wd003 + text_from_ram wSeerNickname text " seems" line "to be becoming" cont "more confident." @@ -445,7 +445,7 @@ UnknownText_0x1c4a21: ; 0x1c4a21 text "Incidentally…" para "@" - text_from_ram wd003 + text_from_ram wSeerNickname text " has" line "grown. It's gained" cont "much strength." @@ -459,7 +459,7 @@ UnknownText_0x1c4a5b: ; 0x1c4a5b line "grown mighty!" para "This @" - text_from_ram wd003 + text_from_ram wSeerNickname text "" line "must have come" @@ -483,12 +483,12 @@ UnknownText_0x1c4ae5: ; 0x1c4ae5 para "seen a #MON as" line "mighty as this" cont "@" - text_from_ram wd003 + text_from_ram wSeerNickname text "." para "I'm sure that" line "seeing @" - text_from_ram wd003 + text_from_ram wSeerNickname text "" para "in battle would" line "excite anyone." @@ -859,13 +859,13 @@ UnknownText_0x1c51d7: ; 0x1c51d7 ; 0x1c51f4 UnknownText_0x1c51f4: ; 0x1c51f4 - text_from_ram wd006 + text_from_ram wMobileParticipant1Nickname text "," line "@" - text_from_ram wd00c + text_from_ram wMobileParticipant2Nickname text " and" cont "@" - text_from_ram wd012 + text_from_ram wMobileParticipant3Nickname text "." para "Use these three?" @@ -989,7 +989,7 @@ UnknownText_0x1c5580: ; 0x1c5580 ; 0x1c5588 UnknownText_0x1c5588: ; 0x1c5588 - text $56 + text "<......>" done ; 0x1c558b @@ -1050,7 +1050,7 @@ UnknownText_0x1c5660: ; 0x1c5660 line "@" text_from_ram StringBuffer2 text "!@" - sound0 + sound_dex_fanfare_50_79 text_waitbutton db "@" ; 0x1c5677 @@ -1189,7 +1189,7 @@ UnknownText_0x1c5823: ; 0x1c5823 ; 0x1c5824 UnknownText_0x1c5824: ; 0x1c5824 - text $56 + text "<......>" done ; 0x1c5827 @@ -1367,7 +1367,7 @@ UnknownText_0x1c5b17: ; 0x1c5b17 text_from_ram EnemyMonNick text "" line "was caught!@" - sound0x02 + sound_caught_mon db "@" ; 0x1c5b34 @@ -1396,7 +1396,7 @@ UnknownText_0x1c5b53: ; 0x1c5b53 text "'s data" line "was newly added to" cont "the #DEX.@" - sound0x2C + sound_slot_machine_start text_waitbutton db "@" ; 0x1c5b7e @@ -1514,7 +1514,7 @@ UnknownText_0x1c5cf1: ; 0x1c5cf1 UnknownText_0x1c5d03: ; 0x1c5d03 text "There was a trophy" line "inside!@" - sound0 + sound_dex_fanfare_50_79 text "" para "@" text_from_ram PlayerName |