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/dannye/pokered-crysaudio

Browse source
This commit is contained in:
dannye 2023-04-19 21:08:01 -05:00
commit 8021cbdf04
530 changed files with 153841 additions and 14088 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/CeruleanCity.asm
View file

@ -69,10 +69,10 @@ ENDC
and a
jr z, .walking
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
.walking
ld c, BANK(Music_MeetRival)
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
xor a
@ -191,7 +191,7 @@ CeruleanCityScript2:
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
farcall Music_RivalAlternateStart
ld a, $1

6
scripts/OaksLab.asm
View file

@ -387,7 +387,7 @@ OaksLabScript10:
call SetSpriteFacingDirectionAndDelay
ld a, PLAYER_DIR_UP
ld [wPlayerMovingDirection], a
ld c, BANK(Music_MeetRival)
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld a, $f
@ -564,7 +564,7 @@ OaksLabScript15:
ldh [hJoyHeld], a
call EnableAutoTextBoxDrawing
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
farcall Music_RivalAlternateStart
ld a, $15
@ -665,7 +665,7 @@ OaksLabScript16:
call FillMemory
ld [hl], $ff
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
farcall Music_RivalAlternateStart
ld a, $1

2
scripts/PalletTown.asm
View file

@ -29,7 +29,7 @@ PalletTownScript0:
ld [wPlayerMovingDirection], a
ld a, SFX_STOP_ALL_MUSIC
call PlaySound
ld a, BANK(Music_MeetProfOak)
ld a, 0 ; BANK(Music_MeetProfOak)
ld c, a
ld a, MUSIC_MEET_PROF_OAK ; "oak appears" music
call PlayMusic

17
scripts/PewterPokecenter.asm
View file

@ -42,7 +42,7 @@ PewterJigglypuffText:
dec hl
push hl
ld c, BANK(Music_JigglypuffSong)
ld c, 0 ; BANK(Music_JigglypuffSong)
ld a, MUSIC_JIGGLYPUFF_SONG
call PlayMusic
pop hl
@ -61,11 +61,16 @@ PewterJigglypuffText:
pop hl
ld c, 24
call DelayFrames
ld a, [wChannelSoundIDs]
ld b, a
ld a, [wChannelSoundIDs + CHAN2]
or b
jr nz, .spinMovementLoop
push hl
call IsSongPlaying
pop hl
jr c, .spinMovementLoop
; ld a, [wChannelSoundIDs]
; ld b, a
; ld a, [wChannelSoundIDs + CHAN2]
; or b
; jr nz, .spinMovementLoop
ld c, 48
call DelayFrames

6
scripts/PokemonTower2F.asm
View file

@ -27,9 +27,9 @@ ENDC
call ArePlayerCoordsInArray
ret nc
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
ld c, BANK(Music_MeetRival)
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ResetEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT
@ -83,7 +83,7 @@ PokemonTower2Script1:
ldh [hSpriteIndex], a
call MoveSprite
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
farcall Music_RivalAlternateStart
ld a, $2

19
scripts/RedsHouse1F.asm
View file

@ -29,15 +29,18 @@ MomHealPokemon:
call ReloadMapData
predef HealParty
ld a, MUSIC_PKMN_HEALED
ld [wNewSoundID], a
call PlaySound
.next
ld a, [wChannelSoundIDs]
cp MUSIC_PKMN_HEALED
jr z, .next
; ld [wNewSoundID], a
call PlayMusic
call WaitForSongToFinish
;.next
; ld a, [wChannelSoundIDs]
; cp MUSIC_PKMN_HEALED
; jr z, .next
ld a, [wMapMusicSoundID]
ld [wNewSoundID], a
call PlaySound
; ld [wNewSoundID], a
call PlayMusic
call GBFadeInFromWhite
ld hl, MomHealText2
jp PrintText

12
scripts/Route22.asm
View file

@ -91,10 +91,10 @@ Route22Script0:
and a
jr z, .asm_50f4e
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
.asm_50f4e
ld c, BANK(Music_MeetRival)
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld a, $1
@ -174,7 +174,7 @@ Route22Script2:
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
farcall Music_RivalAlternateStart
ld a, [wcf0d]
@ -248,11 +248,11 @@ Route22Script_5104e:
and a
jr z, .skipYVisibilityTesta
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
.skipYVisibilityTesta
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
farcall Music_RivalAlternateTempo
ld a, $2
@ -337,7 +337,7 @@ Route22Script5:
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
farcall Music_RivalAlternateStartAndTempo
ld a, [wcf0d]

6
scripts/SSAnne2F.asm
View file

@ -25,9 +25,9 @@ SSAnne2Script0:
call ArePlayerCoordsInArray
ret nc
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
ld c, BANK(Music_MeetRival)
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld a, [wCoordIndex]
@ -160,7 +160,7 @@ SSAnne2Script2:
ldh [hSpriteIndex], a
call MoveSprite
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
farcall Music_RivalAlternateStart
ld a, $3

35
scripts/SSAnneCaptainsRoom.asm
View file

@ -44,23 +44,26 @@ SSAnne7Text1:
SSAnne7RubText:
text_far _SSAnne7RubText
text_asm
ld a, [wAudioROMBank]
cp BANK("Audio Engine 3")
ld [wAudioSavedROMBank], a
jr nz, .asm_61908
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
ld a, BANK(Music_PkmnHealed)
ld [wAudioROMBank], a
.asm_61908
; ld a, [wAudioROMBank]
; cp BANK("Audio Engine 3")
; ld [wAudioSavedROMBank], a
; jr nz, .asm_61908
; ld a, SFX_STOP_ALL_MUSIC
; ld [wNewSoundID], a
; call PlaySound
; ld a, 0 ; BANK(Music_PkmnHealed)
; ld [wAudioROMBank], a
;.asm_61908
ld a, MUSIC_PKMN_HEALED
ld [wNewSoundID], a
call PlaySound
.asm_61910
ld a, [wChannelSoundIDs]
cp MUSIC_PKMN_HEALED
jr z, .asm_61910
; ld [wNewSoundID], a
call PlayMusic
call WaitForSongToFinish
;.asm_61910
; ld a, [wChannelSoundIDs]
; cp MUSIC_PKMN_HEALED
; jr z, .asm_61910
call PlayDefaultMusic
SetEvent EVENT_RUBBED_CAPTAINS_BACK
ld hl, wd72d

6
scripts/SilphCo7F.asm
View file

@ -131,9 +131,9 @@ SilphCo7Script0:
ld a, PLAYER_DIR_DOWN
ld [wPlayerMovingDirection], a
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
ld c, BANK(Music_MeetRival)
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld a, $9
@ -235,7 +235,7 @@ SilphCo7Script4:
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
farcall Music_RivalAlternateStart
ld de, MovementData_51d1d

4
scripts/VermilionDock.asm
View file

@ -43,9 +43,9 @@ VermilionDock_1db9b:
SetEventForceReuseHL EVENT_SS_ANNE_LEFT
ld a, SFX_STOP_ALL_MUSIC
ld [wJoyIgnore], a
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
ld c, BANK(Music_Surfing)
ld c, 0 ; BANK(Music_Surfing)
ld a, MUSIC_SURFING
call PlayMusic
farcall LoadSmokeTileFourTimes