summaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/bank1.asm36
-rw-r--r--src/engine/bank3.asm2
-rw-r--r--src/engine/booster_packs.asm12
-rw-r--r--src/engine/effect_functions.asm4
-rw-r--r--src/engine/home.asm103
5 files changed, 92 insertions, 65 deletions
diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm
index d40d866..47873bc 100644
--- a/src/engine/bank1.asm
+++ b/src/engine/bank1.asm
@@ -869,7 +869,7 @@ CheckIfMoveExists: ; 4872 (1:4872)
ld a, [de]
or c
jr z, .return_no_move_found
- ld hl, wLoadedCard1Move1Category - (wLoadedCard1Move1Name + 1)
+ ld hl, CARD_DATA_MOVE1_CATEGORY - (CARD_DATA_MOVE1_NAME + 1)
add hl, de
ld a, [hl]
and $ff ^ RESIDUAL
@@ -930,12 +930,12 @@ _CheckIfEnoughEnergies: ; 48ac (1:48ac)
ld de, wLoadedCard1Move2Energy
.got_move
- ld hl, wLoadedCard1Move1Name - wLoadedCard1Move1Energy
+ ld hl, CARD_DATA_MOVE1_NAME - CARD_DATA_MOVE1_ENERGY
add hl, de
ld a, [hli]
or [hl]
jr z, .not_usable
- ld hl, wLoadedCard1Move1Category - wLoadedCard1Move1Energy
+ ld hl, CARD_DATA_MOVE1_CATEGORY - CARD_DATA_MOVE1_ENERGY
add hl, de
ld a, [hl]
cp POKEMON_POWER
@@ -1161,9 +1161,9 @@ Func_4b60: ; 4b60 (1:4b60)
Func_4cd5: ; 4cd5 (1:4cd5)
ld a, DUELVARS_DUELIST_TYPE
call GetTurnDuelistVariable
- cp $0
+ cp DUELIST_TYPE_PLAYER
jr z, .asm_4d15
- cp $1
+ cp DUELIST_TYPE_LINK_OPP
jr z, .asm_4cec
push af
push hl
@@ -1188,7 +1188,7 @@ Func_4cd5: ; 4cd5 (1:4cd5)
jr c, .asm_4d12
ld a, DUELVARS_DUELIST_TYPE
call GetTurnDuelistVariable
- ld [hl], $1
+ ld [hl], DUELIST_TYPE_LINK_OPP
or a
ret
@@ -1416,10 +1416,10 @@ ConvertTrainerCardToPokemon:
.start_ram_data_overwrite
push de
ld [hl], COLORLESS
- ld bc, wLoadedCard1HP - wLoadedCard1
+ ld bc, CARD_DATA_HP
add hl, bc
ld de, .data_to_overwrite
- ld c, wLoadedCard1Unknown2 - wLoadedCard1HP
+ ld c, CARD_DATA_UNKNOWN2 - CARD_DATA_HP
.loop
ld a, [de]
inc de
@@ -1430,16 +1430,16 @@ ConvertTrainerCardToPokemon:
ret
.data_to_overwrite
- db 10 ; hp
- ds $07 ; wLoadedCard1Move1Name - (wLoadedCard1HP + 1)
- tx DiscardName ; move1 name
- tx DiscardDescription ; move1 description
- ds $03 ; wLoadedCard1Move1Category - (wLoadedCard1Move1Description + 2)
- db POKEMON_POWER ; move1 category
- dw TrainerCardAsPokemonEffectCommands ; move1 effect commands
- ds $18 ; wLoadedCard1RetreatCost - (wLoadedCard1Move1EffectCommands + 2)
- db UNABLE_RETREAT ; retreat cost
- ds $0d ; PKMN_CARD_DATA_LENGTH - (wLoadedCard1RetreatCost + 1 - wLoadedCard1)
+ db 10 ; CARD_DATA_HP
+ ds $07 ; CARD_DATA_MOVE1_NAME - (CARD_DATA_HP + 1)
+ tx DiscardName ; CARD_DATA_MOVE1_NAME
+ tx DiscardDescription ; CARD_DATA_MOVE1_DESCRIPTION
+ ds $03 ; CARD_DATA_MOVE1_CATEGORY - (CARD_DATA_MOVE1_DESCRIPTION + 2)
+ db POKEMON_POWER ; CARD_DATA_MOVE1_CATEGORY
+ dw TrainerCardAsPokemonEffectCommands ; CARD_DATA_MOVE1_EFFECT_COMMANDS
+ ds $18 ; CARD_DATA_RETREAT_COST - (CARD_DATA_MOVE1_EFFECT_COMMANDS + 2)
+ db UNABLE_RETREAT ; CARD_DATA_RETREAT_COST
+ ds $0d ; PKMN_CARD_DATA_LENGTH - (CARD_DATA_RETREAT_COST + 1)
INCROM $6df1, $7107
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index 383fe04..df4a1d5 100644
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -2219,7 +2219,7 @@ Func_d00b: ; d00b (3:500b)
dec hl
ld e, a
ld d, $0
- call Func_2f45
+ call GetCardName
pop hl
ld [hl], e
inc hl
diff --git a/src/engine/booster_packs.asm b/src/engine/booster_packs.asm
index 23c3494..c24f80a 100644
--- a/src/engine/booster_packs.asm
+++ b/src/engine/booster_packs.asm
@@ -81,7 +81,7 @@ FindCardsInSetAndRarity: ; 1e226 (7:6226)
call CheckCardViable
jr c, .finished_with_current_card
ld a, [wBoosterCurrentCardType]
- call GetCardType
+ call GetBoosterCardType
push af
push hl
ld c, a
@@ -107,7 +107,7 @@ FindCardsInSetAndRarity: ; 1e226 (7:6226)
CheckCardViable: ; 1e268 (7:6268)
push bc
ld a, e
- call GetCardHeader
+ call GetCardTypeRarityAndSet
ld [wBoosterCurrentCardType], a
ld a, b
ld [wBoosterCurrentCardRarity], a
@@ -119,7 +119,7 @@ CheckCardViable: ; 1e268 (7:6268)
cp c
jr nz, .invalid_card
ld a, [wBoosterCurrentCardType]
- call GetCardType
+ call GetBoosterCardType
cp BOOSTER_CARD_TYPE_ENERGY
jr z, .return_valid_card
ld a, [wBoosterCurrentCardSet]
@@ -139,7 +139,7 @@ CheckCardViable: ; 1e268 (7:6268)
ret
; Map a card's TYPE_* constant given in a to its BOOSTER_CARD_TYPE_* constant
-GetCardType: ; 1e2a0 (7:62a0)
+GetBoosterCardType: ; 1e2a0 (7:62a0)
push hl
push bc
ld hl, CardTypeTable
@@ -439,7 +439,7 @@ AddBoosterCardsToCollection:; 1e40a (7:640a)
AddBoosterCardToTempCardCollection: ; 1e419 (7:6419)
push hl
- ld h, wTempCardCollection >> 8
+ ld h, HIGH(wTempCardCollection)
ld a, [wBoosterTempCard]
ld l, a
inc [hl]
@@ -448,7 +448,7 @@ AddBoosterCardToTempCardCollection: ; 1e419 (7:6419)
IsByteInTempCardCollectionZero: ; 1e423 (7:6423)
push hl
- ld h, wTempCardCollection >> 8
+ ld h, HIGH(wTempCardCollection)
ld a, [wBoosterTempCard]
ld l, a
ld a, [hl]
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index 1d49838..22d7cec 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -99,12 +99,12 @@ CommentedOut_2c086: ; 2c086 (b:4086)
Func_2c087: ; 2c087 (b:4087)
xor a
- jr asm_2c08c
+ jr Func_2c08c
Func_2c08a: ; 2c08a (b:408a)
ld a, $1
-asm_2c08c
+Func_2c08c:
push de
push af
ld a, $11
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 96f63c4..a889228 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -1284,6 +1284,7 @@ SwitchToCGBDoubleSpeed: ; 07e7 (0:07e7)
bit 7, [hl]
ret nz
; fallthrough
+
CGBSpeedSwitch: ; 07f1 (0:07f1)
ld a, [rIE]
push af
@@ -3491,7 +3492,7 @@ CopyMoveDataAndDamage: ; 16c0 (0:16c0)
ld hl, wLoadedCard1Move2
.got_move
ld de, wLoadedMove
- ld c, wLoadedCard1Move2 - wLoadedCard1Move1
+ ld c, CARD_DATA_MOVE2 - CARD_DATA_MOVE1
.copy_loop
ld a, [hli]
ld [de], a
@@ -3854,7 +3855,7 @@ Func_1994: ; 1994 (0:1994)
call Func_1a0e
ld b, a
call SwapTurn
- call Func_3730
+ call GetArenaPokemonWeakness
call SwapTurn
and b
jr z, .asm_19dc
@@ -3864,7 +3865,7 @@ Func_1994: ; 1994 (0:1994)
set 1, [hl]
.asm_19dc
call SwapTurn
- call Func_374a
+ call GetArenaPokemonResistance
call SwapTurn
and b
jr z, .check_pluspower_and_defender
@@ -3916,7 +3917,7 @@ Func_1a22: ; 1a22 (0:1a22)
call Func_36f6
call Func_1a0e
ld b, a
- call Func_3730
+ call GetArenaPokemonWeakness
and b
jr z, .asm_1a47
sla e
@@ -3924,7 +3925,7 @@ Func_1a22: ; 1a22 (0:1a22)
ld hl, $ccc1
set 1, [hl]
.asm_1a47
- call Func_374a
+ call GetArenaPokemonResistance
and b
jr z, .asm_1a58
ld hl, $ffe2
@@ -4505,6 +4506,7 @@ DrawRegularTextBox: ; 1e7c (0:1e7c)
cp CONSOLE_SGB
jp z, DrawRegularTextBoxSGB
; fallthrough
+
DrawRegularTextBoxDMG: ; 1e88 (0:1e88)
call DECoordToBGMap0Address
; top line (border) of the text box
@@ -4622,7 +4624,7 @@ DrawRegularTextBoxSGB: ; 1f0f (0:1f0f)
ld a, [wFrameType]
or a
ret z
-ColorizeTextBoxSGB
+ColorizeTextBoxSGB:
push bc
push de
ld hl, $cae0
@@ -4742,11 +4744,11 @@ Func_20c4: ; 20c4 (0:20c4)
Func_20d8: ; 20d8 (0:20d8)
ld b, $10
- jr asm_20de
+ jr Func_20dc.asm_20de
Func_20dc: ; 20dc (0:20dc)
ld b, $24
-asm_20de
+.asm_20de
ld hl, DuelGraphics + $980 - $4000
ld a, [wConsole]
cp CONSOLE_CGB
@@ -6558,15 +6560,17 @@ Func_2ec4: ; 2ec4 (0:2ec4)
INCROM $2ecd, $2f0a
-; load data of card with id at e to wLoadedCard1 or wLoadedCard2
+; load data of card with id at e to wLoadedCard2
LoadCardDataToBuffer2: ; 2f0a (0:2f0a)
push hl
ld hl, wLoadedCard2
jr LoadCardDataToRAM
+; load data of card with id at e to wLoadedCard1
LoadCardDataToBuffer1: ; 2f10 (0:2f10)
push hl
ld hl, wLoadedCard1
+; fallthrough
LoadCardDataToRAM: ; 2f14 (0:2f14)
push de
@@ -6586,65 +6590,65 @@ LoadCardDataToRAM: ; 2f14 (0:2f14)
jr nz, .copy_card_data_loop
call BankpopHome
or a
-
.done
pop bc
pop de
pop hl
ret
-Func_2f32: ; 2f32 (0:2f32)
+; return in a the type (TYPE_* constant) of the card with id at e
+GetCardType: ; 2f32 (0:2f32)
push hl
call GetCardPointer
- jr c, .asm_2f43
+ jr c, .done
ld a, BANK(CardPointers)
call BankpushHome2
ld l, [hl]
call BankpopHome
ld a, l
or a
-.asm_2f43
+.done
pop hl
ret
-Func_2f45: ; 2f45 (0:2f45)
+; return in a the 2-byte text id of the name of the card with id at e
+GetCardName: ; 2f45 (0:2f45)
push hl
call GetCardPointer
- jr c, .asm_2f5b
+ jr c, .done
ld a, BANK(CardPointers)
call BankpushHome2
- ld de, $0003
+ ld de, CARD_DATA_NAME
add hl, de
ld e, [hl]
inc hl
ld d, [hl]
call BankpopHome
or a
-
-.asm_2f5b
+.done
pop hl
ret
-; from the card id in a, loads type into a, rarity into b, and set into c
-GetCardHeader: ; 2f5d (0:2f5d)
+; from the card id in a, returns type into a, rarity into b, and set into c
+GetCardTypeRarityAndSet: ; 2f5d (0:2f5d)
push hl
push de
- ld d, $00
+ ld d, 0
ld e, a
call GetCardPointer
- jr c, .card_not_found
+ jr c, .done
ld a, BANK(CardPointers)
call BankpushHome2
- ld e, [hl]
- ld bc, $5
+ ld e, [hl] ; CARD_DATA_TYPE
+ ld bc, CARD_DATA_RARITY
add hl, bc
- ld b, [hl]
+ ld b, [hl] ; CARD_DATA_RARITY
inc hl
- ld c, [hl]
+ ld c, [hl] ; CARD_DATA_SET
call BankpopHome
ld a, e
or a
-.card_not_found
+.done
pop de
pop hl
ret
@@ -7157,6 +7161,7 @@ Func_31fc: ; 31fc (0:31fc)
ld [hl], a
ld a, e
; fallthrough
+
Func_3212: ; 3212 (0:3212)
ld [rSB], a
ld a, $1
@@ -7748,13 +7753,13 @@ Func_36f7: ; 36f7 (0:36f7)
call GetTurnDuelistVariable
bit 7, a
jr nz, .asm_3718
-.asm_3703
+.has_status
ld a, e
add DUELVARS_ARENA_CARD
call GetTurnDuelistVariable
call GetCardIDFromDeckIndex
- call Func_2f32
- cp $10
+ call GetCardType
+ cp TYPE_TRAINER
jr nz, .asm_3715
ld a, $6
.asm_3715
@@ -7764,7 +7769,7 @@ Func_36f7: ; 36f7 (0:36f7)
.asm_3718
ld a, e
call CheckIfUnderAnyCannotUseStatus2
- jr c, .asm_3703
+ jr c, .has_status
ld a, e
add $d4
call GetTurnDuelistVariable
@@ -7774,28 +7779,50 @@ Func_36f7: ; 36f7 (0:36f7)
ret
; 0x3729
- INCROM $3729, $3730
+; return in a the weakness of the arena Pokemon (a == 0) or of a bench Pokemon (a > 0)
+; if a == 0 and [DUELVARS_ARENA_CARD_SUBSTATUS3] != 0, return [DUELVARS_ARENA_CARD_SUBSTATUS3] instead
+GetPlayAreaPokemonWeakness: ; 3729 (0:3729)
+ or a
+ jr z, GetArenaPokemonWeakness
+ add DUELVARS_ARENA_CARD
+ jr GetPokemonWeakness
-Func_3730: ; 3730 (0:3730)
+; return [DUELVARS_ARENA_CARD_SUBSTATUS3] in a
+; if [DUELVARS_ARENA_CARD_SUBSTATUS3] == 0, return the Pokemon's weakness value instead
+GetArenaPokemonWeakness: ; 3730 (0:3730)
ld a, DUELVARS_ARENA_CARD_SUBSTATUS3
call GetTurnDuelistVariable
or a
ret nz
ld a, DUELVARS_ARENA_CARD
+; fallthrough
+
+GetPokemonWeakness:
call GetTurnDuelistVariable
call LoadDeckCardToBuffer2
ld a, [wLoadedCard2Weakness]
ret
; 0x3743
- INCROM $3743, $374a
+; return in a the resistance of the arena Pokemon (a == 0) or of a bench Pokemon (a > 0)
+; if a == 0 and [DUELVARS_ARENA_CARD_SUBSTATUS4] != 0, return [DUELVARS_ARENA_CARD_SUBSTATUS4] instead
+GetPlayAreaPokemonResistance: ; 3743 (0:3743)
+ or a
+ jr z, GetArenaPokemonResistance
+ add DUELVARS_ARENA_CARD
+ jr GetPokemonResistance
-Func_374a: ; 374a (0:374a)
+; return [DUELVARS_ARENA_CARD_SUBSTATUS4] in a
+; if [DUELVARS_ARENA_CARD_SUBSTATUS4] == 0, return the Pokemon's resistance value instead
+GetArenaPokemonResistance: ; 374a (0:374a)
ld a, DUELVARS_ARENA_CARD_SUBSTATUS4
call GetTurnDuelistVariable
or a
ret nz
ld a, DUELVARS_ARENA_CARD
+; fallthrough
+
+GetPokemonResistance:
call GetTurnDuelistVariable
call LoadDeckCardToBuffer2
ld a, [wLoadedCard2Resistance]
@@ -7979,7 +8006,7 @@ Func_38db: ; 38db (0:38db)
xor a
ld [$ba44], a
call DisableSRAM
-asm_38ed
+.asm_38ed
farcall Func_131d3
ld a, $9
ld [wd111], a
@@ -7995,7 +8022,7 @@ Func_38fb: ; 38fb (0:38fb)
ld a, [$ba44]
call DisableSRAM
cp $ff
- jr z, asm_38ed
+ jr z, Func_38db.asm_38ed
scf
ret
@@ -8022,7 +8049,7 @@ GetFloorObjectFromPos: ; 3927 (0:3927)
INCROM $392e, $3946
-; puts a floor tile in hc given coords in bc (x,y. measured in tiles)
+; puts a floor tile in hl given coords in bc (x,y. measured in tiles)
FindFloorTileFromPos: ; 3946 (0:3946)
push bc
srl b
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 10:56:29 +0000