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

small changes

Browse source
This commit is contained in:
YamaArashi 2015-07-18 22:34:11 -07:00
parent c169073eed
commit d0526c0362
7 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engine/evos_moves.asm
View file

@ -145,7 +145,7 @@ Evolution_PartyMonLoop: ; loop over party mons
call GetName
push hl
ld hl, IntoText
call Func_3c59
call PrintText_NoCreatingTextBox
ld a, (SFX_02_3b - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent
call WaitForSoundToFinish

22
engine/overworld/elevator.asm
View file

@ -1,17 +1,16 @@
ShakeElevator: ; 7bf15 (1e:7f15)
ld de, $ffe0
call Func_7bf64
ld de, $240
call Func_7bf64
ld de, -$20
call ShakeElevatorRedrawRow
ld de, SCREEN_HEIGHT * $20
call ShakeElevatorRedrawRow
call Delay3
ld a, $ff
call PlaySound
ld a, [hSCY]
ld d, a
ld e, $1
; number of times to play collision sfx
ld b, 100
.asm_7bf30
.shakeLoop ; scroll the BG up and down and play a sound effect
ld a, e
xor $fe
ld e, a
@ -25,7 +24,7 @@ ShakeElevator: ; 7bf15 (1e:7f15)
ld c, 2
call DelayFrames
dec b
jr nz, .asm_7bf30
jr nz, .shakeLoop
ld a, d
ld [hSCY], a
ld a, $ff
@ -33,14 +32,17 @@ ShakeElevator: ; 7bf15 (1e:7f15)
ld c, BANK(SFX_02_5f)
ld a, (SFX_02_5f - SFX_Headers_02) / 3
call PlayMusic
.asm_7bf57
.musicLoop
ld a, [wc02a]
cp $b9
jr z, .asm_7bf57
jr z, .musicLoop
call UpdateSprites
jp PlayDefaultMusic
Func_7bf64: ; 7bf64 (1e:7f64)
ShakeElevatorRedrawRow: ; 7bf64 (1e:7f64)
; This function is used to redraw certain portions of the screen, but it does
; not appear to ever result in any visible effect, so this function seems to
; be pointless.
ld hl, wMapViewVRAMPointer + 1
ld a, [hld]
push af

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_02_4a - SFX_Headers_02) / 3
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