diff --git a/audio.asm b/audio.asm index 545e190e..b0c093f2 100644 --- a/audio.asm +++ b/audio.asm @@ -422,6 +422,8 @@ INCLUDE "audio/sfx/caught_mon.asm" INCLUDE "audio/music/defeatedtrainer.asm" INCLUDE "audio/music/defeatedwildmon.asm" INCLUDE "audio/music/defeatedgymleader.asm" +INCLUDE "audio/music/digda01.asm" +INCLUDE "audio/music/field6.asm" SECTION "Music 3", ROMX @@ -448,5 +450,4 @@ INCLUDE "audio/music/surfing.asm" INCLUDE "audio/music/jigglypuffsong.asm" INCLUDE "audio/music/halloffame.asm" INCLUDE "audio/music/credits.asm" -INCLUDE "audio/music/digda01.asm" -INCLUDE "audio/music/field6.asm" + diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index c24c08d6..b8590d94 100644 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -39,3 +39,16 @@ Music_DefeatedGymLeader:: channel 1, Music_DefeatedGymLeader_Ch1 channel 2, Music_DefeatedGymLeader_Ch2 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 diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index 7d5c450a..82699f8e 100644 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -114,17 +114,3 @@ Music_MeetMaleTrainer:: channel 1, Music_MeetMaleTrainer_Ch1 channel 2, Music_MeetMaleTrainer_Ch2 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 diff --git a/audio/music/digda01.asm b/audio/music/digda01.asm index c1bf9971..3ea36853 100644 --- a/audio/music/digda01.asm +++ b/audio/music/digda01.asm @@ -12,7 +12,7 @@ ;;---------------------------------------- -Digda01_Ch1: +Music_Digda01_Ch1: ;;---------------------------------------- tempo 144 @@ -239,7 +239,7 @@ Digda01_Ch1: sound_loop 0, .loop ;;---------------------------------------- -Digda01_Ch2: +Music_Digda01_Ch2: ;;---------------------------------------- duty_cycle 1 note_type 12, 12, 3 @@ -477,7 +477,7 @@ Digda01_Ch2: sound_loop 0, .loop ;;---------------------------------------- -Digda01_Ch3: +Music_Digda01_Ch3: ;;---------------------------------------- ;; P3-1 diff --git a/audio/music/field6.asm b/audio/music/field6.asm index c918f169..cfb81a2a 100644 --- a/audio/music/field6.asm +++ b/audio/music/field6.asm @@ -1,11 +1,6 @@ - - - - - ;;---------------------------------------- -Field6_Ch1: +Music_Field6_Ch1: ;;---------------------------------------- tempo 128 @@ -23,7 +18,7 @@ Field6_Ch1: sound_loop 0, .loop10 ;;---------------------------------------- -Field6_Ch2: +Music_Field6_Ch2: ;;---------------------------------------- duty_cycle 1 @@ -123,7 +118,7 @@ Field6_Ch2: ;;---------------------------------------- -Field6_Ch3: +Music_Field6_Ch3: ;;---------------------------------------- note_type 12, 1, 1 @@ -178,7 +173,7 @@ Field6_Ch3: sound_ret ;;---------------------------------------- -Field6_Ch4: +Music_Field6_Ch4: ;;---------------------------------------- drum_speed 6 diff --git a/constants/music_constants.asm b/constants/music_constants.asm index e72e88d9..c578edc5 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -35,6 +35,8 @@ ENDM music_const MUSIC_DEFEATED_TRAINER, Music_DefeatedTrainer music_const MUSIC_DEFEATED_WILD_MON, Music_DefeatedWildMon music_const MUSIC_DEFEATED_GYM_LEADER, Music_DefeatedGymLeader + music_const MUSIC_DIGDA01, Music_Digda01 + music_const MUSIC_FIELD6, Music_Field6 ; AUDIO_3 music_const MUSIC_TITLE_SCREEN, Music_TitleScreen diff --git a/home/pokemon.asm b/home/pokemon.asm index 3e63de35..9c731a60 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -396,8 +396,6 @@ GetMonHeader:: ld b, $77 ; size of Aerodactyl fossil sprite cp FOSSIL_AERODACTYL ; Aerodactyl fossil jr z, .specialID - cp MEW - jr z, .mew predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number ld a, [wd11e] dec a @@ -416,12 +414,6 @@ GetMonHeader:: inc hl ld [hl], d jr .done -.mew - ld hl, MewBaseStats - ld de, wMonHeader - ld bc, BASE_DATA_SIZE - ld a, BANK(MewBaseStats) - call FarCopyData .done ld a, [wd0b5] ld [wMonHIndex], a