diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-04 11:46:23 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-04 11:46:23 -0400 |
| commit | 3713b71d9e3f3f1bc099d4704910cb9c1d172dcf (patch) | |
| tree | 03069bd1fb4576c16b773b23bab0071aabb7cabd /predef | |
| parent | 82f1534925c5fe1f0d876ea88119b0121cfa65a6 (diff) | |
More splitting of main.asm; remove unneeded rept 2
Diffstat (limited to 'predef')
| -rw-r--r-- | predef/cgb.asm | 4 | ||||
| -rw-r--r-- | predef/sgb.asm | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/predef/cgb.asm b/predef/cgb.asm index addbcb0d5..4c164134b 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -58,7 +58,7 @@ Predef_LoadSGBLayoutCGB: ; 8d59 dw _CGB_PokedexUnownMode dw _CGB17 dw _CGB18 - dw _CGB19 + dw _CGB_GamefreakLogo ; called before copyright dw _CGB1a dw _CGB1b dw _CGB_FrontpicPals @@ -1002,7 +1002,7 @@ _CGB13: ; 94d0 ret ; 94fa -_CGB19: ; 94fa +_CGB_GamefreakLogo: ; 94fa ld de, UnknBGPals ld a, $4e call GetPredefPal diff --git a/predef/sgb.asm b/predef/sgb.asm index c79a173ba..f9e8348d9 100644 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -75,9 +75,8 @@ Predef_LoadSGBLayout: ; 864c ld a, [PlayerHPPal] ld l, a ld h, 0 -rept 2 add hl, hl -endr + add hl, hl ld de, Palettes_a8be add hl, de @@ -93,9 +92,8 @@ endr ld a, [EnemyHPPal] ld l, a ld h, 0 -rept 2 add hl, hl -endr + add hl, hl ld de, Palettes_a8be add hl, de @@ -148,9 +146,8 @@ endr ld hl, wSGBPals + 1 ld [hl], $10 -rept 2 inc hl -endr + inc hl ld a, [PlayerHPPal] add $2f @@ -174,9 +171,8 @@ endr ld a, [wcda1] ld l, a ld h, 0 -rept 2 add hl, hl -endr + add hl, hl ld de, Palettes_a8be add hl, de ld a, [hli] |