diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-03-23 12:11:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-23 12:11:10 -0500 |
| commit | 2fd4f339b42c010191c199772b09ac34c580de94 (patch) | |
| tree | e562899f35861ece70c292602fe6aac2f50906bf /sound | |
| parent | 7b142311a7294c4c7a943870fa5f24f0fbea604a (diff) | |
Miscellaneous Work (Again) (#31)
* move some personality data from asm to C
* combine personality_test files and add my close attempt at RedrawPartnerSelectionMenu
* decomp some more wonder mail funcs and label some more data
* lots of data splitting and move some to src
* split out more dungeon data
* continue splitting out more dungeon data
* doc rescue team rank/pts funcs/data and exclusive pokemon ewram
* doc more sound things and decomp a func
* decomp LoadTeamRankBadge and label some data members
* split out rescue team and text util stuff
* forgot a constant
* match a few funcs and clean up a few
* cleaned up sub_80A28B4
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/music_player_table.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/music_player_table.inc b/sound/music_player_table.inc index 7c5eb33..659f576 100644 --- a/sound/music_player_table.inc +++ b/sound/music_player_table.inc @@ -1,10 +1,10 @@ .align 2 gMPlayTable:: @ 9E8665C - music_player 0x20008F0, 0x2000000, 12, 0 @ BGM - music_player 0x2000970, 0x20003C0, 6, 0 @ SE? - music_player 0x20009B0, 0x20005A0, 1, 0 - music_player 0x2000A40, 0x20005F0, 1, 0 - music_player 0x20009F0, 0x2000640, 2, 0 - music_player 0x2000870, 0x20006E0, 2, 0 - music_player 0x20008B0, 0x2000780, 2, 0 - music_player 0x2000930, 0x2000820, 1, 0 + music_player gMPlayInfo_BGM, gMPlayTrack_BGM, 12, 0 @ BGM + music_player 0x2000970, gMPlayTrack_Unknown1, 6, 0 @ SE? + music_player 0x20009B0, gMPlayTrack_Unknown2, 1, 0 + music_player 0x2000A40, gMPlayTrack_Unknown3, 1, 0 + music_player 0x20009F0, gMPlayTrack_Unknown4, 2, 0 + music_player 0x2000870, gMPlayTrack_Unknown5, 2, 0 + music_player 0x20008B0, gMPlayTrack_Unknown6, 2, 0 + music_player 0x2000930, gMPlayTrack_Unknown7, 1, 0 |