diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-10 20:08:49 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-10 20:08:49 -0500 |
| commit | e47308a1f88f19dfc0ee5cb42dc643a520d9175b (patch) | |
| tree | 7ae7bb3ff46ceeab012869db3cbdad86545a0496 /main.asm | |
| parent | a684941cfcf88942cbecaecf997609acc3652a1a (diff) | |
| parent | 37c80175368352710e20f752ebfdc1e9e3ac3e2b (diff) | |
Merge branch kanzure/master into dannye-incbins
Conflicts:
extras
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -106,7 +106,7 @@ SECTION "romheader",ROM0[$100] nop jp Start -Section "start",ROM0[$150] +SECTION "start",ROM0[$150] Start: ; 0150 (0:0150) cp $11 ; value that indicates Gameboy Color jr z,.gbcDetected @@ -102751,8 +102751,8 @@ Unknown_71f8f: ; 71f8f (1c:5f8f) INCBIN "baserom.gbc",$71f8f,$71f97 - $71f8f DeterminePaletteID: ; 71f97 (1c:5f97) - bit 3, a ; bit 3 of battle status 3 (unused?) - ld a, PAL_GREYMON + bit 3, a ; bit 3 of battle status 3, set if current Pokemon is transformed + ld a, PAL_GREYMON ; if yes, use Ditto's palette ret nz ld a, [hl] Func_71f9d: ; 71f9d (1c:5f9d) |