mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-01-23 09:16:20 -08:00
'db "@" \ db "@"' to 'db "@@"'.
This commit is contained in:
parent
82e2fe78e1
commit
da87d2a929
@ -397,13 +397,9 @@ BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
|
||||
deciram CurPartyLevel, 1, 3
|
||||
text "!@"
|
||||
sound_dex_fanfare_50_79
|
||||
db "@"
|
||||
db "@@"
|
||||
; 0x80cb9
|
||||
|
||||
BattleText_0x80cb9: ; 0x80cb9
|
||||
db "@"
|
||||
; 0x80cba
|
||||
|
||||
BattleText_WildPkmnIsEating: ; 0x80cba
|
||||
text "Wild @"
|
||||
text_from_ram EnemyMonNick
|
||||
|
@ -95,10 +95,7 @@ UnknownText_0x1bc14f::
|
||||
text "!@"
|
||||
sound_dex_fanfare_50_79
|
||||
text_waitbutton
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1bc16d::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1bc16e::
|
||||
text_from_ram StringBuffer1
|
||||
@ -147,12 +144,11 @@ UnknownText_0x1bc272::
|
||||
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 @@ UnknownText_0x1bc2eb::
|
||||
done
|
||||
|
||||
UnknownText_0x1bc2fd::
|
||||
text "What?@"
|
||||
db "@"
|
||||
text "What?@@"
|
||||
|
||||
UnknownText_0x1bc305::
|
||||
text "?"
|
||||
@ -178,8 +173,7 @@ UnknownText_0x1bc308::
|
||||
done
|
||||
|
||||
UnknownText_0x1bc31b::
|
||||
text "Whoa!@"
|
||||
db "@"
|
||||
text "Whoa!@@"
|
||||
|
||||
UnknownText_0x1bc323::
|
||||
text "?"
|
||||
@ -299,6 +293,7 @@ UnknownText_0x1bc51c::
|
||||
line "@"
|
||||
text_from_ram StringBuffer3
|
||||
text ""
|
||||
|
||||
para "and set up the"
|
||||
line "@"
|
||||
text_from_ram StringBuffer4
|
||||
@ -424,10 +419,7 @@ UnknownText_0x1bc75e::
|
||||
text " will"
|
||||
line "trade @"
|
||||
text_from_ram wc703
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1bc773::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1bc774::
|
||||
text "for @"
|
||||
@ -443,10 +435,7 @@ UnknownText_0x1bc787::
|
||||
text " will"
|
||||
line "trade @"
|
||||
text_from_ram wc6d1
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1bc79c::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1bc79d::
|
||||
text "for @"
|
||||
@ -512,10 +501,7 @@ UnknownText_0x1bc84b::
|
||||
text ""
|
||||
line "OAK: @"
|
||||
text_from_ram wd050
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1bc857::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1bc858::
|
||||
text ""
|
||||
@ -704,10 +690,7 @@ UnknownText_0x1bca91::
|
||||
text ""
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1bca98::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1bca99::
|
||||
text ""
|
||||
@ -850,10 +833,7 @@ UnknownText_0x1bcc72::
|
||||
text_from_ram StringBuffer2
|
||||
text " @"
|
||||
text_from_ram StringBuffer1
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1bcc7f::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1bcc80::
|
||||
text ""
|
||||
@ -939,10 +919,7 @@ UnknownText_0x1bcda0::
|
||||
text ""
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1bcda7::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1bcda8::
|
||||
text ""
|
||||
@ -1333,10 +1310,7 @@ UnknownText_0x1bd3be::
|
||||
text "!@"
|
||||
sound_item
|
||||
text_waitbutton
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1bd3d6::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1bd3d7::
|
||||
text "You have no coins."
|
||||
@ -1359,16 +1333,12 @@ UnknownText_0x1bd429::
|
||||
text " for"
|
||||
cont "@"
|
||||
text_from_ram StringBuffer2
|
||||
text ".@"
|
||||
db "@"
|
||||
text ".@@"
|
||||
|
||||
UnknownText_0x1bd445::
|
||||
sound_dex_fanfare_80_109
|
||||
interpret_data
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1bd448::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1bd449::
|
||||
text "I collect #MON."
|
||||
@ -1553,7 +1523,8 @@ UnknownText_0x1bd77f::
|
||||
UnknownText_0x1bd868::
|
||||
text "OK, I'll take care"
|
||||
line "of your money."
|
||||
para $56, $56, $56
|
||||
|
||||
para "<......><......><......>"
|
||||
prompt
|
||||
|
||||
UnknownText_0x1bd88e::
|
||||
|
@ -96,8 +96,7 @@ UnknownText_0x1c0272::
|
||||
|
||||
Text_Gained::
|
||||
text_from_ram StringBuffer1
|
||||
text " gained@"
|
||||
db "@"
|
||||
text " gained@@"
|
||||
|
||||
Text_ABoostedStringBuffer2ExpPoints::
|
||||
text ""
|
||||
@ -115,22 +114,18 @@ Text_StringBuffer2ExpPoints::
|
||||
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_BattleMonNick01::
|
||||
|
||||
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 @@ UnknownText_0x1c0609::
|
||||
text "A blinding FLASH"
|
||||
line "lights the area!@"
|
||||
text_waitbutton
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1c062e::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
_UsedSurfText::
|
||||
text_from_ram StringBuffer2
|
||||
|
@ -53,6 +53,7 @@ UnknownText_0x1c071a::
|
||||
UnknownText_0x1c073b::
|
||||
text "Can't use that"
|
||||
line "here."
|
||||
|
||||
para ""
|
||||
done
|
||||
|
||||
@ -341,10 +342,7 @@ UnknownText_0x1c0cc6::
|
||||
text "<USER>'s"
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1c0ccf::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1c0cd0::
|
||||
interpret_data
|
||||
@ -359,10 +357,7 @@ UnknownText_0x1c0ceb::
|
||||
text "<TARGET>'s"
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1c0cf4::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1c0cf5::
|
||||
interpret_data
|
||||
@ -374,8 +369,7 @@ UnknownText_0x1c0d06::
|
||||
prompt
|
||||
|
||||
UnknownText_0x1c0d0e::
|
||||
text "<USER>@"
|
||||
db "@"
|
||||
text "<USER>@@"
|
||||
|
||||
UnknownText_0x1c0d12::
|
||||
text ""
|
||||
@ -408,30 +402,23 @@ UnknownText_0x1c0d6c::
|
||||
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 "@"
|
||||
|
||||
UnknownText_0x1c0da0::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
_EndUsedMove1Text::
|
||||
text "!"
|
||||
@ -455,8 +442,7 @@ _EndUsedMove5Text::
|
||||
|
||||
UnknownText_0x1c0db0::
|
||||
text "Huh?"
|
||||
para "@"
|
||||
db "@"
|
||||
para "@@"
|
||||
|
||||
UnknownText_0x1c0db8::
|
||||
text ""
|
||||
@ -468,10 +454,7 @@ UnknownText_0x1c0dba::
|
||||
line "out of its EGG!@"
|
||||
sound_caught_mon
|
||||
text_waitbutton
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1c0dd7::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1c0dd8::
|
||||
text "Give a nickname to"
|
||||
@ -578,10 +561,7 @@ UnknownText_0x1c0fbc::
|
||||
text ""
|
||||
line "Animation type @"
|
||||
text_from_ram StringBuffer2
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1c0fdc::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1c0fdd::
|
||||
text "#MON number?"
|
||||
@ -647,17 +627,18 @@ ContestJudging_FirstPlaceText::
|
||||
line "Contest winner is@"
|
||||
interpret_data
|
||||
text "…"
|
||||
|
||||
para "@"
|
||||
text_from_ram wBugContestWinnerName
|
||||
text ","
|
||||
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 @@ ContestJudging_SecondPlaceText::
|
||||
para "who caught a"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text "!@"
|
||||
db "@"
|
||||
text "!@@"
|
||||
|
||||
ContestJudging_SecondPlaceScoreText::
|
||||
text ""
|
||||
@ -691,8 +671,7 @@ ContestJudging_ThirdPlaceText::
|
||||
para "who caught a"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text "!@"
|
||||
db "@"
|
||||
text "!@@"
|
||||
|
||||
ContestJudging_ThirdPlaceScoreText::
|
||||
text ""
|
||||
@ -720,10 +699,7 @@ UnknownText_0x1c123a::
|
||||
line "@"
|
||||
text_from_ram wMagikarpRecordHoldersName
|
||||
text_waitbutton
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1c1260::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1c1261::
|
||||
text "Congratulations!"
|
||||
@ -1206,15 +1182,11 @@ _OakText2::
|
||||
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"
|
||||
|
@ -447,10 +447,7 @@ UnknownText_0x1c4b92::
|
||||
text "Congratulations!"
|
||||
line "Your @"
|
||||
text_from_ram StringBuffer2
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1c4bae::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1c4baf::
|
||||
text ""
|
||||
|
@ -237,10 +237,7 @@ UnknownText_0x1c5660::
|
||||
text "!@"
|
||||
sound_dex_fanfare_50_79
|
||||
text_waitbutton
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1c5677::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1c5678::
|
||||
text "Which move should"
|
||||
@ -287,10 +284,7 @@ UnknownText_0x1c56c9::
|
||||
UnknownText_0x1c5740::
|
||||
text "1, 2 and…@"
|
||||
interpret_data
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1c574d::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1c574e::
|
||||
text " Poof!@"
|
||||
@ -348,10 +342,7 @@ UnknownText_0x1c581a::
|
||||
|
||||
UnknownText_0x1c5821::
|
||||
current_day
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1c5823::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1c5824::
|
||||
text "<......>"
|
||||
@ -507,17 +498,11 @@ UnknownText_0x1c5b17::
|
||||
text ""
|
||||
line "was caught!@"
|
||||
sound_caught_mon
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1c5b34::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
Text_Waitbutton_2::
|
||||
text_waitbutton
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1c5b37::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1c5b38::
|
||||
text_from_ram wd050
|
||||
@ -532,10 +517,7 @@ UnknownText_0x1c5b53::
|
||||
cont "the #DEX.@"
|
||||
sound_slot_machine_start
|
||||
text_waitbutton
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1c5b7e::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1c5b7f::
|
||||
text "Give a nickname to"
|
||||
@ -580,10 +562,7 @@ UnknownText_0x1c5c44::
|
||||
text "<PLAYER> played the"
|
||||
line "# FLUTE.@"
|
||||
text_waitbutton
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1c5c5d::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1c5c5e::
|
||||
text "You now have"
|
||||
@ -596,10 +575,7 @@ UnknownText_0x1c5c7b::
|
||||
text "Coins:"
|
||||
line "@"
|
||||
deciram Coins, 2, 4
|
||||
db "@"
|
||||
|
||||
UnknownText_0x1c5c89::
|
||||
db "@"
|
||||
db "@@"
|
||||
|
||||
Text_RaiseThePPOfWhichMove::
|
||||
text "Raise the PP of"
|
||||
|
Loading…
x
Reference in New Issue
Block a user