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
@@ -6,14 +6,14 @@ _FruitBearingTreeText::
|
||||
_HeyItsFruitText::
|
||||
text "Hey! It's"
|
||||
line "@"
|
||||
text_from_ram StringBuffer3
|
||||
text_from_ram wStringBuffer3
|
||||
text "!"
|
||||
done
|
||||
|
||||
_ObtainedFruitText::
|
||||
text "Obtained"
|
||||
line "@"
|
||||
text_from_ram StringBuffer3
|
||||
text_from_ram wStringBuffer3
|
||||
text "!"
|
||||
done
|
||||
|
||||
@@ -38,7 +38,7 @@ UnknownText_0x1bc089::
|
||||
done
|
||||
|
||||
UnknownText_0x1bc0a2::
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text_start
|
||||
line "recovered @"
|
||||
deciram wd1f3, 2, 3
|
||||
@@ -46,59 +46,59 @@ UnknownText_0x1bc0a2::
|
||||
done
|
||||
|
||||
UnknownText_0x1bc0bb::
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "'s"
|
||||
line "cured of poison."
|
||||
done
|
||||
|
||||
UnknownText_0x1bc0d2::
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "'s"
|
||||
line "rid of paralysis."
|
||||
done
|
||||
|
||||
UnknownText_0x1bc0ea::
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "'s"
|
||||
line "burn was healed."
|
||||
done
|
||||
|
||||
UnknownText_0x1bc101::
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text_start
|
||||
line "was defrosted."
|
||||
done
|
||||
|
||||
UnknownText_0x1bc115::
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text_start
|
||||
line "woke up."
|
||||
done
|
||||
|
||||
UnknownText_0x1bc123::
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "'s"
|
||||
line "health returned."
|
||||
done
|
||||
|
||||
UnknownText_0x1bc13a::
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text_start
|
||||
line "is revitalized."
|
||||
done
|
||||
|
||||
UnknownText_0x1bc14f::
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text " grew to"
|
||||
line "level @"
|
||||
deciram CurPartyLevel, 1, 3
|
||||
deciram wCurPartyLevel, 1, 3
|
||||
text "!@"
|
||||
sound_dex_fanfare_50_79
|
||||
text_waitbutton
|
||||
db "@@"
|
||||
|
||||
UnknownText_0x1bc16e::
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text " came"
|
||||
line "to its senses."
|
||||
done
|
||||
@@ -276,7 +276,7 @@ UnknownText_0x1bc4b2::
|
||||
UnknownText_0x1bc4d7::
|
||||
text "Put away the"
|
||||
line "@"
|
||||
text_from_ram StringBuffer3
|
||||
text_from_ram wStringBuffer3
|
||||
text "."
|
||||
prompt
|
||||
|
||||
@@ -288,19 +288,19 @@ UnknownText_0x1bc4ec::
|
||||
UnknownText_0x1bc509::
|
||||
text "Set up the"
|
||||
line "@"
|
||||
text_from_ram StringBuffer3
|
||||
text_from_ram wStringBuffer3
|
||||
text "."
|
||||
prompt
|
||||
|
||||
UnknownText_0x1bc51c::
|
||||
text "Put away the"
|
||||
line "@"
|
||||
text_from_ram StringBuffer3
|
||||
text_from_ram wStringBuffer3
|
||||
text_start
|
||||
|
||||
para "and set up the"
|
||||
line "@"
|
||||
text_from_ram StringBuffer4
|
||||
text_from_ram wStringBuffer4
|
||||
text "."
|
||||
prompt
|
||||
|
||||
@@ -331,7 +331,7 @@ UnknownText_0x1bc5b3::
|
||||
UnknownText_0x1bc5d7::
|
||||
text "It's an adorable"
|
||||
line "@"
|
||||
text_from_ram StringBuffer3
|
||||
text_from_ram wStringBuffer3
|
||||
text "."
|
||||
done
|
||||
|
||||
@@ -517,14 +517,14 @@ _OPT_OakText2::
|
||||
_OPT_OakText3::
|
||||
text_start
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
done
|
||||
|
||||
_OPT_MaryText1::
|
||||
text_start
|
||||
line "MARY: @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "'s"
|
||||
done
|
||||
|
||||
@@ -695,7 +695,7 @@ _OPT_PokemonChannelText::
|
||||
_PokedexShowText::
|
||||
text_start
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
db "@@"
|
||||
|
||||
; Pokémon Music Channel / Pokémusic
|
||||
@@ -793,7 +793,7 @@ _LC_Text8::
|
||||
text_start
|
||||
line "Number is @"
|
||||
interpret_data
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "!"
|
||||
done
|
||||
|
||||
@@ -842,9 +842,9 @@ _PnP_Text3::
|
||||
_PnP_Text4::
|
||||
text_start
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text " @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
db "@@"
|
||||
|
||||
_PnP_cute::
|
||||
@@ -930,7 +930,7 @@ _PnP_odd::
|
||||
_PnP_Text5::
|
||||
text_start
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
db "@@"
|
||||
|
||||
_RocketRadioText1::
|
||||
@@ -1009,7 +1009,7 @@ _BuenaRadioText3::
|
||||
_BuenaRadioText4::
|
||||
text_start
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "!"
|
||||
done
|
||||
|
||||
@@ -1085,7 +1085,7 @@ Text_EnemyWithdrew::
|
||||
text "<ENEMY>"
|
||||
line "withdrew"
|
||||
cont "@"
|
||||
text_from_ram EnemyMonNick
|
||||
text_from_ram wEnemyMonNick
|
||||
text "!"
|
||||
prompt
|
||||
|
||||
@@ -1095,7 +1095,7 @@ Text_EnemyUsedOn::
|
||||
text_from_ram wMonOrItemNameBuffer
|
||||
text_start
|
||||
cont "on @"
|
||||
text_from_ram EnemyMonNick
|
||||
text_from_ram wEnemyMonNick
|
||||
text "!"
|
||||
prompt
|
||||
|
||||
@@ -1111,7 +1111,7 @@ Text_ThatItemCantBePutInThePack::
|
||||
|
||||
Text_TheItemWasPutInThePack::
|
||||
text "The @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text_start
|
||||
line "was put in the"
|
||||
cont "PACK."
|
||||
@@ -1138,7 +1138,7 @@ UnknownText_0x1bd05e::
|
||||
UnknownText_0x1bd07f::
|
||||
text "Will you play with"
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "?"
|
||||
done
|
||||
|
||||
@@ -1173,7 +1173,7 @@ UnknownText_0x1bd11c::
|
||||
UnknownText_0x1bd131::
|
||||
text "Test event"
|
||||
line "@"
|
||||
deciram StringBuffer2, 1, 2
|
||||
deciram wStringBuffer2, 1, 2
|
||||
text "?"
|
||||
done
|
||||
|
||||
@@ -1205,7 +1205,7 @@ UnknownText_0x1bd188::
|
||||
UnknownText_0x1bd19a::
|
||||
text "A new CARD arrived"
|
||||
line "from @"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "."
|
||||
done
|
||||
|
||||
@@ -1215,10 +1215,10 @@ UnknownText_0x1bd1ba::
|
||||
done
|
||||
|
||||
UnknownText_0x1bd1dd::
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "'s CARD was"
|
||||
line "listed as no.@"
|
||||
deciram StringBuffer1, 1, 2
|
||||
deciram wStringBuffer1, 1, 2
|
||||
text "."
|
||||
prompt
|
||||
|
||||
@@ -1251,10 +1251,10 @@ UnknownText_0x1bd266::
|
||||
|
||||
UnknownText_0x1bd286::
|
||||
text "Trading @"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text_start
|
||||
line "for @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "…"
|
||||
done
|
||||
|
||||
@@ -1286,7 +1286,7 @@ UnknownText_0x1bd308::
|
||||
UnknownText_0x1bd321::
|
||||
text "<PLAYER> found"
|
||||
line "@"
|
||||
text_from_ram StringBuffer3
|
||||
text_from_ram wStringBuffer3
|
||||
text "!"
|
||||
done
|
||||
|
||||
@@ -1298,10 +1298,10 @@ UnknownText_0x1bd331::
|
||||
UnknownText_0x1bd34b::
|
||||
text "I just saw some"
|
||||
line "rare @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text " in"
|
||||
cont "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "."
|
||||
|
||||
para "I'll call you if I"
|
||||
@@ -1315,10 +1315,10 @@ UnknownText_0x1bd39e::
|
||||
done
|
||||
|
||||
UnknownText_0x1bd3be::
|
||||
text_from_ram PlayerName
|
||||
text_from_ram wPlayerName
|
||||
text " received"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "!@"
|
||||
sound_item
|
||||
text_waitbutton
|
||||
@@ -1344,7 +1344,7 @@ UnknownText_0x1bd429::
|
||||
text_from_ram wMonOrItemNameBuffer
|
||||
text " for"
|
||||
cont "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text ".@@"
|
||||
|
||||
UnknownText_0x1bd445::
|
||||
@@ -1356,12 +1356,12 @@ UnknownText_0x1bd449::
|
||||
text "I collect #MON."
|
||||
line "Do you have"
|
||||
cont "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "?"
|
||||
|
||||
para "Want to trade it"
|
||||
line "for my @"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "?"
|
||||
done
|
||||
|
||||
@@ -1373,7 +1373,7 @@ UnknownText_0x1bd48c::
|
||||
UnknownText_0x1bd4aa::
|
||||
text "Huh? That's not"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text ". "
|
||||
cont "What a letdown…"
|
||||
done
|
||||
@@ -1381,7 +1381,7 @@ UnknownText_0x1bd4aa::
|
||||
UnknownText_0x1bd4d2::
|
||||
text "Yay! I got myself"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "!"
|
||||
cont "Thanks!"
|
||||
done
|
||||
@@ -1389,7 +1389,7 @@ UnknownText_0x1bd4d2::
|
||||
UnknownText_0x1bd4f4::
|
||||
text "Hi, how's my old"
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text " doing?"
|
||||
done
|
||||
|
||||
@@ -1399,12 +1399,12 @@ UnknownText_0x1bd512::
|
||||
|
||||
para "If you have"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text ", would"
|
||||
|
||||
para "you trade it for"
|
||||
line "my @"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "?"
|
||||
done
|
||||
|
||||
@@ -1419,7 +1419,7 @@ UnknownText_0x1bd565::
|
||||
UnknownText_0x1bd5a1::
|
||||
text "You don't have"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "? That's"
|
||||
cont "too bad, then."
|
||||
done
|
||||
@@ -1429,7 +1429,7 @@ UnknownText_0x1bd5cc::
|
||||
|
||||
para "I finally got"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
done
|
||||
|
||||
@@ -1448,12 +1448,12 @@ UnknownText_0x1bd621::
|
||||
|
||||
para "it. Do you have"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "?"
|
||||
|
||||
para "Want to trade it"
|
||||
line "for my @"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text "?"
|
||||
done
|
||||
|
||||
@@ -1465,7 +1465,7 @@ UnknownText_0x1bd673::
|
||||
UnknownText_0x1bd696::
|
||||
text "That's not"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
|
||||
para "Please trade with"
|
||||
@@ -1483,7 +1483,7 @@ UnknownText_0x1bd6cd::
|
||||
UnknownText_0x1bd6f5::
|
||||
text "How is that"
|
||||
line "@"
|
||||
text_from_ram StringBuffer2
|
||||
text_from_ram wStringBuffer2
|
||||
text " I"
|
||||
cont "traded you doing?"
|
||||
|
||||
@@ -1709,7 +1709,7 @@ UnknownText_0x1bdcff::
|
||||
UnknownText_0x1bdd30::
|
||||
text "OK. I'll raise"
|
||||
line "your @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
prompt
|
||||
|
||||
@@ -1722,25 +1722,25 @@ UnknownText_0x1bdd64::
|
||||
text "Are we geniuses or"
|
||||
line "what? Want to see"
|
||||
cont "your @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "?"
|
||||
done
|
||||
|
||||
UnknownText_0x1bdd96::
|
||||
text "Your @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text_start
|
||||
line "has grown a lot."
|
||||
|
||||
para "By level, it's"
|
||||
line "grown by @"
|
||||
deciram StringBuffer2 + 1, 1, 3
|
||||
deciram wStringBuffer2 + 1, 1, 3
|
||||
text "."
|
||||
|
||||
para "If you want your"
|
||||
line "#MON back, it"
|
||||
cont "will cost ¥@"
|
||||
deciram StringBuffer2 + 2, 3, 4
|
||||
deciram wStringBuffer2 + 2, 3, 4
|
||||
text "."
|
||||
done
|
||||
|
||||
@@ -1752,14 +1752,14 @@ UnknownText_0x1bde04::
|
||||
UnknownText_0x1bde1f::
|
||||
text "<PLAYER> got back"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text "."
|
||||
prompt
|
||||
|
||||
UnknownText_0x1bde32::
|
||||
text "Huh? Back already?"
|
||||
line "Your @"
|
||||
text_from_ram StringBuffer1
|
||||
text_from_ram wStringBuffer1
|
||||
text_start
|
||||
para "needs a little"
|
||||
line "more time with us."
|
||||
|
||||
Reference in New Issue
Block a user