diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-05 20:15:21 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-05 20:15:21 -0400 |
| commit | 5ecda4d2741cc8f43a0b172aefc8299e44687832 (patch) | |
| tree | 7fbac7a8f1be0bcd6a877ea47ec73fd5dfbbc211 /home/copy2.asm | |
| parent | Fix EOL to LF to make push requests more doable. (diff) | |
| parent | Fix a lot of bugs (diff) | |
| download | pokeyellow-5ecda4d2741cc8f43a0b172aefc8299e44687832.tar.gz pokeyellow-5ecda4d2741cc8f43a0b172aefc8299e44687832.tar.xz pokeyellow-5ecda4d2741cc8f43a0b172aefc8299e44687832.zip | |
Merge git://github.com/dannye/pokeyellow into dannye-master
Conflicts:
constants/connection_constants.asm
constants/evolution_constants.asm
constants/list_constants.asm
constants/oam_constants.asm
constants/sprite_constants.asm
constants/type_constants.asm
engine/bank3d/random.asm
engine/bank3f/main.asm
home.asm
home/overworld.asm
home/serial.asm
macros.asm
main.asm
wram.asm
Diffstat (limited to 'home/copy2.asm')
| -rw-r--r-- | home/copy2.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/home/copy2.asm b/home/copy2.asm index 318ed882..ad82260a 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -14,11 +14,11 @@ FarCopyDataDouble:: ; 15d4 (0:15d4) ld e,a ld a,b and a - jr z,.8bitcopyamount + jr z,.eightbitcopyamount ld a,c and a ; multiple of $100 jr z, .expandloop ; if so, do not increment b because the first instance of dec c results in underflow -.8bitcopyamount +.eightbitcopyamount inc b .expandloop ld a,[de] @@ -134,13 +134,13 @@ FillMemory:: ; 166e (0:166e) push af ld a,b and a - jr z, .8bitcopyamount + jr z, .eightbitcopyamount ld a,c and a - jr z, .mulitpleof$100 -.8bitcopyamount + jr z, .mulitpleof0x100 +.eightbitcopyamount inc b -.multipleof$100 +.mulitpleof0x100 pop af .loop ld [hli],a |