diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_anim_80FE840.s | 2 | ||||
| -rwxr-xr-x | asm/battle_frontier_2.s | 2 | ||||
| -rw-r--r-- | asm/contest.s | 2 | ||||
| -rw-r--r-- | asm/link.s | 6 | ||||
| -rw-r--r-- | asm/mauville_old_man.s | 8 | ||||
| -rw-r--r-- | asm/pokedex.s | 12 | ||||
| -rw-r--r-- | asm/pokedex_cry_screen.s | 2 | ||||
| -rw-r--r-- | asm/roulette.s | 12 | ||||
| -rw-r--r-- | asm/title_screen.s | 2 |
9 files changed, 24 insertions, 24 deletions
diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s index a60163139..e51dcedb7 100644 --- a/asm/battle_anim_80FE840.s +++ b/asm/battle_anim_80FE840.s @@ -36243,7 +36243,7 @@ _08110C10: mov r0, sp movs r2, 0 bl sub_80A6D60 - ldr r0, =gUnknown_08D8DAB8 + ldr r0, =gBattleAnimSpritePalette_261 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index 1909a7a02..23f870d4d 100755 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -20736,7 +20736,7 @@ _081A54D4: bl HandleBattleWindow movs r0, 0 bl CopyBgTilemapBufferToVram - ldr r0, =gMPlay_BGM + ldr r0, =gMPlayInfo_BGM ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 diff --git a/asm/contest.s b/asm/contest.s index 7577826cf..3c34965ad 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -8891,7 +8891,7 @@ _080DC226: ble _080DC284 movs r0, 0x60 bl PlaySE - ldr r4, =gMPlay_SE1 + ldr r4, =gMPlayInfo_SE1 adds r0, r4, 0 bl m4aMPlayImmInit ldr r1, =0x0000ffff diff --git a/asm/link.s b/asm/link.s index a270c8f62..05dda2cb7 100644 --- a/asm/link.s +++ b/asm/link.s @@ -3342,11 +3342,11 @@ c2_800ACD4: @ 800AF30 movs r0, 0 movs r1, 0 bl SetGpuReg - ldr r0, =gMPlay_SE1 + ldr r0, =gMPlayInfo_SE1 bl m4aMPlayStop - ldr r0, =gMPlay_SE2 + ldr r0, =gMPlayInfo_SE2 bl m4aMPlayStop - ldr r0, =gMPlay_SE3 + ldr r0, =gMPlayInfo_SE3 bl m4aMPlayStop ldr r0, =0x02000000 movs r1, 0xE0 diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s index 8c7037ca7..49a502d5c 100644 --- a/asm/mauville_old_man.s +++ b/asm/mauville_old_man.s @@ -965,7 +965,7 @@ _08120850: lsls r1, 1 adds r0, r1 strh r0, [r6, 0x6] - ldr r4, =gMPlay_SE2 + ldr r4, =gMPlayInfo_SE2 ldr r5, =0x0000ffff ldrh r2, [r6, 0x6] adds r0, r4, 0 @@ -1008,7 +1008,7 @@ _081208BC: subs r0, 0x40 _081208C0: strh r0, [r6, 0x8] - ldr r4, =gMPlay_SE2 + ldr r4, =gMPlayInfo_SE2 ldr r5, =0x0000ffff ldrh r2, [r6, 0x6] adds r0, r4, 0 @@ -1059,7 +1059,7 @@ _08120922: lsls r0, 24 cmp r0, 0 bne _08120938 - ldr r0, =gMPlay_SE2 + ldr r0, =gMPlayInfo_SE2 bl m4aMPlayStop movs r0, 0x4 _08120936: @@ -1228,7 +1228,7 @@ _08120A7E: bne _08120AB0 movs r0, 0x6 bl FadeInBGM - ldr r0, =gMPlay_SE2 + ldr r0, =gMPlayInfo_SE2 movs r1, 0x2 bl m4aMPlayFadeOutTemporarily bl EnableBothScriptContexts 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] diff --git a/asm/pokedex_cry_screen.s b/asm/pokedex_cry_screen.s index e8b8ad5e6..846b20881 100644 --- a/asm/pokedex_cry_screen.s +++ b/asm/pokedex_cry_screen.s @@ -239,7 +239,7 @@ sub_8145534: @ 8145534 lsls r0, 16 lsrs r4, r0, 16 adds r5, r4, 0 - ldr r0, =gMPlay_BGM + ldr r0, =gMPlayInfo_BGM ldr r0, [r0, 0x4] cmp r0, 0 bge _08145582 diff --git a/asm/roulette.s b/asm/roulette.s index bb1d5fed6..9d9e39feb 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -6841,14 +6841,14 @@ _08143BEA: lsls r0, 24 cmp r0, 0 beq _08143C74 - ldr r0, _08143C84 @ =gMPlay_SE1 + ldr r0, _08143C84 @ =gMPlayInfo_SE1 ldr r4, _08143C88 @ =0x0000FFFF ldrh r2, [r7, 0x24] lsls r2, 24 asrs r2, 24 adds r1, r4, 0 bl m4aMPlayPanpotControl - ldr r0, _08143C8C @ =gMPlay_SE2 + ldr r0, _08143C8C @ =gMPlayInfo_SE2 ldrh r2, [r7, 0x24] lsls r2, 24 asrs r2, 24 @@ -6864,11 +6864,11 @@ _08143C74: _08143C80: .4byte 0x00000000 _08143C84: - .4byte gMPlay_SE1 + .4byte gMPlayInfo_SE1 _08143C88: .4byte 0x0000FFFF _08143C8C: - .4byte gMPlay_SE2 + .4byte gMPlayInfo_SE2 thumb_func_end sub_8143B84 thumb_func_start sub_8143C90 @@ -9385,14 +9385,14 @@ sub_81450D8: @ 81450D8 adds r4, r0 asrs r4, 1 negs r4, r4 - ldr r0, =gMPlay_SE1 + ldr r0, =gMPlayInfo_SE1 ldr r5, =0x0000ffff lsls r4, 24 asrs r4, 24 adds r1, r5, 0 adds r2, r4, 0 bl m4aMPlayPanpotControl - ldr r0, =gMPlay_SE2 + ldr r0, =gMPlayInfo_SE2 adds r1, r5, 0 adds r2, r4, 0 bl m4aMPlayPanpotControl diff --git a/asm/title_screen.s b/asm/title_screen.s index bc9401fb6..b5286d049 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -1169,7 +1169,7 @@ _080AAE30: _080AAE72: ldrb r0, [r3, 0x8] bl title_screen_update_rayquaza_ring_palette - ldr r0, =gMPlay_BGM + ldr r0, =gMPlayInfo_BGM ldr r1, =0x0000ffff ldrh r0, [r0, 0x4] cmp r0, 0 |