ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-28 16:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

move m4a track definitions

Browse Source
This commit is contained in:
Kurausukun 2022-01-22 19:37:46 -05:00
parent 79dfac92c9
commit a83e41b2cc
3 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sound/music_player_table.inc
View File

@ -1,6 +1,36 @@
.equiv TRACK_SIZE, 0x50
.equiv NUM_TRACKS_BGM, 10
.equiv NUM_TRACKS_SE1, 3
.equiv NUM_TRACKS_SE2, 9
.equiv NUM_TRACKS_SE3, 1
.bss
.global gMPlayTrack_BGM
gMPlayTrack_BGM:
.space TRACK_SIZE * NUM_TRACKS_BGM
.size gMPlayTrack_BGM, .-gMPlayTrack_BGM
.global gMPlayTrack_SE1
gMPlayTrack_SE1:
.space TRACK_SIZE * NUM_TRACKS_SE1
.size gMPlayTrack_SE1, .-gMPlayTrack_SE1
.global gMPlayTrack_SE2
gMPlayTrack_SE2:
.space TRACK_SIZE * NUM_TRACKS_SE2
.size gMPlayTrack_SE2, .-gMPlayTrack_SE2
.global gMPlayTrack_SE3
gMPlayTrack_SE3:
.space TRACK_SIZE * NUM_TRACKS_SE3
.size gMPlayTrack_SE3, .-gMPlayTrack_SE3
.section .rodata
.align 2 .align 2
gMPlayTable:: gMPlayTable::
music_player gMPlayInfo_BGM, gMPlayTrack_BGM, 10, 0 music_player gMPlayInfo_BGM, gMPlayTrack_BGM, NUM_TRACKS_BGM, 0
music_player gMPlayInfo_SE1, gMPlayTrack_SE1, 3, 1 music_player gMPlayInfo_SE1, gMPlayTrack_SE1, NUM_TRACKS_SE1, 1
music_player gMPlayInfo_SE2, gMPlayTrack_SE2, 9, 1 music_player gMPlayInfo_SE2, gMPlayTrack_SE2, NUM_TRACKS_SE2, 1
music_player gMPlayInfo_SE3, gMPlayTrack_SE3, 1, 0 music_player gMPlayInfo_SE3, gMPlayTrack_SE3, NUM_TRACKS_SE3, 0

22
src/m4a_1.s
View File

@ -1910,27 +1910,7 @@ _081DDD90:
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
.bss .bss
gDecodingBuffer: @ Used as a buffer for audio decoded from compressed DPCM gDecodingBuffer: @ Used as a buffer for audio decoded from compressed DPCM
.space 0x40 .space 0x40
.size gDecodingBuffer, .-gDecodingBuffer .size gDecodingBuffer, .-gDecodingBuffer
.global gMPlayTrack_BGM
gMPlayTrack_BGM:
.space 0x320
.size gMPlayTrack_BGM, .-gMPlayTrack_BGM
.global gMPlayTrack_SE1
gMPlayTrack_SE1:
.space 0xF0
.size gMPlayTrack_SE1, .-gMPlayTrack_SE1
.global gMPlayTrack_SE2
gMPlayTrack_SE2:
.space 0x2D0
.size gMPlayTrack_SE2, .-gMPlayTrack_SE2
.global gMPlayTrack_SE3
gMPlayTrack_SE3:
.space 0x50
.size gMPlayTrack_SE3, .-gMPlayTrack_SE3

1
sym_bss.txt
View File

@ -55,6 +55,7 @@
.include "src/ereader_helpers.o" .include "src/ereader_helpers.o"
.include "src/faraway_island.o" .include "src/faraway_island.o"
.include "src/m4a_1.o" .include "src/m4a_1.o"
.include "data/sound_data.o"
.include "src/agb_flash.o" .include "src/agb_flash.o"
.include "src/siirtc.o" .include "src/siirtc.o"
.include "*libgcc.a:dp-bit.o" .include "*libgcc.a:dp-bit.o"