summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-02-04 13:16:40 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-02-04 13:16:40 -0500
commitd6b00d0cc177b3a94b477735fd165232614a6cee (patch)
treedc8eb88735ac8508cda3c31a510a6644d752bdac
parent6c405e38598309bd090bb325a45f135e08b47a6f (diff)
Sync code with wiki
-rw-r--r--engine/battle/core.asm2
-rw-r--r--engine/battle/effect_commands.asm12
-rwxr-xr-xengine/dma_transfer.asm2
-rw-r--r--engine/events/map_name_sign.asm2
-rw-r--r--engine/map_palettes.asm8
-rwxr-xr-xengine/mystery_gift.asm4
-rw-r--r--lib/mobile/main.asm16
-rwxr-xr-xmobile/mobile_12.asm2
-rwxr-xr-xmobile/mobile_46.asm2
9 files changed, 25 insertions, 25 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 11016b8af..419129e10 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -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]
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm
index d4a3c9446..5a0c130bd 100644
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -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
diff --git a/engine/dma_transfer.asm b/engine/dma_transfer.asm
index b4a500545..e22adf69a 100755
--- a/engine/dma_transfer.asm
+++ b/engine/dma_transfer.asm
@@ -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
diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm
index b97d40798..385ddf802 100644
--- a/engine/events/map_name_sign.asm
+++ b/engine/events/map_name_sign.asm
@@ -85,7 +85,7 @@ ReturnFromMapSetupScript:: ; b8000
ret z
cp POWER_PLANT
ret z
- ld a, $1
+ ld a, 1
and a
ret
; b8089
diff --git a/engine/map_palettes.asm b/engine/map_palettes.asm
index f8e23e058..a9d2b382f 100644
--- a/engine/map_palettes.asm
+++ b/engine/map_palettes.asm
@@ -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
diff --git a/engine/mystery_gift.asm b/engine/mystery_gift.asm
index 62332da05..9ffe1aa0e 100755
--- a/engine/mystery_gift.asm
+++ b/engine/mystery_gift.asm
@@ -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
diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm
index ef0b0edf3..a2ac008ca 100644
--- a/lib/mobile/main.asm
+++ b/lib/mobile/main.asm
@@ -60,7 +60,7 @@ Function11000f: ; 11000f
add c
ld c, a
ld a, b
- adc $0
+ adc 0
ld b, a
ret
; 110029
@@ -1667,7 +1667,7 @@ Function110af4: ; 110af4
add c
ld [hli], a
ld a, b
- adc $0
+ adc 0
ld [hl], a
xor a
ld [$c993], a
@@ -1708,8 +1708,8 @@ Function110af4: ; 110af4
ld a, [$c993]
add e
ld [hli], a
- ld a, $0
- adc $0
+ ld a, 0
+ adc 0
ld [hl], a
xor a
ld [$c993], a
@@ -2495,8 +2495,8 @@ Function111044: ; 111044
ld a, [$c991]
add e
ld [hli], a
- ld a, $0
- adc $0
+ ld a, 0
+ adc 0
ld [hl], a
xor a
ld [$c991], a
@@ -6829,7 +6829,7 @@ Function112bec: ; 112bec
add c
ld [$c82d], a
ld a, [$c82e]
- adc $0
+ adc 0
ld [$c82e], a
ld hl, $c829
ld a, e
@@ -7549,7 +7549,7 @@ Function113095: ; 113095
add b
ld [hli], a
ld a, [hl]
- adc $0
+ adc 0
ld [hl], a
ld c, b
pop hl
diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm
index c9f4f56e0..9e2e35dec 100755
--- a/mobile/mobile_12.asm
+++ b/mobile/mobile_12.asm
@@ -1798,7 +1798,7 @@ Function48d4a: ; 48d4a (12:4d4a)
add e
ld c, a
ld a, b
- adc $0
+ adc 0
ld b, a
ld a, c
ld [hld], a
diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm
index e8a69a7de..03f0a2380 100755
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -7714,7 +7714,7 @@ Function11b879: ; 11b879
ld e, a
ld a, h
cpl
- adc $0
+ adc 0
ld d, a
pop hl
add hl, de