pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
PikalaxALT
2015-11-01 18:14:37 -05:00
parent 010b450834 25c126c69b
commit 6b2d0ae841
33 changed files with 717 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
text/battle.asm
View File

@@ -1,4 +1,4 @@
BattleText_0x80730: ; 0x80730
BattleText_PlayerPickuedUpPayDayMoney: ; 0x80730
text "<PLAYER> picked up"
line "¥@"
deciram wPayDayMoney, 3, 6
@@ -307,7 +307,7 @@ BattleText_GotAwaySafely: ; 0x80b77
text "Got away safely!"
prompt
BattleText_0x80b89: ; 0x80b89
BattleText_UserFledUsingAStringBuffer1: ; 0x80b89
text "<USER>"
line "fled using a"
cont "@"
@@ -321,7 +321,7 @@ BattleText_CantEscape: ; 0x80ba0
prompt
; 0x80bae
BattleText_0x80bae: ; 0x80bae
BattleText_UserHurtBySpikes: ; 0x80bae
text "<USER>'s"
line "hurt by SPIKES!"
prompt
@@ -336,7 +336,7 @@ RecoveredUsingText: ; 0x80bc2
prompt
; 0x80bde
BattleText_0x80bde: ; 0x80bde
BattleText_UsersStringBuffer1Activated: ; 0x80bde
text "<USER>'s"
line "@"
text_from_ram StringBuffer1
@@ -345,52 +345,52 @@ BattleText_0x80bde: ; 0x80bde
prompt
; 0x80bf3
BattleText_0x80bf3: ; 0x80bf3
BattleText_ItemsCantBeUsedHere: ; 0x80bf3
text "Items can't be"
line "used here."
prompt
; 0x80c0d
BattleText_0x80c0d: ; 0x80c0d
BattleText_PkmnIsAlreadyOut: ; 0x80c0d
text_from_ram BattleMonNick
text ""
line "is already out."
prompt
; 0x80c22
BattleText_0x80c22: ; 0x80c22
BattleText_PkmnCantBeRecalled: ; 0x80c22
text_from_ram BattleMonNick
text ""
line "can't be recalled!"
prompt
; 0x80c39
BattleText_0x80c39: ; 0x80c39
BattleText_TheresNoPPLeftForThisMove: ; 0x80c39
text "There's no PP left"
line "for this move!"
prompt
; 0x80c5b
BattleText_0x80c5b: ; 0x80c5b
BattleText_TheMoveIsDisabled: ; 0x80c5b
text "The move is"
line "DISABLED!"
prompt
; 0x80c72
BattleText_0x80c72: ; 0x80c72
BattleText_PkmnHasNoMovesLeft: ; 0x80c72
text_from_ram BattleMonNick
text ""
line "has no moves left!"
done
; 0x80c8a
BattleText_0x80c8a: ; 0x80c8a
BattleText_TargetsEncoreEnded: ; 0x80c8a
text "<TARGET>'s"
line "ENCORE ended!"
prompt
; 0x80c9c
BattleText_0x80c9c: ; 0x80c9c
BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
text_from_ram StringBuffer1
text " grew to"
line "level @"
@@ -404,7 +404,7 @@ BattleText_0x80cb9: ; 0x80cb9
db "@"
; 0x80cba
BattleText_0x80cba: ; 0x80cba
BattleText_WildPkmnIsEating: ; 0x80cba
text "Wild @"
text_from_ram EnemyMonNick
text ""
@@ -412,7 +412,7 @@ BattleText_0x80cba: ; 0x80cba
prompt
; 0x80cd1
BattleText_0x80cd1: ; 0x80cd1
BattleText_WildPkmnIsAngry: ; 0x80cd1
text "Wild @"
text_from_ram EnemyMonNick
text ""
@@ -495,7 +495,7 @@ AlreadyConfusedText: ; 0x80dcc
prompt
; 0x80de2
BattleText_0x80de2: ; 0x80de2
BattleText_UsersHurtByStringBuffer1: ; 0x80de2
text "<USER>'s"
line "hurt by"
cont "@"
@@ -504,7 +504,7 @@ BattleText_0x80de2: ; 0x80de2
prompt
; 0x80df5
BattleText_0x80df5: ; 0x80df5
BattleText_UserWasReleasedFromStringBuffer1: ; 0x80df5
text "<USER>"
line "was released from"
cont "@"

24
text/common_3.asm
View File

