diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 15:17:39 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 15:17:39 -0500 |
| commit | 2a4b8b5a248065d2ef80b9960228750112f30da5 (patch) | |
| tree | 0f4d2992bc3d34ce91a28f05ec29e27b4cf29774 | |
| parent | 2db54ecb9b2ec41dd40318395f69814af64f6f7b (diff) | |
Remove trailing whitespace
| -rwxr-xr-x | data/maps/special_warps.asm | 6 | ||||
| -rwxr-xr-x | data/trainers/special_moves.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 2 | ||||
| -rw-r--r-- | engine/math/bcd.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/add_mon.asm | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/special_warps.asm b/data/maps/special_warps.asm index 80f88cc4..56dac3a5 100755 --- a/data/maps/special_warps.asm +++ b/data/maps/special_warps.asm @@ -48,11 +48,11 @@ FirstMapSpec: special_warp_spec REDS_HOUSE_2F, 3, 6, REDS_HOUSE_2 TradeCenterSpec1: special_warp_spec TRADE_CENTER, 3, 4, CLUB -TradeCenterSpec2: +TradeCenterSpec2: special_warp_spec TRADE_CENTER, 6, 4, CLUB -ColosseumSpec1: +ColosseumSpec1: special_warp_spec COLOSSEUM, 3, 4, CLUB -ColosseumSpec2: +ColosseumSpec2: special_warp_spec COLOSSEUM, 6, 4, CLUB diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index da19f587..b797d1c7 100755 --- a/data/trainers/special_moves.asm +++ b/data/trainers/special_moves.asm @@ -1,6 +1,6 @@ ; unique moves for gym leaders ; this is not automatic! you have to write the index you want to [wLoneAttackNo] -; first. e.g., erika's script writes 4 to [wLoneAttackNo] to get mega drain, +; first. e.g., erika's script writes 4 to [wLoneAttackNo] to get mega drain, ; the fourth entry in the list. LoneMoves: ; pokemon index, move to give nth pokemon diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 96e7f360..b9985b6b 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -4485,7 +4485,7 @@ CalculateDamage: ld b, 4 call Divide -; Update wCurDamage. +; Update wCurDamage. ; Capped at MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE: 999 - 2 = 997. ld hl, wDamage ld b, [hl] diff --git a/engine/math/bcd.asm b/engine/math/bcd.asm index 92bf6f17..5747a684 100644 --- a/engine/math/bcd.asm +++ b/engine/math/bcd.asm @@ -13,7 +13,7 @@ DivideBCD:: ldh [hDivideBCDBuffer+1], a ldh [hDivideBCDBuffer+2], a ld d, $1 -.mulBy10Loop +.mulBy10Loop ; multiply the divisor by 10 until the leading digit is nonzero ; to set up the standard long division algorithm ldh a, [hDivideBCDDivisor] @@ -108,7 +108,7 @@ DivideBCD:: ldh a, [hDivideBCDBuffer+2] ldh [hDivideBCDQuotient+2], a pop de - ld a, $6 + ld a, $6 sub d and a ret z diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm index d7e7eab1..c49a0a77 100644 --- a/engine/pokemon/add_mon.asm +++ b/engine/pokemon/add_mon.asm @@ -430,7 +430,7 @@ _MoveMon:: cp PARTY_TO_DAYCARE ld de, wDayCareMonOT jr z, .findOTsrc - dec a + dec a ld hl, wPartyMonOT ld a, [wPartyCount] jr nz, .addOToffset |