thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

temporary music changes

Browse source
This commit is contained in:
MementoMartha 2022-08-31 23:26:54 +01:00
parent a1e009abb3
commit a37e07b842
7 changed files with 25 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
audio.asm
View file

@ -422,6 +422,8 @@ INCLUDE "audio/sfx/caught_mon.asm"
INCLUDE "audio/music/defeatedtrainer.asm" INCLUDE "audio/music/defeatedtrainer.asm"
INCLUDE "audio/music/defeatedwildmon.asm" INCLUDE "audio/music/defeatedwildmon.asm"
INCLUDE "audio/music/defeatedgymleader.asm" INCLUDE "audio/music/defeatedgymleader.asm"
INCLUDE "audio/music/digda01.asm"
INCLUDE "audio/music/field6.asm"
SECTION "Music 3", ROMX SECTION "Music 3", ROMX
@ -448,5 +450,4 @@ INCLUDE "audio/music/surfing.asm"
INCLUDE "audio/music/jigglypuffsong.asm" INCLUDE "audio/music/jigglypuffsong.asm"
INCLUDE "audio/music/halloffame.asm" INCLUDE "audio/music/halloffame.asm"
INCLUDE "audio/music/credits.asm" INCLUDE "audio/music/credits.asm"
INCLUDE "audio/music/digda01.asm"
INCLUDE "audio/music/field6.asm"

13
audio/headers/musicheaders2.asm
View file

@ -39,3 +39,16 @@ Music_DefeatedGymLeader::
channel 1, Music_DefeatedGymLeader_Ch1 channel 1, Music_DefeatedGymLeader_Ch1
channel 2, Music_DefeatedGymLeader_Ch2 channel 2, Music_DefeatedGymLeader_Ch2
channel 3, Music_DefeatedGymLeader_Ch3 channel 3, Music_DefeatedGymLeader_Ch3
Music_Digda01::
channel_count 3
channel 1, Music_Digda01_Ch1
channel 2, Music_Digda01_Ch2
channel 3, Music_Digda01_Ch3
Music_Field6::
channel_count 4
channel 1, Music_Field6_Ch1
channel 2, Music_Field6_Ch2
channel 3, Music_Field6_Ch3
channel 4, Music_Field6_Ch4

14
audio/headers/musicheaders3.asm
View file

@ -114,17 +114,3 @@ Music_MeetMaleTrainer::
channel 1, Music_MeetMaleTrainer_Ch1 channel 1, Music_MeetMaleTrainer_Ch1
channel 2, Music_MeetMaleTrainer_Ch2 channel 2, Music_MeetMaleTrainer_Ch2
channel 3, Music_MeetMaleTrainer_Ch3 channel 3, Music_MeetMaleTrainer_Ch3
; New Music
Music_Digda01::
channel_count 3
channel 1, Music_Digda01_Ch1
channel 2, Music_Digda01_Ch2
channel 3, Music_Digda01_Ch3
Music_Field6::
channel_count 4
channel 1, Music_Field6_Ch1
channel 2, Music_Field6_Ch2
channel 3, Music_Field6_Ch3
channel 4, Music_Field6_Ch4

6
audio/music/digda01.asm
View file

@ -12,7 +12,7 @@
;;---------------------------------------- ;;----------------------------------------
Digda01_Ch1: Music_Digda01_Ch1:
;;---------------------------------------- ;;----------------------------------------
tempo 144 tempo 144
@ -239,7 +239,7 @@ Digda01_Ch1:
sound_loop 0, .loop sound_loop 0, .loop
;;---------------------------------------- ;;----------------------------------------
Digda01_Ch2: Music_Digda01_Ch2:
;;---------------------------------------- ;;----------------------------------------
duty_cycle 1 duty_cycle 1
note_type 12, 12, 3 note_type 12, 12, 3
@ -477,7 +477,7 @@ Digda01_Ch2:
sound_loop 0, .loop sound_loop 0, .loop
;;---------------------------------------- ;;----------------------------------------
Digda01_Ch3: Music_Digda01_Ch3:
;;---------------------------------------- ;;----------------------------------------
;; P3-1 ;; P3-1

13
audio/music/field6.asm
View file

@ -1,11 +1,6 @@
;;---------------------------------------- ;;----------------------------------------
Field6_Ch1: Music_Field6_Ch1:
;;---------------------------------------- ;;----------------------------------------
tempo 128 tempo 128
@ -23,7 +18,7 @@ Field6_Ch1:
sound_loop 0, .loop10 sound_loop 0, .loop10
;;---------------------------------------- ;;----------------------------------------
Field6_Ch2: Music_Field6_Ch2:
;;---------------------------------------- ;;----------------------------------------
duty_cycle 1 duty_cycle 1
@ -123,7 +118,7 @@ Field6_Ch2:
;;---------------------------------------- ;;----------------------------------------
Field6_Ch3: Music_Field6_Ch3:
;;---------------------------------------- ;;----------------------------------------
note_type 12, 1, 1 note_type 12, 1, 1
@ -178,7 +173,7 @@ Field6_Ch3:
sound_ret sound_ret
;;---------------------------------------- ;;----------------------------------------
Field6_Ch4: Music_Field6_Ch4:
;;---------------------------------------- ;;----------------------------------------
drum_speed 6 drum_speed 6

2
constants/music_constants.asm
View file

@ -35,6 +35,8 @@ ENDM
music_const MUSIC_DEFEATED_TRAINER, Music_DefeatedTrainer music_const MUSIC_DEFEATED_TRAINER, Music_DefeatedTrainer
music_const MUSIC_DEFEATED_WILD_MON, Music_DefeatedWildMon music_const MUSIC_DEFEATED_WILD_MON, Music_DefeatedWildMon
music_const MUSIC_DEFEATED_GYM_LEADER, Music_DefeatedGymLeader music_const MUSIC_DEFEATED_GYM_LEADER, Music_DefeatedGymLeader
music_const MUSIC_DIGDA01, Music_Digda01
music_const MUSIC_FIELD6, Music_Field6
; AUDIO_3 ; AUDIO_3
music_const MUSIC_TITLE_SCREEN, Music_TitleScreen music_const MUSIC_TITLE_SCREEN, Music_TitleScreen

8
home/pokemon.asm
View file

@ -396,8 +396,6 @@ GetMonHeader::
ld b, $77 ; size of Aerodactyl fossil sprite ld b, $77 ; size of Aerodactyl fossil sprite
cp FOSSIL_AERODACTYL ; Aerodactyl fossil cp FOSSIL_AERODACTYL ; Aerodactyl fossil
jr z, .specialID jr z, .specialID
cp MEW
jr z, .mew
predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number
ld a, [wd11e] ld a, [wd11e]
dec a dec a
@ -416,12 +414,6 @@ GetMonHeader::
inc hl inc hl
ld [hl], d ld [hl], d
jr .done jr .done
.mew
ld hl, MewBaseStats
ld de, wMonHeader
ld bc, BASE_DATA_SIZE
ld a, BANK(MewBaseStats)
call FarCopyData
.done .done
ld a, [wd0b5] ld a, [wd0b5]
ld [wMonHIndex], a ld [wMonHIndex], a