mirror of
https://github.com/pret/pmd-red.git
synced 2026-04-25 15:46:18 -05:00
Identify, split, decompile m4a, and more
ResetSprites, gCharMemCursor, gSpriteCount; analysed subheaps; identified more file pointers
This commit is contained in:
parent
f4ef62bb41
commit
c7045ae369
3
Makefile
3
Makefile
|
|
@ -60,6 +60,9 @@ $(BUILD_DIR)/src/agb_flash.o : CC1FLAGS := -O -mthumb-interwork
|
|||
$(BUILD_DIR)/src/agb_flash_1m.o: CC1FLAGS := -O -mthumb-interwork
|
||||
$(BUILD_DIR)/src/agb_flash_mx.o: CC1FLAGS := -O -mthumb-interwork
|
||||
|
||||
$(BUILD_DIR)/src/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc
|
||||
$(BUILD_DIR)/src/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
|
||||
|
||||
#### Main Rules ####
|
||||
|
||||
ALL_BUILDS := red
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ _08000406:
|
|||
movs r0, 0x2
|
||||
bl sub_800A8F8
|
||||
movs r0, 0x1
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
movs r0, 0
|
||||
bl xxx_update_some_bg_tiles
|
||||
bl sub_80097B0
|
||||
|
|
@ -431,7 +431,7 @@ xxx_update_stuff:
|
|||
bl sub_8009908
|
||||
bl xxx_call_update_bg_sound_input
|
||||
movs r0, 0
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
|
|
|
|||
|
|
@ -1062,7 +1062,7 @@ sub_800BD08:
|
|||
ands r3, r1
|
||||
strh r3, [r0, 0xA]
|
||||
ldrh r0, [r0, 0xA]
|
||||
bl sub_80AEF24
|
||||
bl m4aSoundInit
|
||||
ldr r0, _0800BDB8
|
||||
movs r2, 0
|
||||
strh r2, [r0]
|
||||
|
|
@ -1184,7 +1184,7 @@ _0800BE4C:
|
|||
movs r0, 0x1
|
||||
strh r0, [r1]
|
||||
adds r0, r6, 0
|
||||
bl sub_80AEFA8
|
||||
bl m4aSongNumStart
|
||||
_0800BE70:
|
||||
cmp r4, 0
|
||||
beq _0800BE78
|
||||
|
|
@ -1258,19 +1258,19 @@ _0800BEE0:
|
|||
movs r1, 0x1
|
||||
strh r1, [r0]
|
||||
adds r0, r6, 0
|
||||
bl sub_80AEFA8
|
||||
bl m4aSongNumStart
|
||||
ldr r4, _0800BF44
|
||||
adds r0, r4, 0
|
||||
bl sub_80AF198
|
||||
bl m4aMPlayImmInit
|
||||
adds r0, r4, 0
|
||||
movs r1, 0xFF
|
||||
movs r2, 0
|
||||
bl sub_80AFF50
|
||||
bl m4aMPlayVolumeControl
|
||||
adds r0, r6, 0
|
||||
bl sub_80AF074
|
||||
bl m4aSongNumStop
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
bl sub_80AF170
|
||||
bl m4aMPlayFadeIn
|
||||
_0800BF26:
|
||||
cmp r7, 0
|
||||
beq _0800BF2E
|
||||
|
|
@ -1333,7 +1333,7 @@ sub_800BF80:
|
|||
cmp r1, r0
|
||||
beq _0800BFA2
|
||||
ldr r0, _0800BFC8
|
||||
bl sub_80AF7C0
|
||||
bl m4aMPlayStop
|
||||
_0800BFA2:
|
||||
ldr r0, _0800BFC0
|
||||
ldr r2, _0800BFC4
|
||||
|
|
@ -1392,7 +1392,7 @@ _0800BFE8:
|
|||
strh r0, [r1]
|
||||
ldr r0, _0800C028
|
||||
adds r1, r4, 0
|
||||
bl sub_80AF140
|
||||
bl m4aMPlayFadeOut
|
||||
b _0800C044
|
||||
.align 2, 0
|
||||
_0800C018: .4byte gUnknown_202D690
|
||||
|
|
@ -1403,7 +1403,7 @@ _0800C028: .4byte gUnknown_20008F0
|
|||
_0800C02C:
|
||||
strh r2, [r3]
|
||||
ldr r0, _0800C038
|
||||
bl sub_80AF7C0
|
||||
bl m4aMPlayStop
|
||||
b _0800C044
|
||||
.align 2, 0
|
||||
_0800C038: .4byte gUnknown_20008F0
|
||||
|
|
@ -1506,7 +1506,7 @@ _0800C0B4:
|
|||
strb r2, [r0]
|
||||
ldr r0, _0800C11C
|
||||
movs r1, 0x1
|
||||
bl sub_80AF150
|
||||
bl m4aMPlayFadeOutTemporarily
|
||||
b _0800C15E
|
||||
.align 2, 0
|
||||
_0800C0FC: .4byte 0x000003e5
|
||||
|
|
@ -1529,9 +1529,9 @@ _0800C12C:
|
|||
movs r0, 0x3
|
||||
strh r0, [r4]
|
||||
ldr r0, _0800C140
|
||||
bl sub_80AF7C0
|
||||
bl m4aMPlayStop
|
||||
ldrh r0, [r6]
|
||||
bl sub_80AEFA8
|
||||
bl m4aSongNumStart
|
||||
b _0800C15E
|
||||
.align 2, 0
|
||||
_0800C140: .4byte gUnknown_20008F0
|
||||
|
|
@ -1542,9 +1542,9 @@ _0800C144:
|
|||
cmp r0, 0x1
|
||||
bls _0800C15E
|
||||
ldr r0, _0800C17C
|
||||
bl sub_80AF7C0
|
||||
bl m4aMPlayStop
|
||||
ldrh r0, [r6]
|
||||
bl sub_80AEFA8
|
||||
bl m4aSongNumStart
|
||||
movs r0, 0x3
|
||||
_0800C15C:
|
||||
strh r0, [r4]
|
||||
|
|
@ -1618,7 +1618,7 @@ _0800C1DC:
|
|||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
mov r0, r8
|
||||
bl sub_80AEFA8
|
||||
bl m4aSongNumStart
|
||||
movs r0, 0x1
|
||||
strh r0, [r4]
|
||||
mov r0, r8
|
||||
|
|
@ -1693,7 +1693,7 @@ _0800C22C:
|
|||
mov r0, r8
|
||||
movs r1, 0xF
|
||||
adds r2, r7, 0
|
||||
bl sub_80AFF50
|
||||
bl m4aMPlayVolumeControl
|
||||
_0800C27E:
|
||||
cmp r6, 0
|
||||
beq _0800C286
|
||||
|
|
@ -1705,7 +1705,7 @@ _0800C286:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800C290: .4byte gUnknown_9E8665C
|
||||
_0800C290: .4byte gMPlayTable
|
||||
_0800C294: .4byte gUnknown_3000FD8
|
||||
thumb_func_end sub_800C214
|
||||
|
||||
|
|
@ -1736,7 +1736,7 @@ sub_800C298:
|
|||
movs r5, 0x4
|
||||
_0800C2C8:
|
||||
ldr r0, [r6]
|
||||
bl sub_80AF7C0
|
||||
bl m4aMPlayStop
|
||||
strh r7, [r4]
|
||||
mov r2, r8
|
||||
strh r2, [r4, 0x2]
|
||||
|
|
@ -1756,7 +1756,7 @@ _0800C2C8:
|
|||
.align 2, 0
|
||||
_0800C2F0: .4byte 0x000003e5
|
||||
_0800C2F4: .4byte gUnknown_3000FE8
|
||||
_0800C2F8: .4byte gUnknown_9E8665C
|
||||
_0800C2F8: .4byte gMPlayTable
|
||||
_0800C2FC:
|
||||
adds r0, r5, 0
|
||||
bl sub_800CAAC
|
||||
|
|
@ -1782,7 +1782,7 @@ _0800C2FC:
|
|||
bl nullsub_21
|
||||
b _0800C3DE
|
||||
.align 2, 0
|
||||
_0800C330: .4byte gUnknown_9E8665C
|
||||
_0800C330: .4byte gMPlayTable
|
||||
_0800C334: .4byte gUnknown_3000FD8
|
||||
_0800C338:
|
||||
bl sub_800B620
|
||||
|
|
@ -1792,7 +1792,7 @@ _0800C338:
|
|||
cmp r0, r5
|
||||
bne _0800C35A
|
||||
adds r0, r7, 0
|
||||
bl sub_80AF7C0
|
||||
bl m4aMPlayStop
|
||||
movs r1, 0
|
||||
movs r0, 0
|
||||
strh r0, [r4]
|
||||
|
|
@ -1823,7 +1823,7 @@ _0800C364:
|
|||
mov r0, r8
|
||||
strh r0, [r1]
|
||||
ldr r0, _0800C3A4
|
||||
bl sub_80AF7C0
|
||||
bl m4aMPlayStop
|
||||
_0800C38C:
|
||||
cmp r4, 0
|
||||
beq _0800C3DE
|
||||
|
|
@ -1854,7 +1854,7 @@ _0800C3A8:
|
|||
mov r2, r8
|
||||
strh r2, [r1]
|
||||
ldr r0, _0800C3F4
|
||||
bl sub_80AF7C0
|
||||
bl m4aMPlayStop
|
||||
_0800C3D6:
|
||||
cmp r4, 0
|
||||
beq _0800C3DE
|
||||
|
|
@ -1924,15 +1924,15 @@ _0800C43E:
|
|||
beq _0800C46C
|
||||
ldr r0, [r6]
|
||||
mov r1, r9
|
||||
bl sub_80AF140
|
||||
bl m4aMPlayFadeOut
|
||||
b _0800C47E
|
||||
.align 2, 0
|
||||
_0800C460: .4byte 0x000003e5
|
||||
_0800C464: .4byte gUnknown_3000FE8
|
||||
_0800C468: .4byte gUnknown_9E8665C
|
||||
_0800C468: .4byte gMPlayTable
|
||||
_0800C46C:
|
||||
ldr r0, [r6]
|
||||
bl sub_80AF7C0
|
||||
bl m4aMPlayStop
|
||||
strh r4, [r5]
|
||||
mov r1, r8
|
||||
strh r1, [r5, 0x2]
|
||||
|
|
@ -1985,14 +1985,14 @@ _0800C496:
|
|||
beq _0800C4EC
|
||||
adds r0, r6, 0
|
||||
mov r1, r9
|
||||
bl sub_80AF140
|
||||
bl m4aMPlayFadeOut
|
||||
b _0800C4FE
|
||||
.align 2, 0
|
||||
_0800C4E4: .4byte gUnknown_3000FD8
|
||||
_0800C4E8: .4byte gUnknown_9E8665C
|
||||
_0800C4E8: .4byte gMPlayTable
|
||||
_0800C4EC:
|
||||
adds r0, r6, 0
|
||||
bl sub_80AF7C0
|
||||
bl m4aMPlayStop
|
||||
movs r0, 0
|
||||
strh r4, [r5]
|
||||
mov r1, r8
|
||||
|
|
@ -2026,7 +2026,7 @@ _0800C508:
|
|||
beq _0800C54C
|
||||
ldr r0, _0800C548
|
||||
mov r1, r9
|
||||
bl sub_80AF140
|
||||
bl m4aMPlayFadeOut
|
||||
b _0800C556
|
||||
.align 2, 0
|
||||
_0800C53C: .4byte 0x000003e6
|
||||
|
|
@ -2035,7 +2035,7 @@ _0800C544: .4byte gUnknown_202D68E
|
|||
_0800C548: .4byte gUnknown_2000970
|
||||
_0800C54C:
|
||||
ldr r0, _0800C560
|
||||
bl sub_80AF7C0
|
||||
bl m4aMPlayStop
|
||||
mov r0, r8
|
||||
strh r0, [r4]
|
||||
_0800C556:
|
||||
|
|
@ -2069,7 +2069,7 @@ _0800C564:
|
|||
beq _0800C5AC
|
||||
ldr r0, _0800C5A8
|
||||
mov r1, r9
|
||||
bl sub_80AF140
|
||||
bl m4aMPlayFadeOut
|
||||
b _0800C5B6
|
||||
.align 2, 0
|
||||
_0800C5A0: .4byte gUnknown_202D690
|
||||
|
|
@ -2077,7 +2077,7 @@ _0800C5A4: .4byte gUnknown_202D68E
|
|||
_0800C5A8: .4byte gUnknown_2000970
|
||||
_0800C5AC:
|
||||
ldr r0, _0800C5CC
|
||||
bl sub_80AF7C0
|
||||
bl m4aMPlayStop
|
||||
mov r1, r8
|
||||
strh r1, [r5]
|
||||
_0800C5B6:
|
||||
|
|
@ -2246,7 +2246,7 @@ _0800C6D8:
|
|||
beq _0800C718
|
||||
ldrh r0, [r2]
|
||||
_0800C6E4:
|
||||
bl sub_80AEFA8
|
||||
bl m4aSongNumStart
|
||||
movs r0, 0x3
|
||||
strh r0, [r4]
|
||||
b _0800C8A2
|
||||
|
|
@ -2297,7 +2297,7 @@ _0800C74C: .4byte gUnknown_202D68E
|
|||
_0800C750: .4byte 0x000003e5
|
||||
_0800C754:
|
||||
ldr r0, _0800C76C
|
||||
bl sub_80AF7C0
|
||||
bl m4aMPlayStop
|
||||
_0800C75A:
|
||||
ldr r1, _0800C770
|
||||
ldrh r0, [r1]
|
||||
|
|
@ -2324,7 +2324,7 @@ _0800C774:
|
|||
cmp r0, 0
|
||||
beq _0800C7A4
|
||||
ldrh r0, [r3]
|
||||
bl sub_80AEFA8
|
||||
bl m4aSongNumStart
|
||||
b _0800C7BE
|
||||
.align 2, 0
|
||||
_0800C794: .4byte gUnknown_202D68A
|
||||
|
|
@ -2334,7 +2334,7 @@ _0800C7A0: .4byte gUnknown_202D694
|
|||
_0800C7A4:
|
||||
ldr r0, _0800C7B0
|
||||
movs r1, 0x4
|
||||
bl sub_80AF170
|
||||
bl m4aMPlayFadeIn
|
||||
b _0800C7BE
|
||||
.align 2, 0
|
||||
_0800C7B0: .4byte gUnknown_20008F0
|
||||
|
|
@ -2342,7 +2342,7 @@ _0800C7B4:
|
|||
ldr r0, _0800C7CC
|
||||
strh r2, [r0]
|
||||
ldr r0, _0800C7D0
|
||||
bl sub_80AF7C0
|
||||
bl m4aMPlayStop
|
||||
_0800C7BE:
|
||||
ldr r1, _0800C7D4
|
||||
movs r0, 0
|
||||
|
|
@ -2402,7 +2402,7 @@ _0800C834: .4byte gUnknown_202D68A
|
|||
_0800C838: .4byte 0x000003e7
|
||||
_0800C83C:
|
||||
ldr r0, _0800C854
|
||||
bl sub_80AF7C0
|
||||
bl m4aMPlayStop
|
||||
_0800C842:
|
||||
ldr r1, _0800C858
|
||||
movs r0, 0
|
||||
|
|
@ -2436,7 +2436,7 @@ _0800C864:
|
|||
ldr r0, _0800C898
|
||||
strh r2, [r0]
|
||||
adds r0, r1, 0
|
||||
bl sub_80AEFA8
|
||||
bl m4aSongNumStart
|
||||
strh r4, [r6]
|
||||
b _0800C8A2
|
||||
.align 2, 0
|
||||
|
|
@ -2503,10 +2503,10 @@ _0800C8F0:
|
|||
ldr r0, [r0]
|
||||
ldrh r2, [r4, 0x4]
|
||||
movs r1, 0xFF
|
||||
bl sub_80AFF50
|
||||
bl m4aMPlayVolumeControl
|
||||
b _0800C926
|
||||
.align 2, 0
|
||||
_0800C918: .4byte gUnknown_9E8665C
|
||||
_0800C918: .4byte gMPlayTable
|
||||
_0800C91C:
|
||||
strh r0, [r4]
|
||||
mov r1, r8
|
||||
|
|
@ -2579,8 +2579,8 @@ _0800C9A8:
|
|||
strh r0, [r4]
|
||||
_0800C9AC:
|
||||
ldr r0, _0800C9C8
|
||||
bl sub_80AF7C0
|
||||
bl sub_80AF5AC
|
||||
bl m4aMPlayStop
|
||||
bl m4aSoundVSyncOff
|
||||
cmp r5, 0
|
||||
beq _0800C9BE
|
||||
bl sub_800B5F0
|
||||
|
|
@ -2599,7 +2599,7 @@ sub_800C9CC:
|
|||
bl sub_800B620
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_80AF628
|
||||
bl m4aSoundVSyncOn
|
||||
ldr r0, _0800CA08
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
|
|
@ -2620,7 +2620,7 @@ sub_800C9CC:
|
|||
cmp r0, 0
|
||||
beq _0800CA1C
|
||||
ldrh r0, [r2]
|
||||
bl sub_80AEFA8
|
||||
bl m4aSongNumStart
|
||||
b _0800CA22
|
||||
.align 2, 0
|
||||
_0800CA08: .4byte gUnknown_202D690
|
||||
|
|
@ -2630,7 +2630,7 @@ _0800CA14: .4byte gUnknown_202D688
|
|||
_0800CA18: .4byte gUnknown_202D694
|
||||
_0800CA1C:
|
||||
ldr r0, _0800CA30
|
||||
bl sub_80AF108
|
||||
bl m4aMPlayContinue
|
||||
_0800CA22:
|
||||
cmp r4, 0
|
||||
beq _0800CA2A
|
||||
|
|
@ -2762,7 +2762,7 @@ sub_800CAE0:
|
|||
ldrh r0, [r0, 0x4]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_0800CAEC: .4byte gUnknown_9E866BC
|
||||
_0800CAEC: .4byte gSongTable
|
||||
thumb_func_end sub_800CAE0
|
||||
|
||||
thumb_func_start sub_800CAF0
|
||||
|
|
@ -2782,7 +2782,7 @@ sub_800CAF0:
|
|||
movs r0, 0x1
|
||||
b _0800CB12
|
||||
.align 2, 0
|
||||
_0800CB0C: .4byte gUnknown_9E8665C
|
||||
_0800CB0C: .4byte gMPlayTable
|
||||
_0800CB10:
|
||||
movs r0, 0
|
||||
_0800CB12:
|
||||
|
|
|
|||
|
|
@ -7661,7 +7661,7 @@ sub_8010960:
|
|||
bl xxx_call_update_bg_sound_input
|
||||
bl sub_8011860
|
||||
movs r0, 0
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
|
@ -9290,7 +9290,7 @@ sub_801169C:
|
|||
bl xxx_call_update_bg_sound_input
|
||||
bl sub_8011860
|
||||
movs r0, 0
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
add sp, 0x8
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ sub_8012A18:
|
|||
bl sub_8009908
|
||||
bl xxx_call_update_bg_sound_input
|
||||
movs r0, 0
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
|
|
@ -17484,7 +17484,7 @@ sub_801B3C0:
|
|||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
movs r0, 0x1
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
ldr r4, _0801B40C
|
||||
movs r0, 0x94
|
||||
movs r1, 0x8
|
||||
|
|
@ -19806,7 +19806,7 @@ sub_801C620:
|
|||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
movs r0, 0x1
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
ldr r5, _0801C670
|
||||
movs r0, 0x94
|
||||
movs r1, 0x8
|
||||
|
|
@ -26163,7 +26163,7 @@ sub_801F808:
|
|||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
movs r0, 0x1
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
ldr r5, _0801F88C
|
||||
movs r0, 0xD4
|
||||
movs r1, 0x8
|
||||
|
|
@ -41273,7 +41273,7 @@ _0802706E:
|
|||
sub_8027074:
|
||||
push {r4,lr}
|
||||
movs r0, 0
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
ldr r4, _080270A0
|
||||
movs r0, 0xF0
|
||||
lsls r0, 1
|
||||
|
|
@ -73146,7 +73146,7 @@ sub_8036FDC:
|
|||
movs r2, 0x1
|
||||
bl sub_800641C
|
||||
movs r0, 0
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
ldr r5, _080370C0
|
||||
ldr r0, [r5]
|
||||
cmp r0, 0
|
||||
|
|
@ -73610,7 +73610,7 @@ sub_80373C4:
|
|||
bl sub_8009908
|
||||
bl xxx_call_update_bg_sound_input
|
||||
movs r0, 0
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80373C4
|
||||
|
|
@ -76245,7 +76245,7 @@ sub_8038830:
|
|||
add r0, r12
|
||||
str r5, [r0]
|
||||
movs r0, 0
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
|
@ -86815,7 +86815,7 @@ _0803DB88: .4byte gUnknown_83B0000
|
|||
_0803DB8C: .4byte gDungeonNameBannerPalette
|
||||
_0803DB90: .4byte gUnknown_80F6100
|
||||
_0803DB94: .4byte gDungeonNameBannerFontFile
|
||||
_0803DB98: .4byte gDungeonNameBannerFontFile + 4
|
||||
_0803DB98: .4byte gDungeonNameBannerFont
|
||||
_0803DB9C: .4byte 0x06000140
|
||||
_0803DBA0: .4byte gUnknown_203B418
|
||||
_0803DBA4: .4byte 0x00000645
|
||||
|
|
@ -87287,7 +87287,7 @@ _0803DF08:
|
|||
adds r0, r2, r0
|
||||
b _0803DF3A
|
||||
.align 2, 0
|
||||
_0803DF1C: .4byte gDungeonNameBannerFontFile + 4
|
||||
_0803DF1C: .4byte gDungeonNameBannerFont
|
||||
_0803DF20:
|
||||
lsls r0, r1, 3
|
||||
adds r0, r5
|
||||
|
|
@ -88114,7 +88114,7 @@ _0803E5A2:
|
|||
bl sub_8011860
|
||||
bl sub_8040B60
|
||||
movs r0, 0
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
movs r0, 0
|
||||
bl nullsub_10
|
||||
ldr r1, _0803E664
|
||||
|
|
@ -88186,7 +88186,7 @@ sub_803E668:
|
|||
strb r1, [r0]
|
||||
bl sub_8011860
|
||||
movs r0, 0
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
movs r0, 0
|
||||
bl nullsub_10
|
||||
ldr r0, [r4]
|
||||
|
|
@ -273046,7 +273046,7 @@ _080995AE:
|
|||
_08099604:
|
||||
bl xxx_call_update_bg_sound_input
|
||||
movs r0, 0
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
mov r2, r9
|
||||
cmp r2, 0
|
||||
beq _08099524
|
||||
|
|
@ -299178,7 +299178,7 @@ _080A6434:
|
|||
_080A6444:
|
||||
strh r0, [r5, 0xA]
|
||||
movs r0, 0x1
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
movs r0, 0x1
|
||||
bl nullsub_10
|
||||
pop {r3,r4}
|
||||
|
|
@ -299342,7 +299342,7 @@ sub_80A658C:
|
|||
push {r4,lr}
|
||||
bl sub_800DB7C
|
||||
movs r0, 0
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
movs r0, 0
|
||||
bl nullsub_10
|
||||
bl sub_8005180
|
||||
|
|
@ -300572,7 +300572,7 @@ _080A6E56:
|
|||
sub_80A6E68:
|
||||
push {lr}
|
||||
movs r0, 0
|
||||
bl sub_8004D8C
|
||||
bl ResetSprites
|
||||
movs r0, 0
|
||||
bl nullsub_10
|
||||
bl sub_800E970
|
||||
|
|
|
|||
1647
asm/m4a_1.s
Normal file
1647
asm/m4a_1.s
Normal file
File diff suppressed because it is too large
Load Diff
70
asm/m4a_2.s
Normal file
70
asm/m4a_2.s
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/gba_constants.inc"
|
||||
.include "constants/m4a_constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start CgbModVol
|
||||
CgbModVol:
|
||||
push {r4,lr}
|
||||
adds r1, r0, 0
|
||||
ldrb r0, [r1, 0x2]
|
||||
lsls r2, r0, 24
|
||||
lsrs r4, r2, 24
|
||||
ldrb r3, [r1, 0x3]
|
||||
lsls r0, r3, 24
|
||||
lsrs r3, r0, 24
|
||||
cmp r4, r3
|
||||
bcc _080AFA94
|
||||
lsrs r0, r2, 25
|
||||
cmp r0, r3
|
||||
bcc _080AFAA0
|
||||
movs r0, 0xF
|
||||
strb r0, [r1, 0x1B]
|
||||
b _080AFAAE
|
||||
_080AFA94:
|
||||
lsrs r0, 25
|
||||
cmp r0, r4
|
||||
bcc _080AFAA0
|
||||
movs r0, 0xF0
|
||||
strb r0, [r1, 0x1B]
|
||||
b _080AFAAE
|
||||
_080AFAA0:
|
||||
movs r0, 0xFF
|
||||
strb r0, [r1, 0x1B]
|
||||
ldrb r2, [r1, 0x3]
|
||||
ldrb r3, [r1, 0x2]
|
||||
adds r0, r2, r3
|
||||
lsrs r0, 4
|
||||
b _080AFABE
|
||||
_080AFAAE:
|
||||
ldrb r2, [r1, 0x3]
|
||||
ldrb r3, [r1, 0x2]
|
||||
adds r0, r2, r3
|
||||
lsrs r0, 4
|
||||
strb r0, [r1, 0xA]
|
||||
cmp r0, 0xF
|
||||
bls _080AFAC0
|
||||
movs r0, 0xF
|
||||
_080AFABE:
|
||||
strb r0, [r1, 0xA]
|
||||
_080AFAC0:
|
||||
ldrb r2, [r1, 0x6]
|
||||
ldrb r3, [r1, 0xA]
|
||||
adds r0, r2, 0
|
||||
muls r0, r3
|
||||
adds r0, 0xF
|
||||
asrs r0, 4
|
||||
strb r0, [r1, 0x19]
|
||||
ldrb r0, [r1, 0x1C]
|
||||
ldrb r2, [r1, 0x1B]
|
||||
ands r0, r2
|
||||
strb r0, [r1, 0x1B]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end CgbModVol
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
574
asm/m4a_3.s
Normal file
574
asm/m4a_3.s
Normal file
|
|
@ -0,0 +1,574 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/gba_constants.inc"
|
||||
.include "constants/m4a_constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start CgbSound
|
||||
CgbSound:
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
mov r5, r8
|
||||
push {r5-r7}
|
||||
sub sp, 0x1C
|
||||
ldr r0, =SOUND_INFO_PTR
|
||||
ldr r0, [r0]
|
||||
str r0, [sp, 0x4]
|
||||
ldrb r0, [r0, 0xA]
|
||||
cmp r0, 0
|
||||
beq _080AFB00
|
||||
subs r0, 0x1
|
||||
ldr r1, [sp, 0x4]
|
||||
strb r0, [r1, 0xA]
|
||||
b _080AFB06
|
||||
.pool
|
||||
_080AFB00:
|
||||
movs r0, 0xE
|
||||
ldr r2, [sp, 0x4]
|
||||
strb r0, [r2, 0xA]
|
||||
_080AFB06:
|
||||
movs r6, 0x1
|
||||
ldr r0, [sp, 0x4]
|
||||
ldr r4, [r0, 0x1C]
|
||||
_080AFB0C:
|
||||
ldrb r1, [r4]
|
||||
movs r0, 0xC7
|
||||
ands r0, r1
|
||||
adds r2, r6, 0x1
|
||||
mov r10, r2
|
||||
movs r2, 0x40
|
||||
adds r2, r4
|
||||
mov r9, r2
|
||||
cmp r0, 0
|
||||
bne _080AFB22
|
||||
b _080AFF0C
|
||||
_080AFB22:
|
||||
cmp r6, 0x2
|
||||
beq _080AFB54
|
||||
cmp r6, 0x2
|
||||
bgt _080AFB30
|
||||
cmp r6, 0x1
|
||||
beq _080AFB36
|
||||
b _080AFB8C
|
||||
_080AFB30:
|
||||
cmp r6, 0x3
|
||||
beq _080AFB6C
|
||||
b _080AFB8C
|
||||
_080AFB36:
|
||||
ldr r0, =REG_NR10
|
||||
str r0, [sp, 0x8]
|
||||
ldr r7, =REG_NR11
|
||||
ldr r2, =REG_NR12
|
||||
str r2, [sp, 0xC]
|
||||
adds r0, 0x4
|
||||
str r0, [sp, 0x10]
|
||||
adds r2, 0x2
|
||||
b _080AFB9C
|
||||
.pool
|
||||
_080AFB54:
|
||||
ldr r0, =REG_NR10 + 1
|
||||
str r0, [sp, 0x8]
|
||||
ldr r7, =REG_NR21
|
||||
ldr r2, =REG_NR22
|
||||
b _080AFB94
|
||||
.pool
|
||||
_080AFB6C:
|
||||
ldr r0, =REG_NR30
|
||||
str r0, [sp, 0x8]
|
||||
ldr r7, =REG_NR31
|
||||
ldr r2, =REG_NR32
|
||||
str r2, [sp, 0xC]
|
||||
adds r0, 0x4
|
||||
str r0, [sp, 0x10]
|
||||
adds r2, 0x2
|
||||
b _080AFB9C
|
||||
.pool
|
||||
_080AFB8C:
|
||||
ldr r0, =REG_NR30 + 1
|
||||
str r0, [sp, 0x8]
|
||||
ldr r7, =REG_NR41
|
||||
ldr r2, =REG_NR42
|
||||
_080AFB94:
|
||||
str r2, [sp, 0xC]
|
||||
adds r0, 0xB
|
||||
str r0, [sp, 0x10]
|
||||
adds r2, 0x4
|
||||
_080AFB9C:
|
||||
str r2, [sp, 0x14]
|
||||
ldr r0, [sp, 0x4]
|
||||
ldrb r0, [r0, 0xA]
|
||||
str r0, [sp]
|
||||
ldr r2, [sp, 0xC]
|
||||
ldrb r0, [r2]
|
||||
mov r8, r0
|
||||
adds r2, r1, 0
|
||||
movs r0, 0x80
|
||||
ands r0, r2
|
||||
cmp r0, 0
|
||||
beq _080AFC92
|
||||
movs r3, 0x40
|
||||
adds r0, r3, 0
|
||||
ands r0, r2
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
adds r0, r6, 0x1
|
||||
mov r10, r0
|
||||
movs r1, 0x40
|
||||
adds r1, r4
|
||||
mov r9, r1
|
||||
cmp r5, 0
|
||||
bne _080AFCB6
|
||||
movs r0, 0x3
|
||||
strb r0, [r4]
|
||||
strb r0, [r4, 0x1D]
|
||||
adds r0, r4, 0
|
||||
str r3, [sp, 0x18]
|
||||
bl CgbModVol
|
||||
ldr r3, [sp, 0x18]
|
||||
cmp r6, 0x2
|
||||
beq _080AFC04
|
||||
cmp r6, 0x2
|
||||
bgt _080AFBF8
|
||||
cmp r6, 0x1
|
||||
beq _080AFBFE
|
||||
b _080AFC58
|
||||
.pool
|
||||
_080AFBF8:
|
||||
cmp r6, 0x3
|
||||
beq _080AFC10
|
||||
b _080AFC58
|
||||
_080AFBFE:
|
||||
ldrb r0, [r4, 0x1F]
|
||||
ldr r2, [sp, 0x8]
|
||||
strb r0, [r2]
|
||||
_080AFC04:
|
||||
ldr r0, [r4, 0x24]
|
||||
lsls r0, 6
|
||||
ldrb r1, [r4, 0x1E]
|
||||
adds r0, r1, r0
|
||||
strb r0, [r7]
|
||||
b _080AFC64
|
||||
_080AFC10:
|
||||
ldr r1, [r4, 0x24]
|
||||
ldr r0, [r4, 0x28]
|
||||
cmp r1, r0
|
||||
beq _080AFC38
|
||||
ldr r2, [sp, 0x8]
|
||||
strb r3, [r2]
|
||||
ldr r1, =REG_WAVE_RAM
|
||||
ldr r2, [r4, 0x24]
|
||||
ldr r0, [r2]
|
||||
str r0, [r1]
|
||||
adds r1, 0x4
|
||||
ldr r0, [r2, 0x4]
|
||||
str r0, [r1]
|
||||
adds r1, 0x4
|
||||
ldr r0, [r2, 0x8]
|
||||
str r0, [r1]
|
||||
adds r1, 0x4
|
||||
ldr r0, [r2, 0xC]
|
||||
str r0, [r1]
|
||||
str r2, [r4, 0x28]
|
||||
_080AFC38:
|
||||
ldr r0, [sp, 0x8]
|
||||
strb r5, [r0]
|
||||
ldrb r0, [r4, 0x1E]
|
||||
strb r0, [r7]
|
||||
ldrb r0, [r4, 0x1E]
|
||||
cmp r0, 0
|
||||
beq _080AFC50
|
||||
movs r0, 0xC0
|
||||
b _080AFC72
|
||||
.pool
|
||||
_080AFC50:
|
||||
movs r1, 0x80
|
||||
negs r1, r1
|
||||
strb r1, [r4, 0x1A]
|
||||
b _080AFC74
|
||||
_080AFC58:
|
||||
ldrb r0, [r4, 0x1E]
|
||||
strb r0, [r7]
|
||||
ldr r0, [r4, 0x24]
|
||||
lsls r0, 3
|
||||
ldr r2, [sp, 0x10]
|
||||
strb r0, [r2]
|
||||
_080AFC64:
|
||||
ldrb r0, [r4, 0x4]
|
||||
adds r0, 0x8
|
||||
mov r8, r0
|
||||
ldrb r0, [r4, 0x1E]
|
||||
cmp r0, 0
|
||||
beq _080AFC72
|
||||
movs r0, 0x40
|
||||
_080AFC72:
|
||||
strb r0, [r4, 0x1A]
|
||||
_080AFC74:
|
||||
ldrb r1, [r4, 0x4]
|
||||
movs r2, 0
|
||||
strb r1, [r4, 0xB]
|
||||
movs r0, 0xFF
|
||||
ands r0, r1
|
||||
adds r1, r6, 0x1
|
||||
mov r10, r1
|
||||
movs r1, 0x40
|
||||
adds r1, r4
|
||||
mov r9, r1
|
||||
cmp r0, 0
|
||||
bne _080AFC8E
|
||||
b _080AFDCA
|
||||
_080AFC8E:
|
||||
strb r2, [r4, 0x9]
|
||||
b _080AFDF8
|
||||
_080AFC92:
|
||||
movs r0, 0x4
|
||||
ands r0, r2
|
||||
cmp r0, 0
|
||||
beq _080AFCC4
|
||||
ldrb r0, [r4, 0xD]
|
||||
subs r0, 0x1
|
||||
strb r0, [r4, 0xD]
|
||||
movs r2, 0xFF
|
||||
ands r0, r2
|
||||
lsls r0, 24
|
||||
adds r1, r6, 0x1
|
||||
mov r10, r1
|
||||
movs r2, 0x40
|
||||
adds r2, r4
|
||||
mov r9, r2
|
||||
cmp r0, 0
|
||||
ble _080AFCB6
|
||||
b _080AFE0A
|
||||
_080AFCB6:
|
||||
lsls r0, r6, 24
|
||||
lsrs r0, 24
|
||||
bl CgbOscOff
|
||||
movs r0, 0
|
||||
strb r0, [r4]
|
||||
b _080AFF08
|
||||
_080AFCC4:
|
||||
movs r0, 0x40
|
||||
ands r0, r1
|
||||
adds r2, r6, 0x1
|
||||
mov r10, r2
|
||||
movs r2, 0x40
|
||||
adds r2, r4
|
||||
mov r9, r2
|
||||
cmp r0, 0
|
||||
beq _080AFD04
|
||||
movs r0, 0x3
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _080AFD04
|
||||
movs r0, 0xFC
|
||||
ands r0, r1
|
||||
movs r2, 0
|
||||
strb r0, [r4]
|
||||
ldrb r1, [r4, 0x7]
|
||||
strb r1, [r4, 0xB]
|
||||
movs r0, 0xFF
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _080AFD36
|
||||
movs r0, 0x1
|
||||
ldrb r1, [r4, 0x1D]
|
||||
orrs r0, r1
|
||||
strb r0, [r4, 0x1D]
|
||||
cmp r6, 0x3
|
||||
beq _080AFDF8
|
||||
ldrb r2, [r4, 0x7]
|
||||
mov r8, r2
|
||||
b _080AFDF8
|
||||
_080AFD04:
|
||||
ldrb r0, [r4, 0xB]
|
||||
cmp r0, 0
|
||||
bne _080AFDF8
|
||||
cmp r6, 0x3
|
||||
bne _080AFD16
|
||||
movs r0, 0x1
|
||||
ldrb r1, [r4, 0x1D]
|
||||
orrs r0, r1
|
||||
strb r0, [r4, 0x1D]
|
||||
_080AFD16:
|
||||
adds r0, r4, 0
|
||||
bl CgbModVol
|
||||
movs r0, 0x3
|
||||
ldrb r2, [r4]
|
||||
ands r0, r2
|
||||
cmp r0, 0
|
||||
bne _080AFD6A
|
||||
ldrb r0, [r4, 0x9]
|
||||
subs r0, 0x1
|
||||
strb r0, [r4, 0x9]
|
||||
movs r1, 0xFF
|
||||
ands r0, r1
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bgt _080AFD66
|
||||
_080AFD36:
|
||||
ldrb r2, [r4, 0xC]
|
||||
ldrb r1, [r4, 0xA]
|
||||
adds r0, r2, 0
|
||||
muls r0, r1
|
||||
adds r0, 0xFF
|
||||
asrs r0, 8
|
||||
movs r1, 0
|
||||
strb r0, [r4, 0x9]
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080AFCB6
|
||||
movs r0, 0x4
|
||||
ldrb r2, [r4]
|
||||
orrs r0, r2
|
||||
strb r0, [r4]
|
||||
movs r0, 0x1
|
||||
ldrb r1, [r4, 0x1D]
|
||||
orrs r0, r1
|
||||
strb r0, [r4, 0x1D]
|
||||
cmp r6, 0x3
|
||||
beq _080AFE0A
|
||||
movs r2, 0x8
|
||||
mov r8, r2
|
||||
b _080AFE0A
|
||||
_080AFD66:
|
||||
ldrb r0, [r4, 0x7]
|
||||
b _080AFDF6
|
||||
_080AFD6A:
|
||||
cmp r0, 0x1
|
||||
bne _080AFD76
|
||||
_080AFD6E:
|
||||
ldrb r0, [r4, 0x19]
|
||||
strb r0, [r4, 0x9]
|
||||
movs r0, 0x7
|
||||
b _080AFDF6
|
||||
_080AFD76:
|
||||
cmp r0, 0x2
|
||||
bne _080AFDBA
|
||||
ldrb r0, [r4, 0x9]
|
||||
subs r0, 0x1
|
||||
strb r0, [r4, 0x9]
|
||||
movs r1, 0xFF
|
||||
ands r0, r1
|
||||
lsls r0, 24
|
||||
ldrb r2, [r4, 0x19]
|
||||
lsls r1, r2, 24
|
||||
cmp r0, r1
|
||||
bgt _080AFDB6
|
||||
_080AFD8E:
|
||||
ldrb r0, [r4, 0x6]
|
||||
cmp r0, 0
|
||||
bne _080AFD9E
|
||||
movs r0, 0xFC
|
||||
ldrb r1, [r4]
|
||||
ands r0, r1
|
||||
strb r0, [r4]
|
||||
b _080AFD36
|
||||
_080AFD9E:
|
||||
ldrb r0, [r4]
|
||||
subs r0, 0x1
|
||||
strb r0, [r4]
|
||||
movs r0, 0x1
|
||||
ldrb r2, [r4, 0x1D]
|
||||
orrs r0, r2
|
||||
strb r0, [r4, 0x1D]
|
||||
cmp r6, 0x3
|
||||
beq _080AFD6E
|
||||
movs r0, 0x8
|
||||
mov r8, r0
|
||||
b _080AFD6E
|
||||
_080AFDB6:
|
||||
ldrb r0, [r4, 0x5]
|
||||
b _080AFDF6
|
||||
_080AFDBA:
|
||||
ldrb r0, [r4, 0x9]
|
||||
adds r0, 0x1
|
||||
strb r0, [r4, 0x9]
|
||||
movs r1, 0xFF
|
||||
ands r0, r1
|
||||
ldrb r2, [r4, 0xA]
|
||||
cmp r0, r2
|
||||
bcc _080AFDF4
|
||||
_080AFDCA:
|
||||
ldrb r0, [r4]
|
||||
subs r0, 0x1
|
||||
movs r2, 0
|
||||
strb r0, [r4]
|
||||
ldrb r1, [r4, 0x5]
|
||||
strb r1, [r4, 0xB]
|
||||
movs r0, 0xFF
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _080AFD8E
|
||||
movs r0, 0x1
|
||||
ldrb r1, [r4, 0x1D]
|
||||
orrs r0, r1
|
||||
strb r0, [r4, 0x1D]
|
||||
ldrb r0, [r4, 0xA]
|
||||
strb r0, [r4, 0x9]
|
||||
cmp r6, 0x3
|
||||
beq _080AFDF8
|
||||
ldrb r2, [r4, 0x5]
|
||||
mov r8, r2
|
||||
b _080AFDF8
|
||||
_080AFDF4:
|
||||
ldrb r0, [r4, 0x4]
|
||||
_080AFDF6:
|
||||
strb r0, [r4, 0xB]
|
||||
_080AFDF8:
|
||||
ldrb r0, [r4, 0xB]
|
||||
subs r0, 0x1
|
||||
strb r0, [r4, 0xB]
|
||||
ldr r0, [sp]
|
||||
cmp r0, 0
|
||||
bne _080AFE0A
|
||||
subs r0, 0x1
|
||||
str r0, [sp]
|
||||
b _080AFD04
|
||||
_080AFE0A:
|
||||
movs r0, 0x2
|
||||
ldrb r1, [r4, 0x1D]
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _080AFE82
|
||||
cmp r6, 0x3
|
||||
bgt _080AFE4A
|
||||
movs r0, 0x8
|
||||
ldrb r2, [r4, 0x1]
|
||||
ands r0, r2
|
||||
cmp r0, 0
|
||||
beq _080AFE4A
|
||||
ldr r0, =REG_SOUNDBIAS + 1
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0x3F
|
||||
bgt _080AFE3C
|
||||
ldr r0, [r4, 0x20]
|
||||
adds r0, 0x2
|
||||
ldr r1, =0x000007fc
|
||||
b _080AFE46
|
||||
.pool
|
||||
_080AFE3C:
|
||||
cmp r0, 0x7F
|
||||
bgt _080AFE4A
|
||||
ldr r0, [r4, 0x20]
|
||||
adds r0, 0x1
|
||||
ldr r1, =0x000007fe
|
||||
_080AFE46:
|
||||
ands r0, r1
|
||||
str r0, [r4, 0x20]
|
||||
_080AFE4A:
|
||||
cmp r6, 0x4
|
||||
beq _080AFE5C
|
||||
ldr r0, [r4, 0x20]
|
||||
ldr r1, [sp, 0x10]
|
||||
strb r0, [r1]
|
||||
b _080AFE6A
|
||||
.pool
|
||||
_080AFE5C:
|
||||
ldr r2, [sp, 0x10]
|
||||
ldrb r0, [r2]
|
||||
movs r1, 0x8
|
||||
ands r1, r0
|
||||
ldr r0, [r4, 0x20]
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
_080AFE6A:
|
||||
movs r0, 0xC0
|
||||
ldrb r1, [r4, 0x1A]
|
||||
ands r0, r1
|
||||
adds r1, r4, 0
|
||||
adds r1, 0x21
|
||||
ldrb r1, [r1]
|
||||
adds r0, r1, r0
|
||||
strb r0, [r4, 0x1A]
|
||||
movs r2, 0xFF
|
||||
ands r0, r2
|
||||
ldr r1, [sp, 0x14]
|
||||
strb r0, [r1]
|
||||
_080AFE82:
|
||||
movs r0, 0x1
|
||||
ldrb r2, [r4, 0x1D]
|
||||
ands r0, r2
|
||||
cmp r0, 0
|
||||
beq _080AFF08
|
||||
ldr r1, =REG_NR51
|
||||
ldrb r0, [r1]
|
||||
ldrb r2, [r4, 0x1C]
|
||||
bics r0, r2
|
||||
ldrb r2, [r4, 0x1B]
|
||||
orrs r0, r2
|
||||
strb r0, [r1]
|
||||
cmp r6, 0x3
|
||||
bne _080AFED4
|
||||
ldr r0, =gCgb3Vol
|
||||
ldrb r1, [r4, 0x9]
|
||||
adds r0, r1, r0
|
||||
ldrb r0, [r0]
|
||||
ldr r2, [sp, 0xC]
|
||||
strb r0, [r2]
|
||||
movs r1, 0x80
|
||||
adds r0, r1, 0
|
||||
ldrb r2, [r4, 0x1A]
|
||||
ands r0, r2
|
||||
cmp r0, 0
|
||||
beq _080AFF08
|
||||
ldr r0, [sp, 0x8]
|
||||
strb r1, [r0]
|
||||
ldrb r0, [r4, 0x1A]
|
||||
ldr r1, [sp, 0x14]
|
||||
strb r0, [r1]
|
||||
movs r0, 0x7F
|
||||
ldrb r2, [r4, 0x1A]
|
||||
ands r0, r2
|
||||
strb r0, [r4, 0x1A]
|
||||
b _080AFF08
|
||||
.pool
|
||||
_080AFED4:
|
||||
movs r0, 0xF
|
||||
mov r1, r8
|
||||
ands r1, r0
|
||||
mov r8, r1
|
||||
ldrb r2, [r4, 0x9]
|
||||
lsls r0, r2, 4
|
||||
add r0, r8
|
||||
ldr r1, [sp, 0xC]
|
||||
strb r0, [r1]
|
||||
movs r2, 0x80
|
||||
ldrb r0, [r4, 0x1A]
|
||||
orrs r0, r2
|
||||
ldr r1, [sp, 0x14]
|
||||
strb r0, [r1]
|
||||
cmp r6, 0x1
|
||||
bne _080AFF08
|
||||
ldr r0, [sp, 0x8]
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x8
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _080AFF08
|
||||
ldrb r0, [r4, 0x1A]
|
||||
orrs r0, r2
|
||||
ldr r1, [sp, 0x14]
|
||||
strb r0, [r1]
|
||||
_080AFF08:
|
||||
movs r0, 0
|
||||
strb r0, [r4, 0x1D]
|
||||
_080AFF0C:
|
||||
mov r6, r10
|
||||
mov r4, r9
|
||||
cmp r6, 0x4
|
||||
bgt _080AFF16
|
||||
b _080AFB0C
|
||||
_080AFF16:
|
||||
add sp, 0x1C
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
mov r10, r5
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end CgbSound
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
22
asm/sprite.s
22
asm/sprite.s
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_8004D8C
|
||||
sub_8004D8C:
|
||||
thumb_func_start ResetSprites
|
||||
ResetSprites:
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
|
|
@ -120,8 +120,8 @@ _08004E50:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08004E68: .4byte gUnknown_20266A8
|
||||
_08004E6C: .4byte gUnknown_2026E30
|
||||
_08004E68: .4byte gSpriteCount
|
||||
_08004E6C: .4byte gCharMemCursor
|
||||
_08004E70: .4byte 0x06010000
|
||||
_08004E74: .4byte gUnknown_203B074
|
||||
_08004E78: .4byte gUnknown_20266B0
|
||||
|
|
@ -129,7 +129,7 @@ _08004E7C: .4byte gUnknown_20256A0
|
|||
_08004E80: .4byte gUnknown_20262A8
|
||||
_08004E84: .4byte gUnknown_2025EA8
|
||||
_08004E88: .4byte 0x00000804
|
||||
thumb_func_end sub_8004D8C
|
||||
thumb_func_end ResetSprites
|
||||
|
||||
thumb_func_start sub_8004E8C
|
||||
sub_8004E8C:
|
||||
|
|
@ -230,7 +230,7 @@ _08004F20:
|
|||
strh r0, [r1, 0x2]
|
||||
b _08004F86
|
||||
.align 2, 0
|
||||
_08004F40: .4byte gUnknown_20266A8
|
||||
_08004F40: .4byte gSpriteCount
|
||||
_08004F44: .4byte 0x0000fcff
|
||||
_08004F48: .4byte 0x0000f1ff
|
||||
_08004F4C: .4byte 0x000003ff
|
||||
|
|
@ -448,7 +448,7 @@ _080050D8:
|
|||
strh r0, [r2, 0x2]
|
||||
b _08005128
|
||||
.align 2, 0
|
||||
_080050F4: .4byte gUnknown_20266A8
|
||||
_080050F4: .4byte gSpriteCount
|
||||
_080050F8: .4byte gUnknown_20262A8
|
||||
_080050FC:
|
||||
ldrh r1, [r6]
|
||||
|
|
@ -513,7 +513,7 @@ _08005168:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_08005174: .4byte gUnknown_2025EA8
|
||||
_08005178: .4byte gUnknown_20266A8
|
||||
_08005178: .4byte gSpriteCount
|
||||
_0800517C: .4byte gUnknown_20256A0
|
||||
thumb_func_end AddSprite
|
||||
|
||||
|
|
@ -728,8 +728,8 @@ _080052F2:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080052F8: .4byte gUnknown_203B074
|
||||
_080052FC: .4byte gUnknown_2026E30
|
||||
_08005300: .4byte gUnknown_2026E30
|
||||
_080052FC: .4byte gCharMemCursor
|
||||
_08005300: .4byte gCharMemCursor
|
||||
thumb_func_end sub_80052BC
|
||||
|
||||
thumb_func_start sub_8005304
|
||||
|
|
@ -790,7 +790,7 @@ sub_800533C:
|
|||
str r0, [r1]
|
||||
b _0800538E
|
||||
.align 2, 0
|
||||
_08005368: .4byte gUnknown_2026E30
|
||||
_08005368: .4byte gCharMemCursor
|
||||
_0800536C: .4byte 0x06010000
|
||||
_08005370:
|
||||
cmp r6, 0
|
||||
|
|
|
|||
|
|
@ -11966,42 +11966,3 @@ gUnknown_812F1F8: @ 812F1F8
|
|||
gUnknown_813237C: @ 813237C
|
||||
.incbin "baserom.gba", 0x13237C, 0x13D610
|
||||
|
||||
.global gUnknown_826F98C
|
||||
gUnknown_826F98C: @ 826F98C
|
||||
.incbin "baserom.gba", 0x26F98C, 0x90
|
||||
|
||||
.global gUnknown_826FA1C
|
||||
gUnknown_826FA1C: @ 826FA1C
|
||||
.incbin "baserom.gba", 0x26FA1C, 0xB4
|
||||
|
||||
.global gUnknown_826FAD0
|
||||
gUnknown_826FAD0: @ 826FAD0
|
||||
.incbin "baserom.gba", 0x26FAD0, 0x30
|
||||
|
||||
.global gUnknown_826FB00
|
||||
gUnknown_826FB00: @ 826FB00
|
||||
.incbin "baserom.gba", 0x26FB00, 0x18
|
||||
|
||||
.global gUnknown_826FB18
|
||||
gUnknown_826FB18: @ 826FB18
|
||||
.incbin "baserom.gba", 0x26FB18, 0x84
|
||||
|
||||
.global gUnknown_826FB9C
|
||||
gUnknown_826FB9C: @ 826FB9C
|
||||
.incbin "baserom.gba", 0x26FB9C, 0x18
|
||||
|
||||
.global gUnknown_826FBB4
|
||||
gUnknown_826FBB4: @ 826FBB4
|
||||
.incbin "baserom.gba", 0x26FBB4, 0x3C
|
||||
|
||||
.global gUnknown_826FBF0
|
||||
gUnknown_826FBF0: @ 826FBF0
|
||||
.incbin "baserom.gba", 0x26FBF0, 0x10
|
||||
|
||||
.global gUnknown_826FC00
|
||||
gUnknown_826FC00: @ 826FC00
|
||||
.incbin "baserom.gba", 0x26FC00, 0x34
|
||||
|
||||
.global gUnknown_826FC34
|
||||
gUnknown_826FC34: @ 826FC34
|
||||
.incbin "baserom.gba", 0x26FC34, 0x30
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
.section .rodata
|
||||
|
||||
.global gUnknown_9E8665C
|
||||
gUnknown_9E8665C: @ 9E8665C
|
||||
.global gMPlayTable
|
||||
gMPlayTable: @ 9E8665C
|
||||
.incbin "baserom.gba", 0x1E8665C, 0x60
|
||||
|
||||
.global gUnknown_9E866BC
|
||||
gUnknown_9E866BC: @ 9E866BC
|
||||
.global gSongTable
|
||||
gSongTable: @ 9E866BC
|
||||
.incbin "baserom.gba", 0x1E866BC
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ struct HeapFreeListElement
|
|||
struct HeapDescriptor
|
||||
{
|
||||
u32 unk0;
|
||||
u32 unk4;
|
||||
struct HeapDescriptor *parentHeap;
|
||||
struct HeapFreeListElement *freeList;
|
||||
s32 freeCount;
|
||||
u32 freeListLength;
|
||||
|
|
@ -51,6 +51,6 @@ void MemoryCopy32(u32 *dest, u32 *src, s32 size);
|
|||
|
||||
void InitHeapInternal(void);
|
||||
void DoInitHeap(struct HeapDescriptor *, struct HeapSettings *, struct HeapFreeListElement *, u32);
|
||||
void InitSubHeap(struct HeapDescriptor *, struct HeapFreeListElement *, u32);
|
||||
void InitSubHeap(struct HeapDescriptor *, struct HeapMemoryBlock *, u32);
|
||||
|
||||
#endif // GUARD_MEMORY_H
|
||||
#endif // GUARD_MEMORY_H
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
ENTRY(Start)
|
||||
|
||||
gNumMusicPlayers = 8;
|
||||
gMaxLines = 0;
|
||||
|
||||
SECTIONS {
|
||||
. = 0x2000000;
|
||||
|
||||
|
|
@ -8,23 +11,15 @@ SECTIONS {
|
|||
{
|
||||
ewram_start = .;
|
||||
INCLUDE "sym_ewram.ld"
|
||||
. = ALIGN(4);
|
||||
src/agb_flash.o(.bss);
|
||||
. = ALIGN(4);
|
||||
tools/agbcc/lib/libgcc.a:fp-bit.o(.bss);
|
||||
. = ALIGN(4);
|
||||
tools/agbcc/lib/libgcc.a:dp-bit.o(.bss);
|
||||
. = ALIGN(4);
|
||||
tools/agbcc/lib/libc.a:syscalls.o(.bss);
|
||||
. = ALIGN(16);
|
||||
INCLUDE "sym_ewram2.ld"
|
||||
. = ALIGN(4);
|
||||
tools/agbcc/lib/libc.a:impure.o(.data);
|
||||
. = ALIGN(4);
|
||||
tools/agbcc/lib/libc.a:locale.o(.data);
|
||||
. = ALIGN(4);
|
||||
tools/agbcc/lib/libc.a:mallocr.o(.data);
|
||||
. = ALIGN(4);
|
||||
gUnknown_203BC04 = .;
|
||||
. = 0x40000;
|
||||
}
|
||||
|
|
@ -73,7 +68,11 @@ SECTIONS {
|
|||
asm/save.o(.text);
|
||||
src/save1.o(.text);
|
||||
asm/code_8012A18.o(.text);
|
||||
asm/m4a.o(.text);
|
||||
asm/m4a_1.o(.text);
|
||||
src/m4a_2.o(.text);
|
||||
asm/m4a_2.o(.text);
|
||||
asm/m4a_3.o(.text);
|
||||
src/m4a_4.o(.text);
|
||||
asm/syscall.o(.text);
|
||||
src/agb_flash.o(.text);
|
||||
src/agb_flash_1m.o(.text);
|
||||
|
|
@ -138,23 +137,17 @@ SECTIONS {
|
|||
data/data.o(.rodata);
|
||||
src/file_system.o(.rodata);
|
||||
data/data_80B9BB8.o(.rodata);
|
||||
src/m4a_tables.o(.rodata);
|
||||
src/agb_flash.o(.rodata);
|
||||
src/agb_flash_1m.o(.rodata);
|
||||
src/agb_flash_mx.o(.rodata);
|
||||
src/agb_flash_le.o(.rodata);
|
||||
. = ALIGN(4);
|
||||
tools/agbcc/lib/libc.a:sprintf.o(.rodata);
|
||||
. = ALIGN(4);
|
||||
tools/agbcc/lib/libc.a:vfprintf.o(.rodata);
|
||||
. = ALIGN(4);
|
||||
tools/agbcc/lib/libc.a:dtoa.o(.rodata);
|
||||
. = ALIGN(4);
|
||||
tools/agbcc/lib/libc.a:impure.o(.rodata);
|
||||
. = ALIGN(4);
|
||||
tools/agbcc/lib/libc.a:locale.o(.rodata);
|
||||
. = ALIGN(4);
|
||||
tools/agbcc/lib/libc.a:mprec.o(.rodata);
|
||||
. = ALIGN(4);
|
||||
tools/agbcc/lib/libc.a:syscalls.o(.rodata);
|
||||
. = ALIGN(4);
|
||||
data/data_8270000.o(.rodata);
|
||||
|
|
@ -169,7 +162,8 @@ SECTIONS {
|
|||
unk_code_end = .;
|
||||
}
|
||||
|
||||
unk_code_ram_end = unk_code_ram + (unk_code_end - unk_code);
|
||||
unk_code_section_size = (unk_code_end - unk_code);
|
||||
unk_code_ram_end = unk_code_ram + unk_code_section_size;
|
||||
end = unk_code_ram_end;
|
||||
|
||||
. = 0x8300000;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ void InitBGPaletteBuffer(void)
|
|||
|
||||
u8* p;
|
||||
|
||||
ptr = gUnknown_20251F0;
|
||||
ptr = gBGPaletteBuffer;
|
||||
|
||||
i = 0x80;
|
||||
i <<= 2;
|
||||
|
|
@ -30,12 +30,12 @@ void InitBGPaletteBuffer(void)
|
|||
|
||||
paletteUsed = TRUE;
|
||||
|
||||
p = gUnknown_20251D0;
|
||||
p = gBGPaletteUsed;
|
||||
p += 31;
|
||||
|
||||
do
|
||||
*p-- = paletteUsed;
|
||||
while ((s32) p >= (s32) &gUnknown_20251D0);
|
||||
while ((s32) p >= (s32) &gBGPaletteUsed);
|
||||
}
|
||||
void SetBGPaletteBufferColorRGB(s32 index, u8 *RGBArray, s32 a3, u8 *a4)
|
||||
{
|
||||
|
|
|
|||
834
src/m4a_2.c
Normal file
834
src/m4a_2.c
Normal file
|
|
@ -0,0 +1,834 @@
|
|||
#include "gba/m4a_internal.h"
|
||||
|
||||
extern char SoundMainRAM_Buffer[0x400];
|
||||
|
||||
extern struct SoundInfo gSoundInfo;
|
||||
|
||||
|
||||
u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust)
|
||||
{
|
||||
u32 val1;
|
||||
u32 val2;
|
||||
u32 fineAdjustShifted = fineAdjust << 24;
|
||||
|
||||
if (key > 178)
|
||||
{
|
||||
key = 178;
|
||||
fineAdjustShifted = 255 << 24;
|
||||
}
|
||||
|
||||
val1 = gScaleTable[key];
|
||||
val1 = gFreqTable[val1 & 0xF] >> (val1 >> 4);
|
||||
|
||||
val2 = gScaleTable[key + 1];
|
||||
val2 = gFreqTable[val2 & 0xF] >> (val2 >> 4);
|
||||
|
||||
return umul3232H32(wav->freq, val1 + umul3232H32(val2 - val1, fineAdjustShifted));
|
||||
}
|
||||
|
||||
void UnusedDummyFunc()
|
||||
{
|
||||
}
|
||||
|
||||
void MPlayContinue(struct MusicPlayerInfo *mplayInfo)
|
||||
{
|
||||
if (mplayInfo->ident == ID_NUMBER)
|
||||
{
|
||||
mplayInfo->ident++;
|
||||
mplayInfo->status &= ~MUSICPLAYER_STATUS_PAUSE;
|
||||
mplayInfo->ident = ID_NUMBER;
|
||||
}
|
||||
}
|
||||
|
||||
void MPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed)
|
||||
{
|
||||
if (mplayInfo->ident == ID_NUMBER)
|
||||
{
|
||||
mplayInfo->ident++;
|
||||
mplayInfo->fadeOC = speed;
|
||||
mplayInfo->fadeOI = speed;
|
||||
mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT);
|
||||
mplayInfo->ident = ID_NUMBER;
|
||||
}
|
||||
}
|
||||
|
||||
void m4aSoundInit(void)
|
||||
{
|
||||
s32 i;
|
||||
|
||||
CpuCopy32((void *)((s32)SoundMainRAM & ~1), SoundMainRAM_Buffer, sizeof(SoundMainRAM_Buffer));
|
||||
|
||||
SoundInit(&gSoundInfo);
|
||||
MPlayExtender(gCgbChans);
|
||||
m4aSoundMode(SOUND_MODE_DA_BIT_8
|
||||
| SOUND_MODE_FREQ_18157
|
||||
| (14 << SOUND_MODE_MASVOL_SHIFT)
|
||||
| (5 << SOUND_MODE_MAXCHN_SHIFT));
|
||||
|
||||
for (i = 0; i < NUM_MUSIC_PLAYERS; i++)
|
||||
{
|
||||
struct MusicPlayerInfo *mplayInfo = gMPlayTable[i].info;
|
||||
MPlayOpen(mplayInfo, gMPlayTable[i].track, gMPlayTable[i].unk_8);
|
||||
mplayInfo->unk_B = gMPlayTable[i].unk_A;
|
||||
mplayInfo->memAccArea = gMPlayMemAccArea;
|
||||
}
|
||||
}
|
||||
|
||||
void m4aSoundMain(void)
|
||||
{
|
||||
SoundMain();
|
||||
}
|
||||
|
||||
void m4aSongNumStart(u16 n)
|
||||
{
|
||||
const struct MusicPlayer *mplayTable = gMPlayTable;
|
||||
const struct Song *songTable = gSongTable;
|
||||
const struct Song *song = &songTable[n];
|
||||
const struct MusicPlayer *mplay = &mplayTable[song->ms];
|
||||
|
||||
MPlayStart(mplay->info, song->header);
|
||||
}
|
||||
|
||||
void m4aSongNumStartOrChange(u16 n)
|
||||
{
|
||||
const struct MusicPlayer *mplayTable = gMPlayTable;
|
||||
const struct Song *songTable = gSongTable;
|
||||
const struct Song *song = &songTable[n];
|
||||
const struct MusicPlayer *mplay = &mplayTable[song->ms];
|
||||
|
||||
if (mplay->info->songHeader != song->header)
|
||||
{
|
||||
MPlayStart(mplay->info, song->header);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((mplay->info->status & MUSICPLAYER_STATUS_TRACK) == 0
|
||||
|| (mplay->info->status & MUSICPLAYER_STATUS_PAUSE))
|
||||
{
|
||||
MPlayStart(mplay->info, song->header);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void m4aSongNumStartOrContinue(u16 n)
|
||||
{
|
||||
const struct MusicPlayer *mplayTable = gMPlayTable;
|
||||
const struct Song *songTable = gSongTable;
|
||||
const struct Song *song = &songTable[n];
|
||||
const struct MusicPlayer *mplay = &mplayTable[song->ms];
|
||||
|
||||
if (mplay->info->songHeader != song->header)
|
||||
MPlayStart(mplay->info, song->header);
|
||||
else if ((mplay->info->status & MUSICPLAYER_STATUS_TRACK) == 0)
|
||||
MPlayStart(mplay->info, song->header);
|
||||
else if (mplay->info->status & MUSICPLAYER_STATUS_PAUSE)
|
||||
MPlayContinue(mplay->info);
|
||||
}
|
||||
|
||||
|
||||
void m4aSongNumStop(u16 n)
|
||||
{
|
||||
const struct MusicPlayer *mplayTable = gMPlayTable;
|
||||
const struct Song *songTable = gSongTable;
|
||||
const struct Song *song = &songTable[n];
|
||||
const struct MusicPlayer *mplay = &mplayTable[song->ms];
|
||||
|
||||
if (mplay->info->songHeader == song->header)
|
||||
m4aMPlayStop(mplay->info);
|
||||
}
|
||||
|
||||
void m4aSongNumContinue(u16 n)
|
||||
{
|
||||
const struct MusicPlayer *mplayTable = gMPlayTable;
|
||||
const struct Song *songTable = gSongTable;
|
||||
const struct Song *song = &songTable[n];
|
||||
const struct MusicPlayer *mplay = &mplayTable[song->ms];
|
||||
|
||||
if (mplay->info->songHeader == song->header)
|
||||
MPlayContinue(mplay->info);
|
||||
}
|
||||
|
||||
void m4aMPlayAllStop(void)
|
||||
{
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < NUM_MUSIC_PLAYERS; i++)
|
||||
m4aMPlayStop(gMPlayTable[i].info);
|
||||
}
|
||||
|
||||
void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo)
|
||||
{
|
||||
MPlayContinue(mplayInfo);
|
||||
}
|
||||
|
||||
void m4aMPlayAllContinue(void)
|
||||
{
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < NUM_MUSIC_PLAYERS; i++)
|
||||
MPlayContinue(gMPlayTable[i].info);
|
||||
}
|
||||
|
||||
void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed)
|
||||
{
|
||||
MPlayFadeOut(mplayInfo, speed);
|
||||
}
|
||||
|
||||
void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed)
|
||||
{
|
||||
if (mplayInfo->ident == ID_NUMBER)
|
||||
{
|
||||
mplayInfo->ident++;
|
||||
mplayInfo->fadeOC = speed;
|
||||
mplayInfo->fadeOI = speed;
|
||||
mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT) | TEMPORARY_FADE;
|
||||
mplayInfo->ident = ID_NUMBER;
|
||||
}
|
||||
}
|
||||
void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed)
|
||||
{
|
||||
if (mplayInfo->ident == ID_NUMBER)
|
||||
{
|
||||
mplayInfo->ident++;
|
||||
mplayInfo->fadeOC = speed;
|
||||
mplayInfo->fadeOI = speed;
|
||||
mplayInfo->fadeOV = (0 << FADE_VOL_SHIFT) | FADE_IN;
|
||||
mplayInfo->status &= ~MUSICPLAYER_STATUS_PAUSE;
|
||||
mplayInfo->ident = ID_NUMBER;
|
||||
}
|
||||
}
|
||||
|
||||
void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo)
|
||||
{
|
||||
s32 trackCount = mplayInfo->trackCount;
|
||||
struct MusicPlayerTrack *track = mplayInfo->tracks;
|
||||
|
||||
while (trackCount > 0)
|
||||
{
|
||||
if (track->flags & MPT_FLG_EXIST)
|
||||
{
|
||||
if (track->flags & MPT_FLG_START)
|
||||
{
|
||||
Clear64byte(track);
|
||||
track->flags = MPT_FLG_EXIST;
|
||||
track->bendRange = 2;
|
||||
track->volX = 64;
|
||||
track->lfoSpeed = 22;
|
||||
track->tone.type = 1;
|
||||
}
|
||||
}
|
||||
|
||||
trackCount--;
|
||||
track++;
|
||||
}
|
||||
}
|
||||
|
||||
void MPlayExtender(struct CgbChannel *cgbChans)
|
||||
{
|
||||
struct SoundInfo *soundInfo;
|
||||
u32 ident;
|
||||
|
||||
REG_SOUNDCNT_X = SOUND_MASTER_ENABLE
|
||||
| SOUND_4_ON
|
||||
| SOUND_3_ON
|
||||
| SOUND_2_ON
|
||||
| SOUND_1_ON;
|
||||
REG_SOUNDCNT_L = 0; // set master volume to zero
|
||||
REG_NR12 = 0x8;
|
||||
REG_NR22 = 0x8;
|
||||
REG_NR42 = 0x8;
|
||||
REG_NR14 = 0x80;
|
||||
REG_NR24 = 0x80;
|
||||
REG_NR44 = 0x80;
|
||||
REG_NR30 = 0;
|
||||
REG_NR50 = 0x77;
|
||||
|
||||
soundInfo = SOUND_INFO_PTR;
|
||||
|
||||
ident = soundInfo->ident;
|
||||
|
||||
if (ident != ID_NUMBER)
|
||||
return;
|
||||
|
||||
soundInfo->ident++;
|
||||
|
||||
gMPlayJumpTable[8] = ply_memacc;
|
||||
gMPlayJumpTable[17] = ply_lfos;
|
||||
gMPlayJumpTable[19] = ply_mod;
|
||||
gMPlayJumpTable[28] = ply_xcmd;
|
||||
gMPlayJumpTable[29] = ply_endtie;
|
||||
gMPlayJumpTable[30] = SampleFreqSet;
|
||||
gMPlayJumpTable[31] = TrackStop;
|
||||
gMPlayJumpTable[32] = FadeOutBody;
|
||||
gMPlayJumpTable[33] = TrkVolPitSet;
|
||||
|
||||
soundInfo->cgbChans = (struct CgbChannel *)cgbChans;
|
||||
soundInfo->CgbSound = CgbSound;
|
||||
soundInfo->CgbOscOff = CgbOscOff;
|
||||
soundInfo->MidiKeyToCgbFreq = MidiKeyToCgbFreq;
|
||||
soundInfo->maxLines = MAX_LINES;
|
||||
|
||||
CpuFill32(0, cgbChans, sizeof(struct CgbChannel) * 4);
|
||||
|
||||
cgbChans[0].ty = 1;
|
||||
cgbChans[0].panMask = 0x11;
|
||||
cgbChans[1].ty = 2;
|
||||
cgbChans[1].panMask = 0x22;
|
||||
cgbChans[2].ty = 3;
|
||||
cgbChans[2].panMask = 0x44;
|
||||
cgbChans[3].ty = 4;
|
||||
cgbChans[3].panMask = 0x88;
|
||||
|
||||
soundInfo->ident = ident;
|
||||
}
|
||||
|
||||
void MusicPlayerJumpTableCopy(void)
|
||||
{
|
||||
asm("swi 0x2A");
|
||||
}
|
||||
|
||||
void ClearChain(void *x)
|
||||
{
|
||||
void (*func)(void *) = *(&gMPlayJumpTable[34]);
|
||||
func(x);
|
||||
}
|
||||
|
||||
void Clear64byte(void *x)
|
||||
{
|
||||
void (*func)(void *) = *(&gMPlayJumpTable[35]);
|
||||
func(x);
|
||||
}
|
||||
|
||||
void SoundInit(struct SoundInfo *soundInfo)
|
||||
{
|
||||
soundInfo->ident = 0;
|
||||
|
||||
if (REG_DMA1CNT & (DMA_REPEAT << 16))
|
||||
REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
|
||||
|
||||
if (REG_DMA2CNT & (DMA_REPEAT << 16))
|
||||
REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
|
||||
|
||||
REG_DMA1CNT_H = DMA_32BIT;
|
||||
REG_DMA2CNT_H = DMA_32BIT;
|
||||
REG_SOUNDCNT_X = SOUND_MASTER_ENABLE
|
||||
| SOUND_4_ON
|
||||
| SOUND_3_ON
|
||||
| SOUND_2_ON
|
||||
| SOUND_1_ON;
|
||||
REG_SOUNDCNT_H = SOUND_B_FIFO_RESET | SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT
|
||||
| SOUND_A_FIFO_RESET | SOUND_A_TIMER_0 | SOUND_A_RIGHT_OUTPUT
|
||||
| SOUND_ALL_MIX_FULL;
|
||||
REG_SOUNDBIAS_H = (REG_SOUNDBIAS_H & 0x3F) | 0x40;
|
||||
|
||||
REG_DMA1SAD = (s32)soundInfo->pcmBuffer;
|
||||
REG_DMA1DAD = (s32)®_FIFO_A;
|
||||
REG_DMA2SAD = (s32)soundInfo->pcmBuffer + PCM_DMA_BUF_SIZE;
|
||||
REG_DMA2DAD = (s32)®_FIFO_B;
|
||||
|
||||
SOUND_INFO_PTR = soundInfo;
|
||||
CpuFill32(0, soundInfo, sizeof(struct SoundInfo));
|
||||
|
||||
soundInfo->maxChans = 8;
|
||||
soundInfo->masterVolume = 15;
|
||||
soundInfo->plynote = (u32)ply_note;
|
||||
soundInfo->CgbSound = DummyFunc;
|
||||
soundInfo->CgbOscOff = (void (*)(u8))DummyFunc;
|
||||
soundInfo->MidiKeyToCgbFreq = (u32 (*)(u8, u8, u8))DummyFunc;
|
||||
soundInfo->ExtVolPit = (u32)DummyFunc;
|
||||
|
||||
MPlayJumpTableCopy(gMPlayJumpTable);
|
||||
|
||||
soundInfo->MPlayJumpTable = (u32)gMPlayJumpTable;
|
||||
|
||||
SampleFreqSet(SOUND_MODE_FREQ_13379);
|
||||
|
||||
soundInfo->ident = ID_NUMBER;
|
||||
}
|
||||
|
||||
void SampleFreqSet(u32 freq)
|
||||
{
|
||||
struct SoundInfo *soundInfo = SOUND_INFO_PTR;
|
||||
|
||||
freq = (freq & 0xF0000) >> 16;
|
||||
soundInfo->freq = freq;
|
||||
soundInfo->pcmSamplesPerVBlank = gPcmSamplesPerVBlankTable[freq - 1];
|
||||
soundInfo->pcmDmaPeriod = PCM_DMA_BUF_SIZE / soundInfo->pcmSamplesPerVBlank;
|
||||
|
||||
// LCD refresh rate 59.7275Hz
|
||||
soundInfo->pcmFreq = (597275 * soundInfo->pcmSamplesPerVBlank + 5000) / 10000;
|
||||
|
||||
// CPU frequency 16.78Mhz
|
||||
soundInfo->divFreq = (16777216 / soundInfo->pcmFreq + 1) >> 1;
|
||||
|
||||
// Turn off timer 0.
|
||||
REG_TM0CNT_H = 0;
|
||||
|
||||
// cycles per LCD fresh 280896
|
||||
REG_TM0CNT_L = -(280896 / soundInfo->pcmSamplesPerVBlank);
|
||||
|
||||
m4aSoundVSyncOn();
|
||||
|
||||
while (*(vu8 *)REG_ADDR_VCOUNT == 159)
|
||||
;
|
||||
|
||||
while (*(vu8 *)REG_ADDR_VCOUNT != 159)
|
||||
;
|
||||
|
||||
REG_TM0CNT_H = TIMER_ENABLE | TIMER_1CLK;
|
||||
}
|
||||
|
||||
void m4aSoundMode(u32 mode)
|
||||
{
|
||||
struct SoundInfo *soundInfo = SOUND_INFO_PTR;
|
||||
u32 temp;
|
||||
|
||||
if (soundInfo->ident != ID_NUMBER)
|
||||
return;
|
||||
|
||||
soundInfo->ident++;
|
||||
|
||||
temp = mode & (SOUND_MODE_REVERB_SET | SOUND_MODE_REVERB_VAL);
|
||||
|
||||
if (temp)
|
||||
soundInfo->reverb = temp & SOUND_MODE_REVERB_VAL;
|
||||
|
||||
temp = mode & SOUND_MODE_MAXCHN;
|
||||
|
||||
if (temp)
|
||||
{
|
||||
struct SoundChannel *chan;
|
||||
|
||||
soundInfo->maxChans = temp >> SOUND_MODE_MAXCHN_SHIFT;
|
||||
|
||||
temp = MAX_DIRECTSOUND_CHANNELS;
|
||||
chan = &soundInfo->chans[0];
|
||||
|
||||
while (temp != 0)
|
||||
{
|
||||
chan->status = 0;
|
||||
temp--;
|
||||
chan++;
|
||||
}
|
||||
}
|
||||
|
||||
temp = mode & SOUND_MODE_MASVOL;
|
||||
|
||||
if (temp)
|
||||
soundInfo->masterVolume = temp >> SOUND_MODE_MASVOL_SHIFT;
|
||||
|
||||
temp = mode & SOUND_MODE_DA_BIT;
|
||||
|
||||
if (temp)
|
||||
{
|
||||
temp = (temp & 0x300000) >> 14;
|
||||
REG_SOUNDBIAS_H = (REG_SOUNDBIAS_H & 0x3F) | temp;
|
||||
}
|
||||
|
||||
temp = mode & SOUND_MODE_FREQ;
|
||||
|
||||
if (temp)
|
||||
{
|
||||
m4aSoundVSyncOff();
|
||||
SampleFreqSet(temp);
|
||||
}
|
||||
|
||||
soundInfo->ident = ID_NUMBER;
|
||||
}
|
||||
|
||||
void SoundClear(void)
|
||||
{
|
||||
struct SoundInfo *soundInfo = SOUND_INFO_PTR;
|
||||
s32 i;
|
||||
void *chan;
|
||||
|
||||
if (soundInfo->ident != ID_NUMBER)
|
||||
return;
|
||||
|
||||
soundInfo->ident++;
|
||||
|
||||
i = MAX_DIRECTSOUND_CHANNELS;
|
||||
chan = &soundInfo->chans[0];
|
||||
|
||||
while (i > 0)
|
||||
{
|
||||
((struct SoundChannel *)chan)->status = 0;
|
||||
i--;
|
||||
chan = (void *)((s32)chan + sizeof(struct SoundChannel));
|
||||
}
|
||||
|
||||
chan = soundInfo->cgbChans;
|
||||
|
||||
if (chan)
|
||||
{
|
||||
i = 1;
|
||||
|
||||
while (i <= 4)
|
||||
{
|
||||
soundInfo->CgbOscOff(i);
|
||||
((struct CgbChannel *)chan)->sf = 0;
|
||||
i++;
|
||||
chan = (void *)((s32)chan + sizeof(struct CgbChannel));
|
||||
}
|
||||
}
|
||||
|
||||
soundInfo->ident = ID_NUMBER;
|
||||
}
|
||||
|
||||
void m4aSoundVSyncOff(void)
|
||||
{
|
||||
struct SoundInfo *soundInfo = SOUND_INFO_PTR;
|
||||
|
||||
if (soundInfo->ident >= ID_NUMBER && soundInfo->ident <= ID_NUMBER + 1)
|
||||
{
|
||||
soundInfo->ident += 10;
|
||||
|
||||
if (REG_DMA1CNT & (DMA_REPEAT << 16))
|
||||
REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
|
||||
|
||||
if (REG_DMA2CNT & (DMA_REPEAT << 16))
|
||||
REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
|
||||
|
||||
REG_DMA1CNT_H = DMA_32BIT;
|
||||
REG_DMA2CNT_H = DMA_32BIT;
|
||||
|
||||
CpuFill32(0, soundInfo->pcmBuffer, sizeof(soundInfo->pcmBuffer));
|
||||
}
|
||||
}
|
||||
|
||||
void m4aSoundVSyncOn(void)
|
||||
{
|
||||
struct SoundInfo *soundInfo = SOUND_INFO_PTR;
|
||||
u32 ident = soundInfo->ident;
|
||||
|
||||
if (ident == ID_NUMBER)
|
||||
return;
|
||||
|
||||
REG_DMA1CNT_H = DMA_ENABLE | DMA_START_SPECIAL | DMA_32BIT | DMA_REPEAT;
|
||||
REG_DMA2CNT_H = DMA_ENABLE | DMA_START_SPECIAL | DMA_32BIT | DMA_REPEAT;
|
||||
|
||||
soundInfo->pcmDmaCounter = 0;
|
||||
soundInfo->ident = ident - 10;
|
||||
}
|
||||
|
||||
void MPlayOpen(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *tracks, u8 trackCount)
|
||||
{
|
||||
struct SoundInfo *soundInfo;
|
||||
|
||||
if (trackCount == 0)
|
||||
return;
|
||||
|
||||
if (trackCount > MAX_MUSICPLAYER_TRACKS)
|
||||
trackCount = MAX_MUSICPLAYER_TRACKS;
|
||||
|
||||
soundInfo = SOUND_INFO_PTR;
|
||||
|
||||
if (soundInfo->ident != ID_NUMBER)
|
||||
return;
|
||||
|
||||
soundInfo->ident++;
|
||||
|
||||
Clear64byte(mplayInfo);
|
||||
|
||||
mplayInfo->tracks = tracks;
|
||||
mplayInfo->trackCount = trackCount;
|
||||
mplayInfo->status = MUSICPLAYER_STATUS_PAUSE;
|
||||
|
||||
while (trackCount != 0)
|
||||
{
|
||||
tracks->flags = 0;
|
||||
trackCount--;
|
||||
tracks++;
|
||||
}
|
||||
|
||||
if (soundInfo->func != 0)
|
||||
{
|
||||
mplayInfo->func = soundInfo->func;
|
||||
mplayInfo->intp = soundInfo->intp;
|
||||
soundInfo->func = 0;
|
||||
}
|
||||
|
||||
soundInfo->intp = (u32)mplayInfo;
|
||||
soundInfo->func = (u32)MPlayMain;
|
||||
soundInfo->ident = ID_NUMBER;
|
||||
mplayInfo->ident = ID_NUMBER;
|
||||
}
|
||||
|
||||
void MPlayStart(struct MusicPlayerInfo *mplayInfo, struct SongHeader *songHeader)
|
||||
{
|
||||
s32 i;
|
||||
u8 unk_B;
|
||||
struct MusicPlayerTrack *track;
|
||||
|
||||
if (mplayInfo->ident != ID_NUMBER)
|
||||
return;
|
||||
|
||||
unk_B = mplayInfo->unk_B;
|
||||
|
||||
if (!unk_B
|
||||
|| ((!mplayInfo->songHeader || !(mplayInfo->tracks[0].flags & MPT_FLG_START))
|
||||
&& ((mplayInfo->status & MUSICPLAYER_STATUS_TRACK) == 0
|
||||
|| (mplayInfo->status & MUSICPLAYER_STATUS_PAUSE)))
|
||||
|| (mplayInfo->priority <= songHeader->priority))
|
||||
{
|
||||
mplayInfo->ident++;
|
||||
mplayInfo->status = 0;
|
||||
mplayInfo->songHeader = songHeader;
|
||||
mplayInfo->tone = songHeader->tone;
|
||||
mplayInfo->priority = songHeader->priority;
|
||||
mplayInfo->clock = 0;
|
||||
mplayInfo->tempoD = 150;
|
||||
mplayInfo->tempoI = 150;
|
||||
mplayInfo->tempoU = 0x100;
|
||||
mplayInfo->tempoC = 0;
|
||||
mplayInfo->fadeOI = 0;
|
||||
|
||||
i = 0;
|
||||
track = mplayInfo->tracks;
|
||||
|
||||
while (i < songHeader->trackCount && i < mplayInfo->trackCount)
|
||||
{
|
||||
TrackStop(mplayInfo, track);
|
||||
track->flags = MPT_FLG_EXIST | MPT_FLG_START;
|
||||
track->chan = 0;
|
||||
track->cmdPtr = songHeader->part[i];
|
||||
i++;
|
||||
track++;
|
||||
}
|
||||
|
||||
while (i < mplayInfo->trackCount)
|
||||
{
|
||||
TrackStop(mplayInfo, track);
|
||||
track->flags = 0;
|
||||
i++;
|
||||
track++;
|
||||
}
|
||||
|
||||
if (songHeader->reverb & 0x80)
|
||||
m4aSoundMode(songHeader->reverb);
|
||||
|
||||
mplayInfo->ident = ID_NUMBER;
|
||||
}
|
||||
}
|
||||
|
||||
void m4aMPlayStop(struct MusicPlayerInfo *mplayInfo)
|
||||
{
|
||||
s32 i;
|
||||
struct MusicPlayerTrack *track;
|
||||
|
||||
if (mplayInfo->ident != ID_NUMBER)
|
||||
return;
|
||||
|
||||
mplayInfo->ident++;
|
||||
mplayInfo->status |= MUSICPLAYER_STATUS_PAUSE;
|
||||
|
||||
i = mplayInfo->trackCount;
|
||||
track = mplayInfo->tracks;
|
||||
|
||||
while (i > 0)
|
||||
{
|
||||
TrackStop(mplayInfo, track);
|
||||
i--;
|
||||
track++;
|
||||
}
|
||||
|
||||
mplayInfo->ident = ID_NUMBER;
|
||||
}
|
||||
|
||||
void FadeOutBody(struct MusicPlayerInfo *mplayInfo)
|
||||
{
|
||||
s32 i;
|
||||
struct MusicPlayerTrack *track;
|
||||
u16 fadeOI = mplayInfo->fadeOI;
|
||||
register u32 temp asm("r3");
|
||||
register u16 mask asm("r2");
|
||||
|
||||
if (fadeOI == 0)
|
||||
return;
|
||||
|
||||
mplayInfo->fadeOC--;
|
||||
|
||||
temp = 0xFFFF;
|
||||
mask = temp;
|
||||
|
||||
if (mplayInfo->fadeOC != 0)
|
||||
return;
|
||||
|
||||
mplayInfo->fadeOC = fadeOI;
|
||||
|
||||
if (mplayInfo->fadeOV & FADE_IN)
|
||||
{
|
||||
mplayInfo->fadeOV += (4 << FADE_VOL_SHIFT);
|
||||
|
||||
if ((u16)(mplayInfo->fadeOV & mask) >= (64 << FADE_VOL_SHIFT))
|
||||
{
|
||||
mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT);
|
||||
mplayInfo->fadeOI = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
mplayInfo->fadeOV -= (4 << FADE_VOL_SHIFT);
|
||||
|
||||
if ((s16)(mplayInfo->fadeOV & mask) <= 0)
|
||||
{
|
||||
i = mplayInfo->trackCount;
|
||||
track = mplayInfo->tracks;
|
||||
|
||||
while (i > 0)
|
||||
{
|
||||
register u32 fadeOV asm("r7");
|
||||
u32 val;
|
||||
|
||||
TrackStop(mplayInfo, track);
|
||||
|
||||
val = TEMPORARY_FADE;
|
||||
fadeOV = mplayInfo->fadeOV;
|
||||
val &= fadeOV;
|
||||
|
||||
if (!val)
|
||||
track->flags = 0;
|
||||
|
||||
i--;
|
||||
track++;
|
||||
}
|
||||
|
||||
if (mplayInfo->fadeOV & TEMPORARY_FADE)
|
||||
mplayInfo->status |= MUSICPLAYER_STATUS_PAUSE;
|
||||
else
|
||||
mplayInfo->status = MUSICPLAYER_STATUS_PAUSE;
|
||||
|
||||
mplayInfo->fadeOI = 0;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
i = mplayInfo->trackCount;
|
||||
track = mplayInfo->tracks;
|
||||
|
||||
while (i > 0)
|
||||
{
|
||||
if (track->flags & MPT_FLG_EXIST)
|
||||
{
|
||||
track->volX = (mplayInfo->fadeOV >> FADE_VOL_SHIFT);
|
||||
track->flags |= MPT_FLG_VOLCHG;
|
||||
}
|
||||
|
||||
i--;
|
||||
track++;
|
||||
}
|
||||
}
|
||||
|
||||
void TrkVolPitSet(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
|
||||
{
|
||||
if (track->flags & MPT_FLG_VOLSET)
|
||||
{
|
||||
s32 x;
|
||||
s32 y;
|
||||
|
||||
x = (u32)(track->vol * track->volX) >> 5;
|
||||
|
||||
if (track->modT == 1)
|
||||
x = (u32)(x * (track->modM + 128)) >> 7;
|
||||
|
||||
y = 2 * track->pan + track->panX;
|
||||
|
||||
if (track->modT == 2)
|
||||
y += track->modM;
|
||||
|
||||
if (y < -128)
|
||||
y = -128;
|
||||
else if (y > 127)
|
||||
y = 127;
|
||||
|
||||
track->volMR = (u32)((y + 128) * x) >> 8;
|
||||
track->volML = (u32)((127 - y) * x) >> 8;
|
||||
}
|
||||
|
||||
if (track->flags & MPT_FLG_PITSET)
|
||||
{
|
||||
s32 bend = track->bend * track->bendRange;
|
||||
register s32 x asm("r1") = track->tune;
|
||||
x += bend;
|
||||
x *= 4;
|
||||
x += (track->keyShift << 8);
|
||||
x += (track->keyShiftX << 8);
|
||||
x += track->pitX;
|
||||
|
||||
if (track->modT == 0)
|
||||
x += 16 * track->modM;
|
||||
|
||||
track->keyM = x >> 8;
|
||||
track->pitM = x;
|
||||
}
|
||||
|
||||
track->flags &= ~(MPT_FLG_PITSET | MPT_FLG_VOLSET);
|
||||
}
|
||||
|
||||
u32 MidiKeyToCgbFreq(u8 chanNum, u8 key, u8 fineAdjust)
|
||||
{
|
||||
if (chanNum == 4)
|
||||
{
|
||||
if (key <= 20)
|
||||
{
|
||||
key = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
key -= 21;
|
||||
if (key > 59)
|
||||
key = 59;
|
||||
}
|
||||
|
||||
return gNoiseTable[key];
|
||||
}
|
||||
else
|
||||
{
|
||||
s32 val1;
|
||||
s32 val2;
|
||||
|
||||
if (key <= 35)
|
||||
{
|
||||
fineAdjust = 0;
|
||||
key = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
key -= 36;
|
||||
if (key > 130)
|
||||
{
|
||||
key = 130;
|
||||
fineAdjust = 255;
|
||||
}
|
||||
}
|
||||
|
||||
val1 = gCgbScaleTable[key];
|
||||
val1 = gCgbFreqTable[val1 & 0xF] >> (val1 >> 4);
|
||||
|
||||
val2 = gCgbScaleTable[key + 1];
|
||||
val2 = gCgbFreqTable[val2 & 0xF] >> (val2 >> 4);
|
||||
|
||||
return val1 + ((fineAdjust * (val2 - val1)) >> 8) + 2048;
|
||||
}
|
||||
}
|
||||
|
||||
void CgbOscOff(u8 chanNum)
|
||||
{
|
||||
switch (chanNum)
|
||||
{
|
||||
case 1:
|
||||
REG_NR12 = 8;
|
||||
REG_NR14 = 0x80;
|
||||
break;
|
||||
case 2:
|
||||
REG_NR22 = 8;
|
||||
REG_NR24 = 0x80;
|
||||
break;
|
||||
case 3:
|
||||
REG_NR30 = 0;
|
||||
break;
|
||||
default:
|
||||
REG_NR42 = 8;
|
||||
REG_NR44 = 0x80;
|
||||
}
|
||||
}
|
||||
384
src/m4a_4.c
Normal file
384
src/m4a_4.c
Normal file
|
|
@ -0,0 +1,384 @@
|
|||
#include "gba/m4a_internal.h"
|
||||
|
||||
void m4aMPlayTempoControl(struct MusicPlayerInfo *mplayInfo, u16 tempo)
|
||||
{
|
||||
if (mplayInfo->ident == ID_NUMBER)
|
||||
{
|
||||
mplayInfo->ident++;
|
||||
mplayInfo->tempoU = tempo;
|
||||
mplayInfo->tempoI = (mplayInfo->tempoD * mplayInfo->tempoU) >> 8;
|
||||
mplayInfo->ident = ID_NUMBER;
|
||||
}
|
||||
}
|
||||
|
||||
void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume)
|
||||
{
|
||||
s32 i;
|
||||
u32 bit;
|
||||
struct MusicPlayerTrack *track;
|
||||
|
||||
if (mplayInfo->ident != ID_NUMBER)
|
||||
return;
|
||||
|
||||
mplayInfo->ident++;
|
||||
|
||||
i = mplayInfo->trackCount;
|
||||
track = mplayInfo->tracks;
|
||||
bit = 1;
|
||||
|
||||
while (i > 0)
|
||||
{
|
||||
if (trackBits & bit)
|
||||
{
|
||||
if (track->flags & MPT_FLG_EXIST)
|
||||
{
|
||||
track->volX = volume / 4;
|
||||
track->flags |= MPT_FLG_VOLCHG;
|
||||
}
|
||||
}
|
||||
|
||||
i--;
|
||||
track++;
|
||||
bit <<= 1;
|
||||
}
|
||||
|
||||
mplayInfo->ident = ID_NUMBER;
|
||||
}
|
||||
|
||||
void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch)
|
||||
{
|
||||
s32 i;
|
||||
u32 bit;
|
||||
struct MusicPlayerTrack *track;
|
||||
|
||||
if (mplayInfo->ident != ID_NUMBER)
|
||||
return;
|
||||
|
||||
mplayInfo->ident++;
|
||||
|
||||
i = mplayInfo->trackCount;
|
||||
track = mplayInfo->tracks;
|
||||
bit = 1;
|
||||
|
||||
while (i > 0)
|
||||
{
|
||||
if (trackBits & bit)
|
||||
{
|
||||
if (track->flags & MPT_FLG_EXIST)
|
||||
{
|
||||
track->keyShiftX = pitch >> 8;
|
||||
track->pitX = pitch;
|
||||
track->flags |= MPT_FLG_PITCHG;
|
||||
}
|
||||
}
|
||||
|
||||
i--;
|
||||
track++;
|
||||
bit <<= 1;
|
||||
}
|
||||
|
||||
mplayInfo->ident = ID_NUMBER;
|
||||
}
|
||||
|
||||
void m4aMPlayPanpotControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s8 pan)
|
||||
{
|
||||
s32 i;
|
||||
u32 bit;
|
||||
struct MusicPlayerTrack *track;
|
||||
|
||||
if (mplayInfo->ident != ID_NUMBER)
|
||||
return;
|
||||
|
||||
mplayInfo->ident++;
|
||||
|
||||
i = mplayInfo->trackCount;
|
||||
track = mplayInfo->tracks;
|
||||
bit = 1;
|
||||
|
||||
while (i > 0)
|
||||
{
|
||||
if (trackBits & bit)
|
||||
{
|
||||
if (track->flags & MPT_FLG_EXIST)
|
||||
{
|
||||
track->panX = pan;
|
||||
track->flags |= MPT_FLG_VOLCHG;
|
||||
}
|
||||
}
|
||||
|
||||
i--;
|
||||
track++;
|
||||
bit <<= 1;
|
||||
}
|
||||
|
||||
mplayInfo->ident = ID_NUMBER;
|
||||
}
|
||||
|
||||
void ClearModM(struct MusicPlayerTrack *track)
|
||||
{
|
||||
track->lfoSpeedC = 0;
|
||||
track->modM = 0;
|
||||
|
||||
if (track->modT == 0)
|
||||
track->flags |= MPT_FLG_PITCHG;
|
||||
else
|
||||
track->flags |= MPT_FLG_VOLCHG;
|
||||
}
|
||||
|
||||
void m4aMPlayModDepthSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 modDepth)
|
||||
{
|
||||
s32 i;
|
||||
u32 bit;
|
||||
struct MusicPlayerTrack *track;
|
||||
|
||||
if (mplayInfo->ident != ID_NUMBER)
|
||||
return;
|
||||
|
||||
mplayInfo->ident++;
|
||||
|
||||
i = mplayInfo->trackCount;
|
||||
track = mplayInfo->tracks;
|
||||
bit = 1;
|
||||
|
||||
while (i > 0)
|
||||
{
|
||||
if (trackBits & bit)
|
||||
{
|
||||
if (track->flags & MPT_FLG_EXIST)
|
||||
{
|
||||
track->mod = modDepth;
|
||||
|
||||
if (!track->mod)
|
||||
ClearModM(track);
|
||||
}
|
||||
}
|
||||
|
||||
i--;
|
||||
track++;
|
||||
bit <<= 1;
|
||||
}
|
||||
|
||||
mplayInfo->ident = ID_NUMBER;
|
||||
}
|
||||
|
||||
void m4aMPlayLFOSpeedSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 lfoSpeed)
|
||||
{
|
||||
s32 i;
|
||||
u32 bit;
|
||||
struct MusicPlayerTrack *track;
|
||||
|
||||
if (mplayInfo->ident != ID_NUMBER)
|
||||
return;
|
||||
|
||||
mplayInfo->ident++;
|
||||
|
||||
i = mplayInfo->trackCount;
|
||||
track = mplayInfo->tracks;
|
||||
bit = 1;
|
||||
|
||||
while (i > 0)
|
||||
{
|
||||
if (trackBits & bit)
|
||||
{
|
||||
if (track->flags & MPT_FLG_EXIST)
|
||||
{
|
||||
track->lfoSpeed = lfoSpeed;
|
||||
|
||||
if (!track->lfoSpeed)
|
||||
ClearModM(track);
|
||||
}
|
||||
}
|
||||
|
||||
i--;
|
||||
track++;
|
||||
bit <<= 1;
|
||||
}
|
||||
|
||||
mplayInfo->ident = ID_NUMBER;
|
||||
}
|
||||
|
||||
#define MEMACC_COND_JUMP(cond) \
|
||||
if (cond) \
|
||||
goto cond_true; \
|
||||
else \
|
||||
goto cond_false; \
|
||||
|
||||
void ply_memacc(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
|
||||
{
|
||||
u32 op;
|
||||
u8 *addr;
|
||||
u8 data;
|
||||
|
||||
op = *track->cmdPtr;
|
||||
track->cmdPtr++;
|
||||
|
||||
addr = mplayInfo->memAccArea + *track->cmdPtr;
|
||||
track->cmdPtr++;
|
||||
|
||||
data = *track->cmdPtr;
|
||||
track->cmdPtr++;
|
||||
|
||||
switch (op)
|
||||
{
|
||||
case 0:
|
||||
*addr = data;
|
||||
return;
|
||||
case 1:
|
||||
*addr += data;
|
||||
return;
|
||||
case 2:
|
||||
*addr -= data;
|
||||
return;
|
||||
case 3:
|
||||
*addr = mplayInfo->memAccArea[data];
|
||||
return;
|
||||
case 4:
|
||||
*addr += mplayInfo->memAccArea[data];
|
||||
return;
|
||||
case 5:
|
||||
*addr -= mplayInfo->memAccArea[data];
|
||||
return;
|
||||
case 6:
|
||||
MEMACC_COND_JUMP(*addr == data)
|
||||
return;
|
||||
case 7:
|
||||
MEMACC_COND_JUMP(*addr != data)
|
||||
return;
|
||||
case 8:
|
||||
MEMACC_COND_JUMP(*addr > data)
|
||||
return;
|
||||
case 9:
|
||||
MEMACC_COND_JUMP(*addr >= data)
|
||||
return;
|
||||
case 10:
|
||||
MEMACC_COND_JUMP(*addr <= data)
|
||||
return;
|
||||
case 11:
|
||||
MEMACC_COND_JUMP(*addr < data)
|
||||
return;
|
||||
case 12:
|
||||
MEMACC_COND_JUMP(*addr == mplayInfo->memAccArea[data])
|
||||
return;
|
||||
case 13:
|
||||
MEMACC_COND_JUMP(*addr != mplayInfo->memAccArea[data])
|
||||
return;
|
||||
case 14:
|
||||
MEMACC_COND_JUMP(*addr > mplayInfo->memAccArea[data])
|
||||
return;
|
||||
case 15:
|
||||
MEMACC_COND_JUMP(*addr >= mplayInfo->memAccArea[data])
|
||||
return;
|
||||
case 16:
|
||||
MEMACC_COND_JUMP(*addr <= mplayInfo->memAccArea[data])
|
||||
return;
|
||||
case 17:
|
||||
MEMACC_COND_JUMP(*addr < mplayInfo->memAccArea[data])
|
||||
return;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
||||
cond_true:
|
||||
{
|
||||
void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *) = *(&gMPlayJumpTable[1]);
|
||||
func(mplayInfo, track);
|
||||
return;
|
||||
}
|
||||
|
||||
cond_false:
|
||||
track->cmdPtr += 4;
|
||||
}
|
||||
|
||||
void ply_xcmd(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
|
||||
{
|
||||
u32 n = *track->cmdPtr;
|
||||
track->cmdPtr++;
|
||||
|
||||
gXcmdTable[n](mplayInfo, track);
|
||||
}
|
||||
|
||||
void ply_xxx(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
|
||||
{
|
||||
void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *) = *(&gMPlayJumpTable[0]);
|
||||
func(mplayInfo, track);
|
||||
}
|
||||
|
||||
#define READ_XCMD_BYTE(var, n) \
|
||||
{ \
|
||||
u32 byte = track->cmdPtr[(n)]; \
|
||||
byte <<= n * 8; \
|
||||
(var) &= ~(0xFF << (n * 8)); \
|
||||
(var) |= byte; \
|
||||
}
|
||||
|
||||
void ply_xwave(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
|
||||
{
|
||||
u32 wav;
|
||||
|
||||
READ_XCMD_BYTE(wav, 0) // UB: uninitialized variable
|
||||
READ_XCMD_BYTE(wav, 1)
|
||||
READ_XCMD_BYTE(wav, 2)
|
||||
READ_XCMD_BYTE(wav, 3)
|
||||
|
||||
track->tone.wav = (struct WaveData *)wav;
|
||||
track->cmdPtr += 4;
|
||||
}
|
||||
|
||||
void ply_xtype(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
|
||||
{
|
||||
track->tone.type = *track->cmdPtr;
|
||||
track->cmdPtr++;
|
||||
}
|
||||
|
||||
void ply_xatta(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
|
||||
{
|
||||
track->tone.attack = *track->cmdPtr;
|
||||
track->cmdPtr++;
|
||||
}
|
||||
|
||||
void ply_xdeca(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
|
||||
{
|
||||
track->tone.decay = *track->cmdPtr;
|
||||
track->cmdPtr++;
|
||||
}
|
||||
|
||||
void ply_xsust(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
|
||||
{
|
||||
track->tone.sustain = *track->cmdPtr;
|
||||
track->cmdPtr++;
|
||||
}
|
||||
|
||||
void ply_xrele(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
|
||||
{
|
||||
track->tone.release = *track->cmdPtr;
|
||||
track->cmdPtr++;
|
||||
}
|
||||
|
||||
void ply_xiecv(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
|
||||
{
|
||||
track->echoVolume = *track->cmdPtr;
|
||||
track->cmdPtr++;
|
||||
}
|
||||
|
||||
void ply_xiecl(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
|
||||
{
|
||||
track->echoLength = *track->cmdPtr;
|
||||
track->cmdPtr++;
|
||||
}
|
||||
|
||||
void ply_xleng(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
|
||||
{
|
||||
track->tone.length = *track->cmdPtr;
|
||||
track->cmdPtr++;
|
||||
}
|
||||
|
||||
void ply_xswee(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
|
||||
{
|
||||
track->tone.pan_sweep = *track->cmdPtr;
|
||||
track->cmdPtr++;
|
||||
}
|
||||
|
||||
void DummyFunc()
|
||||
{
|
||||
;
|
||||
}
|
||||
223
src/m4a_tables.c
Normal file
223
src/m4a_tables.c
Normal file
|
|
@ -0,0 +1,223 @@
|
|||
#include "gba/m4a_internal.h"
|
||||
|
||||
// Some of these functions have different signatures, so we need to make this
|
||||
// an array of void pointers or a struct. It's simpler to just make it an array
|
||||
// for now.
|
||||
void * const gMPlayJumpTableTemplate[] =
|
||||
{
|
||||
ply_fine,
|
||||
ply_goto,
|
||||
ply_patt,
|
||||
ply_pend,
|
||||
ply_rept,
|
||||
ply_fine,
|
||||
ply_fine,
|
||||
ply_fine,
|
||||
ply_fine,
|
||||
ply_prio,
|
||||
ply_tempo,
|
||||
ply_keysh,
|
||||
ply_voice,
|
||||
ply_vol,
|
||||
ply_pan,
|
||||
ply_bend,
|
||||
ply_bendr,
|
||||
ply_lfos,
|
||||
ply_lfodl,
|
||||
ply_mod,
|
||||
ply_modt,
|
||||
ply_fine,
|
||||
ply_fine,
|
||||
ply_tune,
|
||||
ply_fine,
|
||||
ply_fine,
|
||||
ply_fine,
|
||||
ply_port,
|
||||
ply_fine,
|
||||
ply_endtie,
|
||||
SampleFreqSet,
|
||||
TrackStop,
|
||||
FadeOutBody,
|
||||
TrkVolPitSet,
|
||||
RealClearChain,
|
||||
SoundMainBTM,
|
||||
};
|
||||
|
||||
const u8 gScaleTable[] =
|
||||
{
|
||||
0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB,
|
||||
0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB,
|
||||
0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB,
|
||||
0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB,
|
||||
0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB,
|
||||
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B,
|
||||
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B,
|
||||
0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B,
|
||||
0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B,
|
||||
0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B,
|
||||
0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B,
|
||||
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B,
|
||||
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B,
|
||||
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B,
|
||||
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,
|
||||
};
|
||||
|
||||
const u32 gFreqTable[] =
|
||||
{
|
||||
2147483648u,
|
||||
2275179671u,
|
||||
2410468894u,
|
||||
2553802834u,
|
||||
2705659852u,
|
||||
2866546760u,
|
||||
3037000500u,
|
||||
3217589947u,
|
||||
3408917802u,
|
||||
3611622603u,
|
||||
3826380858u,
|
||||
4053909305u,
|
||||
};
|
||||
|
||||
const u16 gPcmSamplesPerVBlankTable[] =
|
||||
{
|
||||
96,
|
||||
132,
|
||||
176,
|
||||
224,
|
||||
264,
|
||||
304,
|
||||
352,
|
||||
448,
|
||||
528,
|
||||
608,
|
||||
672,
|
||||
704,
|
||||
};
|
||||
|
||||
const u8 gCgbScaleTable[] =
|
||||
{
|
||||
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,
|
||||
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B,
|
||||
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B,
|
||||
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B,
|
||||
0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B,
|
||||
0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B,
|
||||
0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B,
|
||||
0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B,
|
||||
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B,
|
||||
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B,
|
||||
0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB,
|
||||
};
|
||||
|
||||
const s16 gCgbFreqTable[] =
|
||||
{
|
||||
-2004,
|
||||
-1891,
|
||||
-1785,
|
||||
-1685,
|
||||
-1591,
|
||||
-1501,
|
||||
-1417,
|
||||
-1337,
|
||||
-1262,
|
||||
-1192,
|
||||
-1125,
|
||||
-1062,
|
||||
};
|
||||
|
||||
const u8 gNoiseTable[] =
|
||||
{
|
||||
0xD7, 0xD6, 0xD5, 0xD4,
|
||||
0xC7, 0xC6, 0xC5, 0xC4,
|
||||
0xB7, 0xB6, 0xB5, 0xB4,
|
||||
0xA7, 0xA6, 0xA5, 0xA4,
|
||||
0x97, 0x96, 0x95, 0x94,
|
||||
0x87, 0x86, 0x85, 0x84,
|
||||
0x77, 0x76, 0x75, 0x74,
|
||||
0x67, 0x66, 0x65, 0x64,
|
||||
0x57, 0x56, 0x55, 0x54,
|
||||
0x47, 0x46, 0x45, 0x44,
|
||||
0x37, 0x36, 0x35, 0x34,
|
||||
0x27, 0x26, 0x25, 0x24,
|
||||
0x17, 0x16, 0x15, 0x14,
|
||||
0x07, 0x06, 0x05, 0x04,
|
||||
0x03, 0x02, 0x01, 0x00,
|
||||
};
|
||||
|
||||
const u8 gCgb3Vol[] =
|
||||
{
|
||||
0x00, 0x00,
|
||||
0x60, 0x60, 0x60, 0x60,
|
||||
0x40, 0x40, 0x40, 0x40,
|
||||
0x80, 0x80, 0x80, 0x80,
|
||||
0x20, 0x20,
|
||||
};
|
||||
|
||||
const u8 gClockTable[] =
|
||||
{
|
||||
0x00,
|
||||
0x01,
|
||||
0x02,
|
||||
0x03,
|
||||
0x04,
|
||||
0x05,
|
||||
0x06,
|
||||
0x07,
|
||||
0x08,
|
||||
0x09,
|
||||
0x0A,
|
||||
0x0B,
|
||||
0x0C,
|
||||
0x0D,
|
||||
0x0E,
|
||||
0x0F,
|
||||
0x10,
|
||||
0x11,
|
||||
0x12,
|
||||
0x13,
|
||||
0x14,
|
||||
0x15,
|
||||
0x16,
|
||||
0x17,
|
||||
0x18,
|
||||
0x1C,
|
||||
0x1E,
|
||||
0x20,
|
||||
0x24,
|
||||
0x28,
|
||||
0x2A,
|
||||
0x2C,
|
||||
0x30,
|
||||
0x34,
|
||||
0x36,
|
||||
0x38,
|
||||
0x3C,
|
||||
0x40,
|
||||
0x42,
|
||||
0x44,
|
||||
0x48,
|
||||
0x4C,
|
||||
0x4E,
|
||||
0x50,
|
||||
0x54,
|
||||
0x58,
|
||||
0x5A,
|
||||
0x5C,
|
||||
0x60,
|
||||
};
|
||||
|
||||
const XcmdFunc gXcmdTable[] =
|
||||
{
|
||||
ply_xxx,
|
||||
ply_xwave,
|
||||
ply_xtype,
|
||||
ply_xxx,
|
||||
ply_xatta,
|
||||
ply_xdeca,
|
||||
ply_xsust,
|
||||
ply_xrele,
|
||||
ply_xiecv,
|
||||
ply_xiecl,
|
||||
ply_xleng,
|
||||
ply_xswee
|
||||
};
|
||||
12
src/memory.c
12
src/memory.c
|
|
@ -113,7 +113,7 @@ void DoInitHeap(struct HeapDescriptor *descriptor, struct HeapSettings *settings
|
|||
descriptor->start = settings->start;
|
||||
descriptor->size = aligned_size;
|
||||
descriptor->unk0 = 2;
|
||||
descriptor->unk4 = 0;
|
||||
descriptor->parentHeap = NULL;
|
||||
descriptor->freeList = freeList;
|
||||
descriptor->freeCount = 1;
|
||||
descriptor->freeListLength = freeListLength;
|
||||
|
|
@ -126,7 +126,7 @@ void DoInitHeap(struct HeapDescriptor *descriptor, struct HeapSettings *settings
|
|||
freeList->grp = 0;
|
||||
}
|
||||
|
||||
void InitSubHeap(struct HeapDescriptor *parentHeap, struct HeapFreeListElement *start, u32 freeListMax)
|
||||
void InitSubHeap(struct HeapDescriptor *parentHeap, struct HeapMemoryBlock *block, u32 freeListMax)
|
||||
{
|
||||
u32 freeListSize;
|
||||
u32 aligned_size;
|
||||
|
|
@ -137,9 +137,9 @@ void InitSubHeap(struct HeapDescriptor *parentHeap, struct HeapFreeListElement *
|
|||
freeListSize = freeListMax * 3;
|
||||
alignment = ~3;
|
||||
freeListSize *= 8;
|
||||
aligned_size = (start->atb - freeListSize) & alignment; //possible struct misalignment?
|
||||
freeList = (struct HeapFreeListElement *)start->unk_atb;
|
||||
settings.start = &((u8 *)start->unk_atb)[freeListSize];
|
||||
aligned_size = (block->size - freeListSize) & alignment;
|
||||
freeList = (struct HeapFreeListElement *)block->start;
|
||||
settings.start = &((u8 *)block->start)[freeListSize];
|
||||
settings.size = aligned_size;
|
||||
DoInitHeap(parentHeap, &settings, freeList, freeListMax);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@ void sub_80129FC()
|
|||
MemoryFree(gUnknown_203B194);
|
||||
gUnknown_203B194 = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
#include "global.h"
|
||||
|
||||
void sub_8004D8C(u32);
|
||||
void ResetSprites(bool32);
|
||||
void SetSavingIconCoords(u32);
|
||||
|
||||
void InitSprites(void)
|
||||
{
|
||||
sub_8004D8C(1);
|
||||
ResetSprites(1);
|
||||
SetSavingIconCoords(0);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ gUnknown_20008F0 = .; /* 20008F0 */
|
|||
gUnknown_2000970 = .; /* 2000970 */
|
||||
. += 0xC0;
|
||||
|
||||
gUnknown_2000A30 = .; /* 2000A30 */
|
||||
gMPlayMemAccArea = .; /* 2000A30 */
|
||||
. += 0x50;
|
||||
|
||||
gUnknown_2000A80 = .; /* 2000A80 */
|
||||
|
|
@ -82,13 +82,13 @@ gUnknown_2025EA8 = .; /* 2025EA8 */
|
|||
gUnknown_20262A8 = .; /* 20262A8 */
|
||||
. += 0x400;
|
||||
|
||||
gUnknown_20266A8 = .; /* 20266A8 */
|
||||
gSpriteCount = .; /* 20266A8 */
|
||||
. += 0x8;
|
||||
|
||||
gUnknown_20266B0 = .; /* 20266B0 */
|
||||
. += 0x780;
|
||||
|
||||
gUnknown_2026E30 = .; /* 2026E30 */
|
||||
gCharMemCursor = .; /* 2026E30 */
|
||||
. += 0x8;
|
||||
|
||||
gUnknown_2026E38 = .; /* 2026E38 */
|
||||
|
|
@ -519,7 +519,10 @@ gDungeonNameBannerPalette = .; /* 202EC88 */
|
|||
. += 0x4;
|
||||
|
||||
gDungeonNameBannerFontFile = .; /* 202EC8C */
|
||||
. += 0x8;
|
||||
. += 0x4;
|
||||
|
||||
gDungeonNameBannerFont = .; /* 202EC90 */
|
||||
. += 0x4;
|
||||
|
||||
gUnknown_202EC94 = .; /* 202EC94 */
|
||||
. += 0x4;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,10 @@
|
|||
. = ALIGN(2);
|
||||
|
||||
gUnknown_2039ED0 = .; /* 2039ED0 */
|
||||
gSoundInfo = .; /* 2039ED0 */
|
||||
. += 0xFB0;
|
||||
|
||||
gUnknown_203AE80 = .; /* 203AE80 */
|
||||
. += 0x4;
|
||||
|
||||
gUnknown_203AE84 = .; /* 203AE84 */
|
||||
. += 0x84;
|
||||
gMPlayJumpTable = .; /* 203AE80 */
|
||||
. += 0x88;
|
||||
|
||||
gUnknown_203AF08 = .; /* 203AF08 */
|
||||
. += 0x4;
|
||||
|
|
@ -15,7 +12,7 @@ gUnknown_203AF08 = .; /* 203AF08 */
|
|||
gUnknown_203AF0C = .; /* 203AF0C */
|
||||
. += 0x4;
|
||||
|
||||
gUnknown_203AF10 = .; /* 203AF10 */
|
||||
gCgbChans = .; /* 203AF10 */
|
||||
. += 0x100;
|
||||
|
||||
gFlashTimeoutFlag = .; /* 203B010 */
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user