diff options
| author | JimB16 <f1@jimb.de> | 2015-10-19 16:25:15 +0200 |
|---|---|---|
| committer | JimB16 <f1@jimb.de> | 2015-10-19 16:25:15 +0200 |
| commit | 3b9a3cc3bee8934e45f5e4d3fd9704b3fa619560 (patch) | |
| tree | b402ddfd95a21402d2ab76368d44b9f04f937725 /battle/anim_objects.asm | |
| parent | 3ef626d37864f4dae26f115c26e448351f19da7c (diff) | |
| parent | f399315a489c7eff28ec1941c41d12264fb38039 (diff) | |
merge conflicts resolved
Diffstat (limited to 'battle/anim_objects.asm')
| -rw-r--r-- | battle/anim_objects.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/battle/anim_objects.asm b/battle/anim_objects.asm index 5bf3e7c01..5c4c43525 100644 --- a/battle/anim_objects.asm +++ b/battle/anim_objects.asm @@ -1696,9 +1696,9 @@ Functioncd677: ; cd677 (33:5677) ld a, $42 ld [hLCDStatCustom], a ; $ff00+$c6 ld a, $58 - ld [$ffc7], a + ld [hLCDStatCustom + 1], a ld a, $5e - ld [$ffc8], a + ld [hLCDStatCustom + 2], a ret Functioncd687: ; cd687 (33:5687) @@ -1712,7 +1712,7 @@ Functioncd687: ; cd687 (33:5687) jr nc, .asm_cd69b call Functionce72c xor a - ld [$ffc7], a + ld [hLCDStatCustom + 1], a ret .asm_cd69b dec a @@ -1730,7 +1730,7 @@ Functioncd687: ; cd687 (33:5687) add [hl] sub $10 ret c - ld [$ffc7], a + ld [hLCDStatCustom + 1], a ld hl, $9 add hl, bc ld a, [hl] @@ -1754,8 +1754,8 @@ Functioncd6c6: ; cd6c6 (33:56c6) jr c, asm_cd6da xor a ld [hLCDStatCustom], a ; $ff00+$c6 - ld [$ffc7], a - ld [$ffc8], a + ld [hLCDStatCustom + 1], a + ld [hLCDStatCustom + 2], a Functioncd6d6: ; cd6d6 (33:56d6) call Functioncc9bd @@ -1767,7 +1767,7 @@ endr ld [hl], a sub $10 ret c - ld [$ffc7], a + ld [hLCDStatCustom + 1], a ret Functioncd6e3: ; cd6e3 (33:56e3) |