mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Make reviewed fixes; standardize on " + "
This commit is contained in:
parent
8498394701
commit
c9cb67141b
@ -2422,7 +2422,7 @@ _PlayCry::
|
||||
add hl, bc
|
||||
ld a, [wCryLength]
|
||||
ld [hli], a
|
||||
ld a, [wCryLength+1]
|
||||
ld a, [wCryLength + 1]
|
||||
ld [hl], a
|
||||
.start
|
||||
call StartChannel
|
||||
|
@ -1155,7 +1155,7 @@ Text_BreedingIsNotPossible::
|
||||
UnknownText_0x1bd0d8::
|
||||
text "The compatibility"
|
||||
line "is @"
|
||||
deciram wBreedingCompatibility , 1, 3
|
||||
deciram wBreedingCompatibility, 1, 3
|
||||
text "."
|
||||
cont "Should they breed?"
|
||||
done
|
||||
|
@ -5989,7 +5989,7 @@ LoadEnemyMon:
|
||||
; Used for Ho-Oh, Lugia and Snorlax encounters
|
||||
ld a, [wBattleType]
|
||||
cp BATTLETYPE_FORCEITEM
|
||||
ld a, [wBaseItems]
|
||||
ld a, [wBaseItem1]
|
||||
jr z, .UpdateItem
|
||||
|
||||
; Failing that, it's all up to chance
|
||||
@ -6007,9 +6007,9 @@ LoadEnemyMon:
|
||||
; From there, an 8% chance for Item2
|
||||
call BattleRandom
|
||||
cp 8 percent ; 8% of 25% = 2% Item2
|
||||
ld a, [wBaseItems]
|
||||
ld a, [wBaseItem1]
|
||||
jr nc, .UpdateItem
|
||||
ld a, [wBaseItems+1]
|
||||
ld a, [wBaseItem2]
|
||||
|
||||
.UpdateItem:
|
||||
ld [wEnemyMonItem], a
|
||||
|
@ -157,21 +157,21 @@ DrawEnemyHUDBorder:
|
||||
.tiles_end
|
||||
|
||||
PlaceHUDBorderTiles:
|
||||
ld a, [wTrainerHUDTiles+0]
|
||||
ld a, [wTrainerHUDTiles + 0]
|
||||
ld [hl], a
|
||||
ld bc, SCREEN_WIDTH
|
||||
add hl, bc
|
||||
ld a, [wTrainerHUDTiles+1]
|
||||
ld a, [wTrainerHUDTiles + 1]
|
||||
ld [hl], a
|
||||
ld b, 8
|
||||
.loop
|
||||
add hl, de
|
||||
ld a, [wTrainerHUDTiles+3]
|
||||
ld a, [wTrainerHUDTiles + 3]
|
||||
ld [hl], a
|
||||
dec b
|
||||
jr nz, .loop
|
||||
add hl, de
|
||||
ld a, [wTrainerHUDTiles+2]
|
||||
ld a, [wTrainerHUDTiles + 2]
|
||||
ld [hl], a
|
||||
ret
|
||||
|
||||
|
@ -377,7 +377,7 @@ ParseCredits:
|
||||
push de
|
||||
ld a, [wCreditsPos]
|
||||
ld e, a
|
||||
ld a, [wCreditsPos+1]
|
||||
ld a, [wCreditsPos + 1]
|
||||
ld d, a
|
||||
ld hl, CreditsScript
|
||||
add hl, de
|
||||
@ -386,7 +386,7 @@ ParseCredits:
|
||||
ld a, e
|
||||
ld [wCreditsPos], a
|
||||
ld a, d
|
||||
ld [wCreditsPos+1], a
|
||||
ld [wCreditsPos + 1], a
|
||||
ld a, [hl]
|
||||
pop de
|
||||
pop hl
|
||||
|
@ -983,7 +983,7 @@ PlayerEventScriptPointers:
|
||||
dba Script_OverworldWhiteout ; PLAYEREVENT_WHITEOUT
|
||||
dba HatchEggScript ; PLAYEREVENT_HATCH
|
||||
dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING
|
||||
dba Invalid_0x96c2d ; 10
|
||||
dba Invalid_0x96c2d ; (NUM_PLAYER_EVENTS)
|
||||
|
||||
Invalid_0x96c2d:
|
||||
end
|
||||
|
@ -213,7 +213,7 @@ GetJoypad::
|
||||
ld a, l
|
||||
ld [wAutoInputAddress], a
|
||||
ld a, h
|
||||
ld [wAutoInputAddress+1], a
|
||||
ld [wAutoInputAddress + 1], a
|
||||
jr .finishauto
|
||||
|
||||
.stopauto
|
||||
@ -235,7 +235,7 @@ StartAutoInput::
|
||||
ld a, l
|
||||
ld [wAutoInputAddress], a
|
||||
ld a, h
|
||||
ld [wAutoInputAddress+1], a
|
||||
ld [wAutoInputAddress + 1], a
|
||||
; Start reading the stream immediately.
|
||||
xor a
|
||||
ld [wAutoInputLength], a
|
||||
@ -254,7 +254,7 @@ StopAutoInput::
|
||||
xor a
|
||||
ld [wAutoInputBank], a
|
||||
ld [wAutoInputAddress], a
|
||||
ld [wAutoInputAddress+1], a
|
||||
ld [wAutoInputAddress + 1], a
|
||||
ld [wAutoInputLength], a
|
||||
; Back to normal input.
|
||||
ld [wInputType], a
|
||||
|
@ -39,7 +39,7 @@ Predef::
|
||||
ld a, h
|
||||
ld [wPredefTemp], a
|
||||
ld a, l
|
||||
ld [wPredefTemp+1], a
|
||||
ld [wPredefTemp + 1], a
|
||||
|
||||
pop hl
|
||||
ld a, h
|
||||
|
@ -3367,7 +3367,7 @@ Function119987:
|
||||
ret
|
||||
|
||||
Function1199b4:
|
||||
ld a, [w3_d081+1]
|
||||
ld a, [w3_d081 + 1]
|
||||
and a
|
||||
jr nz, .asm_1199c7
|
||||
ld a, [w3_d081]
|
||||
|
Loading…
Reference in New Issue
Block a user