pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Make reviewed fixes; standardize on " + "

Browse Source
This commit is contained in:
Rangi 2018-07-29 01:40:23 -04:00
parent 8498394701
commit c9cb67141b
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/engine.asm
View File

@ -2422,7 +2422,7 @@ _PlayCry::
add hl, bc add hl, bc
ld a, [wCryLength] ld a, [wCryLength]
ld [hli], a ld [hli], a
ld a, [wCryLength+1] ld a, [wCryLength + 1]
ld [hl], a ld [hl], a
.start .start
call StartChannel call StartChannel

2
data/text/common_1.asm
View File

@ -1155,7 +1155,7 @@ Text_BreedingIsNotPossible::
UnknownText_0x1bd0d8:: UnknownText_0x1bd0d8::
text "The compatibility" text "The compatibility"
line "is @" line "is @"
deciram wBreedingCompatibility , 1, 3 deciram wBreedingCompatibility, 1, 3
text "." text "."
cont "Should they breed?" cont "Should they breed?"
done done

6
engine/battle/core.asm
View File

@ -5989,7 +5989,7 @@ LoadEnemyMon:
; Used for Ho-Oh, Lugia and Snorlax encounters ; Used for Ho-Oh, Lugia and Snorlax encounters
ld a, [wBattleType] ld a, [wBattleType]
cp BATTLETYPE_FORCEITEM cp BATTLETYPE_FORCEITEM
ld a, [wBaseItems] ld a, [wBaseItem1]
jr z, .UpdateItem jr z, .UpdateItem
; Failing that, it's all up to chance ; Failing that, it's all up to chance
@ -6007,9 +6007,9 @@ LoadEnemyMon:
; From there, an 8% chance for Item2 ; From there, an 8% chance for Item2
call BattleRandom call BattleRandom
cp 8 percent ; 8% of 25% = 2% Item2 cp 8 percent ; 8% of 25% = 2% Item2
ld a, [wBaseItems] ld a, [wBaseItem1]
jr nc, .UpdateItem jr nc, .UpdateItem
ld a, [wBaseItems+1] ld a, [wBaseItem2]
.UpdateItem: .UpdateItem:
ld [wEnemyMonItem], a ld [wEnemyMonItem], a

8
engine/battle/trainer_huds.asm
View File

@ -157,21 +157,21 @@ DrawEnemyHUDBorder:
.tiles_end .tiles_end
PlaceHUDBorderTiles: PlaceHUDBorderTiles:
ld a, [wTrainerHUDTiles+0] ld a, [wTrainerHUDTiles + 0]
ld [hl], a ld [hl], a
ld bc, SCREEN_WIDTH ld bc, SCREEN_WIDTH
add hl, bc add hl, bc
ld a, [wTrainerHUDTiles+1] ld a, [wTrainerHUDTiles + 1]
ld [hl], a ld [hl], a
ld b, 8 ld b, 8
.loop .loop
add hl, de add hl, de
ld a, [wTrainerHUDTiles+3] ld a, [wTrainerHUDTiles + 3]
ld [hl], a ld [hl], a
dec b dec b
jr nz, .loop jr nz, .loop
add hl, de add hl, de
ld a, [wTrainerHUDTiles+2] ld a, [wTrainerHUDTiles + 2]
ld [hl], a ld [hl], a
ret ret

4
engine/movie/credits.asm
View File

@ -377,7 +377,7 @@ ParseCredits:
push de push de
ld a, [wCreditsPos] ld a, [wCreditsPos]
ld e, a ld e, a
ld a, [wCreditsPos+1] ld a, [wCreditsPos + 1]
ld d, a ld d, a
ld hl, CreditsScript ld hl, CreditsScript
add hl, de add hl, de
@ -386,7 +386,7 @@ ParseCredits:
ld a, e ld a, e
ld [wCreditsPos], a ld [wCreditsPos], a
ld a, d ld a, d
ld [wCreditsPos+1], a ld [wCreditsPos + 1], a
ld a, [hl] ld a, [hl]
pop de pop de
pop hl pop hl

2
engine/overworld/events.asm
View File

@ -983,7 +983,7 @@ PlayerEventScriptPointers:
dba Script_OverworldWhiteout ; PLAYEREVENT_WHITEOUT dba Script_OverworldWhiteout ; PLAYEREVENT_WHITEOUT
dba HatchEggScript ; PLAYEREVENT_HATCH dba HatchEggScript ; PLAYEREVENT_HATCH
dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING
dba Invalid_0x96c2d ; 10 dba Invalid_0x96c2d ; (NUM_PLAYER_EVENTS)
Invalid_0x96c2d: Invalid_0x96c2d:
end end

6
home/joypad.asm
View File

@ -213,7 +213,7 @@ GetJoypad::
ld a, l ld a, l
ld [wAutoInputAddress], a ld [wAutoInputAddress], a
ld a, h ld a, h
ld [wAutoInputAddress+1], a ld [wAutoInputAddress + 1], a
jr .finishauto jr .finishauto
.stopauto .stopauto
@ -235,7 +235,7 @@ StartAutoInput::
ld a, l ld a, l
ld [wAutoInputAddress], a ld [wAutoInputAddress], a
ld a, h ld a, h
ld [wAutoInputAddress+1], a ld [wAutoInputAddress + 1], a
; Start reading the stream immediately. ; Start reading the stream immediately.
xor a xor a
ld [wAutoInputLength], a ld [wAutoInputLength], a
@ -254,7 +254,7 @@ StopAutoInput::
xor a xor a
ld [wAutoInputBank], a ld [wAutoInputBank], a
ld [wAutoInputAddress], a ld [wAutoInputAddress], a
ld [wAutoInputAddress+1], a ld [wAutoInputAddress + 1], a
ld [wAutoInputLength], a ld [wAutoInputLength], a
; Back to normal input. ; Back to normal input.
ld [wInputType], a ld [wInputType], a

2
home/predef.asm
View File

@ -39,7 +39,7 @@ Predef::
ld a, h ld a, h
ld [wPredefTemp], a ld [wPredefTemp], a
ld a, l ld a, l
ld [wPredefTemp+1], a ld [wPredefTemp + 1], a
pop hl pop hl
ld a, h ld a, h

2
mobile/mobile_46.asm
View File

@ -3367,7 +3367,7 @@ Function119987:
ret ret
Function1199b4: Function1199b4:
ld a, [w3_d081+1] ld a, [w3_d081 + 1]
and a and a
jr nz, .asm_1199c7 jr nz, .asm_1199c7
ld a, [w3_d081] ld a, [w3_d081]