diff options
| author | yenatch <yenatch@gmail.com> | 2018-06-30 17:50:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-30 17:50:33 -0400 |
| commit | 2641f93ad084b1329b3f3b9f7c8c222445fc4832 (patch) | |
| tree | fb048bbc8bb7257dbd8169e2442117da5d2b30d2 /home/battle.asm | |
| parent | 91f914718a263839daef24d44eda857bfc7cca95 (diff) | |
| parent | da5125e1411f9599b883181c5ee6e31252d37ac8 (diff) | |
Merge pull request #534 from Rangi42/master
[RTM] Fix triple newlines left over from removing address comments, and other improvements
Diffstat (limited to 'home/battle.asm')
| -rw-r--r-- | home/battle.asm | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/home/battle.asm b/home/battle.asm index 1899a40dc..e88adef02 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -9,7 +9,6 @@ UserPartyAttr:: pop af jr OTPartyAttr - OpponentPartyAttr:: push af ld a, [hBattleTurn] @@ -21,7 +20,6 @@ OpponentPartyAttr:: pop af jr OTPartyAttr - BattlePartyAttr:: ; Get attribute a from the party struct of the active battle mon. push bc @@ -34,7 +32,6 @@ BattlePartyAttr:: pop bc ret - OTPartyAttr:: ; Get attribute a from the party struct of the active enemy mon. push bc @@ -47,7 +44,6 @@ OTPartyAttr:: pop bc ret - ResetDamage:: xor a ld [wCurDamage], a @@ -64,7 +60,6 @@ SetEnemyTurn:: ld [hBattleTurn], a ret - UpdateOpponentInParty:: ld a, [hBattleTurn] and a @@ -110,7 +105,6 @@ UpdateEnemyMonInParty:: ld bc, wEnemyMonMaxHP - wEnemyMonLevel jp CopyBytes - RefreshBattleHuds:: call UpdateBattleHuds ld c, 3 @@ -122,10 +116,8 @@ UpdateBattleHuds:: farcall UpdateEnemyHUD ret - INCLUDE "home/battle_vars.asm" - FarCopyRadioText:: inc hl ld a, [hROMBank] @@ -149,12 +141,7 @@ FarCopyRadioText:: ld [MBC3RomBank], a ret - MobileTextBorder:: - -CELL_PHONE_TOP EQU $5e -CELL_PHONE_BOTTOM EQU $5f - ; For mobile link battles only. ld a, [wLinkMode] cp LINK_MOBILE @@ -163,12 +150,11 @@ CELL_PHONE_BOTTOM EQU $5f ; Draw a cell phone icon at the ; top right corner of the border. hlcoord 19, 12 - ld [hl], CELL_PHONE_TOP + ld [hl], $5e ; top hlcoord 19, 13 - ld [hl], CELL_PHONE_BOTTOM + ld [hl], $5f ; bottom ret - BattleTextBox:: ; Open a textbox and print text at hl. push hl @@ -180,7 +166,6 @@ BattleTextBox:: call PrintTextBoxText ret - StdBattleTextBox:: ; Open a textbox and print battle text at 20:hl. @@ -197,7 +182,6 @@ StdBattleTextBox:: ret GetBattleAnimPointer:: - ld a, BANK(BattleAnimations) rst Bankswitch @@ -212,7 +196,6 @@ GetBattleAnimPointer:: ret GetBattleAnimByte:: - push hl push de |