thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/YamaArashi/pokered

Browse source 
Conflicts:
	engine/evos_moves.asm
	engine/overworld/healing_machine.asm
This commit is contained in:
dannye 2015-07-19 03:52:20 -05:00
commit 64b4cf624f
67 changed files with 766 additions and 632 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engine/overworld/healing_machine.asm
View file

@ -14,7 +14,7 @@ AnimateHealingMachine: ; 70433 (1c:4433)
ld [rOBP1], a
ld hl, wOAMBuffer + $84
ld de, PokeCenterOAMData
call Func_70503
call CopyHealingMachineOAM
ld a, $4
ld [wMusicHeaderPointer], a
ld a, $ff
@ -27,7 +27,7 @@ AnimateHealingMachine: ; 70433 (1c:4433)
ld a, [wPartyCount]
ld b, a
.asm_7046e
call Func_70503
call CopyHealingMachineOAM
ld a, SFX_HEALING_MACHINE
call PlaySound
ld c, 30
@ -87,7 +87,8 @@ FlashSprite8Times: ; 704f3 (1c:44f3)
jr nz, .loop
ret
Func_70503: ; 70503 (1c:4503)
CopyHealingMachineOAM: ; 70503 (1c:4503)
; copy one OAM entry and advance the pointers
ld a, [de]
inc de
ld [hli], a