diff options
author | mid-kid <esteve.varela@gmail.com> | 2019-10-20 22:24:17 +0000 |
---|---|---|
committer | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-10-20 18:24:17 -0400 |
commit | e3e0bcd653f8d671f6fd1390fa922e3b644f4a34 (patch) | |
tree | 27c9b465e4d3e0de2649a5755a9f0b5021b05798 | |
parent | 3fc2ba41f7bc7fcf1e51f821b4e07525e0e4a873 (diff) |
#641 fixes and additions. (#646)
Name a lot of text labels according to our conventions
203 files changed, 4081 insertions, 4602 deletions
diff --git a/data/battle_tower/trainer_text.asm b/data/battle_tower/trainer_text.asm index 9937f8bf9..5e9aadcbd 100644 --- a/data/battle_tower/trainer_text.asm +++ b/data/battle_tower/trainer_text.asm @@ -1,4 +1,4 @@ -BattleTowerText_0x1ec000: +_BTGreetingM1Text: text "Hello, glad to" line "meet you!" @@ -6,122 +6,122 @@ BattleTowerText_0x1ec000: line "a good battle." done -BattleTowerText_0x1ec03b: +_BTLossM1Text: text "Thank you! A most" line "enjoyable battle!" done -UnknownText_0x1ec060: +_BTWinM1Text: text "Thank you. You are" line "formidable." done -BattleTowerText_0x1ec080: +_BTGreetingM2Text: text "Work, work, work…" line "I'm always busy!" done -UnknownText_0x1ec0a3: +_BTLossM2Text: text "But, I work hard" line "in battle too!" done -UnknownText_0x1ec0c4: +_BTWinM2Text: text "I'm too busy to be" line "battling!" done -UnknownText_0x1ec0e1: +_BTGreetingM3Text: text "Brace yourself for" line "my all-out attack!" done -UnknownText_0x1ec108: +_BTLossM3Text: text "What a cakewalk!" line "You're too easy!" done -UnknownText_0x1ec12a: +_BTWinM3Text: text "I won't lose next" line "time, all right?" done -UnknownText_0x1ec14d: +_BTGreetingM4Text: text "Heh, your #MON" line "look pretty cool." done -UnknownText_0x1ec16f: +_BTLossM4Text: text "Hey, hey, no way!" line "You won't win!" done -UnknownText_0x1ec190: +_BTWinM4Text: text "You serious?" line "This is brutal!" done -UnknownText_0x1ec1ae: +_BTGreetingM5Text: text "#MON every day!" line "I love battling!" done -UnknownText_0x1ec1d0: +_BTLossM5Text: text "I'm on top of my" line "game, but not you!" done -UnknownText_0x1ec1f4: +_BTWinM5Text: text "I don't care that" line "I lost, really!" done -UnknownText_0x1ec216: +_BTGreetingM6Text: text "Hi, there! Let's" line "keep this clean!" done -UnknownText_0x1ec238: +_BTLossM6Text: text "Whoops, sorry for" line "that wipeout!" done -UnknownText_0x1ec259: +_BTWinM6Text: text "Whoops! Come on," line "let me win one!" done -UnknownText_0x1ec27b: +_BTGreetingM7Text: text "Do you want to see" line "my battle level?" done -UnknownText_0x1ec2a0: +_BTLossM7Text: text "Hehehe, I know" line "your level now!" done -UnknownText_0x1ec2c0: +_BTWinM7Text: text "Ouch… I'm just too" line "weak…" done -UnknownText_0x1ec2d9: +_BTGreetingM8Text: text "Hey, let's battle." line "I'm your opponent." done -UnknownText_0x1ec2fe: +_BTLossM8Text: text "Wow, you're not" line "serious about it!" done -UnknownText_0x1ec320: +_BTWinM8Text: text "…Urgh… Nothing" line "positive here…" done -UnknownText_0x1ec33f: +_BTGreetingM9Text: text "I'm your" line "opponent." @@ -129,47 +129,47 @@ UnknownText_0x1ec33f: line "hammered." done -UnknownText_0x1ec36c: +_BTLossM9Text: text "Hahah! That was a" line "pushover!" done -UnknownText_0x1ec389: +_BTWinM9Text: text "No way! There has" line "to be a mistake!" done -UnknownText_0x1ec3ad: +_BTGreetingM10Text: text "Hah!" line "Let's get rolling!" done -UnknownText_0x1ec3c5: +_BTLossM10Text: text "Wahahaha! Didn't" line "break a sweat!" done -UnknownText_0x1ec3e5: +_BTWinM10Text: text "Tough! I'm no" line "match for you!" done -UnknownText_0x1ec402: +_BTGreetingM11Text: text "<……><……><……>" line "<……><……>Battle?" done -UnknownText_0x1ec411: +_BTLossM11Text: text "<……><……><……>" line "<……><……>I won?" done -UnknownText_0x1ec41f: +_BTWinM11Text: text "<……><……><……>" line "<……><……>I lost?" done -UnknownText_0x1ec42e: +_BTGreetingM12Text: text "You want to be a" line "leader?" @@ -177,7 +177,7 @@ UnknownText_0x1ec42e: line "then!" done -UnknownText_0x1ec461: +_BTLossM12Text: text "You need another" line "ten years of" @@ -185,7 +185,7 @@ UnknownText_0x1ec461: line "better, I'd say." done -UnknownText_0x1ec4a0: +_BTWinM12Text: text "You're incredibly" line "talented." @@ -193,72 +193,72 @@ UnknownText_0x1ec4a0: line "you now!" done -UnknownText_0x1ec4d6: +_BTGreetingM13Text: text "Today, I'm going" line "to whomp you." done -UnknownText_0x1ec4f5: +_BTLossM13Text: text "I knew I'd win." line "I'm so great!" done -UnknownText_0x1ec512: +_BTWinM13Text: text "Uh? My plans are" line "out of whack…" done -UnknownText_0x1ec532: +_BTGreetingM14Text: text "I bet you can't" line "beat me!" done -UnknownText_0x1ec54b: +_BTLossM14Text: text "Those #MON" line "aren't enough!" done -UnknownText_0x1ec565: +_BTWinM14Text: text "I want your" line "#MON. Please?" done -UnknownText_0x1ec580: +_BTGreetingM15Text: text "I'll show you a" line "real battle!" done -UnknownText_0x1ec59d: +_BTLossM15Text: text "This battle…" line "I'm bored!" done -UnknownText_0x1ec5b5: +_BTWinM15Text: text "…I won't turn tail" line "in battle!" done -UnknownText_0x1ec5d3: +_BTGreetingM16Text: text "Let's go!" line "No holds barred!" done -UnknownText_0x1ec5ee: +_BTLossM16Text: text "Sorry! I wanted" line "the win more!" done -UnknownText_0x1ec60d: +_BTWinM16Text: text "Wahah! Congrats!" line "I can't do better!" done -UnknownText_0x1ec631: +_BTGreetingM17Text: text "My #MON skills" line "are phenomenal!" done -UnknownText_0x1ec651: +_BTLossM17Text: text "You've got a long" line "way to go." @@ -266,17 +266,17 @@ UnknownText_0x1ec651: line "Best of luck!" done -UnknownText_0x1ec68f: +_BTWinM17Text: text "Aww… Don't lose" line "after beating me." done -UnknownText_0x1ec6b1: +_BTGreetingM18Text: text "Who are you?" line "I don't know you…" done -UnknownText_0x1ec6d0: +_BTLossM18Text: text "I must've imagined" line "that." @@ -284,42 +284,42 @@ UnknownText_0x1ec6d0: line "no one here…" done -UnknownText_0x1ec708: +_BTWinM18Text: text "Who am I?" line "I don't know…" done -UnknownText_0x1ec720: +_BTGreetingM19Text: text "Um… Are you that…" line "um…person?" done -UnknownText_0x1ec73e: +_BTLossM19Text: text "It doesn't appear" line "to be you…" done -UnknownText_0x1ec75b: +_BTWinM19Text: text "Then you really" line "are the legendary…" done -UnknownText_0x1ec77f: +_BTGreetingM20Text: text "I heard that" line "you're hot!" done -UnknownText_0x1ec798: +_BTLossM20Text: text "Not bad. I was" line "just a bit better." done -UnknownText_0x1ec7bb: +_BTWinM20Text: text "Eh, you're not" line "that special." done -UnknownText_0x1ec7d8: +_BTGreetingM21Text: text "I'm scared about" line "what might happen." @@ -327,297 +327,297 @@ UnknownText_0x1ec7d8: line "too strong." done -UnknownText_0x1ec818: +_BTLossM21Text: text "See? My #MON" line "were too strong." done -UnknownText_0x1ec837: +_BTWinM21Text: text "Graa! My #MON" line "were total wimps!" done -UnknownText_0x1ec858: +_BTGreetingM22Text: text "Hey, there!" line "I'll take you on!" done -UnknownText_0x1ec876: +_BTLossM22Text: text "Don't you have a" line "better strategy?" done -UnknownText_0x1ec898: +_BTWinM22Text: text "You've got decent" line "style!" done -UnknownText_0x1ec8b1: +_BTGreetingM23Text: text "I wonder if I can" line "battle properly…" done -UnknownText_0x1ec8d5: +_BTLossM23Text: text "Um… Sorry…" line "I think I won." done -UnknownText_0x1ec8f0: +_BTWinM23Text: text "I guess I'm not" line "good enough yet…" done -UnknownText_0x1ec911: +_BTGreetingM24Text: text "Wrrooar!" line "I won't lose!" done -UnknownText_0x1ec928: +_BTLossM24Text: text "Wrrooar! I knew" line "I was a genius!" done -UnknownText_0x1ec949: +_BTWinM24Text: text "Arrooh! I hate it" line "when I lose!" done -UnknownText_0x1ec969: +_BTGreetingM25Text: text "Sorry, but I'm" line "going to win." done -UnknownText_0x1ec986: +_BTLossM25Text: text "Yeah! My #MON" line "rule!" done -UnknownText_0x1ec99b: +_BTWinM25Text: text "Oh, close! I lost" line "by just a bit!" done -UnknownText_0x1ec9bd: +_BTGreetingF1Text: text "OK, I'm not" line "fooling around!" done -UnknownText_0x1ec9d9: +_BTLossF1Text: text "Yay! Too easy!" line "Like, no way!" done -UnknownText_0x1ec9f7: +_BTWinF1Text: text "No!" line "Like, no way!" done -UnknownText_0x1eca0a: +_BTGreetingF2Text: text "Look! My #MON" line "are really cute!" done -UnknownText_0x1eca2a: +_BTLossF2Text: text "Aren't they really" line "adorable?" done -UnknownText_0x1eca47: +_BTWinF2Text: text "I'm sorry, it's" line "all my fault!" done -UnknownText_0x1eca64: +_BTGreetingF3Text: text "Let's get our" line "battle started!" done -UnknownText_0x1eca82: +_BTLossF3Text: text "Was I too strong" line "for you?" done -UnknownText_0x1eca9d: +_BTWinF3Text: text "Ooh, you're in a" line "different class." done -UnknownText_0x1ecabf: +_BTGreetingF4Text: text "Are we going to" line "battle? Let's!" done -UnknownText_0x1ecade: +_BTLossF4Text: text "Oh, you're too" line "weak. Shame." done -UnknownText_0x1ecafa: +_BTWinF4Text: text "Wow! Are you quite" line "satisfied?" done -UnknownText_0x1ecb19: +_BTGreetingF5Text: text "Oh, you have some" line "rare #MON." done -UnknownText_0x1ecb37: +_BTLossF5Text: text "May I have one of" line "your #MON?" done -UnknownText_0x1ecb55: +_BTWinF5Text: text "…I want one of" line "your #MON." done -UnknownText_0x1ecb70: +_BTGreetingF6Text: text "Want to hear about" line "my cute #MON?" done -UnknownText_0x1ecb92: +_BTLossF6Text: text "What do you think" line "about my cuties?" done -UnknownText_0x1ecbb6: +_BTWinF6Text: text "Oh! My! You're a" line "dreadful trainer!" done -UnknownText_0x1ecbd9: +_BTGreetingF7Text: text "Battle? Sure!" line "Right now!" done -UnknownText_0x1ecbf3: +_BTLossF7Text: text "Oh, I love it!" line "Battling is wild!" done -UnknownText_0x1ecc15: +_BTWinF7Text: text "Oh, how rude! Wait" line "till next time!" done -UnknownText_0x1ecc39: +_BTGreetingF8Text: text "Please let me win!" line "Please?" done -UnknownText_0x1ecc55: +_BTLossF8Text: text "Wow, thank you!" line "You're so nice!" done -UnknownText_0x1ecc75: +_BTWinF8Text: text "You're mean!" line "I hate meanies!" done -UnknownText_0x1ecc92: +_BTGreetingF9Text: text "Well, can we" line "begin?" done -UnknownText_0x1ecca7: +_BTLossF9Text: text "Well, I beg your" line "pardon…" done -UnknownText_0x1eccc1: +_BTWinF9Text: text "Sob… That's not" line "fair!" done -UnknownText_0x1eccd7: +_BTGreetingF10Text: text "I'm good!" line "You can't win." done -UnknownText_0x1eccef: +_BTLossF10Text: text "Giving up? You're" line "pretty weak!" done -UnknownText_0x1ecd0e: +_BTWinF10Text: text "I won't accept" line "this… No way!" done -UnknownText_0x1ecd2b: +_BTGreetingF11Text: text "Are you treating" line "this seriously?" done -UnknownText_0x1ecd4d: +_BTLossF11Text: text "Oh, sorry! Looks" line "like I won!" done -UnknownText_0x1ecd6b: +_BTWinF11Text: text "Oh, how nasty!" line "You were serious!" done -UnknownText_0x1ecd8d: +_BTGreetingF12Text: text "Ahahah! I'll take" line "it easy on you!" done -UnknownText_0x1ecdaf: +_BTLossF12Text: text "Oops, sorry! But" line "I'm happy too!" done -UnknownText_0x1ecdcf: +_BTWinF12Text: text "Oh, oh, I lost!" line "Thanks. Bye!" done -UnknownText_0x1ecded: +_BTGreetingF13Text: text "BATTLE TOWER is a" line "tough place!" done -UnknownText_0x1ece0d: +_BTLossF13Text: text "You might have a" line "hard time." done -UnknownText_0x1ece2a: +_BTWinF13Text: text "Ooh, you might" line "make a run here!" done -UnknownText_0x1ece4b: +_BTGreetingF14Text: text "I want to see your" line "style in action!" done -UnknownText_0x1ece70: +_BTLossF14Text: text "Every battle is a" line "drama!" done -UnknownText_0x1ece8a: +_BTWinF14Text: text "Oh… Want to trade" line "something?" done -UnknownText_0x1ecea8: +_BTGreetingF15Text: text "OK, here goes!" line "I have momentum!" done -UnknownText_0x1ecec9: +_BTLossF15Text: text "See, I rolled" line "right over you!" done -UnknownText_0x1ecee8: +_BTWinF15Text: text "No! This did not" line "happen!" done diff --git a/data/phone/text/alan_callee.asm b/data/phone/text/alan_callee.asm index a7f62f89d..8121b8e48 100644 --- a/data/phone/text/alan_callee.asm +++ b/data/phone/text/alan_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b659d: +AlanAnswerPhoneText: text "Yup, it's @" text_ram wStringBuffer3 text "!" @@ -7,7 +7,7 @@ UnknownText_0x1b659d: line "Good morning!" done -UnknownText_0x1b65c7: +AlanAnswerPhoneDayText: text "Yup, it's @" text_ram wStringBuffer3 text "!" @@ -15,7 +15,7 @@ UnknownText_0x1b65c7: para "Is that <PLAY_G>?" done -UnknownText_0x1b65e3: +AlanAnswerPhoneNiteText: text "Yup, it's @" text_ram wStringBuffer3 text "!" @@ -24,28 +24,28 @@ UnknownText_0x1b65e3: line "Good evening!" done -UnknownText_0x1b660d: +AlanGreetText: text "Hello! It's me," line "@" text_ram wStringBuffer3 text "!" done -UnknownText_0x1b6624: +AlanGreetDayText: text "Hello! It's me," line "@" text_ram wStringBuffer3 text "!" done -UnknownText_0x1b663b: +AlanGreetNiteText: text "Hello! It's me," line "@" text_ram wStringBuffer3 text "!" done -UnknownText_0x1b6652: +AlanGenericText: text "<PLAY_G>, are you" line "raising your" cont "#MON properly?" diff --git a/data/phone/text/alan_caller.asm b/data/phone/text/alan_caller.asm index fad41cafb..1755ffb91 100644 --- a/data/phone/text/alan_caller.asm +++ b/data/phone/text/alan_caller.asm @@ -8,7 +8,7 @@ AlanGettingStrongerText: line "calculated!" done -UnknownText_0x64cf3: +AlanDefeatedMonText: text "By the way, we" line "knocked out a wild" @@ -21,7 +21,7 @@ UnknownText_0x64cf3: line "advance worked!" done -UnknownText_0x64d4f: +AlanLostAMonText: text "By the way, a wild" line "@" text_ram wStringBuffer4 @@ -32,7 +32,7 @@ UnknownText_0x64d4f: line "error on my part…" done -UnknownText_0x64da4: +AlanBattleRematchText: text "I've studied quite" line "a bit since then," @@ -48,11 +48,11 @@ UnknownText_0x64da4: line "for a battle?" done -UnknownText_0x64e1f: +AlanHangUpText: text "See you later!" done -UnknownText_0x64e2f: +AlanFoundItemText: text "Hehehe, I picked" line "up something nice!" @@ -65,7 +65,7 @@ UnknownText_0x64e2f: line "and pick it up?" done -UnknownText_0x64e90: +AlanHaventPickedUpAnythingText: text "I haven't picked" line "up anything yet." @@ -73,7 +73,7 @@ UnknownText_0x64e90: line "find something." done -UnknownText_0x64ed4: +AlanReminderText: text "If we don't battle" line "soon, I'll forget" cont "my strategy!" @@ -84,7 +84,7 @@ UnknownText_0x64ed4: text "!" done -UnknownText_0x64f1a: +AlanComePickUpGiftText: text "I have to do my" line "homework, so can" diff --git a/data/phone/text/anthony_callee.asm b/data/phone/text/anthony_callee.asm index 8919d41c2..ab968e32d 100644 --- a/data/phone/text/anthony_callee.asm +++ b/data/phone/text/anthony_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b5f7a: +AnthonyAnswerPhoneText: text "Yeah, @" text_ram wStringBuffer3 text " the" @@ -7,7 +7,7 @@ UnknownText_0x1b5f7a: para "Ah, <PLAYER>!" done -UnknownText_0x1b5f9e: +AnthonyAnswerPhoneDayText: text "Yeah, @" text_ram wStringBuffer3 text " the" @@ -17,7 +17,7 @@ UnknownText_0x1b5f9e: line "right?" done -UnknownText_0x1b5fc9: +AnthonyAnswerPhoneNiteText: text "Yeah, @" text_ram wStringBuffer3 text " the" @@ -27,7 +27,7 @@ UnknownText_0x1b5fc9: line "it?" done -UnknownText_0x1b5ff6: +AnthonyGreetText: text "Yo, <PLAYER>?" para "This is @" @@ -36,7 +36,7 @@ UnknownText_0x1b5ff6: line "the HIKER!" done -UnknownText_0x1b6017: +AnthonyGreetDayText: text "Hey, is this" line "<PLAYER>?" @@ -46,7 +46,7 @@ UnknownText_0x1b6017: line "the HIKER!" done -UnknownText_0x1b6041: +AnthonyGreetNiteText: text "<PLAYER>, you still" line "awake?" @@ -56,7 +56,7 @@ UnknownText_0x1b6041: line "the HIKER!" done -UnknownText_0x1b606f: +AnthonyGenericText: text "Are your #MON" line "as feisty as ever?" diff --git a/data/phone/text/anthony_caller.asm b/data/phone/text/anthony_caller.asm index 5cbf011b7..29b311250 100644 --- a/data/phone/text/anthony_caller.asm +++ b/data/phone/text/anthony_caller.asm @@ -1,4 +1,4 @@ -AnthonyAteBerriesText: +AnthonyMonAteSomeBerriesText: text "The other day, I" line "was watching my" @@ -20,7 +20,7 @@ AnthonyAteBerriesText: line "was delicious!" done -UnknownText_0x176aef: +AnthonyDefeatedMonText: text "Lately, I've been" line "running across" @@ -33,7 +33,7 @@ UnknownText_0x176aef: line "taken care of." done -UnknownText_0x176b45: +AnthonyLostAMonText: text "Oh yeah, I was" line "battling this" @@ -53,7 +53,7 @@ UnknownText_0x176b45: line "the job at hand!" done -UnknownText_0x176bee: +AnthonyBattleRematchText: text "Come on--let's" line "battle right now!" @@ -66,12 +66,12 @@ UnknownText_0x176bee: line "you feel up to it!" done -UnknownText_0x176c47: +AnthonyHangUpText: text "All right then!" line "Be good!" done -UnknownText_0x176c61: +AnthonySwarmText: text "<PLAYER>! It's" line "mind-blowing!" @@ -99,7 +99,7 @@ UnknownText_0x176c61: line "strong #MON." done -UnknownText_0x176d32: +AnthonyWasntPayingAttentionText: text "Rare #MON?" para "Hey, sorry! I was" @@ -109,7 +109,7 @@ UnknownText_0x176d32: line "paying attention." done -UnknownText_0x176d85: +AnthonyReminderText: text "Hello! You haven't" line "forgotten about" @@ -122,7 +122,7 @@ UnknownText_0x176d85: line "I'm waiting!" done -UnknownText_0x176dd1: +AnthonyHurryText: text "Hello? What? Where" line "is DUNSPARCE?" diff --git a/data/phone/text/arnie_callee.asm b/data/phone/text/arnie_callee.asm index ace24befe..51a70c8ef 100644 --- a/data/phone/text/arnie_callee.asm +++ b/data/phone/text/arnie_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b6454: +ArnieAnswerPhoneText: text "Yeah, hello." line "This is @" text_ram wStringBuffer3 @@ -7,7 +7,7 @@ UnknownText_0x1b6454: para "…Huh, <PLAY_G>? Yo!" done -UnknownText_0x1b647e: +ArnieAnswerPhoneDayText: text "Yeah, hello, you" line "got @" text_ram wStringBuffer3 @@ -16,7 +16,7 @@ UnknownText_0x1b647e: para "…Huh, <PLAY_G>? Yo!" done -UnknownText_0x1b64a8: +ArnieAnswerPhoneNiteText: text "Yeah, hello, you" line "got @" text_ram wStringBuffer3 @@ -25,7 +25,7 @@ UnknownText_0x1b64a8: para "…Huh, <PLAY_G>? Yo!" done -UnknownText_0x1b64d2: +ArnieGreetText: text "Yeah, hello?" line "@" text_ram wStringBuffer3 @@ -35,7 +35,7 @@ UnknownText_0x1b64d2: line "to, <PLAY_G>?" done -UnknownText_0x1b6506: +ArnieGreetDayText: text "Yeah, hello?" line "@" text_ram wStringBuffer3 @@ -45,7 +45,7 @@ UnknownText_0x1b6506: line "<PLAY_G>?" done -UnknownText_0x1b6539: +ArnieGreetNiteText: text "Yeah, hello?" line "@" text_ram wStringBuffer3 @@ -55,7 +55,7 @@ UnknownText_0x1b6539: line "<PLAY_G>?" done -UnknownText_0x1b656c: +ArnieGenericText: text "I bet your #MON" line "are a lot stronger" cont "than before." diff --git a/data/phone/text/arnie_caller.asm b/data/phone/text/arnie_caller.asm index ce3a52b63..96e3623ea 100644 --- a/data/phone/text/arnie_caller.asm +++ b/data/phone/text/arnie_caller.asm @@ -1,4 +1,4 @@ -ArnieLovesTheCuteText: +ArnieMonIsSoCuteText: text "I'm always with my" line "@" text_ram wStringBuffer4 @@ -8,7 +8,7 @@ ArnieLovesTheCuteText: line "I just love it!" done -UnknownText_0x64a13: +ArnieDefeatedMonText: text "Changing the topic" line "here, I saw this" @@ -21,7 +21,7 @@ UnknownText_0x64a13: line "beat, actually." done -UnknownText_0x64a71: +ArnieLostAMonText: text "I was wondering," line "do you happen to" cont "have @" @@ -35,7 +35,7 @@ UnknownText_0x64a71: line "wonder." done -UnknownText_0x64ada: +ArnieBattleRematchText: text "Hey, let's battle" line "our #MON!" @@ -51,12 +51,12 @@ UnknownText_0x64ada: text "!" done -UnknownText_0x64b48: +ArnieHangUpText: text "Let's talk again," line "huh?" done -UnknownText_0x64b5f: +ArnieSwarmText: text "Boy, am I glad I" line "caught you!" @@ -74,7 +74,7 @@ UnknownText_0x64b5f: line "this!" done -UnknownText_0x64bc6: +ArnieHaventSeenRareMonText: text "I haven't had any" line "luck seeing rare" cont "#MON lately…" @@ -83,7 +83,7 @@ UnknownText_0x64bc6: line "out there!" done -UnknownText_0x64c13: +ArnieReminderText: text "Hey, where are you" line "now?" @@ -94,7 +94,7 @@ UnknownText_0x64c13: text "!" done -UnknownText_0x64c5a: +ArnieHurryText: text "Hello? Are you" line "coming or what?" diff --git a/data/phone/text/beth_callee.asm b/data/phone/text/beth_callee.asm index 61bf7298f..289c3e606 100644 --- a/data/phone/text/beth_callee.asm +++ b/data/phone/text/beth_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b53f7: +BethAnswerPhoneText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -10,7 +10,7 @@ UnknownText_0x1b53f7: para "" done -UnknownText_0x1b5424: +BethAnswerPhoneDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -19,7 +19,7 @@ UnknownText_0x1b5424: para "Oh. Hi, <PLAY_G>." done -UnknownText_0x1b5446: +BethAnswerPhoneNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -29,7 +29,7 @@ UnknownText_0x1b5446: line "Good evening." done -UnknownText_0x1b5472: +BethGreetText: text "Good morning," line "<PLAY_G>!" @@ -39,7 +39,7 @@ UnknownText_0x1b5472: line "Were you sleeping?" done -UnknownText_0x1b54a6: +BethGreetDayText: text "<PLAY_G>, hi!" line "This is @" text_ram wStringBuffer3 @@ -49,7 +49,7 @@ UnknownText_0x1b54a6: line "time?" done -UnknownText_0x1b54d4: +BethGreetNiteText: text "Hi, <PLAY_G>." line "Good evening." @@ -61,7 +61,7 @@ UnknownText_0x1b54d4: line "awake." done -UnknownText_0x1b5510: +BethGenericText: text "Are you the kind" line "of person who goes" diff --git a/data/phone/text/beth_caller.asm b/data/phone/text/beth_caller.asm index d7cac6298..b42ad9918 100644 --- a/data/phone/text/beth_caller.asm +++ b/data/phone/text/beth_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x174c7f: +BethExhilaratingRideText: text "Do you remember my" line "sweet @" text_ram wStringBuffer4 @@ -16,7 +16,7 @@ UnknownText_0x174c7f: line "really gets going." done -UnknownText_0x174cf6: +BethDefeatedMonText: text "Oh, have you ever" line "seen a @" text_ram wStringBuffer4 @@ -36,7 +36,7 @@ UnknownText_0x174cf6: line "course." done -UnknownText_0x174d86: +BethLostAMonText: text "Oh, I just saw a" line "wild @" text_ram wStringBuffer4 @@ -59,7 +59,7 @@ UnknownText_0x174d86: line "from my mistake." done -UnknownText_0x174e4e: +BethBattleRematchText: text "Do you want to" line "battle? I'm going" cont "to win this time!" @@ -73,16 +73,16 @@ UnknownText_0x174e4e: line "Look for me, OK?" done -UnknownText_0x174eb7: +BethHangUpText: text "OK, bye-bye!" done -UnknownText_0x174ec5: +BethLetsBattleAgainSometimeText: text "Let's battle again" line "sometime!" done -BethForgetDealText: +BethReminderText: text "Um… <PLAY_G>?" line "What's wrong?" diff --git a/data/phone/text/beverly_callee.asm b/data/phone/text/beverly_callee.asm index bac2e24bd..da97a75b7 100644 --- a/data/phone/text/beverly_callee.asm +++ b/data/phone/text/beverly_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b4f21: +BeverlyAnswerPhoneText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b4f21: line "<PLAYER>." done -UnknownText_0x1b4f4d: +BeverlyAnswerPhoneDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b4f4d: line "<PLAYER>." done -UnknownText_0x1b4f75: +BeverlyAnswerPhoneNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b4f75: line "<PLAYER>." done -UnknownText_0x1b4fa1: +BeverlyGreetText: text "Hello, <PLAYER>." line "Good morning." @@ -38,7 +38,7 @@ UnknownText_0x1b4fa1: line "Were you asleep?" done -UnknownText_0x1b4fda: +BeverlyGreetDayText: text "Hi, <PLAYER>." line "This is @" text_ram wStringBuffer3 @@ -47,7 +47,7 @@ UnknownText_0x1b4fda: para "How are you doing?" done -UnknownText_0x1b5004: +BeverlyGreetNiteText: text "Hi, <PLAYER>." line "This is @" text_ram wStringBuffer3 @@ -56,7 +56,7 @@ UnknownText_0x1b5004: para "Were you awake?" done -UnknownText_0x1b502b: +BeverlyGenericText: text "Keeping your" line "#MON happy?" diff --git a/data/phone/text/beverly_caller.asm b/data/phone/text/beverly_caller.asm index 73fd4b215..761f4fe36 100644 --- a/data/phone/text/beverly_caller.asm +++ b/data/phone/text/beverly_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x174688: +BeverlyMadeMonEvenCuterText: text "I fancied up my" line "@" text_ram wStringBuffer4 @@ -8,7 +8,7 @@ UnknownText_0x174688: line "than before!" done -UnknownText_0x1746c3: +BeverlyDefeatedMonText: text "I happened to come" line "across a wild" cont "SNUBBULL recently." @@ -20,7 +20,7 @@ UnknownText_0x1746c3: line "wild one." done -UnknownText_0x174734: +BeverlyLostAMonText: text "I happened to see" line "a wild MARILL the" @@ -36,12 +36,12 @@ UnknownText_0x174734: line "quite miffed." done -UnknownText_0x1747ac: +BeverlyHangUpText: text "You can expect a" line "call from me." done -BeverlyFoundNuggetText: +BeverlyFoundItemText: text "My husband got" line "some NUGGETS." @@ -60,7 +60,7 @@ BeverlyFoundNuggetText: line "when you can." done -UnknownText_0x17485b: +BeverlyLetsChatAboutMonAgainText: text "Are your #MON" line "in prime form?" @@ -68,7 +68,7 @@ UnknownText_0x17485b: line "#MON again." done -UnknownText_0x174895: +BeverlyComePickUpText: text "Pardon?" line "Oh, the NUGGET?" diff --git a/data/phone/text/bike_shop.asm b/data/phone/text/bike_shop.asm index e410fc3be..30ccfeaf1 100644 --- a/data/phone/text/bike_shop.asm +++ b/data/phone/text/bike_shop.asm @@ -1,4 +1,4 @@ -UnknownText_0x174000: +BikeShopPhoneCallerText: text "Hi, <PLAY_G>!" line "Our BICYCLE sales" diff --git a/data/phone/text/brent_callee.asm b/data/phone/text/brent_callee.asm index 9dcacdc4e..351ea6b0c 100644 --- a/data/phone/text/brent_callee.asm +++ b/data/phone/text/brent_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b6c96: +BrentAnswerPhoneText: text "Yes? @" text_ram wStringBuffer3 text " here…" @@ -7,7 +7,7 @@ UnknownText_0x1b6c96: line "can I do for you?" done -UnknownText_0x1b6cc6: +BrentAnswerPhoneDayText: text "Yes? @" text_ram wStringBuffer3 text " here…" @@ -16,7 +16,7 @@ UnknownText_0x1b6cc6: line "can I do for you?" done -UnknownText_0x1b6cf6: +BrentAnswerPhoneNiteText: text "Yes? @" text_ram wStringBuffer3 text " here…" @@ -25,7 +25,7 @@ UnknownText_0x1b6cf6: line "can I do for you?" done -UnknownText_0x1b6d26: +BrentGreetText: text "Hiya, <PLAYER>. How" line "are you doing?" @@ -35,7 +35,7 @@ UnknownText_0x1b6d26: text "." done -UnknownText_0x1b6d57: +BrentGreetDayText: text "Hiya, <PLAYER>, how" line "are you doing?" @@ -45,7 +45,7 @@ UnknownText_0x1b6d57: text "." done -UnknownText_0x1b6d88: +BrentGreetNiteText: text "Hiya, <PLAYER>, how" line "are you doing?" @@ -55,7 +55,7 @@ UnknownText_0x1b6d88: text "." done -UnknownText_0x1b6db9: +BrentGenericText: text "Oh yeah, I saw you" line "coming out of a" diff --git a/data/phone/text/brent_caller.asm b/data/phone/text/brent_caller.asm index dcca0840f..e1ef65d74 100644 --- a/data/phone/text/brent_caller.asm +++ b/data/phone/text/brent_caller.asm @@ -12,7 +12,7 @@ BrentRareTradeText: line "it a secret!" done -UnknownText_0x6613c: +BrentDefeatedMonText: text "Oh yeah, I took" line "down this wild" @@ -25,7 +25,7 @@ UnknownText_0x6613c: line "catching." done -UnknownText_0x6618c: +BrentLostAMonText: text "Oh yeah, I saw a" line "rare #MON about" cont "an hour ago." @@ -40,7 +40,7 @@ UnknownText_0x6618c: line "at my mistakes?" done -UnknownText_0x66214: +BrentBattleRematchText: text "You've got time" line "like usual, right?" @@ -59,11 +59,11 @@ UnknownText_0x66214: text "." done -UnknownText_0x662a9: +BrentHangUpText: text "So that's it then." done -UnknownText_0x662bc: +BrentFatherGossipText: text "Did you know…?" line "BILL's father is" @@ -71,7 +71,7 @@ UnknownText_0x662bc: line "great #MANIAC." done -UnknownText_0x662fc: +BrentGrandpaGossipText: text "Did you know…?" line "Apparently BILL's" @@ -79,13 +79,13 @@ UnknownText_0x662fc: line "#MANIAC." done -UnknownText_0x66335: +BrentGoldenrodGossipText: text "Did you know…?" line "BILL's originally" cont "from GOLDENROD." done -UnknownText_0x66366: +BrentRoute25GossipText: text "Did you know…?" line "BILL evidently" @@ -93,7 +93,7 @@ UnknownText_0x66366: line "in KANTO." done -UnknownText_0x663a1: +BrentAbraGossipText: text "Did you know…?" line "ABRA was the first" @@ -101,7 +101,7 @@ UnknownText_0x663a1: line "ostensibly caught." done -UnknownText_0x663e6: +BrentSisterGossipText: text "Did you know…?" line "BILL's younger" @@ -109,7 +109,7 @@ UnknownText_0x663e6: line "can't wink." done -UnknownText_0x66421: +BrentMilkGossipText: text "Did you know…?" line "BILL supposedly" @@ -117,7 +117,7 @@ UnknownText_0x66421: line "can't drink it." done -UnknownText_0x6645f: +BrentBattlingGossipText: text "Did you know…?" line "Evidently, BILL" @@ -125,7 +125,7 @@ UnknownText_0x6645f: line "battling." done -UnknownText_0x6649b: +BrentFlowerShopGossipText: text "Did you know…?" line "BILL appears to" @@ -133,7 +133,7 @@ UnknownText_0x6649b: line "the FLOWER SHOP." done -UnknownText_0x664dd: +BrentKimonoGirlGossipText: text "Did you know…?" line "BILL's mother is" @@ -141,7 +141,7 @@ UnknownText_0x664dd: line "a KIMONO GIRL." done -UnknownText_0x6651e: +BrentSorryImTooBusyText: text "You wanted to hear" line "about BILL?" @@ -152,7 +152,7 @@ UnknownText_0x6651e: line "have time." done -UnknownText_0x66579: +BrentReminderText: text "You want to see my" line "rare #MON." diff --git a/data/phone/text/buena.asm b/data/phone/text/buena.asm index 2503ae73c..72ce8fccb 100644 --- a/data/phone/text/buena.asm +++ b/data/phone/text/buena.asm @@ -1,4 +1,4 @@ -UnknownText_0xa0c28: +BuenaPhoneMorningAnswerText: text "Hi, this is BUENA…" para "Oh! Good morning," @@ -8,7 +8,7 @@ UnknownText_0xa0c28: line "in the morning…" done -UnknownText_0xa0c72: +BuenaPhoneDayAnswerText: text "Hi, this is BUENA…" line "Oh! Hi, <PLAY_G>!" @@ -16,7 +16,7 @@ UnknownText_0xa0c72: line "BUENA's show?" done -UnknownText_0xa0caf: +BuenaPhoneMidnightAnswerText: text "This is BUENA." line "I can't come to" @@ -33,7 +33,7 @@ UnknownText_0xa0caf: line "after midnight!" done -UnknownText_0xa0d42: +BuenaPhoneNiteAnswerText: text "Hi, this is BUENA…" line "Oh! Hi, <PLAY_G>!" @@ -44,7 +44,7 @@ UnknownText_0xa0d42: line "I'm exhausted!" done -UnknownText_0xa0d96: +BuenaPhoneMorningText: text "<PLAY_G>!" line "Hi, it's BUENA!" @@ -52,7 +52,7 @@ UnknownText_0xa0d96: line "I decided to call!" done -UnknownText_0xa0dcf: +BuenaPhoneDayText: text "<PLAY_G>!" line "Hi, it's BUENA!" @@ -60,7 +60,7 @@ UnknownText_0xa0dcf: line "to chat with!" done -UnknownText_0xa0e01: +BuenaPhoneMidnightText: text "<PLAY_G>!" line "Hi, it's BUENA!" @@ -68,7 +68,7 @@ UnknownText_0xa0e01: line "break." done -UnknownText_0xa0e29: +BuenaPhoneNiteText: text "<PLAY_G>!" line "Hi, it's BUENA!" @@ -76,7 +76,7 @@ UnknownText_0xa0e29: line "so I called you." done -UnknownText_0xa0e5e: +BuenaPhoneRocketText: text "Oh. Hi, <PLAY_G>!" para "You are how?" @@ -94,7 +94,7 @@ UnknownText_0xa0e5e: line "better be careful!" done -UnknownText_0xa0efb: +BuenaPhoneWentOutWithBenText: text "The other day, I" line "went out to eat" @@ -117,7 +117,7 @@ UnknownText_0xa0efb: line "you later!" done -UnknownText_0xa0fcf: +BuenaPhoneReceptionistText: text "You know the" line "receptionist at" cont "the RADIO TOWER?" @@ -140,7 +140,7 @@ UnknownText_0xa0fcf: para "Catch you later!" done -UnknownText_0xa109d: +BuenaPhoneLuckyNumberShowText: text "Tell me, <PLAY_G>." line "Have you ever won" @@ -157,7 +157,7 @@ UnknownText_0xa109d: para "Let's chat again!" done -UnknownText_0xa1143: +BuenaPhoneStressedFromWorkText: text "You know, last" line "night…" @@ -187,7 +187,7 @@ UnknownText_0xa1143: line "wrong number!" done -UnknownText_0xa1244: +BuenaPhoneProfessorOakText: text "Yesterday, PROF." line "OAK was in the" @@ -209,7 +209,7 @@ UnknownText_0xa1244: para "Catch you later!" done -UnknownText_0xa1318: +BuenaPhoneGotAColdText: text "…Cough, cough!" para "Uhm sorry uh got" @@ -229,7 +229,7 @@ UnknownText_0xa1318: cont "been BUENA!" done -UnknownText_0xa13d8: +BuenaPhoneRadioCardQuestionsText: text "Hey, <PLAY_G>." line "You won that RADIO" @@ -249,7 +249,7 @@ UnknownText_0xa13d8: line "again!" done -UnknownText_0xa1488: +BuenaPhonePikachuFanClubText: text "I'm elated that" line "more people are" @@ -283,7 +283,7 @@ UnknownText_0xa1488: para "Let's chat again!" done -UnknownText_0xa15de: +BuenaPhoneRadioTowerDirectorText: text "Guess what?" line "The RADIO TOWER's" @@ -315,7 +315,7 @@ UnknownText_0xa15de: line "my show!" done -UnknownText_0xa1717: +BuenaPhoneWhenDoYouRelaxText: text "<PLAY_G>, tell me." para "When do you relax" @@ -347,7 +347,7 @@ UnknownText_0xa1717: line "happened! Later!" done -UnknownText_0xa183d: +BuenaPhoneStarterPokemonText: text "<PLAY_G>, what was" line "the first #MON" cont "you ever caught?" @@ -387,7 +387,7 @@ UnknownText_0xa183d: para "Bye-bye!" done -UnknownText_0xa19b1: +BuenaPhoneCompanyVacationText: text "Guess what? All of" line "us from the RADIO" @@ -415,7 +415,7 @@ UnknownText_0xa19b1: para "Bye-bye!" done -UnknownText_0xa1ac0: +BuenaPhoneBenAndFernText: text "Did you know…?" para "BEN and FERN talk" @@ -445,7 +445,7 @@ UnknownText_0xa1ac0: para "Let's chat again!" done -UnknownText_0xa1bed: +BuenaPhoneGoingShoppingText: text "I'm going shopping" line "with MARY and LILY" cont "soon." @@ -462,7 +462,7 @@ UnknownText_0xa1bed: para "Catch you later!" done -UnknownText_0xa1c88: +BuenaPhoneFavoriteSlotMachineAnswerText: text "I'm thinking of" line "going to the GAME" @@ -489,7 +489,7 @@ endc para "Catch you later!" done -UnknownText_0xa1d5f: +BuenaPhonePokegearAnswerText: text "Hey, <PLAY_G>. You" line "use your #GEAR" @@ -512,7 +512,7 @@ UnknownText_0xa1d5f: line "calling! Later!" done -UnknownText_0xa1e2f: +BuenaPhoneCoopedUpInRadioTowerAnswerText: text "Is it sunny" line "outside today?" diff --git a/data/phone/text/chad_callee.asm b/data/phone/text/chad_callee.asm index f7602dbe2..52c711dce 100644 --- a/data/phone/text/chad_callee.asm +++ b/data/phone/text/chad_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b67e2: +ChadAnswerPhoneText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b67e2: line "Good morning!" done -UnknownText_0x1b680e: +ChadAnswerPhoneDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b680e: line "day!" done -UnknownText_0x1b6836: +ChadAnswerPhoneNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b6836: line "evening!" done -UnknownText_0x1b6862: +ChadGreetText: text "Hi, <PLAY_G>, good" line "morning!" @@ -38,7 +38,7 @@ UnknownText_0x1b6862: line "How are you?" done -UnknownText_0x1b6890: +ChadGreetDayText: text "Hi, <PLAY_G>, good" line "day!" @@ -48,7 +48,7 @@ UnknownText_0x1b6890: line "How are you?" done -UnknownText_0x1b68ba: +ChadGreetNiteText: text "Hi, <PLAY_G>, good" line "evening!" @@ -58,7 +58,7 @@ UnknownText_0x1b68ba: line "How are you?" done -UnknownText_0x1b68e8: +ChadGenericText: text "How are your" line "#MON doing?" diff --git a/data/phone/text/chad_caller.asm b/data/phone/text/chad_caller.asm index f65035c27..d4442d158 100644 --- a/data/phone/text/chad_caller.asm +++ b/data/phone/text/chad_caller.asm @@ -18,7 +18,7 @@ ChadObservingWildText: line "PROF.OAK soon." done -UnknownText_0x65318: +ChadDefeatedMonText: text "Oh yes, I managed" line "to knock out a" @@ -34,7 +34,7 @@ UnknownText_0x65318: line "was inevitable." done -UnknownText_0x65399: +ChadLostAMonText: text "Oh yes, I came" line "close to catching" @@ -52,7 +52,7 @@ UnknownText_0x65399: text ". Rats…" done -UnknownText_0x65419: +ChadBattleRematchText: text "Want to battle?" line "I have to battle" @@ -65,7 +65,7 @@ UnknownText_0x65419: text "!" done -UnknownText_0x65471: +ChadHangUpText: text "See you later!" done @@ -106,7 +106,7 @@ ChadProfElmGossipText: line "I envy him!" done -ChadDreamGossipText: +ChadProfOaksDreamGossipText: text "PROF.OAK's dream" line "is to compile a" @@ -148,7 +148,7 @@ ChadLeagueGossipText: line "great man." done -ChadRadioShowGossipText: +ChadPokemonTalkGossipText: text "PROF.OAK'S #MON" line "TALK is a popular" cont "radio show, right?" @@ -167,7 +167,7 @@ ChadRadioShowGossipText: line "thank for it!" done -ChadBattlingGossipText: +ChadProfOakTrainerGossipText: text "PROF.OAK used to" line "be a trainer a" cont "long time ago." @@ -203,7 +203,7 @@ ChadDaisyTeaGossipText: line "PROF.OAK." done -ChadTravelGossipText: +ChadProfOakTravelingGossipText: text "Did you know?" line "PROF.OAK traveled" @@ -223,7 +223,7 @@ ChadTravelGossipText: line "things too…" done -UnknownText_0x65a23: +ChadGoingToStudyHardText: text "I'm going to study" line "hard so PROF.OAK" @@ -231,7 +231,7 @@ UnknownText_0x65a23: line "assistant!" done -UnknownText_0x65a63: +ChadReminderText: text "Do you remember" line "about our battle?" diff --git a/data/phone/text/dana_callee.asm b/data/phone/text/dana_callee.asm index 8b90785bf..350196fe3 100644 --- a/data/phone/text/dana_callee.asm +++ b/data/phone/text/dana_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b66c8: +DanaAnswerPhoneText: text "Hi, @" text_ram wStringBuffer3 text " on the" @@ -7,7 +7,7 @@ UnknownText_0x1b66c8: para "Hey! It's <PLAY_G>!" done -UnknownText_0x1b66ec: +DanaAnswerPhoneDayText: text "Hi, @" text_ram wStringBuffer3 text " on the" @@ -17,7 +17,7 @@ UnknownText_0x1b66ec: line "It's <PLAY_G>!" done -UnknownText_0x1b6713: +DanaAnswerPhoneNiteText: text "Hi, @" text_ram wStringBuffer3 text " on the" @@ -27,7 +27,7 @@ UnknownText_0x1b6713: line "What's up?" done -UnknownText_0x1b6738: +DanaGreetText: text "Uh, <PLAY_G>?" para "It's me!" @@ -36,7 +36,7 @@ UnknownText_0x1b6738: text "!" done -UnknownText_0x1b6757: +DanaGreetDayText: text "Uh, <PLAY_G>?" para "It's me!" @@ -45,7 +45,7 @@ UnknownText_0x1b6757: text "!" done -UnknownText_0x1b6776: +DanaGreetNiteText: text "Uh, <PLAY_G>?" para "It's me!" @@ -54,7 +54,7 @@ UnknownText_0x1b6776: text "!" done -UnknownText_0x1b6795: +DanaGenericText: text "My @" text_ram wStringBuffer4 text " is" diff --git a/data/phone/text/dana_caller.asm b/data/phone/text/dana_caller.asm index 0209b2ae2..b4bb55b19 100644 --- a/data/phone/text/dana_caller.asm +++ b/data/phone/text/dana_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x64f74: +DanaTakingPhotosText: text "My @" text_ram wStringBuffer4 text " is" @@ -8,7 +8,7 @@ UnknownText_0x64f74: line "photos galore!" done -UnknownText_0x64fb2: +DanaDefeatedMonText: text "It took only an" line "instant to KO a" cont "wild @" @@ -22,7 +22,7 @@ UnknownText_0x64fb2: line "time." done -UnknownText_0x6501c: +DanaLostAMonText: text "You know what?" line "A wild @" text_ram wStringBuffer4 @@ -37,7 +37,7 @@ UnknownText_0x6501c: line "and I would've…" done -UnknownText_0x65091: +DanaBattleRematchText: text "Right now, I'm on" line "@" text_ram wStringBuffer5 @@ -50,11 +50,11 @@ UnknownText_0x65091: line "for you!" done -UnknownText_0x650e2: +DanaHangUpText: text "See you!" done -UnknownText_0x650ec: +DanaFoundItemText: text "You know what?" line "I got a good gift!" @@ -70,7 +70,7 @@ UnknownText_0x650ec: text "!" done -UnknownText_0x65161: +DanaCanYouWaitABitLongerText: text "Oh! You wanted a" line "gift, right?" @@ -81,7 +81,7 @@ UnknownText_0x65161: line "longer?" done -UnknownText_0x651bf: +DanaReminderText: text "Hi! You haven't" line "forgotten about" @@ -94,7 +94,7 @@ UnknownText_0x651bf: text "!" done -UnknownText_0x6520f: +DanaComePickUpText: text "Hello?" para "If you don't come" diff --git a/data/phone/text/derek_callee.asm b/data/phone/text/derek_callee.asm index be0784140..e2024cb1d 100644 --- a/data/phone/text/derek_callee.asm +++ b/data/phone/text/derek_callee.asm @@ -1,25 +1,25 @@ -UnknownText_0x1b69a8: +DerekAnswerPhoneText: text "Hi, <PLAY_G>?" para "Good morning pika." line "What's up pika?" done -UnknownText_0x1b69d2: +DerekAnswerPhoneDayText: text "Hi, <PLAY_G>?" para "Good day pika," line "what's up pika?" done -UnknownText_0x1b69f8: +DerekAnswerPhoneNiteText: text "Hi, <PLAY_G>?" para "Good evening pika," line "what's up pika?" done -UnknownText_0x1b6a22: +DerekGreetText: text "<PLAY_G> pika, good" line "morning!" @@ -29,7 +29,7 @@ UnknownText_0x1b6a22: line "pika are you?" done -UnknownText_0x1b6a56: +DerekGreetDayText: text "<PLAY_G> pika, good" line "pika day!" @@ -39,7 +39,7 @@ UnknownText_0x1b6a56: line "pika are you?" done -UnknownText_0x1b6a8b: +DerekGreetNiteText: text "<PLAY_G> pika, good" line "evening!" @@ -49,7 +49,7 @@ UnknownText_0x1b6a8b: line "you pika awake?" done -UnknownText_0x1b6ac2: +DerekGenericText: text "You have to hear" line "this! My lovable" diff --git a/data/phone/text/derek_caller.asm b/data/phone/text/derek_caller.asm index a96768faa..a6ed1abd7 100644 --- a/data/phone/text/derek_caller.asm +++ b/data/phone/text/derek_caller.asm @@ -1,4 +1,4 @@ -DerekCheekPincherText: +DerekCheekPinchingText: text "Listen to this." line "My @" text_ram wStringBuffer4 @@ -12,7 +12,7 @@ DerekCheekPincherText: para "I must be special." done -UnknownText_0x65b29: +DerekDefeatedMonText: text "Oh, and recently," line "my PIKACHU beat a" cont "wild @" @@ -34,7 +34,7 @@ UnknownText_0x65b29: line "greatest!" done -UnknownText_0x65bc8: +DerekLostAMonText: text "Oh, and I saw a" line "wild @" text_ram wStringBuffer4 @@ -51,7 +51,7 @@ UnknownText_0x65bc8: line "good otherwise." done -UnknownText_0x65c4e: +DerekHangUpText: text "Well, let's talk" line "again!" done @@ -71,7 +71,7 @@ DerekBugCatchingContestText: line "off its cuteness." done -UnknownText_0x65cf9: +DerekFoundItemText: text "I'd like you to" line "have a NUGGET." @@ -83,7 +83,7 @@ UnknownText_0x65cf9: cont "it too!" done -UnknownText_0x65d5c: +DerekLetsGetTogetherText: text "How is your" line "PIKACHU doing?" @@ -92,7 +92,7 @@ UnknownText_0x65d5c: cont "PIKACHU!" done -UnknownText_0x65da6: +DerekComePickUpText: text "What's wrong?" para "I'm waiting on" diff --git a/data/phone/text/elm.asm b/data/phone/text/elm.asm index 0e4dc5bc3..8685367f0 100644 --- a/data/phone/text/elm.asm +++ b/data/phone/text/elm.asm @@ -1,4 +1,4 @@ -ElmPhoneStartText: +ElmPhoneHealYourMonText: text "Hello, <PLAY_G>?" para "Try not to overdo" @@ -28,7 +28,7 @@ ElmPhonePokemonStolenText: line "do that?" done -ElmPhoneCheckingEggText: +ElmPhoneCheckingTheEggText: text "Hello, <PLAY_G>?" para "We're checking the" @@ -48,7 +48,7 @@ ElmPhoneAssistantText: line "in VIOLET CITY." done -ElmPhoneEggUnhatchedText: +ElmPhoneHowIsTheEggText: text "Hello, <PLAY_G>?" para "How's the EGG? Has" @@ -70,7 +70,7 @@ ElmPhoneEggHatchedText: line "me now!" done -ElmPhoneDiscovery1Text: +ElmPhoneDiscoveredHatchTimeText: text "Hello, <PLAY_G>?" para "I just made a new" @@ -83,7 +83,7 @@ ElmPhoneDiscovery1Text: line "the #MON." done -ElmPhoneDiscovery2Text: +ElmPhoneInvestigatingEggMovesText: text "Hello, <PLAY_G>?" para "It's still a" @@ -96,7 +96,7 @@ ElmPhoneDiscovery2Text: line "ing that now." done -ElmPhonePokerusText: +ElmPhoneDiscoveredPokerusText: text "Hello, <PLAY_G>?" para "I discovered an" @@ -158,7 +158,7 @@ ElmPhoneEggAssistantText: cont "him?" done -ElmPhoneRocketText: +ElmPhoneRadioTowerRocketTakeoverText: text "<PLAY_G>, how are" line "things going?" @@ -197,7 +197,8 @@ ElmPhoneGiftText: para "See you later!" done -ElmPhoneUnusedText: +; unused +ElmPhoneGotAholdOfSomethingNeatText: text "Hello, <PLAY_G>?" line "How's it going?" diff --git a/data/phone/text/erin_callee.asm b/data/phone/text/erin_callee.asm index a39a19f80..c2685cee7 100644 --- a/data/phone/text/erin_callee.asm +++ b/data/phone/text/erin_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b751a: +ErinAnswerPhoneText: text "Yes, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b751a: line "Good morning!" done -UnknownText_0x1b7548: +ErinAnswerPhoneDayText: text "Yes, this is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b7548: line "Yahoo!" done -UnknownText_0x1b756f: +ErinAnswerPhoneNiteText: text "Yes, this is" line "@" text_ram wStringBuffer3 @@ -27,7 +27,7 @@ UnknownText_0x1b756f: para "Oh, hi, <PLAY_G>!" done -UnknownText_0x1b758f: +ErinGreetText: text "<PLAY_G>!" para "It's @" @@ -36,7 +36,7 @@ UnknownText_0x1b758f: line "Good morning!" done -UnknownText_0x1b75ac: +ErinGreetDayText: text "<PLAY_G>!" para "It's @" @@ -45,7 +45,7 @@ UnknownText_0x1b75ac: line "Working hard?" done -UnknownText_0x1b75c9: +ErinGreetNiteText: text "<PLAY_G>!" para "It's @" @@ -54,7 +54,7 @@ UnknownText_0x1b75c9: line "Were you up?" done -UnknownText_0x1b75e5: +ErinGenericText: text "Are you raising" line "your #MON?" diff --git a/data/phone/text/erin_caller.asm b/data/phone/text/erin_caller.asm index a7e3fd94f..ee54d3121 100644 --- a/data/phone/text/erin_caller.asm +++ b/data/phone/text/erin_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x6717a: +ErinMonIsMuchStrongerText: text_ram wStringBuffer3 text "'s @" text_ram wStringBuffer4 @@ -7,7 +7,7 @@ UnknownText_0x6717a: cont "than before!" done -UnknownText_0x671a4: +ErinDefeatedMonText: text "And, and…" line "I just battled and" cont "beat @" @@ -18,7 +18,7 @@ UnknownText_0x671a4: line "#MON properly!" done -UnknownText_0x671eb: +ErinLostAMonText: text "But, but…" para "A wild @" @@ -30,7 +30,7 @@ UnknownText_0x671eb: line "not fair!" done -UnknownText_0x6722e: +ErinBattleRematchText: text "I'm ERIN. Want to" line "battle me again?" @@ -43,7 +43,7 @@ UnknownText_0x6722e: text "!" done -UnknownText_0x67281: +ErinHangUpText: text "See you. Bye-bye!" done diff --git a/data/phone/text/gaven_callee.asm b/data/phone/text/gaven_callee.asm index 3191ca7db..4e8584057 100644 --- a/data/phone/text/gaven_callee.asm +++ b/data/phone/text/gaven_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b5270: +GavenAnswerPhoneText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b5270: line "Good morning!" done -UnknownText_0x1b52a5: +GavenAnswerPhoneDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -17,7 +17,7 @@ UnknownText_0x1b52a5: para "Hi, <PLAY_G>!" done -UnknownText_0x1b52cc: +GavenAnswerPhoneNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -27,7 +27,7 @@ UnknownText_0x1b52cc: line "Good evening!" done -UnknownText_0x1b5301: +GavenGreetText: text "<PLAY_G>, good" line "morning!" @@ -37,7 +37,7 @@ UnknownText_0x1b5301: line "How are you doing?" done -UnknownText_0x1b5335: +GavenGreetDayText: text "Hi, <PLAY_G>!" para "It's me, @" @@ -46,7 +46,7 @@ UnknownText_0x1b5335: line "How are you doing?" done -UnknownText_0x1b535f: +GavenGreetNiteText: text "<PLAY_G>, good" line "evening!" @@ -56,7 +56,7 @@ UnknownText_0x1b535f: line "How are you doing?" done -UnknownText_0x1b5393: +GavenGenericText: text "How are your" line "#MON doing?" diff --git a/data/phone/text/gaven_caller.asm b/data/phone/text/gaven_caller.asm index 96b5c9086..f552d4148 100644 --- a/data/phone/text/gaven_caller.asm +++ b/data/phone/text/gaven_caller.asm @@ -1,4 +1,4 @@ -GavenGreaterText: +GavenMonGreaterThanImaginedText: text "My @" text_ram wStringBuffer4 text_start @@ -12,7 +12,7 @@ GavenGreaterText: cont "better than mine." done -UnknownText_0x174a80: +GavenDefeatedMonText: text "Oh, and I managed" line "to barely defeat" @@ -35,7 +35,7 @@ UnknownText_0x174a80: cont "used to seeing." done -UnknownText_0x174b2d: +GavenLostAMonText: text "And a while back," line "I tried to catch a" cont "wild @" @@ -52,7 +52,7 @@ UnknownText_0x174b2d: line "to be careful too." done -UnknownText_0x174bc5: +GavenBattleRematchText: text "Let's battle!" para "I'll be waiting on" @@ -64,17 +64,17 @@ UnknownText_0x174bc5: line "when you're close." done -UnknownText_0x174c0e: +GavenHangUpText: text "OK, I'll talk to" line "you soon!" done -UnknownText_0x174c29: +GavenHangUpNotThursdayText: text "I obsess over how" line "to beat you." done -UnknownText_0x174c49: +GavenReminderText: text "<PLAY_G>, why" line "aren't you here?" diff --git a/data/phone/text/gina_callee.asm b/data/phone/text/gina_callee.asm index 3c86e94e6..81325f670 100644 --- a/data/phone/text/gina_callee.asm +++ b/data/phone/text/gina_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b626a: +GinaAnswerPhoneText: text "Hello? This is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b626a: line "Good morning!" done -UnknownText_0x1b6296: +GinaAnswerPhoneDayText: text "Hello? This is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b6296: line "Hi, how are you?" done -UnknownText_0x1b62c5: +GinaAnswerPhoneNiteText: text "Hello? This is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b62c5: line "Good evening!" done -UnknownText_0x1b62f1: +GinaGreetText: text "<PLAY_G>?" para "It's @" @@ -37,7 +37,7 @@ UnknownText_0x1b62f1: line "Good morning!" done -UnknownText_0x1b630e: +GinaGreetDayText: text "<PLAY_G>?" para "It's @" @@ -46,7 +46,7 @@ UnknownText_0x1b630e: line "this a bad time?" done -UnknownText_0x1b6331: +GinaGreetNiteText: text "<PLAY_G>?" para "It's @" @@ -55,7 +55,7 @@ UnknownText_0x1b6331: line "Got time to chat?" done -UnknownText_0x1b6352: +GinaGenericText: text "Are your #MON" line "still tough?" diff --git a/data/phone/text/gina_caller.asm b/data/phone/text/gina_caller.asm index eb65d3786..34bbbaedc 100644 --- a/data/phone/text/gina_caller.asm +++ b/data/phone/text/gina_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x1771fd: +GinaGettingInSyncWithMonText: text "My @" text_ram wStringBuffer4 text " and" @@ -8,7 +8,7 @@ UnknownText_0x1771fd: line "other." done -UnknownText_0x177237: +GinaDefeatedMonText: text "We battled a wild" line "@" text_ram wStringBuffer4 @@ -21,7 +21,7 @@ UnknownText_0x177237: line "the groove!" done -UnknownText_0x177297: +GinaLostAMonText: text "But, you know?" para "I still haven't" @@ -33,7 +33,7 @@ UnknownText_0x177297: line "frustrating…" done -UnknownText_0x1772e2: +GinaBattleRematchText: text "Would you be my" line "practice partner" cont "again sometime?" @@ -48,12 +48,12 @@ UnknownText_0x1772e2: cont "me next time?" done -UnknownText_0x177361: +GinaHangUpText: text "Bye! Let's chat" line "again!" done -UnknownText_0x177378: +GinaRocketTakeoverRumorText: text "Have you heard" line "about TEAM ROCKET?" @@ -65,7 +65,7 @@ UnknownText_0x177378: line "inside safe?" done -UnknownText_0x1773e7: +GinaFoundItemText: text "I picked up some-" line "thing nice today." @@ -81,7 +81,7 @@ UnknownText_0x1773e7: line "where I am." done -UnknownText_0x177465: +GinaHaventFoundAnythingYetText: text "Sorry, I haven't" line "found anything" @@ -92,7 +92,7 @@ UnknownText_0x177465: line "can have it!" done -UnknownText_0x1774c1: +GinaReminderText: text "Oh, <PLAY_G>!" line "How soon can I" @@ -105,7 +105,7 @@ UnknownText_0x1774c1: text "!" done -UnknownText_0x17750e: +GinaComePickUpText: text "I'm getting really" line "impatient, waiting" diff --git a/data/phone/text/huey_callee.asm b/data/phone/text/huey_callee.asm index 9fc78d76f..82afaad4a 100644 --- a/data/phone/text/huey_callee.asm +++ b/data/phone/text/huey_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b5073: +HueyAnswerPhoneText: text "Yeah, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b5073: line "<PLAYER>?" done -UnknownText_0x1b509b: +HueyAnswerPhoneDayText: text "Yeah, this is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b509b: line "<PLAYER>?" done -UnknownText_0x1b50c2: +HueyAnswerPhoneNiteText: text "Yeah, this is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b50c2: line "<PLAYER>?" done -UnknownText_0x1b50e9: +HueyGreetText: text "Yo, <PLAYER>!" line "You awake?" @@ -38,7 +38,7 @@ UnknownText_0x1b50e9: line "How's it going?" done -UnknownText_0x1b511a: +HueyGreetDayText: text "Yo, <PLAYER>! You" line "free right now?" @@ -48,7 +48,7 @@ UnknownText_0x1b511a: line "How's it going?" done -UnknownText_0x1b5154: +HueyGreetNiteText: text "Yo, <PLAYER>!" line "Were you asleep?" diff --git a/data/phone/text/huey_caller.asm b/data/phone/text/huey_caller.asm index a4822f059..b06f2be58 100644 --- a/data/phone/text/huey_caller.asm +++ b/data/phone/text/huey_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x1748ea: +HueyBattleRematchText: text "Hey, I challenge" line "you to a battle!" @@ -14,11 +14,11 @@ UnknownText_0x1748ea: line "over here pronto!" done -UnknownText_0x174962: +HueyHangUpText: text "See ya!" done -UnknownText_0x17496b: +HueyWeHaveToBattleAgainSometimeText: text "We have to battle" line "again sometime." @@ -29,7 +29,7 @@ UnknownText_0x17496b: line "till I win." done -UnknownText_0x1749c7: +HueyReminderText: text "Hey, you'd better" line "not have forgotten" cont "about our battle!" diff --git a/data/phone/text/irwin_callee.asm b/data/phone/text/irwin_callee.asm index 46bcda8b4..61a98b169 100644 --- a/data/phone/text/irwin_callee.asm +++ b/data/phone/text/irwin_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b638c: +IrwinAnswerPhoneText: text "Hello? @" text_ram wStringBuffer3 text_start @@ -7,7 +7,7 @@ UnknownText_0x1b638c: para "Hey, <PLAY_G>!" done -UnknownText_0x1b63a8: +IrwinAnswerPhoneDayText: text "Hello? @" text_ram wStringBuffer3 text_start @@ -16,7 +16,7 @@ UnknownText_0x1b63a8: para "Wow, <PLAY_G>!" done -UnknownText_0x1b63c4: +IrwinAnswerPhoneNiteText: text "Hello? @" text_ram wStringBuffer3 text_start @@ -25,7 +25,7 @@ UnknownText_0x1b63c4: para "Yippee, <PLAY_G>!" done -UnknownText_0x1b63e3: +IrwinGreetText: text "Uh, hello." line "<PLAY_G>?" @@ -35,7 +35,7 @@ UnknownText_0x1b63e3: text "!" done -UnknownText_0x1b6407: +IrwinGreetDayText: text "Uh, hello," line "<PLAY_G>?" @@ -45,7 +45,7 @@ UnknownText_0x1b6407: text "!" done -UnknownText_0x1b642c: +IrwinGreetNiteText: text "Uh, hello," line "<PLAY_G>?" diff --git a/data/phone/text/irwin_caller.asm b/data/phone/text/irwin_caller.asm index 552cf8259..d45646909 100644 --- a/data/phone/text/irwin_caller.asm +++ b/data/phone/text/irwin_caller.asm @@ -1,11 +1,11 @@ -UnknownText_0x64000: +IrwinHangUpText: text "I hate having to" line "hang up on you!" para "Call you later!" done -UnknownText_0x64032: +IrwinRocketTakeoverRumorText: text "<PLAY_G>, have you" line "heard?" @@ -19,7 +19,7 @@ UnknownText_0x64032: line "ROCKET?" done -UnknownText_0x64099: +IrwinPlainBadgeGossipText: text "<PLAY_G>, I heard!" para "You defeated that" @@ -29,7 +29,7 @@ UnknownText_0x64099: line "to be your friend!" done -UnknownText_0x640e6: +IrwinJasmineReturnedGossipText: text "Hey, I heard about" line "you!" @@ -46,7 +46,7 @@ UnknownText_0x640e6: line "bed with a cold!" done -UnknownText_0x6416d: +IrwinRocketHideoutGossipText: text "I heard, I heard," line "I heard!" @@ -60,7 +60,7 @@ UnknownText_0x6416d: line "TEAM ROCKET?" done -UnknownText_0x641e8: +IrwinRadioTowerGossipText: text "I heard, I heard," line "I heard!" @@ -71,7 +71,7 @@ UnknownText_0x641e8: line "rock so hard!" done -UnknownText_0x64247: +IrwinRisingBadgeGossipText: text "I saw, I saw!" para "I saw you go into" @@ -84,7 +84,7 @@ UnknownText_0x64247: line "You can't fail!" done -UnknownText_0x642bb: +IrwinEliteFourGossipText: text "Yesterday, I went" line "out to NEW BARK" @@ -113,7 +113,7 @@ UnknownText_0x642bb: line "mom, believe me!" done -UnknownText_0x643d4: +IrwinVermilionCityGossipText: text "I saw, I saw," line "I saw!" @@ -127,7 +127,7 @@ UnknownText_0x643d4: line "your backdrop!" done -UnknownText_0x64448: +IrwinTrainPassGossipText: text "I heard, I heard!" para "You got a MAGNET" @@ -155,7 +155,7 @@ UnknownText_0x64448: line "by FLY?" done -UnknownText_0x6455b: +IrwinSnorlaxGossipText: text "I saw, I saw!" para "You waking up" @@ -174,7 +174,7 @@ UnknownText_0x6455b: line "magic!" done -UnknownText_0x645ff: +IrwinMtSilverGossipText: text "I hear rumors" line "about you all over" cont "the place." @@ -200,7 +200,7 @@ IrwinCalledRightAwayText: line "good friends!" done -UnknownText_0x646df: +IrwinFogBadgeGossipText: text "I saw, I heard!" para "You beat MORTY of" @@ -225,7 +225,7 @@ UnknownText_0x646df: line "took off for home…" done -UnknownText_0x647d8: +IrwinMarshBadgeGossipText: text "<PLAY_G>, I heard!" para "You're kicking up" @@ -240,7 +240,7 @@ UnknownText_0x647d8: para "You so rock!" done -UnknownText_0x64846: +IrwinYourEscapadesRockText: text "Hearing about your" line "escapades rocks my" @@ -248,7 +248,7 @@ UnknownText_0x64846: line "It sure does!" done -UnknownText_0x64881: +IrwinGoodMatchText: text "I'm so glad you" line "called!" @@ -259,7 +259,7 @@ UnknownText_0x64881: line "a good match!" done -UnknownText_0x648dc: +IrwinSoMuchToChatAboutText: text "How are you?" para "What are you" diff --git a/data/phone/text/jack_callee.asm b/data/phone/text/jack_callee.asm index 18c0ec1a4..2559c62fa 100644 --- a/data/phone/text/jack_callee.asm +++ b/data/phone/text/jack_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b4dc5: +JackAnswerPhoneText: text "Hello. This is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b4dc5: line "<PLAY_G>!" done -UnknownText_0x1b4ded: +JackAnswerPhoneDayText: text "Hello. This is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b4ded: line "<PLAY_G>?" done -UnknownText_0x1b4e16: +JackAnswerPhoneNiteText: text "Hello. This is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b4e16: line "<PLAY_G>!" done -UnknownText_0x1b4e3e: +JackGreetText: text "<PLAY_G>, good" line "morning!" @@ -38,7 +38,7 @@ UnknownText_0x1b4e3e: line "How are you doing?" done -UnknownText_0x1b4e72: +JackGreetDayText: text "<PLAY_G>, howdy!" para "It's me, @" @@ -47,7 +47,7 @@ UnknownText_0x1b4e72: line "Isn't it nice out?" done -UnknownText_0x1b4e9e: +JackGreetNiteText: text "<PLAY_G>, good" line "evening!" @@ -57,7 +57,7 @@ UnknownText_0x1b4e9e: line "Got a minute?" done -UnknownText_0x1b4ecd: +JackGenericText: text "How are your" line "#MON doing?" diff --git a/data/phone/text/jack_caller.asm b/data/phone/text/jack_caller.asm index 671097a34..92299d326 100644 --- a/data/phone/text/jack_caller.asm +++ b/data/phone/text/jack_caller.asm @@ -1,4 +1,4 @@ -JackIntelligenceText: +JackIntelligenceKeepsRisingText: text "My @" text_ram wStringBuffer4 text "'s" @@ -21,7 +21,7 @@ JackDefeatedMonText: cont "starting to help." done -UnknownText_0x174165: +JackLostAMonText: text "Oh, and listen." line "I missed catching" @@ -37,7 +37,7 @@ UnknownText_0x174165: line "caught it…" done -UnknownText_0x1741e1: +JackBattleRematchText: text "Do you want to" line "battle? I'll show" @@ -53,7 +53,7 @@ UnknownText_0x1741e1: line "you're nearby." done -UnknownText_0x174251: +JackHangUpText: text "See you later!" done @@ -165,7 +165,7 @@ JackRainDanceTriviaText: line "than usual." done -UnknownText_0x1745c2: +JackHeardSomeGreatTipsText: text "My friend heard" line "some great tips." @@ -177,7 +177,7 @@ UnknownText_0x1745c2: cont "away and tell you." done -UnknownText_0x174638: +JackReminderText: text "Hey, <PLAY_G>!" para "Do you remember" diff --git a/data/phone/text/joey_callee.asm b/data/phone/text/joey_callee.asm index c86ba29fc..7bbe3397d 100644 --- a/data/phone/text/joey_callee.asm +++ b/data/phone/text/joey_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b589a: +JoeyAnswerPhoneText: text "Hi, @" text_ram wStringBuffer3 text " here!" @@ -7,7 +7,7 @@ UnknownText_0x1b589a: line "doing well?" done -UnknownText_0x1b58c2: +JoeyAnswerPhoneDayText: text "Hi, @" text_ram wStringBuffer3 text " here!" @@ -16,7 +16,7 @@ UnknownText_0x1b58c2: line "doing well?" done -UnknownText_0x1b58ea: +JoeyAnswerPhoneNiteText: text "Hi, @" text_ram wStringBuffer3 text " here!" @@ -25,7 +25,7 @@ UnknownText_0x1b58ea: line "doing well?" done -UnknownText_0x1b5912: +JoeyGreetText: text "Yo, <PLAYER>!" line "How're you doing?" @@ -35,7 +35,7 @@ UnknownText_0x1b5912: line "got a minute?" done -UnknownText_0x1b5948: +JoeyGreetDayText: text "Yo, <PLAYER>! How's" line "it going?" @@ -45,7 +45,7 @@ UnknownText_0x1b5948: line "Got a minute?" done -UnknownText_0x1b597c: +JoeyGreetNiteText: text "Yo, <PLAYER>!" line "How're you doing?" @@ -55,7 +55,7 @@ UnknownText_0x1b597c: line "got a minute?" done -UnknownText_0x1b59b2: +JoeyGenericText: text "How are your" line "#MON doing?" diff --git a/data/phone/text/joey_caller.asm b/data/phone/text/joey_caller.asm index dcf1dfd71..07704fd28 100644 --- a/data/phone/text/joey_caller.asm +++ b/data/phone/text/joey_caller.asm @@ -1,4 +1,4 @@ -JoeySharperText: +JoeyMonLookingSharperText: text "My @" text_ram wStringBuffer4 text "'s" @@ -12,7 +12,7 @@ JoeySharperText: line "party!" done -UnknownText_0x175591: +JoeyDefeatedMonText: text "Oh yeah, I took" line "down a @" text_ram wStringBuffer4 @@ -27,7 +27,7 @@ UnknownText_0x175591: line "us being so tough." done -UnknownText_0x175611: +JoeyLostAMonText: text "Oh yeah, I saw a" line "wild @" text_ram wStringBuffer4 @@ -43,7 +43,7 @@ UnknownText_0x175611: line "extreme end." done -UnknownText_0x175693: +JoeyBattleRematchText: text "Let's get together" line "and battle!" @@ -59,11 +59,11 @@ UnknownText_0x175693: line "when you come." done -UnknownText_0x17570a: +JoeyHangUpText: text "All right. Later!" done -UnknownText_0x17571d: +JoeyDevisingStrategiesText: text "I'm checking out" line "@" text_ram wStringBuffer4 @@ -77,7 +77,7 @@ UnknownText_0x17571d: cont "let's battle!" done -UnknownText_0x175786: +JoeyReminderText: text "What's keeping" line "you, <PLAYER>!" diff --git a/data/phone/text/jose_callee.asm b/data/phone/text/jose_callee.asm index c476d431b..01ae5f5a2 100644 --- a/data/phone/text/jose_callee.asm +++ b/data/phone/text/jose_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b55ae: +JoseAnswerPhoneText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b55ae: line "Good morning!" done -UnknownText_0x1b55da: +JoseAnswerPhoneDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -17,7 +17,7 @@ UnknownText_0x1b55da: para "Oh, <PLAY_G>? Hi!" done -UnknownText_0x1b55fc: +JoseAnswerPhoneNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -27,7 +27,7 @@ UnknownText_0x1b55fc: line "Good evening!" done -UnknownText_0x1b5628: +JoseGreetText: text "Oh, <PLAY_G>?" para "Tweet! Yeah, it's" @@ -36,7 +36,7 @@ UnknownText_0x1b5628: text "." done -UnknownText_0x1b564c: +JoseGreetDayText: text "Oh, <PLAY_G>?" para "Tweet! Yeah, it's" @@ -45,7 +45,7 @@ UnknownText_0x1b564c: text "." done -UnknownText_0x1b5670: +JoseGreetNiteText: text "Oh, <PLAY_G>?" para "Tweet! Yeah, it's" @@ -54,7 +54,7 @@ UnknownText_0x1b5670: text "." done -UnknownText_0x1b5694: +JoseGenericText: text "Are your #MON" line "still cooking?" diff --git a/data/phone/text/jose_caller.asm b/data/phone/text/jose_caller.asm index 33d022855..7ab165359 100644 --- a/data/phone/text/jose_caller.asm +++ b/data/phone/text/jose_caller.asm @@ -1,4 +1,4 @@ -JoseAromaText: +JoseMonsStickHasADeliciousAromaText: text "Hey listen, my" line "@" text_ram wStringBuffer4 @@ -11,7 +11,7 @@ JoseAromaText: line "appetite going!" done -UnknownText_0x174f90: +JoseDefeatedMonText: text "A while ago, my" line "FARFETCH'D KO'd" cont "this @" @@ -25,7 +25,7 @@ UnknownText_0x174f90: line "Amazing stuff!" done -UnknownText_0x174ffd: +JoseLostAMonText: text "I ran into a wild" line "@" text_ram wStringBuffer4 @@ -41,7 +41,7 @@ UnknownText_0x174ffd: line "bit disappointing." done -UnknownText_0x17507d: +JoseBattleRematchText: text "Want to battle" line "again?" @@ -60,11 +60,11 @@ UnknownText_0x17507d: line "for me, OK?" done -UnknownText_0x175106: +JoseHangUpText: text "Be seeing you!" done -JoseFoundSomethingText: +JoseFoundItemText: text "My FARFETCH'D had" line "something pretty" cont "in its beak." @@ -81,7 +81,7 @@ JoseFoundSomethingText: line "have it." done -UnknownText_0x17519b: +JoseHaventGottenItemYetText: text "I haven't gotten" line "what I promised" cont "you yet." @@ -93,7 +93,7 @@ UnknownText_0x17519b: line "a little longer?" done -UnknownText_0x17520a: +JoseReminderText: text "<PLAY_G>, could you" line "hurry over?" @@ -114,7 +114,7 @@ UnknownText_0x17520a: line "soon as you can!" done -UnknownText_0x17529c: +JoseComePickUpText: text "What's wrong?" para "Don't you want" diff --git a/data/phone/text/kenji_callee.asm b/data/phone/text/kenji_callee.asm index e108aa778..94adbb264 100644 --- a/data/phone/text/kenji_callee.asm +++ b/data/phone/text/kenji_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b730b: +KenjiAnswerPhoneText: text_ram wStringBuffer3 text " here…" @@ -6,7 +6,7 @@ UnknownText_0x1b730b: line "morning, hey?" done -UnknownText_0x1b7331: +KenjiAnswerPhoneDayText: text_ram wStringBuffer3 text " here…" @@ -14,7 +14,7 @@ UnknownText_0x1b7331: line "weather, hey?" done -UnknownText_0x1b7357: +KenjiAnswerPhoneNiteText: text_ram wStringBuffer3 text " here…" @@ -22,21 +22,21 @@ UnknownText_0x1b7357: line "moonlight, hey?" done -UnknownText_0x1b737f: +KenjiGreetText: text "Hey, <PLAYER>!" line "This is @" text_ram wStringBuffer3 text "!" done -UnknownText_0x1b7397: +KenjiGreetDayText: text "Hey, <PLAYER>!" line "This is @" text_ram wStringBuffer3 text "!" done -UnknownText_0x1b73af: +KenjiGreetNiteText: text "Hey, <PLAYER>!" line "This is @" text_ram wStringBuffer3 diff --git a/data/phone/text/kenji_caller.asm b/data/phone/text/kenji_caller.asm index d0f527d3b..52eba3a8f 100644 --- a/data/phone/text/kenji_caller.asm +++ b/data/phone/text/kenji_caller.asm @@ -1,9 +1,9 @@ -UnknownText_0x66dab: +KenjiHangUpText: text "Anyway, we'll chat" line "again!" done -UnknownText_0x66dc5: +KenjiRemainDedicatedText: text "Are you still on" line "your journey?" @@ -13,7 +13,7 @@ UnknownText_0x66dc5: para "Oooooaaarrrgh!" done -UnknownText_0x66e17: +KenjiCallMeBackAnotherTimeText: text "I'm in training" line "now. I apologize," @@ -23,7 +23,7 @@ UnknownText_0x66e17: para "Oooooaaarrrgh!" done -UnknownText_0x66e67: +KenjiIllHaveTimeToChatTomorrowText: text "I apologize, but I" line "don't have time to" @@ -36,7 +36,7 @@ UnknownText_0x66e67: para "Yiiihah!" done -UnknownText_0x66ed3: +KenjiHangUpMorningText: text "I plan to take a" line "lunch break, so" @@ -44,7 +44,7 @@ UnknownText_0x66ed3: line "Ayiiiyah!" done -KenjiBreakText: +KenjiTakingABreakText: text "I'm taking a break" line "on ROUTE 45!" @@ -52,7 +52,7 @@ KenjiBreakText: line "you are free?" done -UnknownText_0x66f52: +KenjiHangUpNightText: text "I rested up over" line "my lunch break." diff --git a/data/phone/text/liz_callee.asm b/data/phone/text/liz_callee.asm index 93ea88923..57d3c95bb 100644 --- a/data/phone/text/liz_callee.asm +++ b/data/phone/text/liz_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b5d9f: +LizAnswerPhoneText: text "Hello, @" text_ram wStringBuffer3 text_start @@ -8,7 +8,7 @@ UnknownText_0x1b5d9f: line "Good morning." done -UnknownText_0x1b5dcc: +LizAnswerPhoneDayText: text "Hello, @" text_ram wStringBuffer3 text_start @@ -18,7 +18,7 @@ UnknownText_0x1b5dcc: line "How are you?" done -UnknownText_0x1b5df8: +LizAnswerPhoneNiteText: text "Hello, @" text_ram wStringBuffer3 text_start @@ -28,7 +28,7 @@ UnknownText_0x1b5df8: line "Good evening." done -UnknownText_0x1b5e25: +LizGreetText: text "Good morning," line "<PLAY_G>." @@ -38,7 +38,7 @@ UnknownText_0x1b5e25: line "Were you sleeping?" done -UnknownText_0x1b5e59: +LizGreetDayText: text "Hi, <PLAY_G>." line "This is @" text_ram wStringBuffer3 @@ -48,7 +48,7 @@ UnknownText_0x1b5e59: line "going for you?" done -UnknownText_0x1b5e8e: +LizGreetNiteText: text "Good evening," line "<PLAY_G>." @@ -58,7 +58,7 @@ UnknownText_0x1b5e8e: line "Are you awake?" done -UnknownText_0x1b5ebe: +LizGenericText: text "I had some time," line "so I called you." diff --git a/data/phone/text/liz_caller.asm b/data/phone/text/liz_caller.asm index f0c7a7025..b9dc1a00b 100644 --- a/data/phone/text/liz_caller.asm +++ b/data/phone/text/liz_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x175fda: +LizMonAlwaysWantsToNuzzleText: text "Oh, you have to" line "hear this." @@ -11,7 +11,7 @@ UnknownText_0x175fda: line "nuzzle me!" done -UnknownText_0x17602d: +LizDefeatedMonText: text "And, and! Um…" para "We beat a wild" @@ -26,7 +26,7 @@ UnknownText_0x17602d: line "it, though." done -UnknownText_0x176095: +LizLostAMonText: text "And, and! Uh…" para "We just saw a" @@ -42,7 +42,7 @@ UnknownText_0x176095: line "really angry!" done -UnknownText_0x17610a: +LizBattleRematchText: text "Hi! Do you have" line "some free time?" @@ -61,7 +61,7 @@ UnknownText_0x17610a: line "you get here!" done -LizHiTaniaText: +LizWrongNumberText: text "Hi, TANIA. How are" line "you? This is LIZ." @@ -72,12 +72,12 @@ LizHiTaniaText: line "Oops! Sorry!" done -UnknownText_0x17620a: +LizHangUpText: text "OK, I'll call you" line "later!" done -UnknownText_0x176223: +LizRuinsOfAlphGossipText: text "Listen, listen!" para "I was listening to" @@ -93,7 +93,7 @@ UnknownText_0x176223: line "was. So strange!" done -UnknownText_0x1762c3: +LizFalknerGossipText: text "Listen, listen!" para "Don't you think" @@ -115,7 +115,7 @@ UnknownText_0x1762c3: line "meet him!" done -UnknownText_0x17638a: +LizEarlGossipText: text "Listen, listen!" para "Do you know EARL," @@ -131,7 +131,7 @@ UnknownText_0x17638a: line "was wildly funny!" done -UnknownText_0x176424: +LizSurfPikachuGossipText: text "Listen, listen!" para "I collect #MON" @@ -151,7 +151,7 @@ UnknownText_0x176424: cont "you had one." done -UnknownText_0x1764eb: +LizMooMooMilkGossipText: text "Listen, listen!" para "Do you know about" @@ -170,7 +170,7 @@ UnknownText_0x1764eb: line "it's delicious!" done -UnknownText_0x176599: +LizSalonGossipText: text "Listen, listen!" para "There's a #MON" @@ -198,7 +198,7 @@ UnknownText_0x176599: line "whom I should use…" done -UnknownText_0x1766ac: +LizWhitneyGossipText: text "Listen, listen!" para "GOLDENROD GYM's" @@ -215,7 +215,7 @@ UnknownText_0x1766ac: line "totally talented." done -UnknownText_0x17674f: +LizBugCatchingContestGossipText: text "Listen, listen!" para "Have you ever" @@ -236,7 +236,7 @@ UnknownText_0x17674f: cont "that great?" done -UnknownText_0x176816: +LizBeautifulMonGossipText: text "Listen, listen!" para "I saw a beautiful" @@ -251,7 +251,7 @@ UnknownText_0x176816: text " too." done -UnknownText_0x17686d: +LizForgotGossipText: text "Listen, listen!" para "Uh… Um… Whoops!" @@ -260,7 +260,7 @@ UnknownText_0x17686d: line "was going to say!" done -UnknownText_0x1768b0: +LizFawningOverMonText: text "Listen, listen!" para "My @" @@ -294,7 +294,7 @@ UnknownText_0x1768b0: line "I love chatting!" done -UnknownText_0x1769da: +LizReminderText: text "I've got too much" line "time on my hands!" diff --git a/data/phone/text/parry_callee.asm b/data/phone/text/parry_callee.asm index 247566b54..6258bf690 100644 --- a/data/phone/text/parry_callee.asm +++ b/data/phone/text/parry_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b73c7: +ParryAnswerPhoneText: text "Yup, yup!" line "It's @" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b73c7: line "<PLAY_G>!" done -UnknownText_0x1b73ef: +ParryAnswerPhoneDayText: text "Yup, yup!" line "It's @" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b73ef: line "<PLAY_G>!" done -UnknownText_0x1b7417: +ParryAnswerPhoneNiteText: text "Yup, yup!" line "It's @" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b7417: line "<PLAY_G>!" done -UnknownText_0x1b743f: +ParryGreetText: text "<PLAY_G>, it's" line "@" text_ram wStringBuffer3 @@ -38,7 +38,7 @@ UnknownText_0x1b743f: line "proper breakfast?" done -UnknownText_0x1b746f: +ParryGreetDayText: text "<PLAY_G>, it's" line "@" text_ram wStringBuffer3 @@ -48,7 +48,7 @@ UnknownText_0x1b746f: line "proper lunch?" done -UnknownText_0x1b749b: +ParryGreetNiteText: text "<PLAY_G>, it's" line "@" text_ram wStringBuffer3 @@ -58,7 +58,7 @@ UnknownText_0x1b749b: line "proper dinner?" done -UnknownText_0x1b74c8: +ParryGenericText: text "Are your #MON" line "looking good?" diff --git a/data/phone/text/parry_caller.asm b/data/phone/text/parry_caller.asm index ca20b1c2c..090b8e0d9 100644 --- a/data/phone/text/parry_caller.asm +++ b/data/phone/text/parry_caller.asm @@ -1,11 +1,11 @@ -ParryNoMatchText: +ParryNothingCanMatchText: text "Nothing can match" line "my @" text_ram wStringBuffer4 text " now." done -UnknownText_0x66fc0: +ParryDefeatedMonText: text "Yeah, we KO'd a" line "wild @" text_ram wStringBuffer4 @@ -15,7 +15,7 @@ UnknownText_0x66fc0: line "wanted to get it…" done -UnknownText_0x67001: +ParryLostAMonText: text "And yesterday, we" line "spotted a wild" @@ -34,7 +34,7 @@ UnknownText_0x67001: line "How about that!" done -UnknownText_0x67096: +ParryBattleRematchText: text "You're thinking" line "you'd like to" @@ -47,7 +47,7 @@ UnknownText_0x67096: text "!" done -UnknownText_0x670eb: +ParryHangUpText: text "OK, give me a call" line "again!" done diff --git a/data/phone/text/ralph_callee.asm b/data/phone/text/ralph_callee.asm index cbb647cd7..ec6da0199 100644 --- a/data/phone/text/ralph_callee.asm +++ b/data/phone/text/ralph_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b5c10: +RalphAnswerPhoneText: text "Yes? Ah, <PLAY_G>." para "You're courteous" @@ -8,7 +8,7 @@ UnknownText_0x1b5c10: line "call on the phone." done -UnknownText_0x1b5c63: +RalphAnswerPhoneDayText: text "Yes? Ah, <PLAY_G>." para "You're courteous" @@ -18,7 +18,7 @@ UnknownText_0x1b5c63: line "call on the phone." done -UnknownText_0x1b5cb6: +RalphAnswerPhoneNiteText: text "Yes? Ah, <PLAY_G>." para "You're courteous" @@ -28,28 +28,28 @@ UnknownText_0x1b5cb6: line "call on the phone." done -UnknownText_0x1b5d09: +RalphGreetText: text "Hiya, it's Uncle" line "@" text_ram wStringBuffer3 text "." done -UnknownText_0x1b5d21: +RalphGreetDayText: text "Hiya, it's Uncle" line "@" text_ram wStringBuffer3 text "." done -UnknownText_0x1b5d39: +RalphGreetNiteText: text "Hiya, it's Uncle" line "@" text_ram wStringBuffer3 text "." done -UnknownText_0x1b5d51: +RalphGenericText: text "Are you taking" line "good care of your" diff --git a/data/phone/text/ralph_caller.asm b/data/phone/text/ralph_caller.asm index f890be10f..667ee1896 100644 --- a/data/phone/text/ralph_caller.asm +++ b/data/phone/text/ralph_caller.asm @@ -11,7 +11,7 @@ RalphNeglectingKidsText: line "actually." done -UnknownText_0x175c24: +RalphDefeatedMonText: text "I just beat a wild" line "@" text_ram wStringBuffer4 @@ -27,7 +27,7 @@ UnknownText_0x175c24: line "cocky…" done -UnknownText_0x175c9f: +RalphLostAMonText: text "Yesterday a wild" line "@" text_ram wStringBuffer4 @@ -46,7 +46,7 @@ UnknownText_0x175c9f: line "made my day!" done -UnknownText_0x175d40: +RalphBattleRematchText: text "What do you say to" line "a battle with me?" @@ -62,12 +62,12 @@ UnknownText_0x175d40: line "the spot!" done -UnknownText_0x175db7: +RalphHangUpText: text "You call your mom" line "sometimes too!" done -UnknownText_0x175dd9: +RalphItemText: text "Listen, I… Yowch!" para "Uh, sorry! See," @@ -96,7 +96,7 @@ UnknownText_0x175dd9: line "to fish!" done -UnknownText_0x175eaf: +RalphNoItemText: text "Yeah, I know." para "You're looking for" @@ -107,7 +107,7 @@ UnknownText_0x175eaf: cont "MAGIKARP, though…" done -UnknownText_0x175f11: +RalphReminderText: text "So where are you?" line "I'm waiting for" @@ -120,7 +120,7 @@ UnknownText_0x175f11: line "your elders wait!" done -UnknownText_0x175f70: +RalphHurryText: text "Hey, what's the" line "matter with you?" diff --git a/data/phone/text/reena_callee.asm b/data/phone/text/reena_callee.asm index 980ced9da..e1a880bb5 100644 --- a/data/phone/text/reena_callee.asm +++ b/data/phone/text/reena_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b5702: +ReenaAnswerPhoneText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b5702: line "What's up?" done -UnknownText_0x1b572e: +ReenaAnswerPhoneDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b572e: line "what's up?" done -UnknownText_0x1b575a: +ReenaAnswerPhoneNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b575a: line "what's up?" done -UnknownText_0x1b5786: +ReenaGreetText: text "You're slow! Hurry" line "up and answer!" @@ -37,7 +37,7 @@ UnknownText_0x1b5786: text "!" done -UnknownText_0x1b57b7: +ReenaGreetDayText: text "You're slow! Hurry" line "up and answer!" @@ -46,7 +46,7 @@ UnknownText_0x1b57b7: text "!" done -UnknownText_0x1b57e8: +ReenaGreetNiteText: text "You're slow! Hurry" line "up and answer!" @@ -55,7 +55,7 @@ UnknownText_0x1b57e8: text "!" done -UnknownText_0x1b5819: +ReenaGenericText: text "Hey, how are your" line "#MON doing?" diff --git a/data/phone/text/reena_caller.asm b/data/phone/text/reena_caller.asm index 815e2f596..59bb71c84 100644 --- a/data/phone/text/reena_caller.asm +++ b/data/phone/text/reena_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x1752f5: +ReenaMonsIsAPerfectMatchText: text "Listen, dear…" para "Do you recall my" @@ -16,7 +16,7 @@ UnknownText_0x1752f5: cont "match for me?" done -UnknownText_0x17536b: +ReenaDefeatedMonText: text "Have I ever faced" line "a wild @" text_ram wStringBuffer4 @@ -31,7 +31,7 @@ UnknownText_0x17536b: cont "occasions!" done -UnknownText_0x1753c5: +ReenaLostAMonText: text "Have I ever failed" line "to catch a wild" cont "#MON?" @@ -47,7 +47,7 @@ UnknownText_0x1753c5: line "Oh! Never mind!" done -UnknownText_0x17543a: +ReenaBattleRematchText: text "We are going to" line "battle!" @@ -60,11 +60,11 @@ UnknownText_0x17543a: line "wait! Got it?" done -UnknownText_0x175488: +ReenaHangUpText: text "Fine, you may go." done -UnknownText_0x17549b: +ReenaForwardText: text "Don't be too proud" line "just because you" @@ -74,7 +74,7 @@ UnknownText_0x17549b: para "It was a fluke!" done -UnknownText_0x1754e5: +ReenaHurryText: text "What are you" line "doing?" diff --git a/data/phone/text/tiffany_callee.asm b/data/phone/text/tiffany_callee.asm index 1bac8dc73..3b6becf97 100644 --- a/data/phone/text/tiffany_callee.asm +++ b/data/phone/text/tiffany_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b6e7c: +TiffanyAnswerPhoneText: text "Yes? This is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b6e7c: line "Good morning." done -UnknownText_0x1b6ea6: +TiffanyAnswerPhoneDayText: text "Yes? This is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b6ea6: line "Hello." done -UnknownText_0x1b6ec9: +TiffanyAnswerPhoneNiteText: text "Yes? This is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b6ec9: line "evening." done -UnknownText_0x1b6ef3: +TiffanyGreetText: text "Is this <PLAY_G>?" para "Good morning. This" @@ -37,7 +37,7 @@ UnknownText_0x1b6ef3: text "." done -UnknownText_0x1b6f1c: +TiffanyGreetDayText: text "Is this <PLAY_G>?" para "Hi, it's @" @@ -45,7 +45,7 @@ UnknownText_0x1b6f1c: text "." done -UnknownText_0x1b6f37: +TiffanyGreetNiteText: text "Is this <PLAY_G>?" para "Good evening. This" @@ -54,7 +54,7 @@ UnknownText_0x1b6f37: text "." done -UnknownText_0x1b6f60: +TiffanyGenericText: text "Are your #MON" line "doing well?" diff --git a/data/phone/text/tiffany_caller.asm b/data/phone/text/tiffany_caller.asm index 220d4ef3c..a10fe07b9 100644 --- a/data/phone/text/tiffany_caller.asm +++ b/data/phone/text/tiffany_caller.asm @@ -1,4 +1,4 @@ -UnknownText_0x665ad: +TiffanyMonIsAdorableText: text "My @" text_ram wStringBuffer4 text "'s" @@ -11,7 +11,7 @@ UnknownText_0x665ad: line "fluffy and warm!" done -UnknownText_0x66605: +TiffanyDefeatedMonText: text "Oh, and we had to" line "battle a wild" @@ -31,7 +31,7 @@ UnknownText_0x66605: text "!" done -UnknownText_0x66688: +TiffanyLostAMonText: text "Oh, and we had to" line "battle a wild" @@ -51,7 +51,7 @@ UnknownText_0x66688: cont "of my CLEFAIRY." done -UnknownText_0x66730: +TiffanyBattleRematchText: text "I know this might" line "surprise you, but" @@ -81,11 +81,11 @@ TiffanyItsAwfulText: line "Bye-bye!" done -UnknownText_0x667f7: +TiffanyHangUpText: text "Bye-bye!" done -UnknownText_0x66801: +TiffanyFoundItemText: text "I bought some PINK" line "BOWS at GOLDENROD" @@ -101,12 +101,12 @@ UnknownText_0x66801: text "." done -UnknownText_0x66882: +TiffanyNoItemText: text "I love dressing up" line "my CLEFAIRY!" done -UnknownText_0x668a3: +TiffanyAsleepText: text "What's wrong?" line "Can't you visit?" @@ -122,7 +122,7 @@ UnknownText_0x668a3: text "!" done -UnknownText_0x6691d: +TiffanyHurryText: text "What's wrong?" line "Can't you visit?" diff --git a/data/phone/text/todd_callee.asm b/data/phone/text/todd_callee.asm index f795d29c2..9ba4931ad 100644 --- a/data/phone/text/todd_callee.asm +++ b/data/phone/text/todd_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b60f5: +ToddAnswerPhoneText: text "Yes? This is" line "@" text_ram wStringBuffer3 @@ -7,7 +7,7 @@ UnknownText_0x1b60f5: para "Hey, <PLAY_G>!" done -UnknownText_0x1b611b: +ToddAnswerPhoneDayText: text "Yes? This is" line "@" text_ram wStringBuffer3 @@ -17,7 +17,7 @@ UnknownText_0x1b611b: line "<PLAY_G>." done -UnknownText_0x1b6149: +ToddAnswerPhoneNiteText: text "Yes? This is" line "@" text_ram wStringBuffer3 @@ -26,7 +26,7 @@ UnknownText_0x1b6149: para "Ah, <PLAY_G>!" done -UnknownText_0x1b616e: +ToddGreetText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -35,7 +35,7 @@ UnknownText_0x1b616e: para "<PLAY_G>, right?" done -UnknownText_0x1b618f: +ToddGreetDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -45,7 +45,7 @@ UnknownText_0x1b618f: line "you doing?" done -UnknownText_0x1b61bd: +ToddGreetNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -55,7 +55,7 @@ UnknownText_0x1b61bd: line "call you so late." done -UnknownText_0x1b61f2: +ToddGenericText: text "How do you raise" line "your #MON?" diff --git a/data/phone/text/todd_caller.asm b/data/phone/text/todd_caller.asm index 3b647d1b5..d713b8aa3 100644 --- a/data/phone/text/todd_caller.asm +++ b/data/phone/text/todd_caller.asm @@ -8,7 +8,7 @@ ToddLooksCuteLikeMeText: line "getting cuter!" done -UnknownText_0x176e9c: +ToddDefeatedMonText: text "And, you know?" para "Now we can KO" @@ -20,7 +20,7 @@ UnknownText_0x176e9c: line "the GOLDENROD GYM." done -UnknownText_0x176eee: +ToddLostAMonText: text "And, you know?" line "We just failed to" @@ -36,7 +36,7 @@ UnknownText_0x176eee: line "yet…" done -UnknownText_0x176f60: +ToddBattleRematchText: text "You must be a lot" line "better now, huh?" @@ -52,11 +52,11 @@ UnknownText_0x176f60: text "." done -UnknownText_0x176fdb: +ToddHangUpText: text "See you later!" done -UnknownText_0x176feb: +ToddDepartmentStoreBargainSaleText: text "This is it--the" line "one we've all been" cont "waiting for!" @@ -82,7 +82,7 @@ UnknownText_0x176feb: cont "soon as you can!" done -UnknownText_0x1770fb: +ToddSavingUpForBargainSaleText: text "I'm saving up for" line "the next bargain" @@ -90,7 +90,7 @@ UnknownText_0x1770fb: line "next one?" done -UnknownText_0x177138: +ToddLookingForwardToBattleText: text "Where are you?" para "Let's have our" @@ -102,7 +102,7 @@ UnknownText_0x177138: text "." done -UnknownText_0x17717c: +ToddHaveYouGoneToDepartmentStoreText: text "Haven't you gone" line "to GOLDENROD DEPT." diff --git a/data/phone/text/tully_callee.asm b/data/phone/text/tully_callee.asm index 9156cd1e6..92b3fb5a0 100644 --- a/data/phone/text/tully_callee.asm +++ b/data/phone/text/tully_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b6b39: +TullyAnswerPhoneText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b6b39: line "<PLAY_G>." done -UnknownText_0x1b6b65: +TullyAnswerPhoneDayText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b6b65: line "<PLAY_G>, right?" done -UnknownText_0x1b6b92: +TullyAnswerPhoneNiteText: text "Hello, this is" line "@" text_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b6b92: line "<PLAY_G>!" done -UnknownText_0x1b6bb9: +TullyGreetText: text "Hello!" line "@" text_ram wStringBuffer3 @@ -38,7 +38,7 @@ UnknownText_0x1b6bb9: line "weather's great!" done -UnknownText_0x1b6bef: +TullyGreetDayText: text "Hello!" line "@" text_ram wStringBuffer3 @@ -48,7 +48,7 @@ UnknownText_0x1b6bef: line "for fishing!" done -UnknownText_0x1b6c23: +TullyGreetNiteText: text "Hello!" line "@" text_ram wStringBuffer3 @@ -58,7 +58,7 @@ UnknownText_0x1b6c23: line "for fishing!" done -UnknownText_0x1b6c56: +TullyGenericText: text "How's your trip" line "coming along?" diff --git a/data/phone/text/tully_caller.asm b/data/phone/text/tully_caller.asm index cf1fc5d23..727c31a4a 100644 --- a/data/phone/text/tully_caller.asm +++ b/data/phone/text/tully_caller.asm @@ -1,4 +1,4 @@ -TullyGrownText: +TullyMonHasGrownText: text "My @" text_ram wStringBuffer4 text " has" @@ -11,7 +11,7 @@ TullyGrownText: line "it's way bigger." done -UnknownText_0x65e42: +TullyDefeatedMonText: text "Oh yeah, I KO'd a" line "wild @" text_ram wStringBuffer4 @@ -25,7 +25,7 @@ UnknownText_0x65e42: cont "the phone…" done -UnknownText_0x65eac: +TullyLostAMonText: text "Oh yeah, I lost a" line "wild @" text_ram wStringBuffer4 @@ -39,7 +39,7 @@ UnknownText_0x65eac: cont "the phone…" done -UnknownText_0x65f17: +TullyBattleRematchText: text "We should get a" line "battle going!" @@ -52,12 +52,12 @@ UnknownText_0x65f17: line "have the time." done -UnknownText_0x65f6e: +TullyHangUpText: text "Well, I'll be" line "seeing you." done -UnknownText_0x65f88: +TullyFoundItemText: text "I picked up a good" line "little thing at" cont "the water's edge." @@ -71,7 +71,7 @@ UnknownText_0x65f88: text "." done -UnknownText_0x65ff2: +TullyNoItemText: text "Have I found" line "anything good?" @@ -81,7 +81,7 @@ UnknownText_0x65ff2: line "you need patience." done -UnknownText_0x66043: +TullyForwardText: text "Yup, TULLY here…" para "<PLAY_G>? What?" @@ -93,7 +93,7 @@ UnknownText_0x66043: text "." done -UnknownText_0x66087: +TullyHurryText: text "I've got something" line "good for you." diff --git a/data/phone/text/unknown_callee.asm b/data/phone/text/unknown_callee.asm index 570618b05..02b26926a 100644 --- a/data/phone/text/unknown_callee.asm +++ b/data/phone/text/unknown_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b518b: +UnknownGenericText: text "How are your" line "#MON doing?" @@ -18,7 +18,7 @@ UnknownText_0x1b518b: line "bit much for me!" done -UnknownText_0x1b522b: +UnknownTougherThanEverText: text "My @" text_ram wStringBuffer4 text "'s" diff --git a/data/phone/text/vance_callee.asm b/data/phone/text/vance_callee.asm index c1c8948b4..0297e3af4 100644 --- a/data/phone/text/vance_callee.asm +++ b/data/phone/text/vance_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b7019: +VanceAnswerPhoneText: text "Yes, hello?" line "@" text_ram wStringBuffer3 @@ -10,7 +10,7 @@ UnknownText_0x1b7019: line "#MON?" done -UnknownText_0x1b7057: +VanceAnswerPhoneDayText: text "Yes, hello?" line "@" text_ram wStringBuffer3 @@ -22,7 +22,7 @@ UnknownText_0x1b7057: line "#MON flying?" done -UnknownText_0x1b7092: +VanceAnswerPhoneNiteText: text "Yes, hello?" line "@" text_ram wStringBuffer3 @@ -35,7 +35,7 @@ UnknownText_0x1b7092: line "see some action?" done -UnknownText_0x1b70e7: +VanceGreetText: text "Good morning," line "<PLAY_G>!" @@ -45,7 +45,7 @@ UnknownText_0x1b70e7: line "Good morning!" done -UnknownText_0x1b7112: +VanceGreetDayText: text "Hi, <PLAY_G>!" para "It's @" @@ -54,7 +54,7 @@ UnknownText_0x1b7112: line "Remember me?" done -UnknownText_0x1b7132: +VanceGreetNiteText: text "Good evening," line "<PLAY_G>!" @@ -64,7 +64,7 @@ UnknownText_0x1b7132: line "Are you free now?" done -UnknownText_0x1b7161: +VanceGenericText: text "Are you and your" line "#MON fine?" diff --git a/data/phone/text/vance_caller.asm b/data/phone/text/vance_caller.asm index 97cf2ec14..bc08e4f1d 100644 --- a/data/phone/text/vance_caller.asm +++ b/data/phone/text/vance_caller.asm @@ -1,4 +1,4 @@ -VanceLiftoffText: +VanceMonHasBecomeTougherText: text "My @" text_ram wStringBuffer4 text "'s" @@ -8,7 +8,7 @@ VanceLiftoffText: line "liftoff!" done -UnknownText_0x669b2: +VanceDefeatedMonText: text "We can easily beat" line "@" text_ram wStringBuffer4 @@ -18,7 +18,7 @@ UnknownText_0x669b2: line "Isn't that great?" done -UnknownText_0x669ed: +VanceLostAMonText: text "But get this, a" line "wild @" text_ram wStringBuffer4 @@ -30,7 +30,7 @@ UnknownText_0x669ed: line "after it…" done -UnknownText_0x66a3a: +VanceBattleRematchText: text "Right now, I'm on" line "@" text_ram wStringBuffer5 @@ -43,7 +43,7 @@ UnknownText_0x66a3a: line "I'll wait here." done -UnknownText_0x66a93: +VanceHangUpText: text "OK, bye for now!" done diff --git a/data/phone/text/wade_callee.asm b/data/phone/text/wade_callee.asm index ab8a1cd3a..602db6f0d 100644 --- a/data/phone/text/wade_callee.asm +++ b/data/phone/text/wade_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b5a3b: +WadeAnswerPhoneText: text "Hello? This is" line "@" text_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b5a3b: line "Good morning!" done -UnknownText_0x1b5a74: +WadeAnswerPhoneDayText: text "Hello? This is" line "@" text_ram wStringBuffer3 @@ -17,7 +17,7 @@ UnknownText_0x1b5a74: para "Oh, hi, <PLAY_G>!" done -UnknownText_0x1b5a9f: +WadeAnswerPhoneNiteText: text "Hello? This is" line "@" text_ram wStringBuffer3 @@ -27,7 +27,7 @@ UnknownText_0x1b5a9f: line "Good evening!" done -UnknownText_0x1b5ad8: +WadeGreetText: text "<PLAY_G>, good" line "morning!" @@ -37,7 +37,7 @@ UnknownText_0x1b5ad8: line "Isn't it nice out?" done -UnknownText_0x1b5b0b: +WadeGreetDayText: text "<PLAY_G>, howdy!" para "It's me, @" @@ -46,7 +46,7 @@ UnknownText_0x1b5b0b: line "Isn't it nice out?" done -UnknownText_0x1b5b37: +WadeGreetNiteText: text "Good evening," line "<PLAY_G>!" @@ -56,7 +56,7 @@ UnknownText_0x1b5b37: line "Were you awake?" done -UnknownText_0x1b5b68: +WadeGenericText: text "How are your" line "#MON doing?" diff --git a/data/phone/text/wade_caller.asm b/data/phone/text/wade_caller.asm index 6f8ccc841..b00df640c 100644 --- a/data/phone/text/wade_caller.asm +++ b/data/phone/text/wade_caller.asm @@ -1,4 +1,4 @@ -WadeAreYouGrowingText: +WadeAreYourMonGrowingText: text "Are your #MON" line "growing?" @@ -17,7 +17,7 @@ WadeAreYouGrowingText: line "it'll get tough." done -UnknownText_0x175869: +WadeDefeatedMonText: text "Oh yeah, we KO'd a" line "wild @" text_ram wStringBuffer4 @@ -32,7 +32,7 @@ UnknownText_0x175869: line "the poor thing." done -UnknownText_0x1758e4: +WadeLostAMonText: text "Oh yeah, a wild" line "@" text_ram wStringBuffer4 @@ -51,7 +51,7 @@ UnknownText_0x1758e4: line "had it." done -UnknownText_0x175976: +WadeBattleRematchText: text "Do you feel like a" line "#MON battle?" @@ -67,7 +67,7 @@ UnknownText_0x175976: line "you get there." done -UnknownText_0x1759e7: +WadeHangUpText: text "See you later!" done @@ -85,7 +85,7 @@ WadeBugCatchingContestText: line "up my mind." done -WadeFoundBerryText: +WadeFoundItemText: text "I found all kinds" line "of BERRIES. If you" @@ -98,7 +98,7 @@ WadeFoundBerryText: text "." done -UnknownText_0x175abe: +WadeNoBerriesText: text "Huh? BERRIES?" para "Sorry, I haven't" @@ -109,7 +109,7 @@ UnknownText_0x175abe: cont "please wait?" done -UnknownText_0x175b1e: +WadeQuickBattleText: text "Let's battle" line "already!" @@ -122,7 +122,7 @@ UnknownText_0x175b1e: line "soon as you can!" done -UnknownText_0x175b6d: +WadeComeQuickText: text "How come you're" line "not here yet?" diff --git a/data/phone/text/wilton_callee.asm b/data/phone/text/wilton_callee.asm index 2d9dd1813..beed917e1 100644 --- a/data/phone/text/wilton_callee.asm +++ b/data/phone/text/wilton_callee.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b71d5: +WiltonAnswerPhoneText: text "Hello, you have" line "reached @" text_ram wStringBuffer3 @@ -7,7 +7,7 @@ UnknownText_0x1b71d5: para "Ah, <PLAY_G>." done -UnknownText_0x1b71fc: +WiltonAnswerPhoneDayText: text "Hello, you have" line "reached @" text_ram wStringBuffer3 @@ -17,7 +17,7 @@ UnknownText_0x1b71fc: line "it?" done -UnknownText_0x1b722a: +WiltonAnswerPhoneNiteText: text "Hello, you have" line "reached @" text_ram wStringBuffer3 @@ -27,7 +27,7 @@ UnknownText_0x1b722a: line "<PLAY_G>." done -UnknownText_0x1b725c: +WiltonGreetText: text "Ah, it's @" text_ram wStringBuffer3 text "…" @@ -36,7 +36,7 @@ UnknownText_0x1b725c: line "moment?" done -UnknownText_0x1b7283: +WiltonGreetDayText: text "Ah, it's @" text_ram wStringBuffer3 text "…" @@ -44,7 +44,7 @@ UnknownText_0x1b7283: para "Can you talk now?" done -UnknownText_0x1b72a5: +WiltonGreetNiteText: text "Ah, it's @" text_ram wStringBuffer3 text "…" @@ -53,7 +53,7 @@ UnknownText_0x1b72a5: line "so late." done -UnknownText_0x1b72d0: +WiltonGenericText: text "Have your #MON" line "grown any?" diff --git a/data/phone/text/wilton_caller.asm b/data/phone/text/wilton_caller.asm index 9e95e95d6..661e3f3c7 100644 --- a/data/phone/text/wilton_caller.asm +++ b/data/phone/text/wilton_caller.asm @@ -1,4 +1,4 @@ -WiltonGrownText: +WiltonMonHasGrownText: text "My @" text_ram wStringBuffer4 text "'s" @@ -8,7 +8,7 @@ WiltonGrownText: line "have improved too!" done -UnknownText_0x66b3e: +WiltonDefeatedMonText: text "We beat a wild" line "@" text_ram wStringBuffer4 @@ -21,7 +21,7 @@ UnknownText_0x66b3e: line "#MON." done -UnknownText_0x66b8f: +WiltonLostAMonText: text "But a while back," line "we came this close" @@ -34,7 +34,7 @@ UnknownText_0x66b8f: line "huge. Believe me." done -UnknownText_0x66bf3: +WiltonBattleRematchText: text "I'm fishing on" line "@" text_ram wStringBuffer5 @@ -48,11 +48,11 @@ UnknownText_0x66bf3: cont "over for a battle." done -UnknownText_0x66c58: +WiltonHangUpText: text "All right, later." done -UnknownText_0x66c6b: +WiltonFoundItemText: text "I snagged an item" line "while fishing." diff --git a/data/text/battle.asm b/data/text/battle.asm index 722c3e289..39554bf61 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -819,7 +819,7 @@ SubFadedText: line "SUBSTITUTE faded!" prompt -LearnedMoveText: +MimicLearnedMoveText: text "<USER>" line "learned" cont "@" diff --git a/data/text/common_1.asm b/data/text/common_1.asm index 5c3686350..a2dbbdb3e 100644 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm @@ -153,7 +153,7 @@ _CardFolderOpenText:: text "CARD FOLDER open.@" text_end -_OakTimeText1:: +_OakTimeWokeUpText:: text "<……><……><……><……><……><……>" line "<……><……><……><……><……><……>" @@ -164,55 +164,57 @@ _OakTimeText1:: line "clock for me?" prompt -_OakTimeText2:: +_OakTimeWhatTimeIsItText:: text "What time is it?" done -_OakTimeText3:: +_OakTimeWhatHoursText:: text "What?@" text_end -_OakTimeText4:: +_OakTimeHoursQuestionMarkText:: text "?" done -_OakTimeText5:: +_OakTimeHowManyMinutesText:: text "How many minutes?" done -_OakTimeText6:: +_OakTimeWhoaMinutesText:: text "Whoa!@" text_end -_OakTimeText7:: +_OakTimeMinutesQuestionMarkText:: text "?" done -_OakTimeText8:: +_OakTimeOversleptText:: text "!" line "I overslept!" done -_OakTimeText11:: +_OakTimeYikesText:: text "!" line "Yikes! I over-" cont "slept!" done -_OakTimeText12:: +_OakTimeSoDarkText:: text "!" line "No wonder it's so" cont "dark!" done -_OakTimeText13:: +_OakTimeWhatDayIsItText:: text "What day is it?" done -_OakTimeText14:: +_OakTimeIsItText:: text ", is it?" done +; Mobile Adapter + UnknownText_0x1bc384:: text "There is nothing" line "connected." @@ -258,6 +260,8 @@ UnknownText_0x1bc44c:: line "ID no." done +; Mobile Adapter End + UnknownText_0x1bc45e:: text "Enter the" line "amount." @@ -345,38 +349,38 @@ _LookGiantDecoText:: line "fluffy and cuddly." done -_MomShoppingText1:: +_MomHiHowAreYouText:: text "Hi, <PLAYER>!" line "How are you?" prompt -_MomShoppingText2:: +_MomFoundAnItemText:: text "I found a useful" line "item shopping, so" prompt -_MomShoppingText3:: +_MomBoughtWithYourMoneyText:: text "I bought it with" line "your money. Sorry!" prompt -_MomShoppingText4:: +_MomItsInPCText:: text "It's in your PC." line "You'll like it!" done -_MomShoppingText5:: +_MomFoundADollText:: text "While shopping" line "today, I saw this" cont "adorable doll, so" prompt -_MomShoppingText6:: +_MomItsInYourRoomText:: text "It's in your room." line "You'll love it!" done -_TradingText1:: +_MonWasSentToText:: text_ram wPlayerTrademonSpeciesName text " was" line "sent to @" @@ -384,29 +388,29 @@ _TradingText1:: text "." done -_TradingText2:: +_MonNameSentToText:: text_start done -_TradingText3:: +_BidsFarewellToMonText:: text_ram wOTTrademonSenderName text " bids" line "farewell to" done -_TradingText4:: +_MonNameBidsFarewellText:: text_ram wOTTrademonSpeciesName text "." done -_TradingText5:: +_TakeGoodCareOfMonText:: text "Take good care of" line "@" text_ram wOTTrademonSpeciesName text "." done -_TradingText6:: +_ForYourMonSendsText:: text "For @" text_ram wPlayerTrademonSenderName text "'s" @@ -415,7 +419,7 @@ _TradingText6:: text "," done -_TradingText7:: +_OTSendsText:: text_ram wOTTrademonSenderName text " sends" line "@" @@ -423,7 +427,7 @@ _TradingText7:: text "." done -_TradingText8:: +_WillTradeText:: text_ram wOTTrademonSenderName text " will" line "trade @" @@ -432,7 +436,7 @@ _TradingText8:: text_end ; unused -_TradingText9:: +_ForYourMonWillTradeText:: text "for @" text_ram wPlayerTrademonSenderName text "'s" @@ -441,7 +445,7 @@ _TradingText9:: text "." done -_TradingText10:: +_MobilePlayerWillTradeMonText:: text_ram wPlayerTrademonSenderName text " will" line "trade @" @@ -450,7 +454,7 @@ _TradingText10:: text_end ; unused -_TradingText11:: +_MobileForPartnersMonText:: text "for @" text_ram wOTTrademonSenderName text "'s" @@ -459,7 +463,8 @@ _TradingText11:: text "." done -_TradingText12:: +; unused +_MobilePlayersMonTradeText:: text_ram wPlayerTrademonSenderName text "'s" line "@" @@ -467,14 +472,14 @@ _TradingText12:: text " trade…" done -_TradingText13:: +_MobileTakeGoodCareOfMonText:: text "Take good care of" line "@" text_ram wOTTrademonSpeciesName text "." done -_TradingText14:: +_MobilePlayersMonTrade2Text:: text_ram wPlayerTrademonSenderName text "'s" line "@" @@ -482,14 +487,14 @@ _TradingText14:: text " trade…" done -_TradingText15:: +_MobileTakeGoodCareOfText:: text "Take good care of" line "@" text_ram wOTTrademonSpeciesName text "." done -_TradingText16:: +_MobileTradeCameBackText:: text_ram wOTTrademonSpeciesName text " came" line "back!" @@ -539,162 +544,162 @@ _OPT_MaryText1:: text "'s" done -OPT_SweetAdorably:: +_OPT_SweetAdorablyText:: text_start line "sweet and adorably" done -OPT_WigglySlickly:: +_OPT_WigglySlicklyText:: text_start line "wiggly and slickly" done -OPT_AptlyNamed:: +_OPT_AptlyNamedText:: text_start line "aptly named and" done -OPT_UndeniablyKindOf:: +_OPT_UndeniablyKindOfText:: text_start line "undeniably kind of" done -OPT_Unbearably:: +_OPT_UnbearablyText:: text_start line "so, so unbearably" done -OPT_WowImpressively:: +_OPT_WowImpressivelyText:: text_start line "wow, impressively" done -OPT_AlmostPoisonously:: +_OPT_AlmostPoisonouslyText:: text_start line "almost poisonously" done -OPT_Sensually:: +_OPT_SensuallyText:: text_start line "ooh, so sensually" done -OPT_Mischievously:: +_OPT_MischievouslyText:: text_start line "so mischievously" done -OPT_Topically:: +_OPT_TopicallyText:: text_start line "so very topically" done -OPT_Addictively:: +_OPT_AddictivelyText:: text_start line "sure addictively" done -OPT_LooksInWater:: +_OPT_LooksInWaterText:: text_start line "looks in water is" done -OPT_EvolutionMustBe:: +_OPT_EvolutionMustBeText:: text_start line "evolution must be" done -OPT_Provocatively:: +_OPT_ProvocativelyText:: text_start line "provocatively" done -OPT_FlippedOut:: +_OPT_FlippedOutText:: text_start line "so flipped out and" done -OPT_HeartMeltingly:: +_OPT_HeartMeltinglyText:: text_start line "heart-meltingly" done -OPT_Cute:: +_OPT_CuteText:: text_start line "cute." done -OPT_Weird:: +_OPT_WeirdText:: text_start line "weird." done -OPT_Pleasant:: +_OPT_PleasantText:: text_start line "pleasant." done -OPT_BoldSortOf:: +_OPT_BoldSortOfText:: text_start line "bold, sort of." done -OPT_Frightening:: +_OPT_FrighteningText:: text_start line "frightening." done -OPT_SuaveDebonair:: +_OPT_SuaveDebonairText:: text_start line "suave & debonair!" done -OPT_Powerful:: +_OPT_PowerfulText:: text_start line "powerful." done -OPT_Exciting:: +_OPT_ExcitingText:: text_start line "exciting." done -OPT_Groovy:: +_OPT_GroovyText:: text_start line "groovy!" done -OPT_Inspiring:: +_OPT_InspiringText:: text_start line "inspiring." done -OPT_Friendly:: +_OPT_FriendlyText:: text_start line "friendly." done -OPT_HotHotHot:: +_OPT_HotHotHotText:: text_start line "hot, hot, hot!" done -OPT_Stimulating:: +_OPT_StimulatingText:: text_start line "stimulating." done -OPT_Guarded:: +_OPT_GuardedText:: text_start line "guarded." done -OPT_Lovely:: +_OPT_LovelyText:: text_start line "lovely." done -OPT_Speedy:: +_OPT_SpeedyText:: text_start line "speedy." done @@ -862,82 +867,82 @@ _PnP_Text4:: text_end ; unused -_PnP_cute:: +_PnP_CuteText:: text_start line "is cute." done -_PnP_lazy:: +_PnP_LazyText:: text_start line "is sort of lazy." done -_PnP_happy:: +_PnP_HappyText:: text_start line "is always happy." done -_PnP_noisy:: +_PnP_NoisyText:: text_start line "is quite noisy." done -_PnP_precocious:: +_PnP_PrecociousText:: text_start line "is precocious." done -_PnP_bold:: +_PnP_BoldText:: text_start line "is somewhat bold." done -_PnP_picky:: +_PnP_PickyText:: text_start line "is too picky!" done -_PnP_sortofok:: +_PnP_SortOfOKText:: text_start line "is sort of OK." done -_PnP_soso:: +_PnP_SoSoText:: text_start line "is just so-so." done -_PnP_great:: +_PnP_GreatText:: text_start line "is actually great." done -_PnP_mytype:: +_PnP_MyTypeText:: text_start line "is just my type." done -_PnP_cool:: +_PnP_CoolText:: text_start line "is so cool, no?" done -_PnP_inspiring:: +_PnP_InspiringText:: text_start line "is inspiring!" done -_PnP_weird:: +_PnP_WeirdText:: text_start line "is kind of weird." done -_PnP_rightforme:: +_PnP_RightForMeText:: text_start line "is right for me?" done -_PnP_odd:: +_PnP_OddText:: text_start line "is definitely odd!" done @@ -1098,7 +1103,7 @@ _BuenaOffTheAirText:: line "" done -Text_EnemyWithdrew:: +_EnemyWithdrewText:: text "<ENEMY>" line "withdrew" cont "@" @@ -1106,7 +1111,7 @@ Text_EnemyWithdrew:: text "!" prompt -Text_EnemyUsedOn:: +_EnemyUsedOnText:: text "<ENEMY>" line "used @" text_ram wMonOrItemNameBuffer @@ -1280,17 +1285,17 @@ UnknownText_0x1bd2a0:: line "VOLTORBBADGE!" done -UnknownText_0x1bd2bc:: +_AskFloorElevatorText:: text "Which floor?" done -UnknownText_0x1bd2ca:: +_BugCatchingContestTimeUpText:: text "ANNOUNCER: BEEEP!" para "Time's up!" done -UnknownText_0x1bd2e7:: +_BugCatchingContestIsOverText:: text "ANNOUNCER: The" line "Contest is over!" done @@ -1352,12 +1357,12 @@ _NoCoinCaseText:: line "COIN CASE." prompt -UnknownText_0x1bd407:: +_NPCTradeCableText:: text "OK, connect the" line "Game Link Cable." prompt -UnknownText_0x1bd429:: +Text_NPCTraded:: text "<PLAYER> traded" line "@" text_ram wMonOrItemNameBuffer @@ -1367,7 +1372,7 @@ UnknownText_0x1bd429:: text ".@" text_end -UnknownText_0x1bd445:: +_NPCTradeFanfareText:: sound_dex_fanfare_80_109 text_pause text_end @@ -1408,7 +1413,7 @@ _NPCTradeCompleteText1:: cont "Thanks!" done -_NPCTradeAFterText1:: +_NPCTradeAfterText1:: text "Hi, how's my old" line "@" text_ram wStringBuffer2 @@ -1571,7 +1576,7 @@ _MomLeavingText3:: para "Now, go on!" done -_MomVisitingText1:: +_MomIsThisAboutYourMoneyText:: text "Hi! Welcome home!" line "You're trying very" cont "hard, I see." @@ -1583,47 +1588,47 @@ _MomVisitingText1:: line "your money?" done -_MomVisitingText2:: +_MomBankWhatDoYouWantToDoText:: text "What do you want" line "to do?" done -_MomVisitingText3:: +_MomStoreMoneyText:: text "How much do you" line "want to save?" done -_MomVisitingText4:: +_MomTakeMoneyText:: text "How much do you" line "want to take?" done -_MomVisitingText5:: +_MomSaveMoneyText:: text "Do you want to" line "save some money?" done -_MomVisitingText6:: +_MomHaventSavedThatMuchText:: text "You haven't saved" line "that much." prompt -_MomVisitingText7:: +_MomNotEnoughRoomInWalletText:: text "You can't take" line "that much." prompt -_MomVisitingText8:: +_MomInsufficientFundsInWalletText:: text "You don't have" line "that much." prompt -_MomVisitingText9:: +_MomNotEnoughRoomInBankText:: text "You can't save" line "that much." prompt -_MomVisitingText10:: +_MomStartSavingMoneyText:: text "OK, I'll save your" line "money. Trust me!" @@ -1631,17 +1636,17 @@ _MomVisitingText10:: line "with it!" done -_MomVisitingText11:: +_MomStoredMoneyText:: text "Your money's safe" line "here! Get going!" done -_MomVisitingText12:: +_MomTakenMoneyText:: text "<PLAYER>, don't" line "give up!" done -_MomVisitingText13:: +_MomJustDoWhatYouCanText:: text "Just do what" line "you can." done @@ -1712,7 +1717,7 @@ _OnlyOneMonText:: line "just one #MON." prompt -_CantRaiseEggText:: +_CantAcceptEggText:: text "Sorry, but I can't" line "accept an EGG." prompt @@ -1796,7 +1801,7 @@ _HaveNoRoomText:: line "for it." prompt -_DCNotEnoughMoneyText:: +_NotEnoughMoneyText:: text "You don't have" line "enough money." prompt @@ -1842,7 +1847,7 @@ _TakeGoodCareOfEggText:: line "it." done -_RefuseEggText:: +_IllKeepItThanksText:: text "Well then, I'll" line "keep it. Thanks!" done @@ -1859,7 +1864,7 @@ _WhichMonPhotoText:: cont "graph?" prompt -_HoldOnText:: +_HoldStillText:: text "All righty. Hold" line "still for a bit." prompt diff --git a/data/text/common_2.asm b/data/text/common_2.asm index 29f5dc0bb..0e66d1be3 100644 --- a/data/text/common_2.asm +++ b/data/text/common_2.asm @@ -1,14 +1,14 @@ -UnknownText_0x1c0000:: +_NoPhotoText:: text "Oh, no picture?" line "Come again, OK?" done -UnknownText_0x1c0021:: +_EggPhotoText:: text "An EGG? My talent" line "is worth more…" done -UnknownText_0x1c0043:: +_NameRaterHelloText:: text "Hello, hello! I'm" line "the NAME RATER." @@ -19,13 +19,13 @@ UnknownText_0x1c0043:: line "to rate names?" done -UnknownText_0x1c00a0:: +_NameRaterWhichMonText:: text "Which #MON's" line "nickname should I" cont "rate for you?" prompt -UnknownText_0x1c00cd:: +_NameRaterBetterNameText:: text "Hm… @" text_ram wStringBuffer1 text "…" @@ -40,25 +40,25 @@ UnknownText_0x1c00cd:: line "a better name?" done -UnknownText_0x1c0142:: +_NameRaterWhatNameText:: text "All right. What" line "name should we" cont "give it, then?" prompt -UnknownText_0x1c0171:: +_NameRaterFinishedText:: text "That's a better" line "name than before!" para "Well done!" done -UnknownText_0x1c019e:: +_NameRaterComeAgainText:: text "OK, then. Come" line "again sometime." done -UnknownText_0x1c01be:: +_NameRaterPerfectNameText:: text "Hm… @" text_ram wStringBuffer1 text "?" @@ -71,12 +71,12 @@ UnknownText_0x1c01be:: line "with loving care." done -UnknownText_0x1c0208:: +_NameRaterEggText:: text "Whoa… That's just" line "an EGG." done -UnknownText_0x1c0222:: +_NameRaterSameNameText:: text "It might look the" line "same as before," @@ -86,7 +86,7 @@ UnknownText_0x1c0222:: para "Well done!" done -UnknownText_0x1c0272:: +_NameRaterNamedText:: text "All right. This" line "#MON is now" cont "named @" @@ -99,7 +99,7 @@ Text_Gained:: text " gained@" text_end -Text_ABoostedStringBuffer2ExpPoints:: +_BoostedExpPointsText:: text_start line "a boosted" cont "@" @@ -107,7 +107,7 @@ Text_ABoostedStringBuffer2ExpPoints:: text " EXP. Points!" prompt -Text_StringBuffer2ExpPoints:: +_ExpPointsText:: text_start line "@" text_decimal wStringBuffer2, 2, 4 @@ -132,7 +132,7 @@ Text_YourFoesWeakGetmMon:: line "Get'm, @" text_end -Text_BattleMonNick01:: +_BattleMonNicknameText:: text_ram wBattleMonNick text "!" done @@ -142,35 +142,35 @@ Text_BattleMonNickComma:: text ",@" text_end -Text_ThatsEnoughComeBack:: +_ThatsEnoughComeBackText:: text " that's" line "enough! Come back!@" text_end -Text_OKComeBack:: +_OKComeBackText:: text " OK!" line "Come back!@" text_end -Text_GoodComeBack:: +_GoodComeBackText:: text " good!" line "Come back!@" text_end -Text_ComeBack:: +_ComeBackText:: text " come" line "back!" done -UnknownText_0x1c0373:: +_BootedTMText:: text "Booted up a TM." prompt -UnknownText_0x1c0384:: +_BootedHMText:: text "Booted up an HM." prompt -UnknownText_0x1c0396:: +_ContainedMoveText:: text "It contained" line "@" text_ram wStringBuffer2 @@ -182,7 +182,7 @@ UnknownText_0x1c0396:: line "to a #MON?" done -UnknownText_0x1c03c2:: +_TMHMNotCompatibleText:: text_ram wStringBuffer2 text " is" line "not compatible" @@ -196,7 +196,7 @@ UnknownText_0x1c03c2:: text "." prompt -UnknownText_0x1c03fa:: +_NoRoomTMHMText:: text "You have no room" line "for any more" cont "@" @@ -204,44 +204,44 @@ UnknownText_0x1c03fa:: text "S." prompt -UnknownText_0x1c0421:: +_ReceivedTMHMText:: text "You received" line "@" text_ram wStringBuffer1 text "!" prompt -UnknownText_0x1c0436:: +_MysteryGiftCanceledText:: text "The link has been" line "cancelled." prompt -UnknownText_0x1c0454:: +_MysteryGiftCommErrorText:: text "Communication" line "error." prompt -UnknownText_0x1c046a:: +_RetrieveMysteryGiftText:: text "Must retrieve GIFT" line "at #MON CENTER." prompt -UnknownText_0x1c048e:: +_YourFriendIsNotReadyText:: text "Your friend isn't" line "ready." prompt -UnknownText_0x1c04a7:: +_MysteryGiftFiveADayText:: text "Sorry--only five" line "GIFTS a day." prompt -UnknownText_0x1c04c6:: +_MysteryGiftOneADayText:: text "Sorry. One GIFT" line "a day per person." prompt -UnknownText_0x1c04e9:: +_MysteryGiftSentText:: text_ram wMysteryGiftPartnerName text " sent" line "@" @@ -249,7 +249,7 @@ UnknownText_0x1c04e9:: text "." prompt -UnknownText_0x1c04fa:: +_MysteryGiftSentHomeText:: text_ram wMysteryGiftPartnerName text " sent" line "@" @@ -260,14 +260,14 @@ UnknownText_0x1c04fa:: text "'s home." prompt -UnknownText_0x1c051a:: +_MysteryGiftReceivedCardText:: text "Received" line "@" text_ram wc850 text "'s CARD." prompt -UnknownText_0x1c0531:: +_MysteryGiftListedCardText:: text_ram wc850 text "'s CARD was" line "listed as no.@" @@ -275,17 +275,17 @@ UnknownText_0x1c0531:: text "." prompt -UnknownText_0x1c0555:: +_MysteryGiftNotRegisteredCardText:: text "The CARD was not" line "registered." prompt -UnknownText_0x1c0573:: +_MysteryGiftLinkCancelledText:: text "The link has been" line "cancelled." prompt -UnknownText_0x1c0591:: +_MysteryGiftLinkCommErrorText:: text "Communication" line "error." prompt @@ -295,23 +295,23 @@ _BadgeRequiredText:: line "is required." prompt -UnknownText_0x1c05c8:: +_CantUseItemText:: text "Can't use that" line "here." prompt -UnknownText_0x1c05dd:: +_UseCutText:: text_ram wStringBuffer2 text " used" line "CUT!" prompt -UnknownText_0x1c05ec:: +_CutNothingText:: text "There's nothing to" line "CUT here." prompt -UnknownText_0x1c0609:: +_BlindingFlashText:: text "A blinding FLASH" line "lights the area!@" text_waitbutton @@ -340,68 +340,68 @@ _AskSurfText:: line "Want to SURF?" done -UnknownText_0x1c068e:: +_UseWaterfallText:: text_ram wStringBuffer2 text " used" line "WATERFALL!" done -UnknownText_0x1c06a3:: +_HugeWaterfallText:: text "Wow, it's a huge" line "waterfall." done -UnknownText_0x1c06bf:: +_AskWaterfallText:: text "Do you want to use" line "WATERFALL?" done -UnknownText_0x1c06de:: +_UseDigText:: text_ram wStringBuffer2 text " used" line "DIG!" done -UnknownText_0x1c06ed:: +_UseEscapeRopeText:: text "<PLAYER> used an" line "ESCAPE ROPE." done -UnknownText_0x1c0705:: +_CantUseDigText:: text "Can't use that" line "here." done -UnknownText_0x1c071a:: +_TeleportReturnText:: text "Return to the last" line "#MON CENTER." done -UnknownText_0x1c073b:: +_CantUseTeleportText:: text "Can't use that" line "here." para "" done -UnknownText_0x1c0751:: +_AlreadyUsingStrengthText:: text "A #MON is using" line "STRENGTH already." prompt -UnknownText_0x1c0774:: +_UseStrengthText:: text_ram wStringBuffer2 text " used" line "STRENGTH!" done -UnknownText_0x1c0788:: +_MoveBoulderText:: text_ram wStringBuffer1 text " can" line "move boulders." prompt -UnknownText_0x1c07a0:: +_AskStrengthText:: text "A #MON may be" line "able to move this." @@ -409,23 +409,23 @@ UnknownText_0x1c07a0:: line "STRENGTH?" done -UnknownText_0x1c07d8:: +_BouldersMoveText:: text "Boulders may now" line "be moved!" done -UnknownText_0x1c07f4:: +_BouldersMayMoveText:: text "A #MON may be" line "able to move this." done -UnknownText_0x1c0816:: +_UseWhirlpoolText:: text_ram wStringBuffer2 text " used" line "WHIRLPOOL!" prompt -UnknownText_0x1c082b:: +_MayPassWhirlpoolText:: text "It's a vicious" line "whirlpool!" @@ -433,7 +433,7 @@ UnknownText_0x1c082b:: line "able to pass it." done -UnknownText_0x1c0864:: +_AskWhirlpoolText:: text "A whirlpool is in" line "the way." @@ -441,17 +441,17 @@ UnknownText_0x1c0864:: line "WHIRLPOOL?" done -UnknownText_0x1c0897:: +_UseHeadbuttText:: text_ram wStringBuffer2 text " did a" line "HEADBUTT!" prompt -UnknownText_0x1c08ac:: +_HeadbuttNothingText:: text "Nope. Nothing…" done -UnknownText_0x1c08bc:: +_AskHeadbuttText:: text "A #MON could be" line "in this tree." @@ -459,18 +459,18 @@ UnknownText_0x1c08bc:: line "it?" done -UnknownText_0x1c08f0:: +_UseRockSmashText:: text_ram wStringBuffer2 text " used" line "ROCK SMASH!" prompt -UnknownText_0x1c0906:: +_MaySmashText:: text "Maybe a #MON" line "can break this." done -UnknownText_0x1c0924:: +_AskRockSmashText:: text "This rock looks" line "breakable." @@ -478,65 +478,66 @@ UnknownText_0x1c0924:: line "SMASH?" done -UnknownText_0x1c0958:: +_RodBiteText:: text "Oh!" line "A bite!" prompt -UnknownText_0x1c0965:: +_RodNothingText:: text "Not even a nibble!" prompt -UnknownText_0x1c0979:: +; unused +_UnusedNothingHereText:: text "Looks like there's" line "nothing here." prompt -UnknownText_0x1c099a:: +_CantGetOffBikeText:: text "You can't get off" line "here!" done -UnknownText_0x1c09b2:: +_GotOnBikeText:: text "<PLAYER> got on the" line "@" text_ram wStringBuffer2 text "." done -UnknownText_0x1c09c7:: +_GotOffBikeText:: text "<PLAYER> got off" line "the @" text_ram wStringBuffer2 text "." done -UnknownText_0x1c09dd:: +_AskCutText:: text "This tree can be" line "CUT!" para "Want to use CUT?" done -UnknownText_0x1c0a05:: +_CanCutText:: text "This tree can be" line "CUT!" done -UnknownText_0x1c0a1c:: +_FoundItemText:: text "<PLAYER> found" line "@" text_ram wStringBuffer3 text "!" done -UnknownText_0x1c0a2c:: +_CantCarryItemText:: text "But <PLAYER> can't" line "carry any more" cont "items." done -UnknownText_0x1c0a4e:: +_WhitedOutText:: text "<PLAYER> is out of" line "useable #MON!" @@ -544,24 +545,24 @@ UnknownText_0x1c0a4e:: line "out!" done -UnknownText_0x1c0a77:: +_ItemfinderItemNearbyText:: text "Yes! ITEMFINDER" line "indicates there's" cont "an item nearby." prompt -UnknownText_0x1c0aa9:: +_ItemfinderNopeText:: text "Nope! ITEMFINDER" line "isn't responding." prompt -UnknownText_0x1c0acc:: +_PoisonFaintText:: text_ram wStringBuffer3 text_start line "fainted!" prompt -UnknownText_0x1c0ada:: +_PoisonWhiteoutText:: text "<PLAYER> is out of" line "useable #MON!" @@ -569,18 +570,18 @@ UnknownText_0x1c0ada:: line "out!" prompt -UnknownText_0x1c0b03:: +_UseSweetScentText:: text_ram wStringBuffer3 text " used" line "SWEET SCENT!" done -UnknownText_0x1c0b1a:: +_SweetScentNothingText:: text "Looks like there's" line "nothing here…" done -UnknownText_0x1c0b3b:: +_SquirtbottleNothingText:: text "<PLAYER> sprinkled" line "water." @@ -588,26 +589,26 @@ UnknownText_0x1c0b3b:: line "happened…" done -UnknownText_0x1c0b65:: +_UseSacredAshText:: text "<PLAYER>'s #MON" line "were all healed!" done -Text_AnEGGCantHoldAnItem:: +_AnEggCantHoldAnItemText:: text "An EGG can't hold" line "an item." prompt -UnknownText_0x1c0b9a:: +_PackNoItemText:: text "No items." done -UnknownText_0x1c0ba5:: +_AskThrowAwayText:: text "Throw away how" line "many?" done -UnknownText_0x1c0bbb:: +_AskQuantityThrowAwayText:: text "Throw away @" text_decimal wItemQuantityChangeBuffer, 1, 2 text_start @@ -616,56 +617,56 @@ UnknownText_0x1c0bbb:: text "(S)?" done -UnknownText_0x1c0bd8:: +_ThrewAwayText:: text "Threw away" line "@" text_ram wStringBuffer2 text "(S)." prompt -UnknownText_0x1c0bee:: +_OakThisIsntTheTimeText:: text "OAK: <PLAYER>!" line "This isn't the" cont "time to use that!" prompt -Text_YouDontHaveAMon:: +_YouDontHaveAMonText:: text "You don't have a" line "#MON!" prompt -UnknownText_0x1c0c2e:: +_RegisteredItemText:: text "Registered the" line "@" text_ram wStringBuffer2 text "." prompt -UnknownText_0x1c0c45:: +_CantRegisterText:: text "You can't register" line "that item." prompt -UnknownText_0x1c0c63:: +_AskItemMoveText:: text "Where should this" line "be moved to?" done -UnknownText_0x1c0c83:: +_PackEmptyText:: text_start done -Text_YouCantUseItInABattle:: +_YouCantUseItInABattleText:: text "You can't use it" line "in a battle." prompt -Text_AreYouABoyOrAreYouAGirl:: +_AreYouABoyOrAreYouAGirlText:: text "Are you a boy?" line "Or are you a girl?" done -UnknownText_0x1c0cc6:: +Text_BattleEffectActivate:: text "<USER>'s" line "@" text_ram wStringBuffer2 @@ -673,16 +674,16 @@ UnknownText_0x1c0cc6:: text_end ; unused -UnknownText_0x1c0cd0:: +_BattleStatWentWayUpText:: text_pause text "<SCROLL>went way up!" prompt -UnknownText_0x1c0ce0:: +_BattleStatWentUpText:: text " went up!" prompt -UnknownText_0x1c0ceb:: +Text_BattleFoeEffectActivate:: text "<TARGET>'s" line "@" text_ram wStringBuffer2 @@ -690,45 +691,45 @@ UnknownText_0x1c0ceb:: text_end ; unused -UnknownText_0x1c0cf5:: +_BattleStatSharplyFellText:: text_pause text "<SCROLL>sharply fell!" prompt -UnknownText_0x1c0d06:: +_BattleStatFellText:: text " fell!" prompt -UnknownText_0x1c0d0e:: +Text_BattleUser:: text "<USER>@" text_end -UnknownText_0x1c0d12:: +_BattleMadeWhirlwindText:: text_start line "made a whirlwind!" prompt -UnknownText_0x1c0d26:: +_BattleTookSunlightText:: text_start line "took in sunlight!" prompt -UnknownText_0x1c0d3a:: +_BattleLoweredHeadText:: text_start line "lowered its head!" prompt -UnknownText_0x1c0d4e:: +_BattleGlowingText:: text_start line "is glowing!" prompt -UnknownText_0x1c0d5c:: +_BattleFlewText:: text_start line "flew up high!" prompt -UnknownText_0x1c0d6c:: +_BattleDugText:: text_start line "dug a hole!" prompt @@ -778,17 +779,17 @@ _EndUsedMove5Text:: text "!" done -UnknownText_0x1c0db0:: +Text_BreedHuh:: text "Huh?" para "@" text_end -UnknownText_0x1c0db8:: +_BreedClearboxText:: text_start done -UnknownText_0x1c0dba:: +_BreedEggHatchText:: text_ram wStringBuffer1 text " came" line "out of its EGG!@" @@ -798,14 +799,14 @@ UnknownText_0x1c0dba:: text_end ; unused -UnknownText_0x1c0dd8:: +_BreedAskNicknameText:: text "Give a nickname to" line "@" text_ram wStringBuffer1 text "?" done -UnknownText_0x1c0df3:: +_LeftWithDayCareLadyText:: text "It's @" text_ram wBreedMon2Nick text_start @@ -813,7 +814,7 @@ UnknownText_0x1c0df3:: cont "the DAY-CARE LADY." done -UnknownText_0x1c0e24:: +_LeftWithDayCareManText:: text "It's @" text_ram wBreedMon1Nick text_start @@ -821,33 +822,33 @@ UnknownText_0x1c0e24:: cont "the DAY-CARE MAN." done -UnknownText_0x1c0e54:: +_BreedBrimmingWithEnergyText:: text "It's brimming with" line "energy." prompt -UnknownText_0x1c0e6f:: +_BreedNoInterestText:: text "It has no interest" line "in @" text_ram wStringBuffer1 text "." prompt -UnknownText_0x1c0e8d:: +_BreedAppearsToCareForText:: text "It appears to care" line "for @" text_ram wStringBuffer1 text "." prompt -UnknownText_0x1c0eac:: +_BreedFriendlyText:: text "It's friendly with" line "@" text_ram wStringBuffer1 text "." prompt -UnknownText_0x1c0ec6:: +_BreedShowsInterestText:: text "It shows interest" line "in @" text_ram wStringBuffer1 @@ -859,44 +860,47 @@ _EmptyMailboxText:: line "here." prompt -ClearedMailPutAwayText:: +_MailClearedPutAwayText:: text "The cleared MAIL" line "was put away." prompt -MailPackFullText:: +_MailPackFullText:: text "The PACK is full." prompt -MailMessageLostText:: +_MailMessageLostText:: text "The MAIL's message" line "will be lost. OK?" done -MailAlreadyHoldingItemText:: +_MailAlreadyHoldingItemText:: text "It's already hold-" line "ing an item." prompt -MailEggText:: +_MailEggText:: text "An EGG can't hold" line "any MAIL." prompt -MailMovedFromBoxText:: +_MailMovedFromBoxText:: text "The MAIL was moved" line "from the MAILBOX." prompt -UnknownText_0x1c0fb3:: +; unused +_YesPromptText:: text "Yes" prompt -UnknownText_0x1c0fb8:: +; unused +_NoPromptText:: text "No" prompt -UnknownText_0x1c0fbc:: +; unused +_AnimationTypeText:: text_decimal wcf64, 1, 3 text " @" text_ram wStringBuffer1 @@ -907,26 +911,27 @@ UnknownText_0x1c0fbc:: text_end ; unused -UnknownText_0x1c0fdd:: +; unused +_MonNumberText:: text "#MON number?" done -Text_WasSentToBillsPC:: +_WasSentToBillsPCText:: text_ram wStringBuffer1 text " was" line "sent to BILL's PC." prompt -UnknownText_0x1c1006:: +_PCGottaHavePokemonText:: text "You gotta have" line "#MON to call!" prompt -UnknownText_0x1c1024:: +_PCWhatText:: text "What?" done -UnknownText_0x1c102b:: +_PCMonHoldingMailText:: text "There is a #MON" line "holding MAIL." @@ -934,39 +939,39 @@ UnknownText_0x1c102b:: line "MAIL." prompt -UnknownText_0x1c1062:: +_PCNoSingleMonText:: text "You don't have a" line "single #MON!" prompt -UnknownText_0x1c1080:: +_PCCantDepositLastMonText:: text "You can't deposit" line "your last #MON!" prompt -UnknownText_0x1c10a2:: +_PCCantTakeText:: text "You can't take any" line "more #MON." prompt -UnknownText_0x1c10c0:: +_ContestCaughtMonText:: text "Caught @" text_ram wStringBuffer1 text "!" prompt -UnknownText_0x1c10cf:: +_ContestAskSwitchText:: text "Switch #MON?" done -UnknownText_0x1c10dd:: +_ContestAlreadyCaughtText:: text "You already caught" line "a @" text_ram wStringBuffer1 text "." prompt -ContestJudging_FirstPlaceText:: +_ContestJudging_FirstPlaceText:: text "This Bug-Catching" line "Contest winner is@" text_pause @@ -981,7 +986,7 @@ ContestJudging_FirstPlaceText:: text "!@" text_end -ContestJudging_FirstPlaceScoreText:: +_ContestJudging_FirstPlaceScoreText:: text_start para "The winning score" @@ -990,7 +995,7 @@ ContestJudging_FirstPlaceScoreText:: text " points!" prompt -ContestJudging_SecondPlaceText:: +_ContestJudging_SecondPlaceText:: text "Placing second was" line "@" text_ram wBugContestWinnerName @@ -1002,7 +1007,7 @@ ContestJudging_SecondPlaceText:: text "!@" text_end -ContestJudging_SecondPlaceScoreText:: +_ContestJudging_SecondPlaceScoreText:: text_start para "The score was" @@ -1011,7 +1016,7 @@ ContestJudging_SecondPlaceScoreText:: text " points!" prompt -ContestJudging_ThirdPlaceText:: +_ContestJudging_ThirdPlaceText:: text "Placing third was" line "@" text_ram wBugContestWinnerName @@ -1023,7 +1028,7 @@ ContestJudging_ThirdPlaceText:: text "!@" text_end -ContestJudging_ThirdPlaceScoreText:: +_ContestJudging_ThirdPlaceScoreText:: text_start para "The score was" @@ -1032,7 +1037,7 @@ ContestJudging_ThirdPlaceScoreText:: text " points!" prompt -UnknownText_0x1c1203:: +_MagikarpGuruMeasureText:: text "Let me measure" line "that MAGIKARP." @@ -1042,7 +1047,7 @@ UnknownText_0x1c1203:: text "." prompt -UnknownText_0x1c123a:: +_KarpGuruRecordText:: text "CURRENT RECORD" para "@" @@ -1055,7 +1060,7 @@ UnknownText_0x1c123a:: text_end ; unused -UnknownText_0x1c1261:: +_LuckyNumberMatchPartyText:: text "Congratulations!" para "We have a match" @@ -1067,7 +1072,7 @@ UnknownText_0x1c1261:: line "your party." prompt -UnknownText_0x1c12ae:: +_LuckyNumberMatchPCText:: text "Congratulations!" para "We have a match" @@ -1079,7 +1084,7 @@ UnknownText_0x1c12ae:: line "your PC BOX." prompt -UnknownText_0x1c12fc:: +_CaughtAskNicknameText:: text "Give a nickname to" line "the @" text_ram wStringBuffer1 @@ -1087,18 +1092,18 @@ UnknownText_0x1c12fc:: cont "received?" done -UnknownText_0x1c1328:: +_PokecenterPCCantUseText:: text "Bzzzzt! You must" line "have a #MON to" cont "use this!" prompt -UnknownText_0x1c1353:: +_PlayersPCTurnOnText:: text "<PLAYER> turned on" line "the PC." prompt -UnknownText_0x1c1368:: +_PlayersPCAskWhatDoText:: text "What do you want" line "to do?" done @@ -1122,7 +1127,7 @@ _PlayersPCNoRoomWithdrawText:: line "for more items." prompt -UnknownText_0x1c13df:: +_PlayersPCNoItemsText:: text "No items here!" prompt @@ -1145,16 +1150,16 @@ _PlayersPCNoRoomDepositText:: line "store items." prompt -UnknownText_0x1c144d:: +_PokecenterPCTurnOnText:: text "<PLAYER> turned on" line "the PC." prompt -UnknownText_0x1c1462:: +_PokecenterPCWhoseText:: text "Access whose PC?" done -UnknownText_0x1c1474:: +_PokecenterBillsPCText:: text "BILL's PC" line "accessed." @@ -1162,14 +1167,14 @@ UnknownText_0x1c1474:: line "System opened." prompt -UnknownText_0x1c14a4:: +_PokecenterPlayersPCText:: text "Accessed own PC." para "Item Storage" line "System opened." prompt -UnknownText_0x1c14d2:: +_PokecenterOaksPCText:: text "PROF.OAK's PC" line "accessed." @@ -1177,7 +1182,7 @@ UnknownText_0x1c14d2:: line "System opened." prompt -UnknownText_0x1c1505:: +_PokecenterPCOaksClosedText:: text "…" line "Link closed…" done @@ -1347,7 +1352,8 @@ _OakPCText4:: line "OAK's PC closed." done -UnknownText_0x1c19cd:: +; unused +_TrainerRankingExplanationText:: text "Triple-theme" line "trainer ranking!" @@ -1358,7 +1364,8 @@ UnknownText_0x1c19cd:: para "" done -UnknownText_0x1c1a22:: +; unused +_TrainerRankingNoDataText:: text "There is no" line "ranking data." @@ -1368,27 +1375,27 @@ UnknownText_0x1c1a22:: para "" done -UnknownText_0x1c1a5b:: +_DummyGameYeahText:: text " , yeah!" done -UnknownText_0x1c1a65:: +_DummyGameDarnText:: text "Darn…" done -UnknownText_0x1c1a6c:: +_StartMenuContestEndText:: text "Would you like to" line "end the Contest?" done -UnknownText_0x1c1a90:: +_ItemsTossOutHowManyText:: text "Toss out how many" line "@" text_ram wStringBuffer2 text "(S)?" done -UnknownText_0x1c1aad:: +_ItemsThrowAwayText:: text "Throw away @" text_decimal wItemQuantityChangeBuffer, 1, 2 text_start @@ -1397,25 +1404,25 @@ UnknownText_0x1c1aad:: text "(S)?" done -UnknownText_0x1c1aca:: +_ItemsDiscardedText:: text "Discarded" line "@" text_ram wStringBuffer1 text "(S)." prompt -UnknownText_0x1c1adf:: +_ItemsTooImportantText:: text "That's too impor-" line "tant to toss out!" prompt -UnknownText_0x1c1b03:: +_ItemsOakWarningText:: text "OAK: <PLAYER>!" line "This isn't the" cont "time to use that!" done -UnknownText_0x1c1b2c:: +_PokemonSwapItemText:: text "Took @" text_ram wMonOrItemNameBuffer text "'s" @@ -1429,7 +1436,7 @@ UnknownText_0x1c1b2c:: text "." prompt -UnknownText_0x1c1b57:: +_PokemonHoldItemText:: text "Made @" text_ram wMonOrItemNameBuffer text_start @@ -1438,23 +1445,23 @@ UnknownText_0x1c1b57:: text "." prompt -UnknownText_0x1c1b6f:: +_PokemonRemoveMailText:: text "Please remove the" line "MAIL first." prompt -UnknownText_0x1c1b8e:: +_PokemonNotHoldingText:: text_ram wMonOrItemNameBuffer text " isn't" line "holding anything." prompt -UnknownText_0x1c1baa:: +_ItemStorageFullText:: text "Item storage space" line "full." prompt -UnknownText_0x1c1bc4:: +_PokemonTookItemText:: text "Took @" text_ram wStringBuffer1 text_start @@ -1463,7 +1470,7 @@ UnknownText_0x1c1bc4:: text "." prompt -UnknownText_0x1c1bdc:: +_PokemonAskSwapItemText:: text_ram wMonOrItemNameBuffer text " is" line "already holding" @@ -1474,48 +1481,48 @@ UnknownText_0x1c1bdc:: line "Switch items?" done -UnknownText_0x1c1c09:: +_ItemCantHeldText:: text "This item can't be" line "held." prompt -UnknownText_0x1c1c22:: +_MailLoseMessageText:: text "The MAIL will lose" line "its message. OK?" done -UnknownText_0x1c1c47:: +_MailDetachedText:: text "MAIL detached from" line "@" text_ram wStringBuffer1 text "." prompt -UnknownText_0x1c1c62:: +_MailNoSpaceText:: text "There's no space" line "for removing MAIL." prompt -UnknownText_0x1c1c86:: +_MailAskSendToPCText:: text "Send the removed" line "MAIL to your PC?" done -UnknownText_0x1c1ca9:: +_MailboxFullText:: text "Your PC's MAILBOX" line "is full." prompt -UnknownText_0x1c1cc4:: +_MailSentToPCText:: text "The MAIL was sent" line "to your PC." prompt -UnknownText_0x1c1ce3:: +_PokemonNotEnoughHPText:: text "Not enough HP!" prompt -UnknownText_0x1c1cf3:: +_MayRegisterItemText:: text "An item in your" line "PACK may be" diff --git a/data/text/common_3.asm b/data/text/common_3.asm index 09278eb29..bff390dcf 100644 --- a/data/text/common_3.asm +++ b/data/text/common_3.asm @@ -25,7 +25,7 @@ _OakText7:: line "later!" done -UnknownText_0x1c40e6:: +_ClockTimeMayBeWrongText:: text "The clock's time" line "may be wrong." @@ -33,7 +33,7 @@ UnknownText_0x1c40e6:: line "time." prompt -UnknownText_0x1c411c:: +_ClockSetWithControlPadText:: text "Set with the" line "Control Pad." @@ -41,28 +41,28 @@ UnknownText_0x1c411c:: line "Cancel: B Button" done -UnknownText_0x1c415b:: +_ClockIsThisOKText:: text "Is this OK?" done -UnknownText_0x1c4168:: +_ClockHasResetText:: text "The clock has been" line "reset." done -UnknownText_0x1c4183:: +_LinkTimeoutText:: text "Too much time has" line "elapsed. Please" cont "try again." prompt -UnknownText_0x1c41b1:: +_LinkTradeCantBattleText:: text "If you trade that" line "#MON, you won't" cont "be able to battle." prompt -UnknownText_0x1c41e6:: +_LinkAbnormalMonText:: text "Your friend's" line "@" text_ram wStringBuffer1 @@ -70,7 +70,7 @@ UnknownText_0x1c41e6:: cont "to be abnormal!" prompt -UnknownText_0x1c4212:: +_LinkAskTradeForText:: text "Trade @" text_ram wd004 text_start @@ -79,6 +79,7 @@ UnknownText_0x1c4212:: text "?" done +; unused UnknownText_0x1c422a:: text "To enter a mobile" line "battle, you must" @@ -89,11 +90,13 @@ UnknownText_0x1c422a:: para "Is that OK?" done +; unused UnknownText_0x1c4275:: text "Need more info on" line "mobile battles?" done +; unused UnknownText_0x1c4298:: text "For a mobile" line "battle, choose" @@ -121,6 +124,7 @@ UnknownText_0x1c4298:: line "wins." done +; unused UnknownText_0x1c439c:: text "Today's remaining" line "time is @" @@ -131,6 +135,7 @@ UnknownText_0x1c439c:: line "battle?" done +; unused UnknownText_0x1c43dc:: text "There are only @" text_decimal wStringBuffer2, 1, 2 @@ -141,6 +146,7 @@ UnknownText_0x1c43dc:: line "battle?" done +; unused UnknownText_0x1c4419:: text "There is only" line "1 min. left today!" @@ -149,6 +155,7 @@ UnknownText_0x1c4419:: line "through a battle?" done +; unused UnknownText_0x1c445a:: text "There is less than" line "1 min. left today!" @@ -157,26 +164,31 @@ UnknownText_0x1c445a:: line "tomorrow." done +; unused UnknownText_0x1c449c:: text "Try again using" line "the same settings?" done +; unused UnknownText_0x1c44c0:: text "There is less than" line "1 min. left today!" done +; unused UnknownText_0x1c44e7:: text "No time left for" line "linking today." done +; unused UnknownText_0x1c4508:: text "Pick three #MON" line "for battle." done +; unused UnknownText_0x1c4525:: text "Today's remaining" line "time is @" @@ -184,61 +196,63 @@ UnknownText_0x1c4525:: text " min." done -UnknownText_0x1c454b:: +_WouldYouLikeToSaveTheGameText:: text "Would you like to" line "save the game?" done -UnknownText_0x1c456d:: +_SavingDontTurnOffThePowerText:: text "SAVING… DON'T TURN" line "OFF THE POWER." done -UnknownText_0x1c4590:: +_SavedTheGameText:: text "<PLAYER> saved" line "the game." done -UnknownText_0x1c45a3:: +_AlreadyASaveFileText:: text "There is already a" line "save file. Is it" cont "OK to overwrite?" done -UnknownText_0x1c45d9:: +_AnotherSaveFileText:: text "There is another" line "save file. Is it" cont "OK to overwrite?" done -UnknownText_0x1c460d:: +_SaveFileCorruptedText:: text "The save file is" line "corrupted!" prompt -UnknownText_0x1c462a:: +_ChangeBoxSaveText:: text "When you change a" line "#MON BOX, data" cont "will be saved. OK?" done -UnknownText_0x1c465f:: +_MoveMonWOMailSaveText:: text "Each time you move" line "a #MON, data" cont "will be saved. OK?" done -UnknownText_0x1c4693:: +; unused +_WindowAreaExceededErrorText:: text "The window save" line "area was exceeded." done -UnknownText_0x1c46b7:: +_WindowPoppingErrorText:: text "No windows avail-" line "able for popping." done -UnknownText_0x1c46dc:: +; unused +_CorruptedEventErrorText:: text "Corrupted event!" prompt @@ -246,22 +260,22 @@ _ObjectEventText:: text "Object event" done -UnknownText_0x1c46fc:: +_BGEventText:: text "BG event" done -UnknownText_0x1c4706:: +_CoordinatesEventText:: text "Coordinates event" done -UnknownText_0x1c4719:: +_ReceivedItemText:: text "<PLAYER> received" line "@" text_ram wStringBuffer4 text "." done -UnknownText_0x1c472c:: +_PutItemInPocketText:: text "<PLAYER> put the" line "@" text_ram wStringBuffer1 @@ -271,14 +285,14 @@ UnknownText_0x1c472c:: text "." prompt -UnknownText_0x1c474b:: +_PocketIsFullText:: text "The @" text_ram wStringBuffer3 text_start line "is full…" prompt -UnknownText_0x1c475f:: +_SeerSeeAllText:: text "I see all." line "I know all…" @@ -286,7 +300,7 @@ UnknownText_0x1c475f:: line "of your #MON!" done -UnknownText_0x1c4797:: +_SeerCantTellAThingText:: text "Whaaaat? I can't" line "tell a thing!" @@ -294,7 +308,7 @@ UnknownText_0x1c4797:: line "know of this?" done -UnknownText_0x1c47d4:: +_SeerNameLocationText:: text "Hm… I see you met" line "@" text_ram wSeerNickname @@ -304,7 +318,7 @@ UnknownText_0x1c47d4:: text "!" prompt -UnknownText_0x1c47fa:: +_SeerTimeLevelText:: text "The time was" line "@" text_ram wSeerTimeOfDay @@ -317,7 +331,7 @@ UnknownText_0x1c47fa:: para "Am I good or what?" prompt -UnknownText_0x1c4837:: +_SeerTradeText:: text "Hm… @" text_ram wSeerNickname text_start @@ -337,7 +351,7 @@ UnknownText_0x1c4837:: text "!" prompt -UnknownText_0x1c487f:: +_SeerNoLocationText:: text "What!? Incredible!" para "I don't understand" @@ -355,7 +369,7 @@ UnknownText_0x1c487f:: para "Am I good or what?" prompt -UnknownText_0x1c491d:: +_SeerEggText:: text "Hey!" para "That's an EGG!" @@ -364,12 +378,12 @@ UnknownText_0x1c491d:: line "you've met it yet…" done -UnknownText_0x1c4955:: +_SeerDoNothingText:: text "Fufufu! I saw that" line "you'd do nothing!" done -UnknownText_0x1c497a:: +_SeerMoreCareText:: text "Incidentally…" para "It would be wise" @@ -379,7 +393,7 @@ UnknownText_0x1c497a:: line "little more care." done -UnknownText_0x1c49c6:: +_SeerMoreConfidentText:: text "Incidentally…" para "It seems to have" @@ -392,7 +406,7 @@ UnknownText_0x1c49c6:: cont "more confident." done -UnknownText_0x1c4a21:: +_SeerMuchStrengthText:: text "Incidentally…" para "@" @@ -402,7 +416,7 @@ UnknownText_0x1c4a21:: cont "much strength." done -UnknownText_0x1c4a5b:: +_SeerMightyText:: text "Incidentally…" para "It certainly has" @@ -420,7 +434,7 @@ UnknownText_0x1c4a5b:: line "with confidence." done -UnknownText_0x1c4ae5:: +_SeerImpressedText:: text "Incidentally…" para "I'm impressed by" @@ -444,7 +458,7 @@ UnknownText_0x1c4ae5:: line "excite anyone." done -UnknownText_0x1c4b92:: +_CongratulationsYourPokemonText:: text "Congratulations!" line "Your @" text_ram wStringBuffer2 @@ -452,7 +466,7 @@ UnknownText_0x1c4b92:: text_end ; unused -UnknownText_0x1c4baf:: +_EvolvedIntoText:: text_start para "evolved into" @@ -461,25 +475,25 @@ UnknownText_0x1c4baf:: text "!" done -UnknownText_0x1c4bc5:: +_StoppedEvolvingText:: text "Huh? @" text_ram wStringBuffer2 text_start line "stopped evolving!" prompt -UnknownText_0x1c4be3:: +_EvolvingText:: text "What? @" text_ram wStringBuffer2 text_start line "is evolving!" done -UnknownText_0x1c4bfd:: +_MartHowManyText:: text "How many?" done -UnknownText_0x1c4c08:: +_MartFinalPriceText:: text_decimal wItemQuantityChangeBuffer, 1, 2 text " @" text_ram wStringBuffer2 @@ -489,7 +503,7 @@ UnknownText_0x1c4c08:: text "." done -UnknownText_0x1c4c28:: +_HerbShopLadyIntroText:: text "Hello, dear." para "I sell inexpensive" @@ -504,11 +518,11 @@ UnknownText_0x1c4c28:: para "Hehehehe…" done -UnknownText_0x1c4ca3:: +_HerbalLadyHowManyText:: text "How many?" done -UnknownText_0x1c4cae:: +_HerbalLadyFinalPriceText:: text_decimal wItemQuantityChangeBuffer, 1, 2 text " @" text_ram wStringBuffer2 @@ -518,27 +532,27 @@ UnknownText_0x1c4cae:: text "." done -UnknownText_0x1c4cce:: +_HerbalLadyThanksText:: text "Thank you, dear." line "Hehehehe…" done -UnknownText_0x1c4cea:: +_HerbalLadyPackFullText:: text "Oh? Your PACK is" line "full, dear." done -UnknownText_0x1c4d08:: +_HerbalLadyNoMoneyText:: text "Hehehe… You don't" line "have the money." done -UnknownText_0x1c4d2a:: +_HerbalLadyComeAgainText:: text "Come again, dear." line "Hehehehe…" done -UnknownText_0x1c4d47:: +_BargainShopIntroText:: text "Hiya! Care to see" line "some bargains?" @@ -549,7 +563,7 @@ UnknownText_0x1c4d47:: line "one of each item." done -UnknownText_0x1c4db0:: +_BargainShopFinalPriceText:: text_ram wStringBuffer2 text " costs" line "¥@" @@ -557,41 +571,41 @@ UnknownText_0x1c4db0:: text ". Want it?" done -UnknownText_0x1c4dcd:: +_BargainShopThanksText:: text "Thanks." done -UnknownText_0x1c4dd6:: +_BargainShopPackFullText:: text "Uh-oh, your PACK" line "is chock-full." done -UnknownText_0x1c4df7:: +_BargainShopSoldOutText:: text "You bought that" line "already. I'm all" cont "sold out of it." done -UnknownText_0x1c4e28:: +_BargainShopNoFundsText:: text "Uh-oh, you're" line "short on funds." done -UnknownText_0x1c4e46:: +_BargainShopComeAgainText:: text "Come by again" line "sometime." done -UnknownText_0x1c4e5f:: +_PharmacyIntroText:: text "What's up? Need" line "some medicine?" done -UnknownText_0x1c4e7e:: +_PharmacyHowManyText:: text "How many?" done -UnknownText_0x1c4e89:: +_PharmacyFinalPriceText:: text_decimal wItemQuantityChangeBuffer, 1, 2 text " @" text_ram wStringBuffer2 @@ -601,35 +615,36 @@ UnknownText_0x1c4e89:: text "." done -UnknownText_0x1c4eab:: +_PharmacyThanksText:: text "Thanks much!" done -UnknownText_0x1c4eb9:: +_PharmacyPackFullText:: text "You don't have any" line "more space." done -UnknownText_0x1c4ed8:: +_PharmacyNoMoneyText:: text "Huh? That's not" line "enough money." done -UnknownText_0x1c4ef6:: +_PharmacyComeAgainText:: text "All right." line "See you around." done -UnknownText_0x1c4f12:: +; unused +_NothingToSellText:: text "You don't have" line "anything to sell." prompt -UnknownText_0x1c4f33:: +_MartSellHowManyText:: text "How many?" done -UnknownText_0x1c4f3e:: +_MartSellPriceText:: text "I can pay you" line "¥@" text_decimal hMoneyTemp, 3, 6 @@ -638,41 +653,41 @@ UnknownText_0x1c4f3e:: para "Is that OK?" done -UnknownText_0x1c4f62:: +_MartWelcomeText:: text "Welcome! How may I" line "help you?" done -UnknownText_0x1c4f80:: +_MartThanksText:: text "Here you are." line "Thank you!" done -UnknownText_0x1c4f9a:: +_MartNoMoneyText:: text "You don't have" line "enough money." done -UnknownText_0x1c4fb7:: +_MartPackFullText:: text "You can't carry" line "any more items." done -UnknownText_0x1c4fd7:: +_MartCantBuyText:: text "Sorry, I can't buy" line "that from you." prompt -UnknownText_0x1c4ff9:: +_MartComeAgainText:: text "Please come again!" done -UnknownText_0x1c500d:: +_MartAskMoreText:: text "Can I do anything" line "else for you?" done -UnknownText_0x1c502e:: +_MartBoughtText:: text "Got ¥@" text_decimal hMoneyTemp, 3, 6 text " for" @@ -681,37 +696,37 @@ UnknownText_0x1c502e:: text "(S)." done -UnknownText_0x1c5049:: +_SlotsBetHowManyCoinsText:: text "Bet how many" line "coins?" done -UnknownText_0x1c505e:: +_SlotsStartText:: text "Start!" done -UnknownText_0x1c5066:: +_SlotsNotEnoughCoinsText:: text "Not enough" line "coins." prompt -UnknownText_0x1c5079:: +_SlotsRanOutOfCoinsText:: text "Darn… Ran out of" line "coins…" done -UnknownText_0x1c5092:: +_SlotsPlayAgainText:: text "Play again?" done -UnknownText_0x1c509f:: +_SlotsLinedUpText:: text "lined up!" line "Won @" text_ram wStringBuffer2 text " coins!" done -UnknownText_0x1c50bb:: +_SlotsDarnText:: text "Darn!" done @@ -739,26 +754,30 @@ _MobileStadiumSuccessText:: para "" done -UnknownText_0x1c5182:: +_MainMenuTimeUnknownText:: text "Clock time unknown" done -UnknownText_0x1c5196:: +; unused mobile +_DeleteSavedLoginPasswordText:: text "Delete the saved" line "LOG-IN PASSWORD?" done -UnknownText_0x1c51b9:: +; unused mobile +_DeletedTheLoginPasswordText:: text "Deleted the LOG-IN" line "PASSWORD." done -UnknownText_0x1c51d7:: +; unused mobile +_MobilePickThreeMonForBattle:: text "Pick three #MON" line "for battle." prompt -UnknownText_0x1c51f4:: +; unused mobile +_MobileUseTheseThreeMonText:: text_ram wMobileParticipant1Nickname text "," line "@" @@ -771,12 +790,14 @@ UnknownText_0x1c51f4:: para "Use these three?" done -UnknownText_0x1c521c:: +; unused mobile +_MobileOnlyThreeMonMayEnterText:: text "Only three #MON" line "may enter." prompt -UnknownText_0x1c5238:: +; unused mobile +_MobileCardFolderIntro1Text:: text "The CARD FOLDER" line "stores your and" @@ -793,7 +814,8 @@ UnknownText_0x1c5238:: para "" done -UnknownText_0x1c52bc:: +; unused mobile +_MobileCardFolderIntro2Text:: text "This is your CARD." para "Once you've" @@ -806,7 +828,8 @@ UnknownText_0x1c52bc:: para "" done -UnknownText_0x1c531e:: +; unused mobile +_MobileCardFolderIntro3Text:: text "If you have your" line "friend's CARD, you" @@ -820,7 +843,8 @@ UnknownText_0x1c531e:: para "" done -UnknownText_0x1c5394:: +; unused mobile +_MobileCardFolderIntro4Text:: text "To safely store" line "your collection of" @@ -831,7 +855,8 @@ UnknownText_0x1c5394:: para "" done -UnknownText_0x1c53ee:: +; unused mobile +_MobileCardFolderAskDeleteText:: text "If the CARD FOLDER" line "is deleted, all" @@ -847,19 +872,22 @@ UnknownText_0x1c53ee:: line "your CARD FOLDER?" done -UnknownText_0x1c5494:: +; unused mobile +_MobileCardFolderDeleteAreYouSureText:: text "Are you sure you" line "want to delete it?" done -UnknownText_0x1c54b9:: +; unused mobile +_MobileCardFolderDeletedText:: text "The CARD FOLDER" line "has been deleted." para "" done -UnknownText_0x1c54dd:: +; unused mobile +_MobileCardFolderAskOpenOldText:: text "There is an older" line "CARD FOLDER from a" cont "previous journey." @@ -868,72 +896,75 @@ UnknownText_0x1c54dd:: line "open it?" done -UnknownText_0x1c552d:: +; unused mobile +_MobileCardFolderAskDeleteOldText:: text "Delete the old" line "CARD FOLDER?" done -UnknownText_0x1c554a:: +; unused mobile +_MobileCardFolderFinishRegisteringCardsText:: text "Finish registering" line "CARDS?" done -UnknownText_0x1c5565:: +_PhoneWrongNumberText:: text "Huh? Sorry, wrong" line "number!" done -UnknownText_0x1c5580:: +_PhoneClickText:: text "Click!" done -UnknownText_0x1c5588:: +_PhoneEllipseText:: text "<……>" done -UnknownText_0x1c558b:: +_PhoneOutOfAreaText:: text "That number is out" line "of the area." done -UnknownText_0x1c55ac:: +_PhoneJustTalkToThemText:: text "Just go talk to" line "that person!" done -UnknownText_0x1c55ca:: +_PhoneThankYouText:: text "Thank you!" done +; unused UnknownText_0x1c55d6:: text " :" done -UnknownText_0x1c55db:: +_PasswordAskResetText:: text "Password OK." line "Select CONTINUE &" cont "reset settings." prompt -UnknownText_0x1c560b:: +_PasswordWrongText:: text "Wrong password!" prompt -UnknownText_0x1c561c:: +_PasswordAskResetClockText:: text "Reset the clock?" done -UnknownText_0x1c562e:: +_PasswordAskEnterText:: text "Please enter the" line "password." done -UnknownText_0x1c564a:: +_ClearAllSaveDataText:: text "Clear all save" line "data?" done -UnknownText_0x1c5660:: +_LearnedMoveText:: text_ram wMonOrItemNameBuffer text " learned" line "@" @@ -945,19 +976,19 @@ UnknownText_0x1c5660:: text_end ; unused -UnknownText_0x1c5678:: +_MoveAskForgetText:: text "Which move should" next "be forgotten?" done -UnknownText_0x1c5699:: +_StopLearningMoveText:: text "Stop learning" line "@" text_ram wStringBuffer2 text "?" done -UnknownText_0x1c56af:: +_DidNotLearnMoveText:: text_ram wMonOrItemNameBuffer text_start line "did not learn" @@ -966,7 +997,7 @@ UnknownText_0x1c56af:: text "." prompt -UnknownText_0x1c56c9:: +_AskForgetMoveText:: text_ram wMonOrItemNameBuffer text " is" line "trying to learn" @@ -987,14 +1018,14 @@ UnknownText_0x1c56c9:: text "?" done -UnknownText_0x1c5740:: +Text_MoveForgetCount:: text "1, 2 and…@" text_pause text_end text_end ; unused -UnknownText_0x1c574e:: +_MoveForgotText:: text " Poof!@" text_pause text_start @@ -1009,126 +1040,126 @@ UnknownText_0x1c574e:: para "And…" prompt -UnknownText_0x1c5772:: +_MoveCantForgetHMText:: text "HM moves can't be" line "forgotten now." prompt -UnknownText_0x1c5793:: +_CardFlipPlayWithThreeCoinsText:: text "Play with three" line "coins?" done -UnknownText_0x1c57ab:: +_CardFlipNotEnoughCoinsText:: text "Not enough coins…" prompt -UnknownText_0x1c57be:: +_CardFlipChooseACardText:: text "Choose a card." done -UnknownText_0x1c57ce:: +_CardFlipPlaceYourBetText:: text "Place your bet." done -UnknownText_0x1c57df:: +_CardFlipPlayAgainText:: text "Want to play" line "again?" done -UnknownText_0x1c57f4:: +_CardFlipShuffledText:: text "The cards have" line "been shuffled." prompt -UnknownText_0x1c5813:: +_CardFlipYeahText:: text "Yeah!" done -UnknownText_0x1c581a:: +_CardFlipDarnText:: text "Darn…" done -UnknownText_0x1c5821:: +_GearTodayText:: text_today text_end text_end ; unused -UnknownText_0x1c5824:: +_GearEllipseText:: text "<……>" done -UnknownText_0x1c5827:: +_GearOutOfServiceText:: text "You're out of the" line "service area." prompt -UnknownText_0x1c5847:: +_PokegearAskWhoCallText:: text "Whom do you want" line "to call?" done -UnknownText_0x1c5862:: +_PokegearPressButtonText:: text "Press any button" line "to exit." done -UnknownText_0x1c587d:: +_PokegearAskDeleteText:: text "Delete this stored" line "phone number?" done -UnknownText_0x1c589f:: +_BuenaAskWhichPrizeText:: text "Which prize would" line "you like?" done -UnknownText_0x1c58bc:: +_BuenaIsThatRightText:: text_ram wStringBuffer1 text "?" line "Is that right?" done -UnknownText_0x1c58d1:: +_BuenaHereYouGoText:: text "Here you go!" para "" done -UnknownText_0x1c58e0:: +_BuenaNotEnoughPointsText:: text "You don't have" line "enough points." para "" done -UnknownText_0x1c58ff:: +_BuenaNoRoomText:: text "You have no room" line "for it." para "" done -UnknownText_0x1c591a:: +_BuenaComeAgainText:: text "Oh. Please come" line "back again!" done -UnknownText_0x1c5937:: +_BTExcuseMeText:: text "Excuse me!" para "" done -Text_ExcuseMeYoureNotReady:: +_ExcuseMeYoureNotReadyText:: text "Excuse me." line "You're not ready." para "" done -UnknownText_0x1c5962:: +_BattleTowerReturnWhenReadyText:: text "Please return when" line "you're ready." done @@ -1181,7 +1212,7 @@ _YouCantTakeAnEggText:: para "" done -UnknownText_0x1c5a5a:: +_BallDodgedText:: text "It dodged the" line "thrown BALL!" @@ -1189,32 +1220,32 @@ UnknownText_0x1c5a5a:: line "can't be caught!" prompt -UnknownText_0x1c5a90:: +_BallMissedText:: text "You missed the" line "#MON!" prompt -UnknownText_0x1c5aa6:: +_BallBrokeFreeText:: text "Oh no! The #MON" line "broke free!" prompt -UnknownText_0x1c5ac3:: +_BallAppearedCaughtText:: text "Aww! It appeared" line "to be caught!" prompt -UnknownText_0x1c5ae3:: +_BallAlmostHadItText:: text "Aargh!" line "Almost had it!" prompt -UnknownText_0x1c5afa:: +_BallSoCloseText:: text "Shoot! It was so" line "close too!" prompt -UnknownText_0x1c5b17:: +Text_BallCaught:: text "Gotcha! @" text_ram wEnemyMonNick text_start @@ -1224,19 +1255,19 @@ UnknownText_0x1c5b17:: text_end ; unused -Text_Waitbutton_2:: +_WaitButtonText:: text_waitbutton text_end text_end ; unused -UnknownText_0x1c5b38:: +_BallSentToPCText:: text_ram wMonOrItemNameBuffer text " was" line "sent to BILL's PC." prompt -UnknownText_0x1c5b53:: +_NewDexDataText:: text_ram wEnemyMonNick text "'s data" line "was newly added to" @@ -1247,14 +1278,14 @@ UnknownText_0x1c5b53:: text_end ; unused -UnknownText_0x1c5b7f:: +_AskGiveNicknameText:: text "Give a nickname to" line "@" text_ram wStringBuffer1 text "?" done -UnknownText_0x1c5b9a:: +_ItemStatRoseText:: text_ram wStringBuffer1 text "'s" line "@" @@ -1262,18 +1293,18 @@ UnknownText_0x1c5b9a:: text " rose." prompt -UnknownText_0x1c5bac:: +_ItemCantUseOnMonText:: text "That can't be used" line "on this #MON." prompt -Text_RepelUsedEarlierIsStillInEffect:: +_RepelUsedEarlierIsStillInEffectText:: text "The REPEL used" line "earlier is still" cont "in effect." prompt -UnknownText_0x1c5bf9:: +_PlayedFluteText:: text "Played the #" line "FLUTE." @@ -1281,12 +1312,12 @@ UnknownText_0x1c5bf9:: line "catchy tune!" prompt -UnknownText_0x1c5c28:: +_FluteWakeUpText:: text "All sleeping" line "#MON woke up." prompt -UnknownText_0x1c5c44:: +Text_PlayedPokeFlute:: text "<PLAYER> played the" line "# FLUTE.@" text_waitbutton @@ -1294,14 +1325,14 @@ UnknownText_0x1c5c44:: text_end ; unused -UnknownText_0x1c5c5e:: +_BlueCardBalanceText:: text "You now have" line "@" text_decimal wBlueCardBalance, 1, 2 text " points." done -UnknownText_0x1c5c7b:: +_CoinCaseCountText:: text "Coins:" line "@" text_decimal wCoins, 2, 4 @@ -1309,33 +1340,33 @@ UnknownText_0x1c5c7b:: text_end ; unused -Text_RaiseThePPOfWhichMove:: +_RaiseThePPOfWhichMoveText:: text "Raise the PP of" line "which move?" done -Text_RestoreThePPOfWhichMove:: +_RestoreThePPOfWhichMoveText:: text "Restore the PP of" line "which move?" done -Text_PPIsMaxedOut:: +_PPIsMaxedOutText:: text_ram wStringBuffer2 text "'s PP" line "is maxed out." prompt -Text_PPsIncreased:: +_PPsIncreasedText:: text_ram wStringBuffer2 text "'s PP" line "increased." prompt -UnknownText_0x1c5cf1:: +_PPRestoredText:: text "PP was restored." prompt -UnknownText_0x1c5d03:: +_SentTrophyHomeText:: text "There was a trophy" line "inside!@" sound_dex_fanfare_50_79 @@ -1347,73 +1378,73 @@ UnknownText_0x1c5d03:: line "trophy home." prompt -UnknownText_0x1c5d3e:: +_ItemLooksBitterText:: text "It looks bitter…" prompt -UnknownText_0x1c5d50:: +_ItemCantUseOnEggText:: text "That can't be used" line "on an EGG." prompt -UnknownText_0x1c5d6e:: +_ItemOakWarningText:: text "OAK: <PLAYER>!" line "This isn't the" cont "time to use that!" prompt -UnknownText_0x1c5d97:: +_ItemBelongsToSomeoneElseText:: text "That belongs to" line "someone else!" prompt -UnknownText_0x1c5db6:: +_ItemWontHaveEffectText:: text "It won't have any" line "effect." prompt -UnknownText_0x1c5dd0:: +_BallBlockedText:: text "The trainer" line "blocked the BALL!" prompt -UnknownText_0x1c5def:: +_BallDontBeAThiefText:: text "Don't be a thief!" prompt -UnknownText_0x1c5e01:: +_NoCyclingText:: text "Cycling isn't" line "allowed here." prompt -UnknownText_0x1c5e1d:: +_ItemCantGetOnText:: text "Can't get on your" line "@" text_ram wStringBuffer1 text " now." prompt -UnknownText_0x1c5e3a:: +_BallBoxFullText:: text "The #MON BOX" line "is full. That" cont "can't be used now." prompt -UnknownText_0x1c5e68:: +_ItemUsedText:: text "<PLAYER> used the@" text_low text_ram wStringBuffer2 text "." done -UnknownText_0x1c5e7b:: +_ItemGotOnText:: text "<PLAYER> got on the@" text_low text_ram wStringBuffer2 text "." prompt -UnknownText_0x1c5e90:: +_ItemGotOffText:: text "<PLAYER> got off@" text_low text "the @" @@ -1421,7 +1452,7 @@ UnknownText_0x1c5e90:: text "." prompt -UnknownText_0x1c5ea8:: +_KnowsMoveText:: text_ram wStringBuffer1 text " knows" line "@" @@ -1429,39 +1460,39 @@ UnknownText_0x1c5ea8:: text "." prompt -UnknownText_0x1c5eba:: +_MoveKnowsOneText:: text "That #MON knows" line "only one move." done -UnknownText_0x1c5eda:: +_AskDeleteMoveText:: text "Oh, make it forget" line "@" text_ram wStringBuffer1 text "?" done -UnknownText_0x1c5ef5:: +_DeleterForgotMoveText:: text "Done! Your #MON" line "forgot the move." done -UnknownText_0x1c5f17:: +_DeleterEggText:: text "An EGG doesn't" line "know any moves!" done -UnknownText_0x1c5f36:: +_DeleterNoComeAgainText:: text "No? Come visit me" line "again." done -UnknownText_0x1c5f50:: +_DeleterAskWhichMoveText:: text "Which move should" line "it forget, then?" prompt -UnknownText_0x1c5f74:: +_DeleterIntroText:: text "Um… Oh, yes, I'm" line "the MOVE DELETER." @@ -1472,43 +1503,43 @@ UnknownText_0x1c5f74:: line "#MON forget?" done -UnknownText_0x1c5fd1:: +_DeleterAskWhichMonText:: text "Which #MON?" prompt -Text_DSTIsThatOK:: +_DSTIsThatOKText:: text " DST," line "is that OK?" done -UnknownText_0x1c5ff1:: +_TimeAskOkayText:: text "," line "is that OK?" done -UnknownText_0x1c6000:: +_TimesetAskDSTText:: text "Do you want to" line "switch to Daylight" cont "Saving Time?" done -UnknownText_0x1c6030:: +_TimesetDSTText:: text "I set the clock" line "forward by one" cont "hour." prompt -UnknownText_0x1c6056:: +_TimesetAskNotDSTText:: text "Is Daylight Saving" line "Time over?" done -UnknownText_0x1c6075:: +_TimesetNotDSTText:: text "I put the clock" line "back one hour." prompt -UnknownText_0x1c6095:: +_TimesetAskAdjustDSTText:: text "Do you want to" line "adjust your clock" @@ -1516,7 +1547,7 @@ UnknownText_0x1c6095:: line "Saving Time?" done -UnknownText_0x1c60d1:: +_MomLostGearBookletText:: text "I lost the in-" line "struction booklet" cont "for the #GEAR." diff --git a/data/text/std_text.asm b/data/text/std_text.asm index d431a0fd1..5415c4876 100644 --- a/data/text/std_text.asm +++ b/data/text/std_text.asm @@ -159,7 +159,7 @@ MerchandiseShelfText: line "merchandise!" done -TownMapText: +LookTownMapText: text "It's the TOWN MAP." done diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index ad6114c77..ab9731a12 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -780,10 +780,10 @@ This can bring Pokémon straight from level 1 to 100 by gaining just a few exper ([Video](https://www.youtube.com/watch?v=o54VjpAEoO8)) -**Fix:** Edit `Text_ABoostedStringBuffer2ExpPoints` and `Text_StringBuffer2ExpPoints` in [data/text/common_2.asm](https://github.com/pret/pokecrystal/blob/master/data/text/common_2.asm): +**Fix:** Edit `_ABoostedStringBuffer2ExpPointsText` and `_StringBuffer2ExpPointsText` in [data/text/common_2.asm](https://github.com/pret/pokecrystal/blob/master/data/text/common_2.asm): ```diff - Text_ABoostedStringBuffer2ExpPoints:: + _ABoostedStringBuffer2ExpPointsText:: text_start line "a boosted" cont "@" @@ -792,7 +792,7 @@ This can bring Pokémon straight from level 1 to 100 by gaining just a few exper text " EXP. Points!" prompt - Text_StringBuffer2ExpPoints:: + _StringBuffer2ExpPointsText:: text_start line "@" - text_decimal wStringBuffer2, 2, 4 diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm index b7a6de644..6ee026d28 100644 --- a/engine/battle/ai/items.asm +++ b/engine/battle/ai/items.asm @@ -687,7 +687,7 @@ AI_Switch: pop af jr c, .skiptext - ld hl, TextJump_EnemyWithdrew + ld hl, EnemyWithdrewText call PrintText .skiptext @@ -707,8 +707,8 @@ AI_Switch: scf ret -TextJump_EnemyWithdrew: - text_far Text_EnemyWithdrew +EnemyWithdrewText: + text_far _EnemyWithdrewText text_end Function384d5: ; This appears to be unused @@ -824,9 +824,9 @@ PrintText_UsedItemOn: ld de, wMonOrItemNameBuffer ld bc, ITEM_NAME_LENGTH call CopyBytes - ld hl, TextJump_EnemyUsedOn + ld hl, EnemyUsedOnText jp PrintText -TextJump_EnemyUsedOn: - text_far Text_EnemyUsedOn +EnemyUsedOnText: + text_far _EnemyUsedOnText text_end diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 38abbb51f..bc20ab3f3 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -7405,20 +7405,20 @@ BoostExp: Text_MonGainedExpPoint: text_far Text_Gained text_asm - ld hl, TextJump_StringBuffer2ExpPoints + ld hl, ExpPointsText ld a, [wStringBuffer2 + 2] ; IsTradedMon and a ret z - ld hl, TextJump_ABoostedStringBuffer2ExpPoints + ld hl, BoostedExpPointsText ret -TextJump_ABoostedStringBuffer2ExpPoints: - text_far Text_ABoostedStringBuffer2ExpPoints +BoostedExpPointsText: + text_far _BoostedExpPointsText text_end -TextJump_StringBuffer2ExpPoints: - text_far Text_StringBuffer2ExpPoints +ExpPointsText: + text_far _ExpPointsText text_end AnimateExpBar: @@ -7687,11 +7687,11 @@ JumpText_YourFoesWeakGetmMon: text_far Text_YourFoesWeakGetmMon text_asm Function_TextJump_BattleMonNick01: - ld hl, TextJump_BattleMonNick01 + ld hl, BattleMonNicknameText ret -TextJump_BattleMonNick01: - text_far Text_BattleMonNick01 +BattleMonNicknameText: + text_far _BattleMonNicknameText text_end WithdrawMonText: @@ -7734,40 +7734,40 @@ WithdrawMonText: pop bc pop de ldh a, [hQuotient + 3] - ld hl, TextJump_ThatsEnoughComeBack + ld hl, ThatsEnoughComeBackText and a ret z - ld hl, TextJump_ComeBack + ld hl, ComeBackText cp 30 ret c - ld hl, TextJump_OKComeBack + ld hl, OKComeBackText cp 70 ret c - ld hl, TextJump_GoodComeBack + ld hl, GoodComeBackText ret -TextJump_ThatsEnoughComeBack: - text_far Text_ThatsEnoughComeBack +ThatsEnoughComeBackText: + text_far _ThatsEnoughComeBackText text_end -TextJump_OKComeBack: - text_far Text_OKComeBack +OKComeBackText: + text_far _OKComeBackText text_end -TextJump_GoodComeBack: - text_far Text_GoodComeBack +GoodComeBackText: + text_far _GoodComeBackText text_end Unreferenced_TextJump_ComeBack: ; this function doesn't seem to be used - ld hl, TextJump_ComeBack + ld hl, ComeBackText ret -TextJump_ComeBack: - text_far Text_ComeBack +ComeBackText: + text_far _ComeBackText text_end Unreferenced_HandleSafariAngerEatingStatus: diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index eefb1debe..266a5073f 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -4546,21 +4546,21 @@ BattleCommand_StatUpMessage: jp BattleTextbox .stat - text_far UnknownText_0x1c0cc6 + text_far Text_BattleEffectActivate text_asm - ld hl, .up + ld hl, .BattleStatWentUpText ld a, [wLoweredStat] and $f0 ret z - ld hl, .wayup + ld hl, .BattleStatWentWayUpText ret -.wayup - text_far UnknownText_0x1c0cd0 +.BattleStatWentWayUpText: + text_far _BattleStatWentWayUpText text_end -.up - text_far UnknownText_0x1c0ce0 +.BattleStatWentUpText: + text_far _BattleStatWentUpText text_end BattleCommand_StatDownMessage: @@ -4576,21 +4576,21 @@ BattleCommand_StatDownMessage: jp BattleTextbox .stat - text_far UnknownText_0x1c0ceb + text_far Text_BattleFoeEffectActivate text_asm - ld hl, .fell + ld hl, .BattleStatFellText ld a, [wLoweredStat] and $f0 ret z - ld hl, .sharplyfell + ld hl, .BattleStatSharplyFellText ret -.sharplyfell - text_far UnknownText_0x1c0cf5 +.BattleStatSharplyFellText: + text_far _BattleStatSharplyFellText text_end -.fell - text_far UnknownText_0x1c0d06 +.BattleStatFellText: + text_far _BattleStatFellText text_end TryLowerStat: @@ -5641,64 +5641,58 @@ BattleCommand_Charge: jp EndMoveEffect .UsedText: - text_far UnknownText_0x1c0d0e ; "<USER>" + text_far Text_BattleUser ; "<USER>" text_asm ld a, BATTLE_VARS_MOVE_ANIM call GetBattleVar cp RAZOR_WIND - ld hl, .RazorWind + ld hl, .BattleMadeWhirlwindText jr z, .done cp SOLARBEAM - ld hl, .Solarbeam + ld hl, .BattleTookSunlightText jr z, .done cp SKULL_BASH - ld hl, .SkullBash + ld hl, .BattleLoweredHeadText jr z, .done cp SKY_ATTACK - ld hl, .SkyAttack + ld hl, .BattleGlowingText jr z, .done cp FLY - ld hl, .Fly + ld hl, .BattleFlewText jr z, .done cp DIG - ld hl, .Dig + ld hl, .BattleDugText .done ret -.RazorWind: -; 'made a whirlwind!' - text_far UnknownText_0x1c0d12 +.BattleMadeWhirlwindText: + text_far _BattleMadeWhirlwindText text_end -.Solarbeam: -; 'took in sunlight!' - text_far UnknownText_0x1c0d26 +.BattleTookSunlightText: + text_far _BattleTookSunlightText text_end -.SkullBash: -; 'lowered its head!' - text_far UnknownText_0x1c0d3a +.BattleLoweredHeadText: + text_far _BattleLoweredHeadText text_end -.SkyAttack: -; 'is glowing!' - text_far UnknownText_0x1c0d4e +.BattleGlowingText: + text_far _BattleGlowingText text_end -.Fly: -; 'flew up high!' - text_far UnknownText_0x1c0d5c +.BattleFlewText: + text_far _BattleFlewText text_end -.Dig: -; 'dug a hole!' - text_far UnknownText_0x1c0d6c +.BattleDugText: + text_far _BattleDugText text_end BattleCommand3c: diff --git a/engine/battle/move_effects/mimic.asm b/engine/battle/move_effects/mimic.asm index e4b99377f..71eb72c63 100644 --- a/engine/battle/move_effects/mimic.asm +++ b/engine/battle/move_effects/mimic.asm @@ -43,7 +43,7 @@ BattleCommand_Mimic: ld [hl], 5 call GetMoveName call AnimateCurrentMove - ld hl, LearnedMoveText + ld hl, MimicLearnedMoveText jp StdBattleTextbox .fail diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm index 3162ef38e..54910c37d 100644 --- a/engine/events/battle_tower/rules.asm +++ b/engine/events/battle_tower/rules.asm @@ -16,13 +16,12 @@ CheckForMobileBattleRules: dw BattleTower_CheckPartyHasThreeMonsThatAreNotEggs .TextPointers: - dw .ExcuseMeText + dw .BTExcuseMeText dw NeedAtLeastThreeMonText dw EggDoesNotQualifyText -.ExcuseMeText: - ; Excuse me! - text_far UnknownText_0x1c5937 +.BTExcuseMeText: + text_far _BTExcuseMeText text_end _CheckForBattleTowerRules: @@ -49,54 +48,46 @@ _CheckForBattleTowerRules: dw Function_HasPartyAnEgg .TextPointers: - dw JumpText_ExcuseMeYoureNotReady + dw ExcuseMeYoureNotReadyText dw OnlyThreeMonMayBeEnteredText dw TheMonMustAllBeDifferentKindsText dw TheMonMustNotHoldTheSameItemsText dw YouCantTakeAnEggText -JumpText_ExcuseMeYoureNotReady: - ; Excuse me. You're not ready. - text_far Text_ExcuseMeYoureNotReady +ExcuseMeYoureNotReadyText: + text_far _ExcuseMeYoureNotReadyText text_end BattleTower_PleaseReturnWhenReady: - ld hl, .PleaseReturnWhenReady + ld hl, .BattleTowerReturnWhenReadyText call PrintText ret -.PleaseReturnWhenReady: - ; Please return when you're ready. - text_far UnknownText_0x1c5962 +.BattleTowerReturnWhenReadyText: + text_far _BattleTowerReturnWhenReadyText text_end NeedAtLeastThreeMonText: - ; You need at least three #MON. text_far _NeedAtLeastThreeMonText text_end EggDoesNotQualifyText: - ; Sorry, an EGG doesn't qualify. text_far _EggDoesNotQualifyText text_end OnlyThreeMonMayBeEnteredText: - ; Only three #MON may be entered. text_far _OnlyThreeMonMayBeEnteredText text_end TheMonMustAllBeDifferentKindsText: - ; The @ #MON must all be different kinds. text_far _TheMonMustAllBeDifferentKindsText text_end TheMonMustNotHoldTheSameItemsText: - ; The @ #MON must not hold the same items. text_far _TheMonMustNotHoldTheSameItemsText text_end YouCantTakeAnEggText: - ; You can't take an EGG! text_far _YouCantTakeAnEggText text_end diff --git a/engine/events/battle_tower/trainer_text.asm b/engine/events/battle_tower/trainer_text.asm index 6d06e2eec..6ff9c5b3e 100644 --- a/engine/events/battle_tower/trainer_text.asm +++ b/engine/events/battle_tower/trainer_text.asm @@ -94,85 +94,85 @@ BTMaleTrainerTexts: dw .PlayerWon .Greetings: - dw BTGreetingM1 - dw BTGreetingM2 - dw BTGreetingM3 - dw BTGreetingM4 - dw BTGreetingM5 - dw BTGreetingM6 - dw BTGreetingM7 - dw BTGreetingM8 - dw BTGreetingM9 - dw BTGreetingM10 - dw BTGreetingM11 - dw BTGreetingM12 - dw BTGreetingM13 - dw BTGreetingM14 - dw BTGreetingM15 - dw BTGreetingM16 - dw BTGreetingM17 - dw BTGreetingM18 - dw BTGreetingM19 - dw BTGreetingM20 - dw BTGreetingM21 - dw BTGreetingM22 - dw BTGreetingM23 - dw BTGreetingM24 - dw BTGreetingM25 + dw BTGreetingM1Text + dw BTGreetingM2Text + dw BTGreetingM3Text + dw BTGreetingM4Text + dw BTGreetingM5Text + dw BTGreetingM6Text + dw BTGreetingM7Text + dw BTGreetingM8Text + dw BTGreetingM9Text + dw BTGreetingM10Text + dw BTGreetingM11Text + dw BTGreetingM12Text + dw BTGreetingM13Text + dw BTGreetingM14Text + dw BTGreetingM15Text + dw BTGreetingM16Text + dw BTGreetingM17Text + dw BTGreetingM18Text + dw BTGreetingM19Text + dw BTGreetingM20Text + dw BTGreetingM21Text + dw BTGreetingM22Text + dw BTGreetingM23Text + dw BTGreetingM24Text + dw BTGreetingM25Text .PlayerLost: - dw BTLossM1 - dw BTLossM2 - dw BTLossM3 - dw BTLossM4 - dw BTLossM5 - dw BTLossM6 - dw BTLossM7 - dw BTLossM8 - dw BTLossM9 - dw BTLossM10 - dw BTLossM11 - dw BTLossM12 - dw BTLossM13 - dw BTLossM14 - dw BTLossM15 - dw BTLossM16 - dw BTLossM17 - dw BTLossM18 - dw BTLossM19 - dw BTLossM20 - dw BTLossM21 - dw BTLossM22 - dw BTLossM23 - dw BTLossM24 - dw BTLossM25 + dw BTLossM1Text + dw BTLossM2Text + dw BTLossM3Text + dw BTLossM4Text + dw BTLossM5Text + dw BTLossM6Text + dw BTLossM7Text + dw BTLossM8Text + dw BTLossM9Text + dw BTLossM10Text + dw BTLossM11Text + dw BTLossM12Text + dw BTLossM13Text + dw BTLossM14Text + dw BTLossM15Text + dw BTLossM16Text + dw BTLossM17Text + dw BTLossM18Text + dw BTLossM19Text + dw BTLossM20Text + dw BTLossM21Text + dw BTLossM22Text + dw BTLossM23Text + dw BTLossM24Text + dw BTLossM25Text .PlayerWon: - dw BTWinM1 - dw BTWinM2 - dw BTWinM3 - dw BTWinM4 - dw BTWinM5 - dw BTWinM6 - dw BTWinM7 - dw BTWinM8 - dw BTWinM9 - dw BTWinM10 - dw BTWinM11 - dw BTWinM12 - dw BTWinM13 - dw BTWinM14 - dw BTWinM15 - dw BTWinM16 - dw BTWinM17 - dw BTWinM18 - dw BTWinM19 - dw BTWinM20 - dw BTWinM21 - dw BTWinM22 - dw BTWinM23 - dw BTWinM24 - dw BTWinM25 + dw BTWinM1Text + dw BTWinM2Text + dw BTWinM3Text + dw BTWinM4Text + dw BTWinM5Text + dw BTWinM6Text + dw BTWinM7Text + dw BTWinM8Text + dw BTWinM9Text + dw BTWinM10Text + dw BTWinM11Text + dw BTWinM12Text + dw BTWinM13Text + dw BTWinM14Text + dw BTWinM15Text + dw BTWinM16Text + dw BTWinM17Text + dw BTWinM18Text + dw BTWinM19Text + dw BTWinM20Text + dw BTWinM21Text + dw BTWinM22Text + dw BTWinM23Text + dw BTWinM24Text + dw BTWinM25Text BTFemaleTrainerTexts: dw .Greetings @@ -180,532 +180,532 @@ BTFemaleTrainerTexts: dw .PlayerWon .Greetings: - dw BTGreetingF1 - dw BTGreetingF2 - dw BTGreetingF3 - dw BTGreetingF4 - dw BTGreetingF5 - dw BTGreetingF6 - dw BTGreetingF7 - dw BTGreetingF8 - dw BTGreetingF9 - dw BTGreetingF10 - dw BTGreetingF11 - dw BTGreetingF12 - dw BTGreetingF13 - dw BTGreetingF14 - dw BTGreetingF15 + dw BTGreetingF1Text + dw BTGreetingF2Text + dw BTGreetingF3Text + dw BTGreetingF4Text + dw BTGreetingF5Text + dw BTGreetingF6Text + dw BTGreetingF7Text + dw BTGreetingF8Text + dw BTGreetingF9Text + dw BTGreetingF10Text + dw BTGreetingF11Text + dw BTGreetingF12Text + dw BTGreetingF13Text + dw BTGreetingF14Text + dw BTGreetingF15Text .PlayerLost: - dw BTLossF1 - dw BTLossF2 - dw BTLossF3 - dw BTLossF4 - dw BTLossF5 - dw BTLossF6 - dw BTLossF7 - dw BTLossF8 - dw BTLossF9 - dw BTLossF10 - dw BTLossF11 - dw BTLossF12 - dw BTLossF13 - dw BTLossF14 - dw BTLossF15 + dw BTLossF1Text + dw BTLossF2Text + dw BTLossF3Text + dw BTLossF4Text + dw BTLossF5Text + dw BTLossF6Text + dw BTLossF7Text + dw BTLossF8Text + dw BTLossF9Text + dw BTLossF10Text + dw BTLossF11Text + dw BTLossF12Text + dw BTLossF13Text + dw BTLossF14Text + dw BTLossF15Text .PlayerWon: - dw BTWinF1 - dw BTWinF2 - dw BTWinF3 - dw BTWinF4 - dw BTWinF5 - dw BTWinF6 - dw BTWinF7 - dw BTWinF8 - dw BTWinF9 - dw BTWinF10 - dw BTWinF11 - dw BTWinF12 - dw BTWinF13 - dw BTWinF14 - dw BTWinF15 + dw BTWinF1Text + dw BTWinF2Text + dw BTWinF3Text + dw BTWinF4Text + dw BTWinF5Text + dw BTWinF6Text + dw BTWinF7Text + dw BTWinF8Text + dw BTWinF9Text + dw BTWinF10Text + dw BTWinF11Text + dw BTWinF12Text + dw BTWinF13Text + dw BTWinF14Text + dw BTWinF15Text -BTGreetingM1: - text_far BattleTowerText_0x1ec000 +BTGreetingM1Text: + text_far _BTGreetingM1Text text_end -BTLossM1: - text_far BattleTowerText_0x1ec03b +BTLossM1Text: + text_far _BTLossM1Text text_end -BTWinM1: - text_far UnknownText_0x1ec060 +BTWinM1Text: + text_far _BTWinM1Text text_end -BTGreetingM2: - text_far BattleTowerText_0x1ec080 +BTGreetingM2Text: + text_far _BTGreetingM2Text text_end -BTLossM2: - text_far UnknownText_0x1ec0a3 +BTLossM2Text: + text_far _BTLossM2Text text_end -BTWinM2: - text_far UnknownText_0x1ec0c4 +BTWinM2Text: + text_far _BTWinM2Text text_end -BTGreetingM3: - text_far UnknownText_0x1ec0e1 +BTGreetingM3Text: + text_far _BTGreetingM3Text text_end -BTLossM3: - text_far UnknownText_0x1ec108 +BTLossM3Text: + text_far _BTLossM3Text text_end -BTWinM3: - text_far UnknownText_0x1ec12a +BTWinM3Text: + text_far _BTWinM3Text text_end -BTGreetingM4: - text_far UnknownText_0x1ec14d +BTGreetingM4Text: + text_far _BTGreetingM4Text text_end -BTLossM4: - text_far UnknownText_0x1ec16f +BTLossM4Text: + text_far _BTLossM4Text text_end -BTWinM4: - text_far UnknownText_0x1ec190 +BTWinM4Text: + text_far _BTWinM4Text text_end -BTGreetingM5: - text_far UnknownText_0x1ec1ae +BTGreetingM5Text: + text_far _BTGreetingM5Text text_end -BTLossM5: - text_far UnknownText_0x1ec1d0 +BTLossM5Text: + text_far _BTLossM5Text text_end -BTWinM5: - text_far UnknownText_0x1ec1f4 +BTWinM5Text: + text_far _BTWinM5Text text_end -BTGreetingM6: - text_far UnknownText_0x1ec216 +BTGreetingM6Text: + text_far _BTGreetingM6Text text_end -BTLossM6: - text_far UnknownText_0x1ec238 +BTLossM6Text: + text_far _BTLossM6Text text_end -BTWinM6: - text_far UnknownText_0x1ec259 +BTWinM6Text: + text_far _BTWinM6Text text_end -BTGreetingM7: - text_far UnknownText_0x1ec27b +BTGreetingM7Text: + text_far _BTGreetingM7Text text_end -BTLossM7: - text_far UnknownText_0x1ec2a0 +BTLossM7Text: + text_far _BTLossM7Text text_end -BTWinM7: - text_far UnknownText_0x1ec2c0 +BTWinM7Text: + text_far _BTWinM7Text text_end -BTGreetingM8: - text_far UnknownText_0x1ec2d9 +BTGreetingM8Text: + text_far _BTGreetingM8Text text_end -BTLossM8: - text_far UnknownText_0x1ec2fe +BTLossM8Text: + text_far _BTLossM8Text text_end -BTWinM8: - text_far UnknownText_0x1ec320 +BTWinM8Text: + text_far _BTWinM8Text text_end -BTGreetingM9: - text_far UnknownText_0x1ec33f +BTGreetingM9Text: + text_far _BTGreetingM9Text text_end -BTLossM9: - text_far UnknownText_0x1ec36c +BTLossM9Text: + text_far _BTLossM9Text text_end -BTWinM9: - text_far UnknownText_0x1ec389 +BTWinM9Text: + text_far _BTWinM9Text text_end -BTGreetingM10: - text_far UnknownText_0x1ec3ad +BTGreetingM10Text: + text_far _BTGreetingM10Text text_end -BTLossM10: - text_far UnknownText_0x1ec3c5 +BTLossM10Text: + text_far _BTLossM10Text text_end -BTWinM10: - text_far UnknownText_0x1ec3e5 +BTWinM10Text: + text_far _BTWinM10Text text_end -BTGreetingM11: - text_far UnknownText_0x1ec402 +BTGreetingM11Text: + text_far _BTGreetingM11Text text_end -BTLossM11: - text_far UnknownText_0x1ec411 +BTLossM11Text: + text_far _BTLossM11Text text_end -BTWinM11: - text_far UnknownText_0x1ec41f +BTWinM11Text: + text_far _BTWinM11Text text_end -BTGreetingM12: - text_far UnknownText_0x1ec42e +BTGreetingM12Text: + text_far _BTGreetingM12Text text_end -BTLossM12: - text_far UnknownText_0x1ec461 +BTLossM12Text: + text_far _BTLossM12Text text_end -BTWinM12: - text_far UnknownText_0x1ec4a0 +BTWinM12Text: + text_far _BTWinM12Text text_end -BTGreetingM13: - text_far UnknownText_0x1ec4d6 +BTGreetingM13Text: + text_far _BTGreetingM13Text text_end -BTLossM13: - text_far UnknownText_0x1ec4f5 +BTLossM13Text: + text_far _BTLossM13Text text_end -BTWinM13: - text_far UnknownText_0x1ec512 +BTWinM13Text: + text_far _BTWinM13Text text_end -BTGreetingM14: - text_far UnknownText_0x1ec532 +BTGreetingM14Text: + text_far _BTGreetingM14Text text_end -BTLossM14: - text_far UnknownText_0x1ec54b +BTLossM14Text: + text_far _BTLossM14Text text_end -BTWinM14: - text_far UnknownText_0x1ec565 +BTWinM14Text: + text_far _BTWinM14Text text_end -BTGreetingM15: - text_far UnknownText_0x1ec580 +BTGreetingM15Text: + text_far _BTGreetingM15Text text_end -BTLossM15: - text_far UnknownText_0x1ec59d +BTLossM15Text: + text_far _BTLossM15Text text_end -BTWinM15: - text_far UnknownText_0x1ec5b5 +BTWinM15Text: + text_far _BTWinM15Text text_end -BTGreetingM16: - text_far UnknownText_0x1ec5d3 +BTGreetingM16Text: + text_far _BTGreetingM16Text text_end -BTLossM16: - text_far UnknownText_0x1ec5ee +BTLossM16Text: + text_far _BTLossM16Text text_end -BTWinM16: - text_far UnknownText_0x1ec60d +BTWinM16Text: + text_far _BTWinM16Text text_end -BTGreetingM17: - text_far UnknownText_0x1ec631 +BTGreetingM17Text: + text_far _BTGreetingM17Text text_end -BTLossM17: - text_far UnknownText_0x1ec651 +BTLossM17Text: + text_far _BTLossM17Text text_end -BTWinM17: - text_far UnknownText_0x1ec68f +BTWinM17Text: + text_far _BTWinM17Text text_end -BTGreetingM18: - text_far UnknownText_0x1ec6b1 +BTGreetingM18Text: + text_far _BTGreetingM18Text text_end -BTLossM18: - text_far UnknownText_0x1ec6d0 +BTLossM18Text: + text_far _BTLossM18Text text_end -BTWinM18: - text_far UnknownText_0x1ec708 +BTWinM18Text: + text_far _BTWinM18Text text_end -BTGreetingM19: - text_far UnknownText_0x1ec720 +BTGreetingM19Text: + text_far _BTGreetingM19Text text_end -BTLossM19: - text_far UnknownText_0x1ec73e +BTLossM19Text: + text_far _BTLossM19Text text_end -BTWinM19: - text_far UnknownText_0x1ec75b +BTWinM19Text: + text_far _BTWinM19Text text_end -BTGreetingM20: - text_far UnknownText_0x1ec77f +BTGreetingM20Text: + text_far _BTGreetingM20Text text_end -BTLossM20: - text_far UnknownText_0x1ec798 +BTLossM20Text: + text_far _BTLossM20Text text_end -BTWinM20: - text_far UnknownText_0x1ec7bb +BTWinM20Text: + text_far _BTWinM20Text text_end -BTGreetingM21: - text_far UnknownText_0x1ec7d8 +BTGreetingM21Text: + text_far _BTGreetingM21Text text_end -BTLossM21: - text_far UnknownText_0x1ec818 +BTLossM21Text: + text_far _BTLossM21Text text_end -BTWinM21: - text_far UnknownText_0x1ec837 +BTWinM21Text: + text_far _BTWinM21Text text_end -BTGreetingM22: - text_far UnknownText_0x1ec858 +BTGreetingM22Text: + text_far _BTGreetingM22Text text_end -BTLossM22: - text_far UnknownText_0x1ec876 +BTLossM22Text: + text_far _BTLossM22Text text_end -BTWinM22: - text_far UnknownText_0x1ec898 +BTWinM22Text: + text_far _BTWinM22Text text_end -BTGreetingM23: - text_far UnknownText_0x1ec8b1 +BTGreetingM23Text: + text_far _BTGreetingM23Text text_end -BTLossM23: - text_far UnknownText_0x1ec8d5 +BTLossM23Text: + text_far _BTLossM23Text text_end -BTWinM23: - text_far UnknownText_0x1ec8f0 +BTWinM23Text: + text_far _BTWinM23Text text_end -BTGreetingM24: - text_far UnknownText_0x1ec911 +BTGreetingM24Text: + text_far _BTGreetingM24Text text_end -BTLossM24: - text_far UnknownText_0x1ec928 +BTLossM24Text: + text_far _BTLossM24Text text_end -BTWinM24: - text_far UnknownText_0x1ec949 +BTWinM24Text: + text_far _BTWinM24Text text_end -BTGreetingM25: - text_far UnknownText_0x1ec969 +BTGreetingM25Text: + text_far _BTGreetingM25Text text_end -BTLossM25: - text_far UnknownText_0x1ec986 +BTLossM25Text: + text_far _BTLossM25Text text_end -BTWinM25: - text_far UnknownText_0x1ec99b +BTWinM25Text: + text_far _BTWinM25Text text_end -BTGreetingF1: - text_far UnknownText_0x1ec9bd +BTGreetingF1Text: + text_far _BTGreetingF1Text text_end -BTLossF1: - text_far UnknownText_0x1ec9d9 +BTLossF1Text: + text_far _BTLossF1Text text_end -BTWinF1: - text_far UnknownText_0x1ec9f7 +BTWinF1Text: + text_far _BTWinF1Text text_end -BTGreetingF2: - text_far UnknownText_0x1eca0a +BTGreetingF2Text: + text_far _BTGreetingF2Text text_end -BTLossF2: - text_far UnknownText_0x1eca2a +BTLossF2Text: + text_far _BTLossF2Text text_end -BTWinF2: - text_far UnknownText_0x1eca47 +BTWinF2Text: + text_far _BTWinF2Text text_end -BTGreetingF3: - text_far UnknownText_0x1eca64 +BTGreetingF3Text: + text_far _BTGreetingF3Text text_end -BTLossF3: - text_far UnknownText_0x1eca82 +BTLossF3Text: + text_far _BTLossF3Text text_end -BTWinF3: - text_far UnknownText_0x1eca9d +BTWinF3Text: + text_far _BTWinF3Text text_end -BTGreetingF4: - text_far UnknownText_0x1ecabf +BTGreetingF4Text: + text_far _BTGreetingF4Text text_end -BTLossF4: - text_far UnknownText_0x1ecade +BTLossF4Text: + text_far _BTLossF4Text text_end -BTWinF4: - text_far UnknownText_0x1ecafa +BTWinF4Text: + text_far _BTWinF4Text text_end -BTGreetingF5: - text_far UnknownText_0x1ecb19 +BTGreetingF5Text: + text_far _BTGreetingF5Text text_end -BTLossF5: - text_far UnknownText_0x1ecb37 +BTLossF5Text: + text_far _BTLossF5Text text_end -BTWinF5: - text_far UnknownText_0x1ecb55 +BTWinF5Text: + text_far _BTWinF5Text text_end -BTGreetingF6: - text_far UnknownText_0x1ecb70 +BTGreetingF6Text: + text_far _BTGreetingF6Text text_end -BTLossF6: - text_far UnknownText_0x1ecb92 +BTLossF6Text: + text_far _BTLossF6Text text_end -BTWinF6: - text_far UnknownText_0x1ecbb6 +BTWinF6Text: + text_far _BTWinF6Text text_end -BTGreetingF7: - text_far UnknownText_0x1ecbd9 +BTGreetingF7Text: + text_far _BTGreetingF7Text text_end -BTLossF7: - text_far UnknownText_0x1ecbf3 +BTLossF7Text: + text_far _BTLossF7Text text_end -BTWinF7: - text_far UnknownText_0x1ecc15 +BTWinF7Text: + text_far _BTWinF7Text text_end -BTGreetingF8: - text_far UnknownText_0x1ecc39 +BTGreetingF8Text: + text_far _BTGreetingF8Text text_end -BTLossF8: - text_far UnknownText_0x1ecc55 +BTLossF8Text: + text_far _BTLossF8Text text_end -BTWinF8: - text_far UnknownText_0x1ecc75 +BTWinF8Text: + text_far _BTWinF8Text text_end -BTGreetingF9: - text_far UnknownText_0x1ecc92 +BTGreetingF9Text: + text_far _BTGreetingF9Text text_end -BTLossF9: - text_far UnknownText_0x1ecca7 +BTLossF9Text: + text_far _BTLossF9Text text_end -BTWinF9: - text_far UnknownText_0x1eccc1 +BTWinF9Text: + text_far _BTWinF9Text text_end -BTGreetingF10: - text_far UnknownText_0x1eccd7 +BTGreetingF10Text: + text_far _BTGreetingF10Text text_end -BTLossF10: - text_far UnknownText_0x1eccef +BTLossF10Text: + text_far _BTLossF10Text text_end -BTWinF10: - text_far UnknownText_0x1ecd0e +BTWinF10Text: + text_far _BTWinF10Text text_end -BTGreetingF11: - text_far UnknownText_0x1ecd2b +BTGreetingF11Text: + text_far _BTGreetingF11Text text_end -BTLossF11: - text_far UnknownText_0x1ecd4d +BTLossF11Text: + text_far _BTLossF11Text text_end -BTWinF11: - text_far UnknownText_0x1ecd6b +BTWinF11Text: + text_far _BTWinF11Text text_end -BTGreetingF12: - text_far UnknownText_0x1ecd8d +BTGreetingF12Text: + text_far _BTGreetingF12Text text_end -BTLossF12: - text_far UnknownText_0x1ecdaf +BTLossF12Text: + text_far _BTLossF12Text text_end -BTWinF12: - text_far UnknownText_0x1ecdcf +BTWinF12Text: + text_far _BTWinF12Text text_end -BTGreetingF13: - text_far UnknownText_0x1ecded +BTGreetingF13Text: + text_far _BTGreetingF13Text text_end -BTLossF13: - text_far UnknownText_0x1ece0d +BTLossF13Text: + text_far _BTLossF13Text text_end -BTWinF13: - text_far UnknownText_0x1ece2a +BTWinF13Text: + text_far _BTWinF13Text text_end -BTGreetingF14: - text_far UnknownText_0x1ece4b +BTGreetingF14Text: + text_far _BTGreetingF14Text text_end -BTLossF14: - text_far UnknownText_0x1ece70 +BTLossF14Text: + text_far _BTLossF14Text text_end -BTWinF14: - text_far UnknownText_0x1ece8a +BTWinF14Text: + text_far _BTWinF14Text text_end -BTGreetingF15: - text_far UnknownText_0x1ecea8 +BTGreetingF15Text: + text_far _BTGreetingF15Text text_end -BTLossF15: - text_far UnknownText_0x1ecec9 +BTLossF15Text: + text_far _BTLossF15Text text_end -BTWinF15: - text_far UnknownText_0x1ecee8 +BTWinF15Text: + text_far _BTWinF15Text text_end diff --git a/engine/events/buena.asm b/engine/events/buena.asm index 3e78dfa91..ef8c70bfc 100644 --- a/engine/events/buena.asm +++ b/engine/events/buena.asm @@ -70,12 +70,12 @@ BuenaPrize: ld [wMenuSelection], a call Buena_PlacePrizeMenuBox call Buena_DisplayBlueCardBalance - ld hl, .Text_AskWhichPrize + ld hl, .BuenaAskWhichPrizeText call PrintText jr .okay .loop - ld hl, .Text_AskWhichPrize + ld hl, .BuenaAskWhichPrizeText call BuenaPrintText .okay @@ -89,7 +89,7 @@ BuenaPrize: ld a, [hl] ld [wNamedObjectIndexBuffer], a call GetItemName - ld hl, .Text_IsThatRight + ld hl, .BuenaIsThatRightText call BuenaPrintText call YesNoBox jr c, .loop @@ -121,17 +121,17 @@ BuenaPrize: jr .Purchase .InsufficientBalance: - ld hl, .Text_NotEnoughPoints + ld hl, .BuenaNotEnoughPointsText jr .print .BagFull: - ld hl, .Text_NoRoom + ld hl, .BuenaNoRoomText jr .print .Purchase: ld de, SFX_TRANSACTION call PlaySFX - ld hl, .Text_HereYouGo + ld hl, .BuenaHereYouGoText .print call BuenaPrintText @@ -140,40 +140,34 @@ BuenaPrize: .done call CloseWindow call CloseWindow - ld hl, .Text_PleaseComeBackAgain + ld hl, .BuenaComeAgainText call PrintText call JoyWaitAorB call PlayClickSFX ret -.Text_AskWhichPrize: - ; Which prize would you like? - text_far UnknownText_0x1c589f +.BuenaAskWhichPrizeText: + text_far _BuenaAskWhichPrizeText text_end -.Text_IsThatRight: - ; ? Is that right? - text_far UnknownText_0x1c58bc +.BuenaIsThatRightText: + text_far _BuenaIsThatRightText text_end -.Text_HereYouGo: - ; Here you go! - text_far UnknownText_0x1c58d1 +.BuenaHereYouGoText: + text_far _BuenaHereYouGoText text_end -.Text_NotEnoughPoints: - ; You don't have enough points. - text_far UnknownText_0x1c58e0 +.BuenaNotEnoughPointsText: + text_far _BuenaNotEnoughPointsText text_end -.Text_NoRoom: - ; You have no room for it. - text_far UnknownText_0x1c58ff +.BuenaNoRoomText: + text_far _BuenaNoRoomText text_end -.Text_PleaseComeBackAgain: - ; Oh. Please come back again! - text_far UnknownText_0x1c591a +.BuenaComeAgainText: + text_far _BuenaComeAgainText text_end Buena_DisplayBlueCardBalance: diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm index 71e6f1f62..b2cc044aa 100644 --- a/engine/events/bug_contest/caught_mon.asm +++ b/engine/events/bug_contest/caught_mon.asm @@ -14,7 +14,7 @@ BugContest_SetCaughtContestMon: ld a, [wTempEnemyMonSpecies] ld [wNamedObjectIndexBuffer], a call GetPokemonName - ld hl, .caughttext + ld hl, .ContestCaughtMonText call PrintText ret @@ -32,7 +32,6 @@ BugContest_SetCaughtContestMon: ld hl, wContestMon jp GeneratePartyMonStats -.caughttext - ; Caught @ ! - text_far UnknownText_0x1c10c0 +.ContestCaughtMonText: + text_far _ContestCaughtMonText text_end diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index 3e8800739..6a3f77994 100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -18,26 +18,24 @@ BugCatchingContestBattleScript:: BugCatchingContestOverScript:: playsound SFX_ELEVATOR_END opentext - writetext BugCatchingContestText_BeeepTimesUp + writetext BugCatchingContestTimeUpText waitbutton sjump BugCatchingContestReturnToGateScript BugCatchingContestOutOfBallsScript: playsound SFX_ELEVATOR_END opentext - writetext BugCatchingContestText_ContestIsOver + writetext BugCatchingContestIsOverText waitbutton BugCatchingContestReturnToGateScript: closetext jumpstd bugcontestresultswarp -BugCatchingContestText_BeeepTimesUp: - ; ANNOUNCER: BEEEP! Time's up! - text_far UnknownText_0x1bd2ca +BugCatchingContestTimeUpText: + text_far _BugCatchingContestTimeUpText text_end -BugCatchingContestText_ContestIsOver: - ; ANNOUNCER: The Contest is over! - text_far UnknownText_0x1bd2e7 +BugCatchingContestIsOverText: + text_far _BugCatchingContestIsOverText text_end diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index 6969bc893..dc5518594 100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm @@ -67,7 +67,7 @@ DisplayCaughtContestMonStats: ld de, wEnemyMonMaxHP call PrintNum - ld hl, SwitchMonText + ld hl, ContestAskSwitchText call PrintText pop af @@ -86,19 +86,17 @@ DisplayCaughtContestMonStats: .This: db " THIS <PKMN> @" -SwitchMonText: - ; Switch #MON? - text_far UnknownText_0x1c10cf +ContestAskSwitchText: + text_far _ContestAskSwitchText text_end DisplayAlreadyCaughtText: call GetPokemonName - ld hl, .AlreadyCaughtText + ld hl, .ContestAlreadyCaughtText jp PrintText -.AlreadyCaughtText: - ; You already caught a @ . - text_far UnknownText_0x1c10dd +.ContestAlreadyCaughtText: + text_far _ContestAlreadyCaughtText text_end DummyPredef2F: diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index a166269d5..9f8c0c5c2 100644 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -7,66 +7,63 @@ _BugContestJudging: ld a, [wBugContestThirdPlaceMon] ld [wNamedObjectIndexBuffer], a call GetPokemonName - ld hl, BugContest_ThirdPlaceText + ld hl, ContestJudging_ThirdPlaceText call PrintText ld a, [wBugContestSecondPlaceWinnerID] call LoadContestantName ld a, [wBugContestSecondPlaceMon] ld [wNamedObjectIndexBuffer], a call GetPokemonName - ld hl, BugContest_SecondPlaceText + ld hl, ContestJudging_SecondPlaceText call PrintText ld a, [wBugContestFirstPlaceWinnerID] call LoadContestantName ld a, [wBugContestFirstPlaceMon] ld [wNamedObjectIndexBuffer], a call GetPokemonName - ld hl, BugContest_FirstPlaceText + ld hl, ContestJudging_FirstPlaceText call PrintText jp BugContest_GetPlayersResult -BugContest_FirstPlaceText: - text_far ContestJudging_FirstPlaceText +ContestJudging_FirstPlaceText: + text_far _ContestJudging_FirstPlaceText text_asm ld de, SFX_1ST_PLACE call PlaySFX call WaitSFX - ld hl, BugContest_FirstPlaceScoreText + ld hl, ContestJudging_FirstPlaceScoreText ret -BugContest_FirstPlaceScoreText: - ; The winning score was @ points! - text_far ContestJudging_FirstPlaceScoreText +ContestJudging_FirstPlaceScoreText: + text_far _ContestJudging_FirstPlaceScoreText text_end -BugContest_SecondPlaceText: +ContestJudging_SecondPlaceText: ; Placing second was @ , who caught a @ !@ @ - text_far ContestJudging_SecondPlaceText + text_far _ContestJudging_SecondPlaceText text_asm ld de, SFX_2ND_PLACE call PlaySFX call WaitSFX - ld hl, BugContest_SecondPlaceScoreText + ld hl, ContestJudging_SecondPlaceScoreText ret -BugContest_SecondPlaceScoreText: - ; The score was @ points! - text_far ContestJudging_SecondPlaceScoreText +ContestJudging_SecondPlaceScoreText: + text_far _ContestJudging_SecondPlaceScoreText text_end -BugContest_ThirdPlaceText: +ContestJudging_ThirdPlaceText: ; Placing third was @ , who caught a @ !@ @ - text_far ContestJudging_ThirdPlaceText + text_far _ContestJudging_ThirdPlaceText text_asm ld de, SFX_3RD_PLACE call PlaySFX call WaitSFX - ld hl, BugContest_ThirdPlaceScoreText + ld hl, ContestJudging_ThirdPlaceScoreText ret -BugContest_ThirdPlaceScoreText: - ; The score was @ points! - text_far ContestJudging_ThirdPlaceScoreText +ContestJudging_ThirdPlaceScoreText: + text_far _ContestJudging_ThirdPlaceScoreText text_end LoadContestantName: diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index 34e896778..a3c1ccfd1 100644 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -166,8 +166,7 @@ DayCareAskDepositPokemon: scf ret -.DummyText: - ; +.DaycareDummyText: text_far _DaycareDummyText text_end @@ -207,7 +206,7 @@ DayCare_AskWithdrawBreedMon: jr c, .not_enough_money ld a, [wPartyCount] cp PARTY_LENGTH - jr nc, .PartyFull + jr nc, .party_full and a ret @@ -221,7 +220,7 @@ DayCare_AskWithdrawBreedMon: scf ret -.PartyFull: +.party_full ld a, DAYCARETEXT_PARTY_FULL scf ret @@ -274,124 +273,104 @@ PrintDayCareText: .TextTable: ; entries correspond to DAYCARETEXT_* constants - dw .DayCareManIntro ; 00 - dw .DayCareManOddEgg ; 01 - dw .DayCareLadyIntro ; 02 - dw .DayCareLadyOddEgg ; 03 - dw .WhichOne ; 04 - dw .OkayIllRaiseYourMon ; 05 - dw .CantAcceptEgg ; 06 - dw .JustOneMon ; 07 - dw .LastHealthyMon ; 08 - dw .ComeBackForItLater ; 09 - dw .RemoveMail ; 0a - dw .AreWeGeniusesOrWhat ; 0b - dw .AskRetrieveMon ; 0c - dw .PerfectHeresYourMon ; 0d - dw .GotBackMon ; 0e - dw .ImmediatelyWithdrawMon ; 0f - dw .PartyFull ; 10 - dw .NotEnoughMoney ; 11 - dw .OhFineThen ; 12 - dw .ComeAgain ; 13 - -.DayCareManIntro: - ; I'm the DAY-CARE MAN. Want me to raise a #MON? + dw .DayCareManIntroText ; 00 + dw .DayCareManOddEggText ; 01 + dw .DayCareLadyIntroText ; 02 + dw .DayCareLadyOddEggText ; 03 + dw .WhatShouldIRaiseText ; 04 + dw .IllRaiseYourMonText ; 05 + dw .CantAcceptEggText ; 06 + dw .OnlyOneMonText ; 07 + dw .LastHealthyMonText ; 08 + dw .ComeBackLaterText ; 09 + dw .RemoveMailText ; 0a + dw .AreWeGeniusesText ; 0b + dw .YourMonHasGrownText ; 0c + dw .PerfectHeresYourMonText ; 0d + dw .GotBackMonText ; 0e + dw .BackAlreadyText ; 0f + dw .HaveNoRoomText ; 10 + dw .NotEnoughMoneyText ; 11 + dw .OhFineThenText ; 12 + dw .ComeAgainText ; 13 + +.DayCareManIntroText: text_far _DayCareManIntroText text_end -.DayCareManOddEgg: - ; I'm the DAY-CARE MAN. Do you know about EGGS? I was raising #MON with my wife, you see. We were shocked to find an EGG! How incredible is that? So, want me to raise a #MON? +.DayCareManOddEggText: text_far _DayCareManOddEggText text_end -.DayCareLadyIntro: - ; I'm the DAY-CARE LADY. Should I raise a #MON for you? +.DayCareLadyIntroText: text_far _DayCareLadyIntroText text_end -.DayCareLadyOddEgg: - ; I'm the DAY-CARE LADY. Do you know about EGGS? My husband and I were raising some #MON, you see. We were shocked to find an EGG! How incredible could that be? Should I raise a #MON for you? +.DayCareLadyOddEggText: text_far _DayCareLadyOddEggText text_end -.WhichOne: - ; What should I raise for you? +.WhatShouldIRaiseText: text_far _WhatShouldIRaiseText text_end -.JustOneMon: - ; Oh? But you have just one #MON. +.OnlyOneMonText: text_far _OnlyOneMonText text_end -.CantAcceptEgg: - ; Sorry, but I can't accept an EGG. - text_far _CantRaiseEggText +.CantAcceptEggText: + text_far _CantAcceptEggText text_end -.RemoveMail: - ; Remove MAIL before you come see me. +.RemoveMailText: text_far _RemoveMailText text_end -.LastHealthyMon: - ; If you give me that, what will you battle with? +.LastHealthyMonText: text_far _LastHealthyMonText text_end -.OkayIllRaiseYourMon: - ; OK. I'll raise your @ . +.IllRaiseYourMonText: text_far _IllRaiseYourMonText text_end -.ComeBackForItLater: - ; Come back for it later. +.ComeBackLaterText: text_far _ComeBackLaterText text_end -.AreWeGeniusesOrWhat: - ; Are we geniuses or what? Want to see your @ ? +.AreWeGeniusesText: text_far _AreWeGeniusesText text_end -.AskRetrieveMon: - ; Your @ has grown a lot. By level, it's grown by @ . If you want your #MON back, it will cost ¥@ . +.YourMonHasGrownText: text_far _YourMonHasGrownText text_end -.PerfectHeresYourMon: - ; Perfect! Here's your #MON. +.PerfectHeresYourMonText: text_far _PerfectHeresYourMonText text_end -.GotBackMon: - ; got back @ . +.GotBackMonText: text_far _GotBackMonText text_end -.ImmediatelyWithdrawMon: - ; Huh? Back already? Your @ needs a little more time with us. If you want your #MON back, it will cost ¥100. +.BackAlreadyText: text_far _BackAlreadyText text_end -.PartyFull: - ; You have no room for it. +.HaveNoRoomText: text_far _HaveNoRoomText text_end -.NotEnoughMoney: - ; You don't have enough money. - text_far _DCNotEnoughMoneyText +.NotEnoughMoneyText: + text_far _NotEnoughMoneyText text_end -.OhFineThen: - ; Oh, fine then. +.OhFineThenText: text_far _OhFineThenText text_end -.ComeAgain: - ; Come again. +.ComeAgainText: text_far _ComeAgainText text_end @@ -399,17 +378,16 @@ DayCareManOutside: ld hl, wDayCareMan bit DAYCAREMAN_HAS_EGG_F, [hl] jr nz, .AskGiveEgg - ld hl, .NotYet + ld hl, .NotYetText call PrintText ret -.NotYet: - ; Not yet… +.NotYetText: text_far _NotYetText text_end .AskGiveEgg: - ld hl, .IntroText + ld hl, .FoundAnEggText call PrintText call YesNoBox jr c, .Declined @@ -420,13 +398,13 @@ DayCareManOutside: ld hl, wDayCareMan res DAYCAREMAN_HAS_EGG_F, [hl] call DayCare_InitBreeding - ld hl, .GotEggText + ld hl, .ReceivedEggText call PrintText ld de, SFX_GET_EGG call PlaySFX ld c, 120 call DelayFrames - ld hl, .TakeGoodCareOfItText + ld hl, .TakeGoodCareOfEggText jr .Load0 .Declined: @@ -439,34 +417,29 @@ DayCareManOutside: ret .PartyFull: - ld hl, .PartyFullText + ld hl, .NoRoomForEggText call PrintText ld a, TRUE ld [wScriptVar], a ret -.IntroText: - ; Ah, it's you! We were raising your #MON, and my goodness, were we surprised! Your #MON had an EGG! We don't know how it got there, but your #MON had it. You want it? +.FoundAnEggText: text_far _FoundAnEggText text_end -.GotEggText: - ; received the EGG! +.ReceivedEggText: text_far _ReceivedEggText text_end -.TakeGoodCareOfItText: - ; Take good care of it. +.TakeGoodCareOfEggText: text_far _TakeGoodCareOfEggText text_end .IllKeepItThanksText: - ; Well then, I'll keep it. Thanks! - text_far _RefuseEggText + text_far _IllKeepItThanksText text_end -.PartyFullText: - ; You have no room in your party. Come back later. +.NoRoomForEggText: text_far _NoRoomForEggText text_end diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 8394cf442..e51b6be15 100644 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -115,7 +115,7 @@ Elevator_GoToFloor: Elevator_AskWhichFloor: call LoadStandardMenuHeader - ld hl, Elevator_WhichFloorText + ld hl, AskFloorElevatorText call PrintText call Elevator_GetCurrentFloorText ld hl, Elevator_MenuHeader @@ -137,9 +137,8 @@ Elevator_AskWhichFloor: scf ret -Elevator_WhichFloorText: - ; Which floor? - text_far UnknownText_0x1bd2bc +AskFloorElevatorText: + text_far _AskFloorElevatorText text_end Elevator_GetCurrentFloorText: diff --git a/engine/events/itemfinder.asm b/engine/events/itemfinder.asm index 4d9c9c814..3665187c8 100644 --- a/engine/events/itemfinder.asm +++ b/engine/events/itemfinder.asm @@ -30,23 +30,21 @@ ItemFinder: reloadmappart special UpdateTimePals callasm .ItemfinderSound - writetext .Text_FoundSomething + writetext .ItemfinderItemNearbyText closetext end .Script_FoundNothing: reloadmappart special UpdateTimePals - writetext .Text_FoundNothing + writetext .ItemfinderNopeText closetext end -.Text_FoundSomething: - ; Yes! ITEMFINDER indicates there's an item nearby. - text_far UnknownText_0x1c0a77 +.ItemfinderItemNearbyText: + text_far _ItemfinderItemNearbyText text_end -.Text_FoundNothing: - ; Nope! ITEMFINDER isn't responding. - text_far UnknownText_0x1c0aa9 +.ItemfinderNopeText: + text_far _ItemfinderNopeText text_end diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index 3dd700dbb..3da57db2b 100644 --- a/engine/events/kurt.asm +++ b/engine/events/kurt.asm @@ -1,20 +1,18 @@ Kurt_PrintTextWhichApricorn: - ld hl, .Text + ld hl, .WhichApricornText call PrintText ret -.Text: - ; Which APRICORN should I use? +.WhichApricornText: text_far _WhichApricornText text_end Kurt_PrintTextHowMany: - ld hl, .Text + ld hl, .HowManyShouldIMakeText call PrintText ret -.Text: - ; How many should I make? +.HowManyShouldIMakeText: text_far _HowManyShouldIMakeText text_end diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 928556d6c..36dbf3d0e 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -110,10 +110,10 @@ CheckForLuckyNumberWinners: ld a, [wCurPartySpecies] ld [wNamedObjectIndexBuffer], a call GetPokemonName - ld hl, .FoundPartymonText + ld hl, .LuckyNumberMatchPartyText pop af jr z, .print - ld hl, .FoundBoxmonText + ld hl, .LuckyNumberMatchPCText .print jp PrintText @@ -206,14 +206,12 @@ CheckForLuckyNumberWinners: dba sBox13 dba sBox14 -.FoundPartymonText: - ; Congratulations! We have a match with the ID number of @ in your party. - text_far UnknownText_0x1c1261 +.LuckyNumberMatchPartyText: + text_far _LuckyNumberMatchPartyText text_end -.FoundBoxmonText: - ; Congratulations! We have a match with the ID number of @ in your PC BOX. - text_far UnknownText_0x1c12ae +.LuckyNumberMatchPCText: + text_far _LuckyNumberMatchPCText text_end PrintTodaysLuckyNumber: diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 0c41713dd..2450e8d02 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -29,7 +29,7 @@ CheckMagikarpLength: call CalcMagikarpLength call PrintMagikarpLength farcall StubbedTrainerRankings_MagikarpLength - ld hl, .MeasureItText + ld hl, .MagikarpGuruMeasureText call PrintText ; Did we beat the record? @@ -71,9 +71,8 @@ CheckMagikarpLength: ld [wScriptVar], a ret -.MeasureItText: - ; Let me measure that MAGIKARP. …Hm, it measures @ . - text_far UnknownText_0x1c1203 +.MagikarpGuruMeasureText: + text_far _MagikarpGuruMeasureText text_end Magikarp_LoadFeetInchesChars: @@ -307,11 +306,10 @@ MagikarpHouseSign: ld a, [wBestMagikarpLengthInches] ld [wMagikarpLength + 1], a call PrintMagikarpLength - ld hl, .CurrentRecordtext + ld hl, .KarpGuruRecordText call PrintText ret -.CurrentRecordtext: - ; "CURRENT RECORD" - text_far UnknownText_0x1c123a +.KarpGuruRecordText: + text_far _KarpGuruRecordText text_end diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm index 653a9eb35..e90063327 100644 --- a/engine/events/misc_scripts.asm +++ b/engine/events/misc_scripts.asm @@ -11,7 +11,7 @@ FindItemInBallScript:: iffalse .no_room disappear LAST_TALKED opentext - writetext .text_found + writetext .FoundItemText playsound SFX_ITEM pause 60 itemnotify @@ -20,21 +20,19 @@ FindItemInBallScript:: .no_room opentext - writetext .text_found + writetext .FoundItemText waitbutton - writetext .text_bag_full + writetext .CantCarryItemText waitbutton closetext end -.text_found - ; found @ ! - text_far UnknownText_0x1c0a1c +.FoundItemText: + text_far _FoundItemText text_end -.text_bag_full - ; But can't carry any more items. - text_far UnknownText_0x1c0a2c +.CantCarryItemText: + text_far _CantCarryItemText text_end .TryReceiveItem: diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm index 36e4172a7..4889b30aa 100644 --- a/engine/events/misc_scripts_2.asm +++ b/engine/events/misc_scripts_2.asm @@ -1,12 +1,11 @@ RepelWoreOffScript:: opentext - writetext .text + writetext .RepelWoreOffText waitbutton closetext end -.text - ; REPEL's effect wore off. +.RepelWoreOffText: text_far _RepelWoreOffText text_end @@ -14,7 +13,7 @@ HiddenItemScript:: opentext readmem wHiddenItemID getitemname STRING_BUFFER_3, USE_SCRIPT_VAR - writetext .found_text + writetext .PlayerFoundItemText giveitem ITEM_FROM_MEM iffalse .bag_full callasm SetMemEvent @@ -24,20 +23,18 @@ HiddenItemScript:: .bag_full buttonsound - writetext .no_room_text + writetext .ButNoSpaceText waitbutton .finish closetext end -.found_text - ; found @ ! +.PlayerFoundItemText: text_far _PlayerFoundItemText text_end -.no_room_text - ; But has no space left… +.ButNoSpaceText: text_far _ButNoSpaceText text_end diff --git a/engine/events/mom.asm b/engine/events/mom.asm index 9a3c107e0..5d62a1693 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -38,8 +38,8 @@ BankOfMom: dw .StoreMoney dw .TakeMoney dw .StopOrStartSavingMoney - dw .AskDST dw .JustDoWhatYouCan + dw .AskDST .CheckIfBankInitialized: ld a, [wMomSavingMoney] @@ -58,11 +58,11 @@ BankOfMom: ret .InitializeBank: - ld hl, UnknownText_0x16649 + ld hl, MomLeavingText1 call PrintText call YesNoBox jr c, .DontSaveMoney - ld hl, UnknownText_0x1664e + ld hl, MomLeavingText2 call PrintText ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F) jr .done_1 @@ -72,14 +72,14 @@ BankOfMom: .done_1 ld [wMomSavingMoney], a - ld hl, UnknownText_0x16653 + ld hl, MomLeavingText3 call PrintText ld a, $8 ld [wJumptableIndex], a ret .IsThisAboutYourMoney: - ld hl, UnknownText_0x16658 + ld hl, MomIsThisAboutYourMoneyText call PrintText call YesNoBox jr c, .nope @@ -95,7 +95,7 @@ BankOfMom: ret .AccessBankOfMom: - ld hl, UnknownText_0x1665d + ld hl, MomBankWhatDoYouWantToDoText call PrintText call LoadStandardMenuHeader ld hl, MenuHeader_0x166b5 @@ -131,7 +131,7 @@ BankOfMom: ret .StoreMoney: - ld hl, UnknownText_0x16662 + ld hl, MomStoreMoneyText call PrintText xor a ld hl, wStringBuffer2 @@ -155,7 +155,7 @@ BankOfMom: ld de, wMoney ld bc, wStringBuffer2 farcall CompareMoney - jr c, .DontHaveThatMuchToDeposit + jr c, .InsufficientFundsInWallet ld hl, wStringBuffer2 ld de, wStringBuffer2 + 3 ld bc, 3 @@ -163,7 +163,7 @@ BankOfMom: ld bc, wMomsMoney ld de, wStringBuffer2 farcall GiveMoney - jr c, .CantDepositThatMuch + jr c, .NotEnoughRoomInBank ld bc, wStringBuffer2 + 3 ld de, wMoney farcall TakeMoney @@ -174,18 +174,18 @@ BankOfMom: ld de, SFX_TRANSACTION call PlaySFX call WaitSFX - ld hl, UnknownText_0x1668a + ld hl, MomStoredMoneyText call PrintText ld a, $8 jr .done_4 -.DontHaveThatMuchToDeposit: - ld hl, UnknownText_0x1667b +.InsufficientFundsInWallet: + ld hl, MomInsufficientFundsInWalletText call PrintText ret -.CantDepositThatMuch: - ld hl, UnknownText_0x16680 +.NotEnoughRoomInBank: + ld hl, MomNotEnoughRoomInBankText call PrintText ret @@ -197,7 +197,7 @@ BankOfMom: ret .TakeMoney: - ld hl, UnknownText_0x16667 + ld hl, MomTakeMoneyText call PrintText xor a ld hl, wStringBuffer2 @@ -240,18 +240,18 @@ BankOfMom: ld de, SFX_TRANSACTION call PlaySFX call WaitSFX - ld hl, UnknownText_0x1668f + ld hl, MomTakenMoneyText call PrintText ld a, $8 jr .done_5 .InsufficientFundsInBank: - ld hl, UnknownText_0x16671 + ld hl, MomHaventSavedThatMuchText call PrintText ret .NotEnoughRoomInWallet: - ld hl, UnknownText_0x16676 + ld hl, MomNotEnoughRoomInWalletText call PrintText ret @@ -263,13 +263,13 @@ BankOfMom: ret .StopOrStartSavingMoney: - ld hl, UnknownText_0x1666c + ld hl, MomSaveMoneyText call PrintText call YesNoBox jr c, .StopSavingMoney ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F) ld [wMomSavingMoney], a - ld hl, UnknownText_0x16685 + ld hl, MomStartSavingMoneyText call PrintText ld a, $8 ld [wJumptableIndex], a @@ -282,11 +282,11 @@ BankOfMom: ld [wJumptableIndex], a ret -.AskDST: - ld hl, UnknownText_0x16694 +.JustDoWhatYouCan: + ld hl, MomJustDoWhatYouCanText call PrintText -.JustDoWhatYouCan: +.AskDST: ld hl, wJumptableIndex set 7, [hl] ret @@ -309,13 +309,13 @@ DSTChecks: .LostBooklet: call .ClearBox bccoord 1, 14 - ld hl, .Text_AdjustClock + ld hl, .TimesetAskAdjustDSTText call PlaceHLTextAtBC call YesNoBox ret c call .ClearBox bccoord 1, 14 - ld hl, .Text_LostInstructionBooklet + ld hl, .MomLostGearBookletText call PlaceHLTextAtBC ret @@ -325,7 +325,7 @@ DSTChecks: ld a, [wDST] bit 7, a jr z, .SetDST - ld hl, .Text_IsDSTOver + ld hl, .TimesetAskNotDSTText call PlaceHLTextAtBC call YesNoBox ret c @@ -335,12 +335,12 @@ DSTChecks: call .SetClockBack call .ClearBox bccoord 1, 14 - ld hl, .Text_SetClockBack + ld hl, .TimesetNotDSTText call PlaceHLTextAtBC ret .SetDST: - ld hl, .Text_SwitchToDST + ld hl, .TimesetAskDSTText call PlaceHLTextAtBC call YesNoBox ret c @@ -350,7 +350,7 @@ DSTChecks: call .SetClockForward call .ClearBox bccoord 1, 14 - ld hl, .Text_SetClockForward + ld hl, .TimesetDSTText call PlaceHLTextAtBC ret @@ -389,35 +389,28 @@ DSTChecks: call ClearBox ret -.Text_AdjustClock: - ; Do you want to adjust your clock for Daylight Saving Time? - text_far UnknownText_0x1c6095 +.TimesetAskAdjustDSTText: + text_far _TimesetAskAdjustDSTText text_end -.Text_LostInstructionBooklet: - ; I lost the instruction booklet for the POKéGEAR. - ; Come back again in a while. - text_far UnknownText_0x1c60d1 +.MomLostGearBookletText: + text_far _MomLostGearBookletText text_end -.Text_SwitchToDST: - ; Do you want to switch to Daylight Saving Time? - text_far UnknownText_0x1c6000 +.TimesetAskDSTText: + text_far _TimesetAskDSTText text_end -.Text_SetClockForward: - ; I set the clock forward by one hour. - text_far UnknownText_0x1c6030 +.TimesetDSTText: + text_far _TimesetDSTText text_end -.Text_IsDSTOver: - ; Is Daylight Saving Time over? - text_far UnknownText_0x1c6056 +.TimesetAskNotDSTText: + text_far _TimesetAskNotDSTText text_end -.Text_SetClockBack: - ; I put the clock back one hour. - text_far UnknownText_0x1c6075 +.TimesetNotDSTText: + text_far _TimesetNotDSTText text_end Mom_SetUpWithdrawMenu: @@ -590,84 +583,68 @@ Mom_WithdrawDepositMenuJoypad: dt 90 dt 9 -UnknownText_0x16649: - ; Wow, that's a cute #MON. Where did you get it? … So, you're leaving on an adventure… OK! I'll help too. But what can I do for you? I know! I'll save money for you. On a long journey, money's important. Do you want me to save your money? +MomLeavingText1: text_far _MomLeavingText1 text_end -UnknownText_0x1664e: - ; OK, I'll take care of your money. +MomLeavingText2: text_far _MomLeavingText2 text_end -UnknownText_0x16653: - ; Be careful. #MON are your friends. You need to work as a team. Now, go on! +MomLeavingText3: text_far _MomLeavingText3 text_end -UnknownText_0x16658: - ; Hi! Welcome home! You're trying very hard, I see. I've kept your room tidy. Or is this about your money? - text_far _MomVisitingText1 +MomIsThisAboutYourMoneyText: + text_far _MomIsThisAboutYourMoneyText text_end -UnknownText_0x1665d: - ; What do you want to do? - text_far _MomVisitingText2 +MomBankWhatDoYouWantToDoText: + text_far _MomBankWhatDoYouWantToDoText text_end -UnknownText_0x16662: - ; How much do you want to save? - text_far _MomVisitingText3 +MomStoreMoneyText: + text_far _MomStoreMoneyText text_end -UnknownText_0x16667: - ; How much do you want to take? - text_far _MomVisitingText4 +MomTakeMoneyText: + text_far _MomTakeMoneyText text_end -UnknownText_0x1666c: - ; Do you want to save some money? - text_far _MomVisitingText5 +MomSaveMoneyText: + text_far _MomSaveMoneyText text_end -UnknownText_0x16671: - ; You haven't saved that much. - text_far _MomVisitingText6 +MomHaventSavedThatMuchText: + text_far _MomHaventSavedThatMuchText text_end -UnknownText_0x16676: - ; You can't take that much. - text_far _MomVisitingText7 +MomNotEnoughRoomInWalletText: + text_far _MomNotEnoughRoomInWalletText text_end -UnknownText_0x1667b: - ; You don't have that much. - text_far _MomVisitingText8 +MomInsufficientFundsInWalletText: + text_far _MomInsufficientFundsInWalletText text_end -UnknownText_0x16680: - ; You can't save that much. - text_far _MomVisitingText9 +MomNotEnoughRoomInBankText: + text_far _MomNotEnoughRoomInBankText text_end -UnknownText_0x16685: - ; OK, I'll save your money. Trust me! , stick with it! - text_far _MomVisitingText10 +MomStartSavingMoneyText: + text_far _MomStartSavingMoneyText text_end -UnknownText_0x1668a: - ; Your money's safe here! Get going! - text_far _MomVisitingText11 +MomStoredMoneyText: + text_far _MomStoredMoneyText text_end -UnknownText_0x1668f: - ; , don't give up! - text_far _MomVisitingText12 +MomTakenMoneyText: + text_far _MomTakenMoneyText text_end -UnknownText_0x16694: - ; Just do what you can. - text_far _MomVisitingText13 +MomJustDoWhatYouCanText: + text_far _MomJustDoWhatYouCanText text_end Mom_SavedString: diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm index 052082395..aa26fd5c0 100644 --- a/engine/events/mom_phone.asm +++ b/engine/events/mom_phone.asm @@ -163,17 +163,17 @@ Mom_GetScriptPointer: ret .ItemScript: - writetext _MomText_HiHowAreYou - writetext _MomText_FoundAnItem - writetext _MomText_BoughtWithYourMoney - writetext _MomText_ItsInPC + writetext MomHiHowAreYouText + writetext MomFoundAnItemText + writetext MomBoughtWithYourMoneyText + writetext MomItsInPCText end .DollScript: - writetext _MomText_HiHowAreYou - writetext _MomText_FoundADoll - writetext _MomText_BoughtWithYourMoney - writetext _MomText_ItsInRoom + writetext MomHiHowAreYouText + writetext MomFoundADollText + writetext MomBoughtWithYourMoneyText + writetext MomItsInYourRoomText end GetItemFromMom: @@ -206,34 +206,28 @@ INCLUDE "data/items/mom_phone.asm" db 0, 0, 0 ; unused -_MomText_HiHowAreYou: - ; Hi, ! How are you? - text_far _MomShoppingText1 +MomHiHowAreYouText: + text_far _MomHiHowAreYouText text_end -_MomText_FoundAnItem: - ; I found a useful item shopping, so - text_far _MomShoppingText2 +MomFoundAnItemText: + text_far _MomFoundAnItemText text_end -_MomText_BoughtWithYourMoney: - ; I bought it with your money. Sorry! - text_far _MomShoppingText3 +MomBoughtWithYourMoneyText: + text_far _MomBoughtWithYourMoneyText text_end -_MomText_ItsInPC: - ; It's in your PC. You'll like it! - text_far _MomShoppingText4 +MomItsInPCText: + text_far _MomItsInPCText text_end -_MomText_FoundADoll: - ; While shopping today, I saw this adorable doll, so - text_far _MomShoppingText5 +MomFoundADollText: + text_far _MomFoundADollText text_end -_MomText_ItsInRoom: - ; It's in your room. You'll love it! - text_far _MomShoppingText6 +MomItsInYourRoomText: + text_far _MomItsInYourRoomText text_end db 0 ; unused diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm index 7860ab3ae..f9f83fab6 100644 --- a/engine/events/move_deleter.asm +++ b/engine/events/move_deleter.asm @@ -1,9 +1,9 @@ MoveDeletion: - ld hl, .IntroText + ld hl, .DeleterIntroText call PrintText call YesNoBox jr c, .declined - ld hl, .AskWhichMonText + ld hl, .DeleterAskWhichMonText call PrintText farcall SelectMonFromParty jr c, .declined @@ -17,7 +17,7 @@ MoveDeletion: ld a, [hl] and a jr z, .onlyonemove - ld hl, .AskWhichMoveText + ld hl, .DeleterAskWhichMoveText call PrintText call LoadStandardMenuHeader farcall ChooseMoveToDelete @@ -30,7 +30,7 @@ MoveDeletion: ld a, [wCurSpecies] ld [wNamedObjectIndexBuffer], a call GetMoveName - ld hl, .ConfirmDeleteText + ld hl, .AskDeleteMoveText call PrintText call YesNoBox pop bc @@ -40,63 +40,55 @@ MoveDeletion: ld de, SFX_MOVE_DELETED call PlaySFX call WaitSFX - ld hl, .MoveDeletedText + ld hl, .DeleterForgotMoveText call PrintText ret .egg - ld hl, .EggText + ld hl, .MailEggText call PrintText ret .declined - ld hl, .DeclinedDeletionText + ld hl, .DeleterNoComeAgainText call PrintText ret .onlyonemove - ld hl, .OnlyOneMoveText + ld hl, .MoveKnowsOneText call PrintText ret -.OnlyOneMoveText: - ; That #MON knows only one move. - text_far UnknownText_0x1c5eba +.MoveKnowsOneText: + text_far _MoveKnowsOneText text_end -.ConfirmDeleteText: - ; Oh, make it forget @ ? - text_far UnknownText_0x1c5eda +.AskDeleteMoveText: + text_far _AskDeleteMoveText text_end -.MoveDeletedText: - ; Done! Your #MON forgot the move. - text_far UnknownText_0x1c5ef5 +.DeleterForgotMoveText: + text_far _DeleterForgotMoveText text_end -.EggText: - ; An EGG doesn't know any moves! - text_far UnknownText_0x1c5f17 +.MailEggText: + text_far _DeleterEggText text_end -.DeclinedDeletionText: - ; No? Come visit me again. - text_far UnknownText_0x1c5f36 +.DeleterNoComeAgainText: + text_far _DeleterNoComeAgainText text_end -.AskWhichMoveText: - ; Which move should it forget, then? - text_far UnknownText_0x1c5f50 +.DeleterAskWhichMoveText: + text_far _DeleterAskWhichMoveText text_end -.IntroText: - ; Um… Oh, yes, I'm the MOVE DELETER. I can make #MON forget moves. Shall I make a #MON forget? - text_far UnknownText_0x1c5f74 +.DeleterIntroText: + text_far _DeleterIntroText text_end -.AskWhichMonText: - ; Which #MON? - text_far UnknownText_0x1c5fd1 +.DeleterAskWhichMonText: + text_far _DeleterAskWhichMonText text_end .DeleteMove: diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index 681dc6adc..8f1640a4f 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -70,8 +70,8 @@ CheckCanLearnMoveTutorMove: ld de, SFX_WRONG call PlaySFX pop de - ld a, BANK(Text_TMHMNotCompatible) - ld hl, Text_TMHMNotCompatible + ld a, BANK(TMHMNotCompatibleText) + ld hl, TMHMNotCompatibleText call FarPrintText jr .didnt_learn diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm index f3a443de4..e2b24c4c7 100644 --- a/engine/events/name_rater.asm +++ b/engine/events/name_rater.asm @@ -1,6 +1,6 @@ _NameRater: ; Introduce himself - ld hl, NameRaterIntroText + ld hl, NameRaterHelloText call PrintText call YesNoBox jp c, .cancel @@ -18,12 +18,12 @@ _NameRater: call CheckIfMonIsYourOT jr c, .traded ; This name is good, but we can do better. How about it? - ld hl, NameRaterIsGoodText + ld hl, NameRaterBetterNameText call PrintText call YesNoBox jr c, .cancel ; What name shall I give it then? - ld hl, NameRaterWhichNameText + ld hl, NameRaterWhatNameText call PrintText ; Load the new nickname into wStringBuffer2 xor a ; PARTYMON @@ -37,11 +37,11 @@ _NameRater: farcall _NamingScreen ; If the new name is empty, treat it as unchanged. call IsNewNameEmpty - ld hl, NameRaterSameAsBeforeText + ld hl, NameRaterSameNameText jr c, .samename ; If the new name is the same as the old name, treat it as unchanged. call CompareNewToOld - ld hl, NameRaterSameAsBeforeText + ld hl, NameRaterSameNameText jr c, .samename ; Copy the new name from wStringBuffer2 ld hl, wPartyMonNicknames @@ -53,22 +53,22 @@ _NameRater: ld hl, wStringBuffer2 ld bc, MON_NAME_LENGTH call CopyBytes - ld hl, NameRaterEvenBetterText + ld hl, NameRaterFinishedText .samename push hl call GetCurNick - ld hl, NameRaterDoneText + ld hl, NameRaterNamedText call PrintText pop hl jr .done .traded - ld hl, NameRaterTradedText + ld hl, NameRaterPerfectNameText jr .done .cancel - ld hl, NameRaterCancelText + ld hl, NameRaterComeAgainText jr .done .egg @@ -178,58 +178,42 @@ GetNicknameLength: jr nz, .loop ret -NameRaterIntroText: - ; Hello, hello! I'm the NAME RATER. - ; I rate the names of #MON. - ; Would you like me to rate names? - text_far UnknownText_0x1c0043 +NameRaterHelloText: + text_far _NameRaterHelloText text_end NameRaterWhichMonText: - ; Which #MON's nickname should I rate for you? - text_far UnknownText_0x1c00a0 + text_far _NameRaterWhichMonText text_end -NameRaterIsGoodText: - ; Hm… @ … That's a fairly decent name. - ; But, how about a slightly better nickname? - ; Want me to give it a better name? - text_far UnknownText_0x1c00cd +NameRaterBetterNameText: + text_far _NameRaterBetterNameText text_end -NameRaterWhichNameText: - ; All right. What name should we give it, then? - text_far UnknownText_0x1c0142 +NameRaterWhatNameText: + text_far _NameRaterWhatNameText text_end -NameRaterEvenBetterText: - ; That's a better name than before! Well done! - text_far UnknownText_0x1c0171 +NameRaterFinishedText: + text_far _NameRaterFinishedText text_end -NameRaterCancelText: - ; OK, then. Come again sometime. - text_far UnknownText_0x1c019e +NameRaterComeAgainText: + text_far _NameRaterComeAgainText text_end -NameRaterTradedText: - ; Hm… @ ? What a great name! It's perfect. - ; Treat @ with loving care. - text_far UnknownText_0x1c01be +NameRaterPerfectNameText: + text_far _NameRaterPerfectNameText text_end NameRaterEggText: - ; Whoa… That's just an EGG. - text_far UnknownText_0x1c0208 + text_far _NameRaterEggText text_end -NameRaterSameAsBeforeText: - ; It might look the different as before, - ; but this new name is much better! Well done! - text_far UnknownText_0x1c0222 +NameRaterSameNameText: + text_far _NameRaterSameNameText text_end -NameRaterDoneText: - ; All right. This #MON is now named @ . - text_far UnknownText_0x1c0272 +NameRaterNamedText: + text_far _NameRaterNamedText text_end diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index 19ed72a4b..a14a102cf 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -34,7 +34,7 @@ NPCTrade:: ld b, SET_FLAG call TradeFlagAction - ld hl, ConnectLinkCableText + ld hl, NPCTradeCableText call PrintText call DoNPCTrade @@ -405,39 +405,38 @@ PrintTradeText: TradeTexts: ; entries correspond to TRADE_DIALOG_* × TRADE_DIALOGSET_* constants ; TRADE_DIALOG_INTRO - dw TradeIntroText1 - dw TradeIntroText2 - dw TradeIntroText3 - dw TradeIntroText4 + dw NPCTradeIntroText1 + dw NPCTradeIntroText2 + dw NPCTradeIntroText2 + dw NPCTradeIntroText3 ; TRADE_DIALOG_CANCEL - dw TradeCancelText1 - dw TradeCancelText2 - dw TradeCancelText3 - dw TradeCancelText4 + dw NPCTradeCancelText1 + dw NPCTradeCancelText2 + dw NPCTradeCancelText2 + dw NPCTradeCancelText3 ; TRADE_DIALOG_WRONG - dw TradeWrongText1 - dw TradeWrongText2 - dw TradeWrongText3 - dw TradeWrongText4 + dw NPCTradeWrongText1 + dw NPCTradeWrongText2 + dw NPCTradeWrongText2 + dw NPCTradeWrongText3 ; TRADE_DIALOG_COMPLETE - dw TradeCompleteText1 - dw TradeCompleteText2 - dw TradeCompleteText3 - dw TradeCompleteText4 + dw NPCTradeCompleteText1 + dw NPCTradeCompleteText2 + dw NPCTradeCompleteText4 + dw NPCTradeCompleteText3 ; TRADE_DIALOG_AFTER - dw TradeAfterText1 - dw TradeAfterText2 - dw TradeAfterText3 - dw TradeAfterText4 - -ConnectLinkCableText: - ; OK, connect the Game Link Cable. - text_far UnknownText_0x1bd407 + dw NPCTradeAfterText1 + dw NPCTradeAfterText2 + dw NPCTradeAfterText4 + dw NPCTradeAfterText3 + +NPCTradeCableText: + text_far _NPCTradeCableText text_end TradedForText: ; traded givemon for getmon - text_far UnknownText_0x1bd429 + text_far Text_NPCTraded text_asm ld de, MUSIC_NONE call PlayMusic @@ -446,95 +445,73 @@ TradedForText: ret .done - ; sound_dex_fanfare_80_109 - ; text_pause - text_far UnknownText_0x1bd445 + text_far _NPCTradeFanfareText text_end -TradeIntroText1: - ; I collect #MON. Do you have @ ? Want to trade it for my @ ? +NPCTradeIntroText1: text_far _NPCTradeIntroText1 text_end -TradeCancelText1: - ; You don't want to trade? Aww… +NPCTradeCancelText1: text_far _NPCTradeCancelText1 text_end -TradeWrongText1: - ; Huh? That's not @ . What a letdown… +NPCTradeWrongText1: text_far _NPCTradeWrongText1 text_end -TradeCompleteText1: - ; Yay! I got myself @ ! Thanks! +NPCTradeCompleteText1: text_far _NPCTradeCompleteText1 text_end -TradeAfterText1: - ; Hi, how's my old @ doing? - text_far _NPCTradeAFterText1 +NPCTradeAfterText1: + text_far _NPCTradeAfterText1 text_end -TradeIntroText2: -TradeIntroText3: - ; Hi, I'm looking for this #MON. If you have @ , would you trade it for my @ ? +NPCTradeIntroText2: text_far _NPCTradeIntroText2 text_end -TradeCancelText2: -TradeCancelText3: - ; You don't have one either? Gee, that's really disappointing… +NPCTradeCancelText2: text_far _NPCTradeCancelText2 text_end -TradeWrongText2: -TradeWrongText3: - ; You don't have @ ? That's too bad, then. +NPCTradeWrongText2: text_far _NPCTradeWrongText2 text_end -TradeCompleteText2: - ; Great! Thank you! I finally got @ . +NPCTradeCompleteText2: text_far _NPCTradeCompleteText2 text_end -TradeAfterText2: - ; Hi! The @ you traded me is doing great! +NPCTradeAfterText2: text_far _NPCTradeAfterText2 text_end -TradeIntroText4: - ; 's cute, but I don't have it. Do you have @ ? Want to trade it for my @ ? +NPCTradeIntroText3: text_far _NPCTradeIntroText3 text_end -TradeCancelText4: - ; You don't want to trade? Oh, darn… +NPCTradeCancelText3: text_far _NPCTradeCancelText3 text_end -TradeWrongText4: - ; That's not @ . Please trade with me if you get one. +NPCTradeWrongText3: text_far _NPCTradeWrongText3 text_end -TradeCompleteText4: - ; Wow! Thank you! I always wanted @ ! +NPCTradeCompleteText3: text_far _NPCTradeCompleteText3 text_end -TradeAfterText4: - ; How is that @ I traded you doing? Your @ 's so cute! +NPCTradeAfterText3: text_far _NPCTradeAfterText3 text_end -TradeCompleteText3: - ; Uh? What happened? +NPCTradeCompleteText4: text_far _NPCTradeCompleteText4 text_end -TradeAfterText3: - ; Trading is so odd… I still have a lot to learn about it. +NPCTradeAfterText4: text_far _NPCTradeAfterText4 text_end diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index e74bdf0aa..055a5ca9d 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -58,8 +58,6 @@ CheckBadge: ret .BadgeRequiredText: - ; Sorry! A new BADGE - ; is required. text_far _BadgeRequiredText text_end @@ -108,13 +106,12 @@ CheckPartyMove: ret FieldMoveFailed: - ld hl, .CantUseHere + ld hl, .CantUseItemText call MenuTextboxBackup ret -.CantUseHere: - ; Can't use that here. - text_far UnknownText_0x1c05c8 +.CantUseItemText: + text_far _CantUseItemText text_end CutFunction: @@ -156,19 +153,17 @@ CutFunction: ret .FailCut: - ld hl, Text_NothingToCut + ld hl, CutNothingText call MenuTextboxBackup ld a, $80 ret -Text_UsedCut: - ; used CUT! - text_far UnknownText_0x1c05dd +UseCutText: + text_far _UseCutText text_end -Text_NothingToCut: - ; There's nothing to CUT here. - text_far UnknownText_0x1c05ec +CutNothingText: + text_far _CutNothingText text_end CheckMapForSomethingToCut: @@ -212,7 +207,7 @@ Script_CutFromMenu: Script_Cut: callasm GetPartyNick - writetext Text_UsedCut + writetext UseCutText reloadmappart callasm CutDownTreeOrGrass closetext @@ -317,13 +312,13 @@ UseFlash: Script_UseFlash: reloadmappart special UpdateTimePals - writetext UnknownText_0xc8f3 + writetext UseFlashTextScript callasm BlindingFlash closetext end -UnknownText_0xc8f3: - text_far UnknownText_0x1c0609 +UseFlashTextScript: + text_far _BlindingFlashText text_asm call WaitSFX ld de, SFX_FLASH @@ -545,7 +540,6 @@ AskSurfScript: end AskSurfText: - ; The water is calm. Want to SURF? text_far _AskSurfText text_end @@ -683,7 +677,7 @@ Script_WaterfallFromMenu: Script_UsedWaterfall: callasm GetPartyNick - writetext .Text_UsedWaterfall + writetext .UseWaterfallText waitbutton closetext playsound SFX_BUBBLEBEAM @@ -708,9 +702,8 @@ Script_UsedWaterfall: turn_waterfall UP step_end -.Text_UsedWaterfall: - ; used WATERFALL! - text_far UnknownText_0x1c068e +.UseWaterfallText: + text_far _UseWaterfallText text_end TryWaterfallOW:: @@ -736,24 +729,22 @@ TryWaterfallOW:: ret Script_CantDoWaterfall: - jumptext .Text_CantDoWaterfall + jumptext .HugeWaterfallText -.Text_CantDoWaterfall: - ; Wow, it's a huge waterfall. - text_far UnknownText_0x1c06a3 +.HugeWaterfallText: + text_far _HugeWaterfallText text_end Script_AskWaterfall: opentext - writetext .AskUseWaterfall + writetext .AskWaterfallText yesorno iftrue Script_UsedWaterfall closetext end -.AskUseWaterfall: - ; Do you want to use WATERFALL? - text_far UnknownText_0x1c06bf +.AskWaterfallText: + text_far _AskWaterfallText text_end EscapeRopeFunction: @@ -829,7 +820,7 @@ dig_incave ld a, [wBuffer2] cp $2 jr nz, .failescaperope - ld hl, .Text_CantUseHere + ld hl, .CantUseDigText call MenuTextbox call WaitPressAorB_BlinkCursor call CloseWindow @@ -838,31 +829,28 @@ dig_incave ld a, $80 ret -.Text_UsedDig: - ; used DIG! - text_far UnknownText_0x1c06de +.UseDigText: + text_far _UseDigText text_end -.Text_UsedEscapeRope: - ; used an ESCAPE ROPE. - text_far UnknownText_0x1c06ed +.UseEscapeRopeText: + text_far _UseEscapeRopeText text_end -.Text_CantUseHere: - ; Can't use that here. - text_far UnknownText_0x1c0705 +.CantUseDigText: + text_far _CantUseDigText text_end .UsedEscapeRopeScript: reloadmappart special UpdateTimePals - writetext .Text_UsedEscapeRope + writetext .UseEscapeRopeText sjump .UsedDigOrEscapeRopeScript .UsedDigScript: reloadmappart special UpdateTimePals - writetext .Text_UsedDig + writetext .UseDigText .UsedDigOrEscapeRopeScript: waitbutton @@ -932,25 +920,23 @@ TeleportFunction: ret .FailTeleport: - ld hl, .Text_CantUseHere + ld hl, .CantUseTeleportText call MenuTextboxBackup ld a, $80 ret -.Text_ReturnToLastMonCenter: - ; Return to the last #MON CENTER. - text_far UnknownText_0x1c071a +.TeleportReturnText: + text_far _TeleportReturnText text_end -.Text_CantUseHere: - ; Can't use that here. - text_far UnknownText_0x1c073b +.CantUseTeleportText: + text_far _CantUseTeleportText text_end .TeleportScript: reloadmappart special UpdateTimePals - writetext .Text_ReturnToLastMonCenter + writetext .TeleportReturnText pause 60 reloadmappart closetext @@ -986,13 +972,13 @@ StrengthFunction: jr .UseStrength .Unreferenced_AlreadyUsing: - ld hl, .JumpText + ld hl, .AlreadyUsingStrengthText call MenuTextboxBackup ld a, $80 ret -.JumpText: - text_far UnknownText_0x1c0751 +.AlreadyUsingStrengthText: + text_far _AlreadyUsingStrengthText text_end .Failed: @@ -1024,20 +1010,20 @@ Script_StrengthFromMenu: Script_UsedStrength: callasm SetStrengthFlag - writetext .UsedStrength + writetext .UseStrengthText readmem wBuffer6 cry 0 pause 3 - writetext .StrengthAllowedItToMoveBoulders + writetext .MoveBoulderText closetext end -.UsedStrength: - text_far UnknownText_0x1c0774 +.UseStrengthText: + text_far _UseStrengthText text_end -.StrengthAllowedItToMoveBoulders: - text_far UnknownText_0x1c0788 +.MoveBoulderText: + text_far _MoveBoulderText text_end AskStrengthScript: @@ -1047,32 +1033,29 @@ AskStrengthScript: sjump .AlreadyUsedStrength .DontMeetRequirements: - jumptext UnknownText_0xcd73 + jumptext BouldersMayMoveText .AlreadyUsedStrength: - jumptext UnknownText_0xcd6e + jumptext BouldersMoveText .AskStrength: opentext - writetext UnknownText_0xcd69 + writetext AskStrengthText yesorno iftrue Script_UsedStrength closetext end -UnknownText_0xcd69: - ; A #MON may be able to move this. Want to use STRENGTH? - text_far UnknownText_0x1c07a0 +AskStrengthText: + text_far _AskStrengthText text_end -UnknownText_0xcd6e: - ; Boulders may now be moved! - text_far UnknownText_0x1c07d8 +BouldersMoveText: + text_far _BouldersMoveText text_end -UnknownText_0xcd73: - ; A #MON may be able to move this. - text_far UnknownText_0x1c07f4 +BouldersMayMoveText: + text_far _BouldersMayMoveText text_end TryStrengthOW: @@ -1146,9 +1129,8 @@ Jumptable_cdae: ld a, $80 ret -Text_UsedWhirlpool: - ; used WHIRLPOOL! - text_far UnknownText_0x1c0816 +UseWhirlpoolText: + text_far _UseWhirlpoolText text_end TryWhirlpoolMenu: @@ -1186,7 +1168,7 @@ Script_WhirlpoolFromMenu: Script_UsedWhirlpool: callasm GetPartyNick - writetext Text_UsedWhirlpool + writetext UseWhirlpoolText reloadmappart callasm DisappearWhirlpool closetext @@ -1232,22 +1214,22 @@ TryWhirlpoolOW:: ret Script_MightyWhirlpool: - jumptext .MightyWhirlpoolText + jumptext .MayPassWhirlpoolText -.MightyWhirlpoolText: - text_far UnknownText_0x1c082b +.MayPassWhirlpoolText: + text_far _MayPassWhirlpoolText text_end Script_AskWhirlpoolOW: opentext - writetext UnknownText_0xce78 + writetext AskWhirlpoolText yesorno iftrue Script_UsedWhirlpool closetext end -UnknownText_0xce78: - text_far UnknownText_0x1c0864 +AskWhirlpoolText: + text_far _AskWhirlpoolText text_end HeadbuttFunction: @@ -1271,14 +1253,12 @@ TryHeadbuttFromMenu: ld a, $80 ret -UnknownText_0xce9d: - ; did a HEADBUTT! - text_far UnknownText_0x1c0897 +UseHeadbuttText: + text_far _UseHeadbuttText text_end -UnknownText_0xcea2: - ; Nope. Nothing… - text_far UnknownText_0x1c08ac +HeadbuttNothingText: + text_far _HeadbuttNothingText text_end HeadbuttFromMenuScript: @@ -1287,7 +1267,7 @@ HeadbuttFromMenuScript: HeadbuttScript: callasm GetPartyNick - writetext UnknownText_0xce9d + writetext UseHeadbuttText reloadmappart callasm ShakeHeadbuttTree @@ -1301,7 +1281,7 @@ HeadbuttScript: end .no_battle - writetext UnknownText_0xcea2 + writetext HeadbuttNothingText waitbutton closetext end @@ -1323,15 +1303,14 @@ TryHeadbuttOW:: AskHeadbuttScript: opentext - writetext UnknownText_0xcee6 + writetext AskHeadbuttText yesorno iftrue HeadbuttScript closetext end -UnknownText_0xcee6: - ; A #MON could be in this tree. Want to HEADBUTT it? - text_far UnknownText_0x1c08bc +AskHeadbuttText: + text_far _AskHeadbuttText text_end RockSmashFunction: @@ -1385,7 +1364,7 @@ RockSmashFromMenuScript: RockSmashScript: callasm GetPartyNick - writetext UnknownText_0xcf58 + writetext UseRockSmashText closetext special WaitSFX playsound SFX_STRENGTH @@ -1406,8 +1385,8 @@ MovementData_0xcf55: rock_smash 10 step_end -UnknownText_0xcf58: - text_far UnknownText_0x1c08f0 +UseRockSmashText: + text_far _UseRockSmashText text_end AskRockSmashScript: @@ -1415,22 +1394,20 @@ AskRockSmashScript: ifequal 1, .no opentext - writetext UnknownText_0xcf77 + writetext AskRockSmashText yesorno iftrue RockSmashScript closetext end .no - jumptext UnknownText_0xcf72 + jumptext MaySmashText -UnknownText_0xcf72: - ; Maybe a #MON can break this. - text_far UnknownText_0x1c0906 +MaySmashText: + text_far _MaySmashText text_end -UnknownText_0xcf77: - ; This rock looks breakable. Want to use ROCK SMASH? - text_far UnknownText_0x1c0924 +AskRockSmashText: + text_far _AskRockSmashText text_end HasRockSmash: @@ -1539,12 +1516,12 @@ FishFunction: Script_NotEvenANibble: scall Script_FishCastRod - writetext UnknownText_0xd0a9 + writetext RodNothingText sjump Script_NotEvenANibble_FallThrough Script_NotEvenANibble2: scall Script_FishCastRod - writetext UnknownText_0xd0a9 + writetext RodNothingText Script_NotEvenANibble_FallThrough: loademote EMOTE_SHADOW @@ -1565,7 +1542,7 @@ Script_GotABite: .FightTheHookedPokemon: pause 40 applymovement PLAYER, .Movement_RestoreRod - writetext UnknownText_0xd0a4 + writetext RodBiteText callasm PutTheRodAway closetext randomwildmon @@ -1631,19 +1608,16 @@ PutTheRodAway: call ReplaceKrisSprite ret -UnknownText_0xd0a4: - ; Oh! A bite! - text_far UnknownText_0x1c0958 +RodBiteText: + text_far _RodBiteText text_end -UnknownText_0xd0a9: - ; Not even a nibble! - text_far UnknownText_0x1c0965 +RodNothingText: + text_far _RodNothingText text_end -UnknownText_0xd0ae: ; unused - ; Looks like there's nothing here. - text_far UnknownText_0x1c0979 +UnusedNothingHereText: ; unused + text_far _UnusedNothingHereText text_end BikeFunction: @@ -1736,7 +1710,7 @@ Script_GetOnBike: reloadmappart special UpdateTimePals loadvar VAR_MOVEMENT, PLAYER_BIKE - writetext GotOnTheBikeText + writetext GotOnBikeText waitbutton closetext special ReplaceKrisSprite @@ -1756,7 +1730,7 @@ Script_GetOffBike: reloadmappart special UpdateTimePals loadvar VAR_MOVEMENT, PLAYER_NORMAL - writetext GotOffTheBikeText + writetext GotOffBikeText waitbutton FinishGettingOffBike: @@ -1776,18 +1750,15 @@ Script_CantGetOffBike: end .CantGetOffBikeText: - ; You can't get off here! - text_far UnknownText_0x1c099a + text_far _CantGetOffBikeText text_end -GotOnTheBikeText: - ; got on the @ . - text_far UnknownText_0x1c09b2 +GotOnBikeText: + text_far _GotOnBikeText text_end -GotOffTheBikeText: - ; got off the @ . - text_far UnknownText_0x1c09c7 +GotOffBikeText: + text_far _GotOffBikeText text_end TryCutOW:: @@ -1814,7 +1785,7 @@ TryCutOW:: AskCutScript: opentext - writetext UnknownText_0xd1c8 + writetext AskCutText yesorno iffalse .script_d1b8 callasm .CheckMap @@ -1832,13 +1803,13 @@ AskCutScript: ld [wScriptVar], a ret -UnknownText_0xd1c8: - text_far UnknownText_0x1c09dd +AskCutText: + text_far _AskCutText text_end CantCutScript: - jumptext UnknownText_0xd1d0 + jumptext CanCutText -UnknownText_0xd1d0: - text_far UnknownText_0x1c0a05 +CanCutText: + text_far _CanCutText text_end diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm index 70da92f13..98a6e25a1 100644 --- a/engine/events/poisonstep.asm +++ b/engine/events/poisonstep.asm @@ -146,9 +146,9 @@ DoPoisonStep:: ret .PoisonFaintText: - text_far UnknownText_0x1c0acc + text_far _PoisonFaintText text_end -.PoisonWhiteOutText: - text_far UnknownText_0x1c0ada +.PoisonWhiteoutText: + text_far _PoisonWhiteoutText text_end diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm index db8d2beab..80d055111 100644 --- a/engine/events/poke_seer.asm +++ b/engine/events/poke_seer.asm @@ -287,53 +287,45 @@ PrintSeerText: ret SeerTexts: - dw SeerIntroText - dw SeerCantTellText - dw SeerMetAtText + dw SeerSeeAllText + dw SeerCantTellAThingText + dw SeerNameLocationText dw SeerTimeLevelText - dw SeerTradedText - dw SeerCancelText + dw SeerTradeText + dw SeerDoNothingText dw SeerEggText - dw SeerLevelOnlyText + dw SeerNoLocationText -SeerIntroText: - ; I see all. I know all… Certainly, I know of your #MON! - text_far UnknownText_0x1c475f +SeerSeeAllText: + text_far _SeerSeeAllText text_end -SeerCantTellText: - ; Whaaaat? I can't tell a thing! How could I not know of this? - text_far UnknownText_0x1c4797 +SeerCantTellAThingText: + text_far _SeerCantTellAThingText text_end -SeerMetAtText: - ; Hm… I see you met @ here: @ ! - text_far UnknownText_0x1c47d4 +SeerNameLocationText: + text_far _SeerNameLocationText text_end SeerTimeLevelText: - ; The time was @ ! Its level was @ ! Am I good or what? - text_far UnknownText_0x1c47fa + text_far _SeerTimeLevelText text_end -SeerTradedText: - ; Hm… @ came from @ in a trade? @ was where @ met @ ! - text_far UnknownText_0x1c4837 +SeerTradeText: + text_far _SeerTradeText text_end -SeerLevelOnlyText: - ; What!? Incredible! I don't understand how, but it is incredible! You are special. I can't tell where you met it, but it was at level @ . Am I good or what? - text_far UnknownText_0x1c487f +SeerNoLocationText: + text_far _SeerNoLocationText text_end SeerEggText: - ; Hey! That's an EGG! You can't say that you've met it yet… - text_far UnknownText_0x1c491d + text_far _SeerEggText text_end -SeerCancelText: - ; Fufufu! I saw that you'd do nothing! - text_far UnknownText_0x1c4955 +SeerDoNothingText: + text_far _SeerDoNothingText text_end SeerAdvice: @@ -364,36 +356,31 @@ SeerAdvice: SeerAdviceTexts: ; level, text - dbw 9, SeerAdvice1 - dbw 29, SeerAdvice2 - dbw 59, SeerAdvice3 - dbw 89, SeerAdvice4 - dbw 100, SeerAdvice5 - dbw 255, SeerAdvice1 - -SeerAdvice1: - ; Incidentally… It would be wise to raise your #MON with a little more care. - text_far UnknownText_0x1c497a + dbw 9, SeerMoreCareText + dbw 29, SeerMoreConfidentText + dbw 59, SeerMuchStrengthText + dbw 89, SeerMightyText + dbw 100, SeerImpressedText + dbw 255, SeerMoreCareText + +SeerMoreCareText: + text_far _SeerMoreCareText text_end -SeerAdvice2: - ; Incidentally… It seems to have grown a little. @ seems to be becoming more confident. - text_far UnknownText_0x1c49c6 +SeerMoreConfidentText: + text_far _SeerMoreConfidentText text_end -SeerAdvice3: - ; Incidentally… @ has grown. It's gained much strength. - text_far UnknownText_0x1c4a21 +SeerMuchStrengthText: + text_far _SeerMuchStrengthText text_end -SeerAdvice4: - ; Incidentally… It certainly has grown mighty! This @ must have come through numerous #MON battles. It looks brimming with confidence. - text_far UnknownText_0x1c4a5b +SeerMightyText: + text_far _SeerMightyText text_end -SeerAdvice5: - ; Incidentally… I'm impressed by your dedication. It's been a long time since I've seen a #MON as mighty as this @ . I'm sure that seeing @ in battle would excite anyone. - text_far UnknownText_0x1c4ae5 +SeerImpressedText: + text_far _SeerImpressedText text_end GetCaughtGender: diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index fa06d971e..e22a2ffc4 100644 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -2,9 +2,9 @@ PokemonCenterPC: call PC_CheckPartyForPokemon ret c call PC_PlayBootSound - ld hl, PokecenterPCText_BootedUpPC + ld hl, PokecenterPCTurnOnText call PC_DisplayText - ld hl, PokecenterPCText_AccessWhosePC + ld hl, PokecenterPCWhoseText call PC_DisplayTextWaitMenu ld hl, .TopMenu call LoadMenuHeader @@ -104,19 +104,18 @@ PC_CheckPartyForPokemon: ret nz ld de, SFX_CHOOSE_PC_OPTION call PlaySFX - ld hl, .MustHavePokemonToUse + ld hl, .PokecenterPCCantUseText call PC_DisplayText scf ret -.MustHavePokemonToUse: - ; Bzzzzt! You must have a #MON to use this! - text_far UnknownText_0x1c1328 +.PokecenterPCCantUseText: + text_far _PokecenterPCCantUseText text_end BillsPC: call PC_PlayChoosePCSound - ld hl, PokecenterPCText_AccessedBillsPC + ld hl, PokecenterBillsPCText call PC_DisplayText farcall _BillsPC and a @@ -124,7 +123,7 @@ BillsPC: PlayersPC: call PC_PlayChoosePCSound - ld hl, PokecenterPCText_AccessedOwnPC + ld hl, PokecenterPlayersPCText call PC_DisplayText ld b, $0 call _PlayersPC @@ -133,7 +132,7 @@ PlayersPC: OaksPC: call PC_PlayChoosePCSound - ld hl, PokecenterPCText_AccessedOaksPC + ld hl, PokecenterOaksPCText call PC_DisplayText farcall ProfOaksPC and a @@ -148,7 +147,7 @@ HallOfFamePC: ret TurnOffPC: - ld hl, PokecenterPCText_LinkClosed + ld hl, PokecenterPCOaksClosedText call PrintText scf ret @@ -181,7 +180,7 @@ PC_WaitPlaySFX: _PlayersHousePC: call PC_PlayBootSound - ld hl, UnknownText_0x156ff + ld hl, PlayersPCTurnOnText call PC_DisplayText ld b, $1 call _PlayersPC @@ -199,15 +198,14 @@ _PlayersHousePC: ld c, $1 ret -UnknownText_0x156ff: - ; turned on the PC. - text_far UnknownText_0x1c1353 +PlayersPCTurnOnText: + text_far _PlayersPCTurnOnText text_end _PlayersPC: ld a, b ld [wWhichIndexSet], a - ld hl, UnknownText_0x157cc + ld hl, PlayersPCAskWhatDoText call PC_DisplayTextWaitMenu call Function15715 call ExitMenu @@ -302,9 +300,8 @@ PC_DisplayTextWaitMenu: ld [wOptions], a ret -UnknownText_0x157cc: - ; What do you want to do? - text_far UnknownText_0x1c1368 +PlayersPCAskWhatDoText: + text_far _PlayersPCAskWhatDoText text_end PlayerWithdrawItemMenu: @@ -334,7 +331,7 @@ PlayerWithdrawItemMenu: jr .withdraw .askquantity - ld hl, .HowManyText + ld hl, .PlayersPCHowManyWithdrawText call MenuTextbox farcall SelectQuantityToToss call ExitMenu @@ -356,7 +353,7 @@ PlayerWithdrawItemMenu: ld hl, wNumPCItems call TossItem predef PartyMonItemName - ld hl, .WithdrewText + ld hl, .PlayersPCWithdrewItemsText call MenuTextbox xor a ldh [hBGMapMode], a @@ -364,22 +361,22 @@ PlayerWithdrawItemMenu: ret .PackFull: - ld hl, .NoRoomText + ld hl, .PlayersPCNoRoomWithdrawText call MenuTextboxBackup ret .done ret -.HowManyText: +.PlayersPCHowManyWithdrawText: text_far _PlayersPCHowManyWithdrawText text_end -.WithdrewText: +.PlayersPCWithdrewItemsText: text_far _PlayersPCWithdrewItemsText text_end -.NoRoomText: +.PlayersPCNoRoomWithdrawText: text_far _PlayersPCNoRoomWithdrawText text_end @@ -436,14 +433,13 @@ PlayerDepositItemMenu: .CheckItemsInBag: farcall HasNoItems ret nc - ld hl, .NoItemsInBag + ld hl, .PlayersPCNoItemsText call MenuTextboxBackup scf ret -.NoItemsInBag: - ; No items here! - text_far UnknownText_0x1c13df +.PlayersPCNoItemsText: + text_far _PlayersPCNoItemsText text_end .TryDepositItem: @@ -494,7 +490,7 @@ PlayerDepositItemMenu: jr .ContinueDeposit .AskQuantity: - ld hl, .HowManyText + ld hl, .PlayersPCHowManyDepositText call MenuTextbox farcall SelectQuantityToToss push af @@ -518,12 +514,12 @@ PlayerDepositItemMenu: ld hl, wNumItems call TossItem predef PartyMonItemName - ld hl, .DepositText + ld hl, .PlayersPCDepositItemsText call PrintText ret .NoRoomInPC: - ld hl, .NoRoomText + ld hl, .PlayersPCNoRoomDepositText call PrintText ret @@ -531,15 +527,15 @@ PlayerDepositItemMenu: and a ret -.HowManyText: +.PlayersPCHowManyDepositText: text_far _PlayersPCHowManyDepositText text_end -.DepositText: +.PlayersPCDepositItemsText: text_far _PlayersPCDepositItemsText text_end -.NoRoomText: +.PlayersPCNoRoomDepositText: text_far _PlayersPCNoRoomDepositText text_end @@ -637,32 +633,26 @@ PC_DisplayText: call ExitMenu ret -PokecenterPCText_BootedUpPC: - ; turned on the PC. - text_far UnknownText_0x1c144d +PokecenterPCTurnOnText: + text_far _PokecenterPCTurnOnText text_end -PokecenterPCText_AccessWhosePC: - ; Access whose PC? - text_far UnknownText_0x1c1462 +PokecenterPCWhoseText: + text_far _PokecenterPCWhoseText text_end -PokecenterPCText_AccessedBillsPC: - ; BILL's PC accessed. #MON Storage System opened. - text_far UnknownText_0x1c1474 +PokecenterBillsPCText: + text_far _PokecenterBillsPCText text_end -PokecenterPCText_AccessedOwnPC: - ; Accessed own PC. Item Storage System opened. - text_far UnknownText_0x1c14a4 +PokecenterPlayersPCText: + text_far _PokecenterPlayersPCText text_end -PokecenterPCText_AccessedOaksPC: - ; PROF.OAK's PC accessed. #DEX Rating System opened. - text_far UnknownText_0x1c14d2 +PokecenterOaksPCText: + text_far _PokecenterOaksPCText text_end -PokecenterPCText_LinkClosed: - ; … Link closed… - text_far UnknownText_0x1c1505 +PokecenterPCOaksClosedText: + text_far _PokecenterPCOaksClosedText text_end diff --git a/engine/events/print_photo.asm b/engine/events/print_photo.asm index 0194b0072..056788b94 100644 --- a/engine/events/print_photo.asm +++ b/engine/events/print_photo.asm @@ -1,5 +1,5 @@ PhotoStudio: - ld hl, .Text_AskWhichMon + ld hl, .WhichMonPhotoText call PrintText farcall SelectMonFromParty jr c, .cancel @@ -7,7 +7,7 @@ PhotoStudio: cp EGG jr z, .egg - ld hl, .Text_HoldStill + ld hl, .HoldStillText call PrintText call DisableSpriteUpdates farcall PrintPartymon @@ -15,41 +15,36 @@ PhotoStudio: ldh a, [hPrinter] and a jr nz, .cancel - ld hl, .Text_Presto + ld hl, .PrestoAllDoneText jr .print_text .cancel - ld hl, .Text_NoPicture + ld hl, .NoPhotoText jr .print_text .egg - ld hl, .Text_Egg + ld hl, .EggPhotoText .print_text call PrintText ret -.Text_AskWhichMon: - ; Which #MON should I photo- graph? +.WhichMonPhotoText: text_far _WhichMonPhotoText text_end -.Text_HoldStill: - ; All righty. Hold still for a bit. - text_far _HoldOnText +.HoldStillText: + text_far _HoldStillText text_end -.Text_Presto: - ; Presto! All done. Come again, OK? +.PrestoAllDoneText: text_far _PrestoAllDoneText text_end -.Text_NoPicture: - ; Oh, no picture? Come again, OK? - text_far UnknownText_0x1c0000 +.NoPhotoText: + text_far _NoPhotoText text_end -.Text_Egg: - ; An EGG? My talent is worth more… - text_far UnknownText_0x1c0021 +.EggPhotoText: + text_far _EggPhotoText text_end diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm index b7553f919..d105b2fb7 100644 --- a/engine/events/sacred_ash.asm +++ b/engine/events/sacred_ash.asm @@ -1,4 +1,3 @@ - _SacredAsh: ld a, $0 ld [wItemEffectSucceeded], a @@ -57,14 +56,13 @@ SacredAshScript: special FadeOutPalettes special FadeInPalettes waitsfx - writetext UnknownText_0x50845 + writetext .UseSacredAshText playsound SFX_CAUGHT_MON waitsfx waitbutton closetext end -UnknownText_0x50845: - ; 's #MON were all healed! - text_far UnknownText_0x1c0b65 +.UseSacredAshText: + text_far _UseSacredAshText text_end diff --git a/engine/events/specials.asm b/engine/events/specials.asm index ef5286dff..d133dd68f 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -168,7 +168,6 @@ GetMysteryGiftItem: ret .ReceiveItemText: - ; received item text_far _ReceiveItemText text_end @@ -256,12 +255,10 @@ CheckCoinsAndCoinCase: ret .NoCoinsText: - ; You have no coins. text_far _NoCoinsText text_end .NoCoinCaseText: - ; You don't have a COIN CASE. text_far _NoCoinCaseText text_end diff --git a/engine/events/squirtbottle.asm b/engine/events/squirtbottle.asm index a5b7fd866..411b5c2e2 100644 --- a/engine/events/squirtbottle.asm +++ b/engine/events/squirtbottle.asm @@ -9,15 +9,14 @@ _Squirtbottle: reloadmappart special UpdateTimePals callasm .CheckCanUseSquirtbottle - iffalse .NothingHappenedScript + iffalse .SquirtbottleNothingScript farsjump WateredWeirdTreeScript -.NothingHappenedScript: - jumptext .NothingHappenedText +.SquirtbottleNothingScript: + jumptext .SquirtbottleNothingText -.NothingHappenedText: - ; sprinkled water. But nothing happened… - text_far UnknownText_0x1c0b3b +.SquirtbottleNothingText: + text_far _SquirtbottleNothingText text_end .CheckCanUseSquirtbottle: diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index ecda72526..1ca5eb4c9 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -182,7 +182,7 @@ MerchandiseShelfScript: TownMapScript: opentext - farwritetext TownMapText + farwritetext LookTownMapText waitbutton special OverworldTownMap closetext diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm index 92060ea3f..c81aa9c3a 100644 --- a/engine/events/sweet_scent.asm +++ b/engine/events/sweet_scent.asm @@ -9,7 +9,7 @@ SweetScentFromMenu: reloadmappart special UpdateTimePals callasm GetPartyNick - writetext UnknownText_0x50726 + writetext UseSweetScentText waitbutton callasm SweetScentEncounter iffalse SweetScentNothing @@ -24,7 +24,7 @@ SweetScentFromMenu: farsjump BugCatchingContestBattleScript SweetScentNothing: - writetext UnknownText_0x5072b + writetext SweetScentNothingText waitbutton closetext end @@ -57,12 +57,10 @@ SweetScentEncounter: ld [wBattleType], a ret -UnknownText_0x50726: - ; used SWEET SCENT! - text_far UnknownText_0x1c0b03 +UseSweetScentText: + text_far _UseSweetScentText text_end -UnknownText_0x5072b: - ; Looks like there's nothing here… - text_far UnknownText_0x1c0b1a +SweetScentNothingText: + text_far _SweetScentNothingText text_end diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index 4b3c3773a..c9141ac2a 100644 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -25,8 +25,7 @@ Script_Whiteout: jumpstd bugcontestresultswarp .WhitedOutText: - ; is out of useable #MON! whited out! - text_far UnknownText_0x1c0a4e + text_far _WhitedOutText text_end OverworldBGMap: diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm index 17fd2d493..54d729dfa 100644 --- a/engine/games/card_flip.asm +++ b/engine/games/card_flip.asm @@ -102,7 +102,7 @@ _CardFlip: ret .AskPlayWithThree: - ld hl, .PlayWithThreeCoinsText + ld hl, .CardFlipPlayWithThreeCoinsText call CardFlip_UpdateCoinBalanceDisplay call YesNoBox jr c, .SaidNo @@ -115,9 +115,8 @@ _CardFlip: ld [wJumptableIndex], a ret -.PlayWithThreeCoinsText: - ; Play with three coins? - text_far UnknownText_0x1c5793 +.CardFlipPlayWithThreeCoinsText: + text_far _CardFlipPlayWithThreeCoinsText text_end .DeductCoins: @@ -131,7 +130,7 @@ _CardFlip: ld a, l cp 3 jr nc, .deduct ; You have at least 3 coins. - ld hl, .NotEnoughCoinsText + ld hl, .CardFlipNotEnoughCoinsText call CardFlip_UpdateCoinBalanceDisplay ld a, 7 ld [wJumptableIndex], a @@ -155,9 +154,8 @@ _CardFlip: call .Increment ret -.NotEnoughCoinsText: - ; Not enough coins… - text_far UnknownText_0x1c57ab +.CardFlipNotEnoughCoinsText: + text_far _CardFlipNotEnoughCoinsText text_end .ChooseACard: @@ -184,7 +182,7 @@ _CardFlip: hlcoord 2, 6 call PlaceCardFaceDown call WaitBGMap - ld hl, .ChooseACardText + ld hl, .CardFlipChooseACardText call CardFlip_UpdateCoinBalanceDisplay xor a ld [wCardFlipWhichCard], a @@ -232,13 +230,12 @@ _CardFlip: call .Increment ret -.ChooseACardText: - ; Choose a card. - text_far UnknownText_0x1c57be +.CardFlipChooseACardText: + text_far _CardFlipChooseACardText text_end .PlaceYourBet: - ld hl, .PlaceYourBetText + ld hl, .CardFlipPlaceYourBetText call CardFlip_UpdateCoinBalanceDisplay .betloop call JoyTextDelay @@ -254,9 +251,8 @@ _CardFlip: call .Increment ret -.PlaceYourBetText: - ; Place your bet. - text_far UnknownText_0x1c57ce +.CardFlipPlaceYourBetText: + text_far _CardFlipPlaceYourBetText text_end .CheckTheCard: @@ -296,7 +292,7 @@ _CardFlip: .PlayAgain: call ClearSprites - ld hl, .PlayAgainText + ld hl, .CardFlipPlayAgainText call CardFlip_UpdateCoinBalanceDisplay call YesNoBox jr nc, .Continue @@ -313,7 +309,7 @@ _CardFlip: ld a, $1 ldh [hBGMapMode], a call CardFlip_ShuffleDeck - ld hl, .CardsShuffledText + ld hl, .CardFlipShuffledText call PrintText jr .LoopAround @@ -325,14 +321,12 @@ _CardFlip: ld [wJumptableIndex], a ret -.PlayAgainText: - ; Want to play again? - text_far UnknownText_0x1c57df +.CardFlipPlayAgainText: + text_far _CardFlipPlayAgainText text_end -.CardsShuffledText: - ; The cards have been shuffled. - text_far UnknownText_0x1c57f4 +.CardFlipShuffledText: + text_far _CardFlipShuffledText text_end .Quit: @@ -1085,7 +1079,7 @@ CardFlip_CheckWinCondition: .Lose: ld de, SFX_WRONG call PlaySFX - ld hl, .Text_Darn + ld hl, .CardFlipDarnText call CardFlip_UpdateCoinBalanceDisplay call WaitSFX ret @@ -1093,7 +1087,7 @@ CardFlip_CheckWinCondition: .Payout: push bc push de - ld hl, .Text_Yeah + ld hl, .CardFlipYeahText call CardFlip_UpdateCoinBalanceDisplay pop de call PlaySFX @@ -1114,14 +1108,12 @@ CardFlip_CheckWinCondition: jr nz, .loop ret -.Text_Yeah: - ; Yeah! - text_far UnknownText_0x1c5813 +.CardFlipYeahText: + text_far _CardFlipYeahText text_end -.Text_Darn: - ; Darn… - text_far UnknownText_0x1c581a +.CardFlipDarnText: + text_far _CardFlipDarnText text_end .AddCoinPlaySFX: diff --git a/engine/games/dummy_game.asm b/engine/games/dummy_game.asm index 582ae67f6..6e435191b 100644 --- a/engine/games/dummy_game.asm +++ b/engine/games/dummy_game.asm @@ -304,7 +304,7 @@ DummyGame_CheckMatch: call DummyGame_Card2Coord call DummyGame_PlaceCard - ld hl, DummyGameText_Darn + ld hl, DummyGameDarnText call PrintText ret @@ -313,21 +313,19 @@ DummyGame_CheckMatch: push bc hlcoord 2, 13 call DummyGame_PlaceCard - ld hl, DummyGameText_Yeah + ld hl, DummyGameYeahText pop bc inc bc inc bc inc bc ret -DummyGameText_Yeah: - ; , yeah! - text_far UnknownText_0x1c1a5b +DummyGameYeahText: + text_far _DummyGameYeahText text_end -DummyGameText_Darn: - ; Darn… - text_far UnknownText_0x1c1a65 +DummyGameDarnText: + text_far _DummyGameDarnText text_end DummyGame_InitBoard: diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index 202aca20b..25f9166ee 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -1707,7 +1707,7 @@ Slots_TurnLightsOnOrOff: Slots_AskBet: .loop - ld hl, .Text_BetHowManyCoins + ld hl, .SlotsBetHowManyCoinsText call PrintText ld hl, .MenuHeader call LoadMenuHeader @@ -1727,7 +1727,7 @@ Slots_AskBet: ld a, [hl] cp c jr nc, .Start - ld hl, .Text_NotEnoughCoins + ld hl, .SlotsNotEnoughCoinsText call PrintText jr .loop @@ -1742,24 +1742,21 @@ Slots_AskBet: call WaitSFX ld de, SFX_PAY_DAY call PlaySFX - ld hl, .Text_Start + ld hl, .SlotsStartText call PrintText and a ret -.Text_BetHowManyCoins: - ; Bet how many coins? - text_far UnknownText_0x1c5049 +.SlotsBetHowManyCoinsText: + text_far _SlotsBetHowManyCoinsText text_end -.Text_Start: - ; Start! - text_far UnknownText_0x1c505e +.SlotsStartText: + text_far _SlotsStartText text_end -.Text_NotEnoughCoins: - ; Not enough coins. - text_far UnknownText_0x1c5066 +.SlotsNotEnoughCoinsText: + text_far _SlotsNotEnoughCoinsText text_end .MenuHeader: @@ -1780,14 +1777,14 @@ Slots_AskPlayAgain: ld a, [hli] or [hl] jr nz, .you_have_coins - ld hl, .Text_OutOfCoins + ld hl, .SlotsRanOutOfCoinsText call PrintText ld c, 60 call DelayFrames jr .exit_slots .you_have_coins - ld hl, .Text_PlayAgain + ld hl, .SlotsPlayAgainText call PrintText call LoadMenuTextbox lb bc, 14, 12 @@ -1804,12 +1801,12 @@ Slots_AskPlayAgain: scf ret -.Text_OutOfCoins: - text_far UnknownText_0x1c5079 +.SlotsRanOutOfCoinsText: + text_far _SlotsRanOutOfCoinsText text_end -.Text_PlayAgain: - text_far UnknownText_0x1c5092 +.SlotsPlayAgainText: + text_far _SlotsPlayAgainText text_end Slots_GetPayout: @@ -1849,7 +1846,7 @@ Slots_PayoutText: ld a, [wSlotMatched] cp SLOTS_NO_MATCH jr nz, .MatchedSomething - ld hl, .Text_Darn + ld hl, .SlotsDarnText call PrintText farcall StubbedTrainerRankings_EndSlotsWinStreak ret @@ -1899,20 +1896,18 @@ Slots_PayoutText: ldcoord_a 3, 14 hlcoord 18, 17 ld [hl], "▼" - ld hl, .Text_LinedUpWonCoins + ld hl, .SlotsLinedUpText rept 4 inc bc endr ret -.Text_LinedUpWonCoins: - ; lined up! Won @ coins! - text_far UnknownText_0x1c509f +.SlotsLinedUpText: + text_far _SlotsLinedUpText text_end -.Text_Darn: - ; Darn! - text_far UnknownText_0x1c50bb +.SlotsDarnText: + text_far _SlotsDarnText text_end .LinedUpSevens: diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 35c20db70..96e0e0047 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -218,7 +218,7 @@ PokeBallEffect: ld hl, wOptions res NO_TEXT_SCROLL, [hl] - ld hl, UsedItemText + ld hl, ItemUsedText call PrintText ld a, [wEnemyMonCatchRate] @@ -399,16 +399,16 @@ PokeBallEffect: jr nz, .caught ld a, [wBuffer2] cp $1 - ld hl, Text_NoShake + ld hl, BallBrokeFreeText jp z, .shake_and_break_free cp $2 - ld hl, Text_OneShake + ld hl, BallAppearedCaughtText jp z, .shake_and_break_free cp $3 - ld hl, Text_TwoShakes + ld hl, BallAlmostHadItText jp z, .shake_and_break_free cp $4 - ld hl, Text_ThreeShakes + ld hl, BallSoCloseText jp z, .shake_and_break_free .caught @@ -517,7 +517,7 @@ PokeBallEffect: call CheckReceivedDex jr z, .skip_pokedex - ld hl, Text_AddedToPokedex + ld hl, NewDexDataText call PrintText call ClearSprites @@ -562,7 +562,7 @@ PokeBallEffect: ld [hl], a .SkipPartyMonFriendBall: - ld hl, Text_AskNicknameNewlyCaughtMon + ld hl, AskGiveNicknameText call PrintText ld a, [wCurPartySpecies] @@ -622,7 +622,7 @@ PokeBallEffect: .SkipBoxMonFriendBall: call CloseSRAM - ld hl, Text_AskNicknameNewlyCaughtMon + ld hl, AskGiveNicknameText call PrintText ld a, [wCurPartySpecies] @@ -665,7 +665,7 @@ PokeBallEffect: call CloseSRAM - ld hl, Text_SentToBillsPC + ld hl, BallSentToPCText call PrintText call RotateThreePalettesRight @@ -1061,39 +1061,33 @@ LevelBallMultiplier: ; These two texts were carried over from gen 1. ; They are not used in gen 2, and are dummied out. -Text_RBY_CatchMarowak: - ; It dodged the thrown BALL! This #MON can't be caught! - text_far UnknownText_0x1c5a5a +BallDodgedText: + text_far _BallDodgedText text_end -Text_RBY_NoShake: - ; You missed the #MON! - text_far UnknownText_0x1c5a90 +BallMissedText: + text_far _BallMissedText text_end -Text_NoShake: - ; Oh no! The #MON broke free! - text_far UnknownText_0x1c5aa6 +BallBrokeFreeText: + text_far _BallBrokeFreeText text_end -Text_OneShake: - ; Aww! It appeared to be caught! - text_far UnknownText_0x1c5ac3 +BallAppearedCaughtText: + text_far _BallAppearedCaughtText text_end -Text_TwoShakes: - ; Aargh! Almost had it! - text_far UnknownText_0x1c5ae3 +BallAlmostHadItText: + text_far _BallAlmostHadItText text_end -Text_ThreeShakes: - ; Shoot! It was so close too! - text_far UnknownText_0x1c5afa +BallSoCloseText: + text_far _BallSoCloseText text_end Text_GotchaMonWasCaught: ; Gotcha! @ was caught!@ @ - text_far UnknownText_0x1c5b17 + text_far Text_BallCaught text_asm call WaitSFX push bc @@ -1103,27 +1097,23 @@ Text_GotchaMonWasCaught: ld de, MUSIC_CAPTURE call PlayMusic pop bc - ld hl, TextJump_Waitbutton + ld hl, WaitButtonText ret -TextJump_Waitbutton: - ; @ - text_far Text_Waitbutton_2 +WaitButtonText: + text_far _WaitButtonText text_end -Text_SentToBillsPC: - ; was sent to BILL's PC. - text_far UnknownText_0x1c5b38 +BallSentToPCText: + text_far _BallSentToPCText text_end -Text_AddedToPokedex: - ; 's data was newly added to the #DEX.@ @ - text_far UnknownText_0x1c5b53 +NewDexDataText: + text_far _NewDexDataText text_end -Text_AskNicknameNewlyCaughtMon: - ; Give a nickname to @ ? - text_far UnknownText_0x1c5b7f +AskGiveNicknameText: + text_far _AskGiveNicknameText text_end ReturnToBattle_UseBall: @@ -1204,7 +1194,7 @@ VitaminEffect: call Play_SFX_FULL_HEAL - ld hl, Text_StatRose + ld hl, ItemStatRoseText call PrintText ld c, HAPPINESS_USEDITEM @@ -1213,7 +1203,7 @@ VitaminEffect: jp UseDisposableItem NoEffectMessage: - ld hl, WontHaveAnyEffectText + ld hl, ItemWontHaveEffectText call PrintText jp ClearPalettes @@ -1232,9 +1222,8 @@ RareCandy_StatBooster_ExitMenu: ld [wItemEffectSucceeded], a jp ClearPalettes -Text_StatRose: - ; 's @ rose. - text_far UnknownText_0x1c5b9a +ItemStatRoseText: + text_far _ItemStatRoseText text_end StatStrings: @@ -2055,14 +2044,13 @@ Softboiled_MilkDrinkFunction: .cant_use push bc - ld hl, .Text_CantBeUsed + ld hl, .ItemCantUseOnMonText call MenuTextboxBackup pop bc jr .loop -.Text_CantBeUsed: - ; That can't be used on this #MON. - text_far UnknownText_0x1c5bac +.ItemCantUseOnMonText: + text_far _ItemCantUseOnMonText text_end EscapeRopeEffect: @@ -2089,16 +2077,15 @@ RepelEffect: UseRepel: ld a, [wRepelEffect] and a - ld hl, TextJump_RepelUsedEarlierIsStillInEffect + ld hl, RepelUsedEarlierIsStillInEffectText jp nz, PrintText ld a, b ld [wRepelEffect], a jp UseItemText -TextJump_RepelUsedEarlierIsStillInEffect: - ; The REPEL used earlier is still in effect. - text_far Text_RepelUsedEarlierIsStillInEffect +RepelUsedEarlierIsStillInEffectText: + text_far _RepelUsedEarlierIsStillInEffectText text_end XAccuracyEffect: @@ -2205,7 +2192,7 @@ PokeFluteEffect: ld a, [wd002] and a - ld hl, .CatchyTune + ld hl, .PlayedFluteText jp z, PrintText ld hl, .PlayedTheFlute call PrintText @@ -2214,7 +2201,7 @@ PokeFluteEffect: and 1 << DANGER_ON_F jr nz, .dummy2 .dummy2 - ld hl, .AllSleepingMonWokeUp + ld hl, .FluteWakeUpText jp PrintText .CureSleep: @@ -2237,19 +2224,17 @@ PokeFluteEffect: jr nz, .loop ret -.CatchyTune: - ; Played the # FLUTE. Now, that's a catchy tune! - text_far UnknownText_0x1c5bf9 +.PlayedFluteText: + text_far _PlayedFluteText text_end -.AllSleepingMonWokeUp: - ; All sleeping #MON woke up. - text_far UnknownText_0x1c5c28 +.FluteWakeUpText: + text_far _FluteWakeUpText text_end .PlayedTheFlute: ; played the # FLUTE.@ @ - text_far UnknownText_0x1c5c44 + text_far Text_PlayedPokeFlute text_asm ld a, [wBattleMode] and a @@ -2265,19 +2250,19 @@ PokeFluteEffect: jp PokeFluteTerminatorCharacter BlueCardEffect: - ld hl, .bluecardtext + ld hl, .BlueCardBalanceText jp MenuTextboxWaitButton -.bluecardtext - text_far UnknownText_0x1c5c5e +.BlueCardBalanceText: + text_far _BlueCardBalanceText text_end CoinCaseEffect: - ld hl, .coincasetext + ld hl, .CoinCaseCountText jp MenuTextboxWaitButton -.coincasetext - text_far UnknownText_0x1c5c7b +.CoinCaseCountText: + text_far _CoinCaseCountText text_end OldRodEffect: @@ -2317,11 +2302,11 @@ RestorePPEffect: cp ELIXER jp z, Elixer_RestorePPofAllMoves - ld hl, TextJump_RaiseThePPOfWhichMove + ld hl, RaiseThePPOfWhichMoveText ld a, [wd002] cp PP_UP jr z, .ppup - ld hl, TextJump_RestoreThePPOfWhichMove + ld hl, RestoreThePPOfWhichMoveText .ppup call PrintText @@ -2365,7 +2350,7 @@ RestorePPEffect: .CantUsePPUpOnSketch: .pp_is_maxed_out - ld hl, TextJump_PPIsMaxedOut + ld hl, PPIsMaxedOutText call PrintText jr .loop2 @@ -2378,7 +2363,7 @@ RestorePPEffect: call ApplyPPUp call Play_SFX_FULL_HEAL - ld hl, TextJump_PPsIncreased + ld hl, PPsIncreasedText call PrintText FinishPPRestore: @@ -2401,7 +2386,7 @@ BattleRestorePP: .not_in_battle call Play_SFX_FULL_HEAL - ld hl, UnknownText_0xf739 + ld hl, PPRestoredText call PrintText jr FinishPPRestore @@ -2530,29 +2515,24 @@ RestorePP: xor a ret -TextJump_RaiseThePPOfWhichMove: - ; Raise the PP of which move? - text_far Text_RaiseThePPOfWhichMove +RaiseThePPOfWhichMoveText: + text_far _RaiseThePPOfWhichMoveText text_end -TextJump_RestoreThePPOfWhichMove: - ; Restore the PP of which move? - text_far Text_RestoreThePPOfWhichMove +RestoreThePPOfWhichMoveText: + text_far _RestoreThePPOfWhichMoveText text_end -TextJump_PPIsMaxedOut: - ; 's PP is maxed out. - text_far Text_PPIsMaxedOut +PPIsMaxedOutText: + text_far _PPIsMaxedOutText text_end -TextJump_PPsIncreased: - ; 's PP increased. - text_far Text_PPsIncreased +PPsIncreasedText: + text_far _PPsIncreasedText text_end -UnknownText_0xf739: - ; PP was restored. - text_far UnknownText_0x1c5cf1 +PPRestoredText: + text_far _PPRestoredText text_end SquirtbottleEffect: @@ -2584,14 +2564,13 @@ GorgeousBoxEffect: OpenBox: farcall SetSpecificDecorationFlag - ld hl, .text + ld hl, .SentTrophyHomeText call PrintText jp UseDisposableItem -.text - ; There was a trophy inside! - text_far UnknownText_0x1c5d03 +.SentTrophyHomeText: + text_far _SentTrophyHomeText text_end NoEffect: @@ -2605,7 +2584,7 @@ Play_SFX_FULL_HEAL: ret UseItemText: - ld hl, UsedItemText + ld hl, ItemUsedText call PrintText call Play_SFX_FULL_HEAL call WaitPressAorB_BlinkCursor @@ -2627,14 +2606,14 @@ UseBallInTrainerBattle: ldh [hBattleTurn], a ld [wNumHits], a predef PlayBattleAnim - ld hl, BlockedTheBallText + ld hl, BallBlockedText call PrintText - ld hl, DontBeAThiefText + ld hl, BallDontBeAThiefText call PrintText jr UseDisposableItem WontHaveAnyEffect_NotUsedMessage: - ld hl, WontHaveAnyEffectText + ld hl, ItemWontHaveEffectText call PrintText ; Item wasn't used. @@ -2643,11 +2622,11 @@ WontHaveAnyEffect_NotUsedMessage: ret LooksBitterMessage: - ld hl, LooksBitterText + ld hl, ItemLooksBitterText jp PrintText Ball_BoxIsFullMessage: - ld hl, Ball_BoxIsFullText + ld hl, BallBoxFullText call PrintText ; Item wasn't used. @@ -2656,27 +2635,27 @@ Ball_BoxIsFullMessage: ret CantUseOnEggMessage: - ld hl, CantUseOnEggText + ld hl, ItemCantUseOnEggText jr CantUseItemMessage IsntTheTimeMessage: - ld hl, IsntTheTimeText + ld hl, ItemOakWarningText jr CantUseItemMessage WontHaveAnyEffectMessage: - ld hl, WontHaveAnyEffectText + ld hl, ItemWontHaveEffectText jr CantUseItemMessage BelongsToSomeoneElseMessage: - ld hl, BelongsToSomeoneElseText + ld hl, ItemBelongsToSomeoneElseText jr CantUseItemMessage CyclingIsntAllowedMessage: - ld hl, CyclingIsntAllowedText + ld hl, NoCyclingText jr CantUseItemMessage CantGetOnYourBikeMessage: - ld hl, CantGetOnYourBikeText + ld hl, ItemCantGetOnText CantUseItemMessage: ; Item couldn't be used. @@ -2684,69 +2663,56 @@ CantUseItemMessage: ld [wItemEffectSucceeded], a jp PrintText -LooksBitterText: - ; It looks bitter… - text_far UnknownText_0x1c5d3e +ItemLooksBitterText: + text_far _ItemLooksBitterText text_end -CantUseOnEggText: - ; That can't be used on an EGG. - text_far UnknownText_0x1c5d50 +ItemCantUseOnEggText: + text_far _ItemCantUseOnEggText text_end -IsntTheTimeText: - ; OAK: ! This isn't the time to use that! - text_far UnknownText_0x1c5d6e +ItemOakWarningText: + text_far _ItemOakWarningText text_end -BelongsToSomeoneElseText: - ; That belongs to someone else! - text_far UnknownText_0x1c5d97 +ItemBelongsToSomeoneElseText: + text_far _ItemBelongsToSomeoneElseText text_end -WontHaveAnyEffectText: - ; It won't have any effect. - text_far UnknownText_0x1c5db6 +ItemWontHaveEffectText: + text_far _ItemWontHaveEffectText text_end -BlockedTheBallText: - ; The trainer blocked the BALL! - text_far UnknownText_0x1c5dd0 +BallBlockedText: + text_far _BallBlockedText text_end -DontBeAThiefText: - ; Don't be a thief! - text_far UnknownText_0x1c5def +BallDontBeAThiefText: + text_far _BallDontBeAThiefText text_end -CyclingIsntAllowedText: - ; Cycling isn't allowed here. - text_far UnknownText_0x1c5e01 +NoCyclingText: + text_far _NoCyclingText text_end -CantGetOnYourBikeText: - ; Can't get on your @ now. - text_far UnknownText_0x1c5e1d +ItemCantGetOnText: + text_far _ItemCantGetOnText text_end -Ball_BoxIsFullText: - ; The #MON BOX is full. That can't be used now. - text_far UnknownText_0x1c5e3a +BallBoxFullText: + text_far _BallBoxFullText text_end -UsedItemText: - ; used the@ . - text_far UnknownText_0x1c5e68 +ItemUsedText: + text_far _ItemUsedText text_end -GotOnTheItemText: - ; got on the@ . - text_far UnknownText_0x1c5e7b +ItemGotOnText: + text_far _ItemGotOnText text_end -GotOffTheItemText: - ; got off@ the @ . - text_far UnknownText_0x1c5e90 +ItemGotOffText: + text_far _ItemGotOffText text_end ApplyPPUp: diff --git a/engine/items/mart.asm b/engine/items/mart.asm index 0209aac23..98bb8324c 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -34,10 +34,10 @@ MartDialog: HerbShop: call FarReadMart call LoadStandardMenuHeader - ld hl, Text_HerbShop_Intro + ld hl, HerbShopLadyIntroText call MartTextbox call BuyMenu - ld hl, Text_HerbShop_ComeAgain + ld hl, HerbalLadyComeAgainText call MartTextbox ret @@ -47,7 +47,7 @@ BargainShop: call LoadMartPointer call ReadMart call LoadStandardMenuHeader - ld hl, Text_BargainShop_Intro + ld hl, BargainShopIntroText call MartTextbox call BuyMenu ld hl, wBargainShopFlags @@ -58,17 +58,17 @@ BargainShop: set DAILYFLAGS1_GOLDENROD_UNDERGROUND_BARGAIN_F, [hl] .skip_set - ld hl, Text_BargainShop_ComeAgain + ld hl, BargainShopComeAgainText call MartTextbox ret Pharmacist: call FarReadMart call LoadStandardMenuHeader - ld hl, Text_Pharmacist_Intro + ld hl, PharmacyIntroText call MartTextbox call BuyMenu - ld hl, Text_Pharmacist_ComeAgain + ld hl, PharmacyComeAgainText call MartTextbox ret @@ -85,10 +85,10 @@ RooftopSale: call LoadMartPointer call ReadMart call LoadStandardMenuHeader - ld hl, Text_Mart_HowMayIHelpYou + ld hl, MartWelcomeText call MartTextbox call BuyMenu - ld hl, Text_Mart_ComeAgain + ld hl, MartComeAgainText call MartTextbox ret @@ -161,7 +161,7 @@ StandardMart: .HowMayIHelpYou: call LoadStandardMenuHeader - ld hl, Text_Mart_HowMayIHelpYou + ld hl, MartWelcomeText call PrintText ld a, STANDARDMART_TOPMENU ret @@ -202,14 +202,14 @@ StandardMart: .Quit: call ExitMenu - ld hl, Text_Mart_ComeAgain + ld hl, MartComeAgainText call MartTextbox ld a, STANDARDMART_EXIT ret .AnythingElse: call LoadStandardMenuHeader - ld hl, Text_Mart_AnythingElse + ld hl, MartAskMoreText call PrintText ld a, STANDARDMART_TOPMENU ret @@ -395,35 +395,35 @@ GetMartDialogGroup: dwb .StandardMartPointers, 2 .StandardMartPointers: - dw Text_Mart_HowMany - dw Text_Mart_CostsThisMuch - dw Text_Mart_InsufficientFunds - dw Text_Mart_BagFull - dw Text_Mart_HereYouGo + dw MartHowManyText + dw MartFinalPriceText + dw MartNoMoneyText + dw MartPackFullText + dw MartThanksText dw BuyMenuLoop .HerbShopPointers: - dw Text_HerbShop_HowMany - dw Text_HerbShop_CostsThisMuch - dw Text_HerbShop_InsufficientFunds - dw Text_HerbShop_BagFull - dw Text_HerbShop_HereYouGo + dw HerbalLadyHowManyText + dw HerbalLadyFinalPriceText + dw HerbalLadyNoMoneyText + dw HerbalLadyPackFullText + dw HerbalLadyThanksText dw BuyMenuLoop .BargainShopPointers: dw BuyMenuLoop - dw Text_BargainShop_CostsThisMuch - dw Text_BargainShop_InsufficientFunds - dw Text_BargainShop_BagFull - dw Text_BargainShop_HereYouGo - dw Text_BargainShop_SoldOut + dw BargainShopFinalPriceText + dw BargainShopNoFundsText + dw BargainShopPackFullText + dw BargainShopThanksText + dw BargainShopSoldOutText .PharmacyPointers: - dw Text_Pharmacy_HowMany - dw Text_Pharmacy_CostsThisMuch - dw Text_Pharmacy_InsufficientFunds - dw Text_Pharmacy_BagFull - dw Text_Pharmacy_HereYouGo + dw PharmacyHowManyText + dw PharmacyFinalPriceText + dw PharmacyNoMoneyText + dw PharmacyPackFullText + dw PharmacyThanksText dw BuyMenuLoop BuyMenuLoop: @@ -581,14 +581,12 @@ RooftopSaleAskPurchaseQuantity: ld d, [hl] ret -Text_Mart_HowMany: - ; How many? - text_far UnknownText_0x1c4bfd +MartHowManyText: + text_far _MartHowManyText text_end -Text_Mart_CostsThisMuch: - ; @ (S) will be ¥@ . - text_far UnknownText_0x1c4c08 +MartFinalPriceText: + text_far _MartFinalPriceText text_end MenuHeader_Buy: @@ -624,109 +622,88 @@ MenuHeader_Buy: call PrintBCDNumber ret -Text_HerbShop_Intro: - ; Hello, dear. I sell inexpensive herbal medicine. They're good, but a trifle bitter. Your #MON may not like them. Hehehehe… - text_far UnknownText_0x1c4c28 +HerbShopLadyIntroText: + text_far _HerbShopLadyIntroText text_end -Text_HerbShop_HowMany: - ; How many? - text_far UnknownText_0x1c4ca3 +HerbalLadyHowManyText: + text_far _HerbalLadyHowManyText text_end -Text_HerbShop_CostsThisMuch: - ; @ (S) will be ¥@ . - text_far UnknownText_0x1c4cae +HerbalLadyFinalPriceText: + text_far _HerbalLadyFinalPriceText text_end -Text_HerbShop_HereYouGo: - ; Thank you, dear. Hehehehe… - text_far UnknownText_0x1c4cce +HerbalLadyThanksText: + text_far _HerbalLadyThanksText text_end -Text_HerbShop_BagFull: - ; Oh? Your PACK is full, dear. - text_far UnknownText_0x1c4cea +HerbalLadyPackFullText: + text_far _HerbalLadyPackFullText text_end -Text_HerbShop_InsufficientFunds: - ; Hehehe… You don't have the money. - text_far UnknownText_0x1c4d08 +HerbalLadyNoMoneyText: + text_far _HerbalLadyNoMoneyText text_end -Text_HerbShop_ComeAgain: - ; Come again, dear. Hehehehe… - text_far UnknownText_0x1c4d2a +HerbalLadyComeAgainText: + text_far _HerbalLadyComeAgainText text_end -Text_BargainShop_Intro: - ; Hiya! Care to see some bargains? I sell rare items that nobody else carries--but only one of each item. - text_far UnknownText_0x1c4d47 +BargainShopIntroText: + text_far _BargainShopIntroText text_end -Text_BargainShop_CostsThisMuch: - ; costs ¥@ . Want it? - text_far UnknownText_0x1c4db0 +BargainShopFinalPriceText: + text_far _BargainShopFinalPriceText text_end -Text_BargainShop_HereYouGo: - ; Thanks. - text_far UnknownText_0x1c4dcd +BargainShopThanksText: + text_far _BargainShopThanksText text_end -Text_BargainShop_BagFull: - ; Uh-oh, your PACK is chock-full. - text_far UnknownText_0x1c4dd6 +BargainShopPackFullText: + text_far _BargainShopPackFullText text_end -Text_BargainShop_SoldOut: - ; You bought that already. I'm all sold out of it. - text_far UnknownText_0x1c4df7 +BargainShopSoldOutText: + text_far _BargainShopSoldOutText text_end -Text_BargainShop_InsufficientFunds: - ; Uh-oh, you're short on funds. - text_far UnknownText_0x1c4e28 +BargainShopNoFundsText: + text_far _BargainShopNoFundsText text_end -Text_BargainShop_ComeAgain: - ; Come by again sometime. - text_far UnknownText_0x1c4e46 +BargainShopComeAgainText: + text_far _BargainShopComeAgainText text_end -Text_Pharmacist_Intro: - ; What's up? Need some medicine? - text_far UnknownText_0x1c4e5f +PharmacyIntroText: + text_far _PharmacyIntroText text_end -Text_Pharmacy_HowMany: - ; How many? - text_far UnknownText_0x1c4e7e +PharmacyHowManyText: + text_far _PharmacyHowManyText text_end -Text_Pharmacy_CostsThisMuch: - ; @ (S) will cost ¥@ . - text_far UnknownText_0x1c4e89 +PharmacyFinalPriceText: + text_far _PharmacyFinalPriceText text_end -Text_Pharmacy_HereYouGo: - ; Thanks much! - text_far UnknownText_0x1c4eab +PharmacyThanksText: + text_far _PharmacyThanksText text_end -Text_Pharmacy_BagFull: - ; You don't have any more space. - text_far UnknownText_0x1c4eb9 +PharmacyPackFullText: + text_far _PharmacyPackFullText text_end -Text_Pharmacy_InsufficientFunds: - ; Huh? That's not enough money. - text_far UnknownText_0x1c4ed8 +PharmacyNoMoneyText: + text_far _PharmacyNoMoneyText text_end -Text_Pharmacist_ComeAgain: - ; All right. See you around. - text_far UnknownText_0x1c4ef6 +PharmacyComeAgainText: + text_far _PharmacyComeAgainText text_end SellMenu: @@ -752,8 +729,7 @@ SellMenu: ret .NothingToSellText: - ; You don't have anything to sell. - text_far UnknownText_0x1c4f12 + text_far _NothingToSellText text_end .TryToSellItem: @@ -780,13 +756,13 @@ SellMenu: ld a, [wItemAttributeParamBuffer] and a jr z, .okay_to_sell - ld hl, TextMart_CantBuyFromYou + ld hl, MartCantBuyText call PrintText and a ret .okay_to_sell - ld hl, Text_Mart_SellHowMany + ld hl, MartSellHowManyText call PrintText farcall PlaceMoneyAtTopLeftOfTextbox farcall SelectQuantityToSell @@ -795,7 +771,7 @@ SellMenu: hlcoord 1, 14 lb bc, 3, 18 call ClearBox - ld hl, Text_Mart_ICanPayThisMuch + ld hl, MartSellPriceText call PrintTextboxText call YesNoBox jr c, .declined @@ -809,7 +785,7 @@ SellMenu: hlcoord 1, 14 lb bc, 3, 18 call ClearBox - ld hl, Text_Mart_SoldForAmount + ld hl, MartBoughtText call PrintTextboxText call PlayTransactionSound farcall PlaceMoneyBottomLeft @@ -820,22 +796,19 @@ SellMenu: and a ret -Text_Mart_SellHowMany: - ; How many? - text_far UnknownText_0x1c4f33 +MartSellHowManyText: + text_far _MartSellHowManyText text_end -Text_Mart_ICanPayThisMuch: - ; I can pay you ¥@ . Is that OK? - text_far UnknownText_0x1c4f3e +MartSellPriceText: + text_far _MartSellPriceText text_end .UnusedString15f7d: db "!ダミー!@" -Text_Mart_HowMayIHelpYou: - ; Welcome! How may I help you? - text_far UnknownText_0x1c4f62 +MartWelcomeText: + text_far _MartWelcomeText text_end MenuHeader_BuySell: @@ -851,37 +824,32 @@ MenuHeader_BuySell: db "SELL@" db "QUIT@" -Text_Mart_HereYouGo: - ; Here you are. Thank you! - text_far UnknownText_0x1c4f80 +MartThanksText: + text_far _MartThanksText text_end -Text_Mart_InsufficientFunds: - ; You don't have enough money. - text_far UnknownText_0x1c4f9a +MartNoMoneyText: + text_far _MartNoMoneyText text_end -Text_Mart_BagFull: - ; You can't carry any more items. - text_far UnknownText_0x1c4fb7 +MartPackFullText: + text_far _MartPackFullText text_end -TextMart_CantBuyFromYou: - ; Sorry, I can't buy that from you. - text_far UnknownText_0x1c4fd7 +MartCantBuyText: + text_far _MartCantBuyText text_end -Text_Mart_ComeAgain: - ; Please come again! - text_far UnknownText_0x1c4ff9 +MartComeAgainText: + text_far _MartComeAgainText text_end -Text_Mart_AnythingElse: - text_far UnknownText_0x1c500d +MartAskMoreText: + text_far _MartAskMoreText text_end -Text_Mart_SoldForAmount: - text_far UnknownText_0x1c502e +MartBoughtText: + text_far _MartBoughtText text_end PlayTransactionSound: diff --git a/engine/items/pack.asm b/engine/items/pack.asm index d5d331720..f19539b88 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -440,7 +440,7 @@ UseItem: dw .Field ; ITEMMENU_CLOSE .Oak: - ld hl, Text_ThisIsntTheTime + ld hl, OakThisIsntTheTimeText call Pack_PrintTextNoScroll ret @@ -461,7 +461,7 @@ UseItem: ret .NoPokemon: - ld hl, TextJump_YouDontHaveAMon + ld hl, YouDontHaveAMonText call Pack_PrintTextNoScroll ret @@ -475,7 +475,7 @@ UseItem: ret TossMenu: - ld hl, Text_ThrowAwayHowMany + ld hl, AskThrowAwayText call Pack_PrintTextNoScroll farcall SelectQuantityToToss push af @@ -483,7 +483,7 @@ TossMenu: pop af jr c, .finish call Pack_GetItemName - ld hl, Text_ConfirmThrowAway + ld hl, AskQuantityThrowAwayText call MenuTextbox call YesNoBox push af @@ -494,7 +494,7 @@ TossMenu: ld a, [wCurItemQuantity] call TossItem call Pack_GetItemName - ld hl, Text_ThrewAway + ld hl, ThrewAwayText call Pack_PrintTextNoScroll .finish ret @@ -547,12 +547,12 @@ RegisterItem: call Pack_GetItemName ld de, SFX_FULL_HEAL call WaitPlaySFX - ld hl, Text_RegisteredItem + ld hl, RegisteredItemText call Pack_PrintTextNoScroll ret .cant_register - ld hl, Text_CantRegister + ld hl, CantRegisterText call Pack_PrintTextNoScroll ret @@ -581,7 +581,7 @@ GiveItem: ld a, [wCurPartySpecies] cp EGG jr nz, .give - ld hl, .Egg + ld hl, .AnEggCantHoldAnItemText call PrintText jr .loop @@ -611,12 +611,11 @@ GiveItem: ret .NoPokemon: - ld hl, TextJump_YouDontHaveAMon + ld hl, YouDontHaveAMonText call Pack_PrintTextNoScroll ret -.Egg: - ; An EGG can't hold an item. - text_far Text_AnEGGCantHoldAnItem +.AnEggCantHoldAnItemText: + text_far _AnEggCantHoldAnItemText text_end QuitItemSubmenu: @@ -735,7 +734,7 @@ BattlePack: xor a ldh [hBGMapMode], a call WaitBGMap_DrawPackGFX - ld hl, Text_PackEmptyString + ld hl, PackEmptyText call Pack_PrintTextNoScroll call Pack_JumptableNext ret @@ -851,7 +850,7 @@ TMHMSubmenu: dw .BattleOnly ; ITEMMENU_CLOSE .Oak: - ld hl, Text_ThisIsntTheTime + ld hl, OakThisIsntTheTimeText call Pack_PrintTextNoScroll ret @@ -1298,7 +1297,7 @@ Pack_InterpretJoypad: .select farcall SwitchItemsInBag - ld hl, Text_MoveItemWhere + ld hl, AskItemMoveText call Pack_PrintTextNoScroll scf ret @@ -1546,60 +1545,48 @@ PC_Mart_BallsPocketMenuHeader: dba PlaceMenuItemQuantity dba UpdateItemDescription -Text_PackNoItems: - ; No items. - text_far UnknownText_0x1c0b9a +PackNoItemText: + text_far _PackNoItemText text_end -Text_ThrowAwayHowMany: - ; Throw away how many? - text_far UnknownText_0x1c0ba5 +AskThrowAwayText: + text_far _AskThrowAwayText text_end -Text_ConfirmThrowAway: - ; Throw away @ @ (S)? - text_far UnknownText_0x1c0bbb +AskQuantityThrowAwayText: + text_far _AskQuantityThrowAwayText text_end -Text_ThrewAway: - ; Threw away @ (S). - text_far UnknownText_0x1c0bd8 +ThrewAwayText: + text_far _ThrewAwayText text_end -Text_ThisIsntTheTime: - ; OAK: ! This isn't the time to use that! - text_far UnknownText_0x1c0bee +OakThisIsntTheTimeText: + text_far _OakThisIsntTheTimeText text_end -TextJump_YouDontHaveAMon: - ; You don't have a #MON! - text_far Text_YouDontHaveAMon +YouDontHaveAMonText: + text_far _YouDontHaveAMonText text_end -Text_RegisteredItem: - ; Registered the @ . - text_far UnknownText_0x1c0c2e +RegisteredItemText: + text_far _RegisteredItemText text_end -Text_CantRegister: - ; You can't register that item. - text_far UnknownText_0x1c0c45 +CantRegisterText: + text_far _CantRegisterText text_end -Text_MoveItemWhere: - ; Where should this be moved to? - text_far UnknownText_0x1c0c63 +AskItemMoveText: + text_far _AskItemMoveText text_end -Text_PackEmptyString: - ; - text_far UnknownText_0x1c0c83 +PackEmptyText: + text_far _PackEmptyText text_end -TextJump_YouCantUseItInABattle: - ; Doesn't seem to be used anywhere - ; "You can't use it in a battle." - text_far Text_YouCantUseItInABattle +YouCantUseItInABattleText: + text_far _YouCantUseItInABattleText text_end PackMenuGFX: diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index d82b5829e..1ff7aab21 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -54,14 +54,14 @@ AskTeachTMHM: ld [wPutativeTMHMMove], a call GetMoveName call CopyName1 - ld hl, Text_BootedTM ; Booted up a TM + ld hl, BootedTMText ; Booted up a TM ld a, [wCurItem] cp HM01 jr c, .TM - ld hl, Text_BootedHM ; Booted up an HM + ld hl, BootedHMText ; Booted up an HM .TM: call PrintText - ld hl, Text_ItContained + ld hl, ContainedMoveText call PrintText call YesNoBox .NotTMHM: @@ -132,7 +132,7 @@ TeachTMHM: ld de, SFX_WRONG call PlaySFX pop de - ld hl, Text_TMHMNotCompatible + ld hl, TMHMNotCompatibleText call PrintText jr .nope @@ -166,24 +166,20 @@ TeachTMHM: scf ret -Text_BootedTM: - ; Booted up a TM. - text_far UnknownText_0x1c0373 +BootedTMText: + text_far _BootedTMText text_end -Text_BootedHM: - ; Booted up an HM. - text_far UnknownText_0x1c0384 +BootedHMText: + text_far _BootedHMText text_end -Text_ItContained: - ; It contained @ . Teach @ to a #MON? - text_far UnknownText_0x1c0396 +ContainedMoveText: + text_far _ContainedMoveText text_end -Text_TMHMNotCompatible: - ; is not compatible with @ . It can't learn @ . - text_far UnknownText_0x1c03c2 +TMHMNotCompatibleText: + text_far _TMHMNotCompatibleText text_end TMHM_PocketLoop: @@ -491,20 +487,18 @@ TMHM_PlaySFX_ReadText2: Unreferenced_Function2cadf: call ConvertCurItemIntoCurTMHM call .CheckHaveRoomForTMHM - ld hl, .NoRoomText + ld hl, .NoRoomTMHMText jr nc, .print - ld hl, .ReceivedText + ld hl, .ReceivedTMHMText .print jp PrintText -.NoRoomText: - ; You have no room for any more @ S. - text_far UnknownText_0x1c03fa +.NoRoomTMHMText: + text_far _NoRoomTMHMText text_end -.ReceivedText: - ; You received @ ! - text_far UnknownText_0x1c0421 +.ReceivedTMHMText: + text_far _ReceivedTMHMText text_end .CheckHaveRoomForTMHM: diff --git a/engine/link/link.asm b/engine/link/link.asm index 9cb29801c..d12f6bdd8 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -475,7 +475,7 @@ Gen2ToGen2LinkComms: jp InitTradeMenuDisplay LinkTimeout: - ld de, .TooMuchTimeHasElapsed + ld de, .LinkTimeoutText ld b, 10 .loop call DelayFrame @@ -505,9 +505,8 @@ LinkTimeout: call WaitBGMap2 ret -.TooMuchTimeHasElapsed: - ; Too much time has elapsed. Please try again. - text_far UnknownText_0x1c4183 +.LinkTimeoutText: + text_far _LinkTimeoutText text_end ExchangeBytes: @@ -1446,7 +1445,7 @@ Function28926: ld c, 18 call LinkTextboxAtHL farcall Link_WaitBGMap - ld hl, .Text_CantTradeLastMon + ld hl, .LinkTradeCantBattleText bccoord 1, 14 call PlaceHLTextAtBC jr .cancel_trade @@ -1468,7 +1467,7 @@ Function28926: ld c, 18 call LinkTextboxAtHL farcall Link_WaitBGMap - ld hl, .Text_Abnormal + ld hl, .LinkAbnormalMonText bccoord 1, 14 call PlaceHLTextAtBC @@ -1487,17 +1486,15 @@ Function28926: call DelayFrames jp InitTradeMenuDisplay -.Text_CantTradeLastMon: - ; If you trade that #MON, you won't be able to battle. - text_far UnknownText_0x1c41b1 +.LinkTradeCantBattleText: + text_far _LinkTradeCantBattleText text_end .String_Stats_Trade: db "STATS TRADE@" -.Text_Abnormal: - ; Your friend's @ appears to be abnormal! - text_far UnknownText_0x1c41e6 +.LinkAbnormalMonText: + text_far _LinkAbnormalMonText text_end Function28ac9: @@ -1633,7 +1630,7 @@ LinkTrade: ld a, [hl] ld [wNamedObjectIndexBuffer], a call GetPokemonName - ld hl, UnknownText_0x28eb8 + ld hl, LinkAskTradeForText bccoord 1, 14 call PlaceHLTextAtBC call LoadStandardMenuHeader @@ -1948,9 +1945,8 @@ String28eab: db "TRADE" next "CANCEL@" -UnknownText_0x28eb8: - ; Trade @ for @ ? - text_far UnknownText_0x1c4212 +LinkAskTradeForText: + text_far _LinkAskTradeForText text_end String28ebd: diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 041127abe..7c6ce7d7b 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -33,7 +33,7 @@ DoMysteryGift: pop de hlcoord 2, 8 ld a, d - ld de, .Text_LinkCanceled ; Link has been canceled + ld de, .MysteryGiftCanceledText ; Link has been canceled cp $10 jp z, .LinkCanceled cp $6c @@ -42,10 +42,10 @@ DoMysteryGift: cp 3 jr z, .skip_checks call .CheckAlreadyGotFiveGiftsToday - ld hl, .Text_MaxFiveGifts ; Only 5 gifts a day + ld hl, .MysteryGiftFiveADayText ; Only 5 gifts a day jp nc, .PrintTextAndExit call .CheckAlreadyGotAGiftFromThatPerson - ld hl, .Text_MaxOneGiftPerPerson ; Only one gift a day per person + ld hl, .MysteryGiftOneADayText ; Only one gift a day per person jp c, .PrintTextAndExit .skip_checks ld a, [wMysteryGiftPlayerBackupItem] @@ -82,7 +82,7 @@ DoMysteryGift: ld de, wStringBuffer1 ld bc, ITEM_NAME_LENGTH call CopyBytes - ld hl, .Text_SentToHome ; sent decoration to home + ld hl, .MysteryGiftSentHomeText ; sent decoration to home jr .PrintTextAndExit .item @@ -95,24 +95,24 @@ DoMysteryGift: ld [wNamedObjectIndexBuffer], a call CloseSRAM call GetItemName - ld hl, .Text_Sent ; sent item + ld hl, .MysteryGiftSentText ; sent item jr .PrintTextAndExit .LinkCanceled: - ld hl, .Text_LinkCanceled ; Link has been canceled + ld hl, .MysteryGiftCanceledText ; Link has been canceled jr .PrintTextAndExit .CommunicationError: - ld hl, .Text_CommunicationError ; Communication error + ld hl, .MysteryGiftCommErrorText ; Communication error call PrintText jp DoMysteryGift .GiftWaiting: - ld hl, .Text_ReceiveGiftAtCounter ; receive gift at counter + ld hl, .RetrieveMysteryGiftText ; receive gift at counter jr .PrintTextAndExit .FriendNotReady: - ld hl, .Text_FriendNotReady ; friend not ready + ld hl, .YourFriendIsNotReadyText ; friend not ready .PrintTextAndExit: call PrintText @@ -127,36 +127,36 @@ DoMysteryGift: next "cancel it." db "@" -.Text_LinkCanceled: - text_far UnknownText_0x1c0436 +.MysteryGiftCanceledText: + text_far _MysteryGiftCanceledText text_end -.Text_CommunicationError: - text_far UnknownText_0x1c0454 +.MysteryGiftCommErrorText: + text_far _MysteryGiftCommErrorText text_end -.Text_ReceiveGiftAtCounter: - text_far UnknownText_0x1c046a +.RetrieveMysteryGiftText: + text_far _RetrieveMysteryGiftText text_end -.Text_FriendNotReady: - text_far UnknownText_0x1c048e +.YourFriendIsNotReadyText: + text_far _YourFriendIsNotReadyText text_end -.Text_MaxFiveGifts: - text_far UnknownText_0x1c04a7 +.MysteryGiftFiveADayText: + text_far _MysteryGiftFiveADayText text_end -.Text_MaxOneGiftPerPerson: - text_far UnknownText_0x1c04c6 +.MysteryGiftOneADayText: + text_far _MysteryGiftOneADayText text_end -.Text_Sent: - text_far UnknownText_0x1c04e9 +.MysteryGiftSentText: + text_far _MysteryGiftSentText text_end -.Text_SentToHome: - text_far UnknownText_0x1c04fa +.MysteryGiftSentHomeText: + text_far _MysteryGiftSentHomeText text_end .CheckAlreadyGotFiveGiftsToday: @@ -1425,15 +1425,15 @@ Function105688: ld c, 60 call DelayFrames call Function105777 - ld hl, Text_ReceivedCard + ld hl, MysteryGiftReceivedCardText call PrintText ld de, wMysteryGiftTrainerData farcall Function8ac70 ld a, c ld [wDeciramBuffer], a - ld hl, Text_CardNotRegistered + ld hl, MysteryGiftNotRegisteredCardText jr c, PrintTextAndExit_JP - ld hl, Text_ListedCardAsNumber + ld hl, MysteryGiftListedCardText jr PrintTextAndExit_JP Function1056eb: @@ -1467,12 +1467,12 @@ endr Function105712: call Function105777 - ld hl, Text_MGLinkCanceled + ld hl, MysteryGiftLinkCancelledText jr PrintTextAndExit_JP Function10571a: call Function105777 - ld hl, Text_MGCommError + ld hl, MysteryGiftLinkCommErrorText call PrintText jp Function105688 @@ -1489,24 +1489,24 @@ String_PressAToLink_BToCancel_JP: next "つうしん<WO>ちゅうし します" db "@" -Text_ReceivedCard: - text_far UnknownText_0x1c051a +MysteryGiftReceivedCardText: + text_far _MysteryGiftReceivedCardText text_end -Text_ListedCardAsNumber: - text_far UnknownText_0x1c0531 +MysteryGiftListedCardText: + text_far _MysteryGiftListedCardText text_end -Text_CardNotRegistered: - text_far UnknownText_0x1c0555 +MysteryGiftNotRegisteredCardText: + text_far _MysteryGiftNotRegisteredCardText text_end -Text_MGLinkCanceled: - text_far UnknownText_0x1c0573 +MysteryGiftLinkCancelledText: + text_far _MysteryGiftLinkCancelledText text_end -Text_MGCommError: - text_far UnknownText_0x1c0591 +MysteryGiftLinkCommErrorText: + text_far _MysteryGiftLinkCommErrorText text_end Function105777: diff --git a/engine/menus/delete_save.asm b/engine/menus/delete_save.asm index 85b25e54b..97b27ac2d 100644 --- a/engine/menus/delete_save.asm +++ b/engine/menus/delete_save.asm @@ -6,7 +6,7 @@ _DeleteSaveData: call LoadFontsExtra ld de, MUSIC_MAIN_MENU call PlayMusic - ld hl, .Text_ClearAllSaveData + ld hl, .ClearAllSaveDataText call PrintText ld hl, .NoYesMenuHeader call CopyMenuHeader @@ -18,9 +18,8 @@ _DeleteSaveData: farcall EmptyAllSRAMBanks ret -.Text_ClearAllSaveData: - ; Clear all save data? - text_far UnknownText_0x1c564a +.ClearAllSaveDataText: + text_far _ClearAllSaveDataText text_end .NoYesMenuHeader: diff --git a/engine/menus/init_gender.asm b/engine/menus/init_gender.asm index 4c1f3a8f9..c5cc95bf3 100644 --- a/engine/menus/init_gender.asm +++ b/engine/menus/init_gender.asm @@ -27,7 +27,7 @@ InitGender: call LoadGenderScreenLightBlueTile call WaitBGMap2 call SetPalettes - ld hl, TextJump_AreYouABoyOrAreYouAGirl + ld hl, AreYouABoyOrAreYouAGirlText call PrintText ld hl, .MenuHeader call LoadMenuHeader @@ -53,9 +53,8 @@ InitGender: db "Boy@" db "Girl@" -TextJump_AreYouABoyOrAreYouAGirl: - ; Are you a boy? Or are you a girl? - text_far Text_AreYouABoyOrAreYouAGirl +AreYouABoyOrAreYouAGirlText: + text_far _AreYouABoyOrAreYouAGirlText text_end InitGenderScreen: diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 281000352..9274694da 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -280,9 +280,8 @@ MainMenu_PrintCurrentTimeAndDay: .TimeNotSet: db "TIME NOT SET@" -.UnusedText: - ; Clock time unknown - text_far UnknownText_0x1c5182 +.MainMenuTimeUnknownText: + text_far _MainMenuTimeUnknownText text_end .PlaceCurrentDay: diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm index f9f395329..544f4ade8 100644 --- a/engine/menus/menu.asm +++ b/engine/menus/menu.asm @@ -725,14 +725,14 @@ Unreferenced_Function24423: ret Error_Cant_ExitMenu: - ld hl, .Text_NoWindowsAvailableForPopping + ld hl, .WindowPoppingErrorText call PrintText call WaitBGMap -.InfiniteLoop: - jr .InfiniteLoop +.infinite_loop + jr .infinite_loop -.Text_NoWindowsAvailableForPopping: - text_far UnknownText_0x1c46b7 +.WindowPoppingErrorText: + text_far _WindowPoppingErrorText text_end _InitVerticalMenuCursor:: diff --git a/engine/menus/save.asm b/engine/menus/save.asm index e7dcb026a..7116e817a 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -4,7 +4,7 @@ SaveMenu: call SpeechTextbox call UpdateSprites farcall SaveMenu_CopyTilemapAtOnce - ld hl, Text_WouldYouLikeToSaveTheGame + ld hl, WouldYouLikeToSaveTheGameText call SaveTheGame_yesorno jr nz, .refused call AskOverwriteSaveFile @@ -38,7 +38,7 @@ SaveAfterLinkTrade: ChangeBoxSaveGame: push de - ld hl, Text_SaveOnBoxSwitch + ld hl, ChangeBoxSaveText call MenuTextbox call YesNoBox call ExitMenu @@ -115,7 +115,7 @@ MoveMonWOMail_InsertMon_SaveGame: ret StartMoveMonWOMail_SaveGame: - ld hl, Text_SaveOnMoveMonWOMail + ld hl, MoveMonWOMailSaveText call MenuTextbox call YesNoBox call ExitMenu @@ -173,13 +173,13 @@ AskOverwriteSaveFile: jr z, .erase call CompareLoadedAndSavedPlayerID jr z, .yoursavefile - ld hl, Text_AnotherSaveFile + ld hl, AnotherSaveFileText call SaveTheGame_yesorno jr nz, .refused jr .erase .yoursavefile - ld hl, Text_AlreadyASaveFile + ld hl, AlreadyASaveFileText call SaveTheGame_yesorno jr nz, .refused jr .ok @@ -196,7 +196,7 @@ AskOverwriteSaveFile: ret SaveTheGame_yesorno: - ld b, BANK(Text_WouldYouLikeToSaveTheGame) + ld b, BANK(WouldYouLikeToSaveTheGameText) call MapTextbox call LoadMenuTextbox lb bc, 0, 7 @@ -239,7 +239,7 @@ SavedTheGame: ld a, TEXT_DELAY_MED ld [wOptions], a ; <PLAYER> saved the game! - ld hl, Text_PlayerSavedTheGame + ld hl, SavedTheGameText call PrintText ; restore the original text speed setting pop af @@ -336,7 +336,7 @@ SavingDontTurnOffThePower: ld a, TEXT_DELAY_MED ld [wOptions], a ; SAVING... DON'T TURN OFF THE POWER. - ld hl, Text_SavingDontTurnOffThePower + ld hl, SavingDontTurnOffThePowerText call PrintText ; Restore the text speed setting pop af @@ -619,7 +619,7 @@ TryLoadSaveFile: push af set NO_TEXT_SCROLL, a ld [wOptions], a - ld hl, Text_SaveFileCorrupted + ld hl, SaveFileCorruptedText call PrintText pop af ld [wOptions], a @@ -1095,42 +1095,34 @@ Checksum: jr nz, .loop ret -Text_WouldYouLikeToSaveTheGame: - ; Would you like to save the game? - text_far UnknownText_0x1c454b +WouldYouLikeToSaveTheGameText: + text_far _WouldYouLikeToSaveTheGameText text_end -Text_SavingDontTurnOffThePower: - ; SAVING… DON'T TURN OFF THE POWER. - text_far UnknownText_0x1c456d +SavingDontTurnOffThePowerText: + text_far _SavingDontTurnOffThePowerText text_end -Text_PlayerSavedTheGame: - ; saved the game. - text_far UnknownText_0x1c4590 +SavedTheGameText: + text_far _SavedTheGameText text_end -Text_AlreadyASaveFile: - ; There is already a save file. Is it OK to overwrite? - text_far UnknownText_0x1c45a3 +AlreadyASaveFileText: + text_far _AlreadyASaveFileText text_end -Text_AnotherSaveFile: - ; There is another save file. Is it OK to overwrite? - text_far UnknownText_0x1c45d9 +AnotherSaveFileText: + text_far _AnotherSaveFileText text_end -Text_SaveFileCorrupted: - ; The save file is corrupted! - text_far UnknownText_0x1c460d +SaveFileCorruptedText: + text_far _SaveFileCorruptedText text_end -Text_SaveOnBoxSwitch: - ; When you change a #MON BOX, data will be saved. OK? - text_far UnknownText_0x1c462a +ChangeBoxSaveText: + text_far _ChangeBoxSaveText text_end -Text_SaveOnMoveMonWOMail: - ; Each time you move a #MON, data will be saved. OK? - text_far UnknownText_0x1c465f +MoveMonWOMailSaveText: + text_far _MoveMonWOMailSaveText text_end diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index ab7b98ea2..69b1f73bf 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -411,7 +411,7 @@ StartMenu_Exit: StartMenu_Quit: ; Retire from the bug catching contest. - ld hl, .EndTheContestText + ld hl, .StartMenuContestEndText call StartMenuYesNo jr c, .DontEndContest ld a, BANK(BugCatchingContestReturnToGateScript) @@ -424,8 +424,8 @@ StartMenu_Quit: ld a, 0 ret -.EndTheContestText: - text_far UnknownText_0x1c1a6c +.StartMenuContestEndText: + text_far _StartMenuContestEndText text_end StartMenu_Save: diff --git a/engine/movie/init_hof_credits.asm b/engine/movie/init_hof_credits.asm index 0a02919ed..7dc31ef24 100644 --- a/engine/movie/init_hof_credits.asm +++ b/engine/movie/init_hof_credits.asm @@ -17,14 +17,13 @@ InitDisplayForHallOfFame: ldh [hSCY], a ldh [hSCX], a call EnableLCD - ld hl, .SavingRecordDontTurnOff + ld hl, .SavingRecordText call PrintText call WaitBGMap2 call SetPalettes ret -.SavingRecordDontTurnOff: - ; SAVING RECORD… DON'T TURN OFF! +.SavingRecordText: text_far _SavingRecordText text_end diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 065ba9e18..7868fe33e 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -1170,11 +1170,11 @@ TradeAnim_SentToOTText: ld a, [wLinkMode] cp LINK_TIMECAPSULE jr z, .time_capsule - ld hl, .Text_MonName + ld hl, .MonNameSentToText call PrintText ld c, 189 call DelayFrames - ld hl, .Text_WasSentTo + ld hl, .MonWasSentToText call PrintText call TradeAnim_Wait80Frames ld c, 128 @@ -1183,40 +1183,36 @@ TradeAnim_SentToOTText: ret .time_capsule - ld hl, .Text_WasSentTo + ld hl, .MonWasSentToText call PrintText call TradeAnim_Wait80Frames call TradeAnim_AdvanceScriptPointer ret -.Text_WasSentTo: - ; was sent to @ . - text_far _TradingText1 +.MonWasSentToText: + text_far _MonWasSentToText text_end -.Text_MonName: - ; - text_far _TradingText2 +.MonNameSentToText: + text_far _MonNameSentToText text_end TradeAnim_OTBidsFarewell: - ld hl, .Text_BidsFarewellToMon + ld hl, .BidsFarewellToMonText call PrintText call TradeAnim_Wait80Frames - ld hl, .Text_MonName + ld hl, .MonNameBidsFarewellText call PrintText call TradeAnim_Wait80Frames call TradeAnim_AdvanceScriptPointer ret -.Text_BidsFarewellToMon: - ; bids farewell to - text_far _TradingText3 +.BidsFarewellToMonText: + text_far _BidsFarewellToMonText text_end -.Text_MonName: - ; . - text_far _TradingText4 +.MonNameBidsFarewellText: + text_far _MonNameBidsFarewellText text_end TradeAnim_TakeCareOfText: @@ -1226,22 +1222,21 @@ TradeAnim_TakeCareOfText: ld a, " " call ByteFill call WaitBGMap - ld hl, .Text_TakeGoodCareOfMon + ld hl, .TakeGoodCareOfMonText call PrintText call TradeAnim_Wait80Frames call TradeAnim_AdvanceScriptPointer ret -.Text_TakeGoodCareOfMon: - ; Take good care of @ . - text_far _TradingText5 +.TakeGoodCareOfMonText: + text_far _TakeGoodCareOfMonText text_end TradeAnim_OTSendsText1: - ld hl, .Text_ForYourMon + ld hl, .ForYourMonSendsText call PrintText call TradeAnim_Wait80Frames - ld hl, .Text_OTSends + ld hl, .OTSendsText call PrintText call TradeAnim_Wait80Frames ld c, 14 @@ -1249,21 +1244,19 @@ TradeAnim_OTSendsText1: call TradeAnim_AdvanceScriptPointer ret -.Text_ForYourMon: - ; For @ 's @ , - text_far _TradingText6 +.ForYourMonSendsText: + text_far _ForYourMonSendsText text_end -.Text_OTSends: - ; sends @ . - text_far _TradingText7 +.OTSendsText: + text_far _OTSendsText text_end TradeAnim_OTSendsText2: - ld hl, .Text_WillTrade + ld hl, .WillTradeText call PrintText call TradeAnim_Wait80Frames - ld hl, .Text_ForYourMon + ld hl, .ForYourMonWillTradeText call PrintText call TradeAnim_Wait80Frames ld c, 14 @@ -1271,14 +1264,12 @@ TradeAnim_OTSendsText2: call TradeAnim_AdvanceScriptPointer ret -.Text_WillTrade: - ; will trade @ @ - text_far _TradingText8 +.WillTradeText: + text_far _WillTradeText text_end -.Text_ForYourMon: - ; for @ 's @ . - text_far _TradingText9 +.ForYourMonWillTradeText: + text_far _ForYourMonWillTradeText text_end TradeAnim_Wait80Frames: diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm index 3b40641f3..67a07e5db 100644 --- a/engine/overworld/decorations.asm +++ b/engine/overworld/decorations.asm @@ -378,12 +378,11 @@ PopulateDecoCategoryMenu: ret .empty - ld hl, .Text_nothing_to_choose + ld hl, .NothingToChooseText call MenuTextboxBackup ret -.Text_nothing_to_choose: - ; There's nothing to choose. +.NothingToChooseText: text_far _NothingToChooseText text_end @@ -674,7 +673,7 @@ DecoAction_SetItUp: ld a, [wBuffer1] ld hl, wStringBuffer3 call GetDecorationName - ld hl, DecoText_PutAwayAndSetUp + ld hl, PutAwayAndSetUpText call MenuTextboxBackup xor a ret @@ -683,13 +682,13 @@ DecoAction_SetItUp: ld a, [wMenuSelection] ld hl, wStringBuffer3 call GetDecorationName - ld hl, DecoText_SetUpTheDeco + ld hl, SetUpTheDecoText call MenuTextboxBackup xor a ret .alreadythere - ld hl, DecoText_AlreadySetUp + ld hl, AlreadySetUpText call MenuTextboxBackup scf ret @@ -710,19 +709,19 @@ DecoAction_TryPutItAway: ld [wMenuSelection], a ld hl, wStringBuffer3 call GetDecorationName - ld hl, DecoText_PutAwayTheDeco + ld hl, PutAwayTheDecoText call MenuTextboxBackup xor a ret .nothingthere - ld hl, DecoText_NothingToPutAway + ld hl, NothingToPutAwayText call MenuTextboxBackup xor a ret DecoAction_setupornament: - ld hl, UnknownText_0x26e41 + ld hl, WhichSidePutOnText call DecoAction_AskWhichSide jr c, .cancel call DecoAction_SetItUp_Ornament @@ -736,7 +735,7 @@ DecoAction_setupornament: ret DecoAction_putawayornament: - ld hl, DecoText_WhichSide + ld hl, WhichSidePutAwayText call DecoAction_AskWhichSide jr nc, .incave xor a @@ -771,7 +770,7 @@ DecoAction_SetItUp_Ornament: ld a, [wMenuSelection] ld [wSelectedDecoration], a call .getwhichside - ld hl, DecoText_PutAwayAndSetUp + ld hl, PutAwayAndSetUpText call MenuTextboxBackup xor a ret @@ -783,13 +782,13 @@ DecoAction_SetItUp_Ornament: ld a, [wMenuSelection] ld hl, wStringBuffer3 call GetDecorationName - ld hl, DecoText_SetUpTheDeco + ld hl, SetUpTheDecoText call MenuTextboxBackup xor a ret .failed - ld hl, DecoText_AlreadySetUp + ld hl, AlreadySetUpText call MenuTextboxBackup scf ret @@ -804,8 +803,7 @@ DecoAction_SetItUp_Ornament: ld [wOtherDecoration], a ret -UnknownText_0x26e41: - ; Which side do you want to put it on? +WhichSidePutOnText: text_far _WhichSidePutOnText text_end @@ -819,19 +817,18 @@ DecoAction_PutItAway_Ornament: ld [wBuffer5], a xor a ld [wSelectedDecoration], a - ld hl, DecoText_PutAwayTheDeco + ld hl, PutAwayTheDecoText call MenuTextboxBackup xor a ret .nothingthere - ld hl, DecoText_NothingToPutAway + ld hl, NothingToPutAwayText call MenuTextboxBackup xor a ret -DecoText_WhichSide: - ; Which side do you want to put away? +WhichSidePutAwayText: text_far _WhichSidePutAwayText text_end @@ -883,28 +880,23 @@ MenuData_0x26eb3: db "LEFT SIDE@" db "CANCEL@" -DecoText_PutAwayTheDeco: - ; Put away the @ . +PutAwayTheDecoText: text_far _PutAwayTheDecoText text_end -DecoText_NothingToPutAway: - ; There's nothing to put away. +NothingToPutAwayText: text_far _NothingToPutAwayText text_end -DecoText_SetUpTheDeco: - ; Set up the @ . +SetUpTheDecoText: text_far _SetUpTheDecoText text_end -DecoText_PutAwayAndSetUp: - ; Put away the @ and set up the @ . +PutAwayAndSetUpText: text_far _PutAwayAndSetUpText text_end -DecoText_AlreadySetUp: - ; That's already set up. +AlreadySetUpText: text_far _AlreadySetUpText text_end @@ -1005,38 +997,34 @@ DecorationDesc_PosterPointers: DecorationDesc_TownMapPoster: opentext - writetext .TownMapText + writetext .LookTownMapText waitbutton special OverworldTownMap closetext end -.TownMapText: - ; It's the TOWN MAP. +.LookTownMapText: text_far _LookTownMapText text_end DecorationDesc_PikachuPoster: - jumptext .PikaPosterText + jumptext .LookPikachuPosterText -.PikaPosterText: - ; It's a poster of a cute PIKACHU. +.LookPikachuPosterText: text_far _LookPikachuPosterText text_end DecorationDesc_ClefairyPoster: - jumptext .ClefairyPosterText + jumptext .LookClefairyPosterText -.ClefairyPosterText: - ; It's a poster of a cute CLEFAIRY. +.LookClefairyPosterText: text_far _LookClefairyPosterText text_end DecorationDesc_JigglypuffPoster: - jumptext .JigglypuffPosterText + jumptext .LookJigglypuffPosterText -.JigglypuffPosterText: - ; It's a poster of a cute JIGGLYPUFF. +.LookJigglypuffPosterText: text_far _LookJigglypuffPosterText text_end @@ -1064,10 +1052,9 @@ DecorationDesc_OrnamentOrConsole: ret .OrnamentConsoleScript: - jumptext .OrnamentConsoleText + jumptext .LookAdorableDecoText -.OrnamentConsoleText: - ; It's an adorable @ . +.LookAdorableDecoText: text_far _LookAdorableDecoText text_end @@ -1077,10 +1064,9 @@ DecorationDesc_GiantOrnament: ret .BigDollScript: - jumptext .BigDollText + jumptext .LookGiantDecoText -.BigDollText: - ; A giant doll! It's fluffy and cuddly. +.LookGiantDecoText: text_far _LookGiantDecoText text_end diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 7496b82bd..128439205 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -530,7 +530,7 @@ GiveItemScript: end ReceivedItemText: - text_far UnknownText_0x1c4719 + text_far _ReceivedItemText text_end Script_verbosegiveitemvar: @@ -622,11 +622,11 @@ CurItemName: ret PutItemInPocketText: - text_far UnknownText_0x1c472c + text_far _PutItemInPocketText text_end PocketIsFullText: - text_far UnknownText_0x1c474b + text_far _PocketIsFullText text_end Script_pokemart: diff --git a/engine/overworld/select_menu.asm b/engine/overworld/select_menu.asm index 9cc2ba149..18532edae 100644 --- a/engine/overworld/select_menu.asm +++ b/engine/overworld/select_menu.asm @@ -5,14 +5,14 @@ SelectMenu:: .NotRegistered: call OpenText - ld b, BANK(ItemMayBeRegisteredText) - ld hl, ItemMayBeRegisteredText + ld b, BANK(MayRegisterItemText) + ld hl, MayRegisterItemText call MapTextbox call WaitButton jp CloseText -ItemMayBeRegisteredText: - text_far UnknownText_0x1c1cf3 +MayRegisterItemText: + text_far _MayRegisterItemText text_end CheckRegisteredItem: diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index a384915b6..61ef89b18 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -821,7 +821,7 @@ RandomUnseenWildMon: ld a, c ld [wNamedObjectIndexBuffer], a call GetPokemonName - ld hl, .SawRareMonText + ld hl, .JustSawSomeRareMonText call PrintText xor a ld [wScriptVar], a @@ -832,8 +832,7 @@ RandomUnseenWildMon: ld [wScriptVar], a ret -.SawRareMonText: - ; I just saw some rare @ in @ . I'll call you if I see another rare #MON, OK? +.JustSawSomeRareMonText: text_far _JustSawSomeRareMonText text_end diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 8a2b022dc..a62312d10 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -361,8 +361,8 @@ Function90199: jr .DoPhoneCall .OutOfArea: - ld b, BANK(UnknownScript_0x90209) - ld de, UnknownScript_0x90209 + ld b, BANK(LoadOutOfAreaScript) + ld de, LoadOutOfAreaScript call ExecuteCallbackScript ret @@ -373,17 +373,17 @@ Function90199: ld [wPhoneCaller], a ld a, h ld [wPhoneCaller + 1], a - ld b, BANK(UnknownScript_0x90205) - ld de, UnknownScript_0x90205 + ld b, BANK(LoadPhoneScriptBank) + ld de, LoadPhoneScriptBank call ExecuteCallbackScript ret -UnknownScript_0x90205: +LoadPhoneScriptBank: memcall wPhoneScriptBank return -UnknownScript_0x90209: - scall UnknownScript_0x90657 +LoadOutOfAreaScript: + scall PhoneOutOfAreaScript return LoadCallerScript: @@ -413,11 +413,10 @@ WrongNumber: db TRAINER_NONE, PHONE_00 dba .script .script - writetext .text + writetext .PhoneWrongNumberText end -.text - ; Huh? Sorry, wrong number! - text_far UnknownText_0x1c5565 +.PhoneWrongNumberText: + text_far _PhoneWrongNumberText text_end Script_ReceivePhoneCall: @@ -438,7 +437,7 @@ Script_SpecialBillCall:: ld e, PHONE_BILL jp LoadCallerScript -UnknownScript_0x90261: +LoadElmCallScript: callasm .LoadElmScript pause 30 sjump Script_ReceivePhoneCall @@ -535,23 +534,23 @@ Function90316: ret HangUp_Beep: - ld hl, UnknownText_0x9032a + ld hl, PhoneClickText call PrintText ld de, SFX_HANG_UP call PlaySFX ret -UnknownText_0x9032a: - text_far UnknownText_0x1c5580 +PhoneClickText: + text_far _PhoneClickText text_end HangUp_BoopOn: - ld hl, UnknownText_0x90336 + ld hl, PhoneEllipseText call PrintText ret -UnknownText_0x90336: - text_far UnknownText_0x1c5588 +PhoneEllipseText: + text_far _PhoneEllipseText text_end HangUp_BoopOff: @@ -705,29 +704,26 @@ INCLUDE "data/phone/phone_contacts.asm" INCLUDE "data/phone/special_calls.asm" -UnknownScript_0x90657: - writetext UnknownText_0x9065b +PhoneOutOfAreaScript: + writetext PhoneOutOfAreaText end -UnknownText_0x9065b: - ; That number is out of the area. - text_far UnknownText_0x1c558b +PhoneOutOfAreaText: + text_far _PhoneOutOfAreaText text_end PhoneScript_JustTalkToThem: - writetext UnknownText_0x90664 + writetext PhoneJustTalkToThemText end -UnknownText_0x90664: - ; Just go talk to that person! - text_far UnknownText_0x1c55ac +PhoneJustTalkToThemText: + text_far _PhoneJustTalkToThemText text_end -UnknownScript_0x90669: - writetext UnknownText_0x9066d +PhoneThankYouTextScript: + writetext PhoneThankYouText end -UnknownText_0x9066d: - ; Thank you! - text_far UnknownText_0x1c55ca +PhoneThankYouText: + text_far _PhoneThankYouText text_end diff --git a/engine/phone/scripts/alan.asm b/engine/phone/scripts/alan.asm index ad020f0ba..0f42e8558 100644 --- a/engine/phone/scripts/alan.asm +++ b/engine/phone/scripts/alan.asm @@ -13,15 +13,15 @@ AlanPhoneCalleeScript: iftrue AlanWednesdayDay .NotWednesday: - farsjump UnknownScript_0xa0970 + farsjump AlanHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_36 - farsjump UnknownScript_0xa0a73 + farsjump AlanReminderScript .FireStone: getlandmarkname STRING_BUFFER_5, ROUTE_36 - farsjump UnknownScript_0xa0ac5 + farsjump AlanComePickUpScript AlanPhoneCallerScript: gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1 diff --git a/engine/phone/scripts/anthony.asm b/engine/phone/scripts/anthony.asm index 4bd3278c3..55afd47f5 100644 --- a/engine/phone/scripts/anthony.asm +++ b/engine/phone/scripts/anthony.asm @@ -13,15 +13,15 @@ AnthonyPhoneCalleeScript: .NotFriday: checkflag ENGINE_DUNSPARCE_SWARM iftrue .AlreadySwarming - farsjump UnknownScript_0xa0950 + farsjump AnthonyHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_33 - farsjump UnknownScript_0xa0a5f + farsjump AnthonyReminderScript .AlreadySwarming: getlandmarkname STRING_BUFFER_5, ROUTE_33 - farsjump UnknownScript_0xa0afa + farsjump AnthonyHurryScript AnthonyPhoneCallerScript: gettrainername STRING_BUFFER_3, HIKER, ANTHONY2 @@ -55,7 +55,7 @@ AnthonyTriesDunsparceSwarm: getmonname STRING_BUFFER_4, DUNSPARCE swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE getlandmarkname STRING_BUFFER_5, DARK_CAVE - farsjump UnknownScript_0xa05de + farsjump AnthonySwarmScript .Generic: farsjump Phone_GenericCall_Male diff --git a/engine/phone/scripts/arnie.asm b/engine/phone/scripts/arnie.asm index fda846e18..a768d8b70 100644 --- a/engine/phone/scripts/arnie.asm +++ b/engine/phone/scripts/arnie.asm @@ -13,15 +13,15 @@ ArniePhoneCalleeScript: .NotTuesday: checkflag ENGINE_YANMA_SWARM iftrue .AlreadySwarming - farsjump UnknownScript_0xa0968 + farsjump ArnieHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_35 - farsjump UnknownScript_0xa0a6e + farsjump ArnieReminderScript .AlreadySwarming: getlandmarkname STRING_BUFFER_5, ROUTE_35 - farsjump UnknownScript_0xa0aff + farsjump ArnieHurryScript ArniePhoneCallerScript: gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1 @@ -55,7 +55,7 @@ ArnieYanmaSwarm: ; start swarm getmonname STRING_BUFFER_4, YANMA swarm SWARM_YANMA, ROUTE_35 getlandmarkname STRING_BUFFER_5, ROUTE_35 - farsjump UnknownScript_0xa05ce + farsjump ArnieSwarmScript ArnieFoundRare: farsjump Phone_CheckIfUnseenRare_Male diff --git a/engine/phone/scripts/beth.asm b/engine/phone/scripts/beth.asm index d4a15a8bd..c5854c747 100644 --- a/engine/phone/scripts/beth.asm +++ b/engine/phone/scripts/beth.asm @@ -11,7 +11,7 @@ BethPhoneCalleeScript: iftrue BethFridayAfternoon .NotFriday: - farsjump UnknownScript_0xa0918 + farsjump BethHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_26 diff --git a/engine/phone/scripts/beverly.asm b/engine/phone/scripts/beverly.asm index 35db64918..77daa5d4b 100644 --- a/engine/phone/scripts/beverly.asm +++ b/engine/phone/scripts/beverly.asm @@ -3,11 +3,11 @@ BeverlyPhoneCalleeScript: farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_BEVERLY_HAS_NUGGET iftrue .HasNugget - farsjump UnknownScript_0xa0900 + farsjump BeverlyHangUpScript .HasNugget: getlandmarkname STRING_BUFFER_5, NATIONAL_PARK - farsjump UnknownScript_0xa0aa5 + farsjump BeverlyComePickUpScript BeverlyPhoneCallerScript: gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1 diff --git a/engine/phone/scripts/bike_shop.asm b/engine/phone/scripts/bike_shop.asm index 8b32be888..2761774f2 100644 --- a/engine/phone/scripts/bike_shop.asm +++ b/engine/phone/scripts/bike_shop.asm @@ -1,5 +1,5 @@ BikeShopPhoneCallerScript: - farwritetext UnknownText_0x174000 + farwritetext BikeShopPhoneCallerText clearflag ENGINE_BIKE_SHOP_CALL_ENABLED specialphonecall SPECIALCALL_NONE end diff --git a/engine/phone/scripts/brent.asm b/engine/phone/scripts/brent.asm index 9fbdfde7d..7187befee 100644 --- a/engine/phone/scripts/brent.asm +++ b/engine/phone/scripts/brent.asm @@ -11,11 +11,11 @@ BrentPhoneCalleeScript: iftrue BrentMondayMorning .NotMonday: - farsjump UnknownScript_0xa0998 + farsjump BrentHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_43 - farsjump UnknownScript_0xa0a87 + farsjump BrentReminderScript BrentPhoneCallerScript: gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1 diff --git a/engine/phone/scripts/brent_gossip.asm b/engine/phone/scripts/brent_gossip.asm index 90054d0eb..3c92d420a 100644 --- a/engine/phone/scripts/brent_gossip.asm +++ b/engine/phone/scripts/brent_gossip.asm @@ -12,51 +12,51 @@ BrentBillTriviaScript: ifequal 9, .KimonoGirl .Father: - farwritetext UnknownText_0x662bc + farwritetext BrentFatherGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Grandpa: - farwritetext UnknownText_0x662fc + farwritetext BrentGrandpaGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Goldenrod: - farwritetext UnknownText_0x66335 + farwritetext BrentGoldenrodGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Route25: - farwritetext UnknownText_0x66366 + farwritetext BrentRoute25GossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Abra: - farwritetext UnknownText_0x663a1 + farwritetext BrentAbraGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Sister: - farwritetext UnknownText_0x663e6 + farwritetext BrentSisterGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Milk: - farwritetext UnknownText_0x66421 + farwritetext BrentMilkGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Battling: - farwritetext UnknownText_0x6645f + farwritetext BrentBattlingGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .FlowerShop: - farwritetext UnknownText_0x6649b + farwritetext BrentFlowerShopGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .KimonoGirl: - farwritetext UnknownText_0x664dd + farwritetext BrentKimonoGirlGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/buena.asm b/engine/phone/scripts/buena.asm index 86c2a3243..edfe5c0a7 100644 --- a/engine/phone/scripts/buena.asm +++ b/engine/phone/scripts/buena.asm @@ -2,70 +2,70 @@ BuenaPhoneCalleeScript: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue BuenaPhoneScript_Rocket readvar VAR_HOUR - ifgreater 17, BuenaPhoneScript_AfterMidnight1 - scall BuenaPhoneScript_CheckTimeOfDay1 - sjump BuenaPhoneScript_Random1 + ifgreater 17, BuenaPhoneScript_AfterMidnightCallee + scall BuenaPhoneScript_CheckTimeOfDayCallee + sjump BuenaPhoneScript_RandomCallee BuenaPhoneCallerScript: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue BuenaPhoneScript_Rocket - scall BuenaPhoneScript_CheckTimeOfDay2 - sjump BuenaPhoneScript_Random2 + scall BuenaPhoneScript_CheckTimeOfDayCaller + sjump BuenaPhoneScript_RandomCaller -BuenaPhoneScript_CheckTimeOfDay1: +BuenaPhoneScript_CheckTimeOfDayCallee: checktime MORN iftrue .morn checktime DAY iftrue .day - writetext UnknownText_0xa0d42 + writetext BuenaPhoneNiteAnswerText buttonsound end .morn - writetext UnknownText_0xa0c28 + writetext BuenaPhoneMorningAnswerText buttonsound end .day - writetext UnknownText_0xa0c72 + writetext BuenaPhoneDayAnswerText buttonsound end -BuenaPhoneScript_AfterMidnight1: - writetext UnknownText_0xa0caf +BuenaPhoneScript_AfterMidnightCallee: + writetext BuenaPhoneMidnightAnswerText end -BuenaPhoneScript_CheckTimeOfDay2: +BuenaPhoneScript_CheckTimeOfDayCaller: readvar VAR_HOUR - ifgreater 17, BuenaPhoneScript_AfterMidnight2 + ifgreater 17, BuenaPhoneScript_AfterMidnightCaller checktime MORN iftrue .morn checktime DAY iftrue .day - writetext UnknownText_0xa0e29 + writetext BuenaPhoneNiteText buttonsound end .morn - writetext UnknownText_0xa0d96 + writetext BuenaPhoneMorningText buttonsound end .day - writetext UnknownText_0xa0dcf + writetext BuenaPhoneDayText buttonsound end -BuenaPhoneScript_AfterMidnight2: - writetext UnknownText_0xa0e01 +BuenaPhoneScript_AfterMidnightCaller: + writetext BuenaPhoneMidnightText buttonsound end BuenaPhoneScript_Rocket: - writetext UnknownText_0xa0e5e + writetext BuenaPhoneRocketText end -BuenaPhoneScript_Random2: +BuenaPhoneScript_RandomCaller: checkevent EVENT_BEAT_ELITE_FOUR iftrue .PostE4 random 11 @@ -91,79 +91,79 @@ BuenaPhoneScript_Random2: ifequal 13, .thirteen .zero - writetext UnknownText_0xa0efb + writetext BuenaPhoneWentOutWithBenText sjump .finish .one - writetext UnknownText_0xa0fcf + writetext BuenaPhoneReceptionistText sjump .finish .two - writetext UnknownText_0xa109d + writetext BuenaPhoneLuckyNumberShowText sjump .finish .three - writetext UnknownText_0xa1143 + writetext BuenaPhoneStressedFromWorkText sjump .finish .four - writetext UnknownText_0xa1244 + writetext BuenaPhoneProfessorOakText sjump .finish .five - writetext UnknownText_0xa1318 + writetext BuenaPhoneGotAColdText sjump .finish .six - writetext UnknownText_0xa13d8 + writetext BuenaPhoneRadioCardQuestionsText sjump .finish .seven - writetext UnknownText_0xa1488 + writetext BuenaPhonePikachuFanClubText sjump .finish .eight - writetext UnknownText_0xa15de + writetext BuenaPhoneRadioTowerDirectorText sjump .finish .nine - writetext UnknownText_0xa1717 + writetext BuenaPhoneWhenDoYouRelaxText sjump .finish .ten - writetext UnknownText_0xa183d + writetext BuenaPhoneStarterPokemonText sjump .finish .eleven - writetext UnknownText_0xa19b1 + writetext BuenaPhoneCompanyVacationText sjump .finish .twelve - writetext UnknownText_0xa1ac0 + writetext BuenaPhoneBenAndFernText sjump .finish .thirteen - writetext UnknownText_0xa1bed + writetext BuenaPhoneGoingShoppingText .finish end -BuenaPhoneScript_Random1: +BuenaPhoneScript_RandomCallee: random 3 ifequal 0, .zero ifequal 1, .one ifequal 2, .two .zero - writetext UnknownText_0xa1c88 + writetext BuenaPhoneFavoriteSlotMachineAnswerText end .one - writetext UnknownText_0xa1d5f + writetext BuenaPhonePokegearAnswerText end .two - writetext UnknownText_0xa1e2f + writetext BuenaPhoneCoopedUpInRadioTowerAnswerText end INCLUDE "data/phone/text/buena.asm" diff --git a/engine/phone/scripts/chad.asm b/engine/phone/scripts/chad.asm index cd36bae37..8af8e6eee 100644 --- a/engine/phone/scripts/chad.asm +++ b/engine/phone/scripts/chad.asm @@ -11,11 +11,11 @@ ChadPhoneCalleeScript: iftrue ChadFridayMorning .NotFriday: - farsjump UnknownScript_0xa0980 + farsjump ChadHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_38 - farsjump UnknownScript_0xa0a7d + farsjump ChadReminderScript ChadPhoneCallerScript: gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1 diff --git a/engine/phone/scripts/chad_gossip.asm b/engine/phone/scripts/chad_gossip.asm index e72fcd628..544c25b21 100644 --- a/engine/phone/scripts/chad_gossip.asm +++ b/engine/phone/scripts/chad_gossip.asm @@ -14,49 +14,49 @@ ChadOakGossipScript: .Blue: farwritetext ChadBlueGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Daisy: farwritetext ChadDaisyGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .ProfElm: farwritetext ChadProfElmGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Dream: - farwritetext ChadDreamGossipText + farwritetext ChadProfOaksDreamGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Kurt: farwritetext ChadKurtGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .League: farwritetext ChadLeagueGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .RadioShow: - farwritetext ChadRadioShowGossipText + farwritetext ChadPokemonTalkGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Battling: - farwritetext ChadBattlingGossipText + farwritetext ChadProfOakTrainerGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .DaisyTea: farwritetext ChadDaisyTeaGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Traveled: - farwritetext ChadTravelGossipText + farwritetext ChadProfOakTravelingGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/dana.asm b/engine/phone/scripts/dana.asm index ca2613ef4..c00607f41 100644 --- a/engine/phone/scripts/dana.asm +++ b/engine/phone/scripts/dana.asm @@ -13,15 +13,15 @@ DanaPhoneCalleeScript: iftrue DanaThursdayNight .NotThursday: - farsjump UnknownScript_0xa0978 + farsjump DanaHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_38 - farsjump UnknownScript_0xa0a78 + farsjump DanaReminderScript .HasThunderstone: getlandmarkname STRING_BUFFER_5, ROUTE_38 - farsjump UnknownScript_0xa0acd + farsjump DanaComePickUpScript DanaPhoneCallerScript: gettrainername STRING_BUFFER_3, LASS, DANA1 diff --git a/engine/phone/scripts/derek.asm b/engine/phone/scripts/derek.asm index 817f2e13e..9a69e7701 100644 --- a/engine/phone/scripts/derek.asm +++ b/engine/phone/scripts/derek.asm @@ -13,14 +13,14 @@ DerekPhoneCalleeScript: ifequal SATURDAY, .ContestToday .NoContest: - farsjump UnknownScript_0xa0988 + farsjump DerekHangUpScript .ContestToday: farsjump PhoneScript_BugCatchingContest .Nugget: getlandmarkname STRING_BUFFER_5, ROUTE_39 - farsjump UnknownScript_0xa0ad5 + farsjump DerekComePickUpScript DerekPhoneCallerScript: gettrainername STRING_BUFFER_3, POKEFANM, DEREK1 diff --git a/engine/phone/scripts/elm.asm b/engine/phone/scripts/elm.asm index d1b54905d..4760d8505 100644 --- a/engine/phone/scripts/elm.asm +++ b/engine/phone/scripts/elm.asm @@ -18,7 +18,7 @@ ElmPhoneCalleeScript: iftrue .stolen checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON iftrue .sawmrpokemon - farwritetext ElmPhoneStartText + farwritetext ElmPhoneHealYourMonText end .sawmrpokemon @@ -30,7 +30,7 @@ ElmPhoneCalleeScript: end .checkingegg - farwritetext ElmPhoneCheckingEggText + farwritetext ElmPhoneCheckingTheEggText end .assistant @@ -38,7 +38,7 @@ ElmPhoneCalleeScript: end .eggunhatched - farwritetext ElmPhoneEggUnhatchedText + farwritetext ElmPhoneHowIsTheEggText end .egghatched @@ -49,15 +49,15 @@ ElmPhoneCalleeScript: .discovery random 2 ifequal 0, .nextdiscovery - farwritetext ElmPhoneDiscovery1Text + farwritetext ElmPhoneDiscoveredHatchTimeText end .nextdiscovery - farwritetext ElmPhoneDiscovery2Text + farwritetext ElmPhoneInvestigatingEggMovesText end .pokerus - farwritetext ElmPhonePokerusText + farwritetext ElmPhoneDiscoveredPokerusText specialphonecall SPECIALCALL_NONE end @@ -68,7 +68,7 @@ ElmPhoneCallerScript: ifequal SPECIALCALL_WEIRDBROADCAST, .rocket ifequal SPECIALCALL_SSTICKET, .gift ifequal SPECIALCALL_MASTERBALL, .gift - farwritetext ElmPhonePokerusText + farwritetext ElmPhoneDiscoveredPokerusText specialphonecall SPECIALCALL_NONE end @@ -86,7 +86,7 @@ ElmPhoneCallerScript: end .rocket - farwritetext ElmPhoneRocketText + farwritetext ElmPhoneRadioTowerRocketTakeoverText specialphonecall SPECIALCALL_NONE end @@ -96,6 +96,6 @@ ElmPhoneCallerScript: end .unused - farwritetext ElmPhoneUnusedText + farwritetext ElmPhoneGotAholdOfSomethingNeatText specialphonecall SPECIALCALL_NONE end diff --git a/engine/phone/scripts/gaven.asm b/engine/phone/scripts/gaven.asm index 1c610e69d..32e20db91 100644 --- a/engine/phone/scripts/gaven.asm +++ b/engine/phone/scripts/gaven.asm @@ -8,14 +8,14 @@ GavenPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal THURSDAY, .NotThursday checktime MORN - iftrue GavenThursdayMorning + iftrue GavenThursdayMorningScript .NotThursday: - farsjump UnknownScript_0xa0910 + farsjump GavenHangUpNotThursdayScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_26 - farsjump UnknownScript_0xa0a37 + farsjump GavenReminderScript GavenPhoneCallerScript: gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3 @@ -32,7 +32,7 @@ GavenPhoneCallerScript: ifequal 0, GavenFoundRare farsjump Phone_GenericCall_Male -GavenThursdayMorning: +GavenThursdayMorningScript: setflag ENGINE_GAVEN_THURSDAY_MORNING GavenWantsRematch: diff --git a/engine/phone/scripts/generic_callee.asm b/engine/phone/scripts/generic_callee.asm index 6afce4abe..76d26f922 100644 --- a/engine/phone/scripts/generic_callee.asm +++ b/engine/phone/scripts/generic_callee.asm @@ -46,102 +46,102 @@ PhoneScript_AnswerPhone_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4dc5 + farwritetext JackAnswerPhoneText buttonsound end .Huey: - farwritetext UnknownText_0x1b5073 + farwritetext HueyAnswerPhoneText buttonsound end .Gaven: - farwritetext UnknownText_0x1b5270 + farwritetext GavenAnswerPhoneText buttonsound end .Jose: - farwritetext UnknownText_0x1b55ae + farwritetext JoseAnswerPhoneText buttonsound end .Joey: - farwritetext UnknownText_0x1b589a + farwritetext JoeyAnswerPhoneText buttonsound end .Wade: - farwritetext UnknownText_0x1b5a3b + farwritetext WadeAnswerPhoneText buttonsound end .Ralph: - farwritetext UnknownText_0x1b5c10 + farwritetext RalphAnswerPhoneText buttonsound end .Anthony: - farwritetext UnknownText_0x1b5f7a + farwritetext AnthonyAnswerPhoneText buttonsound end .Todd: - farwritetext UnknownText_0x1b60f5 + farwritetext ToddAnswerPhoneText buttonsound end .Irwin: - farwritetext UnknownText_0x1b638c + farwritetext IrwinAnswerPhoneText buttonsound end .Arnie: - farwritetext UnknownText_0x1b6454 + farwritetext ArnieAnswerPhoneText buttonsound end .Alan: - farwritetext UnknownText_0x1b659d + farwritetext AlanAnswerPhoneText buttonsound end .Chad: - farwritetext UnknownText_0x1b67e2 + farwritetext ChadAnswerPhoneText buttonsound end .Derek: - farwritetext UnknownText_0x1b69a8 + farwritetext DerekAnswerPhoneText buttonsound end .Tully: - farwritetext UnknownText_0x1b6b39 + farwritetext TullyAnswerPhoneText buttonsound end .Brent: - farwritetext UnknownText_0x1b6c96 + farwritetext BrentAnswerPhoneText buttonsound end .Vance: - farwritetext UnknownText_0x1b7019 + farwritetext VanceAnswerPhoneText buttonsound end .Wilton: - farwritetext UnknownText_0x1b71d5 + farwritetext WiltonAnswerPhoneText buttonsound end .Kenji: - farwritetext UnknownText_0x1b730b + farwritetext KenjiAnswerPhoneText buttonsound end .Parry: - farwritetext UnknownText_0x1b73c7 + farwritetext ParryAnswerPhoneText buttonsound end @@ -169,102 +169,102 @@ PhoneScript_AnswerPhone_Male_Day: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4ded + farwritetext JackAnswerPhoneDayText buttonsound end .Huey: - farwritetext UnknownText_0x1b509b + farwritetext HueyAnswerPhoneDayText buttonsound end .Gaven: - farwritetext UnknownText_0x1b52a5 + farwritetext GavenAnswerPhoneDayText buttonsound end .Jose: - farwritetext UnknownText_0x1b55da + farwritetext JoseAnswerPhoneDayText buttonsound end .Joey: - farwritetext UnknownText_0x1b58c2 + farwritetext JoeyAnswerPhoneDayText buttonsound end .Wade: - farwritetext UnknownText_0x1b5a74 + farwritetext WadeAnswerPhoneDayText buttonsound end .Ralph: - farwritetext UnknownText_0x1b5c63 + farwritetext RalphAnswerPhoneDayText buttonsound end .Anthony: - farwritetext UnknownText_0x1b5f9e + farwritetext AnthonyAnswerPhoneDayText buttonsound end .Todd: - farwritetext UnknownText_0x1b611b + farwritetext ToddAnswerPhoneDayText buttonsound end .Irwin: - farwritetext UnknownText_0x1b63a8 + farwritetext IrwinAnswerPhoneDayText buttonsound end .Arnie: - farwritetext UnknownText_0x1b647e + farwritetext ArnieAnswerPhoneDayText buttonsound end .Alan: - farwritetext UnknownText_0x1b65c7 + farwritetext AlanAnswerPhoneDayText buttonsound end .Chad: - farwritetext UnknownText_0x1b680e + farwritetext ChadAnswerPhoneDayText buttonsound end .Derek: - farwritetext UnknownText_0x1b69d2 + farwritetext DerekAnswerPhoneDayText buttonsound end .Tully: - farwritetext UnknownText_0x1b6b65 + farwritetext TullyAnswerPhoneDayText buttonsound end .Brent: - farwritetext UnknownText_0x1b6cc6 + farwritetext BrentAnswerPhoneDayText buttonsound end .Vance: - farwritetext UnknownText_0x1b7057 + farwritetext VanceAnswerPhoneDayText buttonsound end .Wilton: - farwritetext UnknownText_0x1b71fc + farwritetext WiltonAnswerPhoneDayText buttonsound end .Kenji: - farwritetext UnknownText_0x1b7331 + farwritetext KenjiAnswerPhoneDayText buttonsound end .Parry: - farwritetext UnknownText_0x1b73ef + farwritetext ParryAnswerPhoneDayText buttonsound end @@ -292,102 +292,102 @@ PhoneScript_AnswerPhone_Male_Nite: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4e16 + farwritetext JackAnswerPhoneNiteText buttonsound end .Huey: - farwritetext UnknownText_0x1b50c2 + farwritetext HueyAnswerPhoneNiteText buttonsound end .Gaven: - farwritetext UnknownText_0x1b52cc + farwritetext GavenAnswerPhoneNiteText buttonsound end .Jose: - farwritetext UnknownText_0x1b55fc + farwritetext JoseAnswerPhoneNiteText buttonsound end .Joey: - farwritetext UnknownText_0x1b58ea + farwritetext JoeyAnswerPhoneNiteText buttonsound end .Wade: - farwritetext UnknownText_0x1b5a9f + farwritetext WadeAnswerPhoneNiteText buttonsound end .Ralph: - farwritetext UnknownText_0x1b5cb6 + farwritetext RalphAnswerPhoneNiteText buttonsound end .Anthony: - farwritetext UnknownText_0x1b5fc9 + farwritetext AnthonyAnswerPhoneNiteText buttonsound end .Todd: - farwritetext UnknownText_0x1b6149 + farwritetext ToddAnswerPhoneNiteText buttonsound end .Irwin: - farwritetext UnknownText_0x1b63c4 + farwritetext IrwinAnswerPhoneNiteText buttonsound end .Arnie: - farwritetext UnknownText_0x1b64a8 + farwritetext ArnieAnswerPhoneNiteText buttonsound end .Alan: - farwritetext UnknownText_0x1b65e3 + farwritetext AlanAnswerPhoneNiteText buttonsound end .Chad: - farwritetext UnknownText_0x1b6836 + farwritetext ChadAnswerPhoneNiteText buttonsound end .Derek: - farwritetext UnknownText_0x1b69f8 + farwritetext DerekAnswerPhoneNiteText buttonsound end .Tully: - farwritetext UnknownText_0x1b6b92 + farwritetext TullyAnswerPhoneNiteText buttonsound end .Brent: - farwritetext UnknownText_0x1b6cf6 + farwritetext BrentAnswerPhoneNiteText buttonsound end .Vance: - farwritetext UnknownText_0x1b7092 + farwritetext VanceAnswerPhoneNiteText buttonsound end .Wilton: - farwritetext UnknownText_0x1b722a + farwritetext WiltonAnswerPhoneNiteText buttonsound end .Kenji: - farwritetext UnknownText_0x1b7357 + farwritetext KenjiAnswerPhoneNiteText buttonsound end .Parry: - farwritetext UnknownText_0x1b7417 + farwritetext ParryAnswerPhoneNiteText buttonsound end @@ -407,42 +407,42 @@ PhoneScript_AnswerPhone_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b4f21 + farwritetext BeverlyAnswerPhoneText buttonsound end .Beth: - farwritetext UnknownText_0x1b53f7 + farwritetext BethAnswerPhoneText buttonsound end .Reena: - farwritetext UnknownText_0x1b5702 + farwritetext ReenaAnswerPhoneText buttonsound end .Liz: - farwritetext UnknownText_0x1b5d9f + farwritetext LizAnswerPhoneText buttonsound end .Gina: - farwritetext UnknownText_0x1b626a + farwritetext GinaAnswerPhoneText buttonsound end .Dana: - farwritetext UnknownText_0x1b66c8 + farwritetext DanaAnswerPhoneText buttonsound end .Tiffany: - farwritetext UnknownText_0x1b6e7c + farwritetext TiffanyAnswerPhoneText buttonsound end .Erin: - farwritetext UnknownText_0x1b751a + farwritetext ErinAnswerPhoneText buttonsound end @@ -458,42 +458,42 @@ PhoneScript_AnswerPhone_Female_Day: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b4f4d + farwritetext BeverlyAnswerPhoneDayText buttonsound end .Beth: - farwritetext UnknownText_0x1b5424 + farwritetext BethAnswerPhoneDayText buttonsound end .Reena: - farwritetext UnknownText_0x1b572e + farwritetext ReenaAnswerPhoneDayText buttonsound end .Liz: - farwritetext UnknownText_0x1b5dcc + farwritetext LizAnswerPhoneDayText buttonsound end .Gina: - farwritetext UnknownText_0x1b6296 + farwritetext GinaAnswerPhoneDayText buttonsound end .Dana: - farwritetext UnknownText_0x1b66ec + farwritetext DanaAnswerPhoneDayText buttonsound end .Tiffany: - farwritetext UnknownText_0x1b6ea6 + farwritetext TiffanyAnswerPhoneDayText buttonsound end .Erin: - farwritetext UnknownText_0x1b7548 + farwritetext ErinAnswerPhoneDayText buttonsound end @@ -509,42 +509,42 @@ PhoneScript_AnswerPhone_Female_Nite: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b4f75 + farwritetext BeverlyAnswerPhoneNiteText buttonsound end .Beth: - farwritetext UnknownText_0x1b5446 + farwritetext BethAnswerPhoneNiteText buttonsound end .Reena: - farwritetext UnknownText_0x1b575a + farwritetext ReenaAnswerPhoneNiteText buttonsound end .Liz: - farwritetext UnknownText_0x1b5df8 + farwritetext LizAnswerPhoneNiteText buttonsound end .Gina: - farwritetext UnknownText_0x1b62c5 + farwritetext GinaAnswerPhoneNiteText buttonsound end .Dana: - farwritetext UnknownText_0x1b6713 + farwritetext DanaAnswerPhoneNiteText buttonsound end .Tiffany: - farwritetext UnknownText_0x1b6ec9 + farwritetext TiffanyAnswerPhoneNiteText buttonsound end .Erin: - farwritetext UnknownText_0x1b756f + farwritetext ErinAnswerPhoneNiteText buttonsound end @@ -576,102 +576,102 @@ PhoneScript_GreetPhone_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4e3e + farwritetext JackGreetText buttonsound end .Huey: - farwritetext UnknownText_0x1b50e9 + farwritetext HueyGreetText buttonsound end .Gaven: - farwritetext UnknownText_0x1b5301 + farwritetext GavenGreetText buttonsound end .Jose: - farwritetext UnknownText_0x1b5628 + farwritetext JoseGreetText buttonsound end .Joey: - farwritetext UnknownText_0x1b5912 + farwritetext JoeyGreetText buttonsound end .Wade: - farwritetext UnknownText_0x1b5ad8 + farwritetext WadeGreetText buttonsound end .Ralph: - farwritetext UnknownText_0x1b5d09 + farwritetext RalphGreetText buttonsound end .Anthony: - farwritetext UnknownText_0x1b5ff6 + farwritetext AnthonyGreetText buttonsound end .Todd: - farwritetext UnknownText_0x1b616e + farwritetext ToddGreetText buttonsound end .Irwin: - farwritetext UnknownText_0x1b63e3 + farwritetext IrwinGreetText buttonsound end .Arnie: - farwritetext UnknownText_0x1b64d2 + farwritetext ArnieGreetText buttonsound end .Alan: - farwritetext UnknownText_0x1b660d + farwritetext AlanGreetText buttonsound end .Chad: - farwritetext UnknownText_0x1b6862 + farwritetext ChadGreetText buttonsound end .Derek: - farwritetext UnknownText_0x1b6a22 + farwritetext DerekGreetText buttonsound end .Tully: - farwritetext UnknownText_0x1b6bb9 + farwritetext TullyGreetText buttonsound end .Brent: - farwritetext UnknownText_0x1b6d26 + farwritetext BrentGreetText buttonsound end .Vance: - farwritetext UnknownText_0x1b70e7 + farwritetext VanceGreetText buttonsound end .Wilton: - farwritetext UnknownText_0x1b725c + farwritetext WiltonGreetText buttonsound end .Kenji: - farwritetext UnknownText_0x1b737f + farwritetext KenjiGreetText buttonsound end .Parry: - farwritetext UnknownText_0x1b743f + farwritetext ParryGreetText buttonsound end @@ -699,102 +699,102 @@ PhoneScript_GreetPhone_Male_Day: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4e72 + farwritetext JackGreetDayText buttonsound end .Huey: - farwritetext UnknownText_0x1b511a + farwritetext HueyGreetDayText buttonsound end .Gaven: - farwritetext UnknownText_0x1b5335 + farwritetext GavenGreetDayText buttonsound end .Jose: - farwritetext UnknownText_0x1b564c + farwritetext JoseGreetDayText buttonsound end .Joey: - farwritetext UnknownText_0x1b5948 + farwritetext JoeyGreetDayText buttonsound end .Wade: - farwritetext UnknownText_0x1b5b0b + farwritetext WadeGreetDayText buttonsound end .Ralph: - farwritetext UnknownText_0x1b5d21 + farwritetext RalphGreetDayText buttonsound end .Anthony: - farwritetext UnknownText_0x1b6017 + farwritetext AnthonyGreetDayText buttonsound end .Todd: - farwritetext UnknownText_0x1b618f + farwritetext ToddGreetDayText buttonsound end .Irwin: - farwritetext UnknownText_0x1b6407 + farwritetext IrwinGreetDayText buttonsound end .Arnie: - farwritetext UnknownText_0x1b6506 + farwritetext ArnieGreetDayText buttonsound end .Alan: - farwritetext UnknownText_0x1b6624 + farwritetext AlanGreetDayText buttonsound end .Chad: - farwritetext UnknownText_0x1b6890 + farwritetext ChadGreetDayText buttonsound end .Derek: - farwritetext UnknownText_0x1b6a56 + farwritetext DerekGreetDayText buttonsound end .Tully: - farwritetext UnknownText_0x1b6bef + farwritetext TullyGreetDayText buttonsound end .Brent: - farwritetext UnknownText_0x1b6d57 + farwritetext BrentGreetDayText buttonsound end .Vance: - farwritetext UnknownText_0x1b7112 + farwritetext VanceGreetDayText buttonsound end .Wilton: - farwritetext UnknownText_0x1b7283 + farwritetext WiltonGreetDayText buttonsound end .Kenji: - farwritetext UnknownText_0x1b7397 + farwritetext KenjiGreetDayText buttonsound end .Parry: - farwritetext UnknownText_0x1b746f + farwritetext ParryGreetDayText buttonsound end @@ -822,102 +822,102 @@ PhoneScript_GreetPhone_Male_Nite: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4e9e + farwritetext JackGreetNiteText buttonsound end .Huey: - farwritetext UnknownText_0x1b5154 + farwritetext HueyGreetNiteText buttonsound end .Gaven: - farwritetext UnknownText_0x1b535f + farwritetext GavenGreetNiteText buttonsound end .Jose: - farwritetext UnknownText_0x1b5670 + farwritetext JoseGreetNiteText buttonsound end .Joey: - farwritetext UnknownText_0x1b597c + farwritetext JoeyGreetNiteText buttonsound end .Wade: - farwritetext UnknownText_0x1b5b37 + farwritetext WadeGreetNiteText buttonsound end .Ralph: - farwritetext UnknownText_0x1b5d39 + farwritetext RalphGreetNiteText buttonsound end .Anthony: - farwritetext UnknownText_0x1b6041 + farwritetext AnthonyGreetNiteText buttonsound end .Todd: - farwritetext UnknownText_0x1b61bd + farwritetext ToddGreetNiteText buttonsound end .Irwin: - farwritetext UnknownText_0x1b642c + farwritetext IrwinGreetNiteText buttonsound end .Arnie: - farwritetext UnknownText_0x1b6539 + farwritetext ArnieGreetNiteText buttonsound end .Alan: - farwritetext UnknownText_0x1b663b + farwritetext AlanGreetNiteText buttonsound end .Chad: - farwritetext UnknownText_0x1b68ba + farwritetext ChadGreetNiteText buttonsound end .Derek: - farwritetext UnknownText_0x1b6a8b + farwritetext DerekGreetNiteText buttonsound end .Tully: - farwritetext UnknownText_0x1b6c23 + farwritetext TullyGreetNiteText buttonsound end .Brent: - farwritetext UnknownText_0x1b6d88 + farwritetext BrentGreetNiteText buttonsound end .Vance: - farwritetext UnknownText_0x1b7132 + farwritetext VanceGreetNiteText buttonsound end .Wilton: - farwritetext UnknownText_0x1b72a5 + farwritetext WiltonGreetNiteText buttonsound end .Kenji: - farwritetext UnknownText_0x1b73af + farwritetext KenjiGreetNiteText buttonsound end .Parry: - farwritetext UnknownText_0x1b749b + farwritetext ParryGreetNiteText buttonsound end @@ -937,42 +937,42 @@ PhoneScript_GreetPhone_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b4fa1 + farwritetext BeverlyGreetText buttonsound end .Beth: - farwritetext UnknownText_0x1b5472 + farwritetext BethGreetText buttonsound end .Reena: - farwritetext UnknownText_0x1b5786 + farwritetext ReenaGreetText buttonsound end .Liz: - farwritetext UnknownText_0x1b5e25 + farwritetext LizGreetText buttonsound end .Gina: - farwritetext UnknownText_0x1b62f1 + farwritetext GinaGreetText buttonsound end .Dana: - farwritetext UnknownText_0x1b6738 + farwritetext DanaGreetText buttonsound end .Tiffany: - farwritetext UnknownText_0x1b6ef3 + farwritetext TiffanyGreetText buttonsound end .Erin: - farwritetext UnknownText_0x1b758f + farwritetext ErinGreetText buttonsound end @@ -988,42 +988,42 @@ PhoneScript_GreetPhone_Female_Day: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b4fda + farwritetext BeverlyGreetDayText buttonsound end .Beth: - farwritetext UnknownText_0x1b54a6 + farwritetext BethGreetDayText buttonsound end .Reena: - farwritetext UnknownText_0x1b57b7 + farwritetext ReenaGreetDayText buttonsound end .Liz: - farwritetext UnknownText_0x1b5e59 + farwritetext LizGreetDayText buttonsound end .Gina: - farwritetext UnknownText_0x1b630e + farwritetext GinaGreetDayText buttonsound end .Dana: - farwritetext UnknownText_0x1b6757 + farwritetext DanaGreetDayText buttonsound end .Tiffany: - farwritetext UnknownText_0x1b6f1c + farwritetext TiffanyGreetDayText buttonsound end .Erin: - farwritetext UnknownText_0x1b75ac + farwritetext ErinGreetDayText buttonsound end @@ -1039,42 +1039,42 @@ PhoneScript_GreetPhone_Female_Nite: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b5004 + farwritetext BeverlyGreetNiteText buttonsound end .Beth: - farwritetext UnknownText_0x1b54d4 + farwritetext BethGreetNiteText buttonsound end .Reena: - farwritetext UnknownText_0x1b57e8 + farwritetext ReenaGreetNiteText buttonsound end .Liz: - farwritetext UnknownText_0x1b5e8e + farwritetext LizGreetNiteText buttonsound end .Gina: - farwritetext UnknownText_0x1b6331 + farwritetext GinaGreetNiteText buttonsound end .Dana: - farwritetext UnknownText_0x1b6776 + farwritetext DanaGreetNiteText buttonsound end .Tiffany: - farwritetext UnknownText_0x1b6f37 + farwritetext TiffanyGreetNiteText buttonsound end .Erin: - farwritetext UnknownText_0x1b75c9 + farwritetext ErinGreetNiteText buttonsound end @@ -1099,92 +1099,92 @@ PhoneScript_Generic_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4ecd + farwritetext JackGenericText buttonsound end .Unknown: - farwritetext UnknownText_0x1b518b + farwritetext UnknownGenericText buttonsound end .Gaven: - farwritetext UnknownText_0x1b5393 + farwritetext GavenGenericText buttonsound end .Jose: - farwritetext UnknownText_0x1b5694 + farwritetext JoseGenericText buttonsound end .Joey: - farwritetext UnknownText_0x1b59b2 + farwritetext JoeyGenericText buttonsound end .Wade: - farwritetext UnknownText_0x1b5b68 + farwritetext WadeGenericText buttonsound end .Ralph: - farwritetext UnknownText_0x1b5d51 + farwritetext RalphGenericText buttonsound end .Anthony: - farwritetext UnknownText_0x1b606f + farwritetext AnthonyGenericText buttonsound end .Todd: - farwritetext UnknownText_0x1b61f2 + farwritetext ToddGenericText buttonsound end .Arnie: - farwritetext UnknownText_0x1b656c + farwritetext ArnieGenericText buttonsound end .Alan: - farwritetext UnknownText_0x1b6652 + farwritetext AlanGenericText buttonsound end .Chad: - farwritetext UnknownText_0x1b68e8 + farwritetext ChadGenericText buttonsound end .Derek: - farwritetext UnknownText_0x1b6ac2 + farwritetext DerekGenericText buttonsound end .Tully: - farwritetext UnknownText_0x1b6c56 + farwritetext TullyGenericText buttonsound end .Brent: - farwritetext UnknownText_0x1b6db9 + farwritetext BrentGenericText buttonsound end .Vance: - farwritetext UnknownText_0x1b7161 + farwritetext VanceGenericText buttonsound end .Wilton: - farwritetext UnknownText_0x1b72d0 + farwritetext WiltonGenericText buttonsound end .Parry: - farwritetext UnknownText_0x1b74c8 + farwritetext ParryGenericText buttonsound end @@ -1200,42 +1200,42 @@ PhoneScript_Generic_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b502b + farwritetext BeverlyGenericText buttonsound end .Beth: - farwritetext UnknownText_0x1b5510 + farwritetext BethGenericText buttonsound end .Reena: - farwritetext UnknownText_0x1b5819 + farwritetext ReenaGenericText buttonsound end .Liz: - farwritetext UnknownText_0x1b5ebe + farwritetext LizGenericText buttonsound end .Gina: - farwritetext UnknownText_0x1b6352 + farwritetext GinaGenericText buttonsound end .Dana: - farwritetext UnknownText_0x1b6795 + farwritetext DanaGenericText buttonsound end .Tiffany: - farwritetext UnknownText_0x1b6f60 + farwritetext TiffanyGenericText buttonsound end .Erin: - farwritetext UnknownText_0x1b75e5 + farwritetext ErinGenericText buttonsound end @@ -1243,17 +1243,17 @@ PhoneScript_MonFlavorText: special RandomPhoneMon farscall PhoneScript_Random2 ifequal $0, .TooEnergetic - farwritetext UnknownText_0x1b518b + farwritetext UnknownGenericText buttonsound - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male .TooEnergetic: farsjump .unnecessary .unnecessary - farwritetext UnknownText_0x1b522b + farwritetext UnknownTougherThanEverText buttonsound - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male GrandmaString: db "Grandma@" GrandpaString: db "Grandpa@" diff --git a/engine/phone/scripts/generic_caller.asm b/engine/phone/scripts/generic_caller.asm index 636b7ab81..6c4e9fd7d 100644 --- a/engine/phone/scripts/generic_caller.asm +++ b/engine/phone/scripts/generic_caller.asm @@ -31,7 +31,7 @@ Phone_FoundAMon_Male: farscall PhoneScript_Random2 ifequal 0, .GotAway farscall Phone_WhoDefeatedMon_Male - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male .GotAway: farsjump Phone_GotAwayCall_Male @@ -41,18 +41,18 @@ Phone_FoundAMon_Female: farscall PhoneScript_Random2 ifequal 0, .GotAway farscall Phone_WhoDefeatedMon_Female - farsjump PhoneScript_HangupText_Female + farsjump PhoneScript_HangUpText_Female .GotAway: farsjump Phone_GotAwayCall_Female Phone_GotAwayCall_Male: farscall Phone_WhoLostAMon_Male - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male Phone_GotAwayCall_Female: farscall Phone_WhoLostAMon_Female - farsjump PhoneScript_HangupText_Female + farsjump PhoneScript_HangUpText_Female Phone_WhosBragging_Male: readvar VAR_CALLERID @@ -75,27 +75,27 @@ Phone_WhosBragging_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext JackIntelligenceText + farwritetext JackIntelligenceKeepsRisingText buttonsound end .Gaven: - farwritetext GavenGreaterText + farwritetext GavenMonGreaterThanImaginedText buttonsound end .Jose: - farwritetext JoseAromaText + farwritetext JoseMonsStickHasADeliciousAromaText buttonsound end .Joey: - farwritetext JoeySharperText + farwritetext JoeyMonLookingSharperText buttonsound end .Wade: - farwritetext WadeAreYouGrowingText + farwritetext WadeAreYourMonGrowingText buttonsound end @@ -105,7 +105,7 @@ Phone_WhosBragging_Male: end .Anthony: - farwritetext AnthonyAteBerriesText + farwritetext AnthonyMonAteSomeBerriesText buttonsound end @@ -115,7 +115,7 @@ Phone_WhosBragging_Male: end .Arnie: - farwritetext ArnieLovesTheCuteText + farwritetext ArnieMonIsSoCuteText buttonsound end @@ -130,12 +130,12 @@ Phone_WhosBragging_Male: end .Derek: - farwritetext DerekCheekPincherText + farwritetext DerekCheekPinchingText buttonsound end .Tully: - farwritetext TullyGrownText + farwritetext TullyMonHasGrownText buttonsound end @@ -145,17 +145,17 @@ Phone_WhosBragging_Male: end .Vance: - farwritetext VanceLiftoffText + farwritetext VanceMonHasBecomeTougherText buttonsound end .Wilton: - farwritetext WiltonGrownText + farwritetext WiltonMonHasGrownText buttonsound end .Parry: - farwritetext ParryNoMatchText + farwritetext ParryNothingCanMatchText buttonsound end @@ -171,42 +171,42 @@ Phone_WhosBragging_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x174688 + farwritetext BeverlyMadeMonEvenCuterText buttonsound end .Beth: - farwritetext UnknownText_0x174c7f + farwritetext BethExhilaratingRideText buttonsound end .Reena: - farwritetext UnknownText_0x1752f5 + farwritetext ReenaMonsIsAPerfectMatchText buttonsound end .Liz: - farwritetext UnknownText_0x175fda + farwritetext LizMonAlwaysWantsToNuzzleText buttonsound end .Gina: - farwritetext UnknownText_0x1771fd + farwritetext GinaGettingInSyncWithMonText buttonsound end .Dana: - farwritetext UnknownText_0x64f74 + farwritetext DanaTakingPhotosText buttonsound end .Tiffany: - farwritetext UnknownText_0x665ad + farwritetext TiffanyMonIsAdorableText buttonsound end .Erin: - farwritetext UnknownText_0x6717a + farwritetext ErinMonIsMuchStrongerText buttonsound end @@ -236,82 +236,82 @@ Phone_WhoDefeatedMon_Male: end .Gaven: - farwritetext UnknownText_0x174a80 + farwritetext GavenDefeatedMonText buttonsound end .Jose: - farwritetext UnknownText_0x174f90 + farwritetext JoseDefeatedMonText buttonsound end .Joey: - farwritetext UnknownText_0x175591 + farwritetext JoeyDefeatedMonText buttonsound end .Wade: - farwritetext UnknownText_0x175869 + farwritetext WadeDefeatedMonText buttonsound end .Ralph: - farwritetext UnknownText_0x175c24 + farwritetext RalphDefeatedMonText buttonsound end .Anthony: - farwritetext UnknownText_0x176aef + farwritetext AnthonyDefeatedMonText buttonsound end .Todd: - farwritetext UnknownText_0x176e9c + farwritetext ToddDefeatedMonText buttonsound end .Arnie: - farwritetext UnknownText_0x64a13 + farwritetext ArnieDefeatedMonText buttonsound end .Alan: - farwritetext UnknownText_0x64cf3 + farwritetext AlanDefeatedMonText buttonsound end .Chad: - farwritetext UnknownText_0x65318 + farwritetext ChadDefeatedMonText buttonsound end .Derek: - farwritetext UnknownText_0x65b29 + farwritetext DerekDefeatedMonText buttonsound end .Tully: - farwritetext UnknownText_0x65e42 + farwritetext TullyDefeatedMonText buttonsound end .Brent: - farwritetext UnknownText_0x6613c + farwritetext BrentDefeatedMonText buttonsound end .Vance: - farwritetext UnknownText_0x669b2 + farwritetext VanceDefeatedMonText buttonsound end .Wilton: - farwritetext UnknownText_0x66b3e + farwritetext WiltonDefeatedMonText buttonsound end .Parry: - farwritetext UnknownText_0x66fc0 + farwritetext ParryDefeatedMonText buttonsound end @@ -327,42 +327,42 @@ Phone_WhoDefeatedMon_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1746c3 + farwritetext BeverlyDefeatedMonText buttonsound end .Beth: - farwritetext UnknownText_0x174cf6 + farwritetext BethDefeatedMonText buttonsound end .Reena: - farwritetext UnknownText_0x17536b + farwritetext ReenaDefeatedMonText buttonsound end .Liz: - farwritetext UnknownText_0x17602d + farwritetext LizDefeatedMonText buttonsound end .Gina: - farwritetext UnknownText_0x177237 + farwritetext GinaDefeatedMonText buttonsound end .Dana: - farwritetext UnknownText_0x64fb2 + farwritetext DanaDefeatedMonText buttonsound end .Tiffany: - farwritetext UnknownText_0x66605 + farwritetext TiffanyDefeatedMonText buttonsound end .Erin: - farwritetext UnknownText_0x671a4 + farwritetext ErinDefeatedMonText buttonsound end @@ -387,87 +387,87 @@ Phone_WhoLostAMon_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x174165 + farwritetext JackLostAMonText buttonsound end .Gaven: - farwritetext UnknownText_0x174b2d + farwritetext GavenLostAMonText buttonsound end .Jose: - farwritetext UnknownText_0x174ffd + farwritetext JoseLostAMonText buttonsound end .Joey: - farwritetext UnknownText_0x175611 + farwritetext JoeyLostAMonText buttonsound end .Wade: - farwritetext UnknownText_0x1758e4 + farwritetext WadeLostAMonText buttonsound end .Ralph: - farwritetext UnknownText_0x175c9f + farwritetext RalphLostAMonText buttonsound end .Anthony: - farwritetext UnknownText_0x176b45 + farwritetext AnthonyLostAMonText buttonsound end .Todd: - farwritetext UnknownText_0x176eee + farwritetext ToddLostAMonText buttonsound end .Arnie: - farwritetext UnknownText_0x64a71 + farwritetext ArnieLostAMonText buttonsound end .Alan: - farwritetext UnknownText_0x64d4f + farwritetext AlanLostAMonText buttonsound end .Chad: - farwritetext UnknownText_0x65399 + farwritetext ChadLostAMonText buttonsound end .Derek: - farwritetext UnknownText_0x65bc8 + farwritetext DerekLostAMonText buttonsound end .Tully: - farwritetext UnknownText_0x65eac + farwritetext TullyLostAMonText buttonsound end .Brent: - farwritetext UnknownText_0x6618c + farwritetext BrentLostAMonText buttonsound end .Vance: - farwritetext UnknownText_0x669ed + farwritetext VanceLostAMonText buttonsound end .Wilton: - farwritetext UnknownText_0x66b8f + farwritetext WiltonLostAMonText buttonsound end .Parry: - farwritetext UnknownText_0x67001 + farwritetext ParryLostAMonText buttonsound end @@ -483,52 +483,52 @@ Phone_WhoLostAMon_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x174734 + farwritetext BeverlyLostAMonText buttonsound end .Beth: - farwritetext UnknownText_0x174d86 + farwritetext BethLostAMonText buttonsound end .Reena: - farwritetext UnknownText_0x1753c5 + farwritetext ReenaLostAMonText buttonsound end .Liz: - farwritetext UnknownText_0x176095 + farwritetext LizLostAMonText buttonsound end .Gina: - farwritetext UnknownText_0x177297 + farwritetext GinaLostAMonText buttonsound end .Dana: - farwritetext UnknownText_0x6501c + farwritetext DanaLostAMonText buttonsound end .Tiffany: - farwritetext UnknownText_0x66688 + farwritetext TiffanyLostAMonText buttonsound end .Erin: - farwritetext UnknownText_0x671eb + farwritetext ErinLostAMonText buttonsound end PhoneScript_WantsToBattle_Male: farscall PhoneScript_RematchText_Male - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male PhoneScript_WantsToBattle_Female: farscall PhoneScript_RematchText_Female - farsjump PhoneScript_HangupText_Female + farsjump PhoneScript_HangUpText_Female PhoneScript_RematchText_Male: readvar VAR_CALLERID @@ -551,87 +551,87 @@ PhoneScript_RematchText_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1741e1 + farwritetext JackBattleRematchText buttonsound end .Huey: - farwritetext UnknownText_0x1748ea + farwritetext HueyBattleRematchText buttonsound end .Gaven: - farwritetext UnknownText_0x174bc5 + farwritetext GavenBattleRematchText buttonsound end .Jose: - farwritetext UnknownText_0x17507d + farwritetext JoseBattleRematchText buttonsound end .Joey: - farwritetext UnknownText_0x175693 + farwritetext JoeyBattleRematchText buttonsound end .Wade: - farwritetext UnknownText_0x175976 + farwritetext WadeBattleRematchText buttonsound end .Ralph: - farwritetext UnknownText_0x175d40 + farwritetext RalphBattleRematchText buttonsound end .Anthony: - farwritetext UnknownText_0x176bee + farwritetext AnthonyBattleRematchText buttonsound end .Todd: - farwritetext UnknownText_0x176f60 + farwritetext ToddBattleRematchText buttonsound end .Arnie: - farwritetext UnknownText_0x64ada + farwritetext ArnieBattleRematchText buttonsound end .Alan: - farwritetext UnknownText_0x64da4 + farwritetext AlanBattleRematchText buttonsound end .Chad: - farwritetext UnknownText_0x65419 + farwritetext ChadBattleRematchText buttonsound end .Tully: - farwritetext UnknownText_0x65f17 + farwritetext TullyBattleRematchText buttonsound end .Brent: - farwritetext UnknownText_0x66214 + farwritetext BrentBattleRematchText buttonsound end .Vance: - farwritetext UnknownText_0x66a3a + farwritetext VanceBattleRematchText buttonsound end .Wilton: - farwritetext UnknownText_0x66bf3 + farwritetext WiltonBattleRematchText buttonsound end .Parry: - farwritetext UnknownText_0x67096 + farwritetext ParryBattleRematchText buttonsound end @@ -646,49 +646,49 @@ PhoneScript_RematchText_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beth: - farwritetext UnknownText_0x174e4e + farwritetext BethBattleRematchText buttonsound end .Reena: - farwritetext UnknownText_0x17543a + farwritetext ReenaBattleRematchText buttonsound end .Liz: - farwritetext UnknownText_0x17610a + farwritetext LizBattleRematchText buttonsound end .Gina: - farwritetext UnknownText_0x1772e2 + farwritetext GinaBattleRematchText buttonsound end .Dana: - farwritetext UnknownText_0x65091 + farwritetext DanaBattleRematchText buttonsound end .Tiffany: - farwritetext UnknownText_0x66730 + farwritetext TiffanyBattleRematchText buttonsound end .Erin: - farwritetext UnknownText_0x6722e + farwritetext ErinBattleRematchText buttonsound end LizWrongNumberScript: - farwritetext LizHiTaniaText + farwritetext LizWrongNumberText end TiffanyItsAwful: farwritetext TiffanyItsAwfulText end -PhoneScript_HangupText_Male: +PhoneScript_HangUpText_Male: readvar VAR_CALLERID ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_SAILOR_HUEY, .Huey @@ -712,86 +712,86 @@ PhoneScript_HangupText_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x174251 + farwritetext JackHangUpText end .Huey: - farwritetext UnknownText_0x174962 + farwritetext HueyHangUpText end .Gaven: - farwritetext UnknownText_0x174c0e + farwritetext GavenHangUpText end .Jose: - farwritetext UnknownText_0x175106 + farwritetext JoseHangUpText end .Joey: - farwritetext UnknownText_0x17570a + farwritetext JoeyHangUpText end .Wade: - farwritetext UnknownText_0x1759e7 + farwritetext WadeHangUpText end .Ralph: - farwritetext UnknownText_0x175db7 + farwritetext RalphHangUpText end .Anthony: - farwritetext UnknownText_0x176c47 + farwritetext AnthonyHangUpText end .Todd: - farwritetext UnknownText_0x176fdb + farwritetext ToddHangUpText end .Irwin: - farwritetext UnknownText_0x64000 + farwritetext IrwinHangUpText end .Arnie: - farwritetext UnknownText_0x64b48 + farwritetext ArnieHangUpText end .Alan: - farwritetext UnknownText_0x64e1f + farwritetext AlanHangUpText end .Chad: - farwritetext UnknownText_0x65471 + farwritetext ChadHangUpText end .Derek: - farwritetext UnknownText_0x65c4e + farwritetext DerekHangUpText end .Tully: - farwritetext UnknownText_0x65f6e + farwritetext TullyHangUpText end .Brent: - farwritetext UnknownText_0x662a9 + farwritetext BrentHangUpText end .Vance: - farwritetext UnknownText_0x66a93 + farwritetext VanceHangUpText end .Wilton: - farwritetext UnknownText_0x66c58 + farwritetext WiltonHangUpText end .Kenji: - farwritetext UnknownText_0x66dab + farwritetext KenjiHangUpText end .Parry: - farwritetext UnknownText_0x670eb + farwritetext ParryHangUpText end -PhoneScript_HangupText_Female: +PhoneScript_HangUpText_Female: readvar VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_COOLTRAINERF_BETH, .Beth @@ -803,35 +803,35 @@ PhoneScript_HangupText_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1747ac + farwritetext BeverlyHangUpText end .Beth: - farwritetext UnknownText_0x174eb7 + farwritetext BethHangUpText end .Reena: - farwritetext UnknownText_0x175488 + farwritetext ReenaHangUpText end .Liz: - farwritetext UnknownText_0x17620a + farwritetext LizHangUpText end .Gina: - farwritetext UnknownText_0x177361 + farwritetext GinaHangUpText end .Dana: - farwritetext UnknownText_0x650e2 + farwritetext DanaHangUpText end .Tiffany: - farwritetext UnknownText_0x667f7 + farwritetext TiffanyHangUpText end .Erin: - farwritetext UnknownText_0x67281 + farwritetext ErinHangUpText end Phone_CheckIfUnseenRare_Male: @@ -840,7 +840,7 @@ Phone_CheckIfUnseenRare_Male: farsjump Phone_GenericCall_Male .HangUp: - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male Phone_CheckIfUnseenRare_Female: scall PhoneScriptRareWildMon @@ -848,7 +848,7 @@ Phone_CheckIfUnseenRare_Female: farsjump Phone_GenericCall_Female .HangUp: - farsjump PhoneScript_HangupText_Female + farsjump PhoneScript_HangUpText_Female PhoneScriptRareWildMon: special RandomUnseenWildMon @@ -862,37 +862,37 @@ PhoneScript_BugCatchingContest: .Wade: farwritetext WadeBugCatchingContestText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Derek: farwritetext DerekBugCatchingContestText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -IrwinRocketRumor: - farwritetext UnknownText_0x64032 +IrwinRocketRumorScript: + farwritetext IrwinRocketTakeoverRumorText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa05c6: - farwritetext UnknownText_0x177378 +GinaRocketRumorScript: + farwritetext GinaRocketTakeoverRumorText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa05ce: - farwritetext UnknownText_0x64b5f +ArnieSwarmScript: + farwritetext ArnieSwarmText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa05d6: - farwritetext UnknownText_0x175dd9 +RalphItemScript: + farwritetext RalphItemText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa05de: - farwritetext UnknownText_0x176c61 +AnthonySwarmScript: + farwritetext AnthonySwarmText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male PhoneScript_FoundItem_Male: readvar VAR_CALLERID @@ -904,27 +904,27 @@ PhoneScript_FoundItem_Male: ifequal PHONE_FISHER_WILTON, .Wilton .Jose: - farwritetext JoseFoundSomethingText + farwritetext JoseFoundItemText end .Wade: - farwritetext WadeFoundBerryText + farwritetext WadeFoundItemText end .Alan: - farwritetext UnknownText_0x64e2f + farwritetext AlanFoundItemText end .Derek: - farwritetext UnknownText_0x65cf9 + farwritetext DerekFoundItemText end .Tully: - farwritetext UnknownText_0x65f88 + farwritetext TullyFoundItemText end .Wilton: - farwritetext UnknownText_0x66c6b + farwritetext WiltonFoundItemText end PhoneScript_FoundItem_Female: @@ -935,27 +935,27 @@ PhoneScript_FoundItem_Female: ifequal PHONE_PICNICKER_TIFFANY, .Tiffany .Beverly: - farwritetext BeverlyFoundNuggetText + farwritetext BeverlyFoundItemText end .Gina: - farwritetext UnknownText_0x1773e7 + farwritetext GinaFoundItemText end .Dana: - farwritetext UnknownText_0x650ec + farwritetext DanaFoundItemText end .Tiffany: - farwritetext UnknownText_0x66801 + farwritetext TiffanyFoundItemText end -UnknownScript_0xa0644: - farwritetext UnknownText_0x176feb +ToddItemScript: + farwritetext ToddDepartmentStoreBargainSaleText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male KenjiCallingPhoneScript: - farwritetext UnknownText_0x66dc5 + farwritetext KenjiRemainDedicatedText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/gina.asm b/engine/phone/scripts/gina.asm index d1953d3f7..3b9da6090 100644 --- a/engine/phone/scripts/gina.asm +++ b/engine/phone/scripts/gina.asm @@ -15,18 +15,18 @@ GinaPhoneCalleeScript: .NotSunday: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue .Rockets - farsjump UnknownScript_0xa0960 + farsjump GinaHangUpScript .Rockets: - farsjump UnknownScript_0xa05c6 + farsjump GinaRocketRumorScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_34 - farsjump UnknownScript_0xa0a69 + farsjump GinaReminderScript .HasLeafStone: getlandmarkname STRING_BUFFER_5, ROUTE_34 - farsjump UnknownScript_0xa0abd + farsjump GinaComePickUpScript GinaPhoneCallerScript: gettrainername STRING_BUFFER_3, PICNICKER, GINA1 @@ -64,7 +64,7 @@ GinaWantsBattle: farsjump PhoneScript_WantsToBattle_Female GinaRockets: - farsjump UnknownScript_0xa05c6 + farsjump GinaRocketRumorScript GinaHasLeafStone: setflag ENGINE_GINA_HAS_LEAF_STONE diff --git a/engine/phone/scripts/hangups.asm b/engine/phone/scripts/hangups.asm index 55d2f8144..e524ca0fc 100644 --- a/engine/phone/scripts/hangups.asm +++ b/engine/phone/scripts/hangups.asm @@ -1,166 +1,166 @@ -JackPhoneTips: - farwritetext UnknownText_0x1745c2 +JackPhoneTipsScript: + farwritetext JackHeardSomeGreatTipsText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0900: - farwritetext UnknownText_0x17485b +BeverlyHangUpScript: + farwritetext BeverlyLetsChatAboutMonAgainText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0908: - farwritetext UnknownText_0x17496b +HueyHangUpScript: + farwritetext HueyWeHaveToBattleAgainSometimeText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0910: - farwritetext UnknownText_0x174c29 +GavenHangUpNotThursdayScript: + farwritetext GavenHangUpNotThursdayText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0918: - farwritetext UnknownText_0x174ec5 +BethHangUpScript: + farwritetext BethLetsBattleAgainSometimeText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0920: - farwritetext UnknownText_0x17519b +JoseHangUpScript: + farwritetext JoseHaventGottenItemYetText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0928: - farwritetext UnknownText_0x17549b +ReenaForwardScript: + farwritetext ReenaForwardText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0930: - farwritetext UnknownText_0x17571d +JoeyHangUpScript: + farwritetext JoeyDevisingStrategiesText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0938: - farwritetext UnknownText_0x175abe +WadeNoBerriesScript: + farwritetext WadeNoBerriesText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0940: - farwritetext UnknownText_0x175eaf +RalphNoItemScript: + farwritetext RalphNoItemText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0948: - farwritetext UnknownText_0x1768b0 +LizHangUpScript: + farwritetext LizFawningOverMonText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0950: - farwritetext UnknownText_0x176d32 +AnthonyHangUpScript: + farwritetext AnthonyWasntPayingAttentionText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0958: - farwritetext UnknownText_0x1770fb +ToddNoItemScript: + farwritetext ToddSavingUpForBargainSaleText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0960: - farwritetext UnknownText_0x177465 +GinaHangUpScript: + farwritetext GinaHaventFoundAnythingYetText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0968: - farwritetext UnknownText_0x64bc6 +ArnieHangUpScript: + farwritetext ArnieHaventSeenRareMonText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0970: - farwritetext UnknownText_0x64e90 +AlanHangUpScript: + farwritetext AlanHaventPickedUpAnythingText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0978: - farwritetext UnknownText_0x65161 +DanaHangUpScript: + farwritetext DanaCanYouWaitABitLongerText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0980: - farwritetext UnknownText_0x65a23 +ChadHangUpScript: + farwritetext ChadGoingToStudyHardText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0988: - farwritetext UnknownText_0x65d5c +DerekHangUpScript: + farwritetext DerekLetsGetTogetherText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0990: - farwritetext UnknownText_0x65ff2 +TullyNoItemScript: + farwritetext TullyNoItemText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0998: - farwritetext UnknownText_0x6651e +BrentHangUpScript: + farwritetext BrentSorryImTooBusyText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa09a0: - farwritetext UnknownText_0x66882 +TiffanyNoItemScript: + farwritetext TiffanyNoItemText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -VanceLookingForward: +VanceLookingForwardScript: farwritetext VanceLookingForwardText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -WiltonHaventFoundAnything: +WiltonHaventFoundAnythingScript: farwritetext WiltonHaventFoundAnythingText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -ParryBattleWithMe: +ParryBattleWithMeScript: farwritetext ParryBattleWithMeText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male ErinWorkingHardScript: farwritetext ErinWorkingHardText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa09c8: +IrwinRandomTextScript: random 3 - ifequal 0, UnknownScript_0xa09d6 - ifequal 1, UnknownScript_0xa09de - ifequal 2, UnknownScript_0xa09e6 + ifequal 0, IrwinEscapadeScript + ifequal 1, IrwinGoodMatchScript + ifequal 2, IrwinSoMuchToChatAboutScript -UnknownScript_0xa09d6: - farwritetext UnknownText_0x64846 +IrwinEscapadeScript: + farwritetext IrwinYourEscapadesRockText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa09de: - farwritetext UnknownText_0x64881 +IrwinGoodMatchScript: + farwritetext IrwinGoodMatchText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa09e6: - farwritetext UnknownText_0x648dc +IrwinSoMuchToChatAboutScript: + farwritetext IrwinSoMuchToChatAboutText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male KenjiAnswerPhoneScript: readvar VAR_KENJI_BREAK ifequal 2, .Training ifequal 1, .OnBreak - farwritetext UnknownText_0x66e17 + farwritetext KenjiCallMeBackAnotherTimeText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Training: - farwritetext UnknownText_0x66e67 + farwritetext KenjiIllHaveTimeToChatTomorrowText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .OnBreak: checktime MORN @@ -168,16 +168,16 @@ KenjiAnswerPhoneScript: checktime NITE iftrue .Night setevent EVENT_KENJI_ON_BREAK - farwritetext KenjiBreakText + farwritetext KenjiTakingABreakText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Morning: - farwritetext UnknownText_0x66ed3 + farwritetext KenjiHangUpMorningText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Night: - farwritetext UnknownText_0x66f52 + farwritetext KenjiHangUpNightText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/hangups_2.asm b/engine/phone/scripts/hangups_2.asm index 4518b2d99..c0fa7217a 100644 --- a/engine/phone/scripts/hangups_2.asm +++ b/engine/phone/scripts/hangups_2.asm @@ -1,49 +1,49 @@ -UnknownScript_0xa0aa5: - farwritetext UnknownText_0x174895 +BeverlyComePickUpScript: + farwritetext BeverlyComePickUpText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0aad: - farwritetext UnknownText_0x17529c +JoseComePickUpScript: + farwritetext JoseComePickUpText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0ab5: - farwritetext UnknownText_0x175b6d +WadeComeQuickScript: + farwritetext WadeComeQuickText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0abd: - farwritetext UnknownText_0x17750e +GinaComePickUpScript: + farwritetext GinaComePickUpText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0ac5: - farwritetext UnknownText_0x64f1a +AlanComePickUpScript: + farwritetext AlanComePickUpGiftText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0acd: - farwritetext UnknownText_0x6520f +DanaComePickUpScript: + farwritetext DanaComePickUpText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0ad5: - farwritetext UnknownText_0x65da6 +DerekComePickUpScript: + farwritetext DerekComePickUpText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0add: - farwritetext UnknownText_0x66087 +TullyHurryScript: + farwritetext TullyHurryText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0ae5: - farwritetext UnknownText_0x6691d +TiffanyHurryScript: + farwritetext TiffanyHurryText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -WiltonWantThis: +WiltonWantThisScript: farwritetext WiltonWantThisText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/huey.asm b/engine/phone/scripts/huey.asm index b5bf21b5b..cac966682 100644 --- a/engine/phone/scripts/huey.asm +++ b/engine/phone/scripts/huey.asm @@ -12,7 +12,7 @@ HueyPhoneCalleeScript: .NotWednesday: special RandomPhoneMon - farsjump UnknownScript_0xa0908 + farsjump HueyHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, LIGHTHOUSE diff --git a/engine/phone/scripts/irwin.asm b/engine/phone/scripts/irwin.asm index c859aecf5..b7a7b1112 100644 --- a/engine/phone/scripts/irwin.asm +++ b/engine/phone/scripts/irwin.asm @@ -3,10 +3,10 @@ IrwinPhoneCalleeScript: farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue .Rockets - farsjump UnknownScript_0xa09c8 + farsjump IrwinRandomTextScript .Rockets: - farsjump IrwinRocketRumor + farsjump IrwinRocketRumorScript IrwinPhoneCallerScript: gettrainername STRING_BUFFER_3, JUGGLER, IRWIN1 @@ -16,4 +16,4 @@ IrwinPhoneCallerScript: farsjump IrwinRumorScript .Rockets: - farsjump IrwinRocketRumor + farsjump IrwinRocketRumorScript diff --git a/engine/phone/scripts/irwin_gossip.asm b/engine/phone/scripts/irwin_gossip.asm index 038f094d6..97816d6e8 100644 --- a/engine/phone/scripts/irwin_gossip.asm +++ b/engine/phone/scripts/irwin_gossip.asm @@ -25,64 +25,64 @@ IrwinRumorScript: iftrue .PlainBadge farwritetext IrwinCalledRightAwayText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .PlainBadge: - farwritetext UnknownText_0x64099 + farwritetext IrwinPlainBadgeGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .JasmineReturned: - farwritetext UnknownText_0x640e6 + farwritetext IrwinJasmineReturnedGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .RocketHideout: - farwritetext UnknownText_0x6416d + farwritetext IrwinRocketHideoutGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .RadioTower: - farwritetext UnknownText_0x641e8 + farwritetext IrwinRadioTowerGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .RisingBadge: - farwritetext UnknownText_0x64247 + farwritetext IrwinRisingBadgeGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .EliteFour: - farwritetext UnknownText_0x642bb + farwritetext IrwinEliteFourGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .VermilionCity: - farwritetext UnknownText_0x643d4 + farwritetext IrwinVermilionCityGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .TrainPass: - farwritetext UnknownText_0x64448 + farwritetext IrwinTrainPassGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Snorlax: - farwritetext UnknownText_0x6455b + farwritetext IrwinSnorlaxGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .MtSilver: - farwritetext UnknownText_0x645ff + farwritetext IrwinMtSilverGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .FogBadge: - farwritetext UnknownText_0x646df + farwritetext IrwinFogBadgeGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .MarshBadge: - farwritetext UnknownText_0x647d8 + farwritetext IrwinMarshBadgeGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/jack.asm b/engine/phone/scripts/jack.asm index 27287f310..f2de3689c 100644 --- a/engine/phone/scripts/jack.asm +++ b/engine/phone/scripts/jack.asm @@ -11,7 +11,7 @@ JackPhoneCalleeScript: iftrue JackMondayMorning .NotMonday: - farsjump JackPhoneTips + farsjump JackPhoneTipsScript .WantsBattle: getlandmarkname STRING_BUFFER_5, NATIONAL_PARK diff --git a/engine/phone/scripts/jack_gossip.asm b/engine/phone/scripts/jack_gossip.asm index 72c0d71e1..ffb8cb59f 100644 --- a/engine/phone/scripts/jack_gossip.asm +++ b/engine/phone/scripts/jack_gossip.asm @@ -15,54 +15,54 @@ JackTriviaScript: .Thunder: farwritetext JackThunderTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Rollout: farwritetext JackRolloutTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Solarbeam: farwritetext JackSolarbeamTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Stomp: farwritetext JackStompTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Gust: farwritetext JackGustTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Twister: farwritetext JackTwisterTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Earthquake: farwritetext JackEarthquakeTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Magnitude: farwritetext JackMagnitudeTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Sandstorm: farwritetext JackSandstormTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .SunnyDay: farwritetext JackSunnyDayTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .RainDance: farwritetext JackRainDanceTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/joey.asm b/engine/phone/scripts/joey.asm index 7a7fae956..8b15b55cb 100644 --- a/engine/phone/scripts/joey.asm +++ b/engine/phone/scripts/joey.asm @@ -12,11 +12,11 @@ JoeyPhoneCalleeScript: .NotMonday: special RandomPhoneMon - farsjump UnknownScript_0xa0930 + farsjump JoeyHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_30 - farsjump UnknownScript_0xa0a4b + farsjump JoeyReminderScript JoeyPhoneCallerScript: gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1 diff --git a/engine/phone/scripts/jose.asm b/engine/phone/scripts/jose.asm index 4dcf0f4de..acf2e3bbc 100644 --- a/engine/phone/scripts/jose.asm +++ b/engine/phone/scripts/jose.asm @@ -13,15 +13,15 @@ JosePhoneCalleeScript: iftrue JoseSaturdayNight .NotSaturday: - farsjump UnknownScript_0xa0920 + farsjump JoseHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_27 - farsjump UnknownScript_0xa0a41 + farsjump JoseReminderScript .HasItem: getlandmarkname STRING_BUFFER_5, ROUTE_27 - farsjump UnknownScript_0xa0a41 + farsjump JoseReminderScript JosePhoneCallerScript: gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2 diff --git a/engine/phone/scripts/liz.asm b/engine/phone/scripts/liz.asm index 64719bb16..a2e5320cb 100644 --- a/engine/phone/scripts/liz.asm +++ b/engine/phone/scripts/liz.asm @@ -12,11 +12,11 @@ LizPhoneCalleeScript: .NotThursday: special RandomPhoneMon - farsjump UnknownScript_0xa0948 + farsjump LizHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_32 - farsjump UnknownScript_0xa0a5a + farsjump LizReminderScript LizPhoneCallerScript: gettrainername STRING_BUFFER_3, PICNICKER, LIZ1 @@ -99,4 +99,4 @@ LizGossip: sjump LizGossipScript LizGossipScript: - farsjump UnknownScript_0xa06da + farsjump LizGossipRandomScript diff --git a/engine/phone/scripts/liz_gossip.asm b/engine/phone/scripts/liz_gossip.asm index 738b61235..e57ea1162 100644 --- a/engine/phone/scripts/liz_gossip.asm +++ b/engine/phone/scripts/liz_gossip.asm @@ -1,4 +1,4 @@ -UnknownScript_0xa06da: +LizGossipRandomScript: random 10 ifequal 0, .RuinsOfAlph ifequal 1, .Falkner @@ -12,51 +12,51 @@ UnknownScript_0xa06da: ifequal 9, .Forgot .RuinsOfAlph: - farwritetext UnknownText_0x176223 + farwritetext LizRuinsOfAlphGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .Falkner: - farwritetext UnknownText_0x1762c3 + farwritetext LizFalknerGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .Earl: - farwritetext UnknownText_0x17638a + farwritetext LizEarlGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .SurfPikachu: - farwritetext UnknownText_0x176424 + farwritetext LizSurfPikachuGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .MooMooMilk: - farwritetext UnknownText_0x1764eb + farwritetext LizMooMooMilkGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .Salon: - farwritetext UnknownText_0x176599 + farwritetext LizSalonGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .Whitney: - farwritetext UnknownText_0x1766ac + farwritetext LizWhitneyGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .BugCatchingContest: - farwritetext UnknownText_0x17674f + farwritetext LizBugCatchingContestGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .BeautifulMon: - farwritetext UnknownText_0x176816 + farwritetext LizBeautifulMonGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .Forgot: - farwritetext UnknownText_0x17686d + farwritetext LizForgotGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female diff --git a/engine/phone/scripts/parry.asm b/engine/phone/scripts/parry.asm index 48a1aa1af..e8628bcfd 100644 --- a/engine/phone/scripts/parry.asm +++ b/engine/phone/scripts/parry.asm @@ -11,11 +11,11 @@ ParryPhoneCalleeScript: iftrue ParryFridayDay .WantsRematch: - farsjump ParryBattleWithMe + farsjump ParryBattleWithMeScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_45 - farsjump ParryHaventYouGottenTo + farsjump ParryHaventYouGottenToScript ParryPhoneCallerScript: gettrainername STRING_BUFFER_3, HIKER, PARRY1 diff --git a/engine/phone/scripts/ralph.asm b/engine/phone/scripts/ralph.asm index c85e988db..245cce175 100644 --- a/engine/phone/scripts/ralph.asm +++ b/engine/phone/scripts/ralph.asm @@ -12,15 +12,15 @@ RalphPhoneCalleeScript: .CheckSwarm: checkflag ENGINE_FISH_SWARM iftrue .ReportSwarm - farsjump UnknownScript_0xa0940 + farsjump RalphNoItemScript .Rematch: getlandmarkname STRING_BUFFER_5, ROUTE_32 - farsjump UnknownScript_0xa0a55 + farsjump RalphReminderScript .ReportSwarm: getlandmarkname STRING_BUFFER_5, ROUTE_32 - farsjump UnknownScript_0xa0af5 + farsjump RalphHurryScript RalphPhoneCallerScript: gettrainername STRING_BUFFER_3, FISHER, RALPH1 @@ -53,7 +53,7 @@ Ralph_SetUpSwarm: getlandmarkname STRING_BUFFER_5, ROUTE_32 setval FISHSWARM_QWILFISH special ActivateFishingSwarm - farsjump UnknownScript_0xa05d6 + farsjump RalphItemScript .Generic: farsjump Phone_GenericCall_Male diff --git a/engine/phone/scripts/reena.asm b/engine/phone/scripts/reena.asm index 5b2a06afe..4800eb441 100644 --- a/engine/phone/scripts/reena.asm +++ b/engine/phone/scripts/reena.asm @@ -11,11 +11,11 @@ ReenaPhoneCalleeScript: iftrue ReenaSundayMorning .NotSunday: - farsjump UnknownScript_0xa0928 + farsjump ReenaForwardScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_27 - farsjump UnknownScript_0xa0a46 + farsjump ReenaHurryScript ReenaPhoneCallerScript: gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1 diff --git a/engine/phone/scripts/reminders.asm b/engine/phone/scripts/reminders.asm index d93418d36..b2676d3d4 100644 --- a/engine/phone/scripts/reminders.asm +++ b/engine/phone/scripts/reminders.asm @@ -1,92 +1,92 @@ JackWantsBattleScript: - farwritetext UnknownText_0x174638 + farwritetext JackReminderText end HueyWantsBattleScript: - farwritetext UnknownText_0x1749c7 + farwritetext HueyReminderText end -UnknownScript_0xa0a37: - farwritetext UnknownText_0x174c49 +GavenReminderScript: + farwritetext GavenReminderText end BethBattleReminderScript: - farwritetext BethForgetDealText + farwritetext BethReminderText end -UnknownScript_0xa0a41: - farwritetext UnknownText_0x17520a +JoseReminderScript: + farwritetext JoseReminderText end -UnknownScript_0xa0a46: - farwritetext UnknownText_0x1754e5 +ReenaHurryScript: + farwritetext ReenaHurryText end -UnknownScript_0xa0a4b: - farwritetext UnknownText_0x175786 +JoeyReminderScript: + farwritetext JoeyReminderText end -UnknownScript_0xa0a50: - farwritetext UnknownText_0x175b1e +WadeQuickBattleScript: + farwritetext WadeQuickBattleText end -UnknownScript_0xa0a55: - farwritetext UnknownText_0x175f11 +RalphReminderScript: + farwritetext RalphReminderText end -UnknownScript_0xa0a5a: - farwritetext UnknownText_0x1769da +LizReminderScript: + farwritetext LizReminderText end -UnknownScript_0xa0a5f: - farwritetext UnknownText_0x176d85 +AnthonyReminderScript: + farwritetext AnthonyReminderText end -UnknownScript_0xa0a64: - farwritetext UnknownText_0x177138 +ToddForwardScript: + farwritetext ToddLookingForwardToBattleText end -UnknownScript_0xa0a69: - farwritetext UnknownText_0x1774c1 +GinaReminderScript: + farwritetext GinaReminderText end -UnknownScript_0xa0a6e: - farwritetext UnknownText_0x64c13 +ArnieReminderScript: + farwritetext ArnieReminderText end -UnknownScript_0xa0a73: - farwritetext UnknownText_0x64ed4 +AlanReminderScript: + farwritetext AlanReminderText end -UnknownScript_0xa0a78: - farwritetext UnknownText_0x651bf +DanaReminderScript: + farwritetext DanaReminderText end -UnknownScript_0xa0a7d: - farwritetext UnknownText_0x65a63 +ChadReminderScript: + farwritetext ChadReminderText end -UnknownScript_0xa0a82: - farwritetext UnknownText_0x66043 +TullyForwardScript: + farwritetext TullyForwardText end -UnknownScript_0xa0a87: - farwritetext UnknownText_0x66579 +BrentReminderScript: + farwritetext BrentReminderText end -UnknownScript_0xa0a8c: - farwritetext UnknownText_0x668a3 +TiffanyAsleepScript: + farwritetext TiffanyAsleepText end -VanceHurryHurry: +VanceHurryHurryScript: farwritetext VanceHurryHurryText end -WiltonNotBiting: +WiltonNotBitingScript: farwritetext WiltonNotBitingText end -ParryHaventYouGottenTo: +ParryHaventYouGottenToScript: farwritetext ParryHaventYouGottenToText end diff --git a/engine/phone/scripts/reminders_2.asm b/engine/phone/scripts/reminders_2.asm index 9cbc5cfd7..54f54494c 100644 --- a/engine/phone/scripts/reminders_2.asm +++ b/engine/phone/scripts/reminders_2.asm @@ -1,15 +1,15 @@ -UnknownScript_0xa0af5: - farwritetext UnknownText_0x175f70 +RalphHurryScript: + farwritetext RalphHurryText end -UnknownScript_0xa0afa: - farwritetext UnknownText_0x176dd1 +AnthonyHurryScript: + farwritetext AnthonyHurryText end -UnknownScript_0xa0aff: - farwritetext UnknownText_0x64c5a +ArnieHurryScript: + farwritetext ArnieHurryText end -UnknownScript_0xa0b04: - farwritetext UnknownText_0x17717c +ToddHurryScript: + farwritetext ToddHaveYouGoneToDepartmentStoreText end diff --git a/engine/phone/scripts/tiffany.asm b/engine/phone/scripts/tiffany.asm index 6225f98c9..394361999 100644 --- a/engine/phone/scripts/tiffany.asm +++ b/engine/phone/scripts/tiffany.asm @@ -13,15 +13,15 @@ TiffanyPhoneCalleeScript: iftrue TiffanyTuesdayAfternoon .NotTuesday: - farsjump UnknownScript_0xa09a0 + farsjump TiffanyNoItemScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_43 - farsjump UnknownScript_0xa0a8c + farsjump TiffanyAsleepScript .HasItem: getlandmarkname STRING_BUFFER_5, ROUTE_43 - farsjump UnknownScript_0xa0ae5 + farsjump TiffanyHurryScript TiffanyPhoneCallerScript: gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3 diff --git a/engine/phone/scripts/todd.asm b/engine/phone/scripts/todd.asm index 1493aca34..5f73c97d6 100644 --- a/engine/phone/scripts/todd.asm +++ b/engine/phone/scripts/todd.asm @@ -13,14 +13,14 @@ ToddPhoneCalleeScript: .NotSaturday: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON iftrue .SaleOn - farsjump UnknownScript_0xa0958 + farsjump ToddNoItemScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_34 - farsjump UnknownScript_0xa0a64 + farsjump ToddForwardScript .SaleOn: - farsjump UnknownScript_0xa0b04 + farsjump ToddHurryScript ToddPhoneCallerScript: gettrainername STRING_BUFFER_3, CAMPER, TODD1 @@ -56,4 +56,4 @@ ToddFoundRare: ToddDeptStoreSale: setflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON - farsjump UnknownScript_0xa0644 + farsjump ToddItemScript diff --git a/engine/phone/scripts/tully.asm b/engine/phone/scripts/tully.asm index 4b5f138ee..c02931831 100644 --- a/engine/phone/scripts/tully.asm +++ b/engine/phone/scripts/tully.asm @@ -13,15 +13,15 @@ TullyPhoneCalleeScript: iftrue TullySundayNight .NotSunday: - farsjump UnknownScript_0xa0990 + farsjump TullyNoItemScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_42 - farsjump UnknownScript_0xa0a82 + farsjump TullyForwardScript .WaterStone: getlandmarkname STRING_BUFFER_5, ROUTE_42 - farsjump UnknownScript_0xa0add + farsjump TullyHurryScript TullyPhoneCallerScript: gettrainername STRING_BUFFER_3, FISHER, TULLY1 diff --git a/engine/phone/scripts/vance.asm b/engine/phone/scripts/vance.asm index 0de527673..7f01f27d6 100644 --- a/engine/phone/scripts/vance.asm +++ b/engine/phone/scripts/vance.asm @@ -11,11 +11,11 @@ VancePhoneCalleeScript: iftrue VanceWednesdayNight .NotWednesday: - farsjump VanceLookingForward + farsjump VanceLookingForwardScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_44 - farsjump VanceHurryHurry + farsjump VanceHurryHurryScript VancePhoneCallerScript: gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1 diff --git a/engine/phone/scripts/wade.asm b/engine/phone/scripts/wade.asm index 44d82ec01..298468de1 100644 --- a/engine/phone/scripts/wade.asm +++ b/engine/phone/scripts/wade.asm @@ -23,18 +23,18 @@ WadePhoneCalleeScript: ifequal SATURDAY, .ContestToday .NoContest: - farsjump UnknownScript_0xa0938 + farsjump WadeNoBerriesScript .ContestToday: farsjump PhoneScript_BugCatchingContest .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_31 - farsjump UnknownScript_0xa0a50 + farsjump WadeQuickBattleScript .HasItem: getlandmarkname STRING_BUFFER_5, ROUTE_31 - farsjump UnknownScript_0xa0ab5 + farsjump WadeComeQuickScript WadePhoneCallerScript: gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1 diff --git a/engine/phone/scripts/wilton.asm b/engine/phone/scripts/wilton.asm index 4605589f5..b9e014ecb 100644 --- a/engine/phone/scripts/wilton.asm +++ b/engine/phone/scripts/wilton.asm @@ -13,15 +13,15 @@ WiltonPhoneCalleeScript: iftrue WiltonThursdayMorning .NotThursday: - farsjump WiltonHaventFoundAnything + farsjump WiltonHaventFoundAnythingScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_44 - farsjump WiltonNotBiting + farsjump WiltonNotBitingScript .HasItem: getlandmarkname STRING_BUFFER_5, ROUTE_44 - farsjump WiltonWantThis + farsjump WiltonWantThisScript WiltonPhoneCallerScript: gettrainername STRING_BUFFER_3, FISHER, WILTON1 diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index d0e7e8ca0..b383ed860 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -459,7 +459,7 @@ PokegearJumptable: PokegearClock_Init: call InitPokegearTilemap - ld hl, PokegearText_PressAnyButtonToExit + ld hl, PokegearPressButtonText call PrintText ld hl, wJumptableIndex inc [hl] @@ -523,7 +523,7 @@ Pokegear_UpdateClock: ld c, a decoord 6, 8 farcall PrintHoursMins - ld hl, .DayText + ld hl, .GearTodayText bccoord 6, 6 call PlaceHLTextAtBC ret @@ -531,8 +531,8 @@ Pokegear_UpdateClock: db "ごぜん@" db "ごご@" -.DayText: - text_far UnknownText_0x1c5821 +.GearTodayText: + text_far _GearTodayText text_end PokegearMap_CheckRegion: @@ -812,7 +812,7 @@ PokegearPhone_Init: ld [wPokegearPhoneSelectedPerson], a call InitPokegearTilemap call ExitPokegearRadio_HandleMusic - ld hl, PokegearText_WhomToCall + ld hl, PokegearAskWhoCallText call PrintText ret @@ -902,12 +902,12 @@ PokegearPhone_MakePhoneCall: ldh [hInMenu], a ld de, SFX_CALL call PlaySFX - ld hl, .dotdotdot + ld hl, .GearEllipseText call PrintText call WaitSFX ld de, SFX_CALL call PlaySFX - ld hl, .dotdotdot + ld hl, .GearEllipseText call PrintText call WaitSFX ld a, [wPokegearPhoneSelectedPerson] @@ -926,22 +926,20 @@ PokegearPhone_MakePhoneCall: .no_service farcall Phone_NoSignal - ld hl, .OutOfServiceArea + ld hl, .GearOutOfServiceText call PrintText ld a, POKEGEARSTATE_PHONEJOYPAD ld [wJumptableIndex], a - ld hl, PokegearText_WhomToCall + ld hl, PokegearAskWhoCallText call PrintText ret -.dotdotdot - ; - text_far UnknownText_0x1c5824 +.GearEllipseText: + text_far _GearEllipseText text_end -.OutOfServiceArea: - ; You're out of the service area. - text_far UnknownText_0x1c5827 +.GearOutOfServiceText: + text_far _GearOutOfServiceText text_end PokegearPhone_FinishPhoneCall: @@ -951,7 +949,7 @@ PokegearPhone_FinishPhoneCall: farcall HangUp ld a, POKEGEARSTATE_PHONEJOYPAD ld [wJumptableIndex], a - ld hl, PokegearText_WhomToCall + ld hl, PokegearAskWhoCallText call PrintText ret @@ -1206,13 +1204,13 @@ PokegearPhoneContactSubmenu: jp hl .Cancel: - ld hl, PokegearText_WhomToCall + ld hl, PokegearAskWhoCallText call PrintText scf ret .Delete: - ld hl, PokegearText_DeleteStoredNumber + ld hl, PokegearAskDeleteText call MenuTextbox call YesNoBox call ExitMenu @@ -1221,7 +1219,7 @@ PokegearPhoneContactSubmenu: xor a ldh [hBGMapMode], a call PokegearPhone_UpdateDisplayList - ld hl, PokegearText_WhomToCall + ld hl, PokegearAskWhoCallText call PrintText call WaitBGMap .CancelDelete: @@ -1351,19 +1349,16 @@ Pokegear_LoadTilemapRLE: jr nz, .load jr .loop -PokegearText_WhomToCall: - ; Whom do you want to call? - text_far UnknownText_0x1c5847 +PokegearAskWhoCallText: + text_far _PokegearAskWhoCallText text_end -PokegearText_PressAnyButtonToExit: - ; Press any button to exit. - text_far UnknownText_0x1c5862 +PokegearPressButtonText: + text_far _PokegearPressButtonText text_end -PokegearText_DeleteStoredNumber: - ; Delete this stored phone number? - text_far UnknownText_0x1c587d +PokegearAskDeleteText: + text_far _PokegearAskDeleteText text_end PokegearSpritesGFX: diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm index 2e1dccf67..570278f03 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -304,32 +304,26 @@ OaksPKMNTalk6: jp NextRadioLine OPT_IntroText1: - ; MARY: PROF.OAK'S text_far _OPT_IntroText1 text_end OPT_IntroText2: - ; #MON TALK! text_far _OPT_IntroText2 text_end OPT_IntroText3: - ; With me, MARY! text_far _OPT_IntroText3 text_end OPT_OakText1: - ; OAK: @ @ text_far _OPT_OakText1 text_end OPT_OakText2: - ; may be seen around text_far _OPT_OakText2 text_end OPT_OakText3: - ; @ . text_far _OPT_OakText3 text_end @@ -342,7 +336,6 @@ OaksPKMNTalk7: jp NextRadioLine OPT_MaryText1: - ; MARY: @ 's text_far _OPT_MaryText1 text_end @@ -364,101 +357,85 @@ OaksPKMNTalk8: .Adverbs: ; there are NUM_OAKS_POKEMON_TALK_ADVERBS entries - dw .sweetadorably - dw .wigglyslickly - dw .aptlynamed - dw .undeniablykindof - dw .unbearably - dw .wowimpressively - dw .almostpoisonously - dw .sensually - dw .mischievously - dw .topically - dw .addictively - dw .looksinwater - dw .evolutionmustbe - dw .provocatively - dw .flippedout - dw .heartmeltingly + dw .OPT_SweetAdorablyText + dw .OPT_WigglySlicklyText + dw .OPT_AptlyNamedText + dw .OPT_UndeniablyKindOfText + dw .OPT_UnbearablyText + dw .OPT_WowImpressivelyText + dw .OPT_AlmostPoisonouslyText + dw .OPT_SensuallyText + dw .OPT_MischievouslyText + dw .OPT_TopicallyText + dw .OPT_AddictivelyText + dw .OPT_LooksInWaterText + dw .OPT_EvolutionMustBeText + dw .OPT_ProvocativelyText + dw .OPT_FlippedOutText + dw .OPT_HeartMeltinglyText -.sweetadorably - ; sweet and adorably - text_far OPT_SweetAdorably +.OPT_SweetAdorablyText: + text_far _OPT_SweetAdorablyText text_end -.wigglyslickly - ; wiggly and slickly - text_far OPT_WigglySlickly +.OPT_WigglySlicklyText: + text_far _OPT_WigglySlicklyText text_end -.aptlynamed - ; aptly named and - text_far OPT_AptlyNamed +.OPT_AptlyNamedText: + text_far _OPT_AptlyNamedText text_end -.undeniablykindof - ; undeniably kind of - text_far OPT_UndeniablyKindOf +.OPT_UndeniablyKindOfText: + text_far _OPT_UndeniablyKindOfText text_end -.unbearably - ; so, so unbearably - text_far OPT_Unbearably +.OPT_UnbearablyText: + text_far _OPT_UnbearablyText text_end -.wowimpressively - ; wow, impressively - text_far OPT_WowImpressively +.OPT_WowImpressivelyText: + text_far _OPT_WowImpressivelyText text_end -.almostpoisonously - ; almost poisonously - text_far OPT_AlmostPoisonously +.OPT_AlmostPoisonouslyText: + text_far _OPT_AlmostPoisonouslyText text_end -.sensually - ; ooh, so sensually - text_far OPT_Sensually +.OPT_SensuallyText: + text_far _OPT_SensuallyText text_end -.mischievously - ; so mischievously - text_far OPT_Mischievously +.OPT_MischievouslyText: + text_far _OPT_MischievouslyText text_end -.topically - ; so very topically - text_far OPT_Topically +.OPT_TopicallyText: + text_far _OPT_TopicallyText text_end -.addictively - ; sure addictively - text_far OPT_Addictively +.OPT_AddictivelyText: + text_far _OPT_AddictivelyText text_end -.looksinwater - ; looks in water is - text_far OPT_LooksInWater +.OPT_LooksInWaterText: + text_far _OPT_LooksInWaterText text_end -.evolutionmustbe - ; evolution must be - text_far OPT_EvolutionMustBe +.OPT_EvolutionMustBeText: + text_far _OPT_EvolutionMustBeText text_end -.provocatively - ; provocatively - text_far OPT_Provocatively +.OPT_ProvocativelyText: + text_far _OPT_ProvocativelyText text_end -.flippedout - ; so flipped out and - text_far OPT_FlippedOut +.OPT_FlippedOutText: + text_far _OPT_FlippedOutText text_end -.heartmeltingly - ; heart-meltingly - text_far OPT_HeartMeltingly +.OPT_HeartMeltinglyText: + text_far _OPT_HeartMeltinglyText text_end OaksPKMNTalk9: @@ -487,101 +464,85 @@ OaksPKMNTalk9: .Adjectives: ; there are NUM_OAKS_POKEMON_TALK_ADJECTIVES entries - dw .cute - dw .weird - dw .pleasant - dw .boldsortof - dw .frightening - dw .suavedebonair - dw .powerful - dw .exciting - dw .groovy - dw .inspiring - dw .friendly - dw .hothothot - dw .stimulating - dw .guarded - dw .lovely - dw .speedy + dw .OPT_CuteText + dw .OPT_WeirdText + dw .OPT_PleasantText + dw .OPT_BoldSortOfText + dw .OPT_FrighteningText + dw .OPT_SuaveDebonairText + dw .OPT_PowerfulText + dw .OPT_ExcitingText + dw .OPT_GroovyText + dw .OPT_InspiringText + dw .OPT_FriendlyText + dw .OPT_HotHotHotText + dw .OPT_StimulatingText + dw .OPT_GuardedText + dw .OPT_LovelyText + dw .OPT_SpeedyText -.cute - ; cute. - text_far OPT_Cute +.OPT_CuteText: + text_far _OPT_CuteText text_end -.weird - ; weird. - text_far OPT_Weird +.OPT_WeirdText: + text_far _OPT_WeirdText text_end -.pleasant - ; pleasant. - text_far OPT_Pleasant +.OPT_PleasantText: + text_far _OPT_PleasantText text_end -.boldsortof - ; bold, sort of. - text_far OPT_BoldSortOf +.OPT_BoldSortOfText: + text_far _OPT_BoldSortOfText text_end -.frightening - ; frightening. - text_far OPT_Frightening +.OPT_FrighteningText: + text_far _OPT_FrighteningText text_end -.suavedebonair - ; suave & debonair! - text_far OPT_SuaveDebonair +.OPT_SuaveDebonairText: + text_far _OPT_SuaveDebonairText text_end -.powerful - ; powerful. - text_far OPT_Powerful +.OPT_PowerfulText: + text_far _OPT_PowerfulText text_end -.exciting - ; exciting. - text_far OPT_Exciting +.OPT_ExcitingText: + text_far _OPT_ExcitingText text_end -.groovy - ; groovy! - text_far OPT_Groovy +.OPT_GroovyText: + text_far _OPT_GroovyText text_end -.inspiring - ; inspiring. - text_far OPT_Inspiring +.OPT_InspiringText: + text_far _OPT_InspiringText text_end -.friendly - ; friendly. - text_far OPT_Friendly +.OPT_FriendlyText: + text_far _OPT_FriendlyText text_end -.hothothot - ; hot, hot, hot! - text_far OPT_HotHotHot +.OPT_HotHotHotText: + text_far _OPT_HotHotHotText text_end -.stimulating - ; stimulating. - text_far OPT_Stimulating +.OPT_StimulatingText: + text_far _OPT_StimulatingText text_end -.guarded - ; guarded. - text_far OPT_Guarded +.OPT_GuardedText: + text_far _OPT_GuardedText text_end -.lovely - ; lovely. - text_far OPT_Lovely +.OPT_LovelyText: + text_far _OPT_LovelyText text_end -.speedy - ; speedy. - text_far OPT_Speedy +.OPT_SpeedyText: + text_far _OPT_SpeedyText text_end OaksPKMNTalk10: @@ -598,7 +559,6 @@ OaksPKMNTalk10: ret OPT_PokemonChannelText: - ; #MON text_far _OPT_PokemonChannelText text_end @@ -848,7 +808,6 @@ CopyDexEntryPart2: ret PokedexShowText: - ; @ @ text_far _PokedexShowText text_end @@ -875,7 +834,7 @@ FernMonMusic1: jp NextRadioLine FernMonMusic2: - ld hl, FernIntroMusic2 + ld hl, FernIntroText2 ld a, POKEMON_MUSIC_4 jp NextRadioLine @@ -920,52 +879,42 @@ StartPokemonMusicChannel: ret BenIntroText1: - ; BEN: #MON MUSIC text_far _BenIntroText1 text_end BenIntroText2: - ; CHANNEL! text_far _BenIntroText2 text_end BenIntroText3: - ; It's me, DJ BEN! text_far _BenIntroText3 text_end FernIntroText1: - ; FERN: #MUSIC! text_far _FernIntroText1 text_end -FernIntroMusic2: - ; With DJ FERN! +FernIntroText2: text_far _FernIntroText2 text_end BenFernText1: - ; Today's @ , text_far _BenFernText1 text_end BenFernText2A: - ; so let us jam to text_far _BenFernText2A text_end BenFernText2B: - ; so chill out to text_far _BenFernText2B text_end BenFernText3A: - ; #MON March! text_far _BenFernText3A text_end BenFernText3B: - ; #MON Lullaby! text_far _BenFernText3B text_end @@ -1061,67 +1010,54 @@ LuckyNumberShow15: jp NextRadioLine LC_Text1: - ; REED: Yeehaw! How text_far _LC_Text1 text_end LC_Text2: - ; y'all doin' now? text_far _LC_Text2 text_end LC_Text3: - ; Whether you're up text_far _LC_Text3 text_end LC_Text4: - ; or way down low, text_far _LC_Text4 text_end LC_Text5: - ; don't you miss the text_far _LC_Text5 text_end LC_Text6: - ; LUCKY NUMBER SHOW! text_far _LC_Text6 text_end LC_Text7: - ; This week's Lucky text_far _LC_Text7 text_end LC_Text8: - ; Number is @ ! text_far _LC_Text8 text_end LC_Text9: - ; I'll repeat that! text_far _LC_Text9 text_end LC_Text10: - ; Match it and go to text_far _LC_Text10 text_end LC_Text11: - ; the RADIO TOWER! text_far _LC_Text11 text_end LC_DragText1: - ; …Repeating myself text_far _LC_DragText1 text_end LC_DragText2: - ; gets to be a drag… text_far _LC_DragText2 text_end @@ -1147,17 +1083,14 @@ PeoplePlaces3: jp NextRadioLine PnP_Text1: - ; PLACES AND PEOPLE! text_far _PnP_Text1 text_end PnP_Text2: - ; Brought to you by text_far _PnP_Text2 text_end PnP_Text3: - ; me, DJ LILY! text_far _PnP_Text3 text_end @@ -1199,7 +1132,6 @@ PeoplePlaces4: ; People INCLUDE "data/radio/pnp_hidden_people.asm" PnP_Text4: - ; @ @ @ text_far _PnP_Text4 text_end @@ -1230,101 +1162,85 @@ PeoplePlaces5: .Adjectives: ; there are NUM_PNP_PEOPLE_ADJECTIVES entries - dw PnP_cute - dw PnP_lazy - dw PnP_happy - dw PnP_noisy - dw PnP_precocious - dw PnP_bold - dw PnP_picky - dw PnP_sortofok - dw PnP_soso - dw PnP_great - dw PnP_mytype - dw PnP_cool - dw PnP_inspiring - dw PnP_weird - dw PnP_rightforme - dw PnP_odd + dw PnP_CuteText + dw PnP_LazyText + dw PnP_HappyText + dw PnP_NoisyText + dw PnP_PrecociousText + dw PnP_BoldText + dw PnP_PickyText + dw PnP_SortOfOKText + dw PnP_SoSoText + dw PnP_GreatText + dw PnP_MyTypeText + dw PnP_CoolText + dw PnP_InspiringText + dw PnP_WeirdText + dw PnP_RightForMeText + dw PnP_OddText -PnP_cute: - ; is cute. - text_far _PnP_cute +PnP_CuteText: + text_far _PnP_CuteText text_end -PnP_lazy: - ; is sort of lazy. - text_far _PnP_lazy +PnP_LazyText: + text_far _PnP_LazyText text_end -PnP_happy: - ; is always happy. - text_far _PnP_happy +PnP_HappyText: + text_far _PnP_HappyText text_end -PnP_noisy: - ; is quite noisy. - text_far _PnP_noisy +PnP_NoisyText: + text_far _PnP_NoisyText text_end -PnP_precocious: - ; is precocious. - text_far _PnP_precocious +PnP_PrecociousText: + text_far _PnP_PrecociousText text_end -PnP_bold: - ; is somewhat bold. - text_far _PnP_bold +PnP_BoldText: + text_far _PnP_BoldText text_end -PnP_picky: - ; is too picky! - text_far _PnP_picky +PnP_PickyText: + text_far _PnP_PickyText text_end -PnP_sortofok: - ; is sort of OK. - text_far _PnP_sortofok +PnP_SortOfOKText: + text_far _PnP_SortOfOKText text_end -PnP_soso: - ; is just so-so. - text_far _PnP_soso +PnP_SoSoText: + text_far _PnP_SoSoText text_end -PnP_great: - ; is actually great. - text_far _PnP_great +PnP_GreatText: + text_far _PnP_GreatText text_end -PnP_mytype: - ; is just my type. - text_far _PnP_mytype +PnP_MyTypeText: + text_far _PnP_MyTypeText text_end -PnP_cool: - ; is so cool, no? - text_far _PnP_cool +PnP_CoolText: + text_far _PnP_CoolText text_end -PnP_inspiring: - ; is inspiring! - text_far _PnP_inspiring +PnP_InspiringText: + text_far _PnP_InspiringText text_end -PnP_weird: - ; is kind of weird. - text_far _PnP_weird +PnP_WeirdText: + text_far _PnP_WeirdText text_end -PnP_rightforme: - ; is right for me? - text_far _PnP_rightforme +PnP_RightForMeText: + text_far _PnP_RightForMeText text_end -PnP_odd: - ; is definitely odd! - text_far _PnP_odd +PnP_OddText: + text_far _PnP_OddText text_end PeoplePlaces6: ; Places @@ -1349,7 +1265,6 @@ PeoplePlaces6: ; Places INCLUDE "data/radio/pnp_hidden_places.asm" PnP_Text5: - ; @ @ text_far _PnP_Text5 text_end @@ -1381,22 +1296,22 @@ PeoplePlaces7: .Adjectives: ; there are NUM_PNP_PLACES_ADJECTIVES entries - dw PnP_cute - dw PnP_lazy - dw PnP_happy - dw PnP_noisy - dw PnP_precocious - dw PnP_bold - dw PnP_picky - dw PnP_sortofok - dw PnP_soso - dw PnP_great - dw PnP_mytype - dw PnP_cool - dw PnP_inspiring - dw PnP_weird - dw PnP_rightforme - dw PnP_odd + dw PnP_CuteText + dw PnP_LazyText + dw PnP_HappyText + dw PnP_NoisyText + dw PnP_PrecociousText + dw PnP_BoldText + dw PnP_PickyText + dw PnP_SortOfOKText + dw PnP_SoSoText + dw PnP_GreatText + dw PnP_MyTypeText + dw PnP_CoolText + dw PnP_InspiringText + dw PnP_WeirdText + dw PnP_RightForMeText + dw PnP_OddText RocketRadio1: call StartRadioStation @@ -1450,52 +1365,42 @@ RocketRadio10: jp NextRadioLine RocketRadioText1: - ; … …Ahem, we are text_far _RocketRadioText1 text_end RocketRadioText2: - ; TEAM ROCKET! text_far _RocketRadioText2 text_end RocketRadioText3: - ; After three years text_far _RocketRadioText3 text_end RocketRadioText4: - ; of preparation, we text_far _RocketRadioText4 text_end RocketRadioText5: - ; have risen again text_far _RocketRadioText5 text_end RocketRadioText6: - ; from the ashes! text_far _RocketRadioText6 text_end RocketRadioText7: - ; GIOVANNI! @ Can you text_far _RocketRadioText7 text_end RocketRadioText8: - ; hear?@ We did it! text_far _RocketRadioText8 text_end RocketRadioText9: - ; @ Where is our boss? text_far _RocketRadioText9 text_end RocketRadioText10: - ; @ Is he listening? text_far _RocketRadioText10 text_end @@ -1807,92 +1712,74 @@ BuenasPasswordChannelName: db "BUENA'S PASSWORD@" BuenaRadioText1: - ; BUENA: BUENA here! text_far _BuenaRadioText1 text_end BuenaRadioText2: - ; Today's password! text_far _BuenaRadioText2 text_end BuenaRadioText3: - ; Let me think… It's text_far _BuenaRadioText3 text_end BuenaRadioText4: - ; @ ! text_far _BuenaRadioText4 text_end BuenaRadioText5: - ; Don't forget it! text_far _BuenaRadioText5 text_end BuenaRadioText6: - ; I'm in GOLDENROD's text_far _BuenaRadioText6 text_end BuenaRadioText7: - ; RADIO TOWER! text_far _BuenaRadioText7 text_end BuenaRadioMidnightText1: - ; BUENA: Oh my… text_far _BuenaRadioMidnightText1 text_end BuenaRadioMidnightText2: - ; It's midnight! I text_far _BuenaRadioMidnightText2 text_end BuenaRadioMidnightText3: - ; have to shut down! text_far _BuenaRadioMidnightText3 text_end BuenaRadioMidnightText4: - ; Thanks for tuning text_far _BuenaRadioMidnightText4 text_end BuenaRadioMidnightText5: - ; in to the end! But text_far _BuenaRadioMidnightText5 text_end BuenaRadioMidnightText6: - ; don't stay up too text_far _BuenaRadioMidnightText6 text_end BuenaRadioMidnightText7: - ; late! Presented to text_far _BuenaRadioMidnightText7 text_end BuenaRadioMidnightText8: - ; you by DJ BUENA! text_far _BuenaRadioMidnightText8 text_end BuenaRadioMidnightText9: - ; I'm outta here! text_far _BuenaRadioMidnightText9 text_end BuenaRadioMidnightText10: - ; … text_far _BuenaRadioMidnightText10 text_end BuenaOffTheAirText: - ; text_far _BuenaOffTheAirText text_end diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index 700c59d35..b449c765a 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -9,14 +9,13 @@ _BillsPC: ld a, [wPartyCount] and a ret nz - ld hl, .Text_GottaHavePokemon + ld hl, .PCGottaHavePokemonText call MenuTextboxBackup scf ret -.Text_GottaHavePokemon: - ; You gotta have #MON to call! - text_far UnknownText_0x1c1006 +.PCGottaHavePokemonText: + text_far _PCGottaHavePokemonText text_end .LogIn: @@ -28,16 +27,15 @@ _BillsPC: ld a, [hl] push af set NO_TEXT_SCROLL, [hl] - ld hl, .Text_What + ld hl, .PCWhatText call PrintText pop af ld [wOptions], a call LoadFontsBattleExtra ret -.Text_What: - ; What? - text_far UnknownText_0x1c1024 +.PCWhatText: + text_far _PCWhatText text_end .LogOut: @@ -112,7 +110,7 @@ BillsPC_MovePKMNMenu: call LoadStandardMenuHeader farcall IsAnyMonHoldingMail jr nc, .no_mail - ld hl, .Text_MonHoldingMail + ld hl, .PCMonHoldingMailText call PrintText jr .quit @@ -128,9 +126,8 @@ BillsPC_MovePKMNMenu: and a ret -.Text_MonHoldingMail: - ; There is a #MON holding MAIL. Please remove the MAIL. - text_far UnknownText_0x1c102b +.PCMonHoldingMailText: + text_far _PCMonHoldingMailText text_end BillsPC_DepositMenu: @@ -152,25 +149,23 @@ Unreferenced_Functione512: ret .no_mon - ld hl, .Text_NoMon + ld hl, .PCNoSingleMonText call MenuTextboxBackup scf ret .only_one_mon - ld hl, .Text_ItsYourLastMon + ld hl, .PCCantDepositLastMonText call MenuTextboxBackup scf ret -.Text_NoMon: - ; You don't have a single #MON! - text_far UnknownText_0x1c1062 +.PCNoSingleMonText: + text_far _PCNoSingleMonText text_end -.Text_ItsYourLastMon: - ; You can't deposit your last #MON! - text_far UnknownText_0x1c1080 +.PCCantDepositLastMonText: + text_far _PCCantDepositLastMonText text_end CheckCurPartyMonFainted: @@ -219,14 +214,13 @@ Unreferenced_Functione56d: ret .asm_e576 - ld hl, UnknownText_0xe57e + ld hl, PCCantTakeText call MenuTextboxBackup scf ret -UnknownText_0xe57e: - ; You can't take any more #MON. - text_far UnknownText_0x1c10a2 +PCCantTakeText: + text_far _PCCantTakeText text_end BillsPC_ChangeBoxMenu: diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index 66d227ce5..34a0f2bbe 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -319,7 +319,7 @@ HatchEggs: ld d, h ld e, l push de - ld hl, .Text_NicknameHatchling + ld hl, .BreedAskNicknameText call PrintText call YesNoBox pop de @@ -356,7 +356,7 @@ HatchEggs: .Text_HatchEgg: ; Huh? @ @ - text_far UnknownText_0x1c0db0 + text_far Text_BreedHuh text_asm ld hl, wVramState res 0, [hl] @@ -366,29 +366,26 @@ HatchEggs: ld a, [wCurPartySpecies] push af call EggHatch_AnimationSequence - ld hl, .ClearTextbox + ld hl, .BreedClearboxText call PrintText pop af ld [wCurPartySpecies], a pop bc pop de pop hl - ld hl, .CameOutOfItsEgg + ld hl, .BreedEggHatchText ret -.ClearTextbox: - ; - text_far UnknownText_0x1c0db8 +.BreedClearboxText: + text_far _BreedClearboxText text_end -.CameOutOfItsEgg: - ; came out of its EGG!@ @ - text_far UnknownText_0x1c0dba +.BreedEggHatchText: + text_far _BreedEggHatchText text_end -.Text_NicknameHatchling: - ; Give a nickname to @ ? - text_far UnknownText_0x1c0dd8 +.BreedAskNicknameText: + text_far _BreedAskNicknameText text_end InitEggMoves: @@ -865,7 +862,7 @@ Hatch_ShellFragmentLoop: ret DayCareMon1: - ld hl, DayCareMon1Text + ld hl, LeftWithDayCareManText call PrintText ld a, [wBreedMon1Species] call PlayMonCry @@ -878,7 +875,7 @@ DayCareMon1: jp PrintText DayCareMon2: - ld hl, DayCareMon2Text + ld hl, LeftWithDayCareLadyText call PrintText ld a, [wBreedMon2Species] call PlayMonCry @@ -893,14 +890,12 @@ DayCareMon2: DayCareMonCursor: jp WaitPressAorB_BlinkCursor -DayCareMon2Text: - ; It's @ that was left with the DAY-CARE LADY. - text_far UnknownText_0x1c0df3 +LeftWithDayCareLadyText: + text_far _LeftWithDayCareLadyText text_end -DayCareMon1Text: - ; It's @ that was left with the DAY-CARE MAN. - text_far UnknownText_0x1c0e24 +LeftWithDayCareManText: + text_far _LeftWithDayCareManText text_end DayCareMonCompatibilityText: @@ -911,46 +906,41 @@ DayCareMonCompatibilityText: call CheckBreedmonCompatibility pop bc ld a, [wBreedingCompatibility] - ld hl, .AllAlone + ld hl, .BreedBrimmingWithEnergyText cp -1 jr z, .done - ld hl, .Incompatible + ld hl, .BreedNoInterestText and a jr z, .done - ld hl, .HighCompatibility + ld hl, .BreedAppearsToCareForText cp 230 jr nc, .done cp 70 - ld hl, .ModerateCompatibility + ld hl, .BreedFriendlyText jr nc, .done - ld hl, .SlightCompatibility + ld hl, .BreedShowsInterestText .done ret -.AllAlone: - ; It's brimming with energy. - text_far UnknownText_0x1c0e54 +.BreedBrimmingWithEnergyText: + text_far _BreedBrimmingWithEnergyText text_end -.Incompatible: - ; It has no interest in @ . - text_far UnknownText_0x1c0e6f +.BreedNoInterestText: + text_far _BreedNoInterestText text_end -.HighCompatibility: - ; It appears to care for @ . - text_far UnknownText_0x1c0e8d +.BreedAppearsToCareForText: + text_far _BreedAppearsToCareForText text_end -.ModerateCompatibility: - ; It's friendly with @ . - text_far UnknownText_0x1c0eac +.BreedFriendlyText: + text_far _BreedFriendlyText text_end -.SlightCompatibility: - ; It shows interest in @ . - text_far UnknownText_0x1c0ec6 +.BreedShowsInterestText: + text_far _BreedShowsInterestText text_end Unreferenced_DayCareMonPrintEmptyString: diff --git a/engine/pokemon/caught_data.asm b/engine/pokemon/caught_data.asm index fe34f197d..0633b8e9a 100644 --- a/engine/pokemon/caught_data.asm +++ b/engine/pokemon/caught_data.asm @@ -152,13 +152,12 @@ CheckPartyFullAfterContest: ret GiveANickname_YesNo: - ld hl, TextJump_GiveANickname + ld hl, CaughtAskNicknameText call PrintText jp YesNoBox -TextJump_GiveANickname: - ; Give a nickname to the @ you received? - text_far UnknownText_0x1c12fc +CaughtAskNicknameText: + text_far _CaughtAskNicknameText text_end SetCaughtData: diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index 0ee10eac8..51c47c0d6 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -204,7 +204,7 @@ EvolveAfterBattle_MasterLoop: ld hl, wPartyMonNicknames call GetNick call CopyName1 - ld hl, Text_WhatEvolving + ld hl, EvolvingText call PrintText ld c, 50 @@ -227,7 +227,7 @@ EvolveAfterBattle_MasterLoop: pop af jp c, CancelEvolution - ld hl, Text_CongratulationsYourPokemon + ld hl, CongratulationsYourPokemonText call PrintText pop hl @@ -240,7 +240,7 @@ EvolveAfterBattle_MasterLoop: call GetPokemonName push hl - ld hl, Text_EvolvedIntoPKMN + ld hl, EvolvedIntoText call PrintTextboxText farcall StubbedTrainerRankings_MonsEvolved @@ -377,7 +377,7 @@ UpdateSpeciesNameIfNotNicknamed: jp CopyBytes CancelEvolution: - ld hl, Text_StoppedEvolving + ld hl, StoppedEvolvingText call PrintText call ClearTileMap pop hl @@ -394,24 +394,20 @@ IsMonHoldingEverstone: pop hl ret -Text_CongratulationsYourPokemon: - ; Congratulations! Your @ @ - text_far UnknownText_0x1c4b92 +CongratulationsYourPokemonText: + text_far _CongratulationsYourPokemonText text_end -Text_EvolvedIntoPKMN: - ; evolved into @ ! - text_far UnknownText_0x1c4baf +EvolvedIntoText: + text_far _EvolvedIntoText text_end -Text_StoppedEvolving: - ; Huh? @ stopped evolving! - text_far UnknownText_0x1c4bc5 +StoppedEvolvingText: + text_far _StoppedEvolvingText text_end -Text_WhatEvolving: - ; What? @ is evolving! - text_far UnknownText_0x1c4be3 +EvolvingText: + text_far _EvolvingText text_end LearnLevelMoves: diff --git a/engine/pokemon/knows_move.asm b/engine/pokemon/knows_move.asm index 523d13968..9fe0f6ace 100644 --- a/engine/pokemon/knows_move.asm +++ b/engine/pokemon/knows_move.asm @@ -14,12 +14,11 @@ KnowsMove: ret .knows_move - ld hl, .Text_knows + ld hl, .KnowsMoveText call PrintText scf ret -.Text_knows: - ; knows @ . - text_far UnknownText_0x1c5ea8 +.KnowsMoveText: + text_far _KnowsMoveText text_end diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index d73dd7094..6722c4fe1 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -102,25 +102,25 @@ LearnMove: jp .learned .cancel - ld hl, Text_StopLearning ; Stop learning <MOVE>? + ld hl, StopLearningMoveText call PrintText call YesNoBox jp c, .loop - ld hl, Text_DidNotLearn ; <MON> did not learn <MOVE>. + ld hl, DidNotLearnMoveText call PrintText ld b, 0 ret .learned - ld hl, Text_LearnedMove ; <MON> learned <MOVE>! + ld hl, LearnedMoveText call PrintText ld b, 1 ret ForgetMove: push hl - ld hl, Text_TryingToLearn + ld hl, AskForgetMoveText call PrintText call YesNoBox pop hl @@ -134,7 +134,7 @@ ForgetMove: pop hl .loop push hl - ld hl, Text_ForgetWhich + ld hl, MoveAskForgetText call PrintText hlcoord 5, 2 ld b, NUM_MOVES * 2 @@ -191,7 +191,7 @@ ForgetMove: ret .hmmove - ld hl, Text_CantForgetHM + ld hl, MoveCantForgetHMText call PrintText pop hl jr .loop @@ -200,48 +200,40 @@ ForgetMove: scf ret -Text_LearnedMove: -; <MON> learned <MOVE>! - text_far UnknownText_0x1c5660 +LearnedMoveText: + text_far _LearnedMoveText text_end -Text_ForgetWhich: -; Which move should be forgotten? - text_far UnknownText_0x1c5678 +MoveAskForgetText: + text_far _MoveAskForgetText text_end -Text_StopLearning: -; Stop learning <MOVE>? - text_far UnknownText_0x1c5699 +StopLearningMoveText: + text_far _StopLearningMoveText text_end -Text_DidNotLearn: -; <MON> did not learn <MOVE>. - text_far UnknownText_0x1c56af +DidNotLearnMoveText: + text_far _DidNotLearnMoveText text_end -Text_TryingToLearn: -; <MON> is trying to learn <MOVE>. But <MON> can't learn more than -; four moves. Delete an older move to make room for <MOVE>? - text_far UnknownText_0x1c56c9 +AskForgetMoveText: + text_far _AskForgetMoveText text_end Text_1_2_and_Poof: - text_far UnknownText_0x1c5740 ; 1, 2 and… + text_far Text_MoveForgetCount ; 1, 2 and… text_asm push de ld de, SFX_SWITCH_POKEMON call PlaySFX pop de - ld hl, .PoofForgot + ld hl, .MoveForgotText ret -.PoofForgot: -; Poof! <MON> forgot <MOVE>. And… - text_far UnknownText_0x1c574e +.MoveForgotText: + text_far _MoveForgotText text_end -Text_CantForgetHM: -; HM moves can't be forgotten now. - text_far UnknownText_0x1c5772 +MoveCantForgetHMText: + text_far _MoveCantForgetHMText text_end diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index f89a51944..fa3955003 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -428,7 +428,7 @@ MailboxPC: jp CloseSubmenu .PutInPack: - ld hl, .MessageLostText + ld hl, .MailMessageLostText call MenuTextbox call YesNoBox call ExitMenu @@ -441,7 +441,7 @@ MailboxPC: ld hl, wNumItems call ReceiveItem jr c, .put_in_bag - ld hl, .PackFullText + ld hl, .MailPackFullText jp MenuTextboxBackup .put_in_bag @@ -449,19 +449,19 @@ MailboxPC: dec a ld b, a call DeleteMailFromPC - ld hl, .PutAwayText + ld hl, .MailClearedPutAwayText jp MenuTextboxBackup -.PutAwayText: - text_far ClearedMailPutAwayText +.MailClearedPutAwayText: + text_far _MailClearedPutAwayText text_end -.PackFullText: - text_far MailPackFullText +.MailPackFullText: + text_far _MailPackFullText text_end -.MessageLostText: - text_far MailMessageLostText +.MailMessageLostText: + text_far _MailMessageLostText text_end .GetMailType: @@ -500,12 +500,12 @@ MailboxPC: ld a, [hl] and a jr z, .attach_mail - ld hl, .HoldingMailText + ld hl, .MailAlreadyHoldingItemText call PrintText jr .try_again .egg - ld hl, .EggText + ld hl, .MailEggText call PrintText jr .try_again @@ -514,22 +514,22 @@ MailboxPC: dec a ld b, a call MoveMailFromPCToParty - ld hl, .MailMovedText + ld hl, .MailMovedFromBoxText call PrintText .exit2 jp CloseSubmenu -.HoldingMailText: - text_far MailAlreadyHoldingItemText +.MailAlreadyHoldingItemText: + text_far _MailAlreadyHoldingItemText text_end -.EggText: - text_far MailEggText +.MailEggText: + text_far _MailEggText text_end -.MailMovedText: - text_far MailMovedFromBoxText +.MailMovedFromBoxText: + text_far _MailMovedFromBoxText text_end .Cancel: diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 624a7c964..0b19dcb14 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -29,7 +29,7 @@ TossItemFromPC: ld a, [wItemAttributeParamBuffer] and a jr nz, .key_item - ld hl, .TossHowMany + ld hl, .ItemsTossOutHowManyText call MenuTextbox farcall SelectQuantityToToss push af @@ -37,7 +37,7 @@ TossItemFromPC: call ExitMenu pop af jr c, .quit - ld hl, .ConfirmToss + ld hl, .ItemsThrowAwayText call MenuTextbox call YesNoBox push af @@ -48,7 +48,7 @@ TossItemFromPC: ld a, [wCurItemQuantity] call TossItem call PartyMonItemName - ld hl, .TossedThisMany + ld hl, .ItemsDiscardedText call MenuTextbox call ExitMenu and a @@ -61,38 +61,34 @@ TossItemFromPC: scf ret -.TossHowMany: - ; Toss out how many @ (S)? - text_far UnknownText_0x1c1a90 +.ItemsTossOutHowManyText: + text_far _ItemsTossOutHowManyText text_end -.ConfirmToss: - ; Throw away @ @ (S)? - text_far UnknownText_0x1c1aad +.ItemsThrowAwayText: + text_far _ItemsThrowAwayText text_end -.TossedThisMany: - ; Discarded @ (S). - text_far UnknownText_0x1c1aca +.ItemsDiscardedText: + text_far _ItemsDiscardedText text_end .CantToss: - ld hl, .TooImportantToToss + ld hl, .ItemsTooImportantText call MenuTextboxBackup ret -.TooImportantToToss: - ; That's too impor- tant to toss out! - text_far UnknownText_0x1c1adf +.ItemsTooImportantText: + text_far _ItemsTooImportantText text_end CantUseItem: - ld hl, CantUseItemText + ld hl, ItemsOakWarningText call MenuTextboxWaitButton ret -CantUseItemText: - text_far UnknownText_0x1c1b03 +ItemsOakWarningText: + text_far _ItemsOakWarningText text_end PartyMonItemName: @@ -264,7 +260,7 @@ GiveTakePartyMonItem: jr .quit .next - ld hl, CantBeHeldText + ld hl, ItemCantHeldText call MenuTextboxBackup jr .loop @@ -289,20 +285,20 @@ TryGiveItemToPartymon: .give_item_to_mon call GiveItemToPokemon - ld hl, MadeHoldText + ld hl, PokemonHoldItemText call MenuTextboxBackup call GivePartyItem ret .please_remove_mail - ld hl, PleaseRemoveMailText + ld hl, PokemonRemoveMailText call MenuTextboxBackup ret .already_holding_item ld [wNamedObjectIndexBuffer], a call GetItemName - ld hl, SwitchAlreadyHoldingText + ld hl, PokemonAskSwapItemText call StartMenuYesNo jr c, .abort @@ -316,7 +312,7 @@ TryGiveItemToPartymon: call ReceiveItemFromPokemon jr nc, .bag_full - ld hl, TookAndMadeHoldText + ld hl, PokemonSwapItemText call MenuTextboxBackup ld a, [wNamedObjectIndexBuffer] ld [wCurItem], a @@ -327,7 +323,7 @@ TryGiveItemToPartymon: ld a, [wNamedObjectIndexBuffer] ld [wCurItem], a call ReceiveItemFromPokemon - ld hl, ItemStorageIsFullText + ld hl, ItemStorageFullText call MenuTextboxBackup .abort @@ -362,17 +358,17 @@ TakePartyItem: ld [wNamedObjectIndexBuffer], a ld [hl], NO_ITEM call GetItemName - ld hl, TookFromText + ld hl, PokemonTookItemText call MenuTextboxBackup jr .asm_12c9a .asm_12c8c - ld hl, IsntHoldingAnythingText + ld hl, PokemonNotHoldingText call MenuTextboxBackup jr .asm_12c9a .asm_12c94 - ld hl, ItemStorageIsFullText + ld hl, ItemStorageFullText call MenuTextboxBackup .asm_12c9a @@ -390,36 +386,36 @@ GiveTakeItemMenuData: db "GIVE@" db "TAKE@" -TookAndMadeHoldText: - text_far UnknownText_0x1c1b2c +PokemonSwapItemText: + text_far _PokemonSwapItemText text_end -MadeHoldText: - text_far UnknownText_0x1c1b57 +PokemonHoldItemText: + text_far _PokemonHoldItemText text_end -PleaseRemoveMailText: - text_far UnknownText_0x1c1b6f +PokemonRemoveMailText: + text_far _PokemonRemoveMailText text_end -IsntHoldingAnythingText: - text_far UnknownText_0x1c1b8e +PokemonNotHoldingText: + text_far _PokemonNotHoldingText text_end -ItemStorageIsFullText: - text_far UnknownText_0x1c1baa +ItemStorageFullText: + text_far _ItemStorageFullText text_end -TookFromText: - text_far UnknownText_0x1c1bc4 +PokemonTookItemText: + text_far _PokemonTookItemText text_end -SwitchAlreadyHoldingText: - text_far UnknownText_0x1c1bdc +PokemonAskSwapItemText: + text_far _PokemonAskSwapItemText text_end -CantBeHeldText: - text_far UnknownText_0x1c1c09 +ItemCantHeldText: + text_far _ItemCantHeldText text_end GetPartyItemLocation: @@ -506,24 +502,24 @@ MonMailAction: ret .take - ld hl, .sendmailtopctext + ld hl, .MailAskSendToPCText call StartMenuYesNo jr c, .RemoveMailToBag ld a, [wCurPartyMon] ld b, a farcall SendMailToPC jr c, .MailboxFull - ld hl, .sentmailtopctext + ld hl, .MailSentToPCText call MenuTextboxBackup jr .done .MailboxFull: - ld hl, .mailboxfulltext + ld hl, .MailboxFullText call MenuTextboxBackup jr .done .RemoveMailToBag: - ld hl, .mailwilllosemessagetext + ld hl, .MailLoseMessageText call StartMenuYesNo jr c, .done call GetPartyItemLocation @@ -534,12 +530,12 @@ MonMailAction: call GetPartyItemLocation ld [hl], $0 call GetCurNick - ld hl, .tookmailfrommontext + ld hl, .MailDetachedText call MenuTextboxBackup jr .done .BagIsFull: - ld hl, .bagfulltext + ld hl, .MailNoSpaceText call MenuTextboxBackup jr .done @@ -560,34 +556,28 @@ MonMailAction: db "TAKE@" db "QUIT@" -.mailwilllosemessagetext -; The MAIL will lose its message. OK? - text_far UnknownText_0x1c1c22 +.MailLoseMessageText: + text_far _MailLoseMessageText text_end -.tookmailfrommontext -; MAIL detached from <POKEMON>. - text_far UnknownText_0x1c1c47 +.MailDetachedText: + text_far _MailDetachedText text_end -.bagfulltext -; There's no space for removing MAIL. - text_far UnknownText_0x1c1c62 +.MailNoSpaceText: + text_far _MailNoSpaceText text_end -.sendmailtopctext -; Send the removed MAIL to your PC? - text_far UnknownText_0x1c1c86 +.MailAskSendToPCText: + text_far _MailAskSendToPCText text_end -.mailboxfulltext -; Your PC's MAILBOX is full. - text_far UnknownText_0x1c1ca9 +.MailboxFullText: + text_far _MailboxFullText text_end -.sentmailtopctext -; The MAIL was sent to your PC. - text_far UnknownText_0x1c1cc4 +.MailSentToPCText: + text_far _MailSentToPCText text_end OpenPartyStats: @@ -738,7 +728,7 @@ MonMenu_Softboiled_MilkDrink: jr .finish .NotEnoughHP: - ld hl, .Text_NotEnoughHP + ld hl, .PokemonNotEnoughHPText call PrintText .finish @@ -747,9 +737,8 @@ MonMenu_Softboiled_MilkDrink: ld a, $3 ret -.Text_NotEnoughHP: - ; Not enough HP! - text_far UnknownText_0x1c1ce3 +.PokemonNotEnoughHPText: + text_far _PokemonNotEnoughHPText text_end .CheckMonHasEnoughHP: diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index eaa05f84a..eb5afa9dc 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -1782,7 +1782,7 @@ GivePoke:: ld a, b and a ret z - ld hl, TextJump_WasSentToBillsPC + ld hl, WasSentToBillsPCText call PrintText ld a, BANK(sBoxMonNicknames) call GetSRAMBank @@ -1800,9 +1800,8 @@ GivePoke:: ld b, $2 ret -TextJump_WasSentToBillsPC: - ; was sent to BILL's PC. - text_far Text_WasSentToBillsPC +WasSentToBillsPCText: + text_far _WasSentToBillsPCText text_end InitNickname: diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index f8a6b0a5e..49c2c4713 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -792,64 +792,54 @@ PrintPartyMenuActionText: .MenuActionTexts: ; entries correspond to PARTYMENUTEXT_* constants - dw .Text_CuredOfPoison - dw .Text_BurnWasHealed - dw .Text_Defrosted - dw .Text_WokeUp - dw .Text_RidOfParalysis - dw .Text_RecoveredSomeHP - dw .Text_HealthReturned - dw .Text_Revitalized - dw .Text_GrewToLevel - dw .Text_CameToItsSenses - -.Text_RecoveredSomeHP: - ; recovered @ HP! + dw .CuredOfPoisonText + dw .BurnWasHealedText + dw .WasDefrostedText + dw .WokeUpText + dw .RidOfParalysisText + dw .RecoveredSomeHPText + dw .HealthReturnedText + dw .RevitalizedText + dw .GrewToLevelText + dw .CameToItsSensesText + +.RecoveredSomeHPText: text_far _RecoveredSomeHPText text_end -.Text_CuredOfPoison: - ; 's cured of poison. +.CuredOfPoisonText: text_far _CuredOfPoisonText text_end -.Text_RidOfParalysis: - ; 's rid of paralysis. +.RidOfParalysisText: text_far _RidOfParalysisText text_end -.Text_BurnWasHealed: - ; 's burn was healed. +.BurnWasHealedText: text_far _BurnWasHealedText text_end -.Text_Defrosted: - ; was defrosted. +.WasDefrostedText: text_far _WasDefrostedText text_end -.Text_WokeUp: - ; woke up. +.WokeUpText: text_far _WokeUpText text_end -.Text_HealthReturned: - ; 's health returned. +.HealthReturnedText: text_far _HealthReturnedText text_end -.Text_Revitalized: - ; is revitalized. +.RevitalizedText: text_far _RevitalizedText text_end -.Text_GrewToLevel: - ; grew to level @ !@ @ +.GrewToLevelText: text_far _GrewToLevelText text_end -.Text_CameToItsSenses: - ; came to its senses. +.CameToItsSensesText: text_far _CameToItsSensesText text_end diff --git a/engine/rtc/reset_password.asm b/engine/rtc/reset_password.asm index 0992f0bca..6fd7b3e15 100644 --- a/engine/rtc/reset_password.asm +++ b/engine/rtc/reset_password.asm @@ -6,7 +6,7 @@ _ResetClock: call LoadFontsExtra ld de, MUSIC_MAIN_MENU call PlayMusic - ld hl, .text_askreset + ld hl, .PasswordAskResetClockText call PrintText ld hl, .NoYes_MenuHeader call CopyMenuHeader @@ -22,28 +22,25 @@ _ResetClock: ld a, $80 ld [sRTCStatusFlags], a call CloseSRAM - ld hl, .text_okay + ld hl, .PasswordAskResetText call PrintText ret .wrongpassword - ld hl, .text_wrong + ld hl, .PasswordWrongText call PrintText ret -.text_okay - ; Password OK. Select CONTINUE & reset settings. - text_far UnknownText_0x1c55db +.PasswordAskResetText: + text_far _PasswordAskResetText text_end -.text_wrong - ; Wrong password! - text_far UnknownText_0x1c560b +.PasswordWrongText: + text_far _PasswordWrongText text_end -.text_askreset - ; Reset the clock? - text_far UnknownText_0x1c561c +.PasswordAskResetClockText: + text_far _PasswordAskResetClockText text_end .NoYes_MenuHeader: @@ -67,7 +64,7 @@ ClockResetPassword: call ByteFill ld a, $4 ld [wStringBuffer2 + 5], a - ld hl, .pleaseenterpasswordtext + ld hl, .PasswordAskEnterText call PrintText .loop call .updateIDdisplay @@ -101,9 +98,8 @@ ClockResetPassword: scf ret -.pleaseenterpasswordtext - ; Please enter the password. - text_far UnknownText_0x1c562e +.PasswordAskEnterText: + text_far _PasswordAskEnterText text_end .updateIDdisplay diff --git a/engine/rtc/restart_clock.asm b/engine/rtc/restart_clock.asm index 16f25cddd..357e69667 100644 --- a/engine/rtc/restart_clock.asm +++ b/engine/rtc/restart_clock.asm @@ -29,7 +29,7 @@ endr RestartClock: ; If we're here, we had an RTC overflow. - ld hl, .Text_ClockTimeMayBeWrong + ld hl, .ClockTimeMayBeWrongText call PrintText ld hl, wOptions ld a, [hl] @@ -37,7 +37,7 @@ RestartClock: set NO_TEXT_SCROLL, [hl] call LoadStandardMenuHeader call ClearTileMap - ld hl, .Text_SetWithControlPad + ld hl, .ClockSetWithControlPadText call PrintText call .SetClock call ExitMenu @@ -47,14 +47,12 @@ RestartClock: ld c, a ret -.Text_ClockTimeMayBeWrong: - ; The clock's time may be wrong. Please reset the time. - text_far UnknownText_0x1c40e6 +.ClockTimeMayBeWrongText: + text_far _ClockTimeMayBeWrongText text_end -.Text_SetWithControlPad: - ; Set with the Control Pad. Confirm: A Button Cancel: B Button - text_far UnknownText_0x1c411c +.ClockSetWithControlPadText: + text_far _ClockSetWithControlPadText text_end .SetClock: @@ -77,7 +75,7 @@ RestartClock: and a ret nz call .PrintTime - ld hl, .Text_IsThisOK + ld hl, .ClockIsThisOKText call PrintText call YesNoBox jr c, .cancel @@ -91,7 +89,7 @@ RestartClock: ld [wStringBuffer2 + 3], a call InitTime call .PrintTime - ld hl, .Text_ClockReset + ld hl, .ClockHasResetText call PrintText call WaitPressAorB_BlinkCursor xor a @@ -101,14 +99,12 @@ RestartClock: ld a, $1 ret -.Text_IsThisOK: - ; Is this OK? - text_far UnknownText_0x1c415b +.ClockIsThisOKText: + text_far _ClockIsThisOKText text_end -.Text_ClockReset: - ; The clock has been reset. - text_far UnknownText_0x1c4168 +.ClockHasResetText: + text_far _ClockHasResetText text_end .joy_loop diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index 146adc072..ab47c5e56 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -41,7 +41,7 @@ InitClock: call .ClearScreen call WaitBGMap call RotateFourPalettesRight - ld hl, Text_WokeUpOak + ld hl, OakTimeWokeUpText call PrintText ld hl, wTimeSetBuffer ld bc, wTimeSetBufferEnd - wTimeSetBuffer @@ -51,7 +51,7 @@ InitClock: ld [wInitHourBuffer], a .loop - ld hl, Text_WhatTimeIsIt + ld hl, OakTimeWhatTimeIsItText call PrintText hlcoord 3, 7 ld b, 2 @@ -74,7 +74,7 @@ InitClock: ld a, [wInitHourBuffer] ld [wStringBuffer2 + 1], a call .ClearScreen - ld hl, Text_WhatHrs + ld hl, OakTimeWhatHoursText call PrintText call YesNoBox jr nc, .HourIsSet @@ -82,7 +82,7 @@ InitClock: jr .loop .HourIsSet: - ld hl, Text_HowManyMinutes + ld hl, OakTimeHowManyMinutesText call PrintText hlcoord 11, 7 lb bc, 2, 7 @@ -104,7 +104,7 @@ InitClock: ld a, [wInitMinuteBuffer] ld [wStringBuffer2 + 2], a call .ClearScreen - ld hl, Text_WhoaMins + ld hl, OakTimeWhoaMinutesText call PrintText call YesNoBox jr nc, .MinutesAreSet @@ -289,53 +289,48 @@ PrintTwoDigitNumberRightAlign: call PrintNum ret -Text_WokeUpOak: - ; Zzz… Hm? Wha…? You woke me up! Will you check the clock for me? - text_far _OakTimeText1 +OakTimeWokeUpText: + text_far _OakTimeWokeUpText text_end -Text_WhatTimeIsIt: - ; What time is it? - text_far _OakTimeText2 +OakTimeWhatTimeIsItText: + text_far _OakTimeWhatTimeIsItText text_end String_oclock: db "o'clock@" -Text_WhatHrs: +OakTimeWhatHoursText: ; What?@ @ - text_far _OakTimeText3 + text_far _OakTimeWhatHoursText text_asm hlcoord 1, 16 call DisplayHourOClock - ld hl, .QuestionMark + ld hl, .OakTimeHoursQuestionMarkText ret -.QuestionMark: - ; ? - text_far _OakTimeText4 +.OakTimeHoursQuestionMarkText: + text_far _OakTimeHoursQuestionMarkText text_end -Text_HowManyMinutes: - ; How many minutes? - text_far _OakTimeText5 +OakTimeHowManyMinutesText: + text_far _OakTimeHowManyMinutesText text_end String_min: db "min.@" -Text_WhoaMins: +OakTimeWhoaMinutesText: ; Whoa!@ @ - text_far _OakTimeText6 + text_far _OakTimeWhoaMinutesText text_asm hlcoord 7, 14 call DisplayMinutesWithMinString - ld hl, .QuestionMark + ld hl, .OakTimeMinutesQuestionMarkText ret -.QuestionMark: - ; ? - text_far _OakTimeText7 +.OakTimeMinutesQuestionMarkText: + text_far _OakTimeMinutesQuestionMarkText text_end OakText_ResponseToSetTime: @@ -358,29 +353,26 @@ OakText_ResponseToSetTime: jr c, .morn cp NITE_HOUR jr c, .day -.nite: - ld hl, .sodark +.nite + ld hl, .OakTimeSoDarkText ret -.morn: - ld hl, .overslept +.morn + ld hl, .OakTimeOversleptText ret -.day: - ld hl, .yikes +.day + ld hl, .OakTimeYikesText ret -.overslept - ; ! I overslept! - text_far _OakTimeText8 +.OakTimeOversleptText: + text_far _OakTimeOversleptText text_end -.yikes - ; ! Yikes! I over- slept! - text_far _OakTimeText11 +.OakTimeYikesText: + text_far _OakTimeYikesText text_end -.sodark - ; ! No wonder it's so dark! - text_far _OakTimeText12 +.OakTimeSoDarkText: + text_far _OakTimeSoDarkText text_end TimeSetBackgroundGFX: @@ -410,7 +402,7 @@ SetDayOfWeek: lb bc, 4, 18 call Textbox call LoadStandardMenuHeader - ld hl, .WhatDayIsItText + ld hl, .OakTimeWhatDayIsItText call PrintText hlcoord 9, 3 ld b, 2 @@ -532,21 +524,19 @@ SetDayOfWeek: .Friday: db " FRIDAY@" .Saturday: db "SATURDAY@" -.WhatDayIsItText: - ; What day is it? - text_far _OakTimeText13 +.OakTimeWhatDayIsItText: + text_far _OakTimeWhatDayIsItText text_end .ConfirmWeekdayText: text_asm hlcoord 1, 14 call .PlaceWeekdayString - ld hl, .IsIt + ld hl, .OakTimeIsItText ret -.IsIt: - ; , is it? - text_far _OakTimeText14 +.OakTimeIsItText: + text_far _OakTimeIsItText text_end InitialSetDSTFlag: @@ -569,12 +559,11 @@ InitialSetDSTFlag: ld c, a decoord 1, 14 farcall PrintHoursMins - ld hl, .DSTIsThatOK + ld hl, .DSTIsThatOKText ret -.DSTIsThatOK: - ; DST, is that OK? - text_far Text_DSTIsThatOK +.DSTIsThatOKText: + text_far _DSTIsThatOKText text_end InitialClearDSTFlag: @@ -597,12 +586,11 @@ InitialClearDSTFlag: ld c, a decoord 1, 14 farcall PrintHoursMins - ld hl, .IsThatOK + ld hl, .TimeAskOkayText ret -.IsThatOK: - ; , is that OK? - text_far UnknownText_0x1c5ff1 +.TimeAskOkayText: + text_far _TimeAskOkayText text_end DebugDisplayTime: diff --git a/home/map.asm b/home/map.asm index 02df97323..b3ef17da8 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1114,14 +1114,14 @@ BGEvent:: jumptext BGEventText BGEventText:: - text_far UnknownText_0x1c46fc + text_far _BGEventText text_end CoordinatesEvent:: jumptext CoordinatesEventText CoordinatesEventText:: - text_far UnknownText_0x1c4706 + text_far _CoordinatesEventText text_end CheckObjectMask:: diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index d9d916243..6b7ff934d 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -73,21 +73,21 @@ MoveTutorScript: .Flamethrower: setval MOVETUTOR_FLAMETHROWER - writetext UnknownText_0x1991cf + writetext GoldenrodCityMoveTutorMoveText special MoveTutor ifequal FALSE, .TeachMove sjump .Incompatible .Thunderbolt: setval MOVETUTOR_THUNDERBOLT - writetext UnknownText_0x1991cf + writetext GoldenrodCityMoveTutorMoveText special MoveTutor ifequal FALSE, .TeachMove sjump .Incompatible .IceBeam: setval MOVETUTOR_ICE_BEAM - writetext UnknownText_0x1991cf + writetext GoldenrodCityMoveTutorMoveText special MoveTutor ifequal FALSE, .TeachMove sjump .Incompatible @@ -545,7 +545,7 @@ GoldenrodCityMoveTutorYouDontHaveEnoughCoinsText: line "enough coins here…" done -UnknownText_0x1991cf: +GoldenrodCityMoveTutorMoveText: text_start done diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 733d5e024..97a7fd855 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -45,14 +45,14 @@ LakeOfRageLanceScript: checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE iftrue .AskAgainForHelp opentext - writetext UnknownText_0x70157 + writetext LakeOfRageLanceForcedToEvolveText buttonsound faceplayer - writetext UnknownText_0x701b4 + writetext LakeOfRageLanceIntroText yesorno iffalse .RefusedToHelp .AgreedToHelp: - writetext UnknownText_0x702c6 + writetext LakeOfRageLanceRadioSignalText waitbutton closetext playsound SFX_WARP_TO @@ -64,7 +64,7 @@ LakeOfRageLanceScript: end .RefusedToHelp: - writetext UnknownText_0x70371 + writetext LakeOfRageLanceRefusedText waitbutton closetext setevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE @@ -73,14 +73,14 @@ LakeOfRageLanceScript: .AskAgainForHelp: faceplayer opentext - writetext UnknownText_0x703a5 + writetext LakeOfRageLanceAskHelpText yesorno iffalse .RefusedToHelp sjump .AgreedToHelp RedGyarados: opentext - writetext UnknownText_0x703cb + writetext LakeOfRageGyaradosCryText pause 15 cry GYARADOS closetext @@ -94,7 +94,7 @@ RedGyarados: opentext giveitem RED_SCALE waitsfx - writetext UnknownText_0x703df + writetext LakeOfRageGotRedScaleText playsound SFX_ITEM waitsfx itemnotify @@ -242,7 +242,7 @@ MovementData_0x70155: teleport_from step_end -UnknownText_0x70157: +LakeOfRageLanceForcedToEvolveText: text "This lake is full" line "of GYARADOS but" cont "nothing else…" @@ -252,7 +252,7 @@ UnknownText_0x70157: cont "to evolve…" done -UnknownText_0x701b4: +LakeOfRageLanceIntroText: text "Did you come here" line "because of the" cont "rumors?" @@ -280,7 +280,7 @@ UnknownText_0x701b4: cont "investigate?" done -UnknownText_0x702c6: +LakeOfRageLanceRadioSignalText: text "LANCE: Excellent!" para "It seems that the" @@ -299,22 +299,22 @@ UnknownText_0x702c6: line "for you, <PLAY_G>." done -UnknownText_0x70371: +LakeOfRageLanceRefusedText: text "Oh… Well, if you" line "change your mind," cont "please help me." done -UnknownText_0x703a5: +LakeOfRageLanceAskHelpText: text "LANCE: Hm? Are you" line "going to help me?" done -UnknownText_0x703cb: +LakeOfRageGyaradosCryText: text "GYARADOS: Gyashaa!" done -UnknownText_0x703df: +LakeOfRageGotRedScaleText: text "<PLAYER> obtained a" line "RED SCALE." done diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 7a47c37d1..e09c60763 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -80,7 +80,7 @@ LancesRoomLanceScript: appear LANCESROOM_MARY applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRushesIn opentext - writetext UnknownText_0x1811dd + writetext LancesRoomMaryOhNoOakText waitbutton closetext appear LANCESROOM_OAK @@ -91,19 +91,19 @@ LancesRoomLanceScript: turnobject LANCESROOM_OAK, UP turnobject LANCESROOM_LANCE, LEFT opentext - writetext UnknownText_0x18121b + writetext LancesRoomOakCongratulationsText waitbutton closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryInterviewChampion turnobject PLAYER, LEFT opentext - writetext UnknownText_0x18134b + writetext LancesRoomMaryInterviewText waitbutton closetext applymovement LANCESROOM_LANCE, LancesRoomMovementData_LancePositionsSelfToGuidePlayerAway turnobject PLAYER, UP opentext - writetext UnknownText_0x18137b + writetext LancesRoomNoisyText waitbutton closetext follow LANCESROOM_LANCE, PLAYER @@ -119,7 +119,7 @@ LancesRoomLanceScript: applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryTriesToFollow showemote EMOTE_SHOCK, LANCESROOM_MARY, 15 opentext - writetext UnknownText_0x1813c5 + writetext LancesRoomMaryNoInterviewText pause 30 closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth @@ -273,7 +273,7 @@ LanceBattleAfterText: line "your #MON." done -UnknownText_0x1811dd: +LancesRoomMaryOhNoOakText: text "MARY: Oh, no!" line "It's all over!" @@ -281,7 +281,7 @@ UnknownText_0x1811dd: line "weren't so slow…" done -UnknownText_0x18121b: +LancesRoomOakCongratulationsText: text "PROF.OAK: Ah," line "<PLAY_G>!" @@ -314,13 +314,13 @@ UnknownText_0x18121b: line "<PLAY_G>!" done -UnknownText_0x18134b: +LancesRoomMaryInterviewText: text "MARY: Let's inter-" line "view the brand new" cont "CHAMPION!" done -UnknownText_0x18137b: +LancesRoomNoisyText: text "LANCE: This is" line "getting to be a" cont "bit too noisy…" @@ -329,7 +329,7 @@ UnknownText_0x18137b: line "come with me?" done -UnknownText_0x1813c5: +LancesRoomMaryNoInterviewText: text "MARY: Oh, wait!" line "We haven't done" cont "the interview!" diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index d63430709..cd517f930 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -63,7 +63,7 @@ MahogayMart1FBlackBeltScript: MahoganyMart1FLanceUncoversStaircaseScript: pause 15 opentext - writetext UnknownText_0x6c52a + writetext MahoganyMart1FLanceDragoniteHyperBeamText pause 15 closetext playsound SFX_TACKLE @@ -74,7 +74,7 @@ MahoganyMart1FLanceUncoversStaircaseScript: pause 15 applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c407 opentext - writetext UnknownText_0x6c549 + writetext MahoganyMart1FLanceRadioText waitbutton closetext follow MAHOGANYMART1F_LANCE, PLAYER @@ -83,7 +83,7 @@ MahoganyMart1FLanceUncoversStaircaseScript: applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40e stopfollow opentext - writetext UnknownText_0x6c59e + writetext MahoganyMart1FLanceStairsText waitbutton showemote EMOTE_SHOCK, MAHOGANYMART1F_PHARMACIST, 10 playsound SFX_FAINT @@ -93,7 +93,7 @@ MahoganyMart1FLanceUncoversStaircaseScript: setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART turnobject MAHOGANYMART1F_LANCE, LEFT opentext - writetext UnknownText_0x6c5ba + writetext MahoganyMart1FLanceSplitUpText waitbutton closetext applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412 @@ -189,12 +189,12 @@ MahogayMart1FBlackBeltText_LanceEntered: line "#MON are tough…" done -UnknownText_0x6c52a: +MahoganyMart1FLanceDragoniteHyperBeamText: text "LANCE: DRAGONITE," line "HYPER BEAM." done -UnknownText_0x6c549: +MahoganyMart1FLanceRadioText: text "What took you," line "<PLAY_G>?" @@ -205,12 +205,12 @@ UnknownText_0x6c549: line "from here." done -UnknownText_0x6c59e: +MahoganyMart1FLanceStairsText: text "The stairs are" line "right here." done -UnknownText_0x6c5ba: +MahoganyMart1FLanceSplitUpText: text "LANCE: <PLAY_G>, we" line "should split up to" diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 25ffc862f..7cf4f6ce0 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -19,34 +19,34 @@ MountMortarB1FKiyoScript: iftrue .GotTyrogue checkevent EVENT_BEAT_BLACKBELT_KIYO iftrue .BeatKiyo - writetext UnknownText_0x7e24d + writetext MountMortarB1FKiyoIntroText waitbutton closetext - winlosstext UnknownText_0x7e2a9, 0 + winlosstext MountMortarB1FKiyoWinText, 0 loadtrainer BLACKBELT_T, KIYO startbattle reloadmapafterbattle setevent EVENT_BEAT_BLACKBELT_KIYO opentext .BeatKiyo: - writetext UnknownText_0x7e2c0 + writetext MountMortarB1FTyrogueRewardText buttonsound waitsfx readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, .NoRoom - writetext UnknownText_0x7e355 + writetext MountMortarB1FReceiveMonText playsound SFX_CAUGHT_MON waitsfx givepoke TYROGUE, 10 setevent EVENT_GOT_TYROGUE_FROM_KIYO .GotTyrogue: - writetext UnknownText_0x7e36a + writetext MountMortarB1FKiyoGotTyrogueText waitbutton closetext end .NoRoom: - writetext UnknownText_0x7e3df + writetext MountMortarB1FKiyoFullPartyText waitbutton closetext end @@ -72,7 +72,7 @@ MountMortarB1FPPUp: MountMortarB1FHiddenMaxRevive: hiddenitem MAX_REVIVE, EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE -UnknownText_0x7e24d: +MountMortarB1FKiyoIntroText: text "Hey!" para "I am the KARATE" @@ -87,12 +87,12 @@ UnknownText_0x7e24d: para "Hwaaarggh!" done -UnknownText_0x7e2a9: +MountMortarB1FKiyoWinText: text "Waaaarggh!" line "I'm beaten!" done -UnknownText_0x7e2c0: +MountMortarB1FTyrogueRewardText: text "I… I'm crushed…" para "My training is" @@ -108,12 +108,12 @@ UnknownText_0x7e2c0: line "fighting #MON." done -UnknownText_0x7e355: +MountMortarB1FReceiveMonText: text "<PLAYER> received" line "TYROGUE." done -UnknownText_0x7e36a: +MountMortarB1FKiyoGotTyrogueText: text "TYROGUE is a" line "fighting-type." @@ -127,7 +127,7 @@ UnknownText_0x7e36a: para "Farewell!" done -UnknownText_0x7e3df: +MountMortarB1FKiyoFullPartyText: text "You have no room" line "in your party!" done diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index b4fc2aff8..5fb0b1003 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -82,7 +82,7 @@ TrainerSchoolboyJack1: iftrue .NumberAccepted checkevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain - writetext UnknownText_0x5c4f3 + writetext SchoolboyJackTradeMonText buttonsound setevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 @@ -212,7 +212,7 @@ TrainerPokefanfBeverly1: iffalse .NoMarill checkevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain - writetext UnknownText_0x5c5bd + writetext PokefanBeverlyCuteMonText buttonsound setevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 @@ -239,7 +239,7 @@ TrainerPokefanfBeverly1: sjump .PackFull .NoMarill: - writetext UnknownText_0x5c68a + writetext PokefanFBeverlyMarillFriendText waitbutton closetext end @@ -405,7 +405,7 @@ SchoolboyJack1BeatenText: text "Wha-wha-what?" done -UnknownText_0x5c4f3: +SchoolboyJackTradeMonText: text "There is a lot" line "to learn." @@ -432,7 +432,7 @@ PokefanfBeverly1BeatenText: line "pride, but…" done -UnknownText_0x5c5bd: +PokefanBeverlyCuteMonText: text "I must say, your" line "#MON are quite" cont "cute, too." @@ -459,7 +459,7 @@ PokefanmWilliamAfterBattleText: line "being most lovely." done -UnknownText_0x5c68a: +PokefanFBeverlyMarillFriendText: text "My friend keeps a" line "MARILL!" diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 1cb28288a..dce328919 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -34,7 +34,7 @@ OlivinePortSailorAtGangwayScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue OlivinePortAlreadyRodeScript - writetext UnknownText_0x74a55 + writetext OlivinePortSailorGetOnBoardText waitbutton closetext turnobject OLIVINEPORT_SAILOR1, DOWN @@ -67,7 +67,7 @@ OlivinePortSailorAtGangwayScript: end OlivinePortAlreadyRodeScript: - writetext UnknownText_0x74a80 + writetext OlivinePortCantBoardText waitbutton closetext end @@ -89,14 +89,14 @@ OlivinePortWalkUpToShipScript: ifequal WEDNESDAY, .NextShipFriday ifequal THURSDAY, .NextShipFriday .FirstTime: - writetext UnknownText_0x74a9c + writetext OlivinePortAskBoardText yesorno iffalse OlivinePortNotRidingMoveAwayScript - writetext UnknownText_0x74ada + writetext OlivinePortAskTicketText buttonsound checkitem S_S_TICKET iffalse .NoTicket - writetext UnknownText_0x74b11 + writetext OlivinePortFlashTicketText waitbutton closetext setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 @@ -104,21 +104,21 @@ OlivinePortWalkUpToShipScript: sjump OlivinePortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74b41 + writetext OlivinePortNoTicketText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 end .NextShipMonday: - writetext UnknownText_0x74ba8 + writetext OlivinePortMondayShipText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 end .NextShipFriday: - writetext UnknownText_0x74bce + writetext OlivinePortFridayShipText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 @@ -128,13 +128,13 @@ OlivinePortWalkUpToShipScript: end OlivinePortNotRidingScript: - writetext UnknownText_0x74af6 + writetext OlivinePortComeAgainText waitbutton closetext end OlivinePortNotRidingMoveAwayScript: - writetext UnknownText_0x74af6 + writetext OlivinePortComeAgainText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 @@ -154,14 +154,14 @@ OlivinePortSailorAfterHOFScript: ifequal WEDNESDAY, .NextShipFriday ifequal THURSDAY, .NextShipFriday .FirstTime: - writetext UnknownText_0x74a9c + writetext OlivinePortAskBoardText yesorno iffalse OlivinePortNotRidingScript - writetext UnknownText_0x74ada + writetext OlivinePortAskTicketText buttonsound checkitem S_S_TICKET iffalse .NoTicket - writetext UnknownText_0x74b11 + writetext OlivinePortFlashTicketText waitbutton closetext setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 @@ -175,19 +175,19 @@ OlivinePortSailorAfterHOFScript: sjump OlivinePortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74b41 + writetext OlivinePortNoTicketText waitbutton closetext end .NextShipMonday: - writetext UnknownText_0x74ba8 + writetext OlivinePortMondayShipText waitbutton closetext end .NextShipFriday: - writetext UnknownText_0x74bce + writetext OlivinePortFridayShipText waitbutton closetext end @@ -283,18 +283,18 @@ MovementData_0x74a49: step DOWN step_end -UnknownText_0x74a55: +OlivinePortSailorGetOnBoardText: text "We're departing" line "soon. Please get" cont "on board." done -UnknownText_0x74a80: +OlivinePortCantBoardText: text "Sorry. You can't" line "board now." done -UnknownText_0x74a9c: +OlivinePortAskBoardText: text "Welcome to FAST" line "SHIP S.S.AQUA." @@ -302,17 +302,17 @@ UnknownText_0x74a9c: line "ing today?" done -UnknownText_0x74ada: +OlivinePortAskTicketText: text "May I see your" line "S.S.TICKET?" done -UnknownText_0x74af6: +OlivinePortComeAgainText: text "We hope to see you" line "again!" done -UnknownText_0x74b11: +OlivinePortFlashTicketText: text "<PLAYER> flashed" line "the S.S.TICKET." @@ -320,7 +320,7 @@ UnknownText_0x74b11: line "Thank you!" done -UnknownText_0x74b41: +OlivinePortNoTicketText: text "<PLAYER> tried to" line "show the S.S." cont "TICKET…" @@ -334,12 +334,12 @@ UnknownText_0x74b41: line "S.S.TICKET." done -UnknownText_0x74ba8: +OlivinePortMondayShipText: text "The FAST SHIP will" line "sail next Monday." done -UnknownText_0x74bce: +OlivinePortFridayShipText: text "The FAST SHIP will" line "sail next Friday." done diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index b77cc011e..e09ec19ec 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -36,7 +36,7 @@ MeetMomScript: opentext writetext ElmsLookingForYouText buttonsound - getstring STRING_BUFFER_4, GearName + getstring STRING_BUFFER_4, PokegearName scall PlayersHouse1FReceiveItemStd setflag ENGINE_POKEGEAR setflag ENGINE_PHONE_CARD @@ -103,7 +103,7 @@ MeetMomTalkedScript: playmusic MUSIC_MOM sjump MeetMomScript -GearName: +PokegearName: db "#GEAR@" PlayersHouse1FReceiveItemStd: diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 7dc6f32ac..e06d4c633 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -106,7 +106,7 @@ LinkReceptionistScript_Trade: .FriendNotReady: special WaitForOtherPlayerToExit - writetext Text_FriendNotReady + writetext YourFriendIsNotReadyText closetext end @@ -208,7 +208,7 @@ LinkReceptionistScript_Battle: .FriendNotReady: special WaitForOtherPlayerToExit - writetext Text_FriendNotReady + writetext YourFriendIsNotReadyText closetext end @@ -341,7 +341,7 @@ LinkReceptionistScript_TimeCapsule: .FriendNotReady: special WaitForOtherPlayerToExit - writetext Text_FriendNotReady + writetext YourFriendIsNotReadyText closetext end @@ -853,7 +853,7 @@ Text_TimeCapsuleReceptionistIntro: line "trade across time?" done -Text_FriendNotReady: +YourFriendIsNotReadyText: text "Your friend is not" line "ready." prompt diff --git a/maps/Route36.asm b/maps/Route36.asm index 4604e8c5a..51d012074 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -179,7 +179,7 @@ TrainerSchoolboyAlan1: iftrue .NumberAccepted checkevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER iftrue .AskAgainForPhoneNumber - writetext UnknownText_0x1947aa + writetext SchoolboyAlanBooksText buttonsound setevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 @@ -489,7 +489,7 @@ RockSmashGuyText2: cont "have this." done -UnknownText_0x19451a: +UnusedReceivedTM08Text: text "<PLAYER> received" line "TM08." done @@ -509,7 +509,7 @@ RockSmashGuyText3: cont "smash 'em up!" done -UnknownText_0x1945b8: +UnusedOddTreeText: text "An odd tree is" line "blocking the way" cont "to GOLDENROD CITY." @@ -570,7 +570,7 @@ SchoolboyAlan1BeatenText: line "error?" done -UnknownText_0x1947aa: +SchoolboyAlanBooksText: text "Darn. I study five" line "hours a day too." diff --git a/maps/Route38.asm b/maps/Route38.asm index 427c12f0a..3a4305b59 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -49,7 +49,7 @@ TrainerLassDana1: iftrue .NumberAccepted checkevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER iftrue .SecondTimeAsking - writetext UnknownText_0x1a20ec + writetext LassDanaMoomooMilkText buttonsound setevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER scall .AskNumber1F @@ -185,7 +185,7 @@ TrainerSchoolboyChad1: iftrue .HaveChadsNumber checkevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER iftrue .SecondTimeAsking - writetext UnknownText_0x1a200e + writetext SchoolboyChadSoManyTestsText buttonsound setevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER scall .AskPhoneNumber1 @@ -350,7 +350,7 @@ SchoolboyChad1BeatenText: line "enough, I guess." done -UnknownText_0x1a200e: +SchoolboyChadSoManyTestsText: text "I have to take so" line "many tests, I" @@ -376,7 +376,7 @@ LassDana1BeatenText: line "battle that way." done -UnknownText_0x1a20ec: +LassDanaMoomooMilkText: text "I know something" line "good!" diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index f93036396..d63624b25 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -89,17 +89,17 @@ RuinsOfAlphKabutoChamberScientistScript: iftrue .WallOpen checkevent EVENT_SOLVED_KABUTO_PUZZLE iffalse .PuzzleIncomplete - writetext UnknownText_0x589b8 + writetext RuinsOfAlphKabutoChamberScientistTremorText buttonsound .PuzzleIncomplete: - writetext UnknownText_0x588f5 + writetext RuinsOfAlphKabutoChamberScientistCrypticText waitbutton closetext turnobject RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP end .WallOpen: - writetext UnknownText_0x5897c + writetext RuinsOfAlphKabutoChamberScientistHoleText waitbutton closetext end @@ -170,7 +170,7 @@ RuinsOfAlphKabutoChamberReceptionistText: line "patterns." done -UnknownText_0x588f5: +RuinsOfAlphKabutoChamberScientistCrypticText: text "Recently, strange," line "cryptic patterns" cont "have appeared." @@ -183,7 +183,7 @@ UnknownText_0x588f5: line "look at the walls." done -UnknownText_0x5897c: +RuinsOfAlphKabutoChamberScientistHoleText: text "Ah! Here's another" line "huge hole!" @@ -191,7 +191,7 @@ UnknownText_0x5897c: line "go through!" done -UnknownText_0x589b8: +RuinsOfAlphKabutoChamberScientistTremorText: text "That tremor was" line "pretty scary!" diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index e56a86945..45acce4af 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -10,17 +10,17 @@ Red: special FadeOutMusic faceplayer opentext - writetext .Text1 + writetext RedSeenText waitbutton closetext - winlosstext .Text2, .Text2 + winlosstext RedWinLossText, RedWinLossText loadtrainer RED, RED1 startbattle dontrestartmapmusic reloadmapafterbattle special FadeOutMusic opentext - writetext .Text3 + writetext RedLeavesText waitbutton closetext special FadeBlackQuickly @@ -34,16 +34,16 @@ Red: credits end -.Text1: +RedSeenText: text "<……>" line "<……>" done -.Text2: +RedWinLossText: text "…" done -.Text3: +RedLeavesText: text "<……>" line "<……>" done diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 64ea130af..417b10da4 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -58,7 +58,7 @@ RocketBaseBossFScript: appear TEAMROCKETBASEB2F_ROCKET_GIRL appear TEAMROCKETBASEB2F_ROCKET1 opentext - writetext UnknownText_0x6d2ad + writetext RocketBaseExecutiveFHoldItText waitbutton closetext turnobject PLAYER, DOWN @@ -69,7 +69,7 @@ RocketBaseBossFScript: turnobject PLAYER, UP applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f opentext - writetext UnknownText_0x6d2c3 + writetext RocketBaseBossFThrashText waitbutton closetext cry DRAGONITE @@ -82,18 +82,18 @@ RocketBaseBossFScript: appear TEAMROCKETBASEB2F_LANCE applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d244 opentext - writetext UnknownText_0x6d38c + writetext RocketBaseLanceShareFunText waitbutton closetext turnobject PLAYER, RIGHT applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d241 opentext - writetext UnknownText_0x6d3bd + writetext RocketBaseBossDontMeddleText waitbutton closetext applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d24a applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d248 - winlosstext UnknownText_0x6d45c, 0 + winlosstext RocketBaseBossWinText, 0 setlasttalked TEAMROCKETBASEB2F_ROCKET_GIRL loadtrainer EXECUTIVEF, EXECUTIVEF_2 startbattle @@ -104,7 +104,7 @@ RocketBaseBossFScript: reloadmapafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEF_2 opentext - writetext UnknownText_0x6d4c6 + writetext RocketBaseBossRetreatText waitbutton closetext special FadeBlackQuickly @@ -120,13 +120,13 @@ RocketBaseBossFScript: clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE turnobject TEAMROCKETBASEB2F_LANCE, DOWN opentext - writetext UnknownText_0x6d5d8 + writetext RocketBaseLancePostBattleText waitbutton closetext applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d250 turnobject PLAYER, UP opentext - writetext UnknownText_0x6d64e + writetext RocketBaseLancePowerOffText waitbutton closetext follow TEAMROCKETBASEB2F_LANCE, PLAYER @@ -134,7 +134,7 @@ RocketBaseBossFScript: stopfollow applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d258 opentext - writetext UnknownText_0x6d6cf + writetext RockerBaseLanceElectrodeFaintText waitbutton closetext applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d267 @@ -146,7 +146,7 @@ RocketBaseCantLeaveScript: RocketBaseLancesSideScript: opentext - writetext UnknownText_0x6d7ea + writetext RocketBaseLancesSideText waitbutton closetext applymovement PLAYER, MovementData_0x6d278 @@ -283,16 +283,16 @@ RocketBaseElectrodeScript: applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a turnobject PLAYER, RIGHT opentext - writetext UnknownText_0x6d809 + writetext RocketBaseLanceElectrodeDoneText buttonsound verbosegiveitem HM_WHIRLPOOL setevent EVENT_GOT_HM06_WHIRLPOOL - writetext UnknownText_0x6d8f8 + writetext RocketBaseLanceWhirlpoolText waitbutton closetext turnobject TEAMROCKETBASEB2F_LANCE, DOWN opentext - writetext UnknownText_0x6d994 + writetext RocketBaseLanceMonMasterText waitbutton closetext turnobject PLAYER, DOWN @@ -319,13 +319,13 @@ TeamRocketBaseB2FLockedDoor: opentext checkevent EVENT_LEARNED_HAIL_GIOVANNI iftrue .KnowsPassword - writetext UnknownText_0x6dd39 + writetext RocketBaseDoorNoPasswordText waitbutton closetext end .KnowsPassword: - writetext UnknownText_0x6dd6b + writetext RocketBaseDoorKnowPasswordText waitbutton playsound SFX_ENTER_DOOR changeblock 14, 12, $07 ; floor @@ -339,13 +339,13 @@ TeamRocketBaseB2FTransmitterScript: opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .Deactivated - writetext UnknownText_0x6dda7 + writetext RocketBaseB2FTransmitterText waitbutton closetext end .Deactivated: - writetext UnknownText_0x6de03 + writetext RocketBaseB2FDeactivateTransmitterText waitbutton closetext end @@ -557,12 +557,12 @@ MovementData_0x6d2a4: step RIGHT step_end -UnknownText_0x6d2ad: +RocketBaseExecutiveFHoldItText: text "Hold it right" line "there!" done -UnknownText_0x6d2c3: +RocketBaseBossFThrashText: text "We can't have a" line "brat like you on" cont "the loose." @@ -582,13 +582,13 @@ UnknownText_0x6d2c3: cont "thrashed." done -UnknownText_0x6d38c: +RocketBaseLanceShareFunText: text "Hey! Don't be so" line "selfish. Spread" cont "the fun around." done -UnknownText_0x6d3bd: +RocketBaseBossDontMeddleText: text "What? You had an" line "accomplice?" @@ -605,7 +605,7 @@ UnknownText_0x6d3bd: line "with TEAM ROCKET!" done -UnknownText_0x6d45c: +RocketBaseBossWinText: text "Tch, you really" line "are strong." @@ -618,7 +618,7 @@ UnknownText_0x6d45c: line "an EXECUTIVE." done -UnknownText_0x6d4c6: +RocketBaseBossRetreatText: text "…This hideout is" line "done for…" @@ -646,7 +646,7 @@ UnknownText_0x6d4c6: para "Fufufufu…" done -UnknownText_0x6d5d8: +RocketBaseLancePostBattleText: text "LANCE: That did" line "it. We defeated" @@ -660,7 +660,7 @@ UnknownText_0x6d5d8: line "the process…" done -UnknownText_0x6d64e: +RocketBaseLancePowerOffText: text "Sorry, <PLAY_G>." line "I saw how well you" @@ -674,7 +674,7 @@ UnknownText_0x6d64e: line "radio signal." done -UnknownText_0x6d6cf: +RockerBaseLanceElectrodeFaintText: text "It's this machine" line "that's causing all" cont "the problems." @@ -704,12 +704,12 @@ UnknownText_0x6d6cf: line "split the job." done -UnknownText_0x6d7ea: +RocketBaseLancesSideText: text "LANCE: Leave this" line "side to me." done -UnknownText_0x6d809: +RocketBaseLanceElectrodeDoneText: text "LANCE: That odd" line "signal has finally" cont "stopped." @@ -731,12 +731,13 @@ UnknownText_0x6d809: cont "any need for it." done +; unused UnknownText_0x6d8e6: text "<PLAYER> received" line "HM06." done -UnknownText_0x6d8f8: +RocketBaseLanceWhirlpoolText: text "That's WHIRLPOOL." line "Teach it to a" @@ -753,7 +754,7 @@ UnknownText_0x6d8f8: line "from MAHOGANY GYM." done -UnknownText_0x6d994: +RocketBaseLanceMonMasterText: text "<PLAY_G>…" para "The journey to be-" @@ -871,14 +872,14 @@ GruntM19AfterBattleText: cont "for yourself." done -UnknownText_0x6dd39: +RocketBaseDoorNoPasswordText: text "The door's closed…" para "It needs a pass-" line "word to open." done -UnknownText_0x6dd6b: +RocketBaseDoorKnowPasswordText: text "The door's closed…" para "<PLAYER> entered" @@ -887,7 +888,7 @@ UnknownText_0x6dd6b: para "The door opened!" done -UnknownText_0x6dda7: +RocketBaseB2FTransmitterText: text "It's the radio" line "transmitter that's" @@ -898,7 +899,7 @@ UnknownText_0x6dda7: line "full capacity." done -UnknownText_0x6de03: +RocketBaseB2FDeactivateTransmitterText: text "The radio trans-" line "mitter has finally" diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index d6d5fa6de..5834d796c 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -42,13 +42,13 @@ VermilionSnorlax: opentext special SnorlaxAwake iftrue .Awake - writetext UnknownText_0x1aab64 + writetext VermilionCitySnorlaxSleepingText waitbutton closetext end .Awake: - writetext UnknownText_0x1aab84 + writetext VermilionCityRadioNearSnorlaxText pause 15 cry SNORLAX closetext @@ -69,31 +69,31 @@ VermilionGymBadgeGuy: ifequal NUM_BADGES, .AllBadges ifgreater 13, .MostBadges ifgreater 9, .SomeBadges - writetext UnknownText_0x1aabc8 + writetext VermilionCityBadgeGuyTrainerText waitbutton closetext end .SomeBadges: - writetext UnknownText_0x1aac2b + writetext VermilionCityBadgeGuySomeBadgesText waitbutton closetext end .MostBadges: - writetext UnknownText_0x1aac88 + writetext VermilionCityBadgeGuyMostBadgesText waitbutton closetext end .AllBadges: - writetext UnknownText_0x1aacf3 + writetext VermilionCityBadgeGuyAllBadgesText buttonsound verbosegiveitem HP_UP iffalse .Done setevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY .AlreadyGotItem: - writetext UnknownText_0x1aad4a + writetext VermilionCityBadgeGuyBattleEdgeText waitbutton .Done: closetext @@ -163,12 +163,12 @@ VermilionCitySuperNerdText: cont "#MON GYM." done -UnknownText_0x1aab64: +VermilionCitySnorlaxSleepingText: text "SNORLAX is snoring" line "peacefully…" done -UnknownText_0x1aab84: +VermilionCityRadioNearSnorlaxText: text "The #GEAR was" line "placed near the" cont "sleeping SNORLAX…" @@ -178,7 +178,7 @@ UnknownText_0x1aab84: para "SNORLAX woke up!" done -UnknownText_0x1aabc8: +VermilionCityBadgeGuyTrainerText: text "Skilled trainers" line "gather in KANTO." @@ -189,7 +189,7 @@ UnknownText_0x1aabc8: line "to defeat." done -UnknownText_0x1aac2b: +VermilionCityBadgeGuySomeBadgesText: text "You've started to" line "collect KANTO GYM" cont "BADGES?" @@ -199,7 +199,7 @@ UnknownText_0x1aac2b: cont "here are tough?" done -UnknownText_0x1aac88: +VermilionCityBadgeGuyMostBadgesText: text "I guess you'll be" line "finished with your" @@ -211,7 +211,7 @@ UnknownText_0x1aac88: cont "BADGES." done -UnknownText_0x1aacf3: +VermilionCityBadgeGuyAllBadgesText: text "Congratulations!" para "You got all the" @@ -221,7 +221,7 @@ UnknownText_0x1aacf3: line "for your efforts." done -UnknownText_0x1aad4a: +VermilionCityBadgeGuyBattleEdgeText: text "Having a variety" line "of #MON types" diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index bba156b39..66ea6bb25 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -40,7 +40,7 @@ VermilionPortSailorAtGangwayScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue VermilionPortAlreadyRodeScript - writetext UnknownText_0x74f06 + writetext VermilionPortDepartingText waitbutton closetext turnobject VERMILIONPORT_SAILOR1, DOWN @@ -71,7 +71,7 @@ VermilionPortSailorAtGangwayScript: end VermilionPortAlreadyRodeScript: - writetext UnknownText_0x74f31 + writetext VermilionPortCantBoardText waitbutton closetext end @@ -90,10 +90,10 @@ VermilionPortWalkUpToShipScript: ifequal THURSDAY, .NextShipSunday ifequal FRIDAY, .NextShipSunday ifequal SATURDAY, .NextShipSunday - writetext UnknownText_0x74f4d + writetext VermilionPortAskBoardingText yesorno iffalse VermilionPortNotRidingMoveAwayScript - writetext UnknownText_0x74f8b + writetext VermilionPortAskTicketText buttonsound checkitem S_S_TICKET iffalse .NoTicket @@ -105,21 +105,21 @@ VermilionPortWalkUpToShipScript: sjump VermilionPortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74ff2 + writetext VermilionPortNoTicketText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 end .NextShipWednesday: - writetext UnknownText_0x75059 + writetext VermilionPortSailMondayText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 end .NextShipSunday: - writetext UnknownText_0x75080 + writetext VermilionPortSailSundayText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 @@ -129,13 +129,13 @@ VermilionPortWalkUpToShipScript: end VermilionPortNotRidingScript: - writetext UnknownText_0x74fa7 + writetext VermilionPortComeAgainText waitbutton closetext end VermilionPortNotRidingMoveAwayScript: - writetext UnknownText_0x74fa7 + writetext VermilionPortComeAgainText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 @@ -152,10 +152,10 @@ VermilionPortSailorScript: ifequal THURSDAY, .NextShipSunday ifequal FRIDAY, .NextShipSunday ifequal SATURDAY, .NextShipSunday - writetext UnknownText_0x74f4d + writetext VermilionPortAskBoardingText yesorno iffalse VermilionPortNotRidingScript - writetext UnknownText_0x74f8b + writetext VermilionPortAskTicketText buttonsound checkitem S_S_TICKET iffalse .NoTicket @@ -167,19 +167,19 @@ VermilionPortSailorScript: sjump VermilionPortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74ff2 + writetext VermilionPortNoTicketText waitbutton closetext end .NextShipWednesday: - writetext UnknownText_0x75059 + writetext VermilionPortSailMondayText waitbutton closetext end .NextShipSunday: - writetext UnknownText_0x75080 + writetext VermilionPortSailSundayText waitbutton closetext end @@ -187,7 +187,7 @@ VermilionPortSailorScript: VermilionPortSuperNerdScript: faceplayer opentext - writetext UnknownText_0x750a6 + writetext VermilionPortSuperNerdText waitbutton closetext end @@ -226,18 +226,18 @@ MovementData_0x74efe: step DOWN step_end -UnknownText_0x74f06: +VermilionPortDepartingText: text "We're departing" line "soon. Please get" cont "on board." done -UnknownText_0x74f31: +VermilionPortCantBoardText: text "Sorry. You can't" line "board now." done -UnknownText_0x74f4d: +VermilionPortAskBoardingText: text "Welcome to FAST" line "SHIP S.S.AQUA." @@ -245,12 +245,12 @@ UnknownText_0x74f4d: line "ing today?" done -UnknownText_0x74f8b: +VermilionPortAskTicketText: text "May I see your" line "S.S.TICKET?" done -UnknownText_0x74fa7: +VermilionPortComeAgainText: text "We hope to see you" line "again!" done @@ -263,7 +263,7 @@ VermilionPortSSTicketText: line "Thank you!" done -UnknownText_0x74ff2: +VermilionPortNoTicketText: text "<PLAYER> tried to" line "show the S.S." cont "TICKET…" @@ -277,17 +277,17 @@ UnknownText_0x74ff2: line "S.S.TICKET." done -UnknownText_0x75059: +VermilionPortSailMondayText: text "The FAST SHIP will" line "sail on Wednesday." done -UnknownText_0x75080: +VermilionPortSailSundayText: text "The FAST SHIP will" line "sail next Sunday." done -UnknownText_0x750a6: +VermilionPortSuperNerdText: text "You came from" line "JOHTO?" diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 2124cf27b..67d7d17ec 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -18,7 +18,7 @@ VioletPokecenter1F_ElmsAideScript: opentext checkevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE iftrue .SecondTimeAsking - writetext UnknownText_0x69555 + writetext VioletPokecenterElmsAideFavorText .AskTakeEgg: yesorno iffalse .RefusedEgg @@ -31,7 +31,7 @@ VioletPokecenter1F_ElmsAideScript: clearevent EVENT_ELMS_AIDE_IN_LAB clearevent EVENT_TOGEPI_HATCHED setmapscene ROUTE_32, SCENE_ROUTE32_OFFER_SLOWPOKETAIL - writetext UnknownText_0x695c5 + writetext VioletPokecenterElmsAideGiveEggText waitbutton closetext readvar VAR_FACING @@ -60,20 +60,20 @@ VioletPokecenter1F_ElmsAideScript: end .PartyFull: - writetext UnknownText_0x69693 + writetext VioletCityElmsAideFullPartyText waitbutton closetext end .RefusedEgg: - writetext UnknownText_0x696f2 + writetext VioletPokecenterElmsAideRefuseText waitbutton closetext setevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE end .SecondTimeAsking: - writetext UnknownText_0x69712 + writetext VioletPokecenterElmsAideAskEggText sjump .AskTakeEgg VioletPokecenter1FGameboyKidScript: @@ -103,7 +103,7 @@ MovementData_AideFinishesLeavingPokecenter: step DOWN step_end -UnknownText_0x69555: +VioletPokecenterElmsAideFavorText: text "<PLAY_G>, long" line "time, no see." @@ -117,7 +117,7 @@ UnknownText_0x69555: line "#MON EGG?" done -UnknownText_0x695c5: +VioletPokecenterElmsAideGiveEggText: text "We discovered that" line "a #MON will not" @@ -137,7 +137,7 @@ UnknownText_0x695c5: cont "hatches!" done -UnknownText_0x69693: +VioletCityElmsAideFullPartyText: text "Oh, no. You can't" line "carry any more" cont "#MON with you." @@ -147,17 +147,18 @@ UnknownText_0x69693: cont "room for the EGG." done -UnknownText_0x696f2: +VioletPokecenterElmsAideRefuseText: text "B-but… PROF.ELM" line "asked for you…" done -UnknownText_0x69712: +VioletPokecenterElmsAideAskEggText: text "<PLAY_G>, will you" line "take the EGG?" done -UnknownText_0x6972d: +; unused +VioletPokecenterFarawayLinkText: text "I've been thinking" line "it'd be great to" @@ -168,7 +169,8 @@ UnknownText_0x6972d: line "far away." done -UnknownText_0x69791: +; unused +VioletPokecenterMobileAdapterText: text "I just battled a" line "friend in CIANWOOD" cont "over a link." diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index 7c3adbbcb..3cc79a536 100644 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -235,13 +235,12 @@ Function4a94e: .asm_4a9b0 ld de, SFX_WRONG call PlaySFX - ld hl, UnknownText_0x4a9be + ld hl, MobilePickThreeMonForBattle call PrintText jr .asm_4a974 -UnknownText_0x4a9be: - ; Pick three #MON for battle. - text_far UnknownText_0x1c51d7 +MobilePickThreeMonForBattle: + text_far _MobilePickThreeMonForBattle text_end Function4a9c3: @@ -287,14 +286,13 @@ Function4a9d7: ld de, wd012 ld bc, 6 call CopyBytes - ld hl, UnknownText_0x4aa1d + ld hl, MobileUseTheseThreeMonText call PrintText call YesNoBox ret -UnknownText_0x4aa1d: - ; , @ and @ . Use these three? - text_far UnknownText_0x1c51f4 +MobileUseTheseThreeMonText: + text_far _MobileUseTheseThreeMonText text_end Function4aa22: @@ -772,7 +770,7 @@ Function4ad17: jr z, .asm_4ad39 ld de, SFX_WRONG call WaitPlaySFX - ld hl, UnknownText_0x4ad51 + ld hl, MobileOnlyThreeMonMayEnterText call PrintText ret @@ -792,9 +790,8 @@ Function4ad17: call Function4adc2 ret -UnknownText_0x4ad51: - ; Only three #MON may enter. - text_far UnknownText_0x1c521c +MobileOnlyThreeMonMayEnterText: + text_far _MobileOnlyThreeMonMayEnterText text_end Function4ad56: diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 3920e44c9..45886f47c 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -2482,7 +2482,7 @@ Function89fce: jp Function89e36 Function89fed: - ld hl, UnknownText_0x8a102 + ld hl, MobileCardFolderIntro1Text call PrintText jp Function89e36 @@ -2513,14 +2513,14 @@ Function89ff6: jp Function89e36 Function8a03d: - ld hl, UnknownText_0x8a107 + ld hl, MobileCardFolderIntro2Text call Function89209 call PrintText call Function8920f jp Function89e36 Function8a04c: - ld hl, UnknownText_0x8a10c + ld hl, MobileCardFolderIntro3Text call PrintText jp Function89e36 @@ -2621,7 +2621,7 @@ Function8a0e6: jp Function89e36 Function8a0ec: - ld hl, UnknownText_0x8a111 + ld hl, MobileCardFolderIntro4Text call PrintText jp Function89e36 @@ -2634,24 +2634,20 @@ Function8a0f5: Function8a0ff: jp Function89e36 -UnknownText_0x8a102: - ; The CARD FOLDER stores your and your friends' CARDS. A CARD contains information like the person's name, phone number and profile. - text_far UnknownText_0x1c5238 +MobileCardFolderIntro1Text: + text_far _MobileCardFolderIntro1Text text_end -UnknownText_0x8a107: - ; This is your CARD. Once you've entered your phone number, you can trade CARDS with your friends. - text_far UnknownText_0x1c52bc +MobileCardFolderIntro2Text: + text_far _MobileCardFolderIntro2Text text_end -UnknownText_0x8a10c: - ; If you have your friend's CARD, you can use it to make a call from a mobile phone on the 2nd floor of a #MON CENTER. - text_far UnknownText_0x1c531e +MobileCardFolderIntro3Text: + text_far _MobileCardFolderIntro3Text text_end -UnknownText_0x8a111: - ; To safely store your collection of CARDS, you must set a PASSCODE for your CARD FOLDER. - text_far UnknownText_0x1c5394 +MobileCardFolderIntro4Text: + text_far _MobileCardFolderIntro4Text text_end Function8a116: @@ -2760,37 +2756,34 @@ Strings_8a1cc: db "@" Function8a20d: - ld hl, UnknownText_0x8a232 + ld hl, MobileCardFolderAskDeleteText call PrintText ld a, $2 call Function89259 ret c - ld hl, UnknownText_0x8a237 + ld hl, MobileCardFolderDeleteAreYouSureText call PrintText ld a, $2 call Function89259 ret c xor a call Function8a2fe - ld hl, UnknownText_0x8a23c + ld hl, MobileCardFolderDeletedText call PrintText xor a and a ret -UnknownText_0x8a232: - ; If the CARD FOLDER is deleted, all its CARDS and the PASSCODE will also be deleted. Beware--a deleted CARD FOLDER can't be restored. Want to delete your CARD FOLDER? - text_far UnknownText_0x1c53ee +MobileCardFolderAskDeleteText: + text_far _MobileCardFolderAskDeleteText text_end -UnknownText_0x8a237: - ; Are you sure you want to delete it? - text_far UnknownText_0x1c5494 +MobileCardFolderDeleteAreYouSureText: + text_far _MobileCardFolderDeleteAreYouSureText text_end -UnknownText_0x8a23c: - ; The CARD FOLDER has been deleted. - text_far UnknownText_0x1c54b9 +MobileCardFolderDeletedText: + text_far _MobileCardFolderDeletedText text_end Function8a241: @@ -2839,12 +2832,12 @@ Function8a262: Function8a2aa: ld hl, MenuHeader_0x8a2ef call LoadMenuHeader - ld hl, UnknownText_0x8a2f4 + ld hl, MobileCardFolderAskOpenOldText call PrintText ld a, $1 call Function89259 jr nc, .asm_8a2cf - ld hl, UnknownText_0x8a2f9 + ld hl, MobileCardFolderAskDeleteOldText call PrintText ld a, $2 call Function89259 @@ -2873,14 +2866,12 @@ MenuHeader_0x8a2ef: db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 -UnknownText_0x8a2f4: - ; There is an older CARD FOLDER from a previous journey. Do you want to open it? - text_far UnknownText_0x1c54dd +MobileCardFolderAskOpenOldText: + text_far _MobileCardFolderAskOpenOldText text_end -UnknownText_0x8a2f9: - ; Delete the old CARD FOLDER? - text_far UnknownText_0x1c552d +MobileCardFolderAskDeleteOldText: + text_far _MobileCardFolderAskDeleteOldText text_end Function8a2fe: @@ -4140,7 +4131,7 @@ Function8ac7c: ret .asm_8acf0 - ld hl, UnknownText_0x8ad06 + ld hl, MobileCardFolderFinishRegisteringCardsText call PrintText ld a, $2 call Function89259 @@ -4151,9 +4142,8 @@ Function8ac7c: scf ret -UnknownText_0x8ad06: - ; Finish registering CARDS? - text_far UnknownText_0x1c554a +MobileCardFolderFinishRegisteringCardsText: + text_far _MobileCardFolderFinishRegisteringCardsText text_end Function8ad0b: diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 0e5b56099..b0fbe5918 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -406,7 +406,7 @@ Function8b539: Function8b555: .loop - ld hl, UnknownText_0x8b5ce + ld hl, EnterNewPasscodeText call PrintText ld bc, wd017 call Function8b45c @@ -417,12 +417,12 @@ Function8b555: ld bc, wd017 call Function8b664 jr nz, .asm_8b57c - ld hl, UnknownText_0x8b5e2 + ld hl, FourZerosInvalidText call PrintText jr .loop .asm_8b57c - ld hl, UnknownText_0x8b5d3 + ld hl, ConfirmPasscodeText call PrintText ld bc, wd013 call Function8b45c @@ -434,7 +434,7 @@ Function8b555: call Function89448 ld bc, wd013 call Function8b493 - ld hl, UnknownText_0x8b5d8 + ld hl, PasscodesNotSameText call PrintText jr .asm_8b57c @@ -448,7 +448,7 @@ Function8b555: call Function89448 ld bc, wd013 call Function8b493 - ld hl, UnknownText_0x8b5dd + ld hl, PasscodeSetText call PrintText and a .asm_8b5c8 @@ -457,28 +457,23 @@ Function8b555: pop af ret -UnknownText_0x8b5ce: - ; Please enter any four-digit number. +EnterNewPasscodeText: text_far _EnterNewPasscodeText text_end -UnknownText_0x8b5d3: - ; Enter the same number to confirm. +ConfirmPasscodeText: text_far _ConfirmPasscodeText text_end -UnknownText_0x8b5d8: - ; That's not the same number. +PasscodesNotSameText: text_far _PasscodesNotSameText text_end -UnknownText_0x8b5dd: - ; Your PASSCODE has been set. Enter this number next time to open the CARD FOLDER. +PasscodeSetText: text_far _PasscodeSetText text_end -UnknownText_0x8b5e2: - ; 0000 is invalid! +FourZerosInvalidText: text_far _FourZerosInvalidText text_end @@ -494,7 +489,7 @@ Function8b5e7: ld e, $0 call Function89c44 .asm_8b602 - ld hl, UnknownText_0x8b642 + ld hl, EnterPasscodeText call PrintText ld bc, wd013 call Function8b45c @@ -507,7 +502,7 @@ Function8b5e7: call Function8b3a4 call CloseSRAM jr z, .asm_8b635 - ld hl, UnknownText_0x8b647 + ld hl, IncorrectPasscodeText call PrintText ld bc, wd013 call Function8b36c @@ -522,13 +517,11 @@ Function8b5e7: pop af ret -UnknownText_0x8b642: - ; Enter the CARD FOLDER PASSCODE. +EnterPasscodeText: text_far _EnterPasscodeText text_end -UnknownText_0x8b647: - ; Incorrect PASSCODE! +IncorrectPasscodeText: text_far _IncorrectPasscodeText text_end diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 3eaa12436..ab79a84b9 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -1539,52 +1539,52 @@ Function108be0: Function108bec: ld a, $90 ldh [hWY], a - ld hl, .PlayerWillTradeMon + ld hl, .MobilePlayerWillTradeMonText call PrintText ld c, 80 call DelayFrames - ld hl, .ForPartnersMon + ld hl, .MobileForPartnersMonText call PrintText ld c, 80 call DelayFrames ret -.PlayerWillTradeMon: - text_far _TradingText10 +.MobilePlayerWillTradeMonText: + text_far _MobilePlayerWillTradeMonText text_end -.ForPartnersMon: - text_far _TradingText11 +.MobileForPartnersMonText: + text_far _MobileForPartnersMonText text_end -.UnusedTextPlayersMonTrade: - text_far _TradingText12 +.MobilePlayersMonTradeText: + text_far _MobilePlayersMonTradeText text_end Function108c16: ld a, $90 ldh [hWY], a - ld hl, .TakeGoodCareOfMon + ld hl, .MobileTakeGoodCareOfMonText call PrintText ld c, 80 call DelayFrames ret -.TakeGoodCareOfMon: - text_far _TradingText13 +.MobileTakeGoodCareOfMonText: + text_far _MobileTakeGoodCareOfMonText text_end Function108c2b: ld a, $90 ldh [hWY], a - ld hl, .PlayersMonTrade + ld hl, .MobilePlayersMonTrade2Text call PrintText ld c, 80 call DelayFrames ret -.PlayersMonTrade: - text_far _TradingText14 +.MobilePlayersMonTrade2Text: + text_far _MobilePlayersMonTrade2Text text_end Function108c40: @@ -1593,25 +1593,25 @@ Function108c40: ld a, [wcf65] and %10000000 jr z, .Getmon - ld hl, .CameBack + ld hl, .MobileTradeCameBackText call PrintText ld c, 80 call DelayFrames ret .Getmon: - ld hl, .TakeGoodCareOf + ld hl, .MobileTakeGoodCareOfText call PrintText ld c, 80 call DelayFrames ret -.TakeGoodCareOf: - text_far _TradingText15 +.MobileTakeGoodCareOfText: + text_far _MobileTakeGoodCareOfText text_end -.CameBack: - text_far _TradingText16 +.MobileTradeCameBackText: + text_far _MobileTradeCameBackText text_end Function108c6d: diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index ea54ff85c..86c18341a 100644 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -413,7 +413,7 @@ Function4a28a: .DeleteLoginPassword: call PlaceHollowCursor - ld hl, UnknownText_0x4a358 + ld hl, DeleteSavedLoginPasswordText call PrintText hlcoord 14, 7 ld b, 3 @@ -435,7 +435,7 @@ Function4a28a: ld bc, MOBILE_LOGIN_PASSWORD_LENGTH call ByteFill call CloseSRAM - ld hl, UnknownText_0x4a35d + ld hl, DeletedTheLoginPasswordText call PrintText call JoyWaitAorB .dont_delete_password @@ -455,14 +455,12 @@ String_4a34b: next "けす" next "もどる@" -UnknownText_0x4a358: - ; Delete the saved LOG-IN PASSWORD? - text_far UnknownText_0x1c5196 +DeleteSavedLoginPasswordText: + text_far _DeleteSavedLoginPasswordText text_end -UnknownText_0x4a35d: - ; Deleted the LOG-IN PASSWORD. - text_far UnknownText_0x1c51b9 +DeletedTheLoginPasswordText: + text_far _DeletedTheLoginPasswordText text_end DeletePassword_YesNo_MenuHeader: |