dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

decompile sound.c

Browse Source
This commit is contained in:
ProjectRevoTPP
2018-10-05 21:26:13 -04:00
parent 0659d53c27
commit 4fafb81b2f
30 changed files with 730 additions and 1654 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_anim.s
+16 -16
View File
@@ -272,7 +272,7 @@ _080726EE:
beq _08072706
cmp r8, r0
bne _080726EC
ldr r0, _0807272C @ =gMPlay_BGM
ldr r0, _0807272C @ =gMPlayInfo_BGM
movs r2, 0x80
bl m4aMPlayVolumeControl
_08072706:
@@ -295,7 +295,7 @@ _08072706:
bx r0
.align 2, 0
_08072728: .4byte 0x0000ffff
_0807272C: .4byte gMPlay_BGM
_0807272C: .4byte gMPlayInfo_BGM
_08072730: .4byte gUnknown_2022984
_08072734: .4byte gUnknown_2022986
_08072738: .4byte gUnknown_2022988
@@ -868,9 +868,9 @@ _08072B62:
_08072B6C: .4byte gUnknown_2037F12
_08072B70: .4byte gUnknown_2037EE0
_08072B74:
ldr r0, _08072BE8 @ =gMPlay_SE1
ldr r0, _08072BE8 @ =gMPlayInfo_SE1
bl m4aMPlayStop
ldr r0, _08072BEC @ =gMPlay_SE2
ldr r0, _08072BEC @ =gMPlayInfo_SE2
bl m4aMPlayStop
_08072B80:
ldr r1, _08072BF0 @ =gUnknown_2037F12
@@ -905,7 +905,7 @@ _08072BB2:
mov r1, r8
cmp r1, 0
bne _08072BDC
ldr r0, _08072C00 @ =gMPlay_BGM
ldr r0, _08072C00 @ =gMPlayInfo_BGM
ldr r1, _08072BF4 @ =0x0000ffff
movs r2, 0x80
lsls r2, 1
@@ -923,13 +923,13 @@ _08072BDC:
pop {r0}
bx r0
.align 2, 0
_08072BE8: .4byte gMPlay_SE1
_08072BEC: .4byte gMPlay_SE2
_08072BE8: .4byte gMPlayInfo_SE1
_08072BEC: .4byte gMPlayInfo_SE2
_08072BF0: .4byte gUnknown_2037F12
_08072BF4: .4byte 0x0000ffff
_08072BF8: .4byte gUnknown_83ACC08
_08072BFC: .4byte gUnknown_2037EEE
_08072C00: .4byte gMPlay_BGM
_08072C00: .4byte gMPlayInfo_BGM
_08072C04: .4byte gUnknown_2037EE1
thumb_func_end sub_8072B08
@@ -3652,17 +3652,17 @@ ScriptCmd_waitsound: @ 80740E0
lsrs r0, 16
cmp r0, 0x5A
bls _0807412E
ldr r0, _08074120 @ =gMPlay_SE1
ldr r0, _08074120 @ =gMPlayInfo_SE1
bl m4aMPlayStop
ldr r0, _08074124 @ =gMPlay_SE2
ldr r0, _08074124 @ =gMPlayInfo_SE2
bl m4aMPlayStop
strh r5, [r4]
b _08074152
.align 2, 0
_08074118: .4byte gUnknown_2037EE3
_0807411C: .4byte gUnknown_2037F12
_08074120: .4byte gMPlay_SE1
_08074124: .4byte gMPlay_SE2
_08074120: .4byte gMPlayInfo_SE1
_08074124: .4byte gMPlayInfo_SE2
_08074128:
ldr r1, _08074138 @ =gUnknown_2037F12
movs r0, 0
@@ -4088,9 +4088,9 @@ _08074454: .4byte gSprites
thumb_func_start sub_8074458
sub_8074458: @ 8074458
push {lr}
ldr r0, _08074474 @ =gMPlay_SE1
ldr r0, _08074474 @ =gMPlayInfo_SE1
bl m4aMPlayStop
ldr r0, _08074478 @ =gMPlay_SE2
ldr r0, _08074478 @ =gMPlayInfo_SE2
bl m4aMPlayStop
ldr r1, _0807447C @ =gUnknown_2037ED4
ldr r0, [r1]
@@ -4099,8 +4099,8 @@ sub_8074458: @ 8074458
pop {r0}
bx r0
.align 2, 0
_08074474: .4byte gMPlay_SE1
_08074478: .4byte gMPlay_SE2
_08074474: .4byte gMPlayInfo_SE1
_08074478: .4byte gMPlayInfo_SE2
_0807447C: .4byte gUnknown_2037ED4
thumb_func_end sub_8074458
asm/battle_controller_link_opponent.s
+6 -6
View File
@@ -381,7 +381,7 @@ _0803A936:
lsrs r0, 24
cmp r0, 0x1
bne _0803A988
ldr r0, _0803A978 @ =gMPlay_BGM
ldr r0, _0803A978 @ =gMPlayInfo_BGM
bl m4aMPlayContinue
b _0803A988
.align 2, 0
@@ -392,9 +392,9 @@ _0803A968: .4byte SpriteCallbackDummy
_0803A96C: .4byte gUnknown_2024018
_0803A970: .4byte 0x000027f9
_0803A974: .4byte gBattleTypeFlags
_0803A978: .4byte gMPlay_BGM
_0803A978: .4byte gMPlayInfo_BGM
_0803A97C:
ldr r0, _0803A9B4 @ =gMPlay_BGM
ldr r0, _0803A9B4 @ =gMPlayInfo_BGM
ldr r1, _0803A9B8 @ =0x0000ffff
movs r2, 0x80
lsls r2, 1
@@ -424,7 +424,7 @@ _0803A9AA:
pop {r0}
bx r0
.align 2, 0
_0803A9B4: .4byte gMPlay_BGM
_0803A9B4: .4byte gMPlayInfo_BGM
_0803A9B8: .4byte 0x0000ffff
_0803A9BC: .4byte gUnknown_2024018
_0803A9C0: .4byte gActiveBattler
@@ -1078,7 +1078,7 @@ sub_803AEDC: @ 803AEDC
lsls r0, 24
cmp r0, 0
bne _0803AF14
ldr r0, _0803AF20 @ =gMPlay_BGM
ldr r0, _0803AF20 @ =gMPlayInfo_BGM
ldr r1, _0803AF24 @ =0x0000ffff
movs r2, 0x80
lsls r2, 1
@@ -1090,7 +1090,7 @@ _0803AF14:
.align 2, 0
_0803AF18: .4byte gUnknown_2024018
_0803AF1C: .4byte gActiveBattler
_0803AF20: .4byte gMPlay_BGM
_0803AF20: .4byte gMPlayInfo_BGM
_0803AF24: .4byte 0x0000ffff
thumb_func_end sub_803AEDC
asm/battle_controller_opponent.s
+6 -6
View File
@@ -394,7 +394,7 @@ _08035CD0:
ands r0, r1
cmp r0, 0
beq _08035DA4
ldr r0, _08035DA0 @ =gMPlay_BGM
ldr r0, _08035DA0 @ =gMPlayInfo_BGM
bl m4aMPlayContinue
b _08035DB0
.align 2, 0
@@ -405,9 +405,9 @@ _08035D90: .4byte SpriteCallbackDummy
_08035D94: .4byte gUnknown_2024018
_08035D98: .4byte 0x000027f9
_08035D9C: .4byte gBattleTypeFlags
_08035DA0: .4byte gMPlay_BGM
_08035DA0: .4byte gMPlayInfo_BGM
_08035DA4:
ldr r0, _08035DD8 @ =gMPlay_BGM
ldr r0, _08035DD8 @ =gMPlayInfo_BGM
ldr r1, _08035DDC @ =0x0000ffff
movs r2, 0x80
lsls r2, 1
@@ -435,7 +435,7 @@ _08035DD2:
pop {r0}
bx r0
.align 2, 0
_08035DD8: .4byte gMPlay_BGM
_08035DD8: .4byte gMPlayInfo_BGM
_08035DDC: .4byte 0x0000ffff
_08035DE0: .4byte gUnknown_2024018
_08035DE4: .4byte gActiveBattler
@@ -1074,7 +1074,7 @@ sub_80362E8: @ 80362E8
lsls r0, 24
cmp r0, 0
bne _08036320
ldr r0, _0803632C @ =gMPlay_BGM
ldr r0, _0803632C @ =gMPlayInfo_BGM
ldr r1, _08036330 @ =0x0000ffff
movs r2, 0x80
lsls r2, 1
@@ -1086,7 +1086,7 @@ _08036320:
.align 2, 0
_08036324: .4byte gUnknown_2024018
_08036328: .4byte gActiveBattler
_0803632C: .4byte gMPlay_BGM
_0803632C: .4byte gMPlayInfo_BGM
_08036330: .4byte 0x0000ffff
thumb_func_end sub_80362E8
asm/battle_controller_player.s
+8 -8
View File
@@ -2775,7 +2775,7 @@ _0802F934:
ands r0, r1
cmp r0, 0
beq _0802F9D0
ldr r0, _0802F9CC @ =gMPlay_BGM
ldr r0, _0802F9CC @ =gMPlayInfo_BGM
bl m4aMPlayContinue
b _0802F9DC
.align 2, 0
@@ -2786,9 +2786,9 @@ _0802F9BC: .4byte SpriteCallbackDummy
_0802F9C0: .4byte gUnknown_2024018
_0802F9C4: .4byte 0x000027f9
_0802F9C8: .4byte gBattleTypeFlags
_0802F9CC: .4byte gMPlay_BGM
_0802F9CC: .4byte gMPlayInfo_BGM
_0802F9D0:
ldr r0, _0802FA38 @ =gMPlay_BGM
ldr r0, _0802FA38 @ =gMPlayInfo_BGM
ldr r1, _0802FA3C @ =0x0000ffff
movs r2, 0x80
lsls r2, 1
@@ -2840,7 +2840,7 @@ _0802FA32:
pop {r0}
bx r0
.align 2, 0
_0802FA38: .4byte gMPlay_BGM
_0802FA38: .4byte gMPlayInfo_BGM
_0802FA3C: .4byte 0x0000ffff
_0802FA40: .4byte gBattlerPartyIndexes
_0802FA44: .4byte gActiveBattler
@@ -3153,7 +3153,7 @@ sub_802FCAC: @ 802FCAC
lsls r0, 24
cmp r0, 0
bne _0802FCFA
ldr r0, _0802FD08 @ =gMPlay_BGM
ldr r0, _0802FD08 @ =gMPlayInfo_BGM
ldr r1, _0802FD0C @ =0x0000ffff
movs r2, 0x80
lsls r2, 1
@@ -3176,7 +3176,7 @@ _0802FCFA:
.align 2, 0
_0802FD00: .4byte gUnknown_2024018
_0802FD04: .4byte gActiveBattler
_0802FD08: .4byte gMPlay_BGM
_0802FD08: .4byte gMPlayInfo_BGM
_0802FD0C: .4byte 0x0000ffff
_0802FD10: .4byte gBattlerPartyIndexes
_0802FD14: .4byte gPlayerParty
@@ -3291,7 +3291,7 @@ c3_0802FDF4: @ 802FDF4
lsls r0, 24
cmp r0, 0
bne _0802FE16
ldr r0, _0802FE1C @ =gMPlay_BGM
ldr r0, _0802FE1C @ =gMPlayInfo_BGM
ldr r1, _0802FE20 @ =0x0000ffff
movs r2, 0x80
lsls r2, 1
@@ -3303,7 +3303,7 @@ _0802FE16:
pop {r0}
bx r0
.align 2, 0
_0802FE1C: .4byte gMPlay_BGM
_0802FE1C: .4byte gMPlayInfo_BGM
_0802FE20: .4byte 0x0000ffff
thumb_func_end c3_0802FDF4
asm/battle_gfx_sfx_util.s
+4 -4
View File
@@ -676,9 +676,9 @@ mplay_80342A4: @ 80342A4
ldrb r0, [r0, 0x8]
cmp r0, 0x1D
bls _080342F0
ldr r0, _080342FC @ =gMPlay_SE1
ldr r0, _080342FC @ =gMPlayInfo_SE1
bl m4aMPlayStop
ldr r0, _08034300 @ =gMPlay_SE2
ldr r0, _08034300 @ =gMPlayInfo_SE2
bl m4aMPlayStop
_080342EC:
cmp r5, 0
@@ -689,8 +689,8 @@ _080342F0:
.align 2, 0
_080342F4: .4byte gUnknown_2024018
_080342F8: .4byte gActiveBattler
_080342FC: .4byte gMPlay_SE1
_08034300: .4byte gMPlay_SE2
_080342FC: .4byte gMPlayInfo_SE1
_08034300: .4byte gMPlayInfo_SE2
_08034304:
ldr r0, _0803431C @ =gUnknown_2024018
ldr r0, [r0]
asm/diploma.s
+1 -1
View File
@@ -154,7 +154,7 @@ _080F4D30:
cmp r0, 0
bne _080F4D50
movs r0, 0x5
bl sub_8071BC4
bl PlayFanfareByFanfareNum
ldr r0, _080F4D68 @ =gTasks
lsls r1, r4, 2
adds r1, r4
asm/hall_of_fame.s
+4 -4
View File
@@ -2151,7 +2151,7 @@ _080F2F0C:
cmp r0, 0
beq _080F2F26
bl StopCryAndClearCrySongs
ldr r0, _080F2F2C @ =gMPlay_BGM
ldr r0, _080F2F2C @ =gMPlayInfo_BGM
ldr r1, _080F2F30 @ =0x0000ffff
movs r2, 0x80
lsls r2, 1
@@ -2161,7 +2161,7 @@ _080F2F26:
str r0, [r4]
b _080F2FD8
.align 2, 0
_080F2F2C: .4byte gMPlay_BGM
_080F2F2C: .4byte gMPlayInfo_BGM
_080F2F30: .4byte 0x0000ffff
_080F2F34: .4byte sub_80F2FEC
_080F2F38:
@@ -2174,7 +2174,7 @@ _080F2F38:
cmp r0, 0
beq _080F2F5A
bl StopCryAndClearCrySongs
ldr r0, _080F2F6C @ =gMPlay_BGM
ldr r0, _080F2F6C @ =gMPlayInfo_BGM
ldr r1, _080F2F70 @ =0x0000ffff
movs r2, 0x80
lsls r2, 1
@@ -2189,7 +2189,7 @@ _080F2F5A:
str r0, [r1]
b _080F2FD8
.align 2, 0
_080F2F6C: .4byte gMPlay_BGM
_080F2F6C: .4byte gMPlayInfo_BGM
_080F2F70: .4byte 0x0000ffff
_080F2F74: .4byte gTasks
_080F2F78: .4byte sub_80F2FEC
asm/help_system.s
+8 -8
View File
@@ -83,9 +83,9 @@ _0813B90C: .4byte gMain
_0813B910: .4byte gUnknown_203F175
_0813B914: .4byte gUnknown_3005ECC
_0813B918:
ldr r0, _0813B94C @ =gMPlay_SE1
ldr r0, _0813B94C @ =gMPlayInfo_SE1
bl m4aMPlayStop
ldr r0, _0813B950 @ =gMPlay_SE2
ldr r0, _0813B950 @ =gMPlayInfo_SE2
bl m4aMPlayStop
movs r0, 0xFA
bl PlaySE
@@ -93,7 +93,7 @@ _0813B918:
ldrb r0, [r0]
cmp r0, 0
bne _0813B93C
ldr r0, _0813B958 @ =gMPlay_BGM
ldr r0, _0813B958 @ =gMPlayInfo_BGM
ldr r1, _0813B95C @ =0x0000ffff
movs r2, 0x80
bl m4aMPlayVolumeControl
@@ -106,10 +106,10 @@ _0813B93C:
movs r0, 0x1
b _0813BB22
.align 2, 0
_0813B94C: .4byte gMPlay_SE1
_0813B950: .4byte gMPlay_SE2
_0813B94C: .4byte gMPlayInfo_SE1
_0813B950: .4byte gMPlayInfo_SE2
_0813B954: .4byte gUnknown_203F174
_0813B958: .4byte gMPlay_BGM
_0813B958: .4byte gMPlayInfo_BGM
_0813B95C: .4byte 0x0000ffff
_0813B960: .4byte gUnknown_203F177
_0813B964: .4byte gUnknown_203F178
@@ -269,7 +269,7 @@ _0813BAE0:
ldrb r0, [r0]
cmp r0, 0
bne _0813BAF4
ldr r0, _0813BB08 @ =gMPlay_BGM
ldr r0, _0813BB08 @ =gMPlayInfo_BGM
ldr r1, _0813BB0C @ =0x0000ffff
movs r2, 0x80
lsls r2, 1
@@ -282,7 +282,7 @@ _0813BAF4:
b _0813BB22
.align 2, 0
_0813BB04: .4byte gUnknown_203F174
_0813BB08: .4byte gMPlay_BGM
_0813BB08: .4byte gMPlayInfo_BGM
_0813BB0C: .4byte 0x0000ffff
_0813BB10: .4byte gUnknown_203F178
_0813BB14:
asm/item_use.s
+1 -1
View File
@@ -838,7 +838,7 @@ sub_80A1648: @ 80A1648
lsls r4, 24
lsrs r4, 24
movs r0, 0xB
bl sub_8071BC4
bl PlayFanfareByFanfareNum
ldr r1, _080A166C @ =gTasks
lsls r0, r4, 2
adds r0, r4
asm/link.s
+6 -6
View File
@@ -3234,11 +3234,11 @@ c2_800ACD4: @ 800ACD4
movs r0, 0
movs r1, 0
bl SetGpuReg
ldr r0, _0800ADE0 @ =gMPlay_SE1
ldr r0, _0800ADE0 @ =gMPlayInfo_SE1
bl m4aMPlayStop
ldr r0, _0800ADE4 @ =gMPlay_SE2
ldr r0, _0800ADE4 @ =gMPlayInfo_SE2
bl m4aMPlayStop
ldr r0, _0800ADE8 @ =gMPlay_SE3
ldr r0, _0800ADE8 @ =gMPlayInfo_SE3
bl m4aMPlayStop
ldr r0, _0800ADEC @ =gHeap
movs r1, 0xE0
@@ -3333,9 +3333,9 @@ _0800ADD8:
pop {r0}
bx r0
.align 2, 0
_0800ADE0: .4byte gMPlay_SE1
_0800ADE4: .4byte gMPlay_SE2
_0800ADE8: .4byte gMPlay_SE3
_0800ADE0: .4byte gMPlayInfo_SE1
_0800ADE4: .4byte gMPlayInfo_SE2
_0800ADE8: .4byte gMPlayInfo_SE3
_0800ADEC: .4byte gHeap
_0800ADF0: .4byte gUnknown_3003F3C
_0800ADF4: .4byte gUnknown_2022854
asm/overworld.s
+2 -2
View File
@@ -2409,7 +2409,7 @@ _08055DDC:
subs r0, 0x7
cmp r0, 0xA
bgt _08055E24
ldr r0, _08055E1C @ =gMPlay_BGM
ldr r0, _08055E1C @ =gMPlayInfo_BGM
ldr r1, [r0]
ldr r0, _08055E20 @ =gUnknown_86E6B0C
cmp r1, r0
@@ -2420,7 +2420,7 @@ _08055DDC:
.align 2, 0
_08055E14: .4byte gSaveBlock1Ptr
_08055E18: .4byte 0x00004f01
_08055E1C: .4byte gMPlay_BGM
_08055E1C: .4byte gMPlayInfo_BGM
_08055E20: .4byte gUnknown_86E6B0C
_08055E24:
bl sub_8055D8C
asm/party_menu.s
+1 -1
View File
@@ -15270,7 +15270,7 @@ sub_8126350: @ 8126350
adds r1, r4, 0
bl sub_80A2294
movs r0, 0
bl sub_8071BC4
bl PlayFanfareByFanfareNum
ldrb r0, [r6, 0x9]
adds r1, r4, 0
bl sub_8126440
asm/pokeball.s
+4 -4
View File
@@ -1287,7 +1287,7 @@ _0804B34E:
lsls r0, 24
cmp r0, 0
beq _0804B3A6
ldr r0, _0804B398 @ =gMPlay_BGM
ldr r0, _0804B398 @ =gMPlayInfo_BGM
bl m4aMPlayStop
b _0804B3A6
.align 2, 0
@@ -1295,9 +1295,9 @@ _0804B388: .4byte gBattlerPartyIndexes
_0804B38C: .4byte gPlayerParty
_0804B390: .4byte gUnknown_2024018
_0804B394: .4byte gBattleTypeFlags
_0804B398: .4byte gMPlay_BGM
_0804B398: .4byte gMPlayInfo_BGM
_0804B39C:
ldr r0, _0804B3C4 @ =gMPlay_BGM
ldr r0, _0804B3C4 @ =gMPlayInfo_BGM
ldr r1, _0804B3C8 @ =0x0000ffff
movs r2, 0x80
bl m4aMPlayVolumeControl
@@ -1318,7 +1318,7 @@ _0804B3C0:
movs r4, 0
b _0804B3F2
.align 2, 0
_0804B3C4: .4byte gMPlay_BGM
_0804B3C4: .4byte gMPlayInfo_BGM
_0804B3C8: .4byte 0x0000ffff
_0804B3CC: .4byte gUnknown_2024018
_0804B3D0:
asm/save_failed_screen.s
+4 -4
View File
@@ -69,7 +69,7 @@ _080F515C:
.align 2, 0
_080F5168: .4byte gUnknown_3005430
_080F516C:
ldr r0, _080F5184 @ =gMPlay_BGM
ldr r0, _080F5184 @ =gMPlayInfo_BGM
ldr r1, _080F5188 @ =0x0000ffff
movs r2, 0x80
bl m4aMPlayVolumeControl
@@ -79,7 +79,7 @@ _080F516C:
strb r0, [r1]
b _080F52D6
.align 2, 0
_080F5184: .4byte gMPlay_BGM
_080F5184: .4byte gMPlayInfo_BGM
_080F5188: .4byte 0x0000ffff
_080F518C: .4byte gUnknown_203AB50
_080F5190:
@@ -206,7 +206,7 @@ _080F5298:
.align 2, 0
_080F52B0: .4byte gUnknown_203AB50
_080F52B4:
ldr r0, _080F52DC @ =gMPlay_BGM
ldr r0, _080F52DC @ =gMPlayInfo_BGM
ldr r1, _080F52E0 @ =0x0000ffff
movs r2, 0x80
lsls r2, 1
@@ -225,7 +225,7 @@ _080F52D8:
pop {r1}
bx r1
.align 2, 0
_080F52DC: .4byte gMPlay_BGM
_080F52DC: .4byte gMPlayInfo_BGM
_080F52E0: .4byte 0x0000ffff
_080F52E4: .4byte gUnknown_3005430
_080F52E8: .4byte gUnknown_203AB50
asm/scrcmd.s
+2 -2
View File
@@ -3897,7 +3897,7 @@ sub_806BB9C: @ 806BB9C
bl sub_809D2F0
adds r0, r4, 0
movs r1, 0
bl sub_8071F24
bl PlayCry7
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -5165,7 +5165,7 @@ ScrCmd_playmoncry: @ 806C508
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_8071F24
bl PlayCry7
movs r0, 0
pop {r4,r5}
pop {r1}
asm/sound.s
-1541
View File
File diff suppressed because it is too large Load Diff
asm/unk_81507FC.s
+2 -2
View File
@@ -2859,7 +2859,7 @@ _08151E6C:
cmp r0, 0x1
bne _08151E8C
movs r0, 0xA
bl sub_8071BC4
bl PlayFanfareByFanfareNum
ldr r0, [r4]
movs r2, 0xAA
lsls r2, 1
@@ -3054,7 +3054,7 @@ _08151FF0:
cmp r0, 0x1
bne _08152010
movs r0, 0xA
bl sub_8071BC4
bl PlayFanfareByFanfareNum
ldr r0, [r4]
movs r3, 0xAA
lsls r3, 1