Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
This commit is contained in:
Rangi
@@ -27,7 +27,7 @@ UnknownText_0x1c00a0::
|
||||
|
||||
UnknownText_0x1c00cd::
|
||||
text "Hm… @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "…"
|
||||
line "That's a fairly"
|
||||
cont "decent name."
|
||||
@@ -60,13 +60,13 @@ UnknownText_0x1c019e::
|
||||
|
||||
UnknownText_0x1c01be::
|
||||
text "Hm… @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "?"
|
||||
line "What a great name!"
|
||||
cont "It's perfect."
|
||||
|
||||
para "Treat @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text_start
|
||||
line "with loving care."
|
||||
done
|
||||
@@ -90,26 +90,26 @@ UnknownText_0x1c0272::
|
||||
text "All right. This"
|
||||
line "#MON is now"
|
||||
cont "named @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
prompt
|
||||
|
||||
Text_Gained::
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text " gained@@"
|
||||
|
||||
Text_ABoostedStringBuffer2ExpPoints::
|
||||
text_start
|
||||
line "a boosted"
|
||||
cont "@"
|
||||
deciram StringBuffer2, 2, 4
|
||||
deciram wStringBuffer2, 2, 4
|
||||
text " EXP. Points!"
|
||||
prompt
|
||||
|
||||
Text_StringBuffer2ExpPoints::
|
||||
text_start
|
||||
line "@"
|
||||
deciram StringBuffer2, 2, 4
|
||||
deciram wStringBuffer2, 2, 4
|
||||
text " EXP. Points!"
|
||||
prompt
|
||||
|
||||
@@ -128,12 +128,12 @@ Text_YourFoesWeakGetmPkmn::
|
||||
line "Get'm, @@"
|
||||
|
||||
Text_BattleMonNick01::
|
||||
text_from_ram BattleMonNick
|
||||
text_from_ram wBattleMonNick
|
||||
text "!"
|
||||
done
|
||||
|
||||
Text_BattleMonNickComma::
|
||||
text_from_ram BattleMonNick
|
||||
text_from_ram wBattleMonNick
|
||||
text ",@@"
|
||||
|
||||
Text_ThatsEnoughComeBack::
|
||||
@@ -164,26 +164,26 @@ UnknownText_0x1c0384::
|
||||
UnknownText_0x1c0396::
|
||||
text "It contained"
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "."
|
||||
|
||||
para "Teach @"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text_start
|
||||
line "to a #MON?"
|
||||
done
|
||||
|
||||
UnknownText_0x1c03c2::
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text " is"
|
||||
line "not compatible"
|
||||
cont "with @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
|
||||
para "It can't learn"
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "."
|
||||
prompt
|
||||
|
||||
@@ -191,14 +191,14 @@ UnknownText_0x1c03fa::
|
||||
text "You have no room"
|
||||
line "for any more"
|
||||
cont "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "S."
|
||||
prompt
|
||||
|
||||
UnknownText_0x1c0421::
|
||||
text "You received"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "!"
|
||||
prompt
|
||||
|
||||
@@ -236,7 +236,7 @@ UnknownText_0x1c04e9::
|
||||
text_from_ram wMysteryGiftPartnerName
|
||||
text " sent"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
prompt
|
||||
|
||||
@@ -244,7 +244,7 @@ UnknownText_0x1c04fa::
|
||||
text_from_ram wMysteryGiftPartnerName
|
||||
text " sent"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text_start
|
||||
cont "to @"
|
||||
text_from_ram wMysteryGiftPlayerName
|
||||
@@ -292,7 +292,7 @@ UnknownText_0x1c05c8::
|
||||
prompt
|
||||
|
||||
UnknownText_0x1c05dd::
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text " used"
|
||||
line "CUT!"
|
||||
prompt
|
||||
@@ -309,7 +309,7 @@ UnknownText_0x1c0609::
|
||||
db "@@"
|
||||
|
||||
_UsedSurfText::
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text " used"
|
||||
line "SURF!"
|
||||
done
|
||||
@@ -330,7 +330,7 @@ _AskSurfText::
|
||||
done
|
||||
|
||||
UnknownText_0x1c068e::
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text " used"
|
||||
line "WATERFALL!"
|
||||
done
|
||||
@@ -346,7 +346,7 @@ UnknownText_0x1c06bf::
|
||||
done
|
||||
|
||||
UnknownText_0x1c06de::
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text " used"
|
||||
line "DIG!"
|
||||
done
|
||||
@@ -379,13 +379,13 @@ UnknownText_0x1c0751::
|
||||
prompt
|
||||
|
||||
UnknownText_0x1c0774::
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text " used"
|
||||
line "STRENGTH!"
|
||||
done
|
||||
|
||||
UnknownText_0x1c0788::
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text " can"
|
||||
line "move boulders."
|
||||
prompt
|
||||
@@ -409,7 +409,7 @@ UnknownText_0x1c07f4::
|
||||
done
|
||||
|
||||
UnknownText_0x1c0816::
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text " used"
|
||||
line "WHIRLPOOL!"
|
||||
prompt
|
||||
@@ -431,7 +431,7 @@ UnknownText_0x1c0864::
|
||||
done
|
||||
|
||||
UnknownText_0x1c0897::
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text " did a"
|
||||
line "HEADBUTT!"
|
||||
prompt
|
||||
@@ -449,7 +449,7 @@ UnknownText_0x1c08bc::
|
||||
done
|
||||
|
||||
UnknownText_0x1c08f0::
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text " used"
|
||||
line "ROCK SMASH!"
|
||||
prompt
|
||||
@@ -489,14 +489,14 @@ UnknownText_0x1c099a::
|
||||
UnknownText_0x1c09b2::
|
||||
text "<PLAYER> got on the"
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "."
|
||||
done
|
||||
|
||||
UnknownText_0x1c09c7::
|
||||
text "<PLAYER> got off"
|
||||
line "the @"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "."
|
||||
done
|
||||
|
||||
@@ -515,7 +515,7 @@ UnknownText_0x1c0a05::
|
||||
UnknownText_0x1c0a1c::
|
||||
text "<PLAYER> found"
|
||||
line "@"
|
||||
text_from_ram StringBuffer3
|
||||
text_from_ram wStringBuffer3
|
||||
text "!"
|
||||
done
|
||||
|
||||
@@ -545,7 +545,7 @@ UnknownText_0x1c0aa9::
|
||||
prompt
|
||||
|
||||
UnknownText_0x1c0acc::
|
||||
text_from_ram StringBuffer3
|
||||
text_from_ram wStringBuffer3
|
||||
text_start
|
||||
line "fainted!"
|
||||
prompt
|
||||
@@ -559,7 +559,7 @@ UnknownText_0x1c0ada::
|
||||
prompt
|
||||
|
||||
UnknownText_0x1c0b03::
|
||||
text_from_ram StringBuffer3
|
||||
text_from_ram wStringBuffer3
|
||||
text " used"
|
||||
line "SWEET SCENT!"
|
||||
done
|
||||
@@ -601,14 +601,14 @@ UnknownText_0x1c0bbb::
|
||||
deciram wItemQuantityChangeBuffer, 1, 2
|
||||
text_start
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "(S)?"
|
||||
done
|
||||
|
||||
UnknownText_0x1c0bd8::
|
||||
text "Threw away"
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "(S)."
|
||||
prompt
|
||||
|
||||
@@ -626,7 +626,7 @@ Text_YouDontHaveAPkmn::
|
||||
UnknownText_0x1c0c2e::
|
||||
text "Registered the"
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "."
|
||||
prompt
|
||||
|
||||
@@ -657,7 +657,7 @@ Text_AreYouABoyOrAreYouAGirl::
|
||||
UnknownText_0x1c0cc6::
|
||||
text "<USER>'s"
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1c0cd0::
|
||||
@@ -672,7 +672,7 @@ UnknownText_0x1c0ce0::
|
||||
UnknownText_0x1c0ceb::
|
||||
text "<TARGET>'s"
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1c0cf5::
|
||||
@@ -733,7 +733,7 @@ _UsedInsteadText::
|
||||
cont "@@"
|
||||
|
||||
_MoveNameText::
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
db "@@"
|
||||
|
||||
_EndUsedMove1Text::
|
||||
@@ -766,7 +766,7 @@ UnknownText_0x1c0db8::
|
||||
done
|
||||
|
||||
UnknownText_0x1c0dba::
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text " came"
|
||||
line "out of its EGG!@"
|
||||
sound_caught_mon
|
||||
@@ -776,7 +776,7 @@ UnknownText_0x1c0dba::
|
||||
UnknownText_0x1c0dd8::
|
||||
text "Give a nickname to"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "?"
|
||||
done
|
||||
|
||||
@@ -804,28 +804,28 @@ UnknownText_0x1c0e54::
|
||||
UnknownText_0x1c0e6f::
|
||||
text "It has no interest"
|
||||
line "in @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
prompt
|
||||
|
||||
UnknownText_0x1c0e8d::
|
||||
text "It appears to care"
|
||||
line "for @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
prompt
|
||||
|
||||
UnknownText_0x1c0eac::
|
||||
text "It's friendly with"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
prompt
|
||||
|
||||
UnknownText_0x1c0ec6::
|
||||
text "It shows interest"
|
||||
line "in @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
prompt
|
||||
|
||||
@@ -874,10 +874,10 @@ UnknownText_0x1c0fb8::
|
||||
UnknownText_0x1c0fbc::
|
||||
deciram wcf64, 1, 3
|
||||
text " @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text_start
|
||||
line "Animation type @"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1c0fdd::
|
||||
@@ -885,7 +885,7 @@ UnknownText_0x1c0fdd::
|
||||
done
|
||||
|
||||
Text_WasSentToBillsPC::
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text " was"
|
||||
line "sent to BILL's PC."
|
||||
prompt
|
||||
@@ -924,7 +924,7 @@ UnknownText_0x1c10a2::
|
||||
|
||||
UnknownText_0x1c10c0::
|
||||
text "Caught @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "!"
|
||||
prompt
|
||||
|
||||
@@ -935,7 +935,7 @@ UnknownText_0x1c10cf::
|
||||
UnknownText_0x1c10dd::
|
||||
text "You already caught"
|
||||
line "a @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
prompt
|
||||
|
||||
@@ -950,7 +950,7 @@ ContestJudging_FirstPlaceText::
|
||||
text ","
|
||||
line "who caught a"
|
||||
cont "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "!@@"
|
||||
|
||||
ContestJudging_FirstPlaceScoreText::
|
||||
@@ -970,7 +970,7 @@ ContestJudging_SecondPlaceText::
|
||||
|
||||
para "who caught a"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "!@@"
|
||||
|
||||
ContestJudging_SecondPlaceScoreText::
|
||||
@@ -990,7 +990,7 @@ ContestJudging_ThirdPlaceText::
|
||||
|
||||
para "who caught a"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "!@@"
|
||||
|
||||
ContestJudging_ThirdPlaceScoreText::
|
||||
@@ -1008,7 +1008,7 @@ UnknownText_0x1c1203::
|
||||
|
||||
para "…Hm, it measures"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
prompt
|
||||
|
||||
@@ -1016,7 +1016,7 @@ UnknownText_0x1c123a::
|
||||
text "CURRENT RECORD"
|
||||
|
||||
para "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text " caught by"
|
||||
line "@"
|
||||
text_from_ram wMagikarpRecordHoldersName
|
||||
@@ -1030,7 +1030,7 @@ UnknownText_0x1c1261::
|
||||
line "with the ID number"
|
||||
|
||||
para "of @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text " in"
|
||||
line "your party."
|
||||
prompt
|
||||
@@ -1042,7 +1042,7 @@ UnknownText_0x1c12ae::
|
||||
line "with the ID number"
|
||||
|
||||
para "of @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text " in"
|
||||
line "your PC BOX."
|
||||
prompt
|
||||
@@ -1050,7 +1050,7 @@ UnknownText_0x1c12ae::
|
||||
UnknownText_0x1c12fc::
|
||||
text "Give a nickname to"
|
||||
line "the @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text " you"
|
||||
cont "received?"
|
||||
done
|
||||
@@ -1081,7 +1081,7 @@ _PlayersPCWithdrewItemsText::
|
||||
deciram wItemQuantityChangeBuffer, 1, 2
|
||||
text_start
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "(S)."
|
||||
prompt
|
||||
|
||||
@@ -1104,7 +1104,7 @@ _PlayersPCDepositItemsText::
|
||||
deciram wItemQuantityChangeBuffer, 1, 2
|
||||
text_start
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "(S)."
|
||||
prompt
|
||||
|
||||
@@ -1161,10 +1161,10 @@ _OakPCText2::
|
||||
prompt
|
||||
|
||||
_OakPCText3::
|
||||
text_from_ram StringBuffer3
|
||||
text_from_ram wStringBuffer3
|
||||
text " #MON seen"
|
||||
line "@"
|
||||
text_from_ram StringBuffer4
|
||||
text_from_ram wStringBuffer4
|
||||
text " #MON owned"
|
||||
|
||||
para "PROF.OAK's"
|
||||
@@ -1352,7 +1352,7 @@ UnknownText_0x1c1a6c::
|
||||
UnknownText_0x1c1a90::
|
||||
text "Toss out how many"
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "(S)?"
|
||||
done
|
||||
|
||||
@@ -1361,14 +1361,14 @@ UnknownText_0x1c1aad::
|
||||
deciram wItemQuantityChangeBuffer, 1, 2
|
||||
text_start
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "(S)?"
|
||||
done
|
||||
|
||||
UnknownText_0x1c1aca::
|
||||
text "Discarded"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "(S)."
|
||||
prompt
|
||||
|
||||
@@ -1388,12 +1388,12 @@ UnknownText_0x1c1b2c::
|
||||
text_from_ram wMonOrItemNameBuffer
|
||||
text "'s"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text " and"
|
||||
|
||||
para "made it hold"
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "."
|
||||
prompt
|
||||
|
||||
@@ -1402,7 +1402,7 @@ UnknownText_0x1c1b57::
|
||||
text_from_ram wMonOrItemNameBuffer
|
||||
text_start
|
||||
line "hold @"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "."
|
||||
prompt
|
||||
|
||||
@@ -1424,7 +1424,7 @@ UnknownText_0x1c1baa::
|
||||
|
||||
UnknownText_0x1c1bc4::
|
||||
text "Took @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text_start
|
||||
line "from @"
|
||||
text_from_ram wMonOrItemNameBuffer
|
||||
@@ -1437,7 +1437,7 @@ UnknownText_0x1c1bdc::
|
||||
line "already holding"
|
||||
|
||||
para "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
line "Switch items?"
|
||||
done
|
||||
@@ -1455,7 +1455,7 @@ UnknownText_0x1c1c22::
|
||||
UnknownText_0x1c1c47::
|
||||
text "MAIL detached from"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
prompt
|
||||
|
||||
|
||||
Reference in New Issue
Block a user