diff options
author | Aroymart <andrewrmartinek@gmail.com> | 2020-12-06 21:06:54 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-06 21:06:54 -0500 |
commit | d7f996687fa01473b08cb572d7b1f59275eaa851 (patch) | |
tree | c46cfba092c5797e9787fe190e8f21cfcb7fd120 /src/engine/bank01.asm | |
parent | 6c44ebb86d6d45150e69fbab82d4e1a251c7366b (diff) | |
parent | db90dae74cc91f53e9ec815531572bdd295efacc (diff) |
Merge branch 'master' into rgbds
Diffstat (limited to 'src/engine/bank01.asm')
-rw-r--r-- | src/engine/bank01.asm | 52 |
1 files changed, 47 insertions, 5 deletions
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 1b7a90f..c4a6b27 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -6755,7 +6755,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] @@ -6783,7 +6783,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 @@ -6947,7 +6947,45 @@ Func_6cfa: ; 6cfa (1:6cfa) ret ; 0x6d3f - INCROM $6d3f, $6d84 +Func_6d3f: ; 6d3f (1:6d3f) + or a + bit POISONED_F , [hl] + ret z + push hl + bit DOUBLE_POISONED_F, [hl] + ld a, PSN_DAMAGE + ldtx hl, Received10DamageDueToPoisonText + jr z, .not_double_poisoned + ld a, DBLPSN_DAMAGE + ldtx hl, Received20DamageDueToPoisonText +.not_double_poisoned + push af + ld [wd4b1], a + xor a + ld [wd4b2], 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, DUELVARS_ARENA_CARD_HP + 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, @@ -8002,7 +8040,9 @@ PlayMoveAnimation: ; 7494 (1:7494) INCROM $74dc, $7571 Func_7571: ; 7571 (1:7571) - INCROM $7571, $7576 + farcall Func_19c20 + ret +; 0x7576 Func_7576: ; 7576 (1:7576) farcall Func_1991f @@ -8012,7 +8052,9 @@ Func_7576: ; 7576 (1:7576) INCROM $757b, $758f Func_758f: ; 758f (1:758f) - INCROM $758f, $7594 + farcall Func_1a4cf + ret +; 0x7594 Func_7594: ; 7594 (1:7594) farcall Func_1a61f |