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

Identify some more labels, and make some more consistent

Browse Source
This commit is contained in:
Rangi
2020-11-01 12:36:38 -05:00
parent 4a323cf591
commit 6220200f0f
18 changed files with 121 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
engine/battle/core.asm
View File

@@ -7616,7 +7616,7 @@ SendOutMonText:
and a
jr z, .not_linked
ld hl, JumpText_GoMon ; If we're in a LinkBattle print just "Go <PlayerMon>"
ld hl, GoMonText ; If we're in a LinkBattle print just "Go <PlayerMon>"
ld a, [wBattleHasJustStarted] ; unless this (unidentified) variable is set
and a
@@ -7627,7 +7627,7 @@ SendOutMonText:
ld hl, wEnemyMonHP
ld a, [hli]
or [hl]
ld hl, JumpText_GoMon
ld hl, GoMonText
jr z, .skip_to_textbox
; compute enemy helth remaining as a percentage
@@ -7656,41 +7656,41 @@ SendOutMonText:
call Divide
ldh a, [hQuotient + 3]
ld hl, JumpText_GoMon
ld hl, GoMonText
cp 70
jr nc, .skip_to_textbox
ld hl, JumpText_DoItMon
ld hl, DoItMonText
cp 40
jr nc, .skip_to_textbox
ld hl, JumpText_GoForItMon
ld hl, GoForItMonText
cp 10
jr nc, .skip_to_textbox
ld hl, JumpText_YourFoesWeakGetmMon
ld hl, YourFoesWeakGetmMonText
.skip_to_textbox
jp BattleTextbox
JumpText_GoMon:
text_far Text_GoMon
GoMonText:
text_far _GoMonText
text_asm
jr Function_TextJump_BattleMonNick01
jr PrepareBattleMonNicknameText
JumpText_DoItMon:
text_far Text_DoItMon
DoItMonText:
text_far _DoItMonText
text_asm
jr Function_TextJump_BattleMonNick01
jr PrepareBattleMonNicknameText
JumpText_GoForItMon:
text_far Text_GoForItMon
GoForItMonText:
text_far _GoForItMonText
text_asm
jr Function_TextJump_BattleMonNick01
jr PrepareBattleMonNicknameText
JumpText_YourFoesWeakGetmMon:
text_far Text_YourFoesWeakGetmMon
YourFoesWeakGetmMonText:
text_far _YourFoesWeakGetmMonText
text_asm
Function_TextJump_BattleMonNick01:
PrepareBattleMonNicknameText:
ld hl, BattleMonNicknameText
ret
@@ -7703,7 +7703,7 @@ WithdrawMonText:
jp BattleTextbox
.WithdrawMonText:
text_far Text_BattleMonNickComma
text_far _BattleMonNickCommaText
text_asm
; Print text to withdraw mon
; depending on HP the message is different

3
engine/battle/read_trainer_party.asm
View File

@@ -380,7 +380,8 @@ CopyTrainerName:
pop de
ret
Function39990: ; unreferenced
IncompleteCopyNameFunction: ; unreferenced
; Copy of CopyTrainerName but without "call CopyBytes"
ld de, wStringBuffer1
push de
ld bc, NAME_LENGTH