pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #577 from Rangi42/master

Browse Source 
Resolve issue #575: Rename text commands
This commit is contained in:
Rangi 2018-11-18 12:44:39 -05:00 committed by GitHub
commit cbf4c66361
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
123 changed files with 1869 additions and 1745 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/phone/text/bill.asm
View File

@ -44,7 +44,7 @@ BillPhoneNotFullText:
para "<PLAY_G>, your BOX" para "<PLAY_G>, your BOX"
line "has room for @" line "has room for @"
text_from_ram wStringBuffer3 text_ram wStringBuffer3
text_start text_start
cont "more #MON." cont "more #MON."
@ -59,7 +59,7 @@ BillPhoneNearlyFullText:
para "<PLAY_G>, your BOX" para "<PLAY_G>, your BOX"
line "has room for only" line "has room for only"
cont "@" cont "@"
text_from_ram wStringBuffer3 text_ram wStringBuffer3
text " more #MON." text " more #MON."
para "Maybe you should" para "Maybe you should"

148
data/phone/text/extra.asm
View File

File diff suppressed because it is too large Load Diff

172
data/phone/text/extra2.asm
View File

File diff suppressed because it is too large Load Diff

4
data/phone/text/gaven_overworld.asm
View File

@ -12,7 +12,7 @@ GavenAskNumber1Text:
line "again when I heal" line "again when I heal"
para "@" para "@"
text_from_ram wStringBuffer4 text_ram wStringBuffer4
text " and the" text " and the"
line "rest of my team." line "rest of my team."
done done
@ -25,7 +25,7 @@ GavenAskNumber2Text:
line "again when I heal" line "again when I heal"
para "@" para "@"
text_from_ram wStringBuffer4 text_ram wStringBuffer4
text " and the" text " and the"
line "rest of my team." line "rest of my team."
done done

2
data/phone/text/jose_overworld.asm
View File

@ -1,6 +1,6 @@
JoseAskNumber1Text: JoseAskNumber1Text:
text "If my @" text "If my @"
text_from_ram wStringBuffer4 text_ram wStringBuffer4
text_start text_start
line "sees anything" line "sees anything"

16
data/phone/text/mom.asm
View File

@ -8,12 +8,12 @@ MomPhoneGreetingText:
MomPhoneLandmarkText: MomPhoneLandmarkText:
text "Oh, so you're in" text "Oh, so you're in"
line "@" line "@"
text_from_ram wStringBuffer3 text_ram wStringBuffer3
text "…" text "…"
para "Isn't that where" para "Isn't that where"
line "@" line "@"
text_from_ram wStringBuffer4 text_ram wStringBuffer4
text_start text_start
para "is? Did you go" para "is? Did you go"
line "take a look?" line "take a look?"
@ -22,7 +22,7 @@ MomPhoneLandmarkText:
MomPhoneGenericAreaText: MomPhoneGenericAreaText:
text "Really, you're in" text "Really, you're in"
line "@" line "@"
text_from_ram wStringBuffer3 text_ram wStringBuffer3
text "?" text "?"
para "I've never gone" para "I've never gone"
@ -33,7 +33,7 @@ MomPhoneGenericAreaText:
MomPhoneNewBarkText: MomPhoneNewBarkText:
text "What? You're in" text "What? You're in"
line "@" line "@"
text_from_ram wStringBuffer3 text_ram wStringBuffer3
text "?" text "?"
para "Come see your MOM" para "Come see your MOM"
@ -43,7 +43,7 @@ MomPhoneNewBarkText:
MomPhoneCherrygroveText: MomPhoneCherrygroveText:
text "You're visiting" text "You're visiting"
line "@" line "@"
text_from_ram wStringBuffer3 text_ram wStringBuffer3
text "?" text "?"
para "How about coming" para "How about coming"
@ -53,7 +53,7 @@ MomPhoneCherrygroveText:
MomOtherAreaText: MomOtherAreaText:
text "Wow, you're in" text "Wow, you're in"
line "@" line "@"
text_from_ram wStringBuffer3 text_ram wStringBuffer3
text "?" text "?"
para "Good luck on your" para "Good luck on your"
@ -74,7 +74,7 @@ MomDeterminedText:
MomCheckBalanceText: MomCheckBalanceText:
text "By the way, you've" text "By the way, you've"
line "saved up ¥@" line "saved up ¥@"
text_from_ram wStringBuffer3 text_ram wStringBuffer3
text "." text "."
para "Do you want to" para "Do you want to"
@ -97,7 +97,7 @@ MomYoureNotSavingText:
MomYouveSavedText: MomYouveSavedText:
text "By the way, you've" text "By the way, you've"
line "saved up ¥@" line "saved up ¥@"
text_from_ram wStringBuffer3 text_ram wStringBuffer3
text "." text "."
para "Want to start" para "Want to start"

364
data/phone/text/trainers.asm
View File

File diff suppressed because it is too large Load Diff

116
data/text/battle.asm
View File

