Sync code with wiki

This commit is contained in:
Rangi
2018-02-04 13:16:40 -05:00
parent 6c405e3859
commit d6b00d0cc1
9 changed files with 25 additions and 25 deletions

View File

@@ -4431,7 +4431,7 @@ HandleHPHealingItem: ; 3dd2f
ld c, a
dec de
ld a, [de]
adc $0
adc 0
ld [wBuffer6], a
ld b, a
ld a, [hld]

View File

@@ -4011,25 +4011,25 @@ BattleCommand_Poison: ; 35f2c
ld a, [hBattleTurn]
and a
jr z, .mimic_random
jr z, .dont_sample_failure
ld a, [wLinkMode]
and a
jr nz, .mimic_random
jr nz, .dont_sample_failure
ld a, [wInBattleTowerBattle]
and a
jr nz, .mimic_random
jr nz, .dont_sample_failure
ld a, [wPlayerSubStatus5]
bit SUBSTATUS_LOCK_ON, a
jr nz, .mimic_random
jr nz, .dont_sample_failure
call BattleRandom
cp 25 percent + 1 ; 25% chance AI fails
jr c, .failed
.mimic_random
.dont_sample_failure
call CheckSubstituteOpp
jr nz, .failed
ld a, [wAttackMissed]
@@ -6364,7 +6364,7 @@ BattleCommand_Paralyze: ; 36dc7
jr nz, .dont_sample_failure
call BattleRandom
cp 1 + 25 percent
cp 25 percent + 1 ; 25% chance AI fails
jr c, .failed
.dont_sample_failure

View File

@@ -618,7 +618,7 @@ HDMATransfer_OnlyTopFourRows: ; 104303
add BG_MAP_WIDTH - SCREEN_WIDTH
ld l, a
ld a, h
adc $0
adc 0
ld h, a
dec b
jr nz, .outer_loop

View File

@@ -85,7 +85,7 @@ ReturnFromMapSetupScript:: ; b8000
ret z
cp POWER_PLANT
ret z
ld a, $1
ld a, 1
and a
ret
; b8089

View File

@@ -14,7 +14,7 @@ SwapTextboxPalettes:: ; 4c000
add [hl]
ld l, a
ld a, [wTilesetPalettes + 1]
adc $0
adc 0
ld h, a
ld a, [hl]
and $f
@@ -25,7 +25,7 @@ SwapTextboxPalettes:: ; 4c000
add [hl]
ld l, a
ld a, [wTilesetPalettes + 1]
adc $0
adc 0
ld h, a
ld a, [hl]
swap a
@@ -58,7 +58,7 @@ ScrollBGMapPalettes:: ; 4c03f
add [hl]
ld l, a
ld a, [wTilesetPalettes + 1]
adc $0
adc 0
ld h, a
ld a, [hl]
and $f
@@ -69,7 +69,7 @@ ScrollBGMapPalettes:: ; 4c03f
add [hl]
ld l, a
ld a, [wTilesetPalettes + 1]
adc $0
adc 0
ld h, a
ld a, [hl]
swap a

View File

@@ -867,7 +867,7 @@ Function104ed6: ; 104ed6 (41:4ed6)
add e
ld [hPrintNum5], a
ld a, [hPrintNum6]
adc $0
adc 0
ld [hPrintNum6], a
.asm_104f02
xor a
@@ -1045,7 +1045,7 @@ Function104faf: ; 104faf (41:4faf)
add e
ld [hPrintNum5], a
ld a, [hPrintNum6]
adc $0
adc 0
ld [hPrintNum6], a
jr .asm_104fd2
.asm_10501a