diff --git a/asm/pokenav_unk_10.s b/asm/pokenav_unk_10.s index b24f0b406..bf621e6a6 100644 --- a/asm/pokenav_unk_10.s +++ b/asm/pokenav_unk_10.s @@ -1305,881 +1305,5 @@ _081D0E5A: bx r1 thumb_func_end sub_81D0E00 - thumb_func_start sub_81D0E60 -sub_81D0E60: @ 81D0E60 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gUnknown_08624BB8 - bl AddWindow - strh r0, [r4, 0xA] - lsls r0, 24 - lsrs r0, 24 - bl PutWindowTilemap - adds r0, r4, 0 - bl sub_81D0E84 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D0E60 - - thumb_func_start sub_81D0E84 -sub_81D0E84: @ 81D0E84 - push {r4,r5,lr} - sub sp, 0x10 - adds r5, r0, 0 - ldr r1, =gUnknown_08624BC0 - add r0, sp, 0xC - movs r2, 0x3 - bl memcpy - ldr r4, =gStringVar1 - bl sub_81D07D8 - adds r1, r0, 0 - adds r0, r4, 0 - movs r2, 0 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - bl DynamicPlaceholderTextUtil_Reset - movs r0, 0 - adds r1, r4, 0 - bl DynamicPlaceholderTextUtil_SetPlaceholderPtr - ldr r4, =gStringVar4 - ldr r1, =gText_RibbonsF700 - adds r0, r4, 0 - bl DynamicPlaceholderTextUtil_ExpandPlaceholders - ldrb r0, [r5, 0xA] - movs r1, 0x44 - bl FillWindowPixelBuffer - ldrb r0, [r5, 0xA] - add r1, sp, 0xC - str r1, [sp] - movs r1, 0x1 - negs r1, r1 - str r1, [sp, 0x4] - str r4, [sp, 0x8] - movs r1, 0x1 - movs r2, 0 - movs r3, 0x1 - bl AddTextPrinterParameterized3 - ldrb r0, [r5, 0xA] - movs r1, 0x2 - bl CopyWindowToVram - add sp, 0x10 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D0E84 - - thumb_func_start sub_81D0EFC -sub_81D0EFC: @ 81D0EFC - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x10 - adds r7, r0, 0 - bl sub_81D0954 - adds r5, r0, 0 - ldr r1, =gUnknown_08624BC0 - add r0, sp, 0xC - movs r2, 0x3 - bl memcpy - ldrb r0, [r7, 0xA] - movs r1, 0x44 - bl FillWindowPixelBuffer - cmp r5, 0x18 - bhi _081D0F60 - lsls r1, r5, 3 - ldr r0, =gRibbonDescriptionPointers - adds r6, r1, r0 - movs r5, 0x80 - lsls r5, 17 - movs r4, 0x1 -_081D0F2E: - ldrb r0, [r7, 0xA] - lsrs r3, r5, 24 - add r1, sp, 0xC - str r1, [sp] - movs r1, 0x1 - negs r1, r1 - str r1, [sp, 0x4] - ldm r6!, {r1} - str r1, [sp, 0x8] - movs r1, 0x1 - movs r2, 0 - bl AddTextPrinterParameterized3 - movs r0, 0x80 - lsls r0, 21 - adds r5, r0 - subs r4, 0x1 - cmp r4, 0 - bge _081D0F2E - b _081D0FAA - .pool -_081D0F60: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - adds r0, r5 - ldr r1, =0x0000318f - adds r0, r1 - ldrb r5, [r0] - cmp r5, 0 - beq _081D0FB2 - subs r5, 0x1 - movs r4, 0 - ldr r0, =gGiftRibbonDescriptionPointers - mov r8, r0 - movs r6, 0x80 - lsls r6, 17 -_081D0F7C: - ldrb r0, [r7, 0xA] - lsrs r3, r6, 24 - add r1, sp, 0xC - str r1, [sp] - movs r1, 0x1 - negs r1, r1 - str r1, [sp, 0x4] - lsls r1, r4, 2 - lsls r2, r5, 3 - adds r1, r2 - add r1, r8 - ldr r1, [r1] - str r1, [sp, 0x8] - movs r1, 0x1 - movs r2, 0 - bl AddTextPrinterParameterized3 - movs r0, 0x80 - lsls r0, 21 - adds r6, r0 - adds r4, 0x1 - cmp r4, 0x1 - ble _081D0F7C -_081D0FAA: - ldrb r0, [r7, 0xA] - movs r1, 0x2 - bl CopyWindowToVram -_081D0FB2: - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D0EFC - - thumb_func_start sub_81D0FCC -sub_81D0FCC: @ 81D0FCC - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gUnknown_08624BC4 - bl AddWindow - strh r0, [r4, 0x8] - lsls r0, 24 - lsrs r0, 24 - bl PutWindowTilemap - adds r0, r4, 0 - bl sub_81D0FF0 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D0FCC - - thumb_func_start sub_81D0FF0 -sub_81D0FF0: @ 81D0FF0 - push {r4-r7,lr} - sub sp, 0x10 - ldrh r7, [r0, 0x8] - ldrb r5, [r0, 0x8] - adds r0, r5, 0 - movs r1, 0x11 - bl FillWindowPixelBuffer - ldr r4, =gStringVar3 - mov r6, sp - adds r6, 0xD - adds r0, r4, 0 - add r1, sp, 0xC - adds r2, r6, 0 - bl sub_81D06E4 - movs r0, 0x1 - str r0, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0x8] - adds r0, r5, 0 - movs r1, 0x1 - adds r2, r4, 0 - movs r3, 0 - bl AddTextPrinterParameterized - ldrb r0, [r6] - cmp r0, 0 - beq _081D1040 - cmp r0, 0xFE - beq _081D1048 - ldr r1, =gUnknown_08624BE4 - b _081D104A - .pool -_081D1040: - ldr r1, =gUnknown_08624BCC - b _081D104A - .pool -_081D1048: - ldr r1, =gUnknown_08624BD8 -_081D104A: - ldr r5, =gStringVar1 - adds r0, r5, 0 - bl StringCopy - movs r1, 0xBA - strb r1, [r0] - adds r0, 0x1 - movs r1, 0xF9 - strb r1, [r0] - adds r0, 0x1 - movs r1, 0x5 - strb r1, [r0] - adds r0, 0x1 - add r1, sp, 0xC - ldrb r1, [r1] - movs r2, 0 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - lsls r4, r7, 24 - lsrs r4, 24 - movs r0, 0x1 - str r0, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0x8] - adds r0, r4, 0 - movs r1, 0x1 - adds r2, r5, 0 - movs r3, 0x3C - bl AddTextPrinterParameterized - adds r0, r4, 0 - movs r1, 0x2 - bl CopyWindowToVram - add sp, 0x10 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D0FF0 - - thumb_func_start sub_81D10A4 -sub_81D10A4: @ 81D10A4 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gUnknown_08624BE8 - bl AddWindow - strh r0, [r4, 0xC] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x11 - bl FillWindowPixelBuffer - ldrb r0, [r4, 0xC] - bl PutWindowTilemap - adds r0, r4, 0 - bl sub_81D10D0 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D10A4 - - thumb_func_start sub_81D10D0 -sub_81D10D0: @ 81D10D0 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0xC - mov r8, r0 - bl sub_81D06C4 - adds r4, r0, 0 - adds r4, 0x1 - bl sub_81D06D4 - adds r6, r0, 0 - ldr r5, =gStringVar1 - adds r0, r5, 0 - adds r1, r4, 0 - movs r2, 0x1 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - movs r1, 0xBA - strb r1, [r0] - adds r0, 0x1 - adds r1, r6, 0 - movs r2, 0x1 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - movs r0, 0x1 - adds r1, r5, 0 - movs r2, 0x38 - bl GetStringCenterAlignXOffset - adds r3, r0, 0 - mov r1, r8 - ldrb r0, [r1, 0xC] - lsls r3, 24 - lsrs r3, 24 - movs r1, 0x1 - str r1, [sp] - movs r1, 0xFF - str r1, [sp, 0x4] - movs r1, 0 - str r1, [sp, 0x8] - movs r1, 0x1 - adds r2, r5, 0 - bl AddTextPrinterParameterized - mov r1, r8 - ldrb r0, [r1, 0xC] - movs r1, 0x2 - bl CopyWindowToVram - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D10D0 - - thumb_func_start sub_81D1148 -sub_81D1148: @ 81D1148 - push {r4,lr} - sub sp, 0xC - adds r4, r0, 0 - add r1, sp, 0x4 - add r2, sp, 0x8 - mov r0, sp - bl sub_81D0760 - bl ResetAllPicSprites - movs r0, 0x28 - movs r1, 0x68 - bl sub_81D1184 - strh r0, [r4, 0x10] - movs r0, 0xF - movs r1, 0 - bl sub_81C7990 - add sp, 0xC - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81D1148 - - thumb_func_start sub_81D1178 -sub_81D1178: @ 81D1178 - push {lr} - ldrh r0, [r0, 0x10] - bl FreeAndDestroyMonPicSprite - pop {r0} - bx r0 - thumb_func_end sub_81D1178 - - thumb_func_start sub_81D1184 -sub_81D1184: @ 81D1184 - push {lr} - sub sp, 0x1C - add r1, sp, 0x14 - add r2, sp, 0x18 - add r0, sp, 0x10 - bl sub_81D0760 - add r0, sp, 0x10 - ldrh r0, [r0] - ldr r1, [sp, 0x18] - ldr r2, [sp, 0x14] - movs r3, 0x28 - str r3, [sp] - movs r3, 0x68 - str r3, [sp, 0x4] - movs r3, 0xF - str r3, [sp, 0x8] - ldr r3, =0x0000ffff - str r3, [sp, 0xC] - movs r3, 0x1 - bl CreateMonPicSprite_HandleDeoxys - lsls r0, 16 - lsrs r0, 16 - ldr r1, =gSprites - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r1 - ldrb r3, [r2, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r3 - strb r1, [r2, 0x5] - add sp, 0x1C - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D1184 - - thumb_func_start sub_81D11D8 -sub_81D11D8: @ 81D11D8 - push {lr} - ldrh r1, [r0, 0x10] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - movs r2, 0x20 - negs r2, r2 - movs r1, 0x28 - movs r3, 0x6 - bl sub_81D1258 - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D11D8 - - thumb_func_start sub_81D11FC -sub_81D11FC: @ 81D11FC - push {r4,r5,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x10] - bl FreeAndDestroyMonPicSprite - movs r5, 0x20 - negs r5, r5 - adds r0, r5, 0 - movs r1, 0x68 - bl sub_81D1184 - strh r0, [r4, 0x10] - ldrh r1, [r4, 0x10] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - adds r1, r5, 0 - movs r2, 0x28 - movs r3, 0x6 - bl sub_81D1258 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D11FC - - thumb_func_start sub_81D1234 -sub_81D1234: @ 81D1234 - ldr r2, =gSprites - ldrh r1, [r0, 0x10] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r2, 0x1C - adds r0, r2 - ldr r1, [r0] - ldr r0, =SpriteCallbackDummy - eors r1, r0 - negs r0, r1 - orrs r0, r1 - lsrs r0, 31 - bx lr - .pool - thumb_func_end sub_81D1234 - - thumb_func_start sub_81D1258 -sub_81D1258: @ 81D1258 - push {r4-r6,lr} - adds r4, r0, 0 - adds r6, r2, 0 - adds r5, r3, 0 - subs r0, r6, r1 - strh r1, [r4, 0x20] - lsls r1, 4 - strh r1, [r4, 0x2E] - lsls r0, 4 - adds r1, r5, 0 - bl __udivsi3 - strh r0, [r4, 0x30] - strh r5, [r4, 0x32] - strh r6, [r4, 0x34] - ldr r0, =sub_81D1284 - str r0, [r4, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1258 - - thumb_func_start sub_81D1284 -sub_81D1284: @ 81D1284 - push {lr} - adds r2, r0, 0 - ldrh r1, [r2, 0x32] - movs r3, 0x32 - ldrsh r0, [r2, r3] - cmp r0, 0 - beq _081D12C8 - subs r0, r1, 0x1 - strh r0, [r2, 0x32] - ldrh r0, [r2, 0x30] - ldrh r1, [r2, 0x2E] - adds r0, r1 - strh r0, [r2, 0x2E] - lsls r0, 16 - asrs r0, 20 - strh r0, [r2, 0x20] - movs r1, 0x20 - negs r1, r1 - cmp r0, r1 - bgt _081D12BA - adds r0, r2, 0 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - b _081D12D0 -_081D12BA: - adds r2, 0x3E - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - b _081D12D0 -_081D12C8: - ldrh r0, [r2, 0x34] - strh r0, [r2, 0x20] - ldr r0, =SpriteCallbackDummy - str r0, [r2, 0x1C] -_081D12D0: - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1284 - - thumb_func_start sub_81D12D8 -sub_81D12D8: @ 81D12D8 - push {r4-r6,lr} - bl sub_81D1350 - ldr r5, =gUnknown_030012C0 - adds r0, r5, 0 - bl sub_81D0914 - adds r6, r0, 0 - ldr r2, =gUnknown_030012C4 - movs r1, 0 - str r1, [r2] - ldr r0, [r5] - cmp r1, r0 - bcs _081D130A - adds r4, r2, 0 -_081D12F6: - ldr r0, [r4] - ldm r6!, {r1} - bl sub_81D1370 - ldr r1, [r4] - adds r1, 0x1 - str r1, [r4] - ldr r0, [r5] - cmp r1, r0 - bcc _081D12F6 -_081D130A: - ldr r4, =gUnknown_030012C0 - adds r0, r4, 0 - bl sub_81D092C - adds r6, r0, 0 - ldr r2, =gUnknown_030012C4 - movs r1, 0 - str r1, [r2] - ldr r0, [r4] - cmp r1, r0 - bcs _081D133A - adds r4, r2, 0 -_081D1322: - ldr r0, [r4] - adds r0, 0x1B - ldm r6!, {r1} - bl sub_81D1370 - ldr r1, [r4] - adds r1, 0x1 - str r1, [r4] - ldr r0, =gUnknown_030012C0 - ldr r0, [r0] - cmp r1, r0 - bcc _081D1322 -_081D133A: - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D12D8 - - thumb_func_start sub_81D1350 -sub_81D1350: @ 81D1350 - push {lr} - sub sp, 0x8 - movs r0, 0x20 - str r0, [sp] - movs r0, 0x14 - str r0, [sp, 0x4] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - add sp, 0x8 - pop {r0} - bx r0 - thumb_func_end sub_81D1350 - - thumb_func_start sub_81D1370 -sub_81D1370: @ 81D1370 - push {r4-r6,lr} - sub sp, 0x10 - adds r4, r0, 0 - adds r6, r1, 0 - movs r1, 0x9 - bl __umodsi3 - adds r5, r0, 0 - lsls r5, 1 - adds r5, 0xB - adds r0, r4, 0 - movs r1, 0x9 - bl __udivsi3 - adds r4, r0, 0 - lsls r4, 1 - adds r4, 0x4 - add r0, sp, 0x8 - adds r1, r6, 0 - bl sub_81D13BC - lsls r5, 24 - lsrs r5, 24 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x2 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0x1 - add r1, sp, 0x8 - adds r2, r5, 0 - adds r3, r4, 0 - bl CopyToBgTilemapBufferRect - add sp, 0x10 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_81D1370 - - thumb_func_start sub_81D13BC -sub_81D13BC: @ 81D13BC - push {r4,r5,lr} - ldr r2, =gUnknown_08624BF8 - lsls r1, 2 - adds r1, r2 - ldrh r3, [r1, 0x2] - adds r3, 0x2 - lsls r3, 16 - ldrh r1, [r1] - lsls r1, 1 - adds r1, 0x1 - lsls r1, 16 - lsrs r1, 16 - lsrs r3, 4 - adds r2, r1, 0 - orrs r2, r3 - strh r2, [r0] - movs r5, 0x80 - lsls r5, 3 - adds r4, r5, 0 - orrs r2, r4 - strh r2, [r0, 0x2] - adds r1, 0x1 - orrs r1, r3 - strh r1, [r0, 0x4] - orrs r1, r4 - strh r1, [r0, 0x6] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D13BC - - thumb_func_start sub_81D13FC -sub_81D13FC: @ 81D13FC - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gUnknown_08624C78 - bl LoadCompressedSpriteSheet - ldr r0, =gUnknown_08624C80 - bl Pokenav_AllocAndLoadPalettes - ldr r0, =gUnknown_08624D04 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r0, =gSprites - adds r1, r0 - str r1, [r4, 0x14] - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D13FC - - thumb_func_start sub_81D1448 -sub_81D1448: @ 81D1448 - push {r4-r6,lr} - mov r6, r8 - push {r6} - adds r6, r0, 0 - bl sub_81D0944 - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r4, 0 - movs r1, 0x9 - bl __modsi3 - adds r5, r0, 0 - lsls r5, 4 - adds r5, 0x60 - adds r0, r4, 0 - movs r1, 0x9 - bl __divsi3 - lsls r0, 4 - adds r0, 0x28 - ldr r1, [r6, 0x14] - movs r2, 0 - mov r8, r2 - strh r5, [r1, 0x20] - ldr r1, [r6, 0x14] - strh r0, [r1, 0x22] - bl sub_81D0954 - adds r4, r0, 0 - movs r0, 0x9 - bl GetSpriteTileStartByTag - ldr r3, [r6, 0x14] - ldr r1, =gUnknown_08624BF8 - lsls r4, 2 - adds r4, r1 - ldrh r1, [r4] - lsls r1, 4 - adds r0, r1 - ldr r2, =0x000003ff - adds r1, r2, 0 - ands r0, r1 - ldrh r2, [r3, 0x4] - ldr r1, =0xfffffc00 - ands r1, r2 - orrs r1, r0 - strh r1, [r3, 0x4] - ldrh r0, [r4, 0x2] - adds r0, 0xF - lsls r0, 16 - lsrs r0, 16 - bl IndexOfSpritePaletteTag - ldr r3, [r6, 0x14] - lsls r0, 4 - ldrb r2, [r3, 0x5] - movs r1, 0xF - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0x5] - ldr r0, [r6, 0x14] - movs r1, 0x1 - bl StartSpriteAffineAnim - ldr r1, [r6, 0x14] - adds r1, 0x3E - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - ldr r0, [r6, 0x14] - mov r1, r8 - strh r1, [r0, 0x2E] - ldr r1, [r6, 0x14] - ldr r0, =sub_81D1538 - str r0, [r1, 0x1C] - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1448 - - thumb_func_start sub_81D1500 -sub_81D1500: @ 81D1500 - push {r4,lr} - adds r4, r0, 0 - ldr r1, [r4, 0x14] - movs r0, 0x1 - strh r0, [r1, 0x2E] - ldr r0, [r4, 0x14] - movs r1, 0x2 - bl StartSpriteAffineAnim - ldr r1, [r4, 0x14] - ldr r0, =sub_81D1538 - str r0, [r1, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1500 - - thumb_func_start sub_81D1524 -sub_81D1524: @ 81D1524 - ldr r0, [r0, 0x14] - ldr r1, [r0, 0x1C] - ldr r0, =SpriteCallbackDummy - eors r1, r0 - negs r0, r1 - orrs r0, r1 - lsrs r0, 31 - bx lr - .pool - thumb_func_end sub_81D1524 - - thumb_func_start sub_81D1538 -sub_81D1538: @ 81D1538 - push {lr} - adds r3, r0, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _081D156A - movs r0, 0x3E - adds r0, r3 - mov r12, r0 - movs r0, 0x1 - ldrh r1, [r3, 0x2E] - ands r1, r0 - lsls r1, 2 - mov r0, r12 - ldrb r2, [r0] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - mov r1, r12 - strb r0, [r1] - ldr r0, =SpriteCallbackDummy - str r0, [r3, 0x1C] -_081D156A: - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1538 .align 2, 0 @ Don't pad with nop. diff --git a/asm/pokenav_unk_2.s b/asm/pokenav_unk_2.s index fd076973c..89a8bde9e 100644 --- a/asm/pokenav_unk_2.s +++ b/asm/pokenav_unk_2.s @@ -5,44 +5,6 @@ @ File centered around AllocSubstruct(2) - thumb_func_start sub_81C98D4 -sub_81C98D4: @ 81C98D4 - push {r4,lr} - movs r4, 0 -_081C98D8: - adds r0, r4, 0 - bl sub_81CB0C8 - ldr r1, =gMapHeader - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r1, 0x14] - cmp r0, r1 - bne _081C9914 - adds r0, r4, 0 - bl sub_81CAE08 - cmp r0, 0 - beq _081C9914 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x000009ca - adds r0, r1 - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0 - beq _081C9914 - movs r0, 0x1 - b _081C991C - .pool -_081C9914: - adds r4, 0x1 - cmp r4, 0x4D - ble _081C98D8 - movs r0, 0 -_081C991C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81C98D4 thumb_func_start sub_81C9924 sub_81C9924: @ 81C9924 diff --git a/data/event_scripts.s b/data/event_scripts.s index bf32eae83..b8e23bbb5 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -848,86 +848,86 @@ Std_MsgboxAutoclose:: @ 8271494 return EventScript_ResetAllBerries:: @ 827149D - setberrytree 2, 7, 5 - setberrytree 1, 3, 5 - setberrytree 11, 7, 5 - setberrytree 13, 3, 5 - setberrytree 4, 7, 5 - setberrytree 76, 1, 5 - setberrytree 8, 1, 5 - setberrytree 10, 6, 5 - setberrytree 25, 20, 5 - setberrytree 26, 2, 5 - setberrytree 66, 2, 5 - setberrytree 67, 20, 5 - setberrytree 69, 22, 5 - setberrytree 70, 22, 5 - setberrytree 71, 22, 5 - setberrytree 55, 17, 5 - setberrytree 56, 17, 5 - setberrytree 5, 1, 5 - setberrytree 6, 6, 5 - setberrytree 7, 1, 5 - setberrytree 16, 18, 5 - setberrytree 17, 18, 5 - setberrytree 18, 18, 5 - setberrytree 29, 19, 5 - setberrytree 28, 19, 5 - setberrytree 27, 19, 5 - setberrytree 24, 4, 5 - setberrytree 23, 3, 5 - setberrytree 22, 3, 5 - setberrytree 21, 4, 5 - setberrytree 19, 16, 5 - setberrytree 20, 16, 5 - setberrytree 80, 7, 5 - setberrytree 81, 7, 5 - setberrytree 77, 8, 5 - setberrytree 78, 8, 5 - setberrytree 68, 8, 5 - setberrytree 31, 10, 5 - setberrytree 33, 10, 5 - setberrytree 34, 21, 5 - setberrytree 35, 21, 5 - setberrytree 36, 21, 5 - setberrytree 83, 24, 5 - setberrytree 84, 24, 5 - setberrytree 85, 10, 5 - setberrytree 86, 6, 5 - setberrytree 37, 5, 5 - setberrytree 38, 5, 5 - setberrytree 39, 5, 5 - setberrytree 40, 3, 5 - setberrytree 41, 3, 5 - setberrytree 42, 3, 5 - setberrytree 46, 19, 5 - setberrytree 45, 20, 5 - setberrytree 44, 18, 5 - setberrytree 43, 16, 5 - setberrytree 47, 8, 5 - setberrytree 48, 5, 5 - setberrytree 49, 4, 5 - setberrytree 50, 2, 5 - setberrytree 52, 18, 5 - setberrytree 53, 18, 5 - setberrytree 62, 6, 5 - setberrytree 64, 6, 5 - setberrytree 58, 21, 5 - setberrytree 59, 21, 5 - setberrytree 60, 25, 5 - setberrytree 61, 25, 5 - setberrytree 79, 23, 5 - setberrytree 14, 23, 5 - setberrytree 15, 21, 5 - setberrytree 30, 21, 5 - setberrytree 65, 25, 5 - setberrytree 72, 25, 5 - setberrytree 73, 23, 5 - setberrytree 74, 23, 5 - setberrytree 87, 3, 5 - setberrytree 88, 10, 5 - setberrytree 89, 4, 5 - setberrytree 82, 36, 5 + setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5 + setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5 + setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5 + setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5 + setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5 + setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5 + setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5 + setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5 + setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5 + setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5 + setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5 + setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5 + setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5 + setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5 + setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5 + setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), 5 + setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), 5 + setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5 + setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5 + setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5 + setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5 + setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5 + setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5 + setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5 + setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5 + setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5 + setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5 + setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5 + setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5 + setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5 + setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5 + setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5 + setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5 + setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5 + setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5 + setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5 + setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5 + setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5 + setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5 + setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5 + setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5 + setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5 + setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), 5 + setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), 5 + setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5 + setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5 + setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5 + setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5 + setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5 + setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5 + setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5 + setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5 + setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5 + setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5 + setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5 + setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5 + setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5 + setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5 + setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5 + setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5 + setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5 + setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5 + setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5 + setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5 + setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5 + setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5 + setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5 + setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5 + setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5 + setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5 + setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5 + setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5 + setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5 + setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5 + setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5 + setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5 + setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5 + setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5 + setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5 + setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), 5 return EventScript_ResetAllMapFlags:: @ 82715DE diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index e50ad9f0a..96e9f86f5 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -595,76 +595,76 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F return BattleFrontier_BattleDomeBattleRoom_EventScript_24C530:: @ 824C530 - createvobject 46, 1, 3, 0, 3, 1 - createvobject 22, 4, 6, 0, 3, 1 - createvobject 5, 6, 8, 0, 3, 1 - createvobject 12, 9, 11, 0, 3, 1 - createvobject 46, 11, 13, 0, 3, 1 - createvobject 66, 13, 15, 0, 3, 1 - createvobject 45, 19, 7, 1, 3, 1 - createvobject 34, 22, 11, 1, 3, 1 - createvobject 11, 25, 15, 1, 3, 1 - createvobject 35, 26, 2, 2, 3, 1 - createvobject 38, 29, 5, 1, 3, 1 + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, 1 + createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, 1 + createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, 1 + createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, 1 + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, 1 + createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, 1 + createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, 1 + createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, 1 + createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, 1 + createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, 1 + createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, 1 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C594:: @ 824C594 - createvobject 46, 1, 3, 0, 3, 1 - createvobject 22, 4, 6, 0, 3, 1 - createvobject 5, 6, 8, 0, 3, 1 - createvobject 20, 7, 9, 0, 3, 1 - createvobject 12, 9, 11, 0, 3, 1 - createvobject 47, 10, 12, 0, 3, 1 - createvobject 46, 11, 13, 0, 3, 1 - createvobject 66, 13, 15, 0, 3, 1 - createvobject 48, 15, 2, 1, 3, 1 - createvobject 5, 16, 3, 1, 3, 1 - createvobject 20, 17, 4, 1, 3, 1 - createvobject 45, 19, 7, 1, 3, 1 - createvobject 22, 20, 9, 1, 3, 1 - createvobject 34, 22, 11, 1, 3, 1 - createvobject 46, 23, 13, 1, 3, 1 - createvobject 11, 25, 15, 1, 3, 1 - createvobject 35, 26, 2, 2, 3, 1 - createvobject 40, 28, 5, 2, 3, 1 - createvobject 38, 29, 5, 1, 3, 1 - createvobject 83, 30, 6, 2, 3, 1 - createvobject 34, 31, 8, 2, 3, 1 + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, 1 + createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, 1 + createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, 1 + createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, 1 + createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, 1 + createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, 1 + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, 1 + createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, 1 + createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, 1 + createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, 1 + createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, 1 + createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, 1 + createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, 1 + createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, 1 + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, 1 + createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, 1 + createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, 1 + createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, 1 + createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, 1 + createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, 1 + createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, 1 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652 - createvobject 5, 0, 2, 0, 3, 1 - createvobject 46, 1, 3, 0, 3, 1 - createvobject 45, 2, 15, 0, 3, 1 - createvobject 66, 3, 5, 0, 3, 1 - createvobject 22, 4, 6, 0, 3, 1 - createvobject 46, 5, 7, 0, 3, 1 - createvobject 5, 6, 8, 0, 3, 1 - createvobject 20, 7, 9, 0, 3, 1 - createvobject 24, 8, 10, 0, 3, 1 - createvobject 12, 9, 11, 0, 3, 1 - createvobject 47, 10, 12, 0, 3, 1 - createvobject 46, 11, 13, 0, 3, 1 - createvobject 45, 12, 14, 0, 3, 1 - createvobject 66, 13, 15, 2, 3, 1 - createvobject 55, 14, 12, 2, 3, 1 - createvobject 48, 15, 2, 1, 3, 1 - createvobject 5, 16, 3, 1, 3, 1 - createvobject 20, 17, 4, 1, 3, 1 - createvobject 24, 18, 6, 1, 3, 1 - createvobject 45, 19, 7, 1, 3, 1 - createvobject 22, 20, 9, 1, 3, 1 - createvobject 23, 21, 10, 1, 3, 1 - createvobject 34, 22, 11, 1, 3, 1 - createvobject 46, 23, 13, 1, 3, 1 - createvobject 48, 24, 14, 1, 3, 1 - createvobject 11, 25, 15, 1, 3, 1 - createvobject 35, 26, 2, 2, 3, 1 - createvobject 17, 27, 3, 2, 3, 1 - createvobject 40, 28, 5, 2, 3, 1 - createvobject 38, 29, 5, 1, 3, 1 - createvobject 83, 30, 6, 2, 3, 1 - createvobject 34, 31, 8, 2, 3, 1 + createvobject EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 0, 3, 1 + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, 1 + createvobject EVENT_OBJ_GFX_BEAUTY, 2, 15, 0, 3, 1 + createvobject EVENT_OBJ_GFX_MAN_5, 3, 5, 0, 3, 1 + createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, 1 + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 5, 7, 0, 3, 1 + createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, 1 + createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, 1 + createvobject EVENT_OBJ_GFX_WOMAN_3, 8, 10, 0, 3, 1 + createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, 1 + createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, 1 + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, 1 + createvobject EVENT_OBJ_GFX_BEAUTY, 12, 14, 0, 3, 1 + createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 2, 3, 1 + createvobject EVENT_OBJ_GFX_HIKER, 14, 12, 2, 3, 1 + createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, 1 + createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, 1 + createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, 1 + createvobject EVENT_OBJ_GFX_WOMAN_3, 18, 6, 1, 3, 1 + createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, 1 + createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, 1 + createvobject EVENT_OBJ_GFX_MAN_2, 21, 10, 1, 3, 1 + createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, 1 + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, 1 + createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 14, 1, 3, 1 + createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, 1 + createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, 1 + createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 3, 2, 3, 1 + createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, 1 + createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, 1 + createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, 1 + createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, 1 return BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773 diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index 8b753471a..e0cd24eff 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -312,97 +312,97 @@ LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B return LinkContestRoom1_EventScript_23BB78:: @ 823BB78 - createvobject 5, 20, 3, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 + createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, 1 + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1 return LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 46, 3, 2, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 12, 13, 12, 8, 3, 3 - createvobject 47, 20, 3, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 + createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4 + createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4 + createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4 + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, 4 + createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3 + createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3 + createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3 + createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, 3 + createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, 1 + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1 return LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6 - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 48, 3, 2, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 45, 13, 12, 8, 3, 3 - createvobject 22, 20, 3, 2, 3, 1 - createvobject 23, 20, 6, 2, 3, 1 - createvobject 34, 20, 7, 2, 3, 1 - createvobject 46, 24, 8, 2, 3, 1 - createvobject 48, 24, 11, 2, 3, 1 - createvobject 11, 25, 3, 9, 3, 2 - createvobject 35, 26, 4, 9, 3, 2 - createvobject 17, 27, 5, 9, 3, 2 - createvobject 40, 28, 9, 9, 3, 2 - createvobject 38, 29, 10, 9, 3, 2 - createvobject 83, 30, 11, 9, 3, 2 + createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4 + createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4 + createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4 + createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, 4 + createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3 + createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3 + createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3 + createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, 3 + createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, 1 + createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, 1 + createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, 1 + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, 1 + createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, 1 + createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, 2 + createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, 2 + createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, 2 + createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, 2 + createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, 2 + createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, 2 return LinkContestRoom1_EventScript_23BC92:: @ 823BC92 - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 12, 3, 2, 8, 3, 4 - createvobject 39, 4, 1, 3, 3, 4 - createvobject 34, 6, 1, 5, 3, 4 - createvobject 26, 7, 1, 6, 3, 4 - createvobject 48, 9, 1, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 45, 13, 12, 8, 3, 3 - createvobject 50, 14, 13, 3, 3, 3 - createvobject 52, 15, 13, 4, 3, 3 - createvobject 65, 17, 13, 6, 3, 3 - createvobject 83, 18, 13, 7, 3, 3 - createvobject 116, 19, 13, 8, 3, 3 - createvobject 25, 20, 3, 2, 3, 1 - createvobject 31, 21, 6, 2, 3, 1 - createvobject 33, 22, 7, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 - createvobject 49, 25, 3, 9, 3, 2 - createvobject 35, 26, 4, 9, 3, 2 - createvobject 48, 27, 5, 9, 3, 2 - createvobject 40, 28, 9, 9, 3, 2 - createvobject 38, 29, 10, 9, 3, 2 - createvobject 83, 30, 11, 9, 3, 2 + createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4 + createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4 + createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4 + createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, 4 + createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, 4 + createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, 4 + createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, 4 + createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, 4 + createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3 + createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3 + createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3 + createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, 3 + createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, 3 + createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, 3 + createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, 3 + createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, 3 + createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, 3 + createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, 1 + createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, 1 + createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, 1 + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1 + createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, 2 + createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, 2 + createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, 2 + createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, 2 + createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, 2 + createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, 2 return LinkContestRoom1_EventScript_23BD86:: @ 823BD86 - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 12, 3, 2, 8, 3, 4 - createvobject 39, 4, 1, 3, 3, 4 - createvobject 34, 6, 1, 5, 3, 4 - createvobject 26, 7, 1, 6, 3, 4 - createvobject 48, 9, 1, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 45, 13, 12, 8, 3, 3 - createvobject 50, 14, 13, 3, 3, 3 - createvobject 52, 15, 13, 4, 3, 3 - createvobject 65, 17, 13, 6, 3, 3 - createvobject 83, 18, 13, 7, 3, 3 - createvobject 116, 19, 13, 8, 3, 3 - createvobject 25, 20, 3, 2, 3, 1 - createvobject 31, 21, 6, 2, 3, 1 - createvobject 33, 22, 7, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 + createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4 + createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4 + createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4 + createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, 4 + createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, 4 + createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, 4 + createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, 4 + createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, 4 + createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3 + createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3 + createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3 + createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, 3 + createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, 3 + createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, 3 + createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, 3 + createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, 3 + createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, 3 + createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, 1 + createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, 1 + createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, 1 + createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1 return LinkContestRoom1_EventScript_23BE44:: @ 823BE44 diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 297c58a30..ff317c943 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -25,7 +25,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_2049F1", - "flag": "FLAG_HIDE_PETALYBURG_GYM_NORMAN" + "flag": "FLAG_HIDE_PETALBURG_GYM_NORMAN" }, { "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index 155081a1b..0a5808820 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -58,7 +58,7 @@ SlateportCity_House1_EventScript_209B50:: @ 8209B50 SlateportCity_House1_EventScript_209B5A:: @ 8209B5A msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT call Common_EventScript_NameReceivedPokemon - specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged + specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicknameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_209B84 diff --git a/data/pokenav.s b/data/pokenav.s index 81ee9024d..2ed2cf9a0 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -1656,110 +1656,3 @@ gUnknown_08624BA0:: @ 8624BA0 .4byte sub_81D0D8C .4byte sub_81D0E00 .4byte sub_81D0C54 - -gUnknown_08624BB8:: @ 8624BB8 - window_template 2, 12, 13, 16, 4, 1, 20 - -gUnknown_08624BC0:: @ 8624BC0 - .byte 4, 2, 3, 0 - -gUnknown_08624BC4:: @ 8624BC4 - window_template 2, 14, 1, 13, 2, 10, 0x54 - -gUnknown_08624BCC:: @ 8624BCC - .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" - .align 2 - -gUnknown_08624BD8:: @ 8624BD8 - .string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_GREEN}{WHITE}{BLUE}♀{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$" - .align 2 - -gUnknown_08624BE4:: @ 8624BE4 - .string "{UNK_SPACER}$" - .align 2 - -gUnknown_08624BE8:: @ 8624BE8 - window_template 2, 1, 5, 7, 2, 1, 0x6E - .4byte NULL - .4byte NULL - -gUnknown_08624BF8:: @ 8624BF8 - .2byte 0, 0, 1, 0 - .2byte 2, 0, 3, 0 - .2byte 4, 0, 1, 1 - .2byte 2, 1, 3, 1 - .2byte 4, 1, 1, 2 - .2byte 2, 2, 3, 2 - .2byte 4, 2, 1, 3 - .2byte 2, 3, 3, 3 - .2byte 4, 3, 1, 4 - .2byte 2, 4, 3, 4 - .2byte 4, 4, 5, 0 - .2byte 6, 0, 7, 1 - .2byte 8, 2, 9, 1 - .2byte 9, 3, 9, 4 - .2byte 10, 3, 10, 4 - .2byte 11, 0, 11, 1 - -gUnknown_08624C78:: @ 8624C78 - obj_tiles gUnknown_08624280, 0x1800, 9 - -gUnknown_08624C80:: @ 8624C80 - obj_pal gUnknown_08623FF8, 15 - obj_pal gUnknown_08624018, 16 - obj_pal gUnknown_08624038, 17 - obj_pal gUnknown_08624058, 18 - obj_pal gUnknown_08624078, 19 - null_obj_pal - -gUnknown_08624CB0:: @ 8624CB0 - .2byte 0x100 - .2byte 0x8000 - .2byte 0x400 - .2byte 0x0 - -gUnknown_08624CB8:: @ 8624CB8 - .2byte 0x80 - .2byte 0x80 - .2byte 0 - .2byte 0 - .2byte 0x7FFF - .2byte 0 - .2byte 0 - .2byte 0 - -gUnknown_08624CC8:: @ 8624CC8 - .2byte 0x80 - .2byte 0x80 - .2byte 0 - .2byte 0 - .2byte 0x20 - .2byte 0x20 - .2byte 0x400 - .2byte 0 - .2byte 0x7FFF - .2byte 0 - .2byte 0 - .2byte 0 - -gUnknown_08624CE0:: @ 8624CE0 - .2byte 0x100 - .2byte 0x100 - .2byte 0 - .2byte 0 - .2byte 0xFFE0 - .2byte 0xFFE0 - .2byte 0x400 - .2byte 0 - .2byte 0x7FFF - .2byte 0 - .2byte 0 - .2byte 0 - -gUnknown_08624CF8:: @ 8624CF8 - .4byte gUnknown_08624CB8 - .4byte gUnknown_08624CC8 - .4byte gUnknown_08624CE0 - -gUnknown_08624D04:: @ 8624D04 - spr_template 9, 15, gUnknown_08624CB0, gDummySpriteAnimTable, NULL, gUnknown_08624CF8, SpriteCallbackDummy diff --git a/data/specials.inc b/data/specials.inc index 7a2b0f975..78a949df5 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -134,7 +134,7 @@ gSpecials:: @ 81DBA64 def_special CompareSeedotSize def_special GetLotadSizeRecordInfo def_special CompareLotadSize - def_special TV_PutNameRaterShowOnTheAirIfNicnkameChanged + def_special TV_PutNameRaterShowOnTheAirIfNicknameChanged def_special TV_CopyNicknameToStringVar1AndEnsureTerminated def_special TV_CheckMonOTIDEqualsPlayerID def_special BufferTrendyPhraseString diff --git a/graphics/unknown/unknown_D9AE04.bin b/graphics/interface/bag_pyramid_tilemap.bin similarity index 100% rename from graphics/unknown/unknown_D9AE04.bin rename to graphics/interface/bag_pyramid_tilemap.bin diff --git a/graphics/unknown/unknown_D9A88C.bin b/graphics/interface/bag_screen_tilemap.bin similarity index 100% rename from graphics/unknown/unknown_D9A88C.bin rename to graphics/interface/bag_screen_tilemap.bin diff --git a/include/constants/flags.h b/include/constants/flags.h index 732c68764..7aa5c3ed3 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -725,7 +725,7 @@ #define FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE 0x301 #define FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE 0x302 #define FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE 0x303 -#define FLAG_HIDE_PETALYBURG_GYM_NORMAN 0x304 +#define FLAG_HIDE_PETALBURG_GYM_NORMAN 0x304 #define FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2 0x305 #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 0x306 #define FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR 0x307 diff --git a/include/constants/trainers.h b/include/constants/trainers.h index 2a6c306b4..c0abfe6b6 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -202,8 +202,8 @@ #define FACILITY_CLASSES_COUNT 0x52 -#define TRAINER_CLASS_PKMN_TRAINER_1 0x0 -#define TRAINER_CLASS_PKMN_TRAINER_2 0x1 +#define TRAINER_CLASS_PKMN_TRAINER_1 0x0 // Unused +#define TRAINER_CLASS_PKMN_TRAINER_2 0x1 // Unused #define TRAINER_CLASS_HIKER 0x2 #define TRAINER_CLASS_TEAM_AQUA 0x3 #define TRAINER_CLASS_PKMN_BREEDER 0x4 @@ -250,7 +250,7 @@ #define TRAINER_CLASS_SWIMMER_F 0x2d #define TRAINER_CLASS_TWINS 0x2e #define TRAINER_CLASS_SAILOR 0x2f -#define TRAINER_CLASS_COOLTRAINER_UNUSED 0x30 +#define TRAINER_CLASS_COOLTRAINER_2 0x30 // Used for only one trainer. #define TRAINER_CLASS_MAGMA_ADMIN 0x31 #define TRAINER_CLASS_PKMN_TRAINER_3 0x32 #define TRAINER_CLASS_BUG_CATCHER 0x33 @@ -267,7 +267,7 @@ #define TRAINER_CLASS_FACTORY_HEAD 0x3e #define TRAINER_CLASS_PIKE_QUEEN 0x3f #define TRAINER_CLASS_PYRAMID_KING 0x40 -#define TRAINER_CLASS_PKMN_TRAINER_4 0x41 +#define TRAINER_CLASS_RS_PROTAG 0x41 #define TRAINER_ENCOUNTER_MUSIC_MALE 0 // standard male encounter music #define TRAINER_ENCOUNTER_MUSIC_FEMALE 1 // standard female encounter music diff --git a/include/graphics.h b/include/graphics.h index 8fa1fafe0..58cc41cea 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3331,10 +3331,10 @@ extern const u32 gPokedexSearch1_Tilemap[]; extern const u16 gPokedexSearchMenu_Pal[]; // berry tag screen -extern const u32 gUnknown_08D9BB44[]; -extern const u32 gUnknown_08D9BF98[]; -extern const u32 gUnknown_08D9C13C[]; -extern const u32 gUnknown_08D9BEF0[]; +extern const u32 gBerryCheck_Gfx[]; +extern const u32 gBerryCheck_Pal[]; +extern const u32 gBerryTag_Gfx[]; +extern const u32 gBerryTag_Pal[]; // rayquaza scene gfx extern const u32 gRaySceneGroudon_Gfx[]; @@ -4405,6 +4405,7 @@ extern const u8 gFireRedMenuElements_Gfx[]; // item menu graphics extern const u32 gBagScreen_Gfx[]; +extern const u32 gBagScreen_GfxTileMap[]; extern const u32 gBagScreenFemale_Pal[]; extern const u32 gBagScreenMale_Pal[]; extern const u8 gBagMenuHMIcon_Gfx[]; @@ -4674,11 +4675,11 @@ extern const u16 gBattleInterface_BallDisplayPal[]; extern const u32 gBagSwapLineGfx[]; extern const u32 gBagSwapLinePal[]; -extern const u32 gUnknown_08D9ADD0[]; -extern const u32 gUnknown_08D9AE04[]; +extern const u32 gBattleFrontierGfx_PyramidBag[]; +extern const u32 gBattleFrontierGfx_PyramidBag_Pal[]; +extern const u32 gBattleFrontierGfx_PyramidBagTileMap[]; extern const u32 gUnknown_08D9AF44[]; extern const u16 gUnknown_0860F074[]; -extern const u32 gBattleFrontierGfx_PyramidBag[]; extern const u32 gTitleScreenEmeraldVersionGfx[]; extern const u32 gTitleScreenPressStartGfx[]; @@ -5344,7 +5345,6 @@ extern const u32 gBattleStatMask6_Pal[]; extern const u32 gBattleStatMask7_Pal[]; extern const u32 gBattleStatMask8_Pal[]; -extern const u32 gUnknown_08D9A88C[]; extern const u32 gContestMiscGfx[]; extern const u32 gContestAudienceGfx[]; extern const u8 gContestApplauseMeterGfx[]; diff --git a/include/item_menu.h b/include/item_menu.h index 70d6b5a94..5580fa4b4 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -29,9 +29,9 @@ struct BagStruct u16 scrollPosition[POCKETS_COUNT]; }; -extern struct BagStruct gUnknown_0203CE58; +extern struct BagStruct gBagPositionStruct; -struct UnkBagStruct +struct BagMenuStruct { void (*mainCallback2)(void); u8 tilemapBuffer[0x800]; @@ -61,7 +61,7 @@ struct UnkBagStruct u8 filler2[4]; }; -extern struct UnkBagStruct *gUnknown_0203CE54; +extern struct BagMenuStruct *gBagMenu; // Exported RAM declarations @@ -85,7 +85,7 @@ void ResetBagScrollPositions(void); void sub_81AABF0(void (*callback)(void)); void CB2_ChooseBerry(void); void unknown_ItemMenu_Confirm(u8 taskId); -void bag_menu_yes_no(u8, u8, const struct YesNoFuncTable*); +void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*); void sub_81AB9A8(u8 pocketId); diff --git a/include/item_menu_icons.h b/include/item_menu_icons.h index aee7599df..50f0d5544 100644 --- a/include/item_menu_icons.h +++ b/include/item_menu_icons.h @@ -1,11 +1,11 @@ #ifndef GUARD_ITEM_MENU_ICONS #define GUARD_ITEM_MENU_ICONS -extern const struct CompressedSpriteSheet gUnknown_0857FB34; -extern const struct CompressedSpriteSheet gUnknown_0857FB3C; -extern const struct CompressedSpritePalette gUnknown_0857FB44; -extern const struct CompressedSpriteSheet gUnknown_0857FDEC; -extern const struct CompressedSpritePalette gUnknown_0857FDF4; +extern const struct CompressedSpriteSheet gBagMaleSpriteSheet; +extern const struct CompressedSpriteSheet gBagFemaleSpriteSheet; +extern const struct CompressedSpritePalette gBagPaletteTable; +extern const struct CompressedSpriteSheet gBerryCheckCircleSpriteSheet; +extern const struct CompressedSpritePalette gBerryCheckCirclePaletteTable; void RemoveBagSprite(u8 id); void AddBagVisualSprite(u8 bagPocketId); @@ -19,7 +19,13 @@ void sub_80D4FC8(u8 arg0); void sub_80D4FEC(u8 arg0); u8 CreateBerryTagSprite(u8 id, s16 x, s16 y); void FreeBerryTagSpritePalette(void); -u8 sub_80D511C(u8 berryId, u8 x, u8 y, bool8 startAffine); +u8 LoadSpinningBerryPicGfx(u8 berryId, u8 x, u8 y, bool8 startAffine); u8 CreateBerryFlavorCircleSprite(s16 x); +#define TAG_BAG_GFX 100 +#define TAG_ROTATING_BALL_GFX 101 +#define TAG_BERRY_CHECK_CIRCLE_GFX 10000 +#define TAG_BERRY_PIC_TILE 0xFFFF +#define TAG_BERRY_PIC_PAL 0x7544 + #endif // GUARD_ITEM_MENU_ICONS diff --git a/include/pokenav.h b/include/pokenav.h index 0d46f04f3..c840fd494 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -125,6 +125,7 @@ void sub_81C7B40(void); struct Sprite *PauseSpinningPokenavSprite(void); void ResumeSpinningPokenavSprite(void); void sub_81C7E14(u32 arg0); +void sub_81C7990(u32 a0, u16 a1); // pokenav_unk_1.c bool32 sub_81C9298(void); @@ -162,7 +163,7 @@ const u8 *sub_81CAFD8(int index, int textType); u16 sub_81CB01C(void); u16 sub_81CB02C(int arg0); void sub_81CB050(u32 arg0, u8 *str); -int sub_81CB0C8(int rematchIndex); +u8 sub_81CB0C8(int rematchIndex); int sub_81CB0E4(int index); bool32 sub_81CAE08(int); int sub_81CB128(int index); diff --git a/ld_script.txt b/ld_script.txt index af0709056..b1c81f6e4 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -305,6 +305,7 @@ SECTIONS { src/pokenav_main_menu.o(.text); src/pokenav_match_call_ui.o(.text); src/pokenav_unk_1.o(.text); + src/pokenav_unk_2.o(.text); asm/pokenav_unk_2.o(.text); src/pokenav_unk_3.o(.text); src/pokenav_unk_4.o(.text); @@ -314,6 +315,7 @@ SECTIONS { asm/pokenav_unk_8.o(.text); asm/pokenav_unk_9.o(.text); asm/pokenav_unk_10.o(.text); + src/pokenav_unk_10.o(.text); src/pokenav_match_call_data.o(.text); src/menu_specialized.o(.text); src/ereader_helpers.o(.text); @@ -636,6 +638,7 @@ SECTIONS { src/pokenav_match_call_ui.o(.rodata); src/pokenav_unk_1.o(.rodata); data/pokenav.o(.rodata); + src/pokenav_unk_10.o(.rodata); src/pokenav_match_call_data.o(.rodata); src/menu_specialized.o(.rodata); data/ereader_helpers.o(.rodata); diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 5b1e2ffeb..f1518ee4b 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -1,2175 +1,2175 @@ .align 2 -DirectSoundWaveData_86B5D04:: @ 86B5D04 - .incbin "sound/direct_sound_samples/86B5D04.bin" +DirectSoundWaveData_sc88_glockenspiel:: + .incbin "sound/direct_sound_samples/sc88_glockenspiel.bin" .align 2 -DirectSoundWaveData_86B63A8:: @ 86B63A8 - .incbin "sound/direct_sound_samples/86B63A8.bin" +DirectSoundWaveData_sc88_organ2:: + .incbin "sound/direct_sound_samples/sc88_organ2.bin" .align 2 -DirectSoundWaveData_86B6BA0:: @ 86B6BA0 - .incbin "sound/direct_sound_samples/86B6BA0.bin" +DirectSoundWaveData_sc88_fretless_bass:: + .incbin "sound/direct_sound_samples/sc88_fretless_bass.bin" .align 2 -DirectSoundWaveData_86B776C:: @ 86B776C - .incbin "sound/direct_sound_samples/86B776C.bin" +DirectSoundWaveData_jv1080_slap_bass:: + .incbin "sound/direct_sound_samples/jv1080_slap_bass.bin" .align 2 -DirectSoundWaveData_86B86A4:: @ 86B86A4 - .incbin "sound/direct_sound_samples/86B86A4.bin" +DirectSoundWaveData_sc88_synth_bass:: + .incbin "sound/direct_sound_samples/sc88_synth_bass.bin" .align 2 -DirectSoundWaveData_86B9318:: @ 86B9318 - .incbin "sound/direct_sound_samples/86B9318.bin" +DirectSoundWaveData_sc88_timpani:: + .incbin "sound/direct_sound_samples/sc88_timpani.bin" .align 2 -DirectSoundWaveData_86BA7E8:: @ 86BA7E8 - .incbin "sound/direct_sound_samples/86BA7E8.bin" +DirectSoundWaveData_advanced_orchestra_voice_ahhs:: + .incbin "sound/direct_sound_samples/advanced_orchestra_voice_ahhs.bin" .align 2 -DirectSoundWaveData_86BBE98:: @ 86BBE98 - .incbin "sound/direct_sound_samples/86BBE98.bin" +DirectSoundWaveData_sd90_classical_oboe:: + .incbin "sound/direct_sound_samples/sd90_classical_oboe.bin" .align 2 -DirectSoundWaveData_86BD1DC:: @ 86BD1DC - .incbin "sound/direct_sound_samples/86BD1DC.bin" +DirectSoundWaveData_unused_sd90_oboe:: + .incbin "sound/direct_sound_samples/unused_sd90_oboe.bin" .align 2 -DirectSoundWaveData_86BDC80:: @ 86BDC80 - .incbin "sound/direct_sound_samples/86BDC80.bin" +DirectSoundWaveData_unused_electric_guitar:: + .incbin "sound/direct_sound_samples/unused_electric_guitar.bin" .align 2 -DirectSoundWaveData_86BEF94:: @ 86BEF94 - .incbin "sound/direct_sound_samples/86BEF94.bin" +DirectSoundWaveData_unused_sc88_unison_slap:: + .incbin "sound/direct_sound_samples/unused_sc88_unison_slap.bin" .align 2 -DirectSoundWaveData_86C2590:: @ 86C2590 - .incbin "sound/direct_sound_samples/86C2590.bin" +DirectSoundWaveData_unknown_snare:: + .incbin "sound/direct_sound_samples/unknown_snare.bin" .align 2 -DirectSoundWaveData_86C2A68:: @ 86C2A68 - .incbin "sound/direct_sound_samples/86C2A68.bin" +DirectSoundWaveData_unknown_wood_block_low:: + .incbin "sound/direct_sound_samples/unknown_wood_block_low.bin" .align 2 -DirectSoundWaveData_86C4344:: @ 86C4344 - .incbin "sound/direct_sound_samples/86C4344.bin" +DirectSoundWaveData_unknown_wood_block_high:: + .incbin "sound/direct_sound_samples/unknown_wood_block_high.bin" .align 2 -DirectSoundWaveData_86C566C:: @ 86C566C - .incbin "sound/direct_sound_samples/86C566C.bin" +DirectSoundWaveData_sc88_standard_kick:: + .incbin "sound/direct_sound_samples/sc88_standard_kick.bin" .align 2 -DirectSoundWaveData_86C5B0C:: @ 86C5B0C - .incbin "sound/direct_sound_samples/86C5B0C.bin" +DirectSoundWaveData_sc88_standard_snare1:: + .incbin "sound/direct_sound_samples/sc88_standard_snare1.bin" .align 2 -DirectSoundWaveData_86C6200:: @ 86C6200 - .incbin "sound/direct_sound_samples/86C6200.bin" +DirectSoundWaveData_sc88_standard_hand_clap:: + .incbin "sound/direct_sound_samples/sc88_standard_hand_clap.bin" .align 2 -DirectSoundWaveData_86C6A90:: @ 86C6A90 - .incbin "sound/direct_sound_samples/86C6A90.bin" +DirectSoundWaveData_sc88_standard_snare2:: + .incbin "sound/direct_sound_samples/sc88_standard_snare2.bin" .align 2 -DirectSoundWaveData_86C7308:: @ 86C7308 - .incbin "sound/direct_sound_samples/86C7308.bin" +DirectSoundWaveData_unknown_tom:: + .incbin "sound/direct_sound_samples/unknown_tom.bin" .align 2 -DirectSoundWaveData_86C8348:: @ 86C8348 - .incbin "sound/direct_sound_samples/86C8348.bin" +DirectSoundWaveData_unknown_close_hihat:: + .incbin "sound/direct_sound_samples/unknown_close_hihat.bin" .align 2 -DirectSoundWaveData_86C875C:: @ 86C875C - .incbin "sound/direct_sound_samples/86C875C.bin" +DirectSoundWaveData_unknown_open_hihat:: + .incbin "sound/direct_sound_samples/unknown_open_hihat.bin" .align 2 -DirectSoundWaveData_86C958C:: @ 86C958C - .incbin "sound/direct_sound_samples/86C958C.bin" +DirectSoundWaveData_unknown_bell:: + .incbin "sound/direct_sound_samples/unknown_bell.bin" .align 2 -DirectSoundWaveData_86CA520:: @ 86CA520 - .incbin "sound/direct_sound_samples/86CA520.bin" +DirectSoundWaveData_unknown_tambourine:: + .incbin "sound/direct_sound_samples/unknown_tambourine.bin" .align 2 -DirectSoundWaveData_86CADD4:: @ 86CADD4 - .incbin "sound/direct_sound_samples/86CADD4.bin" +DirectSoundWaveData_unknown_cymbal_crash:: + .incbin "sound/direct_sound_samples/unknown_cymbal_crash.bin" .align 2 -DirectSoundWaveData_86CB6B8:: @ 86CB6B8 - .incbin "sound/direct_sound_samples/86CB6B8.bin" +DirectSoundWaveData_sc88_standard_cymbal_crash:: + .incbin "sound/direct_sound_samples/sc88_standard_cymbal_crash.bin" .align 2 -DirectSoundWaveData_86CC5E4:: @ 86CC5E4 - .incbin "sound/direct_sound_samples/86CC5E4.bin" +DirectSoundWaveData_sc88_bongo:: + .incbin "sound/direct_sound_samples/sc88_bongo.bin" .align 2 -DirectSoundWaveData_86CCAFC:: @ 86CCAFC - .incbin "sound/direct_sound_samples/86CCAFC.bin" +DirectSoundWaveData_sc88_bongo_low:: + .incbin "sound/direct_sound_samples/sc88_bongo_low.bin" .align 2 -DirectSoundWaveData_86CD0C4:: @ 86CD0C4 - .incbin "sound/direct_sound_samples/86CD0C4.bin" +DirectSoundWaveData_drum_and_percussion_kick:: + .incbin "sound/direct_sound_samples/drum_and_percussion_kick.bin" .align 2 -DirectSoundWaveData_86CDFDC:: @ 86CDFDC - .incbin "sound/direct_sound_samples/86CDFDC.bin" +DirectSoundWaveData_sd90_solo_snare:: + .incbin "sound/direct_sound_samples/sd90_solo_snare.bin" .align 2 -DirectSoundWaveData_86CF950:: @ 86CF950 - .incbin "sound/direct_sound_samples/86CF950.bin" +DirectSoundWaveData_sd90_ambient_tom:: + .incbin "sound/direct_sound_samples/sd90_ambient_tom.bin" .align 2 -DirectSoundWaveData_86D1A2C:: @ 86D1A2C - .incbin "sound/direct_sound_samples/86D1A2C.bin" +DirectSoundWaveData_dance_drums_ride_bell:: + .incbin "sound/direct_sound_samples/dance_drums_ride_bell.bin" .align 2 -DirectSoundWaveData_86D925C:: @ 86D925C - .incbin "sound/direct_sound_samples/86D925C.bin" +DirectSoundWaveData_unknown_cowbell:: + .incbin "sound/direct_sound_samples/unknown_cowbell.bin" .align 2 -DirectSoundWaveData_86D9C14:: @ 86D9C14 - .incbin "sound/direct_sound_samples/86D9C14.bin" +DirectSoundWaveData_unknown_djembe:: + .incbin "sound/direct_sound_samples/unknown_djembe.bin" .align 2 -DirectSoundWaveData_86DAA94:: @ 86DAA94 - .incbin "sound/direct_sound_samples/86DAA94.bin" +DirectSoundWaveData_unknown_anvil_high:: + .incbin "sound/direct_sound_samples/unknown_anvil_high.bin" .align 2 -DirectSoundWaveData_86DB908:: @ 86DB908 - .incbin "sound/direct_sound_samples/86DB908.bin" +DirectSoundWaveData_sc88_standard_bells:: + .incbin "sound/direct_sound_samples/sc88_standard_bells.bin" .align 2 -DirectSoundWaveData_86DD11C:: @ 86DD11C - .incbin "sound/direct_sound_samples/86DD11C.bin" +DirectSoundWaveData_unknown_anvil_low:: + .incbin "sound/direct_sound_samples/unknown_anvil_low.bin" .align 2 -DirectSoundWaveData_86DE6C0:: @ 86DE6C0 - .incbin "sound/direct_sound_samples/86DE6C0.bin" +DirectSoundWaveData_unknown_ethnic_drum:: + .incbin "sound/direct_sound_samples/unknown_ethnic_drum.bin" .align 2 -DirectSoundWaveData_86DFCA4:: @ 86DFCA4 - .incbin "sound/direct_sound_samples/86DFCA4.bin" +DirectSoundWaveData_unknown_tsuzumi:: + .incbin "sound/direct_sound_samples/unknown_tsuzumi.bin" .align 2 -DirectSoundWaveData_86E0D98:: @ 86E0D98 - .incbin "sound/direct_sound_samples/86E0D98.bin" +DirectSoundWaveData_sc88_piano1_48:: + .incbin "sound/direct_sound_samples/sc88_piano1_48.bin" .align 2 -DirectSoundWaveData_86E1CF8:: @ 86E1CF8 - .incbin "sound/direct_sound_samples/86E1CF8.bin" +DirectSoundWaveData_sc88_piano1_60:: + .incbin "sound/direct_sound_samples/sc88_piano1_60.bin" .align 2 -DirectSoundWaveData_86E3358:: @ 86E3358 - .incbin "sound/direct_sound_samples/86E3358.bin" +DirectSoundWaveData_sc88_piano1_72:: + .incbin "sound/direct_sound_samples/sc88_piano1_72.bin" .align 2 -DirectSoundWaveData_86E48B4:: @ 86E48B4 - .incbin "sound/direct_sound_samples/86E48B4.bin" +DirectSoundWaveData_sc88_piano1_84:: + .incbin "sound/direct_sound_samples/sc88_piano1_84.bin" .align 2 -DirectSoundWaveData_86E5440:: @ 86E5440 - .incbin "sound/direct_sound_samples/86E5440.bin" +DirectSoundWaveData_sc88_string_ensemble_60:: + .incbin "sound/direct_sound_samples/sc88_string_ensemble_60.bin" .align 2 -DirectSoundWaveData_86E89E4:: @ 86E89E4 - .incbin "sound/direct_sound_samples/86E89E4.bin" +DirectSoundWaveData_sc88_string_ensemble_72:: + .incbin "sound/direct_sound_samples/sc88_string_ensemble_72.bin" .align 2 -DirectSoundWaveData_86EAD00:: @ 86EAD00 - .incbin "sound/direct_sound_samples/86EAD00.bin" +DirectSoundWaveData_sc88_string_ensemble_84:: + .incbin "sound/direct_sound_samples/sc88_string_ensemble_84.bin" .align 2 -DirectSoundWaveData_86EE3CC:: @ 86EE3CC - .incbin "sound/direct_sound_samples/86EE3CC.bin" +DirectSoundWaveData_sc88_trumpet_60:: + .incbin "sound/direct_sound_samples/sc88_trumpet_60.bin" .align 2 -DirectSoundWaveData_86EF71C:: @ 86EF71C - .incbin "sound/direct_sound_samples/86EF71C.bin" +DirectSoundWaveData_sc88_trumpet_72:: + .incbin "sound/direct_sound_samples/sc88_trumpet_72.bin" .align 2 -DirectSoundWaveData_86F0C2C:: @ 86F0C2C - .incbin "sound/direct_sound_samples/86F0C2C.bin" +DirectSoundWaveData_sc88_trumpet_84:: + .incbin "sound/direct_sound_samples/sc88_trumpet_84.bin" .align 2 -DirectSoundWaveData_86F204C:: @ 86F204C - .incbin "sound/direct_sound_samples/86F204C.bin" +DirectSoundWaveData_unknown_trombone_39:: + .incbin "sound/direct_sound_samples/unknown_trombone_39.bin" .align 2 -DirectSoundWaveData_86F30E8:: @ 86F30E8 - .incbin "sound/direct_sound_samples/86F30E8.bin" +DirectSoundWaveData_unknown_trombone_51:: + .incbin "sound/direct_sound_samples/unknown_trombone_51.bin" .align 2 -DirectSoundWaveData_86F4144:: @ 86F4144 - .incbin "sound/direct_sound_samples/86F4144.bin" +DirectSoundWaveData_sc88_french_horn_60:: + .incbin "sound/direct_sound_samples/sc88_french_horn_60.bin" .align 2 -DirectSoundWaveData_86FB0D8:: @ 86FB0D8 - .incbin "sound/direct_sound_samples/86FB0D8.bin" +DirectSoundWaveData_sc88_french_horn_72:: + .incbin "sound/direct_sound_samples/sc88_french_horn_72.bin" .align 2 -DirectSoundWaveData_86FF65C:: @ 86FF65C - .incbin "sound/direct_sound_samples/86FF65C.bin" +DirectSoundWaveData_sc88_flute:: + .incbin "sound/direct_sound_samples/sc88_flute.bin" .align 2 -DirectSoundWaveData_86FFDC0:: @ 86FFDC0 - .incbin "sound/direct_sound_samples/86FFDC0.bin" +DirectSoundWaveData_sc88_pick_bass:: + .incbin "sound/direct_sound_samples/sc88_pick_bass.bin" .align 2 -DirectSoundWaveData_8701A10:: @ 8701A10 - .incbin "sound/direct_sound_samples/8701A10.bin" +DirectSoundWaveData_unknown_koto_high:: + .incbin "sound/direct_sound_samples/unknown_koto_high.bin" .align 2 -DirectSoundWaveData_8703214:: @ 8703214 - .incbin "sound/direct_sound_samples/8703214.bin" +DirectSoundWaveData_sd90_classical_shakuhachi:: + .incbin "sound/direct_sound_samples/sd90_classical_shakuhachi.bin" .align 2 -DirectSoundWaveData_8706DCC:: @ 8706DCC - .incbin "sound/direct_sound_samples/8706DCC.bin" +DirectSoundWaveData_unknown_koto_low:: + .incbin "sound/direct_sound_samples/unknown_koto_low.bin" .align 2 -DirectSoundWaveData_8709004:: @ 8709004 - .incbin "sound/direct_sound_samples/8709004.bin" +DirectSoundWaveData_sd90_classical_overdrive_guitar:: + .incbin "sound/direct_sound_samples/sd90_classical_overdrive_guitar.bin" .align 2 -DirectSoundWaveData_870AE74:: @ 870AE74 - .incbin "sound/direct_sound_samples/870AE74.bin" +DirectSoundWaveData_sd90_classical_distortion_guitar_high:: + .incbin "sound/direct_sound_samples/sd90_classical_distortion_guitar_high.bin" .align 2 -DirectSoundWaveData_870DE64:: @ 870DE64 - .incbin "sound/direct_sound_samples/870DE64.bin" +DirectSoundWaveData_sd90_classical_distortion_guitar_low:: + .incbin "sound/direct_sound_samples/sd90_classical_distortion_guitar_low.bin" .align 2 -DirectSoundWaveData_8710AB8:: @ 8710AB8 - .incbin "sound/direct_sound_samples/8710AB8.bin" +DirectSoundWaveData_heart_of_asia_gamelan:: + .incbin "sound/direct_sound_samples/heart_of_asia_gamelan.bin" .align 2 -DirectSoundWaveData_8715038:: @ 8715038 - .incbin "sound/direct_sound_samples/8715038.bin" +DirectSoundWaveData_unknown_church_organ:: + .incbin "sound/direct_sound_samples/unknown_church_organ.bin" .align 2 -DirectSoundWaveData_8717980:: @ 8717980 - .incbin "sound/direct_sound_samples/8717980.bin" +DirectSoundWaveData_emu_ii_pipe_organ:: + .incbin "sound/direct_sound_samples/emu_ii_pipe_organ.bin" .align 2 -DirectSoundWaveData_87190E0:: @ 87190E0 - .incbin "sound/direct_sound_samples/87190E0.bin" +DirectSoundWaveData_unused_unknown_female_voice:: + .incbin "sound/direct_sound_samples/unused_unknown_female_voice.bin" .align 2 -DirectSoundWaveData_871A724:: @ 871A724 - .incbin "sound/direct_sound_samples/871A724.bin" +DirectSoundWaveData_unused_unknown_male_voice:: + .incbin "sound/direct_sound_samples/unused_unknown_male_voice.bin" .align 2 -DirectSoundWaveData_871CBCC:: @ 871CBCC - .incbin "sound/direct_sound_samples/871CBCC.bin" +DirectSoundWaveData_unknown_e_piano_low:: + .incbin "sound/direct_sound_samples/unknown_e_piano_low.bin" .align 2 -DirectSoundWaveData_871F234:: @ 871F234 - .incbin "sound/direct_sound_samples/871F234.bin" +DirectSoundWaveData_unknown_e_piano_high:: + .incbin "sound/direct_sound_samples/unknown_e_piano_high.bin" .align 2 -DirectSoundWaveData_87205DC:: @ 87205DC - .incbin "sound/direct_sound_samples/87205DC.bin" +DirectSoundWaveData_sc88_timpani_with_snare:: + .incbin "sound/direct_sound_samples/sc88_timpani_with_snare.bin" .align 2 -DirectSoundWaveData_8721AAC:: @ 8721AAC - .incbin "sound/direct_sound_samples/8721AAC.bin" +DirectSoundWaveData_unknown_synth_snare:: + .incbin "sound/direct_sound_samples/unknown_synth_snare.bin" .align 2 -DirectSoundWaveData_87224B8:: @ 87224B8 - .incbin "sound/direct_sound_samples/87224B8.bin" +DirectSoundWaveData_unused_sc88_square:: + .incbin "sound/direct_sound_samples/unused_sc88_square.bin" .align 2 -DirectSoundWaveData_87240CC:: @ 87240CC - .incbin "sound/direct_sound_samples/87240CC.bin" +DirectSoundWaveData_bicycle_bell:: + .incbin "sound/direct_sound_samples/bicycle_bell.bin" .align 2 -DirectSoundWaveData_8725A2C:: @ 8725A2C +DirectSoundWaveData_8725A2C:: .incbin "sound/direct_sound_samples/8725A2C.bin" .align 2 -DirectSoundWaveData_8726EF0:: @ 8726EF0 - .incbin "sound/direct_sound_samples/8726EF0.bin" +DirectSoundWaveData_sc88_pizzicato_strings:: + .incbin "sound/direct_sound_samples/sc88_pizzicato_strings.bin" .align 2 -DirectSoundWaveData_872762C:: @ 872762C +DirectSoundWaveData_872762C:: .incbin "sound/direct_sound_samples/872762C.bin" .align 2 -DirectSoundWaveData_872921C:: @ 872921C +DirectSoundWaveData_872921C:: .incbin "sound/direct_sound_samples/872921C.bin" .align 2 -DirectSoundWaveData_872A5D0:: @ 872A5D0 +DirectSoundWaveData_872A5D0:: .incbin "sound/direct_sound_samples/872A5D0.bin" .align 2 -DirectSoundWaveData_872CC54:: @ 872CC54 - .incbin "sound/direct_sound_samples/872CC54.bin" +DirectSoundWaveData_sc88_wind:: + .incbin "sound/direct_sound_samples/sc88_wind.bin" .align 2 -DirectSoundWaveData_872DE98:: @ 872DE98 - .incbin "sound/direct_sound_samples/872DE98.bin" +DirectSoundWaveData_sc88_bubbles:: + .incbin "sound/direct_sound_samples/sc88_bubbles.bin" .align 2 -DirectSoundWaveData_872EEA8:: @ 872EEA8 +DirectSoundWaveData_872EEA8:: .incbin "sound/direct_sound_samples/872EEA8.bin" .align 2 -DirectSoundWaveData_87301B0:: @ 87301B0 +DirectSoundWaveData_87301B0:: .incbin "sound/direct_sound_samples/87301B0.bin" .align 2 -DirectSoundWaveData_87322BC:: @ 87322BC - .incbin "sound/direct_sound_samples/87322BC.bin" +DirectSoundWaveData_unused_acid_bass:: + .incbin "sound/direct_sound_samples/unused_acid_bass.bin" .align 2 -DirectSoundWaveData_8734298:: @ 8734298 +DirectSoundWaveData_8734298:: .incbin "sound/direct_sound_samples/8734298.bin" .align 2 -DirectSoundWaveData_87364A8:: @ 87364A8 +DirectSoundWaveData_87364A8:: .incbin "sound/direct_sound_samples/87364A8.bin" .align 2 -DirectSoundWaveData_8736C74:: @ 8736C74 - .incbin "sound/direct_sound_samples/8736C74.bin" +DirectSoundWaveData_sc88_tubular_bell:: + .incbin "sound/direct_sound_samples/sc88_tubular_bell.bin" .align 2 -DirectSoundWaveData_87385E4:: @ 87385E4 +DirectSoundWaveData_87385E4:: .incbin "sound/direct_sound_samples/87385E4.bin" .align 2 -DirectSoundWaveData_873A594:: @ 873A594 - .incbin "sound/direct_sound_samples/873A594.bin" +DirectSoundWaveData_unknown_polysynth:: + .incbin "sound/direct_sound_samples/unknown_polysynth.bin" .align 2 -DirectSoundWaveData_873D874:: @ 873D874 - .incbin "sound/direct_sound_samples/873D874.bin" +DirectSoundWaveData_sc88_harp:: + .incbin "sound/direct_sound_samples/sc88_harp.bin" .align 2 -DirectSoundWaveData_873E2A4:: @ 873E2A4 - .incbin "sound/direct_sound_samples/873E2A4.bin" +DirectSoundWaveData_sc88_xylophone:: + .incbin "sound/direct_sound_samples/sc88_xylophone.bin" .align 2 -DirectSoundWaveData_873ECD8:: @ 873ECD8 +DirectSoundWaveData_873ECD8:: .incbin "sound/direct_sound_samples/873ECD8.bin" .align 2 -DirectSoundWaveData_8740818:: @ 8740818 +DirectSoundWaveData_8740818:: .incbin "sound/direct_sound_samples/8740818.bin" .align 2 -DirectSoundWaveData_87410E0:: @ 87410E0 - .incbin "sound/direct_sound_samples/87410E0.bin" +DirectSoundWaveData_sc88_accordion:: + .incbin "sound/direct_sound_samples/sc88_accordion.bin" .align 2 -DirectSoundWaveData_87424B0:: @ 87424B0 +DirectSoundWaveData_87424B0:: .incbin "sound/direct_sound_samples/87424B0.bin" .align 2 -DirectSoundWaveData_87430C0:: @ 87430C0 +DirectSoundWaveData_87430C0:: .incbin "sound/direct_sound_samples/87430C0.bin" .align 2 -DirectSoundWaveData_8743C50:: @ 8743C50 +DirectSoundWaveData_8743C50:: .incbin "sound/direct_sound_samples/8743C50.bin" .align 2 -DirectSoundWaveData_87446EC:: @ 87446EC +DirectSoundWaveData_87446EC:: .incbin "sound/direct_sound_samples/87446EC.bin" .align 2 -DirectSoundWaveData_8745034:: @ 8745034 +DirectSoundWaveData_8745034:: .incbin "sound/direct_sound_samples/8745034.bin" .align 2 -DirectSoundWaveData_8745A7C:: @ 8745A7C +DirectSoundWaveData_8745A7C:: .incbin "sound/direct_sound_samples/8745A7C.bin" .align 2 -Cry_Bulbasaur:: @ 8746704 +Cry_Bulbasaur:: .incbin "sound/direct_sound_samples/cry_bulbasaur.bin" .align 2 -Cry_Ivysaur:: @ 8747790 +Cry_Ivysaur:: .incbin "sound/direct_sound_samples/cry_ivysaur.bin" .align 2 -Cry_Venusaur:: @ 8748820 +Cry_Venusaur:: .incbin "sound/direct_sound_samples/cry_venusaur.bin" .align 2 -Cry_Charmander:: @ 8749B78 +Cry_Charmander:: .incbin "sound/direct_sound_samples/cry_charmander.bin" .align 2 -Cry_Charmeleon:: @ 874A9E8 +Cry_Charmeleon:: .incbin "sound/direct_sound_samples/cry_charmeleon.bin" .align 2 -Cry_Charizard:: @ 874B868 +Cry_Charizard:: .incbin "sound/direct_sound_samples/cry_charizard.bin" .align 2 -Cry_Squirtle:: @ 874CBB0 +Cry_Squirtle:: .incbin "sound/direct_sound_samples/cry_squirtle.bin" .align 2 -Cry_Wartortle:: @ 874DA24 +Cry_Wartortle:: .incbin "sound/direct_sound_samples/cry_wartortle.bin" .align 2 -Cry_Blastoise:: @ 874EB64 +Cry_Blastoise:: .incbin "sound/direct_sound_samples/cry_blastoise.bin" .align 2 -Cry_Caterpie:: @ 874FEAC +Cry_Caterpie:: .incbin "sound/direct_sound_samples/cry_caterpie.bin" .align 2 -Cry_Metapod:: @ 8750704 +Cry_Metapod:: .incbin "sound/direct_sound_samples/cry_metapod.bin" .align 2 -Cry_Butterfree:: @ 8751E54 +Cry_Butterfree:: .incbin "sound/direct_sound_samples/cry_butterfree.bin" .align 2 -Cry_Weedle:: @ 875285C +Cry_Weedle:: .incbin "sound/direct_sound_samples/cry_weedle.bin" .align 2 -Cry_Kakuna:: @ 87538A0 +Cry_Kakuna:: .incbin "sound/direct_sound_samples/cry_kakuna.bin" .align 2 -Cry_Beedrill:: @ 8754ADC +Cry_Beedrill:: .incbin "sound/direct_sound_samples/cry_beedrill.bin" .align 2 -Cry_Pidgey:: @ 8755E38 +Cry_Pidgey:: .incbin "sound/direct_sound_samples/cry_pidgey.bin" .align 2 -Cry_Pidgeotto:: @ 8756220 +Cry_Pidgeotto:: .incbin "sound/direct_sound_samples/cry_pidgeotto.bin" .align 2 -Cry_Pidgeot:: @ 8757128 +Cry_Pidgeot:: .incbin "sound/direct_sound_samples/cry_pidgeot.bin" .align 2 -Cry_Rattata:: @ 875825C +Cry_Rattata:: .incbin "sound/direct_sound_samples/cry_rattata.bin" .align 2 -Cry_Raticate:: @ 8758A3C +Cry_Raticate:: .incbin "sound/direct_sound_samples/cry_raticate.bin" .align 2 -Cry_Spearow:: @ 87593C0 +Cry_Spearow:: .incbin "sound/direct_sound_samples/cry_spearow.bin" .align 2 -Cry_Fearow:: @ 875A564 +Cry_Fearow:: .incbin "sound/direct_sound_samples/cry_fearow.bin" .align 2 -Cry_Ekans:: @ 875B6A0 +Cry_Ekans:: .incbin "sound/direct_sound_samples/cry_ekans.bin" .align 2 -Cry_Arbok:: @ 875C9EC +Cry_Arbok:: .incbin "sound/direct_sound_samples/cry_arbok.bin" .align 2 -Cry_Pikachu:: @ 875DD44 +Cry_Pikachu:: .incbin "sound/direct_sound_samples/cry_pikachu.bin" .align 2 -Cry_Raichu:: @ 875EDEC +Cry_Raichu:: .incbin "sound/direct_sound_samples/cry_raichu.bin" .align 2 -Cry_Sandshrew:: @ 87605AC +Cry_Sandshrew:: .incbin "sound/direct_sound_samples/cry_sandshrew.bin" .align 2 -Cry_Sandslash:: @ 8760F00 +Cry_Sandslash:: .incbin "sound/direct_sound_samples/cry_sandslash.bin" .align 2 -Cry_NidoranF:: @ 8761C90 +Cry_NidoranF:: .incbin "sound/direct_sound_samples/cry_nidoran_f.bin" .align 2 -Cry_Nidorina:: @ 8762640 +Cry_Nidorina:: .incbin "sound/direct_sound_samples/cry_nidorina.bin" .align 2 -Cry_Nidoqueen:: @ 8763308 +Cry_Nidoqueen:: .incbin "sound/direct_sound_samples/cry_nidoqueen.bin" .align 2 -Cry_NidoranM:: @ 87643E8 +Cry_NidoranM:: .incbin "sound/direct_sound_samples/cry_nidoran_m.bin" .align 2 -Cry_Nidorino:: @ 8764E50 +Cry_Nidorino:: .incbin "sound/direct_sound_samples/cry_nidorino.bin" .align 2 -Cry_Nidoking:: @ 8765A64 +Cry_Nidoking:: .incbin "sound/direct_sound_samples/cry_nidoking.bin" .align 2 -Cry_Clefairy:: @ 87672D0 +Cry_Clefairy:: .incbin "sound/direct_sound_samples/cry_clefairy.bin" .align 2 -Cry_Clefable:: @ 8767B40 +Cry_Clefable:: .incbin "sound/direct_sound_samples/cry_clefable.bin" .align 2 -Cry_Vulpix:: @ 87685D0 +Cry_Vulpix:: .incbin "sound/direct_sound_samples/cry_vulpix.bin" .align 2 -Cry_Ninetales:: @ 8769DA0 +Cry_Ninetales:: .incbin "sound/direct_sound_samples/cry_ninetales.bin" .align 2 -Cry_Jigglypuff:: @ 876B60C +Cry_Jigglypuff:: .incbin "sound/direct_sound_samples/cry_jigglypuff.bin" .align 2 -Cry_Wigglytuff:: @ 876BB70 +Cry_Wigglytuff:: .incbin "sound/direct_sound_samples/cry_wigglytuff.bin" .align 2 -Cry_Zubat:: @ 876C238 +Cry_Zubat:: .incbin "sound/direct_sound_samples/cry_zubat.bin" .align 2 -Cry_Golbat:: @ 876D5A4 +Cry_Golbat:: .incbin "sound/direct_sound_samples/cry_golbat.bin" .align 2 -Cry_Oddish:: @ 876E908 +Cry_Oddish:: .incbin "sound/direct_sound_samples/cry_oddish.bin" .align 2 -Cry_Gloom:: @ 876F7A4 +Cry_Gloom:: .incbin "sound/direct_sound_samples/cry_gloom.bin" .align 2 -Cry_Vileplume:: @ 8770420 +Cry_Vileplume:: .incbin "sound/direct_sound_samples/cry_vileplume.bin" .align 2 -Cry_Paras:: @ 8771DBC +Cry_Paras:: .incbin "sound/direct_sound_samples/cry_paras.bin" .align 2 -Cry_Parasect:: @ 87739B0 +Cry_Parasect:: .incbin "sound/direct_sound_samples/cry_parasect.bin" .align 2 -Cry_Venonat:: @ 8775818 +Cry_Venonat:: .incbin "sound/direct_sound_samples/cry_venonat.bin" .align 2 -Cry_Venomoth:: @ 8776798 +Cry_Venomoth:: .incbin "sound/direct_sound_samples/cry_venomoth.bin" .align 2 -Cry_Diglett:: @ 877779C +Cry_Diglett:: .incbin "sound/direct_sound_samples/cry_diglett.bin" .align 2 -Cry_Dugtrio:: @ 8778B0C +Cry_Dugtrio:: .incbin "sound/direct_sound_samples/cry_dugtrio.bin" .align 2 -Cry_Meowth:: @ 8779E78 +Cry_Meowth:: .incbin "sound/direct_sound_samples/cry_meowth.bin" .align 2 -Cry_Persian:: @ 877A808 +Cry_Persian:: .incbin "sound/direct_sound_samples/cry_persian.bin" .align 2 -Cry_Psyduck:: @ 877BAE4 +Cry_Psyduck:: .incbin "sound/direct_sound_samples/cry_psyduck.bin" .align 2 -Cry_Golduck:: @ 877C80C +Cry_Golduck:: .incbin "sound/direct_sound_samples/cry_golduck.bin" .align 2 -Cry_Mankey:: @ 877D354 +Cry_Mankey:: .incbin "sound/direct_sound_samples/cry_mankey.bin" .align 2 -Cry_Primeape:: @ 877E3B4 +Cry_Primeape:: .incbin "sound/direct_sound_samples/cry_primeape.bin" .align 2 -Cry_Growlithe:: @ 877F3E4 +Cry_Growlithe:: .incbin "sound/direct_sound_samples/cry_growlithe.bin" .align 2 -Cry_Arcanine:: @ 8780148 +Cry_Arcanine:: .incbin "sound/direct_sound_samples/cry_arcanine.bin" .align 2 -Cry_Poliwag:: @ 8781284 +Cry_Poliwag:: .incbin "sound/direct_sound_samples/cry_poliwag.bin" .align 2 -Cry_Poliwhirl:: @ 8781DA0 +Cry_Poliwhirl:: .incbin "sound/direct_sound_samples/cry_poliwhirl.bin" .align 2 -Cry_Poliwrath:: @ 8782448 +Cry_Poliwrath:: .incbin "sound/direct_sound_samples/cry_poliwrath.bin" .align 2 -Cry_Abra:: @ 8782F6C +Cry_Abra:: .incbin "sound/direct_sound_samples/cry_abra.bin" .align 2 -Cry_Kadabra:: @ 87846D0 +Cry_Kadabra:: .incbin "sound/direct_sound_samples/cry_kadabra.bin" .align 2 -Cry_Alakazam:: @ 87861B8 +Cry_Alakazam:: .incbin "sound/direct_sound_samples/cry_alakazam.bin" .align 2 -Cry_Machop:: @ 8788154 +Cry_Machop:: .incbin "sound/direct_sound_samples/cry_machop.bin" .align 2 -Cry_Machoke:: @ 8788EB8 +Cry_Machoke:: .incbin "sound/direct_sound_samples/cry_machoke.bin" .align 2 -Cry_Machamp:: @ 8789C48 +Cry_Machamp:: .incbin "sound/direct_sound_samples/cry_machamp.bin" .align 2 -Cry_Bellsprout:: @ 878ACD0 +Cry_Bellsprout:: .incbin "sound/direct_sound_samples/cry_bellsprout.bin" .align 2 -Cry_Weepinbell:: @ 878B45C +Cry_Weepinbell:: .incbin "sound/direct_sound_samples/cry_weepinbell.bin" .align 2 -Cry_Victreebel:: @ 878C2FC +Cry_Victreebel:: .incbin "sound/direct_sound_samples/cry_victreebel.bin" .align 2 -Cry_Tentacool:: @ 878D648 +Cry_Tentacool:: .incbin "sound/direct_sound_samples/cry_tentacool.bin" .align 2 -Cry_Tentacruel:: @ 878E638 +Cry_Tentacruel:: .incbin "sound/direct_sound_samples/cry_tentacruel.bin" .align 2 -Cry_Geodude:: @ 878FD34 +Cry_Geodude:: .incbin "sound/direct_sound_samples/cry_geodude.bin" .align 2 -Cry_Graveler:: @ 87914E8 +Cry_Graveler:: .incbin "sound/direct_sound_samples/cry_graveler.bin" .align 2 -Cry_Golem:: @ 87930D0 +Cry_Golem:: .incbin "sound/direct_sound_samples/cry_golem.bin" .align 2 -Cry_Ponyta:: @ 8793EFC +Cry_Ponyta:: .incbin "sound/direct_sound_samples/cry_ponyta.bin" .align 2 -Cry_Rapidash:: @ 8794E0C +Cry_Rapidash:: .incbin "sound/direct_sound_samples/cry_rapidash.bin" .align 2 -Cry_Slowpoke:: @ 87960AC +Cry_Slowpoke:: .incbin "sound/direct_sound_samples/cry_slowpoke.bin" .align 2 -Cry_Slowbro:: @ 8796814 +Cry_Slowbro:: .incbin "sound/direct_sound_samples/cry_slowbro.bin" .align 2 -Cry_Magnemite:: @ 8797584 +Cry_Magnemite:: .incbin "sound/direct_sound_samples/cry_magnemite.bin" .align 2 -Cry_Magneton:: @ 87988C8 +Cry_Magneton:: .incbin "sound/direct_sound_samples/cry_magneton.bin" .align 2 -Cry_Farfetchd:: @ 879A0B0 +Cry_Farfetchd:: .incbin "sound/direct_sound_samples/cry_farfetchd.bin" .align 2 -Cry_Doduo:: @ 879A82C +Cry_Doduo:: .incbin "sound/direct_sound_samples/cry_doduo.bin" .align 2 -Cry_Dodrio:: @ 879BB70 +Cry_Dodrio:: .incbin "sound/direct_sound_samples/cry_dodrio.bin" .align 2 -Cry_Seel:: @ 879CEE8 +Cry_Seel:: .incbin "sound/direct_sound_samples/cry_seel.bin" .align 2 -Cry_Dewgong:: @ 879E0D8 +Cry_Dewgong:: .incbin "sound/direct_sound_samples/cry_dewgong.bin" .align 2 -Cry_Grimer:: @ 879F5FC +Cry_Grimer:: .incbin "sound/direct_sound_samples/cry_grimer.bin" .align 2 -Cry_Muk:: @ 87A0084 +Cry_Muk:: .incbin "sound/direct_sound_samples/cry_muk.bin" .align 2 -Cry_Shellder:: @ 87A0F44 +Cry_Shellder:: .incbin "sound/direct_sound_samples/cry_shellder.bin" .align 2 -Cry_Cloyster:: @ 87A1EB8 +Cry_Cloyster:: .incbin "sound/direct_sound_samples/cry_cloyster.bin" .align 2 -Cry_Gastly:: @ 87A337C +Cry_Gastly:: .incbin "sound/direct_sound_samples/cry_gastly.bin" .align 2 -Cry_Haunter:: @ 87A4ACC +Cry_Haunter:: .incbin "sound/direct_sound_samples/cry_haunter.bin" .align 2 -Cry_Gengar:: @ 87A624C +Cry_Gengar:: .incbin "sound/direct_sound_samples/cry_gengar.bin" .align 2 -Cry_Onix:: @ 87A710C +Cry_Onix:: .incbin "sound/direct_sound_samples/cry_onix.bin" .align 2 -Cry_Drowzee:: @ 87A89D0 +Cry_Drowzee:: .incbin "sound/direct_sound_samples/cry_drowzee.bin" .align 2 -Cry_Hypno:: @ 87AA6E8 +Cry_Hypno:: .incbin "sound/direct_sound_samples/cry_hypno.bin" .align 2 -Cry_Krabby:: @ 87AC3EC +Cry_Krabby:: .incbin "sound/direct_sound_samples/cry_krabby.bin" .align 2 -Cry_Kingler:: @ 87ADC38 +Cry_Kingler:: .incbin "sound/direct_sound_samples/cry_kingler.bin" .align 2 -Cry_Voltorb:: @ 87AF490 +Cry_Voltorb:: .incbin "sound/direct_sound_samples/cry_voltorb.bin" .align 2 -Cry_Electrode:: @ 87B0D54 +Cry_Electrode:: .incbin "sound/direct_sound_samples/cry_electrode.bin" .align 2 -Cry_Exeggcute:: @ 87B268C +Cry_Exeggcute:: .incbin "sound/direct_sound_samples/cry_exeggcute.bin" .align 2 -Cry_Exeggutor:: @ 87B396C +Cry_Exeggutor:: .incbin "sound/direct_sound_samples/cry_exeggutor.bin" .align 2 -Cry_Cubone:: @ 87B5950 +Cry_Cubone:: .incbin "sound/direct_sound_samples/cry_cubone.bin" .align 2 -Cry_Marowak:: @ 87B6870 +Cry_Marowak:: .incbin "sound/direct_sound_samples/cry_marowak.bin" .align 2 -Cry_Hitmonlee:: @ 87B76E0 +Cry_Hitmonlee:: .incbin "sound/direct_sound_samples/cry_hitmonlee.bin" .align 2 -Cry_Hitmonchan:: @ 87B898C +Cry_Hitmonchan:: .incbin "sound/direct_sound_samples/cry_hitmonchan.bin" .align 2 -Cry_Lickitung:: @ 87B9B64 +Cry_Lickitung:: .incbin "sound/direct_sound_samples/cry_lickitung.bin" .align 2 -Cry_Koffing:: @ 87BAA8C +Cry_Koffing:: .incbin "sound/direct_sound_samples/cry_koffing.bin" .align 2 -Cry_Weezing:: @ 87BBEE8 +Cry_Weezing:: .incbin "sound/direct_sound_samples/cry_weezing.bin" .align 2 -Cry_Rhyhorn:: @ 87BD494 +Cry_Rhyhorn:: .incbin "sound/direct_sound_samples/cry_rhyhorn.bin" .align 2 -Cry_Rhydon:: @ 87BE800 +Cry_Rhydon:: .incbin "sound/direct_sound_samples/cry_rhydon.bin" .align 2 -Cry_Chansey:: @ 87BFC6C +Cry_Chansey:: .incbin "sound/direct_sound_samples/cry_chansey.bin" .align 2 -Cry_Tangela:: @ 87C0B38 +Cry_Tangela:: .incbin "sound/direct_sound_samples/cry_tangela.bin" .align 2 -Cry_Kangaskhan:: @ 87C1A54 +Cry_Kangaskhan:: .incbin "sound/direct_sound_samples/cry_kangaskhan.bin" .align 2 -Cry_Horsea:: @ 87C2D08 +Cry_Horsea:: .incbin "sound/direct_sound_samples/cry_horsea.bin" .align 2 -Cry_Seadra:: @ 87C3684 +Cry_Seadra:: .incbin "sound/direct_sound_samples/cry_seadra.bin" .align 2 -Cry_Goldeen:: @ 87C3EF0 +Cry_Goldeen:: .incbin "sound/direct_sound_samples/cry_goldeen.bin" .align 2 -Cry_Seaking:: @ 87C48C8 +Cry_Seaking:: .incbin "sound/direct_sound_samples/cry_seaking.bin" .align 2 -Cry_Staryu:: @ 87C5C20 +Cry_Staryu:: .incbin "sound/direct_sound_samples/cry_staryu.bin" .align 2 -Cry_Starmie:: @ 87C7008 +Cry_Starmie:: .incbin "sound/direct_sound_samples/cry_starmie.bin" .align 2 -Cry_MrMime:: @ 87C84E4 +Cry_MrMime:: .incbin "sound/direct_sound_samples/cry_mr_mime.bin" .align 2 -Cry_Scyther:: @ 87C97D4 +Cry_Scyther:: .incbin "sound/direct_sound_samples/cry_scyther.bin" .align 2 -Cry_Jynx:: @ 87CA530 +Cry_Jynx:: .incbin "sound/direct_sound_samples/cry_jynx.bin" .align 2 -Cry_Electabuzz:: @ 87CD4A4 +Cry_Electabuzz:: .incbin "sound/direct_sound_samples/cry_electabuzz.bin" .align 2 -Cry_Magmar:: @ 87CF388 +Cry_Magmar:: .incbin "sound/direct_sound_samples/cry_magmar.bin" .align 2 -Cry_Pinsir:: @ 87D0304 +Cry_Pinsir:: .incbin "sound/direct_sound_samples/cry_pinsir.bin" .align 2 -Cry_Tauros:: @ 87D0F60 +Cry_Tauros:: .incbin "sound/direct_sound_samples/cry_tauros.bin" .align 2 -Cry_Magikarp:: @ 87D21B4 +Cry_Magikarp:: .incbin "sound/direct_sound_samples/cry_magikarp.bin" .align 2 -Cry_Gyarados:: @ 87D34BC +Cry_Gyarados:: .incbin "sound/direct_sound_samples/cry_gyarados.bin" .align 2 -Cry_Lapras:: @ 87D48F0 +Cry_Lapras:: .incbin "sound/direct_sound_samples/cry_lapras.bin" .align 2 -Cry_Ditto:: @ 87D57C4 +Cry_Ditto:: .incbin "sound/direct_sound_samples/cry_ditto.bin" .align 2 -Cry_Eevee:: @ 87D62E0 +Cry_Eevee:: .incbin "sound/direct_sound_samples/cry_eevee.bin" .align 2 -Cry_Vaporeon:: @ 87D7118 +Cry_Vaporeon:: .incbin "sound/direct_sound_samples/cry_vaporeon.bin" .align 2 -Cry_Jolteon:: @ 87D8730 +Cry_Jolteon:: .incbin "sound/direct_sound_samples/cry_jolteon.bin" .align 2 -Cry_Flareon:: @ 87D9704 +Cry_Flareon:: .incbin "sound/direct_sound_samples/cry_flareon.bin" .align 2 -Cry_Porygon:: @ 87DA688 +Cry_Porygon:: .incbin "sound/direct_sound_samples/cry_porygon.bin" .align 2 -Cry_Omanyte:: @ 87DBA94 +Cry_Omanyte:: .incbin "sound/direct_sound_samples/cry_omanyte.bin" .align 2 -Cry_Omastar:: @ 87DC7EC +Cry_Omastar:: .incbin "sound/direct_sound_samples/cry_omastar.bin" .align 2 -Cry_Kabuto:: @ 87DD540 +Cry_Kabuto:: .incbin "sound/direct_sound_samples/cry_kabuto.bin" .align 2 -Cry_Kabutops:: @ 87DE194 +Cry_Kabutops:: .incbin "sound/direct_sound_samples/cry_kabutops.bin" .align 2 -Cry_Aerodactyl:: @ 87DEF50 +Cry_Aerodactyl:: .incbin "sound/direct_sound_samples/cry_aerodactyl.bin" .align 2 -Cry_Snorlax:: @ 87E07AC +Cry_Snorlax:: .incbin "sound/direct_sound_samples/cry_snorlax.bin" .align 2 -Cry_Articuno:: @ 87E0CE8 +Cry_Articuno:: .incbin "sound/direct_sound_samples/cry_articuno.bin" .align 2 -Cry_Zapdos:: @ 87E2490 +Cry_Zapdos:: .incbin "sound/direct_sound_samples/cry_zapdos.bin" .align 2 -Cry_Moltres:: @ 87E3408 +Cry_Moltres:: .incbin "sound/direct_sound_samples/cry_moltres.bin" .align 2 -Cry_Dratini:: @ 87E4BB4 +Cry_Dratini:: .incbin "sound/direct_sound_samples/cry_dratini.bin" .align 2 -Cry_Dragonair:: @ 87E5750 +Cry_Dragonair:: .incbin "sound/direct_sound_samples/cry_dragonair.bin" .align 2 -Cry_Dragonite:: @ 87E67F8 +Cry_Dragonite:: .incbin "sound/direct_sound_samples/cry_dragonite.bin" .align 2 -Cry_Mewtwo:: @ 87E7B04 +Cry_Mewtwo:: .incbin "sound/direct_sound_samples/cry_mewtwo.bin" .align 2 -Cry_Mew:: @ 87E996C +Cry_Mew:: .incbin "sound/direct_sound_samples/cry_mew.bin" .align 2 -Cry_Chikorita:: @ 87EB7D4 +Cry_Chikorita:: .incbin "sound/direct_sound_samples/cry_chikorita.bin" .align 2 -Cry_Bayleef:: @ 87EBD14 +Cry_Bayleef:: .incbin "sound/direct_sound_samples/cry_bayleef.bin" .align 2 -Cry_Meganium:: @ 87EC5E0 +Cry_Meganium:: .incbin "sound/direct_sound_samples/cry_meganium.bin" .align 2 -Cry_Cyndaquil:: @ 87ED618 +Cry_Cyndaquil:: .incbin "sound/direct_sound_samples/cry_cyndaquil.bin" .align 2 -Cry_Quilava:: @ 87EDD1C +Cry_Quilava:: .incbin "sound/direct_sound_samples/cry_quilava.bin" .align 2 -Cry_Typhlosion:: @ 87EE904 +Cry_Typhlosion:: .incbin "sound/direct_sound_samples/cry_typhlosion.bin" .align 2 -Cry_Totodile:: @ 87F0F14 +Cry_Totodile:: .incbin "sound/direct_sound_samples/cry_totodile.bin" .align 2 -Cry_Croconaw:: @ 87F216C +Cry_Croconaw:: .incbin "sound/direct_sound_samples/cry_croconaw.bin" .align 2 -Cry_Feraligatr:: @ 87F35A8 +Cry_Feraligatr:: .incbin "sound/direct_sound_samples/cry_feraligatr.bin" .align 2 -Cry_Sentret:: @ 87F4F2C +Cry_Sentret:: .incbin "sound/direct_sound_samples/cry_sentret.bin" .align 2 -Cry_Furret:: @ 87F5354 +Cry_Furret:: .incbin "sound/direct_sound_samples/cry_furret.bin" .align 2 -Cry_Hoothoot:: @ 87F599C +Cry_Hoothoot:: .incbin "sound/direct_sound_samples/cry_hoothoot.bin" .align 2 -Cry_Noctowl:: @ 87F6480 +Cry_Noctowl:: .incbin "sound/direct_sound_samples/cry_noctowl.bin" .align 2 -Cry_Ledyba:: @ 87F79B0 +Cry_Ledyba:: .incbin "sound/direct_sound_samples/cry_ledyba.bin" .align 2 -Cry_Ledian:: @ 87F80A8 +Cry_Ledian:: .incbin "sound/direct_sound_samples/cry_ledian.bin" .align 2 -Cry_Spinarak:: @ 87F890C +Cry_Spinarak:: .incbin "sound/direct_sound_samples/cry_spinarak.bin" .align 2 -Cry_Ariados:: @ 87F9670 +Cry_Ariados:: .incbin "sound/direct_sound_samples/cry_ariados.bin" .align 2 -Cry_Crobat:: @ 87FA2C4 +Cry_Crobat:: .incbin "sound/direct_sound_samples/cry_crobat.bin" .align 2 -Cry_Chinchou:: @ 87FB9F4 +Cry_Chinchou:: .incbin "sound/direct_sound_samples/cry_chinchou.bin" .align 2 -Cry_Lanturn:: @ 87FC6A4 +Cry_Lanturn:: .incbin "sound/direct_sound_samples/cry_lanturn.bin" .align 2 -Cry_Pichu:: @ 87FD130 +Cry_Pichu:: .incbin "sound/direct_sound_samples/cry_pichu.bin" .align 2 -Cry_Cleffa:: @ 87FD884 +Cry_Cleffa:: .incbin "sound/direct_sound_samples/cry_cleffa.bin" .align 2 -Cry_Igglybuff:: @ 87FDE74 +Cry_Igglybuff:: .incbin "sound/direct_sound_samples/cry_igglybuff.bin" .align 2 -Cry_Togepi:: @ 87FE570 +Cry_Togepi:: .incbin "sound/direct_sound_samples/cry_togepi.bin" .align 2 -Cry_Togetic:: @ 87FF058 +Cry_Togetic:: .incbin "sound/direct_sound_samples/cry_togetic.bin" .align 2 -Cry_Natu:: @ 87FF758 +Cry_Natu:: .incbin "sound/direct_sound_samples/cry_natu.bin" .align 2 -Cry_Xatu:: @ 88001E8 +Cry_Xatu:: .incbin "sound/direct_sound_samples/cry_xatu.bin" .align 2 -Cry_Mareep:: @ 88010B4 +Cry_Mareep:: .incbin "sound/direct_sound_samples/cry_mareep.bin" .align 2 -Cry_Flaaffy:: @ 880180C +Cry_Flaaffy:: .incbin "sound/direct_sound_samples/cry_flaaffy.bin" .align 2 -Cry_Ampharos:: @ 88025C0 +Cry_Ampharos:: .incbin "sound/direct_sound_samples/cry_ampharos.bin" .align 2 -Cry_Bellossom:: @ 8803640 +Cry_Bellossom:: .incbin "sound/direct_sound_samples/cry_bellossom.bin" .align 2 -Cry_Marill:: @ 8804458 +Cry_Marill:: .incbin "sound/direct_sound_samples/cry_marill.bin" .align 2 -Cry_Azumarill:: @ 880516C +Cry_Azumarill:: .incbin "sound/direct_sound_samples/cry_azumarill.bin" .align 2 -Cry_Sudowoodo:: @ 8806258 +Cry_Sudowoodo:: .incbin "sound/direct_sound_samples/cry_sudowoodo.bin" .align 2 -Cry_Politoed:: @ 8807288 +Cry_Politoed:: .incbin "sound/direct_sound_samples/cry_politoed.bin" .align 2 -Cry_Hoppip:: @ 88084CC +Cry_Hoppip:: .incbin "sound/direct_sound_samples/cry_hoppip.bin" .align 2 -Cry_Skiploom:: @ 8808D38 +Cry_Skiploom:: .incbin "sound/direct_sound_samples/cry_skiploom.bin" .align 2 -Cry_Jumpluff:: @ 8809A40 +Cry_Jumpluff:: .incbin "sound/direct_sound_samples/cry_jumpluff.bin" .align 2 -Cry_Aipom:: @ 880AA7C +Cry_Aipom:: .incbin "sound/direct_sound_samples/cry_aipom.bin" .align 2 -Cry_Sunkern:: @ 880B89C +Cry_Sunkern:: .incbin "sound/direct_sound_samples/cry_sunkern.bin" .align 2 -Cry_Sunflora:: @ 880C0B0 +Cry_Sunflora:: .incbin "sound/direct_sound_samples/cry_sunflora.bin" .align 2 -Cry_Yanma:: @ 880D090 +Cry_Yanma:: .incbin "sound/direct_sound_samples/cry_yanma.bin" .align 2 -Cry_Wooper:: @ 880E198 +Cry_Wooper:: .incbin "sound/direct_sound_samples/cry_wooper.bin" .align 2 -Cry_Quagsire:: @ 880E8F8 +Cry_Quagsire:: .incbin "sound/direct_sound_samples/cry_quagsire.bin" .align 2 -Cry_Espeon:: @ 880F658 +Cry_Espeon:: .incbin "sound/direct_sound_samples/cry_espeon.bin" .align 2 -Cry_Umbreon:: @ 8810A0C +Cry_Umbreon:: .incbin "sound/direct_sound_samples/cry_umbreon.bin" .align 2 -Cry_Murkrow:: @ 881198C +Cry_Murkrow:: .incbin "sound/direct_sound_samples/cry_murkrow.bin" .align 2 -Cry_Slowking:: @ 8812A50 +Cry_Slowking:: .incbin "sound/direct_sound_samples/cry_slowking.bin" .align 2 -Cry_Misdreavus:: @ 8814234 +Cry_Misdreavus:: .incbin "sound/direct_sound_samples/cry_misdreavus.bin" .align 2 -Cry_Unown:: @ 8814DD4 +Cry_Unown:: .incbin "sound/direct_sound_samples/cry_unown.bin" .align 2 -Cry_Wobbuffet:: @ 8815AFC +Cry_Wobbuffet:: .incbin "sound/direct_sound_samples/cry_wobbuffet.bin" .align 2 -Cry_Girafarig:: @ 8816F98 +Cry_Girafarig:: .incbin "sound/direct_sound_samples/cry_girafarig.bin" .align 2 -Cry_Pineco:: @ 8817E4C +Cry_Pineco:: .incbin "sound/direct_sound_samples/cry_pineco.bin" .align 2 -Cry_Forretress:: @ 8818BAC +Cry_Forretress:: .incbin "sound/direct_sound_samples/cry_forretress.bin" .align 2 -Cry_Dunsparce:: @ 8819FB4 +Cry_Dunsparce:: .incbin "sound/direct_sound_samples/cry_dunsparce.bin" .align 2 -Cry_Gligar:: @ 881AF94 +Cry_Gligar:: .incbin "sound/direct_sound_samples/cry_gligar.bin" .align 2 -Cry_Steelix:: @ 881BBB4 +Cry_Steelix:: .incbin "sound/direct_sound_samples/cry_steelix.bin" .align 2 -Cry_Snubbull:: @ 881E1DC +Cry_Snubbull:: .incbin "sound/direct_sound_samples/cry_snubbull.bin" .align 2 -Cry_Granbull:: @ 881F050 +Cry_Granbull:: .incbin "sound/direct_sound_samples/cry_granbull.bin" .align 2 -Cry_Qwilfish:: @ 88207F4 +Cry_Qwilfish:: .incbin "sound/direct_sound_samples/cry_qwilfish.bin" .align 2 -Cry_Scizor:: @ 8821390 +Cry_Scizor:: .incbin "sound/direct_sound_samples/cry_scizor.bin" .align 2 -Cry_Shuckle:: @ 8822A8C +Cry_Shuckle:: .incbin "sound/direct_sound_samples/cry_shuckle.bin" .align 2 -Cry_Heracross:: @ 88234C0 +Cry_Heracross:: .incbin "sound/direct_sound_samples/cry_heracross.bin" .align 2 -Cry_Sneasel:: @ 8824714 +Cry_Sneasel:: .incbin "sound/direct_sound_samples/cry_sneasel.bin" .align 2 -Cry_Teddiursa:: @ 8825038 +Cry_Teddiursa:: .incbin "sound/direct_sound_samples/cry_teddiursa.bin" .align 2 -Cry_Ursaring:: @ 88260C4 +Cry_Ursaring:: .incbin "sound/direct_sound_samples/cry_ursaring.bin" .align 2 -Cry_Slugma:: @ 8827E9C +Cry_Slugma:: .incbin "sound/direct_sound_samples/cry_slugma.bin" .align 2 -Cry_Magcargo:: @ 8828FB4 +Cry_Magcargo:: .incbin "sound/direct_sound_samples/cry_magcargo.bin" .align 2 -Cry_Swinub:: @ 882A4BC +Cry_Swinub:: .incbin "sound/direct_sound_samples/cry_swinub.bin" .align 2 -Cry_Piloswine:: @ 882B164 +Cry_Piloswine:: .incbin "sound/direct_sound_samples/cry_piloswine.bin" .align 2 -Cry_Corsola:: @ 882BE58 +Cry_Corsola:: .incbin "sound/direct_sound_samples/cry_corsola.bin" .align 2 -Cry_Remoraid:: @ 882CB38 +Cry_Remoraid:: .incbin "sound/direct_sound_samples/cry_remoraid.bin" .align 2 -Cry_Octillery:: @ 882D5C8 +Cry_Octillery:: .incbin "sound/direct_sound_samples/cry_octillery.bin" .align 2 -Cry_Delibird:: @ 882F00C +Cry_Delibird:: .incbin "sound/direct_sound_samples/cry_delibird.bin" .align 2 -Cry_Mantine:: @ 8830040 +Cry_Mantine:: .incbin "sound/direct_sound_samples/cry_mantine.bin" .align 2 -Cry_Skarmory:: @ 8831008 +Cry_Skarmory:: .incbin "sound/direct_sound_samples/cry_skarmory.bin" .align 2 -Cry_Houndour:: @ 8832810 +Cry_Houndour:: .incbin "sound/direct_sound_samples/cry_houndour.bin" .align 2 -Cry_Houndoom:: @ 88334B8 +Cry_Houndoom:: .incbin "sound/direct_sound_samples/cry_houndoom.bin" .align 2 -Cry_Kingdra:: @ 8834868 +Cry_Kingdra:: .incbin "sound/direct_sound_samples/cry_kingdra.bin" .align 2 -Cry_Phanpy:: @ 8835640 +Cry_Phanpy:: .incbin "sound/direct_sound_samples/cry_phanpy.bin" .align 2 -Cry_Donphan:: @ 8836190 +Cry_Donphan:: .incbin "sound/direct_sound_samples/cry_donphan.bin" .align 2 -Cry_Porygon2:: @ 88372B4 +Cry_Porygon2:: .incbin "sound/direct_sound_samples/cry_porygon2.bin" .align 2 -Cry_Stantler:: @ 883826C +Cry_Stantler:: .incbin "sound/direct_sound_samples/cry_stantler.bin" .align 2 -Cry_Smeargle:: @ 88398E8 +Cry_Smeargle:: .incbin "sound/direct_sound_samples/cry_smeargle.bin" .align 2 -Cry_Tyrogue:: @ 883A31C +Cry_Tyrogue:: .incbin "sound/direct_sound_samples/cry_tyrogue.bin" .align 2 -Cry_Hitmontop:: @ 883B344 +Cry_Hitmontop:: .incbin "sound/direct_sound_samples/cry_hitmontop.bin" .align 2 -Cry_Smoochum:: @ 883C124 +Cry_Smoochum:: .incbin "sound/direct_sound_samples/cry_smoochum.bin" .align 2 -Cry_Elekid:: @ 883CCD8 +Cry_Elekid:: .incbin "sound/direct_sound_samples/cry_elekid.bin" .align 2 -Cry_Magby:: @ 883D764 +Cry_Magby:: .incbin "sound/direct_sound_samples/cry_magby.bin" .align 2 -Cry_Miltank:: @ 883E5D4 +Cry_Miltank:: .incbin "sound/direct_sound_samples/cry_miltank.bin" .align 2 -Cry_Blissey:: @ 883F4B0 +Cry_Blissey:: .incbin "sound/direct_sound_samples/cry_blissey.bin" .align 2 -Cry_Raikou:: @ 8840544 +Cry_Raikou:: .incbin "sound/direct_sound_samples/cry_raikou.bin" .align 2 -Cry_Entei:: @ 88416B4 +Cry_Entei:: .incbin "sound/direct_sound_samples/cry_entei.bin" .align 2 -Cry_Suicune:: @ 8842B28 +Cry_Suicune:: .incbin "sound/direct_sound_samples/cry_suicune.bin" .align 2 -Cry_Larvitar:: @ 8843D70 +Cry_Larvitar:: .incbin "sound/direct_sound_samples/cry_larvitar.bin" .align 2 -Cry_Pupitar:: @ 8844A20 +Cry_Pupitar:: .incbin "sound/direct_sound_samples/cry_pupitar.bin" .align 2 -Cry_Tyranitar:: @ 8845290 +Cry_Tyranitar:: .incbin "sound/direct_sound_samples/cry_tyranitar.bin" .align 2 -Cry_Lugia:: @ 88469F0 +Cry_Lugia:: .incbin "sound/direct_sound_samples/cry_lugia.bin" .align 2 -Cry_HoOh:: @ 8848FE8 +Cry_HoOh:: .incbin "sound/direct_sound_samples/cry_ho_oh.bin" .align 2 -Cry_Celebi:: @ 884A67C +Cry_Celebi:: .incbin "sound/direct_sound_samples/cry_celebi.bin" .align 2 -Cry_Kecleon:: @ 884B4F4 +Cry_Kecleon:: .incbin "sound/direct_sound_samples/cry_kecleon.bin" .align 2 -Cry_Roselia:: @ 884BD54 +Cry_Roselia:: .incbin "sound/direct_sound_samples/cry_roselia.bin" .align 2 -Cry_Torkoal:: @ 884C814 +Cry_Torkoal:: .incbin "sound/direct_sound_samples/cry_torkoal.bin" .align 2 -Cry_Electrike:: @ 884D160 +Cry_Electrike:: .incbin "sound/direct_sound_samples/cry_electrike.bin" .align 2 -Cry_Manectric:: @ 884DDBC +Cry_Manectric:: .incbin "sound/direct_sound_samples/cry_manectric.bin" .align 2 -Cry_Duskull:: @ 884F2C4 +Cry_Duskull:: .incbin "sound/direct_sound_samples/cry_duskull.bin" .align 2 -Cry_Latias:: @ 884FD5C +Cry_Latias:: .incbin "sound/direct_sound_samples/cry_latias.bin" .align 2 -Cry_Wynaut:: @ 885098C +Cry_Wynaut:: .incbin "sound/direct_sound_samples/cry_wynaut.bin" .align 2 -Cry_Seviper:: @ 885176C +Cry_Seviper:: .incbin "sound/direct_sound_samples/cry_seviper.bin" .align 2 -Cry_Sharpedo:: @ 885230C +Cry_Sharpedo:: .incbin "sound/direct_sound_samples/cry_sharpedo.bin" .align 2 -Cry_Zangoose:: @ 8853A18 +Cry_Zangoose:: .incbin "sound/direct_sound_samples/cry_zangoose.bin" .align 2 -Cry_Azurill:: @ 88543A0 +Cry_Azurill:: .incbin "sound/direct_sound_samples/cry_azurill.bin" .align 2 -Cry_Swablu:: @ 8854E08 +Cry_Swablu:: .incbin "sound/direct_sound_samples/cry_swablu.bin" .align 2 -Cry_Altaria:: @ 88553A0 +Cry_Altaria:: .incbin "sound/direct_sound_samples/cry_altaria.bin" .align 2 -Cry_Unused265:: @ 8855EBC +Cry_Unused265:: .incbin "sound/direct_sound_samples/cry_unused_265.bin" .align 2 -Cry_Taillow:: @ 8856810 +Cry_Taillow:: .incbin "sound/direct_sound_samples/cry_taillow.bin" .align 2 -Cry_Swellow:: @ 8856E10 +Cry_Swellow:: .incbin "sound/direct_sound_samples/cry_swellow.bin" .align 2 -Cry_Unused268:: @ 8857714 +Cry_Unused268:: .incbin "sound/direct_sound_samples/cry_unused_268.bin" .align 2 -Cry_Spinda:: @ 88588C4 +Cry_Spinda:: .incbin "sound/direct_sound_samples/cry_spinda.bin" .align 2 -Cry_Torchic:: @ 8859530 +Cry_Torchic:: .incbin "sound/direct_sound_samples/cry_torchic.bin" .align 2 -Cry_Combusken:: @ 8859ED8 +Cry_Combusken:: .incbin "sound/direct_sound_samples/cry_combusken.bin" .align 2 -Cry_Blaziken:: @ 885BBAC +Cry_Blaziken:: .incbin "sound/direct_sound_samples/cry_blaziken.bin" .align 2 -Cry_Treecko:: @ 885DB2C +Cry_Treecko:: .incbin "sound/direct_sound_samples/cry_treecko.bin" .align 2 -Cry_Grovyle:: @ 885E6D4 +Cry_Grovyle:: .incbin "sound/direct_sound_samples/cry_grovyle.bin" .align 2 -Cry_Sceptile:: @ 885FB48 +Cry_Sceptile:: .incbin "sound/direct_sound_samples/cry_sceptile.bin" .align 2 -Cry_Mudkip:: @ 8861564 +Cry_Mudkip:: .incbin "sound/direct_sound_samples/cry_mudkip.bin" .align 2 -Cry_Marshtomp:: @ 8861CE8 +Cry_Marshtomp:: .incbin "sound/direct_sound_samples/cry_marshtomp.bin" .align 2 -Cry_Swampert:: @ 8862DEC +Cry_Swampert:: .incbin "sound/direct_sound_samples/cry_swampert.bin" .align 2 -Cry_Pelipper:: @ 886446C +Cry_Pelipper:: .incbin "sound/direct_sound_samples/cry_pelipper.bin" .align 2 -Cry_Wingull:: @ 8865034 +Cry_Wingull:: .incbin "sound/direct_sound_samples/cry_wingull.bin" .align 2 -Cry_Banette:: @ 8865C74 +Cry_Banette:: .incbin "sound/direct_sound_samples/cry_banette.bin" .align 2 -Cry_Shuppet:: @ 886691C +Cry_Shuppet:: .incbin "sound/direct_sound_samples/cry_shuppet.bin" .align 2 -Cry_Lotad:: @ 886715C +Cry_Lotad:: .incbin "sound/direct_sound_samples/cry_lotad.bin" .align 2 -Cry_Lombre:: @ 88675C4 +Cry_Lombre:: .incbin "sound/direct_sound_samples/cry_lombre.bin" .align 2 -Cry_Ludicolo:: @ 8868458 +Cry_Ludicolo:: .incbin "sound/direct_sound_samples/cry_ludicolo.bin" .align 2 -Cry_Seedot:: @ 8869528 +Cry_Seedot:: .incbin "sound/direct_sound_samples/cry_seedot.bin" .align 2 -Cry_Nuzleaf:: @ 8869D54 +Cry_Nuzleaf:: .incbin "sound/direct_sound_samples/cry_nuzleaf.bin" .align 2 -Cry_Shiftry:: @ 886A8BC +Cry_Shiftry:: .incbin "sound/direct_sound_samples/cry_shiftry.bin" .align 2 -Cry_Carvanha:: @ 886BC80 +Cry_Carvanha:: .incbin "sound/direct_sound_samples/cry_carvanha.bin" .align 2 -Cry_Wurmple:: @ 886C694 +Cry_Wurmple:: .incbin "sound/direct_sound_samples/cry_wurmple.bin" .align 2 -Cry_Silcoon:: @ 886CF60 +Cry_Silcoon:: .incbin "sound/direct_sound_samples/cry_silcoon.bin" .align 2 -Cry_Beautifly:: @ 886DF8C +Cry_Beautifly:: .incbin "sound/direct_sound_samples/cry_beautifly.bin" .align 2 -Cry_Cascoon:: @ 886E7C4 +Cry_Cascoon:: .incbin "sound/direct_sound_samples/cry_cascoon.bin" .align 2 -Cry_Dustox:: @ 886F808 +Cry_Dustox:: .incbin "sound/direct_sound_samples/cry_dustox.bin" .align 2 -Cry_Ralts:: @ 88704B4 +Cry_Ralts:: .incbin "sound/direct_sound_samples/cry_ralts.bin" .align 2 -Cry_Kirlia:: @ 8870ED0 +Cry_Kirlia:: .incbin "sound/direct_sound_samples/cry_kirlia.bin" .align 2 -Cry_Gardevoir:: @ 8871B00 +Cry_Gardevoir:: .incbin "sound/direct_sound_samples/cry_gardevoir.bin" .align 2 -Cry_Slakoth:: @ 8873364 +Cry_Slakoth:: .incbin "sound/direct_sound_samples/cry_slakoth.bin" .align 2 -Cry_Vigoroth:: @ 8873BE8 +Cry_Vigoroth:: .incbin "sound/direct_sound_samples/cry_vigoroth.bin" .align 2 -Cry_Slaking:: @ 8874A40 +Cry_Slaking:: .incbin "sound/direct_sound_samples/cry_slaking.bin" .align 2 -Cry_Nincada:: @ 887542C +Cry_Nincada:: .incbin "sound/direct_sound_samples/cry_nincada.bin" .align 2 -Cry_Ninjask:: @ 8875A9C +Cry_Ninjask:: .incbin "sound/direct_sound_samples/cry_ninjask.bin" .align 2 -Cry_Shedinja:: @ 88766C4 +Cry_Shedinja:: .incbin "sound/direct_sound_samples/cry_shedinja.bin" .align 2 -Cry_Makuhita:: @ 8876E7C +Cry_Makuhita:: .incbin "sound/direct_sound_samples/cry_makuhita.bin" .align 2 -Cry_Hariyama:: @ 88775D8 +Cry_Hariyama:: .incbin "sound/direct_sound_samples/cry_hariyama.bin" .align 2 -Cry_Nosepass:: @ 8878690 +Cry_Nosepass:: .incbin "sound/direct_sound_samples/cry_nosepass.bin" .align 2 -Cry_Glalie:: @ 88793F4 +Cry_Glalie:: .incbin "sound/direct_sound_samples/cry_glalie.bin" .align 2 -Cry_Plusle:: @ 887A8D8 +Cry_Plusle:: .incbin "sound/direct_sound_samples/cry_plusle.bin" .align 2 -Cry_Minun:: @ 887B1D4 +Cry_Minun:: .incbin "sound/direct_sound_samples/cry_minun.bin" .align 2 -Cry_Surskit:: @ 887C1DC +Cry_Surskit:: .incbin "sound/direct_sound_samples/cry_surskit.bin" .align 2 -Cry_Masquerain:: @ 887CC5C +Cry_Masquerain:: .incbin "sound/direct_sound_samples/cry_masquerain.bin" .align 2 -Cry_Skitty:: @ 887E010 +Cry_Skitty:: .incbin "sound/direct_sound_samples/cry_skitty.bin" .align 2 -Cry_Delcatty:: @ 887E724 +Cry_Delcatty:: .incbin "sound/direct_sound_samples/cry_delcatty.bin" .align 2 -Cry_Gulpin:: @ 887FC3C +Cry_Gulpin:: .incbin "sound/direct_sound_samples/cry_gulpin.bin" .align 2 -Cry_Swalot:: @ 8880440 +Cry_Swalot:: .incbin "sound/direct_sound_samples/cry_swalot.bin" .align 2 -Cry_Numel:: @ 88815A0 +Cry_Numel:: .incbin "sound/direct_sound_samples/cry_numel.bin" .align 2 -Cry_Camerupt:: @ 8881EEC +Cry_Camerupt:: .incbin "sound/direct_sound_samples/cry_camerupt.bin" .align 2 -Cry_Barboach:: @ 888360C +Cry_Barboach:: .incbin "sound/direct_sound_samples/cry_barboach.bin" .align 2 -Cry_Whiscash:: @ 8883F48 +Cry_Whiscash:: .incbin "sound/direct_sound_samples/cry_whiscash.bin" .align 2 -Cry_Corphish:: @ 8885044 +Cry_Corphish:: .incbin "sound/direct_sound_samples/cry_corphish.bin" .align 2 -Cry_Crawdaunt:: @ 8885C48 +Cry_Crawdaunt:: .incbin "sound/direct_sound_samples/cry_crawdaunt.bin" .align 2 -Cry_Spoink:: @ 8887500 +Cry_Spoink:: .incbin "sound/direct_sound_samples/cry_spoink.bin" .align 2 -Cry_Grumpig:: @ 8887C40 +Cry_Grumpig:: .incbin "sound/direct_sound_samples/cry_grumpig.bin" .align 2 -Cry_Trapinch:: @ 88888E0 +Cry_Trapinch:: .incbin "sound/direct_sound_samples/cry_trapinch.bin" .align 2 -Cry_Vibrava:: @ 8889304 +Cry_Vibrava:: .incbin "sound/direct_sound_samples/cry_vibrava.bin" .align 2 -Cry_Flygon:: @ 888A108 +Cry_Flygon:: .incbin "sound/direct_sound_samples/cry_flygon.bin" .align 2 -Cry_Cacnea:: @ 888BB10 +Cry_Cacnea:: .incbin "sound/direct_sound_samples/cry_cacnea.bin" .align 2 -Cry_Cacturne:: @ 888C400 +Cry_Cacturne:: .incbin "sound/direct_sound_samples/cry_cacturne.bin" .align 2 -Cry_Baltoy:: @ 888DAB0 +Cry_Baltoy:: .incbin "sound/direct_sound_samples/cry_baltoy.bin" .align 2 -Cry_Claydol:: @ 888E734 +Cry_Claydol:: .incbin "sound/direct_sound_samples/cry_claydol.bin" .align 2 -Cry_Lunatone:: @ 888FA94 +Cry_Lunatone:: .incbin "sound/direct_sound_samples/cry_lunatone.bin" .align 2 -Cry_Solrock:: @ 8891290 +Cry_Solrock:: .incbin "sound/direct_sound_samples/cry_solrock.bin" .align 2 -Cry_Feebas:: @ 88922BC +Cry_Feebas:: .incbin "sound/direct_sound_samples/cry_feebas.bin" .align 2 -Cry_Milotic:: @ 8892A90 +Cry_Milotic:: .incbin "sound/direct_sound_samples/cry_milotic.bin" .align 2 -Cry_Absol:: @ 88951D4 +Cry_Absol:: .incbin "sound/direct_sound_samples/cry_absol.bin" .align 2 -Cry_Meditite:: @ 8895C50 +Cry_Meditite:: .incbin "sound/direct_sound_samples/cry_meditite.bin" .align 2 -Cry_Medicham:: @ 8896470 +Cry_Medicham:: .incbin "sound/direct_sound_samples/cry_medicham.bin" .align 2 -Cry_Spheal:: @ 88974F4 +Cry_Spheal:: .incbin "sound/direct_sound_samples/cry_spheal.bin" .align 2 -Cry_Sealeo:: @ 8897AA8 +Cry_Sealeo:: .incbin "sound/direct_sound_samples/cry_sealeo.bin" .align 2 -Cry_Walrein:: @ 8898680 +Cry_Walrein:: .incbin "sound/direct_sound_samples/cry_walrein.bin" .align 2 -Cry_Clamperl:: @ 889AACC +Cry_Clamperl:: .incbin "sound/direct_sound_samples/cry_clamperl.bin" .align 2 -Cry_Huntail:: @ 889BD1C +Cry_Huntail:: .incbin "sound/direct_sound_samples/cry_huntail.bin" .align 2 -Cry_Gorebyss:: @ 889CD04 +Cry_Gorebyss:: .incbin "sound/direct_sound_samples/cry_gorebyss.bin" .align 2 -Cry_Lileep:: @ 889E370 +Cry_Lileep:: .incbin "sound/direct_sound_samples/cry_lileep.bin" .align 2 -Cry_Cradily:: @ 889ED18 +Cry_Cradily:: .incbin "sound/direct_sound_samples/cry_cradily.bin" .align 2 -Cry_Anorith:: @ 88A0A48 +Cry_Anorith:: .incbin "sound/direct_sound_samples/cry_anorith.bin" .align 2 -Cry_Armaldo:: @ 88A1600 +Cry_Armaldo:: .incbin "sound/direct_sound_samples/cry_armaldo.bin" .align 2 -Cry_Beldum:: @ 88A2CD4 +Cry_Beldum:: .incbin "sound/direct_sound_samples/cry_beldum.bin" .align 2 -Cry_Metang:: @ 88A3674 +Cry_Metang:: .incbin "sound/direct_sound_samples/cry_metang.bin" .align 2 -Cry_Metagross:: @ 88A4948 +Cry_Metagross:: .incbin "sound/direct_sound_samples/cry_metagross.bin" .align 2 -Cry_Bagon:: @ 88A70C0 +Cry_Bagon:: .incbin "sound/direct_sound_samples/cry_bagon.bin" .align 2 -Cry_Shelgon:: @ 88A7894 +Cry_Shelgon:: .incbin "sound/direct_sound_samples/cry_shelgon.bin" .align 2 -Cry_Regirock:: @ 88A8C9C +Cry_Regirock:: .incbin "sound/direct_sound_samples/cry_regirock.bin" .align 2 -Cry_Regice:: @ 88AAC78 +Cry_Regice:: .incbin "sound/direct_sound_samples/cry_regice.bin" .align 2 -Cry_Registeel:: @ 88ACC78 +Cry_Registeel:: .incbin "sound/direct_sound_samples/cry_registeel.bin" .align 2 -Cry_Castform:: @ 88AE37C +Cry_Castform:: .incbin "sound/direct_sound_samples/cry_castform.bin" .align 2 -Cry_Volbeat:: @ 88AF014 +Cry_Volbeat:: .incbin "sound/direct_sound_samples/cry_volbeat.bin" .align 2 -Cry_Illumise:: @ 88AFB9C +Cry_Illumise:: .incbin "sound/direct_sound_samples/cry_illumise.bin" .align 2 -Cry_Poochyena:: @ 88B0CB4 +Cry_Poochyena:: .incbin "sound/direct_sound_samples/cry_poochyena.bin" .align 2 -Cry_Mightyena:: @ 88B15FC +Cry_Mightyena:: .incbin "sound/direct_sound_samples/cry_mightyena.bin" .align 2 -Cry_Dusclops:: @ 88B2988 +Cry_Dusclops:: .incbin "sound/direct_sound_samples/cry_dusclops.bin" .align 2 -Cry_Sableye:: @ 88B3740 +Cry_Sableye:: .incbin "sound/direct_sound_samples/cry_sableye.bin" .align 2 -Cry_Mawile:: @ 88B42E4 +Cry_Mawile:: .incbin "sound/direct_sound_samples/cry_mawile.bin" .align 2 -Cry_Aron:: @ 88B4E64 +Cry_Aron:: .incbin "sound/direct_sound_samples/cry_aron.bin" .align 2 -Cry_Lairon:: @ 88B5790 +Cry_Lairon:: .incbin "sound/direct_sound_samples/cry_lairon.bin" .align 2 -Cry_Aggron:: @ 88B6C68 +Cry_Aggron:: .incbin "sound/direct_sound_samples/cry_aggron.bin" .align 2 -Cry_Relicanth:: @ 88B860C +Cry_Relicanth:: .incbin "sound/direct_sound_samples/cry_relicanth.bin" .align 2 -Cry_Luvdisc:: @ 88B9A3C +Cry_Luvdisc:: .incbin "sound/direct_sound_samples/cry_luvdisc.bin" .align 2 -Cry_Groudon:: @ 88B9F18 +Cry_Groudon:: .incbin "sound/direct_sound_samples/cry_groudon.bin" .align 2 -Cry_Kyogre:: @ 88BC424 +Cry_Kyogre:: .incbin "sound/direct_sound_samples/cry_kyogre.bin" .align 2 -Cry_Rayquaza:: @ 88BE7DC +Cry_Rayquaza:: .incbin "sound/direct_sound_samples/cry_rayquaza.bin" .align 2 -Cry_Salamence:: @ 88C0508 +Cry_Salamence:: .incbin "sound/direct_sound_samples/cry_salamence.bin" .align 2 -Cry_Breloom:: @ 88C1E24 +Cry_Breloom:: .incbin "sound/direct_sound_samples/cry_breloom.bin" .align 2 -Cry_Shroomish:: @ 88C2AE4 +Cry_Shroomish:: .incbin "sound/direct_sound_samples/cry_shroomish.bin" .align 2 -Cry_Linoone:: @ 88C33BC +Cry_Linoone:: .incbin "sound/direct_sound_samples/cry_linoone.bin" .align 2 -Cry_Tropius:: @ 88C5258 +Cry_Tropius:: .incbin "sound/direct_sound_samples/cry_tropius.bin" .align 2 -Cry_Wailmer:: @ 88C731C +Cry_Wailmer:: .incbin "sound/direct_sound_samples/cry_wailmer.bin" .align 2 -Cry_Zigzagoon:: @ 88C8F7C +Cry_Zigzagoon:: .incbin "sound/direct_sound_samples/cry_zigzagoon.bin" .align 2 -Cry_Exploud:: @ 88C9B0C +Cry_Exploud:: .incbin "sound/direct_sound_samples/cry_exploud.bin" .align 2 -Cry_Loudred:: @ 88CB754 +Cry_Loudred:: .incbin "sound/direct_sound_samples/cry_loudred.bin" .align 2 -Cry_Wailord:: @ 88CC47C +Cry_Wailord:: .incbin "sound/direct_sound_samples/cry_wailord.bin" .align 2 -Cry_Whismur:: @ 88CEE8C +Cry_Whismur:: .incbin "sound/direct_sound_samples/cry_whismur.bin" .align 2 -Cry_Snorunt:: @ 88CF6B0 +Cry_Snorunt:: .incbin "sound/direct_sound_samples/cry_snorunt.bin" .align 2 -Cry_Latios:: @ 88D07B8 +Cry_Latios:: .incbin "sound/direct_sound_samples/cry_latios.bin" .align 2 -Cry_Jirachi:: @ 88D1DB0 +Cry_Jirachi:: .incbin "sound/direct_sound_samples/cry_jirachi.bin" .align 2 -Cry_Deoxys:: @ 88D2B34 +Cry_Deoxys:: .incbin "sound/direct_sound_samples/cry_deoxys.bin" .align 2 -Cry_Chimecho:: @ 88D4008 +Cry_Chimecho:: .incbin "sound/direct_sound_samples/cry_chimecho.bin" .align 2 -DirectSoundWaveData_88D4A18:: @ 88D4A18 - .incbin "sound/direct_sound_samples/88D4A18.bin" +DirectSoundWaveData_register_noise:: + .incbin "sound/direct_sound_samples/register_noise.bin" .align 2 -DirectSoundWaveData_88D6978:: @ 88D6978 +DirectSoundWaveData_88D6978:: .incbin "sound/direct_sound_samples/88D6978.bin" .align 2 -DirectSoundWaveData_88D8418:: @ 88D8418 - .incbin "sound/direct_sound_samples/88D8418.bin" +DirectSoundWaveData_sc88_nylon_str_guitar:: + .incbin "sound/direct_sound_samples/sc88_nylon_str_guitar.bin" .align 2 -DirectSoundWaveData_88DA388:: @ 88DA388 - .incbin "sound/direct_sound_samples/88DA388.bin" +DirectSoundWaveData_sd90_classical_guitar_harmonics:: + .incbin "sound/direct_sound_samples/sd90_classical_guitar_harmonics.bin" .align 2 -DirectSoundWaveData_88DBBC0:: @ 88DBBC0 +DirectSoundWaveData_88DBBC0:: .incbin "sound/direct_sound_samples/88DBBC0.bin" .align 2 -DirectSoundWaveData_88DC220:: @ 88DC220 +DirectSoundWaveData_88DC220:: .incbin "sound/direct_sound_samples/88DC220.bin" .align 2 -DirectSoundWaveData_88DC704:: @ 88DC704 +DirectSoundWaveData_88DC704:: .incbin "sound/direct_sound_samples/88DC704.bin" .align 2 -DirectSoundWaveData_88DD054:: @ 88DD054 +DirectSoundWaveData_88DD054:: .incbin "sound/direct_sound_samples/88DD054.bin" .align 2 -DirectSoundWaveData_88DDAC4:: @ 88DDAC4 +DirectSoundWaveData_88DDAC4:: .incbin "sound/direct_sound_samples/88DDAC4.bin" .align 2 -DirectSoundWaveData_88DDDE4:: @ 88DDDE4 +DirectSoundWaveData_88DDDE4:: .incbin "sound/direct_sound_samples/88DDDE4.bin" .align 2 -DirectSoundWaveData_88DEA6C:: @ 88DEA6C +DirectSoundWaveData_88DEA6C:: .incbin "sound/direct_sound_samples/88DEA6C.bin" .align 2 -DirectSoundWaveData_88DF08C:: @ 88DF08C +DirectSoundWaveData_88DF08C:: .incbin "sound/direct_sound_samples/88DF08C.bin" .align 2 -DirectSoundWaveData_88DF414:: @ 88DF414 +DirectSoundWaveData_88DF414:: .incbin "sound/direct_sound_samples/88DF414.bin" .align 2 -DirectSoundWaveData_88E01F8:: @ 88E01F8 +DirectSoundWaveData_88E01F8:: .incbin "sound/direct_sound_samples/88E01F8.bin" .align 2 -DirectSoundWaveData_88E0B68:: @ 88E0B68 +DirectSoundWaveData_88E0B68:: .incbin "sound/direct_sound_samples/88E0B68.bin" .align 2 -DirectSoundWaveData_88E0F04:: @ 88E0F04 +DirectSoundWaveData_88E0F04:: .incbin "sound/direct_sound_samples/88E0F04.bin" .align 2 -DirectSoundWaveData_88E16B8:: @ 88E16B8 +DirectSoundWaveData_88E16B8:: .incbin "sound/direct_sound_samples/88E16B8.bin" .align 2 -DirectSoundWaveData_88E2414:: @ 88E2414 +DirectSoundWaveData_88E2414:: .incbin "sound/direct_sound_samples/88E2414.bin" .align 2 -DirectSoundWaveData_88E2658:: @ 88E2658 +DirectSoundWaveData_88E2658:: .incbin "sound/direct_sound_samples/88E2658.bin" .align 2 -DirectSoundWaveData_88E3498:: @ 88E3498 +DirectSoundWaveData_88E3498:: .incbin "sound/direct_sound_samples/88E3498.bin" .align 2 -DirectSoundWaveData_88E3DEC:: @ 88E3DEC +DirectSoundWaveData_88E3DEC:: .incbin "sound/direct_sound_samples/88E3DEC.bin" .align 2 -DirectSoundWaveData_88E4140:: @ 88E4140 +DirectSoundWaveData_88E4140:: .incbin "sound/direct_sound_samples/88E4140.bin" .align 2 -DirectSoundWaveData_88E4774:: @ 88E4774 +DirectSoundWaveData_88E4774:: .incbin "sound/direct_sound_samples/88E4774.bin" .align 2 -DirectSoundWaveData_88E53E0:: @ 88E53E0 +DirectSoundWaveData_88E53E0:: .incbin "sound/direct_sound_samples/88E53E0.bin" .align 2 -DirectSoundWaveData_88E5978:: @ 88E5978 +DirectSoundWaveData_88E5978:: .incbin "sound/direct_sound_samples/88E5978.bin" .align 2 -DirectSoundWaveData_88E647C:: @ 88E647C +DirectSoundWaveData_88E647C:: .incbin "sound/direct_sound_samples/88E647C.bin" .align 2 -DirectSoundWaveData_88E6A80:: @ 88E6A80 +DirectSoundWaveData_88E6A80:: .incbin "sound/direct_sound_samples/88E6A80.bin" .align 2 -DirectSoundWaveData_88E6C78:: @ 88E6C78 +DirectSoundWaveData_88E6C78:: .incbin "sound/direct_sound_samples/88E6C78.bin" .align 2 -DirectSoundWaveData_88E75DC:: @ 88E75DC +DirectSoundWaveData_88E75DC:: .incbin "sound/direct_sound_samples/88E75DC.bin" .align 2 -DirectSoundWaveData_88E8568:: @ 88E8568 +DirectSoundWaveData_88E8568:: .incbin "sound/direct_sound_samples/88E8568.bin" .align 2 -DirectSoundWaveData_88E8BA0:: @ 88E8BA0 +DirectSoundWaveData_88E8BA0:: .incbin "sound/direct_sound_samples/88E8BA0.bin" .align 2 -DirectSoundWaveData_88E9674:: @ 88E9674 +DirectSoundWaveData_88E9674:: .incbin "sound/direct_sound_samples/88E9674.bin" .align 2 -DirectSoundWaveData_88EA5B8:: @ 88EA5B8 +DirectSoundWaveData_88EA5B8:: .incbin "sound/direct_sound_samples/88EA5B8.bin" .align 2 -DirectSoundWaveData_88EAB30:: @ 88EAB30 +DirectSoundWaveData_88EAB30:: .incbin "sound/direct_sound_samples/88EAB30.bin" .align 2 -DirectSoundWaveData_88EB97C:: @ 88EB97C +DirectSoundWaveData_88EB97C:: .incbin "sound/direct_sound_samples/88EB97C.bin" .align 2 -DirectSoundWaveData_88EC884:: @ 88EC884 +DirectSoundWaveData_88EC884:: .incbin "sound/direct_sound_samples/88EC884.bin" .align 2 -DirectSoundWaveData_88ED358:: @ 88ED358 +DirectSoundWaveData_88ED358:: .incbin "sound/direct_sound_samples/88ED358.bin" .align 2 -DirectSoundWaveData_88EDEEC:: @ 88EDEEC +DirectSoundWaveData_88EDEEC:: .incbin "sound/direct_sound_samples/88EDEEC.bin" .align 2 -DirectSoundWaveData_88EE8C4:: @ 88EE8C4 +DirectSoundWaveData_88EE8C4:: .incbin "sound/direct_sound_samples/88EE8C4.bin" .align 2 -DirectSoundWaveData_88EEF04:: @ 88EEF04 +DirectSoundWaveData_88EEF04:: .incbin "sound/direct_sound_samples/88EEF04.bin" .align 2 -DirectSoundWaveData_88EF9E4:: @ 88EF9E4 +DirectSoundWaveData_88EF9E4:: .incbin "sound/direct_sound_samples/88EF9E4.bin" .align 2 -DirectSoundWaveData_88F0020:: @ 88F0020 +DirectSoundWaveData_88F0020:: .incbin "sound/direct_sound_samples/88F0020.bin" .align 2 -DirectSoundWaveData_88F0738:: @ 88F0738 +DirectSoundWaveData_88F0738:: .incbin "sound/direct_sound_samples/88F0738.bin" .align 2 -DirectSoundWaveData_88F1074:: @ 88F1074 +DirectSoundWaveData_88F1074:: .incbin "sound/direct_sound_samples/88F1074.bin" .align 2 -DirectSoundWaveData_88F1830:: @ 88F1830 +DirectSoundWaveData_88F1830:: .incbin "sound/direct_sound_samples/88F1830.bin" .align 2 -DirectSoundWaveData_88F1D94:: @ 88F1D94 +DirectSoundWaveData_88F1D94:: .incbin "sound/direct_sound_samples/88F1D94.bin" .align 2 -DirectSoundWaveData_88F2B08:: @ 88F2B08 +DirectSoundWaveData_88F2B08:: .incbin "sound/direct_sound_samples/88F2B08.bin" .align 2 -DirectSoundWaveData_88F2F84:: @ 88F2F84 +DirectSoundWaveData_88F2F84:: .incbin "sound/direct_sound_samples/88F2F84.bin" .align 2 -DirectSoundWaveData_88F3470:: @ 88F3470 +DirectSoundWaveData_88F3470:: .incbin "sound/direct_sound_samples/88F3470.bin" .align 2 -DirectSoundWaveData_88F3C38:: @ 88F3C38 +DirectSoundWaveData_88F3C38:: .incbin "sound/direct_sound_samples/88F3C38.bin" .align 2 -DirectSoundWaveData_88F4834:: @ 88F4834 +DirectSoundWaveData_88F4834:: .incbin "sound/direct_sound_samples/88F4834.bin" .align 2 -DirectSoundWaveData_88F4BAC:: @ 88F4BAC +DirectSoundWaveData_88F4BAC:: .incbin "sound/direct_sound_samples/88F4BAC.bin" .align 2 -DirectSoundWaveData_88F5368:: @ 88F5368 +DirectSoundWaveData_88F5368:: .incbin "sound/direct_sound_samples/88F5368.bin" .align 2 -DirectSoundWaveData_88F5FCC:: @ 88F5FCC +DirectSoundWaveData_88F5FCC:: .incbin "sound/direct_sound_samples/88F5FCC.bin" .align 2 -DirectSoundWaveData_88F6498:: @ 88F6498 +DirectSoundWaveData_88F6498:: .incbin "sound/direct_sound_samples/88F6498.bin" .align 2 -DirectSoundWaveData_88F6F48:: @ 88F6F48 - .incbin "sound/direct_sound_samples/88F6F48.bin" +DirectSoundWaveData_sc88_accordion_duplicate:: + .incbin "sound/direct_sound_samples/sc88_accordion_duplicate.bin" .align 2 -DirectSoundWaveData_88F8318:: @ 88F8318 - .incbin "sound/direct_sound_samples/88F8318.bin" +DirectSoundWaveData_steinway_b_piano:: + .incbin "sound/direct_sound_samples/steinway_b_piano.bin" .align 2 -DirectSoundWaveData_88F94DC:: @ 88F94DC - .incbin "sound/direct_sound_samples/88F94DC.bin" +DirectSoundWaveData_sd90_classical_whistle:: + .incbin "sound/direct_sound_samples/sd90_classical_whistle.bin" .align 2 -DirectSoundWaveData_88F9F3C:: @ 88F9F3C - .incbin "sound/direct_sound_samples/88F9F3C.bin" +DirectSoundWaveData_sd90_enhanced_delay_shaku:: + .incbin "sound/direct_sound_samples/sd90_enhanced_delay_shaku.bin" diff --git a/sound/direct_sound_samples/86BA7E8.aif b/sound/direct_sound_samples/advanced_orchestra_voice_ahhs.aif similarity index 100% rename from sound/direct_sound_samples/86BA7E8.aif rename to sound/direct_sound_samples/advanced_orchestra_voice_ahhs.aif diff --git a/sound/direct_sound_samples/87240CC.aif b/sound/direct_sound_samples/bicycle_bell.aif similarity index 100% rename from sound/direct_sound_samples/87240CC.aif rename to sound/direct_sound_samples/bicycle_bell.aif diff --git a/sound/direct_sound_samples/86D1A2C.aif b/sound/direct_sound_samples/dance_drums_ride_bell.aif similarity index 100% rename from sound/direct_sound_samples/86D1A2C.aif rename to sound/direct_sound_samples/dance_drums_ride_bell.aif diff --git a/sound/direct_sound_samples/86CD0C4.aif b/sound/direct_sound_samples/drum_and_percussion_kick.aif similarity index 100% rename from sound/direct_sound_samples/86CD0C4.aif rename to sound/direct_sound_samples/drum_and_percussion_kick.aif diff --git a/sound/direct_sound_samples/8717980.aif b/sound/direct_sound_samples/emu_ii_pipe_organ.aif similarity index 100% rename from sound/direct_sound_samples/8717980.aif rename to sound/direct_sound_samples/emu_ii_pipe_organ.aif diff --git a/sound/direct_sound_samples/8710AB8.aif b/sound/direct_sound_samples/heart_of_asia_gamelan.aif similarity index 100% rename from sound/direct_sound_samples/8710AB8.aif rename to sound/direct_sound_samples/heart_of_asia_gamelan.aif diff --git a/sound/direct_sound_samples/86B776C.aif b/sound/direct_sound_samples/jv1080_slap_bass.aif similarity index 100% rename from sound/direct_sound_samples/86B776C.aif rename to sound/direct_sound_samples/jv1080_slap_bass.aif diff --git a/sound/direct_sound_samples/88D4A18.aif b/sound/direct_sound_samples/register_noise.aif similarity index 100% rename from sound/direct_sound_samples/88D4A18.aif rename to sound/direct_sound_samples/register_noise.aif diff --git a/sound/direct_sound_samples/87410E0.aif b/sound/direct_sound_samples/sc88_accordion.aif similarity index 100% rename from sound/direct_sound_samples/87410E0.aif rename to sound/direct_sound_samples/sc88_accordion.aif diff --git a/sound/direct_sound_samples/88F6F48.aif b/sound/direct_sound_samples/sc88_accordion_duplicate.aif similarity index 100% rename from sound/direct_sound_samples/88F6F48.aif rename to sound/direct_sound_samples/sc88_accordion_duplicate.aif diff --git a/sound/direct_sound_samples/86CC5E4.aif b/sound/direct_sound_samples/sc88_bongo.aif similarity index 100% rename from sound/direct_sound_samples/86CC5E4.aif rename to sound/direct_sound_samples/sc88_bongo.aif diff --git a/sound/direct_sound_samples/86CCAFC.aif b/sound/direct_sound_samples/sc88_bongo_low.aif similarity index 100% rename from sound/direct_sound_samples/86CCAFC.aif rename to sound/direct_sound_samples/sc88_bongo_low.aif diff --git a/sound/direct_sound_samples/872DE98.aif b/sound/direct_sound_samples/sc88_bubbles.aif similarity index 100% rename from sound/direct_sound_samples/872DE98.aif rename to sound/direct_sound_samples/sc88_bubbles.aif diff --git a/sound/direct_sound_samples/86FF65C.aif b/sound/direct_sound_samples/sc88_flute.aif similarity index 100% rename from sound/direct_sound_samples/86FF65C.aif rename to sound/direct_sound_samples/sc88_flute.aif diff --git a/sound/direct_sound_samples/86F4144.aif b/sound/direct_sound_samples/sc88_french_horn_60.aif similarity index 100% rename from sound/direct_sound_samples/86F4144.aif rename to sound/direct_sound_samples/sc88_french_horn_60.aif diff --git a/sound/direct_sound_samples/86FB0D8.aif b/sound/direct_sound_samples/sc88_french_horn_72.aif similarity index 100% rename from sound/direct_sound_samples/86FB0D8.aif rename to sound/direct_sound_samples/sc88_french_horn_72.aif diff --git a/sound/direct_sound_samples/86B6BA0.aif b/sound/direct_sound_samples/sc88_fretless_bass.aif similarity index 100% rename from sound/direct_sound_samples/86B6BA0.aif rename to sound/direct_sound_samples/sc88_fretless_bass.aif diff --git a/sound/direct_sound_samples/86B5D04.aif b/sound/direct_sound_samples/sc88_glockenspiel.aif similarity index 100% rename from sound/direct_sound_samples/86B5D04.aif rename to sound/direct_sound_samples/sc88_glockenspiel.aif diff --git a/sound/direct_sound_samples/873D874.aif b/sound/direct_sound_samples/sc88_harp.aif similarity index 100% rename from sound/direct_sound_samples/873D874.aif rename to sound/direct_sound_samples/sc88_harp.aif diff --git a/sound/direct_sound_samples/88D8418.aif b/sound/direct_sound_samples/sc88_nylon_str_guitar.aif similarity index 100% rename from sound/direct_sound_samples/88D8418.aif rename to sound/direct_sound_samples/sc88_nylon_str_guitar.aif diff --git a/sound/direct_sound_samples/86B63A8.aif b/sound/direct_sound_samples/sc88_organ2.aif similarity index 100% rename from sound/direct_sound_samples/86B63A8.aif rename to sound/direct_sound_samples/sc88_organ2.aif diff --git a/sound/direct_sound_samples/86E0D98.aif b/sound/direct_sound_samples/sc88_piano1_48.aif similarity index 100% rename from sound/direct_sound_samples/86E0D98.aif rename to sound/direct_sound_samples/sc88_piano1_48.aif diff --git a/sound/direct_sound_samples/86E1CF8.aif b/sound/direct_sound_samples/sc88_piano1_60.aif similarity index 100% rename from sound/direct_sound_samples/86E1CF8.aif rename to sound/direct_sound_samples/sc88_piano1_60.aif diff --git a/sound/direct_sound_samples/86E3358.aif b/sound/direct_sound_samples/sc88_piano1_72.aif similarity index 100% rename from sound/direct_sound_samples/86E3358.aif rename to sound/direct_sound_samples/sc88_piano1_72.aif diff --git a/sound/direct_sound_samples/86E48B4.aif b/sound/direct_sound_samples/sc88_piano1_84.aif similarity index 100% rename from sound/direct_sound_samples/86E48B4.aif rename to sound/direct_sound_samples/sc88_piano1_84.aif diff --git a/sound/direct_sound_samples/86FFDC0.aif b/sound/direct_sound_samples/sc88_pick_bass.aif similarity index 100% rename from sound/direct_sound_samples/86FFDC0.aif rename to sound/direct_sound_samples/sc88_pick_bass.aif diff --git a/sound/direct_sound_samples/8726EF0.aif b/sound/direct_sound_samples/sc88_pizzicato_strings.aif similarity index 100% rename from sound/direct_sound_samples/8726EF0.aif rename to sound/direct_sound_samples/sc88_pizzicato_strings.aif diff --git a/sound/direct_sound_samples/86DB908.aif b/sound/direct_sound_samples/sc88_standard_bells.aif similarity index 100% rename from sound/direct_sound_samples/86DB908.aif rename to sound/direct_sound_samples/sc88_standard_bells.aif diff --git a/sound/direct_sound_samples/86CB6B8.aif b/sound/direct_sound_samples/sc88_standard_cymbal_crash.aif similarity index 100% rename from sound/direct_sound_samples/86CB6B8.aif rename to sound/direct_sound_samples/sc88_standard_cymbal_crash.aif diff --git a/sound/direct_sound_samples/86C6200.aif b/sound/direct_sound_samples/sc88_standard_hand_clap.aif similarity index 100% rename from sound/direct_sound_samples/86C6200.aif rename to sound/direct_sound_samples/sc88_standard_hand_clap.aif diff --git a/sound/direct_sound_samples/86C566C.aif b/sound/direct_sound_samples/sc88_standard_kick.aif similarity index 100% rename from sound/direct_sound_samples/86C566C.aif rename to sound/direct_sound_samples/sc88_standard_kick.aif diff --git a/sound/direct_sound_samples/86C5B0C.aif b/sound/direct_sound_samples/sc88_standard_snare1.aif similarity index 100% rename from sound/direct_sound_samples/86C5B0C.aif rename to sound/direct_sound_samples/sc88_standard_snare1.aif diff --git a/sound/direct_sound_samples/86C6A90.aif b/sound/direct_sound_samples/sc88_standard_snare2.aif similarity index 100% rename from sound/direct_sound_samples/86C6A90.aif rename to sound/direct_sound_samples/sc88_standard_snare2.aif diff --git a/sound/direct_sound_samples/86E5440.aif b/sound/direct_sound_samples/sc88_string_ensemble_60.aif similarity index 100% rename from sound/direct_sound_samples/86E5440.aif rename to sound/direct_sound_samples/sc88_string_ensemble_60.aif diff --git a/sound/direct_sound_samples/86E89E4.aif b/sound/direct_sound_samples/sc88_string_ensemble_72.aif similarity index 100% rename from sound/direct_sound_samples/86E89E4.aif rename to sound/direct_sound_samples/sc88_string_ensemble_72.aif diff --git a/sound/direct_sound_samples/86EAD00.aif b/sound/direct_sound_samples/sc88_string_ensemble_84.aif similarity index 100% rename from sound/direct_sound_samples/86EAD00.aif rename to sound/direct_sound_samples/sc88_string_ensemble_84.aif diff --git a/sound/direct_sound_samples/86B86A4.aif b/sound/direct_sound_samples/sc88_synth_bass.aif similarity index 100% rename from sound/direct_sound_samples/86B86A4.aif rename to sound/direct_sound_samples/sc88_synth_bass.aif diff --git a/sound/direct_sound_samples/86B9318.aif b/sound/direct_sound_samples/sc88_timpani.aif similarity index 100% rename from sound/direct_sound_samples/86B9318.aif rename to sound/direct_sound_samples/sc88_timpani.aif diff --git a/sound/direct_sound_samples/87205DC.aif b/sound/direct_sound_samples/sc88_timpani_with_snare.aif similarity index 100% rename from sound/direct_sound_samples/87205DC.aif rename to sound/direct_sound_samples/sc88_timpani_with_snare.aif diff --git a/sound/direct_sound_samples/86EE3CC.aif b/sound/direct_sound_samples/sc88_trumpet_60.aif similarity index 100% rename from sound/direct_sound_samples/86EE3CC.aif rename to sound/direct_sound_samples/sc88_trumpet_60.aif diff --git a/sound/direct_sound_samples/86EF71C.aif b/sound/direct_sound_samples/sc88_trumpet_72.aif similarity index 100% rename from sound/direct_sound_samples/86EF71C.aif rename to sound/direct_sound_samples/sc88_trumpet_72.aif diff --git a/sound/direct_sound_samples/86F0C2C.aif b/sound/direct_sound_samples/sc88_trumpet_84.aif similarity index 100% rename from sound/direct_sound_samples/86F0C2C.aif rename to sound/direct_sound_samples/sc88_trumpet_84.aif diff --git a/sound/direct_sound_samples/8736C74.aif b/sound/direct_sound_samples/sc88_tubular_bell.aif similarity index 100% rename from sound/direct_sound_samples/8736C74.aif rename to sound/direct_sound_samples/sc88_tubular_bell.aif diff --git a/sound/direct_sound_samples/872CC54.aif b/sound/direct_sound_samples/sc88_wind.aif similarity index 100% rename from sound/direct_sound_samples/872CC54.aif rename to sound/direct_sound_samples/sc88_wind.aif diff --git a/sound/direct_sound_samples/873E2A4.aif b/sound/direct_sound_samples/sc88_xylophone.aif similarity index 100% rename from sound/direct_sound_samples/873E2A4.aif rename to sound/direct_sound_samples/sc88_xylophone.aif diff --git a/sound/direct_sound_samples/86CF950.aif b/sound/direct_sound_samples/sd90_ambient_tom.aif similarity index 100% rename from sound/direct_sound_samples/86CF950.aif rename to sound/direct_sound_samples/sd90_ambient_tom.aif diff --git a/sound/direct_sound_samples/870AE74.aif b/sound/direct_sound_samples/sd90_classical_distortion_guitar_high.aif similarity index 100% rename from sound/direct_sound_samples/870AE74.aif rename to sound/direct_sound_samples/sd90_classical_distortion_guitar_high.aif diff --git a/sound/direct_sound_samples/870DE64.aif b/sound/direct_sound_samples/sd90_classical_distortion_guitar_low.aif similarity index 100% rename from sound/direct_sound_samples/870DE64.aif rename to sound/direct_sound_samples/sd90_classical_distortion_guitar_low.aif diff --git a/sound/direct_sound_samples/88DA388.aif b/sound/direct_sound_samples/sd90_classical_guitar_harmonics.aif similarity index 100% rename from sound/direct_sound_samples/88DA388.aif rename to sound/direct_sound_samples/sd90_classical_guitar_harmonics.aif diff --git a/sound/direct_sound_samples/86BBE98.aif b/sound/direct_sound_samples/sd90_classical_oboe.aif similarity index 100% rename from sound/direct_sound_samples/86BBE98.aif rename to sound/direct_sound_samples/sd90_classical_oboe.aif diff --git a/sound/direct_sound_samples/8709004.aif b/sound/direct_sound_samples/sd90_classical_overdrive_guitar.aif similarity index 100% rename from sound/direct_sound_samples/8709004.aif rename to sound/direct_sound_samples/sd90_classical_overdrive_guitar.aif diff --git a/sound/direct_sound_samples/8703214.aif b/sound/direct_sound_samples/sd90_classical_shakuhachi.aif similarity index 100% rename from sound/direct_sound_samples/8703214.aif rename to sound/direct_sound_samples/sd90_classical_shakuhachi.aif diff --git a/sound/direct_sound_samples/88F94DC.aif b/sound/direct_sound_samples/sd90_classical_whistle.aif similarity index 100% rename from sound/direct_sound_samples/88F94DC.aif rename to sound/direct_sound_samples/sd90_classical_whistle.aif diff --git a/sound/direct_sound_samples/88F9F3C.aif b/sound/direct_sound_samples/sd90_enhanced_delay_shaku.aif similarity index 100% rename from sound/direct_sound_samples/88F9F3C.aif rename to sound/direct_sound_samples/sd90_enhanced_delay_shaku.aif diff --git a/sound/direct_sound_samples/86CDFDC.aif b/sound/direct_sound_samples/sd90_solo_snare.aif similarity index 100% rename from sound/direct_sound_samples/86CDFDC.aif rename to sound/direct_sound_samples/sd90_solo_snare.aif diff --git a/sound/direct_sound_samples/88F8318.aif b/sound/direct_sound_samples/steinway_b_piano.aif similarity index 100% rename from sound/direct_sound_samples/88F8318.aif rename to sound/direct_sound_samples/steinway_b_piano.aif diff --git a/sound/direct_sound_samples/86DAA94.aif b/sound/direct_sound_samples/unknown_anvil_high.aif similarity index 100% rename from sound/direct_sound_samples/86DAA94.aif rename to sound/direct_sound_samples/unknown_anvil_high.aif diff --git a/sound/direct_sound_samples/86DD11C.aif b/sound/direct_sound_samples/unknown_anvil_low.aif similarity index 100% rename from sound/direct_sound_samples/86DD11C.aif rename to sound/direct_sound_samples/unknown_anvil_low.aif diff --git a/sound/direct_sound_samples/86C958C.aif b/sound/direct_sound_samples/unknown_bell.aif similarity index 100% rename from sound/direct_sound_samples/86C958C.aif rename to sound/direct_sound_samples/unknown_bell.aif diff --git a/sound/direct_sound_samples/8715038.aif b/sound/direct_sound_samples/unknown_church_organ.aif similarity index 100% rename from sound/direct_sound_samples/8715038.aif rename to sound/direct_sound_samples/unknown_church_organ.aif diff --git a/sound/direct_sound_samples/86C8348.aif b/sound/direct_sound_samples/unknown_close_hihat.aif similarity index 100% rename from sound/direct_sound_samples/86C8348.aif rename to sound/direct_sound_samples/unknown_close_hihat.aif diff --git a/sound/direct_sound_samples/86D925C.aif b/sound/direct_sound_samples/unknown_cowbell.aif similarity index 100% rename from sound/direct_sound_samples/86D925C.aif rename to sound/direct_sound_samples/unknown_cowbell.aif diff --git a/sound/direct_sound_samples/86CADD4.aif b/sound/direct_sound_samples/unknown_cymbal_crash.aif similarity index 100% rename from sound/direct_sound_samples/86CADD4.aif rename to sound/direct_sound_samples/unknown_cymbal_crash.aif diff --git a/sound/direct_sound_samples/86D9C14.aif b/sound/direct_sound_samples/unknown_djembe.aif similarity index 100% rename from sound/direct_sound_samples/86D9C14.aif rename to sound/direct_sound_samples/unknown_djembe.aif diff --git a/sound/direct_sound_samples/871F234.aif b/sound/direct_sound_samples/unknown_e_piano_high.aif similarity index 100% rename from sound/direct_sound_samples/871F234.aif rename to sound/direct_sound_samples/unknown_e_piano_high.aif diff --git a/sound/direct_sound_samples/871CBCC.aif b/sound/direct_sound_samples/unknown_e_piano_low.aif similarity index 100% rename from sound/direct_sound_samples/871CBCC.aif rename to sound/direct_sound_samples/unknown_e_piano_low.aif diff --git a/sound/direct_sound_samples/86DE6C0.aif b/sound/direct_sound_samples/unknown_ethnic_drum.aif similarity index 100% rename from sound/direct_sound_samples/86DE6C0.aif rename to sound/direct_sound_samples/unknown_ethnic_drum.aif diff --git a/sound/direct_sound_samples/8701A10.aif b/sound/direct_sound_samples/unknown_koto_high.aif similarity index 100% rename from sound/direct_sound_samples/8701A10.aif rename to sound/direct_sound_samples/unknown_koto_high.aif diff --git a/sound/direct_sound_samples/8706DCC.aif b/sound/direct_sound_samples/unknown_koto_low.aif similarity index 100% rename from sound/direct_sound_samples/8706DCC.aif rename to sound/direct_sound_samples/unknown_koto_low.aif diff --git a/sound/direct_sound_samples/86C875C.aif b/sound/direct_sound_samples/unknown_open_hihat.aif similarity index 100% rename from sound/direct_sound_samples/86C875C.aif rename to sound/direct_sound_samples/unknown_open_hihat.aif diff --git a/sound/direct_sound_samples/873A594.aif b/sound/direct_sound_samples/unknown_polysynth.aif similarity index 100% rename from sound/direct_sound_samples/873A594.aif rename to sound/direct_sound_samples/unknown_polysynth.aif diff --git a/sound/direct_sound_samples/86C2590.aif b/sound/direct_sound_samples/unknown_snare.aif similarity index 100% rename from sound/direct_sound_samples/86C2590.aif rename to sound/direct_sound_samples/unknown_snare.aif diff --git a/sound/direct_sound_samples/8721AAC.aif b/sound/direct_sound_samples/unknown_synth_snare.aif similarity index 100% rename from sound/direct_sound_samples/8721AAC.aif rename to sound/direct_sound_samples/unknown_synth_snare.aif diff --git a/sound/direct_sound_samples/86CA520.aif b/sound/direct_sound_samples/unknown_tambourine.aif similarity index 100% rename from sound/direct_sound_samples/86CA520.aif rename to sound/direct_sound_samples/unknown_tambourine.aif diff --git a/sound/direct_sound_samples/86C7308.aif b/sound/direct_sound_samples/unknown_tom.aif similarity index 100% rename from sound/direct_sound_samples/86C7308.aif rename to sound/direct_sound_samples/unknown_tom.aif diff --git a/sound/direct_sound_samples/86F204C.aif b/sound/direct_sound_samples/unknown_trombone_39.aif similarity index 100% rename from sound/direct_sound_samples/86F204C.aif rename to sound/direct_sound_samples/unknown_trombone_39.aif diff --git a/sound/direct_sound_samples/86F30E8.aif b/sound/direct_sound_samples/unknown_trombone_51.aif similarity index 100% rename from sound/direct_sound_samples/86F30E8.aif rename to sound/direct_sound_samples/unknown_trombone_51.aif diff --git a/sound/direct_sound_samples/86DFCA4.aif b/sound/direct_sound_samples/unknown_tsuzumi.aif similarity index 100% rename from sound/direct_sound_samples/86DFCA4.aif rename to sound/direct_sound_samples/unknown_tsuzumi.aif diff --git a/sound/direct_sound_samples/86C4344.aif b/sound/direct_sound_samples/unknown_wood_block_high.aif similarity index 100% rename from sound/direct_sound_samples/86C4344.aif rename to sound/direct_sound_samples/unknown_wood_block_high.aif diff --git a/sound/direct_sound_samples/86C2A68.aif b/sound/direct_sound_samples/unknown_wood_block_low.aif similarity index 100% rename from sound/direct_sound_samples/86C2A68.aif rename to sound/direct_sound_samples/unknown_wood_block_low.aif diff --git a/sound/direct_sound_samples/87322BC.aif b/sound/direct_sound_samples/unused_acid_bass.aif similarity index 100% rename from sound/direct_sound_samples/87322BC.aif rename to sound/direct_sound_samples/unused_acid_bass.aif diff --git a/sound/direct_sound_samples/86BDC80.aif b/sound/direct_sound_samples/unused_electric_guitar.aif similarity index 100% rename from sound/direct_sound_samples/86BDC80.aif rename to sound/direct_sound_samples/unused_electric_guitar.aif diff --git a/sound/direct_sound_samples/87224B8.aif b/sound/direct_sound_samples/unused_sc88_square.aif similarity index 100% rename from sound/direct_sound_samples/87224B8.aif rename to sound/direct_sound_samples/unused_sc88_square.aif diff --git a/sound/direct_sound_samples/86BEF94.aif b/sound/direct_sound_samples/unused_sc88_unison_slap.aif similarity index 100% rename from sound/direct_sound_samples/86BEF94.aif rename to sound/direct_sound_samples/unused_sc88_unison_slap.aif diff --git a/sound/direct_sound_samples/86BD1DC.aif b/sound/direct_sound_samples/unused_sd90_oboe.aif similarity index 100% rename from sound/direct_sound_samples/86BD1DC.aif rename to sound/direct_sound_samples/unused_sd90_oboe.aif diff --git a/sound/direct_sound_samples/87190E0.aif b/sound/direct_sound_samples/unused_unknown_female_voice.aif similarity index 100% rename from sound/direct_sound_samples/87190E0.aif rename to sound/direct_sound_samples/unused_unknown_female_voice.aif diff --git a/sound/direct_sound_samples/871A724.aif b/sound/direct_sound_samples/unused_unknown_male_voice.aif similarity index 100% rename from sound/direct_sound_samples/871A724.aif rename to sound/direct_sound_samples/unused_unknown_male_voice.aif diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc index e725047b9..c0f546ccf 100644 --- a/sound/voice_groups.inc +++ b/sound/voice_groups.inc @@ -9,7 +9,7 @@ voicegroup000:: @ 8675D04 voice_square_2 2, 0, 0, 9, 2 @ 8675D4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D64 - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 165, 51, 235 @ 8675D70 + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 235 @ 8675D70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D88 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D94 @@ -17,7 +17,7 @@ voicegroup000:: @ 8675D04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DC4 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 127 @ 8675DD0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 8675DD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DDC voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DF4 @@ -32,13 +32,13 @@ voicegroup000:: @ 8675D04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E60 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E78 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 149 @ 8675E84 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 149 @ 8675E84 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E90 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8675EA8 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 115 @ 8675EB4 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 115 @ 8675EB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675EC0 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 8675ECC + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8675ECC voice_square_1 0, 2, 0, 0, 15, 0 @ 8675ED8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675EE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675EF0 @@ -47,7 +47,7 @@ voicegroup000:: @ 8675D04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F2C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 204, 193, 239 @ 8675F38 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 204, 193, 239 @ 8675F38 voice_keysplit voicegroup006, KeySplitTable2 @ 8675F44 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F50 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F5C @@ -93,78 +93,78 @@ voicegroup001:: @ 8675FEC voice_square_1 0, 0, 0, 1, 6, 0 @ 8676118 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676124 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676130 - voice_directsound 60, 0, DirectSoundWaveData_86BA7E8, 255, 0, 255, 0 @ 867613C + voice_directsound 60, 0, DirectSoundWaveData_advanced_orchestra_voice_ahhs, 255, 0, 255, 0 @ 867613C .align 2 voicegroup002:: @ 8676148 - voice_directsound 60, 0, DirectSoundWaveData_86BBE98, 255, 165, 154, 127 @ 8676148 - voice_directsound 60, 0, DirectSoundWaveData_86BD1DC, 255, 165, 154, 127 @ 8676154 - voice_directsound 60, 0, DirectSoundWaveData_86BDC80, 255, 165, 206, 127 @ 8676160 - voice_directsound 60, 0, DirectSoundWaveData_86BEF94, 255, 165, 206, 127 @ 867616C - voice_directsound 60, 0, DirectSoundWaveData_86C2590, 255, 0, 255, 0 @ 8676178 - voice_directsound 60, 0, DirectSoundWaveData_86C2A68, 255, 0, 255, 0 @ 8676184 - voice_directsound 60, 0, DirectSoundWaveData_86C4344, 255, 0, 255, 0 @ 8676190 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C566C, 255, 0, 255, 242 @ 867619C + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 255, 165, 154, 127 @ 8676148 + voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 255, 165, 154, 127 @ 8676154 + voice_directsound 60, 0, DirectSoundWaveData_unused_electric_guitar, 255, 165, 206, 127 @ 8676160 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_unison_slap, 255, 165, 206, 127 @ 867616C + voice_directsound 60, 0, DirectSoundWaveData_unknown_snare, 255, 0, 255, 0 @ 8676178 + voice_directsound 60, 0, DirectSoundWaveData_unknown_wood_block_low, 255, 0, 255, 0 @ 8676184 + voice_directsound 60, 0, DirectSoundWaveData_unknown_wood_block_high, 255, 0, 255, 0 @ 8676190 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_kick, 255, 0, 255, 242 @ 867619C voice_square_1 0, 2, 0, 0, 15, 0 @ 86761A8 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C5B0C, 255, 0, 255, 242 @ 86761B4 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C6200, 255, 255, 255, 127 @ 86761C0 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C6A90, 255, 0, 255, 242 @ 86761CC - voice_directsound 48, 44, DirectSoundWaveData_86C7308, 255, 210, 77, 204 @ 86761D8 - voice_directsound_no_resample 60, 79, DirectSoundWaveData_86C8348, 255, 127, 0, 188 @ 86761E4 - voice_directsound 51, 54, DirectSoundWaveData_86C7308, 255, 216, 77, 204 @ 86761F0 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 86761B4 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 86761C0 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 86761CC + voice_directsound 48, 44, DirectSoundWaveData_unknown_tom, 255, 210, 77, 204 @ 86761D8 + voice_directsound_no_resample 60, 79, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188 @ 86761E4 + voice_directsound 51, 54, DirectSoundWaveData_unknown_tom, 255, 216, 77, 204 @ 86761F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86761FC - voice_directsound 54, 64, DirectSoundWaveData_86C7308, 255, 216, 77, 204 @ 8676208 - voice_directsound_no_resample 60, 79, DirectSoundWaveData_86C875C, 255, 242, 141, 0 @ 8676214 - voice_directsound 57, 69, DirectSoundWaveData_86C7308, 255, 210, 77, 204 @ 8676220 - voice_directsound 60, 79, DirectSoundWaveData_86C7308, 255, 204, 77, 204 @ 867622C + voice_directsound 54, 64, DirectSoundWaveData_unknown_tom, 255, 216, 77, 204 @ 8676208 + voice_directsound_no_resample 60, 79, DirectSoundWaveData_unknown_open_hihat, 255, 242, 141, 0 @ 8676214 + voice_directsound 57, 69, DirectSoundWaveData_unknown_tom, 255, 210, 77, 204 @ 8676220 + voice_directsound 60, 79, DirectSoundWaveData_unknown_tom, 255, 204, 77, 204 @ 867622C voice_square_1 0, 2, 0, 0, 15, 0 @ 8676238 - voice_directsound 62, 84, DirectSoundWaveData_86C7308, 255, 204, 77, 204 @ 8676244 + voice_directsound 62, 84, DirectSoundWaveData_unknown_tom, 255, 204, 77, 204 @ 8676244 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676250 voice_square_1 0, 2, 0, 0, 15, 0 @ 867625C - voice_directsound_no_resample 70, 49, DirectSoundWaveData_86C958C, 255, 165, 103, 231 @ 8676268 - voice_directsound_no_resample 32, 34, DirectSoundWaveData_86CA520, 255, 127, 77, 204 @ 8676274 - voice_directsound_no_resample 60, 14, DirectSoundWaveData_86CADD4, 255, 235, 0, 165 @ 8676280 + voice_directsound_no_resample 70, 49, DirectSoundWaveData_unknown_bell, 255, 165, 103, 231 @ 8676268 + voice_directsound_no_resample 32, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 8676274 + voice_directsound_no_resample 60, 14, DirectSoundWaveData_unknown_cymbal_crash, 255, 235, 0, 165 @ 8676280 voice_square_1 0, 2, 0, 0, 15, 0 @ 867628C - voice_directsound_no_resample 30, 54, DirectSoundWaveData_86CB6B8, 255, 246, 0, 216 @ 8676298 + voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 246, 0, 216 @ 8676298 voice_square_1 0, 2, 0, 0, 15, 0 @ 86762A4 - voice_directsound_no_resample 30, 54, DirectSoundWaveData_86CB6B8, 255, 246, 0, 216 @ 86762B0 - voice_directsound_no_resample 30, 64, DirectSoundWaveData_86CB6B8, 8, 0, 255, 216 @ 86762BC + voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 246, 0, 216 @ 86762B0 + voice_directsound_no_resample 30, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 8, 0, 255, 216 @ 86762BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86762C8 - voice_directsound_no_resample 72, 104, DirectSoundWaveData_86CC5E4, 255, 0, 255, 0 @ 86762D4 + voice_directsound_no_resample 72, 104, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 86762D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86762E0 - voice_directsound_no_resample 72, 94, DirectSoundWaveData_86CCAFC, 255, 0, 255, 0 @ 86762EC - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CD0C4, 255, 0, 255, 0 @ 86762F8 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CDFDC, 255, 180, 175, 228 @ 8676304 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CDFDC, 255, 0, 255, 242 @ 8676310 - voice_directsound_no_resample 64, 54, DirectSoundWaveData_86C6200, 255, 255, 255, 127 @ 867631C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86C6A90, 255, 0, 255, 242 @ 8676328 - voice_directsound 64, 24, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 8676334 - voice_directsound_no_resample 64, 80, DirectSoundWaveData_86C6A90, 255, 0, 255, 242 @ 8676340 - voice_directsound 68, 34, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 867634C - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C5B0C, 255, 0, 255, 242 @ 8676358 - voice_directsound 72, 44, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 8676364 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C5B0C, 255, 0, 255, 242 @ 8676370 - voice_directsound 76, 84, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 867637C - voice_directsound 80, 94, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 8676388 - voice_directsound_no_resample 33, 89, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 8676394 - voice_directsound 84, 104, DirectSoundWaveData_86CF950, 255, 0, 255, 235 @ 86763A0 + voice_directsound_no_resample 72, 94, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86762EC + voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 86762F8 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 8676304 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 8676310 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 867631C + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 8676328 + voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676334 + voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 8676340 + voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 867634C + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 8676358 + voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676364 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 8676370 + voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 867637C + voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676388 + voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 8676394 + voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235 @ 86763A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86763AC - voice_directsound 63, 64, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 86763B8 - voice_directsound_no_resample 64, 24, DirectSoundWaveData_86D1A2C, 255, 165, 103, 231 @ 86763C4 + voice_directsound 63, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86763B8 + voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 86763C4 .align 2 voicegroup003:: @ 86763D0 - voice_directsound_no_resample 64, 34, DirectSoundWaveData_86CA520, 255, 127, 77, 204 @ 86763D0 - voice_directsound_no_resample 64, 14, DirectSoundWaveData_86CADD4, 255, 231, 0, 188 @ 86763DC - voice_directsound_no_resample 64, 89, DirectSoundWaveData_86D925C, 255, 0, 255, 242 @ 86763E8 - voice_directsound_no_resample 64, 29, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 86763F4 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 86763D0 + voice_directsound_no_resample 64, 14, DirectSoundWaveData_unknown_cymbal_crash, 255, 231, 0, 188 @ 86763DC + voice_directsound_no_resample 64, 89, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242 @ 86763E8 + voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86763F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676400 - voice_directsound_no_resample 64, 54, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 867640C - voice_directsound_no_resample 64, 54, DirectSoundWaveData_86CB6B8, 8, 0, 255, 216 @ 8676418 - voice_directsound_no_resample 64, 94, DirectSoundWaveData_86D9C14, 255, 0, 255, 0 @ 8676424 - voice_directsound_no_resample 64, 34, DirectSoundWaveData_86CC5E4, 255, 0, 255, 0 @ 8676430 - voice_directsound_no_resample 64, 34, DirectSoundWaveData_86CCAFC, 255, 0, 255, 0 @ 867643C - voice_directsound_no_resample 64, 90, DirectSoundWaveData_86CCAFC, 255, 0, 255, 0 @ 8676448 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 867640C + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 8, 0, 255, 216 @ 8676418 + voice_directsound_no_resample 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 8676424 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 8676430 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 867643C + voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 8676448 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676454 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676460 voice_square_1 0, 2, 0, 0, 15, 0 @ 867646C @@ -180,48 +180,48 @@ voicegroup003:: @ 86763D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86764E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86764F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86764FC - voice_directsound_no_resample 64, 39, DirectSoundWaveData_86DAA94, 255, 242, 103, 188 @ 8676508 - voice_directsound_no_resample 64, 79, DirectSoundWaveData_86DAA94, 255, 242, 103, 188 @ 8676514 - voice_directsound_no_resample 64, 39, DirectSoundWaveData_86DAA94, 255, 165, 103, 188 @ 8676520 - voice_directsound_no_resample 64, 24, DirectSoundWaveData_86DB908, 255, 0, 255, 0 @ 867652C + voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 8676508 + voice_directsound_no_resample 64, 79, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 8676514 + voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188 @ 8676520 + voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 867652C voice_square_1 0, 2, 0, 0, 15, 0 @ 8676538 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676544 - voice_directsound_no_resample 64, 104, DirectSoundWaveData_86DD11C, 255, 0, 255, 0 @ 8676550 - voice_directsound 63, 64, DirectSoundWaveData_86DE6C0, 255, 0, 255, 0 @ 867655C - voice_directsound 50, 84, DirectSoundWaveData_86DFCA4, 255, 0, 255, 0 @ 8676568 - voice_directsound 64, 84, DirectSoundWaveData_86DFCA4, 255, 0, 255, 0 @ 8676574 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86DE6C0, 255, 0, 255, 0 @ 8676580 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CDFDC, 255, 180, 175, 228 @ 867658C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CDFDC, 255, 0, 255, 242 @ 8676598 - voice_directsound_no_resample 64, 54, DirectSoundWaveData_86C6200, 255, 255, 255, 127 @ 86765A4 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86C6A90, 255, 0, 255, 242 @ 86765B0 - voice_directsound 64, 24, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 86765BC - voice_directsound_no_resample 64, 80, DirectSoundWaveData_86C6A90, 255, 0, 255, 242 @ 86765C8 - voice_directsound 68, 34, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 86765D4 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C5B0C, 255, 0, 255, 242 @ 86765E0 - voice_directsound 72, 44, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 86765EC + voice_directsound_no_resample 64, 104, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 8676550 + voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 867655C + voice_directsound 50, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 8676568 + voice_directsound 64, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 8676574 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 8676580 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 867658C + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 8676598 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 86765A4 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 86765B0 + voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86765BC + voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 86765C8 + voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86765D4 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 86765E0 + voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86765EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86765F8 - voice_directsound 76, 84, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 8676604 - voice_directsound 80, 94, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 8676610 - voice_directsound_no_resample 33, 89, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 867661C - voice_directsound 64, 104, DirectSoundWaveData_86DE6C0, 255, 0, 255, 235 @ 8676628 + voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676604 + voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676610 + voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 867661C + voice_directsound 64, 104, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 235 @ 8676628 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676634 - voice_directsound 63, 64, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 8676640 - voice_directsound_no_resample 64, 24, DirectSoundWaveData_86D1A2C, 255, 165, 103, 231 @ 867664C + voice_directsound 63, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 8676640 + voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 867664C .align 2 voicegroup004:: @ 8676658 - voice_directsound_no_resample 66, 34, DirectSoundWaveData_86CA520, 255, 127, 77, 204 @ 8676658 - voice_directsound_no_resample 64, 14, DirectSoundWaveData_86CADD4, 255, 231, 0, 188 @ 8676664 - voice_directsound_no_resample 64, 89, DirectSoundWaveData_86D925C, 255, 0, 255, 242 @ 8676670 - voice_directsound_no_resample 64, 29, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 867667C + voice_directsound_no_resample 66, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 8676658 + voice_directsound_no_resample 64, 14, DirectSoundWaveData_unknown_cymbal_crash, 255, 231, 0, 188 @ 8676664 + voice_directsound_no_resample 64, 89, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242 @ 8676670 + voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 867667C voice_square_1 0, 2, 0, 0, 15, 0 @ 8676688 - voice_directsound_no_resample 64, 54, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 8676694 - voice_directsound_no_resample 64, 54, DirectSoundWaveData_86CB6B8, 8, 0, 255, 216 @ 86766A0 - voice_directsound_no_resample 64, 94, DirectSoundWaveData_86D9C14, 255, 0, 255, 0 @ 86766AC - voice_directsound_no_resample 64, 34, DirectSoundWaveData_86CC5E4, 255, 0, 255, 0 @ 86766B8 - voice_directsound_no_resample 64, 34, DirectSoundWaveData_86CCAFC, 255, 0, 255, 0 @ 86766C4 - voice_directsound_no_resample 64, 90, DirectSoundWaveData_86CCAFC, 255, 0, 255, 0 @ 86766D0 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 8676694 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 8, 0, 255, 216 @ 86766A0 + voice_directsound_no_resample 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 86766AC + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 86766B8 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86766C4 + voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86766D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86766DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86766E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86766F4 @@ -232,50 +232,50 @@ voicegroup004:: @ 8676658 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676730 voice_square_1 0, 2, 0, 0, 15, 0 @ 867673C voice_square_1 0, 2, 0, 0, 15, 0 @ 8676748 - voice_directsound_no_resample 61, 84, DirectSoundWaveData_86C4344, 255, 0, 255, 0 @ 8676754 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86C2A68, 255, 0, 255, 0 @ 8676760 + voice_directsound_no_resample 61, 84, DirectSoundWaveData_unknown_wood_block_high, 255, 0, 255, 0 @ 8676754 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_wood_block_low, 255, 0, 255, 0 @ 8676760 voice_square_1 0, 2, 0, 0, 15, 0 @ 867676C voice_square_1 0, 2, 0, 0, 15, 0 @ 8676778 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676784 - voice_directsound_no_resample 64, 39, DirectSoundWaveData_86DAA94, 255, 242, 103, 188 @ 8676790 - voice_directsound_no_resample 64, 79, DirectSoundWaveData_86DAA94, 255, 242, 103, 188 @ 867679C - voice_directsound_no_resample 64, 39, DirectSoundWaveData_86DAA94, 255, 165, 103, 188 @ 86767A8 - voice_directsound_no_resample 64, 24, DirectSoundWaveData_86DB908, 255, 0, 255, 0 @ 86767B4 + voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 8676790 + voice_directsound_no_resample 64, 79, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 867679C + voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188 @ 86767A8 + voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 86767B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86767C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86767CC - voice_directsound_no_resample 64, 104, DirectSoundWaveData_86DD11C, 255, 0, 255, 0 @ 86767D8 - voice_directsound 63, 64, DirectSoundWaveData_86DE6C0, 255, 0, 255, 0 @ 86767E4 - voice_directsound 50, 84, DirectSoundWaveData_86DFCA4, 255, 0, 255, 0 @ 86767F0 - voice_directsound 64, 84, DirectSoundWaveData_86DFCA4, 255, 0, 255, 0 @ 86767FC - voice_directsound 62, 64, DirectSoundWaveData_86CD0C4, 255, 0, 255, 0 @ 8676808 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CDFDC, 255, 180, 175, 228 @ 8676814 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CDFDC, 255, 0, 255, 242 @ 8676820 - voice_directsound_no_resample 64, 54, DirectSoundWaveData_86C6200, 255, 255, 255, 127 @ 867682C - voice_directsound 65, 64, DirectSoundWaveData_86C6A90, 255, 0, 255, 242 @ 8676838 - voice_directsound 64, 24, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 8676844 - voice_directsound_no_resample 64, 80, DirectSoundWaveData_86C6A90, 255, 0, 255, 242 @ 8676850 - voice_directsound 68, 34, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 867685C - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C5B0C, 255, 0, 255, 242 @ 8676868 - voice_directsound 72, 44, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 8676874 + voice_directsound_no_resample 64, 104, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86767D8 + voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 86767E4 + voice_directsound 50, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 86767F0 + voice_directsound 64, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 86767FC + voice_directsound 62, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 8676808 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 8676814 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 8676820 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 867682C + voice_directsound 65, 64, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 8676838 + voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676844 + voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 8676850 + voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 867685C + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 8676868 + voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676874 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676880 - voice_directsound 76, 84, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 867688C - voice_directsound 80, 94, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 8676898 - voice_directsound 56, 89, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 86768A4 - voice_directsound 64, 104, DirectSoundWaveData_86DE6C0, 255, 0, 255, 235 @ 86768B0 + voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 867688C + voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676898 + voice_directsound 56, 89, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86768A4 + voice_directsound 64, 104, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 235 @ 86768B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86768BC - voice_directsound 63, 64, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 86768C8 - voice_directsound_no_resample 64, 24, DirectSoundWaveData_86D1A2C, 255, 165, 103, 231 @ 86768D4 - voice_directsound_no_resample 66, 34, DirectSoundWaveData_86CA520, 255, 127, 77, 204 @ 86768E0 - voice_directsound 64, 14, DirectSoundWaveData_86CADD4, 255, 231, 0, 188 @ 86768EC - voice_directsound 64, 89, DirectSoundWaveData_86D925C, 255, 0, 255, 242 @ 86768F8 - voice_directsound 60, 29, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 8676904 + voice_directsound 63, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86768C8 + voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 86768D4 + voice_directsound_no_resample 66, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 86768E0 + voice_directsound 64, 14, DirectSoundWaveData_unknown_cymbal_crash, 255, 231, 0, 188 @ 86768EC + voice_directsound 64, 89, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242 @ 86768F8 + voice_directsound 60, 29, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 8676904 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676910 - voice_directsound 58, 54, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 867691C - voice_directsound 62, 54, DirectSoundWaveData_86CB6B8, 8, 0, 255, 216 @ 8676928 - voice_directsound 64, 94, DirectSoundWaveData_86D9C14, 255, 0, 255, 0 @ 8676934 - voice_directsound 64, 34, DirectSoundWaveData_86CC5E4, 255, 0, 255, 0 @ 8676940 - voice_directsound 64, 34, DirectSoundWaveData_86CCAFC, 255, 0, 255, 0 @ 867694C - voice_directsound 64, 90, DirectSoundWaveData_86CCAFC, 255, 0, 255, 0 @ 8676958 + voice_directsound 58, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 867691C + voice_directsound 62, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 8, 0, 255, 216 @ 8676928 + voice_directsound 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 8676934 + voice_directsound 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 8676940 + voice_directsound 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 867694C + voice_directsound 64, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 8676958 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676964 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676970 voice_square_1 0, 2, 0, 0, 15, 0 @ 867697C @@ -286,40 +286,40 @@ voicegroup004:: @ 8676658 voice_square_1 0, 2, 0, 0, 15, 0 @ 86769B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86769C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86769D0 - voice_directsound 61, 84, DirectSoundWaveData_86C4344, 255, 0, 255, 0 @ 86769DC - voice_directsound 64, 64, DirectSoundWaveData_86C2A68, 255, 0, 255, 0 @ 86769E8 + voice_directsound 61, 84, DirectSoundWaveData_unknown_wood_block_high, 255, 0, 255, 0 @ 86769DC + voice_directsound 64, 64, DirectSoundWaveData_unknown_wood_block_low, 255, 0, 255, 0 @ 86769E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86769F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676A00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676A0C - voice_directsound 64, 39, DirectSoundWaveData_86DAA94, 255, 242, 103, 188 @ 8676A18 - voice_directsound 64, 79, DirectSoundWaveData_86DAA94, 255, 242, 103, 188 @ 8676A24 - voice_directsound 64, 39, DirectSoundWaveData_86DAA94, 255, 165, 103, 188 @ 8676A30 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86DB908, 255, 0, 255, 0 @ 8676A3C + voice_directsound 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 8676A18 + voice_directsound 64, 79, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 8676A24 + voice_directsound 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188 @ 8676A30 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 8676A3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8676A48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676A54 - voice_directsound 64, 104, DirectSoundWaveData_86DD11C, 255, 0, 255, 0 @ 8676A60 - voice_directsound 63, 64, DirectSoundWaveData_86DE6C0, 255, 0, 255, 0 @ 8676A6C - voice_directsound 50, 84, DirectSoundWaveData_86DFCA4, 255, 0, 255, 0 @ 8676A78 - voice_directsound 64, 84, DirectSoundWaveData_86DFCA4, 255, 0, 255, 0 @ 8676A84 + voice_directsound 64, 104, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 8676A60 + voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 8676A6C + voice_directsound 50, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 8676A78 + voice_directsound 64, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 8676A84 .align 2 voicegroup005:: @ 8676A90 - voice_directsound 60, 0, DirectSoundWaveData_86E0D98, 255, 252, 0, 239 @ 8676A90 - voice_directsound 60, 0, DirectSoundWaveData_86E1CF8, 255, 250, 0, 221 @ 8676A9C - voice_directsound 60, 0, DirectSoundWaveData_86E3358, 255, 250, 0, 221 @ 8676AA8 - voice_directsound 60, 0, DirectSoundWaveData_86E48B4, 255, 247, 0, 221 @ 8676AB4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_48, 255, 252, 0, 239 @ 8676A90 + voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_60, 255, 250, 0, 221 @ 8676A9C + voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_72, 255, 250, 0, 221 @ 8676AA8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_84, 255, 247, 0, 221 @ 8676AB4 .align 2 voicegroup006:: @ 8676AC0 - voice_directsound 60, 0, DirectSoundWaveData_86E5440, 255, 0, 255, 196 @ 8676AC0 - voice_directsound 60, 0, DirectSoundWaveData_86E89E4, 255, 0, 255, 196 @ 8676ACC - voice_directsound 60, 0, DirectSoundWaveData_86EAD00, 255, 0, 255, 196 @ 8676AD8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_60, 255, 0, 255, 196 @ 8676AC0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_72, 255, 0, 255, 196 @ 8676ACC + voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_84, 255, 0, 255, 196 @ 8676AD8 .align 2 voicegroup007:: @ 8676AE4 - voice_directsound 60, 0, DirectSoundWaveData_86EE3CC, 255, 0, 193, 127 @ 8676AE4 - voice_directsound 60, 0, DirectSoundWaveData_86EF71C, 255, 0, 193, 127 @ 8676AF0 - voice_directsound 60, 0, DirectSoundWaveData_86F0C2C, 255, 0, 193, 127 @ 8676AFC + voice_directsound 60, 0, DirectSoundWaveData_sc88_trumpet_60, 255, 0, 193, 127 @ 8676AE4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_trumpet_72, 255, 0, 193, 127 @ 8676AF0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_trumpet_84, 255, 0, 193, 127 @ 8676AFC voice_square_1_alt 38, 2, 1, 0, 0, 0 @ 8676B08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676B14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8676B20 @@ -451,13 +451,13 @@ voicegroup007:: @ 8676AE4 .align 2 voicegroup008:: @ 8677108 - voice_directsound 60, 0, DirectSoundWaveData_86F204C, 255, 0, 255, 165 @ 8677108 - voice_directsound 60, 0, DirectSoundWaveData_86F30E8, 255, 0, 255, 165 @ 8677114 + voice_directsound 60, 0, DirectSoundWaveData_unknown_trombone_39, 255, 0, 255, 165 @ 8677108 + voice_directsound 60, 0, DirectSoundWaveData_unknown_trombone_51, 255, 0, 255, 165 @ 8677114 .align 2 voicegroup009:: @ 8677120 - voice_directsound 60, 0, DirectSoundWaveData_86F4144, 255, 0, 224, 165 @ 8677120 - voice_directsound 60, 0, DirectSoundWaveData_86FB0D8, 255, 0, 218, 165 @ 867712C + voice_directsound 60, 0, DirectSoundWaveData_sc88_french_horn_60, 255, 0, 224, 165 @ 8677120 + voice_directsound 60, 0, DirectSoundWaveData_sc88_french_horn_72, 255, 0, 218, 165 @ 867712C .align 2 voicegroup010:: @ 8677138 @@ -475,7 +475,7 @@ voicegroup010:: @ 8677138 voice_square_1 0, 2, 0, 0, 15, 0 @ 86771BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86771C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86771D4 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 216, 90, 242 @ 86771E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 216, 90, 242 @ 86771E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86771EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86771F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677204 @@ -507,8 +507,8 @@ voicegroup010:: @ 8677138 voice_square_1 0, 2, 0, 0, 15, 0 @ 867733C voice_square_1 0, 2, 0, 0, 15, 0 @ 8677348 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677354 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 204 @ 8677360 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867736C + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 204 @ 8677360 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 867736C voice_keysplit voicegroup006, KeySplitTable2 @ 8677378 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677384 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677390 @@ -572,7 +572,7 @@ voicegroup011:: @ 8677528 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677624 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677630 voice_square_1 0, 2, 0, 0, 15, 0 @ 867763C - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 149 @ 8677648 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 149 @ 8677648 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677654 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677660 voice_square_1 0, 2, 0, 0, 15, 0 @ 867766C @@ -583,7 +583,7 @@ voicegroup011:: @ 8677528 voice_square_1 0, 2, 0, 0, 15, 0 @ 86776A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86776B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86776C0 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 149 @ 86776CC + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 149 @ 86776CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86776D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86776E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86776F0 @@ -621,7 +621,7 @@ voicegroup011:: @ 8677528 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677870 voice_square_1 0, 2, 0, 0, 15, 0 @ 867787C voice_square_1 0, 2, 0, 0, 15, 0 @ 8677888 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 8677894 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 8677894 voice_programmable_wave_alt ProgrammableWaveData_86B4830, 0, 7, 15, 1 @ 86778A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86778AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86778B8 @@ -681,18 +681,18 @@ voicegroup011:: @ 8677528 voicegroup012:: @ 8677B28 voice_keysplit_all voicegroup001 @ 8677B28 voice_keysplit voicegroup005, KeySplitTable1 @ 8677B34 - voice_directsound 60, 0, DirectSoundWaveData_87322BC, 255, 178, 180, 165 @ 8677B40 + voice_directsound 60, 0, DirectSoundWaveData_unused_acid_bass, 255, 178, 180, 165 @ 8677B40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677B4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8677B58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677B64 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677B70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677B7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8677B88 - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 165, 51, 235 @ 8677B94 + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 235 @ 8677B94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677BA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677BAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8677BB8 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 8677BC4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8677BC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677BD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677BDC voice_square_1 0, 2, 0, 0, 15, 0 @ 8677BE8 @@ -717,7 +717,7 @@ voicegroup012:: @ 8677B28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677CCC voice_square_1 0, 2, 0, 0, 15, 0 @ 8677CD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677CE4 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 8677CF0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8677CF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677CFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8677D08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677D14 @@ -725,8 +725,8 @@ voicegroup012:: @ 8677B28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677D2C voice_square_1 0, 2, 0, 0, 15, 0 @ 8677D38 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677D44 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 204 @ 8677D50 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 8677D5C + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 204 @ 8677D50 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 8677D5C voice_keysplit voicegroup006, KeySplitTable2 @ 8677D68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677D74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677D80 @@ -752,7 +752,7 @@ voicegroup012:: @ 8677B28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677E70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677E7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8677E88 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 8677E94 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 8677E94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677EA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677EAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8677EB8 @@ -831,7 +831,7 @@ voicegroup013:: @ 8677FF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678200 voice_square_1 0, 2, 0, 0, 15, 0 @ 867820C voice_square_1 0, 2, 0, 0, 15, 0 @ 8678218 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 8678224 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 8678224 voice_keysplit voicegroup006, KeySplitTable2 @ 8678230 voice_square_1 0, 2, 0, 0, 15, 0 @ 867823C voice_square_1 0, 2, 0, 0, 15, 0 @ 8678248 @@ -901,7 +901,7 @@ voicegroup014:: @ 8678428 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678524 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678530 voice_square_1 0, 2, 0, 0, 15, 0 @ 867853C - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 149 @ 8678548 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 149 @ 8678548 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678554 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678560 voice_square_1 0, 2, 0, 0, 15, 0 @ 867856C @@ -923,8 +923,8 @@ voicegroup014:: @ 8678428 voice_square_1 0, 2, 0, 0, 15, 0 @ 867862C voice_square_1 0, 2, 0, 0, 15, 0 @ 8678638 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678644 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 8678650 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867865C + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 8678650 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 867865C voice_keysplit voicegroup006, KeySplitTable2 @ 8678668 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678674 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678680 @@ -950,7 +950,7 @@ voicegroup014:: @ 8678428 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678770 voice_square_1 0, 2, 0, 0, 15, 0 @ 867877C voice_square_1 0, 2, 0, 0, 15, 0 @ 8678788 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 8678794 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 8678794 voice_square_1 0, 2, 0, 0, 15, 0 @ 86787A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86787AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86787B8 @@ -1000,7 +1000,7 @@ voicegroup015:: @ 8678824 voice_square_1 0, 2, 0, 0, 15, 0 @ 86789A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86789B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86789BC - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 149 @ 86789C8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 149 @ 86789C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86789D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86789E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86789EC @@ -1021,7 +1021,7 @@ voicegroup015:: @ 8678824 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678AA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678AAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8678AB8 - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 255, 0, 255, 165 @ 8678AC4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 8678AC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678AD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678ADC voice_square_1 0, 2, 0, 0, 15, 0 @ 8678AE8 @@ -1038,7 +1038,7 @@ voicegroup015:: @ 8678824 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678B6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8678B78 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678B84 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 8678B90 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 8678B90 voice_programmable_wave ProgrammableWaveData_86B4830, 0, 7, 15, 1 @ 8678B9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8678BA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678BB4 @@ -1096,11 +1096,11 @@ voicegroup016:: @ 8678C74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678E00 voice_noise_alt 0, 0, 2, 0, 2 @ 8678E0C voice_noise_alt 0, 0, 1, 0, 1 @ 8678E18 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C566C, 255, 0, 255, 242 @ 8678E24 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_kick, 255, 0, 255, 242 @ 8678E24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678E30 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C5B0C, 255, 0, 255, 242 @ 8678E3C + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 8678E3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8678E48 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C6A90, 255, 0, 255, 242 @ 8678E54 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 8678E54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678E60 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678E6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8678E78 @@ -1114,7 +1114,7 @@ voicegroup016:: @ 8678C74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678ED8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678EE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678EF0 - voice_directsound_no_resample 32, 74, DirectSoundWaveData_86CA520, 255, 127, 77, 204 @ 8678EFC + voice_directsound_no_resample 32, 74, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 8678EFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8678F08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678F14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678F20 @@ -1122,9 +1122,9 @@ voicegroup016:: @ 8678C74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678F38 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678F44 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678F50 - voice_directsound_no_resample 72, 66, DirectSoundWaveData_86CC5E4, 255, 0, 255, 0 @ 8678F5C + voice_directsound_no_resample 72, 66, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 8678F5C voice_square_1 0, 2, 0, 0, 15, 0 @ 8678F68 - voice_directsound_no_resample 72, 62, DirectSoundWaveData_86CCAFC, 255, 0, 255, 0 @ 8678F74 + voice_directsound_no_resample 72, 62, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 8678F74 .align 2 voicegroup017:: @ 8678F80 @@ -1173,8 +1173,8 @@ voicegroup017:: @ 8678F80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679178 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679184 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679190 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 867919C - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 204 @ 86791A8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 867919C + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 204 @ 86791A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86791B4 voice_keysplit voicegroup006, KeySplitTable2 @ 86791C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86791CC @@ -1201,7 +1201,7 @@ voicegroup017:: @ 8678F80 voice_square_1 0, 2, 0, 0, 15, 0 @ 86792C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86792D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86792E0 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86792EC + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86792EC voice_programmable_wave ProgrammableWaveData_86B4830, 0, 7, 15, 0 @ 86792F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679304 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679310 @@ -1267,7 +1267,7 @@ voicegroup018:: @ 86793C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86795BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86795C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86795D4 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 86795E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 86795E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86795EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86795F8 voice_keysplit voicegroup006, KeySplitTable2 @ 8679604 @@ -1295,7 +1295,7 @@ voicegroup018:: @ 86793C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867970C voice_square_1 0, 2, 0, 0, 15, 0 @ 8679718 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679724 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 8679730 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 8679730 voice_square_1 0, 2, 0, 0, 15, 0 @ 867973C voice_square_1 0, 2, 0, 0, 15, 0 @ 8679748 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679754 @@ -1398,7 +1398,7 @@ voicegroup019:: @ 86799C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679BBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8679BC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679BD4 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 8679BE0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 8679BE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679BEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8679BF8 voice_keysplit voicegroup006, KeySplitTable2 @ 8679C04 @@ -1426,7 +1426,7 @@ voicegroup019:: @ 86799C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679D0C voice_square_1 0, 2, 0, 0, 15, 0 @ 8679D18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679D24 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 8679D30 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 8679D30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679D3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8679D48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679D54 @@ -1486,7 +1486,7 @@ voicegroup020:: @ 8679DC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679FB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679FC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679FD0 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 8679FDC + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 8679FDC voice_square_1 0, 2, 0, 0, 15, 0 @ 8679FE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679FF4 voice_keysplit voicegroup006, KeySplitTable2 @ 867A000 @@ -1578,7 +1578,7 @@ voicegroup021:: @ 867A1D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A3E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A3F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A3FC - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867A408 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 867A408 voice_keysplit voicegroup006, KeySplitTable2 @ 867A414 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A420 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A42C @@ -1607,7 +1607,7 @@ voicegroup022:: @ 867A438 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A51C voice_square_1 0, 2, 0, 0, 15, 0 @ 867A528 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A534 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 867A540 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 867A540 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A54C voice_square_1 0, 2, 0, 0, 15, 0 @ 867A558 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A564 @@ -1621,11 +1621,11 @@ voicegroup022:: @ 867A438 voice_programmable_wave_alt ProgrammableWaveData_86B4870, 0, 7, 15, 0 @ 867A5C4 voice_programmable_wave_alt ProgrammableWaveData_86B4870, 0, 7, 15, 1 @ 867A5D0 voice_square_1_alt 0, 0, 0, 0, 7, 0 @ 867A5DC - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C566C, 255, 0, 255, 242 @ 867A5E8 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_kick, 255, 0, 255, 242 @ 867A5E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A5F4 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C5B0C, 255, 0, 255, 242 @ 867A600 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 867A600 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A60C - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C6A90, 255, 0, 255, 242 @ 867A618 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 867A618 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A624 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A630 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A63C @@ -1639,7 +1639,7 @@ voicegroup022:: @ 867A438 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A69C voice_square_1 0, 2, 0, 0, 15, 0 @ 867A6A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A6B4 - voice_directsound_no_resample 32, 34, DirectSoundWaveData_86CA520, 255, 127, 77, 204 @ 867A6C0 + voice_directsound_no_resample 32, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 867A6C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A6CC voice_square_1 0, 2, 0, 0, 15, 0 @ 867A6D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A6E4 @@ -1647,9 +1647,9 @@ voicegroup022:: @ 867A438 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A6FC voice_square_1 0, 2, 0, 0, 15, 0 @ 867A708 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A714 - voice_directsound_no_resample 72, 67, DirectSoundWaveData_86CC5E4, 255, 0, 255, 0 @ 867A720 + voice_directsound_no_resample 72, 67, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 867A720 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A72C - voice_directsound_no_resample 72, 61, DirectSoundWaveData_86CCAFC, 255, 0, 255, 0 @ 867A738 + voice_directsound_no_resample 72, 61, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 867A738 .align 2 voicegroup023:: @ 867A744 @@ -1688,7 +1688,7 @@ voicegroup023:: @ 867A744 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A8C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A8D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A8DC - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 149 @ 867A8E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 149 @ 867A8E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A8F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A900 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A90C @@ -1699,7 +1699,7 @@ voicegroup023:: @ 867A744 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A948 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A954 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A960 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 867A96C + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 867A96C voice_square_1 0, 2, 0, 0, 15, 0 @ 867A978 voice_keysplit voicegroup006, KeySplitTable2 @ 867A984 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A990 @@ -1790,9 +1790,9 @@ voicegroup024:: @ 867AB70 voice_square_1 0, 2, 0, 0, 15, 0 @ 867AD68 voice_square_1 0, 2, 0, 0, 15, 0 @ 867AD74 voice_square_1 0, 2, 0, 0, 15, 0 @ 867AD80 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 867AD8C + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 867AD8C voice_square_1 0, 2, 0, 0, 15, 0 @ 867AD98 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867ADA4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 867ADA4 voice_keysplit voicegroup006, KeySplitTable2 @ 867ADB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ADBC voice_square_1 0, 2, 0, 0, 15, 0 @ 867ADC8 @@ -1818,7 +1818,7 @@ voicegroup024:: @ 867AB70 voice_square_1 0, 2, 0, 0, 15, 0 @ 867AEB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867AEC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867AED0 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 867AEDC + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 867AEDC voice_square_1 0, 2, 0, 0, 15, 0 @ 867AEE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867AEF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867AF00 @@ -1886,7 +1886,7 @@ voicegroup025:: @ 867AFB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B1C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B1D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B1DC - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867B1E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 867B1E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B1F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B200 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B20C @@ -1912,7 +1912,7 @@ voicegroup025:: @ 867AFB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B2FC voice_square_1 0, 2, 0, 0, 15, 0 @ 867B308 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B314 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 867B320 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 867B320 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B32C voice_square_1 0, 2, 0, 0, 15, 0 @ 867B338 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B344 @@ -1973,7 +1973,7 @@ voicegroup026:: @ 867B3A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B5B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B5C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B5CC - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867B5D8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 867B5D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B5E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B5F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B5FC @@ -2027,7 +2027,7 @@ voicegroup027:: @ 867B7A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B818 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B824 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B830 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 867B83C + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 867B83C voice_square_1 0, 2, 0, 0, 15, 0 @ 867B848 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B854 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B860 @@ -2052,7 +2052,7 @@ voicegroup027:: @ 867B7A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B944 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B950 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B95C - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 867B968 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 867B968 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B974 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B980 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B98C @@ -2162,7 +2162,7 @@ voicegroup028:: @ 867BDA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867BE48 voice_square_1 0, 2, 0, 0, 15, 0 @ 867BE54 voice_square_1 0, 2, 0, 0, 15, 0 @ 867BE60 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 127 @ 867BE6C + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 867BE6C voice_square_1 0, 2, 0, 0, 15, 0 @ 867BE78 voice_square_1 0, 2, 0, 0, 15, 0 @ 867BE84 voice_square_1 0, 2, 0, 0, 15, 0 @ 867BE90 @@ -2181,7 +2181,7 @@ voicegroup028:: @ 867BDA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867BF2C voice_square_1 0, 2, 0, 0, 15, 0 @ 867BF38 voice_square_1 0, 2, 0, 0, 15, 0 @ 867BF44 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 867BF50 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 867BF50 voice_square_1 0, 2, 0, 0, 15, 0 @ 867BF5C voice_square_1 0, 2, 0, 0, 15, 0 @ 867BF68 voice_square_1 0, 2, 0, 0, 15, 0 @ 867BF74 @@ -2245,7 +2245,7 @@ voicegroup029:: @ 867C184 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C208 voice_square_2_alt 2, 0, 2, 0, 0 @ 867C214 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C220 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 216, 90, 242 @ 867C22C + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 216, 90, 242 @ 867C22C voice_square_1 0, 2, 0, 0, 15, 0 @ 867C238 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C244 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C250 @@ -2276,9 +2276,9 @@ voicegroup029:: @ 867C184 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C37C voice_square_1 0, 2, 0, 0, 15, 0 @ 867C388 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C394 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 867C3A0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 867C3A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C3AC - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867C3B8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 867C3B8 voice_keysplit voicegroup006, KeySplitTable2 @ 867C3C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C3D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C3DC @@ -2304,7 +2304,7 @@ voicegroup029:: @ 867C184 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C4CC voice_square_1 0, 2, 0, 0, 15, 0 @ 867C4D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C4E4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 867C4F0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 867C4F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C4FC voice_square_1 0, 2, 0, 0, 15, 0 @ 867C508 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C514 @@ -2336,10 +2336,10 @@ voicegroup030:: @ 867C5A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C628 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C634 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C640 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 216, 90, 242 @ 867C64C + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 216, 90, 242 @ 867C64C voice_square_1 0, 2, 0, 0, 15, 0 @ 867C658 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C664 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 37, 165, 180, 127 @ 867C670 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 37, 165, 180, 127 @ 867C670 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C67C voice_square_1 0, 2, 0, 0, 15, 0 @ 867C688 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C694 @@ -2368,8 +2368,8 @@ voicegroup030:: @ 867C5A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C7A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C7B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C7C0 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 867C7CC - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867C7D8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 867C7CC + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 867C7D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C7E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C7F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C7FC @@ -2415,12 +2415,12 @@ voicegroup031:: @ 867C838 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C9B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C9C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C9D0 - voice_directsound 60, 0, DirectSoundWaveData_873A594, 255, 165, 154, 127 @ 867C9DC + voice_directsound 60, 0, DirectSoundWaveData_unknown_polysynth, 255, 165, 154, 127 @ 867C9DC voice_square_1 0, 2, 0, 0, 15, 0 @ 867C9E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C9F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CA00 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CA0C - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C6A90, 255, 0, 255, 242 @ 867CA18 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 867CA18 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CA24 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CA30 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CA3C @@ -2434,17 +2434,17 @@ voicegroup031:: @ 867C838 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CA9C voice_square_1 0, 2, 0, 0, 15, 0 @ 867CAA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CAB4 - voice_directsound_no_resample 32, 49, DirectSoundWaveData_86CA520, 255, 127, 77, 204 @ 867CAC0 + voice_directsound_no_resample 32, 49, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 867CAC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CACC voice_square_1 0, 2, 0, 0, 15, 0 @ 867CAD8 - voice_directsound_no_resample 30, 54, DirectSoundWaveData_86CB6B8, 8, 0, 255, 216 @ 867CAE4 + voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 8, 0, 255, 216 @ 867CAE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CAF0 - voice_directsound_no_resample 30, 54, DirectSoundWaveData_86CB6B8, 255, 246, 0, 216 @ 867CAFC + voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 246, 0, 216 @ 867CAFC voice_square_1 0, 2, 0, 0, 15, 0 @ 867CB08 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CB14 - voice_directsound_no_resample 72, 79, DirectSoundWaveData_86CC5E4, 255, 0, 255, 0 @ 867CB20 + voice_directsound_no_resample 72, 79, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 867CB20 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CB2C - voice_directsound_no_resample 72, 74, DirectSoundWaveData_86CCAFC, 255, 0, 255, 0 @ 867CB38 + voice_directsound_no_resample 72, 74, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 867CB38 .align 2 voicegroup032:: @ 867CB44 @@ -2483,7 +2483,7 @@ voicegroup032:: @ 867CB44 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CCC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CCD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CCDC - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 255, 250, 0, 149 @ 867CCE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 250, 0, 149 @ 867CCE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CCF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CD00 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CD0C @@ -2521,7 +2521,7 @@ voicegroup032:: @ 867CB44 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CE8C voice_square_1 0, 2, 0, 0, 15, 0 @ 867CE98 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CEA4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 867CEB0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 867CEB0 voice_programmable_wave ProgrammableWaveData_86B4830, 0, 7, 15, 1 @ 867CEBC voice_square_1 0, 2, 0, 0, 15, 0 @ 867CEC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CED4 @@ -2614,7 +2614,7 @@ voicegroup033:: @ 867D144 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D2C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D2D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D2DC - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 149 @ 867D2E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 149 @ 867D2E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D2F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D300 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D30C @@ -2625,7 +2625,7 @@ voicegroup033:: @ 867D144 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D348 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D354 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D360 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 867D36C + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 867D36C voice_square_1 0, 2, 0, 0, 15, 0 @ 867D378 voice_keysplit voicegroup006, KeySplitTable2 @ 867D384 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D390 @@ -2652,7 +2652,7 @@ voicegroup033:: @ 867D144 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D48C voice_square_1 0, 2, 0, 0, 15, 0 @ 867D498 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D4A4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 867D4B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 867D4B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D4BC voice_square_1 0, 2, 0, 0, 15, 0 @ 867D4C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D4D4 @@ -2700,7 +2700,7 @@ voicegroup034:: @ 867D528 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D6A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D6B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D6C0 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 867D6CC + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 867D6CC voice_square_1 0, 2, 0, 0, 15, 0 @ 867D6D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D6E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D6F0 @@ -2710,7 +2710,7 @@ voicegroup034:: @ 867D528 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D720 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D72C voice_square_1 0, 2, 0, 0, 15, 0 @ 867D738 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 867D744 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 867D744 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D750 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D75C voice_keysplit voicegroup006, KeySplitTable2 @ 867D768 @@ -2738,7 +2738,7 @@ voicegroup034:: @ 867D528 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D870 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D87C voice_square_1 0, 2, 0, 0, 15, 0 @ 867D888 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 867D894 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 867D894 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D8A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D8AC voice_square_1 0, 2, 0, 0, 15, 0 @ 867D8B8 @@ -2799,7 +2799,7 @@ voicegroup035:: @ 867D918 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DB28 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DB34 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DB40 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867DB4C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 867DB4C voice_keysplit voicegroup006, KeySplitTable2 @ 867DB58 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DB64 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DB70 @@ -2873,7 +2873,7 @@ voicegroup036:: @ 867DD14 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DE7C voice_square_1 0, 2, 0, 0, 15, 0 @ 867DE88 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DE94 - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 255, 253, 0, 149 @ 867DEA0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 867DEA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DEAC voice_square_1 0, 2, 0, 0, 15, 0 @ 867DEB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DEC4 @@ -2885,8 +2885,8 @@ voicegroup036:: @ 867DD14 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DF0C voice_square_1 0, 2, 0, 0, 15, 0 @ 867DF18 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DF24 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 867DF30 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 867DF3C + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 867DF30 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 867DF3C voice_square_1 0, 2, 0, 0, 15, 0 @ 867DF48 voice_keysplit voicegroup006, KeySplitTable2 @ 867DF54 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DF60 @@ -2985,7 +2985,7 @@ voicegroup037:: @ 867E314 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E398 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E3A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E3B0 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 216, 90, 242 @ 867E3BC + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 216, 90, 242 @ 867E3BC voice_square_1 0, 2, 0, 0, 15, 0 @ 867E3C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E3D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E3E0 @@ -3017,8 +3017,8 @@ voicegroup037:: @ 867E314 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E518 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E524 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E530 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 867E53C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867E548 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 867E53C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 867E548 voice_keysplit voicegroup006, KeySplitTable2 @ 867E554 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E560 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E56C @@ -3080,7 +3080,7 @@ voicegroup038:: @ 867E740 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E7E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E7F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E800 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 127 @ 867E80C + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 867E80C voice_square_1 0, 2, 0, 0, 15, 0 @ 867E818 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E824 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E830 @@ -3101,7 +3101,7 @@ voicegroup038:: @ 867E740 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E8E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E8F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E8FC - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 867E908 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 867E908 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E914 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E920 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E92C @@ -3165,14 +3165,14 @@ voicegroup039:: @ 867EB18 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EBC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EBCC voice_square_1 0, 2, 0, 0, 15, 0 @ 867EBD8 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 165 @ 867EBE4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165 @ 867EBE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EBF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EBFC voice_square_1 0, 2, 0, 0, 15, 0 @ 867EC08 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EC14 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EC20 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EC2C - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 867EC38 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 867EC38 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EC44 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EC50 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EC5C @@ -3184,7 +3184,7 @@ voicegroup039:: @ 867EB18 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ECA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ECB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ECBC - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 867ECC8 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 867ECC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ECD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ECE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ECEC @@ -3221,7 +3221,7 @@ voicegroup039:: @ 867EB18 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EE60 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EE6C voice_square_1 0, 2, 0, 0, 15, 0 @ 867EE78 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 867EE84 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 867EE84 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EE90 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EE9C voice_square_1 0, 2, 0, 0, 15, 0 @ 867EEA8 @@ -3296,14 +3296,14 @@ voicegroup040:: @ 867F118 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F1C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F1CC voice_square_1 0, 2, 0, 0, 15, 0 @ 867F1D8 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 165 @ 867F1E4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165 @ 867F1E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F1F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F1FC voice_square_1 0, 2, 0, 0, 15, 0 @ 867F208 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F214 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F220 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F22C - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 867F238 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 867F238 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F244 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F250 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F25C @@ -3315,7 +3315,7 @@ voicegroup040:: @ 867F118 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F2A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F2B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F2BC - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 867F2C8 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 867F2C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F2D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F2E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F2EC @@ -3352,7 +3352,7 @@ voicegroup040:: @ 867F118 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F460 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F46C voice_square_1 0, 2, 0, 0, 15, 0 @ 867F478 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 867F484 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 867F484 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F490 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F49C voice_square_1 0, 2, 0, 0, 15, 0 @ 867F4A8 @@ -3427,14 +3427,14 @@ voicegroup041:: @ 867F718 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F7C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F7CC voice_square_1 0, 2, 0, 0, 15, 0 @ 867F7D8 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 165 @ 867F7E4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165 @ 867F7E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F7F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F7FC voice_square_1 0, 2, 0, 0, 15, 0 @ 867F808 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F814 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F820 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F82C - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 867F838 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 867F838 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F844 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F850 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F85C @@ -3446,7 +3446,7 @@ voicegroup041:: @ 867F718 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F8A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F8B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F8BC - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 867F8C8 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 867F8C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F8D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F8E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F8EC @@ -3483,7 +3483,7 @@ voicegroup041:: @ 867F718 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FA60 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FA6C voice_square_1 0, 2, 0, 0, 15, 0 @ 867FA78 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 867FA84 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 867FA84 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FA90 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FA9C voice_square_1 0, 2, 0, 0, 15, 0 @ 867FAA8 @@ -3558,14 +3558,14 @@ voicegroup042:: @ 867FD18 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FDC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FDCC voice_square_1 0, 2, 0, 0, 15, 0 @ 867FDD8 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 165 @ 867FDE4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165 @ 867FDE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FDF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FDFC voice_square_1 0, 2, 0, 0, 15, 0 @ 867FE08 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FE14 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FE20 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FE2C - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 867FE38 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 867FE38 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FE44 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FE50 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FE5C @@ -3577,7 +3577,7 @@ voicegroup042:: @ 867FD18 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FEA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FEB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FEBC - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 867FEC8 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 867FEC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FED4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FEE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FEEC @@ -3614,7 +3614,7 @@ voicegroup042:: @ 867FD18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680060 voice_square_1 0, 2, 0, 0, 15, 0 @ 868006C voice_square_1 0, 2, 0, 0, 15, 0 @ 8680078 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 8680084 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 8680084 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680090 voice_square_1 0, 2, 0, 0, 15, 0 @ 868009C voice_square_1 0, 2, 0, 0, 15, 0 @ 86800A8 @@ -3704,7 +3704,7 @@ voicegroup043:: @ 8680318 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680474 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680480 voice_square_1 0, 2, 0, 0, 15, 0 @ 868048C - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 149 @ 8680498 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 149 @ 8680498 voice_square_1 0, 2, 0, 0, 15, 0 @ 86804A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86804B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86804BC @@ -3745,7 +3745,7 @@ voicegroup043:: @ 8680318 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680660 voice_square_1 0, 2, 0, 0, 15, 0 @ 868066C voice_square_1 0, 2, 0, 0, 15, 0 @ 8680678 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 8680684 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8680684 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680690 voice_square_1 0, 2, 0, 0, 15, 0 @ 868069C voice_square_1 0, 2, 0, 0, 15, 0 @ 86806A8 @@ -3791,7 +3791,7 @@ voicegroup044:: @ 86806E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680864 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680870 voice_square_1 0, 2, 0, 0, 15, 0 @ 868087C - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 224 @ 8680888 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 224 @ 8680888 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680894 voice_square_1 0, 2, 0, 0, 15, 0 @ 86808A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86808AC @@ -3801,7 +3801,7 @@ voicegroup044:: @ 86806E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86808DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86808E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86808F4 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 8680900 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 8680900 voice_square_1 0, 2, 0, 0, 15, 0 @ 868090C voice_square_1 0, 2, 0, 0, 15, 0 @ 8680918 voice_keysplit voicegroup006, KeySplitTable2 @ 8680924 @@ -3829,7 +3829,7 @@ voicegroup044:: @ 86806E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680A2C voice_square_1 0, 2, 0, 0, 15, 0 @ 8680A38 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680A44 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 8680A50 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8680A50 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680A5C voice_square_1 0, 2, 0, 0, 15, 0 @ 8680A68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680A74 @@ -3857,7 +3857,7 @@ voicegroup045:: @ 8680AB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680B58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680B64 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680B70 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 8680B7C + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8680B7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8680B88 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680B94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680BA0 @@ -3878,7 +3878,7 @@ voicegroup045:: @ 8680AB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680C54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680C60 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680C6C - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 216 @ 8680C78 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 216 @ 8680C78 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680C84 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680C90 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680C9C @@ -3913,7 +3913,7 @@ voicegroup045:: @ 8680AB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680DF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680E04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680E10 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 8680E1C + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8680E1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8680E28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680E34 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680E40 @@ -3976,7 +3976,7 @@ voicegroup046:: @ 86810B0 voice_square_1_alt 0, 0, 1, 1, 9, 0 @ 86810C8 voice_square_2_alt 2, 0, 2, 6, 3 @ 86810D4 voice_programmable_wave_alt ProgrammableWaveData_86B4850, 0, 7, 15, 1 @ 86810E0 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 216 @ 86810EC + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 216 @ 86810EC voice_square_2_alt 1, 0, 2, 6, 3 @ 86810F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681104 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681110 @@ -4016,7 +4016,7 @@ voicegroup046:: @ 86810B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86812A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86812B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86812C0 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 165 @ 86812CC + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 165 @ 86812CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86812D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86812E4 voice_keysplit voicegroup006, KeySplitTable2 @ 86812F0 @@ -4044,7 +4044,7 @@ voicegroup046:: @ 86810B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86813F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681404 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681410 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 868141C + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 868141C voice_square_1 0, 2, 0, 0, 15, 0 @ 8681428 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681434 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681440 @@ -4140,7 +4140,7 @@ voicegroup047:: @ 86816B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681854 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681860 voice_square_1 0, 2, 0, 0, 15, 0 @ 868186C - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 8681878 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8681878 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681884 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681890 voice_square_1 0, 2, 0, 0, 15, 0 @ 868189C @@ -4148,8 +4148,8 @@ voicegroup047:: @ 86816B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86818B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86818C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86818CC - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 204 @ 86818D8 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 204, 193, 239 @ 86818E4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 204 @ 86818D8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 204, 193, 239 @ 86818E4 voice_keysplit voicegroup006, KeySplitTable2 @ 86818F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86818FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8681908 @@ -4242,7 +4242,7 @@ voicegroup048:: @ 8681CB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681CF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681D04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681D10 - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 204, 51, 242 @ 8681D1C + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 204, 51, 242 @ 8681D1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8681D28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681D34 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681D40 @@ -4279,8 +4279,8 @@ voicegroup048:: @ 8681CB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681EB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681EC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681ECC - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 8681ED8 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 239 @ 8681EE4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 8681ED8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 239 @ 8681EE4 voice_keysplit voicegroup006, KeySplitTable2 @ 8681EF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681EFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8681F08 @@ -4333,7 +4333,7 @@ voicegroup049:: @ 86820D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682118 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682124 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682130 - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 165, 51, 242 @ 868213C + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 242 @ 868213C voice_square_1 0, 2, 0, 0, 15, 0 @ 8682148 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682154 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682160 @@ -4359,7 +4359,7 @@ voicegroup049:: @ 86820D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682250 voice_square_1 0, 2, 0, 0, 15, 0 @ 868225C voice_square_1 0, 2, 0, 0, 15, 0 @ 8682268 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 8682274 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8682274 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682280 voice_square_1 0, 2, 0, 0, 15, 0 @ 868228C voice_square_1 0, 2, 0, 0, 15, 0 @ 8682298 @@ -4369,9 +4369,9 @@ voicegroup049:: @ 86820D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86822C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86822D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86822E0 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 86822EC - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 86822F8 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 226 @ 8682304 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 86822EC + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 86822F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 226 @ 8682304 voice_keysplit voicegroup006, KeySplitTable2 @ 8682310 voice_square_1 0, 2, 0, 0, 15, 0 @ 868231C voice_square_1 0, 2, 0, 0, 15, 0 @ 8682328 @@ -4397,7 +4397,7 @@ voicegroup049:: @ 86820D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682418 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682424 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682430 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 868243C + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 868243C voice_square_1 0, 2, 0, 0, 15, 0 @ 8682448 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682454 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682460 @@ -4472,7 +4472,7 @@ voicegroup050:: @ 86826D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682778 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682784 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682790 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 868279C + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 868279C voice_square_1 0, 2, 0, 0, 15, 0 @ 86827A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86827B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86827C0 @@ -4490,7 +4490,7 @@ voicegroup050:: @ 86826D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682850 voice_square_1 0, 2, 0, 0, 15, 0 @ 868285C voice_square_1 0, 2, 0, 0, 15, 0 @ 8682868 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 8682874 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8682874 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682880 voice_square_1 0, 2, 0, 0, 15, 0 @ 868288C voice_square_1 0, 2, 0, 0, 15, 0 @ 8682898 @@ -4501,7 +4501,7 @@ voicegroup050:: @ 86826D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86828D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86828E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86828EC - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 86828F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 86828F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682904 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682910 voice_square_1 0, 2, 0, 0, 15, 0 @ 868291C @@ -4621,7 +4621,7 @@ voicegroup051:: @ 8682CD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682E50 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682E5C voice_square_1 0, 2, 0, 0, 15, 0 @ 8682E68 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 8682E74 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8682E74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682E80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682E8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8682E98 @@ -4631,7 +4631,7 @@ voicegroup051:: @ 8682CD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682EC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682ED4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682EE0 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 99 @ 8682EEC + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 99 @ 8682EEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8682EF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682F04 voice_keysplit voicegroup006, KeySplitTable2 @ 8682F10 @@ -4659,7 +4659,7 @@ voicegroup051:: @ 8682CD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683018 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683024 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683030 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 868303C + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 868303C .align 2 voicegroup052:: @ 8683048 @@ -4710,7 +4710,7 @@ voicegroup052:: @ 8683048 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683258 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683264 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683270 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 226 @ 868327C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 226 @ 868327C voice_keysplit voicegroup006, KeySplitTable2 @ 8683288 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683294 voice_square_1 0, 2, 0, 0, 15, 0 @ 86832A0 @@ -4829,7 +4829,7 @@ voicegroup053:: @ 8683648 voice_square_1 0, 2, 0, 0, 15, 0 @ 86837C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86837D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86837E0 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 86837EC + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86837EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86837F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683804 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683810 @@ -4839,7 +4839,7 @@ voicegroup053:: @ 8683648 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683840 voice_square_1 0, 2, 0, 0, 15, 0 @ 868384C voice_square_1 0, 2, 0, 0, 15, 0 @ 8683858 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 8683864 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 8683864 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683870 voice_square_1 0, 2, 0, 0, 15, 0 @ 868387C voice_keysplit voicegroup006, KeySplitTable2 @ 8683888 @@ -4867,7 +4867,7 @@ voicegroup053:: @ 8683648 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683990 voice_square_1 0, 2, 0, 0, 15, 0 @ 868399C voice_square_1 0, 2, 0, 0, 15, 0 @ 86839A8 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 86839B4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86839B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86839C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86839CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86839D8 @@ -4970,8 +4970,8 @@ voicegroup054:: @ 8683C48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683E40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683E4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8683E58 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 8683E64 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 8683E70 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 8683E64 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 8683E70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683E7C voice_keysplit voicegroup006, KeySplitTable2 @ 8683E88 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683E94 @@ -4998,7 +4998,7 @@ voicegroup054:: @ 8683C48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683F90 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683F9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8683FA8 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 8683FB4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8683FB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683FC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683FCC voice_square_1 0, 2, 0, 0, 15, 0 @ 8683FD8 @@ -5094,7 +5094,7 @@ voicegroup055:: @ 8684248 voice_square_1 0, 2, 0, 0, 15, 0 @ 86843EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86843F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684404 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 8684410 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8684410 voice_square_1 0, 2, 0, 0, 15, 0 @ 868441C voice_square_1 0, 2, 0, 0, 15, 0 @ 8684428 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684434 @@ -5102,8 +5102,8 @@ voicegroup055:: @ 8684248 voice_square_1 0, 2, 0, 0, 15, 0 @ 868444C voice_square_1 0, 2, 0, 0, 15, 0 @ 8684458 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684464 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 204 @ 8684470 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 204, 193, 239 @ 868447C + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 204 @ 8684470 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 204, 193, 239 @ 868447C voice_keysplit voicegroup006, KeySplitTable2 @ 8684488 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684494 voice_square_1 0, 2, 0, 0, 15, 0 @ 86844A0 @@ -5225,7 +5225,7 @@ voicegroup056:: @ 8684848 voice_square_1 0, 2, 0, 0, 15, 0 @ 86849EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86849F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684A04 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 8684A10 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8684A10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684A1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8684A28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684A34 @@ -5260,7 +5260,7 @@ voicegroup056:: @ 8684848 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684B90 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684B9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8684BA8 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 8684BB4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8684BB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684BC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684BCC voice_square_1 0, 2, 0, 0, 15, 0 @ 8684BD8 @@ -5327,12 +5327,12 @@ voicegroup057:: @ 8684E48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684E90 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684E9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8684EA8 - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 188, 51, 242 @ 8684EB4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 188, 51, 242 @ 8684EB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684EC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684ECC voice_square_1 0, 2, 0, 0, 15, 0 @ 8684ED8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684EE4 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 128, 165, 90, 216 @ 8684EF0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 128, 165, 90, 216 @ 8684EF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684EFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8684F08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684F14 @@ -5341,7 +5341,7 @@ voicegroup057:: @ 8684E48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684F38 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684F44 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684F50 - voice_directsound 60, 0, DirectSoundWaveData_872DE98, 255, 0, 255, 127 @ 8684F5C + voice_directsound 60, 0, DirectSoundWaveData_sc88_bubbles, 255, 0, 255, 127 @ 8684F5C voice_square_1 0, 2, 0, 0, 15, 0 @ 8684F68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684F74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684F80 @@ -5353,7 +5353,7 @@ voicegroup057:: @ 8684E48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684FC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684FD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684FE0 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 8684FEC + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8684FEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8684FF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685004 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685010 @@ -5363,9 +5363,9 @@ voicegroup057:: @ 8684E48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685040 voice_square_1 0, 2, 0, 0, 15, 0 @ 868504C voice_square_1 0, 2, 0, 0, 15, 0 @ 8685058 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 8685064 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 8685070 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 226 @ 868507C + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 8685064 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 8685070 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 226 @ 868507C voice_keysplit voicegroup006, KeySplitTable2 @ 8685088 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685094 voice_square_1 0, 2, 0, 0, 15, 0 @ 86850A0 @@ -5391,7 +5391,7 @@ voicegroup057:: @ 8684E48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685190 voice_square_1 0, 2, 0, 0, 15, 0 @ 868519C voice_square_1 0, 2, 0, 0, 15, 0 @ 86851A8 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 86851B4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86851B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86851C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86851CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86851D8 @@ -5466,7 +5466,7 @@ voicegroup058:: @ 8685448 voice_square_1 0, 2, 0, 0, 15, 0 @ 86854F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86854FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8685508 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 8685514 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8685514 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685520 voice_square_1 0, 2, 0, 0, 15, 0 @ 868552C voice_square_1 0, 2, 0, 0, 15, 0 @ 8685538 @@ -5484,7 +5484,7 @@ voicegroup058:: @ 8685448 voice_square_1 0, 2, 0, 0, 15, 0 @ 86855C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86855D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86855E0 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 86855EC + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86855EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86855F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685604 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685610 @@ -5589,12 +5589,12 @@ voicegroup059:: @ 8685A48 voice_programmable_wave_alt ProgrammableWaveData_86B4870, 0, 7, 15, 0 @ 8685A90 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685A9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8685AA8 - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 165, 51, 242 @ 8685AB4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 242 @ 8685AB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685AC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685ACC voice_square_1 0, 2, 0, 0, 15, 0 @ 8685AD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685AE4 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 8685AF0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8685AF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685AFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8685B08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685B14 @@ -5626,8 +5626,8 @@ voicegroup059:: @ 8685A48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685C4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8685C58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685C64 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8685C70 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 239 @ 8685C7C + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8685C70 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 239 @ 8685C7C voice_keysplit voicegroup006, KeySplitTable2 @ 8685C88 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685C94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685CA0 @@ -5653,7 +5653,7 @@ voicegroup059:: @ 8685A48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685D90 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685D9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8685DA8 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 8685DB4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8685DB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685DC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685DCC voice_square_1 0, 2, 0, 0, 15, 0 @ 8685DD8 @@ -5685,7 +5685,7 @@ voicegroup060:: @ 8685E74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685EEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8685EF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685F04 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 8685F10 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8685F10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685F1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8685F28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685F34 @@ -5717,9 +5717,9 @@ voicegroup060:: @ 8685E74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868606C voice_square_1 0, 2, 0, 0, 15, 0 @ 8686078 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686084 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 128, 226, 0, 38 @ 8686090 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868609C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 86860A8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 128, 226, 0, 38 @ 8686090 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868609C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 86860A8 voice_keysplit voicegroup006, KeySplitTable2 @ 86860B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86860C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86860CC @@ -5745,7 +5745,7 @@ voicegroup060:: @ 8685E74 voice_square_1 0, 2, 0, 0, 15, 0 @ 86861BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86861C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86861D4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 86861E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86861E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86861EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86861F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686204 @@ -5820,7 +5820,7 @@ voicegroup061:: @ 8686474 voice_square_1 0, 2, 0, 0, 15, 0 @ 868651C voice_square_1 0, 2, 0, 0, 15, 0 @ 8686528 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686534 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 8686540 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8686540 voice_square_1 0, 2, 0, 0, 15, 0 @ 868654C voice_square_1 0, 2, 0, 0, 15, 0 @ 8686558 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686564 @@ -5839,7 +5839,7 @@ voicegroup061:: @ 8686474 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686600 voice_square_1 0, 2, 0, 0, 15, 0 @ 868660C voice_square_1 0, 2, 0, 0, 15, 0 @ 8686618 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 115 @ 8686624 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 115 @ 8686624 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686630 voice_square_1 0, 2, 0, 0, 15, 0 @ 868663C voice_square_1 0, 2, 0, 0, 15, 0 @ 8686648 @@ -5876,7 +5876,7 @@ voicegroup061:: @ 8686474 voice_square_1 0, 2, 0, 0, 15, 0 @ 86867BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86867C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86867D4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 86867E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86867E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86867EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86867F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686804 @@ -5972,7 +5972,7 @@ voicegroup062:: @ 8686A74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686C18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686C24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686C30 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 8686C3C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8686C3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8686C48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686C54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686C60 @@ -6082,7 +6082,7 @@ voicegroup063:: @ 8687074 voice_square_1 0, 2, 0, 0, 15, 0 @ 868711C voice_square_1 0, 2, 0, 0, 15, 0 @ 8687128 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687134 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 165 @ 8687140 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165 @ 8687140 voice_square_1 0, 2, 0, 0, 15, 0 @ 868714C voice_square_1 0, 2, 0, 0, 15, 0 @ 8687158 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687164 @@ -6101,7 +6101,7 @@ voicegroup063:: @ 8687074 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687200 voice_square_1 0, 2, 0, 0, 15, 0 @ 868720C voice_square_1 0, 2, 0, 0, 15, 0 @ 8687218 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 8687224 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 8687224 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687230 voice_square_1 0, 2, 0, 0, 15, 0 @ 868723C voice_square_1 0, 2, 0, 0, 15, 0 @ 8687248 @@ -6220,7 +6220,7 @@ voicegroup064:: @ 8687674 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687770 voice_square_1 0, 2, 0, 0, 15, 0 @ 868777C voice_square_1 0, 2, 0, 0, 15, 0 @ 8687788 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 8687794 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8687794 voice_square_1 0, 2, 0, 0, 15, 0 @ 86877A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86877AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86877B8 @@ -6242,8 +6242,8 @@ voicegroup064:: @ 8687674 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687878 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687884 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687890 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868789C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 86878A8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868789C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 86878A8 voice_keysplit voicegroup006, KeySplitTable2 @ 86878B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86878C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86878CC @@ -6269,7 +6269,7 @@ voicegroup064:: @ 8687674 voice_square_1 0, 2, 0, 0, 15, 0 @ 86879BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86879C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86879D4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 86879E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86879E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86879EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86879F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687A04 @@ -6344,7 +6344,7 @@ voicegroup065:: @ 8687C74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687D1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8687D28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687D34 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 165 @ 8687D40 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165 @ 8687D40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687D4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8687D58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687D64 @@ -6363,7 +6363,7 @@ voicegroup065:: @ 8687C74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687E00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687E0C voice_square_1 0, 2, 0, 0, 15, 0 @ 8687E18 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 8687E24 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 8687E24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687E30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687E3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8687E48 @@ -6482,7 +6482,7 @@ voicegroup066:: @ 8688274 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688370 voice_square_1 0, 2, 0, 0, 15, 0 @ 868837C voice_square_1 0, 2, 0, 0, 15, 0 @ 8688388 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 8688394 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8688394 voice_square_1 0, 2, 0, 0, 15, 0 @ 86883A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86883AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86883B8 @@ -6493,17 +6493,17 @@ voicegroup066:: @ 8688274 voice_square_1 0, 2, 0, 0, 15, 0 @ 86883F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688400 voice_square_1 0, 2, 0, 0, 15, 0 @ 868840C - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 8688418 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8688418 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688424 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688430 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 868843C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 868843C voice_square_1 0, 2, 0, 0, 15, 0 @ 8688448 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688454 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688460 voice_square_1 0, 2, 0, 0, 15, 0 @ 868846C voice_square_1 0, 2, 0, 0, 15, 0 @ 8688478 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688484 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 8688490 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 8688490 voice_square_1 0, 2, 0, 0, 15, 0 @ 868849C voice_square_1 0, 2, 0, 0, 15, 0 @ 86884A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86884B4 @@ -6531,7 +6531,7 @@ voicegroup066:: @ 8688274 voice_square_1 0, 2, 0, 0, 15, 0 @ 86885BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86885C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86885D4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 86885E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86885E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86885EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86885F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688604 @@ -6606,14 +6606,14 @@ voicegroup067:: @ 8688874 voice_square_1 0, 2, 0, 0, 15, 0 @ 868891C voice_square_1 0, 2, 0, 0, 15, 0 @ 8688928 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688934 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 8688940 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8688940 voice_square_1 0, 2, 0, 0, 15, 0 @ 868894C voice_square_1 0, 2, 0, 0, 15, 0 @ 8688958 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688964 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688970 voice_square_1 0, 2, 0, 0, 15, 0 @ 868897C voice_square_1 0, 2, 0, 0, 15, 0 @ 8688988 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 8688994 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8688994 voice_square_1 0, 2, 0, 0, 15, 0 @ 86889A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86889AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86889B8 @@ -6627,7 +6627,7 @@ voicegroup067:: @ 8688874 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688A18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688A24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688A30 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 8688A3C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8688A3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8688A48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688A54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688A60 @@ -6662,7 +6662,7 @@ voicegroup067:: @ 8688874 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688BBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8688BC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688BD4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 8688BE0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 8688BE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688BEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8688BF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688C04 @@ -6734,17 +6734,17 @@ voicegroup068:: @ 8688E74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688EF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688F04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688F10 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 8688F1C + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8688F1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8688F28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688F34 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 8688F40 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8688F40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688F4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8688F58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688F64 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688F70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688F7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8688F88 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 8688F94 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8688F94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688FA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688FAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8688FB8 @@ -6755,10 +6755,10 @@ voicegroup068:: @ 8688E74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688FF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689000 voice_square_1 0, 2, 0, 0, 15, 0 @ 868900C - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 8689018 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8689018 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689024 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689030 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 868903C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 868903C voice_square_1 0, 2, 0, 0, 15, 0 @ 8689048 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689054 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689060 @@ -6793,7 +6793,7 @@ voicegroup068:: @ 8688E74 voice_square_1 0, 2, 0, 0, 15, 0 @ 86891BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86891C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86891D4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 86891E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86891E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86891EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86891F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689204 @@ -6868,14 +6868,14 @@ voicegroup069:: @ 8689474 voice_square_1 0, 2, 0, 0, 15, 0 @ 868951C voice_square_1 0, 2, 0, 0, 15, 0 @ 8689528 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689534 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 8689540 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8689540 voice_square_1 0, 2, 0, 0, 15, 0 @ 868954C voice_square_1 0, 2, 0, 0, 15, 0 @ 8689558 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689564 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689570 voice_square_1 0, 2, 0, 0, 15, 0 @ 868957C voice_square_1 0, 2, 0, 0, 15, 0 @ 8689588 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 8689594 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8689594 voice_square_1 0, 2, 0, 0, 15, 0 @ 86895A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86895AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86895B8 @@ -6886,17 +6886,17 @@ voicegroup069:: @ 8689474 voice_square_1 0, 2, 0, 0, 15, 0 @ 86895F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689600 voice_square_1 0, 2, 0, 0, 15, 0 @ 868960C - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 8689618 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8689618 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689624 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689630 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 868963C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 868963C voice_square_1 0, 2, 0, 0, 15, 0 @ 8689648 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689654 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689660 voice_square_1 0, 2, 0, 0, 15, 0 @ 868966C voice_square_1 0, 2, 0, 0, 15, 0 @ 8689678 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689684 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 8689690 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 8689690 voice_square_1 0, 2, 0, 0, 15, 0 @ 868969C voice_square_1 0, 2, 0, 0, 15, 0 @ 86896A8 voice_keysplit voicegroup006, KeySplitTable2 @ 86896B4 @@ -6924,7 +6924,7 @@ voicegroup069:: @ 8689474 voice_square_1 0, 2, 0, 0, 15, 0 @ 86897BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86897C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86897D4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 86897E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86897E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86897EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86897F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689804 @@ -7006,7 +7006,7 @@ voicegroup070:: @ 8689A74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689B70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689B7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8689B88 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 8689B94 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8689B94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689BA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689BAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8689BB8 @@ -7017,7 +7017,7 @@ voicegroup070:: @ 8689A74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689BF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689C00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689C0C - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 8689C18 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8689C18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689C24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689C30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689C3C @@ -7028,8 +7028,8 @@ voicegroup070:: @ 8689A74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689C78 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689C84 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689C90 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8689C9C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 8689CA8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8689C9C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 8689CA8 voice_keysplit voicegroup006, KeySplitTable2 @ 8689CB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689CC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689CCC @@ -7257,18 +7257,18 @@ voicegroup072:: @ 868A674 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A6EC voice_square_1 0, 2, 0, 0, 15, 0 @ 868A6F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A704 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 868A710 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 868A710 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A71C voice_square_1 0, 2, 0, 0, 15, 0 @ 868A728 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A734 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 868A740 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 868A740 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A74C voice_square_1 0, 2, 0, 0, 15, 0 @ 868A758 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A764 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A770 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A77C voice_square_1 0, 2, 0, 0, 15, 0 @ 868A788 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 868A794 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868A794 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A7A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A7AC voice_square_1 0, 2, 0, 0, 15, 0 @ 868A7B8 @@ -7279,7 +7279,7 @@ voicegroup072:: @ 868A674 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A7F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A800 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A80C - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 868A818 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 868A818 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A824 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A830 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A83C @@ -7290,7 +7290,7 @@ voicegroup072:: @ 868A674 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A878 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A884 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A890 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868A89C + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868A89C voice_square_1 0, 2, 0, 0, 15, 0 @ 868A8A8 voice_keysplit voicegroup006, KeySplitTable2 @ 868A8B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A8C0 @@ -7388,18 +7388,18 @@ voicegroup073:: @ 868AC74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868ACEC voice_square_1 0, 2, 0, 0, 15, 0 @ 868ACF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AD04 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 868AD10 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 868AD10 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AD1C voice_square_1 0, 2, 0, 0, 15, 0 @ 868AD28 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AD34 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 868AD40 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 868AD40 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AD4C voice_square_1 0, 2, 0, 0, 15, 0 @ 868AD58 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AD64 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AD70 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AD7C voice_square_1 0, 2, 0, 0, 15, 0 @ 868AD88 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 868AD94 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868AD94 voice_square_1 0, 2, 0, 0, 15, 0 @ 868ADA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868ADAC voice_square_1 0, 2, 0, 0, 15, 0 @ 868ADB8 @@ -7410,10 +7410,10 @@ voicegroup073:: @ 868AC74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868ADF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AE00 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AE0C - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 868AE18 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 868AE18 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AE24 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AE30 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 868AE3C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 868AE3C voice_square_1 0, 2, 0, 0, 15, 0 @ 868AE48 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AE54 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AE60 @@ -7421,7 +7421,7 @@ voicegroup073:: @ 868AC74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AE78 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AE84 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AE90 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868AE9C + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868AE9C voice_square_1 0, 2, 0, 0, 15, 0 @ 868AEA8 voice_keysplit voicegroup006, KeySplitTable2 @ 868AEB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AEC0 @@ -7448,7 +7448,7 @@ voicegroup073:: @ 868AC74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AFBC voice_square_1 0, 2, 0, 0, 15, 0 @ 868AFC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AFD4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 868AFE0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868AFE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AFEC voice_square_1 0, 2, 0, 0, 15, 0 @ 868AFF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B004 @@ -7519,7 +7519,7 @@ voicegroup074:: @ 868B274 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B2EC voice_square_1 0, 2, 0, 0, 15, 0 @ 868B2F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B304 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 868B310 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 868B310 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B31C voice_square_1 0, 2, 0, 0, 15, 0 @ 868B328 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B334 @@ -7541,7 +7541,7 @@ voicegroup074:: @ 868B274 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B3F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B400 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B40C - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 868B418 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 868B418 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B424 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B430 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B43C @@ -7553,7 +7553,7 @@ voicegroup074:: @ 868B274 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B484 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B490 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B49C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 216 @ 868B4A8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 216 @ 868B4A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B4B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B4C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B4CC @@ -7651,7 +7651,7 @@ voicegroup075:: @ 868B874 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B8F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B904 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B910 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 868B91C + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 868B91C voice_square_1 0, 2, 0, 0, 15, 0 @ 868B928 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B934 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B940 @@ -7672,8 +7672,8 @@ voicegroup075:: @ 868B874 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B9F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BA00 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BA0C - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 868BA18 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 868BA24 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 868BA18 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 868BA24 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BA30 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BA3C voice_square_1 0, 2, 0, 0, 15, 0 @ 868BA48 @@ -7684,7 +7684,7 @@ voicegroup075:: @ 868B874 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BA84 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BA90 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BA9C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 868BAA8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 868BAA8 voice_keysplit voicegroup006, KeySplitTable2 @ 868BAB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BAC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BACC @@ -7710,7 +7710,7 @@ voicegroup075:: @ 868B874 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BBBC voice_square_1 0, 2, 0, 0, 15, 0 @ 868BBC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BBD4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 868BBE0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868BBE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BBEC voice_square_1 0, 2, 0, 0, 15, 0 @ 868BBF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BC04 @@ -7785,7 +7785,7 @@ voicegroup076:: @ 868BE74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BF1C voice_square_1 0, 2, 0, 0, 15, 0 @ 868BF28 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BF34 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 165 @ 868BF40 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165 @ 868BF40 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BF4C voice_square_1 0, 2, 0, 0, 15, 0 @ 868BF58 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BF64 @@ -7803,8 +7803,8 @@ voicegroup076:: @ 868BE74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BFF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C000 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C00C - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 868C018 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 868C024 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 868C018 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 868C024 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C030 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C03C voice_square_1 0, 2, 0, 0, 15, 0 @ 868C048 @@ -7912,18 +7912,18 @@ voicegroup077:: @ 868C474 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C4EC voice_square_1 0, 2, 0, 0, 15, 0 @ 868C4F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C504 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 868C510 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 868C510 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C51C voice_square_1 0, 2, 0, 0, 15, 0 @ 868C528 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C534 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 868C540 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 868C540 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C54C voice_square_1 0, 2, 0, 0, 15, 0 @ 868C558 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C564 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C570 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C57C voice_square_1 0, 2, 0, 0, 15, 0 @ 868C588 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 868C594 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868C594 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C5A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C5AC voice_square_1 0, 2, 0, 0, 15, 0 @ 868C5B8 @@ -7934,7 +7934,7 @@ voicegroup077:: @ 868C474 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C5F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C600 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C60C - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 196 @ 868C618 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 196 @ 868C618 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C624 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C630 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C63C @@ -7945,7 +7945,7 @@ voicegroup077:: @ 868C474 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C678 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C684 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C690 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868C69C + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868C69C voice_square_1 0, 2, 0, 0, 15, 0 @ 868C6A8 voice_keysplit voicegroup006, KeySplitTable2 @ 868C6B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C6C0 @@ -7972,7 +7972,7 @@ voicegroup077:: @ 868C474 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C7BC voice_square_1 0, 2, 0, 0, 15, 0 @ 868C7C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C7D4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 868C7E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868C7E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C7EC voice_square_1 0, 2, 0, 0, 15, 0 @ 868C7F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C804 @@ -8044,7 +8044,7 @@ voicegroup078:: @ 868CA74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CAF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CB04 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CB10 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 868CB1C + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 868CB1C voice_square_1 0, 2, 0, 0, 15, 0 @ 868CB28 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CB34 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CB40 @@ -8054,7 +8054,7 @@ voicegroup078:: @ 868CA74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CB70 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CB7C voice_square_1 0, 2, 0, 0, 15, 0 @ 868CB88 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 868CB94 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868CB94 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CBA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CBAC voice_square_1 0, 2, 0, 0, 15, 0 @ 868CBB8 @@ -8065,7 +8065,7 @@ voicegroup078:: @ 868CA74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CBF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CC00 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CC0C - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 196 @ 868CC18 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 196 @ 868CC18 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CC24 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CC30 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CC3C @@ -8075,9 +8075,9 @@ voicegroup078:: @ 868CA74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CC6C voice_square_1 0, 2, 0, 0, 15, 0 @ 868CC78 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CC84 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 868CC90 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 868CC90 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CC9C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 868CCA8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 868CCA8 voice_keysplit voicegroup006, KeySplitTable2 @ 868CCB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CCC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CCCC @@ -8175,17 +8175,17 @@ voicegroup079:: @ 868D074 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D0F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D104 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D110 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 868D11C + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 868D11C voice_square_1 0, 2, 0, 0, 15, 0 @ 868D128 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D134 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 868D140 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 868D140 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D14C voice_square_1 0, 2, 0, 0, 15, 0 @ 868D158 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D164 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D170 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D17C voice_square_1 0, 2, 0, 0, 15, 0 @ 868D188 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 868D194 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868D194 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D1A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D1AC voice_square_1 0, 2, 0, 0, 15, 0 @ 868D1B8 @@ -8206,8 +8206,8 @@ voicegroup079:: @ 868D074 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D26C voice_square_1 0, 2, 0, 0, 15, 0 @ 868D278 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D284 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 868D290 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868D29C + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 868D290 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868D29C voice_square_1 0, 2, 0, 0, 15, 0 @ 868D2A8 voice_keysplit voicegroup006, KeySplitTable2 @ 868D2B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D2C0 @@ -8234,7 +8234,7 @@ voicegroup079:: @ 868D074 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D3BC voice_square_1 0, 2, 0, 0, 15, 0 @ 868D3C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D3D4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 868D3E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868D3E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D3EC voice_square_1 0, 2, 0, 0, 15, 0 @ 868D3F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D404 @@ -8316,7 +8316,7 @@ voicegroup080:: @ 868D674 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D770 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D77C voice_square_1 0, 2, 0, 0, 15, 0 @ 868D788 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 868D794 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868D794 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D7A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D7AC voice_square_1 0, 2, 0, 0, 15, 0 @ 868D7B8 @@ -8330,16 +8330,16 @@ voicegroup080:: @ 868D674 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D818 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D824 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D830 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 868D83C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 868D83C voice_square_1 0, 2, 0, 0, 15, 0 @ 868D848 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D854 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D860 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D86C voice_square_1 0, 2, 0, 0, 15, 0 @ 868D878 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D884 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 868D890 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868D89C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 868D8A8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 868D890 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868D89C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 868D8A8 voice_keysplit voicegroup006, KeySplitTable2 @ 868D8B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D8C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D8CC @@ -8365,7 +8365,7 @@ voicegroup080:: @ 868D674 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D9BC voice_square_1 0, 2, 0, 0, 15, 0 @ 868D9C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D9D4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 868D9E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868D9E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D9EC voice_square_1 0, 2, 0, 0, 15, 0 @ 868D9F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DA04 @@ -8442,7 +8442,7 @@ voicegroup082:: @ 868DC8C voice_square_1 0, 2, 0, 0, 15, 0 @ 868DD10 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DD1C voice_square_1 0, 2, 0, 0, 15, 0 @ 868DD28 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 868DD34 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 868DD34 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DD40 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DD4C voice_square_1 0, 2, 0, 0, 15, 0 @ 868DD58 @@ -8452,7 +8452,7 @@ voicegroup082:: @ 868DC8C voice_square_1 0, 2, 0, 0, 15, 0 @ 868DD88 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DD94 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DDA0 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 868DDAC + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868DDAC voice_square_1 0, 2, 0, 0, 15, 0 @ 868DDB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DDC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DDD0 @@ -8475,7 +8475,7 @@ voicegroup082:: @ 868DC8C voice_square_1 0, 2, 0, 0, 15, 0 @ 868DE9C voice_square_1 0, 2, 0, 0, 15, 0 @ 868DEA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DEB4 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 868DEC0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 868DEC0 voice_keysplit voicegroup006, KeySplitTable2 @ 868DECC voice_square_1 0, 2, 0, 0, 15, 0 @ 868DED8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DEE4 @@ -8568,7 +8568,7 @@ voicegroup083:: @ 868E28C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E2D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E2E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E2EC - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 165, 72, 249 @ 868E2F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 72, 249 @ 868E2F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E304 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E310 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E31C @@ -8583,7 +8583,7 @@ voicegroup083:: @ 868E28C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E388 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E394 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E3A0 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 76 @ 868E3AC + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 868E3AC voice_square_1 0, 2, 0, 0, 15, 0 @ 868E3B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E3C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E3D0 @@ -8594,7 +8594,7 @@ voicegroup083:: @ 868E28C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E40C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E418 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E424 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 868E430 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 868E430 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E43C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E448 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E454 @@ -8604,8 +8604,8 @@ voicegroup083:: @ 868E28C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E484 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E490 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E49C - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 868E4A8 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 868E4B4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 868E4A8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 868E4B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E4C0 voice_keysplit voicegroup006, KeySplitTable2 @ 868E4CC voice_square_1 0, 2, 0, 0, 15, 0 @ 868E4D8 @@ -8632,7 +8632,7 @@ voicegroup083:: @ 868E28C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E5D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E5E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E5EC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 868E5F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 868E5F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E604 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E610 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E61C @@ -8660,7 +8660,7 @@ voicegroup084:: @ 868E67C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E700 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E70C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E718 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 868E724 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 868E724 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E730 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E73C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E748 @@ -8670,7 +8670,7 @@ voicegroup084:: @ 868E67C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E778 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E784 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E790 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 868E79C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868E79C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E7A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E7B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E7C0 @@ -8692,8 +8692,8 @@ voicegroup084:: @ 868E67C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E880 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E88C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E898 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868E8A4 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 868E8B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868E8A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 868E8B0 voice_keysplit voicegroup006, KeySplitTable2 @ 868E8BC voice_square_1 0, 2, 0, 0, 15, 0 @ 868E8C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E8D4 @@ -8719,7 +8719,7 @@ voicegroup084:: @ 868E67C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E9C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E9D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E9DC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 868E9E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868E9E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E9F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868EA00 voice_square_1 0, 2, 0, 0, 15, 0 @ 868EA0C @@ -8801,7 +8801,7 @@ voicegroup085:: @ 868EC7C voice_square_1 0, 2, 0, 0, 15, 0 @ 868ED78 voice_square_1 0, 2, 0, 0, 15, 0 @ 868ED84 voice_square_1 0, 2, 0, 0, 15, 0 @ 868ED90 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 868ED9C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868ED9C voice_square_1 0, 2, 0, 0, 15, 0 @ 868EDA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868EDB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868EDC0 @@ -8823,8 +8823,8 @@ voicegroup085:: @ 868EC7C voice_square_1 0, 2, 0, 0, 15, 0 @ 868EE80 voice_square_1 0, 2, 0, 0, 15, 0 @ 868EE8C voice_square_1 0, 2, 0, 0, 15, 0 @ 868EE98 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868EEA4 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 868EEB0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868EEA4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 868EEB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868EEBC voice_square_1 0, 2, 0, 0, 15, 0 @ 868EEC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868EED4 @@ -8850,7 +8850,7 @@ voicegroup085:: @ 868EC7C voice_square_1 0, 2, 0, 0, 15, 0 @ 868EFC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868EFD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868EFDC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 868EFE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868EFE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868EFF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F000 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F00C @@ -8922,17 +8922,17 @@ voicegroup086:: @ 868F27C voice_square_1 0, 2, 0, 0, 15, 0 @ 868F300 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F30C voice_square_1 0, 2, 0, 0, 15, 0 @ 868F318 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 868F324 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 868F324 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F330 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F33C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 165 @ 868F348 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165 @ 868F348 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F354 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F360 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F36C voice_square_1 0, 2, 0, 0, 15, 0 @ 868F378 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F384 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F390 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 868F39C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868F39C voice_square_1 0, 2, 0, 0, 15, 0 @ 868F3A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F3B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F3C0 @@ -8943,8 +8943,8 @@ voicegroup086:: @ 868F27C voice_square_1 0, 2, 0, 0, 15, 0 @ 868F3FC voice_square_1 0, 2, 0, 0, 15, 0 @ 868F408 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F414 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 868F420 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 868F42C + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 868F420 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 868F42C voice_square_1 0, 2, 0, 0, 15, 0 @ 868F438 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F444 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F450 @@ -8954,7 +8954,7 @@ voicegroup086:: @ 868F27C voice_square_1 0, 2, 0, 0, 15, 0 @ 868F480 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F48C voice_square_1 0, 2, 0, 0, 15, 0 @ 868F498 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868F4A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868F4A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F4B0 voice_keysplit voicegroup006, KeySplitTable2 @ 868F4BC voice_square_1 0, 2, 0, 0, 15, 0 @ 868F4C8 @@ -8981,7 +8981,7 @@ voicegroup086:: @ 868F27C voice_square_1 0, 2, 0, 0, 15, 0 @ 868F5C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F5D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F5DC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 868F5E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868F5E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F5F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F600 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F60C @@ -9075,9 +9075,9 @@ voicegroup087:: @ 868F87C voice_square_1 0, 2, 0, 0, 15, 0 @ 868FA08 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FA14 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FA20 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 868FA2C + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 868FA2C voice_square_1 0, 2, 0, 0, 15, 0 @ 868FA38 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 868FA44 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 868FA44 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FA50 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FA5C voice_square_1 0, 2, 0, 0, 15, 0 @ 868FA68 @@ -9086,7 +9086,7 @@ voicegroup087:: @ 868F87C voice_square_1 0, 2, 0, 0, 15, 0 @ 868FA8C voice_square_1 0, 2, 0, 0, 15, 0 @ 868FA98 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FAA4 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 868FAB0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 868FAB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FABC voice_square_1 0, 2, 0, 0, 15, 0 @ 868FAC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FAD4 @@ -9184,7 +9184,7 @@ voicegroup088:: @ 868FE7C voice_square_1 0, 2, 0, 0, 15, 0 @ 868FF00 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FF0C voice_square_1 0, 2, 0, 0, 15, 0 @ 868FF18 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 868FF24 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 868FF24 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FF30 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FF3C voice_square_1 0, 2, 0, 0, 15, 0 @ 868FF48 @@ -9216,8 +9216,8 @@ voicegroup088:: @ 868FE7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8690080 voice_square_1 0, 2, 0, 0, 15, 0 @ 869008C voice_square_1 0, 2, 0, 0, 15, 0 @ 8690098 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 86900A4 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 239 @ 86900B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 86900A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 239 @ 86900B0 voice_keysplit voicegroup006, KeySplitTable2 @ 86900BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86900C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86900D4 @@ -9243,7 +9243,7 @@ voicegroup088:: @ 868FE7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86901C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86901D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86901DC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 86901E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86901E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86901F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8690200 voice_square_1 0, 2, 0, 0, 15, 0 @ 869020C @@ -9315,7 +9315,7 @@ voicegroup089:: @ 869047C voice_square_1 0, 2, 0, 0, 15, 0 @ 8690500 voice_square_1 0, 2, 0, 0, 15, 0 @ 869050C voice_square_1 0, 2, 0, 0, 15, 0 @ 8690518 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 8690524 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8690524 voice_square_1 0, 2, 0, 0, 15, 0 @ 8690530 voice_square_1 0, 2, 0, 0, 15, 0 @ 869053C voice_square_1 0, 2, 0, 0, 15, 0 @ 8690548 @@ -9374,7 +9374,7 @@ voicegroup089:: @ 869047C voice_square_1 0, 2, 0, 0, 15, 0 @ 86907C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86907D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86907DC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 86907E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86907E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86907F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8690800 voice_square_1 0, 2, 0, 0, 15, 0 @ 869080C @@ -9572,22 +9572,22 @@ voicegroup091:: @ 869107C voice_square_1 0, 2, 0, 0, 15, 0 @ 86910C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86910D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86910DC - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 165, 72, 249 @ 86910E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 72, 249 @ 86910E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86910F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691100 voice_square_1 0, 2, 0, 0, 15, 0 @ 869110C - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 8691118 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8691118 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691124 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691130 voice_square_1 0, 2, 0, 0, 15, 0 @ 869113C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 165 @ 8691148 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165 @ 8691148 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691154 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691160 voice_square_1 0, 2, 0, 0, 15, 0 @ 869116C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691178 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691184 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691190 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 76 @ 869119C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 869119C voice_square_1 0, 2, 0, 0, 15, 0 @ 86911A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86911B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86911C0 @@ -9598,7 +9598,7 @@ voicegroup091:: @ 869107C voice_square_1 0, 2, 0, 0, 15, 0 @ 86911FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8691208 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691214 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 8691220 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8691220 voice_square_1 0, 2, 0, 0, 15, 0 @ 869122C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691238 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691244 @@ -9608,8 +9608,8 @@ voicegroup091:: @ 869107C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691274 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691280 voice_square_1 0, 2, 0, 0, 15, 0 @ 869128C - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 8691298 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 86912A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 8691298 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 86912A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86912B0 voice_keysplit voicegroup006, KeySplitTable2 @ 86912BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86912C8 @@ -9636,7 +9636,7 @@ voicegroup091:: @ 869107C voice_square_1 0, 2, 0, 0, 15, 0 @ 86913C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86913D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86913DC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 86913E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86913E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86913F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691400 voice_square_1 0, 2, 0, 0, 15, 0 @ 869140C @@ -9707,7 +9707,7 @@ voicegroup092:: @ 869167C voice_square_1 0, 2, 0, 0, 15, 0 @ 86916F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691700 voice_square_1 0, 2, 0, 0, 15, 0 @ 869170C - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 8691718 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8691718 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691724 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691730 voice_square_1 0, 2, 0, 0, 15, 0 @ 869173C @@ -9718,7 +9718,7 @@ voicegroup092:: @ 869167C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691778 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691784 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691790 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 76 @ 869179C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 869179C voice_square_1 0, 2, 0, 0, 15, 0 @ 86917A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86917B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86917C0 @@ -9732,7 +9732,7 @@ voicegroup092:: @ 869167C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691820 voice_square_1 0, 2, 0, 0, 15, 0 @ 869182C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691838 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 8691844 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8691844 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691850 voice_square_1 0, 2, 0, 0, 15, 0 @ 869185C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691868 @@ -9740,7 +9740,7 @@ voicegroup092:: @ 869167C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691880 voice_square_1 0, 2, 0, 0, 15, 0 @ 869188C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691898 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 86918A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 86918A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86918B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86918BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86918C8 @@ -9838,7 +9838,7 @@ voicegroup093:: @ 8691C7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691CF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691D00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691D0C - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 8691D18 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8691D18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691D24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691D30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691D3C @@ -9849,7 +9849,7 @@ voicegroup093:: @ 8691C7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691D78 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691D84 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691D90 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 76 @ 8691D9C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 8691D9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691DA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691DB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691DC0 @@ -9861,9 +9861,9 @@ voicegroup093:: @ 8691C7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691E08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691E14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691E20 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 8691E2C + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 8691E2C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691E38 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 8691E44 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8691E44 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691E50 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691E5C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691E68 @@ -9871,7 +9871,7 @@ voicegroup093:: @ 8691C7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691E80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691E8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691E98 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 8691EA4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 8691EA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691EB0 voice_keysplit voicegroup006, KeySplitTable2 @ 8691EBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8691EC8 @@ -9898,7 +9898,7 @@ voicegroup093:: @ 8691C7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691FC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691FD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691FDC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 8691FE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8691FE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691FF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692000 voice_square_1 0, 2, 0, 0, 15, 0 @ 869200C @@ -9965,22 +9965,22 @@ voicegroup094:: @ 869227C voice_square_1 0, 2, 0, 0, 15, 0 @ 86922C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86922D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86922DC - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 165, 72, 249 @ 86922E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 72, 249 @ 86922E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86922F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692300 voice_square_1 0, 2, 0, 0, 15, 0 @ 869230C - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 8692318 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 8692324 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8692318 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8692324 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692330 voice_square_1 0, 2, 0, 0, 15, 0 @ 869233C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 8692348 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8692348 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692354 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692360 voice_square_1 0, 2, 0, 0, 15, 0 @ 869236C - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 255, 0, 255, 165 @ 8692378 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 8692378 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692384 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692390 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 76 @ 869239C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 869239C voice_square_1 0, 2, 0, 0, 15, 0 @ 86923A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86923B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86923C0 @@ -10003,7 +10003,7 @@ voicegroup094:: @ 869227C voice_square_1 0, 2, 0, 0, 15, 0 @ 869248C voice_square_1 0, 2, 0, 0, 15, 0 @ 8692498 voice_square_1 0, 2, 0, 0, 15, 0 @ 86924A4 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 86924B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 86924B0 voice_keysplit voicegroup006, KeySplitTable2 @ 86924BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86924C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86924D4 @@ -10029,7 +10029,7 @@ voicegroup094:: @ 869227C voice_square_1 0, 2, 0, 0, 15, 0 @ 86925C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86925D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86925DC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 86925E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86925E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86925F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692600 voice_square_1 0, 2, 0, 0, 15, 0 @ 869260C @@ -10104,14 +10104,14 @@ voicegroup095:: @ 869287C voice_square_1 0, 2, 0, 0, 15, 0 @ 8692924 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692930 voice_square_1 0, 2, 0, 0, 15, 0 @ 869293C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 8692948 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8692948 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692954 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692960 voice_square_1 0, 2, 0, 0, 15, 0 @ 869296C voice_square_1 0, 2, 0, 0, 15, 0 @ 8692978 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692984 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692990 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 869299C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 869299C voice_square_1 0, 2, 0, 0, 15, 0 @ 86929A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86929B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86929C0 @@ -10125,7 +10125,7 @@ voicegroup095:: @ 869287C voice_square_1 0, 2, 0, 0, 15, 0 @ 8692A20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692A2C voice_square_1 0, 2, 0, 0, 15, 0 @ 8692A38 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 8692A44 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8692A44 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692A50 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692A5C voice_square_1 0, 2, 0, 0, 15, 0 @ 8692A68 @@ -10160,7 +10160,7 @@ voicegroup095:: @ 869287C voice_square_1 0, 2, 0, 0, 15, 0 @ 8692BC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692BD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692BDC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 8692BE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 8692BE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692BF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692C00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692C0C @@ -10231,18 +10231,18 @@ voicegroup096:: @ 8692E7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8692EF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692F00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692F0C - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 8692F18 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8692F18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692F24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692F30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692F3C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 8692F48 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8692F48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692F54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692F60 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692F6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8692F78 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692F84 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692F90 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 8692F9C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8692F9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8692FA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692FB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692FC0 @@ -10254,9 +10254,9 @@ voicegroup096:: @ 8692E7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693008 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693014 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693020 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 869302C + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 869302C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693038 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 8693044 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8693044 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693050 voice_square_1 0, 2, 0, 0, 15, 0 @ 869305C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693068 @@ -10265,7 +10265,7 @@ voicegroup096:: @ 8692E7C voice_square_1 0, 2, 0, 0, 15, 0 @ 869308C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693098 voice_square_1 0, 2, 0, 0, 15, 0 @ 86930A4 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 86930B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 86930B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86930BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86930C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86930D4 @@ -10363,7 +10363,7 @@ voicegroup097:: @ 869347C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693500 voice_square_1 0, 2, 0, 0, 15, 0 @ 869350C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693518 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 8693524 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8693524 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693530 voice_square_1 0, 2, 0, 0, 15, 0 @ 869353C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693548 @@ -10396,7 +10396,7 @@ voicegroup097:: @ 869347C voice_square_1 0, 2, 0, 0, 15, 0 @ 869368C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693698 voice_square_1 0, 2, 0, 0, 15, 0 @ 86936A4 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 249 @ 86936B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 249 @ 86936B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86936BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86936C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86936D4 @@ -10553,7 +10553,7 @@ voicegroup098:: @ 8693A7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693DC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693DD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693DDC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 8693DE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 8693DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693DF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693E00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693E0C @@ -10606,7 +10606,7 @@ voicegroup098:: @ 8693A7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694040 voice_square_1 0, 2, 0, 0, 15, 0 @ 869404C voice_directsound 60, 0, DirectSoundWaveData_873ECD8, 255, 255, 255, 127 @ 8694058 - voice_directsound 60, 0, DirectSoundWaveData_86C6200, 255, 255, 255, 127 @ 8694064 + voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 8694064 voice_noise_alt 0, 0, 1, 0, 0 @ 8694070 .align 2 @@ -10624,7 +10624,7 @@ voicegroup099:: @ 869407C voice_square_1 0, 2, 0, 0, 15, 0 @ 86940F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694100 voice_square_1 0, 2, 0, 0, 15, 0 @ 869410C - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 8694118 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8694118 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694124 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694130 voice_square_1 0, 2, 0, 0, 15, 0 @ 869413C @@ -10647,9 +10647,9 @@ voicegroup099:: @ 869407C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694208 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694214 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694220 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 869422C + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 869422C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694238 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 8694244 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8694244 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694250 voice_square_1 0, 2, 0, 0, 15, 0 @ 869425C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694268 @@ -10755,18 +10755,18 @@ voicegroup100:: @ 869467C voice_square_1 0, 2, 0, 0, 15, 0 @ 86946F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694700 voice_square_1 0, 2, 0, 0, 15, 0 @ 869470C - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 8694718 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8694718 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694724 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694730 voice_square_1 0, 2, 0, 0, 15, 0 @ 869473C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 8694748 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8694748 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694754 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694760 voice_square_1 0, 2, 0, 0, 15, 0 @ 869476C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694778 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694784 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694790 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 869479C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 869479C voice_square_1 0, 2, 0, 0, 15, 0 @ 86947A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86947B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86947C0 @@ -10778,9 +10778,9 @@ voicegroup100:: @ 869467C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694808 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694814 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694820 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 869482C + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 869482C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694838 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 8694844 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8694844 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694850 voice_square_1 0, 2, 0, 0, 15, 0 @ 869485C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694868 @@ -10789,7 +10789,7 @@ voicegroup100:: @ 869467C voice_square_1 0, 2, 0, 0, 15, 0 @ 869488C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694898 voice_square_1 0, 2, 0, 0, 15, 0 @ 86948A4 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 86948B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 86948B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86948BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86948C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86948D4 @@ -10815,7 +10815,7 @@ voicegroup100:: @ 869467C voice_square_1 0, 2, 0, 0, 15, 0 @ 86949C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86949D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86949DC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 86949E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86949E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86949F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694A00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694A0C @@ -10887,7 +10887,7 @@ voicegroup101:: @ 8694C7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694D00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694D0C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694D18 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 8694D24 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8694D24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694D30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694D3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694D48 @@ -10919,8 +10919,8 @@ voicegroup101:: @ 8694C7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694E80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694E8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694E98 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8694EA4 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 239 @ 8694EB0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8694EA4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 239 @ 8694EB0 voice_keysplit voicegroup006, KeySplitTable2 @ 8694EBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8694EC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694ED4 @@ -10946,7 +10946,7 @@ voicegroup101:: @ 8694C7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694FC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694FD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694FDC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 8694FE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8694FE8 voice_programmable_wave_alt ProgrammableWaveData_86B4880, 0, 7, 15, 0 @ 8694FF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695000 voice_square_1 0, 2, 0, 0, 15, 0 @ 869500C @@ -11010,7 +11010,7 @@ voicegroup102:: @ 86951A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86952A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86952AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86952B8 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 248 @ 86952C4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 248 @ 86952C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86952D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86952DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86952E8 @@ -11032,7 +11032,7 @@ voicegroup102:: @ 86951A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86953A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86953B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86953C0 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 165 @ 86953CC + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 165 @ 86953CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86953D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86953E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86953F0 @@ -11085,7 +11085,7 @@ voicegroup103:: @ 869557C voice_square_1 0, 2, 0, 0, 15, 0 @ 8695600 voice_square_1 0, 2, 0, 0, 15, 0 @ 869560C voice_square_1 0, 2, 0, 0, 15, 0 @ 8695618 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 8695624 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8695624 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695630 voice_square_1 0, 2, 0, 0, 15, 0 @ 869563C voice_square_1 0, 2, 0, 0, 15, 0 @ 8695648 @@ -11095,7 +11095,7 @@ voicegroup103:: @ 869557C voice_square_1 0, 2, 0, 0, 15, 0 @ 8695678 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695684 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695690 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 869569C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 869569C voice_square_1 0, 2, 0, 0, 15, 0 @ 86956A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86956B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86956C0 @@ -11117,8 +11117,8 @@ voicegroup103:: @ 869557C voice_square_1 0, 2, 0, 0, 15, 0 @ 8695780 voice_square_1 0, 2, 0, 0, 15, 0 @ 869578C voice_square_1 0, 2, 0, 0, 15, 0 @ 8695798 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 86957A4 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 239 @ 86957B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 86957A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 239 @ 86957B0 voice_keysplit voicegroup006, KeySplitTable2 @ 86957BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86957C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86957D4 @@ -11205,7 +11205,7 @@ voicegroup104:: @ 8695B7C voice_keysplit_all voicegroup003 @ 8695B7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8695B88 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695B94 - voice_directsound 60, 0, DirectSoundWaveData_8701A10, 255, 0, 206, 242 @ 8695BA0 + voice_directsound 60, 0, DirectSoundWaveData_unknown_koto_high, 255, 0, 206, 242 @ 8695BA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695BAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8695BB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695BC4 @@ -11248,7 +11248,7 @@ voicegroup104:: @ 8695B7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8695D80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695D8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8695D98 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8695DA4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8695DA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695DB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695DBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8695DC8 @@ -11279,7 +11279,7 @@ voicegroup104:: @ 8695B7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8695EF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695F00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695F0C - voice_directsound 60, 0, DirectSoundWaveData_8703214, 255, 0, 255, 204 @ 8695F18 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_shakuhachi, 255, 0, 255, 204 @ 8695F18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695F24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695F30 voice_square_1_alt 0, 1, 2, 0, 12, 5 @ 8695F3C @@ -11309,7 +11309,7 @@ voicegroup104:: @ 8695B7C voice_square_1 0, 2, 0, 0, 15, 0 @ 869605C voice_square_1 0, 2, 0, 0, 15, 0 @ 8696068 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696074 - voice_directsound 60, 0, DirectSoundWaveData_8706DCC, 255, 0, 206, 242 @ 8696080 + voice_directsound 60, 0, DirectSoundWaveData_unknown_koto_low, 255, 0, 206, 242 @ 8696080 .align 2 voicegroup105:: @ 869608C @@ -11326,7 +11326,7 @@ voicegroup105:: @ 869608C voice_square_1 0, 2, 0, 0, 15, 0 @ 8696104 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696110 voice_square_1 0, 2, 0, 0, 15, 0 @ 869611C - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 216 @ 8696128 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 216 @ 8696128 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696134 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696140 voice_square_1 0, 2, 0, 0, 15, 0 @ 869614C @@ -11413,23 +11413,23 @@ voicegroup106:: @ 8696470 voice_square_1 0, 2, 0, 0, 15, 0 @ 86964F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696500 voice_square_1 0, 2, 0, 0, 15, 0 @ 869650C - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 8696518 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8696518 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696524 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696530 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 64, 38, 128, 226 @ 869653C + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 64, 38, 128, 226 @ 869653C voice_square_1 0, 2, 0, 0, 15, 0 @ 8696548 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696554 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696560 voice_square_1 0, 2, 0, 0, 15, 0 @ 869656C voice_square_1 0, 2, 0, 0, 15, 0 @ 8696578 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696584 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 76 @ 8696590 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 8696590 voice_square_1 0, 2, 0, 0, 15, 0 @ 869659C voice_square_1 0, 2, 0, 0, 15, 0 @ 86965A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86965B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86965C0 - voice_directsound 60, 0, DirectSoundWaveData_8709004, 255, 0, 255, 127 @ 86965CC - voice_directsound 60, 0, DirectSoundWaveData_870AE74, 255, 0, 255, 127 @ 86965D8 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 86965CC + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 86965D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86965E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86965F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86965FC @@ -11437,7 +11437,7 @@ voicegroup106:: @ 8696470 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696614 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696620 voice_square_1 0, 2, 0, 0, 15, 0 @ 869662C - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 8696638 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8696638 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696644 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696650 voice_square_1 0, 2, 0, 0, 15, 0 @ 869665C @@ -11445,8 +11445,8 @@ voicegroup106:: @ 8696470 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696674 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696680 voice_square_1 0, 2, 0, 0, 15, 0 @ 869668C - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8696698 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 86966A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8696698 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 86966A4 voice_keysplit voicegroup006, KeySplitTable2 @ 86966B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86966BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86966C8 @@ -11461,7 +11461,7 @@ voicegroup106:: @ 8696470 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696734 voice_keysplit voicegroup009, KeySplitTable5 @ 8696740 voice_square_1 0, 2, 0, 0, 15, 0 @ 869674C - voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 127 @ 8696758 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 @ 8696758 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696764 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696770 voice_square_1 0, 2, 0, 0, 15, 0 @ 869677C @@ -11472,7 +11472,7 @@ voicegroup106:: @ 8696470 voice_square_1 0, 2, 0, 0, 15, 0 @ 86967B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86967C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86967D0 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 86967DC + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86967DC voice_programmable_wave_alt ProgrammableWaveData_86B4880, 0, 7, 15, 0 @ 86967E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86967F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696800 @@ -11544,7 +11544,7 @@ voicegroup107:: @ 8696A70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696AF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696B00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696B0C - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 8696B18 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8696B18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696B24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696B30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696B3C @@ -11554,7 +11554,7 @@ voicegroup107:: @ 8696A70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696B6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8696B78 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696B84 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 76 @ 8696B90 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 8696B90 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696B9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8696BA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696BB4 @@ -11576,14 +11576,14 @@ voicegroup107:: @ 8696A70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696C74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696C80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696C8C - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8696C98 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8696C98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696CA4 voice_keysplit voicegroup006, KeySplitTable2 @ 8696CB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696CBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8696CC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696CD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696CE0 - voice_directsound 60, 0, DirectSoundWaveData_86BA7E8, 255, 0, 255, 0 @ 8696CEC + voice_directsound 60, 0, DirectSoundWaveData_advanced_orchestra_voice_ahhs, 255, 0, 255, 0 @ 8696CEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8696CF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696D04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696D10 @@ -11671,7 +11671,7 @@ voicegroup108:: @ 8697070 voice_square_1 0, 2, 0, 0, 15, 0 @ 86970C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86970D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86970DC - voice_directsound 60, 0, DirectSoundWaveData_8710AB8, 255, 188, 139, 239 @ 86970E8 + voice_directsound 60, 0, DirectSoundWaveData_heart_of_asia_gamelan, 255, 188, 139, 239 @ 86970E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86970F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697100 voice_square_1 0, 2, 0, 0, 15, 0 @ 869710C @@ -11685,7 +11685,7 @@ voicegroup108:: @ 8697070 voice_square_1 0, 2, 0, 0, 15, 0 @ 869716C voice_square_1 0, 2, 0, 0, 15, 0 @ 8697178 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697184 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 76 @ 8697190 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 8697190 voice_square_1 0, 2, 0, 0, 15, 0 @ 869719C voice_square_1 0, 2, 0, 0, 15, 0 @ 86971A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86971B4 @@ -11696,7 +11696,7 @@ voicegroup108:: @ 8697070 voice_square_1 0, 2, 0, 0, 15, 0 @ 86971F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86971FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8697208 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 8697214 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8697214 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697220 voice_square_1 0, 2, 0, 0, 15, 0 @ 869722C voice_square_1 0, 2, 0, 0, 15, 0 @ 8697238 @@ -11707,7 +11707,7 @@ voicegroup108:: @ 8697070 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697274 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697280 voice_square_1 0, 2, 0, 0, 15, 0 @ 869728C - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8697298 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8697298 voice_square_1 0, 2, 0, 0, 15, 0 @ 86972A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86972B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86972BC @@ -11811,8 +11811,8 @@ voicegroup109:: @ 8697670 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697730 voice_square_1 0, 2, 0, 0, 15, 0 @ 869773C voice_square_1 0, 2, 0, 0, 15, 0 @ 8697748 - voice_directsound 60, 0, DirectSoundWaveData_8715038, 255, 76, 154, 188 @ 8697754 - voice_directsound 60, 0, DirectSoundWaveData_8717980, 255, 76, 154, 188 @ 8697760 + voice_directsound 60, 0, DirectSoundWaveData_unknown_church_organ, 255, 76, 154, 188 @ 8697754 + voice_directsound 60, 0, DirectSoundWaveData_emu_ii_pipe_organ, 255, 76, 154, 188 @ 8697760 voice_square_1 0, 2, 0, 0, 15, 0 @ 869776C voice_square_1 0, 2, 0, 0, 15, 0 @ 8697778 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697784 @@ -11827,7 +11827,7 @@ voicegroup109:: @ 8697670 voice_square_1 0, 2, 0, 0, 15, 0 @ 86977F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86977FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8697808 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 8697814 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8697814 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697820 voice_square_1 0, 2, 0, 0, 15, 0 @ 869782C voice_square_1 0, 2, 0, 0, 15, 0 @ 8697838 @@ -11892,7 +11892,7 @@ voicegroup110:: @ 8697A54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697AD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697AE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697AF0 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 8697AFC + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8697AFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8697B08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697B14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697B20 @@ -11924,8 +11924,8 @@ voicegroup110:: @ 8697A54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697C58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697C64 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697C70 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8697C7C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 239 @ 8697C88 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8697C7C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 239 @ 8697C88 voice_keysplit voicegroup006, KeySplitTable2 @ 8697C94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697CA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697CAC @@ -12026,7 +12026,7 @@ voicegroup111:: @ 8698054 voice_square_1 0, 2, 0, 0, 15, 0 @ 86980FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8698108 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698114 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 127 @ 8698120 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 8698120 voice_square_1 0, 2, 0, 0, 15, 0 @ 869812C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698138 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698144 @@ -12038,9 +12038,9 @@ voicegroup111:: @ 8698054 voice_square_1 0, 2, 0, 0, 15, 0 @ 869818C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698198 voice_square_1 0, 2, 0, 0, 15, 0 @ 86981A4 - voice_directsound 60, 0, DirectSoundWaveData_8709004, 255, 0, 255, 226 @ 86981B0 - voice_directsound 60, 0, DirectSoundWaveData_870AE74, 255, 0, 255, 195 @ 86981BC - voice_directsound 60, 0, DirectSoundWaveData_88DA388, 255, 0, 255, 195 @ 86981C8 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 226 @ 86981B0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 195 @ 86981BC + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 195 @ 86981C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86981D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86981E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86981EC @@ -12071,7 +12071,7 @@ voicegroup111:: @ 8698054 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698318 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698324 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698330 - voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 195 @ 869833C + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 195 @ 869833C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698348 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698354 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698360 @@ -12154,17 +12154,17 @@ voicegroup112:: @ 8698654 voice_square_1 0, 2, 0, 0, 15, 0 @ 86986D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86986E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86986F0 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86986FC + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86986FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8698708 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698714 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 8698720 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8698720 voice_square_1 0, 2, 0, 0, 15, 0 @ 869872C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698738 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698744 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698750 voice_square_1 0, 2, 0, 0, 15, 0 @ 869875C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698768 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 76 @ 8698774 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8698774 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698780 voice_square_1 0, 2, 0, 0, 15, 0 @ 869878C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698798 @@ -12175,10 +12175,10 @@ voicegroup112:: @ 8698654 voice_square_1 0, 2, 0, 0, 15, 0 @ 86987D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86987E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86987EC - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 86987F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86987F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698804 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698810 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 128, 252, 0, 115 @ 869881C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 128, 252, 0, 115 @ 869881C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698828 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698834 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698840 @@ -12186,15 +12186,15 @@ voicegroup112:: @ 8698654 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698858 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698864 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698870 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 869887C + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 869887C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698888 voice_keysplit voicegroup006, KeySplitTable2 @ 8698894 voice_square_1 0, 2, 0, 0, 15, 0 @ 86988A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86988AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86988B8 - voice_directsound 60, 0, DirectSoundWaveData_86BA7E8, 128, 165, 128, 188 @ 86988C4 - voice_directsound 60, 0, DirectSoundWaveData_87190E0, 128, 165, 128, 204 @ 86988D0 - voice_directsound 60, 0, DirectSoundWaveData_871A724, 128, 165, 128, 188 @ 86988DC + voice_directsound 60, 0, DirectSoundWaveData_advanced_orchestra_voice_ahhs, 128, 165, 128, 188 @ 86988C4 + voice_directsound 60, 0, DirectSoundWaveData_unused_unknown_female_voice, 128, 165, 128, 204 @ 86988D0 + voice_directsound 60, 0, DirectSoundWaveData_unused_unknown_male_voice, 128, 165, 128, 188 @ 86988DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86988E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86988F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698900 @@ -12283,9 +12283,9 @@ voicegroup113:: @ 8698C54 voice_programmable_wave_alt ProgrammableWaveData_86B48E0, 0, 7, 15, 1 @ 8698CC0 voice_programmable_wave_alt ProgrammableWaveData_86B48F0, 0, 7, 15, 1 @ 8698CCC voice_square_1 0, 2, 0, 0, 15, 0 @ 8698CD8 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 8698CE4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8698CE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698CF0 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 8698CFC + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8698CFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8698D08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698D14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698D20 @@ -12300,16 +12300,16 @@ voicegroup113:: @ 8698C54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698D8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698D98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698DA4 - voice_directsound 60, 0, DirectSoundWaveData_8709004, 255, 0, 255, 195 @ 8698DB0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 195 @ 8698DB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698DBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8698DC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698DD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698DE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698DEC - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 8698DF8 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 8698E04 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8698DF8 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 8698E04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698E10 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 8698E1C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8698E1C voice_programmable_wave_alt ProgrammableWaveData_86B4920, 0, 7, 15, 1 @ 8698E28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698E34 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698E40 @@ -12318,7 +12318,7 @@ voicegroup113:: @ 8698C54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698E64 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698E70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698E7C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 8698E88 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 8698E88 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698E94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698EA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698EAC @@ -12344,7 +12344,7 @@ voicegroup113:: @ 8698C54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698F9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698FA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698FB4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 127 @ 8698FC0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 8698FC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698FCC voice_square_1 0, 2, 0, 0, 15, 0 @ 8698FD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698FE4 @@ -12416,7 +12416,7 @@ voicegroup114:: @ 8699254 voice_square_1 0, 2, 0, 0, 15, 0 @ 86992D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86992E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86992F0 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 216, 90, 242 @ 86992FC + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 216, 90, 242 @ 86992FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8699308 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699314 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699320 @@ -12435,7 +12435,7 @@ voicegroup114:: @ 8699254 voice_square_1 0, 2, 0, 0, 15, 0 @ 86993BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86993C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86993D4 - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 255, 253, 0, 149 @ 86993E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 86993E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86993EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86993F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699404 @@ -12449,7 +12449,7 @@ voicegroup114:: @ 8699254 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699464 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699470 voice_square_1 0, 2, 0, 0, 15, 0 @ 869947C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 8699488 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 8699488 voice_keysplit voicegroup006, KeySplitTable2 @ 8699494 voice_square_1 0, 2, 0, 0, 15, 0 @ 86994A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86994AC @@ -12475,7 +12475,7 @@ voicegroup114:: @ 8699254 voice_square_1 0, 2, 0, 0, 15, 0 @ 869959C voice_square_1 0, 2, 0, 0, 15, 0 @ 86995A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86995B4 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 86995C0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86995C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86995CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86995D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86995E4 @@ -12529,7 +12529,7 @@ voicegroup114:: @ 8699254 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699824 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699830 voice_square_1 0, 2, 0, 0, 15, 0 @ 869983C - voice_directsound 60, 0, DirectSoundWaveData_86CB6B8, 255, 246, 0, 216 @ 8699848 + voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 246, 0, 216 @ 8699848 .align 2 voicegroup115:: @ 8699854 @@ -12537,8 +12537,8 @@ voicegroup115:: @ 8699854 voice_keysplit voicegroup005, KeySplitTable1 @ 8699860 voice_square_1 0, 2, 0, 0, 15, 0 @ 869986C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699878 - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 128, 249, 0, 188 @ 8699884 - voice_directsound 60, 0, DirectSoundWaveData_871F234, 255, 188, 103, 165 @ 8699890 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 128, 249, 0, 188 @ 8699884 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_high, 255, 188, 103, 165 @ 8699890 voice_square_1 0, 2, 0, 0, 15, 0 @ 869989C voice_square_1 0, 2, 0, 0, 15, 0 @ 86998A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86998B4 @@ -12547,40 +12547,40 @@ voicegroup115:: @ 8699854 voice_square_1 0, 2, 0, 0, 15, 0 @ 86998D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86998E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86998F0 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86998FC + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86998FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8699908 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699914 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 127 @ 8699920 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 8699920 voice_square_1 0, 2, 0, 0, 15, 0 @ 869992C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699938 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699944 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699950 voice_square_1 0, 2, 0, 0, 15, 0 @ 869995C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699968 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 204 @ 8699974 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 165, 128, 204 @ 8699980 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 204 @ 8699974 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 8699980 voice_square_1 0, 2, 0, 0, 15, 0 @ 869998C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699998 voice_square_1 0, 2, 0, 0, 15, 0 @ 86999A4 - voice_directsound 60, 0, DirectSoundWaveData_8709004, 255, 0, 255, 127 @ 86999B0 - voice_directsound 60, 0, DirectSoundWaveData_870AE74, 255, 165, 154, 165 @ 86999BC + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 86999B0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 165, 154, 165 @ 86999BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86999C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86999D4 - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 255, 253, 0, 149 @ 86999E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 86999E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86999EC - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 198 @ 86999F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 198 @ 86999F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699A04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699A10 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 146 @ 8699A1C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 146 @ 8699A1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699A28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699A34 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699A40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699A4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699A58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699A64 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 8699A70 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8699A7C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 8699A88 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 8699A70 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8699A7C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 8699A88 voice_keysplit voicegroup006, KeySplitTable2 @ 8699A94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699AA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699AAC @@ -12595,7 +12595,7 @@ voicegroup115:: @ 8699854 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699B18 voice_keysplit voicegroup009, KeySplitTable5 @ 8699B24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699B30 - voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 165, 180, 165 @ 8699B3C + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 165, 180, 165 @ 8699B3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699B48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699B54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699B60 @@ -12653,7 +12653,7 @@ voicegroup115:: @ 8699854 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699DD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699DDC voice_square_1 0, 2, 0, 0, 15, 0 @ 8699DE8 - voice_directsound 60, 0, DirectSoundWaveData_88DA388, 255, 0, 255, 165 @ 8699DF4 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 8699DF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699E00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699E0C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699E18 @@ -12681,28 +12681,28 @@ voicegroup116:: @ 8699E54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699EFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8699F08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699F14 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 128, 146, 190, 115 @ 8699F20 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 190, 115 @ 8699F20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699F2C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699F38 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699F44 - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 255, 0, 255, 165 @ 8699F50 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 8699F50 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699F5C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699F68 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 165, 128, 216 @ 8699F74 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 216 @ 8699F74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699F80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699F8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699F98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699FA4 - voice_directsound 60, 0, DirectSoundWaveData_8709004, 255, 0, 255, 127 @ 8699FB0 - voice_directsound 60, 0, DirectSoundWaveData_870AE74, 255, 0, 255, 127 @ 8699FBC + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 8699FB0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 8699FBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8699FC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699FD4 - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 255, 253, 0, 149 @ 8699FE0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 8699FE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699FEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8699FF8 - voice_directsound 60, 0, DirectSoundWaveData_86BEF94, 255, 165, 180, 216 @ 869A004 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_unison_slap, 255, 165, 180, 216 @ 869A004 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A010 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 869A01C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 869A01C voice_square_1 0, 2, 0, 0, 15, 0 @ 869A028 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A034 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A040 @@ -12726,7 +12726,7 @@ voicegroup116:: @ 8699E54 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A118 voice_keysplit voicegroup009, KeySplitTable5 @ 869A124 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A130 - voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 127 @ 869A13C + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 @ 869A13C voice_square_1 0, 2, 0, 0, 15, 0 @ 869A148 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A154 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A160 @@ -12828,7 +12828,7 @@ voicegroup117:: @ 869A454 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A5BC voice_square_1 0, 2, 0, 0, 15, 0 @ 869A5C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A5D4 - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 255, 253, 0, 149 @ 869A5E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 869A5E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A5EC voice_square_1 0, 2, 0, 0, 15, 0 @ 869A5F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A604 @@ -12841,8 +12841,8 @@ voicegroup117:: @ 869A454 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A658 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A664 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A670 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 869A67C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869A688 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 869A67C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869A688 voice_keysplit voicegroup006, KeySplitTable2 @ 869A694 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A6A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A6AC @@ -12894,14 +12894,14 @@ voicegroup118:: @ 869A82C voice_square_1 0, 2, 0, 0, 15, 0 @ 869A8B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A8BC voice_square_1 0, 2, 0, 0, 15, 0 @ 869A8C8 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 250, 0, 242 @ 869A8D4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 250, 0, 242 @ 869A8D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A8E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A8EC - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 127 @ 869A8F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 869A8F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A904 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A910 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A91C - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 255, 0, 255, 165 @ 869A928 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 869A928 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A934 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A940 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A94C @@ -12913,12 +12913,12 @@ voicegroup118:: @ 869A82C voice_square_1 0, 2, 0, 0, 15, 0 @ 869A994 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A9A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A9AC - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 255, 253, 0, 149 @ 869A9B8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 869A9B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A9C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A9D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A9DC voice_square_1 0, 2, 0, 0, 15, 0 @ 869A9E8 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 869A9F4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 869A9F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AA00 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AA0C voice_square_1 0, 2, 0, 0, 15, 0 @ 869AA18 @@ -12926,8 +12926,8 @@ voicegroup118:: @ 869A82C voice_square_1 0, 2, 0, 0, 15, 0 @ 869AA30 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AA3C voice_square_1 0, 2, 0, 0, 15, 0 @ 869AA48 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 869AA54 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869AA60 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 869AA54 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869AA60 voice_keysplit voicegroup006, KeySplitTable2 @ 869AA6C voice_square_1 0, 2, 0, 0, 15, 0 @ 869AA78 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AA84 @@ -12970,7 +12970,7 @@ voicegroup118:: @ 869A82C voice_square_1 0, 2, 0, 0, 15, 0 @ 869AC40 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AC4C voice_square_1 0, 2, 0, 0, 15, 0 @ 869AC58 - voice_directsound 60, 0, DirectSoundWaveData_873A594, 255, 0, 255, 127 @ 869AC64 + voice_directsound 60, 0, DirectSoundWaveData_unknown_polysynth, 255, 0, 255, 127 @ 869AC64 .align 2 voicegroup119:: @ 869AC70 @@ -12991,7 +12991,7 @@ voicegroup119:: @ 869AC70 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AD18 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AD24 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AD30 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 127 @ 869AD3C + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 869AD3C voice_square_1 0, 2, 0, 0, 15, 0 @ 869AD48 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AD54 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AD60 @@ -13007,7 +13007,7 @@ voicegroup119:: @ 869AC70 voice_square_1 0, 2, 0, 0, 15, 0 @ 869ADD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869ADE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869ADF0 - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 255, 253, 0, 149 @ 869ADFC + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 869ADFC voice_square_1 0, 2, 0, 0, 15, 0 @ 869AE08 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AE14 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AE20 @@ -13020,8 +13020,8 @@ voicegroup119:: @ 869AC70 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AE74 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AE80 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AE8C - voice_directsound_no_resample 60, 0, DirectSoundWaveData_87205DC, 255, 246, 0, 226 @ 869AE98 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869AEA4 + voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88_timpani_with_snare, 255, 246, 0, 226 @ 869AE98 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869AEA4 voice_keysplit voicegroup006, KeySplitTable2 @ 869AEB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AEBC voice_square_1 0, 2, 0, 0, 15, 0 @ 869AEC8 @@ -13101,7 +13101,7 @@ voicegroup120:: @ 869B0B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B21C voice_square_1 0, 2, 0, 0, 15, 0 @ 869B228 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B234 - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 255, 253, 0, 149 @ 869B240 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 869B240 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B24C voice_square_1 0, 2, 0, 0, 15, 0 @ 869B258 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B264 @@ -13113,9 +13113,9 @@ voicegroup120:: @ 869B0B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B2AC voice_square_1 0, 2, 0, 0, 15, 0 @ 869B2B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B2C4 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 869B2D0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 869B2D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B2DC - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869B2E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869B2E8 voice_keysplit voicegroup006, KeySplitTable2 @ 869B2F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B300 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B30C @@ -13195,7 +13195,7 @@ voicegroup121:: @ 869B4F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B660 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B66C voice_square_1 0, 2, 0, 0, 15, 0 @ 869B678 - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 255, 253, 0, 149 @ 869B684 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 869B684 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B690 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B69C voice_square_1 0, 2, 0, 0, 15, 0 @ 869B6A8 @@ -13207,9 +13207,9 @@ voicegroup121:: @ 869B4F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B6F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B6FC voice_square_1 0, 2, 0, 0, 15, 0 @ 869B708 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 869B714 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 869B714 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B720 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869B72C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869B72C voice_keysplit voicegroup006, KeySplitTable2 @ 869B738 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B744 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B750 @@ -13235,7 +13235,7 @@ voicegroup121:: @ 869B4F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B840 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B84C voice_square_1 0, 2, 0, 0, 15, 0 @ 869B858 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 869B864 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 869B864 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B870 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B87C voice_square_1 0, 2, 0, 0, 15, 0 @ 869B888 @@ -13287,7 +13287,7 @@ voicegroup122:: @ 869B900 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BA8C voice_square_1 0, 2, 0, 0, 15, 0 @ 869BA98 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BAA4 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 869BAB0 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 869BAB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BABC voice_square_1 0, 2, 0, 0, 15, 0 @ 869BAC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BAD4 @@ -13296,9 +13296,9 @@ voicegroup122:: @ 869B900 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BAF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BB04 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BB10 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 869BB1C + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 869BB1C voice_square_1 0, 2, 0, 0, 15, 0 @ 869BB28 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869BB34 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869BB34 voice_keysplit voicegroup006, KeySplitTable2 @ 869BB40 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BB4C voice_square_1 0, 2, 0, 0, 15, 0 @ 869BB58 @@ -13307,7 +13307,7 @@ voicegroup122:: @ 869B900 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BB7C voice_square_1 0, 2, 0, 0, 15, 0 @ 869BB88 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BB94 - voice_directsound 60, 0, DirectSoundWaveData_873A594, 255, 165, 154, 127 @ 869BBA0 + voice_directsound 60, 0, DirectSoundWaveData_unknown_polysynth, 255, 165, 154, 127 @ 869BBA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BBAC voice_square_1 0, 2, 0, 0, 15, 0 @ 869BBB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BBC4 @@ -13352,7 +13352,7 @@ voicegroup123:: @ 869BCF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BD74 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BD80 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BD8C - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 216, 90, 242 @ 869BD98 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 216, 90, 242 @ 869BD98 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BDA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BDB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BDBC @@ -13371,7 +13371,7 @@ voicegroup123:: @ 869BCF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BE58 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BE64 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BE70 - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 255, 253, 0, 149 @ 869BE7C + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 869BE7C voice_square_1 0, 2, 0, 0, 15, 0 @ 869BE88 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BE94 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BEA0 @@ -13385,7 +13385,7 @@ voicegroup123:: @ 869BCF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BF00 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BF0C voice_square_1 0, 2, 0, 0, 15, 0 @ 869BF18 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869BF24 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869BF24 voice_keysplit voicegroup006, KeySplitTable2 @ 869BF30 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BF3C voice_square_1 0, 2, 0, 0, 15, 0 @ 869BF48 @@ -13411,7 +13411,7 @@ voicegroup123:: @ 869BCF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C038 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C044 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C050 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 869C05C + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 869C05C voice_square_1 0, 2, 0, 0, 15, 0 @ 869C068 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C074 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C080 @@ -13465,7 +13465,7 @@ voicegroup123:: @ 869BCF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C2C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C2CC voice_square_1 0, 2, 0, 0, 15, 0 @ 869C2D8 - voice_directsound 60, 0, DirectSoundWaveData_86CB6B8, 255, 246, 0, 216 @ 869C2E4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 246, 0, 216 @ 869C2E4 .align 2 voicegroup124:: @ 869C2F0 @@ -13502,7 +13502,7 @@ voicegroup124:: @ 869C2F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C458 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C464 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C470 - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 255, 253, 0, 149 @ 869C47C + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 869C47C voice_square_1 0, 2, 0, 0, 15, 0 @ 869C488 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C494 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C4A0 @@ -13515,8 +13515,8 @@ voicegroup124:: @ 869C2F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C4F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C500 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C50C - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 869C518 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869C524 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 869C518 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869C524 voice_keysplit voicegroup006, KeySplitTable2 @ 869C530 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C53C voice_square_1 0, 2, 0, 0, 15, 0 @ 869C548 @@ -13597,7 +13597,7 @@ voicegroup125:: @ 869C704 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C8A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C8B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C8C0 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 869C8CC + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 869C8CC voice_square_1 0, 2, 0, 0, 15, 0 @ 869C8D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C8E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C8F0 @@ -13606,7 +13606,7 @@ voicegroup125:: @ 869C704 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C914 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C920 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C92C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869C938 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869C938 voice_keysplit voicegroup006, KeySplitTable2 @ 869C944 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C950 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C95C @@ -13679,7 +13679,7 @@ voicegroup126:: @ 869CAF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CC5C voice_square_1 0, 2, 0, 0, 15, 0 @ 869CC68 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CC74 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 235, 128, 99 @ 869CC80 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 869CC80 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CC8C voice_square_1 0, 2, 0, 0, 15, 0 @ 869CC98 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CCA4 @@ -13693,7 +13693,7 @@ voicegroup126:: @ 869CAF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CD04 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CD10 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CD1C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869CD28 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869CD28 voice_keysplit voicegroup006, KeySplitTable2 @ 869CD34 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CD40 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CD4C @@ -13772,12 +13772,12 @@ voicegroup126:: @ 869CAF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869D0B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869D0C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869D0D0 - voice_directsound 60, 0, DirectSoundWaveData_86CB6B8, 255, 235, 0, 216 @ 869D0DC - voice_directsound 60, 0, DirectSoundWaveData_86CB6B8, 255, 246, 0, 216 @ 869D0E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 216 @ 869D0DC + voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 246, 0, 216 @ 869D0E8 .align 2 voicegroup127:: @ 869D0F4 - voice_directsound 60, 0, DirectSoundWaveData_8721AAC, 255, 249, 103, 165 @ 869D0F4 + voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 249, 103, 165 @ 869D0F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869D100 voice_square_1 0, 2, 0, 0, 15, 0 @ 869D10C voice_square_1 0, 2, 0, 0, 15, 0 @ 869D118 @@ -13790,8 +13790,8 @@ voicegroup127:: @ 869D0F4 voice_square_1_alt 0, 2, 2, 0, 15, 0 @ 869D16C voice_square_1_alt 0, 1, 2, 0, 15, 0 @ 869D178 voice_square_1_alt 23, 1, 0, 1, 9, 0 @ 869D184 - voice_directsound 60, 0, DirectSoundWaveData_87224B8, 255, 0, 255, 165 @ 869D190 - voice_directsound 60, 0, DirectSoundWaveData_87224B8, 255, 226, 0, 165 @ 869D19C + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 0, 255, 165 @ 869D190 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 226, 0, 165 @ 869D19C voice_square_1_alt 0, 2, 0, 6, 0, 1 @ 869D1A8 voice_square_1_alt 36, 0, 0, 2, 0, 0 @ 869D1B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869D1C0 @@ -13824,7 +13824,7 @@ voicegroup127:: @ 869D0F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869D304 voice_square_1 0, 2, 0, 0, 15, 0 @ 869D310 voice_square_1 0, 2, 0, 0, 15, 0 @ 869D31C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869D328 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869D328 voice_keysplit voicegroup006, KeySplitTable2 @ 869D334 voice_square_1 0, 2, 0, 0, 15, 0 @ 869D340 voice_square_1 0, 2, 0, 0, 15, 0 @ 869D34C @@ -13908,80 +13908,80 @@ voicegroup127:: @ 869D0F4 .align 2 voicegroup128:: @ 869D6F4 - voice_directsound_no_resample 60, 0, DirectSoundWaveData_87240CC, 255, 249, 0, 165 @ 869D6F4 - voice_directsound_alt 60, 0, DirectSoundWaveData_87240CC, 255, 0, 255, 165 @ 869D700 - voice_directsound 60, 0, DirectSoundWaveData_8721AAC, 255, 0, 255, 165 @ 869D70C - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 242, 0, 127 @ 869D718 + voice_directsound_no_resample 60, 0, DirectSoundWaveData_bicycle_bell, 255, 249, 0, 165 @ 869D6F4 + voice_directsound_alt 60, 0, DirectSoundWaveData_bicycle_bell, 255, 0, 255, 165 @ 869D700 + voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 0, 255, 165 @ 869D70C + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 242, 0, 127 @ 869D718 voice_noise_alt 0, 0, 1, 0, 1 @ 869D724 voice_noise_alt 1, 0, 1, 0, 1 @ 869D730 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 255, 165 @ 869D73C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 255, 165 @ 869D73C voice_square_1_alt 0, 2, 0, 2, 0, 1 @ 869D748 voice_directsound 60, 0, DirectSoundWaveData_8725A2C, 255, 0, 255, 165 @ 869D754 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 0, 255, 127 @ 869D760 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 0, 255, 127 @ 869D760 voice_directsound 60, 0, DirectSoundWaveData_872762C, 255, 0, 255, 127 @ 869D76C voice_noise_alt 1, 0, 2, 0, 0 @ 869D778 voice_square_1 103, 3, 2, 7, 0, 0 @ 869D784 voice_square_2 3, 2, 7, 0, 0 @ 869D790 - voice_directsound 60, 0, DirectSoundWaveData_87224B8, 255, 226, 0, 127 @ 869D79C + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 226, 0, 127 @ 869D79C voice_directsound 60, 0, DirectSoundWaveData_872921C, 255, 0, 255, 0 @ 869D7A8 - voice_directsound 60, 0, DirectSoundWaveData_87224B8, 255, 204, 0, 127 @ 869D7B4 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 204, 0, 127 @ 869D7B4 voice_square_1_alt 0, 2, 0, 2, 0, 1 @ 869D7C0 voice_directsound 60, 0, DirectSoundWaveData_872A5D0, 255, 0, 255, 127 @ 869D7CC - voice_directsound 60, 0, DirectSoundWaveData_87224B8, 255, 0, 255, 127 @ 869D7D8 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 0, 255, 127 @ 869D7D8 voice_square_1 103, 0, 0, 7, 0, 0 @ 869D7E4 - voice_directsound 60, 0, DirectSoundWaveData_86C6A90, 255, 0, 255, 127 @ 869D7F0 - voice_directsound 60, 0, DirectSoundWaveData_872CC54, 255, 0, 255, 127 @ 869D7FC - voice_directsound 60, 0, DirectSoundWaveData_872DE98, 255, 0, 255, 127 @ 869D808 - voice_directsound 60, 0, DirectSoundWaveData_86C5B0C, 255, 0, 255, 127 @ 869D814 + voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 127 @ 869D7F0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_wind, 255, 0, 255, 127 @ 869D7FC + voice_directsound 60, 0, DirectSoundWaveData_sc88_bubbles, 255, 0, 255, 127 @ 869D808 + voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 127 @ 869D814 voice_noise_alt 0, 0, 7, 15, 1 @ 869D820 voice_directsound 60, 0, DirectSoundWaveData_872EEA8, 255, 0, 255, 127 @ 869D82C voice_noise_alt 1, 0, 7, 15, 1 @ 869D838 - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 246, 0, 127 @ 869D844 + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 246, 0, 127 @ 869D844 voice_directsound 60, 0, DirectSoundWaveData_87301B0, 255, 0, 255, 127 @ 869D850 voice_square_1_alt 19, 2, 0, 2, 0, 0 @ 869D85C - voice_directsound 60, 0, DirectSoundWaveData_87322BC, 255, 0, 255, 127 @ 869D868 + voice_directsound 60, 0, DirectSoundWaveData_unused_acid_bass, 255, 0, 255, 127 @ 869D868 voice_square_1 103, 0, 0, 0, 15, 0 @ 869D874 voice_directsound_alt 60, 0, DirectSoundWaveData_87301B0, 255, 0, 255, 127 @ 869D880 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 255, 255, 127 @ 869D88C - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 0, 255, 127 @ 869D898 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 255, 255, 127 @ 869D88C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 0, 255, 127 @ 869D898 voice_directsound 60, 0, DirectSoundWaveData_8734298, 255, 0, 255, 127 @ 869D8A4 - voice_directsound 60, 0, DirectSoundWaveData_87322BC, 255, 242, 0, 0 @ 869D8B0 + voice_directsound 60, 0, DirectSoundWaveData_unused_acid_bass, 255, 242, 0, 0 @ 869D8B0 voice_directsound 60, 0, DirectSoundWaveData_87364A8, 255, 0, 255, 0 @ 869D8BC - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 869D8C8 - voice_directsound 60, 0, DirectSoundWaveData_86C8348, 255, 127, 0, 188 @ 869D8D4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 869D8C8 + voice_directsound 60, 0, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188 @ 869D8D4 voice_directsound 60, 0, DirectSoundWaveData_87385E4, 255, 249, 0, 165 @ 869D8E0 voice_square_1 0, 0, 4, 6, 0, 0 @ 869D8EC - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 13, 0, 255, 127 @ 869D8F8 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 13, 0, 255, 127 @ 869D904 - voice_directsound 60, 0, DirectSoundWaveData_873A594, 255, 0, 255, 127 @ 869D910 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 252, 0, 204 @ 869D91C + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 13, 0, 255, 127 @ 869D8F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 13, 0, 255, 127 @ 869D904 + voice_directsound 60, 0, DirectSoundWaveData_unknown_polysynth, 255, 0, 255, 127 @ 869D910 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 252, 0, 204 @ 869D91C voice_square_1 0, 2, 0, 0, 15, 0 @ 869D928 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 869D934 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 869D934 voice_square_1 0, 0, 4, 0, 15, 0 @ 869D940 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 188, 0, 0 @ 869D94C - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 226, 0, 127 @ 869D958 - voice_directsound 60, 0, DirectSoundWaveData_86CB6B8, 26, 0, 255, 127 @ 869D964 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 188, 0, 0 @ 869D94C + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 226, 0, 127 @ 869D958 + voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_cymbal_crash, 26, 0, 255, 127 @ 869D964 voice_square_1_alt 0, 2, 0, 1, 0, 0 @ 869D970 - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 252, 0, 127 @ 869D97C + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 252, 0, 127 @ 869D97C voice_square_1_alt 0, 1, 0, 2, 0, 0 @ 869D988 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 127, 0, 127 @ 869D994 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 127, 0, 127 @ 869D994 voice_noise_alt 0, 1, 6, 0, 0 @ 869D9A0 - voice_directsound 60, 0, DirectSoundWaveData_86B776C, 255, 255, 255, 127 @ 869D9AC - voice_directsound 60, 0, DirectSoundWaveData_86C6200, 255, 255, 255, 127 @ 869D9B8 + voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 255, 255, 127 @ 869D9AC + voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 869D9B8 voice_directsound 60, 0, DirectSoundWaveData_873ECD8, 255, 255, 255, 127 @ 869D9C4 - voice_directsound 60, 0, DirectSoundWaveData_86FB0D8, 11, 242, 0, 127 @ 869D9D0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_french_horn_72, 11, 242, 0, 127 @ 869D9D0 voice_square_1_alt 0, 2, 4, 6, 0, 0 @ 869D9DC voice_directsound 60, 0, DirectSoundWaveData_8740818, 255, 255, 255, 127 @ 869D9E8 - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 255, 0, 255, 165 @ 869D9F4 - voice_directsound 60, 0, DirectSoundWaveData_86C7308, 255, 0, 255, 165 @ 869DA00 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 869D9F4 + voice_directsound 60, 0, DirectSoundWaveData_unknown_tom, 255, 0, 255, 165 @ 869DA00 voice_noise_alt 0, 5, 7, 15, 1 @ 869DA0C - voice_directsound 60, 0, DirectSoundWaveData_87224B8, 128, 242, 0, 165 @ 869DA18 - voice_directsound 60, 0, DirectSoundWaveData_86E89E4, 255, 0, 255, 165 @ 869DA24 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 128, 242, 0, 165 @ 869DA18 + voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_72, 255, 0, 255, 165 @ 869DA24 voice_square_1 0, 0, 1, 5, 0, 0 @ 869DA30 voice_noise_alt 0, 6, 6, 0, 1 @ 869DA3C voice_noise_alt 0, 3, 6, 0, 1 @ 869DA48 voice_square_1 0, 2, 0, 0, 15, 0 @ 869DA54 - voice_directsound 60, 0, DirectSoundWaveData_87322BC, 15, 127, 231, 127 @ 869DA60 + voice_directsound 60, 0, DirectSoundWaveData_unused_acid_bass, 15, 127, 231, 127 @ 869DA60 voice_square_1 0, 2, 0, 0, 15, 0 @ 869DA6C voice_square_1 0, 2, 0, 0, 15, 0 @ 869DA78 voice_square_1 0, 2, 0, 0, 15, 0 @ 869DA84 @@ -14822,19 +14822,19 @@ gCryTable2:: @ 869EF24 .align 2 voicegroup129:: @ 86A0154 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0154 - voice_directsound 60, 0, DirectSoundWaveData_86CC5E4, 255, 0, 255, 0 @ 86A0160 - voice_directsound 60, 0, DirectSoundWaveData_86CCAFC, 255, 0, 255, 0 @ 86A016C - voice_directsound 60, 0, DirectSoundWaveData_86C6200, 255, 226, 25, 0 @ 86A0178 + voice_directsound 60, 0, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 86A0160 + voice_directsound 60, 0, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86A016C + voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_hand_clap, 255, 226, 25, 0 @ 86A0178 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0184 voice_directsound 60, 0, DirectSoundWaveData_8725A2C, 255, 0, 255, 165 @ 86A0190 - voice_directsound 60, 0, DirectSoundWaveData_86D1A2C, 255, 165, 103, 231 @ 86A019C - voice_directsound 60, 0, DirectSoundWaveData_86DAA94, 255, 204, 128, 249 @ 86A01A8 - voice_directsound 60, 0, DirectSoundWaveData_88D4A18, 255, 0, 255, 76 @ 86A01B4 + voice_directsound 60, 0, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 86A019C + voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_high, 255, 204, 128, 249 @ 86A01A8 + voice_directsound 60, 0, DirectSoundWaveData_register_noise, 255, 0, 255, 76 @ 86A01B4 voice_directsound 60, 0, DirectSoundWaveData_88D6978, 255, 0, 206, 204 @ 86A01C0 - voice_directsound 60, 0, DirectSoundWaveData_86C2A68, 255, 0, 206, 38 @ 86A01CC - voice_directsound 60, 0, DirectSoundWaveData_86C4344, 255, 0, 206, 0 @ 86A01D8 + voice_directsound 60, 0, DirectSoundWaveData_unknown_wood_block_low, 255, 0, 206, 38 @ 86A01CC + voice_directsound 60, 0, DirectSoundWaveData_unknown_wood_block_high, 255, 0, 206, 0 @ 86A01D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A01E4 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 216 @ 86A01F0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 216 @ 86A01F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A01FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0208 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0214 @@ -14845,21 +14845,21 @@ voicegroup129:: @ 86A0154 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0250 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A025C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0268 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 165, 128, 204 @ 86A0274 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 86A0274 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0280 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A028C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0298 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A02A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A02B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A02BC - voice_directsound 60, 0, DirectSoundWaveData_88DA388, 255, 0, 255, 165 @ 86A02C8 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86A02C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A02D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A02E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A02EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A02F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0304 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0310 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 86A031C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86A031C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0328 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0334 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0340 @@ -14867,9 +14867,9 @@ voicegroup129:: @ 86A0154 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0358 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0364 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0370 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 252, 0, 204 @ 86A037C - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 255, 0, 255, 165 @ 86A0388 - voice_directsound 60, 0, DirectSoundWaveData_87224B8, 255, 204, 0, 127 @ 86A0394 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 252, 0, 204 @ 86A037C + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 86A0388 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 204, 0, 127 @ 86A0394 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A03A0 voice_square_1_alt 0, 2, 0, 0, 15, 0 @ 86A03AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A03B8 @@ -14937,8 +14937,8 @@ voicegroup129:: @ 86A0154 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A06A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A06AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A06B8 - voice_directsound 60, 0, DirectSoundWaveData_86DE6C0, 255, 0, 255, 0 @ 86A06C4 - voice_directsound 60, 0, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 86A06D0 + voice_directsound 60, 0, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 86A06C4 + voice_directsound 60, 0, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86A06D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A06DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A06E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A06F4 @@ -15024,7 +15024,7 @@ voicegroup130:: @ 86A0754 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0A90 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0A9C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0AA8 - voice_directsound 60, 0, DirectSoundWaveData_88F6F48, 255, 249, 25, 248 @ 86A0AB4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion_duplicate, 255, 249, 25, 248 @ 86A0AB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0AC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0ACC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0AD8 @@ -15136,7 +15136,7 @@ voicegroup130:: @ 86A0754 voicegroup131:: @ 86A0FB8 voice_keysplit_all voicegroup002 @ 86A0FB8 voice_keysplit voicegroup005, KeySplitTable1 @ 86A0FC4 - voice_directsound 60, 0, DirectSoundWaveData_88F8318, 128, 204, 51, 242 @ 86A0FD0 + voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 128, 204, 51, 242 @ 86A0FD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0FDC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0FE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0FF4 @@ -15158,7 +15158,7 @@ voicegroup131:: @ 86A0FB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A10B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A10C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A10CC - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 204, 103, 226 @ 86A10D8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 204, 103, 226 @ 86A10D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A10E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A10F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A10FC @@ -15279,17 +15279,17 @@ voicegroup132:: @ 86A15B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A163C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1648 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1654 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 97, 236 @ 86A1660 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 97, 236 @ 86A1660 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A166C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1678 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 128, 146, 118, 137 @ 86A1684 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 118, 137 @ 86A1684 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1690 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A169C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A16A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A16B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A16C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A16CC - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 51, 204, 92, 226 @ 86A16D8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 51, 204, 92, 226 @ 86A16D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A16E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A16F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A16FC @@ -15312,7 +15312,7 @@ voicegroup132:: @ 86A15B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A17C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A17D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A17E0 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 165, 154, 235 @ 86A17EC + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 165, 154, 235 @ 86A17EC voice_keysplit voicegroup006, KeySplitTable2 @ 86A17F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1804 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1810 @@ -15338,7 +15338,7 @@ voicegroup132:: @ 86A15B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1900 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A190C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1918 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86A1924 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86A1924 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1930 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A193C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1948 @@ -15406,27 +15406,27 @@ voicegroup133:: @ 86A1BB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1C0C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1C18 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1C24 - voice_directsound 60, 0, DirectSoundWaveData_86DD11C, 255, 0, 255, 0 @ 86A1C30 + voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86A1C30 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1C3C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1C48 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1C54 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86A1C60 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A1C60 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1C6C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1C78 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 128, 146, 108, 137 @ 86A1C84 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 108, 137 @ 86A1C84 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1C90 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1C9C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1CA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1CB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1CC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1CCC - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 204, 103, 226 @ 86A1CD8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 204, 103, 226 @ 86A1CD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1CE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1CF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1CFC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1D08 - voice_directsound 60, 0, DirectSoundWaveData_8709004, 255, 0, 255, 127 @ 86A1D14 - voice_directsound 60, 0, DirectSoundWaveData_870AE74, 255, 0, 255, 127 @ 86A1D20 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 86A1D14 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 86A1D20 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1D2C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1D38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1D44 @@ -15434,8 +15434,8 @@ voicegroup133:: @ 86A1BB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1D5C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1D68 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1D74 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 86A1D80 - voice_directsound 60, 0, DirectSoundWaveData_87224B8, 255, 0, 255, 127 @ 86A1D8C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86A1D80 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 0, 255, 127 @ 86A1D8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1D98 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1DA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1DB0 @@ -15443,7 +15443,7 @@ voicegroup133:: @ 86A1BB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1DC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1DD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1DE0 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 153 @ 86A1DEC + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 153 @ 86A1DEC voice_keysplit voicegroup006, KeySplitTable2 @ 86A1DF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1E04 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1E10 @@ -15458,7 +15458,7 @@ voicegroup133:: @ 86A1BB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1E7C voice_keysplit voicegroup009, KeySplitTable5 @ 86A1E88 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1E94 - voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 127 @ 86A1EA0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 @ 86A1EA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1EAC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1EB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1EC4 @@ -15474,7 +15474,7 @@ voicegroup133:: @ 86A1BB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1F3C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1F48 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1F54 - voice_directsound 60, 0, DirectSoundWaveData_88F94DC, 255, 0, 255, 127 @ 86A1F60 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 86A1F60 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1F6C voice_square_1_alt 0, 1, 0, 1, 9, 0 @ 86A1F78 voice_square_2_alt 3, 0, 2, 9, 1 @ 86A1F84 @@ -15516,7 +15516,7 @@ voicegroup133:: @ 86A1BB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2134 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2140 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A214C - voice_directsound 60, 0, DirectSoundWaveData_88DA388, 255, 0, 255, 165 @ 86A2158 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86A2158 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2164 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2170 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A217C @@ -15574,7 +15574,7 @@ voicegroup134:: @ 86A21B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A23C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A23D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A23E0 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 86A23EC + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 86A23EC voice_keysplit voicegroup006, KeySplitTable2 @ 86A23F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2404 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2410 @@ -15641,7 +15641,7 @@ voicegroup135:: @ 86A25F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A26C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A26D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A26E0 - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 85, 137, 180, 204 @ 86A26EC + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 85, 137, 180, 204 @ 86A26EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A26F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2704 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2710 @@ -15735,8 +15735,8 @@ voicegroup136:: @ 86A29D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2B0C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2B18 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2B24 - voice_directsound 60, 0, DirectSoundWaveData_8709004, 255, 0, 255, 127 @ 86A2B30 - voice_directsound 60, 0, DirectSoundWaveData_870AE74, 255, 0, 255, 127 @ 86A2B3C + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 86A2B30 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 86A2B3C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2B48 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2B54 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2B60 @@ -15744,7 +15744,7 @@ voicegroup136:: @ 86A29D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2B78 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2B84 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2B90 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 86A2B9C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86A2B9C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2BA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2BB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2BC0 @@ -15768,7 +15768,7 @@ voicegroup136:: @ 86A29D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2C98 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2CA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2CB0 - voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 127 @ 86A2CBC + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 @ 86A2CBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2CC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2CD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2CE0 @@ -15841,17 +15841,17 @@ voicegroup137:: @ 86A2FD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2FE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2FEC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2FF8 - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 255, 165, 180, 165 @ 86A3004 - voice_directsound 60, 0, DirectSoundWaveData_871F234, 255, 137, 154, 165 @ 86A3010 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 165, 180, 165 @ 86A3004 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_high, 255, 137, 154, 165 @ 86A3010 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A301C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3028 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3034 - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 204, 51, 242 @ 86A3040 + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 204, 51, 242 @ 86A3040 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A304C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3058 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3064 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3070 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86A307C + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A307C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3088 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3094 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A30A0 @@ -15883,8 +15883,8 @@ voicegroup137:: @ 86A2FD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A31D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A31E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A31F0 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 86A31FC - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 153 @ 86A3208 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 86A31FC + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 153 @ 86A3208 voice_keysplit voicegroup006, KeySplitTable2 @ 86A3214 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3220 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A322C @@ -15972,8 +15972,8 @@ voicegroup138:: @ 86A35D4 voice_keysplit voicegroup005, KeySplitTable1 @ 86A35E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A35EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A35F8 - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 255, 188, 128, 226 @ 86A3604 - voice_directsound 60, 65, DirectSoundWaveData_871F234, 255, 204, 77, 246 @ 86A3610 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86A3604 + voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 255, 204, 77, 246 @ 86A3610 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A361C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3628 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3634 @@ -15985,14 +15985,14 @@ voicegroup138:: @ 86A35D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A367C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3688 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3694 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 76, 133, 137 @ 86A36A0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86A36A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A36AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A36B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A36C4 - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 64, 188, 108, 165 @ 86A36D0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86A36D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A36DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A36E8 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 127 @ 86A36F4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 86A36F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3700 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A370C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3718 @@ -16014,7 +16014,7 @@ voicegroup138:: @ 86A35D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A37D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A37E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A37F0 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86A37FC + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86A37FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3808 voice_keysplit voicegroup006, KeySplitTable2 @ 86A3814 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3820 @@ -16041,7 +16041,7 @@ voicegroup138:: @ 86A35D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A391C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3928 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3934 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86A3940 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86A3940 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A394C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3958 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3964 @@ -16108,22 +16108,22 @@ voicegroup139:: @ 86A3BD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3C1C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3C28 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3C34 - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 165, 51, 242 @ 86A3C40 - voice_directsound 60, 0, DirectSoundWaveData_86DD11C, 255, 0, 255, 0 @ 86A3C4C + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 242 @ 86A3C40 + voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86A3C4C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3C58 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3C64 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 86A3C70 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86A3C7C + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 86A3C70 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A3C7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3C88 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3C94 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 128, 127, 103, 201 @ 86A3CA0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 127, 103, 201 @ 86A3CA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3CAC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3CB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3CC4 - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 37, 127, 77, 165 @ 86A3CD0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 37, 127, 77, 165 @ 86A3CD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3CDC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3CE8 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 51, 204, 92, 226 @ 86A3CF4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 51, 204, 92, 226 @ 86A3CF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3D00 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3D0C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3D18 @@ -16145,7 +16145,7 @@ voicegroup139:: @ 86A3BD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3DD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3DE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3DF0 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 226 @ 86A3DFC + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 226 @ 86A3DFC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3E08 voice_keysplit voicegroup006, KeySplitTable2 @ 86A3E14 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3E20 @@ -16172,12 +16172,12 @@ voicegroup139:: @ 86A3BD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3F1C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3F28 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3F34 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 86A3F40 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86A3F40 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3F4C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3F58 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3F64 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3F70 - voice_directsound 60, 0, DirectSoundWaveData_88F94DC, 255, 0, 255, 127 @ 86A3F7C + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 86A3F7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3F88 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3F94 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3FA0 @@ -16250,18 +16250,18 @@ voicegroup141:: @ 86A4204 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A427C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4288 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4294 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 86A42A0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 86A42A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A42AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A42B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A42C4 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 76, 133, 137 @ 86A42D0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86A42D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A42DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A42E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A42F4 - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 64, 188, 108, 165 @ 86A4300 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86A4300 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A430C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4318 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 85, 249, 25, 127 @ 86A4324 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 85, 249, 25, 127 @ 86A4324 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4330 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A433C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4348 @@ -16310,7 +16310,7 @@ voicegroup141:: @ 86A4204 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A454C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4558 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4564 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 86A4570 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86A4570 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A457C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4588 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4594 @@ -16385,20 +16385,20 @@ voicegroup142:: @ 86A4804 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A48AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A48B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A48C4 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 64, 188, 128, 201 @ 86A48D0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 64, 188, 128, 201 @ 86A48D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A48DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A48E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A48F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4900 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A490C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4918 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 64, 195, 103, 220 @ 86A4924 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 64, 195, 103, 220 @ 86A4924 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4930 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A493C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4948 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4954 - voice_directsound 60, 0, DirectSoundWaveData_8709004, 128, 195, 72, 127 @ 86A4960 - voice_directsound 60, 0, DirectSoundWaveData_870AE74, 85, 188, 103, 160 @ 86A496C + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 195, 72, 127 @ 86A4960 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 85, 188, 103, 160 @ 86A496C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4978 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4984 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4990 @@ -16406,7 +16406,7 @@ voicegroup142:: @ 86A4804 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A49A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A49B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A49C0 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 128, 188, 77, 115 @ 86A49CC + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 128, 188, 77, 115 @ 86A49CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A49D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A49E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A49F0 @@ -16430,7 +16430,7 @@ voicegroup142:: @ 86A4804 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4AC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4AD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4AE0 - voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 175, 154, 127 @ 86A4AEC + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 175, 154, 127 @ 86A4AEC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4AF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4B04 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4B10 @@ -16472,14 +16472,14 @@ voicegroup143:: @ 86A4BF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4C9C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4CA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4CB4 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 128, 160, 123, 165 @ 86A4CC0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 160, 123, 165 @ 86A4CC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4CCC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4CD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4CE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4CF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4CFC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4D08 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 0 @ 86A4D14 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 0 @ 86A4D14 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4D20 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4D2C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4D38 @@ -16603,14 +16603,14 @@ voicegroup144:: @ 86A51F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A529C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A52A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A52B4 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 85, 188, 92, 165 @ 86A52C0 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 85, 127, 180, 165 @ 86A52CC + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 85, 188, 92, 165 @ 86A52C0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 85, 127, 180, 165 @ 86A52CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A52D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A52E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A52F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A52FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5308 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 51, 204, 92, 226 @ 86A5314 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 51, 204, 92, 226 @ 86A5314 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5320 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A532C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5338 @@ -16621,10 +16621,10 @@ voicegroup144:: @ 86A51F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5374 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5380 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A538C - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 216 @ 86A5398 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 216 @ 86A5398 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A53A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A53B0 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 86A53BC + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86A53BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A53C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A53D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A53E0 @@ -16721,8 +16721,8 @@ voicegroup145:: @ 86A57F4 voice_keysplit voicegroup005, KeySplitTable1 @ 86A5800 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A580C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5818 - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 255, 188, 128, 226 @ 86A5824 - voice_directsound 60, 65, DirectSoundWaveData_871F234, 255, 204, 77, 246 @ 86A5830 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86A5824 + voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 255, 204, 77, 246 @ 86A5830 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A583C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5848 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5854 @@ -16734,14 +16734,14 @@ voicegroup145:: @ 86A57F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A589C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A58A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A58B4 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 76, 133, 137 @ 86A58C0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86A58C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A58CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A58D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A58E4 - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 64, 188, 108, 165 @ 86A58F0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86A58F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A58FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5908 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 127 @ 86A5914 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 86A5914 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5920 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A592C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5938 @@ -16763,7 +16763,7 @@ voicegroup145:: @ 86A57F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A59F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5A04 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5A10 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86A5A1C + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86A5A1C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5A28 voice_keysplit voicegroup006, KeySplitTable2 @ 86A5A34 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5A40 @@ -16790,7 +16790,7 @@ voicegroup145:: @ 86A57F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5B3C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5B48 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5B54 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86A5B60 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86A5B60 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5B6C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5B78 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5B84 @@ -16849,7 +16849,7 @@ voicegroup145:: @ 86A57F4 .align 2 voicegroup146:: @ 86A5DF4 voice_keysplit_all voicegroup002 @ 86A5DF4 - voice_directsound 60, 0, DirectSoundWaveData_88F8318, 255, 165, 103, 235 @ 86A5E00 + voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 255, 165, 103, 235 @ 86A5E00 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5E0C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5E18 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5E24 @@ -16861,7 +16861,7 @@ voicegroup146:: @ 86A5DF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5E6C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5E78 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5E84 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 86A5E90 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 86A5E90 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5E9C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5EA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5EB4 @@ -16872,7 +16872,7 @@ voicegroup146:: @ 86A5DF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5EF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5EFC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5F08 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 85, 249, 25, 226 @ 86A5F14 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 85, 249, 25, 226 @ 86A5F14 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5F20 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5F2C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5F38 @@ -16926,7 +16926,7 @@ voicegroup146:: @ 86A5DF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6178 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6184 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6190 - voice_directsound 60, 0, DirectSoundWaveData_88F94DC, 43, 76, 103, 216 @ 86A619C + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 43, 76, 103, 216 @ 86A619C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A61A8 voice_square_2_alt 2, 0, 2, 4, 4 @ 86A61B4 voice_square_1_alt 0, 2, 0, 0, 15, 0 @ 86A61C0 @@ -17003,7 +17003,7 @@ voicegroup147:: @ 86A63F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A64F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A64FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6508 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 64, 249, 25, 226 @ 86A6514 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 64, 249, 25, 226 @ 86A6514 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6520 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A652C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6538 @@ -17079,8 +17079,8 @@ voicegroup148:: @ 86A67E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A685C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6868 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6874 - voice_directsound 60, 0, DirectSoundWaveData_87224B8, 255, 226, 0, 127 @ 86A6880 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86A688C + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 226, 0, 127 @ 86A6880 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A688C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6898 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A68A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A68B0 @@ -17105,7 +17105,7 @@ voicegroup148:: @ 86A67E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6994 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A69A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A69AC - voice_directsound 60, 0, DirectSoundWaveData_87224B8, 255, 0, 255, 127 @ 86A69B8 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 0, 255, 127 @ 86A69B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A69C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A69D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A69DC @@ -17206,12 +17206,12 @@ voicegroup149:: @ 86A6DE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6E2C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6E38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6E44 - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 165, 51, 242 @ 86A6E50 + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 242 @ 86A6E50 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6E5C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6E68 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6E74 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 86A6E80 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86A6E8C + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 86A6E80 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A6E8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6E98 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6EA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6EB0 @@ -17243,8 +17243,8 @@ voicegroup149:: @ 86A6DE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6FE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6FF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7000 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86A700C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 165, 154, 153 @ 86A7018 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86A700C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 165, 154, 153 @ 86A7018 voice_keysplit voicegroup006, KeySplitTable2 @ 86A7024 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7030 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A703C @@ -17265,12 +17265,12 @@ voicegroup149:: @ 86A6DE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A70F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A70FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7108 - voice_directsound 60, 0, DirectSoundWaveData_86BBE98, 43, 188, 103, 165 @ 86A7114 - voice_directsound 60, 0, DirectSoundWaveData_86BD1DC, 43, 165, 103, 165 @ 86A7120 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 43, 188, 103, 165 @ 86A7114 + voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 43, 165, 103, 165 @ 86A7120 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A712C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7138 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7144 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86A7150 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86A7150 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A715C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7168 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7174 @@ -17294,7 +17294,7 @@ voicegroup149:: @ 86A6DE4 .align 2 voicegroup150:: @ 86A7240 voice_keysplit_all voicegroup002 @ 86A7240 - voice_directsound 60, 0, DirectSoundWaveData_88F8318, 255, 165, 103, 235 @ 86A724C + voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 255, 165, 103, 235 @ 86A724C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7258 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7264 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7270 @@ -17371,7 +17371,7 @@ voicegroup150:: @ 86A7240 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A75C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A75D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A75DC - voice_directsound 60, 0, DirectSoundWaveData_88F94DC, 85, 204, 77, 127 @ 86A75E8 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 85, 204, 77, 127 @ 86A75E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A75F4 voice_square_2_alt 1, 0, 1, 4, 6 @ 86A7600 voice_square_1_alt 0, 1, 0, 2, 4, 5 @ 86A760C @@ -17438,7 +17438,7 @@ voicegroup151:: @ 86A7840 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A78C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A78D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A78DC - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86A78E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A78E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A78F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7900 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A790C @@ -17471,7 +17471,7 @@ voicegroup151:: @ 86A7840 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7A50 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7A5C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7A68 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 127 @ 86A7A74 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 127 @ 86A7A74 voice_keysplit voicegroup006, KeySplitTable2 @ 86A7A80 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7A8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7A98 @@ -17529,17 +17529,17 @@ voicegroup152:: @ 86A7C60 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7CE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7CF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7CFC - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 97, 236 @ 86A7D08 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 97, 236 @ 86A7D08 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7D14 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7D20 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 128, 160, 175, 165 @ 86A7D2C + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 160, 175, 165 @ 86A7D2C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7D38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7D44 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7D50 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7D5C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7D68 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7D74 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 165, 128, 204 @ 86A7D80 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 86A7D80 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7D8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7D98 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7DA4 @@ -17562,7 +17562,7 @@ voicegroup152:: @ 86A7C60 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7E70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7E7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7E88 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 127, 154, 235 @ 86A7E94 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 127, 154, 235 @ 86A7E94 voice_keysplit voicegroup006, KeySplitTable2 @ 86A7EA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7EAC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7EB8 @@ -17660,7 +17660,7 @@ voicegroup153:: @ 86A8260 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A82E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A82F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A82FC - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 97, 236 @ 86A8308 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 97, 236 @ 86A8308 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8314 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8320 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A832C @@ -17692,8 +17692,8 @@ voicegroup153:: @ 86A8260 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8464 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8470 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A847C - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86A8488 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 127, 154, 235 @ 86A8494 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86A8488 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 127, 154, 235 @ 86A8494 voice_keysplit voicegroup006, KeySplitTable2 @ 86A84A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A84AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A84B8 @@ -17719,7 +17719,7 @@ voicegroup153:: @ 86A8260 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A85A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A85B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A85C0 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86A85CC + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86A85CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A85D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A85E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A85F0 @@ -17781,7 +17781,7 @@ voicegroup154:: @ 86A8860 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A886C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8878 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8884 - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 255, 249, 0, 165 @ 86A8890 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 249, 0, 165 @ 86A8890 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A889C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A88A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A88B4 @@ -17791,7 +17791,7 @@ voicegroup154:: @ 86A8860 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A88E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A88F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A88FC - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 97, 236 @ 86A8908 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 97, 236 @ 86A8908 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8914 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8920 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A892C @@ -17824,7 +17824,7 @@ voicegroup154:: @ 86A8860 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8A70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8A7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8A88 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 127, 154, 235 @ 86A8A94 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 127, 154, 235 @ 86A8A94 voice_keysplit voicegroup006, KeySplitTable2 @ 86A8AA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8AAC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8AB8 @@ -17877,8 +17877,8 @@ voicegroup155:: @ 86A8CBC voice_keysplit voicegroup005, KeySplitTable1 @ 86A8CC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8CD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8CE0 - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 255, 249, 0, 165 @ 86A8CEC - voice_directsound 60, 0, DirectSoundWaveData_871F234, 255, 188, 103, 165 @ 86A8CF8 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 249, 0, 165 @ 86A8CEC + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_high, 255, 188, 103, 165 @ 86A8CF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8D04 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8D10 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8D1C @@ -17887,23 +17887,23 @@ voicegroup155:: @ 86A8CBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8D40 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8D4C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8D58 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86A8D64 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A8D64 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8D70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8D7C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 127 @ 86A8D88 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 86A8D88 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8D94 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8DA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8DAC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8DB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8DC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8DD0 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 127 @ 86A8DDC - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 165, 128, 204 @ 86A8DE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86A8DDC + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 86A8DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8DF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8E00 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8E0C - voice_directsound 60, 0, DirectSoundWaveData_8709004, 255, 0, 255, 127 @ 86A8E18 - voice_directsound 60, 0, DirectSoundWaveData_870AE74, 255, 165, 154, 165 @ 86A8E24 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 86A8E18 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 165, 154, 165 @ 86A8E24 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8E30 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8E3C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8E48 @@ -17920,7 +17920,7 @@ voicegroup155:: @ 86A8CBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8ECC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8ED8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8EE4 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 86A8EF0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 86A8EF0 voice_keysplit voicegroup006, KeySplitTable2 @ 86A8EFC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8F08 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8F14 @@ -17935,7 +17935,7 @@ voicegroup155:: @ 86A8CBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8F80 voice_keysplit voicegroup009, KeySplitTable5 @ 86A8F8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8F98 - voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 165, 180, 165 @ 86A8FA4 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 165, 180, 165 @ 86A8FA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8FB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8FBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8FC8 @@ -17993,7 +17993,7 @@ voicegroup155:: @ 86A8CBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9238 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9244 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9250 - voice_directsound 60, 0, DirectSoundWaveData_88DA388, 255, 0, 255, 165 @ 86A925C + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86A925C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9268 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9274 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9280 @@ -18009,7 +18009,7 @@ voicegroup156:: @ 86A92BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A92D4 voice_programmable_wave_alt ProgrammableWaveData_86B4870, 0, 7, 15, 0 @ 86A92E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A92EC - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 255, 249, 0, 165 @ 86A92F8 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 249, 0, 165 @ 86A92F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9304 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9310 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A931C @@ -18021,26 +18021,26 @@ voicegroup156:: @ 86A92BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9364 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9370 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A937C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 127 @ 86A9388 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 86A9388 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9394 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A93A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A93AC - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 255, 0, 255, 165 @ 86A93B8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 86A93B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A93C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A93D0 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 165, 128, 204 @ 86A93DC + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 86A93DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A93E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A93F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9400 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A940C - voice_directsound 60, 0, DirectSoundWaveData_8709004, 255, 0, 255, 127 @ 86A9418 - voice_directsound 60, 0, DirectSoundWaveData_870AE74, 255, 0, 255, 127 @ 86A9424 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 86A9418 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 86A9424 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9430 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A943C voice_square_2_alt 3, 0, 4, 4, 4 @ 86A9448 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9454 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9460 - voice_directsound 60, 0, DirectSoundWaveData_86BEF94, 255, 165, 180, 216 @ 86A946C + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_unison_slap, 255, 165, 180, 216 @ 86A946C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9478 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9484 voice_square_2_alt 1, 0, 1, 7, 5 @ 86A9490 @@ -18066,7 +18066,7 @@ voicegroup156:: @ 86A92BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9580 voice_keysplit voicegroup009, KeySplitTable5 @ 86A958C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9598 - voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 127 @ 86A95A4 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 @ 86A95A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A95B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A95BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A95C8 @@ -18124,7 +18124,7 @@ voicegroup156:: @ 86A92BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9838 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9844 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9850 - voice_directsound 60, 0, DirectSoundWaveData_88DA388, 255, 0, 255, 165 @ 86A985C + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86A985C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9868 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9874 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9880 @@ -18152,28 +18152,28 @@ voicegroup157:: @ 86A98BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9964 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9970 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A997C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 128, 146, 190, 115 @ 86A9988 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 190, 115 @ 86A9988 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9994 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A99A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A99AC - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 255, 0, 255, 165 @ 86A99B8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 86A99B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A99C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A99D0 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 165, 128, 204 @ 86A99DC + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 86A99DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A99E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A99F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9A00 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9A0C - voice_directsound 60, 0, DirectSoundWaveData_8709004, 255, 0, 255, 127 @ 86A9A18 - voice_directsound 60, 0, DirectSoundWaveData_870AE74, 255, 0, 255, 127 @ 86A9A24 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 86A9A18 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 86A9A24 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9A30 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9A3C - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 255, 253, 0, 149 @ 86A9A48 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 86A9A48 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9A54 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9A60 - voice_directsound 60, 0, DirectSoundWaveData_86BEF94, 255, 165, 180, 216 @ 86A9A6C + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_unison_slap, 255, 165, 180, 216 @ 86A9A6C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9A78 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 86A9A84 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86A9A84 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9A90 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9A9C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9AA8 @@ -18197,7 +18197,7 @@ voicegroup157:: @ 86A98BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9B80 voice_keysplit voicegroup009, KeySplitTable5 @ 86A9B8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9B98 - voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 127 @ 86A9BA4 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 @ 86A9BA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9BB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9BBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9BC8 @@ -18270,42 +18270,42 @@ voicegroup158:: @ 86A9EBC voice_keysplit voicegroup005, KeySplitTable1 @ 86A9EC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9ED4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9EE0 - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 255, 249, 0, 165 @ 86A9EEC + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 249, 0, 165 @ 86A9EEC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9EF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9F04 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9F10 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9F1C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9F28 - voice_directsound 60, 0, DirectSoundWaveData_86DD11C, 255, 0, 255, 0 @ 86A9F34 + voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86A9F34 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9F40 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9F4C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9F58 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86A9F64 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A9F64 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9F70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9F7C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 128, 146, 108, 137 @ 86A9F88 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 108, 137 @ 86A9F88 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9F94 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9FA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9FAC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9FB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9FC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9FD0 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 204, 103, 226 @ 86A9FDC + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 204, 103, 226 @ 86A9FDC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9FE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9FF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA000 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA00C - voice_directsound 60, 0, DirectSoundWaveData_8709004, 255, 0, 255, 127 @ 86AA018 - voice_directsound 60, 0, DirectSoundWaveData_870AE74, 255, 0, 255, 127 @ 86AA024 - voice_directsound 60, 0, DirectSoundWaveData_88DA388, 255, 0, 255, 165 @ 86AA030 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 86AA018 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 86AA024 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86AA030 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA03C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA048 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA054 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 86AA060 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86AA060 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA06C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA078 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 86AA084 - voice_directsound 60, 0, DirectSoundWaveData_87224B8, 255, 0, 255, 127 @ 86AA090 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86AA084 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 0, 255, 127 @ 86AA090 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA09C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA0A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA0B4 @@ -18313,13 +18313,13 @@ voicegroup158:: @ 86A9EBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA0CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA0D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA0E4 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 153 @ 86AA0F0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 153 @ 86AA0F0 voice_keysplit voicegroup006, KeySplitTable2 @ 86AA0FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA108 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA114 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA120 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA12C - voice_directsound 60, 0, DirectSoundWaveData_86BA7E8, 255, 0, 255, 0 @ 86AA138 + voice_directsound 60, 0, DirectSoundWaveData_advanced_orchestra_voice_ahhs, 255, 0, 255, 0 @ 86AA138 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA144 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA150 voice_keysplit voicegroup007, KeySplitTable3 @ 86AA15C @@ -18328,7 +18328,7 @@ voicegroup158:: @ 86A9EBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA180 voice_keysplit voicegroup009, KeySplitTable5 @ 86AA18C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA198 - voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 236, 188 @ 86AA1A4 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 236, 188 @ 86AA1A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA1B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA1BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA1C8 @@ -18344,7 +18344,7 @@ voicegroup158:: @ 86A9EBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA240 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA24C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA258 - voice_directsound 60, 0, DirectSoundWaveData_88F94DC, 255, 0, 255, 127 @ 86AA264 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 86AA264 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA270 voice_square_1_alt 0, 1, 0, 1, 9, 0 @ 86AA27C voice_square_2_alt 3, 0, 1, 10, 1 @ 86AA288 @@ -18401,8 +18401,8 @@ voicegroup159:: @ 86AA4BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA4C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA4D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA4E0 - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 64, 249, 0, 188 @ 86AA4EC - voice_directsound 60, 0, DirectSoundWaveData_871F234, 51, 249, 0, 165 @ 86AA4F8 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 64, 249, 0, 188 @ 86AA4EC + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_high, 51, 249, 0, 165 @ 86AA4F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA504 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA510 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA51C @@ -18421,7 +18421,7 @@ voicegroup159:: @ 86AA4BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA5B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA5C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA5D0 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 85, 249, 25, 127 @ 86AA5DC + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 85, 249, 25, 127 @ 86AA5DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA5E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA5F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA600 @@ -18542,7 +18542,7 @@ voicegroup160:: @ 86AAABC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAB40 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAB4C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAB58 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86AAB64 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86AAB64 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAB70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAB7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAB88 @@ -18552,7 +18552,7 @@ voicegroup160:: @ 86AAABC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AABB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AABC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AABD0 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 127 @ 86AABDC + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86AABDC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AABE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AABF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAC00 @@ -18563,7 +18563,7 @@ voicegroup160:: @ 86AAABC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAC3C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAC48 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAC54 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 86AAC60 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86AAC60 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAC6C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAC78 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAC84 @@ -18633,14 +18633,14 @@ voicegroup161:: @ 86AAEDC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAF60 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAF6C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAF78 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86AAF84 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86AAF84 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAF90 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAF9C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 127 @ 86AAFA8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 86AAFA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAFB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAFC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAFCC - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 255, 0, 255, 165 @ 86AAFD8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 86AAFD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAFE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAFF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAFFC @@ -18692,7 +18692,7 @@ voicegroup161:: @ 86AAEDC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB224 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB230 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB23C - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 86AB248 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86AB248 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB254 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB260 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB26C @@ -18754,7 +18754,7 @@ voicegroup162:: @ 86AB4DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB4E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB4F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB500 - voice_directsound 60, 0, DirectSoundWaveData_871F234, 64, 188, 108, 244 @ 86AB50C + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_high, 64, 188, 108, 244 @ 86AB50C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB518 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB524 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB530 @@ -18764,17 +18764,17 @@ voicegroup162:: @ 86AB4DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB560 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB56C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB578 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86AB584 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86AB584 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB590 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB59C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 64, 195, 92, 235 @ 86AB5A8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 64, 195, 92, 235 @ 86AB5A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB5B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB5C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB5CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB5D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB5E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB5F0 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 127 @ 86AB5FC + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86AB5FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB608 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB614 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB620 @@ -18783,7 +18783,7 @@ voicegroup162:: @ 86AB4DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB644 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB650 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB65C - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 64, 204, 113, 235 @ 86AB668 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 64, 204, 113, 235 @ 86AB668 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB674 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB680 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB68C @@ -18850,8 +18850,8 @@ voicegroup163:: @ 86AB938 voice_keysplit voicegroup005, KeySplitTable1 @ 86AB944 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB950 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB95C - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 255, 188, 128, 226 @ 86AB968 - voice_directsound 60, 65, DirectSoundWaveData_871F234, 255, 204, 77, 246 @ 86AB974 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86AB968 + voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 255, 204, 77, 246 @ 86AB974 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB980 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB98C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB998 @@ -18863,14 +18863,14 @@ voicegroup163:: @ 86AB938 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB9E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB9EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB9F8 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 76, 133, 137 @ 86ABA04 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86ABA04 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABA10 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABA1C voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABA28 - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 64, 188, 108, 165 @ 86ABA34 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86ABA34 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABA40 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABA4C - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 127 @ 86ABA58 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 86ABA58 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABA64 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABA70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABA7C @@ -18892,7 +18892,7 @@ voicegroup163:: @ 86AB938 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABB3C voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABB48 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABB54 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86ABB60 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86ABB60 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABB6C voice_keysplit voicegroup006, KeySplitTable2 @ 86ABB78 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABB84 @@ -18919,7 +18919,7 @@ voicegroup163:: @ 86AB938 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABC80 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABC8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABC98 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86ABCA4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86ABCA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABCB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABCBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABCC8 @@ -18981,8 +18981,8 @@ voicegroup164:: @ 86ABF38 voice_keysplit voicegroup005, KeySplitTable1 @ 86ABF44 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABF50 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABF5C - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 128, 180, 108, 209 @ 86ABF68 - voice_directsound 60, 65, DirectSoundWaveData_871F234, 85, 204, 77, 246 @ 86ABF74 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 128, 180, 108, 209 @ 86ABF68 + voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 85, 204, 77, 246 @ 86ABF74 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABF80 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABF8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABF98 @@ -18994,14 +18994,14 @@ voicegroup164:: @ 86ABF38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABFE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABFEC voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABFF8 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 76, 133, 137 @ 86AC004 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86AC004 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC010 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC01C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC028 - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 64, 188, 108, 165 @ 86AC034 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86AC034 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC040 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC04C - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 127 @ 86AC058 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 86AC058 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC064 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC070 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC07C @@ -19023,7 +19023,7 @@ voicegroup164:: @ 86ABF38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC13C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC148 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC154 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86AC160 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86AC160 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC16C voice_keysplit voicegroup006, KeySplitTable2 @ 86AC178 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC184 @@ -19050,7 +19050,7 @@ voicegroup164:: @ 86ABF38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC280 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC28C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC298 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86AC2A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86AC2A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC2B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC2BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC2C8 @@ -19117,22 +19117,22 @@ voicegroup165:: @ 86AC538 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC580 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC58C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC598 - voice_directsound 60, 0, DirectSoundWaveData_86B5D04, 255, 165, 51, 242 @ 86AC5A4 - voice_directsound 60, 0, DirectSoundWaveData_86DD11C, 255, 0, 255, 0 @ 86AC5B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 242 @ 86AC5A4 + voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86AC5B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC5BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC5C8 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 86AC5D4 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86AC5E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 86AC5D4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86AC5E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC5EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC5F8 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 37, 165, 103, 127 @ 86AC604 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 37, 165, 103, 127 @ 86AC604 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC610 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC61C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC628 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC634 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC640 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC64C - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 204, 92, 226 @ 86AC658 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 204, 92, 226 @ 86AC658 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC664 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC670 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC67C @@ -19154,7 +19154,7 @@ voicegroup165:: @ 86AC538 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC73C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC748 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC754 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 226 @ 86AC760 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 226 @ 86AC760 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC76C voice_keysplit voicegroup006, KeySplitTable2 @ 86AC778 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC784 @@ -19181,12 +19181,12 @@ voicegroup165:: @ 86AC538 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC880 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC88C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC898 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 0, 255, 165 @ 86AC8A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86AC8A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC8B0 - voice_directsound 60, 0, DirectSoundWaveData_88F9F3C, 255, 191, 97, 165 @ 86AC8BC + voice_directsound 60, 0, DirectSoundWaveData_sd90_enhanced_delay_shaku, 255, 191, 97, 165 @ 86AC8BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC8C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC8D4 - voice_directsound 60, 0, DirectSoundWaveData_88F94DC, 255, 0, 255, 127 @ 86AC8E0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 86AC8E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC8EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC8F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC904 @@ -19249,36 +19249,36 @@ voicegroup166:: @ 86ACB38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACB8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACB98 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACBA4 - voice_directsound 60, 0, DirectSoundWaveData_86DD11C, 255, 0, 255, 0 @ 86ACBB0 + voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86ACBB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACBBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACBC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACBD4 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86ACBE0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86ACBE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACBEC voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACBF8 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 128, 146, 108, 137 @ 86ACC04 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 108, 137 @ 86ACC04 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACC10 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACC1C voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACC28 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACC34 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACC40 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACC4C - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 204, 103, 226 @ 86ACC58 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 204, 103, 226 @ 86ACC58 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACC64 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACC70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACC7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACC88 - voice_directsound 60, 0, DirectSoundWaveData_8709004, 255, 0, 255, 127 @ 86ACC94 - voice_directsound 60, 0, DirectSoundWaveData_870AE74, 255, 0, 255, 127 @ 86ACCA0 - voice_directsound 60, 0, DirectSoundWaveData_88DA388, 255, 0, 255, 165 @ 86ACCAC + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 86ACC94 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 86ACCA0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86ACCAC voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACCB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACCC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACCD0 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 86ACCDC + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86ACCDC voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACCE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACCF4 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 86ACD00 - voice_directsound 60, 0, DirectSoundWaveData_87224B8, 255, 0, 255, 127 @ 86ACD0C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86ACD00 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 0, 255, 127 @ 86ACD0C voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD18 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD24 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD30 @@ -19286,7 +19286,7 @@ voicegroup166:: @ 86ACB38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD48 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD54 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD60 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 153 @ 86ACD6C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 153 @ 86ACD6C voice_keysplit voicegroup006, KeySplitTable2 @ 86ACD78 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD84 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD90 @@ -19301,7 +19301,7 @@ voicegroup166:: @ 86ACB38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACDFC voice_keysplit voicegroup009, KeySplitTable5 @ 86ACE08 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACE14 - voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 236, 188 @ 86ACE20 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 236, 188 @ 86ACE20 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACE2C voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACE38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACE44 @@ -19317,7 +19317,7 @@ voicegroup166:: @ 86ACB38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACEBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACEC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACED4 - voice_directsound 60, 0, DirectSoundWaveData_88F94DC, 255, 0, 255, 127 @ 86ACEE0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 86ACEE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACEEC voice_square_1_alt 0, 3, 0, 1, 9, 0 @ 86ACEF8 voice_square_2_alt 3, 0, 2, 9, 1 @ 86ACF04 @@ -19387,14 +19387,14 @@ voicegroup167:: @ 86AD138 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD1E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD1EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD1F8 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 76, 133, 137 @ 86AD204 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86AD204 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD210 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD21C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD228 - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 64, 188, 108, 165 @ 86AD234 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86AD234 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD240 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD24C - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 127 @ 86AD258 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86AD258 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD264 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD270 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD27C @@ -19505,8 +19505,8 @@ voicegroup168:: @ 86AD738 voice_keysplit voicegroup005, KeySplitTable1 @ 86AD744 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD750 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD75C - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 255, 188, 128, 226 @ 86AD768 - voice_directsound 60, 65, DirectSoundWaveData_871F234, 255, 204, 77, 246 @ 86AD774 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86AD768 + voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 255, 204, 77, 246 @ 86AD774 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD780 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD78C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD798 @@ -19518,14 +19518,14 @@ voicegroup168:: @ 86AD738 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD7E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD7EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD7F8 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 76, 133, 137 @ 86AD804 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86AD804 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD810 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD81C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD828 - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 64, 188, 108, 165 @ 86AD834 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86AD834 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD840 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD84C - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 127 @ 86AD858 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 86AD858 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD864 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD870 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD87C @@ -19546,8 +19546,8 @@ voicegroup168:: @ 86AD738 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD930 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD93C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD948 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 86AD954 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86AD960 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 86AD954 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86AD960 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD96C voice_keysplit voicegroup006, KeySplitTable2 @ 86AD978 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD984 @@ -19574,7 +19574,7 @@ voicegroup168:: @ 86AD738 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADA80 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADA8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADA98 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86ADAA4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86ADAA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADAB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADABC voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADAC8 @@ -19649,7 +19649,7 @@ voicegroup169:: @ 86ADD38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADDE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADDEC voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADDF8 - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 210 @ 86ADE04 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 86ADE04 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADE10 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADE1C voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADE28 @@ -19667,7 +19667,7 @@ voicegroup169:: @ 86ADD38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADEB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADEC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADED0 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 86ADEDC + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86ADEDC voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADEE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADEF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADF00 @@ -19810,7 +19810,7 @@ voicegroup170:: @ 86AE338 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE548 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE554 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE560 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 86AE56C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 86AE56C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE578 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE584 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE590 @@ -19836,7 +19836,7 @@ voicegroup170:: @ 86AE338 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE680 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE68C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE698 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86AE6A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86AE6A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE6B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE6BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE6C8 @@ -19895,9 +19895,9 @@ voicegroup171:: @ 86AE728 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE920 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE92C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE938 - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 86AE944 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 86AE944 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE950 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 86AE95C + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 86AE95C voice_keysplit voicegroup006, KeySplitTable2 @ 86AE968 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE974 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE980 @@ -19923,7 +19923,7 @@ voicegroup171:: @ 86AE728 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEA70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEA7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEA88 - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86AEA94 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86AEA94 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEAA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEAAC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEAB8 @@ -19948,8 +19948,8 @@ voicegroup172:: @ 86AEB6C voice_keysplit voicegroup005, KeySplitTable1 @ 86AEB78 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEB84 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEB90 - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 255, 188, 128, 226 @ 86AEB9C - voice_directsound 60, 65, DirectSoundWaveData_871F234, 255, 204, 77, 246 @ 86AEBA8 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86AEB9C + voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 255, 204, 77, 246 @ 86AEBA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEBB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEBC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEBCC @@ -19961,14 +19961,14 @@ voicegroup172:: @ 86AEB6C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEC14 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEC20 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEC2C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 76, 133, 137 @ 86AEC38 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86AEC38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEC44 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEC50 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEC5C - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 64, 188, 108, 165 @ 86AEC68 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86AEC68 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEC74 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEC80 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 127 @ 86AEC8C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 86AEC8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEC98 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AECA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AECB0 @@ -19990,7 +19990,7 @@ voicegroup172:: @ 86AEB6C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AED70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AED7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AED88 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86AED94 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86AED94 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEDA0 voice_keysplit voicegroup006, KeySplitTable2 @ 86AEDAC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEDB8 @@ -20017,7 +20017,7 @@ voicegroup172:: @ 86AEB6C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEEB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEEC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEECC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86AEED8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86AEED8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEEE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEEF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEEFC @@ -20079,8 +20079,8 @@ voicegroup173:: @ 86AF16C voice_keysplit voicegroup005, KeySplitTable1 @ 86AF178 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF184 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF190 - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 255, 188, 128, 226 @ 86AF19C - voice_directsound 60, 65, DirectSoundWaveData_871F234, 128, 204, 77, 246 @ 86AF1A8 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86AF19C + voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 128, 204, 77, 246 @ 86AF1A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF1B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF1C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF1CC @@ -20089,18 +20089,18 @@ voicegroup173:: @ 86AF16C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF1F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF1FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF208 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86AF214 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86AF214 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF220 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF22C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 51, 0, 203, 127 @ 86AF238 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 51, 0, 203, 127 @ 86AF238 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF244 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF250 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF25C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF268 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF274 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF280 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 127 @ 86AF28C - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 64, 216, 51, 224 @ 86AF298 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86AF28C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 64, 216, 51, 224 @ 86AF298 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF2A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF2B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF2BC @@ -20110,7 +20110,7 @@ voicegroup173:: @ 86AF16C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF2EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF2F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF304 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 86AF310 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86AF310 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF31C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF328 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF334 @@ -20148,7 +20148,7 @@ voicegroup173:: @ 86AF16C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF4B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF4C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF4CC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86AF4D8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86AF4D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF4E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF4F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF4FC @@ -20211,7 +20211,7 @@ voicegroup174:: @ 86AF76C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF784 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF790 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF79C - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 255, 249, 0, 165 @ 86AF7A8 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 249, 0, 165 @ 86AF7A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF7B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF7C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF7CC @@ -20223,11 +20223,11 @@ voicegroup174:: @ 86AF76C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF814 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF820 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF82C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 0, 255, 127 @ 86AF838 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 86AF838 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF844 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF850 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF85C - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 255, 0, 255, 165 @ 86AF868 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 86AF868 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF874 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF880 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF88C @@ -20235,8 +20235,8 @@ voicegroup174:: @ 86AF76C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF8A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF8B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF8BC - voice_directsound 60, 0, DirectSoundWaveData_8709004, 128, 0, 255, 214 @ 86AF8C8 - voice_directsound 60, 0, DirectSoundWaveData_870AE74, 128, 0, 255, 206 @ 86AF8D4 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 0, 255, 214 @ 86AF8C8 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 128, 0, 255, 206 @ 86AF8D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF8E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF8EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF8F8 @@ -20244,7 +20244,7 @@ voicegroup174:: @ 86AF76C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF910 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF91C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF928 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 165 @ 86AF934 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 165 @ 86AF934 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF940 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF94C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF958 @@ -20268,7 +20268,7 @@ voicegroup174:: @ 86AF76C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFA30 voice_keysplit voicegroup009, KeySplitTable5 @ 86AFA3C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFA48 - voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 209 @ 86AFA54 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 209 @ 86AFA54 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFA60 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFA6C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFA78 @@ -20326,7 +20326,7 @@ voicegroup174:: @ 86AF76C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFCE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFCF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFD00 - voice_directsound 60, 0, DirectSoundWaveData_88DA388, 255, 0, 255, 165 @ 86AFD0C + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86AFD0C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFD18 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFD24 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFD30 @@ -20358,7 +20358,7 @@ voicegroup174:: @ 86AF76C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFE68 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFE74 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFE80 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 165, 154, 127 @ 86AFE8C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 154, 127 @ 86AFE8C voice_keysplit_all voicegroup002 @ 86AFE98 voice_square_1_alt 0, 2, 0, 2, 3, 1 @ 86AFEA4 voice_square_2_alt 2, 0, 2, 3, 1 @ 86AFEB0 @@ -20379,7 +20379,7 @@ voicegroup175:: @ 86AFEC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFF40 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFF4C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFF58 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 86AFF64 + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 86AFF64 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFF70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFF7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFF88 @@ -20390,7 +20390,7 @@ voicegroup175:: @ 86AFEC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFFC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFFD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFFDC - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 85, 165, 154, 127 @ 86AFFE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 85, 165, 154, 127 @ 86AFFE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFFF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0000 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B000C @@ -20507,36 +20507,36 @@ voicegroup177:: @ 86B0378 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B04F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0504 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0510 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86DB908, 255, 0, 255, 0 @ 86B051C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CD0C4, 255, 0, 255, 0 @ 86B0528 - voice_directsound_no_resample 67, 71, DirectSoundWaveData_86CDFDC, 255, 180, 175, 228 @ 86B0534 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CDFDC, 255, 0, 255, 242 @ 86B0540 - voice_directsound_no_resample 65, 0, DirectSoundWaveData_86C6200, 255, 255, 255, 127 @ 86B054C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86C6A90, 255, 0, 255, 242 @ 86B0558 - voice_directsound 64, 24, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 86B0564 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 86B051C + voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 86B0528 + voice_directsound_no_resample 67, 71, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 86B0534 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 86B0540 + voice_directsound_no_resample 65, 0, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 86B054C + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 86B0558 + voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86B0564 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0570 - voice_directsound 68, 29, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 86B057C - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C5B0C, 255, 0, 255, 242 @ 86B0588 - voice_directsound 72, 64, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 86B0594 + voice_directsound 68, 29, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86B057C + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 86B0588 + voice_directsound 72, 64, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86B0594 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B05A0 - voice_directsound 76, 39, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 86B05AC - voice_directsound 80, 89, DirectSoundWaveData_86CF950, 255, 0, 255, 226 @ 86B05B8 - voice_directsound_no_resample 33, 10, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 86B05C4 - voice_directsound 84, 104, DirectSoundWaveData_86CF950, 255, 0, 255, 235 @ 86B05D0 + voice_directsound 76, 39, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86B05AC + voice_directsound 80, 89, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86B05B8 + voice_directsound_no_resample 33, 10, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B05C4 + voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235 @ 86B05D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B05DC - voice_directsound 63, 64, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 86B05E8 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86D1A2C, 255, 165, 103, 231 @ 86B05F4 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CA520, 255, 127, 77, 204 @ 86B0600 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CADD4, 255, 231, 0, 188 @ 86B060C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86D925C, 255, 0, 255, 242 @ 86B0618 - voice_directsound_no_resample 64, 118, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 86B0624 + voice_directsound 63, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B05E8 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 86B05F4 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 86B0600 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_cymbal_crash, 255, 231, 0, 188 @ 86B060C + voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242 @ 86B0618 + voice_directsound_no_resample 64, 118, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B0624 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0630 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 86B063C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CB6B8, 8, 0, 255, 216 @ 86B0648 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86D9C14, 255, 0, 255, 0 @ 86B0654 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CC5E4, 255, 0, 255, 0 @ 86B0660 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CCAFC, 255, 0, 255, 0 @ 86B066C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CCAFC, 255, 0, 255, 0 @ 86B0678 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B063C + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 8, 0, 255, 216 @ 86B0648 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 86B0654 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 86B0660 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86B066C + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86B0678 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0684 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0690 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B069C @@ -20552,16 +20552,16 @@ voicegroup177:: @ 86B0378 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0714 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0720 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B072C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86DAA94, 255, 242, 103, 188 @ 86B0738 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86DAA94, 255, 242, 103, 188 @ 86B0744 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86DAA94, 255, 165, 103, 188 @ 86B0750 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86DB908, 255, 0, 255, 0 @ 86B075C + voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 86B0738 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 86B0744 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188 @ 86B0750 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 86B075C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0768 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0774 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86DD11C, 255, 0, 255, 0 @ 86B0780 - voice_directsound 63, 64, DirectSoundWaveData_86DE6C0, 255, 0, 255, 0 @ 86B078C - voice_directsound 50, 64, DirectSoundWaveData_86DFCA4, 255, 0, 255, 0 @ 86B0798 - voice_directsound 64, 64, DirectSoundWaveData_86DFCA4, 255, 0, 255, 0 @ 86B07A4 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86B0780 + voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 86B078C + voice_directsound 50, 64, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 86B0798 + voice_directsound 64, 64, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 86B07A4 .align 2 voicegroup178:: @ 86B07B0 @@ -20578,7 +20578,7 @@ voicegroup178:: @ 86B07B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0828 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0834 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0840 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 204, 103, 165 @ 86B084C + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 204, 103, 165 @ 86B084C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0858 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0864 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0870 @@ -20589,7 +20589,7 @@ voicegroup178:: @ 86B07B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B08AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B08B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B08C4 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 165, 154, 165 @ 86B08D0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 154, 165 @ 86B08D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B08DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B08E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B08F4 @@ -20669,7 +20669,7 @@ voicegroup179:: @ 86B0BD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0C48 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0C54 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0C60 - voice_directsound 60, 0, DirectSoundWaveData_873E2A4, 255, 235, 0, 204 @ 86B0C6C + voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 86B0C6C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0C78 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0C84 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0C90 @@ -20680,7 +20680,7 @@ voicegroup179:: @ 86B0BD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0CCC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0CD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0CE4 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 85, 165, 154, 127 @ 86B0CF0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 85, 165, 154, 127 @ 86B0CF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0CFC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0D08 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0D14 @@ -20689,7 +20689,7 @@ voicegroup179:: @ 86B0BD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0D38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0D44 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0D50 - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 255, 253, 0, 149 @ 86B0D5C + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 86B0D5C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0D68 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0D74 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0D80 @@ -20751,8 +20751,8 @@ voicegroup180:: @ 86B0FF0 voice_keysplit voicegroup005, KeySplitTable1 @ 86B0FFC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1008 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1014 - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 64, 249, 0, 188 @ 86B1020 - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 255, 249, 0, 165 @ 86B102C + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 64, 249, 0, 188 @ 86B1020 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 249, 0, 165 @ 86B102C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1038 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1044 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1050 @@ -20873,7 +20873,7 @@ voicegroup180:: @ 86B0FF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B15B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B15C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B15CC - voice_directsound_no_resample 60, 0, DirectSoundWaveData_86C6200, 255, 255, 255, 127 @ 86B15D8 + voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 86B15D8 voice_noise_alt 0, 0, 1, 0, 0 @ 86B15E4 .align 2 @@ -20924,7 +20924,7 @@ voicegroup181:: @ 86B15F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B17F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1800 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B180C - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 86B1818 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 86B1818 .align 2 voicegroup182:: @ 86B1824 @@ -20975,7 +20975,7 @@ voicegroup182:: @ 86B1824 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1A34 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1A40 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1A4C - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 76 @ 86B1A58 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 76 @ 86B1A58 voice_keysplit voicegroup006, KeySplitTable2 @ 86B1A64 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1A70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1A7C @@ -21043,7 +21043,7 @@ voicegroup183:: @ 86B1C44 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1D40 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1D4C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1D58 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 127 @ 86B1D64 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86B1D64 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1D70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1D7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1D88 @@ -21054,7 +21054,7 @@ voicegroup183:: @ 86B1C44 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1DC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1DD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1DDC - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 86B1DE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86B1DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1DF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1E00 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1E0C @@ -21164,7 +21164,7 @@ voicegroup184:: @ 86B2244 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B22C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B22D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B22E0 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86B22EC + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86B22EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B22F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2304 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2310 @@ -21181,14 +21181,14 @@ voicegroup184:: @ 86B2244 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2394 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B23A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B23AC - voice_directsound 60, 0, DirectSoundWaveData_88DA388, 255, 0, 255, 165 @ 86B23B8 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86B23B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B23C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B23D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B23DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B23E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B23F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2400 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 86B240C + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86B240C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2418 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2424 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2430 @@ -21235,7 +21235,7 @@ voicegroup184:: @ 86B2244 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B261C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2628 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2634 - voice_directsound 60, 0, DirectSoundWaveData_86BA7E8, 255, 0, 255, 0 @ 86B2640 + voice_directsound 60, 0, DirectSoundWaveData_advanced_orchestra_voice_ahhs, 255, 0, 255, 0 @ 86B2640 .align 2 voicegroup185:: @ 86B264C @@ -21253,7 +21253,7 @@ voicegroup185:: @ 86B264C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B26D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B26DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B26E8 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86B26F4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86B26F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2700 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B270C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2718 @@ -21268,31 +21268,31 @@ voicegroup185:: @ 86B264C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2784 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2790 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B279C - voice_directsound 60, 0, DirectSoundWaveData_8709004, 128, 0, 255, 214 @ 86B27A8 - voice_directsound 60, 0, DirectSoundWaveData_870AE74, 128, 0, 255, 206 @ 86B27B4 - voice_directsound 60, 0, DirectSoundWaveData_88DA388, 255, 0, 255, 165 @ 86B27C0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 0, 255, 214 @ 86B27A8 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 128, 0, 255, 206 @ 86B27B4 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86B27C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B27CC - voice_directsound 60, 0, DirectSoundWaveData_86FFDC0, 255, 253, 0, 149 @ 86B27D8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 86B27D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B27E4 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 86B27F0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86B27F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B27FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2808 - voice_directsound 60, 0, DirectSoundWaveData_86B86A4, 255, 252, 0, 115 @ 86B2814 + voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86B2814 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2820 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B282C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2838 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2844 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2850 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B285C - voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 86B2868 + voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 86B2868 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2874 - voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 86B2880 + voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 86B2880 voice_keysplit voicegroup006, KeySplitTable2 @ 86B288C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2898 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B28A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B28B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B28BC - voice_directsound 60, 0, DirectSoundWaveData_86BA7E8, 85, 0, 154, 165 @ 86B28C8 + voice_directsound 60, 0, DirectSoundWaveData_advanced_orchestra_voice_ahhs, 85, 0, 154, 165 @ 86B28C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B28D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B28E0 voice_keysplit voicegroup007, KeySplitTable3 @ 86B28EC @@ -21301,7 +21301,7 @@ voicegroup185:: @ 86B264C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2910 voice_keysplit voicegroup009, KeySplitTable5 @ 86B291C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2928 - voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 209 @ 86B2934 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 209 @ 86B2934 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2940 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B294C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2958 @@ -21317,7 +21317,7 @@ voicegroup185:: @ 86B264C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B29D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B29DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B29E8 - voice_directsound 60, 0, DirectSoundWaveData_88F94DC, 255, 0, 255, 127 @ 86B29F4 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 86B29F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2A00 voice_square_2_alt 2, 0, 0, 15, 0 @ 86B2A0C voice_square_1_alt 0, 2, 0, 0, 15, 0 @ 86B2A18 @@ -21518,14 +21518,14 @@ voicegroup187:: @ 86B324C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B32F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3300 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B330C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 255, 76, 133, 137 @ 86B3318 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86B3318 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3324 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3330 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B333C - voice_directsound 60, 0, DirectSoundWaveData_87410E0, 64, 188, 108, 165 @ 86B3348 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86B3348 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3354 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3360 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 255, 249, 25, 127 @ 86B336C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 86B336C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3378 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3384 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3390 @@ -21547,7 +21547,7 @@ voicegroup187:: @ 86B324C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3450 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B345C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3468 - voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86B3474 + voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86B3474 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3480 voice_keysplit voicegroup006, KeySplitTable2 @ 86B348C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3498 @@ -21574,7 +21574,7 @@ voicegroup187:: @ 86B324C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3594 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B35A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B35AC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86B35B8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86B35B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B35C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B35D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B35DC @@ -21636,8 +21636,8 @@ voicegroup188:: @ 86B384C voice_keysplit voicegroup005, KeySplitTable1 @ 86B3858 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3864 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3870 - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 255, 188, 128, 226 @ 86B387C - voice_directsound 60, 65, DirectSoundWaveData_871F234, 128, 204, 77, 246 @ 86B3888 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86B387C + voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 128, 204, 77, 246 @ 86B3888 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3894 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B38A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B38AC @@ -21646,18 +21646,18 @@ voicegroup188:: @ 86B384C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B38D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B38DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B38E8 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86B38F4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86B38F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3900 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B390C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 51, 0, 203, 127 @ 86B3918 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 51, 0, 203, 127 @ 86B3918 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3924 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3930 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B393C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3948 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3954 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3960 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 127 @ 86B396C - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 64, 216, 51, 224 @ 86B3978 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86B396C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 64, 216, 51, 224 @ 86B3978 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3984 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3990 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B399C @@ -21667,7 +21667,7 @@ voicegroup188:: @ 86B384C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B39CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B39D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B39E4 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 86B39F0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86B39F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B39FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3A08 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3A14 @@ -21705,7 +21705,7 @@ voicegroup188:: @ 86B384C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3B94 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3BA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3BAC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86B3BB8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86B3BB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3BC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3BD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3BDC @@ -21767,8 +21767,8 @@ voicegroup189:: @ 86B3E4C voice_keysplit voicegroup005, KeySplitTable1 @ 86B3E58 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3E64 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3E70 - voice_directsound 60, 0, DirectSoundWaveData_871CBCC, 255, 188, 128, 226 @ 86B3E7C - voice_directsound 60, 65, DirectSoundWaveData_871F234, 128, 204, 77, 246 @ 86B3E88 + voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86B3E7C + voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 128, 204, 77, 246 @ 86B3E88 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3E94 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3EA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3EAC @@ -21777,18 +21777,18 @@ voicegroup189:: @ 86B3E4C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3ED0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3EDC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3EE8 - voice_directsound 60, 0, DirectSoundWaveData_8736C74, 255, 165, 90, 216 @ 86B3EF4 + voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86B3EF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3F00 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3F0C - voice_directsound 60, 0, DirectSoundWaveData_86B63A8, 51, 0, 203, 127 @ 86B3F18 + voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 51, 0, 203, 127 @ 86B3F18 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3F24 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3F30 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3F3C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3F48 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3F54 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3F60 - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 128, 249, 25, 127 @ 86B3F6C - voice_directsound 60, 0, DirectSoundWaveData_88D8418, 64, 216, 51, 224 @ 86B3F78 + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86B3F6C + voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 64, 216, 51, 224 @ 86B3F78 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3F84 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3F90 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3F9C @@ -21798,7 +21798,7 @@ voicegroup189:: @ 86B3E4C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3FCC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3FD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3FE4 - voice_directsound 60, 0, DirectSoundWaveData_86B6BA0, 255, 253, 0, 188 @ 86B3FF0 + voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86B3FF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3FFC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4008 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4014 @@ -21836,7 +21836,7 @@ voicegroup189:: @ 86B3E4C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4194 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B41A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B41AC - voice_directsound 60, 0, DirectSoundWaveData_86FF65C, 255, 127, 231, 127 @ 86B41B8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86B41B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B41C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B41D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B41DC @@ -21894,35 +21894,35 @@ voicegroup190:: @ 86B429C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4428 voice_noise_alt 0, 0, 2, 7, 0 @ 86B4434 voice_noise_alt 0, 0, 1, 9, 1 @ 86B4440 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86CD0C4, 255, 0, 255, 0 @ 86B444C + voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 86B444C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4458 - voice_directsound_no_resample 64, 52, DirectSoundWaveData_86C6A90, 255, 0, 255, 242 @ 86B4464 + voice_directsound_no_resample 64, 52, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 86B4464 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4470 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B447C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4488 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4494 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B44A0 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_86C5B0C, 255, 0, 255, 242 @ 86B44AC + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 86B44AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B44B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B44C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B44D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B44DC - voice_directsound_no_resample 33, 104, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 86B44E8 + voice_directsound_no_resample 33, 104, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B44E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B44F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4500 - voice_directsound 63, 64, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 86B450C + voice_directsound 63, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B450C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4518 - voice_directsound_no_resample 64, 34, DirectSoundWaveData_86CA520, 255, 127, 77, 204 @ 86B4524 - voice_directsound_no_resample 64, 14, DirectSoundWaveData_86CADD4, 255, 231, 0, 188 @ 86B4530 - voice_directsound_no_resample 64, 89, DirectSoundWaveData_86D925C, 255, 0, 255, 242 @ 86B453C - voice_directsound_no_resample 64, 24, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 86B4548 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 86B4524 + voice_directsound_no_resample 64, 14, DirectSoundWaveData_unknown_cymbal_crash, 255, 231, 0, 188 @ 86B4530 + voice_directsound_no_resample 64, 89, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242 @ 86B453C + voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B4548 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4554 - voice_directsound_no_resample 64, 54, DirectSoundWaveData_86CB6B8, 255, 235, 0, 231 @ 86B4560 - voice_directsound_no_resample 64, 54, DirectSoundWaveData_86CB6B8, 8, 0, 255, 216 @ 86B456C - voice_directsound_no_resample 64, 94, DirectSoundWaveData_86D9C14, 255, 0, 255, 0 @ 86B4578 - voice_directsound_no_resample 64, 34, DirectSoundWaveData_86CC5E4, 255, 0, 255, 0 @ 86B4584 - voice_directsound_no_resample 64, 34, DirectSoundWaveData_86CCAFC, 255, 0, 255, 0 @ 86B4590 - voice_directsound_no_resample 64, 90, DirectSoundWaveData_86CCAFC, 255, 0, 255, 0 @ 86B459C + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B4560 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 8, 0, 255, 216 @ 86B456C + voice_directsound_no_resample 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 86B4578 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 86B4584 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86B4590 + voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86B459C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B45A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B45B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B45C0 @@ -21938,11 +21938,11 @@ voicegroup190:: @ 86B429C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4638 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4644 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4650 - voice_directsound_no_resample 64, 39, DirectSoundWaveData_86DAA94, 255, 242, 103, 188 @ 86B465C - voice_directsound_no_resample 64, 79, DirectSoundWaveData_86DAA94, 255, 242, 103, 188 @ 86B4668 - voice_directsound_no_resample 64, 39, DirectSoundWaveData_86DAA94, 255, 165, 103, 188 @ 86B4674 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_86DB908, 255, 0, 255, 0 @ 86B4680 + voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 86B465C + voice_directsound_no_resample 64, 79, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 86B4668 + voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188 @ 86B4674 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 86B4680 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B468C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4698 - voice_directsound_no_resample 64, 104, DirectSoundWaveData_86DD11C, 255, 0, 255, 0 @ 86B46A4 - voice_directsound 63, 64, DirectSoundWaveData_86DE6C0, 255, 0, 255, 0 @ 86B46B0 + voice_directsound_no_resample 64, 104, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86B46A4 + voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 86B46B0 diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index ee35ed45b..b4ec6cd62 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -324,7 +324,7 @@ static const union AffineAnimCmd * const gSpriteAffineAnimTable_861F3C4[] = gSpriteAffineAnim_861F39C, }; -static const struct CompressedSpriteSheet gUnknown_0861F3CC = {gBattleFrontierGfx_PyramidBag, 0x0800, 0x1024}; +static const struct CompressedSpriteSheet gPyramidBagSpriteSheet = {gBattleFrontierGfx_PyramidBag, 0x0800, 0x1024}; static const struct SpriteTemplate gUnknown_0861F3D4 = { @@ -538,7 +538,7 @@ static bool8 sub_81C5238(void) case 1: if (free_temp_tile_data_buffers_if_possible() != TRUE) { - LZDecompressWram(gUnknown_08D9AE04, gPyramidBagResources->tilemapBuffer); + LZDecompressWram(gBattleFrontierGfx_PyramidBagTileMap, gPyramidBagResources->tilemapBuffer); gPyramidBagResources->state++; } break; @@ -547,7 +547,7 @@ static bool8 sub_81C5238(void) gPyramidBagResources->state++; break; case 3: - LoadCompressedSpriteSheet(&gUnknown_0861F3CC); + LoadCompressedSpriteSheet(&gPyramidBagSpriteSheet); gPyramidBagResources->state++; break; case 4: @@ -1489,7 +1489,7 @@ static void sub_81C6E98(void) struct SpritePalette spritePalette; u16 *palPtr = Alloc(0x40); - LZDecompressWram(gUnknown_08D9ADD0, palPtr); + LZDecompressWram(gBattleFrontierGfx_PyramidBag_Pal, palPtr); spritePalette.data = palPtr + (gSaveBlock2Ptr->frontier.lvlMode * 16); spritePalette.tag = ITEM_IMAGE_TAG; LoadSpritePalette(&spritePalette); diff --git a/src/berry_blender.c b/src/berry_blender.c index c1c664c1a..d6a7879f4 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1078,7 +1078,7 @@ static void sub_807FD64(struct Sprite* sprite, s16 a2, s16 a3, s16 a4, s16 a5, s static void sub_807FD90(u16 a0, u8 a1) { - u8 spriteId = sub_80D511C(a0 + 123, 0, 80, a1 & 1); + u8 spriteId = LoadSpinningBerryPicGfx(a0 + 123, 0, 80, a1 & 1); sub_807FD64(&gSprites[spriteId], sUnknown_08339C78[a1][0], sUnknown_08339C78[a1][1], sUnknown_08339C78[a1][2], sUnknown_08339C78[a1][3], sUnknown_08339C78[a1][4]); } diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index d0f89ab8a..c3eac783d 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -318,18 +318,18 @@ static bool8 LoadBerryTagGfx(void) { case 0: reset_temp_tile_data_buffers(); - decompress_and_copy_tile_data_to_vram(2, gUnknown_08D9BB44, 0, 0, 0); + decompress_and_copy_tile_data_to_vram(2, gBerryCheck_Gfx, 0, 0, 0); sBerryTag->gfxState++; break; case 1: if (free_temp_tile_data_buffers_if_possible() != TRUE) { - LZDecompressWram(gUnknown_08D9BF98, sBerryTag->tilemapBuffers[0]); + LZDecompressWram(gBerryTag_Gfx, sBerryTag->tilemapBuffers[0]); sBerryTag->gfxState++; } break; case 2: - LZDecompressWram(gUnknown_08D9C13C, sBerryTag->tilemapBuffers[2]); + LZDecompressWram(gBerryTag_Pal, sBerryTag->tilemapBuffers[2]); sBerryTag->gfxState++; break; case 3: @@ -346,15 +346,15 @@ static bool8 LoadBerryTagGfx(void) sBerryTag->gfxState++; break; case 4: - LoadCompressedPalette(gUnknown_08D9BEF0, 0, 0xC0); + LoadCompressedPalette(gBerryCheck_Pal, 0, 0xC0); sBerryTag->gfxState++; break; case 5: - LoadCompressedSpriteSheet(&gUnknown_0857FDEC); + LoadCompressedSpriteSheet(&gBerryCheckCircleSpriteSheet); sBerryTag->gfxState++; break; default: - LoadCompressedSpritePalette(&gUnknown_0857FDF4); + LoadCompressedSpritePalette(&gBerryCheckCirclePaletteTable); return TRUE; // done } @@ -548,7 +548,7 @@ static void Task_HandleInput(u8 taskId) static void TryChangeDisplayedBerry(u8 taskId, s8 toMove) { s16 *data = gTasks[taskId].data; - s16 currPocketPosition = gUnknown_0203CE58.scrollPosition[3] + gUnknown_0203CE58.cursorPosition[3]; + s16 currPocketPosition = gBagPositionStruct.scrollPosition[3] + gBagPositionStruct.cursorPosition[3]; u32 newPocketPosition = currPocketPosition + toMove; if (newPocketPosition < 46 && BagGetItemIdByPocketPosition(POCKET_BERRIES, newPocketPosition) != 0) { @@ -566,8 +566,8 @@ static void TryChangeDisplayedBerry(u8 taskId, s8 toMove) static void HandleBagCursorPositionChange(s8 toMove) { - u16 *scrollPos = &gUnknown_0203CE58.scrollPosition[3]; - u16 *cursorPos = &gUnknown_0203CE58.cursorPosition[3]; + u16 *scrollPos = &gBagPositionStruct.scrollPosition[3]; + u16 *cursorPos = &gBagPositionStruct.cursorPosition[3]; if (toMove > 0) { if (*cursorPos < 4 || BagGetItemIdByPocketPosition(POCKET_BERRIES, *scrollPos + 8) == 0) diff --git a/src/data/graphics/berries.h b/src/data/graphics/berries.h index 649863663..95c72b3e9 100644 --- a/src/data/graphics/berries.h +++ b/src/data/graphics/berries.h @@ -1,8 +1,8 @@ -const u32 gUnknown_08D9BB44[] = INCBIN_U32("graphics/interface/check_berry.4bpp.lz"); -const u32 gUnknown_08D9BEF0[] = INCBIN_U32("graphics/interface/check_berry.gbapal.lz"); +const u32 gBerryCheck_Gfx[] = INCBIN_U32("graphics/interface/check_berry.4bpp.lz"); +const u32 gBerryCheck_Pal[] = INCBIN_U32("graphics/interface/check_berry.gbapal.lz"); -const u32 gUnknown_08D9BF98[] = INCBIN_U32("graphics/interface/berry_tag.bin.lz"); -const u32 gUnknown_08D9C13C[] = INCBIN_U32("graphics/interface/berry_tag_title.bin.lz"); +const u32 gBerryTag_Gfx[] = INCBIN_U32("graphics/interface/berry_tag.bin.lz"); +const u32 gBerryTag_Pal[] = INCBIN_U32("graphics/interface/berry_tag_title.bin.lz"); const u32 gBerryCheckCircle_Gfx[] = INCBIN_U32("graphics/interface/check_berry_circle.4bpp.lz"); diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index 04c7ab3c4..0f2b53a18 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -166,7 +166,6 @@ const u8 gFacilityClassToTrainerClass[] = [FACILITY_CLASS_DOME_ACE_TUCKER] = TRAINER_CLASS_DOME_ACE, [FACILITY_CLASS_RED] = TRAINER_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_LEAF] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_RS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_4, - [FACILITY_CLASS_RS_MAY] = TRAINER_CLASS_PKMN_TRAINER_4, + [FACILITY_CLASS_RS_BRENDAN] = TRAINER_CLASS_RS_PROTAG, + [FACILITY_CLASS_RS_MAY] = TRAINER_CLASS_RS_PROTAG, }; - diff --git a/src/data/text/trainer_class_names.h b/src/data/text/trainer_class_names.h index dd750b354..f012e877b 100644 --- a/src/data/text/trainer_class_names.h +++ b/src/data/text/trainer_class_names.h @@ -47,7 +47,7 @@ const u8 gTrainerClassNames[][13] = { [TRAINER_CLASS_SWIMMER_F] = _("SWIMMER♀"), [TRAINER_CLASS_TWINS] = _("TWINS"), [TRAINER_CLASS_SAILOR] = _("SAILOR"), - [TRAINER_CLASS_COOLTRAINER_UNUSED] = _("COOLTRAINER"), + [TRAINER_CLASS_COOLTRAINER_2] = _("COOLTRAINER"), [TRAINER_CLASS_MAGMA_ADMIN] = _("MAGMA ADMIN"), [TRAINER_CLASS_PKMN_TRAINER_3] = _("{PKMN} TRAINER"), [TRAINER_CLASS_BUG_CATCHER] = _("BUG CATCHER"), @@ -64,5 +64,5 @@ const u8 gTrainerClassNames[][13] = { [TRAINER_CLASS_FACTORY_HEAD] = _("FACTORY HEAD"), [TRAINER_CLASS_PIKE_QUEEN] = _("PIKE QUEEN"), [TRAINER_CLASS_PYRAMID_KING] = _("PYRAMID KING"), - [TRAINER_CLASS_PKMN_TRAINER_4] = _("{PKMN} TRAINER"), + [TRAINER_CLASS_RS_PROTAG] = _("{PKMN} TRAINER"), }; diff --git a/src/data/trainers.h b/src/data/trainers.h index 5a92926cc..c30d21afd 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -10,7 +10,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0, .partySize = 0, - .party = {.NoItemDefaultMoves = NULL } + .party = {.NoItemDefaultMoves = NULL}, }, [TRAINER_SAWYER_1] = @@ -23,8 +23,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Sawyer1 } + .partySize = ARRAY_COUNT(sParty_Sawyer1), + .party = {.NoItemDefaultMoves = sParty_Sawyer1}, }, [TRAINER_GRUNT_1] = @@ -37,8 +37,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt1 } + .partySize = ARRAY_COUNT(sParty_Grunt1), + .party = {.NoItemDefaultMoves = sParty_Grunt1}, }, [TRAINER_GRUNT_2] = @@ -51,8 +51,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Grunt2 } + .partySize = ARRAY_COUNT(sParty_Grunt2), + .party = {.NoItemDefaultMoves = sParty_Grunt2}, }, [TRAINER_GRUNT_3] = @@ -65,8 +65,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt3 } + .partySize = ARRAY_COUNT(sParty_Grunt3), + .party = {.NoItemDefaultMoves = sParty_Grunt3}, }, [TRAINER_GRUNT_4] = @@ -79,8 +79,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt4 } + .partySize = ARRAY_COUNT(sParty_Grunt4), + .party = {.NoItemDefaultMoves = sParty_Grunt4}, }, [TRAINER_GRUNT_5] = @@ -93,8 +93,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt5 } + .partySize = ARRAY_COUNT(sParty_Grunt5), + .party = {.NoItemDefaultMoves = sParty_Grunt5}, }, [TRAINER_GRUNT_6] = @@ -107,8 +107,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt6 } + .partySize = ARRAY_COUNT(sParty_Grunt6), + .party = {.NoItemDefaultMoves = sParty_Grunt6}, }, [TRAINER_GRUNT_7] = @@ -121,8 +121,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt7 } + .partySize = ARRAY_COUNT(sParty_Grunt7), + .party = {.NoItemDefaultMoves = sParty_Grunt7}, }, [TRAINER_GABRIELLE_1] = @@ -135,8 +135,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Gabrielle1 } + .partySize = ARRAY_COUNT(sParty_Gabrielle1), + .party = {.NoItemDefaultMoves = sParty_Gabrielle1}, }, [TRAINER_GRUNT_8] = @@ -149,8 +149,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt8 } + .partySize = ARRAY_COUNT(sParty_Grunt8), + .party = {.NoItemDefaultMoves = sParty_Grunt8}, }, [TRAINER_MARCEL] = @@ -163,8 +163,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Marcel } + .partySize = ARRAY_COUNT(sParty_Marcel), + .party = {.NoItemDefaultMoves = sParty_Marcel}, }, [TRAINER_ALBERTO] = @@ -177,8 +177,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Alberto } + .partySize = ARRAY_COUNT(sParty_Alberto), + .party = {.NoItemDefaultMoves = sParty_Alberto}, }, [TRAINER_ED] = @@ -191,8 +191,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Ed } + .partySize = ARRAY_COUNT(sParty_Ed), + .party = {.NoItemDefaultMoves = sParty_Ed}, }, [TRAINER_GRUNT_9] = @@ -205,8 +205,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt9 } + .partySize = ARRAY_COUNT(sParty_Grunt9), + .party = {.NoItemDefaultMoves = sParty_Grunt9}, }, [TRAINER_DECLAN] = @@ -219,8 +219,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Declan } + .partySize = ARRAY_COUNT(sParty_Declan), + .party = {.NoItemDefaultMoves = sParty_Declan}, }, [TRAINER_GRUNT_10] = @@ -233,8 +233,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt10 } + .partySize = ARRAY_COUNT(sParty_Grunt10), + .party = {.NoItemDefaultMoves = sParty_Grunt10}, }, [TRAINER_GRUNT_11] = @@ -247,8 +247,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Grunt11 } + .partySize = ARRAY_COUNT(sParty_Grunt11), + .party = {.NoItemDefaultMoves = sParty_Grunt11}, }, [TRAINER_GRUNT_12] = @@ -261,8 +261,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Grunt12 } + .partySize = ARRAY_COUNT(sParty_Grunt12), + .party = {.NoItemDefaultMoves = sParty_Grunt12}, }, [TRAINER_GRUNT_13] = @@ -275,8 +275,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Grunt13 } + .partySize = ARRAY_COUNT(sParty_Grunt13), + .party = {.NoItemDefaultMoves = sParty_Grunt13}, }, [TRAINER_GRUNT_14] = @@ -289,8 +289,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt14 } + .partySize = ARRAY_COUNT(sParty_Grunt14), + .party = {.NoItemDefaultMoves = sParty_Grunt14}, }, [TRAINER_GRUNT_15] = @@ -303,8 +303,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Grunt15 } + .partySize = ARRAY_COUNT(sParty_Grunt15), + .party = {.NoItemDefaultMoves = sParty_Grunt15}, }, [TRAINER_GRUNT_16] = @@ -317,8 +317,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt16 } + .partySize = ARRAY_COUNT(sParty_Grunt16), + .party = {.NoItemDefaultMoves = sParty_Grunt16}, }, [TRAINER_GRUNT_17] = @@ -331,8 +331,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt17 } + .partySize = ARRAY_COUNT(sParty_Grunt17), + .party = {.NoItemDefaultMoves = sParty_Grunt17}, }, [TRAINER_GRUNT_18] = @@ -345,8 +345,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt18 } + .partySize = ARRAY_COUNT(sParty_Grunt18), + .party = {.NoItemDefaultMoves = sParty_Grunt18}, }, [TRAINER_GRUNT_19] = @@ -359,8 +359,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Grunt19 } + .partySize = ARRAY_COUNT(sParty_Grunt19), + .party = {.NoItemDefaultMoves = sParty_Grunt19}, }, [TRAINER_GRUNT_20] = @@ -373,8 +373,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt20 } + .partySize = ARRAY_COUNT(sParty_Grunt20), + .party = {.NoItemDefaultMoves = sParty_Grunt20}, }, [TRAINER_GRUNT_21] = @@ -387,8 +387,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt21 } + .partySize = ARRAY_COUNT(sParty_Grunt21), + .party = {.NoItemDefaultMoves = sParty_Grunt21}, }, [TRAINER_GRUNT_22] = @@ -401,8 +401,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt22 } + .partySize = ARRAY_COUNT(sParty_Grunt22), + .party = {.NoItemDefaultMoves = sParty_Grunt22}, }, [TRAINER_FREDRICK] = @@ -415,8 +415,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Fredrick } + .partySize = ARRAY_COUNT(sParty_Fredrick), + .party = {.NoItemDefaultMoves = sParty_Fredrick}, }, [TRAINER_MATT] = @@ -429,8 +429,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Matt } + .partySize = ARRAY_COUNT(sParty_Matt), + .party = {.NoItemDefaultMoves = sParty_Matt}, }, [TRAINER_ZANDER] = @@ -443,8 +443,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Zander } + .partySize = ARRAY_COUNT(sParty_Zander), + .party = {.NoItemDefaultMoves = sParty_Zander}, }, [TRAINER_SHELLY_1] = @@ -457,8 +457,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Shelly1 } + .partySize = ARRAY_COUNT(sParty_Shelly1), + .party = {.NoItemDefaultMoves = sParty_Shelly1}, }, [TRAINER_SHELLY_2] = @@ -471,8 +471,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Shelly2 } + .partySize = ARRAY_COUNT(sParty_Shelly2), + .party = {.NoItemDefaultMoves = sParty_Shelly2}, }, [TRAINER_ARCHIE] = @@ -485,8 +485,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Archie } + .partySize = ARRAY_COUNT(sParty_Archie), + .party = {.NoItemDefaultMoves = sParty_Archie}, }, [TRAINER_LEAH] = @@ -499,8 +499,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Leah } + .partySize = ARRAY_COUNT(sParty_Leah), + .party = {.NoItemDefaultMoves = sParty_Leah}, }, [TRAINER_DAISY] = @@ -513,8 +513,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Daisy } + .partySize = ARRAY_COUNT(sParty_Daisy), + .party = {.NoItemDefaultMoves = sParty_Daisy}, }, [TRAINER_ROSE_1] = @@ -527,8 +527,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Rose1 } + .partySize = ARRAY_COUNT(sParty_Rose1), + .party = {.NoItemDefaultMoves = sParty_Rose1}, }, [TRAINER_FELIX] = @@ -541,8 +541,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Felix } + .partySize = ARRAY_COUNT(sParty_Felix), + .party = {.NoItemCustomMoves = sParty_Felix}, }, [TRAINER_VIOLET] = @@ -555,8 +555,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Violet } + .partySize = ARRAY_COUNT(sParty_Violet), + .party = {.NoItemDefaultMoves = sParty_Violet}, }, [TRAINER_ROSE_2] = @@ -569,8 +569,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Rose2 } + .partySize = ARRAY_COUNT(sParty_Rose2), + .party = {.NoItemDefaultMoves = sParty_Rose2}, }, [TRAINER_ROSE_3] = @@ -583,8 +583,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Rose3 } + .partySize = ARRAY_COUNT(sParty_Rose3), + .party = {.NoItemDefaultMoves = sParty_Rose3}, }, [TRAINER_ROSE_4] = @@ -597,8 +597,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Rose4 } + .partySize = ARRAY_COUNT(sParty_Rose4), + .party = {.NoItemDefaultMoves = sParty_Rose4}, }, [TRAINER_ROSE_5] = @@ -611,8 +611,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Rose5 } + .partySize = ARRAY_COUNT(sParty_Rose5), + .party = {.NoItemDefaultMoves = sParty_Rose5}, }, [TRAINER_DUSTY_1] = @@ -625,8 +625,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Dusty1 } + .partySize = ARRAY_COUNT(sParty_Dusty1), + .party = {.NoItemCustomMoves = sParty_Dusty1}, }, [TRAINER_CHIP] = @@ -639,8 +639,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemCustomMoves = sParty_Chip } + .partySize = ARRAY_COUNT(sParty_Chip), + .party = {.NoItemCustomMoves = sParty_Chip}, }, [TRAINER_FOSTER] = @@ -653,8 +653,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Foster } + .partySize = ARRAY_COUNT(sParty_Foster), + .party = {.NoItemCustomMoves = sParty_Foster}, }, [TRAINER_DUSTY_2] = @@ -667,8 +667,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Dusty2 } + .partySize = ARRAY_COUNT(sParty_Dusty2), + .party = {.NoItemCustomMoves = sParty_Dusty2}, }, [TRAINER_DUSTY_3] = @@ -681,8 +681,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Dusty3 } + .partySize = ARRAY_COUNT(sParty_Dusty3), + .party = {.NoItemCustomMoves = sParty_Dusty3}, }, [TRAINER_DUSTY_4] = @@ -695,8 +695,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Dusty4 } + .partySize = ARRAY_COUNT(sParty_Dusty4), + .party = {.NoItemCustomMoves = sParty_Dusty4}, }, [TRAINER_DUSTY_5] = @@ -709,8 +709,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Dusty5 } + .partySize = ARRAY_COUNT(sParty_Dusty5), + .party = {.NoItemCustomMoves = sParty_Dusty5}, }, [TRAINER_GABBY_AND_TY_1] = @@ -723,8 +723,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_GabbyAndTy1 } + .partySize = ARRAY_COUNT(sParty_GabbyAndTy1), + .party = {.NoItemDefaultMoves = sParty_GabbyAndTy1}, }, [TRAINER_GABBY_AND_TY_2] = @@ -737,8 +737,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_GabbyAndTy2 } + .partySize = ARRAY_COUNT(sParty_GabbyAndTy2), + .party = {.NoItemDefaultMoves = sParty_GabbyAndTy2}, }, [TRAINER_GABBY_AND_TY_3] = @@ -751,8 +751,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_GabbyAndTy3 } + .partySize = ARRAY_COUNT(sParty_GabbyAndTy3), + .party = {.NoItemDefaultMoves = sParty_GabbyAndTy3}, }, [TRAINER_GABBY_AND_TY_4] = @@ -765,8 +765,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_GabbyAndTy4 } + .partySize = ARRAY_COUNT(sParty_GabbyAndTy4), + .party = {.NoItemDefaultMoves = sParty_GabbyAndTy4}, }, [TRAINER_GABBY_AND_TY_5] = @@ -779,8 +779,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_GabbyAndTy5 } + .partySize = ARRAY_COUNT(sParty_GabbyAndTy5), + .party = {.NoItemDefaultMoves = sParty_GabbyAndTy5}, }, [TRAINER_GABBY_AND_TY_6] = @@ -793,8 +793,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_GabbyAndTy6 } + .partySize = ARRAY_COUNT(sParty_GabbyAndTy6), + .party = {.NoItemCustomMoves = sParty_GabbyAndTy6}, }, [TRAINER_LOLA_1] = @@ -807,8 +807,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Lola1 } + .partySize = ARRAY_COUNT(sParty_Lola1), + .party = {.NoItemDefaultMoves = sParty_Lola1}, }, [TRAINER_AUSTINA] = @@ -821,8 +821,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Austina } + .partySize = ARRAY_COUNT(sParty_Austina), + .party = {.NoItemDefaultMoves = sParty_Austina}, }, [TRAINER_GWEN] = @@ -835,8 +835,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Gwen } + .partySize = ARRAY_COUNT(sParty_Gwen), + .party = {.NoItemDefaultMoves = sParty_Gwen}, }, [TRAINER_LOLA_2] = @@ -849,8 +849,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Lola2 } + .partySize = ARRAY_COUNT(sParty_Lola2), + .party = {.NoItemDefaultMoves = sParty_Lola2}, }, [TRAINER_LOLA_3] = @@ -863,8 +863,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Lola3 } + .partySize = ARRAY_COUNT(sParty_Lola3), + .party = {.NoItemDefaultMoves = sParty_Lola3}, }, [TRAINER_LOLA_4] = @@ -877,8 +877,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Lola4 } + .partySize = ARRAY_COUNT(sParty_Lola4), + .party = {.NoItemDefaultMoves = sParty_Lola4}, }, [TRAINER_LOLA_5] = @@ -891,8 +891,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Lola5 } + .partySize = ARRAY_COUNT(sParty_Lola5), + .party = {.NoItemDefaultMoves = sParty_Lola5}, }, [TRAINER_RICKY_1] = @@ -905,8 +905,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Ricky1 } + .partySize = ARRAY_COUNT(sParty_Ricky1), + .party = {.NoItemCustomMoves = sParty_Ricky1}, }, [TRAINER_SIMON] = @@ -919,8 +919,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Simon } + .partySize = ARRAY_COUNT(sParty_Simon), + .party = {.NoItemDefaultMoves = sParty_Simon}, }, [TRAINER_CHARLIE] = @@ -933,8 +933,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Charlie } + .partySize = ARRAY_COUNT(sParty_Charlie), + .party = {.NoItemDefaultMoves = sParty_Charlie}, }, [TRAINER_RICKY_2] = @@ -947,8 +947,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Ricky2 } + .partySize = ARRAY_COUNT(sParty_Ricky2), + .party = {.NoItemCustomMoves = sParty_Ricky2}, }, [TRAINER_RICKY_3] = @@ -961,8 +961,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Ricky3 } + .partySize = ARRAY_COUNT(sParty_Ricky3), + .party = {.NoItemCustomMoves = sParty_Ricky3}, }, [TRAINER_RICKY_4] = @@ -975,8 +975,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Ricky4 } + .partySize = ARRAY_COUNT(sParty_Ricky4), + .party = {.NoItemCustomMoves = sParty_Ricky4}, }, [TRAINER_RICKY_5] = @@ -989,8 +989,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Ricky5 } + .partySize = ARRAY_COUNT(sParty_Ricky5), + .party = {.NoItemCustomMoves = sParty_Ricky5}, }, [TRAINER_RANDALL] = @@ -1003,8 +1003,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.ItemCustomMoves = sParty_Randall } + .partySize = ARRAY_COUNT(sParty_Randall), + .party = {.ItemCustomMoves = sParty_Randall}, }, [TRAINER_PARKER] = @@ -1017,8 +1017,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.ItemCustomMoves = sParty_Parker } + .partySize = ARRAY_COUNT(sParty_Parker), + .party = {.ItemCustomMoves = sParty_Parker}, }, [TRAINER_GEORGE] = @@ -1031,8 +1031,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.ItemCustomMoves = sParty_George } + .partySize = ARRAY_COUNT(sParty_George), + .party = {.ItemCustomMoves = sParty_George}, }, [TRAINER_BERKE] = @@ -1045,8 +1045,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.ItemCustomMoves = sParty_Berke } + .partySize = ARRAY_COUNT(sParty_Berke), + .party = {.ItemCustomMoves = sParty_Berke}, }, [TRAINER_BRAXTON] = @@ -1059,8 +1059,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.NoItemCustomMoves = sParty_Braxton } + .partySize = ARRAY_COUNT(sParty_Braxton), + .party = {.NoItemCustomMoves = sParty_Braxton}, }, [TRAINER_VINCENT] = @@ -1073,8 +1073,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Vincent } + .partySize = ARRAY_COUNT(sParty_Vincent), + .party = {.NoItemDefaultMoves = sParty_Vincent}, }, [TRAINER_LEROY] = @@ -1087,8 +1087,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Leroy } + .partySize = ARRAY_COUNT(sParty_Leroy), + .party = {.NoItemDefaultMoves = sParty_Leroy}, }, [TRAINER_WILTON_1] = @@ -1101,8 +1101,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Wilton1 } + .partySize = ARRAY_COUNT(sParty_Wilton1), + .party = {.NoItemDefaultMoves = sParty_Wilton1}, }, [TRAINER_EDGAR] = @@ -1115,8 +1115,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Edgar } + .partySize = ARRAY_COUNT(sParty_Edgar), + .party = {.NoItemDefaultMoves = sParty_Edgar}, }, [TRAINER_ALBERT] = @@ -1129,8 +1129,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Albert } + .partySize = ARRAY_COUNT(sParty_Albert), + .party = {.NoItemDefaultMoves = sParty_Albert}, }, [TRAINER_SAMUEL] = @@ -1143,8 +1143,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Samuel } + .partySize = ARRAY_COUNT(sParty_Samuel), + .party = {.NoItemDefaultMoves = sParty_Samuel}, }, [TRAINER_VITO] = @@ -1157,8 +1157,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Vito } + .partySize = ARRAY_COUNT(sParty_Vito), + .party = {.NoItemDefaultMoves = sParty_Vito}, }, [TRAINER_OWEN] = @@ -1171,8 +1171,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Owen } + .partySize = ARRAY_COUNT(sParty_Owen), + .party = {.NoItemDefaultMoves = sParty_Owen}, }, [TRAINER_WILTON_2] = @@ -1185,8 +1185,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Wilton2 } + .partySize = ARRAY_COUNT(sParty_Wilton2), + .party = {.NoItemDefaultMoves = sParty_Wilton2}, }, [TRAINER_WILTON_3] = @@ -1199,8 +1199,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Wilton3 } + .partySize = ARRAY_COUNT(sParty_Wilton3), + .party = {.NoItemDefaultMoves = sParty_Wilton3}, }, [TRAINER_WILTON_4] = @@ -1213,8 +1213,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Wilton4 } + .partySize = ARRAY_COUNT(sParty_Wilton4), + .party = {.NoItemDefaultMoves = sParty_Wilton4}, }, [TRAINER_WILTON_5] = @@ -1227,8 +1227,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Wilton5 } + .partySize = ARRAY_COUNT(sParty_Wilton5), + .party = {.NoItemDefaultMoves = sParty_Wilton5}, }, [TRAINER_WARREN] = @@ -1241,8 +1241,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Warren } + .partySize = ARRAY_COUNT(sParty_Warren), + .party = {.NoItemDefaultMoves = sParty_Warren}, }, [TRAINER_MARY] = @@ -1255,8 +1255,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.ItemCustomMoves = sParty_Mary } + .partySize = ARRAY_COUNT(sParty_Mary), + .party = {.ItemCustomMoves = sParty_Mary}, }, [TRAINER_ALEXIA] = @@ -1269,8 +1269,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.ItemCustomMoves = sParty_Alexia } + .partySize = ARRAY_COUNT(sParty_Alexia), + .party = {.ItemCustomMoves = sParty_Alexia}, }, [TRAINER_JODY] = @@ -1283,8 +1283,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN, - .partySize = 1, - .party = {.ItemCustomMoves = sParty_Jody } + .partySize = ARRAY_COUNT(sParty_Jody), + .party = {.ItemCustomMoves = sParty_Jody}, }, [TRAINER_WENDY] = @@ -1297,8 +1297,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN, - .partySize = 3, - .party = {.NoItemCustomMoves = sParty_Wendy } + .partySize = ARRAY_COUNT(sParty_Wendy), + .party = {.NoItemCustomMoves = sParty_Wendy}, }, [TRAINER_KEIRA] = @@ -1311,8 +1311,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Keira } + .partySize = ARRAY_COUNT(sParty_Keira), + .party = {.NoItemDefaultMoves = sParty_Keira}, }, [TRAINER_BROOKE_1] = @@ -1325,8 +1325,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Brooke1 } + .partySize = ARRAY_COUNT(sParty_Brooke1), + .party = {.NoItemDefaultMoves = sParty_Brooke1}, }, [TRAINER_JENNIFER] = @@ -1339,8 +1339,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jennifer } + .partySize = ARRAY_COUNT(sParty_Jennifer), + .party = {.NoItemDefaultMoves = sParty_Jennifer}, }, [TRAINER_HOPE] = @@ -1353,8 +1353,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Hope } + .partySize = ARRAY_COUNT(sParty_Hope), + .party = {.NoItemDefaultMoves = sParty_Hope}, }, [TRAINER_SHANNON] = @@ -1367,8 +1367,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Shannon } + .partySize = ARRAY_COUNT(sParty_Shannon), + .party = {.NoItemDefaultMoves = sParty_Shannon}, }, [TRAINER_MICHELLE] = @@ -1381,8 +1381,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Michelle } + .partySize = ARRAY_COUNT(sParty_Michelle), + .party = {.NoItemDefaultMoves = sParty_Michelle}, }, [TRAINER_CAROLINE] = @@ -1395,8 +1395,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Caroline } + .partySize = ARRAY_COUNT(sParty_Caroline), + .party = {.NoItemDefaultMoves = sParty_Caroline}, }, [TRAINER_JULIE] = @@ -1409,8 +1409,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Julie } + .partySize = ARRAY_COUNT(sParty_Julie), + .party = {.NoItemDefaultMoves = sParty_Julie}, }, [TRAINER_BROOKE_2] = @@ -1423,8 +1423,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Brooke2 } + .partySize = ARRAY_COUNT(sParty_Brooke2), + .party = {.NoItemDefaultMoves = sParty_Brooke2}, }, [TRAINER_BROOKE_3] = @@ -1437,8 +1437,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Brooke3 } + .partySize = ARRAY_COUNT(sParty_Brooke3), + .party = {.NoItemDefaultMoves = sParty_Brooke3}, }, [TRAINER_BROOKE_4] = @@ -1451,8 +1451,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Brooke4 } + .partySize = ARRAY_COUNT(sParty_Brooke4), + .party = {.NoItemDefaultMoves = sParty_Brooke4}, }, [TRAINER_BROOKE_5] = @@ -1465,8 +1465,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Brooke5 } + .partySize = ARRAY_COUNT(sParty_Brooke5), + .party = {.NoItemDefaultMoves = sParty_Brooke5}, }, [TRAINER_PATRICIA] = @@ -1479,8 +1479,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Patricia } + .partySize = ARRAY_COUNT(sParty_Patricia), + .party = {.NoItemDefaultMoves = sParty_Patricia}, }, [TRAINER_KINDRA] = @@ -1493,8 +1493,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Kindra } + .partySize = ARRAY_COUNT(sParty_Kindra), + .party = {.NoItemDefaultMoves = sParty_Kindra}, }, [TRAINER_TAMMY] = @@ -1507,8 +1507,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Tammy } + .partySize = ARRAY_COUNT(sParty_Tammy), + .party = {.NoItemDefaultMoves = sParty_Tammy}, }, [TRAINER_VALERIE_1] = @@ -1521,8 +1521,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Valerie1 } + .partySize = ARRAY_COUNT(sParty_Valerie1), + .party = {.NoItemDefaultMoves = sParty_Valerie1}, }, [TRAINER_TASHA] = @@ -1535,8 +1535,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Tasha } + .partySize = ARRAY_COUNT(sParty_Tasha), + .party = {.NoItemDefaultMoves = sParty_Tasha}, }, [TRAINER_VALERIE_2] = @@ -1549,8 +1549,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Valerie2 } + .partySize = ARRAY_COUNT(sParty_Valerie2), + .party = {.NoItemDefaultMoves = sParty_Valerie2}, }, [TRAINER_VALERIE_3] = @@ -1563,8 +1563,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Valerie3 } + .partySize = ARRAY_COUNT(sParty_Valerie3), + .party = {.NoItemDefaultMoves = sParty_Valerie3}, }, [TRAINER_VALERIE_4] = @@ -1577,8 +1577,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Valerie4 } + .partySize = ARRAY_COUNT(sParty_Valerie4), + .party = {.NoItemDefaultMoves = sParty_Valerie4}, }, [TRAINER_VALERIE_5] = @@ -1591,8 +1591,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Valerie5 } + .partySize = ARRAY_COUNT(sParty_Valerie5), + .party = {.NoItemDefaultMoves = sParty_Valerie5}, }, [TRAINER_CINDY_1] = @@ -1605,8 +1605,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Cindy1 } + .partySize = ARRAY_COUNT(sParty_Cindy1), + .party = {.ItemDefaultMoves = sParty_Cindy1}, }, [TRAINER_DAPHNE] = @@ -1619,8 +1619,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.ItemCustomMoves = sParty_Daphne } + .partySize = ARRAY_COUNT(sParty_Daphne), + .party = {.ItemCustomMoves = sParty_Daphne}, }, [TRAINER_GRUNT_23] = @@ -1633,8 +1633,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Grunt23 } + .partySize = ARRAY_COUNT(sParty_Grunt23), + .party = {.NoItemDefaultMoves = sParty_Grunt23}, }, [TRAINER_CINDY_2] = @@ -1647,8 +1647,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemCustomMoves = sParty_Cindy2 } + .partySize = ARRAY_COUNT(sParty_Cindy2), + .party = {.ItemCustomMoves = sParty_Cindy2}, }, [TRAINER_BRIANNA] = @@ -1661,8 +1661,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Brianna } + .partySize = ARRAY_COUNT(sParty_Brianna), + .party = {.ItemDefaultMoves = sParty_Brianna}, }, [TRAINER_NAOMI] = @@ -1675,8 +1675,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Naomi } + .partySize = ARRAY_COUNT(sParty_Naomi), + .party = {.ItemDefaultMoves = sParty_Naomi}, }, [TRAINER_CINDY_3] = @@ -1689,8 +1689,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Cindy3 } + .partySize = ARRAY_COUNT(sParty_Cindy3), + .party = {.ItemDefaultMoves = sParty_Cindy3}, }, [TRAINER_CINDY_4] = @@ -1703,8 +1703,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Cindy4 } + .partySize = ARRAY_COUNT(sParty_Cindy4), + .party = {.ItemDefaultMoves = sParty_Cindy4}, }, [TRAINER_CINDY_5] = @@ -1717,8 +1717,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Cindy5 } + .partySize = ARRAY_COUNT(sParty_Cindy5), + .party = {.ItemDefaultMoves = sParty_Cindy5}, }, [TRAINER_CINDY_6] = @@ -1731,8 +1731,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemCustomMoves = sParty_Cindy6 } + .partySize = ARRAY_COUNT(sParty_Cindy6), + .party = {.ItemCustomMoves = sParty_Cindy6}, }, [TRAINER_MELISSA] = @@ -1745,8 +1745,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Melissa } + .partySize = ARRAY_COUNT(sParty_Melissa), + .party = {.NoItemDefaultMoves = sParty_Melissa}, }, [TRAINER_SHEILA] = @@ -1759,8 +1759,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Sheila } + .partySize = ARRAY_COUNT(sParty_Sheila), + .party = {.NoItemDefaultMoves = sParty_Sheila}, }, [TRAINER_SHIRLEY] = @@ -1773,8 +1773,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Shirley } + .partySize = ARRAY_COUNT(sParty_Shirley), + .party = {.NoItemDefaultMoves = sParty_Shirley}, }, [TRAINER_JESSICA_1] = @@ -1787,8 +1787,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Jessica1 } + .partySize = ARRAY_COUNT(sParty_Jessica1), + .party = {.NoItemCustomMoves = sParty_Jessica1}, }, [TRAINER_CONNIE] = @@ -1801,8 +1801,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Connie } + .partySize = ARRAY_COUNT(sParty_Connie), + .party = {.NoItemDefaultMoves = sParty_Connie}, }, [TRAINER_BRIDGET] = @@ -1815,8 +1815,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Bridget } + .partySize = ARRAY_COUNT(sParty_Bridget), + .party = {.NoItemDefaultMoves = sParty_Bridget}, }, [TRAINER_OLIVIA] = @@ -1829,8 +1829,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemCustomMoves = sParty_Olivia } + .partySize = ARRAY_COUNT(sParty_Olivia), + .party = {.NoItemCustomMoves = sParty_Olivia}, }, [TRAINER_TIFFANY] = @@ -1843,8 +1843,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Tiffany } + .partySize = ARRAY_COUNT(sParty_Tiffany), + .party = {.NoItemDefaultMoves = sParty_Tiffany}, }, [TRAINER_JESSICA_2] = @@ -1857,8 +1857,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Jessica2 } + .partySize = ARRAY_COUNT(sParty_Jessica2), + .party = {.NoItemCustomMoves = sParty_Jessica2}, }, [TRAINER_JESSICA_3] = @@ -1871,8 +1871,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Jessica3 } + .partySize = ARRAY_COUNT(sParty_Jessica3), + .party = {.NoItemCustomMoves = sParty_Jessica3}, }, [TRAINER_JESSICA_4] = @@ -1885,8 +1885,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Jessica4 } + .partySize = ARRAY_COUNT(sParty_Jessica4), + .party = {.NoItemCustomMoves = sParty_Jessica4}, }, [TRAINER_JESSICA_5] = @@ -1899,8 +1899,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Jessica5 } + .partySize = ARRAY_COUNT(sParty_Jessica5), + .party = {.NoItemCustomMoves = sParty_Jessica5}, }, [TRAINER_WINSTON_1] = @@ -1913,8 +1913,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Winston1 } + .partySize = ARRAY_COUNT(sParty_Winston1), + .party = {.ItemDefaultMoves = sParty_Winston1}, }, [TRAINER_MOLLIE] = @@ -1927,8 +1927,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Mollie } + .partySize = ARRAY_COUNT(sParty_Mollie), + .party = {.NoItemDefaultMoves = sParty_Mollie}, }, [TRAINER_GARRET] = @@ -1941,8 +1941,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Garret } + .partySize = ARRAY_COUNT(sParty_Garret), + .party = {.ItemDefaultMoves = sParty_Garret}, }, [TRAINER_WINSTON_2] = @@ -1955,8 +1955,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Winston2 } + .partySize = ARRAY_COUNT(sParty_Winston2), + .party = {.ItemDefaultMoves = sParty_Winston2}, }, [TRAINER_WINSTON_3] = @@ -1969,8 +1969,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Winston3 } + .partySize = ARRAY_COUNT(sParty_Winston3), + .party = {.ItemDefaultMoves = sParty_Winston3}, }, [TRAINER_WINSTON_4] = @@ -1983,8 +1983,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Winston4 } + .partySize = ARRAY_COUNT(sParty_Winston4), + .party = {.ItemDefaultMoves = sParty_Winston4}, }, [TRAINER_WINSTON_5] = @@ -1997,8 +1997,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemCustomMoves = sParty_Winston5 } + .partySize = ARRAY_COUNT(sParty_Winston5), + .party = {.ItemCustomMoves = sParty_Winston5}, }, [TRAINER_STEVE_1] = @@ -2011,8 +2011,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Steve1 } + .partySize = ARRAY_COUNT(sParty_Steve1), + .party = {.NoItemDefaultMoves = sParty_Steve1}, }, [TRAINER_THALIA_1] = @@ -2025,8 +2025,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Thalia1 } + .partySize = ARRAY_COUNT(sParty_Thalia1), + .party = {.NoItemDefaultMoves = sParty_Thalia1}, }, [TRAINER_MARK] = @@ -2039,8 +2039,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Mark } + .partySize = ARRAY_COUNT(sParty_Mark), + .party = {.NoItemDefaultMoves = sParty_Mark}, }, [TRAINER_GRUNT_24] = @@ -2053,8 +2053,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt24 } + .partySize = ARRAY_COUNT(sParty_Grunt24), + .party = {.NoItemDefaultMoves = sParty_Grunt24}, }, [TRAINER_STEVE_2] = @@ -2067,8 +2067,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Steve2 } + .partySize = ARRAY_COUNT(sParty_Steve2), + .party = {.NoItemDefaultMoves = sParty_Steve2}, }, [TRAINER_STEVE_3] = @@ -2081,8 +2081,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Steve3 } + .partySize = ARRAY_COUNT(sParty_Steve3), + .party = {.NoItemDefaultMoves = sParty_Steve3}, }, [TRAINER_STEVE_4] = @@ -2095,8 +2095,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Steve4 } + .partySize = ARRAY_COUNT(sParty_Steve4), + .party = {.NoItemDefaultMoves = sParty_Steve4}, }, [TRAINER_STEVE_5] = @@ -2109,8 +2109,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Steve5 } + .partySize = ARRAY_COUNT(sParty_Steve5), + .party = {.NoItemDefaultMoves = sParty_Steve5}, }, [TRAINER_LUIS] = @@ -2123,8 +2123,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Luis } + .partySize = ARRAY_COUNT(sParty_Luis), + .party = {.NoItemDefaultMoves = sParty_Luis}, }, [TRAINER_DOMINIK] = @@ -2137,8 +2137,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Dominik } + .partySize = ARRAY_COUNT(sParty_Dominik), + .party = {.NoItemDefaultMoves = sParty_Dominik}, }, [TRAINER_DOUGLAS] = @@ -2151,8 +2151,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Douglas } + .partySize = ARRAY_COUNT(sParty_Douglas), + .party = {.NoItemDefaultMoves = sParty_Douglas}, }, [TRAINER_DARRIN] = @@ -2165,8 +2165,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Darrin } + .partySize = ARRAY_COUNT(sParty_Darrin), + .party = {.NoItemDefaultMoves = sParty_Darrin}, }, [TRAINER_TONY_1] = @@ -2179,8 +2179,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Tony1 } + .partySize = ARRAY_COUNT(sParty_Tony1), + .party = {.NoItemDefaultMoves = sParty_Tony1}, }, [TRAINER_JEROME] = @@ -2193,8 +2193,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jerome } + .partySize = ARRAY_COUNT(sParty_Jerome), + .party = {.NoItemDefaultMoves = sParty_Jerome}, }, [TRAINER_MATTHEW] = @@ -2207,8 +2207,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Matthew } + .partySize = ARRAY_COUNT(sParty_Matthew), + .party = {.NoItemDefaultMoves = sParty_Matthew}, }, [TRAINER_DAVID] = @@ -2221,8 +2221,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_David } + .partySize = ARRAY_COUNT(sParty_David), + .party = {.NoItemDefaultMoves = sParty_David}, }, [TRAINER_SPENCER] = @@ -2235,8 +2235,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Spencer } + .partySize = ARRAY_COUNT(sParty_Spencer), + .party = {.NoItemDefaultMoves = sParty_Spencer}, }, [TRAINER_ROLAND] = @@ -2249,8 +2249,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Roland } + .partySize = ARRAY_COUNT(sParty_Roland), + .party = {.NoItemDefaultMoves = sParty_Roland}, }, [TRAINER_NOLEN] = @@ -2263,8 +2263,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Nolen } + .partySize = ARRAY_COUNT(sParty_Nolen), + .party = {.NoItemDefaultMoves = sParty_Nolen}, }, [TRAINER_STAN] = @@ -2277,8 +2277,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Stan } + .partySize = ARRAY_COUNT(sParty_Stan), + .party = {.NoItemDefaultMoves = sParty_Stan}, }, [TRAINER_BARRY] = @@ -2291,8 +2291,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Barry } + .partySize = ARRAY_COUNT(sParty_Barry), + .party = {.NoItemDefaultMoves = sParty_Barry}, }, [TRAINER_DEAN] = @@ -2305,8 +2305,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Dean } + .partySize = ARRAY_COUNT(sParty_Dean), + .party = {.NoItemDefaultMoves = sParty_Dean}, }, [TRAINER_RODNEY] = @@ -2319,8 +2319,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Rodney } + .partySize = ARRAY_COUNT(sParty_Rodney), + .party = {.NoItemDefaultMoves = sParty_Rodney}, }, [TRAINER_RICHARD] = @@ -2333,8 +2333,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Richard } + .partySize = ARRAY_COUNT(sParty_Richard), + .party = {.NoItemDefaultMoves = sParty_Richard}, }, [TRAINER_HERMAN] = @@ -2347,8 +2347,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Herman } + .partySize = ARRAY_COUNT(sParty_Herman), + .party = {.NoItemDefaultMoves = sParty_Herman}, }, [TRAINER_SANTIAGO] = @@ -2361,8 +2361,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Santiago } + .partySize = ARRAY_COUNT(sParty_Santiago), + .party = {.NoItemDefaultMoves = sParty_Santiago}, }, [TRAINER_GILBERT] = @@ -2375,8 +2375,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Gilbert } + .partySize = ARRAY_COUNT(sParty_Gilbert), + .party = {.NoItemDefaultMoves = sParty_Gilbert}, }, [TRAINER_FRANKLIN] = @@ -2389,8 +2389,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Franklin } + .partySize = ARRAY_COUNT(sParty_Franklin), + .party = {.NoItemDefaultMoves = sParty_Franklin}, }, [TRAINER_KEVIN] = @@ -2403,8 +2403,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Kevin } + .partySize = ARRAY_COUNT(sParty_Kevin), + .party = {.NoItemDefaultMoves = sParty_Kevin}, }, [TRAINER_JACK] = @@ -2417,8 +2417,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jack } + .partySize = ARRAY_COUNT(sParty_Jack), + .party = {.NoItemDefaultMoves = sParty_Jack}, }, [TRAINER_DUDLEY] = @@ -2431,8 +2431,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Dudley } + .partySize = ARRAY_COUNT(sParty_Dudley), + .party = {.NoItemDefaultMoves = sParty_Dudley}, }, [TRAINER_CHAD] = @@ -2445,8 +2445,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Chad } + .partySize = ARRAY_COUNT(sParty_Chad), + .party = {.NoItemDefaultMoves = sParty_Chad}, }, [TRAINER_TONY_2] = @@ -2459,8 +2459,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Tony2 } + .partySize = ARRAY_COUNT(sParty_Tony2), + .party = {.NoItemDefaultMoves = sParty_Tony2}, }, [TRAINER_TONY_3] = @@ -2473,8 +2473,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Tony3 } + .partySize = ARRAY_COUNT(sParty_Tony3), + .party = {.NoItemDefaultMoves = sParty_Tony3}, }, [TRAINER_TONY_4] = @@ -2487,8 +2487,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Tony4 } + .partySize = ARRAY_COUNT(sParty_Tony4), + .party = {.NoItemDefaultMoves = sParty_Tony4}, }, [TRAINER_TONY_5] = @@ -2501,8 +2501,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Tony5 } + .partySize = ARRAY_COUNT(sParty_Tony5), + .party = {.NoItemDefaultMoves = sParty_Tony5}, }, [TRAINER_TAKAO] = @@ -2515,8 +2515,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Takao } + .partySize = ARRAY_COUNT(sParty_Takao), + .party = {.NoItemDefaultMoves = sParty_Takao}, }, [TRAINER_HITOSHI] = @@ -2529,8 +2529,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Hitoshi } + .partySize = ARRAY_COUNT(sParty_Hitoshi), + .party = {.NoItemDefaultMoves = sParty_Hitoshi}, }, [TRAINER_KIYO] = @@ -2543,8 +2543,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Kiyo } + .partySize = ARRAY_COUNT(sParty_Kiyo), + .party = {.NoItemDefaultMoves = sParty_Kiyo}, }, [TRAINER_KOICHI] = @@ -2557,8 +2557,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Koichi } + .partySize = ARRAY_COUNT(sParty_Koichi), + .party = {.NoItemDefaultMoves = sParty_Koichi}, }, [TRAINER_NOB_1] = @@ -2571,8 +2571,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Nob1 } + .partySize = ARRAY_COUNT(sParty_Nob1), + .party = {.NoItemDefaultMoves = sParty_Nob1}, }, [TRAINER_NOB_2] = @@ -2585,8 +2585,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Nob2 } + .partySize = ARRAY_COUNT(sParty_Nob2), + .party = {.NoItemDefaultMoves = sParty_Nob2}, }, [TRAINER_NOB_3] = @@ -2599,8 +2599,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Nob3 } + .partySize = ARRAY_COUNT(sParty_Nob3), + .party = {.NoItemDefaultMoves = sParty_Nob3}, }, [TRAINER_NOB_4] = @@ -2613,8 +2613,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Nob4 } + .partySize = ARRAY_COUNT(sParty_Nob4), + .party = {.NoItemDefaultMoves = sParty_Nob4}, }, [TRAINER_NOB_5] = @@ -2627,8 +2627,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 4, - .party = {.ItemDefaultMoves = sParty_Nob5 } + .partySize = ARRAY_COUNT(sParty_Nob5), + .party = {.ItemDefaultMoves = sParty_Nob5}, }, [TRAINER_YUJI] = @@ -2641,8 +2641,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Yuji } + .partySize = ARRAY_COUNT(sParty_Yuji), + .party = {.NoItemDefaultMoves = sParty_Yuji}, }, [TRAINER_DAISUKE] = @@ -2655,8 +2655,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Daisuke } + .partySize = ARRAY_COUNT(sParty_Daisuke), + .party = {.NoItemDefaultMoves = sParty_Daisuke}, }, [TRAINER_ATSUSHI] = @@ -2669,8 +2669,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Atsushi } + .partySize = ARRAY_COUNT(sParty_Atsushi), + .party = {.NoItemDefaultMoves = sParty_Atsushi}, }, [TRAINER_KIRK] = @@ -2683,8 +2683,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Kirk } + .partySize = ARRAY_COUNT(sParty_Kirk), + .party = {.NoItemCustomMoves = sParty_Kirk}, }, [TRAINER_GRUNT_25] = @@ -2697,8 +2697,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Grunt25 } + .partySize = ARRAY_COUNT(sParty_Grunt25), + .party = {.NoItemDefaultMoves = sParty_Grunt25}, }, [TRAINER_GRUNT_26] = @@ -2711,8 +2711,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt26 } + .partySize = ARRAY_COUNT(sParty_Grunt26), + .party = {.NoItemDefaultMoves = sParty_Grunt26}, }, [TRAINER_SHAWN] = @@ -2725,8 +2725,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Shawn } + .partySize = ARRAY_COUNT(sParty_Shawn), + .party = {.NoItemDefaultMoves = sParty_Shawn}, }, [TRAINER_FERNANDO_1] = @@ -2739,8 +2739,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Fernando1 } + .partySize = ARRAY_COUNT(sParty_Fernando1), + .party = {.NoItemDefaultMoves = sParty_Fernando1}, }, [TRAINER_DALTON_1] = @@ -2753,8 +2753,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Dalton1 } + .partySize = ARRAY_COUNT(sParty_Dalton1), + .party = {.NoItemDefaultMoves = sParty_Dalton1}, }, [TRAINER_DALTON_2] = @@ -2767,8 +2767,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Dalton2 } + .partySize = ARRAY_COUNT(sParty_Dalton2), + .party = {.NoItemDefaultMoves = sParty_Dalton2}, }, [TRAINER_DALTON_3] = @@ -2781,8 +2781,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Dalton3 } + .partySize = ARRAY_COUNT(sParty_Dalton3), + .party = {.NoItemDefaultMoves = sParty_Dalton3}, }, [TRAINER_DALTON_4] = @@ -2795,8 +2795,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Dalton4 } + .partySize = ARRAY_COUNT(sParty_Dalton4), + .party = {.NoItemDefaultMoves = sParty_Dalton4}, }, [TRAINER_DALTON_5] = @@ -2809,8 +2809,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Dalton5 } + .partySize = ARRAY_COUNT(sParty_Dalton5), + .party = {.NoItemDefaultMoves = sParty_Dalton5}, }, [TRAINER_COLE] = @@ -2823,8 +2823,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Cole } + .partySize = ARRAY_COUNT(sParty_Cole), + .party = {.NoItemDefaultMoves = sParty_Cole}, }, [TRAINER_JEFF] = @@ -2837,8 +2837,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Jeff } + .partySize = ARRAY_COUNT(sParty_Jeff), + .party = {.NoItemDefaultMoves = sParty_Jeff}, }, [TRAINER_AXLE] = @@ -2851,8 +2851,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Axle } + .partySize = ARRAY_COUNT(sParty_Axle), + .party = {.NoItemDefaultMoves = sParty_Axle}, }, [TRAINER_JACE] = @@ -2865,8 +2865,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jace } + .partySize = ARRAY_COUNT(sParty_Jace), + .party = {.NoItemDefaultMoves = sParty_Jace}, }, [TRAINER_KEEGAN] = @@ -2879,8 +2879,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Keegan } + .partySize = ARRAY_COUNT(sParty_Keegan), + .party = {.NoItemDefaultMoves = sParty_Keegan}, }, [TRAINER_BERNIE_1] = @@ -2893,8 +2893,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Bernie1 } + .partySize = ARRAY_COUNT(sParty_Bernie1), + .party = {.NoItemDefaultMoves = sParty_Bernie1}, }, [TRAINER_BERNIE_2] = @@ -2907,8 +2907,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Bernie2 } + .partySize = ARRAY_COUNT(sParty_Bernie2), + .party = {.NoItemDefaultMoves = sParty_Bernie2}, }, [TRAINER_BERNIE_3] = @@ -2921,8 +2921,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Bernie3 } + .partySize = ARRAY_COUNT(sParty_Bernie3), + .party = {.NoItemDefaultMoves = sParty_Bernie3}, }, [TRAINER_BERNIE_4] = @@ -2935,8 +2935,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Bernie4 } + .partySize = ARRAY_COUNT(sParty_Bernie4), + .party = {.NoItemDefaultMoves = sParty_Bernie4}, }, [TRAINER_BERNIE_5] = @@ -2949,8 +2949,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Bernie5 } + .partySize = ARRAY_COUNT(sParty_Bernie5), + .party = {.NoItemDefaultMoves = sParty_Bernie5}, }, [TRAINER_DREW] = @@ -2963,8 +2963,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Drew } + .partySize = ARRAY_COUNT(sParty_Drew), + .party = {.NoItemCustomMoves = sParty_Drew}, }, [TRAINER_BEAU] = @@ -2977,8 +2977,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemCustomMoves = sParty_Beau } + .partySize = ARRAY_COUNT(sParty_Beau), + .party = {.NoItemCustomMoves = sParty_Beau}, }, [TRAINER_LARRY] = @@ -2991,8 +2991,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Larry } + .partySize = ARRAY_COUNT(sParty_Larry), + .party = {.NoItemDefaultMoves = sParty_Larry}, }, [TRAINER_SHANE] = @@ -3005,8 +3005,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Shane } + .partySize = ARRAY_COUNT(sParty_Shane), + .party = {.NoItemDefaultMoves = sParty_Shane}, }, [TRAINER_JUSTIN] = @@ -3019,8 +3019,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Justin } + .partySize = ARRAY_COUNT(sParty_Justin), + .party = {.NoItemDefaultMoves = sParty_Justin}, }, [TRAINER_ETHAN_1] = @@ -3033,8 +3033,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Ethan1 } + .partySize = ARRAY_COUNT(sParty_Ethan1), + .party = {.NoItemDefaultMoves = sParty_Ethan1}, }, [TRAINER_AUTUMN] = @@ -3047,8 +3047,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Autumn } + .partySize = ARRAY_COUNT(sParty_Autumn), + .party = {.NoItemDefaultMoves = sParty_Autumn}, }, [TRAINER_TRAVIS] = @@ -3061,8 +3061,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Travis } + .partySize = ARRAY_COUNT(sParty_Travis), + .party = {.NoItemDefaultMoves = sParty_Travis}, }, [TRAINER_ETHAN_2] = @@ -3075,8 +3075,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Ethan2 } + .partySize = ARRAY_COUNT(sParty_Ethan2), + .party = {.NoItemDefaultMoves = sParty_Ethan2}, }, [TRAINER_ETHAN_3] = @@ -3089,8 +3089,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Ethan3 } + .partySize = ARRAY_COUNT(sParty_Ethan3), + .party = {.NoItemDefaultMoves = sParty_Ethan3}, }, [TRAINER_ETHAN_4] = @@ -3103,8 +3103,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Ethan4 } + .partySize = ARRAY_COUNT(sParty_Ethan4), + .party = {.NoItemDefaultMoves = sParty_Ethan4}, }, [TRAINER_ETHAN_5] = @@ -3117,8 +3117,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Ethan5 } + .partySize = ARRAY_COUNT(sParty_Ethan5), + .party = {.NoItemDefaultMoves = sParty_Ethan5}, }, [TRAINER_BRENT] = @@ -3131,8 +3131,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Brent } + .partySize = ARRAY_COUNT(sParty_Brent), + .party = {.NoItemDefaultMoves = sParty_Brent}, }, [TRAINER_DONALD] = @@ -3145,8 +3145,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Donald } + .partySize = ARRAY_COUNT(sParty_Donald), + .party = {.NoItemDefaultMoves = sParty_Donald}, }, [TRAINER_TAYLOR] = @@ -3159,8 +3159,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Taylor } + .partySize = ARRAY_COUNT(sParty_Taylor), + .party = {.NoItemDefaultMoves = sParty_Taylor}, }, [TRAINER_JEFFREY_1] = @@ -3173,8 +3173,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Jeffrey1 } + .partySize = ARRAY_COUNT(sParty_Jeffrey1), + .party = {.NoItemDefaultMoves = sParty_Jeffrey1}, }, [TRAINER_DEREK] = @@ -3187,8 +3187,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Derek } + .partySize = ARRAY_COUNT(sParty_Derek), + .party = {.NoItemDefaultMoves = sParty_Derek}, }, [TRAINER_JEFFREY_2] = @@ -3201,8 +3201,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Jeffrey2 } + .partySize = ARRAY_COUNT(sParty_Jeffrey2), + .party = {.NoItemDefaultMoves = sParty_Jeffrey2}, }, [TRAINER_JEFFREY_3] = @@ -3215,8 +3215,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Jeffrey3 } + .partySize = ARRAY_COUNT(sParty_Jeffrey3), + .party = {.NoItemDefaultMoves = sParty_Jeffrey3}, }, [TRAINER_JEFFREY_4] = @@ -3229,8 +3229,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Jeffrey4 } + .partySize = ARRAY_COUNT(sParty_Jeffrey4), + .party = {.NoItemDefaultMoves = sParty_Jeffrey4}, }, [TRAINER_JEFFREY_5] = @@ -3243,8 +3243,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 5, - .party = {.ItemDefaultMoves = sParty_Jeffrey5 } + .partySize = ARRAY_COUNT(sParty_Jeffrey5), + .party = {.ItemDefaultMoves = sParty_Jeffrey5}, }, [TRAINER_EDWARD] = @@ -3257,8 +3257,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Edward } + .partySize = ARRAY_COUNT(sParty_Edward), + .party = {.NoItemCustomMoves = sParty_Edward}, }, [TRAINER_PRESTON] = @@ -3271,8 +3271,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Preston } + .partySize = ARRAY_COUNT(sParty_Preston), + .party = {.NoItemDefaultMoves = sParty_Preston}, }, [TRAINER_VIRGIL] = @@ -3285,8 +3285,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Virgil } + .partySize = ARRAY_COUNT(sParty_Virgil), + .party = {.NoItemDefaultMoves = sParty_Virgil}, }, [TRAINER_BLAKE] = @@ -3299,8 +3299,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Blake } + .partySize = ARRAY_COUNT(sParty_Blake), + .party = {.NoItemDefaultMoves = sParty_Blake}, }, [TRAINER_WILLIAM] = @@ -3313,8 +3313,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_William } + .partySize = ARRAY_COUNT(sParty_William), + .party = {.NoItemDefaultMoves = sParty_William}, }, [TRAINER_JOSHUA] = @@ -3327,8 +3327,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Joshua } + .partySize = ARRAY_COUNT(sParty_Joshua), + .party = {.NoItemDefaultMoves = sParty_Joshua}, }, [TRAINER_CAMERON_1] = @@ -3341,8 +3341,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Cameron1 } + .partySize = ARRAY_COUNT(sParty_Cameron1), + .party = {.NoItemDefaultMoves = sParty_Cameron1}, }, [TRAINER_CAMERON_2] = @@ -3355,8 +3355,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Cameron2 } + .partySize = ARRAY_COUNT(sParty_Cameron2), + .party = {.NoItemDefaultMoves = sParty_Cameron2}, }, [TRAINER_CAMERON_3] = @@ -3369,8 +3369,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Cameron3 } + .partySize = ARRAY_COUNT(sParty_Cameron3), + .party = {.NoItemDefaultMoves = sParty_Cameron3}, }, [TRAINER_CAMERON_4] = @@ -3383,8 +3383,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Cameron4 } + .partySize = ARRAY_COUNT(sParty_Cameron4), + .party = {.NoItemDefaultMoves = sParty_Cameron4}, }, [TRAINER_CAMERON_5] = @@ -3397,8 +3397,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Cameron5 } + .partySize = ARRAY_COUNT(sParty_Cameron5), + .party = {.NoItemDefaultMoves = sParty_Cameron5}, }, [TRAINER_JACLYN] = @@ -3411,8 +3411,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Jaclyn } + .partySize = ARRAY_COUNT(sParty_Jaclyn), + .party = {.NoItemCustomMoves = sParty_Jaclyn}, }, [TRAINER_HANNAH] = @@ -3425,8 +3425,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Hannah } + .partySize = ARRAY_COUNT(sParty_Hannah), + .party = {.NoItemDefaultMoves = sParty_Hannah}, }, [TRAINER_SAMANTHA] = @@ -3439,8 +3439,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Samantha } + .partySize = ARRAY_COUNT(sParty_Samantha), + .party = {.NoItemDefaultMoves = sParty_Samantha}, }, [TRAINER_MAURA] = @@ -3453,8 +3453,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Maura } + .partySize = ARRAY_COUNT(sParty_Maura), + .party = {.NoItemDefaultMoves = sParty_Maura}, }, [TRAINER_KAYLA] = @@ -3467,8 +3467,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Kayla } + .partySize = ARRAY_COUNT(sParty_Kayla), + .party = {.NoItemDefaultMoves = sParty_Kayla}, }, [TRAINER_ALEXIS] = @@ -3481,8 +3481,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Alexis } + .partySize = ARRAY_COUNT(sParty_Alexis), + .party = {.NoItemDefaultMoves = sParty_Alexis}, }, [TRAINER_JACKI_1] = @@ -3495,8 +3495,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Jacki1 } + .partySize = ARRAY_COUNT(sParty_Jacki1), + .party = {.NoItemDefaultMoves = sParty_Jacki1}, }, [TRAINER_JACKI_2] = @@ -3509,8 +3509,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Jacki2 } + .partySize = ARRAY_COUNT(sParty_Jacki2), + .party = {.NoItemDefaultMoves = sParty_Jacki2}, }, [TRAINER_JACKI_3] = @@ -3523,8 +3523,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Jacki3 } + .partySize = ARRAY_COUNT(sParty_Jacki3), + .party = {.NoItemDefaultMoves = sParty_Jacki3}, }, [TRAINER_JACKI_4] = @@ -3537,8 +3537,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Jacki4 } + .partySize = ARRAY_COUNT(sParty_Jacki4), + .party = {.NoItemDefaultMoves = sParty_Jacki4}, }, [TRAINER_JACKI_5] = @@ -3551,8 +3551,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Jacki5 } + .partySize = ARRAY_COUNT(sParty_Jacki5), + .party = {.NoItemDefaultMoves = sParty_Jacki5}, }, [TRAINER_WALTER_1] = @@ -3565,8 +3565,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Walter1 } + .partySize = ARRAY_COUNT(sParty_Walter1), + .party = {.NoItemDefaultMoves = sParty_Walter1}, }, [TRAINER_MICAH] = @@ -3579,8 +3579,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Micah } + .partySize = ARRAY_COUNT(sParty_Micah), + .party = {.NoItemDefaultMoves = sParty_Micah}, }, [TRAINER_THOMAS] = @@ -3593,8 +3593,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Thomas } + .partySize = ARRAY_COUNT(sParty_Thomas), + .party = {.NoItemDefaultMoves = sParty_Thomas}, }, [TRAINER_WALTER_2] = @@ -3607,8 +3607,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Walter2 } + .partySize = ARRAY_COUNT(sParty_Walter2), + .party = {.NoItemDefaultMoves = sParty_Walter2}, }, [TRAINER_WALTER_3] = @@ -3621,8 +3621,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Walter3 } + .partySize = ARRAY_COUNT(sParty_Walter3), + .party = {.NoItemCustomMoves = sParty_Walter3}, }, [TRAINER_WALTER_4] = @@ -3635,8 +3635,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Walter4 } + .partySize = ARRAY_COUNT(sParty_Walter4), + .party = {.NoItemCustomMoves = sParty_Walter4}, }, [TRAINER_WALTER_5] = @@ -3649,8 +3649,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemCustomMoves = sParty_Walter5 } + .partySize = ARRAY_COUNT(sParty_Walter5), + .party = {.NoItemCustomMoves = sParty_Walter5}, }, [TRAINER_SIDNEY] = @@ -3663,8 +3663,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_SETUP_FIRST_TURN, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Sidney } + .partySize = ARRAY_COUNT(sParty_Sidney), + .party = {.ItemCustomMoves = sParty_Sidney}, }, [TRAINER_PHOEBE] = @@ -3677,8 +3677,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Phoebe } + .partySize = ARRAY_COUNT(sParty_Phoebe), + .party = {.ItemCustomMoves = sParty_Phoebe}, }, [TRAINER_GLACIA] = @@ -3691,8 +3691,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Glacia } + .partySize = ARRAY_COUNT(sParty_Glacia), + .party = {.ItemCustomMoves = sParty_Glacia}, }, [TRAINER_DRAKE] = @@ -3705,8 +3705,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Drake } + .partySize = ARRAY_COUNT(sParty_Drake), + .party = {.ItemCustomMoves = sParty_Drake}, }, [TRAINER_ROXANNE_1] = @@ -3719,8 +3719,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_POTION, ITEM_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.ItemCustomMoves = sParty_Roxanne1 } + .partySize = ARRAY_COUNT(sParty_Roxanne1), + .party = {.ItemCustomMoves = sParty_Roxanne1}, }, [TRAINER_BRAWLY_1] = @@ -3733,8 +3733,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.ItemCustomMoves = sParty_Brawly1 } + .partySize = ARRAY_COUNT(sParty_Brawly1), + .party = {.ItemCustomMoves = sParty_Brawly1}, }, [TRAINER_WATTSON_1] = @@ -3747,8 +3747,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.ItemCustomMoves = sParty_Wattson1 } + .partySize = ARRAY_COUNT(sParty_Wattson1), + .party = {.ItemCustomMoves = sParty_Wattson1}, }, [TRAINER_FLANNERY_1] = @@ -3761,8 +3761,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.ItemCustomMoves = sParty_Flannery1 } + .partySize = ARRAY_COUNT(sParty_Flannery1), + .party = {.ItemCustomMoves = sParty_Flannery1}, }, [TRAINER_NORMAN_1] = @@ -3775,8 +3775,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.ItemCustomMoves = sParty_Norman1 } + .partySize = ARRAY_COUNT(sParty_Norman1), + .party = {.ItemCustomMoves = sParty_Norman1}, }, [TRAINER_WINONA_1] = @@ -3789,8 +3789,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_RISKY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Winona1 } + .partySize = ARRAY_COUNT(sParty_Winona1), + .party = {.ItemCustomMoves = sParty_Winona1}, }, [TRAINER_TATE_AND_LIZA_1] = @@ -3803,8 +3803,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.ItemCustomMoves = sParty_TateAndLiza1 } + .partySize = ARRAY_COUNT(sParty_TateAndLiza1), + .party = {.ItemCustomMoves = sParty_TateAndLiza1}, }, [TRAINER_JUAN_1] = @@ -3817,8 +3817,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Juan1 } + .partySize = ARRAY_COUNT(sParty_Juan1), + .party = {.ItemCustomMoves = sParty_Juan1}, }, [TRAINER_JERRY_1] = @@ -3831,8 +3831,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jerry1 } + .partySize = ARRAY_COUNT(sParty_Jerry1), + .party = {.NoItemDefaultMoves = sParty_Jerry1}, }, [TRAINER_TED] = @@ -3845,8 +3845,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Ted } + .partySize = ARRAY_COUNT(sParty_Ted), + .party = {.NoItemDefaultMoves = sParty_Ted}, }, [TRAINER_PAUL] = @@ -3859,8 +3859,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Paul } + .partySize = ARRAY_COUNT(sParty_Paul), + .party = {.NoItemDefaultMoves = sParty_Paul}, }, [TRAINER_JERRY_2] = @@ -3873,8 +3873,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Jerry2 } + .partySize = ARRAY_COUNT(sParty_Jerry2), + .party = {.NoItemDefaultMoves = sParty_Jerry2}, }, [TRAINER_JERRY_3] = @@ -3887,8 +3887,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Jerry3 } + .partySize = ARRAY_COUNT(sParty_Jerry3), + .party = {.NoItemDefaultMoves = sParty_Jerry3}, }, [TRAINER_JERRY_4] = @@ -3901,8 +3901,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Jerry4 } + .partySize = ARRAY_COUNT(sParty_Jerry4), + .party = {.NoItemDefaultMoves = sParty_Jerry4}, }, [TRAINER_JERRY_5] = @@ -3915,8 +3915,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Jerry5 } + .partySize = ARRAY_COUNT(sParty_Jerry5), + .party = {.NoItemDefaultMoves = sParty_Jerry5}, }, [TRAINER_KAREN_1] = @@ -3929,8 +3929,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Karen1 } + .partySize = ARRAY_COUNT(sParty_Karen1), + .party = {.NoItemDefaultMoves = sParty_Karen1}, }, [TRAINER_GEORGIA] = @@ -3943,8 +3943,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Georgia } + .partySize = ARRAY_COUNT(sParty_Georgia), + .party = {.NoItemDefaultMoves = sParty_Georgia}, }, [TRAINER_KAREN_2] = @@ -3957,8 +3957,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Karen2 } + .partySize = ARRAY_COUNT(sParty_Karen2), + .party = {.NoItemDefaultMoves = sParty_Karen2}, }, [TRAINER_KAREN_3] = @@ -3971,8 +3971,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Karen3 } + .partySize = ARRAY_COUNT(sParty_Karen3), + .party = {.NoItemDefaultMoves = sParty_Karen3}, }, [TRAINER_KAREN_4] = @@ -3985,8 +3985,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Karen4 } + .partySize = ARRAY_COUNT(sParty_Karen4), + .party = {.NoItemDefaultMoves = sParty_Karen4}, }, [TRAINER_KAREN_5] = @@ -3999,8 +3999,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Karen5 } + .partySize = ARRAY_COUNT(sParty_Karen5), + .party = {.NoItemDefaultMoves = sParty_Karen5}, }, [TRAINER_KATE_AND_JOY] = @@ -4013,8 +4013,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_KateAndJoy } + .partySize = ARRAY_COUNT(sParty_KateAndJoy), + .party = {.NoItemCustomMoves = sParty_KateAndJoy}, }, [TRAINER_ANNA_AND_MEG_1] = @@ -4027,8 +4027,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_AnnaAndMeg1 } + .partySize = ARRAY_COUNT(sParty_AnnaAndMeg1), + .party = {.NoItemCustomMoves = sParty_AnnaAndMeg1}, }, [TRAINER_ANNA_AND_MEG_2] = @@ -4041,8 +4041,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_AnnaAndMeg2 } + .partySize = ARRAY_COUNT(sParty_AnnaAndMeg2), + .party = {.NoItemCustomMoves = sParty_AnnaAndMeg2}, }, [TRAINER_ANNA_AND_MEG_3] = @@ -4055,8 +4055,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_AnnaAndMeg3 } + .partySize = ARRAY_COUNT(sParty_AnnaAndMeg3), + .party = {.NoItemCustomMoves = sParty_AnnaAndMeg3}, }, [TRAINER_ANNA_AND_MEG_4] = @@ -4069,8 +4069,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_AnnaAndMeg4 } + .partySize = ARRAY_COUNT(sParty_AnnaAndMeg4), + .party = {.NoItemCustomMoves = sParty_AnnaAndMeg4}, }, [TRAINER_ANNA_AND_MEG_5] = @@ -4083,8 +4083,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_AnnaAndMeg5 } + .partySize = ARRAY_COUNT(sParty_AnnaAndMeg5), + .party = {.NoItemCustomMoves = sParty_AnnaAndMeg5}, }, [TRAINER_VICTOR] = @@ -4097,8 +4097,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.ItemDefaultMoves = sParty_Victor } + .partySize = ARRAY_COUNT(sParty_Victor), + .party = {.ItemDefaultMoves = sParty_Victor}, }, [TRAINER_MIGUEL_1] = @@ -4111,8 +4111,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Miguel1 } + .partySize = ARRAY_COUNT(sParty_Miguel1), + .party = {.ItemDefaultMoves = sParty_Miguel1}, }, [TRAINER_COLTON] = @@ -4125,8 +4125,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_Colton } + .partySize = ARRAY_COUNT(sParty_Colton), + .party = {.ItemCustomMoves = sParty_Colton}, }, [TRAINER_MIGUEL_2] = @@ -4139,8 +4139,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Miguel2 } + .partySize = ARRAY_COUNT(sParty_Miguel2), + .party = {.ItemDefaultMoves = sParty_Miguel2}, }, [TRAINER_MIGUEL_3] = @@ -4153,8 +4153,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Miguel3 } + .partySize = ARRAY_COUNT(sParty_Miguel3), + .party = {.ItemDefaultMoves = sParty_Miguel3}, }, [TRAINER_MIGUEL_4] = @@ -4167,8 +4167,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Miguel4 } + .partySize = ARRAY_COUNT(sParty_Miguel4), + .party = {.ItemDefaultMoves = sParty_Miguel4}, }, [TRAINER_MIGUEL_5] = @@ -4181,8 +4181,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Miguel5 } + .partySize = ARRAY_COUNT(sParty_Miguel5), + .party = {.ItemDefaultMoves = sParty_Miguel5}, }, [TRAINER_VICTORIA] = @@ -4195,8 +4195,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Victoria } + .partySize = ARRAY_COUNT(sParty_Victoria), + .party = {.ItemDefaultMoves = sParty_Victoria}, }, [TRAINER_VANESSA] = @@ -4209,8 +4209,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.ItemDefaultMoves = sParty_Vanessa } + .partySize = ARRAY_COUNT(sParty_Vanessa), + .party = {.ItemDefaultMoves = sParty_Vanessa}, }, [TRAINER_BETHANY] = @@ -4223,8 +4223,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.ItemDefaultMoves = sParty_Bethany } + .partySize = ARRAY_COUNT(sParty_Bethany), + .party = {.ItemDefaultMoves = sParty_Bethany}, }, [TRAINER_ISABEL_1] = @@ -4237,8 +4237,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.ItemDefaultMoves = sParty_Isabel1 } + .partySize = ARRAY_COUNT(sParty_Isabel1), + .party = {.ItemDefaultMoves = sParty_Isabel1}, }, [TRAINER_ISABEL_2] = @@ -4251,8 +4251,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.ItemDefaultMoves = sParty_Isabel2 } + .partySize = ARRAY_COUNT(sParty_Isabel2), + .party = {.ItemDefaultMoves = sParty_Isabel2}, }, [TRAINER_ISABEL_3] = @@ -4265,8 +4265,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.ItemDefaultMoves = sParty_Isabel3 } + .partySize = ARRAY_COUNT(sParty_Isabel3), + .party = {.ItemDefaultMoves = sParty_Isabel3}, }, [TRAINER_ISABEL_4] = @@ -4279,8 +4279,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.ItemDefaultMoves = sParty_Isabel4 } + .partySize = ARRAY_COUNT(sParty_Isabel4), + .party = {.ItemDefaultMoves = sParty_Isabel4}, }, [TRAINER_ISABEL_5] = @@ -4293,8 +4293,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.ItemDefaultMoves = sParty_Isabel5 } + .partySize = ARRAY_COUNT(sParty_Isabel5), + .party = {.ItemDefaultMoves = sParty_Isabel5}, }, [TRAINER_TIMOTHY_1] = @@ -4307,8 +4307,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Timothy1 } + .partySize = ARRAY_COUNT(sParty_Timothy1), + .party = {.NoItemDefaultMoves = sParty_Timothy1}, }, [TRAINER_TIMOTHY_2] = @@ -4321,8 +4321,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Timothy2 } + .partySize = ARRAY_COUNT(sParty_Timothy2), + .party = {.NoItemCustomMoves = sParty_Timothy2}, }, [TRAINER_TIMOTHY_3] = @@ -4335,8 +4335,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Timothy3 } + .partySize = ARRAY_COUNT(sParty_Timothy3), + .party = {.NoItemCustomMoves = sParty_Timothy3}, }, [TRAINER_TIMOTHY_4] = @@ -4349,8 +4349,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Timothy4 } + .partySize = ARRAY_COUNT(sParty_Timothy4), + .party = {.NoItemCustomMoves = sParty_Timothy4}, }, [TRAINER_TIMOTHY_5] = @@ -4363,8 +4363,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Timothy5 } + .partySize = ARRAY_COUNT(sParty_Timothy5), + .party = {.NoItemCustomMoves = sParty_Timothy5}, }, [TRAINER_VICKY] = @@ -4377,8 +4377,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Vicky } + .partySize = ARRAY_COUNT(sParty_Vicky), + .party = {.NoItemCustomMoves = sParty_Vicky}, }, [TRAINER_SHELBY_1] = @@ -4391,8 +4391,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Shelby1 } + .partySize = ARRAY_COUNT(sParty_Shelby1), + .party = {.NoItemDefaultMoves = sParty_Shelby1}, }, [TRAINER_SHELBY_2] = @@ -4405,8 +4405,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Shelby2 } + .partySize = ARRAY_COUNT(sParty_Shelby2), + .party = {.NoItemDefaultMoves = sParty_Shelby2}, }, [TRAINER_SHELBY_3] = @@ -4419,8 +4419,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Shelby3 } + .partySize = ARRAY_COUNT(sParty_Shelby3), + .party = {.NoItemDefaultMoves = sParty_Shelby3}, }, [TRAINER_SHELBY_4] = @@ -4433,8 +4433,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Shelby4 } + .partySize = ARRAY_COUNT(sParty_Shelby4), + .party = {.NoItemDefaultMoves = sParty_Shelby4}, }, [TRAINER_SHELBY_5] = @@ -4447,8 +4447,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Shelby5 } + .partySize = ARRAY_COUNT(sParty_Shelby5), + .party = {.NoItemDefaultMoves = sParty_Shelby5}, }, [TRAINER_CALVIN_1] = @@ -4461,8 +4461,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Calvin1 } + .partySize = ARRAY_COUNT(sParty_Calvin1), + .party = {.NoItemDefaultMoves = sParty_Calvin1}, }, [TRAINER_BILLY] = @@ -4475,8 +4475,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Billy } + .partySize = ARRAY_COUNT(sParty_Billy), + .party = {.NoItemDefaultMoves = sParty_Billy}, }, [TRAINER_JOSH] = @@ -4489,8 +4489,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Josh } + .partySize = ARRAY_COUNT(sParty_Josh), + .party = {.NoItemCustomMoves = sParty_Josh}, }, [TRAINER_TOMMY] = @@ -4503,8 +4503,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Tommy } + .partySize = ARRAY_COUNT(sParty_Tommy), + .party = {.NoItemDefaultMoves = sParty_Tommy}, }, [TRAINER_JOEY] = @@ -4517,8 +4517,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Joey } + .partySize = ARRAY_COUNT(sParty_Joey), + .party = {.NoItemDefaultMoves = sParty_Joey}, }, [TRAINER_BEN] = @@ -4531,8 +4531,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Ben } + .partySize = ARRAY_COUNT(sParty_Ben), + .party = {.NoItemCustomMoves = sParty_Ben}, }, [TRAINER_QUINCY] = @@ -4545,8 +4545,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Quincy } + .partySize = ARRAY_COUNT(sParty_Quincy), + .party = {.NoItemCustomMoves = sParty_Quincy}, }, [TRAINER_KATELYNN] = @@ -4559,8 +4559,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Katelynn } + .partySize = ARRAY_COUNT(sParty_Katelynn), + .party = {.NoItemCustomMoves = sParty_Katelynn}, }, [TRAINER_JAYLEN] = @@ -4573,8 +4573,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jaylen } + .partySize = ARRAY_COUNT(sParty_Jaylen), + .party = {.NoItemDefaultMoves = sParty_Jaylen}, }, [TRAINER_DILLON] = @@ -4587,8 +4587,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Dillon } + .partySize = ARRAY_COUNT(sParty_Dillon), + .party = {.NoItemDefaultMoves = sParty_Dillon}, }, [TRAINER_CALVIN_2] = @@ -4601,8 +4601,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Calvin2 } + .partySize = ARRAY_COUNT(sParty_Calvin2), + .party = {.NoItemDefaultMoves = sParty_Calvin2}, }, [TRAINER_CALVIN_3] = @@ -4615,8 +4615,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Calvin3 } + .partySize = ARRAY_COUNT(sParty_Calvin3), + .party = {.NoItemDefaultMoves = sParty_Calvin3}, }, [TRAINER_CALVIN_4] = @@ -4629,8 +4629,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Calvin4 } + .partySize = ARRAY_COUNT(sParty_Calvin4), + .party = {.NoItemDefaultMoves = sParty_Calvin4}, }, [TRAINER_CALVIN_5] = @@ -4643,8 +4643,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Calvin5 } + .partySize = ARRAY_COUNT(sParty_Calvin5), + .party = {.NoItemDefaultMoves = sParty_Calvin5}, }, [TRAINER_EDDIE] = @@ -4657,8 +4657,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Eddie } + .partySize = ARRAY_COUNT(sParty_Eddie), + .party = {.NoItemDefaultMoves = sParty_Eddie}, }, [TRAINER_ALLEN] = @@ -4671,8 +4671,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Allen } + .partySize = ARRAY_COUNT(sParty_Allen), + .party = {.NoItemDefaultMoves = sParty_Allen}, }, [TRAINER_TIMMY] = @@ -4685,8 +4685,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Timmy } + .partySize = ARRAY_COUNT(sParty_Timmy), + .party = {.NoItemDefaultMoves = sParty_Timmy}, }, [TRAINER_WALLACE] = @@ -4699,8 +4699,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_Wallace } + .partySize = ARRAY_COUNT(sParty_Wallace), + .party = {.ItemCustomMoves = sParty_Wallace}, }, [TRAINER_ANDREW] = @@ -4713,8 +4713,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Andrew } + .partySize = ARRAY_COUNT(sParty_Andrew), + .party = {.NoItemDefaultMoves = sParty_Andrew}, }, [TRAINER_IVAN] = @@ -4727,8 +4727,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Ivan } + .partySize = ARRAY_COUNT(sParty_Ivan), + .party = {.NoItemDefaultMoves = sParty_Ivan}, }, [TRAINER_CLAUDE] = @@ -4741,8 +4741,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Claude } + .partySize = ARRAY_COUNT(sParty_Claude), + .party = {.NoItemDefaultMoves = sParty_Claude}, }, [TRAINER_ELLIOT_1] = @@ -4755,8 +4755,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Elliot1 } + .partySize = ARRAY_COUNT(sParty_Elliot1), + .party = {.NoItemDefaultMoves = sParty_Elliot1}, }, [TRAINER_NED] = @@ -4769,8 +4769,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Ned } + .partySize = ARRAY_COUNT(sParty_Ned), + .party = {.NoItemDefaultMoves = sParty_Ned}, }, [TRAINER_DALE] = @@ -4783,8 +4783,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Dale } + .partySize = ARRAY_COUNT(sParty_Dale), + .party = {.NoItemDefaultMoves = sParty_Dale}, }, [TRAINER_NOLAN] = @@ -4797,8 +4797,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Nolan } + .partySize = ARRAY_COUNT(sParty_Nolan), + .party = {.NoItemDefaultMoves = sParty_Nolan}, }, [TRAINER_BARNY] = @@ -4811,8 +4811,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Barny } + .partySize = ARRAY_COUNT(sParty_Barny), + .party = {.NoItemDefaultMoves = sParty_Barny}, }, [TRAINER_WADE] = @@ -4825,8 +4825,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Wade } + .partySize = ARRAY_COUNT(sParty_Wade), + .party = {.NoItemDefaultMoves = sParty_Wade}, }, [TRAINER_CARTER] = @@ -4839,8 +4839,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Carter } + .partySize = ARRAY_COUNT(sParty_Carter), + .party = {.NoItemDefaultMoves = sParty_Carter}, }, [TRAINER_ELLIOT_2] = @@ -4853,8 +4853,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Elliot2 } + .partySize = ARRAY_COUNT(sParty_Elliot2), + .party = {.NoItemDefaultMoves = sParty_Elliot2}, }, [TRAINER_ELLIOT_3] = @@ -4867,8 +4867,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Elliot3 } + .partySize = ARRAY_COUNT(sParty_Elliot3), + .party = {.NoItemDefaultMoves = sParty_Elliot3}, }, [TRAINER_ELLIOT_4] = @@ -4881,8 +4881,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Elliot4 } + .partySize = ARRAY_COUNT(sParty_Elliot4), + .party = {.NoItemDefaultMoves = sParty_Elliot4}, }, [TRAINER_ELLIOT_5] = @@ -4895,8 +4895,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Elliot5 } + .partySize = ARRAY_COUNT(sParty_Elliot5), + .party = {.NoItemDefaultMoves = sParty_Elliot5}, }, [TRAINER_RONALD] = @@ -4909,8 +4909,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Ronald } + .partySize = ARRAY_COUNT(sParty_Ronald), + .party = {.NoItemDefaultMoves = sParty_Ronald}, }, [TRAINER_JACOB] = @@ -4923,8 +4923,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Jacob } + .partySize = ARRAY_COUNT(sParty_Jacob), + .party = {.NoItemDefaultMoves = sParty_Jacob}, }, [TRAINER_ANTHONY] = @@ -4937,8 +4937,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Anthony } + .partySize = ARRAY_COUNT(sParty_Anthony), + .party = {.NoItemDefaultMoves = sParty_Anthony}, }, [TRAINER_BENJAMIN_1] = @@ -4951,8 +4951,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Benjamin1 } + .partySize = ARRAY_COUNT(sParty_Benjamin1), + .party = {.NoItemDefaultMoves = sParty_Benjamin1}, }, [TRAINER_BENJAMIN_2] = @@ -4965,8 +4965,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Benjamin2 } + .partySize = ARRAY_COUNT(sParty_Benjamin2), + .party = {.NoItemDefaultMoves = sParty_Benjamin2}, }, [TRAINER_BENJAMIN_3] = @@ -4979,8 +4979,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Benjamin3 } + .partySize = ARRAY_COUNT(sParty_Benjamin3), + .party = {.NoItemDefaultMoves = sParty_Benjamin3}, }, [TRAINER_BENJAMIN_4] = @@ -4993,8 +4993,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Benjamin4 } + .partySize = ARRAY_COUNT(sParty_Benjamin4), + .party = {.NoItemDefaultMoves = sParty_Benjamin4}, }, [TRAINER_BENJAMIN_5] = @@ -5007,8 +5007,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Benjamin5 } + .partySize = ARRAY_COUNT(sParty_Benjamin5), + .party = {.NoItemDefaultMoves = sParty_Benjamin5}, }, [TRAINER_ABIGAIL_1] = @@ -5021,8 +5021,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Abigail1 } + .partySize = ARRAY_COUNT(sParty_Abigail1), + .party = {.NoItemDefaultMoves = sParty_Abigail1}, }, [TRAINER_JASMINE] = @@ -5035,8 +5035,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Jasmine } + .partySize = ARRAY_COUNT(sParty_Jasmine), + .party = {.NoItemDefaultMoves = sParty_Jasmine}, }, [TRAINER_ABIGAIL_2] = @@ -5049,8 +5049,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Abigail2 } + .partySize = ARRAY_COUNT(sParty_Abigail2), + .party = {.NoItemDefaultMoves = sParty_Abigail2}, }, [TRAINER_ABIGAIL_3] = @@ -5063,8 +5063,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Abigail3 } + .partySize = ARRAY_COUNT(sParty_Abigail3), + .party = {.NoItemDefaultMoves = sParty_Abigail3}, }, [TRAINER_ABIGAIL_4] = @@ -5077,8 +5077,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Abigail4 } + .partySize = ARRAY_COUNT(sParty_Abigail4), + .party = {.NoItemDefaultMoves = sParty_Abigail4}, }, [TRAINER_ABIGAIL_5] = @@ -5091,8 +5091,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Abigail5 } + .partySize = ARRAY_COUNT(sParty_Abigail5), + .party = {.NoItemDefaultMoves = sParty_Abigail5}, }, [TRAINER_DYLAN_1] = @@ -5105,8 +5105,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Dylan1 } + .partySize = ARRAY_COUNT(sParty_Dylan1), + .party = {.NoItemDefaultMoves = sParty_Dylan1}, }, [TRAINER_DYLAN_2] = @@ -5119,8 +5119,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Dylan2 } + .partySize = ARRAY_COUNT(sParty_Dylan2), + .party = {.NoItemDefaultMoves = sParty_Dylan2}, }, [TRAINER_DYLAN_3] = @@ -5133,8 +5133,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Dylan3 } + .partySize = ARRAY_COUNT(sParty_Dylan3), + .party = {.NoItemDefaultMoves = sParty_Dylan3}, }, [TRAINER_DYLAN_4] = @@ -5147,8 +5147,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Dylan4 } + .partySize = ARRAY_COUNT(sParty_Dylan4), + .party = {.NoItemDefaultMoves = sParty_Dylan4}, }, [TRAINER_DYLAN_5] = @@ -5161,8 +5161,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Dylan5 } + .partySize = ARRAY_COUNT(sParty_Dylan5), + .party = {.NoItemDefaultMoves = sParty_Dylan5}, }, [TRAINER_MARIA_1] = @@ -5175,8 +5175,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Maria1 } + .partySize = ARRAY_COUNT(sParty_Maria1), + .party = {.NoItemDefaultMoves = sParty_Maria1}, }, [TRAINER_MARIA_2] = @@ -5189,8 +5189,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Maria2 } + .partySize = ARRAY_COUNT(sParty_Maria2), + .party = {.NoItemDefaultMoves = sParty_Maria2}, }, [TRAINER_MARIA_3] = @@ -5203,8 +5203,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Maria3 } + .partySize = ARRAY_COUNT(sParty_Maria3), + .party = {.NoItemDefaultMoves = sParty_Maria3}, }, [TRAINER_MARIA_4] = @@ -5217,8 +5217,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Maria4 } + .partySize = ARRAY_COUNT(sParty_Maria4), + .party = {.NoItemDefaultMoves = sParty_Maria4}, }, [TRAINER_MARIA_5] = @@ -5231,8 +5231,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Maria5 } + .partySize = ARRAY_COUNT(sParty_Maria5), + .party = {.NoItemDefaultMoves = sParty_Maria5}, }, [TRAINER_CAMDEN] = @@ -5245,8 +5245,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Camden } + .partySize = ARRAY_COUNT(sParty_Camden), + .party = {.NoItemDefaultMoves = sParty_Camden}, }, [TRAINER_DEMETRIUS] = @@ -5259,8 +5259,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Demetrius } + .partySize = ARRAY_COUNT(sParty_Demetrius), + .party = {.NoItemDefaultMoves = sParty_Demetrius}, }, [TRAINER_ISAIAH_1] = @@ -5273,8 +5273,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Isaiah1 } + .partySize = ARRAY_COUNT(sParty_Isaiah1), + .party = {.NoItemDefaultMoves = sParty_Isaiah1}, }, [TRAINER_PABLO_1] = @@ -5287,8 +5287,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Pablo1 } + .partySize = ARRAY_COUNT(sParty_Pablo1), + .party = {.NoItemDefaultMoves = sParty_Pablo1}, }, [TRAINER_CHASE] = @@ -5301,8 +5301,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Chase } + .partySize = ARRAY_COUNT(sParty_Chase), + .party = {.NoItemDefaultMoves = sParty_Chase}, }, [TRAINER_ISAIAH_2] = @@ -5315,8 +5315,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Isaiah2 } + .partySize = ARRAY_COUNT(sParty_Isaiah2), + .party = {.NoItemDefaultMoves = sParty_Isaiah2}, }, [TRAINER_ISAIAH_3] = @@ -5329,8 +5329,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Isaiah3 } + .partySize = ARRAY_COUNT(sParty_Isaiah3), + .party = {.NoItemDefaultMoves = sParty_Isaiah3}, }, [TRAINER_ISAIAH_4] = @@ -5343,8 +5343,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Isaiah4 } + .partySize = ARRAY_COUNT(sParty_Isaiah4), + .party = {.NoItemDefaultMoves = sParty_Isaiah4}, }, [TRAINER_ISAIAH_5] = @@ -5357,8 +5357,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Isaiah5 } + .partySize = ARRAY_COUNT(sParty_Isaiah5), + .party = {.NoItemDefaultMoves = sParty_Isaiah5}, }, [TRAINER_ISOBEL] = @@ -5371,8 +5371,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Isobel } + .partySize = ARRAY_COUNT(sParty_Isobel), + .party = {.NoItemDefaultMoves = sParty_Isobel}, }, [TRAINER_DONNY] = @@ -5385,8 +5385,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Donny } + .partySize = ARRAY_COUNT(sParty_Donny), + .party = {.NoItemDefaultMoves = sParty_Donny}, }, [TRAINER_TALIA] = @@ -5399,8 +5399,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Talia } + .partySize = ARRAY_COUNT(sParty_Talia), + .party = {.NoItemDefaultMoves = sParty_Talia}, }, [TRAINER_KATELYN_1] = @@ -5413,8 +5413,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Katelyn1 } + .partySize = ARRAY_COUNT(sParty_Katelyn1), + .party = {.NoItemDefaultMoves = sParty_Katelyn1}, }, [TRAINER_ALLISON] = @@ -5427,8 +5427,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Allison } + .partySize = ARRAY_COUNT(sParty_Allison), + .party = {.NoItemDefaultMoves = sParty_Allison}, }, [TRAINER_KATELYN_2] = @@ -5441,8 +5441,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Katelyn2 } + .partySize = ARRAY_COUNT(sParty_Katelyn2), + .party = {.NoItemDefaultMoves = sParty_Katelyn2}, }, [TRAINER_KATELYN_3] = @@ -5455,8 +5455,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Katelyn3 } + .partySize = ARRAY_COUNT(sParty_Katelyn3), + .party = {.NoItemDefaultMoves = sParty_Katelyn3}, }, [TRAINER_KATELYN_4] = @@ -5469,8 +5469,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Katelyn4 } + .partySize = ARRAY_COUNT(sParty_Katelyn4), + .party = {.NoItemDefaultMoves = sParty_Katelyn4}, }, [TRAINER_KATELYN_5] = @@ -5483,8 +5483,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Katelyn5 } + .partySize = ARRAY_COUNT(sParty_Katelyn5), + .party = {.NoItemDefaultMoves = sParty_Katelyn5}, }, [TRAINER_NICOLAS_1] = @@ -5497,8 +5497,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Nicolas1 } + .partySize = ARRAY_COUNT(sParty_Nicolas1), + .party = {.NoItemDefaultMoves = sParty_Nicolas1}, }, [TRAINER_NICOLAS_2] = @@ -5511,8 +5511,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Nicolas2 } + .partySize = ARRAY_COUNT(sParty_Nicolas2), + .party = {.NoItemDefaultMoves = sParty_Nicolas2}, }, [TRAINER_NICOLAS_3] = @@ -5525,8 +5525,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Nicolas3 } + .partySize = ARRAY_COUNT(sParty_Nicolas3), + .party = {.NoItemDefaultMoves = sParty_Nicolas3}, }, [TRAINER_NICOLAS_4] = @@ -5539,8 +5539,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Nicolas4 } + .partySize = ARRAY_COUNT(sParty_Nicolas4), + .party = {.NoItemDefaultMoves = sParty_Nicolas4}, }, [TRAINER_NICOLAS_5] = @@ -5553,8 +5553,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.ItemDefaultMoves = sParty_Nicolas5 } + .partySize = ARRAY_COUNT(sParty_Nicolas5), + .party = {.ItemDefaultMoves = sParty_Nicolas5}, }, [TRAINER_AARON] = @@ -5567,8 +5567,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Aaron } + .partySize = ARRAY_COUNT(sParty_Aaron), + .party = {.NoItemCustomMoves = sParty_Aaron}, }, [TRAINER_PERRY] = @@ -5581,8 +5581,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Perry } + .partySize = ARRAY_COUNT(sParty_Perry), + .party = {.NoItemDefaultMoves = sParty_Perry}, }, [TRAINER_HUGH] = @@ -5595,8 +5595,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Hugh } + .partySize = ARRAY_COUNT(sParty_Hugh), + .party = {.NoItemDefaultMoves = sParty_Hugh}, }, [TRAINER_PHIL] = @@ -5609,8 +5609,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Phil } + .partySize = ARRAY_COUNT(sParty_Phil), + .party = {.NoItemDefaultMoves = sParty_Phil}, }, [TRAINER_JARED] = @@ -5623,8 +5623,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Jared } + .partySize = ARRAY_COUNT(sParty_Jared), + .party = {.NoItemDefaultMoves = sParty_Jared}, }, [TRAINER_HUMBERTO] = @@ -5637,8 +5637,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Humberto } + .partySize = ARRAY_COUNT(sParty_Humberto), + .party = {.NoItemDefaultMoves = sParty_Humberto}, }, [TRAINER_PRESLEY] = @@ -5651,8 +5651,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Presley } + .partySize = ARRAY_COUNT(sParty_Presley), + .party = {.NoItemDefaultMoves = sParty_Presley}, }, [TRAINER_EDWARDO] = @@ -5665,8 +5665,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Edwardo } + .partySize = ARRAY_COUNT(sParty_Edwardo), + .party = {.NoItemDefaultMoves = sParty_Edwardo}, }, [TRAINER_COLIN] = @@ -5679,8 +5679,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Colin } + .partySize = ARRAY_COUNT(sParty_Colin), + .party = {.NoItemDefaultMoves = sParty_Colin}, }, [TRAINER_ROBERT_1] = @@ -5693,8 +5693,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Robert1 } + .partySize = ARRAY_COUNT(sParty_Robert1), + .party = {.NoItemDefaultMoves = sParty_Robert1}, }, [TRAINER_BENNY] = @@ -5707,8 +5707,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Benny } + .partySize = ARRAY_COUNT(sParty_Benny), + .party = {.NoItemDefaultMoves = sParty_Benny}, }, [TRAINER_CHESTER] = @@ -5721,8 +5721,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Chester } + .partySize = ARRAY_COUNT(sParty_Chester), + .party = {.NoItemDefaultMoves = sParty_Chester}, }, [TRAINER_ROBERT_2] = @@ -5735,8 +5735,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Robert2 } + .partySize = ARRAY_COUNT(sParty_Robert2), + .party = {.NoItemDefaultMoves = sParty_Robert2}, }, [TRAINER_ROBERT_3] = @@ -5749,8 +5749,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Robert3 } + .partySize = ARRAY_COUNT(sParty_Robert3), + .party = {.NoItemDefaultMoves = sParty_Robert3}, }, [TRAINER_ROBERT_4] = @@ -5763,8 +5763,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Robert4 } + .partySize = ARRAY_COUNT(sParty_Robert4), + .party = {.NoItemDefaultMoves = sParty_Robert4}, }, [TRAINER_ROBERT_5] = @@ -5777,8 +5777,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Robert5 } + .partySize = ARRAY_COUNT(sParty_Robert5), + .party = {.NoItemDefaultMoves = sParty_Robert5}, }, [TRAINER_ALEX] = @@ -5791,8 +5791,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Alex } + .partySize = ARRAY_COUNT(sParty_Alex), + .party = {.NoItemDefaultMoves = sParty_Alex}, }, [TRAINER_BECK] = @@ -5805,8 +5805,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Beck } + .partySize = ARRAY_COUNT(sParty_Beck), + .party = {.NoItemDefaultMoves = sParty_Beck}, }, [TRAINER_YASU] = @@ -5819,8 +5819,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Yasu } + .partySize = ARRAY_COUNT(sParty_Yasu), + .party = {.NoItemDefaultMoves = sParty_Yasu}, }, [TRAINER_TAKASHI] = @@ -5833,8 +5833,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Takashi } + .partySize = ARRAY_COUNT(sParty_Takashi), + .party = {.NoItemDefaultMoves = sParty_Takashi}, }, [TRAINER_DIANNE] = @@ -5847,8 +5847,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = 0, - .partySize = 2, - .party = {.ItemCustomMoves = sParty_Dianne } + .partySize = ARRAY_COUNT(sParty_Dianne), + .party = {.ItemCustomMoves = sParty_Dianne}, }, [TRAINER_JANI] = @@ -5861,8 +5861,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jani } + .partySize = ARRAY_COUNT(sParty_Jani), + .party = {.NoItemDefaultMoves = sParty_Jani}, }, [TRAINER_LAO_1] = @@ -5875,8 +5875,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .partySize = 3, - .party = {.NoItemCustomMoves = sParty_Lao1 } + .partySize = ARRAY_COUNT(sParty_Lao1), + .party = {.NoItemCustomMoves = sParty_Lao1}, }, [TRAINER_LUNG] = @@ -5889,8 +5889,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Lung } + .partySize = ARRAY_COUNT(sParty_Lung), + .party = {.NoItemDefaultMoves = sParty_Lung}, }, [TRAINER_LAO_2] = @@ -5903,8 +5903,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .partySize = 4, - .party = {.NoItemCustomMoves = sParty_Lao2 } + .partySize = ARRAY_COUNT(sParty_Lao2), + .party = {.NoItemCustomMoves = sParty_Lao2}, }, [TRAINER_LAO_3] = @@ -5917,8 +5917,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .partySize = 4, - .party = {.NoItemCustomMoves = sParty_Lao3 } + .partySize = ARRAY_COUNT(sParty_Lao3), + .party = {.NoItemCustomMoves = sParty_Lao3}, }, [TRAINER_LAO_4] = @@ -5931,8 +5931,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .partySize = 4, - .party = {.NoItemCustomMoves = sParty_Lao4 } + .partySize = ARRAY_COUNT(sParty_Lao4), + .party = {.NoItemCustomMoves = sParty_Lao4}, }, [TRAINER_LAO_5] = @@ -5945,8 +5945,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .partySize = 4, - .party = {.ItemCustomMoves = sParty_Lao5 } + .partySize = ARRAY_COUNT(sParty_Lao5), + .party = {.ItemCustomMoves = sParty_Lao5}, }, [TRAINER_JOCELYN] = @@ -5959,8 +5959,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jocelyn } + .partySize = ARRAY_COUNT(sParty_Jocelyn), + .party = {.NoItemDefaultMoves = sParty_Jocelyn}, }, [TRAINER_LAURA] = @@ -5973,8 +5973,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Laura } + .partySize = ARRAY_COUNT(sParty_Laura), + .party = {.NoItemDefaultMoves = sParty_Laura}, }, [TRAINER_CYNDY_1] = @@ -5987,8 +5987,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Cyndy1 } + .partySize = ARRAY_COUNT(sParty_Cyndy1), + .party = {.NoItemDefaultMoves = sParty_Cyndy1}, }, [TRAINER_CORA] = @@ -6001,8 +6001,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Cora } + .partySize = ARRAY_COUNT(sParty_Cora), + .party = {.NoItemDefaultMoves = sParty_Cora}, }, [TRAINER_PAULA] = @@ -6015,8 +6015,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Paula } + .partySize = ARRAY_COUNT(sParty_Paula), + .party = {.NoItemDefaultMoves = sParty_Paula}, }, [TRAINER_CYNDY_2] = @@ -6029,8 +6029,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Cyndy2 } + .partySize = ARRAY_COUNT(sParty_Cyndy2), + .party = {.NoItemDefaultMoves = sParty_Cyndy2}, }, [TRAINER_CYNDY_3] = @@ -6043,8 +6043,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Cyndy3 } + .partySize = ARRAY_COUNT(sParty_Cyndy3), + .party = {.NoItemDefaultMoves = sParty_Cyndy3}, }, [TRAINER_CYNDY_4] = @@ -6057,8 +6057,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Cyndy4 } + .partySize = ARRAY_COUNT(sParty_Cyndy4), + .party = {.NoItemDefaultMoves = sParty_Cyndy4}, }, [TRAINER_CYNDY_5] = @@ -6071,8 +6071,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Cyndy5 } + .partySize = ARRAY_COUNT(sParty_Cyndy5), + .party = {.NoItemDefaultMoves = sParty_Cyndy5}, }, [TRAINER_MADELINE_1] = @@ -6085,8 +6085,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Madeline1 } + .partySize = ARRAY_COUNT(sParty_Madeline1), + .party = {.NoItemCustomMoves = sParty_Madeline1}, }, [TRAINER_CLARISSA] = @@ -6099,8 +6099,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Clarissa } + .partySize = ARRAY_COUNT(sParty_Clarissa), + .party = {.NoItemDefaultMoves = sParty_Clarissa}, }, [TRAINER_ANGELICA] = @@ -6113,8 +6113,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Angelica } + .partySize = ARRAY_COUNT(sParty_Angelica), + .party = {.NoItemCustomMoves = sParty_Angelica}, }, [TRAINER_MADELINE_2] = @@ -6127,8 +6127,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Madeline2 } + .partySize = ARRAY_COUNT(sParty_Madeline2), + .party = {.NoItemCustomMoves = sParty_Madeline2}, }, [TRAINER_MADELINE_3] = @@ -6141,8 +6141,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Madeline3 } + .partySize = ARRAY_COUNT(sParty_Madeline3), + .party = {.NoItemCustomMoves = sParty_Madeline3}, }, [TRAINER_MADELINE_4] = @@ -6155,8 +6155,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Madeline4 } + .partySize = ARRAY_COUNT(sParty_Madeline4), + .party = {.NoItemCustomMoves = sParty_Madeline4}, }, [TRAINER_MADELINE_5] = @@ -6169,8 +6169,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Madeline5 } + .partySize = ARRAY_COUNT(sParty_Madeline5), + .party = {.NoItemCustomMoves = sParty_Madeline5}, }, [TRAINER_BEVERLY] = @@ -6183,8 +6183,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Beverly } + .partySize = ARRAY_COUNT(sParty_Beverly), + .party = {.NoItemDefaultMoves = sParty_Beverly}, }, [TRAINER_IMANI] = @@ -6197,8 +6197,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Imani } + .partySize = ARRAY_COUNT(sParty_Imani), + .party = {.NoItemDefaultMoves = sParty_Imani}, }, [TRAINER_KYLA] = @@ -6211,8 +6211,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Kyla } + .partySize = ARRAY_COUNT(sParty_Kyla), + .party = {.NoItemDefaultMoves = sParty_Kyla}, }, [TRAINER_DENISE] = @@ -6225,8 +6225,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Denise } + .partySize = ARRAY_COUNT(sParty_Denise), + .party = {.NoItemDefaultMoves = sParty_Denise}, }, [TRAINER_BETH] = @@ -6239,8 +6239,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Beth } + .partySize = ARRAY_COUNT(sParty_Beth), + .party = {.NoItemDefaultMoves = sParty_Beth}, }, [TRAINER_TARA] = @@ -6253,8 +6253,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Tara } + .partySize = ARRAY_COUNT(sParty_Tara), + .party = {.NoItemDefaultMoves = sParty_Tara}, }, [TRAINER_MISSY] = @@ -6267,8 +6267,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Missy } + .partySize = ARRAY_COUNT(sParty_Missy), + .party = {.NoItemDefaultMoves = sParty_Missy}, }, [TRAINER_ALICE] = @@ -6281,8 +6281,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Alice } + .partySize = ARRAY_COUNT(sParty_Alice), + .party = {.NoItemDefaultMoves = sParty_Alice}, }, [TRAINER_JENNY_1] = @@ -6295,8 +6295,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jenny1 } + .partySize = ARRAY_COUNT(sParty_Jenny1), + .party = {.NoItemDefaultMoves = sParty_Jenny1}, }, [TRAINER_GRACE] = @@ -6309,8 +6309,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grace } + .partySize = ARRAY_COUNT(sParty_Grace), + .party = {.NoItemDefaultMoves = sParty_Grace}, }, [TRAINER_TANYA] = @@ -6323,8 +6323,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Tanya } + .partySize = ARRAY_COUNT(sParty_Tanya), + .party = {.NoItemDefaultMoves = sParty_Tanya}, }, [TRAINER_SHARON] = @@ -6337,8 +6337,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Sharon } + .partySize = ARRAY_COUNT(sParty_Sharon), + .party = {.NoItemDefaultMoves = sParty_Sharon}, }, [TRAINER_NIKKI] = @@ -6351,8 +6351,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Nikki } + .partySize = ARRAY_COUNT(sParty_Nikki), + .party = {.NoItemDefaultMoves = sParty_Nikki}, }, [TRAINER_BRENDA] = @@ -6365,8 +6365,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Brenda } + .partySize = ARRAY_COUNT(sParty_Brenda), + .party = {.NoItemDefaultMoves = sParty_Brenda}, }, [TRAINER_KATIE] = @@ -6379,8 +6379,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Katie } + .partySize = ARRAY_COUNT(sParty_Katie), + .party = {.NoItemDefaultMoves = sParty_Katie}, }, [TRAINER_SUSIE] = @@ -6393,8 +6393,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Susie } + .partySize = ARRAY_COUNT(sParty_Susie), + .party = {.NoItemDefaultMoves = sParty_Susie}, }, [TRAINER_KARA] = @@ -6407,8 +6407,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Kara } + .partySize = ARRAY_COUNT(sParty_Kara), + .party = {.NoItemDefaultMoves = sParty_Kara}, }, [TRAINER_DANA] = @@ -6421,8 +6421,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Dana } + .partySize = ARRAY_COUNT(sParty_Dana), + .party = {.NoItemDefaultMoves = sParty_Dana}, }, [TRAINER_SIENNA] = @@ -6435,8 +6435,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Sienna } + .partySize = ARRAY_COUNT(sParty_Sienna), + .party = {.NoItemDefaultMoves = sParty_Sienna}, }, [TRAINER_DEBRA] = @@ -6449,8 +6449,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Debra } + .partySize = ARRAY_COUNT(sParty_Debra), + .party = {.NoItemDefaultMoves = sParty_Debra}, }, [TRAINER_LINDA] = @@ -6463,8 +6463,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Linda } + .partySize = ARRAY_COUNT(sParty_Linda), + .party = {.NoItemDefaultMoves = sParty_Linda}, }, [TRAINER_KAYLEE] = @@ -6477,8 +6477,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Kaylee } + .partySize = ARRAY_COUNT(sParty_Kaylee), + .party = {.NoItemDefaultMoves = sParty_Kaylee}, }, [TRAINER_LAUREL] = @@ -6491,8 +6491,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Laurel } + .partySize = ARRAY_COUNT(sParty_Laurel), + .party = {.NoItemDefaultMoves = sParty_Laurel}, }, [TRAINER_CARLEE] = @@ -6505,8 +6505,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Carlee } + .partySize = ARRAY_COUNT(sParty_Carlee), + .party = {.NoItemDefaultMoves = sParty_Carlee}, }, [TRAINER_JENNY_2] = @@ -6519,8 +6519,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jenny2 } + .partySize = ARRAY_COUNT(sParty_Jenny2), + .party = {.NoItemDefaultMoves = sParty_Jenny2}, }, [TRAINER_JENNY_3] = @@ -6533,8 +6533,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jenny3 } + .partySize = ARRAY_COUNT(sParty_Jenny3), + .party = {.NoItemDefaultMoves = sParty_Jenny3}, }, [TRAINER_JENNY_4] = @@ -6547,8 +6547,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Jenny4 } + .partySize = ARRAY_COUNT(sParty_Jenny4), + .party = {.NoItemDefaultMoves = sParty_Jenny4}, }, [TRAINER_JENNY_5] = @@ -6561,8 +6561,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Jenny5 } + .partySize = ARRAY_COUNT(sParty_Jenny5), + .party = {.NoItemDefaultMoves = sParty_Jenny5}, }, [TRAINER_HEIDI] = @@ -6575,8 +6575,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Heidi } + .partySize = ARRAY_COUNT(sParty_Heidi), + .party = {.NoItemCustomMoves = sParty_Heidi}, }, [TRAINER_BECKY] = @@ -6589,8 +6589,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Becky } + .partySize = ARRAY_COUNT(sParty_Becky), + .party = {.NoItemCustomMoves = sParty_Becky}, }, [TRAINER_CAROL] = @@ -6603,8 +6603,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Carol } + .partySize = ARRAY_COUNT(sParty_Carol), + .party = {.NoItemDefaultMoves = sParty_Carol}, }, [TRAINER_NANCY] = @@ -6617,8 +6617,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Nancy } + .partySize = ARRAY_COUNT(sParty_Nancy), + .party = {.NoItemDefaultMoves = sParty_Nancy}, }, [TRAINER_MARTHA] = @@ -6631,8 +6631,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Martha } + .partySize = ARRAY_COUNT(sParty_Martha), + .party = {.NoItemDefaultMoves = sParty_Martha}, }, [TRAINER_DIANA_1] = @@ -6645,8 +6645,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Diana1 } + .partySize = ARRAY_COUNT(sParty_Diana1), + .party = {.NoItemDefaultMoves = sParty_Diana1}, }, [TRAINER_CEDRIC] = @@ -6659,8 +6659,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Cedric } + .partySize = ARRAY_COUNT(sParty_Cedric), + .party = {.NoItemCustomMoves = sParty_Cedric}, }, [TRAINER_IRENE] = @@ -6673,8 +6673,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Irene } + .partySize = ARRAY_COUNT(sParty_Irene), + .party = {.NoItemDefaultMoves = sParty_Irene}, }, [TRAINER_DIANA_2] = @@ -6687,8 +6687,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Diana2 } + .partySize = ARRAY_COUNT(sParty_Diana2), + .party = {.NoItemDefaultMoves = sParty_Diana2}, }, [TRAINER_DIANA_3] = @@ -6701,8 +6701,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Diana3 } + .partySize = ARRAY_COUNT(sParty_Diana3), + .party = {.NoItemDefaultMoves = sParty_Diana3}, }, [TRAINER_DIANA_4] = @@ -6715,8 +6715,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Diana4 } + .partySize = ARRAY_COUNT(sParty_Diana4), + .party = {.NoItemDefaultMoves = sParty_Diana4}, }, [TRAINER_DIANA_5] = @@ -6729,8 +6729,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Diana5 } + .partySize = ARRAY_COUNT(sParty_Diana5), + .party = {.NoItemDefaultMoves = sParty_Diana5}, }, [TRAINER_AMY_AND_LIV_1] = @@ -6743,8 +6743,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_AmyAndLiv1 } + .partySize = ARRAY_COUNT(sParty_AmyAndLiv1), + .party = {.NoItemDefaultMoves = sParty_AmyAndLiv1}, }, [TRAINER_AMY_AND_LIV_2] = @@ -6757,8 +6757,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_AmyAndLiv2 } + .partySize = ARRAY_COUNT(sParty_AmyAndLiv2), + .party = {.NoItemDefaultMoves = sParty_AmyAndLiv2}, }, [TRAINER_GINA_AND_MIA_1] = @@ -6771,8 +6771,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_GinaAndMia1 } + .partySize = ARRAY_COUNT(sParty_GinaAndMia1), + .party = {.NoItemDefaultMoves = sParty_GinaAndMia1}, }, [TRAINER_MIU_AND_YUKI] = @@ -6785,8 +6785,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_MiuAndYuki } + .partySize = ARRAY_COUNT(sParty_MiuAndYuki), + .party = {.NoItemDefaultMoves = sParty_MiuAndYuki}, }, [TRAINER_AMY_AND_LIV_3] = @@ -6799,8 +6799,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_AmyAndLiv3 } + .partySize = ARRAY_COUNT(sParty_AmyAndLiv3), + .party = {.NoItemDefaultMoves = sParty_AmyAndLiv3}, }, [TRAINER_GINA_AND_MIA_2] = @@ -6813,8 +6813,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_GinaAndMia2 } + .partySize = ARRAY_COUNT(sParty_GinaAndMia2), + .party = {.NoItemCustomMoves = sParty_GinaAndMia2}, }, [TRAINER_AMY_AND_LIV_4] = @@ -6827,8 +6827,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_AmyAndLiv4 } + .partySize = ARRAY_COUNT(sParty_AmyAndLiv4), + .party = {.NoItemDefaultMoves = sParty_AmyAndLiv4}, }, [TRAINER_AMY_AND_LIV_5] = @@ -6841,8 +6841,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_AmyAndLiv5 } + .partySize = ARRAY_COUNT(sParty_AmyAndLiv5), + .party = {.NoItemCustomMoves = sParty_AmyAndLiv5}, }, [TRAINER_AMY_AND_LIV_6] = @@ -6855,8 +6855,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_AmyAndLiv6 } + .partySize = ARRAY_COUNT(sParty_AmyAndLiv6), + .party = {.NoItemCustomMoves = sParty_AmyAndLiv6}, }, [TRAINER_HUEY] = @@ -6869,8 +6869,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Huey } + .partySize = ARRAY_COUNT(sParty_Huey), + .party = {.NoItemDefaultMoves = sParty_Huey}, }, [TRAINER_EDMOND] = @@ -6883,8 +6883,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Edmond } + .partySize = ARRAY_COUNT(sParty_Edmond), + .party = {.NoItemDefaultMoves = sParty_Edmond}, }, [TRAINER_ERNEST_1] = @@ -6897,8 +6897,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Ernest1 } + .partySize = ARRAY_COUNT(sParty_Ernest1), + .party = {.NoItemDefaultMoves = sParty_Ernest1}, }, [TRAINER_DWAYNE] = @@ -6911,8 +6911,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Dwayne } + .partySize = ARRAY_COUNT(sParty_Dwayne), + .party = {.NoItemDefaultMoves = sParty_Dwayne}, }, [TRAINER_PHILLIP] = @@ -6925,8 +6925,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Phillip } + .partySize = ARRAY_COUNT(sParty_Phillip), + .party = {.NoItemDefaultMoves = sParty_Phillip}, }, [TRAINER_LEONARD] = @@ -6939,8 +6939,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Leonard } + .partySize = ARRAY_COUNT(sParty_Leonard), + .party = {.NoItemDefaultMoves = sParty_Leonard}, }, [TRAINER_DUNCAN] = @@ -6953,8 +6953,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Duncan } + .partySize = ARRAY_COUNT(sParty_Duncan), + .party = {.NoItemDefaultMoves = sParty_Duncan}, }, [TRAINER_ERNEST_2] = @@ -6967,8 +6967,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Ernest2 } + .partySize = ARRAY_COUNT(sParty_Ernest2), + .party = {.NoItemDefaultMoves = sParty_Ernest2}, }, [TRAINER_ERNEST_3] = @@ -6981,8 +6981,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Ernest3 } + .partySize = ARRAY_COUNT(sParty_Ernest3), + .party = {.NoItemDefaultMoves = sParty_Ernest3}, }, [TRAINER_ERNEST_4] = @@ -6995,8 +6995,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Ernest4 } + .partySize = ARRAY_COUNT(sParty_Ernest4), + .party = {.NoItemDefaultMoves = sParty_Ernest4}, }, [TRAINER_ERNEST_5] = @@ -7009,8 +7009,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Ernest5 } + .partySize = ARRAY_COUNT(sParty_Ernest5), + .party = {.NoItemDefaultMoves = sParty_Ernest5}, }, [TRAINER_ELI] = @@ -7023,8 +7023,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Eli } + .partySize = ARRAY_COUNT(sParty_Eli), + .party = {.NoItemDefaultMoves = sParty_Eli}, }, [TRAINER_ANNIKA] = @@ -7037,22 +7037,22 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.ItemCustomMoves = sParty_Annika } + .partySize = ARRAY_COUNT(sParty_Annika), + .party = {.ItemCustomMoves = sParty_Annika}, }, [TRAINER_JAZMYN] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_UNUSED, + .trainerClass = TRAINER_CLASS_COOLTRAINER_2, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("JAZMYN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jazmyn } + .partySize = ARRAY_COUNT(sParty_Jazmyn), + .party = {.NoItemDefaultMoves = sParty_Jazmyn}, }, [TRAINER_JONAS] = @@ -7065,8 +7065,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Jonas } + .partySize = ARRAY_COUNT(sParty_Jonas), + .party = {.NoItemCustomMoves = sParty_Jonas}, }, [TRAINER_KAYLEY] = @@ -7079,8 +7079,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Kayley } + .partySize = ARRAY_COUNT(sParty_Kayley), + .party = {.NoItemCustomMoves = sParty_Kayley}, }, [TRAINER_AURON] = @@ -7093,8 +7093,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Auron } + .partySize = ARRAY_COUNT(sParty_Auron), + .party = {.NoItemDefaultMoves = sParty_Auron}, }, [TRAINER_KELVIN] = @@ -7107,8 +7107,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Kelvin } + .partySize = ARRAY_COUNT(sParty_Kelvin), + .party = {.NoItemDefaultMoves = sParty_Kelvin}, }, [TRAINER_MARLEY] = @@ -7121,8 +7121,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.ItemCustomMoves = sParty_Marley } + .partySize = ARRAY_COUNT(sParty_Marley), + .party = {.ItemCustomMoves = sParty_Marley}, }, [TRAINER_REYNA] = @@ -7135,8 +7135,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Reyna } + .partySize = ARRAY_COUNT(sParty_Reyna), + .party = {.NoItemDefaultMoves = sParty_Reyna}, }, [TRAINER_HUDSON] = @@ -7149,8 +7149,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Hudson } + .partySize = ARRAY_COUNT(sParty_Hudson), + .party = {.NoItemDefaultMoves = sParty_Hudson}, }, [TRAINER_CONOR] = @@ -7163,8 +7163,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Conor } + .partySize = ARRAY_COUNT(sParty_Conor), + .party = {.NoItemDefaultMoves = sParty_Conor}, }, [TRAINER_EDWIN_1] = @@ -7177,8 +7177,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Edwin1 } + .partySize = ARRAY_COUNT(sParty_Edwin1), + .party = {.NoItemDefaultMoves = sParty_Edwin1}, }, [TRAINER_HECTOR] = @@ -7191,8 +7191,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Hector } + .partySize = ARRAY_COUNT(sParty_Hector), + .party = {.NoItemDefaultMoves = sParty_Hector}, }, [TRAINER_TABITHA_1] = @@ -7205,8 +7205,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Tabitha1 } + .partySize = ARRAY_COUNT(sParty_Tabitha1), + .party = {.NoItemDefaultMoves = sParty_Tabitha1}, }, [TRAINER_EDWIN_2] = @@ -7219,8 +7219,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Edwin2 } + .partySize = ARRAY_COUNT(sParty_Edwin2), + .party = {.NoItemDefaultMoves = sParty_Edwin2}, }, [TRAINER_EDWIN_3] = @@ -7233,8 +7233,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Edwin3 } + .partySize = ARRAY_COUNT(sParty_Edwin3), + .party = {.NoItemDefaultMoves = sParty_Edwin3}, }, [TRAINER_EDWIN_4] = @@ -7247,8 +7247,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Edwin4 } + .partySize = ARRAY_COUNT(sParty_Edwin4), + .party = {.NoItemDefaultMoves = sParty_Edwin4}, }, [TRAINER_EDWIN_5] = @@ -7261,8 +7261,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Edwin5 } + .partySize = ARRAY_COUNT(sParty_Edwin5), + .party = {.NoItemDefaultMoves = sParty_Edwin5}, }, [TRAINER_WALLY_1] = @@ -7275,8 +7275,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.NoItemCustomMoves = sParty_Wally1 } + .partySize = ARRAY_COUNT(sParty_Wally1), + .party = {.NoItemCustomMoves = sParty_Wally1}, }, [TRAINER_BRENDAN_1] = @@ -7289,8 +7289,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Brendan1 } + .partySize = ARRAY_COUNT(sParty_Brendan1), + .party = {.NoItemDefaultMoves = sParty_Brendan1}, }, [TRAINER_BRENDAN_2] = @@ -7303,8 +7303,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Brendan2 } + .partySize = ARRAY_COUNT(sParty_Brendan2), + .party = {.NoItemDefaultMoves = sParty_Brendan2}, }, [TRAINER_BRENDAN_3] = @@ -7317,8 +7317,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Brendan3 } + .partySize = ARRAY_COUNT(sParty_Brendan3), + .party = {.NoItemDefaultMoves = sParty_Brendan3}, }, [TRAINER_BRENDAN_4] = @@ -7331,8 +7331,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Brendan4 } + .partySize = ARRAY_COUNT(sParty_Brendan4), + .party = {.NoItemDefaultMoves = sParty_Brendan4}, }, [TRAINER_BRENDAN_5] = @@ -7345,8 +7345,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Brendan5 } + .partySize = ARRAY_COUNT(sParty_Brendan5), + .party = {.NoItemDefaultMoves = sParty_Brendan5}, }, [TRAINER_BRENDAN_6] = @@ -7359,8 +7359,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Brendan6 } + .partySize = ARRAY_COUNT(sParty_Brendan6), + .party = {.NoItemDefaultMoves = sParty_Brendan6}, }, [TRAINER_BRENDAN_7] = @@ -7373,8 +7373,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Brendan7 } + .partySize = ARRAY_COUNT(sParty_Brendan7), + .party = {.NoItemDefaultMoves = sParty_Brendan7}, }, [TRAINER_BRENDAN_8] = @@ -7387,8 +7387,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Brendan8 } + .partySize = ARRAY_COUNT(sParty_Brendan8), + .party = {.NoItemDefaultMoves = sParty_Brendan8}, }, [TRAINER_BRENDAN_9] = @@ -7401,8 +7401,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Brendan9 } + .partySize = ARRAY_COUNT(sParty_Brendan9), + .party = {.NoItemDefaultMoves = sParty_Brendan9}, }, [TRAINER_MAY_1] = @@ -7415,8 +7415,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_May1 } + .partySize = ARRAY_COUNT(sParty_May1), + .party = {.NoItemDefaultMoves = sParty_May1}, }, [TRAINER_MAY_2] = @@ -7429,8 +7429,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_May2 } + .partySize = ARRAY_COUNT(sParty_May2), + .party = {.NoItemDefaultMoves = sParty_May2}, }, [TRAINER_MAY_3] = @@ -7443,8 +7443,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_May3 } + .partySize = ARRAY_COUNT(sParty_May3), + .party = {.NoItemDefaultMoves = sParty_May3}, }, [TRAINER_MAY_4] = @@ -7457,8 +7457,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_May4 } + .partySize = ARRAY_COUNT(sParty_May4), + .party = {.NoItemDefaultMoves = sParty_May4}, }, [TRAINER_MAY_5] = @@ -7471,8 +7471,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_May5 } + .partySize = ARRAY_COUNT(sParty_May5), + .party = {.NoItemDefaultMoves = sParty_May5}, }, [TRAINER_MAY_6] = @@ -7485,8 +7485,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_May6 } + .partySize = ARRAY_COUNT(sParty_May6), + .party = {.NoItemDefaultMoves = sParty_May6}, }, [TRAINER_MAY_7] = @@ -7499,8 +7499,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_May7 } + .partySize = ARRAY_COUNT(sParty_May7), + .party = {.NoItemDefaultMoves = sParty_May7}, }, [TRAINER_MAY_8] = @@ -7513,8 +7513,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_May8 } + .partySize = ARRAY_COUNT(sParty_May8), + .party = {.NoItemDefaultMoves = sParty_May8}, }, [TRAINER_MAY_9] = @@ -7527,8 +7527,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_May9 } + .partySize = ARRAY_COUNT(sParty_May9), + .party = {.NoItemDefaultMoves = sParty_May9}, }, [TRAINER_ISAAC_1] = @@ -7541,8 +7541,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Isaac1 } + .partySize = ARRAY_COUNT(sParty_Isaac1), + .party = {.NoItemDefaultMoves = sParty_Isaac1}, }, [TRAINER_DAVIS] = @@ -7555,8 +7555,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Davis } + .partySize = ARRAY_COUNT(sParty_Davis), + .party = {.NoItemDefaultMoves = sParty_Davis}, }, [TRAINER_MITCHELL] = @@ -7569,8 +7569,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Mitchell } + .partySize = ARRAY_COUNT(sParty_Mitchell), + .party = {.NoItemCustomMoves = sParty_Mitchell}, }, [TRAINER_ISAAC_2] = @@ -7583,8 +7583,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Isaac2 } + .partySize = ARRAY_COUNT(sParty_Isaac2), + .party = {.NoItemDefaultMoves = sParty_Isaac2}, }, [TRAINER_ISAAC_3] = @@ -7597,8 +7597,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Isaac3 } + .partySize = ARRAY_COUNT(sParty_Isaac3), + .party = {.NoItemDefaultMoves = sParty_Isaac3}, }, [TRAINER_ISAAC_4] = @@ -7611,8 +7611,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Isaac4 } + .partySize = ARRAY_COUNT(sParty_Isaac4), + .party = {.NoItemDefaultMoves = sParty_Isaac4}, }, [TRAINER_ISAAC_5] = @@ -7625,8 +7625,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Isaac5 } + .partySize = ARRAY_COUNT(sParty_Isaac5), + .party = {.NoItemDefaultMoves = sParty_Isaac5}, }, [TRAINER_LYDIA_1] = @@ -7639,8 +7639,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Lydia1 } + .partySize = ARRAY_COUNT(sParty_Lydia1), + .party = {.NoItemDefaultMoves = sParty_Lydia1}, }, [TRAINER_HALLE] = @@ -7653,8 +7653,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Halle } + .partySize = ARRAY_COUNT(sParty_Halle), + .party = {.NoItemDefaultMoves = sParty_Halle}, }, [TRAINER_GARRISON] = @@ -7667,8 +7667,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Garrison } + .partySize = ARRAY_COUNT(sParty_Garrison), + .party = {.NoItemDefaultMoves = sParty_Garrison}, }, [TRAINER_LYDIA_2] = @@ -7681,8 +7681,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Lydia2 } + .partySize = ARRAY_COUNT(sParty_Lydia2), + .party = {.NoItemDefaultMoves = sParty_Lydia2}, }, [TRAINER_LYDIA_3] = @@ -7695,8 +7695,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Lydia3 } + .partySize = ARRAY_COUNT(sParty_Lydia3), + .party = {.NoItemDefaultMoves = sParty_Lydia3}, }, [TRAINER_LYDIA_4] = @@ -7709,8 +7709,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Lydia4 } + .partySize = ARRAY_COUNT(sParty_Lydia4), + .party = {.NoItemDefaultMoves = sParty_Lydia4}, }, [TRAINER_LYDIA_5] = @@ -7723,8 +7723,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Lydia5 } + .partySize = ARRAY_COUNT(sParty_Lydia5), + .party = {.NoItemDefaultMoves = sParty_Lydia5}, }, [TRAINER_JACKSON_1] = @@ -7737,8 +7737,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jackson1 } + .partySize = ARRAY_COUNT(sParty_Jackson1), + .party = {.NoItemDefaultMoves = sParty_Jackson1}, }, [TRAINER_LORENZO] = @@ -7751,8 +7751,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Lorenzo } + .partySize = ARRAY_COUNT(sParty_Lorenzo), + .party = {.NoItemDefaultMoves = sParty_Lorenzo}, }, [TRAINER_SEBASTIAN] = @@ -7765,8 +7765,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Sebastian } + .partySize = ARRAY_COUNT(sParty_Sebastian), + .party = {.NoItemDefaultMoves = sParty_Sebastian}, }, [TRAINER_JACKSON_2] = @@ -7779,8 +7779,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jackson2 } + .partySize = ARRAY_COUNT(sParty_Jackson2), + .party = {.NoItemDefaultMoves = sParty_Jackson2}, }, [TRAINER_JACKSON_3] = @@ -7793,8 +7793,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jackson3 } + .partySize = ARRAY_COUNT(sParty_Jackson3), + .party = {.NoItemDefaultMoves = sParty_Jackson3}, }, [TRAINER_JACKSON_4] = @@ -7807,8 +7807,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Jackson4 } + .partySize = ARRAY_COUNT(sParty_Jackson4), + .party = {.NoItemDefaultMoves = sParty_Jackson4}, }, [TRAINER_JACKSON_5] = @@ -7821,8 +7821,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Jackson5 } + .partySize = ARRAY_COUNT(sParty_Jackson5), + .party = {.NoItemDefaultMoves = sParty_Jackson5}, }, [TRAINER_CATHERINE_1] = @@ -7835,8 +7835,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Catherine1 } + .partySize = ARRAY_COUNT(sParty_Catherine1), + .party = {.NoItemDefaultMoves = sParty_Catherine1}, }, [TRAINER_JENNA] = @@ -7849,8 +7849,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Jenna } + .partySize = ARRAY_COUNT(sParty_Jenna), + .party = {.NoItemDefaultMoves = sParty_Jenna}, }, [TRAINER_SOPHIA] = @@ -7863,8 +7863,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Sophia } + .partySize = ARRAY_COUNT(sParty_Sophia), + .party = {.NoItemDefaultMoves = sParty_Sophia}, }, [TRAINER_CATHERINE_2] = @@ -7877,8 +7877,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Catherine2 } + .partySize = ARRAY_COUNT(sParty_Catherine2), + .party = {.NoItemDefaultMoves = sParty_Catherine2}, }, [TRAINER_CATHERINE_3] = @@ -7891,8 +7891,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Catherine3 } + .partySize = ARRAY_COUNT(sParty_Catherine3), + .party = {.NoItemDefaultMoves = sParty_Catherine3}, }, [TRAINER_CATHERINE_4] = @@ -7905,8 +7905,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Catherine4 } + .partySize = ARRAY_COUNT(sParty_Catherine4), + .party = {.NoItemDefaultMoves = sParty_Catherine4}, }, [TRAINER_CATHERINE_5] = @@ -7919,8 +7919,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Catherine5 } + .partySize = ARRAY_COUNT(sParty_Catherine5), + .party = {.NoItemDefaultMoves = sParty_Catherine5}, }, [TRAINER_JULIO] = @@ -7933,8 +7933,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Julio } + .partySize = ARRAY_COUNT(sParty_Julio), + .party = {.NoItemDefaultMoves = sParty_Julio}, }, [TRAINER_GRUNT_27] = @@ -7947,8 +7947,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Grunt27 } + .partySize = ARRAY_COUNT(sParty_Grunt27), + .party = {.NoItemDefaultMoves = sParty_Grunt27}, }, [TRAINER_GRUNT_28] = @@ -7961,8 +7961,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Grunt28 } + .partySize = ARRAY_COUNT(sParty_Grunt28), + .party = {.NoItemDefaultMoves = sParty_Grunt28}, }, [TRAINER_GRUNT_29] = @@ -7975,8 +7975,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Grunt29 } + .partySize = ARRAY_COUNT(sParty_Grunt29), + .party = {.NoItemDefaultMoves = sParty_Grunt29}, }, [TRAINER_GRUNT_30] = @@ -7989,8 +7989,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Grunt30 } + .partySize = ARRAY_COUNT(sParty_Grunt30), + .party = {.NoItemDefaultMoves = sParty_Grunt30}, }, [TRAINER_MARC] = @@ -8003,8 +8003,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Marc } + .partySize = ARRAY_COUNT(sParty_Marc), + .party = {.NoItemDefaultMoves = sParty_Marc}, }, [TRAINER_BRENDEN] = @@ -8017,8 +8017,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Brenden } + .partySize = ARRAY_COUNT(sParty_Brenden), + .party = {.NoItemDefaultMoves = sParty_Brenden}, }, [TRAINER_LILITH] = @@ -8031,8 +8031,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Lilith } + .partySize = ARRAY_COUNT(sParty_Lilith), + .party = {.NoItemDefaultMoves = sParty_Lilith}, }, [TRAINER_CRISTIAN] = @@ -8045,8 +8045,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Cristian } + .partySize = ARRAY_COUNT(sParty_Cristian), + .party = {.NoItemDefaultMoves = sParty_Cristian}, }, [TRAINER_SYLVIA] = @@ -8059,8 +8059,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Sylvia } + .partySize = ARRAY_COUNT(sParty_Sylvia), + .party = {.NoItemDefaultMoves = sParty_Sylvia}, }, [TRAINER_LEONARDO] = @@ -8073,8 +8073,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Leonardo } + .partySize = ARRAY_COUNT(sParty_Leonardo), + .party = {.NoItemDefaultMoves = sParty_Leonardo}, }, [TRAINER_ATHENA] = @@ -8087,8 +8087,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.ItemCustomMoves = sParty_Athena } + .partySize = ARRAY_COUNT(sParty_Athena), + .party = {.ItemCustomMoves = sParty_Athena}, }, [TRAINER_HARRISON] = @@ -8101,8 +8101,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Harrison } + .partySize = ARRAY_COUNT(sParty_Harrison), + .party = {.NoItemDefaultMoves = sParty_Harrison}, }, [TRAINER_GRUNT_31] = @@ -8115,8 +8115,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt31 } + .partySize = ARRAY_COUNT(sParty_Grunt31), + .party = {.NoItemDefaultMoves = sParty_Grunt31}, }, [TRAINER_CLARENCE] = @@ -8129,8 +8129,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Clarence } + .partySize = ARRAY_COUNT(sParty_Clarence), + .party = {.NoItemDefaultMoves = sParty_Clarence}, }, [TRAINER_TERRY] = @@ -8143,8 +8143,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Terry } + .partySize = ARRAY_COUNT(sParty_Terry), + .party = {.NoItemDefaultMoves = sParty_Terry}, }, [TRAINER_NATE] = @@ -8157,8 +8157,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Nate } + .partySize = ARRAY_COUNT(sParty_Nate), + .party = {.NoItemDefaultMoves = sParty_Nate}, }, [TRAINER_KATHLEEN] = @@ -8171,8 +8171,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Kathleen } + .partySize = ARRAY_COUNT(sParty_Kathleen), + .party = {.NoItemDefaultMoves = sParty_Kathleen}, }, [TRAINER_CLIFFORD] = @@ -8185,8 +8185,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Clifford } + .partySize = ARRAY_COUNT(sParty_Clifford), + .party = {.NoItemDefaultMoves = sParty_Clifford}, }, [TRAINER_NICHOLAS] = @@ -8199,8 +8199,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Nicholas } + .partySize = ARRAY_COUNT(sParty_Nicholas), + .party = {.NoItemDefaultMoves = sParty_Nicholas}, }, [TRAINER_GRUNT_32] = @@ -8213,8 +8213,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Grunt32 } + .partySize = ARRAY_COUNT(sParty_Grunt32), + .party = {.NoItemDefaultMoves = sParty_Grunt32}, }, [TRAINER_GRUNT_33] = @@ -8227,8 +8227,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt33 } + .partySize = ARRAY_COUNT(sParty_Grunt33), + .party = {.NoItemDefaultMoves = sParty_Grunt33}, }, [TRAINER_GRUNT_34] = @@ -8241,8 +8241,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt34 } + .partySize = ARRAY_COUNT(sParty_Grunt34), + .party = {.NoItemDefaultMoves = sParty_Grunt34}, }, [TRAINER_GRUNT_35] = @@ -8255,8 +8255,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt35 } + .partySize = ARRAY_COUNT(sParty_Grunt35), + .party = {.NoItemDefaultMoves = sParty_Grunt35}, }, [TRAINER_GRUNT_36] = @@ -8269,8 +8269,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt36 } + .partySize = ARRAY_COUNT(sParty_Grunt36), + .party = {.NoItemDefaultMoves = sParty_Grunt36}, }, [TRAINER_MACEY] = @@ -8283,8 +8283,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Macey } + .partySize = ARRAY_COUNT(sParty_Macey), + .party = {.NoItemDefaultMoves = sParty_Macey}, }, [TRAINER_BRENDAN_10] = @@ -8297,8 +8297,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Brendan10 } + .partySize = ARRAY_COUNT(sParty_Brendan10), + .party = {.NoItemDefaultMoves = sParty_Brendan10}, }, [TRAINER_BRENDAN_11] = @@ -8311,8 +8311,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Brendan11 } + .partySize = ARRAY_COUNT(sParty_Brendan11), + .party = {.NoItemDefaultMoves = sParty_Brendan11}, }, [TRAINER_PAXTON] = @@ -8325,8 +8325,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Paxton } + .partySize = ARRAY_COUNT(sParty_Paxton), + .party = {.NoItemDefaultMoves = sParty_Paxton}, }, [TRAINER_ISABELLA] = @@ -8339,8 +8339,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Isabella } + .partySize = ARRAY_COUNT(sParty_Isabella), + .party = {.NoItemDefaultMoves = sParty_Isabella}, }, [TRAINER_GRUNT_37] = @@ -8353,8 +8353,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Grunt37 } + .partySize = ARRAY_COUNT(sParty_Grunt37), + .party = {.NoItemDefaultMoves = sParty_Grunt37}, }, [TRAINER_TABITHA_2] = @@ -8367,8 +8367,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Tabitha2 } + .partySize = ARRAY_COUNT(sParty_Tabitha2), + .party = {.NoItemDefaultMoves = sParty_Tabitha2}, }, [TRAINER_JONATHAN] = @@ -8381,8 +8381,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Jonathan } + .partySize = ARRAY_COUNT(sParty_Jonathan), + .party = {.NoItemDefaultMoves = sParty_Jonathan}, }, [TRAINER_BRENDAN_12] = @@ -8395,8 +8395,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Brendan12 } + .partySize = ARRAY_COUNT(sParty_Brendan12), + .party = {.NoItemDefaultMoves = sParty_Brendan12}, }, [TRAINER_MAY_10] = @@ -8409,8 +8409,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_May10 } + .partySize = ARRAY_COUNT(sParty_May10), + .party = {.NoItemDefaultMoves = sParty_May10}, }, [TRAINER_MAXIE_1] = @@ -8423,8 +8423,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Maxie1 } + .partySize = ARRAY_COUNT(sParty_Maxie1), + .party = {.NoItemDefaultMoves = sParty_Maxie1}, }, [TRAINER_MAXIE_2] = @@ -8437,8 +8437,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Maxie2 } + .partySize = ARRAY_COUNT(sParty_Maxie2), + .party = {.NoItemDefaultMoves = sParty_Maxie2}, }, [TRAINER_TIANA] = @@ -8451,8 +8451,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Tiana } + .partySize = ARRAY_COUNT(sParty_Tiana), + .party = {.NoItemDefaultMoves = sParty_Tiana}, }, [TRAINER_HALEY_1] = @@ -8465,8 +8465,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Haley1 } + .partySize = ARRAY_COUNT(sParty_Haley1), + .party = {.NoItemDefaultMoves = sParty_Haley1}, }, [TRAINER_JANICE] = @@ -8479,8 +8479,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Janice } + .partySize = ARRAY_COUNT(sParty_Janice), + .party = {.NoItemDefaultMoves = sParty_Janice}, }, [TRAINER_VIVI] = @@ -8493,8 +8493,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Vivi } + .partySize = ARRAY_COUNT(sParty_Vivi), + .party = {.NoItemDefaultMoves = sParty_Vivi}, }, [TRAINER_HALEY_2] = @@ -8507,8 +8507,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Haley2 } + .partySize = ARRAY_COUNT(sParty_Haley2), + .party = {.NoItemDefaultMoves = sParty_Haley2}, }, [TRAINER_HALEY_3] = @@ -8521,8 +8521,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Haley3 } + .partySize = ARRAY_COUNT(sParty_Haley3), + .party = {.NoItemDefaultMoves = sParty_Haley3}, }, [TRAINER_HALEY_4] = @@ -8535,8 +8535,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Haley4 } + .partySize = ARRAY_COUNT(sParty_Haley4), + .party = {.NoItemDefaultMoves = sParty_Haley4}, }, [TRAINER_HALEY_5] = @@ -8549,8 +8549,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Haley5 } + .partySize = ARRAY_COUNT(sParty_Haley5), + .party = {.NoItemDefaultMoves = sParty_Haley5}, }, [TRAINER_SALLY] = @@ -8563,8 +8563,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Sally } + .partySize = ARRAY_COUNT(sParty_Sally), + .party = {.NoItemDefaultMoves = sParty_Sally}, }, [TRAINER_ROBIN] = @@ -8577,8 +8577,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Robin } + .partySize = ARRAY_COUNT(sParty_Robin), + .party = {.NoItemDefaultMoves = sParty_Robin}, }, [TRAINER_ANDREA] = @@ -8591,8 +8591,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Andrea } + .partySize = ARRAY_COUNT(sParty_Andrea), + .party = {.NoItemDefaultMoves = sParty_Andrea}, }, [TRAINER_CRISSY] = @@ -8605,8 +8605,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Crissy } + .partySize = ARRAY_COUNT(sParty_Crissy), + .party = {.NoItemDefaultMoves = sParty_Crissy}, }, [TRAINER_RICK] = @@ -8619,8 +8619,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Rick } + .partySize = ARRAY_COUNT(sParty_Rick), + .party = {.NoItemDefaultMoves = sParty_Rick}, }, [TRAINER_LYLE] = @@ -8633,8 +8633,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Lyle } + .partySize = ARRAY_COUNT(sParty_Lyle), + .party = {.NoItemDefaultMoves = sParty_Lyle}, }, [TRAINER_JOSE] = @@ -8647,8 +8647,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Jose } + .partySize = ARRAY_COUNT(sParty_Jose), + .party = {.NoItemDefaultMoves = sParty_Jose}, }, [TRAINER_DOUG] = @@ -8661,8 +8661,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Doug } + .partySize = ARRAY_COUNT(sParty_Doug), + .party = {.NoItemDefaultMoves = sParty_Doug}, }, [TRAINER_GREG] = @@ -8675,8 +8675,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Greg } + .partySize = ARRAY_COUNT(sParty_Greg), + .party = {.NoItemDefaultMoves = sParty_Greg}, }, [TRAINER_KENT] = @@ -8689,8 +8689,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Kent } + .partySize = ARRAY_COUNT(sParty_Kent), + .party = {.NoItemDefaultMoves = sParty_Kent}, }, [TRAINER_JAMES_1] = @@ -8703,8 +8703,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_James1 } + .partySize = ARRAY_COUNT(sParty_James1), + .party = {.NoItemDefaultMoves = sParty_James1}, }, [TRAINER_JAMES_2] = @@ -8717,8 +8717,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_James2 } + .partySize = ARRAY_COUNT(sParty_James2), + .party = {.NoItemDefaultMoves = sParty_James2}, }, [TRAINER_JAMES_3] = @@ -8731,8 +8731,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_James3 } + .partySize = ARRAY_COUNT(sParty_James3), + .party = {.NoItemDefaultMoves = sParty_James3}, }, [TRAINER_JAMES_4] = @@ -8745,8 +8745,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_James4 } + .partySize = ARRAY_COUNT(sParty_James4), + .party = {.NoItemDefaultMoves = sParty_James4}, }, [TRAINER_JAMES_5] = @@ -8759,8 +8759,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_James5 } + .partySize = ARRAY_COUNT(sParty_James5), + .party = {.NoItemDefaultMoves = sParty_James5}, }, [TRAINER_BRICE] = @@ -8773,8 +8773,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Brice } + .partySize = ARRAY_COUNT(sParty_Brice), + .party = {.NoItemDefaultMoves = sParty_Brice}, }, [TRAINER_TRENT_1] = @@ -8787,8 +8787,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Trent1 } + .partySize = ARRAY_COUNT(sParty_Trent1), + .party = {.NoItemDefaultMoves = sParty_Trent1}, }, [TRAINER_LENNY] = @@ -8801,8 +8801,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Lenny } + .partySize = ARRAY_COUNT(sParty_Lenny), + .party = {.NoItemDefaultMoves = sParty_Lenny}, }, [TRAINER_LUCAS_1] = @@ -8815,8 +8815,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Lucas1 } + .partySize = ARRAY_COUNT(sParty_Lucas1), + .party = {.NoItemDefaultMoves = sParty_Lucas1}, }, [TRAINER_ALAN] = @@ -8829,8 +8829,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Alan } + .partySize = ARRAY_COUNT(sParty_Alan), + .party = {.NoItemDefaultMoves = sParty_Alan}, }, [TRAINER_CLARK] = @@ -8843,8 +8843,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Clark } + .partySize = ARRAY_COUNT(sParty_Clark), + .party = {.NoItemDefaultMoves = sParty_Clark}, }, [TRAINER_ERIC] = @@ -8857,8 +8857,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Eric } + .partySize = ARRAY_COUNT(sParty_Eric), + .party = {.NoItemDefaultMoves = sParty_Eric}, }, [TRAINER_LUCAS_2] = @@ -8871,8 +8871,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Lucas2 } + .partySize = ARRAY_COUNT(sParty_Lucas2), + .party = {.NoItemCustomMoves = sParty_Lucas2}, }, [TRAINER_MIKE_1] = @@ -8885,8 +8885,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Mike1 } + .partySize = ARRAY_COUNT(sParty_Mike1), + .party = {.NoItemCustomMoves = sParty_Mike1}, }, [TRAINER_MIKE_2] = @@ -8899,8 +8899,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Mike2 } + .partySize = ARRAY_COUNT(sParty_Mike2), + .party = {.NoItemDefaultMoves = sParty_Mike2}, }, [TRAINER_TRENT_2] = @@ -8913,8 +8913,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Trent2 } + .partySize = ARRAY_COUNT(sParty_Trent2), + .party = {.NoItemDefaultMoves = sParty_Trent2}, }, [TRAINER_TRENT_3] = @@ -8927,8 +8927,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Trent3 } + .partySize = ARRAY_COUNT(sParty_Trent3), + .party = {.NoItemDefaultMoves = sParty_Trent3}, }, [TRAINER_TRENT_4] = @@ -8941,8 +8941,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Trent4 } + .partySize = ARRAY_COUNT(sParty_Trent4), + .party = {.NoItemDefaultMoves = sParty_Trent4}, }, [TRAINER_TRENT_5] = @@ -8955,8 +8955,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Trent5 } + .partySize = ARRAY_COUNT(sParty_Trent5), + .party = {.NoItemDefaultMoves = sParty_Trent5}, }, [TRAINER_DEZ_AND_LUKE] = @@ -8969,8 +8969,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_DezAndLuke } + .partySize = ARRAY_COUNT(sParty_DezAndLuke), + .party = {.NoItemDefaultMoves = sParty_DezAndLuke}, }, [TRAINER_LEA_AND_JED] = @@ -8983,8 +8983,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_LeaAndJed } + .partySize = ARRAY_COUNT(sParty_LeaAndJed), + .party = {.NoItemDefaultMoves = sParty_LeaAndJed}, }, [TRAINER_KIRA_AND_DAN_1] = @@ -8997,8 +8997,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_KiraAndDan1 } + .partySize = ARRAY_COUNT(sParty_KiraAndDan1), + .party = {.NoItemDefaultMoves = sParty_KiraAndDan1}, }, [TRAINER_KIRA_AND_DAN_2] = @@ -9011,8 +9011,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_KiraAndDan2 } + .partySize = ARRAY_COUNT(sParty_KiraAndDan2), + .party = {.NoItemDefaultMoves = sParty_KiraAndDan2}, }, [TRAINER_KIRA_AND_DAN_3] = @@ -9025,8 +9025,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_KiraAndDan3 } + .partySize = ARRAY_COUNT(sParty_KiraAndDan3), + .party = {.NoItemDefaultMoves = sParty_KiraAndDan3}, }, [TRAINER_KIRA_AND_DAN_4] = @@ -9039,8 +9039,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_KiraAndDan4 } + .partySize = ARRAY_COUNT(sParty_KiraAndDan4), + .party = {.NoItemDefaultMoves = sParty_KiraAndDan4}, }, [TRAINER_KIRA_AND_DAN_5] = @@ -9053,8 +9053,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_KiraAndDan5 } + .partySize = ARRAY_COUNT(sParty_KiraAndDan5), + .party = {.NoItemDefaultMoves = sParty_KiraAndDan5}, }, [TRAINER_JOHANNA] = @@ -9067,8 +9067,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Johanna } + .partySize = ARRAY_COUNT(sParty_Johanna), + .party = {.NoItemDefaultMoves = sParty_Johanna}, }, [TRAINER_GERALD] = @@ -9081,8 +9081,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Gerald } + .partySize = ARRAY_COUNT(sParty_Gerald), + .party = {.NoItemCustomMoves = sParty_Gerald}, }, [TRAINER_VIVIAN] = @@ -9095,8 +9095,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Vivian } + .partySize = ARRAY_COUNT(sParty_Vivian), + .party = {.NoItemCustomMoves = sParty_Vivian}, }, [TRAINER_DANIELLE] = @@ -9109,8 +9109,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Danielle } + .partySize = ARRAY_COUNT(sParty_Danielle), + .party = {.NoItemCustomMoves = sParty_Danielle}, }, [TRAINER_HIDEO] = @@ -9123,8 +9123,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Hideo } + .partySize = ARRAY_COUNT(sParty_Hideo), + .party = {.NoItemCustomMoves = sParty_Hideo}, }, [TRAINER_KEIGO] = @@ -9137,8 +9137,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Keigo } + .partySize = ARRAY_COUNT(sParty_Keigo), + .party = {.NoItemCustomMoves = sParty_Keigo}, }, [TRAINER_RILEY] = @@ -9151,8 +9151,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_Riley } + .partySize = ARRAY_COUNT(sParty_Riley), + .party = {.NoItemCustomMoves = sParty_Riley}, }, [TRAINER_FLINT] = @@ -9165,8 +9165,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Flint } + .partySize = ARRAY_COUNT(sParty_Flint), + .party = {.NoItemDefaultMoves = sParty_Flint}, }, [TRAINER_ASHLEY] = @@ -9179,8 +9179,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Ashley } + .partySize = ARRAY_COUNT(sParty_Ashley), + .party = {.NoItemDefaultMoves = sParty_Ashley}, }, [TRAINER_WALLY_2] = @@ -9193,8 +9193,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Wally2 } + .partySize = ARRAY_COUNT(sParty_Wally2), + .party = {.NoItemDefaultMoves = sParty_Wally2}, }, [TRAINER_WALLY_3] = @@ -9207,8 +9207,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.NoItemCustomMoves = sParty_Wally3 } + .partySize = ARRAY_COUNT(sParty_Wally3), + .party = {.NoItemCustomMoves = sParty_Wally3}, }, [TRAINER_WALLY_4] = @@ -9221,8 +9221,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.NoItemCustomMoves = sParty_Wally4 } + .partySize = ARRAY_COUNT(sParty_Wally4), + .party = {.NoItemCustomMoves = sParty_Wally4}, }, [TRAINER_WALLY_5] = @@ -9235,8 +9235,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.NoItemCustomMoves = sParty_Wally5 } + .partySize = ARRAY_COUNT(sParty_Wally5), + .party = {.NoItemCustomMoves = sParty_Wally5}, }, [TRAINER_WALLY_6] = @@ -9249,8 +9249,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.NoItemCustomMoves = sParty_Wally6 } + .partySize = ARRAY_COUNT(sParty_Wally6), + .party = {.NoItemCustomMoves = sParty_Wally6}, }, [TRAINER_BRENDAN_13] = @@ -9263,8 +9263,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Brendan13 } + .partySize = ARRAY_COUNT(sParty_Brendan13), + .party = {.NoItemDefaultMoves = sParty_Brendan13}, }, [TRAINER_BRENDAN_14] = @@ -9277,8 +9277,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Brendan14 } + .partySize = ARRAY_COUNT(sParty_Brendan14), + .party = {.NoItemDefaultMoves = sParty_Brendan14}, }, [TRAINER_BRENDAN_15] = @@ -9291,8 +9291,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Brendan15 } + .partySize = ARRAY_COUNT(sParty_Brendan15), + .party = {.NoItemDefaultMoves = sParty_Brendan15}, }, [TRAINER_MAY_11] = @@ -9305,8 +9305,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_May11 } + .partySize = ARRAY_COUNT(sParty_May11), + .party = {.NoItemDefaultMoves = sParty_May11}, }, [TRAINER_MAY_12] = @@ -9319,8 +9319,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_May12 } + .partySize = ARRAY_COUNT(sParty_May12), + .party = {.NoItemDefaultMoves = sParty_May12}, }, [TRAINER_MAY_13] = @@ -9333,8 +9333,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_May13 } + .partySize = ARRAY_COUNT(sParty_May13), + .party = {.NoItemDefaultMoves = sParty_May13}, }, [TRAINER_JONAH] = @@ -9347,8 +9347,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Jonah } + .partySize = ARRAY_COUNT(sParty_Jonah), + .party = {.NoItemDefaultMoves = sParty_Jonah}, }, [TRAINER_HENRY] = @@ -9361,8 +9361,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Henry } + .partySize = ARRAY_COUNT(sParty_Henry), + .party = {.NoItemDefaultMoves = sParty_Henry}, }, [TRAINER_ROGER] = @@ -9375,8 +9375,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Roger } + .partySize = ARRAY_COUNT(sParty_Roger), + .party = {.NoItemDefaultMoves = sParty_Roger}, }, [TRAINER_ALEXA] = @@ -9389,8 +9389,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Alexa } + .partySize = ARRAY_COUNT(sParty_Alexa), + .party = {.NoItemDefaultMoves = sParty_Alexa}, }, [TRAINER_RUBEN] = @@ -9403,8 +9403,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Ruben } + .partySize = ARRAY_COUNT(sParty_Ruben), + .party = {.NoItemDefaultMoves = sParty_Ruben}, }, [TRAINER_KOJI_1] = @@ -9417,8 +9417,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Koji1 } + .partySize = ARRAY_COUNT(sParty_Koji1), + .party = {.NoItemDefaultMoves = sParty_Koji1}, }, [TRAINER_WAYNE] = @@ -9431,8 +9431,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Wayne } + .partySize = ARRAY_COUNT(sParty_Wayne), + .party = {.NoItemDefaultMoves = sParty_Wayne}, }, [TRAINER_AIDAN] = @@ -9445,8 +9445,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Aidan } + .partySize = ARRAY_COUNT(sParty_Aidan), + .party = {.NoItemDefaultMoves = sParty_Aidan}, }, [TRAINER_REED] = @@ -9459,8 +9459,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Reed } + .partySize = ARRAY_COUNT(sParty_Reed), + .party = {.NoItemDefaultMoves = sParty_Reed}, }, [TRAINER_TISHA] = @@ -9473,8 +9473,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Tisha } + .partySize = ARRAY_COUNT(sParty_Tisha), + .party = {.NoItemDefaultMoves = sParty_Tisha}, }, [TRAINER_TORI_AND_TIA] = @@ -9487,8 +9487,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_ToriAndTia } + .partySize = ARRAY_COUNT(sParty_ToriAndTia), + .party = {.NoItemDefaultMoves = sParty_ToriAndTia}, }, [TRAINER_KIM_AND_IRIS] = @@ -9501,8 +9501,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_KimAndIris } + .partySize = ARRAY_COUNT(sParty_KimAndIris), + .party = {.NoItemCustomMoves = sParty_KimAndIris}, }, [TRAINER_TYRA_AND_IVY] = @@ -9515,8 +9515,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_TyraAndIvy } + .partySize = ARRAY_COUNT(sParty_TyraAndIvy), + .party = {.NoItemCustomMoves = sParty_TyraAndIvy}, }, [TRAINER_MEL_AND_PAUL] = @@ -9529,8 +9529,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_MelAndPaul } + .partySize = ARRAY_COUNT(sParty_MelAndPaul), + .party = {.NoItemCustomMoves = sParty_MelAndPaul}, }, [TRAINER_JOHN_AND_JAY_1] = @@ -9543,8 +9543,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_JohnAndJay1 } + .partySize = ARRAY_COUNT(sParty_JohnAndJay1), + .party = {.NoItemCustomMoves = sParty_JohnAndJay1}, }, [TRAINER_JOHN_AND_JAY_2] = @@ -9557,8 +9557,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_JohnAndJay2 } + .partySize = ARRAY_COUNT(sParty_JohnAndJay2), + .party = {.NoItemCustomMoves = sParty_JohnAndJay2}, }, [TRAINER_JOHN_AND_JAY_3] = @@ -9571,8 +9571,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_JohnAndJay3 } + .partySize = ARRAY_COUNT(sParty_JohnAndJay3), + .party = {.NoItemCustomMoves = sParty_JohnAndJay3}, }, [TRAINER_JOHN_AND_JAY_4] = @@ -9585,8 +9585,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_JohnAndJay4 } + .partySize = ARRAY_COUNT(sParty_JohnAndJay4), + .party = {.NoItemCustomMoves = sParty_JohnAndJay4}, }, [TRAINER_JOHN_AND_JAY_5] = @@ -9599,8 +9599,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemCustomMoves = sParty_JohnAndJay5 } + .partySize = ARRAY_COUNT(sParty_JohnAndJay5), + .party = {.NoItemCustomMoves = sParty_JohnAndJay5}, }, [TRAINER_RELI_AND_IAN] = @@ -9613,8 +9613,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_ReliAndIan } + .partySize = ARRAY_COUNT(sParty_ReliAndIan), + .party = {.NoItemDefaultMoves = sParty_ReliAndIan}, }, [TRAINER_LILA_AND_ROY_1] = @@ -9627,8 +9627,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_LilaAndRoy1 } + .partySize = ARRAY_COUNT(sParty_LilaAndRoy1), + .party = {.NoItemDefaultMoves = sParty_LilaAndRoy1}, }, [TRAINER_LILA_AND_ROY_2] = @@ -9641,8 +9641,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_LilaAndRoy2 } + .partySize = ARRAY_COUNT(sParty_LilaAndRoy2), + .party = {.NoItemDefaultMoves = sParty_LilaAndRoy2}, }, [TRAINER_LILA_AND_ROY_3] = @@ -9655,8 +9655,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_LilaAndRoy3 } + .partySize = ARRAY_COUNT(sParty_LilaAndRoy3), + .party = {.NoItemDefaultMoves = sParty_LilaAndRoy3}, }, [TRAINER_LILA_AND_ROY_4] = @@ -9669,8 +9669,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_LilaAndRoy4 } + .partySize = ARRAY_COUNT(sParty_LilaAndRoy4), + .party = {.NoItemDefaultMoves = sParty_LilaAndRoy4}, }, [TRAINER_LILA_AND_ROY_5] = @@ -9683,8 +9683,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_LilaAndRoy5 } + .partySize = ARRAY_COUNT(sParty_LilaAndRoy5), + .party = {.NoItemDefaultMoves = sParty_LilaAndRoy5}, }, [TRAINER_LISA_AND_RAY] = @@ -9697,8 +9697,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_LisaAndRay } + .partySize = ARRAY_COUNT(sParty_LisaAndRay), + .party = {.NoItemDefaultMoves = sParty_LisaAndRay}, }, [TRAINER_CHRIS] = @@ -9711,8 +9711,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Chris } + .partySize = ARRAY_COUNT(sParty_Chris), + .party = {.NoItemDefaultMoves = sParty_Chris}, }, [TRAINER_DAWSON] = @@ -9725,8 +9725,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.ItemDefaultMoves = sParty_Dawson } + .partySize = ARRAY_COUNT(sParty_Dawson), + .party = {.ItemDefaultMoves = sParty_Dawson}, }, [TRAINER_SARAH] = @@ -9739,8 +9739,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.ItemDefaultMoves = sParty_Sarah } + .partySize = ARRAY_COUNT(sParty_Sarah), + .party = {.ItemDefaultMoves = sParty_Sarah}, }, [TRAINER_DARIAN] = @@ -9753,8 +9753,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Darian } + .partySize = ARRAY_COUNT(sParty_Darian), + .party = {.NoItemDefaultMoves = sParty_Darian}, }, [TRAINER_HAILEY] = @@ -9767,8 +9767,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Hailey } + .partySize = ARRAY_COUNT(sParty_Hailey), + .party = {.NoItemDefaultMoves = sParty_Hailey}, }, [TRAINER_CHANDLER] = @@ -9781,8 +9781,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Chandler } + .partySize = ARRAY_COUNT(sParty_Chandler), + .party = {.NoItemDefaultMoves = sParty_Chandler}, }, [TRAINER_KALEB] = @@ -9795,8 +9795,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.ItemDefaultMoves = sParty_Kaleb } + .partySize = ARRAY_COUNT(sParty_Kaleb), + .party = {.ItemDefaultMoves = sParty_Kaleb}, }, [TRAINER_JOSEPH] = @@ -9809,8 +9809,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Joseph } + .partySize = ARRAY_COUNT(sParty_Joseph), + .party = {.NoItemDefaultMoves = sParty_Joseph}, }, [TRAINER_ALYSSA] = @@ -9823,8 +9823,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Alyssa } + .partySize = ARRAY_COUNT(sParty_Alyssa), + .party = {.NoItemDefaultMoves = sParty_Alyssa}, }, [TRAINER_MARCOS] = @@ -9837,8 +9837,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Marcos } + .partySize = ARRAY_COUNT(sParty_Marcos), + .party = {.NoItemDefaultMoves = sParty_Marcos}, }, [TRAINER_RHETT] = @@ -9851,8 +9851,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Rhett } + .partySize = ARRAY_COUNT(sParty_Rhett), + .party = {.NoItemDefaultMoves = sParty_Rhett}, }, [TRAINER_TYRON] = @@ -9865,8 +9865,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Tyron } + .partySize = ARRAY_COUNT(sParty_Tyron), + .party = {.NoItemDefaultMoves = sParty_Tyron}, }, [TRAINER_CELINA] = @@ -9879,8 +9879,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Celina } + .partySize = ARRAY_COUNT(sParty_Celina), + .party = {.NoItemDefaultMoves = sParty_Celina}, }, [TRAINER_BIANCA] = @@ -9893,8 +9893,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Bianca } + .partySize = ARRAY_COUNT(sParty_Bianca), + .party = {.NoItemDefaultMoves = sParty_Bianca}, }, [TRAINER_HAYDEN] = @@ -9907,8 +9907,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Hayden } + .partySize = ARRAY_COUNT(sParty_Hayden), + .party = {.NoItemDefaultMoves = sParty_Hayden}, }, [TRAINER_SOPHIE] = @@ -9921,8 +9921,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Sophie } + .partySize = ARRAY_COUNT(sParty_Sophie), + .party = {.NoItemDefaultMoves = sParty_Sophie}, }, [TRAINER_COBY] = @@ -9935,8 +9935,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Coby } + .partySize = ARRAY_COUNT(sParty_Coby), + .party = {.NoItemDefaultMoves = sParty_Coby}, }, [TRAINER_LAWRENCE] = @@ -9949,8 +9949,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Lawrence } + .partySize = ARRAY_COUNT(sParty_Lawrence), + .party = {.NoItemDefaultMoves = sParty_Lawrence}, }, [TRAINER_WYATT] = @@ -9963,8 +9963,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Wyatt } + .partySize = ARRAY_COUNT(sParty_Wyatt), + .party = {.NoItemDefaultMoves = sParty_Wyatt}, }, [TRAINER_ANGELINA] = @@ -9977,8 +9977,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Angelina } + .partySize = ARRAY_COUNT(sParty_Angelina), + .party = {.NoItemDefaultMoves = sParty_Angelina}, }, [TRAINER_KAI] = @@ -9991,8 +9991,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Kai } + .partySize = ARRAY_COUNT(sParty_Kai), + .party = {.NoItemDefaultMoves = sParty_Kai}, }, [TRAINER_CHARLOTTE] = @@ -10005,8 +10005,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Charlotte } + .partySize = ARRAY_COUNT(sParty_Charlotte), + .party = {.NoItemDefaultMoves = sParty_Charlotte}, }, [TRAINER_DEANDRE] = @@ -10019,8 +10019,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Deandre } + .partySize = ARRAY_COUNT(sParty_Deandre), + .party = {.NoItemDefaultMoves = sParty_Deandre}, }, [TRAINER_GRUNT_38] = @@ -10033,8 +10033,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt38 } + .partySize = ARRAY_COUNT(sParty_Grunt38), + .party = {.NoItemDefaultMoves = sParty_Grunt38}, }, [TRAINER_GRUNT_39] = @@ -10047,8 +10047,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt39 } + .partySize = ARRAY_COUNT(sParty_Grunt39), + .party = {.NoItemDefaultMoves = sParty_Grunt39}, }, [TRAINER_GRUNT_40] = @@ -10061,8 +10061,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt40 } + .partySize = ARRAY_COUNT(sParty_Grunt40), + .party = {.NoItemDefaultMoves = sParty_Grunt40}, }, [TRAINER_GRUNT_41] = @@ -10075,8 +10075,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Grunt41 } + .partySize = ARRAY_COUNT(sParty_Grunt41), + .party = {.NoItemDefaultMoves = sParty_Grunt41}, }, [TRAINER_GRUNT_42] = @@ -10089,8 +10089,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Grunt42 } + .partySize = ARRAY_COUNT(sParty_Grunt42), + .party = {.NoItemDefaultMoves = sParty_Grunt42}, }, [TRAINER_GRUNT_43] = @@ -10103,8 +10103,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt43 } + .partySize = ARRAY_COUNT(sParty_Grunt43), + .party = {.NoItemDefaultMoves = sParty_Grunt43}, }, [TRAINER_GRUNT_44] = @@ -10117,8 +10117,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt44 } + .partySize = ARRAY_COUNT(sParty_Grunt44), + .party = {.NoItemDefaultMoves = sParty_Grunt44}, }, [TRAINER_GRUNT_45] = @@ -10131,8 +10131,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt45 } + .partySize = ARRAY_COUNT(sParty_Grunt45), + .party = {.NoItemDefaultMoves = sParty_Grunt45}, }, [TRAINER_GRUNT_46] = @@ -10145,8 +10145,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt46 } + .partySize = ARRAY_COUNT(sParty_Grunt46), + .party = {.NoItemDefaultMoves = sParty_Grunt46}, }, [TRAINER_GRUNT_47] = @@ -10159,8 +10159,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt47 } + .partySize = ARRAY_COUNT(sParty_Grunt47), + .party = {.NoItemDefaultMoves = sParty_Grunt47}, }, [TRAINER_GRUNT_48] = @@ -10173,8 +10173,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt48 } + .partySize = ARRAY_COUNT(sParty_Grunt48), + .party = {.NoItemDefaultMoves = sParty_Grunt48}, }, [TRAINER_GRUNT_49] = @@ -10187,8 +10187,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt49 } + .partySize = ARRAY_COUNT(sParty_Grunt49), + .party = {.NoItemDefaultMoves = sParty_Grunt49}, }, [TRAINER_GRUNT_50] = @@ -10201,8 +10201,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt50 } + .partySize = ARRAY_COUNT(sParty_Grunt50), + .party = {.NoItemDefaultMoves = sParty_Grunt50}, }, [TRAINER_GRUNT_51] = @@ -10215,8 +10215,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt51 } + .partySize = ARRAY_COUNT(sParty_Grunt51), + .party = {.NoItemDefaultMoves = sParty_Grunt51}, }, [TRAINER_GRUNT_52] = @@ -10229,8 +10229,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt52 } + .partySize = ARRAY_COUNT(sParty_Grunt52), + .party = {.NoItemDefaultMoves = sParty_Grunt52}, }, [TRAINER_GRUNT_53] = @@ -10243,8 +10243,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Grunt53 } + .partySize = ARRAY_COUNT(sParty_Grunt53), + .party = {.NoItemDefaultMoves = sParty_Grunt53}, }, [TRAINER_TABITHA_3] = @@ -10257,8 +10257,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 4, - .party = {.NoItemDefaultMoves = sParty_Tabitha3 } + .partySize = ARRAY_COUNT(sParty_Tabitha3), + .party = {.NoItemDefaultMoves = sParty_Tabitha3}, }, [TRAINER_DARCY] = @@ -10271,8 +10271,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Darcy } + .partySize = ARRAY_COUNT(sParty_Darcy), + .party = {.NoItemDefaultMoves = sParty_Darcy}, }, [TRAINER_MAXIE_3] = @@ -10285,8 +10285,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Maxie3 } + .partySize = ARRAY_COUNT(sParty_Maxie3), + .party = {.NoItemDefaultMoves = sParty_Maxie3}, }, [TRAINER_PETE] = @@ -10299,8 +10299,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Pete } + .partySize = ARRAY_COUNT(sParty_Pete), + .party = {.NoItemDefaultMoves = sParty_Pete}, }, [TRAINER_ISABELLE] = @@ -10313,8 +10313,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Isabelle } + .partySize = ARRAY_COUNT(sParty_Isabelle), + .party = {.NoItemDefaultMoves = sParty_Isabelle}, }, [TRAINER_ANDRES_1] = @@ -10327,8 +10327,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Andres1 } + .partySize = ARRAY_COUNT(sParty_Andres1), + .party = {.NoItemDefaultMoves = sParty_Andres1}, }, [TRAINER_JOSUE] = @@ -10341,8 +10341,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Josue } + .partySize = ARRAY_COUNT(sParty_Josue), + .party = {.NoItemDefaultMoves = sParty_Josue}, }, [TRAINER_CAMRON] = @@ -10355,8 +10355,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Camron } + .partySize = ARRAY_COUNT(sParty_Camron), + .party = {.NoItemDefaultMoves = sParty_Camron}, }, [TRAINER_CORY_1] = @@ -10369,8 +10369,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Cory1 } + .partySize = ARRAY_COUNT(sParty_Cory1), + .party = {.NoItemDefaultMoves = sParty_Cory1}, }, [TRAINER_CAROLINA] = @@ -10383,8 +10383,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Carolina } + .partySize = ARRAY_COUNT(sParty_Carolina), + .party = {.NoItemDefaultMoves = sParty_Carolina}, }, [TRAINER_ELIJAH] = @@ -10397,8 +10397,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Elijah } + .partySize = ARRAY_COUNT(sParty_Elijah), + .party = {.NoItemDefaultMoves = sParty_Elijah}, }, [TRAINER_CELIA] = @@ -10411,8 +10411,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Celia } + .partySize = ARRAY_COUNT(sParty_Celia), + .party = {.NoItemDefaultMoves = sParty_Celia}, }, [TRAINER_BRYAN] = @@ -10425,8 +10425,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Bryan } + .partySize = ARRAY_COUNT(sParty_Bryan), + .party = {.NoItemDefaultMoves = sParty_Bryan}, }, [TRAINER_BRANDEN] = @@ -10439,8 +10439,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Branden } + .partySize = ARRAY_COUNT(sParty_Branden), + .party = {.NoItemDefaultMoves = sParty_Branden}, }, [TRAINER_BRYANT] = @@ -10453,8 +10453,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Bryant } + .partySize = ARRAY_COUNT(sParty_Bryant), + .party = {.NoItemDefaultMoves = sParty_Bryant}, }, [TRAINER_SHAYLA] = @@ -10467,8 +10467,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Shayla } + .partySize = ARRAY_COUNT(sParty_Shayla), + .party = {.NoItemDefaultMoves = sParty_Shayla}, }, [TRAINER_KYRA] = @@ -10481,8 +10481,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Kyra } + .partySize = ARRAY_COUNT(sParty_Kyra), + .party = {.NoItemDefaultMoves = sParty_Kyra}, }, [TRAINER_JAIDEN] = @@ -10495,8 +10495,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Jaiden } + .partySize = ARRAY_COUNT(sParty_Jaiden), + .party = {.NoItemDefaultMoves = sParty_Jaiden}, }, [TRAINER_ALIX] = @@ -10509,8 +10509,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Alix } + .partySize = ARRAY_COUNT(sParty_Alix), + .party = {.NoItemDefaultMoves = sParty_Alix}, }, [TRAINER_HELENE] = @@ -10523,8 +10523,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Helene } + .partySize = ARRAY_COUNT(sParty_Helene), + .party = {.NoItemDefaultMoves = sParty_Helene}, }, [TRAINER_MARLENE] = @@ -10537,8 +10537,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Marlene } + .partySize = ARRAY_COUNT(sParty_Marlene), + .party = {.NoItemDefaultMoves = sParty_Marlene}, }, [TRAINER_DEVAN] = @@ -10551,8 +10551,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Devan } + .partySize = ARRAY_COUNT(sParty_Devan), + .party = {.NoItemDefaultMoves = sParty_Devan}, }, [TRAINER_JOHNSON] = @@ -10565,8 +10565,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Johnson } + .partySize = ARRAY_COUNT(sParty_Johnson), + .party = {.NoItemDefaultMoves = sParty_Johnson}, }, [TRAINER_MELINA] = @@ -10579,8 +10579,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Melina } + .partySize = ARRAY_COUNT(sParty_Melina), + .party = {.NoItemDefaultMoves = sParty_Melina}, }, [TRAINER_BRANDI] = @@ -10593,8 +10593,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Brandi } + .partySize = ARRAY_COUNT(sParty_Brandi), + .party = {.NoItemDefaultMoves = sParty_Brandi}, }, [TRAINER_AISHA] = @@ -10607,8 +10607,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Aisha } + .partySize = ARRAY_COUNT(sParty_Aisha), + .party = {.NoItemDefaultMoves = sParty_Aisha}, }, [TRAINER_MAKAYLA] = @@ -10621,8 +10621,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Makayla } + .partySize = ARRAY_COUNT(sParty_Makayla), + .party = {.NoItemDefaultMoves = sParty_Makayla}, }, [TRAINER_FABIAN] = @@ -10635,8 +10635,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Fabian } + .partySize = ARRAY_COUNT(sParty_Fabian), + .party = {.NoItemDefaultMoves = sParty_Fabian}, }, [TRAINER_DAYTON] = @@ -10649,8 +10649,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Dayton } + .partySize = ARRAY_COUNT(sParty_Dayton), + .party = {.NoItemDefaultMoves = sParty_Dayton}, }, [TRAINER_RACHEL] = @@ -10663,8 +10663,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Rachel } + .partySize = ARRAY_COUNT(sParty_Rachel), + .party = {.NoItemDefaultMoves = sParty_Rachel}, }, [TRAINER_LEONEL] = @@ -10677,8 +10677,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemCustomMoves = sParty_Leonel } + .partySize = ARRAY_COUNT(sParty_Leonel), + .party = {.NoItemCustomMoves = sParty_Leonel}, }, [TRAINER_CALLIE] = @@ -10691,8 +10691,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Callie } + .partySize = ARRAY_COUNT(sParty_Callie), + .party = {.NoItemDefaultMoves = sParty_Callie}, }, [TRAINER_CALE] = @@ -10705,8 +10705,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Cale } + .partySize = ARRAY_COUNT(sParty_Cale), + .party = {.NoItemDefaultMoves = sParty_Cale}, }, [TRAINER_MYLES] = @@ -10719,8 +10719,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Myles } + .partySize = ARRAY_COUNT(sParty_Myles), + .party = {.NoItemDefaultMoves = sParty_Myles}, }, [TRAINER_PAT] = @@ -10733,8 +10733,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Pat } + .partySize = ARRAY_COUNT(sParty_Pat), + .party = {.NoItemDefaultMoves = sParty_Pat}, }, [TRAINER_CRISTIN_1] = @@ -10747,8 +10747,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Cristin1 } + .partySize = ARRAY_COUNT(sParty_Cristin1), + .party = {.NoItemDefaultMoves = sParty_Cristin1}, }, [TRAINER_MAY_14] = @@ -10761,8 +10761,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_May14 } + .partySize = ARRAY_COUNT(sParty_May14), + .party = {.NoItemDefaultMoves = sParty_May14}, }, [TRAINER_MAY_15] = @@ -10775,8 +10775,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_May15 } + .partySize = ARRAY_COUNT(sParty_May15), + .party = {.NoItemDefaultMoves = sParty_May15}, }, [TRAINER_ROXANNE_2] = @@ -10789,8 +10789,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.ItemCustomMoves = sParty_Roxanne2 } + .partySize = ARRAY_COUNT(sParty_Roxanne2), + .party = {.ItemCustomMoves = sParty_Roxanne2}, }, [TRAINER_ROXANNE_3] = @@ -10803,8 +10803,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Roxanne3 } + .partySize = ARRAY_COUNT(sParty_Roxanne3), + .party = {.ItemCustomMoves = sParty_Roxanne3}, }, [TRAINER_ROXANNE_4] = @@ -10817,8 +10817,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Roxanne4 } + .partySize = ARRAY_COUNT(sParty_Roxanne4), + .party = {.ItemCustomMoves = sParty_Roxanne4}, }, [TRAINER_ROXANNE_5] = @@ -10831,8 +10831,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_Roxanne5 } + .partySize = ARRAY_COUNT(sParty_Roxanne5), + .party = {.ItemCustomMoves = sParty_Roxanne5}, }, [TRAINER_BRAWLY_2] = @@ -10845,8 +10845,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.ItemCustomMoves = sParty_Brawly2 } + .partySize = ARRAY_COUNT(sParty_Brawly2), + .party = {.ItemCustomMoves = sParty_Brawly2}, }, [TRAINER_BRAWLY_3] = @@ -10859,8 +10859,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.ItemCustomMoves = sParty_Brawly3 } + .partySize = ARRAY_COUNT(sParty_Brawly3), + .party = {.ItemCustomMoves = sParty_Brawly3}, }, [TRAINER_BRAWLY_4] = @@ -10873,8 +10873,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Brawly4 } + .partySize = ARRAY_COUNT(sParty_Brawly4), + .party = {.ItemCustomMoves = sParty_Brawly4}, }, [TRAINER_BRAWLY_5] = @@ -10887,8 +10887,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_Brawly5 } + .partySize = ARRAY_COUNT(sParty_Brawly5), + .party = {.ItemCustomMoves = sParty_Brawly5}, }, [TRAINER_WATTSON_2] = @@ -10901,8 +10901,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.ItemCustomMoves = sParty_Wattson2 } + .partySize = ARRAY_COUNT(sParty_Wattson2), + .party = {.ItemCustomMoves = sParty_Wattson2}, }, [TRAINER_WATTSON_3] = @@ -10915,8 +10915,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Wattson3 } + .partySize = ARRAY_COUNT(sParty_Wattson3), + .party = {.ItemCustomMoves = sParty_Wattson3}, }, [TRAINER_WATTSON_4] = @@ -10929,8 +10929,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Wattson4 } + .partySize = ARRAY_COUNT(sParty_Wattson4), + .party = {.ItemCustomMoves = sParty_Wattson4}, }, [TRAINER_WATTSON_5] = @@ -10943,8 +10943,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_Wattson5 } + .partySize = ARRAY_COUNT(sParty_Wattson5), + .party = {.ItemCustomMoves = sParty_Wattson5}, }, [TRAINER_FLANNERY_2] = @@ -10957,8 +10957,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.ItemCustomMoves = sParty_Flannery2 } + .partySize = ARRAY_COUNT(sParty_Flannery2), + .party = {.ItemCustomMoves = sParty_Flannery2}, }, [TRAINER_FLANNERY_3] = @@ -10971,8 +10971,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Flannery3 } + .partySize = ARRAY_COUNT(sParty_Flannery3), + .party = {.ItemCustomMoves = sParty_Flannery3}, }, [TRAINER_FLANNERY_4] = @@ -10985,8 +10985,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_Flannery4 } + .partySize = ARRAY_COUNT(sParty_Flannery4), + .party = {.ItemCustomMoves = sParty_Flannery4}, }, [TRAINER_FLANNERY_5] = @@ -10999,8 +10999,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_Flannery5 } + .partySize = ARRAY_COUNT(sParty_Flannery5), + .party = {.ItemCustomMoves = sParty_Flannery5}, }, [TRAINER_NORMAN_2] = @@ -11013,8 +11013,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 4, - .party = {.ItemCustomMoves = sParty_Norman2 } + .partySize = ARRAY_COUNT(sParty_Norman2), + .party = {.ItemCustomMoves = sParty_Norman2}, }, [TRAINER_NORMAN_3] = @@ -11027,8 +11027,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Norman3 } + .partySize = ARRAY_COUNT(sParty_Norman3), + .party = {.ItemCustomMoves = sParty_Norman3}, }, [TRAINER_NORMAN_4] = @@ -11041,8 +11041,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Norman4 } + .partySize = ARRAY_COUNT(sParty_Norman4), + .party = {.ItemCustomMoves = sParty_Norman4}, }, [TRAINER_NORMAN_5] = @@ -11055,8 +11055,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_Norman5 } + .partySize = ARRAY_COUNT(sParty_Norman5), + .party = {.ItemCustomMoves = sParty_Norman5}, }, [TRAINER_WINONA_2] = @@ -11069,8 +11069,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_RISKY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Winona2 } + .partySize = ARRAY_COUNT(sParty_Winona2), + .party = {.ItemCustomMoves = sParty_Winona2}, }, [TRAINER_WINONA_3] = @@ -11083,8 +11083,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_RISKY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_Winona3 } + .partySize = ARRAY_COUNT(sParty_Winona3), + .party = {.ItemCustomMoves = sParty_Winona3}, }, [TRAINER_WINONA_4] = @@ -11097,8 +11097,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_RISKY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_Winona4 } + .partySize = ARRAY_COUNT(sParty_Winona4), + .party = {.ItemCustomMoves = sParty_Winona4}, }, [TRAINER_WINONA_5] = @@ -11111,8 +11111,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_RISKY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_Winona5 } + .partySize = ARRAY_COUNT(sParty_Winona5), + .party = {.ItemCustomMoves = sParty_Winona5}, }, [TRAINER_TATE_AND_LIZA_2] = @@ -11125,8 +11125,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_TateAndLiza2 } + .partySize = ARRAY_COUNT(sParty_TateAndLiza2), + .party = {.ItemCustomMoves = sParty_TateAndLiza2}, }, [TRAINER_TATE_AND_LIZA_3] = @@ -11139,8 +11139,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_TateAndLiza3 } + .partySize = ARRAY_COUNT(sParty_TateAndLiza3), + .party = {.ItemCustomMoves = sParty_TateAndLiza3}, }, [TRAINER_TATE_AND_LIZA_4] = @@ -11153,8 +11153,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_TateAndLiza4 } + .partySize = ARRAY_COUNT(sParty_TateAndLiza4), + .party = {.ItemCustomMoves = sParty_TateAndLiza4}, }, [TRAINER_TATE_AND_LIZA_5] = @@ -11167,8 +11167,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_TateAndLiza5 } + .partySize = ARRAY_COUNT(sParty_TateAndLiza5), + .party = {.ItemCustomMoves = sParty_TateAndLiza5}, }, [TRAINER_JUAN_2] = @@ -11181,8 +11181,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Juan2 } + .partySize = ARRAY_COUNT(sParty_Juan2), + .party = {.ItemCustomMoves = sParty_Juan2}, }, [TRAINER_JUAN_3] = @@ -11195,8 +11195,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 5, - .party = {.ItemCustomMoves = sParty_Juan3 } + .partySize = ARRAY_COUNT(sParty_Juan3), + .party = {.ItemCustomMoves = sParty_Juan3}, }, [TRAINER_JUAN_4] = @@ -11209,8 +11209,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_Juan4 } + .partySize = ARRAY_COUNT(sParty_Juan4), + .party = {.ItemCustomMoves = sParty_Juan4}, }, [TRAINER_JUAN_5] = @@ -11223,8 +11223,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_Juan5 } + .partySize = ARRAY_COUNT(sParty_Juan5), + .party = {.ItemCustomMoves = sParty_Juan5}, }, [TRAINER_ANGELO] = @@ -11237,8 +11237,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.ItemCustomMoves = sParty_Angelo } + .partySize = ARRAY_COUNT(sParty_Angelo), + .party = {.ItemCustomMoves = sParty_Angelo}, }, [TRAINER_DARIUS] = @@ -11251,8 +11251,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Darius } + .partySize = ARRAY_COUNT(sParty_Darius), + .party = {.NoItemDefaultMoves = sParty_Darius}, }, [TRAINER_STEVEN] = @@ -11265,8 +11265,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 6, - .party = {.ItemCustomMoves = sParty_Steven } + .partySize = ARRAY_COUNT(sParty_Steven), + .party = {.ItemCustomMoves = sParty_Steven}, }, [TRAINER_ANABEL] = @@ -11279,8 +11279,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Anabel } + .partySize = ARRAY_COUNT(sParty_Anabel), + .party = {.NoItemDefaultMoves = sParty_Anabel}, }, [TRAINER_TUCKER] = @@ -11293,8 +11293,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Tucker } + .partySize = ARRAY_COUNT(sParty_Tucker), + .party = {.NoItemDefaultMoves = sParty_Tucker}, }, [TRAINER_SPENSER] = @@ -11307,8 +11307,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Spenser } + .partySize = ARRAY_COUNT(sParty_Spenser), + .party = {.NoItemDefaultMoves = sParty_Spenser}, }, [TRAINER_GRETA] = @@ -11321,8 +11321,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Greta } + .partySize = ARRAY_COUNT(sParty_Greta), + .party = {.NoItemDefaultMoves = sParty_Greta}, }, [TRAINER_NOLAND] = @@ -11335,8 +11335,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Noland } + .partySize = ARRAY_COUNT(sParty_Noland), + .party = {.NoItemDefaultMoves = sParty_Noland}, }, [TRAINER_LUCY] = @@ -11349,8 +11349,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Lucy } + .partySize = ARRAY_COUNT(sParty_Lucy), + .party = {.NoItemDefaultMoves = sParty_Lucy}, }, [TRAINER_BRANDON] = @@ -11363,8 +11363,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Brandon } + .partySize = ARRAY_COUNT(sParty_Brandon), + .party = {.NoItemDefaultMoves = sParty_Brandon}, }, [TRAINER_ANDRES_2] = @@ -11377,8 +11377,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Andres2 } + .partySize = ARRAY_COUNT(sParty_Andres2), + .party = {.NoItemDefaultMoves = sParty_Andres2}, }, [TRAINER_ANDRES_3] = @@ -11391,8 +11391,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Andres3 } + .partySize = ARRAY_COUNT(sParty_Andres3), + .party = {.NoItemDefaultMoves = sParty_Andres3}, }, [TRAINER_ANDRES_4] = @@ -11405,8 +11405,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Andres4 } + .partySize = ARRAY_COUNT(sParty_Andres4), + .party = {.NoItemDefaultMoves = sParty_Andres4}, }, [TRAINER_ANDRES_5] = @@ -11419,8 +11419,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Andres5 } + .partySize = ARRAY_COUNT(sParty_Andres5), + .party = {.NoItemDefaultMoves = sParty_Andres5}, }, [TRAINER_CORY_2] = @@ -11433,8 +11433,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Cory2 } + .partySize = ARRAY_COUNT(sParty_Cory2), + .party = {.NoItemDefaultMoves = sParty_Cory2}, }, [TRAINER_CORY_3] = @@ -11447,8 +11447,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Cory3 } + .partySize = ARRAY_COUNT(sParty_Cory3), + .party = {.NoItemDefaultMoves = sParty_Cory3}, }, [TRAINER_CORY_4] = @@ -11461,8 +11461,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Cory4 } + .partySize = ARRAY_COUNT(sParty_Cory4), + .party = {.NoItemDefaultMoves = sParty_Cory4}, }, [TRAINER_CORY_5] = @@ -11475,8 +11475,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Cory5 } + .partySize = ARRAY_COUNT(sParty_Cory5), + .party = {.NoItemDefaultMoves = sParty_Cory5}, }, [TRAINER_PABLO_2] = @@ -11489,8 +11489,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Pablo2 } + .partySize = ARRAY_COUNT(sParty_Pablo2), + .party = {.NoItemDefaultMoves = sParty_Pablo2}, }, [TRAINER_PABLO_3] = @@ -11503,8 +11503,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Pablo3 } + .partySize = ARRAY_COUNT(sParty_Pablo3), + .party = {.NoItemDefaultMoves = sParty_Pablo3}, }, [TRAINER_PABLO_4] = @@ -11517,8 +11517,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Pablo4 } + .partySize = ARRAY_COUNT(sParty_Pablo4), + .party = {.NoItemDefaultMoves = sParty_Pablo4}, }, [TRAINER_PABLO_5] = @@ -11531,8 +11531,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Pablo5 } + .partySize = ARRAY_COUNT(sParty_Pablo5), + .party = {.NoItemDefaultMoves = sParty_Pablo5}, }, [TRAINER_KOJI_2] = @@ -11545,8 +11545,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Koji2 } + .partySize = ARRAY_COUNT(sParty_Koji2), + .party = {.NoItemDefaultMoves = sParty_Koji2}, }, [TRAINER_KOJI_3] = @@ -11559,8 +11559,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Koji3 } + .partySize = ARRAY_COUNT(sParty_Koji3), + .party = {.NoItemDefaultMoves = sParty_Koji3}, }, [TRAINER_KOJI_4] = @@ -11573,8 +11573,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Koji4 } + .partySize = ARRAY_COUNT(sParty_Koji4), + .party = {.NoItemDefaultMoves = sParty_Koji4}, }, [TRAINER_KOJI_5] = @@ -11587,8 +11587,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Koji5 } + .partySize = ARRAY_COUNT(sParty_Koji5), + .party = {.NoItemDefaultMoves = sParty_Koji5}, }, [TRAINER_CRISTIN_2] = @@ -11601,8 +11601,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Cristin2 } + .partySize = ARRAY_COUNT(sParty_Cristin2), + .party = {.NoItemDefaultMoves = sParty_Cristin2}, }, [TRAINER_CRISTIN_3] = @@ -11615,8 +11615,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Cristin3 } + .partySize = ARRAY_COUNT(sParty_Cristin3), + .party = {.NoItemDefaultMoves = sParty_Cristin3}, }, [TRAINER_CRISTIN_4] = @@ -11629,8 +11629,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Cristin4 } + .partySize = ARRAY_COUNT(sParty_Cristin4), + .party = {.NoItemDefaultMoves = sParty_Cristin4}, }, [TRAINER_CRISTIN_5] = @@ -11643,8 +11643,8 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Cristin5 } + .partySize = ARRAY_COUNT(sParty_Cristin5), + .party = {.NoItemDefaultMoves = sParty_Cristin5}, }, [TRAINER_FERNANDO_2] = @@ -11657,8 +11657,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Fernando2 } + .partySize = ARRAY_COUNT(sParty_Fernando2), + .party = {.NoItemDefaultMoves = sParty_Fernando2}, }, [TRAINER_FERNANDO_3] = @@ -11671,8 +11671,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Fernando3 } + .partySize = ARRAY_COUNT(sParty_Fernando3), + .party = {.NoItemDefaultMoves = sParty_Fernando3}, }, [TRAINER_FERNANDO_4] = @@ -11685,8 +11685,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Fernando4 } + .partySize = ARRAY_COUNT(sParty_Fernando4), + .party = {.NoItemDefaultMoves = sParty_Fernando4}, }, [TRAINER_FERNANDO_5] = @@ -11699,8 +11699,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Fernando5 } + .partySize = ARRAY_COUNT(sParty_Fernando5), + .party = {.NoItemDefaultMoves = sParty_Fernando5}, }, [TRAINER_SAWYER_2] = @@ -11713,8 +11713,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Sawyer2 } + .partySize = ARRAY_COUNT(sParty_Sawyer2), + .party = {.NoItemDefaultMoves = sParty_Sawyer2}, }, [TRAINER_SAWYER_3] = @@ -11727,8 +11727,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Sawyer3 } + .partySize = ARRAY_COUNT(sParty_Sawyer3), + .party = {.NoItemDefaultMoves = sParty_Sawyer3}, }, [TRAINER_SAWYER_4] = @@ -11741,8 +11741,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Sawyer4 } + .partySize = ARRAY_COUNT(sParty_Sawyer4), + .party = {.NoItemDefaultMoves = sParty_Sawyer4}, }, [TRAINER_SAWYER_5] = @@ -11755,8 +11755,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Sawyer5 } + .partySize = ARRAY_COUNT(sParty_Sawyer5), + .party = {.NoItemDefaultMoves = sParty_Sawyer5}, }, [TRAINER_GABRIELLE_2] = @@ -11769,8 +11769,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Gabrielle2 } + .partySize = ARRAY_COUNT(sParty_Gabrielle2), + .party = {.NoItemDefaultMoves = sParty_Gabrielle2}, }, [TRAINER_GABRIELLE_3] = @@ -11783,8 +11783,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Gabrielle3 } + .partySize = ARRAY_COUNT(sParty_Gabrielle3), + .party = {.NoItemDefaultMoves = sParty_Gabrielle3}, }, [TRAINER_GABRIELLE_4] = @@ -11797,8 +11797,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Gabrielle4 } + .partySize = ARRAY_COUNT(sParty_Gabrielle4), + .party = {.NoItemDefaultMoves = sParty_Gabrielle4}, }, [TRAINER_GABRIELLE_5] = @@ -11811,8 +11811,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 6, - .party = {.NoItemDefaultMoves = sParty_Gabrielle5 } + .partySize = ARRAY_COUNT(sParty_Gabrielle5), + .party = {.NoItemDefaultMoves = sParty_Gabrielle5}, }, [TRAINER_THALIA_2] = @@ -11825,8 +11825,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Thalia2 } + .partySize = ARRAY_COUNT(sParty_Thalia2), + .party = {.NoItemDefaultMoves = sParty_Thalia2}, }, [TRAINER_THALIA_3] = @@ -11839,8 +11839,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Thalia3 } + .partySize = ARRAY_COUNT(sParty_Thalia3), + .party = {.NoItemDefaultMoves = sParty_Thalia3}, }, [TRAINER_THALIA_4] = @@ -11853,8 +11853,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Thalia4 } + .partySize = ARRAY_COUNT(sParty_Thalia4), + .party = {.NoItemDefaultMoves = sParty_Thalia4}, }, [TRAINER_THALIA_5] = @@ -11867,8 +11867,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = 3, - .party = {.NoItemDefaultMoves = sParty_Thalia5 } + .partySize = ARRAY_COUNT(sParty_Thalia5), + .party = {.NoItemDefaultMoves = sParty_Thalia5}, }, [TRAINER_MARIELA] = @@ -11881,8 +11881,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Mariela } + .partySize = ARRAY_COUNT(sParty_Mariela), + .party = {.NoItemDefaultMoves = sParty_Mariela}, }, [TRAINER_ALVARO] = @@ -11895,8 +11895,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .partySize = 2, - .party = {.NoItemDefaultMoves = sParty_Alvaro } + .partySize = ARRAY_COUNT(sParty_Alvaro), + .party = {.NoItemDefaultMoves = sParty_Alvaro}, }, [TRAINER_EVERETT] = @@ -11909,8 +11909,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Everett } + .partySize = ARRAY_COUNT(sParty_Everett), + .party = {.NoItemDefaultMoves = sParty_Everett}, }, [TRAINER_RED] = @@ -11923,8 +11923,8 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Red } + .partySize = ARRAY_COUNT(sParty_Red), + .party = {.NoItemDefaultMoves = sParty_Red}, }, [TRAINER_LEAF] = @@ -11937,35 +11937,35 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Leaf } + .partySize = ARRAY_COUNT(sParty_Leaf), + .party = {.NoItemDefaultMoves = sParty_Leaf}, }, [TRAINER_BRENDAN_16] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_PKMN_TRAINER_4, + .trainerClass = TRAINER_CLASS_RS_PROTAG, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_BRENDAN, .trainerName = _("BRENDAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_Brendan16 } + .partySize = ARRAY_COUNT(sParty_Brendan16), + .party = {.NoItemDefaultMoves = sParty_Brendan16}, }, [TRAINER_MAY_16] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_PKMN_TRAINER_4, + .trainerClass = TRAINER_CLASS_RS_PROTAG, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_MAY, .trainerName = _("MAY"), .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .partySize = 1, - .party = {.NoItemDefaultMoves = sParty_May16 } + .partySize = ARRAY_COUNT(sParty_May16), + .party = {.NoItemDefaultMoves = sParty_May16}, }, }; diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index ab2667c8c..b322fc1c7 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1337,13 +1337,13 @@ void SetPlayerAvatarStateMask(u8 flags) gPlayerAvatar.flags |= flags; } -static u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 a, u8 gender) +static u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 graphicsId, u8 gender) { u8 i; for (i = 0; i < 5; i++) { - if (gUnknown_0849750C[gender][i][0] == a) + if (gUnknown_0849750C[gender][i][0] == graphicsId) return gUnknown_0849750C[gender][i][1]; } return 1; @@ -1362,9 +1362,9 @@ u8 GetPlayerAvatarGraphicsIdByCurrentState(void) return 0; } -void SetPlayerAvatarExtraStateTransition(u8 a, u8 b) +void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 b) { - u8 unk = GetPlayerAvatarStateTransitionByGraphicsId(a, gPlayerAvatar.gender); + u8 unk = GetPlayerAvatarStateTransitionByGraphicsId(graphicsId, gPlayerAvatar.gender); gPlayerAvatar.unk1 |= unk | b; DoPlayerAvatarTransition(); diff --git a/src/field_special_scene.c b/src/field_special_scene.c index e059e6ef8..59077ebbd 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -13,6 +13,7 @@ #include "sound.h" #include "sprite.h" #include "task.h" +#include "constants/event_objects.h" #include "constants/songs.h" #include "constants/vars.h" @@ -311,7 +312,7 @@ void Task_HandlePorthole(u8 taskId) void sub_80FB6EC(void) { - u8 spriteId = AddPseudoEventObject(0x8C, SpriteCallbackDummy, 112, 80, 0); + u8 spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_SS_TIDAL, SpriteCallbackDummy, 112, 80, 0); gSprites[spriteId].coordOffsetEnabled = FALSE; diff --git a/src/graphics.c b/src/graphics.c index 0832101d8..679f16af1 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1172,13 +1172,11 @@ const u32 gBagScreenMale_Pal[] = INCBIN_U32("graphics/interface/bag_screen_male. const u32 gBagScreenFemale_Pal[] = INCBIN_U32("graphics/interface/bag_screen_female.gbapal.lz"); const u32 gBagScreen_Gfx[] = INCBIN_U32("graphics/interface/bag_screen.4bpp.lz"); - -const u32 gUnknown_08D9A88C[] = INCBIN_U32("graphics/unknown/unknown_D9A88C.bin.lz"); +const u32 gBagScreen_GfxTileMap[] = INCBIN_U32("graphics/interface/bag_screen_tilemap.bin.lz"); const u32 gBattleFrontierGfx_PyramidBag[] = INCBIN_U32("graphics/interface/bag_pyramid.4bpp.lz"); -const u32 gUnknown_08D9ADD0[] = INCBIN_U32("graphics/interface/bag_pyramid.gbapal.lz"); // female palette is first and male is second. - -const u32 gUnknown_08D9AE04[] = INCBIN_U32("graphics/unknown/unknown_D9AE04.bin.lz"); +const u32 gBattleFrontierGfx_PyramidBag_Pal[] = INCBIN_U32("graphics/interface/bag_pyramid.gbapal.lz"); // female palette is first and male is second. +const u32 gBattleFrontierGfx_PyramidBagTileMap[] = INCBIN_U32("graphics/interface/bag_pyramid_tilemap.bin.lz"); const u32 gUnknown_08D9AF44[] = INCBIN_U32("graphics/unknown/unknown_D9AF44.gbapal.lz"); diff --git a/src/item_menu.c b/src/item_menu.c index bfeeaacd0..a8d1d4445 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -53,40 +53,40 @@ void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)()); void CB2_Bag(void); -bool8 setup_bag_menu(void); -void bag_menu_init_bgs(void); -bool8 load_bag_menu_graphics(void); -void setup_bag_menu_textboxes(void); -void allocate_bag_item_list_buffers(void); -void load_bag_item_list_buffers(u8); -void bag_menu_print_pocket_names(const u8*, const u8*); -void bag_menu_copy_pocket_name_to_window(u32); -void bag_menu_draw_pocket_indicator_square(u8, u8); +bool8 SetupBagMenu(void); +void BagMenu_InitBGs(void); +bool8 LoadBagMenu_Graphics(void); +void SetupBagMenu_Textboxes(void); +void AllocateBagItemListBuffers(void); +void LoadBagItemListBuffers(u8); +void BagMenu_PrintPocketNames(const u8*, const u8*); +void BagMenu_CopyPocketNameToWindow(u32); +void BagMenu_DrawPocketIndicatorSquare(u8, u8); void bag_menu_add_pocket_scroll_arrow_indicators_maybe(void); void bag_menu_add_list_scroll_arrow_indicators_maybe(void); -void bag_menu_prepare_tmhm_move_window(void); +void BagMenu_PrepareTMHMMoveWindow(void); bool8 IsWallysBag(void); void Task_WallyTutorialBagMenu(u8); void Task_BagMenu(u8); -void get_name(s8*, u16); +void GetItemName(s8*, u16); u16 ItemIdToBattleMoveId(u16); u16 BagGetItemIdByPocketPosition(u8, u16); -void bag_menu_print_description_box_text(int); -void bag_menu_print_cursor(u8, u8); -void bag_menu_print(u8, u8, const u8*, u8, u8, u8, u8, u8, u8); +void BagMenu_PrintDescription(int); +void BagMenu_PrintCursor(u8, u8); +void BagMenu_Print(u8, u8, const u8*, u8, u8, u8, u8, u8, u8); bool8 ItemId_GetImportance(u16); u16 BagGetQuantityByPocketPosition(u8, u16); void sub_81AB89C(void); -void task_close_bag_menu_2(u8); +void TaskCloseBagMenu_2(u8); u8 AddItemMessageWindow(u8); void bag_menu_RemoveBagItem_message_window(u8); void set_callback3_to_bag(u8); void sub_81ABC54(u8, s16); -u8 bag_menu_add_window(u8); +u8 BagMenu_AddWindow(u8); u8 GetSwitchBagPocketDirection(void); void SwitchBagPocket(u8, s16, u16); bool8 sub_81AC2C0(void); -void bag_menu_swap_items(u8); +void BagMenu_SwapItems(u8); void sub_81AC10C(u8); void sub_81AC3C0(u8); void sub_81AC498(u8); @@ -97,15 +97,15 @@ void sub_81ACB54(u8, u8, u8); void Task_HandleInBattleItemMenuInput(u8); void Task_HandleOutOfBattleItemMenuInput(u8); bool8 sub_81ACDFC(s8); -void bag_menu_remove_window(u8); -void bag_menu_print_there_is_no_pokemon(u8); +void BagMenu_RemoveWindow(u8); +void BagMenu_PrintThereIsNoPokemon(u8); void Task_ChooseHowManyToToss(u8); -void BagMenuConfirmToss(u8); -void bag_menu_yes_no(u8, u8, const struct YesNoFuncTable*); +void BagMenu_TossItems(u8); +void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*); void Task_ActuallyToss(u8); void ItemMenu_Cancel(u8); void sub_81AD350(u8); -void bag_menu_print_cant_be_held_msg(u8); +void BagMenu_PrintItemCantBeHeld(u8); void bag_menu_AddMoney_window(void); void sub_81AD680(u8); void sub_81AD730(u8); @@ -126,8 +126,8 @@ static void SetPocketListPositions(void); void sub_81ABAE0(void); u8 sub_81AB1F0(u8); void sub_81AC23C(u8); -void bag_menu_change_item_callback(s32 a, bool8 b, struct ListMenu*); -void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a); +void BagMenu_MoveCursorCallback(s32 a, bool8 b, struct ListMenu*); +void PrintItemQuantityPlusGFX(u8 rboxId, int item_index_in_pocket, u8 a); void ItemMenu_UseOutOfBattle(u8 taskId); void ItemMenu_Toss(u8 taskId); void ItemMenu_Register(u8 taskId); @@ -141,13 +141,13 @@ void unknown_ItemMenu_Give2(u8 taskId); void unknown_ItemMenu_Confirm2(u8 taskId); void unknown_item_menu_type(u8 taskId); void item_menu_type_2(u8 taskId); -void display_sell_item_ask_str(u8 taskId); -void display_deposit_item_ask_str(u8 taskId); +void DisplaySellItemAskString(u8 taskId); +void DisplayDepositItemAskString(u8 taskId); void item_menu_type_b(u8 taskId); -void BagMenuActuallyToss(u8 taskId); -void BagMenuCancelToss(u8 taskId); -void sub_81AD84C(u8 taskId); -void sub_81AD6FC(u8 taskId); +void BagMenu_ConfirmToss(u8 taskId); +void BagMenu_CancelToss(u8 taskId); +void BagMenu_ConfirmSell(u8 taskId); +void BagMenu_CancelSell(u8 taskId); // .rodata @@ -185,8 +185,8 @@ static const struct BgTemplate sBgTemplates_ItemMenu[3] = static const struct ListMenuTemplate sItemListMenu = { .items = NULL, - .moveCursorFunc = bag_menu_change_item_callback, - .itemPrintFunc = sub_81AB520, + .moveCursorFunc = BagMenu_MoveCursorCallback, + .itemPrintFunc = PrintItemQuantityPlusGFX, .totalItems = 0, .maxShowed = 0, .windowId = 0, @@ -204,7 +204,7 @@ static const struct ListMenuTemplate sItemListMenu = .cursorKind = 0 }; -const struct MenuAction gUnknown_08613FB4[] = { +const struct MenuAction sItemMenuActions[] = { {gMenuText_Use, ItemMenu_UseOutOfBattle}, {gMenuText_Toss, ItemMenu_Toss}, {gMenuText_Register, ItemMenu_Register}, @@ -239,10 +239,10 @@ const TaskFunc gUnknown_08614054[] = { unknown_item_menu_type, unknown_item_menu_type, item_menu_type_2, - display_sell_item_ask_str, + DisplaySellItemAskString, unknown_ItemMenu_Confirm, unknown_item_menu_type, - display_deposit_item_ask_str, + DisplayDepositItemAskString, unknown_item_menu_type, unknown_item_menu_type, unknown_item_menu_type, @@ -250,11 +250,11 @@ const TaskFunc gUnknown_08614054[] = { item_menu_type_b }; -const struct YesNoFuncTable gUnknown_08614084 = {BagMenuActuallyToss, BagMenuCancelToss}; +const struct YesNoFuncTable sYesNoTossFunctions = {BagMenu_ConfirmToss, BagMenu_CancelToss}; -const struct YesNoFuncTable gUnknown_0861408C = {sub_81AD84C, sub_81AD6FC}; +const struct YesNoFuncTable sYesNoSellItemFunctions = {BagMenu_ConfirmSell, BagMenu_CancelSell}; -const struct ScrollArrowsTemplate gUnknown_08614094 = {SCROLL_ARROW_LEFT, 0x1C, 16, SCROLL_ARROW_RIGHT, 100, 16, -1, -1, 0x6F, 0x6F, 0}; +const struct ScrollArrowsTemplate gBagScrollArrowsTemplate = {SCROLL_ARROW_LEFT, 0x1C, 16, SCROLL_ARROW_RIGHT, 100, 16, -1, -1, 0x6F, 0x6F, 0}; const u8 gUnknown_086140A4[] = INCBIN_U8("graphics/interface/select_button.4bpp"); @@ -439,8 +439,8 @@ struct TempWallyStruct { u16 pocket; }; -EWRAM_DATA struct UnkBagStruct *gUnknown_0203CE54 = 0; -EWRAM_DATA struct BagStruct gUnknown_0203CE58 = {0}; +EWRAM_DATA struct BagMenuStruct *gBagMenu = 0; +EWRAM_DATA struct BagStruct gBagPositionStruct = {0}; static EWRAM_DATA struct ListBuffer1 *sListBuffer1 = 0; static EWRAM_DATA struct ListBuffer2 *sListBuffer2 = 0; EWRAM_DATA u16 gSpecialVar_ItemId = 0; @@ -453,9 +453,9 @@ extern const u16 gUnknown_0860F074[]; void ResetBagScrollPositions(void) { - gUnknown_0203CE58.pocket = ITEMS_POCKET; - memset(gUnknown_0203CE58.cursorPosition, 0, 10); - memset(gUnknown_0203CE58.scrollPosition, 0, 10); + gBagPositionStruct.pocket = ITEMS_POCKET; + memset(gBagPositionStruct.cursorPosition, 0, 10); + memset(gBagPositionStruct.scrollPosition, 0, 10); } void CB2_BagMenuFromStartMenu(void) @@ -513,28 +513,28 @@ void sub_81AAC70(void) void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)()) { u8 temp; - gUnknown_0203CE54 = AllocZeroed(sizeof(struct UnkBagStruct)); - if (gUnknown_0203CE54 == 0) + gBagMenu = AllocZeroed(sizeof(struct BagMenuStruct)); + if (gBagMenu == 0) { SetMainCallback2(postExitMenuMainCallback2); } else { if (bagMenuType != RETURN_LOCATION_UNCHANGED) - gUnknown_0203CE58.location = bagMenuType; + gBagPositionStruct.location = bagMenuType; if (postExitMenuMainCallback2) - gUnknown_0203CE58.bagCallback = postExitMenuMainCallback2; + gBagPositionStruct.bagCallback = postExitMenuMainCallback2; if (pocketId < POCKETS_COUNT) - gUnknown_0203CE58.pocket = pocketId; - temp = gUnknown_0203CE58.location - (POCKETS_COUNT - 1); + gBagPositionStruct.pocket = pocketId; + temp = gBagPositionStruct.location - (POCKETS_COUNT - 1); if (temp <= 1) - gUnknown_0203CE54->unk81B = 1; - gUnknown_0203CE54->mainCallback2 = 0; - gUnknown_0203CE54->unk81A = 0xFF; - gUnknown_0203CE54->unk81E = -1; - gUnknown_0203CE54->unk81F = -1; - memset(gUnknown_0203CE54->spriteId, 0xFF, sizeof(gUnknown_0203CE54->spriteId)); - memset(gUnknown_0203CE54->windowPointers, 0xFF, 10); + gBagMenu->unk81B = 1; + gBagMenu->mainCallback2 = 0; + gBagMenu->unk81A = 0xFF; + gBagMenu->unk81E = -1; + gBagMenu->unk81F = -1; + memset(gBagMenu->spriteId, 0xFF, sizeof(gBagMenu->spriteId)); + memset(gBagMenu->windowPointers, 0xFF, 10); SetMainCallback2(CB2_Bag); } } @@ -557,10 +557,10 @@ void vblank_cb_bag_menu(void) void CB2_Bag(void) { - while(sub_81221EC() != TRUE && setup_bag_menu() != TRUE && sub_81221AC() != TRUE) {}; + while(sub_81221EC() != TRUE && SetupBagMenu() != TRUE && sub_81221AC() != TRUE) {}; } -bool8 setup_bag_menu(void) +bool8 SetupBagMenu(void) { u32 index; u8 taskId; @@ -598,17 +598,17 @@ bool8 setup_bag_menu(void) gMain.state++; break; case 7: - bag_menu_init_bgs(); - gUnknown_0203CE54->unk834 = 0; + BagMenu_InitBGs(); + gBagMenu->unk834 = 0; gMain.state++; break; case 8: - if (!load_bag_menu_graphics()) + if (!LoadBagMenu_Graphics()) break; gMain.state++; break; case 9: - setup_bag_menu_textboxes(); + SetupBagMenu_Textboxes(); gMain.state++; break; case 10: @@ -618,28 +618,28 @@ bool8 setup_bag_menu(void) gMain.state++; break; case 11: - allocate_bag_item_list_buffers(); + AllocateBagItemListBuffers(); gMain.state++; break; case 12: - load_bag_item_list_buffers(gUnknown_0203CE58.pocket); + LoadBagItemListBuffers(gBagPositionStruct.pocket); gMain.state++; break; case 13: - bag_menu_print_pocket_names(gPocketNamesStringsTable[gUnknown_0203CE58.pocket], 0); - bag_menu_copy_pocket_name_to_window(0); - bag_menu_draw_pocket_indicator_square(gUnknown_0203CE58.pocket, 1); + BagMenu_PrintPocketNames(gPocketNamesStringsTable[gBagPositionStruct.pocket], 0); + BagMenu_CopyPocketNameToWindow(0); + BagMenu_DrawPocketIndicatorSquare(gBagPositionStruct.pocket, 1); gMain.state++; break; case 14: - taskId = sub_81AB1F0(gUnknown_0203CE58.location); - gTasks[taskId].data[0] = ListMenuInit(&gMultiuseListMenuTemplate, gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); + taskId = sub_81AB1F0(gBagPositionStruct.location); + gTasks[taskId].data[0] = ListMenuInit(&gMultiuseListMenuTemplate, gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket], gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]); gTasks[taskId].data[3] = 0; gTasks[taskId].data[8] = 0; gMain.state++; break; case 15: - AddBagVisualSprite(gUnknown_0203CE58.pocket); + AddBagVisualSprite(gBagPositionStruct.pocket); gMain.state++; break; case 16: @@ -652,7 +652,7 @@ bool8 setup_bag_menu(void) gMain.state++; break; case 18: - bag_menu_prepare_tmhm_move_window(); + BagMenu_PrepareTMHMMoveWindow(); gMain.state++; break; case 19: @@ -672,13 +672,13 @@ bool8 setup_bag_menu(void) return FALSE; } -void bag_menu_init_bgs(void) +void BagMenu_InitBGs(void) { ResetVramOamAndBgCntRegs(); - memset(gUnknown_0203CE54->tilemapBuffer, 0, 0x800); + memset(gBagMenu->tilemapBuffer, 0, 0x800); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sBgTemplates_ItemMenu, 3); - SetBgTilemapBuffer(2, gUnknown_0203CE54->tilemapBuffer); + SetBgTilemapBuffer(2, gBagMenu->tilemapBuffer); ResetAllBgsCoordinates(); schedule_bg_copy_tilemap_to_vram(2); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); @@ -688,20 +688,20 @@ void bag_menu_init_bgs(void) SetGpuReg(REG_OFFSET_BLDCNT, 0); } -bool8 load_bag_menu_graphics(void) +bool8 LoadBagMenu_Graphics(void) { - switch (gUnknown_0203CE54->unk834) + switch (gBagMenu->unk834) { case 0: reset_temp_tile_data_buffers(); decompress_and_copy_tile_data_to_vram(2, gBagScreen_Gfx, 0, 0, 0); - gUnknown_0203CE54->unk834++; + gBagMenu->unk834++; break; case 1: if (free_temp_tile_data_buffers_if_possible() != TRUE) { - LZDecompressWram(gUnknown_08D9A88C, gUnknown_0203CE54->tilemapBuffer); - gUnknown_0203CE54->unk834++; + LZDecompressWram(gBagScreen_GfxTileMap, gBagMenu->tilemapBuffer); + gBagMenu->unk834++; } break; case 2: @@ -709,22 +709,22 @@ bool8 load_bag_menu_graphics(void) LoadCompressedPalette(gBagScreenFemale_Pal, 0, 0x40); else LoadCompressedPalette(gBagScreenMale_Pal, 0, 0x40); - gUnknown_0203CE54->unk834++; + gBagMenu->unk834++; break; case 3: if (IsWallysBag() == TRUE || gSaveBlock2Ptr->playerGender == MALE) - LoadCompressedSpriteSheet(&gUnknown_0857FB34); + LoadCompressedSpriteSheet(&gBagMaleSpriteSheet); else - LoadCompressedSpriteSheet(&gUnknown_0857FB3C); - gUnknown_0203CE54->unk834++; + LoadCompressedSpriteSheet(&gBagFemaleSpriteSheet); + gBagMenu->unk834++; break; case 4: - LoadCompressedSpritePalette(&gUnknown_0857FB44); - gUnknown_0203CE54->unk834++; + LoadCompressedSpritePalette(&gBagPaletteTable); + gBagMenu->unk834++; break; default: LoadListMenuArrowsGfx(); - gUnknown_0203CE54->unk834 = 0; + gBagMenu->unk834 = 0; return TRUE; } return FALSE; @@ -740,23 +740,23 @@ u8 sub_81AB1F0(u8 a) return taskId; } -void allocate_bag_item_list_buffers(void) +void AllocateBagItemListBuffers(void) { sListBuffer1 = Alloc(sizeof(struct ListBuffer1)); sListBuffer2 = Alloc(sizeof(struct ListBuffer2)); } -void load_bag_item_list_buffers(u8 pocketId) +void LoadBagItemListBuffers(u8 pocketId) { u16 i; struct BagPocket *pocket = &gBagPockets[pocketId]; struct ListMenuItem *subBuffer; - if (!gUnknown_0203CE54->hideCloseBagText) + if (!gBagMenu->hideCloseBagText) { - for (i = 0; i < gUnknown_0203CE54->numItemStacks[pocketId] - 1; i++) + for (i = 0; i < gBagMenu->numItemStacks[pocketId] - 1; i++) { - get_name(sListBuffer2->name[i], pocket->itemSlots[i].itemId); + GetItemName(sListBuffer2->name[i], pocket->itemSlots[i].itemId); subBuffer = sListBuffer1->subBuffers; subBuffer[i].name = sListBuffer2->name[i]; subBuffer[i].id = i; @@ -768,23 +768,23 @@ void load_bag_item_list_buffers(u8 pocketId) } else { - for (i = 0; i < gUnknown_0203CE54->numItemStacks[pocketId]; i++) + for (i = 0; i < gBagMenu->numItemStacks[pocketId]; i++) { - get_name(sListBuffer2->name[i], pocket->itemSlots[i].itemId); + GetItemName(sListBuffer2->name[i], pocket->itemSlots[i].itemId); subBuffer = sListBuffer1->subBuffers; subBuffer[i].name = sListBuffer2->name[i]; subBuffer[i].id = i; } } gMultiuseListMenuTemplate = sItemListMenu; - gMultiuseListMenuTemplate.totalItems = gUnknown_0203CE54->numItemStacks[pocketId]; + gMultiuseListMenuTemplate.totalItems = gBagMenu->numItemStacks[pocketId]; gMultiuseListMenuTemplate.items = sListBuffer1->subBuffers; - gMultiuseListMenuTemplate.maxShowed = gUnknown_0203CE54->numShownItems[pocketId]; + gMultiuseListMenuTemplate.maxShowed = gBagMenu->numShownItems[pocketId]; } -void get_name(s8 *dest, u16 itemId) +void GetItemName(s8 *dest, u16 itemId) { - switch (gUnknown_0203CE58.pocket) + switch (gBagPositionStruct.pocket) { case TMHM_POCKET: StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(itemId)]); @@ -810,27 +810,27 @@ void get_name(s8 *dest, u16 itemId) } } -void bag_menu_change_item_callback(s32 a, bool8 b, struct ListMenu *unused) +void BagMenu_MoveCursorCallback(s32 a, bool8 b, struct ListMenu *unused) { if (b != 1) { PlaySE(SE_SELECT); ShakeBagVisual(); } - if (gUnknown_0203CE54->unk81A == 0xFF) + if (gBagMenu->unk81A == 0xFF) { - RemoveBagItemIconSprite(1 ^ gUnknown_0203CE54->unk81B_1); + RemoveBagItemIconSprite(1 ^ gBagMenu->unk81B_1); if (a != -2) - AddBagItemIconSprite(BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, a), gUnknown_0203CE54->unk81B_1); + AddBagItemIconSprite(BagGetItemIdByPocketPosition(gBagPositionStruct.pocket + 1, a), gBagMenu->unk81B_1); else - AddBagItemIconSprite(-1, gUnknown_0203CE54->unk81B_1); - gUnknown_0203CE54->unk81B_1 ^= 1; - if (!gUnknown_0203CE54->unk81B_3) - bag_menu_print_description_box_text(a); + AddBagItemIconSprite(-1, gBagMenu->unk81B_1); + gBagMenu->unk81B_1 ^= 1; + if (!gBagMenu->unk81B_3) + BagMenu_PrintDescription(a); } } -void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a) +void PrintItemQuantityPlusGFX(u8 rboxId, int item_index_in_pocket, u8 a) { u16 itemId; u16 itemQuantity; @@ -838,30 +838,30 @@ void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a) int offset; if (item_index_in_pocket != -2) { - if (gUnknown_0203CE54->unk81A != 0xFF) + if (gBagMenu->unk81A != 0xFF) { - if (gUnknown_0203CE54->unk81A == (u8)item_index_in_pocket) - bag_menu_print_cursor(a, 2); + if (gBagMenu->unk81A == (u8)item_index_in_pocket) + BagMenu_PrintCursor(a, 2); else - bag_menu_print_cursor(a, -1); + BagMenu_PrintCursor(a, -1); } - itemId = BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, item_index_in_pocket); - itemQuantity = BagGetQuantityByPocketPosition(gUnknown_0203CE58.pocket + 1, item_index_in_pocket); + itemId = BagGetItemIdByPocketPosition(gBagPositionStruct.pocket + 1, item_index_in_pocket); + itemQuantity = BagGetQuantityByPocketPosition(gBagPositionStruct.pocket + 1, item_index_in_pocket); if (itemId >= ITEM_HM01 && itemId <= ITEM_HM08) BlitBitmapToWindow(rboxId, gBagMenuHMIcon_Gfx, 8, a - 1, 16, 16); - if (gUnknown_0203CE58.pocket == BERRIES_POCKET) + if (gBagPositionStruct.pocket == BERRIES_POCKET) { ConvertIntToDecimalStringN(gStringVar1, itemQuantity, 1, 3); StringExpandPlaceholders(gStringVar4, gText_xVar1); offset = GetStringRightAlignXOffset(7, gStringVar4, 0x77); - bag_menu_print(rboxId, 7, gStringVar4, offset, a, 0, 0, -1, 0); + BagMenu_Print(rboxId, 7, gStringVar4, offset, a, 0, 0, -1, 0); } - else if (gUnknown_0203CE58.pocket != KEYITEMS_POCKET && (unique = ItemId_GetImportance(itemId)) == FALSE) + else if (gBagPositionStruct.pocket != KEYITEMS_POCKET && (unique = ItemId_GetImportance(itemId)) == FALSE) { ConvertIntToDecimalStringN(gStringVar1, itemQuantity, 1, 2); StringExpandPlaceholders(gStringVar4, gText_xVar1); offset = GetStringRightAlignXOffset(7, gStringVar4, 0x77); - bag_menu_print(rboxId, 7, gStringVar4, offset, a, unique, unique, -1, unique); + BagMenu_Print(rboxId, 7, gStringVar4, offset, a, unique, unique, -1, unique); } else { @@ -871,96 +871,96 @@ void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a) } } -void bag_menu_print_description_box_text(int a) +void BagMenu_PrintDescription(int a) { const u8 *str; if (a != -2) { - str = ItemId_GetDescription(BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, a)); + str = ItemId_GetDescription(BagGetItemIdByPocketPosition(gBagPositionStruct.pocket + 1, a)); } else { - StringCopy(gStringVar1, gReturnToXStringsTable[gUnknown_0203CE58.location]); + StringCopy(gStringVar1, gReturnToXStringsTable[gBagPositionStruct.location]); StringExpandPlaceholders(gStringVar4, gText_ReturnToVar1); str = gStringVar4; } FillWindowPixelBuffer(1, PIXEL_FILL(0)); - bag_menu_print(1, 1, str, 3, 1, 0, 0, 0, 0); + BagMenu_Print(1, 1, str, 3, 1, 0, 0, 0, 0); } -void bag_menu_print_cursor_(u8 a, u8 b) +void BagMenu_PrintCursor_(u8 a, u8 b) { - bag_menu_print_cursor(ListMenuGetYCoordForPrintingArrowCursor(a), b); + BagMenu_PrintCursor(ListMenuGetYCoordForPrintingArrowCursor(a), b); } -void bag_menu_print_cursor(u8 a, u8 b) +void BagMenu_PrintCursor(u8 a, u8 b) { if (b == 0xFF) FillWindowPixelRect(0, PIXEL_FILL(0), 0, a, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else - bag_menu_print(0, 1, gText_SelectorArrow2, 0, a, 0, 0, 0, b); + BagMenu_Print(0, 1, gText_SelectorArrow2, 0, a, 0, 0, 0, b); } void bag_menu_add_pocket_scroll_arrow_indicators_maybe(void) { - if (gUnknown_0203CE54->unk81E == 0xFF) - gUnknown_0203CE54->unk81E = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xAC, 12, 0x94, gUnknown_0203CE54->numItemStacks[gUnknown_0203CE58.pocket] - gUnknown_0203CE54->numShownItems[gUnknown_0203CE58.pocket], 0x6E, 0x6E, &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]); + if (gBagMenu->unk81E == 0xFF) + gBagMenu->unk81E = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xAC, 12, 0x94, gBagMenu->numItemStacks[gBagPositionStruct.pocket] - gBagMenu->numShownItems[gBagPositionStruct.pocket], 0x6E, 0x6E, &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket]); } void sub_81AB824(void) { - if (gUnknown_0203CE54->unk81E != 0xFF) + if (gBagMenu->unk81E != 0xFF) { - RemoveScrollIndicatorArrowPair(gUnknown_0203CE54->unk81E); - gUnknown_0203CE54->unk81E = 0xFF; + RemoveScrollIndicatorArrowPair(gBagMenu->unk81E); + gBagMenu->unk81E = 0xFF; } sub_81AB89C(); } void bag_menu_add_list_scroll_arrow_indicators_maybe(void) { - if (gUnknown_0203CE54->unk81B != 1 && gUnknown_0203CE54->unk81F == 0xFF) - gUnknown_0203CE54->unk81F = AddScrollIndicatorArrowPair(&gUnknown_08614094, &gUnknown_0203CE58.unk6); + if (gBagMenu->unk81B != 1 && gBagMenu->unk81F == 0xFF) + gBagMenu->unk81F = AddScrollIndicatorArrowPair(&gBagScrollArrowsTemplate, &gBagPositionStruct.unk6); } void sub_81AB89C(void) { - if (gUnknown_0203CE54->unk81F != 0xFF) + if (gBagMenu->unk81F != 0xFF) { - RemoveScrollIndicatorArrowPair(gUnknown_0203CE54->unk81F); - gUnknown_0203CE54->unk81F = 0xFF; + RemoveScrollIndicatorArrowPair(gBagMenu->unk81F); + gBagMenu->unk81F = 0xFF; } } -void free_bag_item_list_buffers(void) +void FreeBagItemListBuffers(void) { Free(sListBuffer2); Free(sListBuffer1); FreeAllWindowBuffers(); - Free(gUnknown_0203CE54); + Free(gBagMenu); } void unknown_ItemMenu_Confirm(u8 taskId) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); - gTasks[taskId].func = task_close_bag_menu_2; + gTasks[taskId].func = TaskCloseBagMenu_2; } -void task_close_bag_menu_2(u8 taskId) +void TaskCloseBagMenu_2(u8 taskId) { s16* data = gTasks[taskId].data; if (!gPaletteFade.active) { - DestroyListMenuTask(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); - if (gUnknown_0203CE54->mainCallback2 != 0) - SetMainCallback2(gUnknown_0203CE54->mainCallback2); + DestroyListMenuTask(data[0], &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket], &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]); + if (gBagMenu->mainCallback2 != 0) + SetMainCallback2(gBagMenu->mainCallback2); else - SetMainCallback2(gUnknown_0203CE58.bagCallback); + SetMainCallback2(gBagPositionStruct.bagCallback); sub_81AB824(); ResetSpriteData(); FreeAllSpritePalettes(); - free_bag_item_list_buffers(); + FreeBagItemListBuffers(); DestroyTask(taskId); } } @@ -979,17 +979,17 @@ void sub_81AB9A8(u8 pocketId) CompactItemsInBagPocket(pocket); break; } - gUnknown_0203CE54->numItemStacks[pocketId] = 0; + gBagMenu->numItemStacks[pocketId] = 0; for (i = 0; i < pocket->capacity && pocket->itemSlots[i].itemId; i++) - gUnknown_0203CE54->numItemStacks[pocketId]++; + gBagMenu->numItemStacks[pocketId]++; - if (!gUnknown_0203CE54->hideCloseBagText) - gUnknown_0203CE54->numItemStacks[pocketId]++; + if (!gBagMenu->hideCloseBagText) + gBagMenu->numItemStacks[pocketId]++; - if (gUnknown_0203CE54->numItemStacks[pocketId] > 8) - gUnknown_0203CE54->numShownItems[pocketId] = 8; + if (gBagMenu->numItemStacks[pocketId] > 8) + gBagMenu->numShownItems[pocketId] = 8; else - gUnknown_0203CE54->numShownItems[pocketId] = gUnknown_0203CE54->numItemStacks[pocketId]; + gBagMenu->numShownItems[pocketId] = gBagMenu->numItemStacks[pocketId]; } void sub_81ABA6C(void) @@ -1001,7 +1001,7 @@ void sub_81ABA6C(void) void SetInitialScrollAndCursorPositions(u8 pocketId) { - sub_812225C(&gUnknown_0203CE58.scrollPosition[pocketId], &gUnknown_0203CE58.cursorPosition[pocketId], gUnknown_0203CE54->numShownItems[pocketId], gUnknown_0203CE54->numItemStacks[pocketId]); + sub_812225C(&gBagPositionStruct.scrollPosition[pocketId], &gBagPositionStruct.cursorPosition[pocketId], gBagMenu->numShownItems[pocketId], gBagMenu->numItemStacks[pocketId]); } static void SetPocketListPositions(void) @@ -1015,12 +1015,12 @@ void sub_81ABAE0(void) { u8 i; for (i = 0; i < POCKETS_COUNT; i++) - sub_8122298(&gUnknown_0203CE58.scrollPosition[i], &gUnknown_0203CE58.cursorPosition[i], gUnknown_0203CE54->numShownItems[i], gUnknown_0203CE54->numItemStacks[i], 8); + sub_8122298(&gBagPositionStruct.scrollPosition[i], &gBagPositionStruct.cursorPosition[i], gBagMenu->numShownItems[i], gBagMenu->numItemStacks[i], 8); } u8 GetItemListPosition(u8 pocketId) { - return gUnknown_0203CE58.scrollPosition[pocketId] + gUnknown_0203CE58.cursorPosition[pocketId]; + return gBagPositionStruct.scrollPosition[pocketId] + gBagPositionStruct.cursorPosition[pocketId]; } void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void ( *callback)(u8 taskId)) @@ -1033,16 +1033,16 @@ void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void ( *callback)(u schedule_bg_copy_tilemap_to_vram(1); } -void bag_menu_inits_lists_menu(u8 taskId) +void BagMenu_InitListsMenu(u8 taskId) { s16* data = gTasks[taskId].data; - u16* scrollPos = &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]; - u16* cursorPos = &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]; + u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket]; + u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]; bag_menu_RemoveBagItem_message_window(4); DestroyListMenuTask(data[0], scrollPos, cursorPos); - sub_81AB9A8(gUnknown_0203CE58.pocket); - SetInitialScrollAndCursorPositions(gUnknown_0203CE58.pocket); - load_bag_item_list_buffers(gUnknown_0203CE58.pocket); + sub_81AB9A8(gBagPositionStruct.pocket); + SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket); + LoadBagItemListBuffers(gBagPositionStruct.pocket); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); schedule_bg_copy_tilemap_to_vram(0); set_callback3_to_bag(taskId); @@ -1050,12 +1050,12 @@ void bag_menu_inits_lists_menu(u8 taskId) void sub_81ABC3C(u8 a) { - sub_81ABC54(bag_menu_add_window(a), 1); + sub_81ABC54(BagMenu_AddWindow(a), 1); } void sub_81ABC54(u8 a, s16 b) { - u8 r3 = (gUnknown_0203CE58.pocket == BERRIES_POCKET) ? 3 : 2; + u8 r3 = (gBagPositionStruct.pocket == BERRIES_POCKET) ? 3 : 2; ConvertIntToDecimalStringN(gStringVar1, b, 2, r3); StringExpandPlaceholders(gStringVar4, gText_xVar1); AddTextPrinterParameterized(a, 1, gStringVar4, GetStringCenterAlignXOffset(1, gStringVar4, 0x28), 2, 0, 0); @@ -1063,7 +1063,7 @@ void sub_81ABC54(u8 a, s16 b) void sub_81ABCC0(int a, int b, int c) { - u8 r3 = (gUnknown_0203CE58.pocket == BERRIES_POCKET) ? 3 : 2; + u8 r3 = (gBagPositionStruct.pocket == BERRIES_POCKET) ? 3 : 2; ConvertIntToDecimalStringN(gStringVar1, b, 2, r3); StringExpandPlaceholders(gStringVar4, gText_xVar1); AddTextPrinterParameterized(a, 1, gStringVar4, 0, 1, -1, 0); @@ -1073,8 +1073,8 @@ void sub_81ABCC0(int a, int b, int c) void Task_BagMenu(u8 taskId) { s16* data = gTasks[taskId].data; - u16* scrollPos = &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]; - u16* cursorPos = &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]; + u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket]; + u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]; u16 select; if (sub_81221EC() != TRUE && !gPaletteFade.active) { @@ -1092,10 +1092,10 @@ void Task_BagMenu(u8 taskId) if (sub_81AC2C0() == 1) { ListMenuGetScrollAndRow(data[0], scrollPos, cursorPos); - if ((*scrollPos + *cursorPos) != gUnknown_0203CE54->numItemStacks[gUnknown_0203CE58.pocket] - 1) + if ((*scrollPos + *cursorPos) != gBagMenu->numItemStacks[gBagPositionStruct.pocket] - 1) { PlaySE(SE_SELECT); - bag_menu_swap_items(taskId); + BagMenu_SwapItems(taskId); } } return; @@ -1109,7 +1109,7 @@ void Task_BagMenu(u8 taskId) case LIST_NOTHING_CHOSEN: break; case LIST_CANCEL: - if (gUnknown_0203CE58.location == 5) + if (gBagPositionStruct.location == 5) { PlaySE(SE_HAZURE); break; @@ -1121,11 +1121,11 @@ void Task_BagMenu(u8 taskId) default: // A_BUTTON PlaySE(SE_SELECT); sub_81AB824(); - bag_menu_print_cursor_(data[0], 2); + BagMenu_PrintCursor_(data[0], 2); data[1] = listPosition; - data[2] = BagGetQuantityByPocketPosition(gUnknown_0203CE58.pocket + 1, listPosition); - gSpecialVar_ItemId = BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, listPosition); - gUnknown_08614054[gUnknown_0203CE58.location](taskId); + data[2] = BagGetQuantityByPocketPosition(gBagPositionStruct.pocket + 1, listPosition); + gSpecialVar_ItemId = BagGetItemIdByPocketPosition(gBagPositionStruct.pocket + 1, listPosition); + gUnknown_08614054[gBagPositionStruct.location](taskId); break; } } @@ -1146,7 +1146,7 @@ void set_callback3_to_bag(u8 taskId) u8 GetSwitchBagPocketDirection(void) { u8 LRKeys; - if (gUnknown_0203CE54->unk81B != 0) + if (gBagMenu->unk81B != 0) return 0; LRKeys = GetLRKeysState(); if ((gMain.newKeys & DPAD_LEFT) || LRKeys == 1) @@ -1184,25 +1184,25 @@ void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, u16 a3) { ClearWindowTilemap(0); ClearWindowTilemap(1); - DestroyListMenuTask(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); + DestroyListMenuTask(data[0], &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket], &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]); schedule_bg_copy_tilemap_to_vram(0); - gSprites[gUnknown_0203CE54->spriteId[2 + (gUnknown_0203CE54->unk81B_1 ^ 1)]].invisible = TRUE; + gSprites[gBagMenu->spriteId[2 + (gBagMenu->unk81B_1 ^ 1)]].invisible = TRUE; sub_81AB824(); } - pocketId = gUnknown_0203CE58.pocket; + pocketId = gBagPositionStruct.pocket; ChangeBagPocketId(&pocketId, deltaBagPocketId); if (deltaBagPocketId == 1) { - bag_menu_print_pocket_names(gPocketNamesStringsTable[gUnknown_0203CE58.pocket], gPocketNamesStringsTable[pocketId]); - bag_menu_copy_pocket_name_to_window(0); + BagMenu_PrintPocketNames(gPocketNamesStringsTable[gBagPositionStruct.pocket], gPocketNamesStringsTable[pocketId]); + BagMenu_CopyPocketNameToWindow(0); } else { - bag_menu_print_pocket_names(gPocketNamesStringsTable[pocketId], gPocketNamesStringsTable[gUnknown_0203CE58.pocket]); - bag_menu_copy_pocket_name_to_window(8); + BagMenu_PrintPocketNames(gPocketNamesStringsTable[pocketId], gPocketNamesStringsTable[gBagPositionStruct.pocket]); + BagMenu_CopyPocketNameToWindow(8); } - bag_menu_draw_pocket_indicator_square(gUnknown_0203CE58.pocket, 0); - bag_menu_draw_pocket_indicator_square(pocketId, 1); + BagMenu_DrawPocketIndicatorSquare(gBagPositionStruct.pocket, 0); + BagMenu_DrawPocketIndicatorSquare(pocketId, 1); FillBgTilemapBufferRect_Palette0(2, 11, 14, 2, 15, 16); schedule_bg_copy_tilemap_to_vram(2); SetBagVisualPocketId(pocketId, 1); @@ -1220,12 +1220,12 @@ void sub_81AC10C(u8 taskId) switch (GetSwitchBagPocketDirection()) { case 1: - ChangeBagPocketId(&gUnknown_0203CE58.pocket, data[11]); + ChangeBagPocketId(&gBagPositionStruct.pocket, data[11]); SwitchTaskToFollowupFunc(taskId); SwitchBagPocket(taskId, -1, 1); return; case 2: - ChangeBagPocketId(&gUnknown_0203CE58.pocket, data[11]); + ChangeBagPocketId(&gBagPositionStruct.pocket, data[11]); SwitchTaskToFollowupFunc(taskId); SwitchBagPocket(taskId, 1, 1); return; @@ -1238,17 +1238,17 @@ void sub_81AC10C(u8 taskId) if (!(++data[12] & 1)) { if (data[11] == 1) - bag_menu_copy_pocket_name_to_window((u8)(data[12] >> 1)); + BagMenu_CopyPocketNameToWindow((u8)(data[12] >> 1)); else - bag_menu_copy_pocket_name_to_window((u8)(8 - (data[12] >> 1))); + BagMenu_CopyPocketNameToWindow((u8)(8 - (data[12] >> 1))); } if (data[12] == 16) data[13]++; break; case 1: - ChangeBagPocketId(&gUnknown_0203CE58.pocket, data[11]); - load_bag_item_list_buffers(gUnknown_0203CE58.pocket); - data[0] = ListMenuInit(&gMultiuseListMenuTemplate, gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); + ChangeBagPocketId(&gBagPositionStruct.pocket, data[11]); + LoadBagItemListBuffers(gBagPositionStruct.pocket); + data[0] = ListMenuInit(&gMultiuseListMenuTemplate, gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket], gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]); PutWindowTilemap(1); PutWindowTilemap(2); schedule_bg_copy_tilemap_to_vram(0); @@ -1264,7 +1264,7 @@ void sub_81AC23C(u8 a) schedule_bg_copy_tilemap_to_vram(2); } -void bag_menu_draw_pocket_indicator_square(u8 x, u8 is_current_bag) +void BagMenu_DrawPocketIndicatorSquare(u8 x, u8 is_current_bag) { if (is_current_bag == 0) FillBgTilemapBufferRect_Palette0(2, 0x1017, x + 5, 3, 1, 1); @@ -1275,29 +1275,29 @@ void bag_menu_draw_pocket_indicator_square(u8 x, u8 is_current_bag) bool8 sub_81AC2C0(void) { - if (gUnknown_0203CE58.location <= 1) + if (gBagPositionStruct.location <= 1) { - u8 temp = gUnknown_0203CE58.pocket - 2; + u8 temp = gBagPositionStruct.pocket - 2; if (temp > 1) return TRUE; } return FALSE; } -void bag_menu_swap_items(u8 taskId) +void BagMenu_SwapItems(u8 taskId) { s16* data = gTasks[taskId].data; ListMenuSetUnkIndicatorsStructField(data[0], 16, 1); - data[1] = gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket] + gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]; - gUnknown_0203CE54->unk81A = data[1]; - CopyItemName(BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, data[1]), gStringVar1); + data[1] = gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket] + gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]; + gBagMenu->unk81A = data[1]; + CopyItemName(BagGetItemIdByPocketPosition(gBagPositionStruct.pocket + 1, data[1]), gStringVar1); StringExpandPlaceholders(gStringVar4, gText_MoveVar1Where); FillWindowPixelBuffer(1, PIXEL_FILL(0)); - bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); + BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); sub_80D4FEC(data[1]); sub_81AB89C(); - bag_menu_print_cursor_(data[0], 2); + BagMenu_PrintCursor_(data[0], 2); gTasks[taskId].func = sub_81AC3C0; } @@ -1311,15 +1311,15 @@ void sub_81AC3C0(u8 taskId) if (gMain.newKeys & SELECT_BUTTON) { PlaySE(SE_SELECT); - ListMenuGetScrollAndRow(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); + ListMenuGetScrollAndRow(data[0], &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket], &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]); sub_81AC498(taskId); } else { input = ListMenu_ProcessInput(data[0]); - ListMenuGetScrollAndRow(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); + ListMenuGetScrollAndRow(data[0], &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket], &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]); sub_80D4FC8(0); - sub_80D4FEC(gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); + sub_80D4FEC(gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]); switch (input) { case LIST_NOTHING_CHOSEN: @@ -1342,20 +1342,20 @@ void sub_81AC3C0(u8 taskId) void sub_81AC498(u8 taskId) { s16* data = gTasks[taskId].data; - u16* scrollPos = &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]; - u16* cursorPos = &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]; + u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket]; + u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]; u16 realPos = (*scrollPos + *cursorPos); if (data[1] == realPos || data[1] == (realPos - 1)) sub_81AC590(taskId); else { - MoveItemSlotInList(gBagPockets[gUnknown_0203CE58.pocket].itemSlots, data[1], realPos); - gUnknown_0203CE54->unk81A = -1; + MoveItemSlotInList(gBagPockets[gBagPositionStruct.pocket].itemSlots, data[1], realPos); + gBagMenu->unk81A = -1; DestroyListMenuTask(data[0], scrollPos, cursorPos); if (data[1] < realPos) - gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]--; - load_bag_item_list_buffers(gUnknown_0203CE58.pocket); + gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]--; + LoadBagItemListBuffers(gBagPositionStruct.pocket); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); sub_80D4FC8(1); bag_menu_add_list_scroll_arrow_indicators_maybe(); @@ -1366,14 +1366,14 @@ void sub_81AC498(u8 taskId) void sub_81AC590(u8 taskId) { s16* data = gTasks[taskId].data; - u16* scrollPos = &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]; - u16* cursorPos = &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]; + u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket]; + u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]; - gUnknown_0203CE54->unk81A = -1; + gBagMenu->unk81A = -1; DestroyListMenuTask(data[0], scrollPos, cursorPos); if (data[1] < (*scrollPos + *cursorPos)) - gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]--; - load_bag_item_list_buffers(gUnknown_0203CE58.pocket); + gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]--; + LoadBagItemListBuffers(gBagPositionStruct.pocket); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); sub_80D4FC8(1); bag_menu_add_list_scroll_arrow_indicators_maybe(); @@ -1382,59 +1382,59 @@ void sub_81AC590(u8 taskId) void sub_81AC644(u8 unused) { - switch (gUnknown_0203CE58.location - 1) + switch (gBagPositionStruct.location - 1) { case 0: case 9: if (ItemId_GetBattleUsage(gSpecialVar_ItemId)) { - gUnknown_0203CE54->unk820 = gUnknown_08614042; - gUnknown_0203CE54->unk828 = 2; + gBagMenu->unk820 = gUnknown_08614042; + gBagMenu->unk828 = 2; } else { - gUnknown_0203CE54->unk820 = &gUnknown_08614046; - gUnknown_0203CE54->unk828 = 1; + gBagMenu->unk820 = &gUnknown_08614046; + gBagMenu->unk828 = 1; } break; case 4: - gUnknown_0203CE54->unk820 = gUnknown_08614047; - gUnknown_0203CE54->unk828 = 4; + gBagMenu->unk820 = gUnknown_08614047; + gBagMenu->unk828 = 4; break; case 8: if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY) { - gUnknown_0203CE54->unk820 = gUnknown_0861404B; - gUnknown_0203CE54->unk828 = 2; + gBagMenu->unk820 = gUnknown_0861404B; + gBagMenu->unk828 = 2; } else { - gUnknown_0203CE54->unk820 = &gUnknown_08614046; - gUnknown_0203CE54->unk828 = 1; + gBagMenu->unk820 = &gUnknown_08614046; + gBagMenu->unk828 = 1; } break; case 6: if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY) { - gUnknown_0203CE54->unk820 = gUnknown_0861404D; - gUnknown_0203CE54->unk828 = 2; + gBagMenu->unk820 = gUnknown_0861404D; + gBagMenu->unk828 = 2; } else { - gUnknown_0203CE54->unk820 = &gUnknown_08614046; - gUnknown_0203CE54->unk828 = 1; + gBagMenu->unk820 = &gUnknown_08614046; + gBagMenu->unk828 = 1; } break; case 7: if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY) { - gUnknown_0203CE54->unk820 = gUnknown_0861404F; - gUnknown_0203CE54->unk828 = 2; + gBagMenu->unk820 = gUnknown_0861404F; + gBagMenu->unk828 = 2; } else { - gUnknown_0203CE54->unk820 = &gUnknown_08614046; - gUnknown_0203CE54->unk828 = 1; + gBagMenu->unk820 = &gUnknown_08614046; + gBagMenu->unk828 = 1; } break; case 1: @@ -1444,56 +1444,56 @@ void sub_81AC644(u8 unused) default: if (sub_81221AC() == TRUE || InUnionRoom() == TRUE) { - if (gUnknown_0203CE58.pocket == KEYITEMS_POCKET || !sub_8122148(gSpecialVar_ItemId)) + if (gBagPositionStruct.pocket == KEYITEMS_POCKET || !sub_8122148(gSpecialVar_ItemId)) { - gUnknown_0203CE54->unk820 = &gUnknown_08614046; - gUnknown_0203CE54->unk828 = 1; + gBagMenu->unk820 = &gUnknown_08614046; + gBagMenu->unk828 = 1; } else { - gUnknown_0203CE54->unk820 = gUnknown_08614044; - gUnknown_0203CE54->unk828 = 2; + gBagMenu->unk820 = gUnknown_08614044; + gBagMenu->unk828 = 2; } } else { - switch (gUnknown_0203CE58.pocket) + switch (gBagPositionStruct.pocket) { case ITEMS_POCKET: - gUnknown_0203CE54->unk820 = &gUnknown_0203CE54->unk824; - gUnknown_0203CE54->unk828 = 4; - memcpy(&gUnknown_0203CE54->unk824, &gUnknown_0861402C, 4); + gBagMenu->unk820 = &gBagMenu->unk824; + gBagMenu->unk828 = 4; + memcpy(&gBagMenu->unk824, &gUnknown_0861402C, 4); if (ItemIsMail(gSpecialVar_ItemId) == TRUE) - gUnknown_0203CE54->unk824 = 6; + gBagMenu->unk824 = 6; break; case KEYITEMS_POCKET: - gUnknown_0203CE54->unk820 = &gUnknown_0203CE54->unk824; - gUnknown_0203CE54->unk828 = 4; - memcpy(&gUnknown_0203CE54->unk824, &gUnknown_08614030, 4); + gBagMenu->unk820 = &gBagMenu->unk824; + gBagMenu->unk828 = 4; + memcpy(&gBagMenu->unk824, &gUnknown_08614030, 4); if (gSaveBlock1Ptr->registeredItem == gSpecialVar_ItemId) - gUnknown_0203CE54->unk825 = 8; + gBagMenu->unk825 = 8; if (gSpecialVar_ItemId == ITEM_MACH_BIKE || gSpecialVar_ItemId == ITEM_ACRO_BIKE) { if (TestPlayerAvatarFlags(6)) - gUnknown_0203CE54->unk824 = 7; + gBagMenu->unk824 = 7; } break; case BALLS_POCKET: - gUnknown_0203CE54->unk820 = gUnknown_08614034; - gUnknown_0203CE54->unk828 = 4; + gBagMenu->unk820 = gUnknown_08614034; + gBagMenu->unk828 = 4; break; case TMHM_POCKET: - gUnknown_0203CE54->unk820 = gUnknown_08614038; - gUnknown_0203CE54->unk828 = 4; + gBagMenu->unk820 = gUnknown_08614038; + gBagMenu->unk828 = 4; break; case BERRIES_POCKET: - gUnknown_0203CE54->unk820 = gUnknown_0861403C; - gUnknown_0203CE54->unk828 = 6; + gBagMenu->unk820 = gUnknown_0861403C; + gBagMenu->unk828 = 6; break; } } } - if (gUnknown_0203CE58.pocket == TMHM_POCKET) + if (gBagPositionStruct.pocket == TMHM_POCKET) { ClearWindowTilemap(1); PrintTMHMMoveData(gSpecialVar_ItemId); @@ -1506,34 +1506,34 @@ void sub_81AC644(u8 unused) CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); FillWindowPixelBuffer(1, PIXEL_FILL(0)); - bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); + BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); } - if (gUnknown_0203CE54->unk828 == 1) - sub_81ACAF8(bag_menu_add_window(0)); - else if (gUnknown_0203CE54->unk828 == 2) - sub_81ACAF8(bag_menu_add_window(1)); - else if (gUnknown_0203CE54->unk828 == 4) - sub_81ACB54(bag_menu_add_window(2), 2, 2); + if (gBagMenu->unk828 == 1) + sub_81ACAF8(BagMenu_AddWindow(0)); + else if (gBagMenu->unk828 == 2) + sub_81ACAF8(BagMenu_AddWindow(1)); + else if (gBagMenu->unk828 == 4) + sub_81ACB54(BagMenu_AddWindow(2), 2, 2); else - sub_81ACB54(bag_menu_add_window(3), 2, 3); + sub_81ACB54(BagMenu_AddWindow(3), 2, 3); } void sub_81ACAF8(u8 a) { - AddItemMenuActionTextPrinters(a, 7, 8, 1, 0, 16, gUnknown_0203CE54->unk828, gUnknown_08613FB4, gUnknown_0203CE54->unk820); - InitMenuInUpperLeftCornerPlaySoundWhenAPressed(a, gUnknown_0203CE54->unk828, 0); + AddItemMenuActionTextPrinters(a, 7, 8, 1, 0, 16, gBagMenu->unk828, sItemMenuActions, gBagMenu->unk820); + InitMenuInUpperLeftCornerPlaySoundWhenAPressed(a, gBagMenu->unk828, 0); } void sub_81ACB54(u8 a, u8 b, u8 c) { - sub_8198DBC(a, 7, 8, 1, 0x38, b, c, gUnknown_08613FB4, gUnknown_0203CE54->unk820); + sub_8198DBC(a, 7, 8, 1, 0x38, b, c, sItemMenuActions, gBagMenu->unk820); sub_8199944(a, 0x38, b, c, 0); } void unknown_item_menu_type(u8 taskId) { sub_81AC644(taskId); - if (gUnknown_0203CE54->unk828 <= 2) + if (gBagMenu->unk828 <= 2) gTasks[taskId].func = Task_HandleInBattleItemMenuInput; else gTasks[taskId].func = Task_HandleOutOfBattleItemMenuInput; @@ -1550,11 +1550,11 @@ void Task_HandleInBattleItemMenuInput(u8 taskId) break; case MENU_B_PRESSED: PlaySE(SE_SELECT); - gUnknown_08613FB4[4].func.void_u8(taskId); + sItemMenuActions[4].func.void_u8(taskId); break; default: PlaySE(SE_SELECT); - gUnknown_08613FB4[gUnknown_0203CE54->unk820[r4]].func.void_u8(taskId); + sItemMenuActions[gBagMenu->unk820[r4]].func.void_u8(taskId); break; } } @@ -1575,7 +1575,7 @@ void Task_HandleOutOfBattleItemMenuInput(u8 taskId) } else if (gMain.newKeys & DPAD_DOWN) { - if (cursorPos < (gUnknown_0203CE54->unk828 - 2) && sub_81ACDFC(cursorPos + 2)) + if (cursorPos < (gBagMenu->unk828 - 2) && sub_81ACDFC(cursorPos + 2)) { PlaySE(SE_SELECT); sub_8199134(0, 1); @@ -1600,12 +1600,12 @@ void Task_HandleOutOfBattleItemMenuInput(u8 taskId) else if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - gUnknown_08613FB4[gUnknown_0203CE54->unk820[cursorPos]].func.void_u8(taskId); + sItemMenuActions[gBagMenu->unk820[cursorPos]].func.void_u8(taskId); } else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - gUnknown_08613FB4[4].func.void_u8(taskId); + sItemMenuActions[4].func.void_u8(taskId); } } } @@ -1614,41 +1614,41 @@ bool8 sub_81ACDFC(s8 a) { if (a < 0) return FALSE; - if (a > gUnknown_0203CE54->unk828) + if (a > gBagMenu->unk828) return FALSE; - if (gUnknown_0203CE54->unk820[a] == 14) + if (gBagMenu->unk820[a] == 14) return FALSE; return TRUE; } -void bag_menu_remove_some_window(void) +void BagMenu_RemoveSomeWindow(void) { - if (gUnknown_0203CE54->unk828 == 1) - bag_menu_remove_window(0); - else if (gUnknown_0203CE54->unk828 == 2) + if (gBagMenu->unk828 == 1) + BagMenu_RemoveWindow(0); + else if (gBagMenu->unk828 == 2) { - bag_menu_remove_window(1); + BagMenu_RemoveWindow(1); } - else if (gUnknown_0203CE54->unk828 == 4) + else if (gBagMenu->unk828 == 4) { - bag_menu_remove_window(2); + BagMenu_RemoveWindow(2); } else - bag_menu_remove_window(3); + BagMenu_RemoveWindow(3); } void ItemMenu_UseOutOfBattle(u8 taskId) { if (ItemId_GetFieldFunc(gSpecialVar_ItemId)) { - bag_menu_remove_some_window(); + BagMenu_RemoveSomeWindow(); if (CalculatePlayerPartyCount() == 0 && ItemId_GetType(gSpecialVar_ItemId) == 1) - bag_menu_print_there_is_no_pokemon(taskId); + BagMenu_PrintThereIsNoPokemon(taskId); else { FillWindowPixelBuffer(1, PIXEL_FILL(0)); schedule_bg_copy_tilemap_to_vram(0); - if (gUnknown_0203CE58.pocket != BERRIES_POCKET) + if (gBagPositionStruct.pocket != BERRIES_POCKET) ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId); else sub_80FDD10(taskId); @@ -1660,24 +1660,24 @@ void ItemMenu_Toss(u8 taskId) { s16* data = gTasks[taskId].data; - bag_menu_remove_some_window(); + BagMenu_RemoveSomeWindow(); data[8] = 1; if (data[2] == 1) { - BagMenuConfirmToss(taskId); + BagMenu_TossItems(taskId); } else { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_TossHowManyVar1s); FillWindowPixelBuffer(1, PIXEL_FILL(0)); - bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); + BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); sub_81ABC3C(7); gTasks[taskId].func = Task_ChooseHowManyToToss; } } -void BagMenuConfirmToss(u8 taskId) +void BagMenu_TossItems(u8 taskId) { s16* data = gTasks[taskId].data; @@ -1685,16 +1685,16 @@ void BagMenuConfirmToss(u8 taskId) ConvertIntToDecimalStringN(gStringVar2, data[8], 0, 3); StringExpandPlaceholders(gStringVar4, gText_ConfirmTossItems); FillWindowPixelBuffer(1, PIXEL_FILL(0)); - bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); - bag_menu_yes_no(taskId, 5, &gUnknown_08614084); + BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); + BagMenu_YesNo(taskId, 5, &sYesNoTossFunctions); } -void BagMenuCancelToss(u8 taskId) +void BagMenu_CancelToss(u8 taskId) { s16* data = gTasks[taskId].data; - bag_menu_print_description_box_text(data[1]); - bag_menu_print_cursor_(data[0], 0); + BagMenu_PrintDescription(data[1]); + BagMenu_PrintCursor_(data[0], 0); set_callback3_to_bag(taskId); } @@ -1704,23 +1704,23 @@ void Task_ChooseHowManyToToss(u8 taskId) if (AdjustQuantityAccordingToDPadInput(&data[8], data[2]) == TRUE) { - sub_81ABC54(gUnknown_0203CE54->unk817, data[8]); + sub_81ABC54(gBagMenu->unk817, data[8]); } else if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - bag_menu_remove_window(7); - BagMenuConfirmToss(taskId); + BagMenu_RemoveWindow(7); + BagMenu_TossItems(taskId); } else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - bag_menu_remove_window(7); - BagMenuCancelToss(taskId); + BagMenu_RemoveWindow(7); + BagMenu_CancelToss(taskId); } } -void BagMenuActuallyToss(u8 taskId) +void BagMenu_ConfirmToss(u8 taskId) { s16* data = gTasks[taskId].data; @@ -1728,24 +1728,24 @@ void BagMenuActuallyToss(u8 taskId) ConvertIntToDecimalStringN(gStringVar2, data[8], 0, 3); StringExpandPlaceholders(gStringVar4, gText_ThrewAwayVar2Var1s); FillWindowPixelBuffer(1, PIXEL_FILL(0)); - bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); + BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); gTasks[taskId].func = Task_ActuallyToss; } void Task_ActuallyToss(u8 taskId) { s16* data = gTasks[taskId].data; - u16* scrollPos = &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]; - u16* cursorPos = &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]; + u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket]; + u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]; if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { PlaySE(SE_SELECT); RemoveBagItem(gSpecialVar_ItemId, data[8]); DestroyListMenuTask(data[0], scrollPos, cursorPos); - sub_81AB9A8(gUnknown_0203CE58.pocket); - SetInitialScrollAndCursorPositions(gUnknown_0203CE58.pocket); - load_bag_item_list_buffers(gUnknown_0203CE58.pocket); + sub_81AB9A8(gBagPositionStruct.pocket); + SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket); + LoadBagItemListBuffers(gBagPositionStruct.pocket); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); schedule_bg_copy_tilemap_to_vram(0); set_callback3_to_bag(taskId); @@ -1755,15 +1755,15 @@ void Task_ActuallyToss(u8 taskId) void ItemMenu_Register(u8 taskId) { s16* data = gTasks[taskId].data; - u16* scrollPos = &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]; - u16* cursorPos = &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]; + u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket]; + u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]; if (gSaveBlock1Ptr->registeredItem == gSpecialVar_ItemId) gSaveBlock1Ptr->registeredItem = 0; else gSaveBlock1Ptr->registeredItem = gSpecialVar_ItemId; DestroyListMenuTask(data[0], scrollPos, cursorPos); - load_bag_item_list_buffers(gUnknown_0203CE58.pocket); + LoadBagItemListBuffers(gBagPositionStruct.pocket); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); schedule_bg_copy_tilemap_to_vram(0); ItemMenu_Cancel(taskId); @@ -1771,7 +1771,7 @@ void ItemMenu_Register(u8 taskId) void ItemMenu_Give(u8 taskId) { - bag_menu_remove_some_window(); + BagMenu_RemoveSomeWindow(); if (!itemid_80BF6D8_mail_related(gSpecialVar_ItemId)) { DisplayItemMessage(taskId, 1, gText_CantWriteMail, sub_81AD350); @@ -1779,25 +1779,25 @@ void ItemMenu_Give(u8 taskId) else if (!ItemId_GetImportance(gSpecialVar_ItemId)) { if (CalculatePlayerPartyCount() == 0) - bag_menu_print_there_is_no_pokemon(taskId); + BagMenu_PrintThereIsNoPokemon(taskId); else { - gUnknown_0203CE54->mainCallback2 = sub_81B7F60; + gBagMenu->mainCallback2 = sub_81B7F60; unknown_ItemMenu_Confirm(taskId); } } else { - bag_menu_print_cant_be_held_msg(taskId); + BagMenu_PrintItemCantBeHeld(taskId); } } -void bag_menu_print_there_is_no_pokemon(u8 taskId) +void BagMenu_PrintThereIsNoPokemon(u8 taskId) { DisplayItemMessage(taskId, 1, gText_NoPokemon, sub_81AD350); } -void bag_menu_print_cant_be_held_msg(u8 taskId) +void BagMenu_PrintItemCantBeHeld(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_Var1CantBeHeld); @@ -1809,13 +1809,13 @@ void sub_81AD350(u8 taskId) if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - bag_menu_inits_lists_menu(taskId); + BagMenu_InitListsMenu(taskId); } } void ItemMenu_CheckTag(u8 taskId) { - gUnknown_0203CE54->mainCallback2 = DoBerryTagScreen; + gBagMenu->mainCallback2 = DoBerryTagScreen; unknown_ItemMenu_Confirm(taskId); } @@ -1823,11 +1823,11 @@ void ItemMenu_Cancel(u8 taskId) { s16* data = gTasks[taskId].data; - bag_menu_remove_some_window(); - bag_menu_print_description_box_text(data[1]); + BagMenu_RemoveSomeWindow(); + BagMenu_PrintDescription(data[1]); schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(1); - bag_menu_print_cursor_(data[0], 0); + BagMenu_PrintCursor_(data[0], 0); set_callback3_to_bag(taskId); } @@ -1835,7 +1835,7 @@ void ItemMenu_UseInBattle(u8 taskId) { if (ItemId_GetBattleFunc(gSpecialVar_ItemId)) { - bag_menu_remove_some_window(); + BagMenu_RemoveSomeWindow(); ItemId_GetBattleFunc(gSpecialVar_ItemId)(taskId); } } @@ -1857,13 +1857,13 @@ void item_menu_type_2(u8 taskId) StringExpandPlaceholders(gStringVar4, gText_Var1CantBeHeldHere); DisplayItemMessage(taskId, 1, gStringVar4, sub_81AD350); } - else if (gUnknown_0203CE58.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId)) + else if (gBagPositionStruct.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId)) { unknown_ItemMenu_Confirm(taskId); } else { - bag_menu_print_cant_be_held_msg(taskId); + BagMenu_PrintItemCantBeHeld(taskId); } } @@ -1871,10 +1871,10 @@ void item_menu_type_b(u8 taskId) { if (ItemIsMail(gSpecialVar_ItemId) == TRUE) DisplayItemMessage(taskId, 1, gText_CantWriteMail, sub_81AD350); - else if (gUnknown_0203CE58.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId)) + else if (gBagPositionStruct.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId)) gTasks[taskId].func = unknown_ItemMenu_Confirm; else - bag_menu_print_cant_be_held_msg(taskId); + BagMenu_PrintItemCantBeHeld(taskId); } bool8 UseRegisteredKeyItemOnField(void) @@ -1905,7 +1905,7 @@ bool8 UseRegisteredKeyItemOnField(void) return TRUE; } -void display_sell_item_ask_str(u8 taskId) +void DisplaySellItemAskString(u8 taskId) { s16* data = gTasks[taskId].data; @@ -1913,7 +1913,7 @@ void display_sell_item_ask_str(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar2); StringExpandPlaceholders(gStringVar4, gText_CantBuyKeyItem); - DisplayItemMessage(taskId, 1, gStringVar4, bag_menu_inits_lists_menu); + DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu); } else { @@ -1943,23 +1943,23 @@ void sub_81AD680(u8 taskId) void sub_81AD6E4(u8 taskId) { - bag_menu_yes_no(taskId, 6, &gUnknown_0861408C); + BagMenu_YesNo(taskId, 6, &sYesNoSellItemFunctions); } -void sub_81AD6FC(u8 taskId) +void BagMenu_CancelSell(u8 taskId) { s16* data = gTasks[taskId].data; bag_menu_remove_money_window(); bag_menu_RemoveBagItem_message_window(4); - bag_menu_print_cursor_(data[0], 0); + BagMenu_PrintCursor_(data[0], 0); set_callback3_to_bag(taskId); } void sub_81AD730(u8 taskId) { s16* data = gTasks[taskId].data; - u8 windowId = bag_menu_add_window(8); + u8 windowId = BagMenu_AddWindow(8); sub_81ABCC0(windowId, 1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8]); bag_menu_AddMoney_window(); @@ -1972,26 +1972,26 @@ void sub_81AD794(u8 taskId) if (AdjustQuantityAccordingToDPadInput(&data[8], data[2]) == TRUE) { - sub_81ABCC0(gUnknown_0203CE54->unk818, data[8], (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8]); + sub_81ABCC0(gBagMenu->unk818, data[8], (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8]); } else if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - bag_menu_remove_window(8); + BagMenu_RemoveWindow(8); sub_81AD680(taskId); } else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - bag_menu_print_cursor_(data[0], 0); + BagMenu_PrintCursor_(data[0], 0); bag_menu_remove_money_window(); - bag_menu_remove_window(8); + BagMenu_RemoveWindow(8); bag_menu_RemoveBagItem_message_window(4); set_callback3_to_bag(taskId); } } -void sub_81AD84C(u8 taskId) +void BagMenu_ConfirmSell(u8 taskId) { s16* data = gTasks[taskId].data; @@ -2004,19 +2004,19 @@ void sub_81AD84C(u8 taskId) void sub_81AD8C8(u8 taskId) { s16* data = gTasks[taskId].data; - u16* scrollPos = &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]; - u16* cursorPos = &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]; + u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket]; + u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]; PlaySE(SE_REGI); RemoveBagItem(gSpecialVar_ItemId, data[8]); AddMoney(&gSaveBlock1Ptr->money, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8]); DestroyListMenuTask(data[0], scrollPos, cursorPos); - sub_81AB9A8(gUnknown_0203CE58.pocket); - SetInitialScrollAndCursorPositions(gUnknown_0203CE58.pocket); - load_bag_item_list_buffers(gUnknown_0203CE58.pocket); + sub_81AB9A8(gBagPositionStruct.pocket); + SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket); + LoadBagItemListBuffers(gBagPositionStruct.pocket); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); - bag_menu_print_cursor_(data[0], 2); - PrintMoneyAmountInMoneyBox(gUnknown_0203CE54->unk819, GetMoney(&gSaveBlock1Ptr->money), 0); + BagMenu_PrintCursor_(data[0], 2); + PrintMoneyAmountInMoneyBox(gBagMenu->unk819, GetMoney(&gSaveBlock1Ptr->money), 0); gTasks[taskId].func = sub_81AD9C0; } @@ -2026,11 +2026,11 @@ void sub_81AD9C0(u8 taskId) { PlaySE(SE_SELECT); bag_menu_remove_money_window(); - bag_menu_inits_lists_menu(taskId); + BagMenu_InitListsMenu(taskId); } } -void display_deposit_item_ask_str(u8 taskId) +void DisplayDepositItemAskString(u8 taskId) { s16* data = gTasks[taskId].data; @@ -2044,7 +2044,7 @@ void display_deposit_item_ask_str(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_DepositHowManyVar1); FillWindowPixelBuffer(1, PIXEL_FILL(0)); - bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); + BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); sub_81ABC3C(7); gTasks[taskId].func = sub_81ADA7C; } @@ -2056,20 +2056,20 @@ void sub_81ADA7C(u8 taskId) if (AdjustQuantityAccordingToDPadInput(&data[8], data[2]) == TRUE) { - sub_81ABC54(gUnknown_0203CE54->unk817, data[8]); + sub_81ABC54(gBagMenu->unk817, data[8]); } else if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - bag_menu_remove_window(7); + BagMenu_RemoveWindow(7); sub_81ADB14(taskId); } else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - bag_menu_print_description_box_text(data[1]); - bag_menu_print_cursor_(data[0], 0); - bag_menu_remove_window(7); + BagMenu_PrintDescription(data[1]); + BagMenu_PrintCursor_(data[0], 0); + BagMenu_RemoveWindow(7); set_callback3_to_bag(taskId); } } @@ -2081,7 +2081,7 @@ void sub_81ADB14(u8 taskId) FillWindowPixelBuffer(1, PIXEL_FILL(0)); if (ItemId_GetImportance(gSpecialVar_ItemId)) { - bag_menu_print(1, 1, gText_CantStoreImportantItems, 3, 1, 0, 0, 0, 0); + BagMenu_Print(1, 1, gText_CantStoreImportantItems, 3, 1, 0, 0, 0, 0); gTasks[taskId].func = sub_81ADC0C; } else if (AddPCItem(gSpecialVar_ItemId, data[8]) == TRUE) @@ -2089,12 +2089,12 @@ void sub_81ADB14(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], 0, 3); StringExpandPlaceholders(gStringVar4, gText_DepositedVar2Var1s); - bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); + BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); gTasks[taskId].func = Task_ActuallyToss; } else { - bag_menu_print(1, 1, gText_NoRoomForItems, 3, 1, 0, 0, 0, 0); + BagMenu_Print(1, 1, gText_NoRoomForItems, 3, 1, 0, 0, 0, 0); gTasks[taskId].func = sub_81ADC0C; } } @@ -2106,15 +2106,15 @@ void sub_81ADC0C(u8 taskId) if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { PlaySE(SE_SELECT); - bag_menu_print_description_box_text(data[1]); - bag_menu_print_cursor_(data[0], 0); + BagMenu_PrintDescription(data[1]); + BagMenu_PrintCursor_(data[0], 0); set_callback3_to_bag(taskId); } } bool8 IsWallysBag(void) { - if (gUnknown_0203CE58.location == 10) + if (gBagPositionStruct.location == 10) return TRUE; return FALSE; } @@ -2126,11 +2126,11 @@ void PrepareBagForWallyTutorial(void) gUnknown_0203CE80 = AllocZeroed(sizeof(struct TempWallyStruct)); memcpy(gUnknown_0203CE80->bagPocket_Items, gSaveBlock1Ptr->bagPocket_Items, sizeof(gSaveBlock1Ptr->bagPocket_Items)); memcpy(gUnknown_0203CE80->bagPocket_PokeBalls, gSaveBlock1Ptr->bagPocket_PokeBalls, sizeof(gSaveBlock1Ptr->bagPocket_PokeBalls)); - gUnknown_0203CE80->pocket = gUnknown_0203CE58.pocket; + gUnknown_0203CE80->pocket = gBagPositionStruct.pocket; for (i = 0; i <= 4; i++) { - gUnknown_0203CE80->cursorPosition[i] = gUnknown_0203CE58.cursorPosition[i]; - gUnknown_0203CE80->scrollPosition[i] = gUnknown_0203CE58.scrollPosition[i]; + gUnknown_0203CE80->cursorPosition[i] = gBagPositionStruct.cursorPosition[i]; + gUnknown_0203CE80->scrollPosition[i] = gBagPositionStruct.scrollPosition[i]; } ClearItemSlots(gSaveBlock1Ptr->bagPocket_Items, 30); ClearItemSlots(gSaveBlock1Ptr->bagPocket_PokeBalls, 16); @@ -2143,11 +2143,11 @@ void RestoreBagAfterWallyTutorial(void) memcpy(gSaveBlock1Ptr->bagPocket_Items, gUnknown_0203CE80->bagPocket_Items, sizeof(gUnknown_0203CE80->bagPocket_Items)); memcpy(gSaveBlock1Ptr->bagPocket_PokeBalls, gUnknown_0203CE80->bagPocket_PokeBalls, sizeof(gUnknown_0203CE80->bagPocket_PokeBalls)); - gUnknown_0203CE58.pocket = gUnknown_0203CE80->pocket; + gBagPositionStruct.pocket = gUnknown_0203CE80->pocket; for (i = 0; i <= 4; i++) { - gUnknown_0203CE58.cursorPosition[i] = gUnknown_0203CE80->cursorPosition[i]; - gUnknown_0203CE58.scrollPosition[i] = gUnknown_0203CE80->scrollPosition[i]; + gBagPositionStruct.cursorPosition[i] = gUnknown_0203CE80->cursorPosition[i]; + gBagPositionStruct.scrollPosition[i] = gUnknown_0203CE80->scrollPosition[i]; } Free(gUnknown_0203CE80); } @@ -2175,14 +2175,14 @@ void Task_WallyTutorialBagMenu(u8 taskId) break; case 0xCC: PlaySE(SE_SELECT); - bag_menu_print_cursor_(data[0], 2); + BagMenu_PrintCursor_(data[0], 2); gSpecialVar_ItemId = ITEM_POKE_BALL; sub_81AC644(taskId); data[8]++; break; case 0x132: PlaySE(SE_SELECT); - bag_menu_remove_some_window(); + BagMenu_RemoveSomeWindow(); DestroyListMenuTask(data[0], 0, 0); RestoreBagAfterWallyTutorial(); unknown_ItemMenu_Confirm(taskId); @@ -2198,7 +2198,7 @@ void unknown_ItemMenu_Show(u8 taskId) { gSpecialVar_0x8005 = gSpecialVar_ItemId; gSpecialVar_Result = 1; - bag_menu_remove_some_window(); + BagMenu_RemoveSomeWindow(); unknown_ItemMenu_Confirm(taskId); } @@ -2212,7 +2212,7 @@ void unknown_ItemMenu_Give2(u8 taskId) { RemoveBagItem(gSpecialVar_ItemId, 1); gSpecialVar_Result = 1; - bag_menu_remove_some_window(); + BagMenu_RemoveSomeWindow(); unknown_ItemMenu_Confirm(taskId); } @@ -2225,7 +2225,7 @@ void bag_menu_leave_maybe_2(void) void unknown_ItemMenu_Confirm2(u8 taskId) { gSpecialVar_Result = 1; - bag_menu_remove_some_window(); + BagMenu_RemoveSomeWindow(); unknown_ItemMenu_Confirm(taskId); } @@ -2235,7 +2235,7 @@ void bag_menu_leave_maybe(void) SetMainCallback2(CB2_ReturnToField); } -void bag_menu_print_pocket_names(const u8 *pocketName1, const u8 *pocketName2) +void BagMenu_PrintPocketNames(const u8 *pocketName1, const u8 *pocketName2) { struct WindowTemplate window = {0, 0, 0, 0, 0, 0, 0}; u16 windowId; @@ -2246,24 +2246,24 @@ void bag_menu_print_pocket_names(const u8 *pocketName1, const u8 *pocketName2) windowId = AddWindow(&window); FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); offset = GetStringCenterAlignXOffset(1, pocketName1, 0x40); - bag_menu_print(windowId, 1, pocketName1, offset, 1, 0, 0, -1, 1); + BagMenu_Print(windowId, 1, pocketName1, offset, 1, 0, 0, -1, 1); if (pocketName2) { offset = GetStringCenterAlignXOffset(1, pocketName2, 0x40); - bag_menu_print(windowId, 1, pocketName2, offset + 0x40, 1, 0, 0, -1, 1); + BagMenu_Print(windowId, 1, pocketName2, offset + 0x40, 1, 0, 0, -1, 1); } - CpuCopy32((u8*)GetWindowAttribute(windowId, WINDOW_TILE_DATA), gUnknown_0203CE54->pocketNameBuffer, 0x400); + CpuCopy32((u8*)GetWindowAttribute(windowId, WINDOW_TILE_DATA), gBagMenu->pocketNameBuffer, 0x400); RemoveWindow(windowId); } -void bag_menu_copy_pocket_name_to_window(u32 a) +void BagMenu_CopyPocketNameToWindow(u32 a) { u8 (* r4)[32][32]; u8* windowAttribute; int b; if (a > 8) a = 8; - r4 = &gUnknown_0203CE54->pocketNameBuffer; + r4 = &gBagMenu->pocketNameBuffer; windowAttribute = (u8*)GetWindowAttribute(2, WINDOW_TILE_DATA); CpuCopy32(r4[0][a], windowAttribute, 0x100); b = a + 16; @@ -2271,7 +2271,7 @@ void bag_menu_copy_pocket_name_to_window(u32 a) CopyWindowToVram(2, 2); } -void setup_bag_menu_textboxes(void) +void SetupBagMenu_Textboxes(void) { u8 i; @@ -2290,19 +2290,19 @@ void setup_bag_menu_textboxes(void) schedule_bg_copy_tilemap_to_vram(1); } -void bag_menu_print(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 h) +void BagMenu_Print(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 h) { AddTextPrinterParameterized4(windowId, fontId, left, top, letterSpacing, lineSpacing, sFontColorTable[h], speed, str); } u8 sub_81AE124(u8 a) { - return gUnknown_0203CE54->windowPointers[a]; + return gBagMenu->windowPointers[a]; } -u8 bag_menu_add_window(u8 a) +u8 BagMenu_AddWindow(u8 a) { - u8 *ptr = &gUnknown_0203CE54->windowPointers[a]; + u8 *ptr = &gBagMenu->windowPointers[a]; if (*ptr == 0xFF) { *ptr = AddWindow(&gUnknown_086141AC[a]); @@ -2312,9 +2312,9 @@ u8 bag_menu_add_window(u8 a) return *ptr; } -void bag_menu_remove_window(u8 a) +void BagMenu_RemoveWindow(u8 a) { - u8 *ptr = &gUnknown_0203CE54->windowPointers[a]; + u8 *ptr = &gBagMenu->windowPointers[a]; if (*ptr != 0xFF) { ClearStdWindowAndFrameToTransparent(*ptr, 0); @@ -2327,7 +2327,7 @@ void bag_menu_remove_window(u8 a) u8 AddItemMessageWindow(u8 a) { - u8 *ptr = &gUnknown_0203CE54->windowPointers[a]; + u8 *ptr = &gBagMenu->windowPointers[a]; if (*ptr == 0xFF) *ptr = AddWindow(&gUnknown_086141AC[a]); return *ptr; @@ -2335,7 +2335,7 @@ u8 AddItemMessageWindow(u8 a) void bag_menu_RemoveBagItem_message_window(u8 a) { - u8 *ptr = &gUnknown_0203CE54->windowPointers[a]; + u8 *ptr = &gBagMenu->windowPointers[a]; if (*ptr != 0xFF) { ClearDialogWindowAndFrameToTransparent(*ptr, FALSE); @@ -2347,25 +2347,25 @@ void bag_menu_RemoveBagItem_message_window(u8 a) } } -void bag_menu_yes_no(u8 a, u8 b, const struct YesNoFuncTable *funcTable) +void BagMenu_YesNo(u8 a, u8 b, const struct YesNoFuncTable *funcTable) { CreateYesNoMenuWithCallbacks(a, &gUnknown_086141AC[b], 1, 0, 2, 1, 14, funcTable); } void bag_menu_AddMoney_window(void) { - u8 windowId = bag_menu_add_window(9); + u8 windowId = BagMenu_AddWindow(9); PrintMoneyAmountInMoneyBoxWithBorder(windowId, 1, 14, GetMoney(&gSaveBlock1Ptr->money)); AddMoneyLabelObject(19, 11); } void bag_menu_remove_money_window(void) { - bag_menu_remove_window(9); + BagMenu_RemoveWindow(9); RemoveMoneyLabelObject(); } -void bag_menu_prepare_tmhm_move_window(void) +void BagMenu_PrepareTMHMMoveWindow(void) { FillWindowPixelBuffer(3, PIXEL_FILL(0)); blit_move_info_icon(3, 19, 0, 0); @@ -2385,7 +2385,7 @@ void PrintTMHMMoveData(u16 itemId) if (itemId == ITEM_NONE) { for (i = 0; i < 4; i++) - bag_menu_print(4, 1, gText_ThreeDashes, 7, i * 12, 0, 0, -1, 4); + BagMenu_Print(4, 1, gText_ThreeDashes, 7, i * 12, 0, 0, -1, 4); CopyWindowToVram(4, 2); } else @@ -2401,7 +2401,7 @@ void PrintTMHMMoveData(u16 itemId) ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveId].power, 1, 3); text = gStringVar1; } - bag_menu_print(4, 1, text, 7, 12, 0, 0, -1, 4); + BagMenu_Print(4, 1, text, 7, 12, 0, 0, -1, 4); if (gBattleMoves[moveId].accuracy == 0) { text = gText_ThreeDashes; @@ -2411,9 +2411,9 @@ void PrintTMHMMoveData(u16 itemId) ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveId].accuracy, 1, 3); text = gStringVar1; } - bag_menu_print(4, 1, text, 7, 24, 0, 0, -1, 4); + BagMenu_Print(4, 1, text, 7, 24, 0, 0, -1, 4); ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveId].pp, 1, 3); - bag_menu_print(4, 1, gStringVar1, 7, 36, 0, 0, -1, 4); + BagMenu_Print(4, 1, gStringVar1, 7, 36, 0, 0, -1, 4); CopyWindowToVram(4, 2); } } diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 6e2783aee..a9a2cc14b 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -24,12 +24,12 @@ static void SpriteCB_SwitchPocketRotatingBallInit(struct Sprite *sprite); static void SpriteCB_SwitchPocketRotatingBallContinue(struct Sprite *sprite); // static const rom data -static const u16 gUnknown_0857F564[] = INCBIN_U16("graphics/interface/bag_spinner.gbapal"); -static const u8 gUnknown_0857F584[] = INCBIN_U8("graphics/interface/bag_spinner.4bpp"); -static const u8 gUnknown_0857F604[] = INCBIN_U8("graphics/unused/cherry.4bpp"); -static const u16 gUnknown_0857FA84[] = INCBIN_U16("graphics/unused/cherry.gbapal"); +static const u16 gRotatingBall_Pal[] = INCBIN_U16("graphics/interface/bag_spinner.gbapal"); +static const u8 gRotatingBall[] = INCBIN_U8("graphics/interface/bag_spinner.4bpp"); +static const u8 gCherryUnused[] = INCBIN_U8("graphics/unused/cherry.4bpp"); +static const u16 gCherryUnused_Pal[] = INCBIN_U16("graphics/unused/cherry.gbapal"); -static const struct OamData sOamData_857FAA4 = +static const struct OamData sBagOamData = { .y = 0, .affineMode = 1, @@ -46,59 +46,59 @@ static const struct OamData sOamData_857FAA4 = .affineParam = 0 }; -static const union AnimCmd sSpriteAnim_857FAAC[] = +static const union AnimCmd sSpriteAnim_Bag_Closed[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_857FAB4[] = +static const union AnimCmd sSpriteAnim_Bag_Items[] = { ANIMCMD_FRAME(64, 4), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_857FABC[] = +static const union AnimCmd sSpriteAnim_Bag_KeyItems[] = { ANIMCMD_FRAME(128, 4), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_857FAC4[] = +static const union AnimCmd sSpriteAnim_Bag_Pokeballs[] = { ANIMCMD_FRAME(192, 4), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_857FACC[] = +static const union AnimCmd sSpriteAnim_Bag_TMsHMs[] = { ANIMCMD_FRAME(256, 4), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_857FAD4[] = +static const union AnimCmd sSpriteAnim_Bag_Berries[] = { ANIMCMD_FRAME(320, 4), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_857FADC[] = +static const union AnimCmd *const sBagSpriteAnimTable[] = { - sSpriteAnim_857FAAC, - sSpriteAnim_857FAB4, - sSpriteAnim_857FAC4, - sSpriteAnim_857FACC, - sSpriteAnim_857FAD4, - sSpriteAnim_857FABC + sSpriteAnim_Bag_Closed, + sSpriteAnim_Bag_Items, + sSpriteAnim_Bag_Pokeballs, + sSpriteAnim_Bag_TMsHMs, + sSpriteAnim_Bag_Berries, + sSpriteAnim_Bag_KeyItems }; -static const union AffineAnimCmd sSpriteAffineAnim_857FAF4[] = +static const union AffineAnimCmd sSpriteAffineAnim_BagNormal[] = { AFFINEANIMCMD_FRAME(256, 256, 0, 0), AFFINEANIMCMD_END }; -static const union AffineAnimCmd sSpriteAffineAnim_857FB04[] = +static const union AffineAnimCmd sSpriteAffineAnim_BagShake[] = { AFFINEANIMCMD_FRAME(0, 0, 254, 2), AFFINEANIMCMD_FRAME(0, 0, 2, 4), @@ -107,39 +107,39 @@ static const union AffineAnimCmd sSpriteAffineAnim_857FB04[] = AFFINEANIMCMD_END }; -static const union AffineAnimCmd *const sSpriteAffineAnimTable_857FB2C[] = +static const union AffineAnimCmd *const sBagAffineAnimCmds[] = { - sSpriteAffineAnim_857FAF4, - sSpriteAffineAnim_857FB04 + sSpriteAffineAnim_BagNormal, + sSpriteAffineAnim_BagShake }; -const struct CompressedSpriteSheet gUnknown_0857FB34 = +const struct CompressedSpriteSheet gBagMaleSpriteSheet = { - gBagMaleTiles, 0x3000, 100 + gBagMaleTiles, 0x3000, TAG_BAG_GFX }; -const struct CompressedSpriteSheet gUnknown_0857FB3C = +const struct CompressedSpriteSheet gBagFemaleSpriteSheet = { - gBagFemaleTiles, 0x3000, 100 + gBagFemaleTiles, 0x3000, TAG_BAG_GFX }; -const struct CompressedSpritePalette gUnknown_0857FB44 = +const struct CompressedSpritePalette gBagPaletteTable = { - gBagPalette, 100 + gBagPalette, TAG_BAG_GFX }; -static const struct SpriteTemplate gUnknown_0857FB4C = +static const struct SpriteTemplate gBagSpriteTemplate = { - .tileTag = 100, - .paletteTag = 100, - .oam = &sOamData_857FAA4, - .anims = sSpriteAnimTable_857FADC, + .tileTag = TAG_BAG_GFX, + .paletteTag = TAG_BAG_GFX, + .oam = &sBagOamData, + .anims = sBagSpriteAnimTable, .images = NULL, - .affineAnims = sSpriteAffineAnimTable_857FB2C, + .affineAnims = sBagAffineAnimCmds, .callback = SpriteCallbackDummy, }; -static const struct OamData sOamData_857FB64 = +static const struct OamData sRotatingBallOamData = { .y = 0, .affineMode = 0, @@ -156,61 +156,61 @@ static const struct OamData sOamData_857FB64 = .affineParam = 0 }; -static const union AnimCmd sSpriteAnim_857FB6C[] = +static const union AnimCmd sSpriteAffineAnim_RotatingBallStationary[] = { ANIMCMD_FRAME(0, 0), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_857FB74[] = +static const union AnimCmd *const sRotatingBallSpriteAnimTable[] = { - sSpriteAnim_857FB6C + sSpriteAffineAnim_RotatingBallStationary }; -static const union AffineAnimCmd sSpriteAffineAnim_857FB78[] = +static const union AffineAnimCmd sSpriteAffineAnim_RotatingBallRotation1[] = { AFFINEANIMCMD_FRAME(0, 0, 8, 16), AFFINEANIMCMD_END }; -static const union AffineAnimCmd sSpriteAffineAnim_857FB88[] = +static const union AffineAnimCmd sSpriteAffineAnim_RotatingBallRotation2[] = { AFFINEANIMCMD_FRAME(0, 0, 248, 16), AFFINEANIMCMD_END }; -static const union AffineAnimCmd *const sSpriteAffineAnimTable_857FB98[] = +static const union AffineAnimCmd *const sRotatingBallAnimCmds[] = { - sSpriteAffineAnim_857FB78, + sSpriteAffineAnim_RotatingBallRotation1, }; -static const union AffineAnimCmd *const sSpriteAffineAnimTable_857FB9C[] = +static const union AffineAnimCmd *const sRotatingBallAnimCmds_FullRotation[] = { - sSpriteAffineAnim_857FB88, + sSpriteAffineAnim_RotatingBallRotation2, }; -static const struct SpriteSheet gUnknown_0857FBA0 = +static const struct SpriteSheet gRotatingBallTable = { - gUnknown_0857F584, 0x80, 101 + gRotatingBall, 0x80, TAG_ROTATING_BALL_GFX }; -static const struct SpritePalette gUnknown_0857FBA8 = +static const struct SpritePalette gRotatingBallPaletteTable = { - gUnknown_0857F564, 101 + gRotatingBall_Pal, TAG_ROTATING_BALL_GFX }; -static const struct SpriteTemplate gSpriteTemplate_RotatingBall = +static const struct SpriteTemplate gRotatingBallSpriteTemplate = { - .tileTag = 101, - .paletteTag = 101, - .oam = &sOamData_857FB64, - .anims = sSpriteAnimTable_857FB74, + .tileTag = TAG_ROTATING_BALL_GFX, + .paletteTag = TAG_ROTATING_BALL_GFX, + .oam = &sRotatingBallOamData, + .anims = sRotatingBallSpriteAnimTable, .images = NULL, - .affineAnims = sSpriteAffineAnimTable_857FB98, + .affineAnims = sRotatingBallAnimCmds, .callback = SpriteCB_SwitchPocketRotatingBallInit, }; -static const struct OamData sOamData_857FBC8 = +static const struct OamData sBerryPicOamData = { .y = 0, .affineMode = 0, @@ -227,7 +227,7 @@ static const struct OamData sOamData_857FBC8 = .affineParam = 0 }; -static const struct OamData sOamData_857FBD0 = +static const struct OamData sBerryPicRotatingOamData = { .y = 0, .affineMode = 3, @@ -250,28 +250,28 @@ static const union AnimCmd sSpriteAnim_857FBD8[] = ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_857FBE0[] = +static const union AnimCmd *const sBerryPicSpriteAnimTable[] = { sSpriteAnim_857FBD8 }; -static const struct SpriteFrameImage sSpriteImageTable_857FBE4[] = +static const struct SpriteFrameImage sBerryPicSpriteImageTable[] = { {&gDecompressionBuffer[0], 0x800}, }; -static const struct SpriteTemplate gUnknown_0857FBEC = +static const struct SpriteTemplate gBerryPicSpriteTemplate = { - .tileTag = 65535, - .paletteTag = 30020, - .oam = &sOamData_857FBC8, - .anims = sSpriteAnimTable_857FBE0, - .images = sSpriteImageTable_857FBE4, + .tileTag = TAG_BERRY_PIC_TILE, + .paletteTag = TAG_BERRY_PIC_PAL, + .oam = &sBerryPicOamData, + .anims = sBerryPicSpriteAnimTable, + .images = sBerryPicSpriteImageTable, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const union AffineAnimCmd sSpriteAffineAnim_857FC04[] = +static const union AffineAnimCmd sSpriteAffineAnim_BerryPicRotation1[] = { AFFINEANIMCMD_FRAME(-1, -1, 253, 96), AFFINEANIMCMD_FRAME(0, 0, 0, 16), @@ -282,7 +282,7 @@ static const union AffineAnimCmd sSpriteAffineAnim_857FC04[] = AFFINEANIMCMD_JUMP(0) }; -static const union AffineAnimCmd sSpriteAffineAnim_857FC3C[] = +static const union AffineAnimCmd sSpriteAffineAnim_BerryPicRotation2[] = { AFFINEANIMCMD_FRAME(-1, -1, 3, 96), AFFINEANIMCMD_FRAME(0, 0, 0, 16), @@ -293,20 +293,20 @@ static const union AffineAnimCmd sSpriteAffineAnim_857FC3C[] = AFFINEANIMCMD_JUMP(0) }; -static const union AffineAnimCmd *const sSpriteAffineAnimTable_857FC74[] = +static const union AffineAnimCmd *const sBerryPicRotatingAnimCmds[] = { - sSpriteAffineAnim_857FC04, - sSpriteAffineAnim_857FC3C + sSpriteAffineAnim_BerryPicRotation1, + sSpriteAffineAnim_BerryPicRotation2 }; -static const struct SpriteTemplate gUnknown_0857FC7C = +static const struct SpriteTemplate gBerryPicRotatingSpriteTemplate = { - .tileTag = 0xFFFF, - .paletteTag = 0x7544, - .oam = &sOamData_857FBD0, - .anims = sSpriteAnimTable_857FBE0, - .images = sSpriteImageTable_857FBE4, - .affineAnims = sSpriteAffineAnimTable_857FC74, + .tileTag = TAG_BERRY_PIC_TILE, + .paletteTag = TAG_BERRY_PIC_PAL, + .oam = &sBerryPicRotatingOamData, + .anims = sBerryPicSpriteAnimTable, + .images = sBerryPicSpriteImageTable, + .affineAnims = sBerryPicRotatingAnimCmds, .callback = SpriteCallbackDummy, }; @@ -381,17 +381,17 @@ static const struct CompressedTilesPal gBerryPicTable[] = [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = {}, }; -const struct CompressedSpriteSheet gUnknown_0857FDEC = +const struct CompressedSpriteSheet gBerryCheckCircleSpriteSheet = { - gBerryCheckCircle_Gfx, 0x800, 10000 + gBerryCheckCircle_Gfx, 0x800, TAG_BERRY_CHECK_CIRCLE_GFX }; -const struct CompressedSpritePalette gUnknown_0857FDF4 = +const struct CompressedSpritePalette gBerryCheckCirclePaletteTable = { - gUnknown_08D9BEF0, 10000 + gBerryCheck_Pal, TAG_BERRY_CHECK_CIRCLE_GFX }; -static const struct OamData sOamData_857FDFC = +static const struct OamData sBerryCheckCircleOamData = { .y = 0, .affineMode = 0, @@ -408,23 +408,23 @@ static const struct OamData sOamData_857FDFC = .affineParam = 0 }; -static const union AnimCmd sSpriteAnim_857FE04[] = +static const union AnimCmd sSpriteAnim_BerryCheckCircle[] = { ANIMCMD_FRAME(0, 0), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_857FE0C[] = +static const union AnimCmd *const sBerryCheckCircleSpriteAnimTable[] = { - sSpriteAnim_857FE04 + sSpriteAnim_BerryCheckCircle }; -static const struct SpriteTemplate gUnknown_0857FE10 = +static const struct SpriteTemplate gBerryCheckCircleSpriteTemplate = { - .tileTag = 10000, - .paletteTag = 10000, - .oam = &sOamData_857FDFC, - .anims = sSpriteAnimTable_857FE0C, + .tileTag = TAG_BERRY_CHECK_CIRCLE_GFX, + .paletteTag = TAG_BERRY_CHECK_CIRCLE_GFX, + .oam = &sBerryCheckCircleOamData, + .anims = sBerryCheckCircleSpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, @@ -433,7 +433,7 @@ static const struct SpriteTemplate gUnknown_0857FE10 = // code void RemoveBagSprite(u8 id) { - u8 *spriteId = &gUnknown_0203CE54->spriteId[id]; + u8 *spriteId = &gBagMenu->spriteId[id]; if (*spriteId != 0xFF) { FreeSpriteTilesByTag(id + 100); @@ -446,14 +446,14 @@ void RemoveBagSprite(u8 id) void AddBagVisualSprite(u8 bagPocketId) { - u8 *spriteId = &gUnknown_0203CE54->spriteId[0]; - *spriteId = CreateSprite(&gUnknown_0857FB4C, 68, 66, 0); + u8 *spriteId = &gBagMenu->spriteId[0]; + *spriteId = CreateSprite(&gBagSpriteTemplate, 68, 66, 0); SetBagVisualPocketId(bagPocketId, FALSE); } void SetBagVisualPocketId(u8 bagPocketId, bool8 isSwitchingPockets) { - struct Sprite *sprite = &gSprites[gUnknown_0203CE54->spriteId[0]]; + struct Sprite *sprite = &gSprites[gBagMenu->spriteId[0]]; if (isSwitchingPockets) { sprite->pos2.y = -5; @@ -482,7 +482,7 @@ static void SpriteCB_BagVisualSwitchingPockets(struct Sprite *sprite) void ShakeBagVisual(void) { - struct Sprite *sprite = &gSprites[gUnknown_0203CE54->spriteId[0]]; + struct Sprite *sprite = &gSprites[gBagMenu->spriteId[0]]; if (sprite->affineAnimEnded) { StartSpriteAffineAnim(sprite, 1); @@ -501,14 +501,14 @@ static void SpriteCB_ShakeBagVisual(struct Sprite *sprite) void AddSwitchPocketRotatingBallSprite(s16 rotationDirection) { - u8 *spriteId = &gUnknown_0203CE54->spriteId[1]; - LoadSpriteSheet(&gUnknown_0857FBA0); - LoadSpritePalette(&gUnknown_0857FBA8); - *spriteId = CreateSprite(&gSpriteTemplate_RotatingBall, 16, 16, 0); + u8 *spriteId = &gBagMenu->spriteId[1]; + LoadSpriteSheet(&gRotatingBallTable); + LoadSpritePalette(&gRotatingBallPaletteTable); + *spriteId = CreateSprite(&gRotatingBallSpriteTemplate, 16, 16, 0); gSprites[*spriteId].data[0] = rotationDirection; } -static void update_switch_pocket_rotating_ball_coords(struct Sprite *sprite) +static void UpdateSwitchPocketRotatingBallCoords(struct Sprite *sprite) { sprite->centerToCornerVecX = sprite->data[1] - ((sprite->data[3] + 1) & 1); sprite->centerToCornerVecY = sprite->data[1] - ((sprite->data[3] + 1) & 1); @@ -518,28 +518,28 @@ static void SpriteCB_SwitchPocketRotatingBallInit(struct Sprite *sprite) { sprite->oam.affineMode = 1; if (sprite->data[0] == -1) - sprite->affineAnims = sSpriteAffineAnimTable_857FB98; + sprite->affineAnims = sRotatingBallAnimCmds; else - sprite->affineAnims = sSpriteAffineAnimTable_857FB9C; + sprite->affineAnims = sRotatingBallAnimCmds_FullRotation; InitSpriteAffineAnim(sprite); sprite->data[1] = sprite->centerToCornerVecX; sprite->data[1] = sprite->centerToCornerVecY; - update_switch_pocket_rotating_ball_coords(sprite); + UpdateSwitchPocketRotatingBallCoords(sprite); sprite->callback = SpriteCB_SwitchPocketRotatingBallContinue; } static void SpriteCB_SwitchPocketRotatingBallContinue(struct Sprite *sprite) { sprite->data[3]++; - update_switch_pocket_rotating_ball_coords(sprite); + UpdateSwitchPocketRotatingBallCoords(sprite); if (sprite->data[3] == 16) RemoveBagSprite(1); } void AddBagItemIconSprite(u16 itemId, u8 id) { - u8 *spriteId = &gUnknown_0203CE54->spriteId[id + 2]; + u8 *spriteId = &gBagMenu->spriteId[id + 2]; if (*spriteId == 0xFF) { u8 iconSpriteId; @@ -563,17 +563,17 @@ void RemoveBagItemIconSprite(u8 id) void sub_80D4FAC(void) { - sub_8122344(&gUnknown_0203CE54->spriteId[4], 8); + sub_8122344(&gBagMenu->spriteId[4], 8); } void sub_80D4FC8(u8 arg0) { - sub_81223FC(&gUnknown_0203CE54->spriteId[4], 8, arg0); + sub_81223FC(&gBagMenu->spriteId[4], 8, arg0); } void sub_80D4FEC(u8 arg0) { - sub_8122448(&gUnknown_0203CE54->spriteId[4], 136, 120, (arg0 + 1) * 16); + sub_8122448(&gBagMenu->spriteId[4], 136, 120, (arg0 + 1) * 16); } static void sub_80D5018(void *mem0, void *mem1) @@ -596,7 +596,7 @@ static void sub_80D5018(void *mem0, void *mem1) } } -static void sub_80D5070(u8 berryId) +static void LoadBerryGfx(u8 berryId) { struct CompressedSpritePalette pal; @@ -606,7 +606,7 @@ static void sub_80D5070(u8 berryId) } pal.data = gBerryPicTable[berryId].pal; - pal.tag = 0x7544; + pal.tag = TAG_BERRY_PIC_PAL; LoadCompressedSpritePalette(&pal); LZDecompressWram(gBerryPicTable[berryId].tiles, &gDecompressionBuffer[0x1000]); sub_80D5018(&gDecompressionBuffer[0x1000], &gDecompressionBuffer[0]); @@ -614,22 +614,22 @@ static void sub_80D5070(u8 berryId) u8 CreateBerryTagSprite(u8 id, s16 x, s16 y) { - sub_80D5070(id); - return CreateSprite(&gUnknown_0857FBEC, x, y, 0); + LoadBerryGfx(id); + return CreateSprite(&gBerryPicSpriteTemplate, x, y, 0); } void FreeBerryTagSpritePalette(void) { - FreeSpritePaletteByTag(0x7544); + FreeSpritePaletteByTag(TAG_BERRY_PIC_PAL); } -u8 sub_80D511C(u8 berryId, u8 x, u8 y, bool8 startAffine) +u8 LoadSpinningBerryPicGfx(u8 berryId, u8 x, u8 y, bool8 startAffine) { u8 spriteId; - FreeSpritePaletteByTag(0x7544); - sub_80D5070(berryId); - spriteId = CreateSprite(&gUnknown_0857FC7C, x, y, 0); + FreeSpritePaletteByTag(TAG_BERRY_PIC_PAL); + LoadBerryGfx(berryId); + spriteId = CreateSprite(&gBerryPicRotatingSpriteTemplate, x, y, 0); if (startAffine == TRUE) StartSpriteAffineAnim(&gSprites[spriteId], 1); @@ -638,5 +638,5 @@ u8 sub_80D511C(u8 berryId, u8 x, u8 y, bool8 startAffine) u8 CreateBerryFlavorCircleSprite(s16 x) { - return CreateSprite(&gUnknown_0857FE10, x, 116, 0); + return CreateSprite(&gBerryCheckCircleSpriteTemplate, x, 116, 0); } diff --git a/src/item_use.c b/src/item_use.c index 97aceb7ad..2f4374423 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -51,7 +51,7 @@ void SetUpItemUseCallback(u8 taskId); void MapPostLoadHook_UseItem(void); void sub_80AF6D4(void); void Task_CallItemUseOnFieldCallback(u8 taskId); -void bag_menu_inits_lists_menu(u8 taskId); +void BagMenu_InitListsMenu(u8 taskId); void ItemUseOnFieldCB_Bike(u8 taskId); void ItemUseOnFieldCB_Rod(u8 taskId); void ItemUseOnFieldCB_Itemfinder(u8 taskId); @@ -101,7 +101,7 @@ static const u8 gUnknown_085920E4[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST} static const struct YesNoFuncTable gUnknown_085920E8 = { .yesFunc = sub_80FE03C, - .noFunc = bag_menu_inits_lists_menu, + .noFunc = BagMenu_InitListsMenu, }; // .text @@ -115,7 +115,7 @@ void SetUpItemUseCallback(u8 taskId) type = ItemId_GetType(gSpecialVar_ItemId) - 1; if (!InBattlePyramid()) { - gUnknown_0203CE54->mainCallback2 = gUnknown_085920D8[type]; + gBagMenu->mainCallback2 = gUnknown_085920D8[type]; unknown_ItemMenu_Confirm(taskId); } else @@ -154,7 +154,7 @@ void DisplayCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnFiel if (!isUsingRegisteredKeyItemOnField) { if (!InBattlePyramid()) - DisplayItemMessage(taskId, 1, gStringVar4, bag_menu_inits_lists_menu); + DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu); else DisplayItemMessageInBattlePyramid(taskId, gText_DadsAdvice, sub_81C6714); } @@ -199,7 +199,7 @@ void sub_80FD254(void) void ItemUseOutOfBattle_Mail(u8 taskId) { - gUnknown_0203CE54->mainCallback2 = sub_80FD254; + gBagMenu->mainCallback2 = sub_80FD254; unknown_ItemMenu_Confirm(taskId); } @@ -595,7 +595,7 @@ void ItemUseOutOfBattle_PokeblockCase(u8 taskId) } else if (gTasks[taskId].data[3] != TRUE) { - gUnknown_0203CE54->mainCallback2 = sub_80FDBEC; + gBagMenu->mainCallback2 = sub_80FDBEC; unknown_ItemMenu_Confirm(taskId); } else @@ -628,7 +628,7 @@ void ItemUseOutOfBattle_CoinCase(u8 taskId) if (!gTasks[taskId].data[3]) { - DisplayItemMessage(taskId, 1, gStringVar4, bag_menu_inits_lists_menu); + DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu); } else { @@ -643,7 +643,7 @@ void ItemUseOutOfBattle_PowderJar(u8 taskId) if (!gTasks[taskId].data[3]) { - DisplayItemMessage(taskId, 1, gStringVar4, bag_menu_inits_lists_menu); + DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu); } else { @@ -657,7 +657,7 @@ void sub_80FDD10(u8 taskId) { gUnknown_0203A0F4 = sub_80FDD74; gFieldCallback = MapPostLoadHook_UseItem; - gUnknown_0203CE54->mainCallback2 = CB2_ReturnToField; + gBagMenu->mainCallback2 = CB2_ReturnToField; unknown_ItemMenu_Confirm(taskId); } else @@ -782,7 +782,7 @@ void task08_0809AD8C(u8 taskId) void sub_80FE024(u8 taskId) { - bag_menu_yes_no(taskId, 6, &gUnknown_085920E8); + BagMenu_YesNo(taskId, 6, &gUnknown_085920E8); } void sub_80FE03C(u8 taskId) @@ -813,7 +813,7 @@ void ItemUseOutOfBattle_Repel(u8 taskId) if (VarGet(VAR_REPEL_STEP_COUNT) == 0) gTasks[taskId].func = sub_80FE124; else if (!InBattlePyramid()) - DisplayItemMessage(taskId, 1, gText_RepelEffectsLingered, bag_menu_inits_lists_menu); + DisplayItemMessage(taskId, 1, gText_RepelEffectsLingered, BagMenu_InitListsMenu); else DisplayItemMessageInBattlePyramid(taskId, gText_RepelEffectsLingered, sub_81C6714); } @@ -837,7 +837,7 @@ void sub_80FE164(u8 taskId) VarSet(VAR_REPEL_STEP_COUNT, ItemId_GetHoldEffectParam(gSpecialVar_ItemId)); sub_80FE058(); if (!InBattlePyramid()) - DisplayItemMessage(taskId, 1, gStringVar4, bag_menu_inits_lists_menu); + DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu); else DisplayItemMessageInBattlePyramid(taskId, gStringVar4, sub_81C6714); } @@ -849,7 +849,7 @@ void sub_80FE1D0(u8 taskId) { PlaySE(SE_BIDORO); if (!InBattlePyramid()) - DisplayItemMessage(taskId, 1, gStringVar4, bag_menu_inits_lists_menu); + DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu); else DisplayItemMessageInBattlePyramid(taskId, gStringVar4, sub_81C6714); } @@ -928,7 +928,7 @@ void ItemUseInBattle_PokeBall(u8 taskId) } else if (!InBattlePyramid()) { - DisplayItemMessage(taskId, 1, gText_BoxFull, bag_menu_inits_lists_menu); + DisplayItemMessage(taskId, 1, gText_BoxFull, BagMenu_InitListsMenu); } else DisplayItemMessageInBattlePyramid(taskId, gText_BoxFull, sub_81C6714); @@ -965,7 +965,7 @@ void ItemUseInBattle_StatIncrease(u8 taskId) if (ExecuteTableBasedItemEffect(&gPlayerParty[partyId], gSpecialVar_ItemId, partyId, 0) != FALSE) { if (!InBattlePyramid()) - DisplayItemMessage(taskId, 1, gText_WontHaveEffect, bag_menu_inits_lists_menu); + DisplayItemMessage(taskId, 1, gText_WontHaveEffect, BagMenu_InitListsMenu); else DisplayItemMessageInBattlePyramid(taskId, gText_WontHaveEffect, sub_81C6714); } @@ -980,7 +980,7 @@ void sub_80FE54C(u8 taskId) { if (!InBattlePyramid()) { - gUnknown_0203CE54->mainCallback2 = sub_81B89F0; + gBagMenu->mainCallback2 = sub_81B89F0; unknown_ItemMenu_Confirm(taskId); } else diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 148be7c5c..0ddad55a6 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -6936,10 +6936,24 @@ static u8 InBoxInput_Normal(void) sPSSData->field_CD2 = 0; sPSSData->field_CD3 = 0; sPSSData->field_CD7 = 0; - retVal = 0; - if (!(gMain.newAndRepeatedKeys & DPAD_UP)) + + do { - if (gMain.newAndRepeatedKeys & DPAD_DOWN) + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + retVal = TRUE; + if (sBoxCursorPosition >= IN_BOX_ROWS) + { + cursorPosition -= IN_BOX_ROWS; + } + else + { + cursorArea = CURSOR_AREA_BOX; + cursorPosition = 0; + } + break; + } + else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { retVal = TRUE; cursorPosition += IN_BOX_ROWS; @@ -6951,6 +6965,7 @@ static u8 InBoxInput_Normal(void) sPSSData->field_CD2 = 1; sPSSData->field_CD7 = 1; } + break; } else if (gMain.newAndRepeatedKeys & DPAD_LEFT) { @@ -6964,6 +6979,7 @@ static u8 InBoxInput_Normal(void) sPSSData->field_CD3 = -1; cursorPosition += (IN_BOX_ROWS - 1); } + break; } else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) { @@ -6977,81 +6993,70 @@ static u8 InBoxInput_Normal(void) sPSSData->field_CD3 = 1; cursorPosition -= (IN_BOX_ROWS - 1); } + break; } else if (gMain.newKeys & START_BUTTON) { retVal = TRUE; cursorArea = CURSOR_AREA_BOX; cursorPosition = 0; + break; } - else - { - if ((gMain.newKeys & A_BUTTON) && sub_80CFA5C()) - { - if (!sCanOnlyMove) - return 8; - if (sPSSData->boxOption == BOX_OPTION_MOVE_MONS || sIsMonBeingMoved == TRUE) + if ((gMain.newKeys & A_BUTTON) && sub_80CFA5C()) + { + if (!sCanOnlyMove) + return 8; + + if (sPSSData->boxOption != BOX_OPTION_MOVE_MONS || sIsMonBeingMoved == TRUE) + { + switch (sub_80CFF98(0)) { - switch (sub_80CFF98(0)) - { - case 1: - return 11; - case 2: - return 12; - case 3: - return 13; - case 4: - return 14; - case 5: - return 15; - case 12: - return 16; - case 13: - return 17; - case 15: - return 18; - } - } - else - { - sPSSData->inBoxMovingMode = 1; - return 20; + case 1: + return 11; + case 2: + return 12; + case 3: + return 13; + case 4: + return 14; + case 5: + return 15; + case 12: + return 16; + case 13: + return 17; + case 15: + return 18; } } - - if (gMain.newKeys & B_BUTTON) - return 19; - - if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR) + else { - if (gMain.heldKeys & L_BUTTON) - return 10; - if (gMain.heldKeys & R_BUTTON) - return 9; + sPSSData->inBoxMovingMode = 1; + return 20; } + } - if (gMain.newKeys & SELECT_BUTTON) - { - sub_80CFDC4(); - return 0; - } - retVal = FALSE; - } - } - else - { - retVal = TRUE; - if (sBoxCursorPosition >= IN_BOX_ROWS) + if (gMain.newKeys & B_BUTTON) + return 19; + + if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR) { - cursorPosition -= IN_BOX_ROWS; + if (gMain.heldKeys & L_BUTTON) + return 10; + if (gMain.heldKeys & R_BUTTON) + return 9; } - else + + if (gMain.newKeys & SELECT_BUTTON) { - cursorArea = CURSOR_AREA_BOX; - cursorPosition = 0; + sub_80CFDC4(); + return 0; } - } + + retVal = 0; + + } while (0); if (retVal) sub_80CD894(cursorArea, cursorPosition); @@ -7533,20 +7538,30 @@ static u8 HandleInput_InParty(void) gotoBox = FALSE; retVal = 0; - if (!(gMain.newAndRepeatedKeys & DPAD_UP)) + do { - if (gMain.newAndRepeatedKeys & DPAD_DOWN) + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + if (--cursorPosition < 0) + cursorPosition = PARTY_SIZE; + if (cursorPosition != sBoxCursorPosition) + retVal = 1; + break; + } + else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { if (++cursorPosition > PARTY_SIZE) cursorPosition = 0; if (cursorPosition != sBoxCursorPosition) retVal = 1; + break; } - else if ((gMain.newAndRepeatedKeys & DPAD_LEFT) && sBoxCursorPosition != 0) + else if (gMain.newAndRepeatedKeys & DPAD_LEFT && sBoxCursorPosition != 0) { retVal = 1; sPSSData->field_CD6 = sBoxCursorPosition; cursorPosition = 0; + break; } else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) { @@ -7561,73 +7576,67 @@ static u8 HandleInput_InParty(void) cursorArea = CURSOR_AREA_IN_BOX; cursorPosition = 0; } + break; } - else + + if (gMain.newKeys & A_BUTTON) { - if (gMain.newKeys & A_BUTTON) - { - if (sBoxCursorPosition == PARTY_SIZE) - { - if (sPSSData->boxOption == BOX_OPTION_DEPOSIT) - return 4; - - gotoBox = TRUE; - } - else if (sub_80CFA5C()) - { - if (!sCanOnlyMove) - return 8; - - switch (sub_80CFF98(0)) - { - case 1: - return 11; - case 2: - return 12; - case 3: - return 13; - case 4: - return 14; - case 5: - return 15; - case 12: - return 16; - case 13: - return 17; - case 15: - return 18; - } - } - } - - if (gMain.newKeys & B_BUTTON) + if (sBoxCursorPosition == PARTY_SIZE) { if (sPSSData->boxOption == BOX_OPTION_DEPOSIT) - return 19; + return 4; gotoBox = TRUE; } + else if (sub_80CFA5C()) + { + if (!sCanOnlyMove) + return 8; - if (gotoBox) - { - retVal = 6; - cursorArea = CURSOR_AREA_IN_BOX; - cursorPosition = 0; - } - else if (gMain.newKeys & SELECT_BUTTON) - { - sub_80CFDC4(); - return 0; + switch (sub_80CFF98(0)) + { + case 1: + return 11; + case 2: + return 12; + case 3: + return 13; + case 4: + return 14; + case 5: + return 15; + case 12: + return 16; + case 13: + return 17; + case 15: + return 18; + } } } - } - else - { - if (--cursorPosition < 0) - cursorPosition = PARTY_SIZE; - if (cursorPosition != sBoxCursorPosition) - retVal = 1; - } + + if (gMain.newKeys & B_BUTTON) + { + if (sPSSData->boxOption == BOX_OPTION_DEPOSIT) + return 19; + + gotoBox = TRUE; + } + + if (gotoBox) + { + retVal = 6; + cursorArea = CURSOR_AREA_IN_BOX; + cursorPosition = 0; + } + else if (gMain.newKeys & SELECT_BUTTON) + { + sub_80CFDC4(); + return 0; + } + + } while (0); + if (retVal != 0) { if (retVal != 6) @@ -7911,63 +7920,63 @@ _080CF7D8:\n\ static u8 HandleInput_OnBox(void) { u8 retVal; - s8 cursorArea = sBoxCursorArea; - s8 cursorPosition = sBoxCursorPosition; + s8 cursorArea; + s8 cursorPosition; sPSSData->field_CD3 = 0; sPSSData->field_CD2 = 0; sPSSData->field_CD7 = 0; - retVal = 0; - if (!(gMain.newAndRepeatedKeys & DPAD_UP)) + do { - if (gMain.newAndRepeatedKeys & DPAD_DOWN) + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + retVal = 1; + cursorArea = CURSOR_AREA_BUTTONS; + cursorPosition = 0; + sPSSData->field_CD7 = 1; + break; + } + else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { retVal = 1; cursorArea = CURSOR_AREA_IN_BOX; cursorPosition = 2; + break; } - else + + if (gMain.heldKeys & DPAD_LEFT) + return 10; + if (gMain.heldKeys & DPAD_RIGHT) + return 9; + + if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR) { - if (gMain.heldKeys & DPAD_LEFT) + if (gMain.heldKeys & L_BUTTON) return 10; - if (gMain.heldKeys & DPAD_RIGHT) + if (gMain.heldKeys & R_BUTTON) return 9; - - if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR) - { - if (gMain.heldKeys & L_BUTTON) - return 10; - if (gMain.heldKeys & R_BUTTON) - return 9; - } - - if (gMain.newKeys & A_BUTTON) - { - sub_80CD1A8(FALSE); - AddBoxMenu(); - return 7; - } - - if (gMain.newKeys & B_BUTTON) - return 19; - - if (gMain.newKeys & SELECT_BUTTON) - { - sub_80CFDC4(); - return 0; - } - - retVal = 0; } - } - else - { - retVal = 1; - cursorArea = CURSOR_AREA_BUTTONS; - cursorPosition = 0; - sPSSData->field_CD7 = 1; - } + + if (gMain.newKeys & A_BUTTON) + { + sub_80CD1A8(FALSE); + AddBoxMenu(); + return 7; + } + + if (gMain.newKeys & B_BUTTON) + return 19; + + if (gMain.newKeys & SELECT_BUTTON) + { + sub_80CFDC4(); + return 0; + } + + retVal = 0; + + } while (0); if (retVal) { @@ -8116,62 +8125,57 @@ static u8 HandleInput_OnButtons(void) sPSSData->field_CD2 = 0; sPSSData->field_CD7 = 0; - if (!(gMain.newAndRepeatedKeys & DPAD_UP)) + do { - if (gMain.newAndRepeatedKeys & (DPAD_DOWN | START_BUTTON)) + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + retVal = 1; + cursorArea = CURSOR_AREA_IN_BOX; + sPSSData->field_CD2 = -1; + cursorPosition = (sBoxCursorPosition == 0) ? IN_BOX_COUNT - 1 - 5 : IN_BOX_COUNT - 1; + sPSSData->field_CD7 = 1; + break; + } + else if (gMain.newAndRepeatedKeys & (DPAD_DOWN | START_BUTTON)) { retVal = 1; cursorArea = CURSOR_AREA_BOX; cursorPosition = 0; sPSSData->field_CD7 = 1; + break; } - else if (gMain.newAndRepeatedKeys & DPAD_LEFT) + + if (gMain.newAndRepeatedKeys & DPAD_LEFT) { retVal = 1; if (--cursorPosition < 0) - { cursorPosition = 1; - } + break; } else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) { retVal = 1; if (++cursorPosition > 1) - { cursorPosition = 0; - } + break; } - else if (gMain.newKeys & A_BUTTON) - { + + if (gMain.newKeys & A_BUTTON) return (cursorPosition == 0) ? 5 : 4; - } - else if (gMain.newKeys & B_BUTTON) - { + if (gMain.newKeys & B_BUTTON) return 19; - } - else if (gMain.newKeys & SELECT_BUTTON) + + if (gMain.newKeys & SELECT_BUTTON) { sub_80CFDC4(); return 0; } - else - { - retVal = 0; - } - } - else - { - retVal = 1; - cursorArea = CURSOR_AREA_IN_BOX; - sPSSData->field_CD2 = -1; - cursorPosition = (sBoxCursorPosition == 0) ? IN_BOX_COUNT - 1 - 5 : IN_BOX_COUNT - 1; - sPSSData->field_CD7 = 1; - } + + retVal = 0; + } while (0); if (retVal != 0) - { sub_80CD894(cursorArea, cursorPosition); - } return retVal; } @@ -8750,9 +8754,14 @@ static s16 sub_80D00AC(void) { s32 textId = -2; - if (!(gMain.newKeys & A_BUTTON)) + do { - if (gMain.newKeys & B_BUTTON) + if (gMain.newKeys & A_BUTTON) + { + textId = Menu_GetCursorPos(); + break; + } + else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); textId = -1; @@ -8768,11 +8777,7 @@ static s16 sub_80D00AC(void) PlaySE(SE_SELECT); Menu_MoveCursor(1); } - } - else - { - textId = Menu_GetCursorPos(); - } + } while (0); if (textId != -2) sub_80D013C(); @@ -8780,9 +8785,6 @@ static s16 sub_80D00AC(void) if (textId >= 0) textId = sPSSData->menuItems[textId].textId; - #ifndef NONMATCHING - asm("":::"r4"); - #endif // NONMATCHING return textId; } diff --git a/src/pokenav_unk_10.c b/src/pokenav_unk_10.c new file mode 100644 index 000000000..dcdbacfb9 --- /dev/null +++ b/src/pokenav_unk_10.c @@ -0,0 +1,493 @@ +#include "global.h" +#include "decompress.h" +#include "dynamic_placeholder_text_util.h" +#include "international_string_util.h" +#include "pokenav.h" +#include "sprite.h" +#include "string_util.h" +#include "text.h" +#include "trainer_pokemon_sprites.h" +#include "window.h" + +struct Pokenav10Struct +{ + u32 field_0[5]; + struct Sprite *field_14; +}; + +struct Pokenav10Struct2 +{ + u32 filler0[2]; + u16 field_8; + u16 field_A; + u16 field_C; + u8 filler[2]; + u16 field_10; +}; + +// To do: move to C. +extern const u16 gUnknown_08623FF8[]; +extern const u16 gUnknown_08624038[]; +extern const u16 gUnknown_08624018[]; +extern const u16 gUnknown_08624078[]; +extern const u16 gUnknown_08624058[]; +extern const u32 gUnknown_08624280[]; +extern const u8 gText_RibbonsF700[]; +extern const u8 *const gRibbonDescriptionPointers[][2]; +extern const u8 *const gGiftRibbonDescriptionPointers[][2]; + +extern u32 gUnknown_030012C0; +extern u32 gUnknown_030012C4; + +void sub_81D0E84(struct Pokenav10Struct2 *structPtr); +void sub_81D0FF0(struct Pokenav10Struct2 *structPtr); +void sub_81D10D0(struct Pokenav10Struct2 *structPtr); +u32 sub_81D06C4(void); +u32 sub_81D07D8(void); +u32 sub_81D06D4(void); +void sub_81D06E4(u8 *nick, u8 *level, u8 *gender); +void sub_81D0760(u16 *species, u32 *personality, u32 *otId); +u16 sub_81D1184(s32 unused0, s32 unused1); +void sub_81D1258(struct Sprite *sprite, s32 arg1, s32 arg2, s32 arg3); +void sub_81D1284(struct Sprite *sprite); +u32 *sub_81D0914(u32 *arg0); +u32 *sub_81D092C(u32 *arg0); +void sub_81D1350(void); +void sub_81D13BC(u16 *dst, u32 id); +void sub_81D1370(u32 arg0, u32 id); +u16 sub_81D0944(void); +u32 sub_81D0954(void); +void sub_81D1500(struct Pokenav10Struct *structPtr); +bool32 sub_81D1524(struct Pokenav10Struct *structPtr); +void sub_81D1538(struct Sprite *sprite); + +// code +static const struct WindowTemplate gUnknown_08624BB8 = +{ + .bg = 2, + .tilemapLeft = 12, + .tilemapTop = 13, + .width = 16, + .height = 4, + .paletteNum = 1, + .baseBlock = 0x14, +}; + +void sub_81D0E60(struct Pokenav10Struct2 *structPtr) +{ + structPtr->field_A = AddWindow(&gUnknown_08624BB8); + PutWindowTilemap(structPtr->field_A); + sub_81D0E84(structPtr); +} + +void sub_81D0E84(struct Pokenav10Struct2 *structPtr) +{ + u8 color[] = {4, 2, 3}; + + ConvertIntToDecimalStringN(gStringVar1, sub_81D07D8(), STR_CONV_MODE_LEFT_ALIGN, 2); + DynamicPlaceholderTextUtil_Reset(); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_RibbonsF700); + FillWindowPixelBuffer(structPtr->field_A, PIXEL_FILL(4)); + AddTextPrinterParameterized3(structPtr->field_A, 1, 0, 1, color, -1, gStringVar4); + CopyWindowToVram(structPtr->field_A, 2); +} + +void sub_81D0EFC(struct Pokenav10Struct2 *structPtr) +{ + s32 i; + u32 ribbonId = sub_81D0954(); + u8 color[] = {4, 2, 3}; + + FillWindowPixelBuffer(structPtr->field_A, PIXEL_FILL(4)); + if (ribbonId < 25) + { + for (i = 0; i < 2; i++) + AddTextPrinterParameterized3(structPtr->field_A, 1, 0, (i * 16) + 1, color, -1, gRibbonDescriptionPointers[ribbonId][i]); + } + else + { + ribbonId = gSaveBlock1Ptr->giftRibbons[ribbonId - 25]; + if (ribbonId == 0) + return; + + ribbonId--; + for (i = 0; i < 2; i++) + AddTextPrinterParameterized3(structPtr->field_A, 1, 0, (i * 16) + 1, color, -1, gGiftRibbonDescriptionPointers[ribbonId][i]); + } + + CopyWindowToVram(structPtr->field_A, 2); +} + +static const struct WindowTemplate gUnknown_08624BC4 = +{ + .bg = 2, + .tilemapLeft = 14, + .tilemapTop = 1, + .width = 13, + .height = 2, + .paletteNum = 10, + .baseBlock = 0x54, +}; + +void sub_81D0FCC(struct Pokenav10Struct2 *structPtr) +{ + structPtr->field_8 = AddWindow(&gUnknown_08624BC4); + PutWindowTilemap(structPtr->field_8); + sub_81D0FF0(structPtr); +} + +static const u8 sMaleIconString[] = _("{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}"); +static const u8 sFemaleIconString[] = _("{COLOR_HIGHLIGHT_SHADOW}{LIGHT_GREEN}{WHITE}{BLUE}♀{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}"); +static const u8 sGenderlessIconString[] = _("{UNK_SPACER}"); + +void sub_81D0FF0(struct Pokenav10Struct2 *structPtr) +{ + const u8 *genderTxt; + u8 *txtPtr; + u8 level, gender; + u16 windowId = structPtr->field_8; + + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); + sub_81D06E4(gStringVar3, &level, &gender); + AddTextPrinterParameterized(windowId, 1, gStringVar3, 0, 1, TEXT_SPEED_FF, NULL); + switch (gender) + { + case MON_MALE: + genderTxt = sMaleIconString; + break; + case MON_FEMALE: + genderTxt = sFemaleIconString; + break; + default: + genderTxt = sGenderlessIconString; + break; + } + + txtPtr = StringCopy(gStringVar1, genderTxt); + *(txtPtr++) = CHAR_SLASH; + *(txtPtr++) = CHAR_SPECIAL_F9; + *(txtPtr++) = 5; + ConvertIntToDecimalStringN(txtPtr, level, STR_CONV_MODE_LEFT_ALIGN, 3); + AddTextPrinterParameterized(windowId, 1, gStringVar1, 60, 1, TEXT_SPEED_FF, NULL); + CopyWindowToVram(windowId, 2); +} + +static const struct WindowTemplate gUnknown_08624BE8[] = +{ + { + .bg = 2, + .tilemapLeft = 1, + .tilemapTop = 5, + .width = 7, + .height = 2, + .paletteNum = 1, + .baseBlock = 0x6E, + }, + {}, +}; + +void sub_81D10A4(struct Pokenav10Struct2 *structPtr) +{ + structPtr->field_C = AddWindow(gUnknown_08624BE8); + FillWindowPixelBuffer(structPtr->field_C, PIXEL_FILL(1)); + PutWindowTilemap(structPtr->field_C); + sub_81D10D0(structPtr); +} + +void sub_81D10D0(struct Pokenav10Struct2 *structPtr) +{ + s32 x; + u8 *txtPtr; + u32 id = sub_81D06C4() + 1; + u32 count = sub_81D06D4(); + + txtPtr = ConvertIntToDecimalStringN(gStringVar1, id, STR_CONV_MODE_RIGHT_ALIGN, 3); + *(txtPtr++) = CHAR_SLASH; + ConvertIntToDecimalStringN(txtPtr, count, STR_CONV_MODE_RIGHT_ALIGN, 3); + x = GetStringCenterAlignXOffset(1, gStringVar1, 56); + AddTextPrinterParameterized(structPtr->field_C, 1, gStringVar1, x, 1, TEXT_SPEED_FF, NULL); + CopyWindowToVram(structPtr->field_C, 2); +} + +void sub_81D1148(struct Pokenav10Struct2 *structPtr) +{ + u16 species; + u32 personality, otId; + + sub_81D0760(&species, &personality, &otId); + ResetAllPicSprites(); + structPtr->field_10 = sub_81D1184(40, 104); + sub_81C7990(15, 0); +} + +void sub_81D1178(struct Pokenav10Struct2 *structPtr) +{ + FreeAndDestroyMonPicSprite(structPtr->field_10); +} + +u16 sub_81D1184(s32 unused0, s32 unused1) +{ + u16 species, spriteId; + u32 personality, otId; + + sub_81D0760(&species, &personality, &otId); + spriteId = CreateMonPicSprite_HandleDeoxys(species, otId, personality, TRUE, 40, 104, 15, 0xFFFF); + gSprites[spriteId].oam.priority = 0; + return spriteId; +} + +void sub_81D11D8(struct Pokenav10Struct2 *structPtr) +{ + sub_81D1258(&gSprites[structPtr->field_10], 40, -32, 6); +} + +void sub_81D11FC(struct Pokenav10Struct2 *structPtr) +{ + FreeAndDestroyMonPicSprite(structPtr->field_10); + structPtr->field_10 = sub_81D1184(-32, 104); + sub_81D1258(&gSprites[structPtr->field_10], -32, 40, 6); +} + +bool32 sub_81D1234(struct Pokenav10Struct2 *structPtr) +{ + return (gSprites[structPtr->field_10].callback != SpriteCallbackDummy); +} + +void sub_81D1258(struct Sprite *sprite, s32 arg1, s32 arg2, s32 arg3) +{ + u32 var = arg2 - arg1; + + sprite->pos1.x = arg1; + sprite->data[0] = arg1 << 4; + sprite->data[1] = (var << 4) / arg3; + sprite->data[2] = arg3; + sprite->data[3] = arg2; + + sprite->callback = sub_81D1284; +} + +void sub_81D1284(struct Sprite *sprite) +{ + if (sprite->data[2] != 0) + { + sprite->data[2]--; + sprite->data[0] += sprite->data[1]; + sprite->pos1.x = sprite->data[0] >> 4; + if (sprite->pos1.x <= -32) + sprite->invisible = TRUE; + else + sprite->invisible = FALSE; + } + else + { + sprite->pos1.x = sprite->data[3]; + sprite->callback = SpriteCallbackDummy; + } +} + +void sub_81D12D8(void) +{ + u32 *ptr; + + sub_81D1350(); + + ptr = sub_81D0914(&gUnknown_030012C0); + for (gUnknown_030012C4 = 0; gUnknown_030012C4 < gUnknown_030012C0; gUnknown_030012C4++) + sub_81D1370(gUnknown_030012C4, *(ptr++)); + + ptr = sub_81D092C(&gUnknown_030012C0); + for (gUnknown_030012C4 = 0; gUnknown_030012C4 < gUnknown_030012C0; gUnknown_030012C4++) + sub_81D1370(gUnknown_030012C4 + 27, *(ptr++)); + + CopyBgTilemapBufferToVram(1); +} + +void sub_81D1350(void) +{ + FillBgTilemapBufferRect_Palette0(1, 0, 0, 0, 32, 20); +} + +void sub_81D1370(u32 arg0, u32 id) +{ + u16 bgData[4]; + u32 destX = (arg0 % 9) * 2 + 11; + u32 destY = (arg0 / 9) * 2 + 4; + + sub_81D13BC(bgData, id); + CopyToBgTilemapBufferRect(1, bgData, destX, destY, 2, 2); +} + +struct +{ + u16 var0; + u16 var2; +} static const gUnknown_08624BF8[] = +{ + {0, 0}, + {1, 0}, + {2, 0}, + {3, 0}, + {4, 0}, + {1, 1}, + {2, 1}, + {3, 1}, + {4, 1}, + {1, 2}, + {2, 2}, + {3, 2}, + {4, 2}, + {1, 3}, + {2, 3}, + {3, 3}, + {4, 3}, + {1, 4}, + {2, 4}, + {3, 4}, + {4, 4}, + {5, 0}, + {6, 0}, + {7, 1}, + {8, 2}, + {9, 1}, + {9, 3}, + {9, 4}, + {10, 3}, + {10, 4}, + {11, 0}, + {11, 1}, +}; + +void sub_81D13BC(u16 *dst, u32 id) +{ + u16 r3 = gUnknown_08624BF8[id].var2 + 2; + u16 r1 = (gUnknown_08624BF8[id].var0 * 2) + 1; + + dst[0] = r1 | (r3 << 12); + dst[1] = r1 | (r3 << 12) |0x400; + dst[2] = (r1 + 1) | (r3 << 12); + dst[3] = (r1 + 1) | (r3 << 12) | 0x400; +} + +static const struct CompressedSpriteSheet gUnknown_08624C78 = +{ + gUnknown_08624280, 0x1800, 9 +}; + +static const struct SpritePalette gUnknown_08624C80[] = +{ + {gUnknown_08623FF8, 15}, + {gUnknown_08624018, 16}, + {gUnknown_08624038, 17}, + {gUnknown_08624058, 18}, + {gUnknown_08624078, 19}, + {}, +}; + +static const struct OamData sOamData_8624CB0 = +{ + .y = 0, + .affineMode = 1, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = SPRITE_SHAPE(32x32), + .x = 0, + .matrixNum = 0, + .size = SPRITE_SIZE(32x32), + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0 +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8624CB8[] = +{ + AFFINEANIMCMD_FRAME(128, 128, 0, 0), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8624CC8[] = +{ + AFFINEANIMCMD_FRAME(128, 128, 0, 0), + AFFINEANIMCMD_FRAME(32, 32, 0, 4), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8624CE0[] = +{ + AFFINEANIMCMD_FRAME(256, 256, 0, 0), + AFFINEANIMCMD_FRAME(-32, -32, 0, 4), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd *const sSpriteAffineAnimTable_8624CF8[] = +{ + sSpriteAffineAnim_8624CB8, + sSpriteAffineAnim_8624CC8, + sSpriteAffineAnim_8624CE0 +}; + +static const struct SpriteTemplate gUnknown_08624D04 = +{ + .tileTag = 9, + .paletteTag = 15, + .oam = &sOamData_8624CB0, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = sSpriteAffineAnimTable_8624CF8, + .callback = SpriteCallbackDummy, +}; + +void sub_81D13FC(struct Pokenav10Struct *structPtr) +{ + u8 spriteId; + + LoadCompressedSpriteSheet(&gUnknown_08624C78); + Pokenav_AllocAndLoadPalettes(gUnknown_08624C80); + + spriteId = CreateSprite(&gUnknown_08624D04, 0, 0, 0); + structPtr->field_14 = &gSprites[spriteId]; + structPtr->field_14->invisible = TRUE; +} + +void sub_81D1448(struct Pokenav10Struct *structPtr) +{ + u32 ribbonId; + s32 r4 = sub_81D0944(); + s32 r5 = (r4 % 9) * 16 + 96; + s32 r0 = (r4 / 9) * 16 + 40; + + structPtr->field_14->pos1.x = r5; + structPtr->field_14->pos1.y = r0; + + ribbonId = sub_81D0954(); + structPtr->field_14->oam.tileNum = (gUnknown_08624BF8[ribbonId].var0 * 16) + GetSpriteTileStartByTag(9); + structPtr->field_14->oam.paletteNum = IndexOfSpritePaletteTag(gUnknown_08624BF8[ribbonId].var2 + 15); + + StartSpriteAffineAnim(structPtr->field_14, 1); + structPtr->field_14->invisible = FALSE; + structPtr->field_14->data[0] = 0; + structPtr->field_14->callback = sub_81D1538; +} + +void sub_81D1500(struct Pokenav10Struct *structPtr) +{ + structPtr->field_14->data[0] = 1; + StartSpriteAffineAnim(structPtr->field_14, 2); + structPtr->field_14->callback = sub_81D1538; +} + +bool32 sub_81D1524(struct Pokenav10Struct *structPtr) +{ + return (structPtr->field_14->callback != SpriteCallbackDummy); +} + +void sub_81D1538(struct Sprite *sprite) +{ + if (sprite->affineAnimEnded) + { + sprite->invisible = sprite->data[0]; + sprite->callback = SpriteCallbackDummy; + } +} diff --git a/src/pokenav_unk_2.c b/src/pokenav_unk_2.c new file mode 100644 index 000000000..3aec4685e --- /dev/null +++ b/src/pokenav_unk_2.c @@ -0,0 +1,18 @@ +#include "global.h" +#include "gym_leader_rematch.h" +#include "pokenav.h" + +bool32 sub_81C98D4(void) +{ + s32 i; + + for (i = 0; i < REMATCH_TABLE_ENTRIES; i++) + { + if (sub_81CB0C8(i) == gMapHeader.regionMapSectionId + && sub_81CAE08(i) + && gSaveBlock1Ptr->trainerRematches[i]) + return TRUE; + } + + return FALSE; +} diff --git a/src/pokenav_unk_3.c b/src/pokenav_unk_3.c index c6705a352..404743345 100755 --- a/src/pokenav_unk_3.c +++ b/src/pokenav_unk_3.c @@ -282,7 +282,7 @@ int unref_sub_81CAE6C(int arg0) arg0 += state->unkC; if (arg0 >= state->unkA) return REMATCH_TABLE_ENTRIES; - + return state->unk1C[arg0].unk2; } @@ -321,7 +321,7 @@ int sub_81CAF04(int index) index = GetTrainerIdxByRematchIdx(state->unk1C[index].unk2); return gTrainers[index].trainerPic; } - + var0 = state->unk1C[index].unk2; index = MatchCall_GetRematchTableIdx(var0); if (index != REMATCH_TABLE_ENTRIES) @@ -411,7 +411,7 @@ void sub_81CB050(u32 arg0, u8 *str) } } -int sub_81CB0C8(int rematchIndex) +u8 sub_81CB0C8(int rematchIndex) { int mapGroup = gRematchTable[rematchIndex].mapGroup; int mapNum = gRematchTable[rematchIndex].mapNum; diff --git a/src/tv.c b/src/tv.c index 01b43f100..dfd26fd0d 100644 --- a/src/tv.c +++ b/src/tv.c @@ -3434,7 +3434,7 @@ bool8 TV_IsScriptShowKindAlreadyInQueue(void) return FALSE; } -bool8 TV_PutNameRaterShowOnTheAirIfNicnkameChanged(void) +bool8 TV_PutNameRaterShowOnTheAirIfNicknameChanged(void) { GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1); if (!StringCompare(gStringVar3, gStringVar1)) diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c index 4c302c5eb..0b7324366 100644 --- a/src/union_room_player_avatar.c +++ b/src/union_room_player_avatar.c @@ -1,13 +1,14 @@ #include "global.h" -#include "constants/flags.h" -#include "constants/event_object_movement_constants.h" #include "event_data.h" #include "event_object_movement.h" -#include "script.h" #include "field_player_avatar.h" #include "fieldmap.h" -#include "union_room.h" +#include "script.h" #include "task.h" +#include "union_room.h" +#include "constants/event_objects.h" +#include "constants/event_object_movement_constants.h" +#include "constants/flags.h" EWRAM_DATA struct UnkStruct_8019BA8 * gUnknown_02022C64 = NULL; EWRAM_DATA u32 gUnknown_02022C68 = 0; @@ -390,7 +391,7 @@ void sub_8019E70(u8 * sp8, s32 r9) for (r7 = 0; r7 < 5; r7++) { s32 r5 = 5 * r9 + r7; - sp8[r5] = sprite_new(0x41, r5 - 0x38, gUnknown_082F0740[r9][0] + gUnknown_082F0760[r7][0], gUnknown_082F0740[r9][1] + gUnknown_082F0760[r7][1], 3, 1); + sp8[r5] = sprite_new(EVENT_OBJ_GFX_MAN_4, r5 - 0x38, gUnknown_082F0740[r9][0] + gUnknown_082F0760[r7][0], gUnknown_082F0740[r9][1] + gUnknown_082F0760[r7][1], 3, 1); sub_8097C44(r5 - 0x38, TRUE); } }