diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-01 12:36:38 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-01 12:36:38 -0500 |
| commit | 6220200f0f223a4077fcc716c105c01f3e1d3691 (patch) | |
| tree | e126a16a5849f6fcf35964025587e9690e810d69 /engine/battle/core.asm | |
| parent | 4a323cf591f27c928acc295f0044ff1608ebada1 (diff) | |
Identify some more labels, and make some more consistent
Diffstat (limited to 'engine/battle/core.asm')
| -rw-r--r-- | engine/battle/core.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index f84864a95..39e4e165b 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -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 |