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 /asm/music.s | |
| 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 'asm/music.s')
| -rw-r--r-- | asm/music.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/music.s b/asm/music.s index 1bec74b..0aab7a8 100644 --- a/asm/music.s +++ b/asm/music.s @@ -633,7 +633,7 @@ _0800C7A4: bl m4aMPlayFadeIn b _0800C7BE .align 2, 0 -_0800C7B0: .4byte gUnknown_20008F0 +_0800C7B0: .4byte gMPlayInfo_BGM _0800C7B4: ldr r0, _0800C7CC strh r2, [r0] @@ -648,7 +648,7 @@ _0800C7BE: b _0800C84C .align 2, 0 _0800C7CC: .4byte gBGMusicPlayerState -_0800C7D0: .4byte gUnknown_20008F0 +_0800C7D0: .4byte gMPlayInfo_BGM _0800C7D4: .4byte gUnknown_202D690 _0800C7D8: .4byte gUnknown_202D68E _0800C7DC: .4byte 0x000003e5 @@ -710,7 +710,7 @@ _0800C84C: strh r0, [r1] b _0800C8A2 .align 2, 0 -_0800C854: .4byte gUnknown_20008F0 +_0800C854: .4byte gMPlayInfo_BGM _0800C858: .4byte gBGMusicPlayerState _0800C85C: .4byte gCurrentBGSong _0800C860: .4byte 0x000003e7 |