@ -3,13 +3,13 @@ BattleText:: ; used only for BANK(BattleText)
BattleText_PlayerPickedUpPayDayMoney: BattleText_PlayerPickedUpPayDayMoney:
text "<PLAYER> picked up" text "<PLAYER> picked up"
line "¥@" line "¥@"
deciram wPayDayMoney, 3, 6 text_decimal wPayDayMoney, 3, 6
text "!" text "!"
prompt prompt
WildPokemonAppearedText: WildPokemonAppearedText:
text "Wild @" text "Wild @"
text_from_ram wEnemyMonNick text_ram wEnemyMonNick
text_start text_start
line "appeared!" line "appeared!"
prompt prompt
@ -17,20 +17,20 @@ WildPokemonAppearedText:
HookedPokemonAttackedText: HookedPokemonAttackedText:
text "The hooked" text "The hooked"
line "@" line "@"
text_from_ram wEnemyMonNick text_ram wEnemyMonNick
text_start text_start
cont "attacked!" cont "attacked!"
prompt prompt
PokemonFellFromTreeText: PokemonFellFromTreeText:
text_from_ram wEnemyMonNick text_ram wEnemyMonNick
text " fell" text " fell"
line "out of the tree!" line "out of the tree!"
prompt prompt
WildCelebiAppearedText: WildCelebiAppearedText:
text "Wild @" text "Wild @"
text_from_ram wEnemyMonNick text_ram wEnemyMonNick
text_start text_start
line "appeared!" line "appeared!"
prompt prompt
@ -42,14 +42,14 @@ WantsToBattleText::
BattleText_WildFled: BattleText_WildFled:
text "Wild @" text "Wild @"
text_from_ram wEnemyMonNick text_ram wEnemyMonNick
text_start text_start
line "fled!" line "fled!"
prompt prompt
BattleText_EnemyFled: BattleText_EnemyFled:
text "Enemy @" text "Enemy @"
text_from_ram wEnemyMonNick text_ram wEnemyMonNick
text_start text_start
line "fled!" line "fled!"
prompt prompt
@ -87,7 +87,7 @@ SandstormHitsText:
PerishCountText: PerishCountText:
text "<USER>'s" text "<USER>'s"
line "PERISH count is @" line "PERISH count is @"
deciram wDeciramBuffer, 1, 1 text_decimal wDeciramBuffer, 1, 1
text "!" text "!"
prompt prompt
@ -95,7 +95,7 @@ BattleText_TargetRecoveredWithItem:
text "<TARGET>" text "<TARGET>"
line "recovered with" line "recovered with"
cont "@" cont "@"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text "." text "."
prompt prompt
@ -103,7 +103,7 @@ BattleText_UserRecoveredPPUsing:
text "<USER>" text "<USER>"
line "recovered PP using" line "recovered PP using"
cont "@" cont "@"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text "." text "."
prompt prompt
@ -119,13 +119,13 @@ BattleText_SafeguardFaded:
prompt prompt
BattleText_MonsLightScreenFell: BattleText_MonsLightScreenFell:
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text " #MON's" text " #MON's"
line "LIGHT SCREEN fell!" line "LIGHT SCREEN fell!"
prompt prompt
BattleText_MonsReflectFaded: BattleText_MonsReflectFaded:
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text " #MON's" text " #MON's"
line "REFLECT faded!" line "REFLECT faded!"
prompt prompt
@ -161,14 +161,14 @@ BattleText_TheSandstormSubsided:
BattleText_EnemyMonFainted: BattleText_EnemyMonFainted:
text "Enemy @" text "Enemy @"
text_from_ram wEnemyMonNick text_ram wEnemyMonNick
text_start text_start
line "fainted!" line "fainted!"
prompt prompt
GotMoneyForWinningText: GotMoneyForWinningText:
text "<PLAYER> got ¥@" text "<PLAYER> got ¥@"
deciram wBattleReward, 3, 6 text_decimal wBattleReward, 3, 6
text_start text_start
line "for winning!" line "for winning!"
prompt prompt
@ -185,7 +185,7 @@ TiedAgainstText:
SentSomeToMomText: SentSomeToMomText:
text "<PLAYER> got ¥@" text "<PLAYER> got ¥@"
deciram wBattleReward, 3, 6 text_decimal wBattleReward, 3, 6
text_start text_start
line "for winning!" line "for winning!"
cont "Sent some to MOM!" cont "Sent some to MOM!"
@ -206,7 +206,7 @@ BattleText_0x80a4f:
prompt prompt
BattleText_MonFainted: BattleText_MonFainted:
text_from_ram wBattleMonNick text_ram wBattleMonNick
text_start text_start
line "fainted!" line "fainted!"
prompt prompt
@ -230,7 +230,7 @@ BattleText_EnemyIsAboutToUseWillPlayerChangeMon:
text "<ENEMY>" text "<ENEMY>"
line "is about to use" line "is about to use"
cont "@" cont "@"
text_from_ram wEnemyMonNick text_ram wEnemyMonNick
text "." text "."
para "Will <PLAYER>" para "Will <PLAYER>"
@ -241,7 +241,7 @@ BattleText_EnemySentOut:
text "<ENEMY>" text "<ENEMY>"
line "sent out" line "sent out"
cont "@" cont "@"
text_from_ram wEnemyMonNick text_ram wEnemyMonNick
text "!" text "!"
done done
@ -273,7 +273,7 @@ BattleText_UserFledUsingAStringBuffer1:
text "<USER>" text "<USER>"
line "fled using a" line "fled using a"
cont "@" cont "@"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text "!" text "!"
prompt prompt
@ -290,14 +290,14 @@ RecoveredUsingText:
text "<TARGET>" text "<TARGET>"
line "recovered using a" line "recovered using a"
cont "@" cont "@"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text "!" text "!"
prompt prompt
BattleText_UsersStringBuffer1Activated: BattleText_UsersStringBuffer1Activated:
text "<USER>'s" text "<USER>'s"
line "@" line "@"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text_start text_start
cont "activated!" cont "activated!"
prompt prompt
@ -308,13 +308,13 @@ BattleText_ItemsCantBeUsedHere:
prompt prompt
BattleText_MonIsAlreadyOut: BattleText_MonIsAlreadyOut:
text_from_ram wBattleMonNick text_ram wBattleMonNick
text_start text_start
line "is already out." line "is already out."
prompt prompt
BattleText_MonCantBeRecalled: BattleText_MonCantBeRecalled:
text_from_ram wBattleMonNick text_ram wBattleMonNick
text_start text_start
line "can't be recalled!" line "can't be recalled!"
prompt prompt
@ -330,7 +330,7 @@ BattleText_TheMoveIsDisabled:
prompt prompt
BattleText_MonHasNoMovesLeft: BattleText_MonHasNoMovesLeft:
text_from_ram wBattleMonNick text_ram wBattleMonNick
text_start text_start
line "has no moves left!" line "has no moves left!"
done done
@ -341,24 +341,26 @@ BattleText_TargetsEncoreEnded:
prompt prompt
BattleText_StringBuffer1GrewToLevel: BattleText_StringBuffer1GrewToLevel:
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text " grew to" text " grew to"
line "level @" line "level @"
deciram wCurPartyLevel, 1, 3 text_decimal wCurPartyLevel, 1, 3
text "!@" text "!@"
sound_dex_fanfare_50_79 sound_dex_fanfare_50_79
db "@@" text_end
text_end ; unused
BattleText_WildMonIsEating: BattleText_WildMonIsEating:
text "Wild @" text "Wild @"
text_from_ram wEnemyMonNick text_ram wEnemyMonNick
text_start text_start
line "is eating!" line "is eating!"
prompt prompt
BattleText_WildMonIsAngry: BattleText_WildMonIsAngry:
text "Wild @" text "Wild @"
text_from_ram wEnemyMonNick text_ram wEnemyMonNick
text_start text_start
line "is angry!" line "is angry!"
prompt prompt
@ -416,7 +418,7 @@ BecameConfusedText:
BattleText_ItemHealedConfusion: ; ItemHealedConfusion BattleText_ItemHealedConfusion: ; ItemHealedConfusion
text "A @" text "A @"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text " rid" text " rid"
line "<TARGET>" line "<TARGET>"
cont "of its confusion." cont "of its confusion."
@ -431,7 +433,7 @@ BattleText_UsersHurtByStringBuffer1:
text "<USER>'s" text "<USER>'s"
line "hurt by" line "hurt by"
cont "@" cont "@"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text "!" text "!"
prompt prompt
@ -439,7 +441,7 @@ BattleText_UserWasReleasedFromStringBuffer1:
text "<USER>" text "<USER>"
line "was released from" line "was released from"
cont "@" cont "@"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text "!" text "!"
prompt prompt
@ -485,7 +487,7 @@ HungOnText:
text "<TARGET>" text "<TARGET>"
line "hung on with" line "hung on with"
cont "@" cont "@"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text "!" text "!"
prompt prompt
@ -509,43 +511,43 @@ InfatuationText:
DisabledMoveText: DisabledMoveText:
text "<USER>'s" text "<USER>'s"
line "@" line "@"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text " is" text " is"
cont "DISABLED!" cont "DISABLED!"
prompt prompt
LoafingAroundText: LoafingAroundText:
text_from_ram wBattleMonNick text_ram wBattleMonNick
text " is" text " is"
line "loafing around." line "loafing around."
prompt prompt
BeganToNapText: BeganToNapText:
text_from_ram wBattleMonNick text_ram wBattleMonNick
text " began" text " began"
line "to nap!" line "to nap!"
prompt prompt
WontObeyText: WontObeyText:
text_from_ram wBattleMonNick text_ram wBattleMonNick
text " won't" text " won't"
line "obey!" line "obey!"
prompt prompt
TurnedAwayText: TurnedAwayText:
text_from_ram wBattleMonNick text_ram wBattleMonNick
text " turned" text " turned"
line "away!" line "away!"
prompt prompt
IgnoredOrdersText: IgnoredOrdersText:
text_from_ram wBattleMonNick text_ram wBattleMonNick
text " ignored" text " ignored"
line "orders!" line "orders!"
prompt prompt
IgnoredSleepingText: IgnoredSleepingText:
text_from_ram wBattleMonNick text_ram wBattleMonNick
text " ignored" text " ignored"
line "orders…sleeping!" line "orders…sleeping!"
prompt prompt
@ -559,7 +561,7 @@ HasNoPPLeftText:
text "<USER>" text "<USER>"
line "has no PP left for" line "has no PP left for"
cont "@" cont "@"
text_from_ram wStringBuffer2 text_ram wStringBuffer2
text "!" text "!"
prompt prompt
@ -653,7 +655,7 @@ SketchedText:
text "<USER>" text "<USER>"
line "SKETCHED" line "SKETCHED"
cont "@" cont "@"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text "!" text "!"
prompt prompt
@ -666,10 +668,10 @@ DestinyBondEffectText:
SpiteEffectText: SpiteEffectText:
text "<TARGET>'s" text "<TARGET>'s"
line "@" line "@"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text " was" text " was"
cont "reduced by @" cont "reduced by @"
deciram wDeciramBuffer, 1, 1 text_decimal wDeciramBuffer, 1, 1
text "!" text "!"
prompt prompt
@ -731,7 +733,7 @@ WasFrozenText:
WontRiseAnymoreText: WontRiseAnymoreText:
text "<USER>'s" text "<USER>'s"
line "@" line "@"
text_from_ram wStringBuffer2 text_ram wStringBuffer2
text " won't" text " won't"
cont "rise anymore!" cont "rise anymore!"
prompt prompt
@ -739,7 +741,7 @@ WontRiseAnymoreText:
WontDropAnymoreText: WontDropAnymoreText:
text "<TARGET>'s" text "<TARGET>'s"
line "@" line "@"
text_from_ram wStringBuffer2 text_ram wStringBuffer2
text " won't" text " won't"
cont "drop anymore!" cont "drop anymore!"
prompt prompt
@ -761,13 +763,13 @@ BlownAwayText:
PlayerHitTimesText: PlayerHitTimesText:
text "Hit @" text "Hit @"
deciram wPlayerDamageTaken, 1, 1 text_decimal wPlayerDamageTaken, 1, 1
text " times!" text " times!"
prompt prompt
EnemyHitTimesText: EnemyHitTimesText:
text "Hit @" text "Hit @"
deciram wEnemyDamageTaken, 1, 1 text_decimal wEnemyDamageTaken, 1, 1
text " times!" text " times!"
prompt prompt
@ -782,7 +784,7 @@ ProtectedByMistText:
prompt prompt
GettingPumpedText: GettingPumpedText:
interpret_data text_pause
text "<USER>'s" text "<USER>'s"
line "getting pumped!" line "getting pumped!"
prompt prompt
@ -822,7 +824,7 @@ LearnedMoveText:
text "<USER>" text "<USER>"
line "learned" line "learned"
cont "@" cont "@"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text "!" text "!"
prompt prompt
@ -839,7 +841,7 @@ EvadedText:
WasDisabledText: WasDisabledText:
text "<TARGET>'s" text "<TARGET>'s"
line "@" line "@"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text " was" text " was"
cont "DISABLED!" cont "DISABLED!"
prompt prompt
@ -853,7 +855,7 @@ TransformedTypeText:
text "<USER>" text "<USER>"
line "transformed into" line "transformed into"
cont "the @" cont "the @"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text "-type!" text "-type!"
prompt prompt
@ -866,7 +868,7 @@ TransformedText:
text "<USER>" text "<USER>"
line "TRANSFORMED into" line "TRANSFORMED into"
cont "@" cont "@"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text "!" text "!"
prompt prompt
@ -933,7 +935,7 @@ ProtectedByText:
text "<TARGET>'s" text "<TARGET>'s"
line "protected by" line "protected by"
cont "@" cont "@"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text "!" text "!"
prompt prompt
@ -945,7 +947,7 @@ MirrorMoveFailedText:
StoleText: StoleText:
text "<USER>" text "<USER>"
line "stole @" line "stole @"
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text_start text_start
cont "from its foe!" cont "from its foe!"
prompt prompt
@ -1029,7 +1031,7 @@ SafeguardProtectText:
MagnitudeText: MagnitudeText:
text "Magnitude @" text "Magnitude @"
deciram wDeciramBuffer, 1, 1 text_decimal wDeciramBuffer, 1, 1
text "!" text "!"
prompt prompt
@ -1079,7 +1081,7 @@ ForesawAttackText:
prompt prompt
BeatUpAttackText: BeatUpAttackText:
text_from_ram wStringBuffer1 text_ram wStringBuffer1
text "'s" text "'s"
line "attack!" line "attack!"
done done

