diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | data/text/common.asm | 16 | ||||
| -rw-r--r-- | data/text/common_1.asm | 1835 | ||||
| -rw-r--r-- | data/text/common_2.asm | 1596 | ||||
| -rw-r--r-- | data/text/common_3.asm | 550 | ||||
| -rwxr-xr-x | engine/main_menu.asm | 24 | ||||
| -rwxr-xr-x | engine/move_mon.asm | 10 | ||||
| -rwxr-xr-x | engine/pack.asm | 6 | ||||
| -rwxr-xr-x | engine/specials.asm | 4 | ||||
| -rw-r--r-- | home/map.asm | 2 | ||||
| -rw-r--r-- | home/text.asm | 8 | ||||
| -rwxr-xr-x | items/item_effects.asm | 18 | ||||
| -rw-r--r-- | macros/charmap.asm | 4 | ||||
| -rw-r--r-- | macros/text.asm | 8 | ||||
| -rwxr-xr-x | macros/wram.asm | 1 | ||||
| -rw-r--r-- | main.asm | 350 | ||||
| -rw-r--r-- | pokegold.link | 6 | ||||
| -rw-r--r-- | pokesilver.link | 6 | ||||
| -rw-r--r-- | wram.asm | 46 |
19 files changed, 4089 insertions, 402 deletions
@@ -12,6 +12,7 @@ includes := $(PYTHON) scan_includes.py rom_obj := \ +data/text/common.o \ wram.o \ main.o \ home.o diff --git a/data/text/common.asm b/data/text/common.asm new file mode 100644 index 00000000..d1fbb8b1 --- /dev/null +++ b/data/text/common.asm @@ -0,0 +1,16 @@ +INCLUDE "constants.asm" + + +SECTION "Text 1", ROMX + +INCLUDE "data/text/common_1.asm" + + +SECTION "Text 2", ROMX + +INCLUDE "data/text/common_2.asm" + + +SECTION "Text 3", ROMX + +INCLUDE "data/text/common_3.asm" diff --git a/data/text/common_1.asm b/data/text/common_1.asm new file mode 100644 index 00000000..10c5c8aa --- /dev/null +++ b/data/text/common_1.asm @@ -0,0 +1,1835 @@ +_FruitBearingTreeText:: + text "It's a fruit-" + line "bearing tree." + done + +_HeyItsFruitText:: + text "Hey! It's" + line "@" + text_from_ram wStringBuffer3 + text "!" + done + +_ObtainedFruitText:: + text "Obtained" + line "@" + text_from_ram wStringBuffer3 + text "!" + done + +_FruitPackIsFullText:: + text "But the PACK is" + line "full…" + done + +_NothingHereText:: + text "There's nothing" + line "here…" + done + +UnknownText_0x1bc0a2:: + text_from_ram wStringBuffer1 + text_start + line "recovered @" + deciram wLinkBuffer, 2, 3 + text "HP!" + done + +UnknownText_0x1bc0bb:: + text_from_ram wStringBuffer1 + text "'s" + line "cured of poison." + done + +UnknownText_0x1bc0d2:: + text_from_ram wStringBuffer1 + text "'s" + line "rid of paralysis." + done + +UnknownText_0x1bc0ea:: + text_from_ram wStringBuffer1 + text "'s" + line "burn was healed." + done + +UnknownText_0x1bc101:: + text_from_ram wStringBuffer1 + text_start + line "was defrosted." + done + +UnknownText_0x1bc115:: + text_from_ram wStringBuffer1 + text_start + line "woke up." + done + +UnknownText_0x1bc123:: + text_from_ram wStringBuffer1 + text "'s" + line "health returned." + done + +UnknownText_0x1bc13a:: + text_from_ram wStringBuffer1 + text_start + line "is revitalized." + done + +UnknownText_0x1bc14f:: + text_from_ram wStringBuffer1 + text " grew to" + line "level @" + deciram wCurPartyLevel, 1, 3 + text "!@" + sound_dex_fanfare_50_79 + text_waitbutton + db "@" + +UnknownText_0x1bc16e:: + text_from_ram wStringBuffer1 + text " came" + line "to its senses." + done + +UnknownText_0x1bc29c:: + text "<……><……><……><……><……><……>" + line "<……><……><……><……><……><……>" + + para "Zzz… Hm? Wha…?" + line "You woke me up!" + + para "Will you check the" + line "clock for me?" + prompt + +UnknownText_0x1bc2eb:: + text "What time is it?" + done + +UnknownText_0x1bc2fd:: + text "What?@@" + text "?" + done + +UnknownText_0x1bc308:: + text "How many minutes?" + done + +UnknownText_0x1bc31b:: + text "Whoa!@@" + +UnknownText_0x1bc323:: + text "?" + done + +UnknownText_0x1bc326:: + text "!" + line "I overslept!" + done + +UnknownText_0x1bc336:: + text "!" + line "Yikes! I over-" + cont "slept!" + done + +UnknownText_0x1bc34f:: + text "!" + line "No wonder it's so" + cont "dark!" + done + +UnknownText_0x1bc369:: + text "What day is it?" + done + +UnknownText_0x1bc37a:: + text ", is it?" + done + +Text_EnemyWithdrew:: + text "<ENEMY>" + line "withdrew" + cont "@" + text_from_ram wEnemyMonNick + text "!" + prompt + +Text_EnemyUsedOn:: + text "<ENEMY>" + line "used @" + text_from_ram wMonOrItemNameBuffer + text_start + cont "on @" + text_from_ram wEnemyMonNick + text "!" + prompt + +Text_ThatCantBeUsedRightNow:: + text "That can't be used" + line "right now." + prompt + +Text_ThatItemCantBePutInThePack:: + text "That item can't be" + line "put in the PACK." + done + +Text_TheItemWasPutInThePack:: + text "The @" + text_from_ram wStringBuffer1 + text_start + line "was put in the" + cont "PACK." + done + +Text_RemainingTime:: + text "Remaining Time" + done + +Text_YourMonsHPWasHealed:: + text "Your #MON's HP" + line "was healed." + prompt + +Text_Warping:: + text "Warping…" + done + +UnknownText_0x1bd05e:: + text "Which number" + line "should be changed?" + done + +UnknownText_0x1bd07f:: + text "Will you play with" + line "@" + text_from_ram wStringBuffer2 + text "?" + done + +UnknownText_0x1bd09a:: + text "You need two #-" + line "MON for breeding." + prompt + +Text_BreedingIsNotPossible:: + text "Breeding is not" + line "possible." + prompt + +UnknownText_0x1bd0d8:: + text "The compatibility" + line "is @" + deciram wTempNumBuffer, 1, 3 + text "." + cont "Should they breed?" + done + +UnknownText_0x1bd109:: + text "There is no EGG." + line "" + prompt + +UnknownText_0x1bd11c:: + text "It's going to" + line "hatch!" + prompt + +UnknownText_0x1bd131:: + text "Test event" + line "@" + deciram wStringBuffer2, 1, 2 + text "?" + done + + text "What do you want" + line "to play with?" + done + + text "You can have this." + prompt + +UnknownText_0x1bd188:: + text "The BOX is full!" + done + +UnknownText_0x1bd2a0:: + text "Obtained the" + line "VOLTORBBADGE!" + done + +UnknownText_0x1bc42c:: + text "The password is:" + line "" + done + +UnknownText_0x1bc43f:: + text "Is this OK?" + done + +UnknownText_0x1bc44c:: + text "Enter the" + line "ID no." + done + +UnknownText_0x1bc45e:: + text "Enter the" + line "amount." + done + +UnknownText_0x1bc471:: + text "There's nothing to" + line "choose." + prompt + +UnknownText_0x1bc48c:: + text "Which side do you" + line "want to put it on?" + done + +UnknownText_0x1bc4b2:: + text "Which side do you" + line "want to put away?" + done + +UnknownText_0x1bc4d7:: + text "Put away the" + line "@" + text_from_ram wStringBuffer3 + text "." + prompt + +UnknownText_0x1bc4ec:: + text "There's nothing to" + line "put away." + prompt + +UnknownText_0x1bc509:: + text "Set up the" + line "@" + text_from_ram wStringBuffer3 + text "." + prompt + +UnknownText_0x1bc51c:: + text "Put away the" + line "@" + text_from_ram wStringBuffer3 + text_start + + para "and set up the" + line "@" + text_from_ram wStringBuffer4 + text "." + prompt + +UnknownText_0x1bc546:: + text "That's already set" + line "up." + prompt + +UnknownText_0x1bc55d:: + text "It's the TOWN MAP." + done + +UnknownText_0x1bc570:: + text "It's a poster of a" + line "cute PIKACHU." + done + +UnknownText_0x1bc591:: + text "It's a poster of a" + line "cute CLEFAIRY." + done + +UnknownText_0x1bc5b3:: + text "It's a poster of a" + line "cute JIGGLYPUFF." + done + +UnknownText_0x1bc5d7:: + text "It's an adorable" + line "@" + text_from_ram wStringBuffer3 + text "." + done + +UnknownText_0x1bc5ef:: + text "A giant doll! It's" + line "fluffy and cuddly." + done + +UnknownText_0x1bc615:: + text "Hi, <PLAYER>!" + line "How are you?" + prompt + +UnknownText_0x1bc62a:: + text "I found a useful" + line "item shopping, so" + prompt + +UnknownText_0x1bc64e:: + text "I bought it with" + line "your money. Sorry!" + prompt + +UnknownText_0x1bc673:: + text "It's in your PC." + line "You'll like it!" + done + +UnknownText_0x1bc693:: + text "While shopping" + line "today, I saw this" + cont "adorable doll, so" + prompt + +UnknownText_0x1bc6c7:: + text "It's in your room." + line "You'll love it!" + done + +UnknownText_0x1bc6e9:: + text_from_ram wPlayerTrademonSpeciesName + text " was" + line "sent to @" + text_from_ram wOTTrademonSenderName + text "." + done + +UnknownText_0x1bc701:: + text_start + done + +UnknownText_0x1bc703:: + text_from_ram wOTTrademonSenderName + text " bids" + line "farewell to" + done + +UnknownText_0x1bc719:: + text_from_ram wOTTrademonSpeciesName + text "." + done + +UnknownText_0x1bc71f:: + text "Take good care of" + line "@" + text_from_ram wOTTrademonSpeciesName + text "." + done + +UnknownText_0x1bc739:: + text "For @" + text_from_ram wPlayerTrademonSenderName + text "'s" + line "@" + text_from_ram wPlayerTrademonSpeciesName + text "," + done + +UnknownText_0x1bc74c:: + text_from_ram wOTTrademonSenderName + text " sends" + line "@" + text_from_ram wOTTrademonSpeciesName + text "." + done + +UnknownText_0x1bc75e:: + text_from_ram wOTTrademonSenderName + text " will" + line "trade @" + text_from_ram wOTTrademonSpeciesName + db "@@" + +UnknownText_0x1bc774:: + text "for @" + text_from_ram wPlayerTrademonSenderName + text "'s" + line "@" + text_from_ram wPlayerTrademonSpeciesName + text "." + done + +; Oak's Pokémon Talk + +_OPT_IntroText1:: + text_start + line "MARY: PROF.OAK'S" + done + +_OPT_IntroText2:: + text_start + line "#MON TALK!" + done + +_OPT_IntroText3:: + text_start + line "With me, MARY!" + done + +_OPT_OakText1:: + text_start + line "OAK: @" + text_from_ram wMonOrItemNameBuffer + db "@@" + +_OPT_OakText2:: + text_start + line "may be seen around" + done + +_OPT_OakText3:: + text_start + line "@" + text_from_ram wStringBuffer1 + text "." + done + +_OPT_MaryText1:: + text_start + line "MARY: @" + text_from_ram wStringBuffer1 + text "'s" + done + +OPT_SweetAdorably:: + text_start + line "sweet and adorably" + done + +OPT_WigglySlickly:: + text_start + line "wiggly and slickly" + done + +OPT_AptlyNamed:: + text_start + line "aptly named and" + done + +OPT_UndeniablyKindOf:: + text_start + line "undeniably kind of" + done + +OPT_Unbearably:: + text_start + line "so, so unbearably" + done + +OPT_WowImpressively:: + text_start + line "wow, impressively" + done + +OPT_AlmostPoisonously:: + text_start + line "almost poisonously" + done + +OPT_Sensually:: + text_start + line "ooh, so sensually" + done + +OPT_Mischievously:: + text_start + line "so mischievously" + done + +OPT_Topically:: + text_start + line "so very topically" + done + +OPT_Addictively:: + text_start + line "sure addictively" + done + +OPT_LooksInWater:: + text_start + line "looks in water is" + done + +OPT_EvolutionMustBe:: + text_start + line "evolution must be" + done + +OPT_Provocatively:: + text_start + line "provocatively" + done + +OPT_FlippedOut:: + text_start + line "so flipped out and" + done + +OPT_HeartMeltingly:: + text_start + line "heart-meltingly" + done + +OPT_Cute:: + text_start + line "cute." + done + +OPT_Weird:: + text_start + line "weird." + done + +OPT_Pleasant:: + text_start + line "pleasant." + done + +OPT_BoldSortOf:: + text_start + line "bold, sort of." + done + +OPT_Frightening:: + text_start + line "frightening." + done + +OPT_SuaveDebonair:: + text_start + line "suave & debonair!" + done + +OPT_Powerful:: + text_start + line "powerful." + done + +OPT_Exciting:: + text_start + line "exciting." + done + +OPT_Groovy:: + text_start + line "now!" + done + +OPT_Inspiring:: + text_start + line "inspiring." + done + +OPT_Friendly:: + text_start + line "friendly." + done + +OPT_HotHotHot:: + text_start + line "hot, hot, hot!" + done + +OPT_Stimulating:: + text_start + line "stimulating." + done + +OPT_Guarded:: + text_start + line "guarded." + done + +OPT_Lovely:: + text_start + line "lovely." + done + +OPT_Speedy:: + text_start + line "speedy." + done + +_OPT_PokemonChannelText:: + text "#MON" + done + +_PokedexShowText:: + text_start + line "@" + text_from_ram wStringBuffer1 + db "@" + +; Pokémon Music Channel / Pokémusic + +_BenIntroText1:: + text_start + line "BEN: #MON MUSIC" + done + +_BenIntroText2:: + text_start + line "CHANNEL!" + done + +_BenIntroText3:: + text_start + line "It's me, DJ BEN!" + done + +_FernIntroText1:: + text_start + line "FERN: #MUSIC!" + done + +_FernIntroText2:: + text_start + line "With DJ FERN!" + done + +_BenFernText1:: + text_start + line "Today's @" + current_day + text "," + done + +_BenFernText2A:: + text_start + line "so let us jam to" + done + +_BenFernText2B:: + text_start + line "so chill out to" + done + +_BenFernText3A:: + text_start + line "#MON March!" + done + +_BenFernText3B:: + text_start + line "#MON Lullaby!" + done + +; Lucky Channel + +_LC_Text1:: + text_start + line "REED: Yeehaw! How" + done + +_LC_Text2:: + text_start + line "y'all doin' now?" + done + +_LC_Text3:: + text_start + line "Whether you're up" + done + +_LC_Text4:: + text_start + line "or way down low," + done + +_LC_Text5:: + text_start + line "don't you miss the" + done + +_LC_Text6:: + text_start + line "LUCKY NUMBER SHOW!" + done + +_LC_Text7:: + text_start + line "This week's Lucky" + done + +_LC_Text8:: + text_start + line "Number is @" + interpret_data + text_from_ram wStringBuffer1 + text "!" + done + +_LC_Text9:: + text_start + line "I'll repeat that!" + done + +_LC_Text10:: + text_start + line "Match it and go to" + done + +_LC_Text11:: + text_start + line "the RADIO TOWER!" + done + +_LC_DragText1:: + text_start + line "…Repeating myself" + done + +_LC_DragText2:: + text_start + line "gets to be a drag…" + done + +; Places and People + +_PnP_Text1:: + text_start + line "PLACES AND PEOPLE!" + done + +_PnP_Text2:: + text_start + line "Brought to you by" + done + +_PnP_Text3:: + text_start + line "me, DJ LILY!" + done + +_PnP_Text4:: + text_start + line "@" + text_from_ram wStringBuffer2 + text " @" + text_from_ram wStringBuffer1 + db "@@" + +_PnP_cute:: + text_start + line "is cute." + done + +_PnP_lazy:: + text_start + line "is sort of lazy." + done + +_PnP_happy:: + text_start + line "is always happy." + done + +_PnP_noisy:: + text_start + line "is quite noisy." + done + +_PnP_precocious:: + text_start + line "is precocious." + done + +_PnP_bold:: + text_start + line "is somewhat bold." + done + +_PnP_picky:: + text_start + line "is too picky!" + done + +_PnP_sortofok:: + text_start + line "is sort of OK." + done + +_PnP_soso:: + text_start + line "is just so-so." + done + +_PnP_great:: + text_start + line "is actually great." + done + +_PnP_mytype:: + text_start + line "is just my type." + done + +_PnP_cool:: + text_start + line "is so cool, no?" + done + +_PnP_inspiring:: + text_start + line "is inspiring!" + done + +_PnP_weird:: + text_start + line "is kind of weird." + done + +_PnP_rightforme:: + text_start + line "is right for me?" + done + +_PnP_odd:: + text_start + line "is definitely odd!" + done + +_PnP_Text5:: + text_start + line "@" + text_from_ram wStringBuffer1 + db "@@" + +_RocketRadioText1:: + text_start + line "… …Ahem, we are" + done + +_RocketRadioText2:: + text_start + line "TEAM ROCKET!" + done + +_RocketRadioText3:: + text_start + line "After three years" + done + +_RocketRadioText4:: + text_start + line "of preparation, we" + done + +_RocketRadioText5:: + text_start + line "have risen again" + done + +_RocketRadioText6:: + text_start + line "from the ashes!" + done + +_RocketRadioText7:: + text_start + line "GIOVANNI! @" + interpret_data + text "Can you" + done + +_RocketRadioText8:: + text_start + line "hear?@" + interpret_data + text " We did it!" + done + +_RocketRadioText9:: + text_start + line "@" + interpret_data + text "Where is our Boss?" + done + +_RocketRadioText10:: + text_start + line "@" + interpret_data + text "Is he listening?" + done + +UnknownText_0x1bd2bc:: + text "Which floor?" + done + +UnknownText_0x1bd2ca:: + text "ANNOUNCER: BEEEP!" + + para "Time's up!" + done + +UnknownText_0x1bd2e7:: + text "ANNOUNCER: The" + line "Contest is over!" + done + +UnknownText_0x1bd308:: + text "REPEL's effect" + line "wore off." + done + +UnknownText_0x1bd321:: + text "<PLAYER> found" + line "@" + text_from_ram wStringBuffer3 + text "." + done + +UnknownText_0x1bd331:: + text "But <PLAYER> has" + line "no space left…" + done + +UnknownText_0x1bd34b:: + text "I just saw some" + line "rare @" + text_from_ram wStringBuffer1 + text " in" + cont "@" + text_from_ram wStringBuffer2 + text "." + + para "I'll call you if I" + line "see another rare" + cont "#MON, OK?" + prompt + +UnknownText_0x1bd39e:: + text "SAVING RECORD…" + line "DON'T TURN OFF!" + done + +ReceivedMysteryGiftText_:: + text_from_ram wPlayerName + text " received" + line "@" + text_from_ram wStringBuffer1 + text "!@" + sound_item + text_waitbutton + db "@" + +NoCoinsText_:: + text "You have no coins." + prompt + +NoCoinCaseText_:: + text "You don't have a" + line "COIN CASE." + prompt + +UnknownText_0x1bd407:: + text "OK, connect the" + line "Game Link Cable." + prompt + +UnknownText_0x1bd429:: + text "<PLAYER> traded" + line "@" + text_from_ram wStringBuffer2 + text " for" + cont "@" + text_from_ram wMonOrItemNameBuffer + text ".@@" + +UnknownText_0x1bd445:: + sound_dex_fanfare_80_109 + interpret_data + db "@" + +UnknownText_0x1bd449:: + text "I collect #MON." + line "Do you have" + cont "@" + text_from_ram wStringBuffer1 + text "?" + + para "Want to trade it" + line "for my @" + text_from_ram wStringBuffer2 + text "?" + done + +UnknownText_0x1bd48c:: + text "You don't want to" + line "trade? Aww…" + done + +UnknownText_0x1bd4aa:: + text "Huh? That's not" + line "@" + text_from_ram wStringBuffer1 + text ". " + cont "What a letdown…" + done + +UnknownText_0x1bd4d2:: + text "Yay! I got myself" + line "@" + text_from_ram wStringBuffer1 + text "!" + cont "Thanks!" + done + +UnknownText_0x1bd4f4:: + text "Hi, how's my old" + line "@" + text_from_ram wStringBuffer2 + text " doing?" + done + +UnknownText_0x1bd512:: + text "Hi, I'm looking" + line "for this #MON." + + para "If you have" + line "@" + text_from_ram wStringBuffer1 + text ", would" + + para "you trade it for" + line "my @" + text_from_ram wStringBuffer2 + text "?" + done + +UnknownText_0x1bd565:: + text "You don't have" + line "one either?" + + para "Gee, that's really" + line "disappointing…" + done + +UnknownText_0x1bd5a1:: + text "You don't have" + line "@" + text_from_ram wStringBuffer1 + text "? That's" + cont "too bad, then." + done + +UnknownText_0x1bd5cc:: + text "Great! Thank you!" + + para "I finally got" + line "@" + text_from_ram wStringBuffer1 + text "." + done + +UnknownText_0x1bd5f4:: + text "Hi! The @" + text_from_ram wMonOrItemNameBuffer + text_start + line "you traded me is" + cont "doing great!" + done + +UnknownText_0x1bd621:: + text_from_ram wMonOrItemNameBuffer + text "'s cute," + line "but I don't have" + + para "it. Do you have" + line "@" + text_from_ram wStringBuffer1 + text "?" + + para "Want to trade it" + line "for my @" + text_from_ram wStringBuffer2 + text "?" + done + +UnknownText_0x1bd673:: + text "You don't want to" + line "trade? Oh, darn…" + done + +UnknownText_0x1bd696:: + text "That's not" + line "@" + text_from_ram wStringBuffer1 + text "." + + para "Please trade with" + line "me if you get one." + done + +UnknownText_0x1bd6cd:: + text "Wow! Thank you!" + line "I always wanted" + cont "@" + text_from_ram wMonOrItemNameBuffer + text "!" + done + +UnknownText_0x1bd6f5:: + text "How is that" + line "@" + text_from_ram wStringBuffer2 + text " I" + cont "traded you doing?" + + para "Your @" + text_from_ram wMonOrItemNameBuffer + text "'s" + line "so cute!" + done + +UnknownText_0x1bd77f:: + text "Wow, that's a cute" + line "#MON." + + para "Where did you get" + line "it?" + + para "…" + + para "So, you're leaving" + line "on an adventure…" + + para "OK!" + line "I'll help too." + + para "But what can I do" + line "for you?" + + para "I know! I'll save" + line "money for you." + + para "On a long journey," + line "money's important." + + para "Do you want me to" + line "save your money?" + done + +UnknownText_0x1bd868:: + text "OK, I'll take care" + line "of your money." + + para "<……><……><……>" + prompt + +UnknownText_0x1bd88e:: + text "Be careful." + + para "#MON are your" + line "friends. You need" + cont "to work as a team." + + para "Now, go on!" + done + +UnknownText_0x1bd8da:: + text "Hi! Welcome home!" + line "You're trying very" + cont "hard, I see." + + para "I've kept your" + line "room tidy." + + para "Or is this about" + line "your money?" + done + +UnknownText_0x1bd942:: + text "What do you want" + line "to do?" + done + +UnknownText_0x1bd95b:: + text "How much do you" + line "want to save?" + done + +UnknownText_0x1bd97a:: + text "How much do you" + line "want to take?" + done + +UnknownText_0x1bd999:: + text "Do you want to" + line "save some money?" + done + +UnknownText_0x1bd9ba:: + text "You haven't saved" + line "that much." + prompt + +UnknownText_0x1bd9d7:: + text "You can't take" + line "that much." + prompt + +UnknownText_0x1bd9f1:: + text "You don't have" + line "that much." + prompt + +UnknownText_0x1bda0b:: + text "You can't save" + line "that much." + prompt + +UnknownText_0x1bda25:: + text "OK, I'll save your" + line "money. Trust me!" + + para "<PLAYER>, stick" + line "with it!" + done + +UnknownText_0x1bda5b:: + text "Your money's safe" + line "here! Get going!" + done + +UnknownText_0x1bda7e:: + text "<PLAYER>, don't" + line "give up!" + done + +UnknownText_0x1bda90:: + text "Just do what" + line "you can." + done + +UnknownText_0x1bdaa7:: + text_start + done + +UnknownText_0x1bdaa9:: + text "I'm the DAY-CARE" + line "MAN. Want me to" + cont "raise a #MON?" + done + +UnknownText_0x1bdad8:: + text "I'm the DAY-CARE" + line "MAN. Do you know" + cont "about EGGS?" + + para "I was raising" + line "#MON with my" + cont "wife, you see." + + para "We were shocked to" + line "find an EGG!" + + para "How incredible is" + line "that?" + + para "So, want me to" + line "raise a #MON?" + done + +UnknownText_0x1bdb85:: + text "I'm the DAY-CARE" + line "LADY." + + para "Should I raise a" + line "#MON for you?" + done + +UnknownText_0x1bdbbb:: + text "I'm the DAY-CARE" + line "LADY. Do you know" + cont "about EGGS?" + + para "My husband and I" + line "were raising some" + cont "#MON, you see." + + para "We were shocked to" + line "find an EGG!" + + para "How incredible" + line "could that be?" + + para "Should I raise a" + line "#MON for you?" + done + +UnknownText_0x1bdc79:: + text "What should I" + line "raise for you?" + prompt + +UnknownText_0x1bdc97:: + text "Oh? But you have" + line "just one #MON." + prompt + +UnknownText_0x1bdcb8:: + text "Sorry, but I can't" + line "accept an EGG." + prompt + +UnknownText_0x1bdcda:: + text "Remove MAIL before" + line "you come see me." + prompt + +UnknownText_0x1bdcff:: + text "If you give me" + line "that, what will" + cont "you battle with?" + prompt + +UnknownText_0x1bdd30:: + text "OK. I'll raise" + line "your @" + text_from_ram wStringBuffer1 + text "." + prompt + +UnknownText_0x1bdd4b:: + text "Come back for it" + line "later." + done + +UnknownText_0x1bdd64:: + text "Are we geniuses or" + line "what? Want to see" + cont "your @" + text_from_ram wStringBuffer1 + text "?" + done + +UnknownText_0x1bdd96:: + text "Your @" + text_from_ram wStringBuffer1 + text_start + line "has grown a lot." + + para "By level, it's" + line "grown by @" + deciram wStringBuffer2 + 1, 1, 3 + text "." + + para "If you want your" + line "#MON back, it" + cont "will cost ¥@" + deciram wStringBuffer2 + 2, 3, 4 + text "." + done + +UnknownText_0x1bde04:: + text "Perfect! Here's" + line "your #MON." + prompt + +UnknownText_0x1bde1f:: + text "<PLAYER> got back" + line "@" + text_from_ram wStringBuffer1 + text "." + prompt + +UnknownText_0x1bde32:: + text "Huh? Back already?" + line "Your @" + text_from_ram wStringBuffer1 + text_start + para "needs a little" + line "more time with us." + + para "If you want your" + line "#MON back, it" + cont "will cost ¥100." + done + +UnknownText_0x1bdea2:: + text "You have no room" + line "for it." + prompt + +UnknownText_0x1bdebc:: + text "You don't have" + line "enough money." + prompt + +UnknownText_0x1bded9:: + text "Oh, fine then." + prompt + +UnknownText_0x1bdee9:: + text "Come again." + done + +UnknownText_0x1bdef6:: + text "Not yet…" + done + +UnknownText_0x1bdf00:: + text "Ah, it's you!" + + para "We were raising" + line "your #MON, and" + + para "my goodness, were" + line "we surprised!" + + para "Your #MON had" + line "an EGG!" + + para "We don't know how" + line "it got there, but" + + para "your #MON had" + line "it. You want it?" + done + +UnknownText_0x1bdfa5:: + text "<PLAYER> received" + line "the EGG!" + done + +UnknownText_0x1bdfba:: + text "Take good care of" + line "it." + done + +UnknownText_0x1bdfd1:: + text "Well then, I'll" + line "keep it. Thanks!" + done + +UnknownText_0x1bdff2:: + text "You have no room" + line "in your party." + cont "Come back later." + done + +UnknownText_0x1be024:: + text "Which #MON" + line "should I photo-" + cont "graph?" + prompt + +UnknownText_0x1be047:: + text "All righty. Hold" + line "still for a bit." + prompt + +UnknownText_0x1be06a:: + text "Presto! All done." + line "Come again, OK?" + done + +UnknownText_0x1c0000:: + text "Oh, no picture?" + line "Come again, OK?" + done + +UnknownText_0x1c0021:: + text "An EGG? My talent" + line "is worth more…" + done + +UnknownText_0x1c0043:: + text "Hello, hello! I'm" + line "the NAME RATER." + + para "I rate the names" + line "of #MON." + + para "Would you like me" + line "to rate names?" + done + +UnknownText_0x1c00a0:: + text "Which #MON's" + line "nickname should I" + cont "rate for you?" + prompt + +UnknownText_0x1c00cd:: + text "Hm… @" + text_from_ram wStringBuffer1 + text "…" + line "That's a fairly" + cont "decent name." + + para "But, how about a" + line "slightly better" + cont "nickname?" + + para "Want me to give it" + line "a better name?" + done + +UnknownText_0x1c0142:: + text "All right. What" + line "name should we" + cont "give it, then?" + prompt + +UnknownText_0x1c0171:: + text "That's a better" + line "name than before!" + + para "Well done!" + done + +UnknownText_0x1c019e:: + text "OK, then. Come" + line "again sometime." + done + + text "Hm… @" + text_from_ram wStringBuffer1 + text "?" + line "What a great name!" + cont "It's perfect." + + para "Treat @" + text_from_ram wStringBuffer1 + text_start + line "with loving care." + done + +UnknownText_0x1c0208:: + text "Whoa… That's just" + line "an EGG." + done + +UnknownText_0x1c0222:: + text "It might look the" + line "same as before," + + para "but this new name" + line "is much better!" + + para "Well done!" + done + +UnknownText_0x1c0272:: + text "All right. This" + line "#MON is now" + cont "named @" + text_from_ram wStringBuffer1 + text "." + prompt + +Text_Gained:: + text_from_ram wStringBuffer1 + text " gained@@" + +Text_ABoostedStringBuffer2ExpPoints:: + text_start + line "a boosted" + cont "@" + deciram wStringBuffer2, 2, 4 + text " EXP. Points!" + prompt + +Text_StringBuffer2ExpPoints:: + text_start + line "@" + deciram wStringBuffer2, 2, 4 + text " EXP. Points!" + prompt + +Text_GoMon:: + text "Go! @" + text_from_ram wBattleMonNick + text "!" + done + +Text_DoItMon:: + text "Do it! @" + text_from_ram wBattleMonNick + text "!" + done + +Text_GoForItMon:: + text "Go for it," + line "@" + text_from_ram wBattleMonNick + text "!" + done + +Text_YourFoesWeakGetmMon:: + text "Your foe's weak!" + line "Get'm, @" + text_from_ram wBattleMonNick + text "!" + done + +Text_ThatsEnoughComeBack:: + text_from_ram wBattleMonNick + text ",@@" + text " that's" + line "enough! Come back!" + done + +Text_OKComeBack:: + text " OK!" + line "Come back!" + done + +Text_GoodComeBack:: + text " good!" + line "Come back!" + done + +Text_ComeBack:: + text " come" + line "back!" + done + +BattleText_PlayerPickedUpPayDayMoney: + text "<PLAYER> picked up" + line "¥@" + deciram wPayDayMoney, 3, 6 + text "!" + prompt + +UnknownText_0x1c0373:: + text "Booted up a TM." + prompt + +UnknownText_0x1c0384:: + text "Booted up an HM." + prompt + +UnknownText_0x1c0396:: + text "It contained" + line "@" + text_from_ram wStringBuffer2 + text "." + + para "Teach @" + text_from_ram wStringBuffer2 + text_start + line "to a #MON?" + done + +UnknownText_0x1c03c2:: + text_from_ram wStringBuffer2 + text " is" + line "not compatible" + cont "with @" + text_from_ram wStringBuffer1 + text "." + + para "It can't learn" + line "@" + text_from_ram wStringBuffer2 + text "." + prompt + +UnknownText_0x1c03fa:: + text "You have no room" + line "for any more" + cont "@" + text_from_ram wStringBuffer1 + text "S." + prompt + +UnknownText_0x1c0421:: + text "You received" + line "@" + text_from_ram wStringBuffer1 + text "!" + prompt + +UnknownText_0x1c0436:: + text "The link has been" + line "cancelled." + prompt + +UnknownText_0x1c0454:: + text "Communication" + line "error." + prompt + +UnknownText_0x1c046a:: + text "Must retrieve GIFT" + line "at #MON CENTER." + prompt + +UnknownText_0x1c048e:: + text "Your friend isn't" + line "ready." + prompt + +UnknownText_0x1c04a7:: + text "Sorry--only five" + line "GIFTS a day." + prompt + +UnknownText_0x1c04c6:: + text "Sorry. One GIFT" + line "a day per person." + prompt + +UnknownText_0x1c04e9:: + text_from_ram wMysteryGiftPartnerName + text " sent" + line "@" + text_from_ram wStringBuffer1 + text "." + prompt + +UnknownText_0x1c04fa:: + text_from_ram wMysteryGiftPartnerName + text " sent" + line "@" + text_from_ram wStringBuffer1 + text_start + cont "to @" + text_from_ram wMysteryGiftPlayerName + text "'s home." + prompt + +BadgeRequiredText_:: + text "Sorry! A new BADGE" + line "is required." + prompt + +CantUseFieldMoveHereText_:: + text "Can't use that" + line "here." + prompt + +Text_UsedCut_:: + text_from_ram wStringBuffer2 + text " used" + line "CUT!" + prompt + +Text_NothingToCut_:: + text "There's nothing to" + line "CUT here." + prompt + +Text_UsedFlash_:: + text "A blinding FLASH" + line "lights the area!@" + text_waitbutton + db "@@" + +UsedSurfText_:: + text_from_ram wStringBuffer2 + text " used" + line "SURF!" + done diff --git a/data/text/common_2.asm b/data/text/common_2.asm new file mode 100644 index 00000000..4bffc8ed --- /dev/null +++ b/data/text/common_2.asm @@ -0,0 +1,1596 @@ +CantSurfText_:: + text "You can't SURF" + line "here." + prompt + +AlreadySurfingText_:: + text "You're already" + line "SURFING." + prompt + +AskSurfText_:: + text "The water is calm." + line "Want to SURF?" + done + +Text_UsedWaterfall_:: + text_from_ram wStringBuffer2 + text " used" + line "WATERFALL!" + done + +Text_CantDoWaterfall_:: + text "Wow, it's a huge" + line "waterfall." + done + +Text_AskUseWaterfall_:: + text "Do you want to use" + line "WATERFALL?" + done + +Text_UsedDig_:: + text_from_ram wStringBuffer2 + text " used" + line "DIG!" + done + +Text_UsedEscapeRope_:: + text "<PLAYER> used an" + line "ESCAPE ROPE." + done + +Text_CantUseDigEscapeRopeHere_:: + text "Can't use that" + line "here." + done + +Text_ReturnToLastMonCenter_:: + text "Return to the last" + line "#MON CENTER." + done + +Text_CantUseTeleportHere_:: + text "Can't use that" + line "here." + + para "" + done + +Text_AlreadyUsingStrength_:: + text "A #MON is using" + line "STRENGTH already." + prompt + +Text_UsedStrength_:: + text_from_ram wStringBuffer2 + text " used" + line "STRENGTH!" + done + +Text_AllowedToMoveBoulders_:: + text_from_ram wStringBuffer1 + text " can" + line "move boulders." + prompt + +Text_AskStrength_:: + text "A #MON may be" + line "able to move this." + + para "Want to use" + line "STRENGTH?" + done + +Text_BouldersMayNowBeMoved_:: + text "Boulders may now" + line "be moved!" + done + +Text_MonMayBeAbleToMove_:: + text "A #MON may be" + line "able to move this." + done + +Text_UsedWhirlpool_:: + text_from_ram wStringBuffer2 + text " used" + line "WHIRLPOOL!" + prompt + +Text_MightyWhirlpool_:: + text "It's a vicious" + line "whirlpool!" + + para "A #MON may be" + line "able to pass it." + done + +Text_AskWhirlpool_:: + text "A whirlpool is in" + line "the way." + + para "Want to use" + line "WHIRLPOOL?" + done + +Text_DidAHeadbutt_:: + text_from_ram wStringBuffer2 + text " did a" + line "HEADBUTT!" + prompt + +Text_NothingFromHeadbutt_:: + text "Nope. Nothing…" + done + +Text_AskHeadbutt_:: + text "A #MON could be" + line "in this tree." + + para "Want to HEADBUTT" + line "it?" + done + +Text_UsedRockSmash_:: + text_from_ram wStringBuffer2 + text " used" + line "ROCK SMASH!" + prompt + +Text_MayBeBreakable_:: + text "A #MON may be" + line "able to break it." + done + +Text_AskRockSmash_:: + text "This rock looks" + line "breakable." + + para "Want to use ROCK" + line "SMASH?" + done + +Text_OhABite_:: + text "Oh!" + line "A bite!" + prompt + +Text_NotEvenANibble_:: + text "Not even a nibble!" + prompt + +Text_NothingHereToFish_:: + text "Looks like there's" + line "nothing here." + prompt + +Text_CantGetOffBike_:: + text "You can't get off" + line "here!" + done + +Text_GotOnTheBike_:: + text "<PLAYER> got on the" + line "@" + text_from_ram wStringBuffer2 + text "." + done + +Text_GotOffTheBike_:: + text "<PLAYER> got off" + line "the @" + text_from_ram wStringBuffer2 + text "." + done + +Text_AskCut_:: + text "This tree can be" + line "CUT!" + + para "Want to use CUT?" + done + +Text_MonCanCutThis_:: + text "This tree can be" + line "CUT!" + done + +UnknownText_0x1c0a1c:: + text "<PLAYER> found" + line "@" + text_from_ram wStringBuffer3 + text "!" + done + +UnknownText_0x1c0a2c:: + text "But <PLAYER> can't" + line "carry any more" + cont "items!" + done + +UnknownText_0x1c0a4e:: + text "<PLAYER> is out of" + line "useable #MON!" + + para "<PLAYER> whited" + line "out!" + done + +UnknownText_0x1c0a77:: + text "Yes! ITEMFINDER" + line "indicates there's" + cont "an item nearby." + prompt + +UnknownText_0x1c0aa9:: + text "Nope! ITEMFINDER" + line "isn't responding." + prompt + +UnknownText_0x1c0acc:: + text_from_ram wStringBuffer3 + text_start + line "fainted!" + prompt + +UnknownText_0x1c0ada:: + text "<PLAYER> is out of" + line "useable #MON!" + + para "<PLAYER> whited" + line "out!" + prompt + +UnknownText_0x1c0b03:: + text_from_ram wStringBuffer3 + text " used" + line "SWEET SCENT!" + done + +UnknownText_0x1c0b1a:: + text "Looks like there's" + line "nothing here…" + done + +UnknownText_0x1c0b3b:: + text "<PLAYER> sprinkled" + line "water." + + para "But nothing" + line "happened…" + done + +UnknownText_0x1c0b65:: + text "<PLAYER>'s #MON" + line "were all healed!" + done + +Text_AnEGGCantHoldAnItem:: + text "An EGG can't hold" + line "an item." + prompt + +Text_PackNoItems_:: + text "No items." + done + +Text_ThrowAwayHowMany_:: + text "Throw away how" + line "many?" + done + +Text_ConfirmThrowAway_:: + text "Throw away @" + deciram wItemQuantityChangeBuffer, 1, 2 + text_start + line "@" + text_from_ram wStringBuffer2 + text "(S)?" + done + +Text_ThrewAway_:: + text "Threw away" + line "@" + text_from_ram wStringBuffer2 + text "(S)." + prompt + +Text_ThisIsntTheTime_:: + text "OAK: <PLAYER>!" + line "This isn't the" + cont "time to use that!" + prompt + +Text_YouDontHaveAMon:: + text "You don't have a" + line "#MON!" + prompt + +Text_RegisteredTheItem_:: + text "Registered the" + line "@" + text_from_ram wStringBuffer2 + text "." + prompt + +Text_CantRegisterThatItem_:: + text "You can't register" + line "that item." + prompt + +Text_MoveItemWhere_:: + text "Where should this" + line "be moved to?" + done + +Text_PackEmptyString_:: + text_start + done + +Text_YouCantUseItInABattle:: + text "You can't use it" + line "in a battle." + prompt + +_ActorNameText:: + text "<USER>@@" + +_UsedMove1Text:: + text_start + line "used @@" + +_UsedMove2Text:: + text_start + line "used @@" + +_UsedInsteadText:: + text "instead," + cont "@@" + +_MoveNameText:: + text_from_ram wStringBuffer2 + db "@@" + +_EndUsedMove1Text:: + text "!" + done + +_EndUsedMove2Text:: + text "!" + done + +_EndUsedMove3Text:: + text "!" + done + +_EndUsedMove4Text:: + text "!" + done + +_EndUsedMove5Text:: + text "!" + done + +UnknownText_0x1c0cc6:: + text "<USER>'s" + line "@" + text_from_ram wStringBuffer2 + db "@@" + +UnknownText_0x1c0cd0:: + interpret_data + text "<SCROLL>went way up!" + prompt + +UnknownText_0x1c0ce0:: + text " went up!" + prompt + +UnknownText_0x1c0ceb:: + text "<TARGET>'s" + line "@" + text_from_ram wStringBuffer2 + db "@@" + +UnknownText_0x1c0cf5:: + interpret_data + text "<SCROLL>sharply fell!" + prompt + +UnknownText_0x1c0d06:: + text " fell!" + prompt + +UnknownText_0x1c0d0e:: + text "<USER>@@" + +UnknownText_0x1c0d12:: + text_start + line "made a whirlwind!" + prompt + +UnknownText_0x1c0d26:: + text_start + line "took in sunlight!" + prompt + +UnknownText_0x1c0d3a:: + text_start + line "lowered its head!" + prompt + +UnknownText_0x1c0d4e:: + text_start + line "is glowing!" + prompt + +UnknownText_0x1c0d5c:: + text_start + line "flew up high!" + prompt + +UnknownText_0x1c0d6c:: + text_start + line "dug a hole!" + prompt + +UnknownText_0x1c0db0:: + text "Huh?" + + para "@@" + +UnknownText_0x1c0db8:: + text_start + done + +UnknownText_0x1c0dba:: + text_from_ram wStringBuffer1 + text " came" + line "out of its EGG!@" + sound_caught_mon + text_waitbutton + db "@" + +UnknownText_0x1c0dd8:: + text "Give a nickname to" + line "@" + text_from_ram wStringBuffer1 + text "?" + done + +UnknownText_0x1c0df3:: + text "It's @" + text_from_ram wBreedMon2Nick + text_start + line "that was left with" + cont "the DAY-CARE LADY." + done + +UnknownText_0x1c0e24:: + text "It's @" + text_from_ram wDayCareMan + 1 + text_start + line "that was left with" + cont "the DAY-CARE MAN." + done + +UnknownText_0x1c0e54:: + text "It's brimming with" + line "energy." + prompt + +UnknownText_0x1c0e6f:: + text "It has no interest" + line "in @" + text_from_ram wStringBuffer1 + text "." + prompt + +UnknownText_0x1c0e8d:: + text "It appears to care" + line "for @" + text_from_ram wStringBuffer1 + text "." + prompt + +UnknownText_0x1c0eac:: + text "It's friendly with" + line "@" + text_from_ram wStringBuffer1 + text "." + prompt + +UnknownText_0x1c0ec6:: + text "It shows interest" + line "in @" + text_from_ram wStringBuffer1 + text "." + prompt + +_EmptyMailboxText:: + text "There's no MAIL" + line "here." + prompt + +ClearedMailPutAwayText:: + text "The cleared MAIL" + line "was put away." + prompt + +MailPackFullText:: + text "The PACK is full." + prompt + +MailMessageLostText:: + text "The MAIL's message" + line "will be lost. OK?" + done + +MailAlreadyHoldingItemText:: + text "It's already hold-" + line "ing an item." + prompt + +MailEggText:: + text "An EGG can't hold" + line "any MAIL." + prompt + +MailMovedFromBoxText:: + text "The MAIL was moved" + line "from the MAILBOX." + prompt + +Text_WasSentToBillsPC:: + text_from_ram wStringBuffer1 + text " was" + line "sent to BILL's PC." + prompt + +Text_GottaHavePokemon_:: + text "You gotta have" + line "#MON to call!" + prompt + +Text_BillsPCWhat_:: + text "What?" + done + +Text_PleaseRemoveMailBeforeMovePkmnWOMail_:: + text "There is a #MON" + line "holding MAIL." + + para "Please remove the" + line "MAIL." + prompt + +Text_YouDontHaveASinglePokemon_:: + text "You don't have a" + line "single #MON!" + prompt + +Text_ItsYourLastPokemon_:: + text "You can't deposit" + line "your last #MON!" + prompt + +Text_CantTakeAnyMorePokemon_:: + text "You can't take any" + line "more #MON." + prompt + +Text_CaughtBugMon_:: + text "Caught @" + text_from_ram wStringBuffer1 + text "!" + prompt + +UnknownText_0x1c10cf:: + text "Switch #MON?" + done + +UnknownText_0x1c10dd:: + text "You already caught" + line "a @" + text_from_ram wStringBuffer1 + text "." + prompt + +ContestJudging_FirstPlaceText:: + text "This Bug-Catching" + line "Contest winner is@" + interpret_data + text "…" + + para "@" + text_from_ram wBugContestWinnerName + text "," + line "who caught a" + cont "@" + text_from_ram wStringBuffer1 + text "!@@" + +ContestJudging_FirstPlaceScoreText:: + text_start + + para "The winning score" + line "was @" + deciram wBugContestFirstPlaceScore, 2, 3 + text " points!" + prompt + +ContestJudging_SecondPlaceText:: + text "Placing second was" + line "@" + text_from_ram wBugContestWinnerName + text "," + + para "who caught a" + line "@" + text_from_ram wStringBuffer1 + text "!@@" + +ContestJudging_SecondPlaceScoreText:: + text_start + + para "The score was" + line "@" + deciram wBugContestSecondPlaceScore, 2, 3 + text " points!" + prompt + +ContestJudging_ThirdPlaceText:: + text "Placing third was" + line "@" + text_from_ram wBugContestWinnerName + text "," + + para "who caught a" + line "@" + text_from_ram wStringBuffer1 + text "!@@" + +ContestJudging_ThirdPlaceScoreText:: + text_start + + para "The score was" + line "@" + deciram wBugContestThirdPlaceScore, 2, 3 + text " points!" + prompt + +UnknownText_0x1c1203:: + text "Let me measure" + line "that MAGIKARP." + + para "…Hm, it measures" + line "@" + text_from_ram wStringBuffer1 + text "." + prompt + +UnknownText_0x1c123a:: + text "CURRENT RECORD" + + para "@" + text_from_ram wStringBuffer1 + text " caught by" + line "@" + text_from_ram wMagikarpRecordHoldersName + text_waitbutton + db "@" + +UnknownText_0x1c1261:: + text "Congratulations!" + + para "We have a match" + line "with the ID number" + + para "of @" + text_from_ram wStringBuffer1 + text " in" + line "your party." + prompt + +UnknownText_0x1c12ae:: + text "Congratulations!" + + para "We have a match" + line "with the ID number" + + para "of @" + text_from_ram wStringBuffer1 + text " in" + line "your PC BOX." + prompt + +UnknownText_0x1c12fc:: + text "Give a nickname to" + line "the @" + text_from_ram wStringBuffer1 + text " you" + cont "received?" + done + +UnknownText_0x1c1328:: + text "Bzzzzt! You must" + line "have a #MON to" + cont "use this!" + prompt + +UnknownText_0x1c1353:: + text "<PLAYER> turned on" + line "the PC." + prompt + +UnknownText_0x1c1368:: + text "What do you want" + line "to do?" + done + +_PlayersPCHowManyWithdrawText:: + text "How many do you" + line "want to withdraw?" + done + +_PlayersPCWithdrewItemsText:: + text "Withdrew @" + deciram wItemQuantityChangeBuffer, 1, 2 + text_start + line "@" + text_from_ram wStringBuffer2 + text "(S)." + prompt + +_PlayersPCNoRoomWithdrawText:: + text "There's no room" + line "for more items." + prompt + +UnknownText_0x1c13df:: + text "No items here!" + prompt + +_PlayersPCHowManyDepositText:: + text "How many do you" + line "want to deposit?" + done + +_PlayersPCDepositItemsText:: + text "Deposited @" + deciram wItemQuantityChangeBuffer, 1, 2 + text_start + line "@" + text_from_ram wStringBuffer2 + text "(S)." + prompt + +_PlayersPCNoRoomDepositText:: + text "There's no room to" + line "store items." + prompt + +UnknownText_0x1c144d:: + text "<PLAYER> turned on" + line "the PC." + prompt + +UnknownText_0x1c1462:: + text "Access whose PC?" + done + +UnknownText_0x1c1474:: + text "BILL's PC" + line "accessed." + + para "#MON Storage" + line "System opened." + prompt + +UnknownText_0x1c14a4:: + text "Accessed own PC." + + para "Item Storage" + line "System opened." + prompt + +UnknownText_0x1c14d2:: + text "PROF.OAK's PC" + line "accessed." + + para "#DEX Rating" + line "System opened." + prompt + +UnknownText_0x1c1505:: + text "…" + line "Link closed…" + done + +_OakPCText1:: + text "Want to get your" + line "#DEX rated?" + done + +_OakPCText2:: + text "Current #DEX" + line "completion level:" + prompt + +_OakPCText3:: + text_from_ram wStringBuffer3 + text " #MON seen" + line "@" + text_from_ram wStringBuffer4 + text " #MON owned" + + para "PROF.OAK's" + line "Rating:" + done + +_OakRating01:: + text "Look for #MON" + line "in grassy areas!" + done + +_OakRating02:: + text "Good. I see you" + line "understand how to" + cont "use # BALLS." + done + +_OakRating03:: + text "You're getting" + line "good at this." + + para "But you have a" + line "long way to go." + done + +_OakRating04:: + text "You need to fill" + line "up the #DEX." + + para "Catch different" + line "kinds of #MON!" + done + +_OakRating05:: + text "You're trying--I" + line "can see that." + + para "Your #DEX is" + line "coming together." + done + +_OakRating06:: + text "To evolve, some" + line "#MON grow," + + para "others use the" + line "effects of STONES." + done + +_OakRating07:: + text "Have you gotten a" + line "fishing ROD? You" + + para "can catch #MON" + line "by fishing." + done + +_OakRating08:: + text "Excellent! You" + line "seem to like col-" + cont "lecting things!" + done + +_OakRating09:: + text "Some #MON only" + line "appear during" + + para "certain times of" + line "the day." + done + +_OakRating10:: + text "Your #DEX is" + line "filling up. Keep" + cont "up the good work!" + done + +_OakRating11:: + text "I'm impressed." + line "You're evolving" + + para "#MON, not just" + line "catching them." + done + +_OakRating12:: + text "Have you met KURT?" + line "His custom #" + cont "BALLS should help." + done + +_OakRating13:: + text "Wow. You've found" + line "more #MON than" + + para "the last #DEX" + line "research project." + done + +_OakRating14:: + text "Are you trading" + line "your #MON?" + + para "It's tough to do" + line "this alone!" + done + +_OakRating15:: + text "Wow! You've hit" + line "200! Your #DEX" + cont "is looking great!" + done + +_OakRating16:: + text "You've found so" + line "many #MON!" + + para "You've really" + line "helped my studies!" + done + +_OakRating17:: + text "Magnificent! You" + line "could become a" + + para "#MON professor" + line "right now!" + done + +_OakRating18:: + text "Your #DEX is" + line "amazing! You're" + + para "ready to turn" + line "professional!" + done + +_OakRating19:: + text "Whoa! A perfect" + line "#DEX! I've" + + para "dreamt about this!" + line "Congratulations!" + done + +_OakPCText4:: + text "The link to PROF." + line "OAK's PC closed." + done + +UnknownText_0x1c1a5b:: + text " , yeah!" + done + +UnknownText_0x1c1a65:: + text "Darn…" + done + +UnknownText_0x1c1a6c:: + text "Would you like to" + line "end the Contest?" + done + +UnknownText_0x1c1a90:: + text "Toss out how many" + line "@" + text_from_ram wStringBuffer2 + text "(S)?" + done + +UnknownText_0x1c1aad:: + text "Throw away @" + deciram wItemQuantityChangeBuffer, 1, 2 + text_start + line "@" + text_from_ram wStringBuffer2 + text "(S)?" + done + +UnknownText_0x1c1aca:: + text "Discarded" + line "@" + text_from_ram wStringBuffer1 + text "(S)." + prompt + +UnknownText_0x1c1adf:: + text "That's too impor-" + line "tant to toss out!" + prompt + +UnknownText_0x1c1b03:: + text "OAK: <PLAYER>!" + line "This isn't the" + cont "time to use that!" + done + +UnknownText_0x1c1b2c:: + text "Took @" + text_from_ram wMonOrItemNameBuffer + text "'s" + line "@" + text_from_ram wStringBuffer1 + text " and" + + para "made it hold" + line "@" + text_from_ram wStringBuffer2 + text "." + prompt + +UnknownText_0x1c1b57:: + text "Made @" + text_from_ram wMonOrItemNameBuffer + text_start + line "hold @" + text_from_ram wStringBuffer2 + text "." + prompt + +UnknownText_0x1c1b6f:: + text "Please remove the" + line "MAIL first." + prompt + +UnknownText_0x1c1b8e:: + text_from_ram wMonOrItemNameBuffer + text " isn't" + line "holding anything." + prompt + +UnknownText_0x1c1baa:: + text "Item storage space" + line "full." + prompt + +UnknownText_0x1c1bc4:: + text "Took @" + text_from_ram wStringBuffer1 + text_start + line "from @" + text_from_ram wMonOrItemNameBuffer + text "." + prompt + +UnknownText_0x1c1bdc:: + text_from_ram wMonOrItemNameBuffer + text " is" + line "already holding" + + para "@" + text_from_ram wStringBuffer1 + text "." + line "Switch items?" + done + +UnknownText_0x1c1c09:: + text "This item can't be" + line "held." + prompt + +UnknownText_0x1c1c22:: + text "The MAIL will lose" + line "its message. OK?" + done + +UnknownText_0x1c1c47:: + text "MAIL detached from" + line "@" + text_from_ram wStringBuffer1 + text "." + prompt + +UnknownText_0x1c1c62:: + text "There's no space" + line "for removing MAIL." + prompt + +UnknownText_0x1c1c86:: + text "Send the removed" + line "MAIL to your PC?" + done + +UnknownText_0x1c1ca9:: + text "Your PC's MAILBOX" + line "is full." + prompt + +UnknownText_0x1c1cc4:: + text "The MAIL was sent" + line "to your PC." + prompt + +UnknownText_0x1c1ce3:: + text "Not enough HP!" + prompt + +UnknownText_0x1c1cf3:: + text "An item in your" + line "PACK may be" + + para "registered for use" + line "on SELECT Button." + done + +_ClockTimeUnknownText:: + text "Clock time unknown" + done + +_OakText1:: + text "Hello! Sorry to" + line "keep you waiting!" + + para "Welcome to the" + line "world of #MON!" + + para "My name is OAK." + + para "People call me the" + line "#MON PROF." + prompt + +_OakText2:: + text "This world is in-" + line "habited by crea-" + cont "tures that we call" + cont "#MON.@@" + +_OakText3:: + text_waitbutton + db "@" + +_OakText4:: + text "People and #MON" + line "live together by" + + para "supporting each" + line "other." + + para "Some people play" + line "with #MON, some" + cont "battle with them." + prompt + +_OakText5:: + text "But we don't know" + line "everything about" + cont "#MON yet." + + para "There are still" + line "many mysteries to" + cont "solve." + + para "That's why I study" + line "#MON every day." + prompt + +_OakText6:: + text "Now, what did you" + line "say your name was?" + prompt + +_OakText7:: + text "<PLAYER>, are you" + line "ready?" + + para "Your very own" + line "#MON story is" + cont "about to unfold." + + para "You'll face fun" + line "times and tough" + cont "challenges." + + para "A world of dreams" + line "and adventures" + + para "with #MON" + line "awaits! Let's go!" + + para "I'll be seeing you" + line "later!" + done + +UnknownText_0x1c40e6:: + text "The clock's time" + line "may be wrong." + + para "Please reset the" + line "time." + prompt + +UnknownText_0x1c411c:: + text "Set with the" + line "Control Pad." + + para "Confirm: A Button" + line "Cancel: B Button" + done + +UnknownText_0x1c415b:: + text "Is this OK?" + done + +UnknownText_0x1c4168:: + text "The clock has been" + line "reset." + done + +UnknownText_0x1c4183:: + text "Too much time has" + line "elapsed. Please" + cont "try again." + prompt + +UnknownText_0x1c41b1:: + text "If you trade that" + line "#MON, you won't" + cont "be able to battle." + prompt + +UnknownText_0x1c41e6:: + text "Your friend's" + line "@" + text_from_ram wStringBuffer1 + text " appears" + cont "to be abnormal!" + prompt + +UnknownText_0x1c4212:: + text "Trade @" + text_from_ram wTemporaryBuffer + text_start + line "for @" + text_from_ram wStringBuffer1 + text "?" + done + +UnknownText_0x1c454b:: + text "Would you like to" + line "save the game?" + done + +UnknownText_0x1c456d:: + text "SAVING… DON'T TURN" + line "OFF THE POWER." + done + +UnknownText_0x1c4590:: + text "<PLAYER> saved" + line "the game." + done + +UnknownText_0x1c45a3:: + text "There is already a" + line "save file. Is it" + cont "OK to overwrite?" + done + +UnknownText_0x1c45d9:: + text "There is another" + line "save file. Is it" + cont "OK to overwrite?" + done + +UnknownText_0x1c460d:: + text "The save file is" + line "corrupted!" + prompt + +UnknownText_0x1c462a:: + text "When you change a" + line "#MON BOX, data" + cont "will be saved. OK?" + done + +UnknownText_0x1c465f:: + text "Each time you move" + line "a #MON, data" + cont "will be saved. OK?" + done + +UnknownText_0x1c4693:: + text "The window save" + line "area was exceeded." + done + +UnknownText_0x1c46b7:: + text "No windows avail-" + line "able for popping." + done + +UnknownText_0x1c46dc:: + text "Corrupted event!" + prompt + +_ObjectEventText:: + text "Object event." + done + +BGEventText_:: + text "BG event" + done + +CoordinatesEventText_:: + text "Coordinates event" + done + +UnknownText_0x1c4719:: + text "<PLAYER> received" + line "@" + text_from_ram wStringBuffer4 + text "." + done + +UnknownText_0x1c472c:: + text "<PLAYER> put the" + line "@" + text_from_ram wStringBuffer1 + text " in" + cont "the @" + text_from_ram wStringBuffer3 + text "." + prompt + +UnknownText_0x1c474b:: + text "The @" + text_from_ram wStringBuffer3 + text_start + line "is full…" + prompt + +UnknownText_0x1c4b92:: + text "Congratulations!" + line "Your @" + text_from_ram wStringBuffer2 + db "@@" + +UnknownText_0x1c4baf:: + text_start + + para "evolved into" + line "@" + text_from_ram wStringBuffer1 + text "!" + done + +UnknownText_0x1c4bc5:: + text "Huh? @" + text_from_ram wStringBuffer2 + text_start + line "stopped evolving!" + prompt + +UnknownText_0x1c4be3:: + text "What? @" + text_from_ram wStringBuffer2 + text_start + line "is evolving!" + done + +UnknownText_0x1c4bfd:: + text "How many?" + done + +UnknownText_0x1c4c08:: + deciram wItemQuantityChangeBuffer, 1, 2 + text " @" + text_from_ram wStringBuffer2 + text "(S)" + line "will be ¥@" + deciram hMoneyTemp, 3, 6 + text "." + done + +UnknownText_0x1c4c28:: + text "Hello, dear." + + para "I sell inexpensive" + line "herbal medicine." + + para "They're good, but" + line "a trifle bitter." + + para "Your #MON may" + line "not like them." + + para "Hehehehe…" + done + +UnknownText_0x1c4ca3:: + text "How many?" + done + +UnknownText_0x1c4cae:: + deciram wItemQuantityChangeBuffer, 1, 2 + text " @" + text_from_ram wStringBuffer2 + text "(S)" + line "will be ¥@" + deciram hMoneyTemp, 3, 6 + text "." + done + +UnknownText_0x1c4cce:: + text "Thank you, dear." + line "Hehehehe…" + done + +UnknownText_0x1c4cea:: + text "Oh? Your PACK is" + line "full, dear." + done + +UnknownText_0x1c4d08:: + text "Hehehe… You don't" + line "have the money." + done + +UnknownText_0x1c4d2a:: + text "Come again, dear." + line "Hehehehe…" + done + +UnknownText_0x1c4d47:: + text "Hiya! Care to see" + line "some bargains?" + + para "I sell rare items" + line "that nobody else" + + para "carries--but only" + line "one of each item." + done + +UnknownText_0x1c4db0:: + text_from_ram wStringBuffer2 + text " costs" + line "¥@" + deciram hMoneyTemp, 3, 6 + text ". Want it?" + done + +UnknownText_0x1c4dcd:: + text "Thanks." + done + +UnknownText_0x1c4dd6:: + text "Uh-oh, your PACK" + line "is chock-full." + done + +UnknownText_0x1c4df7:: + text "You bought that" + line "already. I'm all" + cont "sold out of it." + done + +UnknownText_0x1c4e28:: + text "Uh-oh, you're" + line "short on funds." + done + +UnknownText_0x1c4e46:: + text "Come by again" + line "sometime." + done + +UnknownText_0x1c4e5f:: + text "What's up? Need" + line "some medicine?" + done + +UnknownText_0x1c4e7e:: + text "How many?" + done + +UnknownText_0x1c4e89:: + deciram wItemQuantityChangeBuffer, 1, 2 + text " @" + text_from_ram wStringBuffer2 + text "(S)" + line "will cost ¥@" + deciram hMoneyTemp, 3, 6 + text "." + done + +UnknownText_0x1c4eab:: + text "Thanks much!" + done + +UnknownText_0x1c4eb9:: + text "You don't have any" + line "more space." + done + +UnknownText_0x1c4ed8:: + text "Huh? That's not" + line "enough money." + done + +UnknownText_0x1c4ef6:: + text "All right." + line "See you around." + done + +UnknownText_0x1c4f12:: + text "You don't have" + line "anything to sell." + prompt + +UnknownText_0x1c4f33:: + text "How many?" + done + +UnknownText_0x1c4f3e:: + text "I can pay you" + line "¥@" + deciram hMoneyTemp, 3, 6 + text "." + + para "Is that OK?" + done + +UnknownText_0x1c4f62:: + text "Welcome! How may I" + line "help you?" + done + +UnknownText_0x1c4f80:: + text "Here you are." + line "Thank you!" + done + +UnknownText_0x1c4f9a:: + text "You don't have" + line "enough money." + done + +UnknownText_0x1c4fb7:: + text "You can't carry" + line "any more items." + done + +UnknownText_0x1c4fd7:: + text "Sorry, I can't buy" + line "that from you." + done + +UnknownText_0x1c4ff9:: + text "Please come again!" + done + +UnknownText_0x1c500d:: + text "Can I do anything" + line "else for you?" + done + +UnknownText_0x1c502e:: + text "Got ¥@" + deciram hMoneyTemp, 3, 6 + text " for" + line "@" + text_from_ram wStringBuffer2 + text "(S)." + done + +UnknownText_0x1c5049:: + text "Bet how many" + line "coins?" + done diff --git a/data/text/common_3.asm b/data/text/common_3.asm new file mode 100644 index 00000000..7f21819a --- /dev/null +++ b/data/text/common_3.asm @@ -0,0 +1,550 @@ +UnknownText_0x1c505e:: + text "Start!" + done + +UnknownText_0x1c5066:: + text "Not enough" + line "coins." + prompt + +UnknownText_0x1c5079:: + text "Darn… Ran out of" + line "coins…" + done + +UnknownText_0x1c5092:: + text "Play again?" + done + +UnknownText_0x1c509f:: + text "lined up!" + line "Won @" + text_from_ram wStringBuffer2 + text " coins!" + done + +UnknownText_0x1c50bb:: + text "Darn!" + done + +UnknownText_0x1c5821:: + current_day + db "@" + +UnknownText_0x1c5824:: + text "<……>" + done + +UnknownText_0x1c5827:: + text "You're out of the" + line "service area." + prompt + +UnknownText_0x1c5847:: + text "Whom do you want" + line "to call?" + done + +UnknownText_0x1c5862:: + text "Press any button" + line "to exit." + done + +UnknownText_0x1c587d:: + text "Delete this stored" + line "phone number?" + done + +UnknownText_0x1c5565:: + text "Huh? Sorry, wrong" + line "number!" + done + +UnknownText_0x1c5580:: + text "Click!" + done + +UnknownText_0x1c5588:: + text "<……>" + done + +UnknownText_0x1c558b:: + text "That number is out" + line "of the area." + done + +UnknownText_0x1c55ac:: + text "Just go talk to" + line "that person!" + done + +UnknownText_0x1c55ca:: + text "Thank you!" + done + +UnknownText_0x1c55d6:: + text " :" + done + +UnknownText_0x1c55db:: + text "Password OK." + line "Select CONTINUE &" + cont "reset settings." + prompt + +UnknownText_0x1c560b:: + text "Wrong password!" + prompt + +UnknownText_0x1c561c:: + text "Reset the clock?" + done + +UnknownText_0x1c562e:: + text "Please enter the" + line "password." + done + +UnknownText_0x1c564a:: + text "Clear all save" + line "data area?" + done + +Text_LearnedMove_:: + text_from_ram wMonOrItemNameBuffer + text " learned" + line "@" + text_from_ram wStringBuffer2 + text "!@" + sound_dex_fanfare_50_79 + text_waitbutton + db "@" + +Text_ForgetWhich_:: + text "Which move should" + next "be forgotten?" + done + +Text_StopLearning_:: + text "Stop learning" + line "@" + text_from_ram wStringBuffer2 + text "?" + done + +Text_DidNotLearn_:: + text_from_ram wMonOrItemNameBuffer + text_start + line "did not learn" + cont "@" + text_from_ram wStringBuffer2 + text "." + prompt + +Text_TryingToLearn_:: + text_from_ram wMonOrItemNameBuffer + text " is" + line "trying to learn" + cont "@" + text_from_ram wStringBuffer2 + text "." + + para "But @" + text_from_ram wMonOrItemNameBuffer + text_start + line "can't learn more" + cont "than four moves." + + para "Delete an older" + line "move to make room" + cont "for @" + text_from_ram wStringBuffer2 + text "?" + done + +Text_1_2_and_Poof_:: + text "1, 2 and…@" + interpret_data + db "@@" + +Text_PoofForgot_:: + text " Poof!@" + interpret_data + text_start + + para "@" + text_from_ram wMonOrItemNameBuffer + text " forgot" + line "@" + text_from_ram wStringBuffer1 + text "." + + para "And…" + prompt + +Text_CantForgetHM_:: + text "HM moves can't be" + line "forgotten now." + prompt + +UnknownText_0x1c5793:: + text "Play with three" + line "coins?" + done + +UnknownText_0x1c57ab:: + text "Not enough coins…" + prompt + +UnknownText_0x1c57be:: + text "Choose a card." + done + +UnknownText_0x1c57ce:: + text "Place your bet." + done + +UnknownText_0x1c57df:: + text "Want to play" + line "again?" + done + +UnknownText_0x1c57f4:: + text "The cards have" + line "been shuffled." + prompt + +UnknownText_0x1c5813:: + text "Yeah!" + done + +UnknownText_0x1c581a:: + text "Darn…" + done + +Text_ThisMonCantBeCaught_:: + text "It dodged the" + line "thrown BALL!" + + para "This #MON" + line "can't be caught!" + prompt + +Text_YouMissedThePokemon_:: + text "You missed the" + line "#MON!" + prompt + +Text_ThePokemonBrokeFree_:: + text "Oh no! The #MON" + line "broke free!" + prompt + +Text_AppearedToBeCaught_:: + text "Aww! It appeared" + line "to be caught!" + prompt + +Text_AarghAlmostHadIt_:: + text "Aargh!" + line "Almost had it!" + prompt + +Text_ShootItWasSoCloseToo_:: + text "Shoot! It was so" + line "close too!" + prompt + +Text_GotchaMonWasCaught_:: + text "Gotcha! @" + text_from_ram wEnemyMonNick + text_start + line "was caught!@" + sound_caught_mon + db "@@" + +Text_Waitbutton_2:: + text_waitbutton + db "@" + +Text_SentToBillsPC_:: + text_from_ram wMonOrItemNameBuffer + text " was" + line "sent to BILL's PC." + prompt + +Text_MonNewlyAddedToPokedex_:: + text_from_ram wEnemyMonNick + text "'s data" + line "was newly added to" + cont "the #DEX.@" + sound_slot_machine_start + text_waitbutton + db "@" + +Text_AskNicknameNewlyCaughtMon_:: + text "Give a nickname to" + line "@" + text_from_ram wStringBuffer1 + text "?" + done + +Text_StatRoseFromVitamin_:: + text_from_ram wStringBuffer1 + text "'s" + line "@" + text_from_ram wStringBuffer2 + text " rose." + prompt + +Text_MilkDrinkCantBeUsed_:: + text "That can't be used" + line "on this #MON." + prompt + +Text_RepelUsedEarlierIsStillInEffect:: + text "The REPEL used" + line "earlier is still" + cont "in effect." + prompt + +Text_NowThatsACatchyTune_:: + text "Played the #" + line "FLUTE." + + para "Now, that's a" + line "catchy tune!" + prompt + +Text_AllSleepingMonWokeUp_:: + text "All sleeping" + line "#MON woke up." + prompt + +Text_PlayedThePokeFlute_:: + text "<PLAYER> played the" + line "# FLUTE.@" + text_waitbutton + db "@@" + +Text_CoinCase_:: + text "Coins:" + line "@" + deciram wCoins, 2, 4 + done + +Text_RaiseThePPOfWhichMove_:: + text "Raise the PP of" + line "which move?" + done + +Text_RestoreThePPOfWhichMove_:: + text "Restore the PP of" + line "which move?" + done + +Text_PPIsMaxedOut_:: + text_from_ram wStringBuffer2 + text "'s PP" + line "is maxed out." + prompt + +Text_PPsIncreased_:: + text_from_ram wStringBuffer2 + text "'s PP" + line "increased." + prompt + +Text_PPWasRestored_:: + text "PP was restored." + prompt + +Text_TrophyInside_:: + text "There was a trophy" + line "inside!@" + sound_dex_fanfare_50_79 + text_start + + para "@" + text_from_ram wPlayerName + text " sent the" + line "trophy home." + prompt + +Text_LooksBitter_:: + text "It looks bitter…" + prompt + +Text_CantUseOnEgg_:: + text "That can't be used" + line "on an EGG." + prompt + +Text_IsntTheTimeToUseThat_:: + text "OAK: <PLAYER>!" + line "This isn't the" + cont "time to use that!" + prompt + +Text_BelongsToSomeoneElse_:: + text "That belongs to" + line "someone else!" + prompt + +Text_WontHaveAnyEffect_:: + text "It won't have any" + line "effect." + prompt + +Text_BlockedTheBall_:: + text "The trainer" + line "blocked the BALL!" + prompt + +Text_DontBeAThief_:: + text "Don't be a thief!" + prompt + +Text_CyclingIsntAllowed_:: + text "Cycling isn't" + line "allowed here." + prompt + +Text_CantGetOnYourItemNow_:: + text "Can't get on your" + line "@" + text_from_ram wStringBuffer1 + text " now." + prompt + +Text_CantUseBallBoxIsFull_:: + text "The #MON BOX" + line "is full. That" + cont "can't be used now." + prompt + +Text_UsedItem_:: + text "<PLAYER> used the" + line "@" + text_from_ram wStringBuffer2 + text "." + done + +Text_GotOnItem_:: + text "<PLAYER> got on the@" + text_low + text_from_ram wStringBuffer2 + text "." + prompt + +Text_GotOffItem_:: + text "<PLAYER> got off@" + text_low + text "the @" + text_from_ram wStringBuffer2 + text "." + prompt + +Text_KnowsMove_:: + text_from_ram wStringBuffer1 + text " knows" + line "@" + text_from_ram wStringBuffer2 + text "." + prompt + +UnknownText_0x1c5eba:: + text "That #MON knows" + line "only one move." + done + +UnknownText_0x1c5eda:: + text "Oh, make it forget" + line "@" + text_from_ram wStringBuffer1 + text "?" + done + +UnknownText_0x1c5ef5:: + text "Done! Your #MON" + line "forgot the move." + done + +UnknownText_0x1c5f17:: + text "An EGG doesn't" + line "know any moves!" + done + +UnknownText_0x1c5f36:: + text "No? Come visit me" + line "again." + done + +UnknownText_0x1c5f50:: + text "Which move should" + line "it forget, then?" + prompt + +UnknownText_0x1c5f74:: + text "Um… Oh, yes, I'm" + line "the MOVE DELETER." + + para "I can make #MON" + line "forget moves." + + para "Shall I make a" + line "#MON forget?" + done + +UnknownText_0x1c5fd1:: + text "Which #MON?" + prompt + +Text_DSTIsThatOK:: + text " DST," + line "is that OK?" + done + +UnknownText_0x1c5ff1:: + text "," + line "is that OK?" + done + +UnknownText_0x1c6000:: + text "Do you want to" + line "switch to Daylight" + cont "Saving Time?" + done + +UnknownText_0x1c6030:: + text "I set the clock" + line "forward by one" + cont "hour." + prompt + +UnknownText_0x1c6056:: + text "Is Daylight Saving" + line "Time over?" + done + +UnknownText_0x1c6075:: + text "I put the clock" + line "back one hour." + prompt + +UnknownText_0x1c6095:: + text "Do you want to" + line "adjust your clock" + + para "for Daylight" + line "Saving Time?" + done + +UnknownText_0x1c60d1:: + text "I lost the in-" + line "struction booklet" + cont "for the #GEAR." + + para "Come back again in" + line "a while." + prompt diff --git a/engine/main_menu.asm b/engine/main_menu.asm index c7f4255d..2da93de6 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -198,7 +198,7 @@ Function5b9c: ; 5b9c (1:5b9c) db "TIME NOT SET@" .UnusedText - text_jump ClockTimeUnknownText_ + text_jump _ClockTimeUnknownText db "@" Function5bb8: ; 5bb8 (1:5bb8) @@ -426,7 +426,7 @@ InitializeMagikarpHouse: ; 5d47 (1:5d47) Function5d5d: ; 5d5d (1:5d5d) ld hl, .Rival - ld de, wRivalsName + ld de, wRivalName call .CopyName ld hl, .Mom ld de, wMomsName @@ -814,11 +814,11 @@ OakSpeech: ; 5fa5 (1:5fa5) ret OakText1: - text_jump OakText1_ + text_jump _OakText1 db "@" OakText2: - text_jump OakText2_ + text_jump _OakText2 start_asm ld a, MARILL call PlayCry @@ -827,23 +827,23 @@ OakText2: ret OakText3: - text_jump OakText3_ + text_jump _OakText3 db "@" OakText4: - text_jump OakText4_ + text_jump _OakText4 db "@" OakText5: - text_jump OakText5_ + text_jump _OakText5 db "@" OakText6: - text_jump OakText6_ + text_jump _OakText6 db "@" OakText7: - text_jump OakText7_ + text_jump _OakText7 db "@" NamePlayer: ; 6085 (1:6085) @@ -853,7 +853,7 @@ NamePlayer: ; 6085 (1:6085) ld a, [wMenuCursorY] dec a jr z, .NewName - ld de, wPlayersName + ld de, wPlayerName call StorePlayerName callba ApplyMonOrTrainerPals call MovePlayerPicLeft @@ -861,7 +861,7 @@ NamePlayer: ; 6085 (1:6085) .NewName ld b, $1 - ld de, wPlayersName + ld de, wPlayerName callba NamingScreen call RotateThreePalettesRight call ClearTileMap @@ -875,7 +875,7 @@ NamePlayer: ; 6085 (1:6085) ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS call GetSGBLayout call RotateThreePalettesLeft - ld hl, wPlayersName + ld hl, wPlayerName ld de, .GoldSilver call InitName ret diff --git a/engine/move_mon.asm b/engine/move_mon.asm index f6e63d88..007f3b2a 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -33,7 +33,7 @@ TryAddMonToParty:: ; d892 (3:5892) call SkipNames ld d, h ld e, l - ld hl, wPlayersName + ld hl, wPlayerName ld bc, NAME_LENGTH call CopyBytes ld a, [wMonType] @@ -857,7 +857,7 @@ SentPkmnIntoBox: ; de74 (3:5e74) jr nz, .asm_de8b call GetBaseData call Functiondf4d - ld hl, wPlayersName + ld hl, wPlayerName ld de, sBoxMonOT ld bc, NAME_LENGTH call CopyBytes @@ -1604,7 +1604,7 @@ GivePoke: ; Give a Pokemon from script ld a, b and a ret z - ld hl, Text_WasSentToBillsPC + ld hl, TextJump_WasSentToBillsPC call PrintText ld a, BANK(sBoxMonNicknames) call OpenSRAM @@ -1622,8 +1622,8 @@ Functione3af: ; e3af (3:63af) ld b, $2 ret -Text_WasSentToBillsPC: - text_jump Text_WasSentToBillsPC_ +TextJump_WasSentToBillsPC: + text_jump Text_WasSentToBillsPC db "@" InitNickname: ; e3b9 (3:63b9) diff --git a/engine/pack.asm b/engine/pack.asm index 03349b34..f923c039 100755 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -609,7 +609,7 @@ Function108b6: ; 108b6 (4:48b6) ret Text_AnEggCantHoldAnItem: - text_jump Text_AnEggCantHoldAnItem_ + text_jump Text_AnEGGCantHoldAnItem db "@" QuitItemSubmenu: @@ -1545,7 +1545,7 @@ Text_ThisIsntTheTime: db "@" Text_YouDontHaveAPokemon: - text_jump Text_YouDontHaveAPokemon_ + text_jump Text_YouDontHaveAMon db "@" Text_RegisteredTheItem: @@ -1565,7 +1565,7 @@ Text_PackEmptyString: db "@" Text_CantUseItInABattle: - text_jump Text_CantUseItInABattle_ + text_jump Text_YouCantUseItInABattle db "@" PackMenuGFX: INCBIN "gfx/misc/pack_menu.2bpp" diff --git a/engine/specials.asm b/engine/specials.asm index c08cee11..4232bb9e 100755 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -190,9 +190,9 @@ asm_c3f2 Special_NameRival: ; c3f7 ld b, $2 - ld de, wRivalsName + ld de, wRivalName callba NamingScreen_ - ld hl, wRivalsName + ld hl, wRivalName ld de, .DefaultName call InitName ret diff --git a/home/map.asm b/home/map.asm index cba63d00..3088996c 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1389,7 +1389,7 @@ ObjectEvent:: jumptextfaceplayer ObjectEventText ObjectEventText:: - text_jump ObjectEventText_ + text_jump _ObjectEventText db "@" BGEvent:: diff --git a/home/text.asm b/home/text.asm index 5c749208..806351d5 100644 --- a/home/text.asm +++ b/home/text.asm @@ -206,7 +206,7 @@ endm dict $23, PlaceKougeki dict "<LNBRK>", HalfLineChar dict "<CONT>", ContText - dict "<......>", SixDotsChar + dict "<……>", SixDotsChar dict "<DONE>", DoneText dict "<PROMPT>", PromptText dict "<PKMN>", PlacePKMN @@ -267,8 +267,8 @@ print_name: macro endm PrintMomsName:: print_name wMomsName ; 1066 (0:1066) -PrintPlayerName:: print_name wPlayersName ; 106d (0:106d) -PrintRivalName:: print_name wRivalsName ; 1074 (0:1074) +PrintPlayerName:: print_name wPlayerName ; 106d (0:106d) +PrintRivalName:: print_name wRivalName ; 1074 (0:1074) PrintRedsName:: print_name wRedsName ; 107b (0:107b) PrintGreensName:: print_name wGreensName ; 1082 (0:1082) @@ -332,7 +332,7 @@ PlaceEnemysName:: ; 10fb (0:10fb) jr PlaceCommandCharacter .rival - ld de, wRivalsName + ld de, wRivalName jr PlaceCommandCharacter .linkbattle diff --git a/items/item_effects.asm b/items/item_effects.asm index d2d32ae4..84ff853e 100755 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -978,7 +978,7 @@ Text_GotchaMonWasCaught: ret Text_CaughtMonWaitbutton: - text_jump Text_CaughtMonWaitbutton_ + text_jump Text_Waitbutton_2 db "@" Text_SentToBillsPC: @@ -1954,7 +1954,7 @@ asm_f4c2 jp Functionf7d0 Text_RepelsEffectsStillLinger: - text_jump Text_RepelsEffectsStillLinger_ + text_jump Text_RepelUsedEarlierIsStillInEffect db "@" XAccuracy: ; f4d8 (3:74d8) @@ -2121,17 +2121,17 @@ Text_CoinCase: OldRod: ; f5ec (3:75ec) ld e, $0 - jr asm_f5f8 + jr UseRod GoodRod: ; f5f0 (3:75f0) ld e, $1 - jr asm_f5f8 + jr UseRod SuperRod: ; f5f4 (3:75f4) ld e, $2 - jr asm_f5f8 + jr UseRod -asm_f5f8 +UseRod: callba FishingRodFunction ; same bank ret @@ -2400,12 +2400,12 @@ GorgeousBox: ; f7ae (3:77ae) ld c, DECOFLAG_GOLD_TROPHY_DOLL asm_f7b0 callba ReceiveDecorationC ; 9:70d5 - ld hl, Text_TrohpyInside ; $77bf + ld hl, Text_TrophyInside ; $77bf call PrintText jp Functionf7dc -Text_TrohpyInside: - text_jump Text_TrohpyInside_ +Text_TrophyInside: + text_jump Text_TrophyInside_ db "@" AmuletCoin: ; f7c4 diff --git a/macros/charmap.asm b/macros/charmap.asm index 44592293..2f0b813b 100644 --- a/macros/charmap.asm +++ b/macros/charmap.asm @@ -12,6 +12,8 @@ charmap "<SHINY>", $3f charmap "<MOM>", $49 charmap "<PKMN>", $4a + charmap "<_CONT>", $4b ; implements "<CONT>" + charmap "<SCROLL>", $4c charmap "<NEXT>", $4e charmap "<LINE>", $4f @@ -21,7 +23,7 @@ charmap "<RIVAL>", $53 charmap "#", $54 charmap "<CONT>", $55 - charmap "<......>", $56 + charmap "<……>", $56 charmap "<DONE>", $57 charmap "<PROMPT>", $58 charmap "<TARGET>", $59 diff --git a/macros/text.asm b/macros/text.asm index bce2fdd2..8cda714a 100644 --- a/macros/text.asm +++ b/macros/text.asm @@ -13,7 +13,13 @@ dex EQUS "db $e8, $50" ; End a Pokedex entry. ; TX_RAM EQU $01 ; TX_FAR EQU $16 - enum_start 1 + enum_start + + enum TX_START +text_start: MACRO ; 00 + db TX_START +ENDM + enum TX_RAM text_from_ram: MACRO ; 01 db TX_RAM diff --git a/macros/wram.asm b/macros/wram.asm index 336ada43..97df2415 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -217,7 +217,6 @@ trademon: MACRO \1OTName:: ds NAME_LENGTH ; wc6f2 | wc724 \1DVs:: ds 2 ; wc6fd | wc72f \1ID:: ds 2 ; wc6ff | wc731 -\1CaughtData:: ds 1 ; wc701 | wc733 \1End:: ENDM @@ -1626,356 +1626,6 @@ SECTION "bank62", ROMX, BANK[$62] SECTION "bank63", ROMX, BANK[$63] dr $18c000, $190000 -SECTION "bank64", ROMX, BANK[$64] - dr $190000, $190ef3 -ReceivedMysteryGiftText_:: - dr $190ef3, $190f0b -NoCoinsText_:: - dr $190f0b, $190f1f -NoCoinCaseText_:: - dr $190f1f, $1920ad -BadgeRequiredText_:: - dr $1920ad, $1920ce -CantUseFieldMoveHereText_:: - dr $1920ce, $1920e3 -Text_UsedCut_:: - dr $1920e3, $1920f2 -Text_NothingToCut_:: - dr $1920f2, $19210f -Text_UsedFlash_:: - dr $19210f, $192135 -UsedSurfText_:: - dr $192135, $194000 - -SECTION "bank65", ROMX, BANK[$65] -CantSurfText_:: - dr $194000, $194015 - -AlreadySurfingText_:: - dr $194015, $19402d - -AskSurfText_:: - dr $19402d, $19404f - -Text_UsedWaterfall_:: - dr $19404f, $194064 - -Text_CantDoWaterfall_:: - dr $194064, $194080 - -Text_AskUseWaterfall_:: - dr $194080, $19409f - -Text_UsedDig_:: - dr $19409f, $1940ae - -Text_UsedEscapeRope_:: - dr $1940ae, $1940c6 - -Text_CantUseDigEscapeRopeHere_:: - dr $1940c6, $1940db - -Text_ReturnToLastMonCenter_:: - dr $1940db, $1940fc - -Text_CantUseTeleportHere_:: - dr $1940fc, $194112 - -Text_AlreadyUsingStrength_:: - dr $194112, $194135 - -Text_UsedStrength_:: - dr $194135, $194149 - -Text_AllowedToMoveBoulders_:: - dr $194149, $194161 - -Text_AskStrength_:: - dr $194161, $194199 - -Text_BouldersMayNowBeMoved_:: - dr $194199, $1941b5 - -Text_MonMayBeAbleToMove_:: - dr $1941b5, $1941d7 - -Text_UsedWhirlpool_:: - dr $1941d7, $1941ec - -Text_MightyWhirlpool_:: - dr $1941ec, $194225 - -Text_AskWhirlpool_:: - dr $194225, $194258 - -Text_DidAHeadbutt_:: - dr $194258, $19426d - -Text_NothingFromHeadbutt_:: - dr $19426d, $19427d - -Text_AskHeadbutt_:: - dr $19427d, $1942b1 - -Text_UsedRockSmash_:: - dr $1942b1, $1942c7 - -Text_MayBeBreakable_:: - dr $1942c7, $1942e8 - -Text_AskRockSmash_:: - dr $1942e8, $19431c - -Text_OhABite_:: - dr $19431c, $194329 - -Text_NotEvenANibble_:: - dr $194329, $19433d - -Text_NothingHereToFish_:: - dr $19433d, $19435e - -Text_CantGetOffBike_:: - dr $19435e, $194376 - -Text_GotOnTheBike_:: - dr $194376, $19438b - -Text_GotOffTheBike_:: - dr $19438b, $1943a1 - -Text_AskCut_:: - dr $1943a1, $1943c9 - -Text_MonCanCutThis_:: - dr $1943c9, $194543 - -Text_AnEggCantHoldAnItem_:: - dr $194543, $19455e - -Text_PackNoItems_:: - dr $19455e, $194569 - -Text_ThrowAwayHowMany_:: - dr $194569, $19457f - -Text_ConfirmThrowAway_:: - dr $19457f, $19459c - -Text_ThrewAway_:: - dr $19459c, $1945b2 - -Text_ThisIsntTheTime_:: - dr $1945b2, $1945db - -Text_YouDontHaveAPokemon_:: - dr $1945db, $1945f2 - -Text_RegisteredTheItem_:: - dr $1945f2, $194609 - -Text_CantRegisterThatItem_:: - dr $194609, $194627 - -Text_MoveItemWhere_:: - dr $194627, $194647 - -Text_PackEmptyString_:: - dr $194647, $194649 - -Text_CantUseItInABattle_:: - dr $194649, $194953 - -Text_WasSentToBillsPC_:: - dr $194953, $19496e - -Text_GottaHavePokemon_:: - dr $19496e, $19498c - -Text_BillsPCWhat_:: - dr $19498c, $194993 - -Text_PleaseRemoveMailBeforeMovePkmnWOMail_:: - dr $194993, $1949ca - -Text_YouDontHaveASinglePokemon_:: - dr $1949ca, $1949e8 - -Text_ItsYourLastPokemon_:: - dr $1949e8, $194a0a - -Text_CantTakeAnyMorePokemon_:: - dr $194a0a, $194a28 - -Text_CaughtBugMon_:: - dr $194a28, $195610 - -ClockTimeUnknownText_:: ; 195610 - dr $195610, $195624 - -OakText1_:: - dr $195624, $195693 - -OakText2_:: - dr $195693, $1956d1 - -OakText3_:: ; 1956d1 - dr $1956d1, $1956d3 - -OakText4_:: - dr $1956d3, $19573f - -OakText5_:: - dr $19573f, $1957b7 - -OakText6_:: - dr $1957b7, $1957dd - -OakText7_:: - dr $1957dd, $195b84 - -ObjectEventText_:: ; 195b84 - dr $195b84, $195b93 - -BGEventText_:: ; 195b93 - dr $195b93, $195b9d - -CoordinatesEventText_:: ; 195b9d - dr $195b9d, $198000 - -SECTION "bank66", ROMX, BANK[$66] - dr $198000, $1981e1 -Text_LearnedMove_:: - dr $1981e1, $1981f8 -Text_ForgetWhich_:: - dr $1981f8, $198219 -Text_StopLearning_:: - dr $198219, $19822f -Text_DidNotLearn_:: - dr $19822f, $198249 -Text_TryingToLearn_:: - dr $198249, $1982c0 -Text_1_2_and_Poof_:: - dr $1982c0, $1982ce -Text_PoofForgot_:: - dr $1982ce, $1982f2 -Text_CantForgetHM_:: - dr $1982f2, $1983a1 - -Text_ThisMonCantBeCaught_:: - dr $1983a1, $1983d7 - -Text_YouMissedThePokemon_:: - dr $1983d7, $1983ed - -Text_ThePokemonBrokeFree_:: - dr $1983ed, $19840a - -Text_AppearedToBeCaught_:: - dr $19840a, $19842a - -Text_AarghAlmostHadIt_:: - dr $19842a, $198441 - -Text_ShootItWasSoCloseToo_:: - dr $198441, $19845e - -Text_GotchaMonWasCaught_:: - dr $19845e, $19847c - -Text_CaughtMonWaitbutton_:: - dr $19847c, $19847e - -Text_SentToBillsPC_:: - dr $19847e, $198499 - -Text_MonNewlyAddedToPokedex_:: - dr $198499, $1984c4 - -Text_AskNicknameNewlyCaughtMon_:: - dr $1984c4, $1984df - -Text_StatRoseFromVitamin_:: - dr $1984df, $1984f1 - -Text_MilkDrinkCantBeUsed_:: - dr $1984f1, $198512 - -Text_RepelsEffectsStillLinger_:: - dr $198512, $19853e - -Text_NowThatsACatchyTune_:: - dr $19853e, $19856d - -Text_AllSleepingMonWokeUp_:: - dr $19856d, $198589 - -Text_PlayedThePokeFlute_:: - dr $198589, $1985a3 - -Text_CoinCase_:: - dr $1985a3, $1985b1 - -Text_RaiseThePPOfWhichMove_:: - dr $1985b1, $1985ce - -Text_RestoreThePPOfWhichMove_:: - dr $1985ce, $1985ed - -Text_PPIsMaxedOut_:: - dr $1985ed, $198604 - -Text_PPsIncreased_:: - dr $198604, $198618 - -Text_PPWasRestored_:: - dr $198618, $19862a - -Text_TrohpyInside_:: - dr $19862a, $198665 - -Text_LooksBitter_:: - dr $198665, $198677 - -Text_CantUseOnEgg_:: - dr $198677, $198695 - -Text_IsntTheTimeToUseThat_:: - dr $198695, $1986be - -Text_BelongsToSomeoneElse_:: - dr $1986be, $1986dd - -Text_WontHaveAnyEffect_:: - dr $1986dd, $1986f7 - -Text_BlockedTheBall_:: - dr $1986f7, $198716 - -Text_DontBeAThief_:: - dr $198716, $198728 - -Text_CyclingIsntAllowed_:: - dr $198728, $198744 - -Text_CantGetOnYourItemNow_:: - dr $198744, $198761 - -Text_CantUseBallBoxIsFull_:: - dr $198761, $19878f - -Text_UsedItem_:: - dr $19878f, $1987a2 - -Text_GotOnItem_:: - dr $1987a2, $1987b7 - -Text_GotOffItem_:: - dr $1987b7, $1987cf - -Text_KnowsMove_:: - dr $1987cf, $19c000 - SECTION "bank67", ROMX, BANK[$67] dr $19c000, $1a0000 diff --git a/pokegold.link b/pokegold.link index 1abadaf0..9bb7a927 100644 --- a/pokegold.link +++ b/pokegold.link @@ -326,13 +326,13 @@ ROMX $63 "bank63" ROMX $64 org $4000 - "bank64" + "Text 1" ROMX $65 org $4000 - "bank65" + "Text 2" ROMX $66 org $4000 - "bank66" + "Text 3" ROMX $67 org $4000 "bank67" diff --git a/pokesilver.link b/pokesilver.link index 1abadaf0..9bb7a927 100644 --- a/pokesilver.link +++ b/pokesilver.link @@ -326,13 +326,13 @@ ROMX $63 "bank63" ROMX $64 org $4000 - "bank64" + "Text 1" ROMX $65 org $4000 - "bank65" + "Text 2" ROMX $66 org $4000 - "bank66" + "Text 3" ROMX $67 org $4000 "bank67" @@ -258,10 +258,26 @@ wc5cc:: ds 1 ; c5cc wc5cd:: ds 1 ; c5cd wc5ce:: ds 1 ; c5ce wc5cf:: ds 1 ; c5cf + +UNION ; c5d0 +; trade +wTradeMons:: +wPlayerTrademon:: trademon wPlayerTrademon +wOTTrademon:: trademon wOTTrademon +wTrademonsEnd:: +wTradeAnimAddress:: dw +wLinkPlayer1Name:: ds NAME_LENGTH +wLinkPlayer2Name:: ds NAME_LENGTH +wLinkTradeSendmonSpecies:: db +wLinkTradeGetmonSpecies:: db + +NEXTU ; c5d0 +; naming screen wNamingScreenDestinationPointer:: dw ; c5d0 wc5d2:: ds 1 ; c5d2 wc5d3:: ds 1 ; c5d3 wNamingScreenType:: ds 1 ; c5d4 + wc5d5:: ds 1 ; c5d5 wc5d6:: ds 1 ; c5d6 wc5d7:: ds 1 ; c5d7 @@ -826,7 +842,11 @@ wLYOverridesBuffer:: wc800:: ds 1 ; c800 wc801:: ds 1 ; c801 wc802:: ds 1 ; c802 +UNION wc803:: ds 1 ; c803 +NEXTU +wMysteryGiftPartnerName:: ds 1 ; c803 +ENDU wc804:: ds 1 ; c804 wc805:: ds 1 ; c805 wc806:: ds 1 ; c806 @@ -906,7 +926,11 @@ wc84f:: ds 1 ; c84f wc850:: ds 1 ; c850 wc851:: ds 1 ; c851 wc852:: ds 1 ; c852 +UNION wc853:: ds 1 ; c853 +NEXTU +wMysteryGiftPlayerName:: +ENDU wc854:: ds 1 ; c854 wc855:: ds 1 ; c855 wc856:: ds 1 ; c856 @@ -1728,9 +1752,8 @@ wcbc6:: ds 1 ; cbc6 wcbc7:: ds 1 ; cbc7 wcbc8:: ds 1 ; cbc8 wcbc9:: ds 1 ; cbc9 -wcbca:: ds 1 ; cbca -wcbcb:: ds 1 ; cbcb -wcbcc:: ds 1 ; cbcc +wPayDayMoney:: ds 3 ; cbca + wcbcd:: ds 1 ; cbcd wcbce:: ds 1 ; cbce wcbcf:: ds 1 ; cbcf @@ -1811,6 +1834,7 @@ wcc1c:: ds 1 ; cc1c wcc1d:: ds 1 ; cc1d wcc1e:: ds 1 ; cc1e wcc1f:: ds 1 ; cc1f +ENDU ; cc20 SECTION "Video", WRAM0 wBGMapBuffer:: ds 1 ; cc20 @@ -2192,6 +2216,8 @@ wceed:: ds 1 ; ceed wMovementBufferPerson:: wceee:: ds 1 ; ceee +wTemporaryBuffer:: +wBugContestFirstPlaceScore:: wceef:: ds 1 ; ceef wcef0:: ds 1 ; cef0 wcef1:: ds 1 ; cef1 @@ -2199,10 +2225,12 @@ wcef1:: ds 1 ; cef1 wMovementBuffer:: wcef2:: ds 1 ; cef2 +wBugContestSecondPlaceScore:: wcef3:: ds 1 ; cef3 wcef4:: ds 1 ; cef4 wcef5:: ds 1 ; cef5 wcef6:: ds 1 ; cef6 +wBugContestThirdPlaceScore:: wcef7:: ds 1 ; cef7 wcef8:: ds 1 ; cef8 wcef9:: ds 1 ; cef9 @@ -2213,6 +2241,7 @@ wcefd:: ds 1 ; cefd wcefe:: ds 1 ; cefe wceff:: ds 1 ; ceff wcf00:: ds 1 ; cf00 +wBugContestWinnerName:: wcf01:: ds 1 ; cf01 wcf02:: ds 1 ; cf02 wcf03:: ds 1 ; cf03 @@ -2399,6 +2428,7 @@ wd005:: ds 1 ; d005 wd006:: ds 1 ; d006 wd007:: ds 1 ; d007 wd008:: ds 1 ; d008 +wItemQuantityChangeBuffer:: wd009:: ds 1 ; d009 wd00a:: ds 1 ; d00a @@ -2552,7 +2582,7 @@ wBuffer6:: ds 1 ; d0d8 wd0d9:: ds 1 ; d0d9 wd0da:: ds 1 ; d0da wd0db:: ds 1 ; d0db -wd0dc:: ds 1 ; d0dc +wLinkBuffer:: ds 1 ; d0dc wd0dd:: ds 1 ; d0dd wd0de:: ds 1 ; d0de wd0df:: ds 1 ; d0df @@ -2644,6 +2674,7 @@ wd14d:: ds 1 ; d14d wd14e:: ds 1 ; d14e wWildMon:: ds 1 ; d14f wd150:: ds 1 ; d150 +wTempNumBuffer:: wd151:: ds 1 ; d151 wd152:: ds 1 ; d152 wd153:: ds 1 ; d153 @@ -2730,9 +2761,9 @@ SECTION "Game Data", WRAMX, BANK[1] wGameData:: wPlayerID:: dw ; d1a1 -wPlayersName:: ds NAME_LENGTH ; d1a3 +wPlayerName:: ds NAME_LENGTH ; d1a3 wMomsName:: ds NAME_LENGTH ; d1ae -wRivalsName:: ds NAME_LENGTH ; d1b9 +wRivalName:: ds NAME_LENGTH ; d1b9 wRedsName:: ds NAME_LENGTH ; d1c4 wGreensName:: ds NAME_LENGTH ; d1cf @@ -3721,6 +3752,7 @@ wBreedMon1:: box_struct wBreedMon1 ; dc57 wDaycareLady:: ds 1 ; dc77 wStepsToEgg:: ds 1 ; dc78 wdc79:: ds 1 ; dc79 +wBreedMon2Nick:: wdc7a:: ds 1 ; dc7a wdc7b:: ds 1 ; dc7b wdc7c:: ds 1 ; dc7c @@ -3834,7 +3866,7 @@ wdd31:: ds 1 ; dd31 wdd32:: ds 1 ; dd32 wdd33:: ds 1 ; dd33 wdd34:: ds 1 ; dd34 -wdd35:: ds 1 ; dd35 +wMagikarpRecordHoldersName:: ds 1 ; dd35 wdd36:: ds 1 ; dd36 wdd37:: ds 1 ; dd37 wdd38:: ds 1 ; dd38 |