You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
text_jump → text_far
The previous name for this was rather misleading. It isn't an actual jump like you'd expect the `jp` instruction to behave as. Instead, it behaves more like a `farcall`. This also makes it consistent with its current command ID name of `TX_FAR`.
This commit is contained in:
@@ -708,7 +708,7 @@ AI_Switch:
|
||||
ret
|
||||
|
||||
TextJump_EnemyWithdrew:
|
||||
text_jump Text_EnemyWithdrew
|
||||
text_far Text_EnemyWithdrew
|
||||
db "@"
|
||||
|
||||
Function384d5: ; This appears to be unused
|
||||
@@ -828,5 +828,5 @@ PrintText_UsedItemOn:
|
||||
jp PrintText
|
||||
|
||||
TextJump_EnemyUsedOn:
|
||||
text_jump Text_EnemyUsedOn
|
||||
text_far Text_EnemyUsedOn
|
||||
db "@"
|
||||
|
@@ -7398,7 +7398,7 @@ BoostExp:
|
||||
ret
|
||||
|
||||
Text_MonGainedExpPoint:
|
||||
text_jump Text_Gained
|
||||
text_far Text_Gained
|
||||
start_asm
|
||||
ld hl, TextJump_StringBuffer2ExpPoints
|
||||
ld a, [wStringBuffer2 + 2] ; IsTradedMon
|
||||
@@ -7409,11 +7409,11 @@ Text_MonGainedExpPoint:
|
||||
ret
|
||||
|
||||
TextJump_ABoostedStringBuffer2ExpPoints:
|
||||
text_jump Text_ABoostedStringBuffer2ExpPoints
|
||||
text_far Text_ABoostedStringBuffer2ExpPoints
|
||||
db "@"
|
||||
|
||||
TextJump_StringBuffer2ExpPoints:
|
||||
text_jump Text_StringBuffer2ExpPoints
|
||||
text_far Text_StringBuffer2ExpPoints
|
||||
db "@"
|
||||
|
||||
AnimateExpBar:
|
||||
@@ -7664,29 +7664,29 @@ SendOutMonText:
|
||||
jp BattleTextBox
|
||||
|
||||
JumpText_GoMon:
|
||||
text_jump Text_GoMon
|
||||
text_far Text_GoMon
|
||||
start_asm
|
||||
jr Function_TextJump_BattleMonNick01
|
||||
|
||||
JumpText_DoItMon:
|
||||
text_jump Text_DoItMon
|
||||
text_far Text_DoItMon
|
||||
start_asm
|
||||
jr Function_TextJump_BattleMonNick01
|
||||
|
||||
JumpText_GoForItMon:
|
||||
text_jump Text_GoForItMon
|
||||
text_far Text_GoForItMon
|
||||
start_asm
|
||||
jr Function_TextJump_BattleMonNick01
|
||||
|
||||
JumpText_YourFoesWeakGetmMon:
|
||||
text_jump Text_YourFoesWeakGetmMon
|
||||
text_far Text_YourFoesWeakGetmMon
|
||||
start_asm
|
||||
Function_TextJump_BattleMonNick01:
|
||||
ld hl, TextJump_BattleMonNick01
|
||||
ret
|
||||
|
||||
TextJump_BattleMonNick01:
|
||||
text_jump Text_BattleMonNick01
|
||||
text_far Text_BattleMonNick01
|
||||
db "@"
|
||||
|
||||
WithdrawMonText:
|
||||
@@ -7694,7 +7694,7 @@ WithdrawMonText:
|
||||
jp BattleTextBox
|
||||
|
||||
.WithdrawMonText:
|
||||
text_jump Text_BattleMonNickComma
|
||||
text_far Text_BattleMonNickComma
|
||||
start_asm
|
||||
; Print text to withdraw mon
|
||||
; depending on HP the message is different
|
||||
@@ -7745,15 +7745,15 @@ WithdrawMonText:
|
||||
ret
|
||||
|
||||
TextJump_ThatsEnoughComeBack:
|
||||
text_jump Text_ThatsEnoughComeBack
|
||||
text_far Text_ThatsEnoughComeBack
|
||||
db "@"
|
||||
|
||||
TextJump_OKComeBack:
|
||||
text_jump Text_OKComeBack
|
||||
text_far Text_OKComeBack
|
||||
db "@"
|
||||
|
||||
TextJump_GoodComeBack:
|
||||
text_jump Text_GoodComeBack
|
||||
text_far Text_GoodComeBack
|
||||
db "@"
|
||||
|
||||
Unreferenced_TextJump_ComeBack:
|
||||
@@ -7762,7 +7762,7 @@ Unreferenced_TextJump_ComeBack:
|
||||
ret
|
||||
|
||||
TextJump_ComeBack:
|
||||
text_jump Text_ComeBack
|
||||
text_far Text_ComeBack
|
||||
db "@"
|
||||
|
||||
Unreferenced_HandleSafariAngerEatingStatus:
|
||||
|
@@ -4542,7 +4542,7 @@ BattleCommand_StatUpMessage:
|
||||
jp BattleTextBox
|
||||
|
||||
.stat
|
||||
text_jump UnknownText_0x1c0cc6
|
||||
text_far UnknownText_0x1c0cc6
|
||||
start_asm
|
||||
ld hl, .up
|
||||
ld a, [wLoweredStat]
|
||||
@@ -4552,11 +4552,11 @@ BattleCommand_StatUpMessage:
|
||||
ret
|
||||
|
||||
.wayup
|
||||
text_jump UnknownText_0x1c0cd0
|
||||
text_far UnknownText_0x1c0cd0
|
||||
db "@"
|
||||
|
||||
.up
|
||||
text_jump UnknownText_0x1c0ce0
|
||||
text_far UnknownText_0x1c0ce0
|
||||
db "@"
|
||||
|
||||
BattleCommand_StatDownMessage:
|
||||
@@ -4572,7 +4572,7 @@ BattleCommand_StatDownMessage:
|
||||
jp BattleTextBox
|
||||
|
||||
.stat
|
||||
text_jump UnknownText_0x1c0ceb
|
||||
text_far UnknownText_0x1c0ceb
|
||||
start_asm
|
||||
ld hl, .fell
|
||||
ld a, [wLoweredStat]
|
||||
@@ -4582,10 +4582,10 @@ BattleCommand_StatDownMessage:
|
||||
ret
|
||||
|
||||
.sharplyfell
|
||||
text_jump UnknownText_0x1c0cf5
|
||||
text_far UnknownText_0x1c0cf5
|
||||
db "@"
|
||||
.fell
|
||||
text_jump UnknownText_0x1c0d06
|
||||
text_far UnknownText_0x1c0d06
|
||||
db "@"
|
||||
|
||||
TryLowerStat:
|
||||
@@ -5636,7 +5636,7 @@ BattleCommand_Charge:
|
||||
jp EndMoveEffect
|
||||
|
||||
.UsedText:
|
||||
text_jump UnknownText_0x1c0d0e ; "<USER>"
|
||||
text_far UnknownText_0x1c0d0e ; "<USER>"
|
||||
start_asm
|
||||
ld a, BATTLE_VARS_MOVE_ANIM
|
||||
call GetBattleVar
|
||||
@@ -5668,32 +5668,32 @@ BattleCommand_Charge:
|
||||
|
||||
.RazorWind:
|
||||
; 'made a whirlwind!'
|
||||
text_jump UnknownText_0x1c0d12
|
||||
text_far UnknownText_0x1c0d12
|
||||
db "@"
|
||||
|
||||
.Solarbeam:
|
||||
; 'took in sunlight!'
|
||||
text_jump UnknownText_0x1c0d26
|
||||
text_far UnknownText_0x1c0d26
|
||||
db "@"
|
||||
|
||||
.SkullBash:
|
||||
; 'lowered its head!'
|
||||
text_jump UnknownText_0x1c0d3a
|
||||
text_far UnknownText_0x1c0d3a
|
||||
db "@"
|
||||
|
||||
.SkyAttack:
|
||||
; 'is glowing!'
|
||||
text_jump UnknownText_0x1c0d4e
|
||||
text_far UnknownText_0x1c0d4e
|
||||
db "@"
|
||||
|
||||
.Fly:
|
||||
; 'flew up high!'
|
||||
text_jump UnknownText_0x1c0d5c
|
||||
text_far UnknownText_0x1c0d5c
|
||||
db "@"
|
||||
|
||||
.Dig:
|
||||
; 'dug a hole!'
|
||||
text_jump UnknownText_0x1c0d6c
|
||||
text_far UnknownText_0x1c0d6c
|
||||
db "@"
|
||||
|
||||
BattleCommand3c:
|
||||
|
@@ -6,7 +6,7 @@ DisplayUsedMoveText:
|
||||
|
||||
UsedMoveText:
|
||||
; this is a stream of text and asm from 105db9 to 105ef6
|
||||
text_jump _ActorNameText
|
||||
text_far _ActorNameText
|
||||
start_asm
|
||||
ldh a, [hBattleTurn]
|
||||
and a
|
||||
@@ -58,12 +58,12 @@ UsedMoveText:
|
||||
ret
|
||||
|
||||
UsedMove1Text:
|
||||
text_jump _UsedMove1Text
|
||||
text_far _UsedMove1Text
|
||||
start_asm
|
||||
jr UsedMoveText_CheckObedience
|
||||
|
||||
UsedMove2Text:
|
||||
text_jump _UsedMove2Text
|
||||
text_far _UsedMove2Text
|
||||
start_asm
|
||||
UsedMoveText_CheckObedience:
|
||||
; check obedience
|
||||
@@ -75,14 +75,14 @@ UsedMoveText_CheckObedience:
|
||||
ret
|
||||
|
||||
.UsedInsteadText:
|
||||
text_jump _UsedInsteadText
|
||||
text_far _UsedInsteadText
|
||||
start_asm
|
||||
.GetMoveNameText:
|
||||
ld hl, MoveNameText
|
||||
ret
|
||||
|
||||
MoveNameText:
|
||||
text_jump _MoveNameText
|
||||
text_far _MoveNameText
|
||||
start_asm
|
||||
; get start address
|
||||
ld hl, .endusedmovetexts
|
||||
@@ -115,19 +115,19 @@ MoveNameText:
|
||||
dw EndUsedMove5Text
|
||||
|
||||
EndUsedMove1Text:
|
||||
text_jump _EndUsedMove1Text
|
||||
text_far _EndUsedMove1Text
|
||||
db "@"
|
||||
EndUsedMove2Text:
|
||||
text_jump _EndUsedMove2Text
|
||||
text_far _EndUsedMove2Text
|
||||
db "@"
|
||||
EndUsedMove3Text:
|
||||
text_jump _EndUsedMove3Text
|
||||
text_far _EndUsedMove3Text
|
||||
db "@"
|
||||
EndUsedMove4Text:
|
||||
text_jump _EndUsedMove4Text
|
||||
text_far _EndUsedMove4Text
|
||||
db "@"
|
||||
EndUsedMove5Text:
|
||||
text_jump _EndUsedMove5Text
|
||||
text_far _EndUsedMove5Text
|
||||
db "@"
|
||||
|
||||
GetMoveGrammar:
|
||||
|
Reference in New Issue
Block a user