ref: 17336221e62e36e31069785622c69cf9e3582b7e
parent: 747c9059d4912c275d3e1e708c026b1fe61e3b42
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Thu Jan 18 16:15:59 EST 2018
newline before para
--- a/charmap.asm
+++ b/charmap.asm
@@ -190,7 +190,7 @@
charmap "♂", $ef
charmap "¥", $f0
charmap "×", $f1
- charmap "<DOT>", $f2 ; same as "." in English
+ charmap "<DOT>", $f2 ; decimal point; same as "." in English
charmap "/", $f3
charmap ",", $f4
charmap "♀", $f5
--- a/data/common_text/common_text_1.asm
+++ b/data/common_text/common_text_1.asm
@@ -121,14 +121,17 @@
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_0x1bc272::
text "Incorrect"
line "PASSCODE!"
+
para ""
done
--- a/data/common_text/common_text_2.asm
+++ b/data/common_text/common_text_2.asm
@@ -758,6 +758,7 @@
UnknownText_0x1c0db0::
text "Huh?"
+
para "@@"
UnknownText_0x1c0db8::
@@ -966,6 +967,7 @@
line "@"
text_from_ram wBugContestWinnerName
text ","
+
para "who caught a"
line "@"
text_from_ram StringBuffer1
@@ -973,6 +975,7 @@
ContestJudging_SecondPlaceScoreText::
text_start
+
para "The score was"
line "@"
deciram wBugContestSecondPlaceScore, 2, 3
@@ -984,6 +987,7 @@
line "@"
text_from_ram wBugContestWinnerName
text ","
+
para "who caught a"
line "@"
text_from_ram StringBuffer1
@@ -991,6 +995,7 @@
ContestJudging_ThirdPlaceScoreText::
text_start
+
para "The score was"
line "@"
deciram wBugContestThirdPlaceScore, 2, 3
@@ -1009,6 +1014,7 @@
UnknownText_0x1c123a::
text "CURRENT RECORD"
+
para "@"
text_from_ram StringBuffer1
text " caught by"
@@ -1312,9 +1318,11 @@
UnknownText_0x1c19cd::
text "Triple-theme"
line "trainer ranking!"
+
para "The SAVE file you"
line "just sent might"
cont "make the rankings!"
+
para ""
done
@@ -1321,8 +1329,10 @@
UnknownText_0x1c1a22::
text "There is no"
line "ranking data."
+
para "Link to obtain"
line "ranking data."
+
para ""
done
--- a/data/common_text/common_text_3.asm
+++ b/data/common_text/common_text_3.asm
@@ -439,6 +439,7 @@
line "seeing @"
text_from_ram wSeerNickname
text_start
+
para "in battle would"
line "excite anyone."
done
@@ -451,6 +452,7 @@
UnknownText_0x1c4baf::
text_start
+
para "evolved into"
line "@"
text_from_ram StringBuffer1
@@ -725,10 +727,13 @@
_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,23 +777,30 @@
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
@@ -795,11 +807,14 @@
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
@@ -806,9 +821,11 @@
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_0x1c54b9::
text "The CARD FOLDER"
line "has been deleted."
+
para ""
done
@@ -974,6 +992,7 @@
text " Poof!@"
interpret_data
text_start
+
para "@"
text_from_ram wMonOrItemNameBuffer
text " forgot"
@@ -1065,6 +1084,7 @@
UnknownText_0x1c58d1::
text "Here you go!"
+
para ""
done
@@ -1071,6 +1091,7 @@
UnknownText_0x1c58e0::
text "You don't have"
line "enough points."
+
para ""
done
@@ -1077,6 +1098,7 @@
UnknownText_0x1c58ff::
text "You have no room"
line "for it."
+
para ""
done
@@ -1087,6 +1109,7 @@
UnknownText_0x1c5937::
text "Excuse me!"
+
para ""
done
@@ -1093,6 +1116,7 @@
Text_ExcuseMeYoureNotReady::
text "Excuse me."
line "You're not ready."
+
para ""
done
@@ -1104,6 +1128,7 @@
UnknownText_0x1c5983::
text "You need at least"
line "three #MON."
+
para ""
done
@@ -1110,6 +1135,7 @@
UnknownText_0x1c59a3::
text "Sorry, an EGG"
line "doesn't qualify."
+
para ""
done
@@ -1116,6 +1142,7 @@
Text_OnlyThreePkmnMayBeEntered::
text "Only three #MON"
line "may be entered."
+
para ""
done
@@ -1125,6 +1152,7 @@
text " #MON"
line "must all be"
cont "different kinds."
+
para ""
done
@@ -1134,6 +1162,7 @@
text " #MON"
line "must not hold the"
cont "same items."
+
para ""
done
@@ -1140,6 +1169,7 @@
Text_YouCantTakeAnEgg::
text "You can't take an"
line "EGG!"
+
para ""
done
@@ -1292,6 +1322,7 @@
line "inside!@"
sound_dex_fanfare_50_79
text_start
+
para "@"
text_from_ram PlayerName
text " sent the"
--- a/data/phone/text/trainers1.asm
+++ b/data/phone/text/trainers1.asm
@@ -308,8 +308,10 @@
line "@"
text_from_ram StringBuffer3
text "."
+
para "Oh, <PLAY_G>."
line "Good morning."
+
para ""
done
--- a/engine/stats_screen.asm
+++ b/engine/stats_screen.asm
@@ -1088,10 +1088,10 @@
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