summaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/bank1.asm18
-rw-r--r--src/engine/bank3.asm2
-rw-r--r--src/engine/booster_packs.asm6
-rw-r--r--src/engine/home.asm15
4 files changed, 21 insertions, 20 deletions
diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm
index 985418b..5be8768 100644
--- a/src/engine/bank1.asm
+++ b/src/engine/bank1.asm
@@ -286,7 +286,7 @@ HandleTurn: ; 4225 (1:4225)
call GetTurnDuelistVariable
ld [wcc0d], a
ld a, [wcc06]
- cp a, $02
+ cp $02
jr c, .asm_4237
call $70f6
@@ -322,9 +322,9 @@ Func_4268:
Func_426d:
call $4f9d
ld a, [wcc0d]
- cp a, DUELIST_TYPE_PLAYER
+ cp DUELIST_TYPE_PLAYER
jr z, PrintDuelMenu
- cp a, DUELIST_TYPE_LINK_OPP
+ cp DUELIST_TYPE_LINK_OPP
jp z, $6911
; DUELIST_TYPE_AI_OPP
xor a
@@ -352,7 +352,7 @@ PrintDuelMenu:
Func_42ac:
call DoFrame
ldh a, [hButtonsHeld]
- and a, $02
+ and $02
jr z, .asm_42cc
ldh a, [hButtonsPressed]
bit D_UP_F, a
@@ -368,7 +368,7 @@ Func_42ac:
.asm_42cc
ldh a, [hButtonsPressed]
- and a, START
+ and START
jp nz, $4370
ldh a, [hButtonsPressed]
bit SELECT_F, a
@@ -450,8 +450,8 @@ DuelMenu_Done: ; 439a (1:439a)
DuelMenu_Retreat: ; 43ab (1:43ab)
ld a, DUELVARS_ARENA_CARD_STATUS
call GetTurnDuelistVariable
- and a,PASSIVE_STATUS_MASK
- cp a, $01
+ and PASSIVE_STATUS_MASK
+ cp $01
ldh [$ffa0], a
jr nz, Func_43f1
ld a, [wcc0c]
@@ -700,10 +700,10 @@ Func_478b: ; 478b (1:478b)
.asm_47d4
call DoFrame
ldh a, [hButtonsPressed2]
- and a, D_RIGHT | D_LEFT
+ and D_RIGHT | D_LEFT
jr nz, .asm_47ce
ldh a, [hButtonsPressed]
- and a, A_BUTTON | B_BUTTON
+ and A_BUTTON | B_BUTTON
jr z, .asm_47d4
ret
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index a97a835..b1fe932 100644
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -1627,7 +1627,7 @@ IncreaseOWScriptPointer: ; cc7a (3:4c7a)
add c
ld [wOWScriptPointer], a
ld a, [wOWScriptPointer+1]
- adc a, 00
+ adc 0
ld [wOWScriptPointer+1], a
ret
diff --git a/src/engine/booster_packs.asm b/src/engine/booster_packs.asm
index 09c7dbb..967a0ee 100644
--- a/src/engine/booster_packs.asm
+++ b/src/engine/booster_packs.asm
@@ -226,7 +226,7 @@ DetermineBoosterCardType: ; 1e2fa (7:62fa)
inc hl
inc c
ld a, c
- cp a, NUM_BOOSTER_CARD_TYPES
+ cp NUM_BOOSTER_CARD_TYPES
jr c, .loop_through_card_types
ld a, BOOSTER_CARD_TYPE_ENERGY
.found_card_type
@@ -279,7 +279,7 @@ UpdateBoosterCardTypesChanceByte: ; 1e350 (7:6350)
ld b, $00
ld hl, wBoosterDataTypeChances
add hl, bc
- ld a,[wBoosterAveragedTypeChances]
+ ld a, [wBoosterAveragedTypeChances]
ld c, a
ld a, [hl]
sub c
@@ -322,7 +322,7 @@ AddBoosterEnergyToDrawnEnergies: ; 1e380 (7:6380)
GenerateEndingEnergy: ; 1e387 (7:6387)
ld a, COLORLESS - FIRE
call Random
- add a, $01
+ add $01
jr AddBoosterEnergyToDrawnEnergies
; generates a booster with 10 random energies
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 4d9c632..beabbfc 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -6127,10 +6127,10 @@ GetCardPointer: ; 2f7c (0:2f7c)
ld bc, CardPointers
add hl, bc
ld a, h
- cp a, (CardPointers + 2 + (2 * NUM_CARDS)) / $100
+ cp HIGH(CardPointers + 2 + (2 * NUM_CARDS))
jr nz, .nz
ld a, l
- cp a, (CardPointers + 2 + (2 * NUM_CARDS)) % $100
+ cp LOW(CardPointers + 2 + (2 * NUM_CARDS))
.nz
ccf
jr c, .out_of_bounds
@@ -6138,7 +6138,7 @@ GetCardPointer: ; 2f7c (0:2f7c)
call BankpushHome2
ld a, [hli]
ld h, [hl]
- ld l,a
+ ld l, a
call BankpopHome
or a
.out_of_bounds
@@ -6244,7 +6244,7 @@ CheckMatchingCommand: ; 2ffe (0:2ffe)
call BankswitchHome
; store the bank number of command functions ($b) in wce22
ld a, $b
- ld [wce22],a
+ ld [wce22], a
.check_command_loop
ld a, [hli]
or a
@@ -8042,7 +8042,8 @@ Func_3db7: ; 3db7 (0:3db7)
pop bc
ret
-; read property (byte) c from a sprite in wSpriteAnimBuffer identified by wWhichSprite
+; return hl pointing to the property (byte) c of a sprite in wSpriteAnimBuffer.
+; the sprite is identified by its index in wWhichSprite.
GetSpriteAnimBufferProperty: ; 3dbf (0:3dbf)
ld a, [wWhichSprite]
cp SPRITE_ANIM_BUFFER_CAPACITY
@@ -8051,13 +8052,13 @@ GetSpriteAnimBufferProperty: ; 3dbf (0:3dbf)
ld a, SPRITE_ANIM_BUFFER_CAPACITY - 1 ; default to last sprite
.got_sprite
push bc
- swap a
+ swap a ; a *= SPRITE_ANIM_LENGTH
push af
and $f
ld b, a
pop af
and $f0
- or c
+ or c ; add the property offset
ld c, a
ld hl, wSpriteAnimBuffer
add hl, bc