'db "@" \ db "@"' to 'db "@@"'.

This commit is contained in:
IIMarckus 2015-12-18 03:39:09 -07:00
parent 82e2fe78e1
commit da87d2a929
6 changed files with 58 additions and 158 deletions

View File

@ -397,13 +397,9 @@ BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
deciram CurPartyLevel, 1, 3 deciram CurPartyLevel, 1, 3
text "!@" text "!@"
sound_dex_fanfare_50_79 sound_dex_fanfare_50_79
db "@" db "@@"
; 0x80cb9 ; 0x80cb9
BattleText_0x80cb9: ; 0x80cb9
db "@"
; 0x80cba
BattleText_WildPkmnIsEating: ; 0x80cba BattleText_WildPkmnIsEating: ; 0x80cba
text "Wild @" text "Wild @"
text_from_ram EnemyMonNick text_from_ram EnemyMonNick

View File

@ -95,10 +95,7 @@ UnknownText_0x1bc14f::
text "!@" text "!@"
sound_dex_fanfare_50_79 sound_dex_fanfare_50_79
text_waitbutton text_waitbutton
db "@" db "@@"
UnknownText_0x1bc16d::
db "@"
UnknownText_0x1bc16e:: UnknownText_0x1bc16e::
text_from_ram StringBuffer1 text_from_ram StringBuffer1
@ -147,12 +144,11 @@ UnknownText_0x1bc272::
done done
UnknownText_0x1bc288:: UnknownText_0x1bc288::
text "CARD FOLDER open.@" text "CARD FOLDER open.@@"
db "@"
UnknownText_0x1bc29c:: UnknownText_0x1bc29c::
text $56, $56, $56, $56, $56, $56 text "<......><......><......><......><......><......>"
line $56, $56, $56, $56, $56, $56 line "<......><......><......><......><......><......>"
para "Zzz… Hm? Wha…?" para "Zzz… Hm? Wha…?"
line "You woke me up!" line "You woke me up!"
@ -166,8 +162,7 @@ UnknownText_0x1bc2eb::
done done
UnknownText_0x1bc2fd:: UnknownText_0x1bc2fd::
text "What?@" text "What?@@"
db "@"
UnknownText_0x1bc305:: UnknownText_0x1bc305::
text "?" text "?"
@ -178,8 +173,7 @@ UnknownText_0x1bc308::
done done
UnknownText_0x1bc31b:: UnknownText_0x1bc31b::
text "Whoa!@" text "Whoa!@@"
db "@"
UnknownText_0x1bc323:: UnknownText_0x1bc323::
text "?" text "?"
@ -299,6 +293,7 @@ UnknownText_0x1bc51c::
line "@" line "@"
text_from_ram StringBuffer3 text_from_ram StringBuffer3
text "" text ""
para "and set up the" para "and set up the"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram StringBuffer4
@ -424,10 +419,7 @@ UnknownText_0x1bc75e::
text " will" text " will"
line "trade @" line "trade @"
text_from_ram wc703 text_from_ram wc703
db "@" db "@@"
UnknownText_0x1bc773::
db "@"
UnknownText_0x1bc774:: UnknownText_0x1bc774::
text "for @" text "for @"
@ -443,10 +435,7 @@ UnknownText_0x1bc787::
text " will" text " will"
line "trade @" line "trade @"
text_from_ram wc6d1 text_from_ram wc6d1
db "@" db "@@"
UnknownText_0x1bc79c::
db "@"
UnknownText_0x1bc79d:: UnknownText_0x1bc79d::
text "for @" text "for @"
@ -512,10 +501,7 @@ UnknownText_0x1bc84b::
text "" text ""
line "OAK: @" line "OAK: @"
text_from_ram wd050 text_from_ram wd050
db "@" db "@@"
UnknownText_0x1bc857::
db "@"
UnknownText_0x1bc858:: UnknownText_0x1bc858::
text "" text ""
@ -704,10 +690,7 @@ UnknownText_0x1bca91::
text "" text ""
line "@" line "@"
text_from_ram StringBuffer1 text_from_ram StringBuffer1
db "@" db "@@"
UnknownText_0x1bca98::
db "@"
UnknownText_0x1bca99:: UnknownText_0x1bca99::
text "" text ""
@ -850,10 +833,7 @@ UnknownText_0x1bcc72::
text_from_ram StringBuffer2 text_from_ram StringBuffer2
text " @" text " @"
text_from_ram StringBuffer1 text_from_ram StringBuffer1
db "@" db "@@"
UnknownText_0x1bcc7f::
db "@"
UnknownText_0x1bcc80:: UnknownText_0x1bcc80::
text "" text ""
@ -939,10 +919,7 @@ UnknownText_0x1bcda0::
text "" text ""
line "@" line "@"
text_from_ram StringBuffer1 text_from_ram StringBuffer1
db "@" db "@@"
UnknownText_0x1bcda7::
db "@"
UnknownText_0x1bcda8:: UnknownText_0x1bcda8::
text "" text ""
@ -1333,10 +1310,7 @@ UnknownText_0x1bd3be::
text "!@" text "!@"
sound_item sound_item
text_waitbutton text_waitbutton
db "@" db "@@"
UnknownText_0x1bd3d6::
db "@"
UnknownText_0x1bd3d7:: UnknownText_0x1bd3d7::
text "You have no coins." text "You have no coins."
@ -1359,16 +1333,12 @@ UnknownText_0x1bd429::
text " for" text " for"
cont "@" cont "@"
text_from_ram StringBuffer2 text_from_ram StringBuffer2
text ".@" text ".@@"
db "@"
UnknownText_0x1bd445:: UnknownText_0x1bd445::
sound_dex_fanfare_80_109 sound_dex_fanfare_80_109
interpret_data interpret_data
db "@" db "@@"
UnknownText_0x1bd448::
db "@"
UnknownText_0x1bd449:: UnknownText_0x1bd449::
text "I collect #MON." text "I collect #MON."
@ -1553,7 +1523,8 @@ UnknownText_0x1bd77f::
UnknownText_0x1bd868:: UnknownText_0x1bd868::
text "OK, I'll take care" text "OK, I'll take care"
line "of your money." line "of your money."
para $56, $56, $56
para "<......><......><......>"
prompt prompt
UnknownText_0x1bd88e:: UnknownText_0x1bd88e::

