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 /home.asm | |
| parent | 3ef626d37864f4dae26f115c26e448351f19da7c (diff) | |
| parent | f399315a489c7eff28ec1941c41d12264fb38039 (diff) | |
merge conflicts resolved
Diffstat (limited to 'home.asm')
| -rw-r--r-- | home.asm | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -76,12 +76,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 @@ -1119,7 +1119,7 @@ IsHMMove:: ; 34e7 db FLASH db WATERFALL db WHIRLPOOL - db $ff + db -1 ; 34f8 @@ -1129,7 +1129,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 @@ -1764,7 +1764,7 @@ Function383d:: ; 383d Function3842:: ; 3842 ld [wd265], a ld de, wd265 - ld b, 1 << 6 + 1 ; 65 + ld b, PRINTNUM_RIGHTALIGN | 1 jp PrintNum ; 384d |