Skip to content

Commit

Permalink
#641 fixes and additions. (#646)
Browse files Browse the repository at this point in the history
Name a lot of text labels according to our conventions
  • Loading branch information
mid-kid authored and Rangi42 committed Oct 20, 2019
1 parent 3fc2ba4 commit e3e0bcd
Show file tree
Hide file tree
Showing 203 changed files with 4,081 additions and 4,602 deletions.
240 changes: 120 additions & 120 deletions data/battle_tower/trainer_text.asm

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions data/phone/text/alan_callee.asm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
UnknownText_0x1b659d:
AlanAnswerPhoneText:
text "Yup, it's @"
text_ram wStringBuffer3
text "!"
Expand All @@ -7,15 +7,15 @@ UnknownText_0x1b659d:
line "Good morning!"
done

UnknownText_0x1b65c7:
AlanAnswerPhoneDayText:
text "Yup, it's @"
text_ram wStringBuffer3
text "!"

para "Is that <PLAY_G>?"
done

UnknownText_0x1b65e3:
AlanAnswerPhoneNiteText:
text "Yup, it's @"
text_ram wStringBuffer3
text "!"
Expand All @@ -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?"
Expand Down
16 changes: 8 additions & 8 deletions data/phone/text/alan_caller.asm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ AlanGettingStrongerText:
line "calculated!"
done

UnknownText_0x64cf3:
AlanDefeatedMonText:
text "By the way, we"
line "knocked out a wild"

Expand All @@ -21,7 +21,7 @@ UnknownText_0x64cf3:
line "advance worked!"
done

UnknownText_0x64d4f:
AlanLostAMonText:
text "By the way, a wild"
line "@"
text_ram wStringBuffer4
Expand All @@ -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,"

Expand All @@ -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!"

Expand All @@ -65,15 +65,15 @@ UnknownText_0x64e2f:
line "and pick it up?"
done

UnknownText_0x64e90:
AlanHaventPickedUpAnythingText:
text "I haven't picked"
line "up anything yet."

para "I'll call you if I"
line "find something."
done

UnknownText_0x64ed4:
AlanReminderText:
text "If we don't battle"
line "soon, I'll forget"
cont "my strategy!"
Expand All @@ -84,7 +84,7 @@ UnknownText_0x64ed4:
text "!"
done

UnknownText_0x64f1a:
AlanComePickUpGiftText:
text "I have to do my"
line "homework, so can"

Expand Down
14 changes: 7 additions & 7 deletions data/phone/text/anthony_callee.asm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
UnknownText_0x1b5f7a:
AnthonyAnswerPhoneText:
text "Yeah, @"
text_ram wStringBuffer3
text " the"
Expand All @@ -7,7 +7,7 @@ UnknownText_0x1b5f7a:
para "Ah, <PLAYER>!"
done

UnknownText_0x1b5f9e:
AnthonyAnswerPhoneDayText:
text "Yeah, @"
text_ram wStringBuffer3
text " the"
Expand All @@ -17,7 +17,7 @@ UnknownText_0x1b5f9e:
line "right?"
done

UnknownText_0x1b5fc9:
AnthonyAnswerPhoneNiteText:
text "Yeah, @"
text_ram wStringBuffer3
text " the"
Expand All @@ -27,7 +27,7 @@ UnknownText_0x1b5fc9:
line "it?"
done

UnknownText_0x1b5ff6:
AnthonyGreetText:
text "Yo, <PLAYER>?"

para "This is @"
Expand All @@ -36,7 +36,7 @@ UnknownText_0x1b5ff6:
line "the HIKER!"
done

UnknownText_0x1b6017:
AnthonyGreetDayText:
text "Hey, is this"
line "<PLAYER>?"

Expand All @@ -46,7 +46,7 @@ UnknownText_0x1b6017:
line "the HIKER!"
done

UnknownText_0x1b6041:
AnthonyGreetNiteText:
text "<PLAYER>, you still"
line "awake?"

Expand All @@ -56,7 +56,7 @@ UnknownText_0x1b6041:
line "the HIKER!"
done

UnknownText_0x1b606f:
AnthonyGenericText:
text "Are your #MON"
line "as feisty as ever?"

Expand Down
18 changes: 9 additions & 9 deletions data/phone/text/anthony_caller.asm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AnthonyAteBerriesText:
AnthonyMonAteSomeBerriesText:
text "The other day, I"
line "was watching my"

Expand All @@ -20,7 +20,7 @@ AnthonyAteBerriesText:
line "was delicious!"
done

