Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-05-09 04:13:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert last 3 .s files to .midi
Some checks are pending
CI / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
Marcus Huderle 2026-03-21 09:35:45 -05:00
parent 1b35dd881e
commit d731ae90d8
9 changed files with 7 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -94,13 +94,11 @@ C_SUBDIR = src
ASM_SUBDIR = asm
DATA_SRC_SUBDIR = src/data
DATA_ASM_SUBDIR = data
SONG_SUBDIR = sound/songs
MID_SUBDIR = sound/songs/midi
C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR)
ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR)
DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR)
SONG_BUILDDIR = $(OBJ_DIR)/$(SONG_SUBDIR)
MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR)
SHELL := bash -o pipefail
@ -211,13 +209,10 @@ REGULAR_DATA_ASM_SRCS := $(filter-out $(DATA_ASM_SUBDIR)/maps.s $(DATA_ASM_SUBDI
DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s)
DATA_ASM_OBJS := $(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o,$(DATA_ASM_SRCS))
SONG_SRCS := $(wildcard $(SONG_SUBDIR)/*.s)
SONG_OBJS := $(patsubst $(SONG_SUBDIR)/%.s,$(SONG_BUILDDIR)/%.o,$(SONG_SRCS))
MID_SRCS := $(wildcard $(MID_SUBDIR)/*.mid)
MID_OBJS := $(patsubst $(MID_SUBDIR)/%.mid,$(MID_BUILDDIR)/%.o,$(MID_SRCS))
OBJS := $(C_OBJS) $(C_ASM_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS)
OBJS := $(C_OBJS) $(C_ASM_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(MID_OBJS)
OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
SUBDIRS := $(sort $(dir $(OBJS)))

6
ld_script.ld
View File

@ -888,7 +888,7 @@ SECTIONS {
sound/songs/midi/se_m_explosion.o(.rodata);
sound/songs/midi/se_m_absorb_2.o(.rodata);
sound/songs/midi/se_m_absorb.o(.rodata);
sound/songs/se_m_screech.o(.rodata);
sound/songs/midi/se_m_screech.o(.rodata);
sound/songs/midi/se_m_bubble_beam.o(.rodata);
sound/songs/midi/se_m_bubble_beam2.o(.rodata);
sound/songs/midi/se_m_supersonic.o(.rodata);
@ -904,7 +904,7 @@ SECTIONS {
sound/songs/midi/se_m_swagger2.o(.rodata);
sound/songs/midi/se_m_heal_bell.o(.rodata);
sound/songs/midi/se_m_confuse_ray.o(.rodata);
sound/songs/se_m_snore.o(.rodata);
sound/songs/midi/se_m_snore.o(.rodata);
sound/songs/midi/se_m_brick_break.o(.rodata);
sound/songs/midi/se_m_giga_drain.o(.rodata);
sound/songs/midi/se_m_psybeam2.o(.rodata);
@ -944,7 +944,7 @@ SECTIONS {
sound/songs/midi/se_m_earthquake.o(.rodata);
sound/songs/midi/se_m_twister.o(.rodata);
sound/songs/midi/se_m_sweet_scent.o(.rodata);
sound/songs/se_m_yawn.o(.rodata);
sound/songs/midi/se_m_yawn.o(.rodata);
sound/songs/midi/se_m_sky_uppercut.o(.rodata);
sound/songs/midi/se_m_stat_increase.o(.rodata);
sound/songs/midi/se_m_heat_wave.o(.rodata);

3
sound/songs/midi/midi.cfg
View File

@ -416,10 +416,12 @@ se_m_sand_attack.mid: -E -R50 -G_rs_sfx_2 -V110 -P4
se_m_sand_tomb.mid: -R50 -G_rs_sfx_2 -P4
se_m_sandstorm.mid: -R50 -G_rs_sfx_2 -P4
se_m_scratch.mid: -E -R50 -G_rs_sfx_2 -V110 -P4
se_m_screech.mid: -R50 -G_rs_sfx_2 -V110 -P4
se_m_self_destruct.mid: -R50 -G_rs_sfx_2 -P4
se_m_sing.mid: -R50 -G_rs_sfx_2 -P4
se_m_sketch.mid: -R50 -G_rs_sfx_2 -P4
se_m_sky_uppercut.mid: -R50 -G_rs_sfx_2 -P4
se_m_snore.mid: -R50 -G_rs_sfx_2 -V120 -P4
se_m_solar_beam.mid: -R50 -G_rs_sfx_2 -P4
se_m_spit_up.mid: -R50 -G_rs_sfx_2 -P4
se_m_stat_decrease.mid: -R50 -G_rs_sfx_2 -P4
@ -452,6 +454,7 @@ se_m_vital_throw2.mid: -R50 -G_rs_sfx_2 -P4
se_m_waterfall.mid: -R50 -G_rs_sfx_2 -P4
se_m_whirlpool.mid: -R50 -G_rs_sfx_2 -P4
se_m_wing_attack.mid: -E -R50 -G_rs_sfx_2 -V105 -P4
se_m_yawn.mid: -R50 -G_rs_sfx_2 -V110 -P4
se_mud_ball.mid: -E -R50 -G_rs_sfx_2 -V110 -P4
se_mugshot.mid: -E -R50 -G_rs_sfx_2 -V090 -P5
se_n.mid: -E -R50 -G_rs_sfx_2 -P4

BIN
sound/songs/midi/se_m_screech.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_snore.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_yawn.mid Normal file
View File

Binary file not shown.

112
sound/songs/se_m_screech.s
View File

@ -1,112 +0,0 @@
.include "MPlayDef.s"
.equ se_m_screech_grp, voicegroup_rs_sfx_2
.equ se_m_screech_pri, 4
.equ se_m_screech_rev, reverb_set+50
.equ se_m_screech_mvl, 127
.equ se_m_screech_key, 0
.equ se_m_screech_tbs, 1
.equ se_m_screech_exg, 0
.equ se_m_screech_cmp, 1
.section .rodata
.global se_m_screech
.align 2
@********************** Track 1 **********************@
se_m_screech_1:
.byte VOL , 110*se_m_screech_mvl/mxv
.byte KEYSH , se_m_screech_key+0
.byte TEMPO , 150*se_m_screech_tbs/2
.byte VOICE , 44
.byte BENDR , 2
.byte PAN , c_v+0
.byte BEND , c_v+0
.byte N21 , Fs5 , v112
.byte W01
.byte PAN , c_v-5
.byte W01
.byte c_v-10
.byte VOL , 15*se_m_screech_mvl/mxv
.byte W01
.byte PAN , c_v-4
.byte VOL , 41*se_m_screech_mvl/mxv
.byte W01
.byte PAN , c_v+0
.byte VOL , 69*se_m_screech_mvl/mxv
.byte W02
.byte PAN , c_v+4
.byte W01
.byte c_v+10
.byte VOL , 84*se_m_screech_mvl/mxv
.byte W01
.byte PAN , c_v+4
.byte W01
.byte VOL , 97*se_m_screech_mvl/mxv
.byte PAN , c_v+0
.byte W01
.byte c_v-5
.byte W02
.byte VOL , 110*se_m_screech_mvl/mxv
.byte PAN , c_v-10
.byte W01
.byte c_v-4
.byte W01
.byte c_v+0
.byte W01
.byte c_v+4
.byte W01
.byte c_v+10
.byte W02
.byte VOL , 100*se_m_screech_mvl/mxv
.byte PAN , c_v+4
.byte W01
.byte VOL , 84*se_m_screech_mvl/mxv
.byte PAN , c_v+0
.byte W01
.byte VOL , 55*se_m_screech_mvl/mxv
.byte W02
.byte BEND , c_v+0
.byte W02
.byte FINE
@********************** Track 2 **********************@
se_m_screech_2:
.byte VOL , 110*se_m_screech_mvl/mxv
.byte KEYSH , se_m_screech_key+0
.byte VOICE , 42
.byte PAN , c_v+0
.byte BEND , c_v+0
.byte N21 , Fn6 , v064
.byte W06
.byte PAN , c_v+0
.byte W03
.byte c_v+0
.byte W03
.byte W03
.byte c_v+0
.byte W03
.byte W01
.byte c_v+0
.byte W03
.byte BEND , c_v+0
.byte W02
.byte FINE
@******************************************************@
.align 2
se_m_screech:
.byte 2 @ NumTrks
.byte 0 @ NumBlks
.byte se_m_screech_pri @ Priority
.byte se_m_screech_rev @ Reverb.
.word se_m_screech_grp
.word se_m_screech_1
.word se_m_screech_2
.end

105
sound/songs/se_m_snore.s
View File

@ -1,105 +0,0 @@
.include "MPlayDef.s"
.equ se_m_snore_grp, voicegroup_rs_sfx_2
.equ se_m_snore_pri, 4
.equ se_m_snore_rev, reverb_set+50
.equ se_m_snore_mvl, 127
.equ se_m_snore_key, 0
.equ se_m_snore_tbs, 1
.equ se_m_snore_exg, 0
.equ se_m_snore_cmp, 1
.section .rodata
.global se_m_snore
.align 2
@********************** Track 1 **********************@
se_m_snore_1:
.byte KEYSH , se_m_snore_key+0
.byte TEMPO , 220*se_m_snore_tbs/2
.byte VOICE , 38
.byte BENDR , 12
.byte PAN , c_v+0
.byte VOL , 27*se_m_snore_mvl/mxv
.byte BEND , c_v+0
.byte N10 , An1 , v127
.byte W01
.byte VOL , 75*se_m_snore_mvl/mxv
.byte W01
.byte 120*se_m_snore_mvl/mxv
.byte W04
.byte W02
.byte 75*se_m_snore_mvl/mxv
.byte W01
.byte 28*se_m_snore_mvl/mxv
.byte W03
.byte VOICE , 36
.byte VOL , 83*se_m_snore_mvl/mxv
.byte N18 , En2 , v112
.byte W02
.byte VOL , 87*se_m_snore_mvl/mxv
.byte W02
.byte 91*se_m_snore_mvl/mxv
.byte W02
.byte W01
.byte 97*se_m_snore_mvl/mxv
.byte W02
.byte 102*se_m_snore_mvl/mxv
.byte W01
.byte 109*se_m_snore_mvl/mxv
.byte W02
.byte 113*se_m_snore_mvl/mxv
.byte W01
.byte 120*se_m_snore_mvl/mxv
.byte W05
.byte FINE
@********************** Track 2 **********************@
se_m_snore_2:
.byte VOL , 120*se_m_snore_mvl/mxv
.byte KEYSH , se_m_snore_key+0
.byte VOICE , 27
.byte N01 , En2 , v052
.byte W02
.byte Dn2
.byte W02
.byte En2
.byte W02
.byte W01
.byte Dn2
.byte W02
.byte En2
.byte W03
.byte W01
.byte En2 , v064
.byte W02
.byte Gs2
.byte W03
.byte Dn3
.byte W02
.byte En2
.byte W02
.byte Gs2
.byte W02
.byte W01
.byte Dn3
.byte W05
.byte FINE
@******************************************************@
.align 2
se_m_snore:
.byte 2 @ NumTrks
.byte 0 @ NumBlks
.byte se_m_snore_pri @ Priority
.byte se_m_snore_rev @ Reverb.
.word se_m_snore_grp
.word se_m_snore_1
.word se_m_snore_2
.end

127
sound/songs/se_m_yawn.s
View File

@ -1,127 +0,0 @@
.include "MPlayDef.s"
.equ se_m_yawn_grp, voicegroup_rs_sfx_2
.equ se_m_yawn_pri, 4
.equ se_m_yawn_rev, reverb_set+50
.equ se_m_yawn_mvl, 127
.equ se_m_yawn_key, 0
.equ se_m_yawn_tbs, 1
.equ se_m_yawn_exg, 0
.equ se_m_yawn_cmp, 1
.section .rodata
.global se_m_yawn
.align 2
@********************** Track 1 **********************@
se_m_yawn_1:
.byte VOL , 110*se_m_yawn_mvl/mxv
.byte KEYSH , se_m_yawn_key+0
.byte TEMPO , 150*se_m_yawn_tbs/2
.byte VOICE , 61
.byte BENDR , 44
.byte PAN , c_v+0
.byte BEND , c_v+0
.byte N48 , Cn4 , v108
.byte W02
.byte BEND , c_v-1
.byte W01
.byte c_v+0
.byte W03
.byte c_v+0
.byte W01
.byte c_v+0
.byte W02
.byte c_v+0
.byte W01
.byte c_v+0
.byte W02
.byte PAN , c_v-4
.byte W01
.byte BEND , c_v+0
.byte W01
.byte c_v+1
.byte W02
.byte c_v+1
.byte W02
.byte c_v+1
.byte W02
.byte c_v+1
.byte W01
.byte c_v+1
.byte W03
.byte PAN , c_v-10
.byte BEND , c_v+1
.byte W01
.byte c_v+2
.byte W02
.byte c_v+2
.byte W03
.byte c_v+1
.byte W02
.byte c_v+2
.byte W01
.byte c_v+1
.byte W03
.byte PAN , c_v-4
.byte BEND , c_v+1
.byte W01
.byte c_v+1
.byte W02
.byte c_v+1
.byte W01
.byte c_v+0
.byte W02
.byte c_v+0
.byte W01
.byte c_v-1
.byte W01
.byte c_v-1
.byte W01
.byte c_v-3
.byte W01
.byte c_v-3
.byte W02
.byte FINE
@********************** Track 2 **********************@
se_m_yawn_2:
.byte KEYSH , se_m_yawn_key+0
.byte VOICE , 66
.byte BENDR , 44
.byte PAN , c_v+1
.byte VOL , 110*se_m_yawn_mvl/mxv
.byte N48 , Dn3 , v020
.byte W24
.byte W03
.byte VOL , 103*se_m_yawn_mvl/mxv
.byte W04
.byte 96*se_m_yawn_mvl/mxv
.byte W03
.byte 83*se_m_yawn_mvl/mxv
.byte W04
.byte 67*se_m_yawn_mvl/mxv
.byte W04
.byte 49*se_m_yawn_mvl/mxv
.byte W03
.byte 23*se_m_yawn_mvl/mxv
.byte W03
.byte FINE
@******************************************************@
.align 2
se_m_yawn:
.byte 2 @ NumTrks
.byte 0 @ NumBlks
.byte se_m_yawn_pri @ Priority
.byte se_m_yawn_rev @ Reverb.
.word se_m_yawn_grp
.word se_m_yawn_1
.word se_m_yawn_2
.end