252
data/text/common_1.asm
View File

File diff suppressed because it is too large Load Diff

285
data/text/common_2.asm
View File

File diff suppressed because it is too large Load Diff

200
data/text/common_3.asm
View File

File diff suppressed because it is too large Load Diff

14
data/text/std_text.asm
View File

@ -231,18 +231,18 @@ ContestResults_ReadyToJudgeText:
ContestResults_PlayerWonAPrizeText: ContestResults_PlayerWonAPrizeText:
text "<PLAYER>, the No.@" text "<PLAYER>, the No.@"
text_from_ram wStringBuffer3 text_ram wStringBuffer3
text_start text_start
line "finisher, wins" line "finisher, wins"
cont "@" cont "@"
text_from_ram wStringBuffer4 text_ram wStringBuffer4
text "!" text "!"
done done
ReceivedItemText: ReceivedItemText:
text "<PLAYER> received" text "<PLAYER> received"
line "@" line "@"
text_from_ram wStringBuffer4 text_ram wStringBuffer4
text "." text "."
done done
@ -279,14 +279,14 @@ ContestResults_PartyFullText:
done done
GymStatue_CityGymText: GymStatue_CityGymText:
text_from_ram wStringBuffer3 text_ram wStringBuffer3
text_start text_start
line "#MON GYM" line "#MON GYM"
done done
GymStatue_WinningTrainersText: GymStatue_WinningTrainersText:
text "LEADER: @" text "LEADER: @"
text_from_ram wStringBuffer4 text_ram wStringBuffer4
text_start text_start
para "WINNING TRAINERS:" para "WINNING TRAINERS:"
line "<PLAYER>" line "<PLAYER>"
@ -376,13 +376,13 @@ HappinessText1:
RegisteredNumber1Text: RegisteredNumber1Text:
text "<PLAYER> registered" text "<PLAYER> registered"
line "@" line "@"
text_from_ram wStringBuffer3 text_ram wStringBuffer3
text "'s number." text "'s number."
done done
RegisteredNumber2Text: RegisteredNumber2Text:
text "<PLAYER> registered" text "<PLAYER> registered"
line "@" line "@"
text_from_ram wStringBuffer3 text_ram wStringBuffer3
text "'s number." text "'s number."
done done