UnknownText_0x176aef:
AnthonyDefeatedMonText:
text "Lately, I've been"
line "running across"

Expand All @@ -33,7 +33,7 @@ UnknownText_0x176aef:
line "taken care of."
done

UnknownText_0x176b45:
AnthonyLostAMonText:
text "Oh yeah, I was"
line "battling this"

Expand All @@ -53,7 +53,7 @@ UnknownText_0x176b45:
line "the job at hand!"
done

UnknownText_0x176bee:
AnthonyBattleRematchText:
text "Come on--let's"
line "battle right now!"

Expand All @@ -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!"

Expand Down Expand Up @@ -99,7 +99,7 @@ UnknownText_0x176c61:
line "strong #MON."
done

UnknownText_0x176d32:
AnthonyWasntPayingAttentionText:
text "Rare #MON?"

para "Hey, sorry! I was"
Expand All @@ -109,7 +109,7 @@ UnknownText_0x176d32:
line "paying attention."
done

UnknownText_0x176d85:
AnthonyReminderText:
text "Hello! You haven't"
line "forgotten about"

Expand All @@ -122,7 +122,7 @@ UnknownText_0x176d85:
line "I'm waiting!"
done

UnknownText_0x176dd1:
AnthonyHurryText:
text "Hello? What? Where"
line "is DUNSPARCE?"

Expand Down
14 changes: 7 additions & 7 deletions data/phone/text/arnie_callee.asm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
UnknownText_0x1b6454:
ArnieAnswerPhoneText:
text "Yeah, hello."
line "This is @"
text_ram wStringBuffer3
Expand All @@ -7,7 +7,7 @@ UnknownText_0x1b6454:
para "…Huh, <PLAY_G>? Yo!"
done

UnknownText_0x1b647e:
ArnieAnswerPhoneDayText:
text "Yeah, hello, you"
line "got @"
text_ram wStringBuffer3
Expand All @@ -16,7 +16,7 @@ UnknownText_0x1b647e:
para "…Huh, <PLAY_G>? Yo!"
done

UnknownText_0x1b64a8:
ArnieAnswerPhoneNiteText:
text "Yeah, hello, you"
line "got @"
text_ram wStringBuffer3
Expand All @@ -25,7 +25,7 @@ UnknownText_0x1b64a8:
para "…Huh, <PLAY_G>? Yo!"
done

UnknownText_0x1b64d2:
ArnieGreetText:
text "Yeah, hello?"
line "@"
text_ram wStringBuffer3
Expand All @@ -35,7 +35,7 @@ UnknownText_0x1b64d2:
line "to, <PLAY_G>?"
done

UnknownText_0x1b6506:
ArnieGreetDayText:
text "Yeah, hello?"
line "@"
text_ram wStringBuffer3
Expand All @@ -45,7 +45,7 @@ UnknownText_0x1b6506:
line "<PLAY_G>?"
done

UnknownText_0x1b6539:
ArnieGreetNiteText:
text "Yeah, hello?"
line "@"
text_ram wStringBuffer3
Expand All @@ -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."
Expand Down
18 changes: 9 additions & 9 deletions data/phone/text/arnie_caller.asm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ArnieLovesTheCuteText:
ArnieMonIsSoCuteText:
text "I'm always with my"
line "@"
text_ram wStringBuffer4
Expand All @@ -8,7 +8,7 @@ ArnieLovesTheCuteText:
line "I just love it!"
done

UnknownText_0x64a13:
ArnieDefeatedMonText:
text "Changing the topic"
line "here, I saw this"

Expand All @@ -21,7 +21,7 @@ UnknownText_0x64a13:
line "beat, actually."
done

UnknownText_0x64a71:
ArnieLostAMonText:
text "I was wondering,"
line "do you happen to"
cont "have @"
Expand All @@ -35,7 +35,7 @@ UnknownText_0x64a71:
line "wonder."
done

UnknownText_0x64ada:
ArnieBattleRematchText:
text "Hey, let's battle"
line "our #MON!"

Expand All @@ -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!"

Expand All @@ -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…"
Expand All @@ -83,7 +83,7 @@ UnknownText_0x64bc6:
line "out there!"
done

UnknownText_0x64c13:
ArnieReminderText:
text "Hey, where are you"
line "now?"

Expand All @@ -94,7 +94,7 @@ UnknownText_0x64c13:
text "!"
done

UnknownText_0x64c5a:
ArnieHurryText:
text "Hello? Are you"
line "coming or what?"

Expand Down
Loading

0 comments on commit e3e0bcd

Please sign in to comment.