Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consistent labels for each nickname in RAM

Browse Source
This commit is contained in:
Rangi
2021-03-17 16:16:02 -04:00
parent 6c8f8609cb
commit 4522162d45
57 changed files with 382 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
data/text/battle.asm
View File

@@ -9,7 +9,7 @@ BattleText_PlayerPickedUpPayDayMoney:
WildPokemonAppearedText:
text "Wild @"
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text_start
line "appeared!"
prompt
@@ -17,20 +17,20 @@ WildPokemonAppearedText:
HookedPokemonAttackedText:
text "The hooked"
line "@"
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text_start
cont "attacked!"
prompt
PokemonFellFromTreeText:
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text " fell"
line "out of the tree!"
prompt
WildCelebiAppearedText:
text "Wild @"
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text_start
line "appeared!"
prompt
@@ -42,14 +42,14 @@ WantsToBattleText::
BattleText_WildFled:
text "Wild @"
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text_start
line "fled!"
prompt
BattleText_EnemyFled:
text "Enemy @"
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text_start
line "fled!"
prompt
@@ -161,7 +161,7 @@ BattleText_TheSandstormSubsided:
BattleText_EnemyMonFainted:
text "Enemy @"
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text_start
line "fainted!"
prompt
@@ -206,7 +206,7 @@ UnusedRivalLossText: ; unreferenced
prompt
BattleText_MonFainted:
text_ram wBattleMonNick
text_ram wBattleMonNickname
text_start
line "fainted!"
prompt
@@ -230,7 +230,7 @@ BattleText_EnemyIsAboutToUseWillPlayerChangeMon:
text "<ENEMY>"
line "is about to use"
cont "@"
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text "."
para "Will <PLAYER>"
@@ -241,7 +241,7 @@ BattleText_EnemySentOut:
text "<ENEMY>"
line "sent out"
cont "@"
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text "!"
done
@@ -308,13 +308,13 @@ BattleText_ItemsCantBeUsedHere:
prompt
BattleText_MonIsAlreadyOut:
text_ram wBattleMonNick
text_ram wBattleMonNickname
text_start
line "is already out."
prompt
BattleText_MonCantBeRecalled:
text_ram wBattleMonNick
text_ram wBattleMonNickname
text_start
line "can't be recalled!"
prompt
@@ -330,7 +330,7 @@ BattleText_TheMoveIsDisabled:
prompt
BattleText_MonHasNoMovesLeft:
text_ram wBattleMonNick
text_ram wBattleMonNickname
text_start
line "has no moves left!"
done
@@ -353,14 +353,14 @@ BattleText_StringBuffer1GrewToLevel:
BattleText_WildMonIsEating:
text "Wild @"
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text_start
line "is eating!"
prompt
BattleText_WildMonIsAngry:
text "Wild @"
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text_start
line "is angry!"
prompt
@@ -516,37 +516,37 @@ DisabledMoveText:
prompt
LoafingAroundText:
text_ram wBattleMonNick
text_ram wBattleMonNickname
text " is"
line "loafing around."
prompt
BeganToNapText:
text_ram wBattleMonNick
text_ram wBattleMonNickname
text " began"
line "to nap!"
prompt
WontObeyText:
text_ram wBattleMonNick
text_ram wBattleMonNickname
text " won't"
line "obey!"
prompt
TurnedAwayText:
text_ram wBattleMonNick
text_ram wBattleMonNickname
text " turned"
line "away!"
prompt
IgnoredOrdersText:
text_ram wBattleMonNick
text_ram wBattleMonNickname
text " ignored"
line "orders!"
prompt
IgnoredSleepingText:
text_ram wBattleMonNick
text_ram wBattleMonNickname
text " ignored"
line "orders…sleeping!"
prompt