From 0ca56ebb226db6b26b5118e91c4c739baffb1e7d Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Thu, 1 Sep 2022 00:39:56 +0100 Subject: [PATCH] A few more minor edits --- audio.asm | 4 ++-- audio/headers/musicheaders1.asm | 14 ++++++++++++++ audio/headers/musicheaders2.asm | 12 ------------ constants/music_constants.asm | 4 ++-- data/wild/maps/Route21.asm | 4 ++-- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/audio.asm b/audio.asm index b0c093f2..214934b2 100644 --- a/audio.asm +++ b/audio.asm @@ -406,6 +406,8 @@ INCLUDE "audio/music/lavender.asm" INCLUDE "audio/music/safarizone.asm" INCLUDE "audio/music/gym.asm" INCLUDE "audio/music/pokecenter.asm" +INCLUDE "audio/music/digda01.asm" +INCLUDE "audio/music/field6.asm" SECTION "Music 2", ROMX @@ -422,8 +424,6 @@ 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 diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm index fb387671..b1661099 100644 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm @@ -133,3 +133,17 @@ Music_IndigoPlateau:: channel 2, Music_IndigoPlateau_Ch2 channel 3, Music_IndigoPlateau_Ch3 channel 4, Music_IndigoPlateau_Ch4 + +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/musicheaders2.asm b/audio/headers/musicheaders2.asm index b8590d94..02f6bebd 100644 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -40,15 +40,3 @@ Music_DefeatedGymLeader:: 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/constants/music_constants.asm b/constants/music_constants.asm index c578edc5..701cc561 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -26,6 +26,8 @@ ENDM music_const MUSIC_ROUTES3, Music_Routes3 music_const MUSIC_ROUTES4, Music_Routes4 music_const MUSIC_INDIGO_PLATEAU, Music_IndigoPlateau + music_const MUSIC_DIGDA01, Music_Digda01 + music_const MUSIC_FIELD6, Music_Field6 ; AUDIO_2 music_const MUSIC_GYM_LEADER_BATTLE, Music_GymLeaderBattle @@ -35,8 +37,6 @@ 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/data/wild/maps/Route21.asm b/data/wild/maps/Route21.asm index f68d2735..9f20d360 100644 --- a/data/wild/maps/Route21.asm +++ b/data/wild/maps/Route21.asm @@ -3,8 +3,8 @@ Route21WildMons: db 21, RATICATE db 23, PIDGEOTTO db 30, BARUNDA - db 30, MR. MIME - db 29, MR. MIME + db 30, MR_MIME + db 29, MR_MIME db 29, GLOOM db 29, WEEPINBELL db 28, TANGELA