From 17336221e62e36e31069785622c69cf9e3582b7e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 21:15:59 -0500 Subject: [PATCH] newline before para --- charmap.asm | 2 +- data/common_text/common_text_1.asm | 4 ++++ data/common_text/common_text_2.asm | 10 ++++++++++ data/common_text/common_text_3.asm | 31 ++++++++++++++++++++++++++++++ data/phone/text/trainers1.asm | 2 ++ engine/stats_screen.asm | 4 ++-- 6 files changed, 50 insertions(+), 3 deletions(-) diff --git a/charmap.asm b/charmap.asm index 152175c0c..a1bf7a193 100644 --- a/charmap.asm +++ b/charmap.asm @@ -190,7 +190,7 @@ charmap "♂", $ef charmap "¥", $f0 charmap "×", $f1 - charmap "", $f2 ; same as "." in English + charmap "", $f2 ; decimal point; same as "." in English charmap "/", $f3 charmap ",", $f4 charmap "♀", $f5 diff --git a/data/common_text/common_text_1.asm b/data/common_text/common_text_1.asm index fbb29eee7..74fefadca 100644 --- a/data/common_text/common_text_1.asm +++ b/data/common_text/common_text_1.asm @@ -121,14 +121,17 @@ UnknownText_0x1bc1cf:: UnknownText_0x1bc1eb:: text "Your PASSCODE has" line "been set." + para "Enter this number" line "next time to open" cont "the CARD FOLDER." + para "" done UnknownText_0x1bc23e:: text "0000 is invalid!" + para "" done @@ -140,6 +143,7 @@ UnknownText_0x1bc251:: UnknownText_0x1bc272:: text "Incorrect" line "PASSCODE!" + para "" done diff --git a/data/common_text/common_text_2.asm b/data/common_text/common_text_2.asm index b209f6048..bddd0d470 100644 --- a/data/common_text/common_text_2.asm +++ b/data/common_text/common_text_2.asm @@ -758,6 +758,7 @@ _EndUsedMove5Text:: UnknownText_0x1c0db0:: text "Huh?" + para "@@" UnknownText_0x1c0db8:: @@ -966,6 +967,7 @@ ContestJudging_SecondPlaceText:: line "@" text_from_ram wBugContestWinnerName text "," + para "who caught a" line "@" text_from_ram StringBuffer1 @@ -973,6 +975,7 @@ ContestJudging_SecondPlaceText:: ContestJudging_SecondPlaceScoreText:: text_start + para "The score was" line "@" deciram wBugContestSecondPlaceScore, 2, 3 @@ -984,6 +987,7 @@ ContestJudging_ThirdPlaceText:: line "@" text_from_ram wBugContestWinnerName text "," + para "who caught a" line "@" text_from_ram StringBuffer1 @@ -991,6 +995,7 @@ ContestJudging_ThirdPlaceText:: ContestJudging_ThirdPlaceScoreText:: text_start + para "The score was" line "@" deciram wBugContestThirdPlaceScore, 2, 3 @@ -1009,6 +1014,7 @@ UnknownText_0x1c1203:: UnknownText_0x1c123a:: text "CURRENT RECORD" + para "@" text_from_ram StringBuffer1 text " caught by" @@ -1312,17 +1318,21 @@ _OakPCText4:: UnknownText_0x1c19cd:: text "Triple-theme" line "trainer ranking!" + para "The SAVE file you" line "just sent might" cont "make the rankings!" + para "" done UnknownText_0x1c1a22:: text "There is no" line "ranking data." + para "Link to obtain" line "ranking data." + para "" done diff --git a/data/common_text/common_text_3.asm b/data/common_text/common_text_3.asm index 0ba0cd7cb..da5abaee8 100644 --- a/data/common_text/common_text_3.asm +++ b/data/common_text/common_text_3.asm @@ -439,6 +439,7 @@ UnknownText_0x1c4ae5:: line "seeing @" text_from_ram wSeerNickname text_start + para "in battle would" line "excite anyone." done @@ -451,6 +452,7 @@ UnknownText_0x1c4b92:: UnknownText_0x1c4baf:: text_start + para "evolved into" line "@" text_from_ram StringBuffer1 @@ -725,10 +727,13 @@ _MobileStadiumEntryText:: _MobileStadiumSuccessText:: text "Data transfer is" line "complete." + para "We hope you enjoy" line "MOBILE STADIUM" + para "battles in the N64" line "#MON STADIUM 2." + para "" done @@ -772,43 +777,55 @@ UnknownText_0x1c521c:: UnknownText_0x1c5238:: text "The CARD FOLDER" line "stores your and" + para "your friends'" line "CARDS." + para "A CARD contains" line "information like" + para "the person's name," line "phone number and" cont "profile." + para "" done UnknownText_0x1c52bc:: text "This is your CARD." + para "Once you've" line "entered your phone" + para "number, you can" line "trade CARDS with" cont "your friends." + para "" done UnknownText_0x1c531e:: text "If you have your" line "friend's CARD, you" + para "can use it to make" line "a call from a" + para "mobile phone on" line "the 2nd floor of a" cont "#MON CENTER." + para "" done UnknownText_0x1c5394:: text "To safely store" line "your collection of" + para "CARDS, you must" line "set a PASSCODE for" cont "your CARD FOLDER." + para "" done @@ -836,6 +853,7 @@ UnknownText_0x1c5494:: UnknownText_0x1c54b9:: text "The CARD FOLDER" line "has been deleted." + para "" done @@ -974,6 +992,7 @@ UnknownText_0x1c574e:: text " Poof!@" interpret_data text_start + para "@" text_from_ram wMonOrItemNameBuffer text " forgot" @@ -1065,18 +1084,21 @@ UnknownText_0x1c58bc:: UnknownText_0x1c58d1:: text "Here you go!" + para "" done UnknownText_0x1c58e0:: text "You don't have" line "enough points." + para "" done UnknownText_0x1c58ff:: text "You have no room" line "for it." + para "" done @@ -1087,12 +1109,14 @@ UnknownText_0x1c591a:: UnknownText_0x1c5937:: text "Excuse me!" + para "" done Text_ExcuseMeYoureNotReady:: text "Excuse me." line "You're not ready." + para "" done @@ -1104,18 +1128,21 @@ UnknownText_0x1c5962:: UnknownText_0x1c5983:: text "You need at least" line "three #MON." + para "" done UnknownText_0x1c59a3:: text "Sorry, an EGG" line "doesn't qualify." + para "" done Text_OnlyThreePkmnMayBeEntered:: text "Only three #MON" line "may be entered." + para "" done @@ -1125,6 +1152,7 @@ Text_ThePkmnMustAllBeDifferentKinds:: text " #MON" line "must all be" cont "different kinds." + para "" done @@ -1134,12 +1162,14 @@ Text_ThePkmnMustNotHoldTheSameItems:: text " #MON" line "must not hold the" cont "same items." + para "" done Text_YouCantTakeAnEgg:: text "You can't take an" line "EGG!" + para "" done @@ -1292,6 +1322,7 @@ UnknownText_0x1c5d03:: line "inside!@" sound_dex_fanfare_50_79 text_start + para "@" text_from_ram PlayerName text " sent the" diff --git a/data/phone/text/trainers1.asm b/data/phone/text/trainers1.asm index 99f4569c5..8768b9295 100644 --- a/data/phone/text/trainers1.asm +++ b/data/phone/text/trainers1.asm @@ -308,8 +308,10 @@ UnknownText_0x1b53f7: ; 0x1b53f7 line "@" text_from_ram StringBuffer3 text "." + para "Oh, ." line "Good morning." + para "" done diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index f51f57a77..11c3b33a3 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -1088,10 +1088,10 @@ StatsScreen_LoadPageIndicators: ; 4e4cd (13:64cd) ld a, $36 ; first of 4 small square tiles call .load_square hlcoord 15, 5 - ld a, $36 ; """ + ld a, $36 ; " " " " call .load_square hlcoord 17, 5 - ld a, $36 ; """ + ld a, $36 ; " " " " call .load_square ld a, c cp GREEN_PAGE