diff options
Diffstat (limited to 'asm')
-rwxr-xr-x | asm/intro.s | 4 | ||||
-rwxr-xr-x | asm/pokedex.s | 16 | ||||
-rwxr-xr-x | asm/rom_11B9C.s | 102 | ||||
-rwxr-xr-x | asm/rom_3219C.s | 172 | ||||
-rwxr-xr-x | asm/rom_528AC.s | 4 |
5 files changed, 149 insertions, 149 deletions
diff --git a/asm/intro.s b/asm/intro.s index 99be7e0..2ccdda6 100755 --- a/asm/intro.s +++ b/asm/intro.s @@ -7086,7 +7086,7 @@ sub_CC94: @ 0x0800CC94 ldrh r0, [r1] adds r0, #1 strh r0, [r1] - ldr r4, _0800CCEC @ =gUnknown_02032EE0 + ldr r4, _0800CCEC @ =gMPlayInfo_BGM ldr r5, _0800CCF0 @ =0x0000FFFF movs r0, #0 ldrsh r1, [r1, r0] @@ -7115,7 +7115,7 @@ _0800CCDE: .align 2, 0 _0800CCE4: .4byte gUnknown_0202BF10 _0800CCE8: .4byte gUnknown_0202A578 -_0800CCEC: .4byte gUnknown_02032EE0 +_0800CCEC: .4byte gMPlayInfo_BGM _0800CCF0: .4byte 0x0000FFFF _0800CCF4: .4byte gUnknown_0202C790 diff --git a/asm/pokedex.s b/asm/pokedex.s index 52e0daf..f3fed51 100755 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -854,7 +854,7 @@ _080044F0: lsls r1, r1, #0x18 asrs r1, r1, #0x18 bl sub_70E0 - ldr r0, _08004594 @ =gUnknown_02032EE0 + ldr r0, _08004594 @ =gMPlayInfo_BGM ldr r1, _08004598 @ =0x0000FFFF movs r2, #0x40 bl m4aMPlayVolumeControl @@ -901,7 +901,7 @@ _08004584: .4byte gUnknown_08086B40 _08004588: .4byte 0x06000280 _0800458C: .4byte 0x800000E0 _08004590: .4byte gUnknown_0202C794 -_08004594: .4byte gUnknown_02032EE0 +_08004594: .4byte gMPlayInfo_BGM _08004598: .4byte 0x0000FFFF _0800459C: .4byte gUnknown_086A3700 _080045A0: .4byte gMain @@ -921,7 +921,7 @@ sub_45A4: @ 0x080045A4 asrs r0, r0, #0x10 cmp r0, #0x50 bne _080045CA - ldr r0, _08004624 @ =gUnknown_02032EE0 + ldr r0, _08004624 @ =gMPlayInfo_BGM ldr r1, _08004628 @ =0x0000FFFF movs r2, #0x80 lsls r2, r2, #1 @@ -971,7 +971,7 @@ _080045E8: b _08004670 .align 2, 0 _08004620: .4byte gUnknown_0202C5E8 -_08004624: .4byte gUnknown_02032EE0 +_08004624: .4byte gMPlayInfo_BGM _08004628: .4byte 0x0000FFFF _0800462C: .4byte gUnknown_0202BEF4 _08004630: .4byte gUnknown_0202C5AC @@ -1046,7 +1046,7 @@ _080046C8: .4byte gMain _080046CC: movs r0, #0x69 bl m4aSongNumStart - ldr r0, _080046F0 @ =gUnknown_02032EE0 + ldr r0, _080046F0 @ =gMPlayInfo_BGM ldr r1, _080046F4 @ =0x0000FFFF movs r2, #0x80 lsls r2, r2, #1 @@ -1060,7 +1060,7 @@ _080046CC: strh r1, [r0] b _08004728 .align 2, 0 -_080046F0: .4byte gUnknown_02032EE0 +_080046F0: .4byte gMPlayInfo_BGM _080046F4: .4byte 0x0000FFFF _080046F8: .4byte gUnknown_0202C5E8 _080046FC: .4byte gUnknown_0202BEF4 @@ -1071,7 +1071,7 @@ _08004700: beq _08004730 movs r0, #0x69 bl m4aSongNumStart - ldr r0, _0800476C @ =gUnknown_02032EE0 + ldr r0, _0800476C @ =gMPlayInfo_BGM ldr r1, _08004770 @ =0x0000FFFF movs r2, #0x80 lsls r2, r2, #1 @@ -1120,7 +1120,7 @@ _08004730: strh r0, [r1] b _0800482C .align 2, 0 -_0800476C: .4byte gUnknown_02032EE0 +_0800476C: .4byte gMPlayInfo_BGM _08004770: .4byte 0x0000FFFF _08004774: .4byte gUnknown_0202C794 _08004778: .4byte gUnknown_0202C5E8 diff --git a/asm/rom_11B9C.s b/asm/rom_11B9C.s index 3907dd0..28b5f5d 100755 --- a/asm/rom_11B9C.s +++ b/asm/rom_11B9C.s @@ -7773,7 +7773,7 @@ _08015A3E: ldrb r0, [r1] adds r0, #1 strb r0, [r1] - ldr r0, _08015A90 @ =gUnknown_02032F20 + ldr r0, _08015A90 @ =gMPlayInfo_SE1 ldr r1, _08015A94 @ =gUnknown_0869FC0C bl MPlayStart ldr r1, [r5] @@ -7805,7 +7805,7 @@ _08015A78: _08015A84: .4byte 0x00002710 _08015A88: .4byte gUnknown_020314E0 _08015A8C: .4byte 0x0000072F -_08015A90: .4byte gUnknown_02032F20 +_08015A90: .4byte gMPlayInfo_SE1 _08015A94: .4byte gUnknown_0869FC0C _08015A98: .4byte 0x00000731 _08015A9C: .4byte 0x000006BC @@ -15941,7 +15941,7 @@ _08019B26: lsls r0, r0, #0x10 cmp r0, #0 bne _08019B50 - ldr r0, _08019B5C @ =gUnknown_02032EE0 + ldr r0, _08019B5C @ =gMPlayInfo_BGM ldr r1, _08019B60 @ =0x0000FFFF movs r2, #0x80 lsls r2, r2, #1 @@ -15952,7 +15952,7 @@ _08019B50: .align 2, 0 _08019B54: .4byte gMain _08019B58: .4byte gUnknown_020314E0 -_08019B5C: .4byte gUnknown_02032EE0 +_08019B5C: .4byte gMPlayInfo_BGM _08019B60: .4byte 0x0000FFFF thumb_func_start sub_19B64 @@ -17085,7 +17085,7 @@ _0801A43A: _0801A44A: cmp r0, #0x28 bne _0801A456 - ldr r0, _0801A4EC @ =gUnknown_02032F20 + ldr r0, _0801A4EC @ =gMPlayInfo_SE1 ldr r1, _0801A4F0 @ =gUnknown_0869F7C8 bl MPlayStart _0801A456: @@ -17165,7 +17165,7 @@ _0801A4DC: .4byte gUnknown_086ACEF8 _0801A4E0: .4byte gUnknown_020314E0 _0801A4E4: .4byte 0x06015800 _0801A4E8: .4byte 0x800010E0 -_0801A4EC: .4byte gUnknown_02032F20 +_0801A4EC: .4byte gMPlayInfo_SE1 _0801A4F0: .4byte gUnknown_0869F7C8 _0801A4F4: .4byte 0x000001A5 _0801A4F8: .4byte 0x000006DC @@ -26856,7 +26856,7 @@ _0801F368: strh r3, [r2] cmp r1, #0xa7 ble _0801F39A - ldr r0, _0801F3EC @ =gUnknown_02032F20 + ldr r0, _0801F3EC @ =gMPlayInfo_SE1 ldr r1, _0801F3F0 @ =gUnknown_0869F2A0 bl MPlayStart ldr r1, [r4] @@ -26906,7 +26906,7 @@ _0801F3CA: b _0801F44E .align 2, 0 _0801F3E8: .4byte gUnknown_020314E0 -_0801F3EC: .4byte gUnknown_02032F20 +_0801F3EC: .4byte gMPlayInfo_SE1 _0801F3F0: .4byte gUnknown_0869F2A0 _0801F3F4: .4byte 0x00000BB8 _0801F3F8: .4byte 0x00000616 @@ -29183,7 +29183,7 @@ _0802062C: .4byte 0x0000062E _08020630: movs r0, #0x3c strh r0, [r2] - ldr r0, _0802067C @ =gUnknown_02032F20 + ldr r0, _0802067C @ =gMPlayInfo_SE1 ldr r1, _08020680 @ =gUnknown_086A2FA0 bl MPlayStart _0802063C: @@ -29219,7 +29219,7 @@ _0802063C: mov r8, r3 b _0802069C .align 2, 0 -_0802067C: .4byte gUnknown_02032F20 +_0802067C: .4byte gMPlayInfo_SE1 _08020680: .4byte gUnknown_086A2FA0 _08020684: .4byte gUnknown_020314E0 _08020688: .4byte 0x00000744 @@ -29398,33 +29398,33 @@ _080207C4: asrs r0, r0, #0x18 cmp r0, #1 bne _080207FC - ldr r0, _080207F4 @ =gUnknown_02032F20 + ldr r0, _080207F4 @ =gMPlayInfo_SE1 ldr r1, _080207F8 @ =gUnknown_086A0328 bl MPlayStart b _08020804 .align 2, 0 -_080207F4: .4byte gUnknown_02032F20 +_080207F4: .4byte gMPlayInfo_SE1 _080207F8: .4byte gUnknown_086A0328 _080207FC: - ldr r0, _08020810 @ =gUnknown_02032F20 + ldr r0, _08020810 @ =gMPlayInfo_SE1 ldr r1, _08020814 @ =gUnknown_086A0368 bl MPlayStart _08020804: - ldr r0, _08020818 @ =gUnknown_02032EE0 + ldr r0, _08020818 @ =gMPlayInfo_BGM ldr r1, _0802081C @ =0x0000FFFF movs r2, #0x40 bl m4aMPlayVolumeControl b _08020832 .align 2, 0 -_08020810: .4byte gUnknown_02032F20 +_08020810: .4byte gMPlayInfo_SE1 _08020814: .4byte gUnknown_086A0368 -_08020818: .4byte gUnknown_02032EE0 +_08020818: .4byte gMPlayInfo_BGM _0802081C: .4byte 0x0000FFFF _08020820: - ldr r0, _08020900 @ =gUnknown_02032F20 + ldr r0, _08020900 @ =gMPlayInfo_SE1 ldr r1, _08020904 @ =gUnknown_086A0328 bl MPlayStart - ldr r0, _08020908 @ =gUnknown_02032EE0 + ldr r0, _08020908 @ =gMPlayInfo_BGM ldr r1, _0802090C @ =0x0000FFFF movs r2, #0x40 bl m4aMPlayVolumeControl @@ -29441,7 +29441,7 @@ _08020832: ldrb r0, [r0] cmp r0, #1 bne _08020856 - ldr r0, _08020900 @ =gUnknown_02032F20 + ldr r0, _08020900 @ =gMPlayInfo_SE1 ldr r1, _0802090C @ =0x0000FFFF movs r2, #0x80 lsls r2, r2, #2 @@ -29528,9 +29528,9 @@ _08020856: str r0, [r1, #0x38] b _080209FE .align 2, 0 -_08020900: .4byte gUnknown_02032F20 +_08020900: .4byte gMPlayInfo_SE1 _08020904: .4byte gUnknown_086A0328 -_08020908: .4byte gUnknown_02032EE0 +_08020908: .4byte gMPlayInfo_BGM _0802090C: .4byte 0x0000FFFF _08020910: .4byte gUnknown_020314E0 _08020914: .4byte 0x0000061E @@ -29800,7 +29800,7 @@ _08020B2C: bne _08020B5C movs r0, #0x7c bl m4aSongNumStop - ldr r0, _08020BC4 @ =gUnknown_02032EE0 + ldr r0, _08020BC4 @ =gMPlayInfo_BGM ldr r1, _08020BC8 @ =0x0000FFFF movs r2, #0x80 lsls r2, r2, #1 @@ -29858,7 +29858,7 @@ _08020B5C: b _08020BE6 .align 2, 0 _08020BC0: .4byte 0x0000020A -_08020BC4: .4byte gUnknown_02032EE0 +_08020BC4: .4byte gMPlayInfo_BGM _08020BC8: .4byte 0x0000FFFF _08020BCC: .4byte 0x0000061C _08020BD0: .4byte gMain @@ -43445,7 +43445,7 @@ _0802798C: ldrh r0, [r0] cmp r0, #0x3c bne _0802799E - ldr r0, _080279F4 @ =gUnknown_02032F20 + ldr r0, _080279F4 @ =gMPlayInfo_SE1 ldr r1, _080279F8 @ =gUnknown_0869F58C bl MPlayStart _0802799E: @@ -43480,7 +43480,7 @@ _080279E4: .4byte gUnknown_0815C4C4 _080279E8: .4byte 0x050003E0 _080279EC: .4byte 0x80000010 _080279F0: .4byte 0x00000626 -_080279F4: .4byte gUnknown_02032F20 +_080279F4: .4byte gMPlayInfo_SE1 _080279F8: .4byte gUnknown_0869F58C _080279FC: .4byte gUnknown_086AE0E6 _08027A00: @@ -43511,7 +43511,7 @@ _08027A00: adds r0, #0x80 ldr r0, [r0] strh r2, [r0] - ldr r0, _08027B4C @ =gUnknown_02032F20 + ldr r0, _08027B4C @ =gMPlayInfo_SE1 ldr r1, _08027B50 @ =gUnknown_0869F5C8 bl MPlayStart ldr r0, [r6] @@ -43653,7 +43653,7 @@ _08027A9C: b _08027CE8 .align 2, 0 _08027B48: .4byte 0x00000626 -_08027B4C: .4byte gUnknown_02032F20 +_08027B4C: .4byte gMPlayInfo_SE1 _08027B50: .4byte gUnknown_0869F5C8 _08027B54: .4byte gUnknown_020314E0 _08027B58: .4byte 0x0000025A @@ -43726,7 +43726,7 @@ _08027BD6: bgt _08027C38 ldr r0, _08027D0C @ =0x00002710 str r0, [r1, #0x3c] - ldr r0, _08027D10 @ =gUnknown_02032F20 + ldr r0, _08027D10 @ =gMPlayInfo_SE1 ldr r1, _08027D14 @ =gUnknown_0869F618 bl MPlayStart ldr r1, [r4] @@ -43870,7 +43870,7 @@ _08027D00: .4byte 0x0000025E _08027D04: .4byte gUnknown_020314E0 _08027D08: .4byte 0x0000026B _08027D0C: .4byte 0x00002710 -_08027D10: .4byte gUnknown_02032F20 +_08027D10: .4byte gMPlayInfo_SE1 _08027D14: .4byte gUnknown_0869F618 _08027D18: .4byte 0x0000071D _08027D1C: .4byte gMain @@ -45423,7 +45423,7 @@ _080289E0: adds r0, r0, r5 movs r1, #0 strb r1, [r0] - ldr r0, _08028A24 @ =gUnknown_02032F20 + ldr r0, _08028A24 @ =gMPlayInfo_SE1 ldr r1, _08028A28 @ =gUnknown_0869F58C bl MPlayStart b _08028AD2 @@ -45434,7 +45434,7 @@ _08028A14: .4byte 0x000001F3 _08028A18: .4byte 0x000005AA _08028A1C: .4byte 0x00000296 _08028A20: .4byte 0x000005F2 -_08028A24: .4byte gUnknown_02032F20 +_08028A24: .4byte gMPlayInfo_SE1 _08028A28: .4byte gUnknown_0869F58C _08028A2C: mov r0, r8 @@ -48462,7 +48462,7 @@ _0802A20C: adds r1, r6, r5 movs r0, #0 strb r0, [r1] - ldr r0, _0802A2E8 @ =gUnknown_02032EE0 + ldr r0, _0802A2E8 @ =gMPlayInfo_BGM bl m4aMPlayStop ldr r0, [r7] ldr r1, _0802A2EC @ =0x000006DD @@ -48525,7 +48525,7 @@ _0802A2AC: _0802A2DC: .4byte gUnknown_020314E0 _0802A2E0: .4byte 0x000006F2 _0802A2E4: .4byte 0x000006C4 -_0802A2E8: .4byte gUnknown_02032EE0 +_0802A2E8: .4byte gMPlayInfo_BGM _0802A2EC: .4byte 0x000006DD _0802A2F0: .4byte 0x000006DE _0802A2F4: .4byte 0x000006ED @@ -48555,7 +48555,7 @@ _0802A30A: movs r0, #2 movs r1, #1 bl sub_1C7F4 - ldr r0, _0802A34C @ =gUnknown_02032F20 + ldr r0, _0802A34C @ =gMPlayInfo_SE1 ldr r1, _0802A350 @ =gUnknown_0869F45C bl MPlayStart _0802A33A: @@ -48567,7 +48567,7 @@ _0802A33A: bx r0 .align 2, 0 _0802A348: .4byte 0x000006EB -_0802A34C: .4byte gUnknown_02032F20 +_0802A34C: .4byte gMPlayInfo_SE1 _0802A350: .4byte gUnknown_0869F45C thumb_func_start sub_2A354 @@ -49188,7 +49188,7 @@ _0802A882: movs r1, #0xe1 lsls r1, r1, #4 strh r1, [r0] - ldr r0, _0802A8B4 @ =gUnknown_02032F20 + ldr r0, _0802A8B4 @ =gMPlayInfo_SE1 ldr r1, _0802A8B8 @ =gUnknown_0869F664 bl MPlayStart ldr r2, _0802A8BC @ =0x040000D4 @@ -49209,7 +49209,7 @@ _0802A882: b _0802AAD2 .align 2, 0 _0802A8B0: .4byte 0x000006DE -_0802A8B4: .4byte gUnknown_02032F20 +_0802A8B4: .4byte gMPlayInfo_SE1 _0802A8B8: .4byte gUnknown_0869F664 _0802A8BC: .4byte 0x040000D4 _0802A8C0: .4byte gUnknown_08137E14 @@ -49698,7 +49698,7 @@ _0802AC20: beq _0802ACCA bl _0802C4D2 _0802ACCA: - ldr r0, _0802AD14 @ =gUnknown_02032EE0 + ldr r0, _0802AD14 @ =gMPlayInfo_BGM bl m4aMPlayStop ldr r0, [r7] adds r0, #0x71 @@ -49719,7 +49719,7 @@ _0802AD04: .4byte 0x80000040 _0802AD08: .4byte 0x06016760 _0802AD0C: .4byte 0x000005F7 _0802AD10: .4byte 0x000005A6 -_0802AD14: .4byte gUnknown_02032EE0 +_0802AD14: .4byte gMPlayInfo_BGM _0802AD18: ldr r4, _0802AD94 @ =gUnknown_020314E0 ldr r1, [r4] @@ -49777,7 +49777,7 @@ _0802AD48: beq _0802AD86 bl _0802C4D2 _0802AD86: - ldr r0, _0802ADAC @ =gUnknown_02032F20 + ldr r0, _0802ADAC @ =gMPlayInfo_SE1 ldr r1, _0802ADB0 @ =gUnknown_0869FCE4 bl MPlayStart bl _0802C4D2 @@ -49788,7 +49788,7 @@ _0802AD9C: .4byte 0x0000071E _0802ADA0: .4byte 0x0000071F _0802ADA4: .4byte 0x0000132C _0802ADA8: .4byte 0x000005A6 -_0802ADAC: .4byte gUnknown_02032F20 +_0802ADAC: .4byte gMPlayInfo_SE1 _0802ADB0: .4byte gUnknown_0869FCE4 _0802ADB4: ldr r2, _0802AE14 @ =0x040000D4 @@ -53653,7 +53653,7 @@ _0802CD18: ldrh r0, [r0] cmp r0, #0x55 bne _0802CD2A - ldr r0, _0802CD8C @ =gUnknown_02032F20 + ldr r0, _0802CD8C @ =gMPlayInfo_SE1 ldr r1, _0802CD90 @ =gUnknown_086A1ABC bl MPlayStart _0802CD2A: @@ -53662,7 +53662,7 @@ _0802CD2A: ldrh r0, [r0] cmp r0, #0x3a bne _0802CD50 - ldr r0, _0802CD8C @ =gUnknown_02032F20 + ldr r0, _0802CD8C @ =gMPlayInfo_SE1 ldr r1, _0802CD94 @ =gUnknown_0869F2A0 bl MPlayStart ldr r0, [r5] @@ -53702,7 +53702,7 @@ _0802CD7C: .4byte 0x040000D4 _0802CD80: .4byte gUnknown_086AE324 _0802CD84: .4byte 0x05000380 _0802CD88: .4byte 0x80000010 -_0802CD8C: .4byte gUnknown_02032F20 +_0802CD8C: .4byte gMPlayInfo_SE1 _0802CD90: .4byte gUnknown_086A1ABC _0802CD94: .4byte gUnknown_0869F2A0 @@ -55817,7 +55817,7 @@ sub_2DE54: @ 0x0802DE54 bgt _0802DEF0 cmp r4, #1 bne _0802DE6A - ldr r0, _0802DED8 @ =gUnknown_02032EE0 + ldr r0, _0802DED8 @ =gMPlayInfo_BGM bl m4aMPlayStop _0802DE6A: ldr r5, _0802DEDC @ =gMain @@ -55877,7 +55877,7 @@ _0802DEB6: b _0802E052 .align 2, 0 _0802DED4: .4byte 0xFFFFFE98 -_0802DED8: .4byte gUnknown_02032EE0 +_0802DED8: .4byte gMPlayInfo_BGM _0802DEDC: .4byte gMain _0802DEE0: .4byte gUnknown_020314E0 _0802DEE4: .4byte gUnknown_086A3700 @@ -57876,7 +57876,7 @@ _0802EF7C: adds r1, r4, r0 movs r0, #0xa strb r0, [r1] - ldr r0, _0802EFD0 @ =gUnknown_02032F20 + ldr r0, _0802EFD0 @ =gMPlayInfo_SE1 ldr r1, _0802EFD4 @ =gUnknown_086A11A4 bl MPlayStart _0802EF90: @@ -57896,7 +57896,7 @@ _0802EF90: asrs r0, r0, #0x10 cmp r0, #0x22 bne _0802EFBA - ldr r0, _0802EFD0 @ =gUnknown_02032F20 + ldr r0, _0802EFD0 @ =gMPlayInfo_SE1 ldr r1, _0802EFD4 @ =gUnknown_086A11A4 bl MPlayStart _0802EFBA: @@ -57911,7 +57911,7 @@ _0802EFBC: b _0802EFFC .align 2, 0 _0802EFCC: .4byte 0x00000306 -_0802EFD0: .4byte gUnknown_02032F20 +_0802EFD0: .4byte gMPlayInfo_SE1 _0802EFD4: .4byte gUnknown_086A11A4 _0802EFD8: .4byte gUnknown_020314E0 _0802EFDC: @@ -62622,7 +62622,7 @@ _08031530: lsls r4, r4, #2 adds r0, r0, r4 strh r3, [r0] - ldr r0, _0803159C @ =gUnknown_02032EE0 + ldr r0, _0803159C @ =gMPlayInfo_BGM bl m4aMPlayStop ldr r1, [r5] ldr r0, _080315A0 @ =0x00030D40 @@ -62633,7 +62633,7 @@ _08031530: .align 2, 0 _08031594: .4byte gMain _08031598: .4byte 0x00000346 -_0803159C: .4byte gUnknown_02032EE0 +_0803159C: .4byte gMPlayInfo_BGM _080315A0: .4byte 0x00030D40 _080315A4: ldr r7, _080315F4 @ =0x00000345 diff --git a/asm/rom_3219C.s b/asm/rom_3219C.s index 7bf28fc..270885e 100755 --- a/asm/rom_3219C.s +++ b/asm/rom_3219C.s @@ -395,7 +395,7 @@ _08032782: lsls r0, r0, #0x10 cmp r0, #0 bne _080327AC - ldr r0, _080327B8 @ =gUnknown_02032EE0 + ldr r0, _080327B8 @ =gMPlayInfo_BGM ldr r1, _080327BC @ =0x0000FFFF movs r2, #0x80 lsls r2, r2, #1 @@ -406,7 +406,7 @@ _080327AC: .align 2, 0 _080327B0: .4byte gMain _080327B4: .4byte gUnknown_020314E0 -_080327B8: .4byte gUnknown_02032EE0 +_080327B8: .4byte gMPlayInfo_BGM _080327BC: .4byte 0x0000FFFF thumb_func_start sub_327C0 @@ -2499,7 +2499,7 @@ _080337E0: add r0, r8 mov r1, sl strh r1, [r0] - ldr r0, _08033904 @ =gUnknown_02032F20 + ldr r0, _08033904 @ =gMPlayInfo_SE1 ldr r1, _08033908 @ =gUnknown_086A1588 bl MPlayStart movs r5, #2 @@ -2545,7 +2545,7 @@ _080338F4: .4byte 0x000003C6 _080338F8: .4byte 0x000003A6 _080338FC: .4byte 0x000003A9 _08033900: .4byte 0x000003B6 -_08033904: .4byte gUnknown_02032F20 +_08033904: .4byte gMPlayInfo_SE1 _08033908: .4byte gUnknown_086A1588 _0803390C: .4byte 0xFFFF0000 _08033910: @@ -5064,14 +5064,14 @@ _08034D32: ldrsh r0, [r0, r1] cmp r0, #0x1e bne _08034D7E - ldr r0, _08034D58 @ =gUnknown_02032F20 + ldr r0, _08034D58 @ =gMPlayInfo_SE1 ldr r1, _08034D5C @ =gUnknown_086A17D8 bl MPlayStart b _08034D7E .align 2, 0 _08034D50: .4byte gUnknown_020314E0 _08034D54: .4byte 0x000003E6 -_08034D58: .4byte gUnknown_02032F20 +_08034D58: .4byte gMPlayInfo_SE1 _08034D5C: .4byte gUnknown_086A17D8 _08034D60: movs r2, #0xc5 @@ -7282,7 +7282,7 @@ _08035F92: lsrs r0, r0, #0x10 cmp r0, #1 bhi _08035FAE - ldr r0, _08035FF8 @ =gUnknown_02032F20 + ldr r0, _08035FF8 @ =gMPlayInfo_SE1 ldr r1, _08035FFC @ =gUnknown_086A1ABC bl MPlayStart _08035FAE: @@ -7309,7 +7309,7 @@ _08035FC2: beq _08035FDC bl _08036C9E _08035FDC: - ldr r0, _08035FF8 @ =gUnknown_02032F20 + ldr r0, _08035FF8 @ =gMPlayInfo_SE1 ldr r1, _08036004 @ =gUnknown_086A1B9C bl MPlayStart bl _08036C9E @@ -7318,7 +7318,7 @@ _08035FE8: .4byte gUnknown_020314E0 _08035FEC: .4byte gMain _08035FF0: .4byte gUnknown_086AE9E4 _08035FF4: .4byte 0x000003E2 -_08035FF8: .4byte gUnknown_02032F20 +_08035FF8: .4byte gMPlayInfo_SE1 _08035FFC: .4byte gUnknown_086A1ABC _08036000: .4byte 0x000003FA _08036004: .4byte gUnknown_086A1B9C @@ -7579,7 +7579,7 @@ _08036218: bhi _0803627C cmp r0, #0 bne _08036234 - ldr r0, _0803625C @ =gUnknown_02032F20 + ldr r0, _0803625C @ =gMPlayInfo_SE1 ldr r1, _08036260 @ =gUnknown_086A1BC8 bl MPlayStart _08036234: @@ -7602,7 +7602,7 @@ _08036234: strh r0, [r1] bl _08036C9E .align 2, 0 -_0803625C: .4byte gUnknown_02032F20 +_0803625C: .4byte gMPlayInfo_SE1 _08036260: .4byte gUnknown_086A1BC8 _08036264: .4byte 0x000003DE _08036268: .4byte 0x000003E2 @@ -7929,7 +7929,7 @@ _080364EC: adds r0, #1 cmp r1, r0 bne _0803650A - ldr r0, _0803653C @ =gUnknown_02032F20 + ldr r0, _0803653C @ =gMPlayInfo_SE1 ldr r1, _08036540 @ =gUnknown_086A1C00 bl MPlayStart _0803650A: @@ -7946,7 +7946,7 @@ _0803650A: beq _08036522 b _08036C9E _08036522: - ldr r0, _0803653C @ =gUnknown_02032F20 + ldr r0, _0803653C @ =gMPlayInfo_SE1 ldr r1, _08036540 @ =gUnknown_086A1C00 bl MPlayStart b _08036C9E @@ -7955,7 +7955,7 @@ _0803652C: .4byte 0x000003E2 _08036530: .4byte gUnknown_020314E0 _08036534: .4byte gUnknown_086AE718 _08036538: .4byte 0x000003DE -_0803653C: .4byte gUnknown_02032F20 +_0803653C: .4byte gMPlayInfo_SE1 _08036540: .4byte gUnknown_086A1C00 _08036544: ldr r2, _080365A0 @ =gUnknown_086AE718 @@ -8291,7 +8291,7 @@ _080367CA: lsls r4, r4, #2 adds r1, r1, r4 strh r3, [r1] - ldr r0, _08036800 @ =gUnknown_02032F20 + ldr r0, _08036800 @ =gMPlayInfo_SE1 ldr r1, _08036804 @ =gUnknown_086A1C64 bl MPlayStart b _08036C9E @@ -8300,7 +8300,7 @@ _080367F0: .4byte 0x000003F6 _080367F4: .4byte 0x000003DE _080367F8: .4byte 0x000003FA _080367FC: .4byte 0x000003E2 -_08036800: .4byte gUnknown_02032F20 +_08036800: .4byte gMPlayInfo_SE1 _08036804: .4byte gUnknown_086A1C64 _08036808: ldr r2, _08036890 @ =gUnknown_086AE718 @@ -8413,7 +8413,7 @@ _0803689C: ldrb r0, [r1] adds r0, #1 strb r0, [r1] - ldr r0, _08036900 @ =gUnknown_02032F20 + ldr r0, _08036900 @ =gMPlayInfo_SE1 ldr r1, _08036904 @ =gUnknown_086A1C88 bl MPlayStart movs r0, #7 @@ -8424,7 +8424,7 @@ _080368F0: .4byte 0x000003DE _080368F4: .4byte 0x000003FA _080368F8: .4byte 0x0007A120 _080368FC: .4byte 0x00000385 -_08036900: .4byte gUnknown_02032F20 +_08036900: .4byte gMPlayInfo_SE1 _08036904: .4byte gUnknown_086A1C88 _08036908: ldr r2, _08036970 @ =gUnknown_086AE718 @@ -8827,7 +8827,7 @@ _08036C0E: adds r0, #6 cmp r1, r0 bne _08036C2E - ldr r0, _08036C54 @ =gUnknown_02032F20 + ldr r0, _08036C54 @ =gMPlayInfo_SE1 ldr r1, _08036C58 @ =gUnknown_086A1CCC bl MPlayStart _08036C2E: @@ -8843,13 +8843,13 @@ _08036C2E: adds r0, #8 cmp r1, r0 bne _08036C9E - ldr r0, _08036C54 @ =gUnknown_02032F20 + ldr r0, _08036C54 @ =gMPlayInfo_SE1 ldr r1, _08036C5C @ =gUnknown_086A1D64 bl MPlayStart b _08036C9E .align 2, 0 _08036C50: .4byte 0x000003DE -_08036C54: .4byte gUnknown_02032F20 +_08036C54: .4byte gMPlayInfo_SE1 _08036C58: .4byte gUnknown_086A1CCC _08036C5C: .4byte gUnknown_086A1D64 _08036C60: @@ -9702,7 +9702,7 @@ _0803732A: ldrh r0, [r0] cmp r0, #0x14 bne _0803733C - ldr r0, _08037494 @ =gUnknown_02032F60 + ldr r0, _08037494 @ =gMPlayInfo_SE2 bl m4aMPlayStop _0803733C: mov r1, sb @@ -9868,7 +9868,7 @@ _08037484: .4byte 0x0000040A _08037488: .4byte 0xFFFFEBC8 _0803748C: .4byte 0x00000405 _08037490: .4byte 0x0000041A -_08037494: .4byte gUnknown_02032F60 +_08037494: .4byte gMPlayInfo_SE2 _08037498: .4byte 0x00000105 _0803749C: .4byte 0x00000414 _080374A0: .4byte 0x00000416 @@ -12565,7 +12565,7 @@ sub_38A20: @ 0x08038A20 ldrh r0, [r0] cmp r0, #4 bne _08038AB0 - ldr r0, _08038AF4 @ =gUnknown_02032F20 + ldr r0, _08038AF4 @ =gMPlayInfo_SE1 ldr r1, _08038AF8 @ =gUnknown_086A1E74 bl MPlayStart movs r0, #7 @@ -12636,7 +12636,7 @@ _08038ADE: _08038AE8: .4byte gUnknown_020314E0 _08038AEC: .4byte 0x00000452 _08038AF0: .4byte 0x00000389 -_08038AF4: .4byte gUnknown_02032F20 +_08038AF4: .4byte gMPlayInfo_SE1 _08038AF8: .4byte gUnknown_086A1E74 _08038AFC: .4byte 0x0007A120 _08038B00: .4byte 0x00000385 @@ -12817,7 +12817,7 @@ _08038C86: ldrsh r0, [r0, r1] cmp r0, #0x21 bne _08038CA4 - ldr r0, _08038CCC @ =gUnknown_02032F20 + ldr r0, _08038CCC @ =gMPlayInfo_SE1 ldr r1, _08038CD0 @ =gUnknown_086A1F10 bl MPlayStart ldr r0, [r7] @@ -12842,7 +12842,7 @@ _08038CB6: _08038CC0: .4byte 0x000003DD _08038CC4: .4byte 0x000003E1 _08038CC8: .4byte gUnknown_081B0DE4 -_08038CCC: .4byte gUnknown_02032F20 +_08038CCC: .4byte gMPlayInfo_SE1 _08038CD0: .4byte gUnknown_086A1F10 _08038CD4: .4byte 0x00000387 _08038CD8: .4byte gUnknown_020314E0 @@ -12907,7 +12907,7 @@ _08038D4A: adds r1, r1, r3 movs r0, #1 strb r0, [r1] - ldr r0, _08038D78 @ =gUnknown_02032F20 + ldr r0, _08038D78 @ =gMPlayInfo_SE1 ldr r1, _08038D7C @ =gUnknown_086A1F10 bl MPlayStart bl _08039562 @@ -12918,7 +12918,7 @@ _08038D68: .4byte 0x000003E2 _08038D6C: .4byte 0x000003DD _08038D70: .4byte 0x000003E1 _08038D74: .4byte 0x00000387 -_08038D78: .4byte gUnknown_02032F20 +_08038D78: .4byte gMPlayInfo_SE1 _08038D7C: .4byte gUnknown_086A1F10 _08038D80: ldr r2, _08038DF0 @ =gUnknown_086AEAF8 @@ -12974,7 +12974,7 @@ _08038DDE: ldr r3, _08038E00 @ =0x00000387 adds r0, r1, r3 strb r2, [r0] - ldr r0, _08038E04 @ =gUnknown_02032F20 + ldr r0, _08038E04 @ =gMPlayInfo_SE1 ldr r1, _08038E08 @ =gUnknown_086A1FC4 bl MPlayStart b _08039562 @@ -12984,7 +12984,7 @@ _08038DF4: .4byte gUnknown_020314E0 _08038DF8: .4byte 0x000003E2 _08038DFC: .4byte 0x000003E1 _08038E00: .4byte 0x00000387 -_08038E04: .4byte gUnknown_02032F20 +_08038E04: .4byte gMPlayInfo_SE1 _08038E08: .4byte gUnknown_086A1FC4 _08038E0C: ldr r2, _08038E68 @ =gUnknown_086AEAF8 @@ -13208,7 +13208,7 @@ _08038FA8: beq _08038FBE b _08039562 _08038FBE: - ldr r0, _08038FDC @ =gUnknown_02032F20 + ldr r0, _08038FDC @ =gMPlayInfo_SE1 ldr r1, _08038FE0 @ =gUnknown_086A1FE4 bl MPlayStart b _08039562 @@ -13218,7 +13218,7 @@ _08038FCC: .4byte 0x000003DD _08038FD0: .4byte gUnknown_020314E0 _08038FD4: .4byte 0x000003E2 _08038FD8: .4byte 0x00000441 -_08038FDC: .4byte gUnknown_02032F20 +_08038FDC: .4byte gMPlayInfo_SE1 _08038FE0: .4byte gUnknown_086A1FE4 _08038FE4: ldr r2, _08039010 @ =gUnknown_086AEAF8 @@ -13309,7 +13309,7 @@ _08039066: ldr r1, _080390C8 @ =0x00000456 adds r0, r2, r1 strh r3, [r0] - ldr r0, _080390CC @ =gUnknown_02032F20 + ldr r0, _080390CC @ =gMPlayInfo_SE1 ldr r1, _080390D0 @ =gUnknown_086A2038 bl MPlayStart _08039098: @@ -13335,7 +13335,7 @@ _080390BC: .4byte 0x000003E2 _080390C0: .4byte gMain _080390C4: .4byte 0x00001438 _080390C8: .4byte 0x00000456 -_080390CC: .4byte gUnknown_02032F20 +_080390CC: .4byte gMPlayInfo_SE1 _080390D0: .4byte gUnknown_086A2038 _080390D4: .4byte 0x00000452 _080390D8: @@ -13525,7 +13525,7 @@ _08039250: adds r1, r1, r6 movs r0, #0 strb r0, [r1] - ldr r0, _08039274 @ =gUnknown_02032F20 + ldr r0, _08039274 @ =gMPlayInfo_SE1 ldr r1, _08039278 @ =gUnknown_086A20F8 bl MPlayStart b _08039562 @@ -13534,7 +13534,7 @@ _08039264: .4byte gUnknown_086AEAF8 _08039268: .4byte gUnknown_020314E0 _0803926C: .4byte 0x000003E2 _08039270: .4byte 0x00000387 -_08039274: .4byte gUnknown_02032F20 +_08039274: .4byte gMPlayInfo_SE1 _08039278: .4byte gUnknown_086A20F8 _0803927C: ldr r2, _080392A8 @ =gUnknown_086AEAF8 @@ -13774,7 +13774,7 @@ _08039440: adds r0, r0, r6 movs r1, #2 strb r1, [r0] - ldr r0, _08039478 @ =gUnknown_02032F20 + ldr r0, _08039478 @ =gMPlayInfo_SE1 ldr r1, _0803947C @ =gUnknown_086A1F10 bl MPlayStart movs r0, #8 @@ -13783,7 +13783,7 @@ _08039440: .align 2, 0 _08039470: .4byte 0x000003E2 _08039474: .4byte 0x00000387 -_08039478: .4byte gUnknown_02032F20 +_08039478: .4byte gMPlayInfo_SE1 _0803947C: .4byte gUnknown_086A1F10 _08039480: ldr r2, _080394AC @ =gUnknown_086AEAF8 @@ -13896,7 +13896,7 @@ _08039548: ldrsh r0, [r0, r1] cmp r0, #0x48 bne _08039562 - ldr r0, _080395C0 @ =gUnknown_02032F20 + ldr r0, _080395C0 @ =gMPlayInfo_SE1 ldr r1, _080395C4 @ =gUnknown_086A1FC4 bl MPlayStart movs r0, #8 @@ -13928,7 +13928,7 @@ _0803958C: ldrh r0, [r0] cmp r0, #0 bne _080395A2 - ldr r0, _080395D0 @ =gUnknown_02032EE0 + ldr r0, _080395D0 @ =gMPlayInfo_BGM ldr r1, _080395D4 @ =0x0000FFFF movs r2, #0x80 lsls r2, r2, #1 @@ -13946,11 +13946,11 @@ _080395B0: .4byte 0x000003EA _080395B4: .4byte gUnknown_020314E0 _080395B8: .4byte 0x000003E2 _080395BC: .4byte 0x00000387 -_080395C0: .4byte gUnknown_02032F20 +_080395C0: .4byte gMPlayInfo_SE1 _080395C4: .4byte gUnknown_086A1FC4 _080395C8: .4byte gUnknown_086A3700 _080395CC: .4byte 0x00001278 -_080395D0: .4byte gUnknown_02032EE0 +_080395D0: .4byte gMPlayInfo_BGM _080395D4: .4byte 0x0000FFFF thumb_func_start sub_395D8 @@ -18055,7 +18055,7 @@ sub_3B7C4: @ 0x0803B7C4 ldrh r0, [r0] cmp r0, #0x23 bne _0803B838 - ldr r0, _0803B880 @ =gUnknown_02032F20 + ldr r0, _0803B880 @ =gMPlayInfo_SE1 ldr r1, _0803B884 @ =gUnknown_086A22D8 bl MPlayStart ldr r1, [r4] @@ -18121,7 +18121,7 @@ _0803B868: _0803B874: .4byte gUnknown_020314E0 _0803B878: .4byte 0x00000452 _0803B87C: .4byte 0x00000389 -_0803B880: .4byte gUnknown_02032F20 +_0803B880: .4byte gMPlayInfo_SE1 _0803B884: .4byte gUnknown_086A22D8 _0803B888: .4byte 0x0007A120 _0803B88C: .4byte 0x00000385 @@ -18381,7 +18381,7 @@ _0803BA9E: adds r0, r0, r4 movs r1, #0x3c strb r1, [r0] - ldr r0, _0803BB20 @ =gUnknown_02032F20 + ldr r0, _0803BB20 @ =gMPlayInfo_SE1 ldr r1, _0803BB24 @ =gUnknown_086A2454 bl MPlayStart movs r0, #0xd @@ -18429,7 +18429,7 @@ _0803BB10: .4byte 0x000004C9 _0803BB14: .4byte 0x00000119 _0803BB18: .4byte 0x00000275 _0803BB1C: .4byte 0x000003EA -_0803BB20: .4byte gUnknown_02032F20 +_0803BB20: .4byte gMPlayInfo_SE1 _0803BB24: .4byte gUnknown_086A2454 _0803BB28: .4byte 0x00000392 _0803BB2C: @@ -18693,7 +18693,7 @@ _0803BD1E: beq _0803BD30 b _0803C476 _0803BD30: - ldr r0, _0803BE0C @ =gUnknown_02032F20 + ldr r0, _0803BE0C @ =gMPlayInfo_SE1 ldr r1, _0803BE10 @ =gUnknown_086A24F0 bl MPlayStart ldr r0, [r5] @@ -18794,7 +18794,7 @@ _0803BDFC: .4byte 0x000003E1 _0803BE00: .4byte 0x0000047C _0803BE04: .4byte gUnknown_020314E0 _0803BE08: .4byte 0x000003E2 -_0803BE0C: .4byte gUnknown_02032F20 +_0803BE0C: .4byte gMPlayInfo_SE1 _0803BE10: .4byte gUnknown_086A24F0 _0803BE14: .4byte 0x0000047E _0803BE18: .4byte 0x00000482 @@ -18989,7 +18989,7 @@ _0803BF96: ldr r1, _0803BFC8 @ =0x00000456 adds r0, r2, r1 strh r3, [r0] - ldr r0, _0803BFCC @ =gUnknown_02032F20 + ldr r0, _0803BFCC @ =gMPlayInfo_SE1 ldr r1, _0803BFD0 @ =gUnknown_086A2548 bl MPlayStart b _0803C476 @@ -19001,7 +19001,7 @@ _0803BFBC: .4byte 0x000003E2 _0803BFC0: .4byte gMain _0803BFC4: .4byte 0x00001888 _0803BFC8: .4byte 0x00000456 -_0803BFCC: .4byte gUnknown_02032F20 +_0803BFCC: .4byte gMPlayInfo_SE1 _0803BFD0: .4byte gUnknown_086A2548 _0803BFD4: ldr r1, _0803BFFC @ =gUnknown_086AF140 @@ -19086,7 +19086,7 @@ _0803C052: strb r1, [r0] movs r0, #0xd bl sub_11B0 - ldr r0, _0803C090 @ =gUnknown_02032F20 + ldr r0, _0803C090 @ =gMPlayInfo_SE1 ldr r1, _0803C094 @ =gUnknown_086A2454 bl MPlayStart b _0803C476 @@ -19094,7 +19094,7 @@ _0803C052: _0803C084: .4byte 0x000003DD _0803C088: .4byte 0x000003E1 _0803C08C: .4byte 0x00000129 -_0803C090: .4byte gUnknown_02032F20 +_0803C090: .4byte gMPlayInfo_SE1 _0803C094: .4byte gUnknown_086A2454 _0803C098: mov r3, r8 @@ -19858,7 +19858,7 @@ _0803C69E: ldrh r0, [r0] cmp r0, #0 bne _0803C6B6 - ldr r0, _0803C6D8 @ =gUnknown_02032EE0 + ldr r0, _0803C6D8 @ =gMPlayInfo_BGM ldr r1, _0803C6DC @ =0x0000FFFF movs r2, #0x80 lsls r2, r2, #1 @@ -19877,7 +19877,7 @@ _0803C6C8: .4byte 0x000004CA _0803C6CC: .4byte gUnknown_086A3700 _0803C6D0: .4byte 0x00001290 _0803C6D4: .4byte 0x000004C9 -_0803C6D8: .4byte gUnknown_02032EE0 +_0803C6D8: .4byte gMPlayInfo_BGM _0803C6DC: .4byte 0x0000FFFF thumb_func_start sub_3C6E0 @@ -21100,7 +21100,7 @@ _0803D04A: ldr r0, _0803D13C @ =0x00000257 cmp r1, r0 bgt _0803D0B6 - ldr r0, _0803D140 @ =gUnknown_02032F20 + ldr r0, _0803D140 @ =gMPlayInfo_SE1 ldr r1, _0803D144 @ =gUnknown_086A26A0 bl MPlayStart ldr r3, _0803D110 @ =gUnknown_020314E0 @@ -21174,7 +21174,7 @@ _0803D130: .4byte 0x00000482 _0803D134: .4byte 0x0000047D _0803D138: .4byte 0x00000486 _0803D13C: .4byte 0x00000257 -_0803D140: .4byte gUnknown_02032F20 +_0803D140: .4byte gMPlayInfo_SE1 _0803D144: .4byte gUnknown_086A26A0 _0803D148: .4byte 0x00000484 _0803D14C: .4byte 0x00004E20 @@ -26211,7 +26211,7 @@ _0803FAA2: ldrh r0, [r0] cmp r0, #0 bne _0803FAB8 - ldr r0, _0803FAD8 @ =gUnknown_02032EE0 + ldr r0, _0803FAD8 @ =gMPlayInfo_BGM ldr r1, _0803FADC @ =0x0000FFFF movs r2, #0x80 lsls r2, r2, #1 @@ -26227,7 +26227,7 @@ _0803FAC8: .4byte 0xFFFFFE0C _0803FACC: .4byte 0x0000FFDA _0803FAD0: .4byte gUnknown_086A3700 _0803FAD4: .4byte 0x000012A8 -_0803FAD8: .4byte gUnknown_02032EE0 +_0803FAD8: .4byte gMPlayInfo_BGM _0803FADC: .4byte 0x0000FFFF thumb_func_start sub_3FAE0 @@ -31314,7 +31314,7 @@ _08042408: lsrs r0, r0, #0x10 cmp r0, #0x14 bne _08042428 - ldr r0, _08042688 @ =gUnknown_02032F20 + ldr r0, _08042688 @ =gMPlayInfo_SE1 ldr r1, _0804268C @ =0x0000FFFF movs r2, #0x80 bl m4aMPlayVolumeControl @@ -31329,7 +31329,7 @@ _08042428: lsrs r0, r0, #0x10 cmp r0, #0x5a bne _08042446 - ldr r0, _08042688 @ =gUnknown_02032F20 + ldr r0, _08042688 @ =gMPlayInfo_SE1 movs r1, #5 bl m4aMPlayFadeOutTemporarily _08042446: @@ -31357,7 +31357,7 @@ _08042464: lsrs r0, r0, #0x10 cmp r0, #2 bne _08042484 - ldr r0, _08042688 @ =gUnknown_02032F20 + ldr r0, _08042688 @ =gMPlayInfo_SE1 ldr r1, _0804268C @ =0x0000FFFF movs r2, #0x33 bl m4aMPlayVolumeControl @@ -31627,7 +31627,7 @@ _0804262A: _0804267C: .4byte gUnknown_020314E0 _08042680: .4byte 0x00000506 _08042684: .4byte 0x00000516 -_08042688: .4byte gUnknown_02032F20 +_08042688: .4byte gMPlayInfo_SE1 _0804268C: .4byte 0x0000FFFF _08042690: .4byte 0x000001FF _08042694: .4byte 0xFFFFFE00 @@ -33146,7 +33146,7 @@ _080432DC: cmp r0, #0 bne _08043314 bl m4aMPlayAllStop - ldr r0, _08043328 @ =gUnknown_02032F20 + ldr r0, _08043328 @ =gMPlayInfo_SE1 ldr r1, _0804332C @ =gUnknown_086A2E90 bl MPlayStart ldr r1, _08043330 @ =gMain @@ -33173,7 +33173,7 @@ _0804331C: b _080434BA .align 2, 0 _08043324: .4byte 0x00000296 -_08043328: .4byte gUnknown_02032F20 +_08043328: .4byte gMPlayInfo_SE1 _0804332C: .4byte gUnknown_086A2E90 _08043330: .4byte gMain _08043334: .4byte 0x00000392 @@ -33447,7 +33447,7 @@ _0804354C: mov sb, r1 cmp r0, #0x17 bne _08043576 - ldr r0, _080435A0 @ =gUnknown_02032F20 + ldr r0, _080435A0 @ =gMPlayInfo_SE1 ldr r1, _080435A4 @ =gUnknown_086A2EAC bl MPlayStart ldr r1, [r7] @@ -33474,7 +33474,7 @@ _08043576: _08043594: .4byte gUnknown_020314E0 _08043598: .4byte gMain _0804359C: .4byte gUnknown_086AFAE2 -_080435A0: .4byte gUnknown_02032F20 +_080435A0: .4byte gMPlayInfo_SE1 _080435A4: .4byte gUnknown_086A2EAC _080435A8: .4byte 0x00001388 _080435AC: @@ -34458,7 +34458,7 @@ _08043DB4: .4byte gUnknown_020314E0 _08043DB8: .4byte 0x00000553 _08043DBC: .4byte 0x0000054F _08043DC0: - ldr r0, _08043E00 @ =gUnknown_02032F20 + ldr r0, _08043E00 @ =gMPlayInfo_SE1 ldr r1, _08043E04 @ =gUnknown_086A2D28 bl MPlayStart ldr r2, _08043E08 @ =gUnknown_020314E0 @@ -34490,7 +34490,7 @@ _08043DC0: adds r0, r0, r6 b _08043E80 .align 2, 0 -_08043E00: .4byte gUnknown_02032F20 +_08043E00: .4byte gMPlayInfo_SE1 _08043E04: .4byte gUnknown_086A2D28 _08043E08: .4byte gUnknown_020314E0 _08043E0C: .4byte 0x0000054F @@ -36548,7 +36548,7 @@ _08044E88: beq _08044EC8 cmp r0, #0x15 bne _08044EB0 - ldr r0, _08044F24 @ =gUnknown_02032F20 + ldr r0, _08044F24 @ =gMPlayInfo_SE1 ldr r1, _08044F28 @ =gUnknown_086A2D94 bl MPlayStart _08044EB0: @@ -36560,7 +36560,7 @@ _08044EB0: lsls r0, r0, #0x10 cmp r0, #0 bne _08044EC8 - ldr r0, _08044F24 @ =gUnknown_02032F20 + ldr r0, _08044F24 @ =gMPlayInfo_SE1 ldr r1, _08044F2C @ =gUnknown_086A2E70 bl MPlayStart _08044EC8: @@ -36593,7 +36593,7 @@ _08044F14: .4byte gUnknown_084AFFEC _08044F18: .4byte 0x06010B20 _08044F1C: .4byte 0x800000C0 _08044F20: .4byte gMain -_08044F24: .4byte gUnknown_02032F20 +_08044F24: .4byte gMPlayInfo_SE1 _08044F28: .4byte gUnknown_086A2D94 _08044F2C: .4byte gUnknown_086A2E70 _08044F30: @@ -37758,7 +37758,7 @@ _08045894: ldrb r0, [r1] adds r0, #1 strb r0, [r1] - ldr r0, _0804590C @ =gUnknown_02032F20 + ldr r0, _0804590C @ =gMPlayInfo_SE1 ldr r1, _08045910 @ =gUnknown_086A2EE4 str r3, [sp, #4] bl MPlayStart @@ -37810,7 +37810,7 @@ _08045894: .align 2, 0 _08045904: .4byte 0x00000584 _08045908: .4byte 0x000065FF -_0804590C: .4byte gUnknown_02032F20 +_0804590C: .4byte gMPlayInfo_SE1 _08045910: .4byte gUnknown_086A2EE4 _08045914: .4byte 0x0000FED4 _08045918: .4byte 0x00000553 @@ -37929,7 +37929,7 @@ _080459F4: ldrb r0, [r1] adds r0, #1 strb r0, [r1] - ldr r0, _08045A70 @ =gUnknown_02032F20 + ldr r0, _08045A70 @ =gMPlayInfo_SE1 ldr r1, _08045A74 @ =gUnknown_086A2EE4 bl MPlayStart movs r0, #7 @@ -37979,7 +37979,7 @@ _08045A5C: _08045A64: .4byte 0x0000132C _08045A68: .4byte 0x000064FF _08045A6C: .4byte 0x00000533 -_08045A70: .4byte gUnknown_02032F20 +_08045A70: .4byte gMPlayInfo_SE1 _08045A74: .4byte gUnknown_086A2EE4 _08045A78: .4byte 0x0000FFA6 _08045A7C: .4byte 0x000003A3 @@ -45111,7 +45111,7 @@ sub_495A0: @ 0x080495A0 ldr r2, _080495E8 @ =0x0000131C adds r0, r1, r2 str r3, [r0] - ldr r2, _080495EC @ =gUnknown_02032EE0 + ldr r2, _080495EC @ =gMPlayInfo_BGM ldr r0, [r2, #4] cmp r0, #0 blt _080495F4 @@ -45127,7 +45127,7 @@ _080495DC: .4byte 0xFFFFFDFC _080495E0: .4byte gUnknown_020314E0 _080495E4: .4byte 0x00001104 _080495E8: .4byte 0x0000131C -_080495EC: .4byte gUnknown_02032EE0 +_080495EC: .4byte gMPlayInfo_BGM _080495F0: .4byte 0x00000F4C _080495F4: ldr r2, _08049628 @ =0x00000F4C @@ -45384,7 +45384,7 @@ sub_497BC: @ 0x080497BC ldr r0, [r2] cmp r0, #0 beq _08049814 - ldr r0, _0804984C @ =gUnknown_02032EE0 + ldr r0, _0804984C @ =gMPlayInfo_BGM bl m4aMPlayContinue _08049814: movs r0, #0xa6 @@ -45404,7 +45404,7 @@ _0804983C: .4byte 0x040000D4 _08049840: .4byte 0x05000200 _08049844: .4byte 0x80000100 _08049848: .4byte 0x00000F4C -_0804984C: .4byte gUnknown_02032EE0 +_0804984C: .4byte gMPlayInfo_BGM thumb_func_start sub_49850 sub_49850: @ 0x08049850 @@ -46599,7 +46599,7 @@ _0804A1B8: ldr r1, [r0] cmp r1, #0 beq _0804A212 - ldr r2, _0804A250 @ =gUnknown_02032EE0 + ldr r2, _0804A250 @ =gMPlayInfo_BGM ldr r0, [r2, #4] cmp r0, #0 bge _0804A212 @@ -46628,7 +46628,7 @@ _0804A240: .4byte gUnknown_0200B134 _0804A244: .4byte gUnknown_020314E0 _0804A248: .4byte gMain _0804A24C: .4byte 0x00000F4C -_0804A250: .4byte gUnknown_02032EE0 +_0804A250: .4byte gMPlayInfo_BGM _0804A254: ldrh r0, [r1, #0x38] movs r0, #0xce @@ -48824,7 +48824,7 @@ sub_4B408: @ 0x0804B408 push {r7} lsls r0, r0, #0x10 lsrs r4, r0, #0x10 - ldr r2, _0804B430 @ =gUnknown_02032EE0 + ldr r2, _0804B430 @ =gMPlayInfo_BGM ldr r0, [r2, #4] cmp r0, #0 blt _0804B43C @@ -48838,7 +48838,7 @@ sub_4B408: @ 0x0804B408 bl m4aMPlayStop b _0804B448 .align 2, 0 -_0804B430: .4byte gUnknown_02032EE0 +_0804B430: .4byte gMPlayInfo_BGM _0804B434: .4byte gUnknown_020314E0 _0804B438: .4byte 0x00000F4C _0804B43C: @@ -56237,7 +56237,7 @@ _0804F196: ldrb r0, [r0] cmp r0, #0x28 bne _0804F1AC - ldr r0, _0804F214 @ =gUnknown_02032F20 + ldr r0, _0804F214 @ =gMPlayInfo_SE1 ldr r1, _0804F218 @ =gUnknown_0869F664 bl MPlayStart _0804F1AC: @@ -56283,7 +56283,7 @@ _0804F204: .4byte 0x040000D4 _0804F208: .4byte gUnknown_08137E14 _0804F20C: .4byte 0x05000220 _0804F210: .4byte 0x80000010 -_0804F214: .4byte gUnknown_02032F20 +_0804F214: .4byte gMPlayInfo_SE1 _0804F218: .4byte gUnknown_0869F664 _0804F21C: .4byte gUnknown_086B0E20 _0804F220: diff --git a/asm/rom_528AC.s b/asm/rom_528AC.s index d98210a..f5f2b88 100755 --- a/asm/rom_528AC.s +++ b/asm/rom_528AC.s @@ -40,7 +40,7 @@ sub_528DC: @ 0x080528DC lsrs r5, r5, #0x10 lsls r4, r4, #0x18 lsrs r4, r4, #0x18 - ldr r0, _08052914 @ =gUnknown_02032EE0 + ldr r0, _08052914 @ =gMPlayInfo_BGM ldr r1, _08052918 @ =0x0000FFFF movs r2, #0x99 bl m4aMPlayVolumeControl @@ -58,7 +58,7 @@ sub_528DC: @ 0x080528DC pop {r0} bx r0 .align 2, 0 -_08052914: .4byte gUnknown_02032EE0 +_08052914: .4byte gMPlayInfo_BGM _08052918: .4byte 0x0000FFFF thumb_func_start sub_5291C |