Merge pull request from yenatch/master

1bpp handling
This commit is contained in:
Bryan Bishop 2013-11-23 00:39:48 -08:00
commit 112de1c172
3 changed files with 42 additions and 17 deletions

View File

@ -67,9 +67,9 @@ gfx/trainers/%.lz: gfx/trainers/%.png
.png.lz: .png.lz:
$(PYTHON) extras/pokemontools/gfx.py png-to-lz $< $(PYTHON) extras/pokemontools/gfx.py png-to-lz $<
.png.2bpp: .png.2bpp:
$(PYTHON) extras/pokemontools/gfx.py png-to-lz $< $(PYTHON) extras/pokemontools/gfx.py png-to-2bpp $<
.png.1bpp: .png.1bpp:
$(PYTHON) extras/pokemontools/gfx.py png-to-lz $< $(PYTHON) extras/pokemontools/gfx.py png-to-1bpp $<
%.2bpp: %.2bpp:
@: @:
%.1bpp: %.1bpp:

2
extras

@ -1 +1 @@
Subproject commit a9aae368887caac706def81f0b991c7e778ad341 Subproject commit 3dac619f2d08f22b31e51311e27225c9f97d642e

View File

@ -54261,7 +54261,7 @@ asm_421f5
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
call ClearSprites call ClearSprites
callba Function4e5e1 callba EvolutionAnimation
push af push af
call ClearSprites call ClearSprites
pop af pop af
@ -63233,7 +63233,7 @@ Function4e5b7: ; 4e5b7 (13:65b7)
INCBIN "baserom.gbc",$4e5da,$4e5e1 - $4e5da INCBIN "baserom.gbc",$4e5da,$4e5e1 - $4e5da
Function4e5e1: ; 4e5e1 EvolutionAnimation: ; 4e5e1
push hl push hl
push de push de
push bc push bc
@ -63243,7 +63243,9 @@ Function4e5e1: ; 4e5e1
push af push af
ld a, [BaseDexNo] ld a, [BaseDexNo]
push af push af
call Function4e607
call _EvolutionAnimation
pop af pop af
ld [BaseDexNo], a ld [BaseDexNo], a
pop af pop af
@ -63253,40 +63255,49 @@ Function4e5e1: ; 4e5e1
pop bc pop bc
pop de pop de
pop hl pop hl
ld a, [$d1ed] ld a, [$d1ed]
and a and a
ret z ret z
scf scf
ret ret
; 4e607 ; 4e607
Function4e607: ; 4e607 _EvolutionAnimation: ; 4e607
ld a, $e4 ld a, $e4
ld [rOBP0], a ld [rOBP0], a
ld de, $0000
ld de, MUSIC_NONE
call PlayMusic call PlayMusic
callba Function8cf53 callba Function8cf53
ld de, $6831
ld de, EvolutionGFX
ld hl, VTiles0 ld hl, VTiles0
ld bc, $1308 ld bc, BANK(EvolutionGFX) << 8 + 8
call Request2bpp call Request2bpp
xor a xor a
ld [Danger], a ld [Danger], a
call WaitBGMap call WaitBGMap
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ld a, [MagikarpLength] ld a, [Buffer1]
ld [PlayerHPPal], a ld [PlayerHPPal], a
ld c, $0 ld c, $0
call Function4e703 call Function4e703
ld a, [MagikarpLength] ld a, [Buffer1]
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld [CurSpecies], a ld [CurSpecies], a
call Function4e708 call Function4e708
ld de, VTiles2 ld de, VTiles2
ld hl, $9310 ld hl, $9310
ld bc, $0031 ld bc, $0031
call Request2bpp call Request2bpp
ld a, $31 ld a, $31
ld [$d1ec], a ld [$d1ec], a
call Function4e755 call Function4e755
@ -63294,44 +63305,54 @@ Function4e607: ; 4e607
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld [CurSpecies], a ld [CurSpecies], a
call Function4e711 call Function4e711
ld a, [MagikarpLength] ld a, [Buffer1]
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld [CurSpecies], a ld [CurSpecies], a
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
call Function4e794 call Function4e794
jr c, .asm_4e67c jr c, .asm_4e67c
ld a, [MagikarpLength]
ld a, [Buffer1]
call Function37ce call Function37ce
.asm_4e67c .asm_4e67c
ld de, $0022 ld de, MUSIC_EVOLUTION
call PlayMusic call PlayMusic
ld c, $50
ld c, 80
call DelayFrames call DelayFrames
ld c, $1 ld c, $1
call Function4e703 call Function4e703
call Function4e726 call Function4e726
jr c, .asm_4e6df jr c, .asm_4e6df
ld a, $cf ld a, $cf
ld [$d1ec], a ld [$d1ec], a
call Function4e755 call Function4e755
xor a xor a
ld [$d1ed], a ld [$d1ed], a
ld a, [Buffer2] ld a, [Buffer2]
ld [PlayerHPPal], a ld [PlayerHPPal], a
ld c, $0 ld c, $0
call Function4e703 call Function4e703
call Function4e7a6 call Function4e7a6
callba Function8cf53 callba Function8cf53
call Function4e794 call Function4e794
jr c, .asm_4e6de jr c, .asm_4e6de
ld a, [$c2c6] ld a, [$c2c6]
push af push af
ld a, $1 ld a, $1
ld [$c2c6], a ld [$c2c6], a
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
push af push af
ld a, [PlayerHPPal] ld a, [PlayerHPPal]
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld hl, $c4cf ld hl, $c4cf
@ -63339,6 +63360,7 @@ Function4e607: ; 4e607
ld e, $4 ld e, $4
ld a, $47 ld a, $47
call Predef call Predef
pop af pop af
ld [CurPartySpecies], a ld [CurPartySpecies], a
pop af pop af
@ -63351,14 +63373,17 @@ Function4e607: ; 4e607
.asm_4e6df .asm_4e6df
ld a, $1 ld a, $1
ld [$d1ed], a ld [$d1ed], a
ld a, [MagikarpLength]
ld a, [Buffer1]
ld [PlayerHPPal], a ld [PlayerHPPal], a
ld c, $0 ld c, $0
call Function4e703 call Function4e703
call Function4e7a6 call Function4e7a6
callba Function8cf53 callba Function8cf53
call Function4e794 call Function4e794
ret c ret c
ld a, [PlayerHPPal] ld a, [PlayerHPPal]
call Function37ce call Function37ce
ret ret