View File

@ -96,8 +96,7 @@ UnknownText_0x1c0272::
Text_Gained:: Text_Gained::
text_from_ram StringBuffer1 text_from_ram StringBuffer1
text " gained@" text " gained@@"
db "@"
Text_ABoostedStringBuffer2ExpPoints:: Text_ABoostedStringBuffer2ExpPoints::
text "" text ""
@ -115,22 +114,18 @@ Text_StringBuffer2ExpPoints::
prompt prompt
Text_GoPkmn:: Text_GoPkmn::
text "Go! @" text "Go! @@"
db "@"
Text_DoItPkmn:: Text_DoItPkmn::
text "Do it! @" text "Do it! @@"
db "@"
Text_GoForItPkmn:: Text_GoForItPkmn::
text "Go for it," text "Go for it,"
line "@" line "@@"
db "@"
Text_YourFoesWeakGetmPkmn:: Text_YourFoesWeakGetmPkmn::
text "Your foe's weak!" text "Your foe's weak!"
line "Get'm, @" line "Get'm, @@"
db "@"
Text_BattleMonNick01:: Text_BattleMonNick01::
text_from_ram BattleMonNick text_from_ram BattleMonNick
@ -139,23 +134,19 @@ Text_BattleMonNick01::
Text_BattleMonNickComma:: Text_BattleMonNickComma::
text_from_ram BattleMonNick text_from_ram BattleMonNick
text ",@" text ",@@"
db "@"
Text_ThatsEnoughComeBack:: Text_ThatsEnoughComeBack::
text " that's" text " that's"
line "enough! Come back!@" line "enough! Come back!@@"
db "@"
Text_OKComeBack:: Text_OKComeBack::
text " OK!" text " OK!"
line "Come back!@" line "Come back!@@"
db "@"
Text_GoodComeBack:: Text_GoodComeBack::
text " good!" text " good!"
line "Come back!@" line "Come back!@@"
db "@"
Text_ComeBack:: Text_ComeBack::
text " come" text " come"
@ -315,10 +306,7 @@ UnknownText_0x1c0609::
text "A blinding FLASH" text "A blinding FLASH"
line "lights the area!@" line "lights the area!@"
text_waitbutton text_waitbutton
db "@" db "@@"
UnknownText_0x1c062e::
db "@"
_UsedSurfText:: _UsedSurfText::
text_from_ram StringBuffer2 text_from_ram StringBuffer2

View File