8
docs/bugs_and_glitches.md
View File

@ -632,16 +632,16 @@ This can bring Pokémon straight from level 1 to 100 by gaining just a few exper
text_start text_start
line "a boosted" line "a boosted"
cont "@" cont "@"
- deciram wStringBuffer2, 2, 4 - text_decimal wStringBuffer2, 2, 4
+ deciram wStringBuffer2, 2, 5 + text_decimal wStringBuffer2, 2, 5
text " EXP. Points!" text " EXP. Points!"
prompt prompt
Text_StringBuffer2ExpPoints:: Text_StringBuffer2ExpPoints::
text_start text_start
line "@" line "@"
- deciram wStringBuffer2, 2, 4 - text_decimal wStringBuffer2, 2, 4
+ deciram wStringBuffer2, 2, 5 + text_decimal wStringBuffer2, 2, 5
text " EXP. Points!" text " EXP. Points!"
prompt prompt
``` ```

106
docs/text_commands.md
View File

@ -3,47 +3,12 @@
Defined in [macros/scripts/text.asm](/macros/scripts/text.asm) and [home/text.asm:TextCommands](/home/text.asm). Defined in [macros/scripts/text.asm](/macros/scripts/text.asm) and [home/text.asm:TextCommands](/home/text.asm).
## `$00`: <code>text <i>text</i></code> ## `$00`: `text_start`
Start writing text until `"@"`. Start writing text until `"@"`. The text can use [control characters](#control-characters).
## `$4E`: <code>next <i>text</i></code> ## `$01`: <code>text_ram <i>address</i></code>
Move a line down.
## `$4F`: <code>line <i>text</i></code>
Start writing at the bottom line.
## `$50`: <code>page <i>text</i></code>
Start a new Pokédex page.
## `$51`: <code>para <i>text</i></code>
Start a new paragraph.
## `$55`: <code>cont <i>text</i></code>
Scroll to the next line.
## `$57`: `done`
End a text box.
## `$58`: `prompt`
Prompt the player to end a text box (initiating some other event).
## `$01`: <code>text_from_ram <i>address</i></code>
Write text from a RAM address. Write text from a RAM address.
@ -81,19 +46,19 @@ Pushes text up two lines and sets the `bc` cursor to the border tile below the
first character column of the text box. first character column of the text box.
## `$08`: `start_asm` ## `$08`: `text_asm`
Start interpreting assembly code. Start interpreting assembly code.
## `$09`: <code>deciram <i>address</i>, <i>bytes</i>, <i>digits</i></code> ## `$09`: <code>text_decimal <i>address</i>, <i>bytes</i>, <i>digits</i></code>
Read *bytes* bytes from *address* and print them as a *digits*-digit number. Read *bytes* bytes from *address* and print them as a *digits*-digit number.
## `$0A`: `interpret_data` ## `$0A`: `text_pause`
Exit. Pause for 30 frames unless A or B is pressed.
## `$0B`: `sound_dex_fanfare_50_79` ## `$0B`: `sound_dex_fanfare_50_79`
@ -101,12 +66,12 @@ Exit.
Play `SFX_DEX_FANFARE_50_79`. Play `SFX_DEX_FANFARE_50_79`.
## `$0C`: <code>limited_interpret_data <i>n</i></code> ## `$0C`: <code>text_dots <i>n</i></code>
Print *n* `"…"`s. Print *n* `"…"`s, pausing for 10 frames after each; interrupt if A or B is pressed.
## `$0D`: `link_wait_button` ## `$0D`: `text_linkwaitbutton`
Wait for button press; show arrow. Wait for button press; show arrow.
@ -154,7 +119,7 @@ Write text from one of the following addresses (listed in [data/text_buffers.asm
6. `BattleMonNick` 6. `BattleMonNick`
## `$15`: `current_day` ## `$15`: `text_today`
Print the weekday. Print the weekday.
@ -164,6 +129,51 @@ Print the weekday.
Write text from a different bank. Write text from a different bank.
## `$00`: `text_start` ## `$50`: `text_end`
Start writing regular text again after a special command. Stops processing text commands.
# Control characters
These get interpreted in the context of printing regular text. Macros exist to conveniently place the control characters.
## `$00`: <code>text <i>text</i></code>
Start writing text until `"@"`. (Not actually a control character, but shorter than `text_start` followed by `db`.)
## `$4E`, `"<NEXT>"`: <code>next <i>text</i></code>
Move a line down.
## `$4F`, `"<LINE>"`: <code>line <i>text</i></code>
Start writing at the bottom line.
## `$50`, `"@"`: <code>page <i>text</i></code>
Start a new Pokédex page.
## `$51`, `"<PARA>"`: <code>para <i>text</i></code>
Start a new paragraph.
## `$55`, `"<CONT>"`: <code>cont <i>text</i></code>
Scroll to the next line.
## `$57`, `"<DONE>"`: `done`
End a text box.
## `$58`, `"<PROMPT>"`: `prompt`
Prompt the player to end a text box (initiating some other event).

4
engine/battle/ai/items.asm
View File

@ -709,7 +709,7 @@ AI_Switch:
TextJump_EnemyWithdrew: TextJump_EnemyWithdrew:
text_far Text_EnemyWithdrew text_far Text_EnemyWithdrew
db "@" text_end
Function384d5: ; This appears to be unused Function384d5: ; This appears to be unused
call AIUsedItemSound call AIUsedItemSound
@ -829,4 +829,4 @@ PrintText_UsedItemOn:
TextJump_EnemyUsedOn: TextJump_EnemyUsedOn:
text_far Text_EnemyUsedOn text_far Text_EnemyUsedOn
db "@" text_end

31
engine/battle/core.asm
View File

@ -6864,8 +6864,9 @@ Unreferenced_LoadHPExpBarGFX:
EmptyBattleTextBox: EmptyBattleTextBox:
ld hl, .empty ld hl, .empty
jp BattleTextBox jp BattleTextBox
.empty
db "@" .empty:
text_end
_BattleRandom:: _BattleRandom::
; If the normal RNG is used in a link battle it'll desync. ; If the normal RNG is used in a link battle it'll desync.
@ -7399,7 +7400,7 @@ BoostExp:
Text_MonGainedExpPoint: Text_MonGainedExpPoint:
text_far Text_Gained text_far Text_Gained
start_asm text_asm
ld hl, TextJump_StringBuffer2ExpPoints ld hl, TextJump_StringBuffer2ExpPoints
ld a, [wStringBuffer2 + 2] ; IsTradedMon ld a, [wStringBuffer2 + 2] ; IsTradedMon
and a and a
@ -7410,11 +7411,11 @@ Text_MonGainedExpPoint:
TextJump_ABoostedStringBuffer2ExpPoints: TextJump_ABoostedStringBuffer2ExpPoints:
text_far Text_ABoostedStringBuffer2ExpPoints text_far Text_ABoostedStringBuffer2ExpPoints
db "@" text_end
TextJump_StringBuffer2ExpPoints: TextJump_StringBuffer2ExpPoints:
text_far Text_StringBuffer2ExpPoints text_far Text_StringBuffer2ExpPoints
db "@" text_end
AnimateExpBar: AnimateExpBar:
push bc push bc
@ -7665,29 +7666,29 @@ SendOutMonText:
JumpText_GoMon: JumpText_GoMon:
text_far Text_GoMon text_far Text_GoMon
start_asm text_asm
jr Function_TextJump_BattleMonNick01 jr Function_TextJump_BattleMonNick01
JumpText_DoItMon: JumpText_DoItMon:
text_far Text_DoItMon text_far Text_DoItMon
start_asm text_asm
jr Function_TextJump_BattleMonNick01 jr Function_TextJump_BattleMonNick01
JumpText_GoForItMon: JumpText_GoForItMon:
text_far Text_GoForItMon text_far Text_GoForItMon
start_asm text_asm
jr Function_TextJump_BattleMonNick01 jr Function_TextJump_BattleMonNick01
JumpText_YourFoesWeakGetmMon: JumpText_YourFoesWeakGetmMon:
text_far Text_YourFoesWeakGetmMon text_far Text_YourFoesWeakGetmMon
start_asm text_asm
Function_TextJump_BattleMonNick01: Function_TextJump_BattleMonNick01:
ld hl, TextJump_BattleMonNick01 ld hl, TextJump_BattleMonNick01
ret ret
TextJump_BattleMonNick01: TextJump_BattleMonNick01:
text_far Text_BattleMonNick01 text_far Text_BattleMonNick01
db "@" text_end
WithdrawMonText: WithdrawMonText:
ld hl, .WithdrawMonText ld hl, .WithdrawMonText
@ -7695,7 +7696,7 @@ WithdrawMonText:
.WithdrawMonText: .WithdrawMonText:
text_far Text_BattleMonNickComma text_far Text_BattleMonNickComma
start_asm text_asm
; Print text to withdraw mon ; Print text to withdraw mon
; depending on HP the message is different ; depending on HP the message is different
push de push de
@ -7746,15 +7747,15 @@ WithdrawMonText:
TextJump_ThatsEnoughComeBack: TextJump_ThatsEnoughComeBack:
text_far Text_ThatsEnoughComeBack text_far Text_ThatsEnoughComeBack
db "@" text_end
TextJump_OKComeBack: TextJump_OKComeBack:
text_far Text_OKComeBack text_far Text_OKComeBack
db "@" text_end
TextJump_GoodComeBack: TextJump_GoodComeBack:
text_far Text_GoodComeBack text_far Text_GoodComeBack
db "@" text_end
Unreferenced_TextJump_ComeBack: Unreferenced_TextJump_ComeBack:
; this function doesn't seem to be used ; this function doesn't seem to be used
@ -7763,7 +7764,7 @@ Unreferenced_TextJump_ComeBack:
TextJump_ComeBack: TextJump_ComeBack:
text_far Text_ComeBack text_far Text_ComeBack
db "@" text_end
Unreferenced_HandleSafariAngerEatingStatus: Unreferenced_HandleSafariAngerEatingStatus:
ld hl, wSafariMonEating ld hl, wSafariMonEating

31
engine/battle/effect_commands.asm
View File

@ -4543,7 +4543,7 @@ BattleCommand_StatUpMessage:
.stat .stat
text_far UnknownText_0x1c0cc6 text_far UnknownText_0x1c0cc6
start_asm text_asm
ld hl, .up ld hl, .up
ld a, [wLoweredStat] ld a, [wLoweredStat]
and $f0 and $f0
@ -4553,11 +4553,11 @@ BattleCommand_StatUpMessage:
.wayup .wayup
text_far UnknownText_0x1c0cd0 text_far UnknownText_0x1c0cd0
db "@" text_end
.up .up
text_far UnknownText_0x1c0ce0 text_far UnknownText_0x1c0ce0
db "@" text_end
BattleCommand_StatDownMessage: BattleCommand_StatDownMessage:
ld a, [wFailedMessage] ld a, [wFailedMessage]
@ -4573,7 +4573,7 @@ BattleCommand_StatDownMessage:
.stat .stat
text_far UnknownText_0x1c0ceb text_far UnknownText_0x1c0ceb
start_asm text_asm
ld hl, .fell ld hl, .fell
ld a, [wLoweredStat] ld a, [wLoweredStat]
and $f0 and $f0
@ -4583,10 +4583,11 @@ BattleCommand_StatDownMessage:
.sharplyfell .sharplyfell
text_far UnknownText_0x1c0cf5 text_far UnknownText_0x1c0cf5
db "@" text_end
.fell .fell
text_far UnknownText_0x1c0d06 text_far UnknownText_0x1c0d06
db "@" text_end
TryLowerStat: TryLowerStat:
; Lower stat c from stat struct hl (buffer de). ; Lower stat c from stat struct hl (buffer de).
@ -5637,7 +5638,7 @@ BattleCommand_Charge:
.UsedText: .UsedText:
text_far UnknownText_0x1c0d0e ; "<USER>" text_far UnknownText_0x1c0d0e ; "<USER>"
start_asm text_asm
ld a, BATTLE_VARS_MOVE_ANIM ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar call GetBattleVar
cp RAZOR_WIND cp RAZOR_WIND
@ -5669,32 +5670,32 @@ BattleCommand_Charge:
.RazorWind: .RazorWind:
; 'made a whirlwind!' ; 'made a whirlwind!'
text_far UnknownText_0x1c0d12 text_far UnknownText_0x1c0d12
db "@" text_end
.Solarbeam: .Solarbeam:
; 'took in sunlight!' ; 'took in sunlight!'
text_far UnknownText_0x1c0d26 text_far UnknownText_0x1c0d26
db "@" text_end
.SkullBash: .SkullBash:
; 'lowered its head!' ; 'lowered its head!'
text_far UnknownText_0x1c0d3a text_far UnknownText_0x1c0d3a
db "@" text_end
.SkyAttack: .SkyAttack:
; 'is glowing!' ; 'is glowing!'
text_far UnknownText_0x1c0d4e text_far UnknownText_0x1c0d4e
db "@" text_end
.Fly: .Fly:
; 'flew up high!' ; 'flew up high!'
text_far UnknownText_0x1c0d5c text_far UnknownText_0x1c0d5c
db "@" text_end
.Dig: .Dig:
; 'dug a hole!' ; 'dug a hole!'
text_far UnknownText_0x1c0d6c text_far UnknownText_0x1c0d6c
db "@" text_end
BattleCommand3c: BattleCommand3c:
; unused ; unused
@ -6857,8 +6858,8 @@ BattleCommand_ClearText:
ld hl, .text ld hl, .text
jp BattleTextBox jp BattleTextBox
.text .text:
db "@" text_end
SkipToBattleCommand: SkipToBattleCommand:
; Skip over commands until reaching command b. ; Skip over commands until reaching command b.

2
engine/battle/menu.asm
View File

@ -88,7 +88,7 @@ MenuData_0x24f91:
Strings24f9a: Strings24f9a:
db "FIGHT@" db "FIGHT@"
db "<PKMN>", "@" db "<PKMN>@"
db "PARKBALL× @" db "PARKBALL× @"
db "RUN@" db "RUN@"

24
engine/battle/used_move_text.asm
View File

@ -7,7 +7,7 @@ DisplayUsedMoveText:
UsedMoveText: UsedMoveText:
; this is a stream of text and asm from 105db9 to 105ef6 ; this is a stream of text and asm from 105db9 to 105ef6
text_far _ActorNameText text_far _ActorNameText
start_asm text_asm
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
jr nz, .start jr nz, .start
@ -59,12 +59,12 @@ UsedMoveText:
UsedMove1Text: UsedMove1Text:
text_far _UsedMove1Text text_far _UsedMove1Text
start_asm text_asm
jr UsedMoveText_CheckObedience jr UsedMoveText_CheckObedience
UsedMove2Text: UsedMove2Text:
text_far _UsedMove2Text text_far _UsedMove2Text
start_asm text_asm
UsedMoveText_CheckObedience: UsedMoveText_CheckObedience:
; check obedience ; check obedience
ld a, [wAlreadyDisobeyed] ld a, [wAlreadyDisobeyed]
@ -76,14 +76,14 @@ UsedMoveText_CheckObedience:
.UsedInsteadText: .UsedInsteadText:
text_far _UsedInsteadText text_far _UsedInsteadText
start_asm text_asm
.GetMoveNameText: .GetMoveNameText:
ld hl, MoveNameText ld hl, MoveNameText
ret ret
MoveNameText: MoveNameText:
text_far _MoveNameText text_far _MoveNameText
start_asm text_asm
; get start address ; get start address
ld hl, .endusedmovetexts ld hl, .endusedmovetexts
@ -116,19 +116,23 @@ MoveNameText:
EndUsedMove1Text: EndUsedMove1Text:
text_far _EndUsedMove1Text text_far _EndUsedMove1Text
db "@" text_end
EndUsedMove2Text: EndUsedMove2Text:
text_far _EndUsedMove2Text text_far _EndUsedMove2Text
db "@" text_end
EndUsedMove3Text: EndUsedMove3Text:
text_far _EndUsedMove3Text text_far _EndUsedMove3Text
db "@" text_end
EndUsedMove4Text: EndUsedMove4Text:
text_far _EndUsedMove4Text text_far _EndUsedMove4Text
db "@" text_end
EndUsedMove5Text: EndUsedMove5Text:
text_far _EndUsedMove5Text text_far _EndUsedMove5Text
db "@" text_end
GetMoveGrammar: GetMoveGrammar:
; store move grammar type in wMoveGrammar ; store move grammar type in wMoveGrammar

18
engine/events/battle_tower/rules.asm
View File

@ -23,7 +23,7 @@ CheckForMobileBattleRules:
.ExcuseMeText: .ExcuseMeText:
; Excuse me! ; Excuse me!
text_far UnknownText_0x1c5937 text_far UnknownText_0x1c5937
db "@" text_end
_CheckForBattleTowerRules: _CheckForBattleTowerRules:
ld hl, wStringBuffer2 ld hl, wStringBuffer2
@ -58,7 +58,7 @@ _CheckForBattleTowerRules:
JumpText_ExcuseMeYoureNotReady: JumpText_ExcuseMeYoureNotReady:
; Excuse me. You're not ready. ; Excuse me. You're not ready.
text_far Text_ExcuseMeYoureNotReady text_far Text_ExcuseMeYoureNotReady
db "@" text_end
BattleTower_PleaseReturnWhenReady: BattleTower_PleaseReturnWhenReady:
ld hl, .PleaseReturnWhenReady ld hl, .PleaseReturnWhenReady
@ -68,37 +68,37 @@ BattleTower_PleaseReturnWhenReady:
.PleaseReturnWhenReady: .PleaseReturnWhenReady:
; Please return when you're ready. ; Please return when you're ready.
text_far UnknownText_0x1c5962 text_far UnknownText_0x1c5962
db "@" text_end
JumpText_NeedAtLeastThreeMon: JumpText_NeedAtLeastThreeMon:
; You need at least three #MON. ; You need at least three #MON.
text_far UnknownText_0x1c5983 text_far UnknownText_0x1c5983
db "@" text_end
JumpText_EggDoesNotQualify: JumpText_EggDoesNotQualify:
; Sorry, an EGG doesn't qualify. ; Sorry, an EGG doesn't qualify.
text_far UnknownText_0x1c59a3 text_far UnknownText_0x1c59a3
db "@" text_end
JumpText_OnlyThreeMonMayBeEntered: JumpText_OnlyThreeMonMayBeEntered:
; Only three #MON may be entered. ; Only three #MON may be entered.
text_far Text_OnlyThreeMonMayBeEntered text_far Text_OnlyThreeMonMayBeEntered
db "@" text_end
JumpText_TheMonMustAllBeDifferentKinds: JumpText_TheMonMustAllBeDifferentKinds:
; The @ #MON must all be different kinds. ; The @ #MON must all be different kinds.
text_far Text_TheMonMustAllBeDifferentKinds text_far Text_TheMonMustAllBeDifferentKinds
db "@" text_end
JumpText_TheMonMustNotHoldTheSameItems: JumpText_TheMonMustNotHoldTheSameItems:
; The @ #MON must not hold the same items. ; The @ #MON must not hold the same items.
text_far Text_TheMonMustNotHoldTheSameItems text_far Text_TheMonMustNotHoldTheSameItems
db "@" text_end
JumpText_YouCantTakeAnEgg: JumpText_YouCantTakeAnEgg:
; You can't take an EGG! ; You can't take an EGG!
text_far Text_YouCantTakeAnEgg text_far Text_YouCantTakeAnEgg
db "@" text_end
BattleTower_ExecuteJumptable: BattleTower_ExecuteJumptable:
ld bc, 0 ld bc, 0

Some files were not shown because too many files have changed in this diff Show More