From 98f443f70c60f8fdbcf8621ab2c4f9dd37c66bde Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 17 May 2016 08:40:42 -0400 Subject: engine/events.asm labels finished fixed palred/green/blue macros --- main.asm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index a8eba9a21..8aaf58391 100644 --- a/main.asm +++ b/main.asm @@ -5129,10 +5129,10 @@ LoadPoisonBGPals: ; cbcdd ld hl, BGPals ld c, $20 .loop -; RGB 31, 21, 28 - ld a, (palred 31 + palgreen 21 + palblue 28) % $100 +; RGB 28, 21, 31 + ld a, (palred 28 + palgreen 21 + palblue 31) % $100 ld [hli], a - ld a, (palred 31 + palgreen 21 + palblue 28) / $100 + ld a, (palred 28 + palgreen 21 + palblue 31) / $100 ld [hli], a dec c jr nz, .loop @@ -5358,11 +5358,11 @@ RotateUnownFrontpic: ; e0000 ld hl, OverworldMap ld de, sScratch - ld bc, $31 tiles + ld bc, 7 * 7 tiles call CopyBytes pop hl ld de, sScratch - ld c, $31 + ld c, 7 * 7 ld a, [hROMBank] ld b, a call Get2bpp @@ -5774,7 +5774,8 @@ DrawPokedexSearchResultsWindow: ; 1de1d1 (77:61d1) .esults_D ; 1de23c ; (SEARCH R) - db "ESULTS" + db "ESULTS" + next "" ; (### FOUN) next "D!@" -- cgit v1.2.3