diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-02-24 08:52:11 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-02-24 08:52:11 -0600 |
| commit | 7f094ac28af099256cbbd8769f9d4f5672c8eaec (patch) | |
| tree | 6c7754a868634626177b2dba65be4ac4e6bc1f4b /src/engine/home.asm | |
| parent | cf80f04ee7365d72b0347c9cdae201e9c1d01724 (diff) | |
| parent | 798a5c1a7d7cc8e02cd649241b357f00871d1290 (diff) | |
Merge branch 'master' of https://github.com/anmart/poketcg
Diffstat (limited to 'src/engine/home.asm')
| -rwxr-xr-x | src/engine/home.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/home.asm b/src/engine/home.asm index 9f182ce..18e8b4d 100755 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -2996,7 +2996,7 @@ Func_1aac: ; 1aac (0:1aac) add DUELVARS_ARENA_CARD call GetTurnDuelistVariable call Func_1376 - ld a, [wCardBuffer1 + $7] + ld a, [wCardBuffer1ID] ld [wccc4], a call Func_1ad3 pop af @@ -5987,7 +5987,7 @@ Func_3432: ; 3432 (0:3432) ld e, a ld d, $0 call Func_2f0a - ld a, [wCardBuffer2 + $9] + ld a, [wCardBuffer2Stage] or a ret z ld e, $5 @@ -6252,7 +6252,7 @@ Func_3730: ; 3730 (0:3730) ld a, DUELVARS_ARENA_CARD call GetTurnDuelistVariable call Func_138c - ld a, [wCardBuffer2 + $33] + ld a, [wCardBuffer2Weakness] ret ; 0x3743 @@ -6266,7 +6266,7 @@ Func_374a: ; 374a (0:374a) ld a, DUELVARS_ARENA_CARD call GetTurnDuelistVariable call Func_138c - ld a, [wCardBuffer2 + $34] + ld a, [wCardBuffer2Resistance] ret ; 0x375d |