ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 15:13:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move m4a BSS syms to m4a_1.s

Browse Source
This commit is contained in:
PikalaxALT 2019-04-04 09:54:43 -04:00 committed by huderlem
parent 09874870ef
commit b3a4509b9a
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
asm/m4a_1.s
View File

@ -1907,3 +1907,28 @@ _081DDD90:
thumb_func_end ply_mod
.align 2, 0 @ Don't pad with nop.
.bss
gUnknown_03001300:
.space 0x40
.size gUnknown_03001300, .-gUnknown_03001300
.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

19
sym_bss.txt
View File

@ -47,6 +47,7 @@
.include "src/mirage_tower.o"
.include "src/berry_fix_program.o"
@ pokenav
gUnknown_030012BC: @ 30012BC
.space 0x4
@ -56,6 +57,7 @@ gUnknown_030012C0: @ 30012C0
gUnknown_030012C4: @ 30012C4
.space 0x4
@ ereader_helpers
gUnknown_030012C8: @ 30012C8
.space 0x18
@ -90,22 +92,7 @@ gUnknown_030012F4: @ 30012F4
.space 0x4
.include "src/faraway_island.o"
gUnknown_03001300: @ 3001300
.space 0x40
gMPlayTrack_BGM: @ 3001340
.space 0x320
gMPlayTrack_SE1: @ 3001660
.space 0xF0
gMPlayTrack_SE2: @ 3001750
.space 0x2D0
gMPlayTrack_SE3: @ 3001A20
.space 0x50
.include "asm/m4a_1.o"
.include "src/agb_flash.o"
.include "src/siirtc.o"
.include "*libgcc.a:dp-bit.o"