From bd9c0b93645602d31257978eac21bd63f4316a6b Mon Sep 17 00:00:00 2001
From: pinksylveon <shakibafzali@gmail.com>
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/engine')

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 <shakibafzali@gmail.com>
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/engine')

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 <shakibafzali@gmail.com>
Date: Mon, 30 Nov 2020 22:30:07 -0500
Subject: Added constants for wram

---
 src/engine/bank01.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/engine')

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
-- 
cgit v1.2.3


From 547b3e5e90eed4b0456ef70fb201d200dc49de22 Mon Sep 17 00:00:00 2001
From: pinksylveon <shakibafzali@gmail.com>
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/engine')

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 <shakibafzali@gmail.com>
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/engine')

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 <shakibafzali@gmail.com>
Date: Tue, 1 Dec 2020 13:48:23 -0500
Subject: Fixed some things and added a couple constants

---
 src/engine/bank01.asm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/engine')

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 <shakibafzali@gmail.com>
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/engine')

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 <shakibafzali@gmail.com>
Date: Tue, 1 Dec 2020 14:55:06 -0500
Subject: Fixed some things

---
 src/engine/bank01.asm | 12 +++++-------
 src/engine/bank06.asm |  5 ++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/engine')

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 b72c0c5d575956d9714991564efb7fd66b384836 Mon Sep 17 00:00:00 2001
From: pinksylveon <shakibafzali@gmail.com>
Date: Tue, 1 Dec 2020 15:05:32 -0500
Subject: More fixups

---
 src/engine/bank01.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/engine')

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