summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-11-05 15:17:48 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2020-11-05 15:17:48 -0500
commited7a2d49d75e3bdd7ecab907574d7cb51f1c81fa (patch)
tree9db96d68320a57375b499c4f9ca27b862d0dd010
parent472f5824a65eaa76f6c92e66bfabb1a1eac66442 (diff)
Remove trailing whitespace
-rwxr-xr-xdata/maps/special_warps.asm6
-rwxr-xr-xengine/battle/core.asm2
-rwxr-xr-xengine/items/item_effects.asm2
-rw-r--r--engine/math/bcd.asm4
-rwxr-xr-xengine/minigame/surfing_pikachu.asm2
-rwxr-xr-xengine/movie/title.asm10
-rwxr-xr-xengine/pikachu/pikachu_movement.asm2
-rw-r--r--engine/pokemon/add_mon.asm2
-rwxr-xr-xwram.asm12
9 files changed, 21 insertions, 21 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/engine/battle/core.asm b/engine/battle/core.asm
index 804625cd..ac9676ec 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -4642,7 +4642,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/items/item_effects.asm b/engine/items/item_effects.asm
index f8a388d5..00a575f1 100755
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -386,7 +386,7 @@ ItemUseBall:
ldh [hDivisor], a
ld b, 4
call Divide
-
+
; Determine Status2.
; no status ailment: Status2 = 0
; Burn/Paralysis/Poison: Status2 = 5
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/minigame/surfing_pikachu.asm b/engine/minigame/surfing_pikachu.asm
index 6d319867..641c4f62 100755
--- a/engine/minigame/surfing_pikachu.asm
+++ b/engine/minigame/surfing_pikachu.asm
@@ -1689,7 +1689,7 @@ SurfingMinigame_WriteTotal:
.Total:
db $2b,$2c,$25,$28,$2d ; Total
-
+
DidPlayerGetAHighScore:
ld hl, wSurfingMinigameHiScore + 1
ld a, [wSurfingMinigameTotalScore + 1]
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index 0b421d89..11852ae4 100755
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -254,7 +254,7 @@ CopyrightTextString:
TitleScreen_PlayPikachuPCM:
callfar PlayPikachuSoundClip
ret
-
+
DoTitleScreenFunction:
call .CheckTimer
ld a, [wTitleScreenScene]
@@ -268,7 +268,7 @@ DoTitleScreenFunction:
ld l, a
jp hl
-
+
.Jumptable:
dw .Nop
dw .BlinkHalf
@@ -282,13 +282,13 @@ DoTitleScreenFunction:
dw .BlinkWait
dw .BlinkOpen
dw .GoBackToStart
-
+
.GoBackToStart:
xor a
ld [wTitleScreenScene], a
.Nop
ret
-
+
.BlinkOpen:
ld e, 0
jr .LoadBlinkFrame
@@ -316,7 +316,7 @@ DoTitleScreenFunction:
ld hl, wTitleScreenScene
inc [hl]
ret
-
+
.CheckTimer:
ld hl, wTitleScreenTimer
ld a, [hl]
diff --git a/engine/pikachu/pikachu_movement.asm b/engine/pikachu/pikachu_movement.asm
index 6b912e61..91c16999 100755
--- a/engine/pikachu/pikachu_movement.asm
+++ b/engine/pikachu/pikachu_movement.asm
@@ -866,7 +866,7 @@ LoadPikachuShadowOAMData:
push bc
push de
push hl
-
+
ld bc, wOAMBuffer + 4 * 36
ld a, [wPikaSpriteY]
ld e, a
diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm
index 52230099..54d7b4de 100644
--- a/engine/pokemon/add_mon.asm
+++ b/engine/pokemon/add_mon.asm
@@ -436,7 +436,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
diff --git a/wram.asm b/wram.asm
index 5ff2cebe..35b5f61f 100755
--- a/wram.asm
+++ b/wram.asm
@@ -2755,8 +2755,8 @@ wExpressionNumber::
ds 1
wPikaPicAnimNumber::
ds 1
-
-wPikachuMovementScriptBank:: ds 1
+
+wPikachuMovementScriptBank:: ds 1
wPikachuMovementScriptAddress:: dw
wPikachuMovementFlags::
; bit 6 - spawn shadow
@@ -2818,11 +2818,11 @@ wd475:: ds 1
wd47a:: ds 1
ds 24
-
+
wd492:: ds 1
-
+
ds 1
-
+
wSurfingMinigameHiScore:: ds 2 ; 4-digit BCD little-endian
ds 1
@@ -3401,7 +3401,7 @@ wGrassMons::
wSerialEnemyDataBlock::
ds 9
-wEnemyPartyCount:: ds 1
+wEnemyPartyCount:: ds 1
wEnemyPartyMons:: ds PARTY_LENGTH + 1
; Overload enemy party data