ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1613 from Kurausukun/m4asymbols

Browse Source 
Move M4A Track Definitions
This commit is contained in:
GriffinR 2022-01-22 21:41:37 -05:00 committed by GitHub
commit 9f2b6ab2f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ld_script_modern.txt
View File

@ -27,6 +27,7 @@ SECTIONS {
/* .bss starts at 0x3000000 */
src/*.o(.bss);
gflib/*.o(.bss);
data/*.o(.bss);
*libc.a:*.o(.bss*);
*libnosys.a:*.o(.bss*);

34
sound/music_player_table.inc
View File

@ -1,6 +1,32 @@
.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
gMPlayTrack_BGM::
.space TRACK_SIZE * NUM_TRACKS_BGM
.size gMPlayTrack_BGM, .-gMPlayTrack_BGM
gMPlayTrack_SE1::
.space TRACK_SIZE * NUM_TRACKS_SE1
.size gMPlayTrack_SE1, .-gMPlayTrack_SE1
gMPlayTrack_SE2::
.space TRACK_SIZE * NUM_TRACKS_SE2
.size gMPlayTrack_SE2, .-gMPlayTrack_SE2
gMPlayTrack_SE3::
.space TRACK_SIZE * NUM_TRACKS_SE3
.size gMPlayTrack_SE3, .-gMPlayTrack_SE3
.section .rodata
.align 2
gMPlayTable::
music_player gMPlayInfo_BGM, gMPlayTrack_BGM, 10, 0
music_player gMPlayInfo_SE1, gMPlayTrack_SE1, 3, 1
music_player gMPlayInfo_SE2, gMPlayTrack_SE2, 9, 1
music_player gMPlayInfo_SE3, gMPlayTrack_SE3, 1, 0
music_player gMPlayInfo_BGM, gMPlayTrack_BGM, NUM_TRACKS_BGM, 0
music_player gMPlayInfo_SE1, gMPlayTrack_SE1, NUM_TRACKS_SE1, 1
music_player gMPlayInfo_SE2, gMPlayTrack_SE2, NUM_TRACKS_SE2, 1
music_player gMPlayInfo_SE3, gMPlayTrack_SE3, NUM_TRACKS_SE3, 0

20
src/m4a_1.s
View File

@ -1914,23 +1914,3 @@ _081DDD90:
gDecodingBuffer: @ Used as a buffer for audio decoded from compressed DPCM
.space 0x40
.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/faraway_island.o"
.include "src/m4a_1.o"
.include "data/sound_data.o"
.include "src/agb_flash.o"
.include "src/siirtc.o"
.include "*libgcc.a:dp-bit.o"