diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-09 18:25:44 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-09 18:25:44 -0500 |
| commit | a5a8364c35eceadf51956dac4212b440290b652c (patch) | |
| tree | d8a15952763765979ca031cefde05ecc5c862b2b /predef | |
| parent | 0c4bf512d08d3779d1185dd08b3f21041f2b6044 (diff) | |
opentext and breeding
Diffstat (limited to 'predef')
| -rw-r--r-- | predef/cgb.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/predef/cgb.asm b/predef/cgb.asm index 300ca9f9a..ea5580f8e 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -611,7 +611,7 @@ _CGB0b: ; 91e4 ld a, $1a call GetAthPalletFromPalettes9df6 call LoadHLPaletteIntoDE - jr .asm_921a + jr .got_palette .asm_91f5 ld hl, PartyMon1DVs @@ -624,12 +624,12 @@ _CGB0b: ; 91e4 call Function974b call Function9643 ld hl, Palettes_979c - ld de, UnknOBPals + $10 - ld bc, $0030 + ld de, UnknOBPals + 2 palettes + ld bc, 6 palettes ld a, $5 call FarCopyWRAM -.asm_921a +.got_palette call Function9699 call Function96b3 call Function96a4 |