diff options
| author | scnorton <scnorton@biociphers.org> | 2019-03-24 20:08:49 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2019-03-24 20:08:49 -0400 |
| commit | 708f128568816f2c1efc14c5565a32240f83f171 (patch) | |
| tree | 62e58d7344f8c1ac83a21a86dc3c27d5867edbc0 | |
| parent | 2136187c113be3c1bc0627c23915f88e0c8a6fc7 (diff) | |
| parent | d7a9fcb9755cd06e4e0245b848e44f4ff75e22cb (diff) | |
Merge branch 'master' into dodrio_berry_picking
137 files changed, 1196 insertions, 6791 deletions
diff --git a/asm/berry_crush.s b/asm/berry_crush.s index 4d5840970..9286a9b4f 100755 --- a/asm/berry_crush.s +++ b/asm/berry_crush.s @@ -404,7 +404,7 @@ _08020F48: ldr r1, [r4] ldr r0, [r1, 0x68] str r0, [r1, 0x1C] - bl sub_8024700 + bl GiveBerryPowder lsls r0, 24 cmp r0, 0 bne _08020F66 @@ -6510,7 +6510,7 @@ _080240DC: movs r3, 0x6 bl ConvertIntToDecimalStringN ldr r4, =gStringVar2 - bl sub_80247BC + bl GetBerryPowder adds r1, r0, 0 adds r0, r4, 0 movs r2, 0 diff --git a/asm/berry_powder_vendor.s b/asm/berry_powder_vendor.s deleted file mode 100755 index 308e5af41..000000000 --- a/asm/berry_powder_vendor.s +++ /dev/null @@ -1,374 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8024668 -sub_8024668: @ 8024668 - ldr r1, =gSaveBlock2Ptr - ldr r1, [r1] - adds r1, 0xAC - ldr r0, [r0] - ldr r1, [r1] - eors r0, r1 - bx lr - .pool - thumb_func_end sub_8024668 - - thumb_func_start SetBerryPowder -SetBerryPowder: @ 802467C - ldr r2, =gSaveBlock2Ptr - ldr r2, [r2] - adds r2, 0xAC - ldr r2, [r2] - eors r2, r1 - str r2, [r0] - bx lr - .pool - thumb_func_end SetBerryPowder - - thumb_func_start ApplyNewEncryptionKeyToBerryPowder -ApplyNewEncryptionKeyToBerryPowder: @ 8024690 - push {lr} - adds r1, r0, 0 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - movs r2, 0xFA - lsls r2, 1 - adds r0, r2 - bl ApplyNewEncryptionKeyToWord - pop {r0} - bx r0 - .pool - thumb_func_end ApplyNewEncryptionKeyToBerryPowder - - thumb_func_start sub_80246AC -sub_80246AC: @ 80246AC - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - movs r1, 0xFA - lsls r1, 1 - adds r0, r1 - bl sub_8024668 - cmp r0, r4 - bcc _080246CC - movs r0, 0x1 - b _080246CE - .pool -_080246CC: - movs r0, 0 -_080246CE: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80246AC - - thumb_func_start sub_80246D4 -sub_80246D4: @ 80246D4 - push {lr} - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - movs r1, 0xFA - lsls r1, 1 - adds r0, r1 - bl sub_8024668 - ldr r1, =gSpecialVar_0x8004 - ldrh r1, [r1] - cmp r0, r1 - bcc _080246F8 - movs r0, 0x1 - b _080246FA - .pool -_080246F8: - movs r0, 0 -_080246FA: - pop {r1} - bx r1 - thumb_func_end sub_80246D4 - - thumb_func_start sub_8024700 -sub_8024700: @ 8024700 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - movs r1, 0xFA - lsls r1, 1 - adds r5, r0, r1 - adds r0, r5, 0 - bl sub_8024668 - adds r1, r0, r4 - ldr r2, =0x0001869f @ Note to decompiler: See UNKNOWN_OFFSET - cmp r1, r2 - bhi _08024730 - adds r0, r5, 0 - bl SetBerryPowder - movs r0, 0x1 - b _0802473A - .pool -_08024730: - adds r0, r5, 0 - adds r1, r2, 0 - bl SetBerryPowder - movs r0, 0 -_0802473A: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8024700 - - thumb_func_start sub_8024740 -sub_8024740: @ 8024740 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - movs r1, 0xFA - lsls r1, 1 - adds r4, r0, r1 - adds r0, r5, 0 - bl sub_80246AC - lsls r0, 24 - cmp r0, 0 - beq _08024774 - adds r0, r4, 0 - bl sub_8024668 - adds r1, r0, 0 - subs r1, r5 - adds r0, r4, 0 - bl SetBerryPowder - movs r0, 0x1 - b _08024776 - .pool -_08024774: - movs r0, 0 -_08024776: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8024740 - - thumb_func_start sub_802477C -sub_802477C: @ 802477C - push {r4,r5,lr} - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - movs r1, 0xFA - lsls r1, 1 - adds r4, r0, r1 - ldr r5, =gSpecialVar_0x8004 - ldrh r0, [r5] - bl sub_80246AC - lsls r0, 24 - cmp r0, 0 - beq _080247B4 - adds r0, r4, 0 - bl sub_8024668 - adds r1, r0, 0 - ldrh r0, [r5] - subs r1, r0 - adds r0, r4, 0 - bl SetBerryPowder - movs r0, 0x1 - b _080247B6 - .pool -_080247B4: - movs r0, 0 -_080247B6: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_802477C - - thumb_func_start sub_80247BC -sub_80247BC: @ 80247BC - push {lr} - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - movs r1, 0xFA - lsls r1, 1 - adds r0, r1 - bl sub_8024668 - pop {r1} - bx r1 - .pool - thumb_func_end sub_80247BC - - thumb_func_start sub_80247D4 -sub_80247D4: @ 80247D4 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - sub sp, 0xC - adds r6, r0, 0 - mov r8, r2 - adds r4, r3, 0 - ldr r5, [sp, 0x24] - lsls r6, 24 - lsrs r6, 24 - mov r0, r8 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - ldr r0, =gStringVar1 - mov r9, r0 - movs r2, 0x1 - movs r3, 0x5 - bl ConvertIntToDecimalStringN - str r4, [sp] - str r5, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x1 - mov r2, r9 - mov r3, r8 - bl AddTextPrinterParameterized - add sp, 0xC - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80247D4 - - thumb_func_start sub_802482C -sub_802482C: @ 802482C - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0xC - adds r6, r0, 0 - adds r4, r1, 0 - adds r5, r2, 0 - mov r8, r3 - lsls r6, 24 - lsrs r6, 24 - lsls r4, 16 - lsrs r4, 16 - lsls r5, 24 - lsrs r5, 24 - adds r0, r6, 0 - movs r1, 0 - adds r2, r4, 0 - adds r3, r5, 0 - bl DrawStdFrameWithCustomTileAndPalette - ldr r2, =gText_Powder - movs r0, 0x1 - str r0, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r4, 0 - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x1 - movs r3, 0 - bl AddTextPrinterParameterized - str r4, [sp] - adds r0, r6, 0 - mov r1, r8 - movs r2, 0x1A - movs r3, 0x11 - bl sub_80247D4 - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_802482C - - thumb_func_start sub_802488C -sub_802488C: @ 802488C - push {lr} - sub sp, 0x4 - bl sub_80247BC - adds r1, r0, 0 - ldr r0, =gUnknown_02022C94 - ldrb r0, [r0] - movs r2, 0 - str r2, [sp] - movs r2, 0x1A - movs r3, 0x11 - bl sub_80247D4 - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end sub_802488C - - thumb_func_start sub_80248B0 -sub_80248B0: @ 80248B0 - push {r4,r5,lr} - sub sp, 0x18 - movs r0, 0x7 - str r0, [sp] - movs r0, 0x4 - str r0, [sp, 0x4] - movs r0, 0xF - str r0, [sp, 0x8] - movs r0, 0x1C - str r0, [sp, 0xC] - add r0, sp, 0x10 - movs r1, 0 - movs r2, 0x1 - movs r3, 0x1 - bl SetWindowTemplateFields - ldr r4, =gUnknown_02022C94 - add r0, sp, 0x10 - bl AddWindow - strb r0, [r4] - ldrb r0, [r4] - movs r1, 0 - bl FillWindowPixelBuffer - ldrb r0, [r4] - bl PutWindowTilemap - ldrb r0, [r4] - ldr r5, =0x0000021d - adds r1, r5, 0 - movs r2, 0xD0 - bl LoadUserWindowBorderGfx_ - ldrb r4, [r4] - bl sub_80247BC - adds r3, r0, 0 - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0xD - bl sub_802482C - add sp, 0x18 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80248B0 - - thumb_func_start sub_8024918 -sub_8024918: @ 8024918 - push {r4,lr} - ldr r4, =gUnknown_02022C94 - ldrb r0, [r4] - bl ClearWindowTilemap - ldrb r0, [r4] - movs r1, 0x1 - bl ClearStdWindowAndFrameToTransparent - ldrb r0, [r4] - bl RemoveWindow - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8024918 - - .align 2, 0 @ don't pad with nop diff --git a/asm/mevent2.s b/asm/mevent2.s deleted file mode 100755 index 6d894207f..000000000 --- a/asm/mevent2.s +++ /dev/null @@ -1,1425 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - -@void sub_801AFD8() { -@ CpuFill32(0, &gSaveBlock1Ptr->field_322C, 219); -@ sub_801B180(); -@ sub_811F8BC(); -@} - thumb_func_start sub_801AFD8 -sub_801AFD8: @ 801AFD8 - push {lr} - sub sp, 0x4 - movs r0, 0 - str r0, [sp] - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, =0x0000322c - adds r1, r0 - ldr r2, =0x050000db - mov r0, sp - bl CpuSet - bl sub_801B180 - bl sub_811F8BC - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end sub_801AFD8 - - thumb_func_start sub_801B00C -sub_801B00C: @ 801B00C - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003230 - adds r0, r1 - bx lr - .pool - thumb_func_end sub_801B00C - - thumb_func_start sav1_get_mevent_buffer_1 -sav1_get_mevent_buffer_1: @ 801B020 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x000033f0 - adds r0, r1 - bx lr - .pool - thumb_func_end sav1_get_mevent_buffer_1 - - thumb_func_start sav1_get_mevent_buffer_2 -sav1_get_mevent_buffer_2: @ 801B034 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - movs r1, 0xD5 - lsls r1, 6 - adds r0, r1 - bx lr - .pool - thumb_func_end sav1_get_mevent_buffer_2 - - thumb_func_start GetSaveBlock1Field356C -GetSaveBlock1Field356C: @ 801B044 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x0000356c - adds r0, r1 - bx lr - .pool - thumb_func_end GetSaveBlock1Field356C - - thumb_func_start GetSaveBlock1Field3564 -GetSaveBlock1Field3564: @ 801B058 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003564 - adds r0, r1 - bx lr - .pool - thumb_func_end GetSaveBlock1Field3564 - - thumb_func_start sub_801B06C -sub_801B06C: @ 801B06C - push {lr} - bl sub_801B14C - pop {r0} - bx r0 - thumb_func_end sub_801B06C - - thumb_func_start sub_801B078 -sub_801B078: @ 801B078 - push {r4-r7,lr} - adds r7, r0, 0 - bl sub_801B114 - cmp r0, 0 - beq _0801B0C4 - bl sub_801B14C - ldr r4, =gSaveBlock1Ptr - ldr r0, [r4] - ldr r5, =0x00003230 - adds r0, r5 - movs r6, 0xDE - lsls r6, 1 - adds r1, r7, 0 - adds r2, r6, 0 - bl memcpy - ldr r0, [r4] - adds r0, r5 - adds r1, r6, 0 - bl CalcCRC16WithTable - ldr r1, [r4] - ldr r2, =0x0000322c - adds r1, r2 - lsls r0, 16 - lsrs r0, 16 - str r0, [r1] - movs r0, 0x1 - b _0801B0C6 - .pool -_0801B0C4: - movs r0, 0 -_0801B0C6: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_801B078 - - thumb_func_start sub_801B0CC -sub_801B0CC: @ 801B0CC - push {r4,lr} - ldr r4, =gSaveBlock1Ptr - ldr r0, [r4] - ldr r1, =0x00003230 - adds r0, r1 - movs r1, 0xDE - lsls r1, 1 - bl CalcCRC16WithTable - lsls r0, 16 - lsrs r0, 16 - ldr r4, [r4] - ldr r2, =0x0000322c - adds r1, r4, r2 - ldr r1, [r1] - cmp r0, r1 - bne _0801B10C - ldr r1, =0x00003230 - adds r0, r4, r1 - bl sub_801B114 - cmp r0, 0 - beq _0801B10C - movs r0, 0x1 - b _0801B10E - .pool -_0801B10C: - movs r0, 0 -_0801B10E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_801B0CC - - thumb_func_start sub_801B114 -sub_801B114: @ 801B114 - push {lr} - ldrh r0, [r0] - cmp r0, 0 - beq _0801B120 - movs r0, 0x1 - b _0801B122 -_0801B120: - movs r0, 0 -_0801B122: - pop {r1} - bx r1 - thumb_func_end sub_801B114 - - thumb_func_start sub_801B128 -sub_801B128: @ 801B128 - push {lr} - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003230 - adds r0, r1 - ldrb r0, [r0, 0x2] - cmp r0, 0 - beq _0801B144 - movs r0, 0x1 - b _0801B146 - .pool -_0801B144: - movs r0, 0 -_0801B146: - pop {r1} - bx r1 - thumb_func_end sub_801B128 - - thumb_func_start sub_801B14C -sub_801B14C: @ 801B14C - push {r4,lr} - sub sp, 0x4 - movs r4, 0 - str r4, [sp] - bl sub_801B00C - adds r1, r0, 0 - ldr r2, =0x0500006f - mov r0, sp - bl CpuSet - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x0000322c - adds r0, r1 - str r4, [r0] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_801B14C - - thumb_func_start sub_801B180 -sub_801B180: @ 801B180 - push {lr} - sub sp, 0x4 - movs r0, 0 - str r0, [sp] - bl GetSaveBlock1Field356C - adds r1, r0, 0 - ldr r2, =0x05000001 - mov r0, sp - bl CpuSet - bl sub_801DBC0 - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end sub_801B180 - - thumb_func_start sub_801B1A4 -sub_801B1A4: @ 801B1A4 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003230 - adds r4, r0, r1 - bl sub_801B0CC - cmp r0, 0 - bne _0801B1C4 -_0801B1B8: - movs r0, 0 - b _0801B1DC - .pool -_0801B1C4: - movs r2, 0 - ldr r3, =0x000001bb -_0801B1C8: - adds r0, r4, r2 - adds r1, r5, r2 - ldrb r0, [r0] - ldrb r1, [r1] - cmp r0, r1 - bne _0801B1B8 - adds r2, 0x1 - cmp r2, r3 - bls _0801B1C8 - movs r0, 0x1 -_0801B1DC: - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_801B1A4 - - thumb_func_start sub_801B1E8 -sub_801B1E8: @ 801B1E8 - push {lr} - bl sub_801B330 - bl sub_801B368 - bl sub_801B9F8 - bl ClearRamScript - bl sub_809D4D8 - bl sub_809D570 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =0x00000bec - adds r0, r1 - bl ClearEReaderTrainer - pop {r0} - bx r0 - .pool - thumb_func_end sub_801B1E8 - - thumb_func_start sub_801B21C -sub_801B21C: @ 801B21C - push {r4-r7,lr} - adds r7, r0, 0 - bl sub_801B2CC - cmp r0, 0 - beq _0801B274 - bl sub_801B1E8 - ldr r4, =gSaveBlock1Ptr - ldr r0, [r4] - ldr r5, =0x000033f0 - adds r0, r5 - movs r6, 0xA6 - lsls r6, 1 - adds r1, r7, 0 - adds r2, r6, 0 - bl memcpy - ldr r0, [r4] - adds r0, r5 - adds r1, r6, 0 - bl CalcCRC16WithTable - ldr r1, [r4] - ldr r3, =0x000033ec - adds r2, r1, r3 - lsls r0, 16 - lsrs r0, 16 - str r0, [r2] - movs r0, 0xD5 - lsls r0, 6 - adds r2, r1, r0 - adds r1, r5 - ldrh r0, [r1, 0x2] - strh r0, [r2, 0x6] - movs r0, 0x1 - b _0801B276 - .pool -_0801B274: - movs r0, 0 -_0801B276: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_801B21C - - thumb_func_start sub_801B27C -sub_801B27C: @ 801B27C - push {r4,r5,lr} - ldr r5, =gSaveBlock1Ptr - ldr r0, [r5] - ldr r1, =0x000033ec - adds r4, r0, r1 - adds r1, 0x4 - adds r0, r1 - movs r1, 0xA6 - lsls r1, 1 - bl CalcCRC16WithTable - lsls r0, 16 - lsrs r0, 16 - ldr r1, [r4] - cmp r1, r0 - bne _0801B2C4 - ldr r0, [r5] - ldr r1, =0x000033f0 - adds r0, r1 - bl sub_801B2CC - cmp r0, 0 - beq _0801B2C4 - bl sub_80991F8 - cmp r0, 0 - beq _0801B2C4 - movs r0, 0x1 - b _0801B2C6 - .pool -_0801B2C4: - movs r0, 0 -_0801B2C6: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_801B27C - - thumb_func_start sub_801B2CC -sub_801B2CC: @ 801B2CC - push {lr} - adds r2, r0, 0 - ldrh r0, [r2] - cmp r0, 0 - beq _0801B302 - ldrb r1, [r2, 0x8] - lsls r0, r1, 30 - lsrs r0, 30 - cmp r0, 0x2 - bhi _0801B302 - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - beq _0801B2F0 - cmp r0, 0x40 - beq _0801B2F0 - cmp r0, 0x80 - bne _0801B302 -_0801B2F0: - lsls r0, r1, 26 - lsrs r0, 28 - cmp r0, 0x7 - bhi _0801B302 - ldrb r0, [r2, 0x9] - cmp r0, 0x7 - bhi _0801B302 - movs r0, 0x1 - b _0801B304 -_0801B302: - movs r0, 0 -_0801B304: - pop {r1} - bx r1 - thumb_func_end sub_801B2CC - - thumb_func_start sub_801B308 -sub_801B308: @ 801B308 - push {lr} - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x000033f0 - adds r0, r1 - ldrb r1, [r0, 0x8] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - beq _0801B328 - movs r0, 0x1 - b _0801B32A - .pool -_0801B328: - movs r0, 0 -_0801B32A: - pop {r1} - bx r1 - thumb_func_end sub_801B308 - - thumb_func_start sub_801B330 -sub_801B330: @ 801B330 - push {r4,r5,lr} - sub sp, 0x4 - movs r5, 0 - str r5, [sp] - ldr r4, =gSaveBlock1Ptr - ldr r1, [r4] - ldr r0, =0x000033f0 - adds r1, r0 - ldr r2, =0x05000053 - mov r0, sp - bl CpuSet - ldr r0, [r4] - ldr r1, =0x000033ec - adds r0, r1 - str r5, [r0] - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_801B330 - - thumb_func_start sub_801B368 -sub_801B368: @ 801B368 - push {r4,lr} - sub sp, 0x4 - movs r4, 0 - str r4, [sp] - bl sav1_get_mevent_buffer_2 - adds r1, r0, 0 - ldr r2, =0x05000009 - mov r0, sp - bl CpuSet - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x0000353c - adds r0, r1 - str r4, [r0] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_801B368 - - thumb_func_start sub_801B39C -sub_801B39C: @ 801B39C - push {lr} - bl sub_801B27C - cmp r0, 0 - bne _0801B3AA - movs r0, 0 - b _0801B3B4 -_0801B3AA: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x000033f0 - adds r0, r1 - ldrh r0, [r0] -_0801B3B4: - pop {r1} - bx r1 - .pool - thumb_func_end sub_801B39C - - thumb_func_start sub_801B3C0 -sub_801B3C0: @ 801B3C0 - push {lr} - adds r2, r0, 0 - ldrb r1, [r2, 0x8] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x40 - bne _0801B3D4 - movs r0, 0x3F - ands r0, r1 - strb r0, [r2, 0x8] -_0801B3D4: - pop {r0} - bx r0 - thumb_func_end sub_801B3C0 - - thumb_func_start sub_801B3D8 -sub_801B3D8: @ 801B3D8 - push {lr} - lsls r0, 16 - ldr r1, =0xfc180000 - adds r0, r1 - lsrs r0, 16 - cmp r0, 0x13 - bls _0801B3F0 - movs r0, 0 - b _0801B3F2 - .pool -_0801B3F0: - movs r0, 0x1 -_0801B3F2: - pop {r1} - bx r1 - thumb_func_end sub_801B3D8 - - thumb_func_start sub_801B3F8 -sub_801B3F8: @ 801B3F8 - push {r4,lr} - bl sub_801B39C - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r4, 0 - bl sub_801B3D8 - cmp r0, 0 - beq _0801B430 - ldr r1, =gUnknown_082F0DE8 - ldr r2, =0xfffffc18 - adds r0, r4, r2 - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0801B430 - movs r0, 0x1 - b _0801B432 - .pool -_0801B430: - movs r0, 0 -_0801B432: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_801B3F8 - - thumb_func_start sub_801B438 -sub_801B438: @ 801B438 - push {lr} - movs r3, 0 - cmp r3, r1 - bge _0801B45A - adds r2, r0, 0 - adds r2, 0x8 -_0801B444: - ldrh r0, [r2, 0xE] - cmp r0, 0 - beq _0801B452 - ldrh r0, [r2] - cmp r0, 0 - beq _0801B452 - adds r3, 0x1 -_0801B452: - adds r2, 0x2 - subs r1, 0x1 - cmp r1, 0 - bne _0801B444 -_0801B45A: - adds r0, r3, 0 - pop {r1} - bx r1 - thumb_func_end sub_801B438 - - thumb_func_start sub_801B460 -sub_801B460: @ 801B460 - push {r4-r7,lr} - adds r5, r0, 0 - adds r4, r1, 0 - movs r1, 0 - cmp r1, r2 - bge _0801B49A - ldrh r6, [r4, 0x2] - movs r0, 0x16 - adds r0, r5 - mov r12, r0 -_0801B474: - lsls r3, r1, 1 - mov r7, r12 - ldrh r0, [r7] - cmp r0, r6 - beq _0801B48C - adds r0, r5, 0 - adds r0, 0x8 - adds r0, r3 - ldrh r0, [r0] - ldrh r3, [r4] - cmp r0, r3 - bne _0801B490 -_0801B48C: - movs r0, 0x1 - b _0801B49C -_0801B490: - movs r7, 0x2 - add r12, r7 - adds r1, 0x1 - cmp r1, r2 - blt _0801B474 -_0801B49A: - movs r0, 0 -_0801B49C: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_801B460 - - thumb_func_start sub_801B4A4 -sub_801B4A4: @ 801B4A4 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x2] - cmp r0, 0 - beq _0801B4C4 - ldrh r1, [r1] - cmp r1, 0 - beq _0801B4C4 - ldr r0, =0x0000019b - cmp r1, r0 - bhi _0801B4C4 - movs r0, 0x1 - b _0801B4C6 - .pool -_0801B4C4: - movs r0, 0 -_0801B4C6: - pop {r1} - bx r1 - thumb_func_end sub_801B4A4 - - thumb_func_start sub_801B4CC -sub_801B4CC: @ 801B4CC - push {lr} - bl sub_801B27C - cmp r0, 0 - beq _0801B500 - ldr r0, =gSaveBlock1Ptr - ldr r3, [r0] - ldr r0, =0x000033f0 - adds r2, r3, r0 - ldrb r1, [r2, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _0801B500 - movs r1, 0xD5 - lsls r1, 6 - adds r0, r3, r1 - ldrb r1, [r2, 0x9] - bl sub_801B438 - b _0801B502 - .pool -_0801B500: - movs r0, 0 -_0801B502: - pop {r1} - bx r1 - thumb_func_end sub_801B4CC - - thumb_func_start sub_801B508 -sub_801B508: @ 801B508 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r6, =gSaveBlock1Ptr - ldr r0, [r6] - ldr r1, =0x000033f0 - adds r0, r1 - ldrb r4, [r0, 0x9] - adds r0, r5, 0 - bl sub_801B4A4 - cmp r0, 0 - beq _0801B572 - ldr r0, [r6] - movs r1, 0xD5 - lsls r1, 6 - adds r0, r1 - adds r1, r5, 0 - adds r2, r4, 0 - bl sub_801B460 - cmp r0, 0 - beq _0801B54C - b _0801B572 - .pool -_0801B540: - ldrh r0, [r5, 0x2] - strh r0, [r1] - ldrh r0, [r5] - strh r0, [r2] - movs r0, 0x1 - b _0801B574 -_0801B54C: - movs r3, 0 - cmp r3, r4 - bge _0801B572 - ldr r0, [r6] - ldr r6, =0x00003548 - adds r2, r0, r6 - adds r6, 0xE - adds r1, r0, r6 -_0801B55C: - ldrh r0, [r2, 0xE] - cmp r0, 0 - bne _0801B568 - ldrh r0, [r2] - cmp r0, 0 - beq _0801B540 -_0801B568: - adds r2, 0x2 - adds r1, 0x2 - adds r3, 0x1 - cmp r3, r4 - blt _0801B55C -_0801B572: - movs r0, 0 -_0801B574: - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_801B508 - - thumb_func_start sub_801B580 -sub_801B580: @ 801B580 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - adds r5, r0, 0 - adds r4, r1, 0 - movs r0, 0 - str r0, [sp] - ldr r2, =0x05000019 - mov r0, sp - adds r1, r5, 0 - bl CpuSet - ldr r0, =0x00000101 - str r0, [r5] - movs r0, 0x1 - strh r0, [r5, 0x4] - str r0, [r5, 0x8] - cmp r4, 0 - beq _0801B5C0 - movs r0, 0x5 - strh r0, [r5, 0xC] - ldr r0, =0x00000201 - b _0801B5C8 - .pool -_0801B5C0: - movs r0, 0x4 - strh r0, [r5, 0xC] - movs r0, 0x80 - lsls r0, 2 -_0801B5C8: - str r0, [r5, 0x10] - bl sub_801B27C - cmp r0, 0 - beq _0801B5FC - bl sav1_get_mevent_buffer_1 - ldrh r0, [r0] - strh r0, [r5, 0x14] - bl sav1_get_mevent_buffer_2 - adds r1, r5, 0 - adds r1, 0x20 - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - bl sav1_get_mevent_buffer_1 - ldrb r1, [r0, 0x9] - adds r0, r5, 0 - adds r0, 0x44 - strb r1, [r0] - b _0801B5FE -_0801B5FC: - strh r0, [r5, 0x14] -_0801B5FE: - adds r4, r5, 0 - adds r4, 0x4C - ldr r0, =gSaveBlock2Ptr - mov r8, r0 - adds r6, r5, 0 - adds r6, 0x45 - adds r7, r5, 0 - adds r7, 0x50 - movs r1, 0x5C - adds r1, r5 - mov r9, r1 - movs r2, 0x60 - adds r2, r5 - mov r10, r2 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r3, =0x00003564 - adds r2, r0, r3 - adds r1, r5, 0 - adds r1, 0x16 - movs r3, 0x3 -_0801B628: - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x2 - adds r1, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _0801B628 - mov r0, r8 - ldr r1, [r0] - adds r1, 0xA - adds r0, r4, 0 - bl CopyTrainerId - mov r2, r8 - ldr r1, [r2] - adds r0, r6, 0 - bl StringCopy - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r3, =0x00002bb0 - adds r2, r0, r3 - adds r1, r7, 0 - movs r3, 0x5 -_0801B658: - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x2 - adds r1, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _0801B658 - ldr r1, =RomHeaderGameCode - mov r0, r9 - movs r2, 0x4 - bl memcpy - ldr r0, =RomHeaderSoftwareVersion - ldrb r0, [r0] - mov r4, r10 - strb r0, [r4] - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_801B580 - - thumb_func_start sub_801B6A0 -sub_801B6A0: @ 801B6A0 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - ldr r1, [r2] - ldr r0, =0x00000101 - cmp r1, r0 - bne _0801B6DC - ldrh r1, [r2, 0x4] - movs r3, 0x1 - adds r0, r3, 0 - ands r0, r1 - cmp r0, 0 - beq _0801B6DC - ldr r0, [r2, 0x8] - ands r0, r3 - cmp r0, 0 - beq _0801B6DC - cmp r4, 0 - bne _0801B6E4 - ldrh r1, [r2, 0xC] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0801B6DC - ldr r0, [r2, 0x10] - movs r1, 0xE0 - lsls r1, 2 - ands r0, r1 - cmp r0, 0 - bne _0801B6E4 -_0801B6DC: - movs r0, 0 - b _0801B6E6 - .pool -_0801B6E4: - movs r0, 0x1 -_0801B6E6: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_801B6A0 - - thumb_func_start sub_801B6EC -sub_801B6EC: @ 801B6EC - push {lr} - ldrh r1, [r1, 0x14] - cmp r1, 0 - bne _0801B6F8 - movs r0, 0 - b _0801B704 -_0801B6F8: - ldrh r0, [r0] - cmp r0, r1 - beq _0801B702 - movs r0, 0x2 - b _0801B704 -_0801B702: - movs r0, 0x1 -_0801B704: - pop {r1} - bx r1 - thumb_func_end sub_801B6EC - - thumb_func_start sub_801B708 -sub_801B708: @ 801B708 - push {r4-r6,lr} - adds r6, r0, 0 - adds r4, r1, 0 - adds r5, r4, 0 - adds r5, 0x20 - adds r4, 0x44 - ldrb r1, [r4] - adds r0, r5, 0 - bl sub_801B438 - ldrb r2, [r4] - subs r4, r2, r0 - cmp r4, 0 - bne _0801B728 - movs r0, 0x1 - b _0801B742 -_0801B728: - adds r0, r5, 0 - adds r1, r6, 0 - bl sub_801B460 - cmp r0, 0 - beq _0801B738 - movs r0, 0x3 - b _0801B742 -_0801B738: - cmp r4, 0x1 - beq _0801B740 - movs r0, 0x2 - b _0801B742 -_0801B740: - movs r0, 0x4 -_0801B742: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_801B708 - - thumb_func_start sub_801B748 -sub_801B748: @ 801B748 - push {r4,lr} - movs r3, 0 - adds r2, r0, 0 - adds r2, 0x16 -_0801B750: - ldrh r0, [r2] - ldrh r4, [r1] - cmp r0, r4 - beq _0801B75C - movs r0, 0 - b _0801B768 -_0801B75C: - adds r1, 0x2 - adds r2, 0x2 - adds r3, 0x1 - cmp r3, 0x3 - ble _0801B750 - movs r0, 0x1 -_0801B768: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_801B748 - - thumb_func_start sub_801B770 -sub_801B770: @ 801B770 - push {lr} - adds r2, r0, 0 - adds r2, 0x20 - adds r0, 0x44 - ldrb r1, [r0] - adds r0, r2, 0 - bl sub_801B438 - pop {r1} - bx r1 - thumb_func_end sub_801B770 - - thumb_func_start sub_801B784 -sub_801B784: @ 801B784 - push {lr} - adds r2, r0, 0 - cmp r1, 0x4 - bhi _0801B7D0 - lsls r0, r1, 2 - ldr r1, =_0801B79C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0801B79C: - .4byte _0801B7B0 - .4byte _0801B7B4 - .4byte _0801B7B8 - .4byte _0801B7BC - .4byte _0801B7C8 -_0801B7B0: - ldrh r0, [r2, 0x20] - b _0801B7D2 -_0801B7B4: - ldrh r0, [r2, 0x22] - b _0801B7D2 -_0801B7B8: - ldrh r0, [r2, 0x24] - b _0801B7D2 -_0801B7BC: - adds r0, r2, 0 - bl sub_801B770 - lsls r0, 16 - lsrs r0, 16 - b _0801B7D2 -_0801B7C8: - adds r0, r2, 0 - adds r0, 0x44 - ldrb r0, [r0] - b _0801B7D2 -_0801B7D0: - movs r0, 0 -_0801B7D2: - pop {r1} - bx r1 - thumb_func_end sub_801B784 - - thumb_func_start sub_801B7D8 -sub_801B7D8: @ 801B7D8 - push {r4,lr} - adds r4, r0, 0 - ldr r2, =gSaveBlock1Ptr - ldr r0, [r2] - ldr r1, =0x000033f0 - adds r0, r1 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - adds r3, r2, 0 - cmp r0, 0x2 - bne _0801B850 - movs r2, 0 - cmp r4, 0x4 - bhi _0801B83A - lsls r0, r4, 2 - ldr r1, =_0801B80C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0801B80C: - .4byte _0801B820 - .4byte _0801B828 - .4byte _0801B834 - .4byte _0801B83A - .4byte _0801B83A -_0801B820: - ldr r0, [r3] - movs r1, 0xD5 - lsls r1, 6 - b _0801B838 -_0801B828: - ldr r0, [r3] - ldr r1, =0x00003542 - b _0801B838 - .pool -_0801B834: - ldr r0, [r3] - ldr r1, =0x00003544 -_0801B838: - adds r2, r0, r1 -_0801B83A: - cmp r2, 0 - beq _0801B850 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - lsls r0, 16 - lsrs r0, 16 - ldr r1, =0x000003e7 - cmp r0, r1 - bls _0801B850 - strh r1, [r2] -_0801B850: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_801B7D8 - - thumb_func_start mevent_081445C0 -mevent_081445C0: @ 801B860 - push {lr} - cmp r0, 0x4 - bhi _0801B938 - lsls r0, 2 - ldr r1, =_0801B874 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0801B874: - .4byte _0801B888 - .4byte _0801B8AC - .4byte _0801B8D0 - .4byte _0801B8F4 - .4byte _0801B918 -_0801B888: - ldr r0, =gSaveBlock1Ptr - ldr r2, [r0] - ldr r1, =0x000033f0 - adds r0, r2, r1 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x2 - bne _0801B938 - movs r1, 0xD5 - lsls r1, 6 - adds r0, r2, r1 - ldrh r0, [r0] - b _0801B93A - .pool -_0801B8AC: - ldr r0, =gSaveBlock1Ptr - ldr r2, [r0] - ldr r1, =0x000033f0 - adds r0, r2, r1 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x2 - bne _0801B938 - movs r1, 0xD5 - lsls r1, 6 - adds r0, r2, r1 - ldrh r0, [r0, 0x2] - b _0801B93A - .pool -_0801B8D0: - ldr r0, =gSaveBlock1Ptr - ldr r2, [r0] - ldr r1, =0x000033f0 - adds r0, r2, r1 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x2 - bne _0801B938 - movs r1, 0xD5 - lsls r1, 6 - adds r0, r2, r1 - ldrh r0, [r0, 0x4] - b _0801B93A - .pool -_0801B8F4: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x000033f0 - adds r0, r1 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _0801B938 - bl sub_801B4CC - lsls r0, 16 - lsrs r0, 16 - b _0801B93A - .pool -_0801B918: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x000033f0 - adds r2, r0, r1 - ldrb r1, [r2, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _0801B938 - ldrb r0, [r2, 0x9] - b _0801B93A - .pool -_0801B938: - movs r0, 0 -_0801B93A: - pop {r1} - bx r1 - thumb_func_end mevent_081445C0 - - thumb_func_start sub_801B940 -sub_801B940: @ 801B940 - ldr r1, =gUnknown_02022C70 - movs r0, 0 - str r0, [r1] - bx lr - .pool - thumb_func_end sub_801B940 - - thumb_func_start sub_801B94C -sub_801B94C: @ 801B94C - push {r4,r5,lr} - lsls r0, 16 - lsrs r0, 16 - adds r4, r0, 0 - ldr r5, =gUnknown_02022C70 - movs r0, 0 - str r0, [r5] - cmp r4, 0 - beq _0801B98A - bl sub_801B27C - cmp r0, 0 - beq _0801B988 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x000033f0 - adds r0, r1 - ldrh r0, [r0] - cmp r0, r4 - bne _0801B988 - movs r0, 0x1 - str r0, [r5] - b _0801B98A - .pool -_0801B988: - movs r0, 0 -_0801B98A: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_801B94C - - thumb_func_start sub_801B990 -sub_801B990: @ 801B990 - push {lr} - adds r2, r0, 0 - ldr r0, =gUnknown_02022C70 - ldr r0, [r0] - cmp r0, 0 - beq _0801B9EC - cmp r2, 0x1 - beq _0801B9DC - cmp r2, 0x1 - bcc _0801B9C0 - cmp r2, 0x2 - bne _0801B9EC - ldr r0, =gSaveBlock1Ptr - ldr r2, [r0] - ldr r0, =0x00003584 - adds r2, r0 - movs r0, 0x2 - b _0801B9CA - .pool -_0801B9C0: - ldr r0, =gSaveBlock1Ptr - ldr r2, [r0] - ldr r0, =0x00003570 - adds r2, r0 - movs r0, 0 -_0801B9CA: - movs r3, 0x5 - bl sub_801BA8C - b _0801B9EC - .pool -_0801B9DC: - ldr r0, =gSaveBlock1Ptr - ldr r2, [r0] - ldr r0, =0x00003570 - adds r2, r0 - movs r0, 0x1 - movs r3, 0x5 - bl sub_801BA8C -_0801B9EC: - pop {r0} - bx r0 - .pool - thumb_func_end sub_801B990 - - thumb_func_start sub_801B9F8 -sub_801B9F8: @ 801B9F8 - push {lr} - sub sp, 0x4 - movs r0, 0 - str r0, [sp] - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, =0x00003570 - adds r1, r0 - ldr r2, =0x0500000a - mov r0, sp - bl CpuSet - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end sub_801B9F8 - - thumb_func_start sub_801BA24 -sub_801BA24: @ 801BA24 - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - movs r1, 0 - cmp r1, r2 - bge _0801BA46 - ldr r0, [r4] - cmp r0, r5 - beq _0801BA46 - adds r3, r4, 0 -_0801BA38: - adds r3, 0x4 - adds r1, 0x1 - cmp r1, r2 - bge _0801BA46 - ldr r0, [r3] - cmp r0, r5 - bne _0801BA38 -_0801BA46: - cmp r1, r2 - bne _0801BA68 - subs r3, r1, 0x1 - cmp r3, 0 - ble _0801BA62 - lsls r0, r3, 2 - subs r0, 0x4 - adds r2, r0, r4 -_0801BA56: - ldr r0, [r2] - str r0, [r2, 0x4] - subs r2, 0x4 - subs r3, 0x1 - cmp r3, 0 - bgt _0801BA56 -_0801BA62: - str r5, [r4] - movs r0, 0x1 - b _0801BA84 -_0801BA68: - adds r3, r1, 0 - cmp r3, 0 - ble _0801BA80 - lsls r0, r3, 2 - subs r0, 0x4 - adds r2, r0, r4 -_0801BA74: - ldr r0, [r2] - str r0, [r2, 0x4] - subs r2, 0x4 - subs r3, 0x1 - cmp r3, 0 - bgt _0801BA74 -_0801BA80: - str r5, [r4] - movs r0, 0 -_0801BA84: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_801BA24 - - thumb_func_start sub_801BA8C -sub_801BA8C: @ 801BA8C - push {r4,lr} - adds r4, r0, 0 - adds r0, r1, 0 - adds r1, r2, 0 - adds r2, r3, 0 - bl sub_801BA24 - cmp r0, 0 - beq _0801BAA4 - adds r0, r4, 0 - bl sub_801B7D8 -_0801BAA4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_801BA8C - - .align 2, 0 @ don't pad with nop diff --git a/asm/mevent_news.s b/asm/mevent_news.s index 463e43c15..b49676ddb 100644 --- a/asm/mevent_news.s +++ b/asm/mevent_news.s @@ -9,7 +9,7 @@ sub_801DB68: @ 801DB68 push {r4,r5,lr} adds r4, r0, 0 - bl GetSaveBlock1Field356C + bl sub_801B044 adds r5, r0, 0 movs r0, 0x3 adds r1, r4, 0 @@ -55,7 +55,7 @@ _0801DBB8: thumb_func_start sub_801DBC0 sub_801DBC0: @ 801DBC0 push {lr} - bl GetSaveBlock1Field356C + bl sub_801B044 movs r1, 0 strb r1, [r0] strb r1, [r0, 0x1] @@ -72,7 +72,7 @@ sub_801DBDC: @ 801DBDC ldr r0, =0x0000402e bl GetVarPointer adds r4, r0, 0 - bl GetSaveBlock1Field356C + bl sub_801B044 adds r2, r0, 0 ldr r0, [r2] lsls r0, 24 @@ -103,7 +103,7 @@ _0801DC10: sub_801DC20: @ 801DC20 push {r4-r6,lr} ldr r6, =gSpecialVar_Result - bl GetSaveBlock1Field356C + bl sub_801B044 adds r4, r0, 0 bl IsMysteryEventEnabled cmp r0, 0 diff --git a/data/berry_powder_vendor.s b/data/berry_powder.s index 22e40771f..2e8002bdd 100755 --- a/data/berry_powder_vendor.s +++ b/data/berry_powder.s @@ -3,8 +3,9 @@ .section .rodata + .align 2 -gUnknown_082F7BA4_UnrefDupe:: @ 82F444C struct BgTemplate +gUnknown_082F7BA4_UnrefDupe:: @ 82F444C struct BgTemplate(???) .4byte 0x000001e0 .4byte 0x000012c9 .4byte 0x000012ea diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 1830c3f00..88bcb2e6c 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -732,11 +732,11 @@ SlateportCity_EventScript_1DD36E:: @ 81DD36E SlateportCity_EventScript_1DD39A:: @ 81DD39A setvar VAR_0x8004, 1 - specialvar VAR_RESULT, sub_80246D4 + specialvar VAR_RESULT, HasEnoughBerryPowder compare VAR_RESULT, 0 goto_if_eq SlateportCity_EventScript_1DD3C0 msgbox SlateportCity_Text_1DEE40, MSGBOX_DEFAULT - special sub_80248B0 + special DisplayBerryPowderVendorMenu goto SlateportCity_EventScript_1DD3CA end @@ -846,7 +846,7 @@ SlateportCity_EventScript_1DD536:: @ 81DD536 SlateportCity_EventScript_1DD54A:: @ 81DD54A msgbox SlateportCity_Text_1DEFBC, MSGBOX_DEFAULT - special sub_8024918 + special RemoveBerryPowderVendorMenu release end @@ -855,26 +855,26 @@ SlateportCity_EventScript_1DD557:: @ 81DD557 compare VAR_RESULT, 0 goto_if_eq SlateportCity_EventScript_1DD3CA copyvar VAR_0x8004, VAR_0x8009 - specialvar VAR_RESULT, sub_80246D4 + specialvar VAR_RESULT, HasEnoughBerryPowder compare VAR_RESULT, 0 goto_if_eq SlateportCity_EventScript_1DD5CE giveitem_std VAR_0x8008 compare VAR_RESULT, 0 goto_if_eq SlateportCity_EventScript_1DD5C1 copyvar VAR_0x8004, VAR_0x8009 - special sub_802477C - special sub_802488C + special TakeBerryPowder + special PrintPlayerBerryPowderAmount msgbox SlateportCity_Text_1DEEF7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq SlateportCity_EventScript_1DD3CA msgbox SlateportCity_Text_1DEF79, MSGBOX_DEFAULT - special sub_8024918 + special RemoveBerryPowderVendorMenu release end SlateportCity_EventScript_1DD5C1:: @ 81DD5C1 msgbox gUnknown_08272A89, MSGBOX_DEFAULT - special sub_8024918 + special RemoveBerryPowderVendorMenu release end diff --git a/data/mevent2.s b/data/mevent_801BAAC.s index cc2b69afe..37c1ae46f 100755 --- a/data/mevent2.s +++ b/data/mevent_801BAAC.s @@ -4,12 +4,6 @@ .section .rodata .align 2 -gUnknown_082F0DE8:: @ 82F0DE8 - .2byte 0x013a, 0x013b, 0x013c, 0x013d, 0x013e, 0x013f, 0x0140, 0x0141 - .2byte 0x0142, 0x0143, 0x0144, 0x0145, 0x0146, 0x0147, 0x0148, 0x0149 - .2byte 0x014a, 0x014b, 0x014c, 0x014d - - .align 2 gUnknown_082F0E10:: @ 82F0E10 .byte 0x00, 0x02, 0x03 .byte 0x00, 0x01, 0x02 diff --git a/data/specials.inc b/data/specials.inc index 9364dcc46..5a812cffa 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -471,11 +471,11 @@ gSpecials:: @ 81DBA64 def_special sub_813AA04 def_special sub_813AA18 def_special sub_813AA44 - def_special sub_80248B0 - def_special sub_8024918 - def_special sub_80246D4 - def_special sub_802477C - def_special sub_802488C + def_special DisplayBerryPowderVendorMenu + def_special RemoveBerryPowderVendorMenu + def_special HasEnoughBerryPowder + def_special TakeBerryPowder + def_special PrintPlayerBerryPowderAmount def_special sub_813A820 def_special sub_813A854 def_special sub_813B7D8 diff --git a/include/berry_powder.h b/include/berry_powder.h new file mode 100755 index 000000000..8deea7ec0 --- /dev/null +++ b/include/berry_powder.h @@ -0,0 +1,9 @@ +#ifndef GUARD_BERRY_POWDER_H +#define GUARD_BERRY_POWDER_H + +void SetBerryPowder(u32 *powder, u32 amount); +void ApplyNewEncryptionKeyToBerryPowder(u32 encryptionKey); +bool8 GiveBerryPowder(u32 amountToAdd); +u32 GetBerryPowder(void); + +#endif // GUARD_BERRY_POWDER_H diff --git a/include/constants/flags.h b/include/constants/flags.h index 230fbabaf..f28af3278 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -336,24 +336,23 @@ #define FLAG_RECEIVED_AURORA_TICKET 0x13A // RECEIVED Aurora Ticket in Mystery Gift #define FLAG_RECEIVED_MYSTIC_TICKET 0x13B // RECEIVED Mystic Ticket in Mystery Gift #define FLAG_RECEIVED_OLD_SEA_MAP 0x13C // RECEIVED Old Sea Map in Mystery Gift - -#define FLAG_UNUSED_0x13D 0x13D // Unused Flag -#define FLAG_UNUSED_0x13E 0x13E // Unused Flag -#define FLAG_UNUSED_0x13F 0x13F // Unused Flag -#define FLAG_UNUSED_0x140 0x140 // Unused Flag -#define FLAG_UNUSED_0x141 0x141 // Unused Flag -#define FLAG_UNUSED_0x142 0x142 // Unused Flag -#define FLAG_UNUSED_0x143 0x143 // Unused Flag -#define FLAG_UNUSED_0x144 0x144 // Unused Flag -#define FLAG_UNUSED_0x145 0x145 // Unused Flag -#define FLAG_UNUSED_0x146 0x146 // Unused Flag -#define FLAG_UNUSED_0x147 0x147 // Unused Flag -#define FLAG_UNUSED_0x148 0x148 // Unused Flag -#define FLAG_UNUSED_0x149 0x149 // Unused Flag -#define FLAG_UNUSED_0x14A 0x14A // Unused Flag -#define FLAG_UNUSED_0x14B 0x14B // Unused Flag -#define FLAG_UNUSED_0x14C 0x14C // Unused Flag -#define FLAG_UNUSED_0x14D 0x14D // Unused Flag +#define FLAG_UNUSED_MYSTERY_GIFT_0x13D 0x13D +#define FLAG_UNUSED_MYSTERY_GIFT_0x13E 0x13E +#define FLAG_UNUSED_MYSTERY_GIFT_0x13F 0x13F +#define FLAG_UNUSED_MYSTERY_GIFT_0x140 0x140 +#define FLAG_UNUSED_MYSTERY_GIFT_0x141 0x141 +#define FLAG_UNUSED_MYSTERY_GIFT_0x142 0x142 +#define FLAG_UNUSED_MYSTERY_GIFT_0x143 0x143 +#define FLAG_UNUSED_MYSTERY_GIFT_0x144 0x144 +#define FLAG_UNUSED_MYSTERY_GIFT_0x145 0x145 +#define FLAG_UNUSED_MYSTERY_GIFT_0x146 0x146 +#define FLAG_UNUSED_MYSTERY_GIFT_0x147 0x147 +#define FLAG_UNUSED_MYSTERY_GIFT_0x148 0x148 +#define FLAG_UNUSED_MYSTERY_GIFT_0x149 0x149 +#define FLAG_UNUSED_MYSTERY_GIFT_0x14A 0x14A +#define FLAG_UNUSED_MYSTERY_GIFT_0x14B 0x14B +#define FLAG_UNUSED_MYSTERY_GIFT_0x14C 0x14C +#define FLAG_UNUSED_MYSTERY_GIFT_0x14D 0x14D #define FLAG_MIRAGE_TOWER_VISIBLE 0x14E #define FLAG_CHOSE_CLAW_FOSSIL 0x14F // Player chose Claw Fossil diff --git a/include/global.h b/include/global.h index 1f9ac5185..d738deb3c 100644 --- a/include/global.h +++ b/include/global.h @@ -808,6 +808,76 @@ struct SaveTrainerHill /*0x3D6E*/ u16 tag:2; // x40, x80 = xC0 }; +struct MysteryEventStruct +{ + u8 unk_0_0:2; + u8 unk_0_2:3; + u8 unk_0_5:3; + u8 unk_1; +}; + + struct MEventBuffer_3120_Sub +{ + u16 unk_00; + u8 unk_02; + u8 unk_03; + u8 unk_04[40]; + u8 unk_2C[10][40]; +}; + + struct MEventBuffer_3120 +{ + u32 crc; + struct MEventBuffer_3120_Sub data; +}; + + struct MEventBuffer_32E0_Sub +{ + u16 unk_00; + u16 unk_02; + u32 unk_04; + u8 unk_08_0:2; + u8 unk_08_2:4; + u8 unk_08_6:2; + u8 unk_09; + u8 unk_0A[40]; + u8 unk_32[40]; + u8 unk_5A[4][40]; + u8 unk_FA[40]; + u8 unk_122[40]; +}; + + struct MEventBuffer_32E0 +{ + u32 crc; + struct MEventBuffer_32E0_Sub data; +}; + + struct MEventBuffer_3430_Sub +{ + u16 unk_00; + u16 unk_02; + u16 unk_04; + u16 unk_06; + u16 unk_08[2][7]; +}; + + struct MEventBuffer_3430 +{ + u32 crc; + struct MEventBuffer_3430_Sub data; +}; + + struct MEventBuffers +{ + /*0x000 0x322C*/ struct MEventBuffer_3120 buffer_000; + /*0x1c0 0x33EC*/ struct MEventBuffer_32E0 buffer_1c0; + /*0x310 0x353C*/ struct MEventBuffer_3430 buffer_310; + /*0x338 0x3564*/ u16 unk_338[4]; + /*0x340 0x356C*/ struct MysteryEventStruct unk_340; + /*0x344 0x3570*/ u32 unk_344[2][5]; +}; // 0x36C 0x3598 + struct SaveBlock1 { /*0x00*/ struct Coords16 pos; @@ -884,14 +954,15 @@ struct SaveBlock1 /*0x31A8*/ u8 giftRibbons[52]; /*0x31DC*/ struct Roamer roamer; /*0x31F8*/ struct EnigmaBerry enigmaBerry; - /*0x322C*/ u8 field_322C[1260]; + /*0x322C*/ struct MEventBuffers unk_322C; + /*0x3598*/ u8 field_3598[0x180]; /*0x3718*/ u32 trainerHillTimes[4]; /*0x3728*/ struct RamScript ramScript; /*0x3B14*/ struct RecordMixingGift recordMixingGift; /*0x3B24*/ u8 seen2[DEX_FLAGS_NO]; /*0x3B58*/ LilycoveLady lilycoveLady; /*0x3B98*/ struct TrainerNameRecord trainerNameRecords[20]; - /*0x3C88*/ u8 filler_3C88[0xDC]; + /*0x3C88*/ u8 unk3C88[11][20]; /*0x3D64*/ struct SaveTrainerHill trainerHill; /*0x3D70*/ struct WaldaPhrase waldaPhrase; // sizeof: 0x3D88 diff --git a/include/link.h b/include/link.h index 1e865e72b..714b6bf15 100644 --- a/include/link.h +++ b/include/link.h @@ -306,7 +306,6 @@ void sub_8009FAC(void); bool8 sub_800A4D8(u8 a0); u8 sub_800A9D8(void); u8 sub_800A0C8(s32, s32); -u16 *GetSaveBlock1Field3564(void); u8 sub_800A9A8(void); void sub_800AD10(void); void sub_800AB18(void); diff --git a/include/main.h b/include/main.h index 4f9a9e61a..6c67fbe9f 100644 --- a/include/main.h +++ b/include/main.h @@ -42,6 +42,8 @@ struct Main extern const u8 gGameVersion; extern const u8 gGameLanguage; +extern const u8 RomHeaderGameCode[4]; +extern const u8 RomHeaderSoftwareVersion; extern u16 gKeyRepeatStartDelay; extern bool8 gLinkTransferringData; diff --git a/include/mevent.h b/include/mevent.h new file mode 100755 index 000000000..7f12f3501 --- /dev/null +++ b/include/mevent.h @@ -0,0 +1,63 @@ +#ifndef GUARD_MEVENT_H +#define GUARD_MEVENT_H + +struct MEvent_Str_1 +{ + u16 unk_000; + size_t unk_004; + const void * unk_008; +}; + +struct MEvent_Str_2 +{ + u8 fill_00[0x40]; +}; + +struct MEventStruct_Unk1442CC +{ + u32 unk_00; + u16 unk_04; + u32 unk_08; + u16 unk_0C; + u32 unk_10; + u16 unk_14; + u16 unk_16[4]; + struct MEventBuffer_3430_Sub unk_20; + u8 unk_44; + u8 unk_45[7]; + u8 unk_4C[4]; + u16 unk_50[6]; + u8 unk_5C[4]; + u8 unk_60; +}; + +void sub_801AFD8(void); +struct MEventBuffer_3120_Sub *sub_801B00C(void); +struct MEventBuffer_32E0_Sub *sav1_get_mevent_buffer_1(void); +struct MEventBuffer_3430_Sub *sav1_get_mevent_buffer_2(void); +struct MysteryEventStruct *sub_801B044(void); +u16 *sub_801B058(void); +void sub_801B06C(void); +bool32 sub_801B078(const struct MEventBuffer_3120_Sub *src); +bool32 sub_801B0CC(void); +bool32 sub_801B128(void); +bool32 sub_801B1A4(const u8 *src); +void sub_801B1E8(void); +bool32 sub_801B21C(const struct MEventBuffer_32E0_Sub *data); +bool32 sub_801B27C(void); +bool32 sub_801B308(void); +u16 sub_801B39C(void); +void sub_801B3C0(struct MEventBuffer_32E0_Sub *buffer); +bool32 sub_801B3F8(void); +bool32 sub_801B508(const u16 *data); +void sub_801B580(struct MEventStruct_Unk1442CC *data, bool32 a1); +bool32 sub_801B6A0(const struct MEventStruct_Unk1442CC *data, bool32 a1); +u32 sub_801B6EC(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *unused); +u32 sub_801B708(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *unused); +bool32 sub_801B748(const struct MEventStruct_Unk1442CC *a0, const u16 *a1); +u16 sub_801B784(const struct MEventStruct_Unk1442CC *a0, u32 command); +u16 mevent_081445C0(u32 command); +void sub_801B940(void); +bool32 sub_801B94C(u16 a0); + +#endif //GUARD_MEVENT_H diff --git a/include/mevent_news.h b/include/mevent_news.h new file mode 100755 index 000000000..698d7148c --- /dev/null +++ b/include/mevent_news.h @@ -0,0 +1,6 @@ +#ifndef GUARD_MEVENT_NEWS_H +#define GUARD_MEVENT_NEWS_H + +void sub_801DBC0(void); + +#endif //GUARD_MEVENT_NEWS_H diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h index 0f13718e5..8376d1bc6 100644 --- a/include/rom_8011DC0.h +++ b/include/rom_8011DC0.h @@ -13,7 +13,6 @@ extern u8 gUnknown_02022C3E; // Exported ROM declarations void sub_8018438(void); -u16 mevent_081445C0(u8); void sub_801B990(u32, u32); u8 sub_8013F78(void); bool32 sub_802C908(u16); diff --git a/include/strings.h b/include/strings.h index ded997b04..400e48036 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2589,4 +2589,7 @@ extern const u8 gUnknown_085EE14B[]; extern const u8 gUnknown_085EE14F[]; extern const u8 gUnknown_085EE154[]; +// Berry Powder Menu +extern const u8 gText_Powder[]; + #endif // GUARD_STRINGS_H diff --git a/ld_script.txt b/ld_script.txt index 88d49b4f3..a82e3f913 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -56,7 +56,7 @@ SECTIONS { src/link_rfu.o(.text); src/union_room.o(.text); asm/union_room.o(.text); - asm/mevent2.o(.text); + src/mevent2.o(.text); asm/mevent_801BAAC.o(.text); asm/mevent_server.o(.text); asm/mevent_server_ish.o(.text); @@ -64,7 +64,7 @@ SECTIONS { asm/mevent_news.o(.text); asm/union_room_chat.o(.text); asm/berry_crush.o(.text); - asm/berry_powder_vendor.o(.text); + src/berry_powder.o(.text); src/dodrio_berry_picking.o(.text); asm/dodrio_berry_picking.o(.text); asm/pokemon_jump.o(.text); @@ -410,11 +410,12 @@ SECTIONS { src/link_rfu.o(.rodata); src/union_room.o(.rodata); data/union_room.o(.rodata); - data/mevent2.o(.rodata); + src/mevent2.o(.rodata); + data/mevent_801BAAC.o(.rodata); data/mevent_server.o(.rodata); data/union_room_chat.o(.rodata); data/berry_crush.o(.rodata); - data/berry_powder_vendor.o(.rodata); + data/berry_powder.o(.rodata); src/dodrio_berry_picking.o(.rodata); data/dodrio_berry_picking.o(.rodata); data/pokemon_jump.o(.rodata); @@ -663,7 +664,7 @@ SECTIONS { sound/songs/midi/se_jyuni.o(.rodata); sound/songs/midi/se_a.o(.rodata); sound/songs/midi/se_i.o(.rodata); - sound/songs/se_u.o(.rodata); + sound/songs/midi/se_u.o(.rodata); sound/songs/midi/se_e.o(.rodata); sound/songs/midi/se_o.o(.rodata); sound/songs/midi/se_n.o(.rodata); @@ -672,7 +673,7 @@ SECTIONS { sound/songs/midi/se_exp.o(.rodata); sound/songs/midi/se_jite_pyoko.o(.rodata); sound/songs/midi/se_mu_pachi.o(.rodata); - sound/songs/se_tk_kasya.o(.rodata); + sound/songs/midi/se_tk_kasya.o(.rodata); sound/songs/midi/se_fu_zaku.o(.rodata); sound/songs/midi/se_fu_zaku2.o(.rodata); sound/songs/midi/se_fu_zuzuzu.o(.rodata); @@ -681,14 +682,14 @@ SECTIONS { sound/songs/midi/se_ru_bari.o(.rodata); sound/songs/midi/se_ru_hyuu.o(.rodata); sound/songs/midi/se_ki_gasyan.o(.rodata); - sound/songs/se_tk_warpin.o(.rodata); - sound/songs/se_tk_warpout.o(.rodata); - sound/songs/se_tu_saa.o(.rodata); + sound/songs/midi/se_tk_warpin.o(.rodata); + sound/songs/midi/se_tk_warpout.o(.rodata); + sound/songs/midi/se_tu_saa.o(.rodata); sound/songs/midi/se_hi_turun.o(.rodata); - sound/songs/se_track_move.o(.rodata); - sound/songs/se_track_stop.o(.rodata); - sound/songs/se_track_haiki.o(.rodata); - sound/songs/se_track_door.o(.rodata); + sound/songs/midi/se_track_move.o(.rodata); + sound/songs/midi/se_track_stop.o(.rodata); + sound/songs/midi/se_track_haiki.o(.rodata); + sound/songs/midi/se_track_door.o(.rodata); sound/songs/midi/se_moter.o(.rodata); sound/songs/midi/se_card.o(.rodata); sound/songs/midi/se_save.o(.rodata); @@ -698,14 +699,14 @@ SECTIONS { sound/songs/midi/se_kon4.o(.rodata); sound/songs/midi/se_suikomu.o(.rodata); sound/songs/midi/se_nageru.o(.rodata); - sound/songs/se_toy_c.o(.rodata); - sound/songs/se_toy_d.o(.rodata); - sound/songs/se_toy_e.o(.rodata); - sound/songs/se_toy_f.o(.rodata); - sound/songs/se_toy_g.o(.rodata); - sound/songs/se_toy_a.o(.rodata); - sound/songs/se_toy_b.o(.rodata); - sound/songs/se_toy_c1.o(.rodata); + sound/songs/midi/se_toy_c.o(.rodata); + sound/songs/midi/se_toy_d.o(.rodata); + sound/songs/midi/se_toy_e.o(.rodata); + sound/songs/midi/se_toy_f.o(.rodata); + sound/songs/midi/se_toy_g.o(.rodata); + sound/songs/midi/se_toy_a.o(.rodata); + sound/songs/midi/se_toy_b.o(.rodata); + sound/songs/midi/se_toy_c1.o(.rodata); sound/songs/midi/se_mizu.o(.rodata); sound/songs/midi/se_hashi.o(.rodata); sound/songs/midi/se_daugi.o(.rodata); @@ -713,8 +714,8 @@ SECTIONS { sound/songs/midi/se_fuusen1.o(.rodata); sound/songs/midi/se_fuusen2.o(.rodata); sound/songs/midi/se_fuusen3.o(.rodata); - sound/songs/se_toy_kabe.o(.rodata); - sound/songs/se_toy_dango.o(.rodata); + sound/songs/midi/se_toy_kabe.o(.rodata); + sound/songs/midi/se_toy_dango.o(.rodata); sound/songs/midi/se_doku.o(.rodata); sound/songs/midi/se_esuka.o(.rodata); sound/songs/midi/se_t_ame.o(.rodata); @@ -728,8 +729,8 @@ SECTIONS { sound/songs/midi/se_elebeta.o(.rodata); sound/songs/midi/se_hinsi.o(.rodata); sound/songs/midi/se_expmax.o(.rodata); - sound/songs/se_tamakoro.o(.rodata); - sound/songs/se_tamakoro_e.o(.rodata); + sound/songs/midi/se_tamakoro.o(.rodata); + sound/songs/midi/se_tamakoro_e.o(.rodata); sound/songs/midi/se_basabasa.o(.rodata); sound/songs/midi/se_regi.o(.rodata); sound/songs/midi/se_c_gaji.o(.rodata); @@ -743,16 +744,16 @@ SECTIONS { sound/songs/midi/se_bt_start.o(.rodata); sound/songs/midi/se_dendou.o(.rodata); sound/songs/midi/se_jihanki.o(.rodata); - sound/songs/se_tama.o(.rodata); + sound/songs/midi/se_tama.o(.rodata); sound/songs/se_z_scroll.o(.rodata); sound/songs/se_z_page.o(.rodata); sound/songs/midi/se_pn_on.o(.rodata); sound/songs/midi/se_pn_off.o(.rodata); sound/songs/midi/se_z_search.o(.rodata); - sound/songs/se_tamago.o(.rodata); - sound/songs/se_tb_start.o(.rodata); - sound/songs/se_tb_kon.o(.rodata); - sound/songs/se_tb_kara.o(.rodata); + sound/songs/midi/se_tamago.o(.rodata); + sound/songs/midi/se_tb_start.o(.rodata); + sound/songs/midi/se_tb_kon.o(.rodata); + sound/songs/midi/se_tb_kara.o(.rodata); sound/songs/midi/se_bidoro.o(.rodata); sound/songs/se_w085.o(.rodata); sound/songs/se_w085b.o(.rodata); @@ -764,53 +765,53 @@ SECTIONS { sound/songs/se_w145b.o(.rodata); sound/songs/se_w145c.o(.rodata); sound/songs/se_w240.o(.rodata); - sound/songs/se_w015.o(.rodata); + sound/songs/midi/se_w015.o(.rodata); sound/songs/se_w081.o(.rodata); sound/songs/se_w081b.o(.rodata); sound/songs/se_w088.o(.rodata); - sound/songs/se_w016.o(.rodata); - sound/songs/se_w016b.o(.rodata); - sound/songs/se_w003.o(.rodata); + sound/songs/midi/se_w016.o(.rodata); + sound/songs/midi/se_w016b.o(.rodata); + sound/songs/midi/se_w003.o(.rodata); sound/songs/se_w104.o(.rodata); - sound/songs/se_w013.o(.rodata); + sound/songs/midi/se_w013.o(.rodata); sound/songs/se_w196.o(.rodata); sound/songs/se_w086.o(.rodata); - sound/songs/se_w004.o(.rodata); - sound/songs/se_w025.o(.rodata); - sound/songs/se_w025b.o(.rodata); + sound/songs/midi/se_w004.o(.rodata); + sound/songs/midi/se_w025.o(.rodata); + sound/songs/midi/se_w025b.o(.rodata); sound/songs/se_w152.o(.rodata); - sound/songs/se_w026.o(.rodata); + sound/songs/midi/se_w026.o(.rodata); sound/songs/se_w172.o(.rodata); sound/songs/se_w172b.o(.rodata); sound/songs/se_w053.o(.rodata); - sound/songs/se_w007.o(.rodata); + sound/songs/midi/se_w007.o(.rodata); sound/songs/se_w092.o(.rodata); sound/songs/se_w221.o(.rodata); sound/songs/se_w221b.o(.rodata); sound/songs/se_w052.o(.rodata); - sound/songs/se_w036.o(.rodata); + sound/songs/midi/se_w036.o(.rodata); sound/songs/se_w059.o(.rodata); sound/songs/se_w059b.o(.rodata); - sound/songs/se_w010.o(.rodata); - sound/songs/se_w011.o(.rodata); - sound/songs/se_w017.o(.rodata); - sound/songs/se_w019.o(.rodata); - sound/songs/se_w028.o(.rodata); - sound/songs/se_w013b.o(.rodata); + sound/songs/midi/se_w010.o(.rodata); + sound/songs/midi/se_w011.o(.rodata); + sound/songs/midi/se_w017.o(.rodata); + sound/songs/midi/se_w019.o(.rodata); + sound/songs/midi/se_w028.o(.rodata); + sound/songs/midi/se_w013b.o(.rodata); sound/songs/se_w044.o(.rodata); - sound/songs/se_w029.o(.rodata); + sound/songs/midi/se_w029.o(.rodata); sound/songs/se_w057.o(.rodata); sound/songs/se_w056.o(.rodata); sound/songs/se_w250.o(.rodata); - sound/songs/se_w030.o(.rodata); - sound/songs/se_w039.o(.rodata); + sound/songs/midi/se_w030.o(.rodata); + sound/songs/midi/se_w039.o(.rodata); sound/songs/se_w054.o(.rodata); sound/songs/se_w077.o(.rodata); - sound/songs/se_w020.o(.rodata); + sound/songs/midi/se_w020.o(.rodata); sound/songs/se_w082.o(.rodata); sound/songs/se_w047.o(.rodata); sound/songs/se_w195.o(.rodata); - sound/songs/se_w006.o(.rodata); + sound/songs/midi/se_w006.o(.rodata); sound/songs/se_w091.o(.rodata); sound/songs/se_w146.o(.rodata); sound/songs/se_w120.o(.rodata); @@ -827,8 +828,8 @@ SECTIONS { sound/songs/se_w122.o(.rodata); sound/songs/se_w060.o(.rodata); sound/songs/se_w185.o(.rodata); - sound/songs/se_w014.o(.rodata); - sound/songs/se_w043.o(.rodata); + sound/songs/midi/se_w014.o(.rodata); + sound/songs/midi/se_w043.o(.rodata); sound/songs/se_w207.o(.rodata); sound/songs/se_w207b.o(.rodata); sound/songs/se_w215.o(.rodata); @@ -899,13 +900,13 @@ SECTIONS { sound/songs/midi/se_rg_deomov.o(.rodata); sound/songs/midi/se_rg_excellent.o(.rodata); sound/songs/midi/se_rg_nawamiss.o(.rodata); - sound/songs/se_toreeye.o(.rodata); - sound/songs/se_toreoff.o(.rodata); + sound/songs/midi/se_toreeye.o(.rodata); + sound/songs/midi/se_toreoff.o(.rodata); sound/songs/midi/se_hantei1.o(.rodata); sound/songs/midi/se_hantei2.o(.rodata); sound/songs/midi/se_curtain.o(.rodata); sound/songs/midi/se_curtain1.o(.rodata); - sound/songs/se_ussoki.o(.rodata); + sound/songs/midi/se_ussoki.o(.rodata); sound/songs/midi/mus_tetsuji.o(.rodata); sound/songs/midi/mus_field13.o(.rodata); sound/songs/midi/mus_kachi22.o(.rodata); @@ -1101,5 +1101,164 @@ $(MID_SUBDIR)/se_t_ooame.s: %.s: %.mid $(MID_SUBDIR)/se_t_ooame_e.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2 +$(MID_SUBDIR)/se_tama.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P5 + +$(MID_SUBDIR)/se_tamago.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5 + +$(MID_SUBDIR)/se_tamakoro.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P2 + +$(MID_SUBDIR)/se_tamakoro_e.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P2 + +$(MID_SUBDIR)/se_tb_kara.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 + +$(MID_SUBDIR)/se_tb_kon.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5 + +$(MID_SUBDIR)/se_tb_start.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5 + +$(MID_SUBDIR)/se_tk_kasya.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 + +$(MID_SUBDIR)/se_tk_warpin.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 + +$(MID_SUBDIR)/se_tk_warpout.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 + +$(MID_SUBDIR)/se_toreeye.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V120 -P5 + +$(MID_SUBDIR)/se_toreoff.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V110 -P5 + +$(MID_SUBDIR)/se_toy_a.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_toy_b.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_toy_c.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_toy_c1.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_toy_d.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_toy_dango.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_toy_e.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_toy_f.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_toy_g.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_toy_kabe.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_track_door.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_track_haiki.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4 + +$(MID_SUBDIR)/se_track_move.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 + +$(MID_SUBDIR)/se_track_stop.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 + +$(MID_SUBDIR)/se_tu_saa.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 + +$(MID_SUBDIR)/se_u.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 + +$(MID_SUBDIR)/se_ussoki.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V077 -P5 + +$(MID_SUBDIR)/se_w003.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_w004.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 + +$(MID_SUBDIR)/se_w006.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 + +$(MID_SUBDIR)/se_w007.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_w010.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_w011.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_w013.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_w013b.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 + +$(MID_SUBDIR)/se_w014.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 + +$(MID_SUBDIR)/se_w015.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 + +$(MID_SUBDIR)/se_w016.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_w016b.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_w017.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 + +$(MID_SUBDIR)/se_w019.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_w020.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 + +$(MID_SUBDIR)/se_w025.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 + +$(MID_SUBDIR)/se_w025b.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_w026.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_w028.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_w029.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_w030.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_w036.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 + +$(MID_SUBDIR)/se_w039.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + +$(MID_SUBDIR)/se_w043.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -v100 -P5 diff --git a/sound/songs/midi/se_tama.mid b/sound/songs/midi/se_tama.mid Binary files differnew file mode 100644 index 000000000..aa9fc7889 --- /dev/null +++ b/sound/songs/midi/se_tama.mid diff --git a/sound/songs/midi/se_tamago.mid b/sound/songs/midi/se_tamago.mid Binary files differnew file mode 100644 index 000000000..67d3959eb --- /dev/null +++ b/sound/songs/midi/se_tamago.mid diff --git a/sound/songs/midi/se_tamakoro.mid b/sound/songs/midi/se_tamakoro.mid Binary files differnew file mode 100644 index 000000000..c6dce2865 --- /dev/null +++ b/sound/songs/midi/se_tamakoro.mid diff --git a/sound/songs/midi/se_tamakoro_e.mid b/sound/songs/midi/se_tamakoro_e.mid Binary files differnew file mode 100644 index 000000000..13675c690 --- /dev/null +++ b/sound/songs/midi/se_tamakoro_e.mid diff --git a/sound/songs/midi/se_tb_kara.mid b/sound/songs/midi/se_tb_kara.mid Binary files differnew file mode 100644 index 000000000..a4c2a51d7 --- /dev/null +++ b/sound/songs/midi/se_tb_kara.mid diff --git a/sound/songs/midi/se_tb_kon.mid b/sound/songs/midi/se_tb_kon.mid Binary files differnew file mode 100644 index 000000000..8526da9c6 --- /dev/null +++ b/sound/songs/midi/se_tb_kon.mid diff --git a/sound/songs/midi/se_tb_start.mid b/sound/songs/midi/se_tb_start.mid Binary files differnew file mode 100644 index 000000000..c88e2a8ea --- /dev/null +++ b/sound/songs/midi/se_tb_start.mid diff --git a/sound/songs/midi/se_tk_kasya.mid b/sound/songs/midi/se_tk_kasya.mid Binary files differnew file mode 100644 index 000000000..baa73e0c6 --- /dev/null +++ b/sound/songs/midi/se_tk_kasya.mid diff --git a/sound/songs/midi/se_tk_warpin.mid b/sound/songs/midi/se_tk_warpin.mid Binary files differnew file mode 100644 index 000000000..e47d3df4d --- /dev/null +++ b/sound/songs/midi/se_tk_warpin.mid diff --git a/sound/songs/midi/se_tk_warpout.mid b/sound/songs/midi/se_tk_warpout.mid Binary files differnew file mode 100644 index 000000000..5072e6448 --- /dev/null +++ b/sound/songs/midi/se_tk_warpout.mid diff --git a/sound/songs/midi/se_toreeye.mid b/sound/songs/midi/se_toreeye.mid Binary files differnew file mode 100644 index 000000000..e25a9ac74 --- /dev/null +++ b/sound/songs/midi/se_toreeye.mid diff --git a/sound/songs/midi/se_toreoff.mid b/sound/songs/midi/se_toreoff.mid Binary files differnew file mode 100644 index 000000000..391f23a3d --- /dev/null +++ b/sound/songs/midi/se_toreoff.mid diff --git a/sound/songs/midi/se_toy_a.mid b/sound/songs/midi/se_toy_a.mid Binary files differnew file mode 100644 index 000000000..b6d5b6159 --- /dev/null +++ b/sound/songs/midi/se_toy_a.mid diff --git a/sound/songs/midi/se_toy_b.mid b/sound/songs/midi/se_toy_b.mid Binary files differnew file mode 100644 index 000000000..9e27e72e7 --- /dev/null +++ b/sound/songs/midi/se_toy_b.mid diff --git a/sound/songs/midi/se_toy_c.mid b/sound/songs/midi/se_toy_c.mid Binary files differnew file mode 100644 index 000000000..3d10dc6cb --- /dev/null +++ b/sound/songs/midi/se_toy_c.mid diff --git a/sound/songs/midi/se_toy_c1.mid b/sound/songs/midi/se_toy_c1.mid Binary files differnew file mode 100644 index 000000000..345925255 --- /dev/null +++ b/sound/songs/midi/se_toy_c1.mid diff --git a/sound/songs/midi/se_toy_d.mid b/sound/songs/midi/se_toy_d.mid Binary files differnew file mode 100644 index 000000000..0de257ee5 --- /dev/null +++ b/sound/songs/midi/se_toy_d.mid diff --git a/sound/songs/midi/se_toy_dango.mid b/sound/songs/midi/se_toy_dango.mid Binary files differnew file mode 100644 index 000000000..baa1ed24e --- /dev/null +++ b/sound/songs/midi/se_toy_dango.mid diff --git a/sound/songs/midi/se_toy_e.mid b/sound/songs/midi/se_toy_e.mid Binary files differnew file mode 100644 index 000000000..214b32bca --- /dev/null +++ b/sound/songs/midi/se_toy_e.mid diff --git a/sound/songs/midi/se_toy_f.mid b/sound/songs/midi/se_toy_f.mid Binary files differnew file mode 100644 index 000000000..780e162e0 --- /dev/null +++ b/sound/songs/midi/se_toy_f.mid diff --git a/sound/songs/midi/se_toy_g.mid b/sound/songs/midi/se_toy_g.mid Binary files differnew file mode 100644 index 000000000..73dae55a5 --- /dev/null +++ b/sound/songs/midi/se_toy_g.mid diff --git a/sound/songs/midi/se_toy_kabe.mid b/sound/songs/midi/se_toy_kabe.mid Binary files differnew file mode 100644 index 000000000..c35be0c0d --- /dev/null +++ b/sound/songs/midi/se_toy_kabe.mid diff --git a/sound/songs/midi/se_track_door.mid b/sound/songs/midi/se_track_door.mid Binary files differnew file mode 100644 index 000000000..5cc1dbad8 --- /dev/null +++ b/sound/songs/midi/se_track_door.mid diff --git a/sound/songs/midi/se_track_haiki.mid b/sound/songs/midi/se_track_haiki.mid Binary files differnew file mode 100644 index 000000000..42db7fd0e --- /dev/null +++ b/sound/songs/midi/se_track_haiki.mid diff --git a/sound/songs/midi/se_track_move.mid b/sound/songs/midi/se_track_move.mid Binary files differnew file mode 100644 index 000000000..ced96f83a --- /dev/null +++ b/sound/songs/midi/se_track_move.mid diff --git a/sound/songs/midi/se_track_stop.mid b/sound/songs/midi/se_track_stop.mid Binary files differnew file mode 100644 index 000000000..509b2dd8e --- /dev/null +++ b/sound/songs/midi/se_track_stop.mid diff --git a/sound/songs/midi/se_tu_saa.mid b/sound/songs/midi/se_tu_saa.mid Binary files differnew file mode 100644 index 000000000..c84b176cb --- /dev/null +++ b/sound/songs/midi/se_tu_saa.mid diff --git a/sound/songs/midi/se_u.mid b/sound/songs/midi/se_u.mid Binary files differnew file mode 100644 index 000000000..0e145e3a2 --- /dev/null +++ b/sound/songs/midi/se_u.mid diff --git a/sound/songs/midi/se_ussoki.mid b/sound/songs/midi/se_ussoki.mid Binary files differnew file mode 100644 index 000000000..c5be0de8d --- /dev/null +++ b/sound/songs/midi/se_ussoki.mid diff --git a/sound/songs/midi/se_w003.mid b/sound/songs/midi/se_w003.mid Binary files differnew file mode 100644 index 000000000..80e7a52a7 --- /dev/null +++ b/sound/songs/midi/se_w003.mid diff --git a/sound/songs/midi/se_w004.mid b/sound/songs/midi/se_w004.mid Binary files differnew file mode 100644 index 000000000..a27538d81 --- /dev/null +++ b/sound/songs/midi/se_w004.mid diff --git a/sound/songs/midi/se_w006.mid b/sound/songs/midi/se_w006.mid Binary files differnew file mode 100644 index 000000000..5f59591be --- /dev/null +++ b/sound/songs/midi/se_w006.mid diff --git a/sound/songs/midi/se_w007.mid b/sound/songs/midi/se_w007.mid Binary files differnew file mode 100644 index 000000000..2f75754f3 --- /dev/null +++ b/sound/songs/midi/se_w007.mid diff --git a/sound/songs/midi/se_w010.mid b/sound/songs/midi/se_w010.mid Binary files differnew file mode 100644 index 000000000..4b3c1cfcf --- /dev/null +++ b/sound/songs/midi/se_w010.mid diff --git a/sound/songs/midi/se_w011.mid b/sound/songs/midi/se_w011.mid Binary files differnew file mode 100644 index 000000000..703ae492b --- /dev/null +++ b/sound/songs/midi/se_w011.mid diff --git a/sound/songs/midi/se_w013.mid b/sound/songs/midi/se_w013.mid Binary files differnew file mode 100644 index 000000000..ae94dafa2 --- /dev/null +++ b/sound/songs/midi/se_w013.mid diff --git a/sound/songs/midi/se_w013b.mid b/sound/songs/midi/se_w013b.mid Binary files differnew file mode 100644 index 000000000..09e8d4c5d --- /dev/null +++ b/sound/songs/midi/se_w013b.mid diff --git a/sound/songs/midi/se_w014.mid b/sound/songs/midi/se_w014.mid Binary files differnew file mode 100644 index 000000000..8b17c79a9 --- /dev/null +++ b/sound/songs/midi/se_w014.mid diff --git a/sound/songs/midi/se_w015.mid b/sound/songs/midi/se_w015.mid Binary files differnew file mode 100644 index 000000000..2f1b4e059 --- /dev/null +++ b/sound/songs/midi/se_w015.mid diff --git a/sound/songs/midi/se_w016.mid b/sound/songs/midi/se_w016.mid Binary files differnew file mode 100644 index 000000000..8bf167109 --- /dev/null +++ b/sound/songs/midi/se_w016.mid diff --git a/sound/songs/midi/se_w016b.mid b/sound/songs/midi/se_w016b.mid Binary files differnew file mode 100644 index 000000000..6dd7020f9 --- /dev/null +++ b/sound/songs/midi/se_w016b.mid diff --git a/sound/songs/midi/se_w017.mid b/sound/songs/midi/se_w017.mid Binary files differnew file mode 100644 index 000000000..459e72406 --- /dev/null +++ b/sound/songs/midi/se_w017.mid diff --git a/sound/songs/midi/se_w019.mid b/sound/songs/midi/se_w019.mid Binary files differnew file mode 100644 index 000000000..6e63f48cc --- /dev/null +++ b/sound/songs/midi/se_w019.mid diff --git a/sound/songs/midi/se_w020.mid b/sound/songs/midi/se_w020.mid Binary files differnew file mode 100644 index 000000000..eec8ccae9 --- /dev/null +++ b/sound/songs/midi/se_w020.mid diff --git a/sound/songs/midi/se_w025.mid b/sound/songs/midi/se_w025.mid Binary files differnew file mode 100644 index 000000000..bcc9590b4 --- /dev/null +++ b/sound/songs/midi/se_w025.mid diff --git a/sound/songs/midi/se_w025b.mid b/sound/songs/midi/se_w025b.mid Binary files differnew file mode 100644 index 000000000..ac165424b --- /dev/null +++ b/sound/songs/midi/se_w025b.mid diff --git a/sound/songs/midi/se_w026.mid b/sound/songs/midi/se_w026.mid Binary files differnew file mode 100644 index 000000000..d43366801 --- /dev/null +++ b/sound/songs/midi/se_w026.mid diff --git a/sound/songs/midi/se_w028.mid b/sound/songs/midi/se_w028.mid Binary files differnew file mode 100644 index 000000000..7a053f799 --- /dev/null +++ b/sound/songs/midi/se_w028.mid diff --git a/sound/songs/midi/se_w029.mid b/sound/songs/midi/se_w029.mid Binary files differnew file mode 100644 index 000000000..4cde4e2d5 --- /dev/null +++ b/sound/songs/midi/se_w029.mid diff --git a/sound/songs/midi/se_w030.mid b/sound/songs/midi/se_w030.mid Binary files differnew file mode 100644 index 000000000..426cdfea4 --- /dev/null +++ b/sound/songs/midi/se_w030.mid diff --git a/sound/songs/midi/se_w036.mid b/sound/songs/midi/se_w036.mid Binary files differnew file mode 100644 index 000000000..e5427c8df --- /dev/null +++ b/sound/songs/midi/se_w036.mid diff --git a/sound/songs/midi/se_w039.mid b/sound/songs/midi/se_w039.mid Binary files differnew file mode 100644 index 000000000..771581ce0 --- /dev/null +++ b/sound/songs/midi/se_w039.mid diff --git a/sound/songs/midi/se_w043.mid b/sound/songs/midi/se_w043.mid Binary files differnew file mode 100644 index 000000000..b44876722 --- /dev/null +++ b/sound/songs/midi/se_w043.mid diff --git a/sound/songs/midi/se_z_search.mid b/sound/songs/midi/se_z_search.mid Binary files differindex b1c161f83..1869374af 100644 --- a/sound/songs/midi/se_z_search.mid +++ b/sound/songs/midi/se_z_search.mid diff --git a/sound/songs/se_tama.s b/sound/songs/se_tama.s deleted file mode 100644 index 25a1aff58..000000000 --- a/sound/songs/se_tama.s +++ /dev/null @@ -1,246 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tama_grp, voicegroup128 - .equ se_tama_pri, 5 - .equ se_tama_rev, reverb_set+50 - .equ se_tama_mvl, 127 - .equ se_tama_key, 0 - .equ se_tama_tbs, 1 - .equ se_tama_exg, 0 - .equ se_tama_cmp, 1 - - .section .rodata - .global se_tama - .align 2 - -@********************** Track 1 **********************@ - -se_tama_1: - .byte KEYSH , se_tama_key+0 - .byte TEMPO , 110*se_tama_tbs/2 - .byte VOICE , 15 - .byte BENDR , 12 - .byte VOL , 100*se_tama_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+30 - .byte TIE , Cn4 , v100 - .byte W01 - .byte BEND , c_v+24 - .byte W01 - .byte c_v+19 - .byte W01 - .byte c_v+14 - .byte W01 - .byte c_v+8 - .byte W02 - .byte c_v+4 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+0 - .byte W04 - .byte W04 - .byte c_v+1 - .byte W02 - .byte W06 - .byte c_v+1 - .byte W06 - .byte c_v+1 - .byte W06 - .byte c_v+2 - .byte W06 - .byte c_v+3 - .byte W06 - .byte c_v+3 - .byte W06 - .byte c_v+4 - .byte W06 - .byte c_v+4 - .byte W06 - .byte c_v+5 - .byte W06 - .byte c_v+6 - .byte W06 - .byte c_v+8 - .byte W06 - .byte c_v+10 - .byte W06 - .byte c_v+12 - .byte W06 - .byte c_v+14 - .byte W06 - .byte c_v+16 - .byte W06 - .byte c_v+18 - .byte W06 - .byte c_v+20 - .byte W06 - .byte VOL , 98*se_tama_mvl/mxv - .byte BEND , c_v+22 - .byte W03 - .byte VOL , 97*se_tama_mvl/mxv - .byte W03 - .byte BEND , c_v+24 - .byte W01 - .byte VOL , 94*se_tama_mvl/mxv - .byte W03 - .byte 91*se_tama_mvl/mxv - .byte W02 - .byte BEND , c_v+26 - .byte W02 - .byte VOL , 88*se_tama_mvl/mxv - .byte W02 - .byte 85*se_tama_mvl/mxv - .byte W02 - .byte BEND , c_v+28 - .byte W02 - .byte VOL , 80*se_tama_mvl/mxv - .byte W02 - .byte 73*se_tama_mvl/mxv - .byte W02 - .byte BEND , c_v+30 - .byte W01 - .byte VOL , 68*se_tama_mvl/mxv - .byte W02 - .byte 62*se_tama_mvl/mxv - .byte W03 - .byte 55*se_tama_mvl/mxv - .byte BEND , c_v+32 - .byte W02 - .byte VOL , 47*se_tama_mvl/mxv - .byte W02 - .byte 37*se_tama_mvl/mxv - .byte W02 - .byte BEND , c_v+36 - .byte W01 - .byte VOL , 30*se_tama_mvl/mxv - .byte W01 - .byte 20*se_tama_mvl/mxv - .byte W01 - .byte 13*se_tama_mvl/mxv - .byte W01 - .byte 4*se_tama_mvl/mxv - .byte W02 - .byte EOT - .byte FINE - -@********************** Track 2 **********************@ - -se_tama_2: - .byte KEYSH , se_tama_key+0 - .byte VOICE , 25 - .byte VOL , 15*se_tama_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte TIE , Gs2 , v060 - .byte W01 - .byte VOL , 21*se_tama_mvl/mxv - .byte W01 - .byte 33*se_tama_mvl/mxv - .byte W01 - .byte 41*se_tama_mvl/mxv - .byte W01 - .byte 49*se_tama_mvl/mxv - .byte W02 - .byte 55*se_tama_mvl/mxv - .byte W01 - .byte 61*se_tama_mvl/mxv - .byte W01 - .byte 69*se_tama_mvl/mxv - .byte W01 - .byte 76*se_tama_mvl/mxv - .byte W01 - .byte 80*se_tama_mvl/mxv - .byte W02 - .byte 86*se_tama_mvl/mxv - .byte W01 - .byte 90*se_tama_mvl/mxv - .byte W01 - .byte 100*se_tama_mvl/mxv - .byte W04 - .byte W06 - .byte W06 - .byte W06 - .byte W01 - .byte BEND , c_v+1 - .byte W05 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W02 - .byte c_v+2 - .byte W04 - .byte W01 - .byte c_v+4 - .byte W05 - .byte c_v+5 - .byte W03 - .byte VOL , 97*se_tama_mvl/mxv - .byte BEND , c_v+6 - .byte W03 - .byte VOL , 94*se_tama_mvl/mxv - .byte W01 - .byte BEND , c_v+6 - .byte W01 - .byte VOL , 87*se_tama_mvl/mxv - .byte W02 - .byte 83*se_tama_mvl/mxv - .byte BEND , c_v+8 - .byte W02 - .byte W01 - .byte VOL , 77*se_tama_mvl/mxv - .byte BEND , c_v+10 - .byte W02 - .byte VOL , 66*se_tama_mvl/mxv - .byte BEND , c_v+14 - .byte W03 - .byte VOL , 55*se_tama_mvl/mxv - .byte BEND , c_v+17 - .byte W02 - .byte VOL , 45*se_tama_mvl/mxv - .byte BEND , c_v+24 - .byte W02 - .byte VOL , 33*se_tama_mvl/mxv - .byte BEND , c_v+30 - .byte W02 - .byte c_v+41 - .byte W01 - .byte VOL , 21*se_tama_mvl/mxv - .byte BEND , c_v+46 - .byte W01 - .byte c_v+55 - .byte W01 - .byte VOL , 11*se_tama_mvl/mxv - .byte BEND , c_v+60 - .byte W01 - .byte VOL , 5*se_tama_mvl/mxv - .byte BEND , c_v+63 - .byte W02 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_tama: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_tama_pri @ Priority - .byte se_tama_rev @ Reverb. - - .word se_tama_grp - - .word se_tama_1 - .word se_tama_2 - - .end diff --git a/sound/songs/se_tamago.s b/sound/songs/se_tamago.s deleted file mode 100644 index dfd2a51fb..000000000 --- a/sound/songs/se_tamago.s +++ /dev/null @@ -1,111 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tamago_grp, voicegroup128 - .equ se_tamago_pri, 5 - .equ se_tamago_rev, reverb_set+50 - .equ se_tamago_mvl, 127 - .equ se_tamago_key, 0 - .equ se_tamago_tbs, 1 - .equ se_tamago_exg, 0 - .equ se_tamago_cmp, 1 - - .section .rodata - .global se_tamago - .align 2 - -@********************** Track 1 **********************@ - -se_tamago_1: - .byte KEYSH , se_tamago_key+0 - .byte TEMPO , 150*se_tamago_tbs/2 - .byte VOICE , 21 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 120*se_tamago_mvl/mxv - .byte BEND , c_v+1 - .byte N01 , Bn5 , v127 - .byte W01 - .byte Cn5 , v100 - .byte W01 - .byte VOICE , 18 - .byte N01 , Cn4 , v127 - .byte W02 - .byte VOICE , 36 - .byte N19 , Cn6 , v040 - .byte W02 - .byte VOL , 63*se_tamago_mvl/mxv - .byte BEND , c_v+5 - .byte W01 - .byte VOL , 77*se_tamago_mvl/mxv - .byte BEND , c_v+13 - .byte W01 - .byte VOL , 91*se_tamago_mvl/mxv - .byte BEND , c_v+21 - .byte W01 - .byte VOL , 106*se_tamago_mvl/mxv - .byte BEND , c_v+33 - .byte W01 - .byte VOL , 120*se_tamago_mvl/mxv - .byte W05 - .byte 109*se_tamago_mvl/mxv - .byte W01 - .byte 102*se_tamago_mvl/mxv - .byte W02 - .byte 84*se_tamago_mvl/mxv - .byte W01 - .byte 68*se_tamago_mvl/mxv - .byte W01 - .byte 56*se_tamago_mvl/mxv - .byte W01 - .byte 24*se_tamago_mvl/mxv - .byte W01 - .byte 10*se_tamago_mvl/mxv - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_tamago_2: - .byte KEYSH , se_tamago_key+0 - .byte VOL , 120*se_tamago_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+1 - .byte W07 - .byte VOICE , 46 - .byte N01 , Cn6 , v100 - .byte W02 - .byte BEND , c_v+4 - .byte N01 , Gn5 , v088 - .byte W03 - .byte BEND , c_v+8 - .byte N01 , Cn6 , v072 - .byte W02 - .byte BEND , c_v+16 - .byte N01 , Gn5 , v056 - .byte W02 - .byte BEND , c_v+23 - .byte N01 , Cn6 , v040 - .byte W03 - .byte BEND , c_v+33 - .byte N01 , Gn5 , v028 - .byte W02 - .byte BEND , c_v+53 - .byte N01 , Cn6 , v012 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_tamago: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_tamago_pri @ Priority - .byte se_tamago_rev @ Reverb. - - .word se_tamago_grp - - .word se_tamago_1 - .word se_tamago_2 - - .end diff --git a/sound/songs/se_tamakoro.s b/sound/songs/se_tamakoro.s deleted file mode 100644 index e71f5964c..000000000 --- a/sound/songs/se_tamakoro.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tamakoro_grp, voicegroup128 - .equ se_tamakoro_pri, 2 - .equ se_tamakoro_rev, reverb_set+50 - .equ se_tamakoro_mvl, 127 - .equ se_tamakoro_key, 0 - .equ se_tamakoro_tbs, 1 - .equ se_tamakoro_exg, 0 - .equ se_tamakoro_cmp, 1 - - .section .rodata - .global se_tamakoro - .align 2 - -@********************** Track 1 **********************@ - -se_tamakoro_1: - .byte KEYSH , se_tamakoro_key+0 - .byte TEMPO , 150*se_tamakoro_tbs/2 - .byte VOICE , 63 - .byte VOL , 110*se_tamakoro_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Dn3 , v127 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_tamakoro: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tamakoro_pri @ Priority - .byte se_tamakoro_rev @ Reverb. - - .word se_tamakoro_grp - - .word se_tamakoro_1 - - .end diff --git a/sound/songs/se_tamakoro_e.s b/sound/songs/se_tamakoro_e.s deleted file mode 100644 index db16f06b5..000000000 --- a/sound/songs/se_tamakoro_e.s +++ /dev/null @@ -1,75 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tamakoro_e_grp, voicegroup128 - .equ se_tamakoro_e_pri, 2 - .equ se_tamakoro_e_rev, reverb_set+50 - .equ se_tamakoro_e_mvl, 127 - .equ se_tamakoro_e_key, 0 - .equ se_tamakoro_e_tbs, 1 - .equ se_tamakoro_e_exg, 0 - .equ se_tamakoro_e_cmp, 1 - - .section .rodata - .global se_tamakoro_e - .align 2 - -@********************** Track 1 **********************@ - -se_tamakoro_e_1: - .byte KEYSH , se_tamakoro_e_key+0 - .byte TEMPO , 150*se_tamakoro_e_tbs/2 - .byte VOICE , 63 - .byte BENDR , 6 - .byte VOL , 110*se_tamakoro_e_mvl/mxv - .byte BEND , c_v+0 - .byte N72 , Dn3 , v127 - .byte W06 - .byte VOL , 107*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-3 - .byte W06 - .byte VOL , 106*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-5 - .byte W06 - .byte VOL , 104*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-7 - .byte W06 - .byte VOL , 102*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-10 - .byte W06 - .byte VOL , 97*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-12 - .byte W06 - .byte VOL , 90*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-14 - .byte W06 - .byte VOL , 73*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-19 - .byte W06 - .byte VOL , 58*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-24 - .byte W06 - .byte VOL , 40*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-29 - .byte W06 - .byte VOL , 25*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-35 - .byte W06 - .byte VOL , 12*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-46 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_tamakoro_e: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tamakoro_e_pri @ Priority - .byte se_tamakoro_e_rev @ Reverb. - - .word se_tamakoro_e_grp - - .word se_tamakoro_e_1 - - .end diff --git a/sound/songs/se_tb_kara.s b/sound/songs/se_tb_kara.s deleted file mode 100644 index 2b5772256..000000000 --- a/sound/songs/se_tb_kara.s +++ /dev/null @@ -1,43 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tb_kara_grp, voicegroup127 - .equ se_tb_kara_pri, 5 - .equ se_tb_kara_rev, reverb_set+50 - .equ se_tb_kara_mvl, 127 - .equ se_tb_kara_key, 0 - .equ se_tb_kara_tbs, 1 - .equ se_tb_kara_exg, 0 - .equ se_tb_kara_cmp, 1 - - .section .rodata - .global se_tb_kara - .align 2 - -@********************** Track 1 **********************@ - -se_tb_kara_1: - .byte KEYSH , se_tb_kara_key+0 - .byte TEMPO , 150*se_tb_kara_tbs/2 - .byte VOICE , 119 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 100*se_tb_kara_mvl/mxv - .byte BEND , c_v+1 - .byte N02 , Gs4 , v040 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_tb_kara: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tb_kara_pri @ Priority - .byte se_tb_kara_rev @ Reverb. - - .word se_tb_kara_grp - - .word se_tb_kara_1 - - .end diff --git a/sound/songs/se_tb_kon.s b/sound/songs/se_tb_kon.s deleted file mode 100644 index 44ae71f3f..000000000 --- a/sound/songs/se_tb_kon.s +++ /dev/null @@ -1,48 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tb_kon_grp, voicegroup128 - .equ se_tb_kon_pri, 5 - .equ se_tb_kon_rev, reverb_set+50 - .equ se_tb_kon_mvl, 127 - .equ se_tb_kon_key, 0 - .equ se_tb_kon_tbs, 1 - .equ se_tb_kon_exg, 0 - .equ se_tb_kon_cmp, 1 - - .section .rodata - .global se_tb_kon - .align 2 - -@********************** Track 1 **********************@ - -se_tb_kon_1: - .byte KEYSH , se_tb_kon_key+0 - .byte TEMPO , 150*se_tb_kon_tbs/2 - .byte VOICE , 16 - .byte VOL , 110*se_tb_kon_mvl/mxv - .byte BEND , c_v+1 - .byte N03 , Gs4 , v072 - .byte W01 - .byte BEND , c_v-2 - .byte W01 - .byte VOL , 58*se_tb_kon_mvl/mxv - .byte BEND , c_v-10 - .byte W01 - .byte VOL , 28*se_tb_kon_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_tb_kon: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tb_kon_pri @ Priority - .byte se_tb_kon_rev @ Reverb. - - .word se_tb_kon_grp - - .word se_tb_kon_1 - - .end diff --git a/sound/songs/se_tb_start.s b/sound/songs/se_tb_start.s deleted file mode 100644 index 136cb1a4b..000000000 --- a/sound/songs/se_tb_start.s +++ /dev/null @@ -1,75 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tb_start_grp, voicegroup128 - .equ se_tb_start_pri, 5 - .equ se_tb_start_rev, reverb_set+50 - .equ se_tb_start_mvl, 127 - .equ se_tb_start_key, 0 - .equ se_tb_start_tbs, 1 - .equ se_tb_start_exg, 0 - .equ se_tb_start_cmp, 1 - - .section .rodata - .global se_tb_start - .align 2 - -@********************** Track 1 **********************@ - -se_tb_start_1: - .byte KEYSH , se_tb_start_key+0 - .byte TEMPO , 150*se_tb_start_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v-32 - .byte VOL , 16*se_tb_start_mvl/mxv - .byte BEND , c_v+1 - .byte N09 , Gn5 , v032 - .byte W01 - .byte VOL , 63*se_tb_start_mvl/mxv - .byte W01 - .byte 98*se_tb_start_mvl/mxv - .byte W01 - .byte 110*se_tb_start_mvl/mxv - .byte W01 - .byte 99*se_tb_start_mvl/mxv - .byte BEND , c_v+5 - .byte W02 - .byte VOL , 63*se_tb_start_mvl/mxv - .byte BEND , c_v+13 - .byte W01 - .byte VOL , 22*se_tb_start_mvl/mxv - .byte BEND , c_v+21 - .byte W01 - .byte VOL , 9*se_tb_start_mvl/mxv - .byte BEND , c_v+33 - .byte W04 - .byte FINE - -@********************** Track 2 **********************@ - -se_tb_start_2: - .byte KEYSH , se_tb_start_key+0 - .byte VOICE , 71 - .byte PAN , c_v+32 - .byte VOL , 110*se_tb_start_mvl/mxv - .byte BEND , c_v+1 - .byte N09 , Fs4 , v060 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_tb_start: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_tb_start_pri @ Priority - .byte se_tb_start_rev @ Reverb. - - .word se_tb_start_grp - - .word se_tb_start_1 - .word se_tb_start_2 - - .end diff --git a/sound/songs/se_tk_kasya.s b/sound/songs/se_tk_kasya.s deleted file mode 100644 index 9bd0c6c4c..000000000 --- a/sound/songs/se_tk_kasya.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tk_kasya_grp, voicegroup127 - .equ se_tk_kasya_pri, 4 - .equ se_tk_kasya_rev, reverb_set+50 - .equ se_tk_kasya_mvl, 127 - .equ se_tk_kasya_key, 0 - .equ se_tk_kasya_tbs, 1 - .equ se_tk_kasya_exg, 0 - .equ se_tk_kasya_cmp, 1 - - .section .rodata - .global se_tk_kasya - .align 2 - -@********************** Track 1 **********************@ - -se_tk_kasya_1: - .byte KEYSH , se_tk_kasya_key+0 - .byte TEMPO , 150*se_tk_kasya_tbs/2 - .byte VOICE , 126 - .byte VOL , 110*se_tk_kasya_mvl/mxv - .byte N01 , Gs3 , v127 - .byte W01 - .byte Cn4 , v068 - .byte W02 - .byte W02 - .byte N03 , Gs4 , v127 - .byte W01 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_tk_kasya: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tk_kasya_pri @ Priority - .byte se_tk_kasya_rev @ Reverb. - - .word se_tk_kasya_grp - - .word se_tk_kasya_1 - - .end diff --git a/sound/songs/se_tk_warpin.s b/sound/songs/se_tk_warpin.s deleted file mode 100644 index b40985aa0..000000000 --- a/sound/songs/se_tk_warpin.s +++ /dev/null @@ -1,56 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tk_warpin_grp, voicegroup127 - .equ se_tk_warpin_pri, 4 - .equ se_tk_warpin_rev, reverb_set+50 - .equ se_tk_warpin_mvl, 127 - .equ se_tk_warpin_key, 0 - .equ se_tk_warpin_tbs, 1 - .equ se_tk_warpin_exg, 0 - .equ se_tk_warpin_cmp, 1 - - .section .rodata - .global se_tk_warpin - .align 2 - -@********************** Track 1 **********************@ - -se_tk_warpin_1: - .byte KEYSH , se_tk_warpin_key+0 - .byte TEMPO , 110*se_tk_warpin_tbs/2 - .byte VOICE , 90 - .byte VOL , 90*se_tk_warpin_mvl/mxv - .byte N06 , En4 , v127 - .byte W03 - .byte W03 - .byte N03 , En4 , v016 - .byte W03 - .byte N06 , En4 , v112 - .byte W03 - .byte W03 - .byte N03 , En4 , v016 - .byte W03 - .byte N06 , En4 , v088 - .byte W03 - .byte W03 - .byte N03 , En4 , v016 - .byte W03 - .byte N06 , En4 , v064 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_tk_warpin: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tk_warpin_pri @ Priority - .byte se_tk_warpin_rev @ Reverb. - - .word se_tk_warpin_grp - - .word se_tk_warpin_1 - - .end diff --git a/sound/songs/se_tk_warpout.s b/sound/songs/se_tk_warpout.s deleted file mode 100644 index 0a1a0e96b..000000000 --- a/sound/songs/se_tk_warpout.s +++ /dev/null @@ -1,60 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tk_warpout_grp, voicegroup127 - .equ se_tk_warpout_pri, 4 - .equ se_tk_warpout_rev, reverb_set+50 - .equ se_tk_warpout_mvl, 127 - .equ se_tk_warpout_key, 0 - .equ se_tk_warpout_tbs, 1 - .equ se_tk_warpout_exg, 0 - .equ se_tk_warpout_cmp, 1 - - .section .rodata - .global se_tk_warpout - .align 2 - -@********************** Track 1 **********************@ - -se_tk_warpout_1: - .byte KEYSH , se_tk_warpout_key+0 - .byte TEMPO , 110*se_tk_warpout_tbs/2 - .byte VOICE , 93 - .byte XCMD , xIECV , 9 - .byte xIECL , 8 - .byte VOL , 90*se_tk_warpout_mvl/mxv - .byte N06 , En5 , v064 - .byte W03 - .byte W03 - .byte N03 , En5 , v016 - .byte W03 - .byte N06 , En5 , v088 - .byte W03 - .byte W03 - .byte N03 , En5 , v016 - .byte W03 - .byte N06 , En5 , v112 - .byte W03 - .byte W03 - .byte N03 , En5 , v016 - .byte W03 - .byte N06 , En5 , v127 - .byte W03 - .byte W03 - .byte N03 , En5 , v016 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_tk_warpout: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tk_warpout_pri @ Priority - .byte se_tk_warpout_rev @ Reverb. - - .word se_tk_warpout_grp - - .word se_tk_warpout_1 - - .end diff --git a/sound/songs/se_toreeye.s b/sound/songs/se_toreeye.s deleted file mode 100644 index 685e37878..000000000 --- a/sound/songs/se_toreeye.s +++ /dev/null @@ -1,146 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toreeye_grp, voicegroup129 - .equ se_toreeye_pri, 5 - .equ se_toreeye_rev, reverb_set+50 - .equ se_toreeye_mvl, 127 - .equ se_toreeye_key, 0 - .equ se_toreeye_tbs, 1 - .equ se_toreeye_exg, 0 - .equ se_toreeye_cmp, 1 - - .section .rodata - .global se_toreeye - .align 2 - -@********************** Track 1 **********************@ - -se_toreeye_1: - .byte KEYSH , se_toreeye_key+0 - .byte TEMPO , 136*se_toreeye_tbs/2 - .byte VOICE , 13 - .byte LFOS , 44 - .byte BENDR , 12 - .byte VOL , 120*se_toreeye_mvl/mxv - .byte PAN , c_v-16 - .byte N01 , An5 , v064 - .byte W01 - .byte Dn6 - .byte W01 - .byte An5 - .byte W01 - .byte Dn6 - .byte W01 - .byte Fs6 - .byte W02 - .byte An5 - .byte W01 - .byte Dn6 - .byte W01 - .byte An5 - .byte W01 - .byte Fs6 - .byte W01 - .byte An5 - .byte W02 - .byte N01 - .byte W01 - .byte Dn6 - .byte W01 - .byte An5 - .byte W01 - .byte Dn6 - .byte W01 - .byte Fs6 - .byte W02 - .byte An5 - .byte W01 - .byte Dn6 - .byte W01 - .byte An5 - .byte W01 - .byte Fs6 - .byte W01 - .byte An5 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_toreeye_2: - .byte KEYSH , se_toreeye_key+0 - .byte VOICE , 80 - .byte LFOS , 44 - .byte XCMD , xIECV , 18 - .byte xIECV , 16 - .byte BENDR , 12 - .byte VOL , 45*se_toreeye_mvl/mxv - .byte MOD , 2 - .byte PAN , c_v+63 - .byte BEND , c_v+2 - .byte N01 , Dn5 , v064 - .byte W01 - .byte Fs5 - .byte W01 - .byte PAN , c_v-62 - .byte N01 , Dn5 - .byte W01 - .byte Fs5 - .byte W01 - .byte PAN , c_v+63 - .byte N01 , An5 - .byte W02 - .byte Dn5 - .byte W01 - .byte PAN , c_v-61 - .byte N01 , Fs5 - .byte W01 - .byte Dn5 - .byte W01 - .byte PAN , c_v+63 - .byte N01 , An5 - .byte W01 - .byte Dn5 - .byte W02 - .byte PAN , c_v-61 - .byte N01 - .byte W01 - .byte Fs5 - .byte W01 - .byte PAN , c_v+63 - .byte N01 , Dn5 - .byte W01 - .byte Fs5 - .byte W01 - .byte PAN , c_v-61 - .byte N01 , An5 - .byte W02 - .byte Dn5 - .byte W01 - .byte PAN , c_v+63 - .byte N01 , Fs5 - .byte W01 - .byte Dn5 - .byte W01 - .byte PAN , c_v-61 - .byte N01 , An5 - .byte W01 - .byte Dn5 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_toreeye: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_toreeye_pri @ Priority - .byte se_toreeye_rev @ Reverb. - - .word se_toreeye_grp - - .word se_toreeye_1 - .word se_toreeye_2 - - .end diff --git a/sound/songs/se_toreoff.s b/sound/songs/se_toreoff.s deleted file mode 100644 index d5632eeb7..000000000 --- a/sound/songs/se_toreoff.s +++ /dev/null @@ -1,87 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toreoff_grp, voicegroup129 - .equ se_toreoff_pri, 5 - .equ se_toreoff_rev, reverb_set+50 - .equ se_toreoff_mvl, 127 - .equ se_toreoff_key, 0 - .equ se_toreoff_tbs, 1 - .equ se_toreoff_exg, 0 - .equ se_toreoff_cmp, 1 - - .section .rodata - .global se_toreoff - .align 2 - -@********************** Track 1 **********************@ - -se_toreoff_1: - .byte KEYSH , se_toreoff_key+0 - .byte TEMPO , 120*se_toreoff_tbs/2 - .byte VOICE , 10 - .byte VOL , 110*se_toreoff_mvl/mxv - .byte BEND , c_v-8 - .byte W01 - .byte N01 , Ds3 , v112 - .byte W04 - .byte Gs1 - .byte W01 - .byte Bn1 , v056 - .byte W04 - .byte Bn1 , v024 - .byte W02 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_toreoff_2: - .byte KEYSH , se_toreoff_key+0 - .byte VOICE , 82 - .byte VOL , 110*se_toreoff_mvl/mxv - .byte BENDR , 12 - .byte LFOS , 44 - .byte BEND , c_v+0 - .byte N01 , Cs3 , v064 - .byte W01 - .byte Fs4 , v032 - .byte W01 - .byte BEND , c_v+0 - .byte N01 , Gs5 , v028 - .byte W01 - .byte BEND , c_v+63 - .byte W01 - .byte c_v-63 - .byte N01 , Cs3 , v036 - .byte W01 - .byte BEND , c_v+63 - .byte W01 - .byte c_v-63 - .byte N01 , Bn4 , v052 - .byte W02 - .byte BEND , c_v+0 - .byte W02 - .byte N01 , Cs1 - .byte W02 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_toreoff: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_toreoff_pri @ Priority - .byte se_toreoff_rev @ Reverb. - - .word se_toreoff_grp - - .word se_toreoff_1 - .word se_toreoff_2 - - .end diff --git a/sound/songs/se_toy_a.s b/sound/songs/se_toy_a.s deleted file mode 100644 index ab772025d..000000000 --- a/sound/songs/se_toy_a.s +++ /dev/null @@ -1,59 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_a_grp, voicegroup128 - .equ se_toy_a_pri, 4 - .equ se_toy_a_rev, reverb_set+50 - .equ se_toy_a_mvl, 127 - .equ se_toy_a_key, 0 - .equ se_toy_a_tbs, 1 - .equ se_toy_a_exg, 0 - .equ se_toy_a_cmp, 1 - - .section .rodata - .global se_toy_a - .align 2 - -@********************** Track 1 **********************@ - -se_toy_a_1: - .byte KEYSH , se_toy_a_key+0 - .byte TEMPO , 150*se_toy_a_tbs/2 - .byte VOICE , 48 - .byte VOL , 110*se_toy_a_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , An5 , v112 - .byte W06 - .byte W06 - .byte N06 , An5 , v040 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_toy_a_2: - .byte KEYSH , se_toy_a_key+0 - .byte VOICE , 17 - .byte VOL , 110*se_toy_a_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , En6 , v060 - .byte W06 - .byte W06 - .byte N06 , En6 , v032 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_a: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_a_pri @ Priority - .byte se_toy_a_rev @ Reverb. - - .word se_toy_a_grp - - .word se_toy_a_1 - .word se_toy_a_2 - - .end diff --git a/sound/songs/se_toy_b.s b/sound/songs/se_toy_b.s deleted file mode 100644 index b773808f1..000000000 --- a/sound/songs/se_toy_b.s +++ /dev/null @@ -1,59 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_b_grp, voicegroup128 - .equ se_toy_b_pri, 4 - .equ se_toy_b_rev, reverb_set+50 - .equ se_toy_b_mvl, 127 - .equ se_toy_b_key, 0 - .equ se_toy_b_tbs, 1 - .equ se_toy_b_exg, 0 - .equ se_toy_b_cmp, 1 - - .section .rodata - .global se_toy_b - .align 2 - -@********************** Track 1 **********************@ - -se_toy_b_1: - .byte KEYSH , se_toy_b_key+0 - .byte TEMPO , 150*se_toy_b_tbs/2 - .byte VOICE , 48 - .byte VOL , 110*se_toy_b_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Bn5 , v112 - .byte W06 - .byte W06 - .byte N06 , Bn5 , v040 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_toy_b_2: - .byte KEYSH , se_toy_b_key+0 - .byte VOICE , 17 - .byte VOL , 110*se_toy_b_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Fs6 , v060 - .byte W06 - .byte W06 - .byte N06 , Fs6 , v032 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_b: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_b_pri @ Priority - .byte se_toy_b_rev @ Reverb. - - .word se_toy_b_grp - - .word se_toy_b_1 - .word se_toy_b_2 - - .end diff --git a/sound/songs/se_toy_c.s b/sound/songs/se_toy_c.s deleted file mode 100644 index 43b09ad9b..000000000 --- a/sound/songs/se_toy_c.s +++ /dev/null @@ -1,59 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_c_grp, voicegroup128 - .equ se_toy_c_pri, 4 - .equ se_toy_c_rev, reverb_set+50 - .equ se_toy_c_mvl, 127 - .equ se_toy_c_key, 0 - .equ se_toy_c_tbs, 1 - .equ se_toy_c_exg, 0 - .equ se_toy_c_cmp, 1 - - .section .rodata - .global se_toy_c - .align 2 - -@********************** Track 1 **********************@ - -se_toy_c_1: - .byte KEYSH , se_toy_c_key+0 - .byte TEMPO , 150*se_toy_c_tbs/2 - .byte VOICE , 48 - .byte VOL , 110*se_toy_c_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Cn5 , v112 - .byte W06 - .byte W06 - .byte N06 , Cn5 , v040 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_toy_c_2: - .byte KEYSH , se_toy_c_key+0 - .byte VOICE , 17 - .byte VOL , 110*se_toy_c_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Gn5 , v060 - .byte W06 - .byte W06 - .byte N06 , Gn5 , v032 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_c: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_c_pri @ Priority - .byte se_toy_c_rev @ Reverb. - - .word se_toy_c_grp - - .word se_toy_c_1 - .word se_toy_c_2 - - .end diff --git a/sound/songs/se_toy_c1.s b/sound/songs/se_toy_c1.s deleted file mode 100644 index 9a258f36d..000000000 --- a/sound/songs/se_toy_c1.s +++ /dev/null @@ -1,59 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_c1_grp, voicegroup128 - .equ se_toy_c1_pri, 4 - .equ se_toy_c1_rev, reverb_set+50 - .equ se_toy_c1_mvl, 127 - .equ se_toy_c1_key, 0 - .equ se_toy_c1_tbs, 1 - .equ se_toy_c1_exg, 0 - .equ se_toy_c1_cmp, 1 - - .section .rodata - .global se_toy_c1 - .align 2 - -@********************** Track 1 **********************@ - -se_toy_c1_1: - .byte KEYSH , se_toy_c1_key+0 - .byte TEMPO , 150*se_toy_c1_tbs/2 - .byte VOICE , 48 - .byte VOL , 110*se_toy_c1_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Cn6 , v112 - .byte W06 - .byte W06 - .byte N06 , Cn6 , v040 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_toy_c1_2: - .byte KEYSH , se_toy_c1_key+0 - .byte VOICE , 17 - .byte VOL , 110*se_toy_c1_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Gn6 , v060 - .byte W06 - .byte W06 - .byte N06 , Gn6 , v032 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_c1: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_c1_pri @ Priority - .byte se_toy_c1_rev @ Reverb. - - .word se_toy_c1_grp - - .word se_toy_c1_1 - .word se_toy_c1_2 - - .end diff --git a/sound/songs/se_toy_d.s b/sound/songs/se_toy_d.s deleted file mode 100644 index 953fee96d..000000000 --- a/sound/songs/se_toy_d.s +++ /dev/null @@ -1,59 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_d_grp, voicegroup128 - .equ se_toy_d_pri, 4 - .equ se_toy_d_rev, reverb_set+50 - .equ se_toy_d_mvl, 127 - .equ se_toy_d_key, 0 - .equ se_toy_d_tbs, 1 - .equ se_toy_d_exg, 0 - .equ se_toy_d_cmp, 1 - - .section .rodata - .global se_toy_d - .align 2 - -@********************** Track 1 **********************@ - -se_toy_d_1: - .byte KEYSH , se_toy_d_key+0 - .byte TEMPO , 150*se_toy_d_tbs/2 - .byte VOICE , 48 - .byte VOL , 110*se_toy_d_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Dn5 , v112 - .byte W06 - .byte W06 - .byte N06 , Dn5 , v040 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_toy_d_2: - .byte KEYSH , se_toy_d_key+0 - .byte VOICE , 17 - .byte VOL , 110*se_toy_d_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , An5 , v060 - .byte W06 - .byte W06 - .byte N06 , An5 , v032 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_d: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_d_pri @ Priority - .byte se_toy_d_rev @ Reverb. - - .word se_toy_d_grp - - .word se_toy_d_1 - .word se_toy_d_2 - - .end diff --git a/sound/songs/se_toy_dango.s b/sound/songs/se_toy_dango.s deleted file mode 100644 index b8469a5a0..000000000 --- a/sound/songs/se_toy_dango.s +++ /dev/null @@ -1,52 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_dango_grp, voicegroup128 - .equ se_toy_dango_pri, 4 - .equ se_toy_dango_rev, reverb_set+50 - .equ se_toy_dango_mvl, 127 - .equ se_toy_dango_key, 0 - .equ se_toy_dango_tbs, 1 - .equ se_toy_dango_exg, 0 - .equ se_toy_dango_cmp, 1 - - .section .rodata - .global se_toy_dango - .align 2 - -@********************** Track 1 **********************@ - -se_toy_dango_1: - .byte KEYSH , se_toy_dango_key+0 - .byte TEMPO , 150*se_toy_dango_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_toy_dango_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Cn4 , v112 - .byte W01 - .byte VOICE , 26 - .byte W01 - .byte N01 , Fn4 , v127 - .byte W01 - .byte W01 - .byte VOICE , 36 - .byte W02 - .byte N01 , Cn3 , v056 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_dango: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_dango_pri @ Priority - .byte se_toy_dango_rev @ Reverb. - - .word se_toy_dango_grp - - .word se_toy_dango_1 - - .end diff --git a/sound/songs/se_toy_e.s b/sound/songs/se_toy_e.s deleted file mode 100644 index d57dcf6c1..000000000 --- a/sound/songs/se_toy_e.s +++ /dev/null @@ -1,59 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_e_grp, voicegroup128 - .equ se_toy_e_pri, 4 - .equ se_toy_e_rev, reverb_set+50 - .equ se_toy_e_mvl, 127 - .equ se_toy_e_key, 0 - .equ se_toy_e_tbs, 1 - .equ se_toy_e_exg, 0 - .equ se_toy_e_cmp, 1 - - .section .rodata - .global se_toy_e - .align 2 - -@********************** Track 1 **********************@ - -se_toy_e_1: - .byte KEYSH , se_toy_e_key+0 - .byte TEMPO , 150*se_toy_e_tbs/2 - .byte VOICE , 48 - .byte VOL , 110*se_toy_e_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , En5 , v112 - .byte W06 - .byte W06 - .byte N06 , En5 , v040 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_toy_e_2: - .byte KEYSH , se_toy_e_key+0 - .byte VOICE , 17 - .byte VOL , 110*se_toy_e_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Bn5 , v060 - .byte W06 - .byte W06 - .byte N06 , Bn5 , v032 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_e: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_e_pri @ Priority - .byte se_toy_e_rev @ Reverb. - - .word se_toy_e_grp - - .word se_toy_e_1 - .word se_toy_e_2 - - .end diff --git a/sound/songs/se_toy_f.s b/sound/songs/se_toy_f.s deleted file mode 100644 index cde717ede..000000000 --- a/sound/songs/se_toy_f.s +++ /dev/null @@ -1,59 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_f_grp, voicegroup128 - .equ se_toy_f_pri, 4 - .equ se_toy_f_rev, reverb_set+50 - .equ se_toy_f_mvl, 127 - .equ se_toy_f_key, 0 - .equ se_toy_f_tbs, 1 - .equ se_toy_f_exg, 0 - .equ se_toy_f_cmp, 1 - - .section .rodata - .global se_toy_f - .align 2 - -@********************** Track 1 **********************@ - -se_toy_f_1: - .byte KEYSH , se_toy_f_key+0 - .byte TEMPO , 150*se_toy_f_tbs/2 - .byte VOICE , 48 - .byte VOL , 110*se_toy_f_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Fn5 , v112 - .byte W06 - .byte W06 - .byte N06 , Fn5 , v040 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_toy_f_2: - .byte KEYSH , se_toy_f_key+0 - .byte VOICE , 17 - .byte VOL , 110*se_toy_f_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Cn6 , v060 - .byte W06 - .byte W06 - .byte N06 , Cn6 , v032 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_f: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_f_pri @ Priority - .byte se_toy_f_rev @ Reverb. - - .word se_toy_f_grp - - .word se_toy_f_1 - .word se_toy_f_2 - - .end diff --git a/sound/songs/se_toy_g.s b/sound/songs/se_toy_g.s deleted file mode 100644 index 74c9c2ce9..000000000 --- a/sound/songs/se_toy_g.s +++ /dev/null @@ -1,59 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_g_grp, voicegroup128 - .equ se_toy_g_pri, 4 - .equ se_toy_g_rev, reverb_set+50 - .equ se_toy_g_mvl, 127 - .equ se_toy_g_key, 0 - .equ se_toy_g_tbs, 1 - .equ se_toy_g_exg, 0 - .equ se_toy_g_cmp, 1 - - .section .rodata - .global se_toy_g - .align 2 - -@********************** Track 1 **********************@ - -se_toy_g_1: - .byte KEYSH , se_toy_g_key+0 - .byte TEMPO , 150*se_toy_g_tbs/2 - .byte VOICE , 48 - .byte VOL , 110*se_toy_g_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Gn5 , v112 - .byte W06 - .byte W06 - .byte N06 , Gn5 , v040 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_toy_g_2: - .byte KEYSH , se_toy_g_key+0 - .byte VOICE , 17 - .byte VOL , 110*se_toy_g_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Dn6 , v060 - .byte W06 - .byte W06 - .byte N06 , Dn6 , v032 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_g: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_g_pri @ Priority - .byte se_toy_g_rev @ Reverb. - - .word se_toy_g_grp - - .word se_toy_g_1 - .word se_toy_g_2 - - .end diff --git a/sound/songs/se_toy_kabe.s b/sound/songs/se_toy_kabe.s deleted file mode 100644 index bb51229d0..000000000 --- a/sound/songs/se_toy_kabe.s +++ /dev/null @@ -1,75 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_kabe_grp, voicegroup128 - .equ se_toy_kabe_pri, 4 - .equ se_toy_kabe_rev, reverb_set+50 - .equ se_toy_kabe_mvl, 127 - .equ se_toy_kabe_key, 0 - .equ se_toy_kabe_tbs, 1 - .equ se_toy_kabe_exg, 0 - .equ se_toy_kabe_cmp, 1 - - .section .rodata - .global se_toy_kabe - .align 2 - -@********************** Track 1 **********************@ - -se_toy_kabe_1: - .byte KEYSH , se_toy_kabe_key+0 - .byte TEMPO , 240*se_toy_kabe_tbs/2 - .byte VOICE , 41 - .byte BENDR , 12 - .byte VOL , 110*se_toy_kabe_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Fs4 , v127 - .byte W01 - .byte BEND , c_v-8 - .byte W01 - .byte c_v-23 - .byte W01 - .byte W01 - .byte c_v+0 - .byte N10 , Cn4 - .byte W02 - .byte W03 - .byte W01 - .byte VOL , 96*se_toy_kabe_mvl/mxv - .byte W02 - .byte 82*se_toy_kabe_mvl/mxv - .byte W01 - .byte 45*se_toy_kabe_mvl/mxv - .byte W01 - .byte 20*se_toy_kabe_mvl/mxv - .byte W01 - .byte W03 - .byte W01 - .byte 110*se_toy_kabe_mvl/mxv - .byte N10 , Cn4 , v040 - .byte W02 - .byte W03 - .byte W01 - .byte VOL , 96*se_toy_kabe_mvl/mxv - .byte W01 - .byte 82*se_toy_kabe_mvl/mxv - .byte W01 - .byte 45*se_toy_kabe_mvl/mxv - .byte W01 - .byte 20*se_toy_kabe_mvl/mxv - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_kabe: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_kabe_pri @ Priority - .byte se_toy_kabe_rev @ Reverb. - - .word se_toy_kabe_grp - - .word se_toy_kabe_1 - - .end diff --git a/sound/songs/se_track_door.s b/sound/songs/se_track_door.s deleted file mode 100644 index 8805c7b61..000000000 --- a/sound/songs/se_track_door.s +++ /dev/null @@ -1,61 +0,0 @@ - .include "MPlayDef.s" - - .equ se_track_door_grp, voicegroup128 - .equ se_track_door_pri, 4 - .equ se_track_door_rev, reverb_set+50 - .equ se_track_door_mvl, 127 - .equ se_track_door_key, 0 - .equ se_track_door_tbs, 1 - .equ se_track_door_exg, 0 - .equ se_track_door_cmp, 1 - - .section .rodata - .global se_track_door - .align 2 - -@********************** Track 1 **********************@ - -se_track_door_1: - .byte KEYSH , se_track_door_key+0 - .byte TEMPO , 150*se_track_door_tbs/2 - .byte VOICE , 8 - .byte VOL , 110*se_track_door_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Cn2 , v092 - .byte W06 - .byte N01 , Cn3 - .byte W02 - .byte N02 , Cn4 - .byte W04 - .byte FINE - -@********************** Track 2 **********************@ - -se_track_door_2: - .byte VOL , 110*se_track_door_mvl/mxv - .byte KEYSH , se_track_door_key+0 - .byte VOICE , 4 - .byte N03 , Cn2 , v032 - .byte W05 - .byte N01 , Cn4 - .byte W01 - .byte W02 - .byte N02 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_track_door: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_track_door_pri @ Priority - .byte se_track_door_rev @ Reverb. - - .word se_track_door_grp - - .word se_track_door_1 - .word se_track_door_2 - - .end diff --git a/sound/songs/se_track_haiki.s b/sound/songs/se_track_haiki.s deleted file mode 100644 index 88737eb88..000000000 --- a/sound/songs/se_track_haiki.s +++ /dev/null @@ -1,49 +0,0 @@ - .include "MPlayDef.s" - - .equ se_track_haiki_grp, voicegroup127 - .equ se_track_haiki_pri, 4 - .equ se_track_haiki_rev, reverb_set+50 - .equ se_track_haiki_mvl, 127 - .equ se_track_haiki_key, 0 - .equ se_track_haiki_tbs, 1 - .equ se_track_haiki_exg, 0 - .equ se_track_haiki_cmp, 1 - - .section .rodata - .global se_track_haiki - .align 2 - -@********************** Track 1 **********************@ - -se_track_haiki_1: - .byte KEYSH , se_track_haiki_key+0 - .byte TEMPO , 150*se_track_haiki_tbs/2 - .byte VOICE , 120 - .byte VOL , 127*se_track_haiki_mvl/mxv - .byte N06 , Bn3 , v028 - .byte W03 - .byte W03 - .byte N21 , Gs4 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_track_haiki: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_track_haiki_pri @ Priority - .byte se_track_haiki_rev @ Reverb. - - .word se_track_haiki_grp - - .word se_track_haiki_1 - - .end diff --git a/sound/songs/se_track_move.s b/sound/songs/se_track_move.s deleted file mode 100644 index 9b33a3780..000000000 --- a/sound/songs/se_track_move.s +++ /dev/null @@ -1,146 +0,0 @@ - .include "MPlayDef.s" - - .equ se_track_move_grp, voicegroup128 - .equ se_track_move_pri, 4 - .equ se_track_move_rev, reverb_set+50 - .equ se_track_move_mvl, 127 - .equ se_track_move_key, 0 - .equ se_track_move_tbs, 1 - .equ se_track_move_exg, 0 - .equ se_track_move_cmp, 1 - - .section .rodata - .global se_track_move - .align 2 - -@********************** Track 1 **********************@ - -se_track_move_1: - .byte KEYSH , se_track_move_key+0 - .byte TEMPO , 150*se_track_move_tbs/2 - .byte VOICE , 10 - .byte VOL , 18*se_track_move_mvl/mxv - .byte BEND , c_v+0 - .byte N96 , Cs3 , v127 - .byte W08 - .byte VOL , 31*se_track_move_mvl/mxv - .byte W08 - .byte 42*se_track_move_mvl/mxv - .byte W08 - .byte 59*se_track_move_mvl/mxv - .byte W08 - .byte 74*se_track_move_mvl/mxv - .byte W08 - .byte 88*se_track_move_mvl/mxv - .byte W08 - .byte 106*se_track_move_mvl/mxv - .byte W08 - .byte 118*se_track_move_mvl/mxv - .byte W08 - .byte 127*se_track_move_mvl/mxv - .byte W32 -se_track_move_1_B1: - .byte TIE , Cs3 , v127 - .byte W96 - .byte W96 - .byte W96 - .byte EOT - .byte GOTO - .word se_track_move_1_B1 - .byte FINE - -@********************** Track 2 **********************@ - -se_track_move_2: - .byte KEYSH , se_track_move_key+0 - .byte VOICE , 11 - .byte VOL , 18*se_track_move_mvl/mxv - .byte W08 - .byte 31*se_track_move_mvl/mxv - .byte W04 - .byte N03 , Fn2 , v044 - .byte W04 - .byte VOL , 42*se_track_move_mvl/mxv - .byte W02 - .byte N03 , An2 - .byte W06 - .byte VOL , 59*se_track_move_mvl/mxv - .byte W06 - .byte N03 , Cs2 , v052 - .byte W02 - .byte VOL , 74*se_track_move_mvl/mxv - .byte W08 - .byte 88*se_track_move_mvl/mxv - .byte W08 - .byte 106*se_track_move_mvl/mxv - .byte N03 , Gn2 , v044 - .byte W08 - .byte VOL , 118*se_track_move_mvl/mxv - .byte W08 - .byte 127*se_track_move_mvl/mxv - .byte W08 - .byte N01 , Bn2 , v032 - .byte W12 - .byte N03 , Fn2 , v044 - .byte W12 -se_track_move_2_B1: - .byte W12 - .byte N03 , Fn2 , v044 - .byte W06 - .byte An2 , v032 - .byte W12 - .byte Cs2 , v052 - .byte W12 - .byte An2 , v032 - .byte W06 - .byte Gn2 , v044 - .byte W24 - .byte N03 - .byte W12 - .byte Fn2 - .byte W12 - .byte Gn2 - .byte W18 - .byte Cs2 , v052 - .byte W12 - .byte N01 , Bn2 , v032 - .byte W06 - .byte N03 , Fn2 , v044 - .byte W24 - .byte N03 - .byte W18 - .byte Cs2 , v052 - .byte W18 - .byte Gn2 , v044 - .byte W18 - .byte An2 - .byte W12 - .byte Cs2 , v052 - .byte W18 - .byte Gn2 , v044 - .byte W12 - .byte Fn2 - .byte W18 - .byte N01 , Bn2 , v032 - .byte W06 - .byte N03 , Fn2 , v044 - .byte W12 - .byte GOTO - .word se_track_move_2_B1 - .byte FINE - -@******************************************************@ - .align 2 - -se_track_move: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_track_move_pri @ Priority - .byte se_track_move_rev @ Reverb. - - .word se_track_move_grp - - .word se_track_move_1 - .word se_track_move_2 - - .end diff --git a/sound/songs/se_track_stop.s b/sound/songs/se_track_stop.s deleted file mode 100644 index ef0aefc55..000000000 --- a/sound/songs/se_track_stop.s +++ /dev/null @@ -1,123 +0,0 @@ - .include "MPlayDef.s" - - .equ se_track_stop_grp, voicegroup128 - .equ se_track_stop_pri, 4 - .equ se_track_stop_rev, reverb_set+50 - .equ se_track_stop_mvl, 127 - .equ se_track_stop_key, 0 - .equ se_track_stop_tbs, 1 - .equ se_track_stop_exg, 0 - .equ se_track_stop_cmp, 1 - - .section .rodata - .global se_track_stop - .align 2 - -@********************** Track 1 **********************@ - -se_track_stop_1: - .byte KEYSH , se_track_stop_key+0 - .byte TEMPO , 150*se_track_stop_tbs/2 - .byte VOICE , 10 - .byte VOL , 127*se_track_stop_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Cs3 , v127 - .byte W09 - .byte BEND , c_v-9 - .byte W09 - .byte c_v-18 - .byte W06 - .byte W09 - .byte c_v-26 - .byte W09 - .byte c_v-34 - .byte W06 - .byte W06 - .byte c_v-43 - .byte W05 - .byte VOL , 123*se_track_stop_mvl/mxv - .byte W04 - .byte BEND , c_v-54 - .byte W02 - .byte VOL , 117*se_track_stop_mvl/mxv - .byte W06 - .byte 110*se_track_stop_mvl/mxv - .byte W01 - .byte BEND , c_v-64 - .byte W08 - .byte VOL , 101*se_track_stop_mvl/mxv - .byte W06 - .byte 89*se_track_stop_mvl/mxv - .byte W09 - .byte 77*se_track_stop_mvl/mxv - .byte W01 - .byte W05 - .byte 60*se_track_stop_mvl/mxv - .byte W09 - .byte 48*se_track_stop_mvl/mxv - .byte W06 - .byte 36*se_track_stop_mvl/mxv - .byte W04 - .byte W03 - .byte 23*se_track_stop_mvl/mxv - .byte W06 - .byte 8*se_track_stop_mvl/mxv - .byte W09 - .byte 0*se_track_stop_mvl/mxv - .byte W01 - .byte EOT - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_track_stop_2: - .byte KEYSH , se_track_stop_key+0 - .byte VOICE , 13 - .byte VOL , 90*se_track_stop_mvl/mxv - .byte W06 - .byte N09 , Gs6 , v024 - .byte W18 - .byte W05 - .byte N15 - .byte W19 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@********************** Track 3 **********************@ - -se_track_stop_3: - .byte KEYSH , se_track_stop_key+0 - .byte VOICE , 12 - .byte VOL , 90*se_track_stop_mvl/mxv - .byte W06 - .byte N09 , An6 , v024 - .byte W18 - .byte W05 - .byte N15 - .byte W19 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_track_stop: - .byte 3 @ NumTrks - .byte 0 @ NumBlks - .byte se_track_stop_pri @ Priority - .byte se_track_stop_rev @ Reverb. - - .word se_track_stop_grp - - .word se_track_stop_1 - .word se_track_stop_2 - .word se_track_stop_3 - - .end diff --git a/sound/songs/se_tu_saa.s b/sound/songs/se_tu_saa.s deleted file mode 100644 index c9346509c..000000000 --- a/sound/songs/se_tu_saa.s +++ /dev/null @@ -1,55 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tu_saa_grp, voicegroup127 - .equ se_tu_saa_pri, 4 - .equ se_tu_saa_rev, reverb_set+50 - .equ se_tu_saa_mvl, 127 - .equ se_tu_saa_key, 0 - .equ se_tu_saa_tbs, 1 - .equ se_tu_saa_exg, 0 - .equ se_tu_saa_cmp, 1 - - .section .rodata - .global se_tu_saa - .align 2 - -@********************** Track 1 **********************@ - -se_tu_saa_1: - .byte KEYSH , se_tu_saa_key+0 - .byte TEMPO , 220*se_tu_saa_tbs/2 - .byte VOICE , 123 - .byte VOL , 90*se_tu_saa_mvl/mxv - .byte N03 , Cn4 , v060 - .byte W03 - .byte VOL , 62*se_tu_saa_mvl/mxv - .byte N32 , Gs4 - .byte W03 - .byte VOL , 68*se_tu_saa_mvl/mxv - .byte W03 - .byte 72*se_tu_saa_mvl/mxv - .byte W03 - .byte 78*se_tu_saa_mvl/mxv - .byte W03 - .byte 85*se_tu_saa_mvl/mxv - .byte W03 - .byte 90*se_tu_saa_mvl/mxv - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_tu_saa: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tu_saa_pri @ Priority - .byte se_tu_saa_rev @ Reverb. - - .word se_tu_saa_grp - - .word se_tu_saa_1 - - .end diff --git a/sound/songs/se_u.s b/sound/songs/se_u.s deleted file mode 100644 index e39a7e0e0..000000000 --- a/sound/songs/se_u.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_u_grp, voicegroup128 - .equ se_u_pri, 4 - .equ se_u_rev, reverb_set+50 - .equ se_u_mvl, 127 - .equ se_u_key, 0 - .equ se_u_tbs, 1 - .equ se_u_exg, 0 - .equ se_u_cmp, 1 - - .section .rodata - .global se_u - .align 2 - -@********************** Track 1 **********************@ - -se_u_1: - .byte KEYSH , se_u_key+0 - .byte TEMPO , 240*se_u_tbs/2 - .byte VOICE , 124 - .byte BENDR , 12 - .byte VOL , 127*se_u_mvl/mxv - .byte BEND , c_v+0 - .byte N72 , Cn3 , v127 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_u: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_u_pri @ Priority - .byte se_u_rev @ Reverb. - - .word se_u_grp - - .word se_u_1 - - .end diff --git a/sound/songs/se_ussoki.s b/sound/songs/se_ussoki.s deleted file mode 100644 index b04f6708f..000000000 --- a/sound/songs/se_ussoki.s +++ /dev/null @@ -1,55 +0,0 @@ - .include "MPlayDef.s" - - .equ se_ussoki_grp, voicegroup129 - .equ se_ussoki_pri, 5 - .equ se_ussoki_rev, reverb_set+50 - .equ se_ussoki_mvl, 127 - .equ se_ussoki_key, 0 - .equ se_ussoki_tbs, 1 - .equ se_ussoki_exg, 0 - .equ se_ussoki_cmp, 1 - - .section .rodata - .global se_ussoki - .align 2 - -@********************** Track 1 **********************@ - -se_ussoki_1: - .byte KEYSH , se_ussoki_key+0 - .byte TEMPO , 100*se_ussoki_tbs/2 - .byte VOICE , 127 - .byte PAN , c_v+0 - .byte VOL , 77*se_ussoki_mvl/mxv - .byte N03 , Cn5 , v096 - .byte W06 - .byte N01 , Gn5 , v064 - .byte W06 - .byte N03 , Cn5 , v100 - .byte W06 - .byte N01 , Gn5 , v064 - .byte W06 -se_ussoki_1_000: - .byte N03 , Cn5 , v096 - .byte W06 - .byte N01 , Gn5 , v064 - .byte W06 - .byte PEND - .byte PATT - .word se_ussoki_1_000 - .byte FINE - -@******************************************************@ - .align 2 - -se_ussoki: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_ussoki_pri @ Priority - .byte se_ussoki_rev @ Reverb. - - .word se_ussoki_grp - - .word se_ussoki_1 - - .end diff --git a/sound/songs/se_w003.s b/sound/songs/se_w003.s deleted file mode 100644 index 736ab9802..000000000 --- a/sound/songs/se_w003.s +++ /dev/null @@ -1,52 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w003_grp, voicegroup128 - .equ se_w003_pri, 4 - .equ se_w003_rev, reverb_set+50 - .equ se_w003_mvl, 127 - .equ se_w003_key, 0 - .equ se_w003_tbs, 1 - .equ se_w003_exg, 0 - .equ se_w003_cmp, 1 - - .section .rodata - .global se_w003 - .align 2 - -@********************** Track 1 **********************@ - -se_w003_1: - .byte KEYSH , se_w003_key+0 - .byte TEMPO , 150*se_w003_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 110*se_w003_mvl/mxv - .byte PAN , c_v+9 - .byte BEND , c_v+0 - .byte N02 , Bn3 , v112 - .byte W04 - .byte PAN , c_v-9 - .byte N02 , Fn5 , v064 - .byte W02 - .byte PAN , c_v+0 - .byte N02 , Bn3 , v036 - .byte W03 - .byte VOICE , 18 - .byte N02 , Cn6 , v096 - .byte W15 - .byte FINE - -@******************************************************@ - .align 2 - -se_w003: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w003_pri @ Priority - .byte se_w003_rev @ Reverb. - - .word se_w003_grp - - .word se_w003_1 - - .end diff --git a/sound/songs/se_w004.s b/sound/songs/se_w004.s deleted file mode 100644 index c78a30d12..000000000 --- a/sound/songs/se_w004.s +++ /dev/null @@ -1,75 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w004_grp, voicegroup128 - .equ se_w004_pri, 4 - .equ se_w004_rev, reverb_set+50 - .equ se_w004_mvl, 127 - .equ se_w004_key, 0 - .equ se_w004_tbs, 1 - .equ se_w004_exg, 0 - .equ se_w004_cmp, 1 - - .section .rodata - .global se_w004 - .align 2 - -@********************** Track 1 **********************@ - -se_w004_1: - .byte KEYSH , se_w004_key+0 - .byte TEMPO , 150*se_w004_tbs/2 - .byte VOICE , 6 - .byte VOL , 120*se_w004_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , Cn3 , v127 - .byte W01 - .byte PAN , c_v-10 - .byte BEND , c_v-27 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v-47 - .byte W01 - .byte c_v-64 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+1 - .byte N02 , Dn3 , v084 - .byte W02 - .byte BEND , c_v-32 - .byte W18 - .byte FINE - -@********************** Track 2 **********************@ - -se_w004_2: - .byte KEYSH , se_w004_key+0 - .byte VOICE , 5 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 120*se_w004_mvl/mxv - .byte PAN , c_v+9 - .byte N03 , An2 , v052 - .byte W04 - .byte N02 - .byte W02 - .byte PAN , c_v-8 - .byte W18 - .byte FINE - -@******************************************************@ - .align 2 - -se_w004: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w004_pri @ Priority - .byte se_w004_rev @ Reverb. - - .word se_w004_grp - - .word se_w004_1 - .word se_w004_2 - - .end diff --git a/sound/songs/se_w006.s b/sound/songs/se_w006.s deleted file mode 100644 index e946f44d9..000000000 --- a/sound/songs/se_w006.s +++ /dev/null @@ -1,107 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w006_grp, voicegroup128 - .equ se_w006_pri, 4 - .equ se_w006_rev, reverb_set+50 - .equ se_w006_mvl, 127 - .equ se_w006_key, 0 - .equ se_w006_tbs, 1 - .equ se_w006_exg, 0 - .equ se_w006_cmp, 1 - - .section .rodata - .global se_w006 - .align 2 - -@********************** Track 1 **********************@ - -se_w006_1: - .byte KEYSH , se_w006_key+0 - .byte TEMPO , 150*se_w006_tbs/2 - .byte VOICE , 39 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 95*se_w006_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , An5 , v100 - .byte W01 - .byte Fn5 , v064 - .byte W01 - .byte N06 , Gn5 , v100 - .byte W01 - .byte VOL , 85*se_w006_mvl/mxv - .byte PAN , c_v-13 - .byte W01 - .byte VOL , 59*se_w006_mvl/mxv - .byte PAN , c_v+11 - .byte W02 - .byte VOL , 33*se_w006_mvl/mxv - .byte PAN , c_v-14 - .byte W01 - .byte VOL , 5*se_w006_mvl/mxv - .byte PAN , c_v+11 - .byte W03 - .byte VOL , 95*se_w006_mvl/mxv - .byte PAN , c_v+1 - .byte N01 , An5 - .byte W02 - .byte Fn5 , v064 - .byte W01 - .byte N19 , Gn5 , v100 - .byte W01 - .byte PAN , c_v-13 - .byte W01 - .byte c_v+11 - .byte W01 - .byte c_v-14 - .byte W02 - .byte c_v+11 - .byte W01 - .byte c_v-13 - .byte W01 - .byte c_v+11 - .byte VOL , 85*se_w006_mvl/mxv - .byte W01 - .byte PAN , c_v-14 - .byte VOL , 77*se_w006_mvl/mxv - .byte W01 - .byte PAN , c_v+11 - .byte VOL , 69*se_w006_mvl/mxv - .byte W02 - .byte PAN , c_v-13 - .byte VOL , 59*se_w006_mvl/mxv - .byte W01 - .byte PAN , c_v+11 - .byte VOL , 52*se_w006_mvl/mxv - .byte W01 - .byte PAN , c_v-14 - .byte VOL , 41*se_w006_mvl/mxv - .byte W01 - .byte 33*se_w006_mvl/mxv - .byte PAN , c_v+11 - .byte W01 - .byte VOL , 23*se_w006_mvl/mxv - .byte PAN , c_v-14 - .byte W02 - .byte VOL , 14*se_w006_mvl/mxv - .byte PAN , c_v+11 - .byte W01 - .byte VOL , 5*se_w006_mvl/mxv - .byte PAN , c_v-13 - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_w006: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w006_pri @ Priority - .byte se_w006_rev @ Reverb. - - .word se_w006_grp - - .word se_w006_1 - - .end diff --git a/sound/songs/se_w007.s b/sound/songs/se_w007.s deleted file mode 100644 index 5a3916361..000000000 --- a/sound/songs/se_w007.s +++ /dev/null @@ -1,138 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w007_grp, voicegroup128 - .equ se_w007_pri, 4 - .equ se_w007_rev, reverb_set+50 - .equ se_w007_mvl, 127 - .equ se_w007_key, 0 - .equ se_w007_tbs, 1 - .equ se_w007_exg, 0 - .equ se_w007_cmp, 1 - - .section .rodata - .global se_w007 - .align 2 - -@********************** Track 1 **********************@ - -se_w007_1: - .byte KEYSH , se_w007_key+0 - .byte TEMPO , 220*se_w007_tbs/2 - .byte VOICE , 6 - .byte VOL , 110*se_w007_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N06 , Cn3 , v127 - .byte W01 - .byte BEND , c_v-9 - .byte W01 - .byte c_v-21 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v-40 - .byte W01 - .byte c_v-64 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N06 , En3 - .byte W01 - .byte BEND , c_v-9 - .byte W01 - .byte c_v-21 - .byte W01 - .byte PAN , c_v+7 - .byte BEND , c_v-40 - .byte W01 - .byte c_v-64 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N09 , An2 - .byte W01 - .byte BEND , c_v-9 - .byte W01 - .byte c_v-19 - .byte W01 - .byte c_v-29 - .byte W01 - .byte VOL , 86*se_w007_mvl/mxv - .byte BEND , c_v-39 - .byte W02 - .byte VOL , 69*se_w007_mvl/mxv - .byte BEND , c_v-45 - .byte W01 - .byte VOL , 53*se_w007_mvl/mxv - .byte BEND , c_v-56 - .byte W01 - .byte VOL , 20*se_w007_mvl/mxv - .byte BEND , c_v-64 - .byte W01 - .byte VOICE , 29 - .byte VOL , 110*se_w007_mvl/mxv - .byte BEND , c_v+0 - .byte N48 - .byte W03 - .byte W02 - .byte PAN , c_v-8 - .byte W04 - .byte c_v+5 - .byte W03 - .byte c_v-6 - .byte W04 - .byte c_v+6 - .byte W03 - .byte c_v-3 - .byte W08 - .byte W03 - .byte VOL , 78*se_w007_mvl/mxv - .byte W04 - .byte 64*se_w007_mvl/mxv - .byte W03 - .byte 51*se_w007_mvl/mxv - .byte W04 - .byte 38*se_w007_mvl/mxv - .byte W04 - .byte 25*se_w007_mvl/mxv - .byte W03 - .byte 12*se_w007_mvl/mxv - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_w007_2: - .byte KEYSH , se_w007_key+0 - .byte VOICE , 5 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 110*se_w007_mvl/mxv - .byte PAN , c_v+9 - .byte N03 , Gs2 , v052 - .byte W06 - .byte PAN , c_v-7 - .byte N03 - .byte W06 - .byte PAN , c_v+0 - .byte N03 - .byte W12 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_w007: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w007_pri @ Priority - .byte se_w007_rev @ Reverb. - - .word se_w007_grp - - .word se_w007_1 - .word se_w007_2 - - .end diff --git a/sound/songs/se_w010.s b/sound/songs/se_w010.s deleted file mode 100644 index 7df3dbd3f..000000000 --- a/sound/songs/se_w010.s +++ /dev/null @@ -1,70 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w010_grp, voicegroup128 - .equ se_w010_pri, 4 - .equ se_w010_rev, reverb_set+50 - .equ se_w010_mvl, 127 - .equ se_w010_key, 0 - .equ se_w010_tbs, 1 - .equ se_w010_exg, 0 - .equ se_w010_cmp, 1 - - .section .rodata - .global se_w010 - .align 2 - -@********************** Track 1 **********************@ - -se_w010_1: - .byte KEYSH , se_w010_key+0 - .byte TEMPO , 220*se_w010_tbs/2 - .byte VOICE , 18 - .byte BENDR , 12 - .byte PAN , c_v+14 - .byte VOL , 42*se_w010_mvl/mxv - .byte BEND , c_v+39 - .byte N10 , Gn5 , v092 - .byte W01 - .byte VOL , 55*se_w010_mvl/mxv - .byte W01 - .byte 71*se_w010_mvl/mxv - .byte BEND , c_v+23 - .byte W01 - .byte PAN , c_v-15 - .byte VOL , 86*se_w010_mvl/mxv - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 110*se_w010_mvl/mxv - .byte BEND , c_v-23 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-34 - .byte W01 - .byte c_v-55 - .byte W01 - .byte c_v-64 - .byte W02 - .byte VOICE , 21 - .byte BEND , c_v+63 - .byte N01 , Cn5 - .byte W02 - .byte Gn5 - .byte W02 - .byte Gn5 , v064 - .byte W10 - .byte FINE - -@******************************************************@ - .align 2 - -se_w010: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w010_pri @ Priority - .byte se_w010_rev @ Reverb. - - .word se_w010_grp - - .word se_w010_1 - - .end diff --git a/sound/songs/se_w011.s b/sound/songs/se_w011.s deleted file mode 100644 index 05e6c04dd..000000000 --- a/sound/songs/se_w011.s +++ /dev/null @@ -1,89 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w011_grp, voicegroup128 - .equ se_w011_pri, 4 - .equ se_w011_rev, reverb_set+50 - .equ se_w011_mvl, 127 - .equ se_w011_key, 0 - .equ se_w011_tbs, 1 - .equ se_w011_exg, 0 - .equ se_w011_cmp, 1 - - .section .rodata - .global se_w011 - .align 2 - -@********************** Track 1 **********************@ - -se_w011_1: - .byte KEYSH , se_w011_key+0 - .byte TEMPO , 220*se_w011_tbs/2 - .byte VOICE , 18 - .byte BENDR , 12 - .byte PAN , c_v+4 - .byte VOL , 42*se_w011_mvl/mxv - .byte BEND , c_v+39 - .byte N06 , Cn5 , v084 - .byte W01 - .byte VOL , 55*se_w011_mvl/mxv - .byte BEND , c_v+18 - .byte W01 - .byte VOL , 71*se_w011_mvl/mxv - .byte BEND , c_v+0 - .byte W01 - .byte PAN , c_v-4 - .byte VOL , 86*se_w011_mvl/mxv - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 110*se_w011_mvl/mxv - .byte BEND , c_v-50 - .byte W02 - .byte PAN , c_v+0 - .byte W04 - .byte VOICE , 8 - .byte PAN , c_v-11 - .byte BEND , c_v+0 - .byte N06 , Gn4 , v120 - .byte W02 - .byte PAN , c_v+11 - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-26 - .byte W01 - .byte PAN , c_v-12 - .byte BEND , c_v-46 - .byte W01 - .byte PAN , c_v+11 - .byte BEND , c_v-54 - .byte W09 - .byte FINE - -@********************** Track 2 **********************@ - -se_w011_2: - .byte KEYSH , se_w011_key+0 - .byte VOICE , 27 - .byte VOL , 110*se_w011_mvl/mxv - .byte PAN , c_v+0 - .byte N06 , Cn2 , v040 - .byte W10 - .byte N02 , Gn2 - .byte W14 - .byte FINE - -@******************************************************@ - .align 2 - -se_w011: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w011_pri @ Priority - .byte se_w011_rev @ Reverb. - - .word se_w011_grp - - .word se_w011_1 - .word se_w011_2 - - .end diff --git a/sound/songs/se_w013.s b/sound/songs/se_w013.s deleted file mode 100644 index af387436c..000000000 --- a/sound/songs/se_w013.s +++ /dev/null @@ -1,86 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w013_grp, voicegroup128 - .equ se_w013_pri, 4 - .equ se_w013_rev, reverb_set+50 - .equ se_w013_mvl, 127 - .equ se_w013_key, 0 - .equ se_w013_tbs, 1 - .equ se_w013_exg, 0 - .equ se_w013_cmp, 1 - - .section .rodata - .global se_w013 - .align 2 - -@********************** Track 1 **********************@ - -se_w013_1: - .byte KEYSH , se_w013_key+0 - .byte TEMPO , 220*se_w013_tbs/2 - .byte VOICE , 18 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w013_mvl/mxv - .byte PAN , c_v+14 - .byte BEND , c_v+0 - .byte N09 , Cn5 , v092 - .byte W03 - .byte PAN , c_v-15 - .byte BEND , c_v-32 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+28 - .byte W03 - .byte VOICE , 2 - .byte BEND , c_v-64 - .byte N21 , Bn2 , v108 - .byte W03 - .byte BEND , c_v-55 - .byte W03 - .byte PAN , c_v+4 - .byte BEND , c_v-45 - .byte W03 - .byte PAN , c_v-5 - .byte BEND , c_v+30 - .byte W03 - .byte PAN , c_v+15 - .byte BEND , c_v+39 - .byte W03 - .byte PAN , c_v-15 - .byte BEND , c_v+54 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+63 - .byte W21 - .byte FINE - -@********************** Track 2 **********************@ - -se_w013_2: - .byte KEYSH , se_w013_key+0 - .byte VOICE , 5 - .byte PAN , c_v+0 - .byte VOL , 110*se_w013_mvl/mxv - .byte N06 , Fn3 , v040 - .byte W09 - .byte N24 , Gn3 - .byte W15 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_w013: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w013_pri @ Priority - .byte se_w013_rev @ Reverb. - - .word se_w013_grp - - .word se_w013_1 - .word se_w013_2 - - .end diff --git a/sound/songs/se_w013b.s b/sound/songs/se_w013b.s deleted file mode 100644 index e78c3057b..000000000 --- a/sound/songs/se_w013b.s +++ /dev/null @@ -1,62 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w013b_grp, voicegroup128 - .equ se_w013b_pri, 4 - .equ se_w013b_rev, reverb_set+50 - .equ se_w013b_mvl, 127 - .equ se_w013b_key, 0 - .equ se_w013b_tbs, 1 - .equ se_w013b_exg, 0 - .equ se_w013b_cmp, 1 - - .section .rodata - .global se_w013b - .align 2 - -@********************** Track 1 **********************@ - -se_w013b_1: - .byte KEYSH , se_w013b_key+0 - .byte TEMPO , 250*se_w013b_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 90*se_w013b_mvl/mxv - .byte BEND , c_v+0 - .byte N14 , An4 , v108 - .byte W03 - .byte PAN , c_v+5 - .byte BEND , c_v+6 - .byte W01 - .byte VOL , 80*se_w013b_mvl/mxv - .byte W02 - .byte PAN , c_v+15 - .byte BEND , c_v+1 - .byte W01 - .byte VOL , 64*se_w013b_mvl/mxv - .byte W02 - .byte PAN , c_v+6 - .byte VOL , 38*se_w013b_mvl/mxv - .byte BEND , c_v-9 - .byte W02 - .byte c_v-34 - .byte W01 - .byte PAN , c_v-1 - .byte VOL , 11*se_w013b_mvl/mxv - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_w013b: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w013b_pri @ Priority - .byte se_w013b_rev @ Reverb. - - .word se_w013b_grp - - .word se_w013b_1 - - .end diff --git a/sound/songs/se_w014.s b/sound/songs/se_w014.s deleted file mode 100644 index 4d712bd00..000000000 --- a/sound/songs/se_w014.s +++ /dev/null @@ -1,211 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w014_grp, voicegroup128 - .equ se_w014_pri, 4 - .equ se_w014_rev, reverb_set+50 - .equ se_w014_mvl, 127 - .equ se_w014_key, 0 - .equ se_w014_tbs, 1 - .equ se_w014_exg, 0 - .equ se_w014_cmp, 1 - - .section .rodata - .global se_w014 - .align 2 - -@********************** Track 1 **********************@ - -se_w014_1: - .byte KEYSH , se_w014_key+0 - .byte TEMPO , 150*se_w014_tbs/2 - .byte VOICE , 28 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 100*se_w014_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Fn5 , v100 - .byte W01 - .byte PAN , c_v-6 - .byte N01 , Fs5 , v088 - .byte W01 - .byte PAN , c_v+5 - .byte N01 , Gn5 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Fs5 - .byte W01 - .byte N14 , Gn5 , v100 - .byte W02 - .byte PAN , c_v-4 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+5 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v-4 - .byte W02 - .byte VOL , 95*se_w014_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 92*se_w014_mvl/mxv - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 87*se_w014_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 79*se_w014_mvl/mxv - .byte PAN , c_v-4 - .byte W01 - .byte VOL , 66*se_w014_mvl/mxv - .byte PAN , c_v+0 - .byte W02 - .byte VOL , 58*se_w014_mvl/mxv - .byte W01 - .byte VOICE , 22 - .byte VOL , 100*se_w014_mvl/mxv - .byte N10 , Cn4 , v092 - .byte W01 - .byte BEND , c_v+3 - .byte W01 - .byte c_v+5 - .byte W01 - .byte PAN , c_v-1 - .byte BEND , c_v+7 - .byte W02 - .byte VOL , 96*se_w014_mvl/mxv - .byte BEND , c_v+12 - .byte W01 - .byte VOL , 90*se_w014_mvl/mxv - .byte PAN , c_v-3 - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 84*se_w014_mvl/mxv - .byte BEND , c_v+20 - .byte W01 - .byte VOL , 70*se_w014_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+26 - .byte W01 - .byte VOL , 61*se_w014_mvl/mxv - .byte BEND , c_v+32 - .byte W03 - .byte VOL , 100*se_w014_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N10 - .byte W01 - .byte BEND , c_v+3 - .byte W01 - .byte c_v+5 - .byte W01 - .byte PAN , c_v+2 - .byte BEND , c_v+7 - .byte W02 - .byte VOL , 96*se_w014_mvl/mxv - .byte BEND , c_v+12 - .byte W01 - .byte VOL , 90*se_w014_mvl/mxv - .byte PAN , c_v+5 - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 84*se_w014_mvl/mxv - .byte BEND , c_v+20 - .byte W01 - .byte VOL , 70*se_w014_mvl/mxv - .byte PAN , c_v+7 - .byte BEND , c_v+26 - .byte W01 - .byte VOL , 61*se_w014_mvl/mxv - .byte BEND , c_v+32 - .byte W03 - .byte VOL , 100*se_w014_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N16 - .byte W01 - .byte BEND , c_v+3 - .byte W01 - .byte c_v+5 - .byte W01 - .byte PAN , c_v+3 - .byte BEND , c_v+7 - .byte W02 - .byte VOL , 96*se_w014_mvl/mxv - .byte BEND , c_v+12 - .byte W01 - .byte VOL , 90*se_w014_mvl/mxv - .byte PAN , c_v-2 - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 84*se_w014_mvl/mxv - .byte BEND , c_v+20 - .byte W01 - .byte VOL , 70*se_w014_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v+26 - .byte W01 - .byte VOL , 61*se_w014_mvl/mxv - .byte BEND , c_v+32 - .byte W02 - .byte VOL , 56*se_w014_mvl/mxv - .byte PAN , c_v-4 - .byte BEND , c_v+36 - .byte W01 - .byte VOL , 48*se_w014_mvl/mxv - .byte BEND , c_v+42 - .byte W01 - .byte VOL , 37*se_w014_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+48 - .byte W01 - .byte VOL , 25*se_w014_mvl/mxv - .byte BEND , c_v+56 - .byte W01 - .byte VOL , 11*se_w014_mvl/mxv - .byte PAN , c_v-11 - .byte BEND , c_v+63 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_w014_2: - .byte KEYSH , se_w014_key+0 - .byte VOICE , 25 - .byte VOL , 100*se_w014_mvl/mxv - .byte N04 , Cn3 , v040 - .byte W04 - .byte N14 , Gs4 - .byte W08 - .byte VOL , 89*se_w014_mvl/mxv - .byte W01 - .byte 72*se_w014_mvl/mxv - .byte W01 - .byte 46*se_w014_mvl/mxv - .byte W01 - .byte 25*se_w014_mvl/mxv - .byte W01 - .byte 11*se_w014_mvl/mxv - .byte W08 - .byte W12 - .byte W12 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_w014: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w014_pri @ Priority - .byte se_w014_rev @ Reverb. - - .word se_w014_grp - - .word se_w014_1 - .word se_w014_2 - - .end diff --git a/sound/songs/se_w015.s b/sound/songs/se_w015.s deleted file mode 100644 index 65397786a..000000000 --- a/sound/songs/se_w015.s +++ /dev/null @@ -1,104 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w015_grp, voicegroup128 - .equ se_w015_pri, 4 - .equ se_w015_rev, reverb_set+50 - .equ se_w015_mvl, 127 - .equ se_w015_key, 0 - .equ se_w015_tbs, 1 - .equ se_w015_exg, 0 - .equ se_w015_cmp, 1 - - .section .rodata - .global se_w015 - .align 2 - -@********************** Track 1 **********************@ - -se_w015_1: - .byte KEYSH , se_w015_key+0 - .byte TEMPO , 220*se_w015_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 120*se_w015_mvl/mxv - .byte BEND , c_v+0 - .byte N15 , Cn3 , v108 - .byte W03 - .byte VOL , 102*se_w015_mvl/mxv - .byte BEND , c_v+22 - .byte W02 - .byte c_v+8 - .byte W01 - .byte VOL , 88*se_w015_mvl/mxv - .byte W03 - .byte 75*se_w015_mvl/mxv - .byte BEND , c_v-13 - .byte W03 - .byte VOL , 55*se_w015_mvl/mxv - .byte W03 - .byte VOICE , 18 - .byte VOL , 120*se_w015_mvl/mxv - .byte PAN , c_v+14 - .byte BEND , c_v+0 - .byte N09 , Cn5 , v092 - .byte W03 - .byte PAN , c_v-15 - .byte BEND , c_v-32 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+28 - .byte W03 - .byte VOICE , 2 - .byte BEND , c_v-64 - .byte N21 , Cn3 , v108 - .byte W03 - .byte BEND , c_v-55 - .byte W03 - .byte PAN , c_v+4 - .byte BEND , c_v-45 - .byte W03 - .byte PAN , c_v-5 - .byte BEND , c_v+30 - .byte W03 - .byte PAN , c_v+15 - .byte BEND , c_v+39 - .byte W03 - .byte PAN , c_v-15 - .byte BEND , c_v+54 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+63 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_w015_2: - .byte KEYSH , se_w015_key+0 - .byte VOICE , 5 - .byte PAN , c_v+0 - .byte VOL , 120*se_w015_mvl/mxv - .byte N15 , Cn2 , v040 - .byte W15 - .byte N06 , Fs3 - .byte W09 - .byte N24 , Gs3 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_w015: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w015_pri @ Priority - .byte se_w015_rev @ Reverb. - - .word se_w015_grp - - .word se_w015_1 - .word se_w015_2 - - .end diff --git a/sound/songs/se_w016.s b/sound/songs/se_w016.s deleted file mode 100644 index a34957c88..000000000 --- a/sound/songs/se_w016.s +++ /dev/null @@ -1,103 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w016_grp, voicegroup128 - .equ se_w016_pri, 4 - .equ se_w016_rev, reverb_set+50 - .equ se_w016_mvl, 127 - .equ se_w016_key, 0 - .equ se_w016_tbs, 1 - .equ se_w016_exg, 0 - .equ se_w016_cmp, 1 - - .section .rodata - .global se_w016 - .align 2 - -@********************** Track 1 **********************@ - -se_w016_1: - .byte KEYSH , se_w016_key+0 - .byte TEMPO , 150*se_w016_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 64*se_w016_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Cn3 , v108 - .byte W03 - .byte VOL , 79*se_w016_mvl/mxv - .byte BEND , c_v+22 - .byte W02 - .byte c_v+8 - .byte W01 - .byte VOL , 84*se_w016_mvl/mxv - .byte PAN , c_v-4 - .byte W03 - .byte VOL , 91*se_w016_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 100*se_w016_mvl/mxv - .byte PAN , c_v-8 - .byte W03 - .byte VOL , 110*se_w016_mvl/mxv - .byte W03 - .byte PAN , c_v-12 - .byte W06 -se_w016_1_B1: - .byte PAN , c_v-17 - .byte BEND , c_v+0 - .byte N48 , Cn3 , v108 - .byte W03 - .byte BEND , c_v-7 - .byte W03 - .byte PAN , c_v-9 - .byte BEND , c_v-12 - .byte W03 - .byte c_v-20 - .byte W03 - .byte PAN , c_v-3 - .byte W03 - .byte c_v+6 - .byte BEND , c_v-13 - .byte W03 - .byte PAN , c_v+10 - .byte W03 - .byte BEND , c_v-6 - .byte W03 - .byte PAN , c_v+16 - .byte W03 - .byte BEND , c_v+6 - .byte W03 - .byte PAN , c_v+13 - .byte BEND , c_v+11 - .byte W03 - .byte c_v+20 - .byte W03 - .byte PAN , c_v+8 - .byte W03 - .byte c_v+0 - .byte BEND , c_v+12 - .byte W03 - .byte PAN , c_v-8 - .byte BEND , c_v+7 - .byte W03 - .byte PAN , c_v-11 - .byte W03 - .byte GOTO - .word se_w016_1_B1 - .byte FINE - -@******************************************************@ - .align 2 - -se_w016: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w016_pri @ Priority - .byte se_w016_rev @ Reverb. - - .word se_w016_grp - - .word se_w016_1 - - .end diff --git a/sound/songs/se_w016b.s b/sound/songs/se_w016b.s deleted file mode 100644 index 78f01bbde..000000000 --- a/sound/songs/se_w016b.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w016b_grp, voicegroup128 - .equ se_w016b_pri, 4 - .equ se_w016b_rev, reverb_set+50 - .equ se_w016b_mvl, 127 - .equ se_w016b_key, 0 - .equ se_w016b_tbs, 1 - .equ se_w016b_exg, 0 - .equ se_w016b_cmp, 1 - - .section .rodata - .global se_w016b - .align 2 - -@********************** Track 1 **********************@ - -se_w016b_1: - .byte KEYSH , se_w016b_key+0 - .byte TEMPO , 150*se_w016b_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w016b_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Cn3 , v108 - .byte W02 - .byte PAN , c_v-19 - .byte W04 - .byte c_v+0 - .byte W01 - .byte VOL , 97*se_w016b_mvl/mxv - .byte W01 - .byte PAN , c_v+16 - .byte W01 - .byte VOL , 84*se_w016b_mvl/mxv - .byte W03 - .byte 76*se_w016b_mvl/mxv - .byte PAN , c_v+2 - .byte W02 - .byte VOL , 55*se_w016b_mvl/mxv - .byte PAN , c_v-8 - .byte W02 - .byte VOL , 39*se_w016b_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 25*se_w016b_mvl/mxv - .byte W01 - .byte PAN , c_v+8 - .byte W01 - .byte VOL , 13*se_w016b_mvl/mxv - .byte W03 - .byte 7*se_w016b_mvl/mxv - .byte PAN , c_v+0 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_w016b: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w016b_pri @ Priority - .byte se_w016b_rev @ Reverb. - - .word se_w016b_grp - - .word se_w016b_1 - - .end diff --git a/sound/songs/se_w017.s b/sound/songs/se_w017.s deleted file mode 100644 index ad992a1c0..000000000 --- a/sound/songs/se_w017.s +++ /dev/null @@ -1,125 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w017_grp, voicegroup128 - .equ se_w017_pri, 4 - .equ se_w017_rev, reverb_set+50 - .equ se_w017_mvl, 127 - .equ se_w017_key, 0 - .equ se_w017_tbs, 1 - .equ se_w017_exg, 0 - .equ se_w017_cmp, 1 - - .section .rodata - .global se_w017 - .align 2 - -@********************** Track 1 **********************@ - -se_w017_1: - .byte KEYSH , se_w017_key+0 - .byte TEMPO , 220*se_w017_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 40*se_w017_mvl/mxv - .byte BEND , c_v-32 - .byte N10 , An1 , v127 - .byte W01 - .byte VOL , 52*se_w017_mvl/mxv - .byte PAN , c_v+10 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 68*se_w017_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 82*se_w017_mvl/mxv - .byte PAN , c_v-9 - .byte BEND , c_v+8 - .byte W01 - .byte VOL , 105*se_w017_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+19 - .byte W02 - .byte PAN , c_v+10 - .byte BEND , c_v+28 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+38 - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v+49 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+63 - .byte W05 - .byte VOL , 40*se_w017_mvl/mxv - .byte BEND , c_v+1 - .byte N06 - .byte W01 - .byte VOL , 52*se_w017_mvl/mxv - .byte PAN , c_v+10 - .byte BEND , c_v+38 - .byte W01 - .byte VOL , 79*se_w017_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+48 - .byte W02 - .byte VOL , 105*se_w017_mvl/mxv - .byte PAN , c_v-9 - .byte BEND , c_v+63 - .byte W01 - .byte PAN , c_v+0 - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_w017_2: - .byte KEYSH , se_w017_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 52*se_w017_mvl/mxv - .byte N10 , Gn2 , v040 - .byte W01 - .byte VOL , 69*se_w017_mvl/mxv - .byte W01 - .byte 83*se_w017_mvl/mxv - .byte W01 - .byte 105*se_w017_mvl/mxv - .byte W01 - .byte 85*se_w017_mvl/mxv - .byte W02 - .byte 52*se_w017_mvl/mxv - .byte W01 - .byte 29*se_w017_mvl/mxv - .byte W01 - .byte 12*se_w017_mvl/mxv - .byte W06 - .byte VOICE , 25 - .byte VOL , 52*se_w017_mvl/mxv - .byte N06 , Gs4 - .byte W01 - .byte VOL , 81*se_w017_mvl/mxv - .byte W01 - .byte 105*se_w017_mvl/mxv - .byte W03 - .byte 52*se_w017_mvl/mxv - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_w017: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w017_pri @ Priority - .byte se_w017_rev @ Reverb. - - .word se_w017_grp - - .word se_w017_1 - .word se_w017_2 - - .end diff --git a/sound/songs/se_w019.s b/sound/songs/se_w019.s deleted file mode 100644 index 2e02a92e6..000000000 --- a/sound/songs/se_w019.s +++ /dev/null @@ -1,251 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w019_grp, voicegroup128 - .equ se_w019_pri, 4 - .equ se_w019_rev, reverb_set+50 - .equ se_w019_mvl, 127 - .equ se_w019_key, 0 - .equ se_w019_tbs, 1 - .equ se_w019_exg, 0 - .equ se_w019_cmp, 1 - - .section .rodata - .global se_w019 - .align 2 - -@********************** Track 1 **********************@ - -se_w019_1: - .byte KEYSH , se_w019_key+0 - .byte TEMPO , 220*se_w019_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 90*se_w019_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , En2 , v127 - .byte W01 - .byte VOL , 55*se_w019_mvl/mxv - .byte PAN , c_v+10 - .byte BEND , c_v-16 - .byte N07 , An1 - .byte W01 - .byte VOL , 71*se_w019_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 86*se_w019_mvl/mxv - .byte PAN , c_v-9 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 110*se_w019_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+33 - .byte W02 - .byte PAN , c_v+10 - .byte BEND , c_v+54 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+63 - .byte W02 - .byte VOL , 90*se_w019_mvl/mxv - .byte PAN , c_v+10 - .byte BEND , c_v+1 - .byte N04 - .byte W01 - .byte VOL , 54*se_w019_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+38 - .byte W02 - .byte VOL , 83*se_w019_mvl/mxv - .byte PAN , c_v-9 - .byte BEND , c_v+48 - .byte W01 - .byte VOL , 110*se_w019_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+63 - .byte W03 - .byte VOL , 90*se_w019_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Ds2 , v104 - .byte W02 - .byte PAN , c_v+10 - .byte VOL , 55*se_w019_mvl/mxv - .byte BEND , c_v-16 - .byte N07 , Gs1 , v100 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 71*se_w019_mvl/mxv - .byte BEND , c_v+0 - .byte W01 - .byte PAN , c_v-9 - .byte VOL , 86*se_w019_mvl/mxv - .byte BEND , c_v+17 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 110*se_w019_mvl/mxv - .byte BEND , c_v+33 - .byte W01 - .byte PAN , c_v+10 - .byte BEND , c_v+54 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+63 - .byte W02 - .byte PAN , c_v+10 - .byte VOL , 90*se_w019_mvl/mxv - .byte BEND , c_v+1 - .byte N04 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 54*se_w019_mvl/mxv - .byte BEND , c_v+38 - .byte W01 - .byte PAN , c_v-9 - .byte VOL , 83*se_w019_mvl/mxv - .byte BEND , c_v+48 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 110*se_w019_mvl/mxv - .byte BEND , c_v+63 - .byte W03 - .byte VOL , 90*se_w019_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Dn2 , v088 - .byte W01 - .byte PAN , c_v+10 - .byte VOL , 55*se_w019_mvl/mxv - .byte BEND , c_v-16 - .byte N07 , Gn1 , v060 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 71*se_w019_mvl/mxv - .byte BEND , c_v+0 - .byte W01 - .byte PAN , c_v-9 - .byte VOL , 86*se_w019_mvl/mxv - .byte BEND , c_v+17 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 110*se_w019_mvl/mxv - .byte BEND , c_v+33 - .byte W01 - .byte PAN , c_v+10 - .byte BEND , c_v+54 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+63 - .byte W03 - .byte PAN , c_v+10 - .byte VOL , 90*se_w019_mvl/mxv - .byte BEND , c_v+1 - .byte N04 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 54*se_w019_mvl/mxv - .byte BEND , c_v+38 - .byte W01 - .byte PAN , c_v-9 - .byte VOL , 83*se_w019_mvl/mxv - .byte BEND , c_v+48 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 110*se_w019_mvl/mxv - .byte BEND , c_v+63 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_w019_2: - .byte KEYSH , se_w019_key+0 - .byte VOICE , 25 - .byte PAN , c_v+0 - .byte VOL , 110*se_w019_mvl/mxv - .byte N08 , Cn2 , v040 - .byte W01 - .byte VOL , 72*se_w019_mvl/mxv - .byte W01 - .byte 87*se_w019_mvl/mxv - .byte W01 - .byte 110*se_w019_mvl/mxv - .byte W01 - .byte 89*se_w019_mvl/mxv - .byte W02 - .byte 49*se_w019_mvl/mxv - .byte W01 - .byte 14*se_w019_mvl/mxv - .byte W02 - .byte 110*se_w019_mvl/mxv - .byte N04 , Gn4 - .byte W01 - .byte VOL , 84*se_w019_mvl/mxv - .byte W02 - .byte 110*se_w019_mvl/mxv - .byte W02 - .byte 55*se_w019_mvl/mxv - .byte W02 - .byte 110*se_w019_mvl/mxv - .byte N08 , Cn2 , v032 - .byte W02 - .byte VOL , 72*se_w019_mvl/mxv - .byte W01 - .byte 87*se_w019_mvl/mxv - .byte W01 - .byte 110*se_w019_mvl/mxv - .byte W01 - .byte 89*se_w019_mvl/mxv - .byte W01 - .byte 49*se_w019_mvl/mxv - .byte W02 - .byte 14*se_w019_mvl/mxv - .byte W02 - .byte 110*se_w019_mvl/mxv - .byte N04 , Gn4 - .byte W01 - .byte VOL , 84*se_w019_mvl/mxv - .byte W01 - .byte 110*se_w019_mvl/mxv - .byte W03 - .byte 55*se_w019_mvl/mxv - .byte W02 - .byte 110*se_w019_mvl/mxv - .byte N08 , Cn2 , v020 - .byte W01 - .byte VOL , 72*se_w019_mvl/mxv - .byte W02 - .byte 87*se_w019_mvl/mxv - .byte W01 - .byte 110*se_w019_mvl/mxv - .byte W01 - .byte 89*se_w019_mvl/mxv - .byte W01 - .byte 49*se_w019_mvl/mxv - .byte W01 - .byte 14*se_w019_mvl/mxv - .byte W03 - .byte 110*se_w019_mvl/mxv - .byte N04 , Gn4 - .byte W01 - .byte VOL , 84*se_w019_mvl/mxv - .byte W01 - .byte 110*se_w019_mvl/mxv - .byte W03 - .byte 55*se_w019_mvl/mxv - .byte FINE - -@******************************************************@ - .align 2 - -se_w019: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w019_pri @ Priority - .byte se_w019_rev @ Reverb. - - .word se_w019_grp - - .word se_w019_1 - .word se_w019_2 - - .end diff --git a/sound/songs/se_w020.s b/sound/songs/se_w020.s deleted file mode 100644 index 6f4e90c64..000000000 --- a/sound/songs/se_w020.s +++ /dev/null @@ -1,81 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w020_grp, voicegroup128 - .equ se_w020_pri, 4 - .equ se_w020_rev, reverb_set+50 - .equ se_w020_mvl, 127 - .equ se_w020_key, 0 - .equ se_w020_tbs, 1 - .equ se_w020_exg, 0 - .equ se_w020_cmp, 1 - - .section .rodata - .global se_w020 - .align 2 - -@********************** Track 1 **********************@ - -se_w020_1: - .byte KEYSH , se_w020_key+0 - .byte TEMPO , 150*se_w020_tbs/2 - .byte VOICE , 38 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 100*se_w020_mvl/mxv - .byte BEND , c_v+0 - .byte N05 , Fs2 , v127 - .byte W01 - .byte PAN , c_v-5 - .byte BEND , c_v-3 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v-5 - .byte W01 - .byte PAN , c_v-8 - .byte BEND , c_v-9 - .byte W01 - .byte PAN , c_v+11 - .byte BEND , c_v-12 - .byte W06 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N11 - .byte W02 - .byte BEND , c_v-10 - .byte W01 - .byte c_v-6 - .byte W01 - .byte PAN , c_v-5 - .byte BEND , c_v-4 - .byte W01 - .byte c_v+0 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v-3 - .byte W02 - .byte c_v+3 - .byte W01 - .byte PAN , c_v-8 - .byte BEND , c_v-9 - .byte W01 - .byte c_v-21 - .byte W01 - .byte PAN , c_v+11 - .byte BEND , c_v-28 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_w020: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w020_pri @ Priority - .byte se_w020_rev @ Reverb. - - .word se_w020_grp - - .word se_w020_1 - - .end diff --git a/sound/songs/se_w025.s b/sound/songs/se_w025.s deleted file mode 100644 index c64f21272..000000000 --- a/sound/songs/se_w025.s +++ /dev/null @@ -1,150 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w025_grp, voicegroup128 - .equ se_w025_pri, 4 - .equ se_w025_rev, reverb_set+50 - .equ se_w025_mvl, 127 - .equ se_w025_key, 0 - .equ se_w025_tbs, 1 - .equ se_w025_exg, 0 - .equ se_w025_cmp, 1 - - .section .rodata - .global se_w025 - .align 2 - -@********************** Track 1 **********************@ - -se_w025_1: - .byte KEYSH , se_w025_key+0 - .byte TEMPO , 150*se_w025_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 63*se_w025_mvl/mxv - .byte BEND , c_v-48 - .byte N72 , Fn4 , v108 - .byte W02 - .byte VOL , 68*se_w025_mvl/mxv - .byte BEND , c_v-43 - .byte W01 - .byte PAN , c_v+5 - .byte W01 - .byte BEND , c_v-38 - .byte W02 - .byte PAN , c_v+15 - .byte VOL , 70*se_w025_mvl/mxv - .byte W01 - .byte BEND , c_v-34 - .byte W02 - .byte PAN , c_v+6 - .byte VOL , 75*se_w025_mvl/mxv - .byte BEND , c_v-30 - .byte W03 - .byte PAN , c_v-1 - .byte BEND , c_v-28 - .byte W01 - .byte VOL , 78*se_w025_mvl/mxv - .byte W01 - .byte BEND , c_v-24 - .byte W01 - .byte PAN , c_v-9 - .byte W01 - .byte VOL , 85*se_w025_mvl/mxv - .byte BEND , c_v-21 - .byte W02 - .byte PAN , c_v-15 - .byte W01 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 90*se_w025_mvl/mxv - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v-12 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v-8 - .byte W02 - .byte c_v-3 - .byte W01 - .byte PAN , c_v+5 - .byte W01 - .byte BEND , c_v+2 - .byte W02 - .byte PAN , c_v+15 - .byte W01 - .byte BEND , c_v+5 - .byte W02 - .byte PAN , c_v+6 - .byte BEND , c_v+9 - .byte W03 - .byte PAN , c_v-1 - .byte BEND , c_v+11 - .byte W02 - .byte c_v+14 - .byte W01 - .byte PAN , c_v-9 - .byte W01 - .byte BEND , c_v+19 - .byte W02 - .byte PAN , c_v-15 - .byte W01 - .byte BEND , c_v+23 - .byte W02 - .byte PAN , c_v-9 - .byte BEND , c_v+27 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+29 - .byte W02 - .byte c_v+33 - .byte W01 - .byte PAN , c_v+5 - .byte W01 - .byte BEND , c_v+35 - .byte W02 - .byte VOL , 74*se_w025_mvl/mxv - .byte PAN , c_v+15 - .byte W01 - .byte BEND , c_v+38 - .byte W02 - .byte VOL , 58*se_w025_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v+42 - .byte W03 - .byte VOL , 47*se_w025_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v+45 - .byte W02 - .byte c_v+48 - .byte W01 - .byte VOL , 34*se_w025_mvl/mxv - .byte PAN , c_v-9 - .byte W01 - .byte BEND , c_v+50 - .byte W02 - .byte VOL , 22*se_w025_mvl/mxv - .byte PAN , c_v-15 - .byte W01 - .byte BEND , c_v+54 - .byte W02 - .byte VOL , 6*se_w025_mvl/mxv - .byte PAN , c_v-9 - .byte BEND , c_v+58 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_w025: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w025_pri @ Priority - .byte se_w025_rev @ Reverb. - - .word se_w025_grp - - .word se_w025_1 - - .end diff --git a/sound/songs/se_w025b.s b/sound/songs/se_w025b.s deleted file mode 100644 index 03b095e6c..000000000 --- a/sound/songs/se_w025b.s +++ /dev/null @@ -1,128 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w025b_grp, voicegroup128 - .equ se_w025b_pri, 4 - .equ se_w025b_rev, reverb_set+50 - .equ se_w025b_mvl, 127 - .equ se_w025b_key, 0 - .equ se_w025b_tbs, 1 - .equ se_w025b_exg, 0 - .equ se_w025b_cmp, 1 - - .section .rodata - .global se_w025b - .align 2 - -@********************** Track 1 **********************@ - -se_w025b_1: - .byte KEYSH , se_w025b_key+0 - .byte TEMPO , 220*se_w025b_tbs/2 - .byte VOICE , 6 - .byte VOL , 110*se_w025b_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N04 , En3 , v127 - .byte W01 - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v+10 - .byte BEND , c_v-38 - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v-64 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , An2 - .byte W01 - .byte PAN , c_v+7 - .byte BEND , c_v-28 - .byte W01 - .byte c_v-64 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , Cn3 , v060 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v-28 - .byte W02 - .byte c_v-64 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N10 , Gn2 , v127 - .byte W01 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 101*se_w025b_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-15 - .byte W02 - .byte c_v-20 - .byte W01 - .byte VOL , 83*se_w025b_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-24 - .byte W01 - .byte c_v-30 - .byte W01 - .byte VOL , 58*se_w025b_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-39 - .byte W01 - .byte c_v-53 - .byte W02 - .byte VOL , 25*se_w025b_mvl/mxv - .byte BEND , c_v-64 - .byte W24 - .byte FINE - -@********************** Track 2 **********************@ - -se_w025b_2: - .byte KEYSH , se_w025b_key+0 - .byte VOICE , 5 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 110*se_w025b_mvl/mxv - .byte PAN , c_v+9 - .byte N03 , Gs2 , v092 - .byte W06 - .byte PAN , c_v-7 - .byte N03 , Gs2 , v052 - .byte W03 - .byte N03 - .byte W05 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte N13 - .byte W04 - .byte VOL , 101*se_w025b_mvl/mxv - .byte W02 - .byte 83*se_w025b_mvl/mxv - .byte W02 - .byte 58*se_w025b_mvl/mxv - .byte W02 - .byte W01 - .byte 25*se_w025b_mvl/mxv - .byte W23 - .byte FINE - -@******************************************************@ - .align 2 - -se_w025b: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w025b_pri @ Priority - .byte se_w025b_rev @ Reverb. - - .word se_w025b_grp - - .word se_w025b_1 - .word se_w025b_2 - - .end diff --git a/sound/songs/se_w026.s b/sound/songs/se_w026.s deleted file mode 100644 index d7e9f8425..000000000 --- a/sound/songs/se_w026.s +++ /dev/null @@ -1,71 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w026_grp, voicegroup128 - .equ se_w026_pri, 4 - .equ se_w026_rev, reverb_set+50 - .equ se_w026_mvl, 127 - .equ se_w026_key, 0 - .equ se_w026_tbs, 1 - .equ se_w026_exg, 0 - .equ se_w026_cmp, 1 - - .section .rodata - .global se_w026 - .align 2 - -@********************** Track 1 **********************@ - -se_w026_1: - .byte KEYSH , se_w026_key+0 - .byte TEMPO , 180*se_w026_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w026_mvl/mxv - .byte BEND , c_v-12 - .byte N19 , Gn3 , v108 - .byte W02 - .byte BEND , c_v-5 - .byte W01 - .byte VOL , 101*se_w026_mvl/mxv - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v+8 - .byte W02 - .byte VOL , 84*se_w026_mvl/mxv - .byte BEND , c_v+4 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 64*se_w026_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v+8 - .byte W02 - .byte VOL , 45*se_w026_mvl/mxv - .byte BEND , c_v-31 - .byte W02 - .byte VOL , 32*se_w026_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte VOICE , 2 - .byte W01 - .byte VOL , 13*se_w026_mvl/mxv - .byte BEND , c_v-52 - .byte W08 - .byte FINE - -@******************************************************@ - .align 2 - -se_w026: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w026_pri @ Priority - .byte se_w026_rev @ Reverb. - - .word se_w026_grp - - .word se_w026_1 - - .end diff --git a/sound/songs/se_w028.s b/sound/songs/se_w028.s deleted file mode 100644 index 716ff7cd8..000000000 --- a/sound/songs/se_w028.s +++ /dev/null @@ -1,95 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w028_grp, voicegroup128 - .equ se_w028_pri, 4 - .equ se_w028_rev, reverb_set+50 - .equ se_w028_mvl, 127 - .equ se_w028_key, 0 - .equ se_w028_tbs, 1 - .equ se_w028_exg, 0 - .equ se_w028_cmp, 1 - - .section .rodata - .global se_w028 - .align 2 - -@********************** Track 1 **********************@ - -se_w028_1: - .byte KEYSH , se_w028_key+0 - .byte TEMPO , 150*se_w028_tbs/2 - .byte VOICE , 26 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w028_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Gn5 , v092 - .byte W02 - .byte Cn5 - .byte W04 - .byte VOICE , 36 - .byte VOL , 84*se_w028_mvl/mxv - .byte PAN , c_v+5 - .byte N15 , Gn5 , v040 - .byte W01 - .byte PAN , c_v-10 - .byte W01 - .byte c_v+5 - .byte W01 - .byte c_v-10 - .byte W01 - .byte VOL , 94*se_w028_mvl/mxv - .byte PAN , c_v+5 - .byte W02 - .byte c_v-10 - .byte W01 - .byte c_v+5 - .byte W01 - .byte c_v-10 - .byte W01 - .byte VOL , 110*se_w028_mvl/mxv - .byte PAN , c_v+5 - .byte W01 - .byte c_v-10 - .byte W02 - .byte VOL , 96*se_w028_mvl/mxv - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 68*se_w028_mvl/mxv - .byte PAN , c_v-10 - .byte W01 - .byte VOL , 15*se_w028_mvl/mxv - .byte PAN , c_v+5 - .byte W01 - .byte c_v-10 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_w028_2: - .byte KEYSH , se_w028_key+0 - .byte VOICE , 25 - .byte VOL , 110*se_w028_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Cn3 , v040 - .byte W02 - .byte N01 - .byte W22 - .byte FINE - -@******************************************************@ - .align 2 - -se_w028: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w028_pri @ Priority - .byte se_w028_rev @ Reverb. - - .word se_w028_grp - - .word se_w028_1 - .word se_w028_2 - - .end diff --git a/sound/songs/se_w029.s b/sound/songs/se_w029.s deleted file mode 100644 index 1f85e9449..000000000 --- a/sound/songs/se_w029.s +++ /dev/null @@ -1,87 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w029_grp, voicegroup128 - .equ se_w029_pri, 4 - .equ se_w029_rev, reverb_set+50 - .equ se_w029_mvl, 127 - .equ se_w029_key, 0 - .equ se_w029_tbs, 1 - .equ se_w029_exg, 0 - .equ se_w029_cmp, 1 - - .section .rodata - .global se_w029 - .align 2 - -@********************** Track 1 **********************@ - -se_w029_1: - .byte KEYSH , se_w029_key+0 - .byte TEMPO , 150*se_w029_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 25*se_w029_mvl/mxv - .byte BEND , c_v-48 - .byte N07 , Cn1 , v127 - .byte W01 - .byte VOL , 41*se_w029_mvl/mxv - .byte BEND , c_v-31 - .byte W01 - .byte PAN , c_v+7 - .byte VOL , 57*se_w029_mvl/mxv - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 79*se_w029_mvl/mxv - .byte BEND , c_v+0 - .byte W01 - .byte PAN , c_v+11 - .byte VOL , 110*se_w029_mvl/mxv - .byte BEND , c_v+14 - .byte W02 - .byte c_v+32 - .byte W01 - .byte PAN , c_v+14 - .byte W01 - .byte VOL , 25*se_w029_mvl/mxv - .byte BEND , c_v-48 - .byte N07 , Dn1 - .byte W01 - .byte PAN , c_v+19 - .byte VOL , 41*se_w029_mvl/mxv - .byte BEND , c_v-31 - .byte W01 - .byte VOL , 57*se_w029_mvl/mxv - .byte BEND , c_v-16 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 79*se_w029_mvl/mxv - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 110*se_w029_mvl/mxv - .byte BEND , c_v+14 - .byte W01 - .byte PAN , c_v-8 - .byte BEND , c_v+32 - .byte W02 - .byte PAN , c_v-11 - .byte W03 - .byte c_v-15 - .byte W05 - .byte VOL , 110*se_w029_mvl/mxv - .byte FINE - -@******************************************************@ - .align 2 - -se_w029: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w029_pri @ Priority - .byte se_w029_rev @ Reverb. - - .word se_w029_grp - - .word se_w029_1 - - .end diff --git a/sound/songs/se_w030.s b/sound/songs/se_w030.s deleted file mode 100644 index 35097ca84..000000000 --- a/sound/songs/se_w030.s +++ /dev/null @@ -1,67 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w030_grp, voicegroup128 - .equ se_w030_pri, 4 - .equ se_w030_rev, reverb_set+50 - .equ se_w030_mvl, 127 - .equ se_w030_key, 0 - .equ se_w030_tbs, 1 - .equ se_w030_exg, 0 - .equ se_w030_cmp, 1 - - .section .rodata - .global se_w030 - .align 2 - -@********************** Track 1 **********************@ - -se_w030_1: - .byte KEYSH , se_w030_key+0 - .byte TEMPO , 150*se_w030_tbs/2 - .byte VOICE , 21 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w030_mvl/mxv - .byte BEND , c_v+1 - .byte N01 , Bn5 , v127 - .byte W02 - .byte VOICE , 18 - .byte N01 , Cn4 - .byte W02 - .byte VOICE , 36 - .byte N06 , Gn5 , v040 - .byte W02 - .byte VOL , 58*se_w030_mvl/mxv - .byte PAN , c_v+16 - .byte BEND , c_v+5 - .byte W01 - .byte VOL , 71*se_w030_mvl/mxv - .byte PAN , c_v-14 - .byte BEND , c_v+13 - .byte W01 - .byte VOL , 84*se_w030_mvl/mxv - .byte PAN , c_v+16 - .byte BEND , c_v+21 - .byte W01 - .byte VOL , 97*se_w030_mvl/mxv - .byte PAN , c_v-14 - .byte BEND , c_v+33 - .byte W01 - .byte VOL , 110*se_w030_mvl/mxv - .byte W14 - .byte FINE - -@******************************************************@ - .align 2 - -se_w030: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w030_pri @ Priority - .byte se_w030_rev @ Reverb. - - .word se_w030_grp - - .word se_w030_1 - - .end diff --git a/sound/songs/se_w036.s b/sound/songs/se_w036.s deleted file mode 100644 index eb32e1489..000000000 --- a/sound/songs/se_w036.s +++ /dev/null @@ -1,95 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w036_grp, voicegroup128 - .equ se_w036_pri, 4 - .equ se_w036_rev, reverb_set+50 - .equ se_w036_mvl, 127 - .equ se_w036_key, 0 - .equ se_w036_tbs, 1 - .equ se_w036_exg, 0 - .equ se_w036_cmp, 1 - - .section .rodata - .global se_w036 - .align 2 - -@********************** Track 1 **********************@ - -se_w036_1: - .byte KEYSH , se_w036_key+0 - .byte TEMPO , 150*se_w036_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 105*se_w036_mvl/mxv - .byte BEND , c_v-48 - .byte N10 , Gn0 , v127 - .byte W02 - .byte PAN , c_v+7 - .byte BEND , c_v-32 - .byte W01 - .byte c_v-16 - .byte W01 - .byte PAN , c_v+11 - .byte BEND , c_v+0 - .byte W02 - .byte c_v+15 - .byte W01 - .byte PAN , c_v+14 - .byte W01 - .byte BEND , c_v+32 - .byte W01 - .byte PAN , c_v+19 - .byte W03 - .byte c_v+0 - .byte VOL , 105*se_w036_mvl/mxv - .byte BEND , c_v-32 - .byte N10 - .byte W02 - .byte PAN , c_v-8 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W01 - .byte PAN , c_v-11 - .byte BEND , c_v+16 - .byte W02 - .byte c_v+32 - .byte W01 - .byte PAN , c_v-15 - .byte W01 - .byte BEND , c_v+48 - .byte W01 - .byte PAN , c_v-20 - .byte W03 - .byte c_v+0 - .byte VOL , 105*se_w036_mvl/mxv - .byte BEND , c_v-16 - .byte N10 - .byte W02 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+16 - .byte W01 - .byte c_v+32 - .byte W02 - .byte c_v+47 - .byte W02 - .byte c_v+63 - .byte W16 - .byte FINE - -@******************************************************@ - .align 2 - -se_w036: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w036_pri @ Priority - .byte se_w036_rev @ Reverb. - - .word se_w036_grp - - .word se_w036_1 - - .end diff --git a/sound/songs/se_w039.s b/sound/songs/se_w039.s deleted file mode 100644 index bcd35e724..000000000 --- a/sound/songs/se_w039.s +++ /dev/null @@ -1,63 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w039_grp, voicegroup128 - .equ se_w039_pri, 4 - .equ se_w039_rev, reverb_set+50 - .equ se_w039_mvl, 127 - .equ se_w039_key, 0 - .equ se_w039_tbs, 1 - .equ se_w039_exg, 0 - .equ se_w039_cmp, 1 - - .section .rodata - .global se_w039 - .align 2 - -@********************** Track 1 **********************@ - -se_w039_1: - .byte KEYSH , se_w039_key+0 - .byte TEMPO , 150*se_w039_tbs/2 - .byte VOICE , 15 - .byte BENDR , 12 - .byte PAN , c_v+18 - .byte VOL , 48*se_w039_mvl/mxv - .byte BEND , c_v-48 - .byte N04 , Gn2 , v127 - .byte W01 - .byte VOL , 81*se_w039_mvl/mxv - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 110*se_w039_mvl/mxv - .byte BEND , c_v+16 - .byte W01 - .byte c_v+0 - .byte W04 - .byte VOL , 48*se_w039_mvl/mxv - .byte PAN , c_v-16 - .byte BEND , c_v-48 - .byte N04 , An2 - .byte W01 - .byte VOL , 81*se_w039_mvl/mxv - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 110*se_w039_mvl/mxv - .byte BEND , c_v+16 - .byte W15 - .byte VOL , 110*se_w039_mvl/mxv - .byte FINE - -@******************************************************@ - .align 2 - -se_w039: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w039_pri @ Priority - .byte se_w039_rev @ Reverb. - - .word se_w039_grp - - .word se_w039_1 - - .end diff --git a/sound/songs/se_w043.s b/sound/songs/se_w043.s deleted file mode 100644 index 85abb295e..000000000 --- a/sound/songs/se_w043.s +++ /dev/null @@ -1,105 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w043_grp, voicegroup128 - .equ se_w043_pri, 4 - .equ se_w043_rev, reverb_set+50 - .equ se_w043_mvl, 127 - .equ se_w043_key, 0 - .equ se_w043_tbs, 1 - .equ se_w043_exg, 0 - .equ se_w043_cmp, 1 - - .section .rodata - .global se_w043 - .align 2 - -@********************** Track 1 **********************@ - -se_w043_1: - .byte KEYSH , se_w043_key+0 - .byte TEMPO , 150*se_w043_tbs/2 - .byte VOICE , 18 - .byte VOL , 110*se_w043_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , En3 , v124 - .byte W02 - .byte As3 - .byte W04 - .byte W01 - .byte N03 , En3 , v092 - .byte W05 - .byte W04 - .byte PAN , c_v-6 - .byte N02 , En3 , v076 - .byte W02 - .byte W01 - .byte PAN , c_v+6 - .byte N02 , As3 - .byte W05 - .byte PAN , c_v+0 - .byte N03 , En3 , v052 - .byte W06 - .byte W03 - .byte PAN , c_v-12 - .byte N02 , En3 , v056 - .byte W03 - .byte PAN , c_v+10 - .byte N02 , As3 - .byte W04 - .byte PAN , c_v+0 - .byte N03 , En3 , v032 - .byte W02 - .byte W06 - .byte W01 - .byte PAN , c_v-16 - .byte N02 , En3 , v044 - .byte W02 - .byte PAN , c_v+16 - .byte N02 , As3 - .byte W03 - .byte W02 - .byte PAN , c_v+0 - .byte N03 , En3 , v020 - .byte W04 - .byte FINE - -@********************** Track 2 **********************@ - -se_w043_2: - .byte KEYSH , se_w043_key+0 - .byte VOICE , 5 - .byte VOL , 110*se_w043_mvl/mxv - .byte N01 , Cn3 , v040 - .byte W03 - .byte En3 - .byte W03 - .byte W01 - .byte Gn3 - .byte W05 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_w043: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w043_pri @ Priority - .byte se_w043_rev @ Reverb. - - .word se_w043_grp - - .word se_w043_1 - .word se_w043_2 - - .end diff --git a/src/berry_powder.c b/src/berry_powder.c new file mode 100755 index 000000000..91f9d0d4e --- /dev/null +++ b/src/berry_powder.c @@ -0,0 +1,128 @@ +#include "global.h" +#include "berry_powder.h" +#include "bg.h" +#include "event_data.h" +#include "load_save.h" +#include "menu.h" +#include "string_util.h" +#include "strings.h" +#include "text.h" +#include "text_window.h" +#include "window.h" + +#define MAX_BERRY_POWDER 99999 + +static EWRAM_DATA u8 sBerryPowderVendorWindowId = 0; + +static u32 DecryptBerryPowder(u32 *powder) +{ + return *powder ^ gSaveBlock2Ptr->encryptionKey; +} + +void SetBerryPowder(u32 *powder, u32 amount) +{ + *powder = amount ^ gSaveBlock2Ptr->encryptionKey; +} + +void ApplyNewEncryptionKeyToBerryPowder(u32 encryptionKey) +{ + u32 *powder = &gSaveBlock2Ptr->berryCrush.berryPowderAmount; + ApplyNewEncryptionKeyToWord(powder, encryptionKey); +} + +static bool8 HasEnoughBerryPowder_(u32 cost) +{ + u32 *powder = &gSaveBlock2Ptr->berryCrush.berryPowderAmount; + if (DecryptBerryPowder(powder) < cost) + return FALSE; + else + return TRUE; +} + +bool8 HasEnoughBerryPowder(void) +{ + u32 *powder = &gSaveBlock2Ptr->berryCrush.berryPowderAmount; + if (DecryptBerryPowder(powder) < gSpecialVar_0x8004) + return FALSE; + else + return TRUE; +} + +bool8 GiveBerryPowder(u32 amountToAdd) +{ + u32 *powder = &gSaveBlock2Ptr->berryCrush.berryPowderAmount; + u32 amount = DecryptBerryPowder(powder) + amountToAdd; + if (amount > MAX_BERRY_POWDER) + { + SetBerryPowder(powder, MAX_BERRY_POWDER); + return FALSE; + } + else + { + SetBerryPowder(powder, amount); + return TRUE; + } +} + +static bool8 TakeBerryPowder_(u32 cost) +{ + u32 *powder = &gSaveBlock2Ptr->berryCrush.berryPowderAmount; + if (!HasEnoughBerryPowder_(cost)) + return FALSE; + + SetBerryPowder(powder, DecryptBerryPowder(powder) - cost); + return TRUE; +} + +bool8 TakeBerryPowder(void) +{ + u32 *powder = &gSaveBlock2Ptr->berryCrush.berryPowderAmount; + if (!HasEnoughBerryPowder_(gSpecialVar_0x8004)) + return FALSE; + + SetBerryPowder(powder, DecryptBerryPowder(powder) - gSpecialVar_0x8004); + return TRUE; +} + +u32 GetBerryPowder(void) +{ + u32 *powder = &gSaveBlock2Ptr->berryCrush.berryPowderAmount; + return DecryptBerryPowder(powder); +} + +static void PrintBerryPowderAmount(u8 windowId, int amount, u8 x, u8 y, u8 speed) +{ + ConvertIntToDecimalStringN(gStringVar1, amount, STR_CONV_MODE_RIGHT_ALIGN, 5); + AddTextPrinterParameterized(windowId, 1, gStringVar1, x, y, speed, NULL); +} + +static void DrawPlayerPowderAmount(u8 windowId, u16 baseTileOffset, u8 paletteNum, u32 amount) +{ + DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, baseTileOffset, paletteNum); + AddTextPrinterParameterized(windowId, 1, gText_Powder, 0, 1, TEXT_SPEED_FF, NULL); + PrintBerryPowderAmount(windowId, amount, 26, 17, 0); +} + +void PrintPlayerBerryPowderAmount(void) +{ + u32 amount = GetBerryPowder(); + PrintBerryPowderAmount(sBerryPowderVendorWindowId, amount, 26, 17, 0); +} + +void DisplayBerryPowderVendorMenu(void) +{ + struct WindowTemplate template; + SetWindowTemplateFields(&template, 0, 1, 1, 7, 4, 15, 0x1C); + sBerryPowderVendorWindowId = AddWindow(&template); + FillWindowPixelBuffer(sBerryPowderVendorWindowId, PIXEL_FILL(0)); + PutWindowTilemap(sBerryPowderVendorWindowId); + LoadUserWindowBorderGfx_(sBerryPowderVendorWindowId, 0x21D, 0xD0); + DrawPlayerPowderAmount(sBerryPowderVendorWindowId, 0x21D, 13, GetBerryPowder()); +} + +void RemoveBerryPowderVendorMenu(void) +{ + ClearWindowTilemap(sBerryPowderVendorWindowId); + ClearStdWindowAndFrameToTransparent(sBerryPowderVendorWindowId, TRUE); + RemoveWindow(sBerryPowderVendorWindowId); +} diff --git a/src/easy_chat.c b/src/easy_chat.c index 4cc8b9c5b..2e384de6e 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -14,8 +14,8 @@ #include "gpu_regs.h" #include "graphics.h" #include "international_string_util.h" -#include "link.h" #include "main.h" +#include "mevent.h" #include "menu.h" #include "overworld.h" #include "palette.h" @@ -1318,7 +1318,7 @@ void ShowEasyChatScreen(void) words = gSaveBlock2Ptr->apprentices[0].easyChatWords; break; case EASY_CHAT_TYPE_QUESTIONNAIRE: - words = GetSaveBlock1Field3564(); + words = sub_801B058(); break; default: return; @@ -5531,7 +5531,7 @@ void InitializeEasyChatWordArray(u16 *words, u16 length) void sub_811F8BC(void) { int i; - u16 *words = GetSaveBlock1Field3564(); + u16 *words = sub_801B058(); for (i = 0; i < 4; i++) words[i] = 0xFFFF; } diff --git a/src/field_specials.c b/src/field_specials.c index 2ae494dad..20c2e6173 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1,4 +1,5 @@ #include "global.h" +#include "alloc.h" #include "battle.h" #include "battle_tower.h" #include "cable_club.h" @@ -20,7 +21,7 @@ #include "link.h" #include "list_menu.h" #include "main.h" -#include "alloc.h" +#include "mevent.h" #include "match_call.h" #include "menu.h" #include "overworld.h" @@ -31,7 +32,6 @@ #include "random.h" #include "rayquaza_scene.h" #include "region_map.h" -#include "rom_8011DC0.h" #include "rtc.h" #include "script.h" #include "script_menu.h" diff --git a/src/item_use.c b/src/item_use.c index e646a18ee..7947964ca 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -4,6 +4,7 @@ #include "battle_pyramid.h" #include "battle_pyramid_bag.h" #include "berry.h" +#include "berry_powder.h" #include "bike.h" #include "coins.h" #include "data2.h" @@ -45,8 +46,6 @@ extern u8 Route102_EventScript_274482[]; extern u8 Route102_EventScript_2744C0[]; extern u8 BattleFrontier_OutsideEast_EventScript_242CFC[]; -extern s32 sub_80247BC(void); - void SetUpItemUseCallback(u8 taskId); void MapPostLoadHook_UseItem(void); void sub_80AF6D4(void); @@ -638,7 +637,7 @@ void ItemUseOutOfBattle_CoinCase(u8 taskId) void ItemUseOutOfBattle_PowderJar(u8 taskId) { - ConvertIntToDecimalStringN(gStringVar1, sub_80247BC(), 0, 5); + ConvertIntToDecimalStringN(gStringVar1, GetBerryPowder(), 0, 5); StringExpandPlaceholders(gStringVar4, gText_PowderQty); if (!gTasks[taskId].data[3]) diff --git a/src/load_save.c b/src/load_save.c index d6785254f..150c557c6 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -1,5 +1,6 @@ #include "global.h" #include "alloc.h" +#include "berry_powder.h" #include "item.h" #include "load_save.h" #include "main.h" @@ -15,8 +16,6 @@ static void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey); -extern void ApplyNewEncryptionKeyToBerryPowder(u32 key); - #define SAVEBLOCK_MOVE_RANGE 128 struct LoadedSaveData diff --git a/src/mevent2.c b/src/mevent2.c new file mode 100755 index 000000000..8a6bd9faa --- /dev/null +++ b/src/mevent2.c @@ -0,0 +1,626 @@ +#include "global.h" +#include "util.h" +#include "main.h" +#include "event_data.h" +#include "easy_chat.h" +#include "script.h" +#include "battle_tower.h" +#include "mevent_news.h" +#include "string_util.h" +#include "new_game.h" +#include "mevent.h" +#include "constants/species.h" + +static EWRAM_DATA bool32 gUnknown_02022C70 = FALSE; + +static void sub_801B180(void); +static void sub_801B14C(void); +static bool32 sub_801B114(const struct MEventBuffer_3120_Sub *data); +static bool32 sub_801B2CC(const struct MEventBuffer_32E0_Sub *data); +static void sub_801B330(void); +static void sub_801B368(void); +static void sub_801B9F8(void); +static void sub_801BA8C(u32 a0, u32 a1, u32 *a2, int a3); + +void sub_801AFD8(void) +{ + CpuFill32(0, &gSaveBlock1Ptr->unk_322C, sizeof(gSaveBlock1Ptr->unk_322C)); + sub_801B180(); + sub_811F8BC(); +} + +struct MEventBuffer_3120_Sub *sub_801B00C(void) +{ + return &gSaveBlock1Ptr->unk_322C.buffer_000.data; +} + +struct MEventBuffer_32E0_Sub *sav1_get_mevent_buffer_1(void) +{ + return &gSaveBlock1Ptr->unk_322C.buffer_1c0.data; +} + +struct MEventBuffer_3430_Sub *sav1_get_mevent_buffer_2(void) +{ + return &gSaveBlock1Ptr->unk_322C.buffer_310.data; +} + +struct MysteryEventStruct *sub_801B044(void) +{ + return &gSaveBlock1Ptr->unk_322C.unk_340; +} + +u16 *sub_801B058(void) +{ + return gSaveBlock1Ptr->unk_322C.unk_338; +} + +void sub_801B06C(void) +{ + sub_801B14C(); +} + +bool32 sub_801B078(const struct MEventBuffer_3120_Sub *src) +{ + if (!sub_801B114(src)) + return FALSE; + + sub_801B14C(); + gSaveBlock1Ptr->unk_322C.buffer_000.data = *src; + gSaveBlock1Ptr->unk_322C.buffer_000.crc = CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.buffer_000.data, sizeof(struct MEventBuffer_3120_Sub)); + return TRUE; +} + +bool32 sub_801B0CC(void) +{ + if (CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.buffer_000.data, sizeof(struct MEventBuffer_3120_Sub)) != gSaveBlock1Ptr->unk_322C.buffer_000.crc) + return FALSE; + if (!sub_801B114(&gSaveBlock1Ptr->unk_322C.buffer_000.data)) + return FALSE; + + return TRUE; +} + +static bool32 sub_801B114(const struct MEventBuffer_3120_Sub *data) +{ + if (data->unk_00 == 0) + return FALSE; + + return TRUE; +} + +bool32 sub_801B128(void) +{ + const struct MEventBuffer_3120_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_000.data; + if (data->unk_02 == 0) + return FALSE; + + return TRUE; +} + +static void sub_801B14C(void) +{ + CpuFill32(0, sub_801B00C(), sizeof(gSaveBlock1Ptr->unk_322C.buffer_000.data)); + gSaveBlock1Ptr->unk_322C.buffer_000.crc = 0; +} + +static void sub_801B180(void) +{ + CpuFill32(0, sub_801B044(), sizeof(struct MysteryEventStruct)); + sub_801DBC0(); +} + +bool32 sub_801B1A4(const u8 *src) +{ + const u8 *r5 = (const u8 *)&gSaveBlock1Ptr->unk_322C.buffer_000.data; + u32 i; + if (!sub_801B0CC()) + return FALSE; + + for (i = 0; i < sizeof(struct MEventBuffer_3120_Sub); i++) + { + if (r5[i] != src[i]) + return FALSE; + } + + return TRUE; +} + +void sub_801B1E8(void) +{ + sub_801B330(); + sub_801B368(); + sub_801B9F8(); + ClearRamScript(); + sub_809D4D8(); + sub_809D570(); + ClearEReaderTrainer(&gSaveBlock2Ptr->frontier.ereaderTrainer); +} + +bool32 sub_801B21C(const struct MEventBuffer_32E0_Sub *data) +{ + struct MEventBuffer_3430_Sub *r2; + struct MEventBuffer_32E0_Sub *r1; + if (!sub_801B2CC(data)) + return FALSE; + + sub_801B1E8(); + memcpy(&gSaveBlock1Ptr->unk_322C.buffer_1c0.data, data, sizeof(struct MEventBuffer_32E0_Sub)); + gSaveBlock1Ptr->unk_322C.buffer_1c0.crc = CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.buffer_1c0.data, sizeof(struct MEventBuffer_32E0_Sub)); + r2 = &gSaveBlock1Ptr->unk_322C.buffer_310.data; + r1 = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data; + r2->unk_06 = r1->unk_02; + return TRUE; +} + +bool32 sub_801B27C(void) +{ + if (gSaveBlock1Ptr->unk_322C.buffer_1c0.crc != CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.buffer_1c0.data, sizeof(struct MEventBuffer_32E0_Sub))) + return FALSE; + if (!sub_801B2CC(&gSaveBlock1Ptr->unk_322C.buffer_1c0.data)) + return FALSE; + if (!sub_80991F8()) + return FALSE; + + return TRUE; +} + +static bool32 sub_801B2CC(const struct MEventBuffer_32E0_Sub *data) +{ + if (data->unk_00 == 0) + return FALSE; + if (data->unk_08_0 > 2) + return FALSE; + if (!(data->unk_08_6 == 0 || data->unk_08_6 == 1 || data->unk_08_6 == 2)) + return FALSE; + if (data->unk_08_2 > 7) + return FALSE; + if (data->unk_09 > 7) + return FALSE; + + return TRUE; +} + +bool32 sub_801B308(void) +{ + const struct MEventBuffer_32E0_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data; + if (data->unk_08_6 == 0) + return FALSE; + + return TRUE; +} + +static void sub_801B330(void) +{ + CpuFill32(0, &gSaveBlock1Ptr->unk_322C.buffer_1c0.data, sizeof(struct MEventBuffer_32E0_Sub)); + gSaveBlock1Ptr->unk_322C.buffer_1c0.crc = 0; +} + +static void sub_801B368(void) +{ + CpuFill32(0, sav1_get_mevent_buffer_2(), 18 *sizeof(u16)); + gSaveBlock1Ptr->unk_322C.buffer_310.crc = 0; +} + +u16 sub_801B39C(void) +{ + if (sub_801B27C()) + return gSaveBlock1Ptr->unk_322C.buffer_1c0.data.unk_00; + + return 0; +} + +void sub_801B3C0(struct MEventBuffer_32E0_Sub *buffer) +{ + if (buffer->unk_08_6 == 1) + buffer->unk_08_6 = 0; +} + +static bool32 sub_801B3D8(u16 a0) +{ + if (a0 >= 1000 && a0 < 1020) + return TRUE; + + return FALSE; +} + +static const u16 sMysteryGiftFlags[] = +{ + FLAG_RECEIVED_AURORA_TICKET, + FLAG_RECEIVED_MYSTIC_TICKET, + FLAG_RECEIVED_OLD_SEA_MAP, + FLAG_UNUSED_MYSTERY_GIFT_0x13D, + FLAG_UNUSED_MYSTERY_GIFT_0x13E, + FLAG_UNUSED_MYSTERY_GIFT_0x13F, + FLAG_UNUSED_MYSTERY_GIFT_0x140, + FLAG_UNUSED_MYSTERY_GIFT_0x141, + FLAG_UNUSED_MYSTERY_GIFT_0x142, + FLAG_UNUSED_MYSTERY_GIFT_0x143, + FLAG_UNUSED_MYSTERY_GIFT_0x144, + FLAG_UNUSED_MYSTERY_GIFT_0x145, + FLAG_UNUSED_MYSTERY_GIFT_0x146, + FLAG_UNUSED_MYSTERY_GIFT_0x147, + FLAG_UNUSED_MYSTERY_GIFT_0x148, + FLAG_UNUSED_MYSTERY_GIFT_0x149, + FLAG_UNUSED_MYSTERY_GIFT_0x14A, + FLAG_UNUSED_MYSTERY_GIFT_0x14B, + FLAG_UNUSED_MYSTERY_GIFT_0x14C, + FLAG_UNUSED_MYSTERY_GIFT_0x14D, +}; + +bool32 sub_801B3F8(void) +{ + u16 value = sub_801B39C(); + if (!sub_801B3D8(value)) + return FALSE; + + if (FlagGet(sMysteryGiftFlags[value - 1000]) == TRUE) + return FALSE; + + return TRUE; +} + +static int sub_801B438(const struct MEventBuffer_3430_Sub *data, int size) +{ + int r3 = 0; + int i; + for (i = 0; i < size; i++) + { + if (data->unk_08[1][i] && data->unk_08[0][i]) + r3++; + } + + return r3; +} + +static bool32 sub_801B460(const struct MEventBuffer_3430_Sub *data1, const u16 *data2, int size) +{ + int i; + for (i = 0; i < size; i++) + { + if (data1->unk_08[1][i] == data2[1]) + return TRUE; + if (data1->unk_08[0][i] == data2[0]) + return TRUE; + } + + return FALSE; +} + +static bool32 sub_801B4A4(const u16 *data) +{ + if (data[1] == 0) + return FALSE; + if (data[0] == 0) + return FALSE; + if (data[0] >= NUM_SPECIES) + return FALSE; + return TRUE; +} + +static int sub_801B4CC(void) +{ + struct MEventBuffer_32E0_Sub *data; + if (!sub_801B27C()) + return 0; + + data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data; + if (data->unk_08_0 != 1) + return 0; + + return sub_801B438(&gSaveBlock1Ptr->unk_322C.buffer_310.data, data->unk_09); +} + +bool32 sub_801B508(const u16 *data) +{ + struct MEventBuffer_32E0_Sub *buffer = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data; + int size = buffer->unk_09; + int i; + if (!sub_801B4A4(data)) + return FALSE; + + if (sub_801B460(&gSaveBlock1Ptr->unk_322C.buffer_310.data, data, size)) + return FALSE; + + for (i = 0; i < size; i++) + { + if (gSaveBlock1Ptr->unk_322C.buffer_310.data.unk_08[1][i] == 0 && gSaveBlock1Ptr->unk_322C.buffer_310.data.unk_08[0][i] == 0) + { + gSaveBlock1Ptr->unk_322C.buffer_310.data.unk_08[1][i] = data[1]; + gSaveBlock1Ptr->unk_322C.buffer_310.data.unk_08[0][i] = data[0]; + return TRUE; + } + } + + return FALSE; +} + +void sub_801B580(struct MEventStruct_Unk1442CC *data, bool32 a1) +{ + int i; + CpuFill32(0, data, sizeof(struct MEventStruct_Unk1442CC)); + data->unk_00 = 0x101; + data->unk_04 = 1; + data->unk_08 = 1; + + if (a1) + { + data->unk_0C = 5; + data->unk_10 = 0x0201; + } + else + { + data->unk_0C = 4; + data->unk_10 = 0x0200; + } + + if (sub_801B27C()) + { + data->unk_14 = sav1_get_mevent_buffer_1()->unk_00; + data->unk_20 = *sav1_get_mevent_buffer_2(); + data->unk_44 = sav1_get_mevent_buffer_1()->unk_09; + } + else + { + data->unk_14 = 0; + } + + for (i = 0; i < 4; i++) + data->unk_16[i] = gSaveBlock1Ptr->unk_322C.unk_338[i]; + + CopyTrainerId(data->unk_4C, gSaveBlock2Ptr->playerTrainerId); + StringCopy(data->unk_45, gSaveBlock2Ptr->playerName); + for (i = 0; i < 6; i++) + data->unk_50[i] = gSaveBlock1Ptr->easyChatProfile[i]; + + memcpy(data->unk_5C, RomHeaderGameCode, 4); + data->unk_60 = RomHeaderSoftwareVersion; +} + +bool32 sub_801B6A0(const struct MEventStruct_Unk1442CC *data, bool32 a1) +{ + if (data->unk_00 != 0x101) + return FALSE; + + if (!(data->unk_04 & 1)) + return FALSE; + + if (!(data->unk_08 & 1)) + return FALSE; + + if (!a1) + { + if (!(data->unk_0C & 4)) + return FALSE; + + if (!(data->unk_10 & 0x380)) + return FALSE; + } + + return TRUE; +} + +u32 sub_801B6EC(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *unused) +{ + if (a1->unk_14 == 0) + return 0; + + if (*a0 == a1->unk_14) + return 1; + + return 2; +} + +u32 sub_801B708(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *unused) +{ + int r4 = a1->unk_44 - sub_801B438(&a1->unk_20, a1->unk_44); + if (r4 == 0) + return 1; + if (sub_801B460(&a1->unk_20, a0, a1->unk_44)) + return 3; + if (r4 == 1) + return 4; + return 2; +} + +bool32 sub_801B748(const struct MEventStruct_Unk1442CC *a0, const u16 *a1) +{ + int i; + for (i = 0; i < 4; i++) + { + if (a0->unk_16[i] != a1[i]) + return FALSE; + } + + return TRUE; +} + +static int sub_801B770(const struct MEventStruct_Unk1442CC *a0) +{ + return sub_801B438(&a0->unk_20, a0->unk_44); +} + +u16 sub_801B784(const struct MEventStruct_Unk1442CC *a0, u32 command) +{ + switch (command) + { + case 0: + return a0->unk_20.unk_00; + case 1: + return a0->unk_20.unk_02; + case 2: + return a0->unk_20.unk_04; + case 3: + return sub_801B770(a0); + case 4: + return a0->unk_44; + default: + AGB_ASSERT(0); + return 0; + } +} + +static void sub_801B7D8(u32 command) +{ + struct MEventBuffer_32E0_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data; + if (data->unk_08_0 == 2) + { + u16 *dest = NULL; + switch (command) + { + case 0: + dest = &gSaveBlock1Ptr->unk_322C.buffer_310.data.unk_00; + break; + case 1: + dest = &gSaveBlock1Ptr->unk_322C.buffer_310.data.unk_02; + break; + case 2: + dest = &gSaveBlock1Ptr->unk_322C.buffer_310.data.unk_04; + break; + case 3: + break; + case 4: + break; + } + + if (dest == NULL) + AGB_ASSERT(0); + else if (++(*dest) > 999) + *dest = 999; + } +} + +u16 mevent_081445C0(u32 command) +{ + switch (command) + { + case 0: + { + struct MEventBuffer_32E0_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data; + if (data->unk_08_0 == 2) + { + struct MEventBuffer_3430_Sub *buffer = &gSaveBlock1Ptr->unk_322C.buffer_310.data; + return buffer->unk_00; + } + break; + } + case 1: + { + struct MEventBuffer_32E0_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data; + if (data->unk_08_0 == 2) + { + struct MEventBuffer_3430_Sub *buffer = &gSaveBlock1Ptr->unk_322C.buffer_310.data; + return buffer->unk_02; + } + break; + } + case 2: + { + struct MEventBuffer_32E0_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data; + if (data->unk_08_0 == 2) + { + struct MEventBuffer_3430_Sub *buffer = &gSaveBlock1Ptr->unk_322C.buffer_310.data; + return buffer->unk_04; + } + break; + } + case 3: + { + struct MEventBuffer_32E0_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data; + if (data->unk_08_0 == 1) + return sub_801B4CC(); + break; + } + case 4: + { + struct MEventBuffer_32E0_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data; + if (data->unk_08_0 == 1) + return data->unk_09; + break; + } + } + + AGB_ASSERT(0); + return 0; +} + +void sub_801B940(void) +{ + gUnknown_02022C70 = FALSE; +} + +bool32 sub_801B94C(u16 a0) +{ + gUnknown_02022C70 = FALSE; + if (a0 == 0) + return FALSE; + + if (!sub_801B27C()) + return FALSE; + + if (gSaveBlock1Ptr->unk_322C.buffer_1c0.data.unk_00 != a0) + return FALSE; + + gUnknown_02022C70 = TRUE; + return TRUE; +} + +void sub_801B990(u32 a0, u32 a1) +{ + if (gUnknown_02022C70) + { + switch (a0) + { + case 2: + sub_801BA8C(2, a1, gSaveBlock1Ptr->unk_322C.unk_344[1], 5); + break; + case 0: + sub_801BA8C(0, a1, gSaveBlock1Ptr->unk_322C.unk_344[0], 5); + break; + case 1: + sub_801BA8C(1, a1, gSaveBlock1Ptr->unk_322C.unk_344[0], 5); + break; + default: + AGB_ASSERT(0); + } + } +} + +static void sub_801B9F8(void) +{ + CpuFill32(0, gSaveBlock1Ptr->unk_322C.unk_344, sizeof(gSaveBlock1Ptr->unk_322C.unk_344)); +} + +static bool32 sub_801BA24(u32 a0, u32 *a1, int size) +{ + int i; + int j; + + for (i = 0; i < size; i++) + { + if (a1[i] == a0) + break; + } + + if (i == size) + { + for (j = size - 1; j > 0; j--) + a1[j] = a1[j - 1]; + + a1[0] = a0; + return TRUE; + } + else + { + for (j = i; j > 0; j--) + a1[j] = a1[j - 1]; + + a1[0] = a0; + return FALSE; + } +} + +static void sub_801BA8C(u32 a0, u32 a1, u32 *a2, int a3) +{ + if (sub_801BA24(a1, a2, a3)) + sub_801B7D8(a0); +} diff --git a/src/new_game.c b/src/new_game.c index 2e8930f7c..97988497d 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -41,12 +41,12 @@ #include "secret_base.h" #include "player_pc.h" #include "field_specials.h" +#include "berry_powder.h" +#include "mevent.h" extern void copy_strings_to_sav1(void); -extern void sub_801AFD8(void); extern void ResetPokeJumpResults(void); -extern void SetBerryPowder(u32* powder, u32 newValue); extern const u8 EventScript_ResetAllMapFlags[]; diff --git a/src/script.c b/src/script.c index c95a1141f..91690dd33 100644 --- a/src/script.c +++ b/src/script.c @@ -1,6 +1,7 @@ #include "global.h" #include "script.h" #include "event_data.h" +#include "mevent.h" #include "util.h" #include "constants/map_scripts.h" @@ -8,8 +9,6 @@ extern const u8* gUnknown_020375C0; -extern bool32 sub_801B27C(void); - // ewram bss IWRAM_DATA static u8 sScriptContext1Status; IWRAM_DATA static u32 sUnusedVariable1; diff --git a/src/union_room.c b/src/union_room.c index 68a517ea6..708f44a26 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -34,6 +34,7 @@ #include "data2.h" #include "field_screen_effect.h" #include "script_pokemon_util_80F87D8.h" +#include "mevent.h" struct UnkStruct_Shared { @@ -228,9 +229,6 @@ void sub_80177B8(u8 arg0, u8 arg1, u8 arg2, struct UnkStruct_x20 *arg3, u8 arg4, bool32 sub_8017678(struct UnkStruct_x20 *arg0, struct UnkStruct_x1C *arg1); u32 sub_8018120(struct TradeUnkStruct *arg0, u8 multiplayerId); void sub_801807C(struct TradeUnkStruct *arg0); -void sub_801B940(void); -void sub_801B94C(u16); -u16 sub_801B39C(void); void sub_801AC54(void); void sub_801DD98(void); void sub_802A9A8(u8 monId, MainCallback callback); diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 999ddcbbd..9b02eeb72 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -509,19 +509,15 @@ void sub_81668F8(void) } } -#ifdef NONMATCHING void sub_8166A34(void) { switch (gUnknown_0203BC90->field_50) { u8 var; case 0: - gUnknown_0203BC90->field_5c[0] = (u8) &gPlayerParty; - gUnknown_0203BCAC->info.field_71 = (u32) &gUnknown_0203BCAC->field_0[gUnknown_0203BCAC->info.field_71]; - gUnknown_0203BC90->field_5c[0] = &gPlayerParty + gUnknown_0203BC90->pokemon = gPlayerParty; + gUnknown_0203BC90->pokemon += gUnknown_0203BCAC->field_7FB8[gUnknown_0203BCAC->info.field_71].unk1; sub_81D3520(gUnknown_0203BCAC->field_7B1C); - /*gUnknown_0203BCAC->pokemon = &gPlayerParty[gUnknown_083DFEC4->unk893c[gUnknown_0203BCAC->field_0[0x7B1C]].partyIdx]; - move_anim_execute();*/ gUnknown_0203BC90->field_50++; break; case 1: @@ -530,27 +526,26 @@ void sub_8166A34(void) break; case 2: sub_8167104(); - sub_81D2754(gUnknown_0203BC90->field_5c, &gUnknown_0203BCAC->field_7C58[0x50]); - sub_81D1F84(&gUnknown_0203BCAC->field_7C58[0], &gUnknown_0203BCAC->field_7C58[gUnknown_0203BCAC->field_7C58[0x35B] + 0x14], 0); + sub_81D2754(gUnknown_0203BC90->field_5c, gUnknown_0203BCAC->field_7C58.unk14[3]); + sub_81D1F84(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14[gUnknown_0203BCAC->field_7FB3], gUnknown_0203BCAC->field_7C58.unk14[3]); sub_8167338(); gUnknown_0203BC90->field_50++; break; case 3: - var = gUnknown_0203BCAC->field_7C58[0]; - sub_81D2074(); - if (!var) + var = sub_81D2074(&gUnknown_0203BCAC->field_7C58); + if(var) + return; + + sub_81681F4(sub_81672A4(gUnknown_0203BCAC->info.field_71)); + + if (gUnknown_0203BCAC->info.field_71 != gUnknown_0203BCAC->info.field_70 - 1) { - sub_81681F4(sub_81672A4(gUnknown_0203BCAC->info.field_71)); - /*sub_80F3D00(); - gUnknown_0203BCAC->unk52 = 0;*/ - if(gUnknown_0203BCAC->info.field_71 == gUnknown_0203BCAC->info.field_70 - 1) - { - gUnknown_0203BC90->field_52 = var; - } - - sub_81D3480(&gUnknown_0203BCAC->field_7C58[0x35B], gUnknown_0203BCAC->field_7C58[0x35B + gUnknown_0203BCAC->field_7C58[0x358]]); - + u8 var0 = gUnknown_0203BCAC->unk7FB0[gUnknown_0203BCAC->field_7FB3]; + sub_81D3480(gUnknown_0203BCAC->field_7B1C, gUnknown_0203BCAC->field_7B10, var0); } + + gUnknown_0203BC90->field_52 = 0; + gUnknown_0203BC90->field_50++; break; case 4: if ((++gUnknown_0203BC90->field_52) > 16) @@ -568,190 +563,6 @@ void sub_8166A34(void) break; } } -#else -NAKED -void sub_8166A34(void) -{ - asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - ldr r1, =gUnknown_0203BC90\n\ - ldr r0, [r1]\n\ - adds r0, 0x50\n\ - ldrb r0, [r0]\n\ - adds r5, r1, 0\n\ - cmp r0, 0x5\n\ - bls _08166A46\n\ - b _08166BDA\n\ -_08166A46:\n\ - lsls r0, 2\n\ - ldr r1, =_08166A58\n\ - adds r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ - .pool\n\ - .align 2, 0\n\ -_08166A58:\n\ - .4byte _08166A70\n\ - .4byte _08166AAC\n\ - .4byte _08166AC0\n\ - .4byte _08166B14\n\ - .4byte _08166B94\n\ - .4byte _08166BB6\n\ -_08166A70:\n\ - ldr r4, [r5]\n\ - ldr r3, =gPlayerParty\n\ - str r3, [r4, 0xC]\n\ - ldr r0, =gUnknown_0203BCAC\n\ - ldr r0, [r0]\n\ - ldr r2, =0x00008041\n\ - adds r1, r0, r2\n\ - ldrb r1, [r1]\n\ - lsls r1, 2\n\ - adds r1, r0, r1\n\ - subs r2, 0x88\n\ - adds r1, r2\n\ - ldrb r2, [r1]\n\ - movs r1, 0x64\n\ - muls r1, r2\n\ - adds r1, r3\n\ - str r1, [r4, 0xC]\n\ - ldr r3, =0x00007b1c\n\ - adds r0, r3\n\ - bl sub_81D3520\n\ - b _08166BAA\n\ - .pool\n\ -_08166AAC:\n\ - ldr r0, =gMain\n\ - ldrh r1, [r0, 0x2E]\n\ - movs r0, 0x3\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _08166ABA\n\ - b _08166BDA\n\ -_08166ABA:\n\ - b _08166BAA\n\ - .pool\n\ -_08166AC0:\n\ - bl sub_8167104\n\ - ldr r6, =gUnknown_0203BC90\n\ - ldr r0, [r6]\n\ - adds r0, 0x5C\n\ - ldr r4, =gUnknown_0203BCAC\n\ - ldr r1, [r4]\n\ - ldr r5, =0x00007ca8\n\ - adds r1, r5\n\ - bl sub_81D2754\n\ - ldr r2, [r4]\n\ - ldr r4, =0x00007c58\n\ - adds r0, r2, r4\n\ - ldr r3, =0x00007fb3\n\ - adds r1, r2, r3\n\ - movs r3, 0\n\ - ldrsb r3, [r1, r3]\n\ - lsls r1, r3, 2\n\ - adds r1, r3\n\ - lsls r1, 2\n\ - adds r4, 0x14\n\ - adds r1, r4\n\ - adds r1, r2, r1\n\ - adds r2, r5\n\ - bl sub_81D1F84\n\ - bl sub_8167338\n\ - ldr r1, [r6]\n\ - b _08166BAC\n\ - .pool\n\ -_08166B14:\n\ - ldr r5, =gUnknown_0203BCAC\n\ - ldr r0, [r5]\n\ - ldr r1, =0x00007c58\n\ - adds r0, r1\n\ - bl sub_81D2074\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - cmp r6, 0\n\ - bne _08166BDA\n\ - ldr r0, [r5]\n\ - ldr r4, =0x00008041\n\ - adds r0, r4\n\ - ldrb r0, [r0]\n\ - bl sub_81672A4\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - bl sub_81681F4\n\ - ldr r3, [r5]\n\ - adds r4, r3, r4\n\ - ldrb r1, [r4]\n\ - ldr r2, =0x00008040\n\ - adds r0, r3, r2\n\ - ldrb r0, [r0]\n\ - subs r0, 0x1\n\ - cmp r1, r0\n\ - beq _08166B6C\n\ - ldr r4, =0x00007fb3\n\ - adds r0, r3, r4\n\ - movs r1, 0\n\ - ldrsb r1, [r0, r1]\n\ - subs r2, 0x90\n\ - adds r0, r3, r2\n\ - adds r0, r1\n\ - ldrb r2, [r0]\n\ - ldr r4, =0x00007b1c\n\ - adds r0, r3, r4\n\ - subs r4, 0xC\n\ - adds r1, r3, r4\n\ - ldrb r1, [r1]\n\ - bl sub_81D3480\n\ -_08166B6C:\n\ - ldr r1, =gUnknown_0203BC90\n\ - ldr r0, [r1]\n\ - adds r0, 0x52\n\ - strb r6, [r0]\n\ - ldr r1, [r1]\n\ - b _08166BAC\n\ - .pool\n\ -_08166B94:\n\ - ldr r1, [r5]\n\ - adds r1, 0x52\n\ - ldrb r0, [r1]\n\ - adds r0, 0x1\n\ - strb r0, [r1]\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0x10\n\ - bls _08166BDA\n\ - bl sub_8166E24\n\ -_08166BAA:\n\ - ldr r1, [r5]\n\ -_08166BAC:\n\ - adds r1, 0x50\n\ - ldrb r0, [r1]\n\ - adds r0, 0x1\n\ - strb r0, [r1]\n\ - b _08166BDA\n\ -_08166BB6:\n\ - ldr r0, =gMain\n\ - ldrh r1, [r0, 0x2E]\n\ - movs r0, 0x3\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _08166BDA\n\ - bl sub_8166EDC\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - bne _08166BDA\n\ - ldr r0, =gSpecialVar_ItemId\n\ - ldrb r0, [r0]\n\ - bl TryClearPokeblock\n\ - ldr r0, =sub_8166BEC\n\ - bl sub_816636C\n\ -_08166BDA:\n\ - pop {r4-r6}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ - .syntax divided\n"); -} -#endif void sub_8166BEC(void) { diff --git a/sym_ewram.txt b/sym_ewram.txt index b790c56f4..7caa6f2ff 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -46,8 +46,7 @@ gUnknown_02022C68: @ 2022C68 gUnknown_02022C6C: @ 2022C6C .space 0x4 -gUnknown_02022C70: @ 2022C70 - .space 0x4 + .include "src/mevent2.o" gUnknown_02022C74: @ 2022C74 .space 0x4 @@ -73,9 +72,7 @@ gUnknown_02022C8C: @ 2022C8C gUnknown_02022C90: @ 2022C90 .space 0x4 -gUnknown_02022C94: @ 2022C94 - .space 0x4 - + .include "src/berry_powder.o" .include "src/dodrio_berry_picking.o" gUnknown_02022CFC: @ 2022CFC |