From 95a2c2a6dacb62adf04aa81fd1d7a79da68cb7ea Mon Sep 17 00:00:00 2001 From: sawakita Date: Thu, 1 Nov 2012 18:33:28 +0100 Subject: [PATCH] Use more meaningful local labels in bank 0 Involved routines are: DisableLCD, CleanLCD_OAM, ResetLCD_OAM. --- main.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/main.asm b/main.asm index e7f3b91c..9cbb012c 100644 --- a/main.asm +++ b/main.asm @@ -39,10 +39,10 @@ DisableLCD: ; $0061 ld b,a res 0,a ld [$ffff],a -.jr0 +.waitVBlank ld a,[$ff44] cp a,$91 - jr nz,.jr0 + jr nz,.waitVBlank ld a,[$ff40] and a,$7f ; res 7,a ld [$ff40],a @@ -60,10 +60,10 @@ CleanLCD_OAM: ; $0082 xor a ld hl,$c300 ld b,$a0 -.jr0 +.loop ld [hli],a dec b - jr nz,.jr0 + jr nz,.loop ret ResetLCD_OAM: ; $008d @@ -71,11 +71,11 @@ ResetLCD_OAM: ; $008d ld hl,$c300 ld de,$0004 ld b,$28 -.jr0 +.loop ld [hl],a add hl,de dec b - jr nz,.jr0 + jr nz,.loop ret FarCopyData: ; 009D @@ -2849,7 +2849,7 @@ SwitchToMapRomBank: ; 12BC pop bc pop hl ret - + INCBIN "baserom.gbc",$12DA,$12ED-$12DA ;appears to be called twice inside function $C38B