From 327faac497b4195dbf1d3c8dbfeb2adcda9deb27 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 11 Oct 2015 12:15:03 -0400 Subject: Magikarp functions moved to event/magikarp.asm --- home.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'home.asm') diff --git a/home.asm b/home.asm index a03c60d63..a7218f26c 100644 --- a/home.asm +++ b/home.asm @@ -75,12 +75,12 @@ Function2ebb:: ; 2ebb ret ; 2ec6 -Function2ec6:: ; 2ec6 +xor_a:: ; 2ec6 xor a ret ; 2ec8 -Function2ec8:: ; 2ec8 +xor_a_dec_a:: ; 2ec8 xor a dec a ret @@ -1760,7 +1760,7 @@ Function383d:: ; 383d Function3842:: ; 3842 ld [wd265], a ld de, wd265 - ld b, 1 << 6 + 1 + ld b, PRINTNUM_RIGHTALIGN | 1 jp PrintNum ; 384d -- cgit v1.2.3 From 0c39f6e273910be3b0ed9317e73c40615d789ae3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 12 Oct 2015 12:33:24 -0400 Subject: Happiness and Mystery Gift constants --- home.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'home.asm') diff --git a/home.asm b/home.asm index a7218f26c..ec4daa2d2 100644 --- a/home.asm +++ b/home.asm @@ -1115,7 +1115,7 @@ IsHMMove:: ; 34e7 db FLASH db WATERFALL db WHIRLPOOL - db $ff + db -1 ; 34f8 @@ -1125,7 +1125,7 @@ GetMoveName:: ; 34f8 ld a, MOVE_NAME ld [wcf61], a - ld a, [wd265] ; move id + ld a, [wNamedObjectIndexBuffer] ; move id ld [CurSpecies], a call GetName -- cgit v1.2.3