diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/core.asm | 2 | ||||
| -rwxr-xr-x | engine/items/item_effects.asm | 2 | ||||
| -rw-r--r-- | engine/math/bcd.asm | 4 | ||||
| -rwxr-xr-x | engine/minigame/surfing_pikachu.asm | 2 | ||||
| -rwxr-xr-x | engine/movie/title.asm | 10 | ||||
| -rwxr-xr-x | engine/pikachu/pikachu_movement.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/add_mon.asm | 2 |
7 files changed, 12 insertions, 12 deletions
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 |