ref: da87d2a929b1d58175efe063833c124d8ba702c9
parent: 82e2fe78e1f52b45d0c2fddc80b99211838a7ff8
author: IIMarckus <[email protected]>
date: Thu Dec 17 22:39:09 EST 2015
'db "@" \ db "@"' to 'db "@@"'.
--- a/text/battle.asm
+++ b/text/battle.asm
@@ -397,12 +397,8 @@
deciram CurPartyLevel, 1, 3
text "!@"
sound_dex_fanfare_50_79
- db "@"
+ db "@@"
; 0x80cb9
-
-BattleText_0x80cb9: ; 0x80cb9
- db "@"
-; 0x80cba
BattleText_WildPkmnIsEating: ; 0x80cba
text "Wild @"
--- a/text/common_1.asm
+++ b/text/common_1.asm
@@ -95,11 +95,8 @@
text "!@"
sound_dex_fanfare_50_79
text_waitbutton
- db "@"
+ db "@@"
-UnknownText_0x1bc16d::
- db "@"
-
UnknownText_0x1bc16e::
text_from_ram StringBuffer1
text " came"
@@ -147,12 +144,11 @@
done
UnknownText_0x1bc288::
- text "CARD FOLDER open.@"
- db "@"
+ text "CARD FOLDER open.@@"
UnknownText_0x1bc29c::
- text $56, $56, $56, $56, $56, $56
- line $56, $56, $56, $56, $56, $56
+ text "<......><......><......><......><......><......>"
+ line "<......><......><......><......><......><......>"
para "Zzz… Hm? Wha…?"
line "You woke me up!"
@@ -166,8 +162,7 @@
done
UnknownText_0x1bc2fd::
- text "What?@"
- db "@"
+ text "What?@@"
UnknownText_0x1bc305::
text "?"
@@ -178,8 +173,7 @@
done
UnknownText_0x1bc31b::
- text "Whoa!@"
- db "@"
+ text "Whoa!@@"
UnknownText_0x1bc323::
text "?"
@@ -299,6 +293,7 @@
line "@"
text_from_ram StringBuffer3
text ""
+
para "and set up the"
line "@"
text_from_ram StringBuffer4
@@ -424,11 +419,8 @@
text " will"
line "trade @"
text_from_ram wc703
- db "@"
+ db "@@"
-UnknownText_0x1bc773::
- db "@"
-
UnknownText_0x1bc774::
text "for @"
text_from_ram wc6e7
@@ -443,11 +435,8 @@
text " will"
line "trade @"
text_from_ram wc6d1
- db "@"
+ db "@@"
-UnknownText_0x1bc79c::
- db "@"
-
UnknownText_0x1bc79d::
text "for @"
text_from_ram wc719
@@ -512,11 +501,8 @@
text ""
line "OAK: @"
text_from_ram wd050
- db "@"
+ db "@@"
-UnknownText_0x1bc857::
- db "@"
-
UnknownText_0x1bc858::
text ""
line "may be seen around"
@@ -704,11 +690,8 @@
text ""
line "@"
text_from_ram StringBuffer1
- db "@"
+ db "@@"
-UnknownText_0x1bca98::
- db "@"
-
UnknownText_0x1bca99::
text ""
line "BEN: #MON MUSIC"
@@ -850,11 +833,8 @@
text_from_ram StringBuffer2
text " @"
text_from_ram StringBuffer1
- db "@"
+ db "@@"
-UnknownText_0x1bcc7f::
- db "@"
-
UnknownText_0x1bcc80::
text ""
line "is cute."
@@ -939,11 +919,8 @@
text ""
line "@"
text_from_ram StringBuffer1
- db "@"
+ db "@@"
-UnknownText_0x1bcda7::
- db "@"
-
UnknownText_0x1bcda8::
text ""
line "… …Ahem, we are"
@@ -1333,11 +1310,8 @@
text "!@"
sound_item
text_waitbutton
- db "@"
+ db "@@"
-UnknownText_0x1bd3d6::
- db "@"
-
UnknownText_0x1bd3d7::
text "You have no coins."
prompt
@@ -1359,17 +1333,13 @@
text " for"
cont "@"
text_from_ram StringBuffer2
- text ".@"
- db "@"
+ text ".@@"
UnknownText_0x1bd445::
sound_dex_fanfare_80_109
interpret_data
- db "@"
+ db "@@"
-UnknownText_0x1bd448::
- db "@"
-
UnknownText_0x1bd449::
text "I collect #MON."
line "Do you have"
@@ -1553,7 +1523,8 @@
UnknownText_0x1bd868::
text "OK, I'll take care"
line "of your money."
- para $56, $56, $56
+
+ para "<......><......><......>"
prompt
UnknownText_0x1bd88e::
--- a/text/common_2.asm
+++ b/text/common_2.asm
@@ -96,8 +96,7 @@
Text_Gained::
text_from_ram StringBuffer1
- text " gained@"
- db "@"
+ text " gained@@"
Text_ABoostedStringBuffer2ExpPoints::
text ""
@@ -115,22 +114,18 @@
prompt
Text_GoPkmn::
- text "Go! @"
- db "@"
+ text "Go! @@"
Text_DoItPkmn::
- text "Do it! @"
- db "@"
+ text "Do it! @@"
Text_GoForItPkmn::
text "Go for it,"
- line "@"
- db "@"
+ line "@@"
Text_YourFoesWeakGetmPkmn::
text "Your foe's weak!"
- line "Get'm, @"
- db "@"
+ line "Get'm, @@"
Text_BattleMonNick01::
text_from_ram BattleMonNick
@@ -139,23 +134,19 @@
Text_BattleMonNickComma::
text_from_ram BattleMonNick
- text ",@"
- db "@"
+ text ",@@"
Text_ThatsEnoughComeBack::
text " that's"
- line "enough! Come back!@"
- db "@"
+ line "enough! Come back!@@"
Text_OKComeBack::
text " OK!"
- line "Come back!@"
- db "@"
+ line "Come back!@@"
Text_GoodComeBack::
text " good!"
- line "Come back!@"
- db "@"
+ line "Come back!@@"
Text_ComeBack::
text " come"
@@ -315,10 +306,7 @@
text "A blinding FLASH"
line "lights the area!@"
text_waitbutton
- db "@"
-
-UnknownText_0x1c062e::
- db "@"
+ db "@@"
_UsedSurfText::
text_from_ram StringBuffer2
--- a/text/common_3.asm
+++ b/text/common_3.asm
@@ -53,6 +53,7 @@
UnknownText_0x1c073b::
text "Can't use that"
line "here."
+
para ""
done
@@ -341,11 +342,8 @@
text "<USER>'s"
line "@"
text_from_ram StringBuffer2
- db "@"
+ db "@@"
-UnknownText_0x1c0ccf::
- db "@"
-
UnknownText_0x1c0cd0::
interpret_data
text $4c, "went way up!"
@@ -359,11 +357,8 @@
text "<TARGET>'s"
line "@"
text_from_ram StringBuffer2
- db "@"
+ db "@@"
-UnknownText_0x1c0cf4::
- db "@"
-
UnknownText_0x1c0cf5::
interpret_data
text $4c, "sharply fell!"
@@ -374,8 +369,7 @@
prompt
UnknownText_0x1c0d0e::
- text "<USER>@"
- db "@"
+ text "<USER>@@"
UnknownText_0x1c0d12::
text ""
@@ -408,31 +402,24 @@
prompt
_ActorNameText::
- text "<USER>@"
- db "@"
+ text "<USER>@@"
_UsedMove1Text::
text ""
- line "used @"
- db "@"
+ line "used @@"
_UsedMove2Text::
text ""
- line "used @"
- db "@"
+ line "used @@"
_UsedInsteadText::
text "instead,"
- cont "@"
- db "@"
+ cont "@@"
_MoveNameText::
text_from_ram StringBuffer2
- db "@"
+ db "@@"
-UnknownText_0x1c0da0::
- db "@"
-
_EndUsedMove1Text::
text "!"
done
@@ -455,8 +442,7 @@
UnknownText_0x1c0db0::
text "Huh?"
- para "@"
- db "@"
+ para "@@"
UnknownText_0x1c0db8::
text ""
@@ -468,11 +454,8 @@
line "out of its EGG!@"
sound_caught_mon
text_waitbutton
- db "@"
+ db "@@"
-UnknownText_0x1c0dd7::
- db "@"
-
UnknownText_0x1c0dd8::
text "Give a nickname to"
line "@"
@@ -578,11 +561,8 @@
text ""
line "Animation type @"
text_from_ram StringBuffer2
- db "@"
+ db "@@"
-UnknownText_0x1c0fdc::
- db "@"
-
UnknownText_0x1c0fdd::
text "#MON number?"
done
@@ -647,6 +627,7 @@
line "Contest winner is@"
interpret_data
text "…"
+
para "@"
text_from_ram wBugContestWinnerName
text ","
@@ -653,11 +634,11 @@
line "who caught a"
cont "@"
text_from_ram StringBuffer1
- text "!@"
- db "@"
+ text "!@@"
ContestJudging_FirstPlaceScoreText::
text ""
+
para "The winning score"
line "was @"
deciram wBugContestFirstPlaceScore, 2, 3
@@ -672,8 +653,7 @@
para "who caught a"
line "@"
text_from_ram StringBuffer1
- text "!@"
- db "@"
+ text "!@@"
ContestJudging_SecondPlaceScoreText::
text ""
@@ -691,8 +671,7 @@
para "who caught a"
line "@"
text_from_ram StringBuffer1
- text "!@"
- db "@"
+ text "!@@"
ContestJudging_ThirdPlaceScoreText::
text ""
@@ -720,11 +699,8 @@
line "@"
text_from_ram wMagikarpRecordHoldersName
text_waitbutton
- db "@"
+ db "@@"
-UnknownText_0x1c1260::
- db "@"
-
UnknownText_0x1c1261::
text "Congratulations!"
@@ -1206,15 +1182,11 @@
text "This world is in-"
line "habited by crea-"
cont "tures that we call"
- cont "#MON.@"
- db "@"
+ cont "#MON.@@"
_OakText3::
text_waitbutton
- db "@"
-
-UnknownText_0x1c1de4::
- db "@"
+ db "@@"
_OakText4::
text "People and #MON"
--- a/text/common_4.asm
+++ b/text/common_4.asm
@@ -447,10 +447,7 @@
text "Congratulations!"
line "Your @"
text_from_ram StringBuffer2
- db "@"
-
-UnknownText_0x1c4bae::
- db "@"
+ db "@@"
UnknownText_0x1c4baf::
text ""
--- a/text/common_5.asm
+++ b/text/common_5.asm
@@ -237,11 +237,8 @@
text "!@"
sound_dex_fanfare_50_79
text_waitbutton
- db "@"
+ db "@@"
-UnknownText_0x1c5677::
- db "@"
-
UnknownText_0x1c5678::
text "Which move should"
next "be forgotten?"
@@ -287,11 +284,8 @@
UnknownText_0x1c5740::
text "1, 2 and…@"
interpret_data
- db "@"
+ db "@@"
-UnknownText_0x1c574d::
- db "@"
-
UnknownText_0x1c574e::
text " Poof!@"
interpret_data
@@ -348,11 +342,8 @@
UnknownText_0x1c5821::
current_day
- db "@"
+ db "@@"
-UnknownText_0x1c5823::
- db "@"
-
UnknownText_0x1c5824::
text "<......>"
done
@@ -507,18 +498,12 @@
text ""
line "was caught!@"
sound_caught_mon
- db "@"
+ db "@@"
-UnknownText_0x1c5b34::
- db "@"
-
Text_Waitbutton_2::
text_waitbutton
- db "@"
+ db "@@"
-UnknownText_0x1c5b37::
- db "@"
-
UnknownText_0x1c5b38::
text_from_ram wd050
text " was"
@@ -532,11 +517,8 @@
cont "the #DEX.@"
sound_slot_machine_start
text_waitbutton
- db "@"
+ db "@@"
-UnknownText_0x1c5b7e::
- db "@"
-
UnknownText_0x1c5b7f::
text "Give a nickname to"
line "@"
@@ -580,11 +562,8 @@
text "<PLAYER> played the"
line "# FLUTE.@"
text_waitbutton
- db "@"
+ db "@@"
-UnknownText_0x1c5c5d::
- db "@"
-
UnknownText_0x1c5c5e::
text "You now have"
line "@"
@@ -596,10 +575,7 @@
text "Coins:"
line "@"
deciram Coins, 2, 4
- db "@"
-
-UnknownText_0x1c5c89::
- db "@"
+ db "@@"
Text_RaiseThePPOfWhichMove::
text "Raise the PP of"