From 757858f3a32350082c246e96051645c064fdca82 Mon Sep 17 00:00:00 2001 From: E Date: Sat, 28 Nov 2020 14:18:00 -0600 Subject: * Adding script that runs after tutorial battle with Sam. * Adding Impostor Professor Oak effect --- src/engine/bank03.asm | 45 ++++++++++++++++++++++++++++++++++++++++- src/engine/effect_functions.asm | 33 +++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 07e903e..8edbdde 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -3416,7 +3416,50 @@ Script_d827: ; d827 (3:5827) run_command ScriptCommand_QuitScriptFully ; 0xd82d - INCROM $d82d, $d880 + INCROM $d82d, $d834 + +AfterTutorialBattleScript: ; d834 (3:5834) + start_script + run_command ScriptCommand_PrintTextString + tx Text05eb + run_command ScriptCommand_PrintTextString + tx Text05ef + run_command ScriptCommand_CloseTextBox + run_command ScriptCommand_MoveActiveNPC + dw $5896 + run_command ScriptCommand_SetPlayerDirection + db NORTH + run_command ScriptCommand_MovePlayer + db NORTH + db $01 + run_command ScriptCommand_MovePlayer + db NORTH + db $01 + run_command ScriptCommand_MovePlayer + db NORTH + db $01 + run_command ScriptCommand_SetPlayerDirection + db EAST + run_command ScriptCommand_MovePlayer + db EAST + db $01 + run_command ScriptCommand_MovePlayer + db EAST + db $01 + run_command ScriptCommand_SetPlayerDirection + db NORTH + run_command ScriptCommand_PrintTextString + tx Text05f0 + run_command ScriptCommand_CloseTextBox + run_command Func_ccdc + tx Text05f1 + run_command ScriptCommand_CloseTextBox + run_command ScriptCommand_PrintTextString + tx Text05f2 + run_command Func_d271 +; 0xd860 + + INCROM $d860, $d880 NPCMovement_d880: ; d880 (3:5880) db EAST diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index 75b0f76..e3c4d90 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -763,4 +763,35 @@ Func_2cbfb: ; 2cbfb (b:4bfb) ret ; 0x2cc0a - INCROM $2cc0a, $30000 + INCROM $2cc0a, $2f4e1 + +ImposterProssorOakEffect: ; 2f4e1 (b:74e1) + call SwapTurn + call CreateHandCardList + call SortCardsInDuelTempListByID + ld hl, wDuelTempList +.return_hand_to_deck_loop + ld a, [hli] + cp $ff + jr z, .shuffle + call RemoveCardFromHand + call ReturnCardToDeck + jr .return_hand_to_deck_loop +.shuffle + call Func_2c0bd + ld a, $07 + bank1call $4935 + ld c, $07 +.draw_loop + call DrawCardFromDeck + jr c, .revert_turn_to_user + call AddCardToHand + dec c + jr nz, .draw_loop +.revert_turn_to_user + call SwapTurn + ret +; 0x2f513 + + + INCROM $2f513, $30000 -- cgit v1.2.3 From 2cf5f3019db3cd571344e8e2610c233acf0192eb Mon Sep 17 00:00:00 2001 From: E Date: Sat, 28 Nov 2020 14:23:17 -0600 Subject: Adding reference to effect_commands.asm --- src/data/effect_commands.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm index 171c241..a65cee6 100644 --- a/src/data/effect_commands.asm +++ b/src/data/effect_commands.asm @@ -1491,7 +1491,7 @@ FullHealEffectCommands: db $00 ImposterProfessorOakEffectCommands: - dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $74e1 + dbw EFFECTCMDTYPE_BEFORE_DAMAGE, ImposterProssorOakEffect db $00 ComputerSearchEffectCommands: -- cgit v1.2.3 From bc110e289dc9bb683adcbc1656d634c44bed4f58 Mon Sep 17 00:00:00 2001 From: E Date: Sat, 28 Nov 2020 14:34:57 -0600 Subject: fixing spelling errors --- src/data/effect_commands.asm | 2 +- src/engine/effect_functions.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm index a65cee6..8275fe9 100644 --- a/src/data/effect_commands.asm +++ b/src/data/effect_commands.asm @@ -1491,7 +1491,7 @@ FullHealEffectCommands: db $00 ImposterProfessorOakEffectCommands: - dbw EFFECTCMDTYPE_BEFORE_DAMAGE, ImposterProssorOakEffect + dbw EFFECTCMDTYPE_BEFORE_DAMAGE, ImpostorProfessorOakEffect db $00 ComputerSearchEffectCommands: diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index e3c4d90..f64953b 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -765,7 +765,7 @@ Func_2cbfb: ; 2cbfb (b:4bfb) INCROM $2cc0a, $2f4e1 -ImposterProssorOakEffect: ; 2f4e1 (b:74e1) +ImpostorProfessorOakEffect: ; 2f4e1 (b:74e1) call SwapTurn call CreateHandCardList call SortCardsInDuelTempListByID -- cgit v1.2.3 From 41796de91581f586b401cf01eb0852095564e202 Mon Sep 17 00:00:00 2001 From: E Date: Sun, 29 Nov 2020 14:23:15 -0600 Subject: Updating spelling + adding NPCMovement_d896 --- src/data/effect_commands.asm | 2 +- src/engine/bank03.asm | 16 ++++++++++++++-- src/engine/effect_functions.asm | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm index 8275fe9..7360aff 100644 --- a/src/data/effect_commands.asm +++ b/src/data/effect_commands.asm @@ -1491,7 +1491,7 @@ FullHealEffectCommands: db $00 ImposterProfessorOakEffectCommands: - dbw EFFECTCMDTYPE_BEFORE_DAMAGE, ImpostorProfessorOakEffect + dbw EFFECTCMDTYPE_BEFORE_DAMAGE, ImposterProfessorOakEffect db $00 ComputerSearchEffectCommands: diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 8edbdde..1f1e690 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -3426,7 +3426,7 @@ AfterTutorialBattleScript: ; d834 (3:5834) tx Text05ef run_command ScriptCommand_CloseTextBox run_command ScriptCommand_MoveActiveNPC - dw $5896 + dw NPCMovement_d896 run_command ScriptCommand_SetPlayerDirection db NORTH run_command ScriptCommand_MovePlayer @@ -3490,8 +3490,20 @@ NPCMovement_d88b: ; d88b (3:588b) NPCMovement_d894: ; d894 (4:5894) db SOUTH | NO_MOVE db $ff + +NPCMovement_d896: ; d896 (3:5896) + db NORTH + db NORTH + db NORTH + db EAST + db EAST + db EAST + db EAST + db SOUTH | NO_MOVE + db $ff +; 0xd89f - INCROM $d896, $d932 + INCROM $d89f, $d932 Script_d932: ; d932 (3:5932) start_script diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index f64953b..dae33a0 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -765,7 +765,7 @@ Func_2cbfb: ; 2cbfb (b:4bfb) INCROM $2cc0a, $2f4e1 -ImpostorProfessorOakEffect: ; 2f4e1 (b:74e1) +ImposterProfessorOakEffect: ; 2f4e1 (b:74e1) call SwapTurn call CreateHandCardList call SortCardsInDuelTempListByID -- cgit v1.2.3 From bd9c0b93645602d31257978eac21bd63f4316a6b Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Mon, 30 Nov 2020 21:48:14 -0500 Subject: Minor bug fix --- src/engine/bank01.asm | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 090ecf0..789cced 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -6973,7 +6973,7 @@ HandleBetweenTurnsEvents: ; 6baf (1:6baf) ld a, [hl] or a jr z, .asm_6c1a - call $6d3f + call Func_6d3f jr c, .asm_6c1a call Func_6cfa ld a, [hl] @@ -7001,7 +7001,7 @@ HandleBetweenTurnsEvents: ; 6baf (1:6baf) ld a, [hl] or a jr z, .asm_6c3a - call $6d3f + call Func_6d3f jr c, .asm_6c3a call Func_6cfa .asm_6c3a @@ -7172,7 +7172,45 @@ Func_6cfa: ; 6cfa (1:6cfa) ret ; 0x6d3f - INCROM $6d3f, $6d84 +Func_6d3f: ; 6d3f (1:6d3f) + or a + bit 7, [hl] + ret z + push hl + bit 6, [hl] + ld a, $0a + ld hl, $26 + jr z, .BoosterPack_RandomEnergies + ld a, $14 + ld hl, $27 +.BoosterPack_RandomEnergies + push af + ld [$d4b1], a + xor a + ld [$d4b2], a + push hl + call Func_6c7e + pop hl + call Func_6ce4 + ld a, $05 + call Func_6cab + pop af + ld e, a + ld d, $00 + ld a, $c8 + call GetTurnDuelistVariable + call SubstractHP + push hl + ld a, $8c + call Func_6cab + pop hl + call PrintKnockedOutIfHLZero + push af + call WaitForWideTextBoxInput + pop af + pop hl + ret +; 0x6d84 ; given the deck index of a turn holder's card in register a, ; and a pointer in hl to the wLoadedCard* buffer where the card data is loaded, -- cgit v1.2.3 From c1a7c2349549e5df1538cb94c0f8659332532eeb Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Mon, 30 Nov 2020 21:51:26 -0500 Subject: Some fixups --- src/engine/bank01.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 789cced..548bafb 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -7180,10 +7180,10 @@ Func_6d3f: ; 6d3f (1:6d3f) bit 6, [hl] ld a, $0a ld hl, $26 - jr z, .BoosterPack_RandomEnergies + jr z, .asm_6d52 ld a, $14 ld hl, $27 -.BoosterPack_RandomEnergies +.asm_6d52 push af ld [$d4b1], a xor a -- cgit v1.2.3 From cd5caaa98a13693787a572d1d5e84d214cf693bb Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Mon, 30 Nov 2020 22:30:07 -0500 Subject: Added constants for wram --- src/engine/bank01.asm | 6 +++--- src/wram.asm | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 548bafb..2f79c38 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -7185,9 +7185,9 @@ Func_6d3f: ; 6d3f (1:6d3f) ld hl, $27 .asm_6d52 push af - ld [$d4b1], a + ld [wd4b1], a xor a - ld [$d4b2], a + ld [wd4b2], a push hl call Func_6c7e pop hl @@ -7197,7 +7197,7 @@ Func_6d3f: ; 6d3f (1:6d3f) pop af ld e, a ld d, $00 - ld a, $c8 + ld a, DUELVARS_ARENA_CARD_HP call GetTurnDuelistVariable call SubstractHP push hl diff --git a/src/wram.asm b/src/wram.asm index acd9638..a54a8d2 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -2319,7 +2319,13 @@ wd4af:: ; d4af wd4b0:: ; d4b0 ds $1 - ds $d +wd4b1:: ; d4b1 + ds $1 + +wd4b2:: ; d4b2 + ds $1 + + ds $b wd4be:: ; d4be ds $1 -- cgit v1.2.3 From 547b3e5e90eed4b0456ef70fb201d200dc49de22 Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Mon, 30 Nov 2020 23:03:22 -0500 Subject: Added a bit of documentation --- src/engine/bank01.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 2f79c38..819756c 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -7179,10 +7179,10 @@ Func_6d3f: ; 6d3f (1:6d3f) push hl bit 6, [hl] ld a, $0a - ld hl, $26 + ld hl, $26 ; copies from the byte of the damage due to poison by 10 jr z, .asm_6d52 ld a, $14 - ld hl, $27 + ld hl, $27 ; copies from the byte of the damage due to poison by 20 .asm_6d52 push af ld [wd4b1], a -- cgit v1.2.3 From 3c17355ec7df797e1418615995b7e0e51fddba93 Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Tue, 1 Dec 2020 02:08:54 -0500 Subject: A bit more disassembling --- src/engine/bank01.asm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 819756c..d09e657 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -8292,7 +8292,11 @@ PlayMoveAnimation: ; 7494 (1:7494) INCROM $74dc, $7571 Func_7571: ; 7571 (1:7571) - INCROM $7571, $7576 + rst $28 + ld b, $20 + ld e, h + ret +; 0x7576 Func_7576: ; 7576 (1:7576) farcall Func_1991f @@ -8302,7 +8306,11 @@ Func_7576: ; 7576 (1:7576) INCROM $757b, $758f Func_758f: ; 758f (1:758f) - INCROM $758f, $7594 + rst $28 + ld b, $cf + ld h, h + ret +; 0x7594 Func_7594: ; 7594 (1:7594) farcall Func_1a61f -- cgit v1.2.3 From e1d567dc159a97aab015caee779cae42f5af4c96 Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Tue, 1 Dec 2020 13:48:23 -0500 Subject: Fixed some things and added a couple constants --- src/constants/duel_constants.asm | 4 ++++ src/engine/bank01.asm | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 344cff1..f42e64a 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -117,9 +117,13 @@ ASLEEP EQU $02 PARALYZED EQU $03 POISONED EQU $80 DOUBLE_POISONED EQU $c0 +DOUBLE_POISONED_F EQU 6 +POISONED_F EQU 7 + CNF_SLP_PRZ EQU $0f ; confused, asleep or paralyzed PSN_DBLPSN EQU $f0 ; poisoned or double poisoned +PSN_DAMAGE EQU $0a ; substatus conditions (DUELVARS_ARENA_CARD_SUBSTATUS*) diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index d09e657..dc5a733 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -7174,16 +7174,16 @@ Func_6cfa: ; 6cfa (1:6cfa) Func_6d3f: ; 6d3f (1:6d3f) or a - bit 7, [hl] + bit POISONED_F , [hl] ret z push hl - bit 6, [hl] - ld a, $0a - ld hl, $26 ; copies from the byte of the damage due to poison by 10 - jr z, .asm_6d52 + bit DOUBLE_POISONED_F, [hl] + ld a, PSN_DAMAGE + ldtx hl, Received10DamageDueToPoisonText ; copies from the byte of the damage due to poison by 10 + jr z, .Damage_Dealt_From_Poison ld a, $14 - ld hl, $27 ; copies from the byte of the damage due to poison by 20 -.asm_6d52 + ldtx hl, Received20DamageDueToPoisonText ; copies from the byte of the damage due to poison by 20 +.Damage_Dealt_From_Poison push af ld [wd4b1], a xor a -- cgit v1.2.3 From c4d69aaacc83faf64d9bbc2c3be4854a3df9dd79 Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Tue, 1 Dec 2020 14:18:13 -0500 Subject: Replaced the byte with farcall --- src/engine/bank01.asm | 4 +--- src/engine/bank06.asm | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index dc5a733..79c80bf 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -8292,9 +8292,7 @@ PlayMoveAnimation: ; 7494 (1:7494) INCROM $74dc, $7571 Func_7571: ; 7571 (1:7571) - rst $28 - ld b, $20 - ld e, h + farcall Func_19c20 ret ; 0x7576 diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm index 19f5e1f..7c5c9a6 100644 --- a/src/engine/bank06.asm +++ b/src/engine/bank06.asm @@ -1523,7 +1523,10 @@ Func_19a12: ; 19a12 (6:5a12) ret ; 0x19a1f - INCROM $19a1f, $1a61f + INCROM $19a1f, $19c20 + +Func_19c20: ; 19c20 (6:5c20) + INCROM $19c20, $1a61f Func_1a61f: ; 1a61f (6:661f) push af -- cgit v1.2.3 From 290dc989ea71786ff346033b9d317648a8c18934 Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Tue, 1 Dec 2020 14:55:06 -0500 Subject: Fixed some things --- src/constants/duel_constants.asm | 3 ++- src/engine/bank01.asm | 12 +++++------- src/engine/bank06.asm | 5 ++++- 3 files changed, 11 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index f42e64a..4abf9d7 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -117,13 +117,14 @@ ASLEEP EQU $02 PARALYZED EQU $03 POISONED EQU $80 DOUBLE_POISONED EQU $c0 + DOUBLE_POISONED_F EQU 6 POISONED_F EQU 7 CNF_SLP_PRZ EQU $0f ; confused, asleep or paralyzed PSN_DBLPSN EQU $f0 ; poisoned or double poisoned -PSN_DAMAGE EQU $0a +PSN_DAMAGE EQU 10 ; substatus conditions (DUELVARS_ARENA_CARD_SUBSTATUS*) diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 79c80bf..ed2ec14 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -7179,11 +7179,11 @@ Func_6d3f: ; 6d3f (1:6d3f) push hl bit DOUBLE_POISONED_F, [hl] ld a, PSN_DAMAGE - ldtx hl, Received10DamageDueToPoisonText ; copies from the byte of the damage due to poison by 10 - jr z, .Damage_Dealt_From_Poison + ldtx hl, Received10DamageDueToPoisonText + jr z, .not_double_poisoned ld a, $14 - ldtx hl, Received20DamageDueToPoisonText ; copies from the byte of the damage due to poison by 20 -.Damage_Dealt_From_Poison + ldtx hl, Received20DamageDueToPoisonText +.not_double_poisoned push af ld [wd4b1], a xor a @@ -8304,9 +8304,7 @@ Func_7576: ; 7576 (1:7576) INCROM $757b, $758f Func_758f: ; 758f (1:758f) - rst $28 - ld b, $cf - ld h, h + farcall Func_1a4cf ret ; 0x7594 diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm index 7c5c9a6..d3aa46a 100644 --- a/src/engine/bank06.asm +++ b/src/engine/bank06.asm @@ -1526,7 +1526,10 @@ Func_19a12: ; 19a12 (6:5a12) INCROM $19a1f, $19c20 Func_19c20: ; 19c20 (6:5c20) - INCROM $19c20, $1a61f + INCROM $19c20, $1a4cf + +Func_1a4cf: ; 1a4cf (6:64cf) + INCROM $1a4cf, $1a61f Func_1a61f: ; 1a61f (6:661f) push af -- cgit v1.2.3 From fcdb5120dc3e94b9f638a10551872df1856ebec4 Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Tue, 1 Dec 2020 15:00:42 -0500 Subject: Aligned the EQU --- src/constants/duel_constants.asm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 4abf9d7..758842a 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -118,8 +118,10 @@ PARALYZED EQU $03 POISONED EQU $80 DOUBLE_POISONED EQU $c0 + + DOUBLE_POISONED_F EQU 6 -POISONED_F EQU 7 +POISONED_F EQU 7 CNF_SLP_PRZ EQU $0f ; confused, asleep or paralyzed -- cgit v1.2.3 From b72c0c5d575956d9714991564efb7fd66b384836 Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Tue, 1 Dec 2020 15:05:32 -0500 Subject: More fixups --- src/constants/duel_constants.asm | 1 - src/engine/bank01.asm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 758842a..80a30b0 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -119,7 +119,6 @@ POISONED EQU $80 DOUBLE_POISONED EQU $c0 - DOUBLE_POISONED_F EQU 6 POISONED_F EQU 7 diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index ed2ec14..1c003e2 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -7181,7 +7181,7 @@ Func_6d3f: ; 6d3f (1:6d3f) ld a, PSN_DAMAGE ldtx hl, Received10DamageDueToPoisonText jr z, .not_double_poisoned - ld a, $14 + ld a, DBLPSN_DAMAGE ldtx hl, Received20DamageDueToPoisonText .not_double_poisoned push af -- cgit v1.2.3 From 6d17f2ebb999e0c42e5eb740bdd92399b5c69dba Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Tue, 1 Dec 2020 15:31:44 -0500 Subject: Added DBLPSN_DAMAGE constant --- src/constants/duel_constants.asm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 80a30b0..0c2af37 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -123,9 +123,10 @@ DOUBLE_POISONED_F EQU 6 POISONED_F EQU 7 -CNF_SLP_PRZ EQU $0f ; confused, asleep or paralyzed -PSN_DBLPSN EQU $f0 ; poisoned or double poisoned -PSN_DAMAGE EQU 10 +CNF_SLP_PRZ EQU $0f ; confused, asleep or paralyzed +PSN_DBLPSN EQU $f0 ; poisoned or double poisoned +PSN_DAMAGE EQU 10 +DBLPSN_DAMAGE EQU $14 ; substatus conditions (DUELVARS_ARENA_CARD_SUBSTATUS*) -- cgit v1.2.3 From 9faba758bebdaebbe4ef40a397503e98f71b5fb4 Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Tue, 1 Dec 2020 16:09:51 -0500 Subject: Fixed hex byte --- src/constants/duel_constants.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 0c2af37..28199e5 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -126,7 +126,7 @@ POISONED_F EQU 7 CNF_SLP_PRZ EQU $0f ; confused, asleep or paralyzed PSN_DBLPSN EQU $f0 ; poisoned or double poisoned PSN_DAMAGE EQU 10 -DBLPSN_DAMAGE EQU $14 +DBLPSN_DAMAGE EQU 20 ; substatus conditions (DUELVARS_ARENA_CARD_SUBSTATUS*) -- cgit v1.2.3