@ -53,6 +53,7 @@ UnknownText_0x1c071a::
UnknownText_0x1c073b:: UnknownText_0x1c073b::
text "Can't use that" text "Can't use that"
line "here." line "here."
para "" para ""
done done
@ -341,10 +342,7 @@ UnknownText_0x1c0cc6::
text "<USER>'s" text "<USER>'s"
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram StringBuffer2
db "@" db "@@"
UnknownText_0x1c0ccf::
db "@"
UnknownText_0x1c0cd0:: UnknownText_0x1c0cd0::
interpret_data interpret_data
@ -359,10 +357,7 @@ UnknownText_0x1c0ceb::
text "<TARGET>'s" text "<TARGET>'s"
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram StringBuffer2
db "@" db "@@"
UnknownText_0x1c0cf4::
db "@"
UnknownText_0x1c0cf5:: UnknownText_0x1c0cf5::
interpret_data interpret_data
@ -374,8 +369,7 @@ UnknownText_0x1c0d06::
prompt prompt
UnknownText_0x1c0d0e:: UnknownText_0x1c0d0e::
text "<USER>@" text "<USER>@@"
db "@"
UnknownText_0x1c0d12:: UnknownText_0x1c0d12::
text "" text ""
@ -408,30 +402,23 @@ UnknownText_0x1c0d6c::
prompt prompt
_ActorNameText:: _ActorNameText::
text "<USER>@" text "<USER>@@"
db "@"
_UsedMove1Text:: _UsedMove1Text::
text "" text ""
line "used @" line "used @@"
db "@"
_UsedMove2Text:: _UsedMove2Text::
text "" text ""
line "used @" line "used @@"
db "@"
_UsedInsteadText:: _UsedInsteadText::
text "instead," text "instead,"
cont "@" cont "@@"
db "@"
_MoveNameText:: _MoveNameText::
text_from_ram StringBuffer2 text_from_ram StringBuffer2
db "@" db "@@"
UnknownText_0x1c0da0::
db "@"
_EndUsedMove1Text:: _EndUsedMove1Text::
text "!" text "!"
@ -455,8 +442,7 @@ _EndUsedMove5Text::
UnknownText_0x1c0db0:: UnknownText_0x1c0db0::
text "Huh?" text "Huh?"
para "@" para "@@"
db "@"
UnknownText_0x1c0db8:: UnknownText_0x1c0db8::
text "" text ""
@ -468,10 +454,7 @@ UnknownText_0x1c0dba::
line "out of its EGG!@" line "out of its EGG!@"
sound_caught_mon sound_caught_mon
text_waitbutton text_waitbutton
db "@" db "@@"
UnknownText_0x1c0dd7::
db "@"
UnknownText_0x1c0dd8:: UnknownText_0x1c0dd8::
text "Give a nickname to" text "Give a nickname to"
@ -578,10 +561,7 @@ UnknownText_0x1c0fbc::
text "" text ""
line "Animation type @" line "Animation type @"
text_from_ram StringBuffer2 text_from_ram StringBuffer2
db "@" db "@@"
UnknownText_0x1c0fdc::
db "@"
UnknownText_0x1c0fdd:: UnknownText_0x1c0fdd::
text "#MON number?" text "#MON number?"
@ -647,17 +627,18 @@ ContestJudging_FirstPlaceText::
line "Contest winner is@" line "Contest winner is@"
interpret_data interpret_data
text "…" text "…"
para "@" para "@"
text_from_ram wBugContestWinnerName text_from_ram wBugContestWinnerName
text "," text ","
line "who caught a" line "who caught a"
cont "@" cont "@"
text_from_ram StringBuffer1 text_from_ram StringBuffer1
text "!@" text "!@@"
db "@"
ContestJudging_FirstPlaceScoreText:: ContestJudging_FirstPlaceScoreText::
text "" text ""
para "The winning score" para "The winning score"
line "was @" line "was @"
deciram wBugContestFirstPlaceScore, 2, 3 deciram wBugContestFirstPlaceScore, 2, 3
@ -672,8 +653,7 @@ ContestJudging_SecondPlaceText::
para "who caught a" para "who caught a"
line "@" line "@"
text_from_ram StringBuffer1 text_from_ram StringBuffer1
text "!@" text "!@@"
db "@"
ContestJudging_SecondPlaceScoreText:: ContestJudging_SecondPlaceScoreText::
text "" text ""
@ -691,8 +671,7 @@ ContestJudging_ThirdPlaceText::
para "who caught a" para "who caught a"
line "@" line "@"
text_from_ram StringBuffer1 text_from_ram StringBuffer1
text "!@" text "!@@"
db "@"
ContestJudging_ThirdPlaceScoreText:: ContestJudging_ThirdPlaceScoreText::
text "" text ""
@ -720,10 +699,7 @@ UnknownText_0x1c123a::
line "@" line "@"
text_from_ram wMagikarpRecordHoldersName text_from_ram wMagikarpRecordHoldersName
text_waitbutton text_waitbutton
db "@" db "@@"
UnknownText_0x1c1260::
db "@"
UnknownText_0x1c1261:: UnknownText_0x1c1261::
text "Congratulations!" text "Congratulations!"
@ -1206,15 +1182,11 @@ _OakText2::
text "This world is in-" text "This world is in-"
line "habited by crea-" line "habited by crea-"
cont "tures that we call" cont "tures that we call"
cont "#MON.@" cont "#MON.@@"
db "@"
_OakText3:: _OakText3::
text_waitbutton text_waitbutton
db "@" db "@@"
UnknownText_0x1c1de4::
db "@"
_OakText4:: _OakText4::
text "People and #MON" text "People and #MON"