@@ -106,13 +106,13 @@ UnknownText_0x1c0272: ; 1c0272
prompt
; 1c029c
UnknownText_0x1c029c: ; 1c029c
Text_Gained: ; 1c029c
text_from_ram StringBuffer1
text " gained@"
db "@"
; 1c02a9
UnknownText_0x1c02a9: ; 1c02a9
Text_ABoostedStringBuffer2ExpPoints: ; 1c02a9
text ""
line "a boosted"
cont "@"
@@ -121,7 +121,7 @@ UnknownText_0x1c02a9: ; 1c02a9
prompt
; 1c02c9
UnknownText_0x1c02c9: ; 1c02c9
Text_StringBuffer2ExpPoints: ; 1c02c9
text ""
line "@"
deciram StringBuffer2, 2, 4
@@ -157,31 +157,31 @@ Text_BattleMonNick01: ; 1c0317
done
; 1c031d
UnknownText_0x1c031d: ; 1c031d
Text_BattleMonNickComma: ; 1c031d
text_from_ram BattleMonNick
text ",@"
db "@"
; 1c0324
UnknownText_0x1c0324: ; 1c0324
Text_ThatsEnoughComeBack: ; 1c0324
text " that's"
line "enough! Come back!@"
db "@"
; 1c0340
UnknownText_0x1c0340: ; 1c0340
Text_OKComeBack: ; 1c0340
text " OK!"
line "Come back!@"
db "@"
; 1c0352
UnknownText_0x1c0352: ; 1c0352
Text_GoodComeBack: ; 1c0352
text " good!"
line "Come back!@"
db "@"
; 1c0366
UnknownText_0x1c0366: ; 1c0366
Text_ComeBack: ; 1c0366
text " come"
line "back!"
done
@@ -689,7 +689,7 @@ UnknownText_0x1c0b65: ; 1c0b65
done
; 1c0b7f
UnknownText_0x1c0b7f: ; 1c0b7f
Text_AnEGGCantHoldAnItem: ; 1c0b7f
text "An EGG can't hold"
line "an item."
prompt
@@ -731,7 +731,7 @@ UnknownText_0x1c0bee: ; 1c0bee
prompt
; 1c0c17
UnknownText_0x1c0c17: ; 1c0c17
Text_YouDontHaveAPkmn: ; 1c0c17
text "You don't have a"
line "#MON!"
prompt
@@ -762,13 +762,13 @@ UnknownText_0x1c0c83: ; 1c0c83
done
; 1c0c85
UnknownText_0x1c0c85: ; 1c0c85
Text_YouCantUseItInABattle: ; 1c0c85
text "You can't use it"
line "in a battle."
prompt
; 1c0ca3
UnknownText_0x1c0ca3: ; 1c0ca3
Text_AreYouABoyOrAreYouAGirl: ; 1c0ca3
text "Are you a boy?"
line "Or are you a girl?"
done

14
text/common_4.asm
View File

@@ -1375,7 +1375,7 @@ UnknownText_0x1c5b34: ; 0x1c5b34
db "@"
; 0x1c5b35
UnknownText_0x1c5b35: ; 0x1c5b35
Text_Waitbutton_2: ; 0x1c5b35
text_waitbutton
db "@"
; 0x1c5b37
@@ -1428,7 +1428,7 @@ UnknownText_0x1c5bac: ; 0x1c5bac
prompt
; 0x1c5bcd
UnknownText_0x1c5bcd: ; 0x1c5bcd
Text_RepelUsedEarlierIsStillInEffect: ; 0x1c5bcd
text "The REPEL used"
line "earlier is still"
cont "in effect."
@@ -1480,26 +1480,26 @@ UnknownText_0x1c5c89: ; 0x1c5c89
db "@"
; 0x1c5c8a
UnknownText_0x1c5c8a: ; 0x1c5c8a
Text_RaiseThePPOfWhichMove: ; 0x1c5c8a
text "Raise the PP of"
line "which move?"
done
; 0x1c5ca7
UnknownText_0x1c5ca7: ; 0x1c5ca7
Text_RestoreThePPOfWhichMove: ; 0x1c5ca7
text "Restore the PP of"
line "which move?"
done
; 0x1c5cc6
UnknownText_0x1c5cc6: ; 0x1c5cc6
Text_PPIsMaxedOut: ; 0x1c5cc6
text_from_ram StringBuffer2
text "'s PP"
line "is maxed out."
prompt
; 0x1c5cdd
UnknownText_0x1c5cdd: ; 0x1c5cdd
Text_PPsIncreased: ; 0x1c5cdd
text_from_ram StringBuffer2
text "'s PP"
line "increased."
@@ -1674,7 +1674,7 @@ UnknownText_0x1c5fd1: ; 0x1c5fd1
prompt
; 0x1c5fde
UnknownText_0x1c5fde: ; 0x1c5fde
Text_DSTIsThatOK: ; 0x1c5fde
text " DST,"
line "is that OK?"
done