From dc0ae34b44bd21f5675e2faa13b066a28e554bae Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Mon, 29 Jun 2015 12:21:48 -0400 Subject: home.asm label fixes. --- home.asm | 10 +++++----- home/init.asm | 2 +- home/serial.asm | 2 +- home/vblank.asm | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/home.asm b/home.asm index 7dcb62e5..98160097 100644 --- a/home.asm +++ b/home.asm @@ -3808,7 +3808,7 @@ ManualTextScroll:: ; 388e (0:388e) Multiply:: ; 38a5 (0:38a5) push hl push bc - callab _Multiply + callab _Multiply ; 3d:660e pop bc pop hl ret @@ -4191,11 +4191,11 @@ WriteOAMBlock:: ; 3a84 (0:3a84) ld [hli],a ret -HandleMenuInput:: ; 3abc (0:3abc) +HandleMenuInput:: ; 3aab (0:3aab) xor a ld [wd09b],a -HandleMenuInputPokemonSelection:: ; 3ac0 (0:3ac0) +HandleMenuInputPokemonSelection:: ; 3aaf (0:3aaf) ld a,[H_DOWNARROWBLINKCNT1] push af ld a,[H_DOWNARROWBLINKCNT2] @@ -4817,7 +4817,7 @@ GBPalWhiteOut:: ; 3df2 (0:3df2) GoPAL_SET_CF1C:: ; 3e03 (0:3e03) ld b,$ff -GoPAL_SET:: ; 3e08 (0:3e08) +GoPAL_SET:: ; 3e05 (0:3e05) ld a,[wOnSGB] and a ret z @@ -4884,7 +4884,7 @@ GivePokemon:: ; 3e59 (0:3e59) ld [W_CURENEMYLVL], a xor a ld [wcc49], a - ld b, BANK(_GivePokemon) + ld b, BANK(_GivePokemon) ; 3d:66fa ld hl, _GivePokemon jp Bankswitch diff --git a/home/init.asm b/home/init.asm index e4d980ef..671809a7 100644 --- a/home/init.asm +++ b/home/init.asm @@ -54,7 +54,7 @@ rLCDC_DEFAULT EQU %11100011 call ClearVram ; 1dc6 ld hl, $ff80 - ld bc, $ffff - $ff80 + ld bc, $fffe - $ff80 call FillMemory call ClearSprites diff --git a/home/serial.asm b/home/serial.asm index 3c5c343b..c8e64f38 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -232,7 +232,7 @@ Serial_PrintWaitingTextAndSyncAndExchangeNybble:: ; 20ca (0:20ca) call Serial_SyncAndExchangeNybble jp LoadScreenTilesFromBuffer1 -Serial_SyncAndExchangeNybble:: ; 227f (0:227f) +Serial_SyncAndExchangeNybble:: ; 20db (0:20db) ld a, $ff ld [wSerialExchangeNybbleReceiveData], a .loop1 diff --git a/home/vblank.asm b/home/vblank.asm index 08348f79..fda0f6f5 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -1,4 +1,4 @@ -VBlank:: +VBlank:: ; 1de5 (0:1de5) push af push bc @@ -83,7 +83,7 @@ VBlank:: reti -DelayFrame:: +DelayFrame:: ; 1e64 (0:1e64) ; Wait for the next vblank interrupt. ; As a bonus, this saves battery. -- cgit v1.3.1-sl0p