View File

@ -447,10 +447,7 @@ UnknownText_0x1c4b92::
text "Congratulations!" text "Congratulations!"
line "Your @" line "Your @"
text_from_ram StringBuffer2 text_from_ram StringBuffer2
db "@" db "@@"
UnknownText_0x1c4bae::
db "@"
UnknownText_0x1c4baf:: UnknownText_0x1c4baf::
text "" text ""

View File

@ -237,10 +237,7 @@ UnknownText_0x1c5660::
text "!@" text "!@"
sound_dex_fanfare_50_79 sound_dex_fanfare_50_79
text_waitbutton text_waitbutton
db "@" db "@@"
UnknownText_0x1c5677::
db "@"
UnknownText_0x1c5678:: UnknownText_0x1c5678::
text "Which move should" text "Which move should"
@ -287,10 +284,7 @@ UnknownText_0x1c56c9::
UnknownText_0x1c5740:: UnknownText_0x1c5740::
text "1, 2 and…@" text "1, 2 and…@"
interpret_data interpret_data
db "@" db "@@"
UnknownText_0x1c574d::
db "@"
UnknownText_0x1c574e:: UnknownText_0x1c574e::
text " Poof!@" text " Poof!@"
@ -348,10 +342,7 @@ UnknownText_0x1c581a::
UnknownText_0x1c5821:: UnknownText_0x1c5821::
current_day current_day
db "@" db "@@"
UnknownText_0x1c5823::
db "@"
UnknownText_0x1c5824:: UnknownText_0x1c5824::
text "<......>" text "<......>"
@ -507,17 +498,11 @@ UnknownText_0x1c5b17::
text "" text ""
line "was caught!@" line "was caught!@"
sound_caught_mon sound_caught_mon
db "@" db "@@"
UnknownText_0x1c5b34::
db "@"
Text_Waitbutton_2:: Text_Waitbutton_2::
text_waitbutton text_waitbutton
db "@" db "@@"
UnknownText_0x1c5b37::
db "@"
UnknownText_0x1c5b38:: UnknownText_0x1c5b38::
text_from_ram wd050 text_from_ram wd050
@ -532,10 +517,7 @@ UnknownText_0x1c5b53::
cont "the #DEX.@" cont "the #DEX.@"
sound_slot_machine_start sound_slot_machine_start
text_waitbutton text_waitbutton
db "@" db "@@"
UnknownText_0x1c5b7e::
db "@"
UnknownText_0x1c5b7f:: UnknownText_0x1c5b7f::
text "Give a nickname to" text "Give a nickname to"
@ -580,10 +562,7 @@ UnknownText_0x1c5c44::
text "<PLAYER> played the" text "<PLAYER> played the"
line "# FLUTE.@" line "# FLUTE.@"
text_waitbutton text_waitbutton
db "@" db "@@"
UnknownText_0x1c5c5d::
db "@"
UnknownText_0x1c5c5e:: UnknownText_0x1c5c5e::
text "You now have" text "You now have"
@ -596,10 +575,7 @@ UnknownText_0x1c5c7b::
text "Coins:" text "Coins:"
line "@" line "@"
deciram Coins, 2, 4 deciram Coins, 2, 4
db "@" db "@@"
UnknownText_0x1c5c89::
db "@"
Text_RaiseThePPOfWhichMove:: Text_RaiseThePPOfWhichMove::
text "Raise the PP of" text "Raise the PP of"