diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-09 21:30:54 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-09 21:30:54 -0600 |
| commit | 3241b1405f003217d3041ae445eb10d039c0a654 (patch) | |
| tree | 34bd6a73538ddd4fc6b4d8ca5f5a3812752dc1a9 /asm/pokedex.s | |
| parent | 73d3a21c2d0a0352cd314e7211fac316cd03b351 (diff) | |
Add symbols to music_player_table
Also rename gMPlay structs to gMPlayInfo
Diffstat (limited to 'asm/pokedex.s')
| -rw-r--r-- | asm/pokedex.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/pokedex.s b/asm/pokedex.s index 147f8921b..6ebeb0792 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -497,7 +497,7 @@ _080BB71C: adds r1, r2 ldrb r1, [r1] bl sub_80BC8D4 - ldr r0, =gMPlay_BGM + ldr r0, =gMPlayInfo_BGM ldr r1, =0x0000ffff movs r2, 0x80 bl m4aMPlayVolumeControl @@ -1246,7 +1246,7 @@ _080BBE18: bl DestroyTask ldr r0, =sub_8086194 bl SetMainCallback2 - ldr r0, =gMPlay_BGM + ldr r0, =gMPlayInfo_BGM ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 @@ -7228,7 +7228,7 @@ _080BF2A8: beq _080BF2B6 b _080BF5B2 _080BF2B6: - ldr r0, =gMPlay_BGM + ldr r0, =gMPlayInfo_BGM bl m4aMPlayStop ldr r5, =gUnknown_02039B4C ldr r0, [r5] @@ -7592,7 +7592,7 @@ _080BF636: movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r0, =gMPlay_BGM + ldr r0, =gMPlayInfo_BGM bl m4aMPlayContinue ldr r0, =gUnknown_02039B4C ldr r0, [r0] @@ -7634,7 +7634,7 @@ _080BF6B0: movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r0, =gMPlay_BGM + ldr r0, =gMPlayInfo_BGM bl m4aMPlayContinue ldr r0, =gUnknown_02039B4C ldr r0, [r0] @@ -7689,7 +7689,7 @@ _080BF73C: movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r0, =gMPlay_BGM + ldr r0, =gMPlayInfo_BGM bl m4aMPlayContinue ldr r0, =gUnknown_02039B4C ldr r0, [r0] |