diff options
2200 files changed, 8185 insertions, 10694 deletions
@@ -125,6 +125,7 @@ tools: @$(MAKE) -C tools/rsfont @$(MAKE) -C tools/aif2pcm @$(MAKE) -C tools/ramscrgen + @$(MAKE) -C tools/mid2agb tidy: $(RM) $(ALL_BUILDS:%=poke%{.gba,.elf,.map}) @@ -174,6 +175,7 @@ include castform.mk include tilesets.mk include fonts.mk include misc.mk +include spritesheet_rules.mk include override.mk %.1bpp: %.png ; $(GBAGFX) $< $@ $(GFX_OPTS) diff --git a/asm/flying.s b/asm/flying.s deleted file mode 100644 index 126f18206..000000000 --- a/asm/flying.s +++ /dev/null @@ -1,2462 +0,0 @@ - .include "constants/gba_constants.inc" - .include "include/macros.inc" - - .syntax unified - - .text - - @ flying - - thumb_func_start sub_80DA4D8 -sub_80DA4D8: @ 80DA4D8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r7, r0, 0 - adds r5, r7, 0 - adds r5, 0x2E - ldr r0, _080DA4F8 @ =gBattleAnimArgs - ldrh r1, [r0, 0xE] - movs r0, 0x80 - lsls r0, 1 - ands r0, r1 - cmp r0, 0 - beq _080DA500 - ldr r0, _080DA4FC @ =gAnimBankAttacker - b _080DA502 - .align 2, 0 -_080DA4F8: .4byte gBattleAnimArgs -_080DA4FC: .4byte gAnimBankAttacker -_080DA500: - ldr r0, _080DA5B0 @ =gAnimBankTarget -_080DA502: - ldrb r6, [r0] - adds r0, r6, 0 - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _080DA518 - ldr r1, _080DA5B4 @ =gBattleAnimArgs - ldrh r0, [r1] - negs r0, r0 - strh r0, [r1] -_080DA518: - adds r0, r6, 0 - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - ldr r4, _080DA5B4 @ =gBattleAnimArgs - lsrs r0, 24 - ldrh r1, [r4] - adds r0, r1 - strh r0, [r7, 0x20] - adds r0, r6, 0 - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - ldrh r1, [r4, 0x2] - lsrs r0, 24 - adds r1, r0, r1 - strh r1, [r7, 0x22] - lsls r1, 8 - strh r1, [r5, 0x8] - ldrh r1, [r4, 0xC] - adds r0, r1 - lsls r0, 1 - ldrh r2, [r5, 0xE] - movs r1, 0x1 - ands r1, r2 - orrs r1, r0 - strh r1, [r5, 0xE] - ldrb r0, [r5] - movs r2, 0x4 - mov r8, r2 - mov r1, r8 - orrs r0, r1 - strb r0, [r5] - ldrh r0, [r4, 0x4] - ldrb r1, [r4, 0x4] - strh r1, [r5, 0x2] - lsls r0, 16 - lsrs r0, 24 - strh r0, [r5, 0xA] - ldrh r0, [r4, 0x6] - strh r0, [r5, 0x4] - ldrh r0, [r4, 0x8] - strh r0, [r5, 0x6] - ldrh r0, [r4, 0xA] - strh r0, [r5, 0xC] - subs r1, 0x40 - lsls r1, 16 - lsrs r1, 16 - cmp r1, 0x7F - bhi _080DA618 - ldr r0, _080DA5B8 @ =gMain - ldr r2, _080DA5BC @ =0x0000043d - adds r0, r2 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080DA5C0 - adds r0, r6, 0 - bl sub_8079ED4 - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x1 - movs r1, 0x3 - ands r0, r1 - lsls r0, 2 - ldrb r2, [r7, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r7, 0x5] - b _080DA5D8 - .align 2, 0 -_080DA5B0: .4byte gAnimBankTarget -_080DA5B4: .4byte gBattleAnimArgs -_080DA5B8: .4byte gMain -_080DA5BC: .4byte 0x0000043d -_080DA5C0: - adds r0, r6, 0 - bl sub_8079ED4 - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r7, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r7, 0x5] -_080DA5D8: - ldrb r1, [r5, 0xE] - movs r4, 0x2 - negs r4, r4 - adds r0, r4, 0 - ands r0, r1 - strb r0, [r5, 0xE] - movs r1, 0x4 - ldrsh r0, [r5, r1] - movs r1, 0x80 - lsls r1, 8 - ands r0, r1 - cmp r0, 0 - bne _080DA678 - adds r3, r7, 0 - adds r3, 0x3F - ldrb r2, [r3] - lsls r0, r2, 31 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - adds r0, r4, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - lsls r0, 31 - lsrs r0, 31 - adds r1, r7, 0 - adds r1, 0x2A - strb r0, [r1] - ldrb r0, [r3] - movs r1, 0x4 - b _080DA66E -_080DA618: - adds r0, r6, 0 - bl sub_8079ED4 - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r7, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r7, 0x5] - ldrb r0, [r5, 0xE] - movs r4, 0x1 - orrs r0, r4 - strb r0, [r5, 0xE] - movs r2, 0x4 - ldrsh r0, [r5, r2] - movs r1, 0x80 - lsls r1, 8 - ands r0, r1 - cmp r0, 0 - beq _080DA678 - adds r3, r7, 0 - adds r3, 0x3F - ldrb r2, [r3] - lsls r1, r2, 31 - lsrs r1, 31 - movs r0, 0x1 - eors r1, r0 - ands r1, r4 - movs r0, 0x2 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - lsls r0, 31 - lsrs r0, 31 - adds r1, r7, 0 - adds r1, 0x2A - strb r0, [r1] - ldrb r0, [r3] - mov r1, r8 -_080DA66E: - orrs r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r3] -_080DA678: - ldrh r1, [r5, 0x2] - lsrs r1, 6 - lsls r1, 4 - ldrb r2, [r5] - movs r0, 0xF - ands r0, r2 - orrs r0, r1 - strb r0, [r5] - ldr r3, _080DA6E4 @ =gSineTable - ldrh r0, [r5, 0x2] - lsls r0, 1 - adds r0, r3 - movs r2, 0 - ldrsh r1, [r0, r2] - ldrb r0, [r5, 0xC] - muls r0, r1 - asrs r0, 8 - strh r0, [r7, 0x24] - ldrb r2, [r7, 0x3] - lsls r2, 26 - lsrs r2, 27 - movs r1, 0x24 - ldrsh r0, [r7, r1] - negs r0, r0 - asrs r0, 1 - ldrb r5, [r5, 0xA] - adds r0, r5 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 1 - adds r1, r3 - ldrh r4, [r1] - ldr r1, _080DA6E8 @ =gOamMatrices - lsls r2, 3 - adds r2, r1 - adds r0, 0x40 - lsls r0, 1 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r2, 0x6] - strh r0, [r2] - strh r4, [r2, 0x2] - lsls r0, r4, 16 - asrs r0, 16 - negs r0, r0 - strh r0, [r2, 0x4] - ldr r0, _080DA6EC @ =sub_80DA6F0 - str r0, [r7, 0x1C] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DA6E4: .4byte gSineTable -_080DA6E8: .4byte gOamMatrices -_080DA6EC: .4byte sub_80DA6F0 - thumb_func_end sub_80DA4D8 - - thumb_func_start sub_80DA6F0 -sub_80DA6F0: @ 80DA6F0 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r5, r0, 0 - movs r6, 0 - movs r0, 0x2E - adds r0, r5 - mov r12, r0 - ldrb r2, [r0] - movs r7, 0x1 - movs r1, 0x1 - mov r9, r1 - mov r0, r9 - ands r0, r2 - cmp r0, 0 - beq _080DA730 - mov r3, r12 - ldrb r0, [r3, 0x1] - adds r1, r0, 0 - adds r1, 0xFF - strb r1, [r3, 0x1] - lsls r0, 24 - cmp r0, 0 - beq _080DA724 - b _080DAD1A -_080DA724: - movs r0, 0x2 - negs r0, r0 - ands r0, r2 - strb r0, [r3] - strb r6, [r3, 0x1] - b _080DAD1A -_080DA730: - mov r4, r12 - ldrh r0, [r4, 0x2] - lsrs r4, r0, 6 - mov r8, r0 - cmp r4, 0x1 - bne _080DA73E - b _080DA896 -_080DA73E: - cmp r4, 0x1 - bgt _080DA748 - cmp r4, 0 - beq _080DA756 - b _080DAC52 -_080DA748: - cmp r4, 0x2 - bne _080DA74E - b _080DA9C8 -_080DA74E: - cmp r4, 0x3 - bne _080DA754 - b _080DAB0E -_080DA754: - b _080DAC52 -_080DA756: - lsls r1, r2, 24 - lsrs r0, r1, 28 - cmp r0, 0x1 - bne _080DA76C - movs r0, 0x8 - orrs r0, r2 - orrs r0, r7 - mov r1, r12 - strb r0, [r1] - strb r6, [r1, 0x1] - b _080DA88A -_080DA76C: - lsrs r0, r1, 28 - cmp r0, 0x3 - bne _080DA790 - lsls r0, r2, 30 - lsrs r0, 31 - movs r1, 0x1 - eors r0, r1 - ands r0, r7 - lsls r0, 1 - movs r1, 0x3 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - orrs r1, r7 - mov r2, r12 - strb r1, [r2] - strb r6, [r2, 0x1] - b _080DA88A -_080DA790: - movs r0, 0x8 - ands r0, r2 - cmp r0, 0 - beq _080DA88A - adds r3, r5, 0 - adds r3, 0x3F - ldrb r2, [r3] - lsls r1, r2, 31 - lsrs r1, 31 - movs r4, 0x1 - eors r1, r4 - ands r1, r7 - movs r6, 0x2 - negs r6, r6 - adds r0, r6, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - lsls r0, 31 - lsrs r0, 31 - adds r1, r5, 0 - adds r1, 0x2A - strb r0, [r1] - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r3] - mov r3, r12 - ldrb r1, [r3] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _080DA87A - ldr r0, _080DA80C @ =gMain - ldr r1, _080DA810 @ =0x0000043d - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080DA82E - ldrb r1, [r3, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _080DA814 - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - subs r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - b _080DA868 - .align 2, 0 -_080DA80C: .4byte gMain -_080DA810: .4byte 0x0000043d -_080DA814: - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - adds r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - b _080DA866 -_080DA82E: - mov r0, r12 - ldrb r1, [r0, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _080DA85C - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - subs r0, 0xC - strb r0, [r1] - mov r1, r12 - ldrb r2, [r1, 0xE] - lsls r0, r2, 31 - lsrs r0, 31 - eors r0, r4 - ands r0, r7 - adds r1, r6, 0 - ands r1, r2 - orrs r1, r0 - mov r2, r12 - strb r1, [r2, 0xE] - b _080DA87A -_080DA85C: - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - adds r0, 0xC - strb r0, [r1] -_080DA866: - mov r3, r12 -_080DA868: - ldrb r2, [r3, 0xE] - lsls r0, r2, 31 - lsrs r0, 31 - eors r0, r4 - ands r0, r7 - adds r1, r6, 0 - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0xE] -_080DA87A: - mov r4, r12 - ldrb r1, [r4] - movs r0, 0x9 - negs r0, r0 - ands r0, r1 - strb r0, [r4] - ldrh r0, [r4, 0x2] - mov r8, r0 -_080DA88A: - mov r2, r12 - ldrb r1, [r2] - movs r0, 0xF - ands r0, r1 - strb r0, [r2] - b _080DAC52 -_080DA896: - lsls r1, r2, 24 - lsrs r0, r1, 28 - cmp r0, 0 - bne _080DA8AC - movs r0, 0x8 - orrs r0, r2 - orrs r0, r7 - mov r3, r12 - strb r0, [r3] - strb r6, [r3, 0x1] - b _080DA9BC -_080DA8AC: - lsrs r0, r1, 28 - cmp r0, 0x2 - bne _080DA8BE - adds r0, r2, 0 - orrs r0, r7 - mov r4, r12 - strb r0, [r4] - strb r6, [r4, 0x1] - b _080DA9BC -_080DA8BE: - movs r0, 0x8 - ands r0, r2 - cmp r0, 0 - beq _080DA9BC - adds r3, r5, 0 - adds r3, 0x3F - ldrb r2, [r3] - lsls r1, r2, 31 - lsrs r1, 31 - movs r4, 0x1 - eors r1, r4 - ands r1, r7 - movs r6, 0x2 - negs r6, r6 - adds r0, r6, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - lsls r0, 31 - lsrs r0, 31 - adds r1, r5, 0 - adds r1, 0x2A - strb r0, [r1] - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r3] - mov r0, r12 - ldrb r1, [r0] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _080DA9AC - ldr r0, _080DA940 @ =gMain - ldr r1, _080DA944 @ =0x0000043d - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080DA962 - mov r2, r12 - ldrb r1, [r2, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _080DA948 - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - subs r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - mov r3, r12 - b _080DA978 - .align 2, 0 -_080DA940: .4byte gMain -_080DA944: .4byte 0x0000043d -_080DA948: - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - adds r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - b _080DA996 -_080DA962: - mov r3, r12 - ldrb r1, [r3, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _080DA98C - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - subs r0, 0xC - strb r0, [r1] -_080DA978: - ldrb r2, [r3, 0xE] - lsls r0, r2, 31 - lsrs r0, 31 - eors r0, r4 - ands r0, r7 - adds r1, r6, 0 - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0xE] - b _080DA9AC -_080DA98C: - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - adds r0, 0xC - strb r0, [r1] -_080DA996: - mov r0, r12 - ldrb r2, [r0, 0xE] - lsls r0, r2, 31 - lsrs r0, 31 - eors r0, r4 - ands r0, r7 - adds r1, r6, 0 - ands r1, r2 - orrs r1, r0 - mov r2, r12 - strb r1, [r2, 0xE] -_080DA9AC: - mov r3, r12 - ldrb r1, [r3] - movs r0, 0x9 - negs r0, r0 - ands r0, r1 - strb r0, [r3] - ldrh r4, [r3, 0x2] - mov r8, r4 -_080DA9BC: - mov r1, r12 - ldrb r0, [r1] - movs r1, 0xF - ands r1, r0 - movs r0, 0x10 - b _080DAC4C -_080DA9C8: - lsls r1, r2, 24 - lsrs r0, r1, 28 - cmp r0, 0x3 - bne _080DA9DE - movs r0, 0x8 - orrs r0, r2 - orrs r0, r7 - mov r3, r12 - strb r0, [r3] - strb r6, [r3, 0x1] - b _080DAAFE -_080DA9DE: - lsrs r0, r1, 28 - cmp r0, 0x1 - bne _080DA9F0 - adds r0, r2, 0 - orrs r0, r7 - mov r4, r12 - strb r0, [r4] - strb r6, [r4, 0x1] - b _080DAAFE -_080DA9F0: - movs r0, 0x8 - ands r0, r2 - cmp r0, 0 - bne _080DA9FA - b _080DAAFE -_080DA9FA: - adds r3, r5, 0 - adds r3, 0x3F - ldrb r2, [r3] - lsls r1, r2, 31 - lsrs r1, 31 - movs r6, 0x1 - eors r1, r6 - ands r1, r7 - movs r0, 0x2 - negs r0, r0 - mov r8, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - lsls r0, 31 - lsrs r0, 31 - adds r1, r5, 0 - adds r1, 0x2A - strb r0, [r1] - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r3] - mov r2, r12 - ldrb r1, [r2] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _080DAAEC - ldr r0, _080DAA6C @ =gMain - ldr r3, _080DAA70 @ =0x0000043d - adds r0, r3 - ldrb r0, [r0] - ands r4, r0 - cmp r4, 0 - beq _080DAAA4 - ldrb r1, [r2, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _080DAA74 - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - subs r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - b _080DAAD8 - .align 2, 0 -_080DAA6C: .4byte gMain -_080DAA70: .4byte 0x0000043d -_080DAA74: - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - adds r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - mov r0, r12 - ldrb r2, [r0, 0xE] - lsls r0, r2, 31 - lsrs r0, 31 - eors r0, r6 - ands r0, r7 - mov r1, r8 - ands r1, r2 - orrs r1, r0 - mov r2, r12 - strb r1, [r2, 0xE] - b _080DAAEC -_080DAAA4: - mov r3, r12 - ldrb r1, [r3, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _080DAACE - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - subs r0, 0xC - strb r0, [r1] - ldrb r2, [r3, 0xE] - lsls r0, r2, 31 - lsrs r0, 31 - eors r0, r6 - ands r0, r7 - mov r1, r8 - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0xE] - b _080DAAEC -_080DAACE: - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - adds r0, 0xC - strb r0, [r1] -_080DAAD8: - mov r4, r12 - ldrb r2, [r4, 0xE] - lsls r0, r2, 31 - lsrs r0, 31 - eors r0, r6 - ands r0, r7 - mov r1, r8 - ands r1, r2 - orrs r1, r0 - strb r1, [r4, 0xE] -_080DAAEC: - mov r0, r12 - ldrb r1, [r0] - movs r0, 0x9 - negs r0, r0 - ands r0, r1 - mov r1, r12 - strb r0, [r1] - ldrh r2, [r1, 0x2] - mov r8, r2 -_080DAAFE: - mov r3, r12 - ldrb r0, [r3] - movs r1, 0xF - ands r1, r0 - movs r0, 0x20 - orrs r1, r0 - strb r1, [r3] - b _080DAC52 -_080DAB0E: - lsls r1, r2, 24 - lsrs r0, r1, 28 - cmp r0, 0x2 - bne _080DAB20 - movs r0, 0x8 - orrs r0, r2 - mov r4, r12 - strb r0, [r4] - b _080DAC42 -_080DAB20: - lsrs r0, r1, 28 - cmp r0, 0 - bne _080DAB44 - lsls r0, r2, 30 - lsrs r0, 31 - movs r1, 0x1 - eors r0, r1 - ands r0, r7 - lsls r0, 1 - movs r1, 0x3 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - orrs r1, r7 - mov r0, r12 - strb r1, [r0] - strb r6, [r0, 0x1] - b _080DAC42 -_080DAB44: - movs r0, 0x8 - ands r0, r2 - cmp r0, 0 - beq _080DAC42 - adds r3, r5, 0 - adds r3, 0x3F - ldrb r2, [r3] - lsls r1, r2, 31 - lsrs r1, 31 - movs r4, 0x1 - eors r1, r4 - ands r1, r7 - movs r6, 0x2 - negs r6, r6 - adds r0, r6, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - lsls r0, 31 - lsrs r0, 31 - adds r1, r5, 0 - adds r1, 0x2A - strb r0, [r1] - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r3] - mov r2, r12 - ldrb r1, [r2] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _080DAC32 - ldr r0, _080DABC4 @ =gMain - ldr r3, _080DABC8 @ =0x0000043d - adds r0, r3 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080DABE6 - ldrb r1, [r2, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _080DABCC - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - subs r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - mov r0, r12 - ldrb r2, [r0, 0xE] - b _080DAC00 - .align 2, 0 -_080DABC4: .4byte gMain -_080DABC8: .4byte 0x0000043d -_080DABCC: - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - adds r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - b _080DAC1E -_080DABE6: - mov r0, r12 - ldrb r1, [r0, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _080DAC14 - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - subs r0, 0xC - strb r0, [r1] - mov r1, r12 - ldrb r2, [r1, 0xE] -_080DAC00: - lsls r0, r2, 31 - lsrs r0, 31 - eors r0, r4 - ands r0, r7 - adds r1, r6, 0 - ands r1, r2 - orrs r1, r0 - mov r2, r12 - strb r1, [r2, 0xE] - b _080DAC32 -_080DAC14: - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - adds r0, 0xC - strb r0, [r1] -_080DAC1E: - mov r3, r12 - ldrb r2, [r3, 0xE] - lsls r0, r2, 31 - lsrs r0, 31 - eors r0, r4 - ands r0, r7 - adds r1, r6, 0 - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0xE] -_080DAC32: - mov r4, r12 - ldrb r1, [r4] - movs r0, 0x9 - negs r0, r0 - ands r0, r1 - strb r0, [r4] - ldrh r0, [r4, 0x2] - mov r8, r0 -_080DAC42: - mov r1, r12 - ldrb r0, [r1] - movs r1, 0xF - ands r1, r0 - movs r0, 0x30 -_080DAC4C: - orrs r1, r0 - mov r2, r12 - strb r1, [r2] -_080DAC52: - mov r3, r12 - ldrb r1, [r3] - lsls r1, 30 - lsrs r1, 31 - mov r0, r12 - adds r0, 0xC - adds r0, r1 - ldrb r1, [r0] - ldr r3, _080DACE0 @ =gSineTable - mov r4, r8 - lsls r0, r4, 1 - adds r0, r3 - movs r2, 0 - ldrsh r0, [r0, r2] - muls r0, r1 - asrs r0, 8 - strh r0, [r5, 0x24] - ldrb r2, [r5, 0x3] - lsls r2, 26 - lsrs r2, 27 - movs r4, 0x24 - ldrsh r0, [r5, r4] - negs r0, r0 - asrs r0, 1 - mov r1, r12 - ldrb r1, [r1, 0xA] - adds r0, r1 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 1 - adds r1, r3 - ldrh r6, [r1] - ldr r1, _080DACE4 @ =gOamMatrices - lsls r2, 3 - adds r2, r1 - adds r0, 0x40 - lsls r0, 1 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r2, 0x6] - strh r0, [r2] - strh r6, [r2, 0x2] - lsls r0, r6, 16 - asrs r0, 16 - negs r0, r0 - strh r0, [r2, 0x4] - mov r2, r12 - ldrh r0, [r2, 0x6] - ldrh r3, [r2, 0x8] - adds r0, r3 - strh r0, [r2, 0x8] - lsls r0, 16 - lsrs r0, 24 - strh r0, [r5, 0x22] - movs r4, 0x4 - ldrsh r0, [r2, r4] - movs r1, 0x80 - lsls r1, 8 - ands r0, r1 - cmp r0, 0 - beq _080DACE8 - ldrh r0, [r2, 0x4] - subs r1, 0x1 - ands r1, r0 - ldrh r0, [r2, 0x2] - subs r0, r1 - movs r1, 0xFF - ands r0, r1 - strh r0, [r2, 0x2] - b _080DACFE - .align 2, 0 -_080DACE0: .4byte gSineTable -_080DACE4: .4byte gOamMatrices -_080DACE8: - mov r1, r12 - ldrh r0, [r1, 0x4] - ldr r1, _080DAD28 @ =0x00007fff - ands r1, r0 - mov r2, r12 - ldrh r2, [r2, 0x2] - adds r1, r2 - movs r0, 0xFF - ands r1, r0 - mov r3, r12 - strh r1, [r3, 0x2] -_080DACFE: - movs r4, 0x22 - ldrsh r1, [r5, r4] - movs r2, 0x26 - ldrsh r0, [r5, r2] - adds r1, r0 - mov r3, r12 - ldrh r0, [r3, 0xE] - lsrs r0, 1 - cmp r1, r0 - blt _080DAD1A - movs r0, 0 - strh r0, [r5, 0x2E] - ldr r0, _080DAD2C @ =sub_80DA48C - str r0, [r5, 0x1C] -_080DAD1A: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DAD28: .4byte 0x00007fff -_080DAD2C: .4byte sub_80DA48C - thumb_func_end sub_80DA6F0 - - thumb_func_start sub_80DAD30 -sub_80DAD30: @ 80DAD30 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r0, _080DAD78 @ =gAnimBankTarget - ldrb r0, [r0] - bl sub_8079ED4 - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r4, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r4, 0x5] - ldr r5, _080DAD7C @ =gAnimBankAttacker - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x20] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x22] - ldr r0, _080DAD80 @ =TranslateAnimSpriteToTargetMonLocation - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DAD78: .4byte gAnimBankTarget -_080DAD7C: .4byte gAnimBankAttacker -_080DAD80: .4byte TranslateAnimSpriteToTargetMonLocation - thumb_func_end sub_80DAD30 - - thumb_func_start sub_80DAD84 -sub_80DAD84: @ 80DAD84 - push {r4-r7,lr} - adds r4, r0, 0 - ldr r5, _080DADCC @ =gBattleAnimArgs - ldrh r0, [r5] - strh r0, [r4, 0x30] - ldrh r0, [r5, 0x2] - strh r0, [r4, 0x32] - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x34] - ldr r0, _080DADD0 @ =gMain - ldr r1, _080DADD4 @ =0x0000043d - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080DAE44 - ldr r0, _080DADD8 @ =gBanksBySide - ldr r1, _080DADDC @ =gAnimBankTarget - ldrb r2, [r1] - adds r0, r2, r0 - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080DADE0 - adds r0, r2, 0 - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r5, [r5, 0x6] - adds r0, r5 - b _080DADEE - .align 2, 0 -_080DADCC: .4byte gBattleAnimArgs -_080DADD0: .4byte gMain -_080DADD4: .4byte 0x0000043d -_080DADD8: .4byte gBanksBySide -_080DADDC: .4byte gAnimBankTarget -_080DADE0: - adds r0, r2, 0 - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x28 -_080DADEE: - strh r0, [r4, 0x3C] - ldr r0, _080DAE1C @ =gBattleAnimArgs - movs r1, 0x8 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _080DAE24 - ldr r0, _080DAE20 @ =gAnimBankTarget - ldrb r0, [r0] - bl sub_8079ED4 - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x1 - movs r1, 0x3 - ands r0, r1 - lsls r0, 2 - ldrb r2, [r4, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r4, 0x5] - b _080DAE58 - .align 2, 0 -_080DAE1C: .4byte gBattleAnimArgs -_080DAE20: .4byte gAnimBankTarget -_080DAE24: - ldr r0, _080DAE40 @ =gAnimBankTarget - ldrb r0, [r0] - bl sub_8079ED4 - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r4, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r4, 0x5] - b _080DAE58 - .align 2, 0 -_080DAE40: .4byte gAnimBankTarget -_080DAE44: - ldr r0, _080DAEFC @ =gAnimBankTarget - ldrb r0, [r0] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r5, [r5, 0x6] - adds r0, r5 - strh r0, [r4, 0x3C] -_080DAE58: - ldr r5, _080DAF00 @ =gSineTable - ldrh r3, [r4, 0x30] - movs r1, 0xFF - ands r1, r3 - lsls r0, r1, 1 - adds r0, r5 - ldrh r0, [r0] - movs r2, 0 - strh r0, [r4, 0x36] - adds r1, 0x40 - lsls r1, 1 - adds r1, r5 - ldrh r0, [r1] - negs r0, r0 - strh r0, [r4, 0x38] - strh r2, [r4, 0x3A] - strh r2, [r4, 0x26] - strh r2, [r4, 0x24] - ldrb r0, [r4, 0x3] - lsls r0, 26 - lsrs r6, r0, 27 - lsls r3, 16 - lsrs r3, 24 - strh r3, [r4, 0x30] - bl Random - lsls r0, 16 - asrs r7, r0, 16 - movs r0, 0x80 - lsls r0, 8 - ands r0, r7 - cmp r0, 0 - beq _080DAEA2 - ldrh r1, [r4, 0x30] - movs r0, 0xFF - subs r0, r1 - strh r0, [r4, 0x30] -_080DAEA2: - movs r0, 0x30 - ldrsh r1, [r4, r0] - lsls r0, r1, 1 - adds r0, r5 - ldrh r0, [r0] - ldr r3, _080DAF04 @ =gOamMatrices - lsls r2, r6, 3 - adds r2, r3 - adds r1, 0x40 - lsls r1, 1 - adds r1, r5 - ldrh r1, [r1] - strh r1, [r2, 0x6] - strh r1, [r2] - strh r0, [r2, 0x2] - lsls r0, 16 - asrs r0, 16 - negs r0, r0 - strh r0, [r2, 0x4] - adds r3, r4, 0 - adds r3, 0x3F - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r3] - movs r0, 0x1 - ands r0, r7 - cmp r0, 0 - beq _080DAEF2 - adds r2, r4, 0 - adds r2, 0x2A - movs r1, 0x1 - movs r0, 0x1 - strb r0, [r2] - ldrb r0, [r3] - orrs r0, r1 - strb r0, [r3] -_080DAEF2: - ldr r0, _080DAF08 @ =sub_80DAF0C - str r0, [r4, 0x1C] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DAEFC: .4byte gAnimBankTarget -_080DAF00: .4byte gSineTable -_080DAF04: .4byte gOamMatrices -_080DAF08: .4byte sub_80DAF0C - thumb_func_end sub_80DAD84 - - thumb_func_start sub_80DAF0C -sub_80DAF0C: @ 80DAF0C - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x10 - adds r4, r0, 0 - adds r5, r4, 0 - adds r5, 0x2E - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - movs r1, 0 - mov r8, r1 - movs r7, 0 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _080DAFF0 - movs r2, 0x36 - ldrsh r1, [r4, r2] - movs r2, 0x3A - ldrsh r0, [r4, r2] - muls r0, r1 - asrs r6, r0, 8 - strh r6, [r4, 0x24] - movs r0, 0x38 - ldrsh r1, [r4, r0] - movs r2, 0x3A - ldrsh r0, [r4, r2] - muls r0, r1 - asrs r3, r0, 8 - strh r3, [r4, 0x26] - ldrh r2, [r4, 0x34] - movs r1, 0xFF - adds r0, r1, 0 - ands r0, r2 - ldrh r2, [r4, 0x3A] - adds r0, r2 - strh r0, [r4, 0x3A] - ldrh r2, [r4, 0x32] - lsls r0, 16 - asrs r0, 16 - ands r1, r2 - cmp r0, r1 - blt _080DAFF0 - ldrh r0, [r4, 0x20] - adds r0, r6 - strh r0, [r4, 0x20] - ldrh r0, [r4, 0x22] - adds r0, r3 - strh r0, [r4, 0x22] - strh r7, [r4, 0x24] - strh r7, [r4, 0x26] - mov r0, sp - adds r1, r5, 0 - movs r2, 0x10 - bl memcpy - adds r0, r5, 0 - movs r1, 0 - movs r2, 0x10 - bl memset - ldrh r0, [r4, 0x22] - lsls r0, 8 - strh r0, [r5, 0x8] - mov r0, sp - ldrh r0, [r0, 0x6] - lsrs r1, r0, 8 - strh r1, [r5, 0x6] - strh r7, [r5, 0x2] - mov r0, sp - ldrh r0, [r0, 0x2] - strh r0, [r5, 0xA] - adds r0, r4, 0 - adds r0, 0x2A - ldrb r0, [r0] - cmp r0, 0 - beq _080DAFC0 - movs r0, 0x8 - ands r1, r0 - cmp r1, 0 - beq _080DAFB8 - ldr r0, _080DAFB4 @ =0x00008001 - b _080DAFCE - .align 2, 0 -_080DAFB4: .4byte 0x00008001 -_080DAFB8: - ldr r0, _080DAFBC @ =0x00008002 - b _080DAFCE - .align 2, 0 -_080DAFBC: .4byte 0x00008002 -_080DAFC0: - movs r0, 0x8 - ands r1, r0 - cmp r1, 0 - beq _080DAFCC - movs r0, 0x1 - b _080DAFCE -_080DAFCC: - movs r0, 0x2 -_080DAFCE: - strh r0, [r5, 0x4] - mov r0, sp - ldrh r0, [r0, 0x4] - lsrs r0, 8 - strb r0, [r5, 0xC] - subs r0, 0x2 - strb r0, [r5, 0xD] - mov r0, sp - ldrh r1, [r0, 0xE] - lsls r1, 1 - ldrh r2, [r5, 0xE] - movs r0, 0x1 - ands r0, r2 - orrs r0, r1 - strh r0, [r5, 0xE] - ldr r0, _080DAFFC @ =sub_80DA6F0 - str r0, [r4, 0x1C] -_080DAFF0: - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DAFFC: .4byte sub_80DA6F0 - thumb_func_end sub_80DAF0C - - thumb_func_start sub_80DB000 -sub_80DB000: @ 80DB000 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, _080DB018 @ =gBattleAnimArgs - movs r1, 0x4 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _080DB01C - adds r0, r5, 0 - movs r1, 0 - bl InitAnimSpritePos - b _080DB024 - .align 2, 0 -_080DB018: .4byte gBattleAnimArgs -_080DB01C: - adds r0, r5, 0 - movs r1, 0 - bl sub_8078764 -_080DB024: - ldr r4, _080DB08C @ =gBattleAnimArgs - movs r2, 0x4 - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _080DB03C - ldr r0, _080DB090 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _080DB052 -_080DB03C: - movs r1, 0x4 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - bne _080DB058 - ldr r0, _080DB094 @ =gAnimBankTarget - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _080DB058 -_080DB052: - ldrh r0, [r5, 0x20] - adds r0, 0x8 - strh r0, [r5, 0x20] -_080DB058: - ldr r4, _080DB08C @ =gBattleAnimArgs - ldrb r1, [r4, 0x8] - adds r0, r5, 0 - bl SeekSpriteAnim - ldrh r0, [r5, 0x20] - subs r0, 0x20 - strh r0, [r5, 0x20] - ldr r0, _080DB098 @ =0x00000ccc - strh r0, [r5, 0x30] - ldrh r1, [r4, 0x8] - movs r0, 0xC - adds r2, r0, 0 - muls r2, r1 - adds r0, r2, 0 - ldrh r2, [r5, 0x24] - adds r0, r2 - strh r0, [r5, 0x24] - strh r1, [r5, 0x2E] - ldrh r0, [r4, 0x6] - strh r0, [r5, 0x3C] - ldr r0, _080DB09C @ =sub_80DB0A0 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DB08C: .4byte gBattleAnimArgs -_080DB090: .4byte gAnimBankAttacker -_080DB094: .4byte gAnimBankTarget -_080DB098: .4byte 0x00000ccc -_080DB09C: .4byte sub_80DB0A0 - thumb_func_end sub_80DB000 - - thumb_func_start sub_80DB0A0 -sub_80DB0A0: @ 80DB0A0 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 24 - ldrh r1, [r4, 0x24] - adds r0, r1 - movs r1, 0 - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6 - bne _080DB0CA - strh r1, [r4, 0x2E] - strh r1, [r4, 0x24] - adds r0, r4, 0 - bl StartSpriteAnim -_080DB0CA: - ldrh r0, [r4, 0x3C] - subs r0, 0x1 - strh r0, [r4, 0x3C] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _080DB0E2 - adds r0, r4, 0 - bl DestroyAnimSprite -_080DB0E2: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DB0A0 - - thumb_func_start sub_80DB0E8 -sub_80DB0E8: @ 80DB0E8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r0, 24 - adds r6, r0, 0 - ldr r1, _080DB180 @ =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r7, r0, r1 - ldrh r0, [r7, 0x8] - movs r1, 0x1F - ands r0, r1 - cmp r0, 0 - bne _080DB162 - ldr r1, _080DB184 @ =gAnimVisualTaskCount - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - movs r1, 0x8 - ldrsh r0, [r7, r1] - movs r5, 0xD - negs r5, r5 - adds r1, r5, 0 - bl Sin - ldr r4, _080DB188 @ =gBattleAnimArgs - strh r0, [r4] - movs r1, 0x8 - ldrsh r0, [r7, r1] - adds r1, r5, 0 - bl Cos - strh r0, [r4, 0x2] - movs r0, 0x1 - strh r0, [r4, 0x4] - movs r0, 0x3 - strh r0, [r4, 0x6] - ldr r0, _080DB18C @ =gBattleAnimSpriteTemplate_83DB538 - mov r8, r0 - ldr r5, _080DB190 @ =gAnimBankTarget - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldrb r0, [r5] - movs r1, 0x3 - bl GetBattlerSpriteCoord - adds r2, r0, 0 - lsls r2, 24 - lsrs r2, 24 - mov r0, r8 - adds r1, r4, 0 - movs r3, 0x3 - bl CreateSpriteAndAnimate -_080DB162: - ldrh r0, [r7, 0x8] - adds r0, 0x8 - strh r0, [r7, 0x8] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xFF - ble _080DB176 - adds r0, r6, 0 - bl DestroyAnimVisualTask -_080DB176: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DB180: .4byte gTasks -_080DB184: .4byte gAnimVisualTaskCount -_080DB188: .4byte gBattleAnimArgs -_080DB18C: .4byte gBattleAnimSpriteTemplate_83DB538 -_080DB190: .4byte gAnimBankTarget - thumb_func_end sub_80DB0E8 - - thumb_func_start sub_80DB194 -sub_80DB194: @ 80DB194 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080DB1A6 - cmp r0, 0x1 - beq _080DB1D8 - b _080DB1EC -_080DB1A6: - adds r0, r4, 0 - movs r1, 0x1 - bl InitAnimSpritePos - movs r0, 0 - bl GetAnimBattlerSpriteId - ldr r2, _080DB1D4 @ =gSprites - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _080DB1EC - .align 2, 0 -_080DB1D4: .4byte gSprites -_080DB1D8: - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _080DB1EC - adds r0, r4, 0 - bl DestroyAnimSprite -_080DB1EC: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DB194 - - thumb_func_start sub_80DB1F4 -sub_80DB1F4: @ 80DB1F4 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080DB22C - cmp r0, 0x1 - bgt _080DB20A - cmp r0, 0 - beq _080DB210 - b _080DB27E -_080DB20A: - cmp r0, 0x2 - beq _080DB240 - b _080DB27E -_080DB210: - ldr r0, _080DB228 @ =gAnimBankTarget - ldrb r0, [r0] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x22] - negs r0, r0 - subs r0, 0x20 - strh r0, [r4, 0x26] - b _080DB238 - .align 2, 0 -_080DB228: .4byte gAnimBankTarget -_080DB22C: - ldrh r0, [r4, 0x26] - adds r0, 0xA - strh r0, [r4, 0x26] - lsls r0, 16 - cmp r0, 0 - blt _080DB27E -_080DB238: - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _080DB27E -_080DB240: - ldrh r0, [r4, 0x26] - subs r0, 0xA - strh r0, [r4, 0x26] - movs r2, 0x22 - ldrsh r0, [r4, r2] - movs r2, 0x26 - ldrsh r1, [r4, r2] - adds r0, r1 - movs r1, 0x20 - negs r1, r1 - cmp r0, r1 - bge _080DB27E - movs r0, 0 - bl GetAnimBattlerSpriteId - ldr r2, _080DB284 @ =gSprites - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - adds r1, 0x3E - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - adds r0, r4, 0 - bl DestroyAnimSprite -_080DB27E: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DB284: .4byte gSprites - thumb_func_end sub_80DB1F4 - - thumb_func_start sub_80DB288 -sub_80DB288: @ 80DB288 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl InitAnimSpritePos - ldr r1, _080DB2C4 @ =gBattleAnimArgs - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x2E] - ldrh r0, [r1, 0x6] - strh r0, [r4, 0x30] - ldr r0, _080DB2C8 @ =sub_80DB2D0 - str r0, [r4, 0x1C] - movs r0, 0 - bl GetAnimBattlerSpriteId - ldr r2, _080DB2CC @ =gSprites - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DB2C4: .4byte gBattleAnimArgs -_080DB2C8: .4byte sub_80DB2D0 -_080DB2CC: .4byte gSprites - thumb_func_end sub_80DB288 - - thumb_func_start sub_80DB2D0 -sub_80DB2D0: @ 80DB2D0 - push {lr} - adds r2, r0, 0 - ldrh r1, [r2, 0x2E] - movs r3, 0x2E - ldrsh r0, [r2, r3] - cmp r0, 0 - ble _080DB2E4 - subs r0, r1, 0x1 - strh r0, [r2, 0x2E] - b _080DB328 -_080DB2E4: - movs r1, 0x22 - ldrsh r0, [r2, r1] - movs r3, 0x26 - ldrsh r1, [r2, r3] - adds r0, r1 - movs r1, 0x20 - negs r1, r1 - cmp r0, r1 - ble _080DB30A - ldrh r0, [r2, 0x30] - ldrh r1, [r2, 0x32] - adds r0, r1 - strh r0, [r2, 0x32] - lsls r0, 16 - asrs r0, 24 - ldrh r1, [r2, 0x26] - subs r1, r0 - strh r1, [r2, 0x26] - b _080DB328 -_080DB30A: - adds r3, r2, 0 - adds r3, 0x3E - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r3] - ldrh r0, [r2, 0x34] - adds r1, r0, 0x1 - strh r1, [r2, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x14 - ble _080DB328 - ldr r0, _080DB32C @ =sub_80DB330 - str r0, [r2, 0x1C] -_080DB328: - pop {r0} - bx r0 - .align 2, 0 -_080DB32C: .4byte sub_80DB330 - thumb_func_end sub_80DB2D0 - - thumb_func_start sub_80DB330 -sub_80DB330: @ 80DB330 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x32] - lsls r0, 16 - asrs r0, 24 - ldrh r1, [r2, 0x26] - adds r0, r1 - strh r0, [r2, 0x26] - movs r3, 0x22 - ldrsh r0, [r2, r3] - movs r3, 0x26 - ldrsh r1, [r2, r3] - adds r0, r1 - movs r1, 0x20 - negs r1, r1 - cmp r0, r1 - ble _080DB360 - adds r3, r2, 0 - adds r3, 0x3E - ldrb r1, [r3] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r3] -_080DB360: - movs r1, 0x26 - ldrsh r0, [r2, r1] - cmp r0, 0 - ble _080DB36E - adds r0, r2, 0 - bl DestroyAnimSprite -_080DB36E: - pop {r0} - bx r0 - thumb_func_end sub_80DB330 - - thumb_func_start sub_80DB374 -sub_80DB374: @ 80DB374 - push {r4,r5,lr} - sub sp, 0x4 - adds r5, r0, 0 - movs r1, 0x2E - ldrsh r0, [r5, r1] - cmp r0, 0 - beq _080DB388 - cmp r0, 0x1 - beq _080DB3E0 - b _080DB44C -_080DB388: - ldr r0, _080DB398 @ =gBattleAnimArgs - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r0, 0 - bne _080DB3A0 - ldr r4, _080DB39C @ =gAnimBankAttacker - b _080DB3A2 - .align 2, 0 -_080DB398: .4byte gBattleAnimArgs -_080DB39C: .4byte gAnimBankAttacker -_080DB3A0: - ldr r4, _080DB3DC @ =gAnimBankTarget -_080DB3A2: - ldrb r0, [r4] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - movs r0, 0 - movs r3, 0x80 - lsls r3, 2 - strh r3, [r5, 0x30] - movs r2, 0x80 - lsls r2, 1 - str r0, [sp] - adds r0, r5, 0 - movs r1, 0 - bl sub_8078FDC - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - b _080DB44C - .align 2, 0 -_080DB3DC: .4byte gAnimBankTarget -_080DB3E0: - movs r1, 0x32 - ldrsh r0, [r5, r1] - cmp r0, 0xB - bgt _080DB3EE - ldrh r0, [r5, 0x30] - subs r0, 0x28 - b _080DB3F2 -_080DB3EE: - ldrh r0, [r5, 0x30] - adds r0, 0x28 -_080DB3F2: - strh r0, [r5, 0x30] - ldrh r0, [r5, 0x32] - adds r0, 0x1 - movs r1, 0 - strh r0, [r5, 0x32] - movs r2, 0x80 - lsls r2, 1 - movs r0, 0x30 - ldrsh r3, [r5, r0] - str r1, [sp] - adds r0, r5, 0 - bl sub_8078FDC - ldrb r1, [r5, 0x3] - lsls r1, 26 - lsrs r1, 27 - movs r0, 0xF4 - lsls r0, 6 - ldr r2, _080DB454 @ =gOamMatrices - lsls r1, 3 - adds r1, r2 - movs r2, 0x6 - ldrsh r1, [r1, r2] - bl __divsi3 - adds r1, r0, 0x1 - cmp r1, 0x80 - ble _080DB42C - movs r1, 0x80 -_080DB42C: - movs r0, 0x40 - subs r0, r1 - lsrs r1, r0, 31 - adds r0, r1 - asrs r1, r0, 1 - strh r1, [r5, 0x26] - movs r1, 0x32 - ldrsh r0, [r5, r1] - cmp r0, 0x18 - bne _080DB44C - adds r0, r5, 0 - bl sub_8079098 - adds r0, r5, 0 - bl DestroyAnimSprite -_080DB44C: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DB454: .4byte gOamMatrices - thumb_func_end sub_80DB374 - - thumb_func_start sub_80DB458 -sub_80DB458: @ 80DB458 - push {r4,r5,lr} - adds r5, r0, 0 - bl Random - ldr r4, _080DB47C @ =0x000001ff - ands r4, r0 - bl Random - movs r1, 0x7F - ands r1, r0 - movs r0, 0x1 - ands r0, r4 - cmp r0, 0 - beq _080DB480 - movs r2, 0xB8 - lsls r2, 2 - adds r0, r4, r2 - b _080DB488 - .align 2, 0 -_080DB47C: .4byte 0x000001ff -_080DB480: - movs r2, 0xB8 - lsls r2, 2 - adds r0, r2, 0 - subs r0, r4 -_080DB488: - strh r0, [r5, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080DB49C - movs r2, 0xE0 - lsls r2, 2 - adds r0, r2, 0 - adds r0, r1, r0 - b _080DB4A4 -_080DB49C: - movs r2, 0xE0 - lsls r2, 2 - adds r0, r2, 0 - subs r0, r1 -_080DB4A4: - strh r0, [r5, 0x30] - ldr r2, _080DB4CC @ =gBattleAnimArgs - ldrh r0, [r2] - strh r0, [r5, 0x32] - lsls r0, 16 - cmp r0, 0 - beq _080DB4C0 - ldrb r0, [r5, 0x3] - movs r1, 0x3F - negs r1, r1 - ands r1, r0 - movs r0, 0x10 - orrs r1, r0 - strb r1, [r5, 0x3] -_080DB4C0: - movs r1, 0x2 - ldrsh r0, [r2, r1] - cmp r0, 0 - bne _080DB4D4 - ldr r4, _080DB4D0 @ =gAnimBankAttacker - b _080DB4D6 - .align 2, 0 -_080DB4CC: .4byte gBattleAnimArgs -_080DB4D0: .4byte gAnimBankAttacker -_080DB4D4: - ldr r4, _080DB500 @ =gAnimBankTarget -_080DB4D6: - ldrb r0, [r4] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x20 - strh r0, [r5, 0x22] - ldr r0, _080DB504 @ =sub_80DB508 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DB500: .4byte gAnimBankTarget -_080DB504: .4byte sub_80DB508 - thumb_func_end sub_80DB458 - - thumb_func_start sub_80DB508 -sub_80DB508: @ 80DB508 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x32 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080DB520 - ldrh r3, [r4, 0x2E] - lsls r0, r3, 16 - asrs r0, 24 - ldrh r1, [r4, 0x24] - adds r0, r1 - b _080DB52A -_080DB520: - ldrh r3, [r4, 0x2E] - lsls r1, r3, 16 - asrs r1, 24 - ldrh r0, [r4, 0x24] - subs r0, r1 -_080DB52A: - strh r0, [r4, 0x24] - ldrh r2, [r4, 0x30] - lsls r1, r2, 16 - asrs r1, 24 - ldrh r0, [r4, 0x26] - subs r0, r1 - strh r0, [r4, 0x26] - strh r3, [r4, 0x2E] - adds r0, r2, 0 - subs r0, 0x20 - strh r0, [r4, 0x30] - lsls r0, r3, 16 - cmp r0, 0 - bge _080DB54A - movs r0, 0 - strh r0, [r4, 0x2E] -_080DB54A: - ldrh r0, [r4, 0x34] - adds r0, 0x1 - strh r0, [r4, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1F - bne _080DB55E - adds r0, r4, 0 - bl DestroyAnimSprite -_080DB55E: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DB508 - - thumb_func_start sub_80DB564 -sub_80DB564: @ 80DB564 - movs r1, 0 - strh r1, [r0, 0x3A] - movs r1, 0x40 - strh r1, [r0, 0x3C] - ldr r1, _080DB574 @ =sub_80DB578 - str r1, [r0, 0x1C] - bx lr - .align 2, 0 -_080DB574: .4byte sub_80DB578 - thumb_func_end sub_80DB564 - - thumb_func_start sub_80DB578 -sub_80DB578: @ 80DB578 - push {lr} - adds r3, r0, 0 - movs r0, 0x2E - ldrsh r1, [r3, r0] - cmp r1, 0 - beq _080DB58A - cmp r1, 0x1 - beq _080DB5D8 - b _080DB5DE -_080DB58A: - ldrh r0, [r3, 0x30] - adds r0, 0x1 - strh r0, [r3, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - ble _080DB5DE - strh r1, [r3, 0x30] - movs r1, 0x3E - adds r1, r3 - mov r12, r1 - ldrb r2, [r1] - lsls r0, r2, 29 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - mov r1, r12 - strb r0, [r1] - ldrh r0, [r3, 0x32] - adds r0, 0x1 - strh r0, [r3, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - ble _080DB5DE - ldrb r1, [r1] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _080DB5DE - ldrh r0, [r3, 0x2E] - adds r0, 0x1 - strh r0, [r3, 0x2E] - b _080DB5DE -_080DB5D8: - adds r0, r3, 0 - bl DestroyAnimSprite -_080DB5DE: - pop {r0} - bx r0 - thumb_func_end sub_80DB578 - - thumb_func_start sub_80DB5E4 -sub_80DB5E4: @ 80DB5E4 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - sub sp, 0x4 - mov r8, r0 - ldrh r4, [r0, 0x20] - ldrh r5, [r0, 0x22] - ldr r6, _080DB698 @ =gAnimBankAttacker - ldrb r0, [r6] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - mov r1, r8 - strh r0, [r1, 0x20] - ldrb r0, [r6] - movs r1, 0x3 - bl GetBattlerSpriteCoord - adds r6, r0, 0 - lsls r6, 24 - lsrs r6, 24 - mov r2, r8 - strh r6, [r2, 0x22] - ldrh r0, [r2, 0x20] - mov r9, r0 - mov r1, r9 - lsls r0, r1, 4 - strh r0, [r2, 0x36] - lsls r0, r6, 4 - strh r0, [r2, 0x38] - lsls r4, 16 - asrs r4, 16 - movs r1, 0x20 - ldrsh r0, [r2, r1] - subs r0, r4, r0 - lsls r0, 4 - movs r1, 0xC - bl __divsi3 - mov r2, r8 - strh r0, [r2, 0x3A] - lsls r5, 16 - asrs r5, 16 - movs r1, 0x22 - ldrsh r0, [r2, r1] - subs r0, r5, r0 - lsls r0, 4 - movs r1, 0xC - bl __divsi3 - mov r2, r8 - strh r0, [r2, 0x3C] - mov r0, r9 - subs r4, r0 - lsls r4, 16 - asrs r4, 16 - subs r5, r6 - lsls r5, 16 - asrs r5, 16 - adds r0, r4, 0 - adds r1, r5, 0 - bl ArcTan2Neg - lsls r0, 16 - movs r1, 0xC0 - lsls r1, 24 - adds r0, r1 - lsrs r0, 16 - movs r3, 0x80 - lsls r3, 1 - str r0, [sp] - mov r0, r8 - movs r1, 0x1 - adds r2, r3, 0 - bl sub_8078FDC - ldr r0, _080DB69C @ =sub_80DB6A0 - mov r2, r8 - str r0, [r2, 0x1C] - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DB698: .4byte gAnimBankAttacker -_080DB69C: .4byte sub_80DB6A0 - thumb_func_end sub_80DB5E4 - - thumb_func_start sub_80DB6A0 -sub_80DB6A0: @ 80DB6A0 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x3A] - ldrh r1, [r2, 0x36] - adds r0, r1 - strh r0, [r2, 0x36] - ldrh r1, [r2, 0x3C] - ldrh r3, [r2, 0x38] - adds r1, r3 - strh r1, [r2, 0x38] - lsls r0, 16 - asrs r0, 20 - strh r0, [r2, 0x20] - lsls r1, 16 - asrs r3, r1, 20 - strh r3, [r2, 0x22] - adds r0, 0x2D - lsls r0, 16 - movs r1, 0xA5 - lsls r1, 17 - cmp r0, r1 - bhi _080DB6DA - adds r1, r3, 0 - cmp r1, 0x9D - bgt _080DB6DA - movs r0, 0x2D - negs r0, r0 - cmp r1, r0 - bge _080DB6E0 -_080DB6DA: - adds r0, r2, 0 - bl move_anim_8074EE0 -_080DB6E0: - pop {r0} - bx r0 - thumb_func_end sub_80DB6A0 - - thumb_func_start unref_sub_80DB6E4 -unref_sub_80DB6E4: @ 80DB6E4 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _080DB714 @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _080DB71C - movs r0, 0 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080DB718 @ =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - b _080DB73A - .align 2, 0 -_080DB714: .4byte gBattleAnimArgs -_080DB718: .4byte gSprites -_080DB71C: - movs r0, 0 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080DB748 @ =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - adds r1, 0x3E - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 -_080DB73A: - strb r0, [r1] - adds r0, r4, 0 - bl DestroyAnimVisualTask - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DB748: .4byte gSprites - thumb_func_end unref_sub_80DB6E4 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/pokenav.s b/asm/pokenav.s index 331c2e8f1..562211a00 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,1924 +5,6 @@ .text - thumb_func_start sub_80F468C -sub_80F468C: @ 80F468C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - ldr r1, _080F475C @ =gUnknown_083DFEC4 - ldr r7, [r1] - lsls r0, 16 - asrs r0, 14 - adds r1, r7, r0 - ldr r2, _080F4760 @ =0x0000893f - adds r0, r1, r2 - ldrb r0, [r0] - lsls r0, 25 - cmp r0, 0 - blt _080F46B2 - b _080F47C4 -_080F46B2: - ldr r3, _080F4764 @ =0x0000893d - adds r0, r1, r3 - ldrb r5, [r0] - subs r2, 0x1 - adds r0, r1, r2 - ldrb r0, [r0] - lsls r0, 27 - lsrs r6, r0, 27 - adds r0, r5, 0 - adds r1, r6, 0 - movs r2, 0x16 - movs r3, 0 - bl sub_80F44B0 - mov r3, r9 - lsls r3, 2 - mov r8, r3 - mov r4, r8 - add r4, r9 - ldr r2, _080F4768 @ =0x00008ff0 - adds r1, r7, r2 - adds r1, r4 - strb r0, [r1] - adds r0, r5, 0 - adds r1, r6, 0 - movs r2, 0x2F - movs r3, 0 - bl sub_80F44B0 - ldr r3, _080F476C @ =0x00008ff1 - adds r1, r7, r3 - adds r1, r4 - strb r0, [r1] - adds r0, r5, 0 - adds r1, r6, 0 - movs r2, 0x21 - movs r3, 0 - bl sub_80F44B0 - ldr r2, _080F4770 @ =0x00008ff2 - adds r1, r7, r2 - adds r1, r4 - strb r0, [r1] - adds r0, r5, 0 - adds r1, r6, 0 - movs r2, 0x18 - movs r3, 0 - bl sub_80F44B0 - ldr r3, _080F4774 @ =0x00008ff3 - adds r1, r7, r3 - adds r1, r4 - strb r0, [r1] - adds r0, r5, 0 - adds r1, r6, 0 - movs r2, 0x17 - movs r3, 0 - bl sub_80F44B0 - ldr r2, _080F4778 @ =0x00008ff4 - adds r1, r7, r2 - adds r1, r4 - strb r0, [r1] - ldr r3, _080F477C @ =0x00008931 - adds r0, r7, r3 - mov r7, r9 - adds r4, r0, r7 - adds r0, r5, 0 - adds r1, r6, 0 - movs r2, 0x30 - movs r3, 0 - bl sub_80F44B0 - cmp r0, 0xFF - beq _080F4780 - adds r0, r5, 0 - adds r1, r6, 0 - movs r2, 0x30 - movs r3, 0 - bl sub_80F44B0 - movs r1, 0x1D - bl __udivsi3 - b _080F4782 - .align 2, 0 -_080F475C: .4byte gUnknown_083DFEC4 -_080F4760: .4byte 0x0000893f -_080F4764: .4byte 0x0000893d -_080F4768: .4byte 0x00008ff0 -_080F476C: .4byte 0x00008ff1 -_080F4770: .4byte 0x00008ff2 -_080F4774: .4byte 0x00008ff3 -_080F4778: .4byte 0x00008ff4 -_080F477C: .4byte 0x00008931 -_080F4780: - movs r0, 0x9 -_080F4782: - strb r0, [r4] - adds r0, r5, 0 - adds r1, r6, 0 - movs r2, 0x8 - movs r3, 0 - bl sub_80F44B0 - ldr r1, _080F47B4 @ =gUnknown_083DFEC4 - ldr r1, [r1] - ldr r3, _080F47B8 @ =0x00008934 - adds r2, r1, r3 - add r2, r9 - strb r0, [r2] - mov r2, r8 - add r2, r9 - ldr r7, _080F47BC @ =0x00008ff0 - adds r0, r2, r7 - adds r0, r1, r0 - lsls r2, 2 - ldr r3, _080F47C0 @ =0x00009004 - adds r2, r3 - adds r1, r2 - bl sub_80F55AC - b _080F480A - .align 2, 0 -_080F47B4: .4byte gUnknown_083DFEC4 -_080F47B8: .4byte 0x00008934 -_080F47BC: .4byte 0x00008ff0 -_080F47C0: .4byte 0x00009004 -_080F47C4: - movs r3, 0 - mov r0, r9 - lsls r0, 2 - mov r8, r0 - adds r4, r7, 0 - mov r2, r8 - add r2, r9 - ldr r1, _080F4818 @ =0x00008ff0 - adds r6, r4, r1 - lsls r5, r2, 2 - mov r9, r3 - ldr r7, _080F481C @ =0x00009004 - mov r8, r7 - movs r0, 0x9B - mov r12, r0 -_080F47E2: - adds r0, r3, r2 - adds r0, r6, r0 - mov r1, r9 - strb r1, [r0] - lsls r0, r3, 2 - adds r0, r5 - adds r0, r4, r0 - mov r7, r8 - adds r1, r0, r7 - mov r7, r12 - strh r7, [r1] - ldr r1, _080F4820 @ =0x00009006 - adds r0, r1 - movs r1, 0x5B - strh r1, [r0] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x4 - bls _080F47E2 -_080F480A: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F4818: .4byte 0x00008ff0 -_080F481C: .4byte 0x00009004 -_080F4820: .4byte 0x00009006 - thumb_func_end sub_80F468C - - thumb_func_start sub_80F4824 -sub_80F4824: @ 80F4824 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0xC - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - ldr r1, _080F48E0 @ =gUnknown_083DFEC4 - ldr r7, [r1] - lsls r0, 16 - asrs r0, 14 - adds r1, r7, r0 - ldr r2, _080F48E4 @ =0x0000893f - adds r0, r1, r2 - ldrb r0, [r0] - lsls r0, 25 - cmp r0, 0 - bge _080F48D0 - ldr r6, _080F48E8 @ =0x0000893d - adds r0, r1, r6 - ldrb r6, [r0] - subs r2, 0x1 - adds r0, r1, r2 - ldrb r4, [r0] - lsls r4, 27 - lsrs r4, 27 - adds r0, r6, 0 - adds r1, r4, 0 - movs r2, 0x41 - movs r3, 0 - bl sub_80F44B0 - adds r5, r0, 0 - lsls r5, 16 - lsrs r5, 16 - adds r0, r6, 0 - adds r1, r4, 0 - movs r2, 0x1 - movs r3, 0 - bl sub_80F44B0 - mov r8, r0 - adds r0, r6, 0 - adds r1, r4, 0 - movs r2, 0 - movs r3, 0 - bl sub_80F44B0 - adds r4, r0, 0 - lsls r0, r5, 3 - ldr r1, _080F48EC @ =gMonFrontPicTable - adds r0, r1 - ldr r2, _080F48F0 @ =gMonFrontPicCoords - lsls r1, r5, 2 - adds r1, r2 - ldrb r1, [r1] - ldr r6, _080F48F4 @ =0x000131e4 - adds r3, r7, r6 - mov r6, r9 - lsls r2, r6, 13 - ldr r6, _080F48F8 @ =0x0000d1e4 - adds r2, r6 - adds r2, r7, r2 - str r2, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - movs r2, 0x1 - bl HandleLoadSpecialPokePic - adds r0, r5, 0 - mov r1, r8 - adds r2, r4, 0 - bl GetMonSpritePalFromOtIdPersonality - mov r2, r9 - lsls r1, r2, 7 - adds r1, r7, r1 - bl LZ77UnCompWram - mov r6, r9 - lsls r1, r6, 1 - ldr r2, _080F48FC @ =0x0000d1d6 - adds r0, r7, r2 - adds r0, r1 - strh r5, [r0] -_080F48D0: - add sp, 0xC - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F48E0: .4byte gUnknown_083DFEC4 -_080F48E4: .4byte 0x0000893f -_080F48E8: .4byte 0x0000893d -_080F48EC: .4byte gMonFrontPicTable -_080F48F0: .4byte gMonFrontPicCoords -_080F48F4: .4byte 0x000131e4 -_080F48F8: .4byte 0x0000d1e4 -_080F48FC: .4byte 0x0000d1d6 - thumb_func_end sub_80F4824 - - thumb_func_start sub_80F4900 -sub_80F4900: @ 80F4900 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - lsls r5, 24 - lsrs r5, 24 - lsls r4, 16 - asrs r4, 16 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_80F45A0 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_80F468C - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_80F4824 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80F4900 - - thumb_func_start sub_80F492C -sub_80F492C: @ 80F492C - ldr r0, _080F493C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F4940 @ =0x00008fe4 - adds r0, r1 - movs r1, 0 - strh r1, [r0] - bx lr - .align 2, 0 -_080F493C: .4byte gUnknown_083DFEC4 -_080F4940: .4byte 0x00008fe4 - thumb_func_end sub_80F492C - - thumb_func_start sub_80F4944 -sub_80F4944: @ 80F4944 - push {r4-r7,lr} - mov r7, r8 - push {r7} - mov r12, r0 - movs r2, 0 - ldr r1, _080F4978 @ =gUnknown_083DFEC4 - ldr r5, [r1] - ldr r3, _080F497C @ =0x00008fe4 - adds r0, r5, r3 - ldrh r4, [r0] - lsrs r3, r4, 1 - mov r8, r1 - cmp r4, r3 - beq _080F499C - adds r6, r5, 0 - mov r0, r12 - ldrb r5, [r0] - ldr r7, _080F4980 @ =0x0000893c -_080F4968: - lsls r0, r3, 2 - adds r0, r6, r0 - adds r0, r7 - ldrb r0, [r0] - cmp r5, r0 - bls _080F4984 - adds r4, r3, 0 - b _080F498A - .align 2, 0 -_080F4978: .4byte gUnknown_083DFEC4 -_080F497C: .4byte 0x00008fe4 -_080F4980: .4byte 0x0000893c -_080F4984: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 -_080F498A: - subs r0, r4, r2 - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - adds r0, r2, r0 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r4, r3 - bne _080F4968 -_080F499C: - mov r1, r8 - ldr r2, [r1] - ldr r1, _080F49EC @ =0x00008fe4 - adds r0, r2, r1 - ldrh r4, [r0] - lsls r6, r3, 2 - cmp r4, r3 - bls _080F49C6 - ldr r0, _080F49F0 @ =0x0000893c - adds r5, r2, r0 -_080F49B0: - lsls r2, r4, 2 - adds r2, r5, r2 - subs r1, r4, 0x1 - lsls r0, r1, 2 - adds r0, r5, r0 - ldr r0, [r0] - str r0, [r2] - lsls r1, 16 - lsrs r4, r1, 16 - cmp r4, r3 - bhi _080F49B0 -_080F49C6: - mov r1, r8 - ldr r2, [r1] - ldr r3, _080F49F0 @ =0x0000893c - adds r0, r2, r3 - adds r0, r6 - mov r3, r12 - ldr r1, [r3] - str r1, [r0] - ldr r0, _080F49EC @ =0x00008fe4 - adds r2, r0 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F49EC: .4byte 0x00008fe4 -_080F49F0: .4byte 0x0000893c - thumb_func_end sub_80F4944 - - thumb_func_start sub_80F49F4 -sub_80F49F4: @ 80F49F4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r3, _080F4A64 @ =gUnknown_083DFEC4 - ldr r4, [r3] - ldr r7, _080F4A68 @ =0x0000893e - adds r2, r4, r7 - ldrh r1, [r2] - ldr r0, _080F4A6C @ =0xffffc01f - mov r12, r0 - ands r0, r1 - movs r1, 0x20 - orrs r0, r1 - strh r0, [r2] - movs r5, 0x1 - ldr r1, _080F4A70 @ =0x00008fe4 - adds r0, r4, r1 - ldrh r3, [r0] - cmp r5, r3 - bcs _080F4A9E - adds r6, r4, 0 - ldr r1, _080F4A74 @ =0x0000893c - mov r8, r1 - ldr r3, _080F4A78 @ =0x000001ff - mov r10, r3 - mov r9, r0 -_080F4A2C: - lsls r0, r5, 2 - adds r3, r6, r0 - mov r0, r8 - adds r2, r3, r0 - subs r0, r5, 0x1 - lsls r0, 2 - adds r4, r6, r0 - mov r0, r8 - adds r1, r4, r0 - ldrb r0, [r2] - ldrb r1, [r1] - cmp r0, r1 - bne _080F4A7C - adds r0, r4, r7 - ldrh r0, [r0] - lsls r0, 18 - lsrs r0, 23 - adds r3, r7 - ldr r1, _080F4A78 @ =0x000001ff - ands r1, r0 - lsls r1, 5 - ldrh r2, [r3] - mov r0, r12 - ands r0, r2 - orrs r0, r1 - strh r0, [r3] - adds r4, r5, 0x1 - b _080F4A92 - .align 2, 0 -_080F4A64: .4byte gUnknown_083DFEC4 -_080F4A68: .4byte 0x0000893e -_080F4A6C: .4byte 0xffffc01f -_080F4A70: .4byte 0x00008fe4 -_080F4A74: .4byte 0x0000893c -_080F4A78: .4byte 0x000001ff -_080F4A7C: - adds r4, r5, 0x1 - adds r3, r7 - adds r1, r4, 0 - mov r0, r10 - ands r1, r0 - lsls r1, 5 - ldrh r2, [r3] - mov r0, r12 - ands r0, r2 - orrs r0, r1 - strh r0, [r3] -_080F4A92: - lsls r0, r4, 16 - lsrs r5, r0, 16 - mov r1, r9 - ldrh r1, [r1] - cmp r5, r1 - bcc _080F4A2C -_080F4A9E: - ldr r3, _080F4AC4 @ =gUnknown_083DFEC4 - ldr r2, [r3] - ldr r1, _080F4AC8 @ =0x0000876c - adds r0, r2, r1 - movs r1, 0 - strh r1, [r0] - ldr r3, _080F4ACC @ =0x00008770 - adds r0, r2, r3 - strh r1, [r0] - subs r3, 0x2 - adds r0, r2, r3 - strh r1, [r0] - ldr r1, _080F4AD0 @ =0x00008fe4 - adds r0, r2, r1 - ldrh r0, [r0] - cmp r0, 0x8 - bhi _080F4AD4 - subs r1, r0, 0x1 - b _080F4AD6 - .align 2, 0 -_080F4AC4: .4byte gUnknown_083DFEC4 -_080F4AC8: .4byte 0x0000876c -_080F4ACC: .4byte 0x00008770 -_080F4AD0: .4byte 0x00008fe4 -_080F4AD4: - movs r1, 0x7 -_080F4AD6: - ldr r3, _080F4B10 @ =0x00008772 - adds r0, r2, r3 - strh r1, [r0] - ldr r0, _080F4B14 @ =gUnknown_083DFEC4 - ldr r2, [r0] - ldr r1, _080F4B18 @ =0x00008fe4 - adds r0, r2, r1 - ldrh r0, [r0] - subs r0, 0x1 - adds r3, 0x2 - adds r1, r2, r3 - strh r0, [r1] - movs r1, 0 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x7 - ble _080F4AFA - movs r1, 0x1 -_080F4AFA: - ldr r3, _080F4B1C @ =0x000087c9 - adds r0, r2, r3 - strb r1, [r0] - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F4B10: .4byte 0x00008772 -_080F4B14: .4byte gUnknown_083DFEC4 -_080F4B18: .4byte 0x00008fe4 -_080F4B1C: .4byte 0x000087c9 - thumb_func_end sub_80F49F4 - - thumb_func_start sub_80F4B20 -sub_80F4B20: @ 80F4B20 - push {r4-r6,lr} - ldr r0, _080F4B5C @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r0, _080F4B60 @ =0x000087dc - adds r5, r4, r0 - movs r1, 0 - ldrsh r0, [r5, r1] - movs r1, 0 - bl sub_80F4900 - movs r0, 0 - bl sub_80F2E18 - ldr r0, _080F4B64 @ =0x000087da - adds r2, r4, r0 - movs r1, 0 - ldrsh r0, [r2, r1] - cmp r0, 0x1 - bne _080F4B6C - ldr r2, _080F4B68 @ =0x00008fe9 - adds r0, r4, r2 - movs r1, 0 - strb r1, [r0] - adds r2, 0x1 - adds r0, r4, r2 - strb r1, [r0] - adds r2, 0x1 - adds r0, r4, r2 - strb r1, [r0] - b _080F4BBE - .align 2, 0 -_080F4B5C: .4byte gUnknown_083DFEC4 -_080F4B60: .4byte 0x000087dc -_080F4B64: .4byte 0x000087da -_080F4B68: .4byte 0x00008fe9 -_080F4B6C: - ldr r0, _080F4BC4 @ =0x00008fe9 - adds r1, r4, r0 - movs r0, 0 - strb r0, [r1] - ldr r0, _080F4BC8 @ =0x00008fea - adds r1, r4, r0 - movs r0, 0x1 - strb r0, [r1] - ldr r0, _080F4BCC @ =0x00008feb - adds r1, r4, r0 - movs r0, 0x2 - strb r0, [r1] - ldrh r3, [r5] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - asrs r0, 16 - ldrh r6, [r2] - movs r4, 0 - ldrsh r1, [r2, r4] - cmp r0, r1 - blt _080F4B9A - movs r5, 0 -_080F4B9A: - subs r0, r3, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r0, 0 - bge _080F4BAA - subs r0, r6, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 -_080F4BAA: - lsls r0, r5, 16 - asrs r0, 16 - movs r1, 0x1 - bl sub_80F4900 - lsls r0, r4, 16 - asrs r0, 16 - movs r1, 0x2 - bl sub_80F4900 -_080F4BBE: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080F4BC4: .4byte 0x00008fe9 -_080F4BC8: .4byte 0x00008fea -_080F4BCC: .4byte 0x00008feb - thumb_func_end sub_80F4B20 - - thumb_func_start sub_80F4BD0 -sub_80F4BD0: @ 80F4BD0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - movs r6, 0 - movs r7, 0 - ldr r0, _080F4CC4 @ =gUnknown_083DFEC4 - ldr r2, [r0] - ldr r3, _080F4CC8 @ =0x00008828 - adds r1, r2, r3 - mov r9, r0 - ldrb r1, [r1] - cmp r7, r1 - bcs _080F4C66 - mov r10, r9 - adds r4, r3, 0 - adds r4, r2 - mov r8, r4 -_080F4BF6: - movs r0, 0x64 - muls r0, r6 - ldr r1, _080F4CCC @ =gPlayerParty - adds r0, r1 - movs r1, 0x2D - bl GetMonData - cmp r0, 0 - bne _080F4C58 - mov r0, r10 - ldr r3, [r0] - lsls r0, r7, 2 - adds r3, r0 - ldr r2, _080F4CD0 @ =0x0000893d - adds r1, r3, r2 - movs r0, 0xE - strb r0, [r1] - ldr r4, _080F4CD4 @ =0x0000893e - adds r5, r3, r4 - movs r0, 0x1F - adds r2, r6, 0 - ands r2, r0 - ldrb r0, [r5] - movs r4, 0x20 - negs r4, r4 - adds r1, r4, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r5] - adds r4, r7, 0x1 - ldr r7, _080F4CD8 @ =0x000001ff - adds r0, r7, 0 - adds r2, r4, 0 - ands r2, r0 - lsls r2, 5 - ldrh r0, [r5] - ldr r7, _080F4CDC @ =0xffffc01f - adds r1, r7, 0 - ands r0, r1 - orrs r0, r2 - strh r0, [r5] - ldr r0, _080F4CE0 @ =0x0000893f - adds r3, r0 - ldrb r0, [r3] - movs r1, 0x40 - orrs r0, r1 - strb r0, [r3] - lsls r4, 16 - lsrs r7, r4, 16 -_080F4C58: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - mov r1, r8 - ldrb r1, [r1] - cmp r6, r1 - bcc _080F4BF6 -_080F4C66: - mov r2, r9 - ldr r4, [r2] - lsls r1, r7, 2 - adds r1, r4, r1 - ldr r3, _080F4CD0 @ =0x0000893d - adds r0, r1, r3 - movs r5, 0 - strb r5, [r0] - ldr r0, _080F4CD4 @ =0x0000893e - adds r2, r1, r0 - ldrb r3, [r2] - movs r0, 0x20 - negs r0, r0 - ands r0, r3 - strb r0, [r2] - ldrh r3, [r2] - ldr r0, _080F4CDC @ =0xffffc01f - ands r0, r3 - strh r0, [r2] - ldr r2, _080F4CE0 @ =0x0000893f - adds r1, r2 - ldrb r2, [r1] - movs r0, 0x41 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - ldr r3, _080F4CE4 @ =0x000087dc - adds r0, r4, r3 - strh r5, [r0] - adds r1, r7, 0x1 - ldr r7, _080F4CE8 @ =0x000087da - adds r0, r4, r7 - strh r1, [r0] - bl sub_80F4B20 - ldr r0, _080F4CEC @ =0x000087cb - adds r4, r0 - movs r0, 0x1 - strb r0, [r4] - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F4CC4: .4byte gUnknown_083DFEC4 -_080F4CC8: .4byte 0x00008828 -_080F4CCC: .4byte gPlayerParty -_080F4CD0: .4byte 0x0000893d -_080F4CD4: .4byte 0x0000893e -_080F4CD8: .4byte 0x000001ff -_080F4CDC: .4byte 0xffffc01f -_080F4CE0: .4byte 0x0000893f -_080F4CE4: .4byte 0x000087dc -_080F4CE8: .4byte 0x000087da -_080F4CEC: .4byte 0x000087cb - thumb_func_end sub_80F4BD0 - - thumb_func_start sub_80F4CF0 -sub_80F4CF0: @ 80F4CF0 - push {r4,lr} - ldr r0, _080F4D1C @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r1, _080F4D20 @ =0x0000876e - adds r0, r4, r1 - ldrh r1, [r0] - ldr r2, _080F4D24 @ =0x000087dc - adds r0, r4, r2 - strh r1, [r0] - bl sub_80F4B20 - ldr r1, _080F4D28 @ =0x00008774 - adds r0, r4, r1 - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r0, 0 - bne _080F4D30 - ldr r0, _080F4D2C @ =0x000087cb - adds r1, r4, r0 - movs r0, 0 - b _080F4D36 - .align 2, 0 -_080F4D1C: .4byte gUnknown_083DFEC4 -_080F4D20: .4byte 0x0000876e -_080F4D24: .4byte 0x000087dc -_080F4D28: .4byte 0x00008774 -_080F4D2C: .4byte 0x000087cb -_080F4D30: - ldr r2, _080F4D40 @ =0x000087cb - adds r1, r4, r2 - movs r0, 0x1 -_080F4D36: - strb r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F4D40: .4byte 0x000087cb - thumb_func_end sub_80F4CF0 - - thumb_func_start sub_80F4D44 -sub_80F4D44: @ 80F4D44 - push {r4,lr} - ldr r0, _080F4D78 @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r1, _080F4D7C @ =0x00008fe6 - adds r0, r4, r1 - movs r1, 0 - strb r1, [r0] - ldr r2, _080F4D80 @ =0x00008fe7 - adds r0, r4, r2 - strb r1, [r0] - bl sub_80F492C - ldr r0, _080F4D84 @ =0x00006dac - adds r4, r0 - ldrb r0, [r4] - cmp r0, 0 - bne _080F4D70 -_080F4D66: - bl sub_80F4D88 - lsls r0, 24 - cmp r0, 0 - bne _080F4D66 -_080F4D70: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F4D78: .4byte gUnknown_083DFEC4 -_080F4D7C: .4byte 0x00008fe6 -_080F4D80: .4byte 0x00008fe7 -_080F4D84: .4byte 0x00006dac - thumb_func_end sub_80F4D44 - - thumb_func_start sub_80F4D88 -sub_80F4D88: @ 80F4D88 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - ldr r6, _080F4E98 @ =gUnknown_083DFEC4 - ldr r4, [r6] - ldr r1, _080F4E9C @ =0x00008fe6 - adds r0, r4, r1 - ldrb r3, [r0] - cmp r3, 0xE - bne _080F4DA4 - b _080F4EB8 -_080F4DA4: - cmp r3, 0xF - bne _080F4DAA - b _080F4F60 -_080F4DAA: - movs r1, 0x80 - lsls r1, 23 - ldr r0, [sp] - orrs r0, r1 - str r0, [sp] - movs r7, 0 - mov r10, r6 - ldr r2, _080F4E9C @ =0x00008fe6 - adds r6, r4, r2 - ldr r3, _080F4EA0 @ =0x00008fe7 - adds r5, r4, r3 - ldr r0, _080F4EA4 @ =0x000087d8 - adds r0, r4 - mov r9, r0 - ldr r1, _080F4EA8 @ =gPokemonStorage + 0x4 - mov r8, r1 -_080F4DCA: - ldrb r0, [r6] - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - ldrb r2, [r5] - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 4 - add r1, r8 - adds r0, r1 - movs r1, 0xB - bl GetBoxMonData - cmp r0, 0 - beq _080F4E60 - ldrb r0, [r6] - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - ldrb r2, [r5] - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 4 - add r1, r8 - adds r0, r1 - movs r1, 0x2D - bl GetBoxMonData - cmp r0, 0 - bne _080F4E60 - ldrb r1, [r6] - lsls r1, 8 - ldr r2, _080F4EAC @ =0xffff00ff - ldr r0, [sp] - ands r0, r2 - orrs r0, r1 - str r0, [sp] - ldrb r2, [r5] - movs r1, 0x1F - ands r2, r1 - lsls r2, 16 - ldr r1, _080F4EB0 @ =0xffe0ffff - ands r0, r1 - orrs r0, r2 - str r0, [sp] - ldrb r0, [r6] - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - ldrb r2, [r5] - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 4 - add r1, r8 - adds r0, r1 - mov r2, r9 - ldrb r1, [r2] - bl GetBoxMonData - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080F4EB4 @ =0xffffff00 - ldr r1, [sp] - ands r1, r2 - orrs r1, r0 - str r1, [sp] - mov r0, sp - bl sub_80F4944 -_080F4E60: - mov r3, r10 - ldr r1, [r3] - ldr r0, _080F4EA0 @ =0x00008fe7 - adds r2, r1, r0 - ldrb r0, [r2] - adds r0, 0x1 - movs r4, 0 - strb r0, [r2] - movs r3, 0xFF - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1E - bne _080F4E8C - strb r4, [r2] - ldr r2, _080F4E9C @ =0x00008fe6 - adds r1, r2 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - ands r0, r3 - cmp r0, 0xE - beq _080F4F64 -_080F4E8C: - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0xE - bls _080F4DCA - b _080F4F64 - .align 2, 0 -_080F4E98: .4byte gUnknown_083DFEC4 -_080F4E9C: .4byte 0x00008fe6 -_080F4EA0: .4byte 0x00008fe7 -_080F4EA4: .4byte 0x000087d8 -_080F4EA8: .4byte gPokemonStorage + 0x4 -_080F4EAC: .4byte 0xffff00ff -_080F4EB0: .4byte 0xffe0ffff -_080F4EB4: .4byte 0xffffff00 -_080F4EB8: - mov r2, sp - ldrb r0, [r2, 0x3] - movs r1, 0x40 - orrs r0, r1 - strb r0, [r2, 0x3] - strb r3, [r2, 0x1] - movs r7, 0 - ldr r3, _080F4F44 @ =0x00008828 - adds r0, r4, r3 - ldrb r0, [r0] - cmp r7, r0 - bcs _080F4F24 - mov r5, sp - mov r8, r6 - adds r6, r4, r3 -_080F4ED6: - movs r0, 0x64 - adds r1, r7, 0 - muls r1, r0 - ldr r0, _080F4F48 @ =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0x2D - bl GetMonData - cmp r0, 0 - bne _080F4F18 - movs r0, 0x1F - adds r2, r7, 0 - ands r2, r0 - ldrb r0, [r5, 0x2] - movs r3, 0x20 - negs r3, r3 - adds r1, r3, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r5, 0x2] - mov r1, r8 - ldr r0, [r1] - ldr r2, _080F4F4C @ =0x000087d8 - adds r0, r2 - ldrb r1, [r0] - adds r0, r4, 0 - bl GetMonData - strb r0, [r5] - mov r0, sp - bl sub_80F4944 -_080F4F18: - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - ldrb r3, [r6] - cmp r7, r3 - bcc _080F4ED6 -_080F4F24: - bl sub_80F49F4 - ldr r0, _080F4F50 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r2, _080F4F54 @ =0x00008fe4 - adds r0, r1, r2 - ldrh r2, [r0] - ldr r3, _080F4F58 @ =0x000087da - adds r0, r1, r3 - strh r2, [r0] - ldr r0, _080F4F5C @ =0x00008fe6 - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _080F4F64 - .align 2, 0 -_080F4F44: .4byte 0x00008828 -_080F4F48: .4byte gPlayerParty -_080F4F4C: .4byte 0x000087d8 -_080F4F50: .4byte gUnknown_083DFEC4 -_080F4F54: .4byte 0x00008fe4 -_080F4F58: .4byte 0x000087da -_080F4F5C: .4byte 0x00008fe6 -_080F4F60: - movs r0, 0 - b _080F4F66 -_080F4F64: - movs r0, 0x1 -_080F4F66: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80F4D88 - - thumb_func_start sub_80F4F78 -sub_80F4F78: @ 80F4F78 - push {lr} - ldr r0, _080F4FA4 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r2, _080F4FA8 @ =0x00009040 - adds r0, r1, r2 - ldr r3, _080F4FAC @ =0x00008fe9 - adds r2, r1, r3 - movs r3, 0 - ldrsb r3, [r2, r3] - lsls r2, r3, 2 - adds r2, r3 - lsls r2, 2 - ldr r3, _080F4FB0 @ =0x00009004 - adds r2, r3 - adds r1, r2 - bl sub_80F53EC - bl sub_80F5504 - pop {r0} - bx r0 - .align 2, 0 -_080F4FA4: .4byte gUnknown_083DFEC4 -_080F4FA8: .4byte 0x00009040 -_080F4FAC: .4byte 0x00008fe9 -_080F4FB0: .4byte 0x00009004 - thumb_func_end sub_80F4F78 - - thumb_func_start sub_80F4FB4 -sub_80F4FB4: @ 80F4FB4 - push {r4,lr} - bl sub_80F5504 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl sub_80F170C - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - cmp r4, 0 - bne _080F4FD2 - cmp r0, 0 - beq _080F4FD4 -_080F4FD2: - movs r1, 0x1 -_080F4FD4: - adds r0, r1, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80F4FB4 - - thumb_func_start sub_80F4FDC -sub_80F4FDC: @ 80F4FDC - push {lr} - ldr r0, _080F5020 @ =gUnknown_083DFEC4 - ldr r2, [r0] - ldr r1, _080F5024 @ =0x000076aa - adds r0, r2, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080F4FFE - ldr r3, _080F5028 @ =0x000087dc - adds r0, r2, r3 - movs r3, 0 - ldrsh r1, [r0, r3] - ldr r3, _080F502C @ =0x00008828 - adds r0, r2, r3 - ldrb r0, [r0] - cmp r1, r0 - beq _080F501A -_080F4FFE: - ldr r1, _080F5030 @ =0x00008fe9 - adds r0, r2, r1 - movs r1, 0 - ldrsb r1, [r0, r1] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - ldr r3, _080F5034 @ =0x00009004 - adds r0, r3 - adds r0, r2, r0 - adds r3, 0x3C - adds r1, r2, r3 - bl sub_80F53EC -_080F501A: - pop {r0} - bx r0 - .align 2, 0 -_080F5020: .4byte gUnknown_083DFEC4 -_080F5024: .4byte 0x000076aa -_080F5028: .4byte 0x000087dc -_080F502C: .4byte 0x00008828 -_080F5030: .4byte 0x00008fe9 -_080F5034: .4byte 0x00009004 - thumb_func_end sub_80F4FDC - - thumb_func_start sub_80F5038 -sub_80F5038: @ 80F5038 - push {r4,lr} - bl sub_80F5504 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl sub_80F173C - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - cmp r4, 0 - bne _080F5056 - cmp r0, 0 - beq _080F5058 -_080F5056: - movs r1, 0x1 -_080F5058: - adds r0, r1, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80F5038 - - thumb_func_start sub_80F5060 -sub_80F5060: @ 80F5060 - push {r4-r7,lr} - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0 - beq _080F507C - ldr r0, _080F5074 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F5078 @ =0x00008feb - adds r0, r1 - b _080F5084 - .align 2, 0 -_080F5074: .4byte gUnknown_083DFEC4 -_080F5078: .4byte 0x00008feb -_080F507C: - ldr r0, _080F50FC @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r2, _080F5100 @ =0x00008fea - adds r0, r2 -_080F5084: - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r0, _080F50FC @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r3, _080F5104 @ =0x00008fe9 - adds r5, r4, r3 - movs r1, 0 - ldrsb r1, [r5, r1] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - ldr r2, _080F5108 @ =0x00009004 - adds r0, r2 - adds r0, r4, r0 - lsls r1, r6, 2 - adds r1, r6 - lsls r1, 2 - adds r1, r2 - adds r1, r4, r1 - bl sub_80F53EC - ldr r0, _080F510C @ =0x000087dc - adds r3, r4, r0 - movs r1, 0 - ldrsh r0, [r3, r1] - lsls r0, 2 - adds r0, r4, r0 - ldr r2, _080F5110 @ =0x0000893f - adds r0, r2 - ldrb r0, [r0] - lsls r0, 25 - lsrs r0, 31 - mov r12, r0 - cmp r7, 0 - beq _080F5158 - ldr r7, _080F5100 @ =0x00008fea - adds r1, r4, r7 - ldrb r0, [r1] - adds r7, 0x1 - adds r2, r4, r7 - strb r0, [r2] - ldrb r0, [r5] - strb r0, [r1] - strb r6, [r5] - ldrb r1, [r2] - ldr r2, _080F5114 @ =0x00008fec - adds r0, r4, r2 - strb r1, [r0] - adds r5, r4, 0 - ldrh r1, [r3] - movs r7, 0 - ldrsh r0, [r3, r7] - cmp r0, 0 - beq _080F5118 - subs r2, r1, 0x1 - b _080F5120 - .align 2, 0 -_080F50FC: .4byte gUnknown_083DFEC4 -_080F5100: .4byte 0x00008fea -_080F5104: .4byte 0x00008fe9 -_080F5108: .4byte 0x00009004 -_080F510C: .4byte 0x000087dc -_080F5110: .4byte 0x0000893f -_080F5114: .4byte 0x00008fec -_080F5118: - ldr r1, _080F513C @ =0x000087da - adds r0, r4, r1 - ldrh r0, [r0] - subs r2, r0, 0x1 -_080F5120: - ldr r1, _080F5140 @ =0x000087dc - adds r0, r5, r1 - strh r2, [r0] - ldr r2, _080F5144 @ =gUnknown_083DFEC4 - ldr r3, [r2] - adds r1, r3, r1 - ldrh r4, [r1] - movs r5, 0 - ldrsh r0, [r1, r5] - cmp r0, 0 - beq _080F5148 - subs r1, r4, 0x1 - b _080F51CE - .align 2, 0 -_080F513C: .4byte 0x000087da -_080F5140: .4byte 0x000087dc -_080F5144: .4byte gUnknown_083DFEC4 -_080F5148: - ldr r7, _080F5154 @ =0x000087da - adds r0, r3, r7 - ldrh r0, [r0] - subs r1, r0, 0x1 - b _080F51CE - .align 2, 0 -_080F5154: .4byte 0x000087da -_080F5158: - ldr r7, _080F518C @ =0x00008feb - adds r1, r4, r7 - ldrb r0, [r1] - subs r7, 0x1 - adds r2, r4, r7 - strb r0, [r2] - ldrb r0, [r5] - strb r0, [r1] - strb r6, [r5] - ldrb r1, [r2] - ldr r2, _080F5190 @ =0x00008fec - adds r0, r4, r2 - strb r1, [r0] - adds r2, r4, 0 - movs r4, 0 - ldrsh r1, [r3, r4] - ldr r5, _080F5194 @ =0x000087da - adds r0, r2, r5 - movs r7, 0 - ldrsh r0, [r0, r7] - subs r0, 0x1 - cmp r1, r0 - bge _080F5198 - ldrh r0, [r3] - adds r3, r0, 0x1 - b _080F519A - .align 2, 0 -_080F518C: .4byte 0x00008feb -_080F5190: .4byte 0x00008fec -_080F5194: .4byte 0x000087da -_080F5198: - movs r3, 0 -_080F519A: - ldr r1, _080F51C0 @ =0x000087dc - adds r0, r2, r1 - strh r3, [r0] - ldr r2, _080F51C4 @ =gUnknown_083DFEC4 - ldr r3, [r2] - adds r4, r3, r1 - movs r0, 0 - ldrsh r1, [r4, r0] - ldr r5, _080F51C8 @ =0x000087da - adds r0, r3, r5 - movs r7, 0 - ldrsh r0, [r0, r7] - subs r0, 0x1 - cmp r1, r0 - bge _080F51CC - ldrh r0, [r4] - adds r1, r0, 0x1 - b _080F51CE - .align 2, 0 -_080F51C0: .4byte 0x000087dc -_080F51C4: .4byte gUnknown_083DFEC4 -_080F51C8: .4byte 0x000087da -_080F51CC: - movs r1, 0 -_080F51CE: - ldr r4, _080F51FC @ =0x00008fee - adds r0, r3, r4 - strh r1, [r0] - ldr r1, [r2] - ldr r5, _080F5200 @ =0x000087dc - adds r0, r1, r5 - movs r7, 0 - ldrsh r0, [r0, r7] - lsls r0, 2 - adds r0, r1, r0 - ldr r3, _080F5204 @ =0x0000893f - adds r0, r3 - ldrb r0, [r0] - lsls r0, 25 - lsrs r0, 31 - mov r4, r12 - cmp r4, 0 - bne _080F520C - adds r5, 0x4 - adds r1, r5 - ldr r0, _080F5208 @ =sub_80F5264 - b _080F5226 - .align 2, 0 -_080F51FC: .4byte 0x00008fee -_080F5200: .4byte 0x000087dc -_080F5204: .4byte 0x0000893f -_080F5208: .4byte sub_80F5264 -_080F520C: - cmp r0, 0 - bne _080F5220 - ldr r7, _080F5218 @ =0x000087e0 - adds r1, r7 - ldr r0, _080F521C @ =sub_80F52F8 - b _080F5226 - .align 2, 0 -_080F5218: .4byte 0x000087e0 -_080F521C: .4byte sub_80F52F8 -_080F5220: - ldr r0, _080F5238 @ =0x000087e0 - adds r1, r0 - ldr r0, _080F523C @ =sub_80F5364 -_080F5226: - str r0, [r1] - ldr r0, [r2] - ldr r1, _080F5240 @ =0x000087de - adds r0, r1 - movs r1, 0 - strb r1, [r0] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F5238: .4byte 0x000087e0 -_080F523C: .4byte sub_80F5364 -_080F5240: .4byte 0x000087de - thumb_func_end sub_80F5060 - - thumb_func_start gpu_sync_bg_show -gpu_sync_bg_show: @ 80F5244 - push {lr} - ldr r0, _080F525C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F5260 @ =0x000087e0 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .align 2, 0 -_080F525C: .4byte gUnknown_083DFEC4 -_080F5260: .4byte 0x000087e0 - thumb_func_end gpu_sync_bg_show - - thumb_func_start sub_80F5264 -sub_80F5264: @ 80F5264 - push {r4,r5,lr} - ldr r0, _080F5280 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F5284 @ =0x000087de - adds r5, r0, r1 - ldrb r1, [r5] - cmp r1, 0x1 - beq _080F52AA - cmp r1, 0x1 - bgt _080F5288 - cmp r1, 0 - beq _080F528E - b _080F52F0 - .align 2, 0 -_080F5280: .4byte gUnknown_083DFEC4 -_080F5284: .4byte 0x000087de -_080F5288: - cmp r1, 0x2 - beq _080F52EC - b _080F52F0 -_080F528E: - ldr r2, _080F52D8 @ =0x00008fe9 - adds r4, r0, r2 - ldrb r0, [r4] - bl sub_80F2E18 - movs r0, 0 - ldrsb r0, [r4, r0] - lsls r0, 16 - lsrs r0, 16 - bl sub_80F01E0 - ldrb r0, [r5] - adds r0, 0x1 - strb r0, [r5] -_080F52AA: - bl sub_80F4FB4 - lsls r0, 24 - cmp r0, 0 - bne _080F52F0 - ldr r0, _080F52DC @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r1, _080F52E0 @ =0x00008fee - adds r0, r4, r1 - movs r2, 0 - ldrsh r0, [r0, r2] - ldr r2, _080F52E4 @ =0x00008fec - adds r1, r4, r2 - ldrb r1, [r1] - bl sub_80F4900 - ldr r0, _080F52E8 @ =0x000087de - adds r4, r0 - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - b _080F52F0 - .align 2, 0 -_080F52D8: .4byte 0x00008fe9 -_080F52DC: .4byte gUnknown_083DFEC4 -_080F52E0: .4byte 0x00008fee -_080F52E4: .4byte 0x00008fec -_080F52E8: .4byte 0x000087de -_080F52EC: - movs r0, 0 - b _080F52F2 -_080F52F0: - movs r0, 0x1 -_080F52F2: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80F5264 - - thumb_func_start sub_80F52F8 -sub_80F52F8: @ 80F52F8 - push {r4,r5,lr} - ldr r0, _080F5310 @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r0, _080F5314 @ =0x000087de - adds r5, r4, r0 - ldrb r0, [r5] - cmp r0, 0 - beq _080F5318 - cmp r0, 0x1 - beq _080F5358 - b _080F535C - .align 2, 0 -_080F5310: .4byte gUnknown_083DFEC4 -_080F5314: .4byte 0x000087de -_080F5318: - bl sub_80F5038 - lsls r0, 24 - cmp r0, 0 - bne _080F535C - ldr r1, _080F5350 @ =0x00008fe9 - adds r0, r4, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 16 - lsrs r0, 16 - bl sub_80F01E0 - ldr r2, _080F5354 @ =0x00008fee - adds r0, r4, r2 - movs r1, 0 - ldrsh r0, [r0, r1] - subs r2, 0x2 - adds r1, r4, r2 - ldrb r1, [r1] - bl sub_80F4900 - ldrb r0, [r5] - adds r0, 0x1 - strb r0, [r5] - b _080F535C - .align 2, 0 -_080F5350: .4byte 0x00008fe9 -_080F5354: .4byte 0x00008fee -_080F5358: - movs r0, 0 - b _080F535E -_080F535C: - movs r0, 0x1 -_080F535E: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80F52F8 - - thumb_func_start sub_80F5364 -sub_80F5364: @ 80F5364 - push {r4,r5,lr} - ldr r0, _080F5380 @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r0, _080F5384 @ =0x000087de - adds r5, r4, r0 - ldrb r0, [r5] - cmp r0, 0x1 - beq _080F53B8 - cmp r0, 0x1 - bgt _080F5388 - cmp r0, 0 - beq _080F538E - b _080F53E4 - .align 2, 0 -_080F5380: .4byte gUnknown_083DFEC4 -_080F5384: .4byte 0x000087de -_080F5388: - cmp r0, 0x2 - beq _080F53CA - b _080F53E4 -_080F538E: - bl sub_80F5504 - bl sub_80F173C - lsls r0, 24 - cmp r0, 0 - bne _080F53E4 - ldr r1, _080F53B4 @ =0x00008fe9 - adds r4, r1 - ldrb r0, [r4] - bl sub_80F2E18 - movs r0, 0 - ldrsb r0, [r4, r0] - lsls r0, 16 - lsrs r0, 16 - bl sub_80F01E0 - b _080F53C2 - .align 2, 0 -_080F53B4: .4byte 0x00008fe9 -_080F53B8: - bl sub_80F4FB4 - lsls r0, 24 - cmp r0, 0 - bne _080F53E4 -_080F53C2: - ldrb r0, [r5] - adds r0, 0x1 - strb r0, [r5] - b _080F53E4 -_080F53CA: - ldr r2, _080F53E0 @ =0x00008fee - adds r0, r4, r2 - movs r1, 0 - ldrsh r0, [r0, r1] - subs r2, 0x2 - adds r1, r4, r2 - ldrb r1, [r1] - bl sub_80F4900 - movs r0, 0 - b _080F53E6 - .align 2, 0 -_080F53E0: .4byte 0x00008fee -_080F53E4: - movs r0, 0x1 -_080F53E6: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80F5364 - - thumb_func_start sub_80F53EC -sub_80F53EC: @ 80F53EC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - str r0, [sp] - mov r9, r1 - movs r7, 0 - ldr r0, _080F54F4 @ =gUnknown_083DFEC4 - ldr r0, [r0] - str r0, [sp, 0x4] -_080F5404: - lsls r4, r7, 2 - ldr r1, [sp] - adds r0, r4, r1 - ldrh r1, [r0] - lsls r5, r1, 8 - mov r2, r9 - adds r0, r4, r2 - ldrh r0, [r0] - subs r0, r1 - lsls r0, 8 - movs r1, 0xA - bl __divsi3 - adds r6, r0, 0 - movs r3, 0 - adds r7, 0x1 - mov r10, r7 - mov r8, r4 -_080F5428: - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 2 - add r0, r8 - ldr r7, [sp, 0x4] - adds r0, r7, r0 - asrs r2, r5, 8 - asrs r1, r5, 7 - movs r7, 0x1 - ands r1, r7 - adds r2, r1 - ldr r1, _080F54F8 @ =0x00009054 - adds r0, r1 - strh r2, [r0] - adds r5, r6 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x8 - bls _080F5428 - ldr r2, _080F54F4 @ =gUnknown_083DFEC4 - ldr r1, [r2] - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 2 - adds r0, r4, r0 - adds r1, r0 - mov r3, r9 - adds r2, r4, r3 - ldrh r0, [r2] - ldr r7, _080F54F8 @ =0x00009054 - adds r1, r7 - strh r0, [r1] - ldr r1, [sp] - adds r0, r4, r1 - ldrh r1, [r0, 0x2] - lsls r5, r1, 8 - ldrh r0, [r2, 0x2] - subs r0, r1 - lsls r0, 8 - movs r1, 0xA - bl __divsi3 - adds r6, r0, 0 - movs r3, 0 - ldr r0, _080F54F4 @ =gUnknown_083DFEC4 - ldr r0, [r0] - mov r12, r0 - str r4, [sp, 0x8] - movs r2, 0x1 - mov r8, r2 -_080F548E: - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 2 - ldr r7, [sp, 0x8] - adds r0, r7, r0 - add r0, r12 - asrs r2, r5, 8 - asrs r1, r5, 7 - mov r7, r8 - ands r1, r7 - adds r2, r1 - ldr r1, _080F54FC @ =0x00009056 - adds r0, r1 - strh r2, [r0] - adds r5, r6 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x8 - bls _080F548E - ldr r7, _080F54F4 @ =gUnknown_083DFEC4 - ldr r2, [r7] - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 2 - adds r0, r4, r0 - adds r0, r2, r0 - mov r3, r9 - adds r1, r4, r3 - ldrh r1, [r1, 0x2] - ldr r7, _080F54FC @ =0x00009056 - adds r0, r7 - strh r1, [r0] - mov r1, r10 - lsls r0, r1, 16 - lsrs r7, r0, 16 - cmp r7, 0x4 - bls _080F5404 - ldr r3, _080F5500 @ =0x00009342 - adds r1, r2, r3 - movs r0, 0 - strh r0, [r1] - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F54F4: .4byte gUnknown_083DFEC4 -_080F54F8: .4byte 0x00009054 -_080F54FC: .4byte 0x00009056 -_080F5500: .4byte 0x00009342 - thumb_func_end sub_80F53EC - - thumb_func_start sub_80F5504 -sub_80F5504: @ 80F5504 - push {r4,lr} - ldr r0, _080F551C @ =gUnknown_083DFEC4 - ldr r2, [r0] - ldr r0, _080F5520 @ =0x00009342 - adds r4, r2, r0 - ldrh r0, [r4] - adds r1, r0, 0 - cmp r1, 0x9 - bls _080F5524 - movs r0, 0 - b _080F5544 - .align 2, 0 -_080F551C: .4byte gUnknown_083DFEC4 -_080F5520: .4byte 0x00009342 -_080F5524: - adds r0, 0x1 - strh r0, [r4] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - ldr r1, _080F554C @ =0x00009054 - adds r0, r1 - adds r0, r2, r0 - bl sub_80F556C - ldrh r1, [r4] - movs r0, 0xA - eors r1, r0 - negs r0, r1 - orrs r0, r1 - lsrs r0, 31 -_080F5544: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080F554C: .4byte 0x00009054 - thumb_func_end sub_80F5504 - - thumb_func_start sub_80F5550 -sub_80F5550: @ 80F5550 - push {lr} - bl sub_80F53EC - pop {r0} - bx r0 - thumb_func_end sub_80F5550 - - thumb_func_start sub_80F555C -sub_80F555C: @ 80F555C - push {lr} - bl sub_80F5504 - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - thumb_func_end sub_80F555C - - thumb_func_start sub_80F556C -sub_80F556C: @ 80F556C - push {r4,r5,lr} - adds r4, r0, 0 - movs r2, 0 - ldr r5, _080F55A0 @ =gUnknown_083DFEC4 - ldr r0, [r5] - ldr r1, _080F55A4 @ =0x0000911c - adds r3, r0, r1 -_080F557A: - lsls r0, r2, 2 - adds r1, r3, r0 - adds r0, r4 - ldr r0, [r0] - str r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x4 - bls _080F557A - ldr r0, [r5] - ldr r1, _080F55A8 @ =0x00009344 - adds r0, r1 - movs r1, 0x1 - strb r1, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F55A0: .4byte gUnknown_083DFEC4 -_080F55A4: .4byte 0x0000911c -_080F55A8: .4byte 0x00009344 - thumb_func_end sub_80F556C - thumb_func_start sub_80F55AC sub_80F55AC: @ 80F55AC push {r4-r7,lr} diff --git a/data/tilesets/primary/building/anim/0.png b/data/tilesets/primary/building/anim/0.png Binary files differindex 966f6566d..938ae1acb 100644 --- a/data/tilesets/primary/building/anim/0.png +++ b/data/tilesets/primary/building/anim/0.png diff --git a/data/tilesets/primary/building/anim/1.png b/data/tilesets/primary/building/anim/1.png Binary files differindex bbbf370a9..0db9a6a9b 100644 --- a/data/tilesets/primary/building/anim/1.png +++ b/data/tilesets/primary/building/anim/1.png diff --git a/data/tilesets/primary/building/tiles.png b/data/tilesets/primary/building/tiles.png Binary files differindex d7343a1d6..63f7a1857 100644 --- a/data/tilesets/primary/building/tiles.png +++ b/data/tilesets/primary/building/tiles.png diff --git a/data/tilesets/primary/general/anim/0/0.png b/data/tilesets/primary/general/anim/0/0.png Binary files differindex ebe74a3c4..5a2ed537a 100644 --- a/data/tilesets/primary/general/anim/0/0.png +++ b/data/tilesets/primary/general/anim/0/0.png diff --git a/data/tilesets/primary/general/anim/0/1.png b/data/tilesets/primary/general/anim/0/1.png Binary files differindex 0aa8ccd8b..56811b1a0 100644 --- a/data/tilesets/primary/general/anim/0/1.png +++ b/data/tilesets/primary/general/anim/0/1.png diff --git a/data/tilesets/primary/general/anim/0/2.png b/data/tilesets/primary/general/anim/0/2.png Binary files differindex 44a9bfb52..278851f47 100644 --- a/data/tilesets/primary/general/anim/0/2.png +++ b/data/tilesets/primary/general/anim/0/2.png diff --git a/data/tilesets/primary/general/anim/1/0.png b/data/tilesets/primary/general/anim/1/0.png Binary files differindex f2c69978b..d3f2ea0da 100644 --- a/data/tilesets/primary/general/anim/1/0.png +++ b/data/tilesets/primary/general/anim/1/0.png diff --git a/data/tilesets/primary/general/anim/1/1.png b/data/tilesets/primary/general/anim/1/1.png Binary files differindex 9285725d4..86b0ff176 100644 --- a/data/tilesets/primary/general/anim/1/1.png +++ b/data/tilesets/primary/general/anim/1/1.png diff --git a/data/tilesets/primary/general/anim/1/2.png b/data/tilesets/primary/general/anim/1/2.png Binary files differindex fc15dfee3..d2302180e 100644 --- a/data/tilesets/primary/general/anim/1/2.png +++ b/data/tilesets/primary/general/anim/1/2.png diff --git a/data/tilesets/primary/general/anim/1/3.png b/data/tilesets/primary/general/anim/1/3.png Binary files differindex 4b075d692..f757f8253 100644 --- a/data/tilesets/primary/general/anim/1/3.png +++ b/data/tilesets/primary/general/anim/1/3.png diff --git a/data/tilesets/primary/general/anim/1/4.png b/data/tilesets/primary/general/anim/1/4.png Binary files differindex e48773472..950b88585 100644 --- a/data/tilesets/primary/general/anim/1/4.png +++ b/data/tilesets/primary/general/anim/1/4.png diff --git a/data/tilesets/primary/general/anim/1/5.png b/data/tilesets/primary/general/anim/1/5.png Binary files differindex 17619f250..4de7d4225 100644 --- a/data/tilesets/primary/general/anim/1/5.png +++ b/data/tilesets/primary/general/anim/1/5.png diff --git a/data/tilesets/primary/general/anim/1/6.png b/data/tilesets/primary/general/anim/1/6.png Binary files differindex eaff830ca..73c1cabdd 100644 --- a/data/tilesets/primary/general/anim/1/6.png +++ b/data/tilesets/primary/general/anim/1/6.png diff --git a/data/tilesets/primary/general/anim/1/7.png b/data/tilesets/primary/general/anim/1/7.png Binary files differindex 684bb8a99..827fd8b74 100644 --- a/data/tilesets/primary/general/anim/1/7.png +++ b/data/tilesets/primary/general/anim/1/7.png diff --git a/data/tilesets/primary/general/anim/2/0.png b/data/tilesets/primary/general/anim/2/0.png Binary files differindex 04c2b2520..80c99c473 100644 --- a/data/tilesets/primary/general/anim/2/0.png +++ b/data/tilesets/primary/general/anim/2/0.png diff --git a/data/tilesets/primary/general/anim/2/1.png b/data/tilesets/primary/general/anim/2/1.png Binary files differindex dcf9ee899..52051f056 100644 --- a/data/tilesets/primary/general/anim/2/1.png +++ b/data/tilesets/primary/general/anim/2/1.png diff --git a/data/tilesets/primary/general/anim/2/2.png b/data/tilesets/primary/general/anim/2/2.png Binary files differindex 4c47a6a21..39c6e2f87 100644 --- a/data/tilesets/primary/general/anim/2/2.png +++ b/data/tilesets/primary/general/anim/2/2.png diff --git a/data/tilesets/primary/general/anim/2/3.png b/data/tilesets/primary/general/anim/2/3.png Binary files differindex 000f179f6..abb5ff362 100644 --- a/data/tilesets/primary/general/anim/2/3.png +++ b/data/tilesets/primary/general/anim/2/3.png diff --git a/data/tilesets/primary/general/anim/2/4.png b/data/tilesets/primary/general/anim/2/4.png Binary files differindex 92599da38..a7bde9837 100644 --- a/data/tilesets/primary/general/anim/2/4.png +++ b/data/tilesets/primary/general/anim/2/4.png diff --git a/data/tilesets/primary/general/anim/2/5.png b/data/tilesets/primary/general/anim/2/5.png Binary files differindex d0fb9fe00..05f88d81e 100644 --- a/data/tilesets/primary/general/anim/2/5.png +++ b/data/tilesets/primary/general/anim/2/5.png diff --git a/data/tilesets/primary/general/anim/2/6.png b/data/tilesets/primary/general/anim/2/6.png Binary files differindex 24385d2e9..01f9c203d 100644 --- a/data/tilesets/primary/general/anim/2/6.png +++ b/data/tilesets/primary/general/anim/2/6.png diff --git a/data/tilesets/primary/general/anim/3/0.png b/data/tilesets/primary/general/anim/3/0.png Binary files differindex a0b45b050..87b3ee5f5 100644 --- a/data/tilesets/primary/general/anim/3/0.png +++ b/data/tilesets/primary/general/anim/3/0.png diff --git a/data/tilesets/primary/general/anim/3/1.png b/data/tilesets/primary/general/anim/3/1.png Binary files differindex cd5679d9e..de633e03c 100644 --- a/data/tilesets/primary/general/anim/3/1.png +++ b/data/tilesets/primary/general/anim/3/1.png diff --git a/data/tilesets/primary/general/anim/3/2.png b/data/tilesets/primary/general/anim/3/2.png Binary files differindex c8f6abd1e..48ab11d04 100644 --- a/data/tilesets/primary/general/anim/3/2.png +++ b/data/tilesets/primary/general/anim/3/2.png diff --git a/data/tilesets/primary/general/anim/3/3.png b/data/tilesets/primary/general/anim/3/3.png Binary files differindex c31bc0cbf..c5177e4f0 100644 --- a/data/tilesets/primary/general/anim/3/3.png +++ b/data/tilesets/primary/general/anim/3/3.png diff --git a/data/tilesets/primary/general/anim/4/0.png b/data/tilesets/primary/general/anim/4/0.png Binary files differindex 04d9fc523..ba160b633 100644 --- a/data/tilesets/primary/general/anim/4/0.png +++ b/data/tilesets/primary/general/anim/4/0.png diff --git a/data/tilesets/primary/general/anim/4/1.png b/data/tilesets/primary/general/anim/4/1.png Binary files differindex 31cac19b3..48274c9a0 100644 --- a/data/tilesets/primary/general/anim/4/1.png +++ b/data/tilesets/primary/general/anim/4/1.png diff --git a/data/tilesets/primary/general/anim/4/2.png b/data/tilesets/primary/general/anim/4/2.png Binary files differindex 9f02ef64e..9e1f98c1b 100644 --- a/data/tilesets/primary/general/anim/4/2.png +++ b/data/tilesets/primary/general/anim/4/2.png diff --git a/data/tilesets/primary/general/anim/4/3.png b/data/tilesets/primary/general/anim/4/3.png Binary files differindex 59e8efac1..c5b446f65 100644 --- a/data/tilesets/primary/general/anim/4/3.png +++ b/data/tilesets/primary/general/anim/4/3.png diff --git a/data/tilesets/primary/general/tiles.png b/data/tilesets/primary/general/tiles.png Binary files differindex 168689b6d..b2955324e 100644 --- a/data/tilesets/primary/general/tiles.png +++ b/data/tilesets/primary/general/tiles.png diff --git a/data/tilesets/primary/secret_base/tiles.png b/data/tilesets/primary/secret_base/tiles.png Binary files differindex 9adc0e13f..e19d61a9d 100644 --- a/data/tilesets/primary/secret_base/tiles.png +++ b/data/tilesets/primary/secret_base/tiles.png diff --git a/data/tilesets/primary/secret_base/unknown_tiles.png b/data/tilesets/primary/secret_base/unknown_tiles.png Binary files differindex dd5c4e16a..2511e18b0 100644 --- a/data/tilesets/primary/secret_base/unknown_tiles.png +++ b/data/tilesets/primary/secret_base/unknown_tiles.png diff --git a/data/tilesets/secondary/battle_tower/tiles.png b/data/tilesets/secondary/battle_tower/tiles.png Binary files differindex 9e804c6bb..42ba6da3d 100644 --- a/data/tilesets/secondary/battle_tower/tiles.png +++ b/data/tilesets/secondary/battle_tower/tiles.png diff --git a/data/tilesets/secondary/bike_shop/anim/0.png b/data/tilesets/secondary/bike_shop/anim/0.png Binary files differindex cf8e62134..6b361d120 100644 --- a/data/tilesets/secondary/bike_shop/anim/0.png +++ b/data/tilesets/secondary/bike_shop/anim/0.png diff --git a/data/tilesets/secondary/bike_shop/anim/1.png b/data/tilesets/secondary/bike_shop/anim/1.png Binary files differindex 9e6df6692..c1f6783da 100644 --- a/data/tilesets/secondary/bike_shop/anim/1.png +++ b/data/tilesets/secondary/bike_shop/anim/1.png diff --git a/data/tilesets/secondary/bike_shop/tiles.png b/data/tilesets/secondary/bike_shop/tiles.png Binary files differindex ec109c3be..f4f48fca3 100644 --- a/data/tilesets/secondary/bike_shop/tiles.png +++ b/data/tilesets/secondary/bike_shop/tiles.png diff --git a/data/tilesets/secondary/brendans_mays_house/tiles.png b/data/tilesets/secondary/brendans_mays_house/tiles.png Binary files differindex b2f41cdae..4a1572fc7 100644 --- a/data/tilesets/secondary/brendans_mays_house/tiles.png +++ b/data/tilesets/secondary/brendans_mays_house/tiles.png diff --git a/data/tilesets/secondary/cable_club/tiles.png b/data/tilesets/secondary/cable_club/tiles.png Binary files differindex 2b153c1f4..7d2378a06 100644 --- a/data/tilesets/secondary/cable_club/tiles.png +++ b/data/tilesets/secondary/cable_club/tiles.png diff --git a/data/tilesets/secondary/cable_club/unknown_tiles.png b/data/tilesets/secondary/cable_club/unknown_tiles.png Binary files differindex da68cdff2..46e0916f3 100644 --- a/data/tilesets/secondary/cable_club/unknown_tiles.png +++ b/data/tilesets/secondary/cable_club/unknown_tiles.png diff --git a/data/tilesets/secondary/cave/anim/0.png b/data/tilesets/secondary/cave/anim/0.png Binary files differindex 67f294ffe..b5cf31bb4 100644 --- a/data/tilesets/secondary/cave/anim/0.png +++ b/data/tilesets/secondary/cave/anim/0.png diff --git a/data/tilesets/secondary/cave/anim/1.png b/data/tilesets/secondary/cave/anim/1.png Binary files differindex 9c92be807..a4324d4da 100644 --- a/data/tilesets/secondary/cave/anim/1.png +++ b/data/tilesets/secondary/cave/anim/1.png diff --git a/data/tilesets/secondary/cave/anim/2.png b/data/tilesets/secondary/cave/anim/2.png Binary files differindex 78ea00e04..4e69ab954 100644 --- a/data/tilesets/secondary/cave/anim/2.png +++ b/data/tilesets/secondary/cave/anim/2.png diff --git a/data/tilesets/secondary/cave/anim/3.png b/data/tilesets/secondary/cave/anim/3.png Binary files differindex 7edd52eaa..5d8448cec 100644 --- a/data/tilesets/secondary/cave/anim/3.png +++ b/data/tilesets/secondary/cave/anim/3.png diff --git a/data/tilesets/secondary/cave/anim/unused/0.png b/data/tilesets/secondary/cave/anim/unused/0.png Binary files differindex 44564e67a..21f4d55e7 100644 --- a/data/tilesets/secondary/cave/anim/unused/0.png +++ b/data/tilesets/secondary/cave/anim/unused/0.png diff --git a/data/tilesets/secondary/cave/anim/unused/1.png b/data/tilesets/secondary/cave/anim/unused/1.png Binary files differindex 47e7e17ee..c62636b1b 100644 --- a/data/tilesets/secondary/cave/anim/unused/1.png +++ b/data/tilesets/secondary/cave/anim/unused/1.png diff --git a/data/tilesets/secondary/cave/anim/unused/2.png b/data/tilesets/secondary/cave/anim/unused/2.png Binary files differindex d1447cde2..f07a0dc61 100644 --- a/data/tilesets/secondary/cave/anim/unused/2.png +++ b/data/tilesets/secondary/cave/anim/unused/2.png diff --git a/data/tilesets/secondary/cave/anim/unused/3.png b/data/tilesets/secondary/cave/anim/unused/3.png Binary files differindex 8ad81b1e1..4d305b934 100644 --- a/data/tilesets/secondary/cave/anim/unused/3.png +++ b/data/tilesets/secondary/cave/anim/unused/3.png diff --git a/data/tilesets/secondary/cave/tiles.png b/data/tilesets/secondary/cave/tiles.png Binary files differindex cf6ddc31a..28e4c0d0f 100644 --- a/data/tilesets/secondary/cave/tiles.png +++ b/data/tilesets/secondary/cave/tiles.png diff --git a/data/tilesets/secondary/contest/tiles.png b/data/tilesets/secondary/contest/tiles.png Binary files differindex 09ddee472..f9a1b5cd9 100644 --- a/data/tilesets/secondary/contest/tiles.png +++ b/data/tilesets/secondary/contest/tiles.png diff --git a/data/tilesets/secondary/dewford/tiles.png b/data/tilesets/secondary/dewford/tiles.png Binary files differindex cfaebcdbd..2073f4d08 100644 --- a/data/tilesets/secondary/dewford/tiles.png +++ b/data/tilesets/secondary/dewford/tiles.png diff --git a/data/tilesets/secondary/dewford_gym/tiles.png b/data/tilesets/secondary/dewford_gym/tiles.png Binary files differindex 2c41d6850..4f7cf81f9 100644 --- a/data/tilesets/secondary/dewford_gym/tiles.png +++ b/data/tilesets/secondary/dewford_gym/tiles.png diff --git a/data/tilesets/secondary/elite_four/anim/0/0.png b/data/tilesets/secondary/elite_four/anim/0/0.png Binary files differindex 806d26e57..108a2099b 100644 --- a/data/tilesets/secondary/elite_four/anim/0/0.png +++ b/data/tilesets/secondary/elite_four/anim/0/0.png diff --git a/data/tilesets/secondary/elite_four/anim/0/1.png b/data/tilesets/secondary/elite_four/anim/0/1.png Binary files differindex 2a8e6a31c..64b23f061 100644 --- a/data/tilesets/secondary/elite_four/anim/0/1.png +++ b/data/tilesets/secondary/elite_four/anim/0/1.png diff --git a/data/tilesets/secondary/elite_four/anim/0/2.png b/data/tilesets/secondary/elite_four/anim/0/2.png Binary files differindex c4e6161a6..0d9f603fc 100644 --- a/data/tilesets/secondary/elite_four/anim/0/2.png +++ b/data/tilesets/secondary/elite_four/anim/0/2.png diff --git a/data/tilesets/secondary/elite_four/anim/0/3.png b/data/tilesets/secondary/elite_four/anim/0/3.png Binary files differindex 2a8e6a31c..64b23f061 100644 --- a/data/tilesets/secondary/elite_four/anim/0/3.png +++ b/data/tilesets/secondary/elite_four/anim/0/3.png diff --git a/data/tilesets/secondary/elite_four/anim/1/0.png b/data/tilesets/secondary/elite_four/anim/1/0.png Binary files differindex 50b109ae5..6e508308b 100644 --- a/data/tilesets/secondary/elite_four/anim/1/0.png +++ b/data/tilesets/secondary/elite_four/anim/1/0.png diff --git a/data/tilesets/secondary/elite_four/anim/1/1.png b/data/tilesets/secondary/elite_four/anim/1/1.png Binary files differindex ae6a7f43a..794f26195 100644 --- a/data/tilesets/secondary/elite_four/anim/1/1.png +++ b/data/tilesets/secondary/elite_four/anim/1/1.png diff --git a/data/tilesets/secondary/elite_four/tiles.png b/data/tilesets/secondary/elite_four/tiles.png Binary files differindex 834be3701..751f5d8cd 100644 --- a/data/tilesets/secondary/elite_four/tiles.png +++ b/data/tilesets/secondary/elite_four/tiles.png diff --git a/data/tilesets/secondary/ever_grande/anim/0.png b/data/tilesets/secondary/ever_grande/anim/0.png Binary files differindex af45de64e..e749a3928 100644 --- a/data/tilesets/secondary/ever_grande/anim/0.png +++ b/data/tilesets/secondary/ever_grande/anim/0.png diff --git a/data/tilesets/secondary/ever_grande/anim/1.png b/data/tilesets/secondary/ever_grande/anim/1.png Binary files differindex af45de64e..e749a3928 100644 --- a/data/tilesets/secondary/ever_grande/anim/1.png +++ b/data/tilesets/secondary/ever_grande/anim/1.png diff --git a/data/tilesets/secondary/ever_grande/anim/2.png b/data/tilesets/secondary/ever_grande/anim/2.png Binary files differindex f6e0941c6..b91f5f41d 100644 --- a/data/tilesets/secondary/ever_grande/anim/2.png +++ b/data/tilesets/secondary/ever_grande/anim/2.png diff --git a/data/tilesets/secondary/ever_grande/anim/3.png b/data/tilesets/secondary/ever_grande/anim/3.png Binary files differindex 84b6438e1..98a0a1c0a 100644 --- a/data/tilesets/secondary/ever_grande/anim/3.png +++ b/data/tilesets/secondary/ever_grande/anim/3.png diff --git a/data/tilesets/secondary/ever_grande/anim/4.png b/data/tilesets/secondary/ever_grande/anim/4.png Binary files differindex af45de64e..e749a3928 100644 --- a/data/tilesets/secondary/ever_grande/anim/4.png +++ b/data/tilesets/secondary/ever_grande/anim/4.png diff --git a/data/tilesets/secondary/ever_grande/anim/5.png b/data/tilesets/secondary/ever_grande/anim/5.png Binary files differindex af45de64e..e749a3928 100644 --- a/data/tilesets/secondary/ever_grande/anim/5.png +++ b/data/tilesets/secondary/ever_grande/anim/5.png diff --git a/data/tilesets/secondary/ever_grande/anim/6.png b/data/tilesets/secondary/ever_grande/anim/6.png Binary files differindex 5042b12cd..f89873480 100644 --- a/data/tilesets/secondary/ever_grande/anim/6.png +++ b/data/tilesets/secondary/ever_grande/anim/6.png diff --git a/data/tilesets/secondary/ever_grande/anim/7.png b/data/tilesets/secondary/ever_grande/anim/7.png Binary files differindex 5042b12cd..f89873480 100644 --- a/data/tilesets/secondary/ever_grande/anim/7.png +++ b/data/tilesets/secondary/ever_grande/anim/7.png diff --git a/data/tilesets/secondary/ever_grande/tiles.png b/data/tilesets/secondary/ever_grande/tiles.png Binary files differindex 0f3689c24..a8ff3a742 100644 --- a/data/tilesets/secondary/ever_grande/tiles.png +++ b/data/tilesets/secondary/ever_grande/tiles.png diff --git a/data/tilesets/secondary/facility/tiles.png b/data/tilesets/secondary/facility/tiles.png Binary files differindex 015efc2a7..7ab52264b 100644 --- a/data/tilesets/secondary/facility/tiles.png +++ b/data/tilesets/secondary/facility/tiles.png diff --git a/data/tilesets/secondary/fallarbor/tiles.png b/data/tilesets/secondary/fallarbor/tiles.png Binary files differindex ab88caa62..4cebf7e81 100644 --- a/data/tilesets/secondary/fallarbor/tiles.png +++ b/data/tilesets/secondary/fallarbor/tiles.png diff --git a/data/tilesets/secondary/fortree/tiles.png b/data/tilesets/secondary/fortree/tiles.png Binary files differindex b14c78bf5..c19f2e80c 100644 --- a/data/tilesets/secondary/fortree/tiles.png +++ b/data/tilesets/secondary/fortree/tiles.png diff --git a/data/tilesets/secondary/fortree_gym/tiles.png b/data/tilesets/secondary/fortree_gym/tiles.png Binary files differindex cd571387a..3e278d4e1 100644 --- a/data/tilesets/secondary/fortree_gym/tiles.png +++ b/data/tilesets/secondary/fortree_gym/tiles.png diff --git a/data/tilesets/secondary/generic_building/tiles.png b/data/tilesets/secondary/generic_building/tiles.png Binary files differindex 0565c75a0..18aab082f 100644 --- a/data/tilesets/secondary/generic_building/tiles.png +++ b/data/tilesets/secondary/generic_building/tiles.png diff --git a/data/tilesets/secondary/inside_of_truck/tiles.png b/data/tilesets/secondary/inside_of_truck/tiles.png Binary files differindex 44f923a5a..59a24b705 100644 --- a/data/tilesets/secondary/inside_of_truck/tiles.png +++ b/data/tilesets/secondary/inside_of_truck/tiles.png diff --git a/data/tilesets/secondary/lab/tiles.png b/data/tilesets/secondary/lab/tiles.png Binary files differindex 1b1900dae..2f667aaff 100644 --- a/data/tilesets/secondary/lab/tiles.png +++ b/data/tilesets/secondary/lab/tiles.png diff --git a/data/tilesets/secondary/lavaridge/anim/0.png b/data/tilesets/secondary/lavaridge/anim/0.png Binary files differindex 303855f71..66f73e2d2 100644 --- a/data/tilesets/secondary/lavaridge/anim/0.png +++ b/data/tilesets/secondary/lavaridge/anim/0.png diff --git a/data/tilesets/secondary/lavaridge/anim/1.png b/data/tilesets/secondary/lavaridge/anim/1.png Binary files differindex 7cdee79e2..306799e63 100644 --- a/data/tilesets/secondary/lavaridge/anim/1.png +++ b/data/tilesets/secondary/lavaridge/anim/1.png diff --git a/data/tilesets/secondary/lavaridge/anim/2.png b/data/tilesets/secondary/lavaridge/anim/2.png Binary files differindex b5810b806..06ec224e9 100644 --- a/data/tilesets/secondary/lavaridge/anim/2.png +++ b/data/tilesets/secondary/lavaridge/anim/2.png diff --git a/data/tilesets/secondary/lavaridge/anim/3.png b/data/tilesets/secondary/lavaridge/anim/3.png Binary files differindex caf7b5698..cdacfa119 100644 --- a/data/tilesets/secondary/lavaridge/anim/3.png +++ b/data/tilesets/secondary/lavaridge/anim/3.png diff --git a/data/tilesets/secondary/lavaridge/tiles.png b/data/tilesets/secondary/lavaridge/tiles.png Binary files differindex b7f11ad3a..bfce10a15 100644 --- a/data/tilesets/secondary/lavaridge/tiles.png +++ b/data/tilesets/secondary/lavaridge/tiles.png diff --git a/data/tilesets/secondary/lavaridge_gym/tiles.png b/data/tilesets/secondary/lavaridge_gym/tiles.png Binary files differindex 294f066d6..6af060f6d 100644 --- a/data/tilesets/secondary/lavaridge_gym/tiles.png +++ b/data/tilesets/secondary/lavaridge_gym/tiles.png diff --git a/data/tilesets/secondary/lilycove/tiles.png b/data/tilesets/secondary/lilycove/tiles.png Binary files differindex 870c2dcc3..efdc0e770 100644 --- a/data/tilesets/secondary/lilycove/tiles.png +++ b/data/tilesets/secondary/lilycove/tiles.png diff --git a/data/tilesets/secondary/lilycove_museum/tiles.png b/data/tilesets/secondary/lilycove_museum/tiles.png Binary files differindex 495187301..d0f0cf036 100644 --- a/data/tilesets/secondary/lilycove_museum/tiles.png +++ b/data/tilesets/secondary/lilycove_museum/tiles.png diff --git a/data/tilesets/secondary/mauville/anim/0/0.png b/data/tilesets/secondary/mauville/anim/0/0.png Binary files differindex fbf1f5169..2b66ac856 100644 --- a/data/tilesets/secondary/mauville/anim/0/0.png +++ b/data/tilesets/secondary/mauville/anim/0/0.png diff --git a/data/tilesets/secondary/mauville/anim/0/1.png b/data/tilesets/secondary/mauville/anim/0/1.png Binary files differindex b07d27c5e..13fe4e27d 100644 --- a/data/tilesets/secondary/mauville/anim/0/1.png +++ b/data/tilesets/secondary/mauville/anim/0/1.png diff --git a/data/tilesets/secondary/mauville/anim/0/2.png b/data/tilesets/secondary/mauville/anim/0/2.png Binary files differindex 576981d72..c3a18889c 100644 --- a/data/tilesets/secondary/mauville/anim/0/2.png +++ b/data/tilesets/secondary/mauville/anim/0/2.png diff --git a/data/tilesets/secondary/mauville/anim/0/3.png b/data/tilesets/secondary/mauville/anim/0/3.png Binary files differindex 998f0c1b1..faf12f826 100644 --- a/data/tilesets/secondary/mauville/anim/0/3.png +++ b/data/tilesets/secondary/mauville/anim/0/3.png diff --git a/data/tilesets/secondary/mauville/anim/0/4.png b/data/tilesets/secondary/mauville/anim/0/4.png Binary files differindex 6bd9947f0..f8061fcfc 100644 --- a/data/tilesets/secondary/mauville/anim/0/4.png +++ b/data/tilesets/secondary/mauville/anim/0/4.png diff --git a/data/tilesets/secondary/mauville/anim/1/0.png b/data/tilesets/secondary/mauville/anim/1/0.png Binary files differindex fbf1f5169..2b66ac856 100644 --- a/data/tilesets/secondary/mauville/anim/1/0.png +++ b/data/tilesets/secondary/mauville/anim/1/0.png diff --git a/data/tilesets/secondary/mauville/anim/1/1.png b/data/tilesets/secondary/mauville/anim/1/1.png Binary files differindex b07d27c5e..13fe4e27d 100644 --- a/data/tilesets/secondary/mauville/anim/1/1.png +++ b/data/tilesets/secondary/mauville/anim/1/1.png diff --git a/data/tilesets/secondary/mauville/anim/1/2.png b/data/tilesets/secondary/mauville/anim/1/2.png Binary files differindex 576981d72..c3a18889c 100644 --- a/data/tilesets/secondary/mauville/anim/1/2.png +++ b/data/tilesets/secondary/mauville/anim/1/2.png diff --git a/data/tilesets/secondary/mauville/anim/1/3.png b/data/tilesets/secondary/mauville/anim/1/3.png Binary files differindex 998f0c1b1..faf12f826 100644 --- a/data/tilesets/secondary/mauville/anim/1/3.png +++ b/data/tilesets/secondary/mauville/anim/1/3.png diff --git a/data/tilesets/secondary/mauville/anim/1/4.png b/data/tilesets/secondary/mauville/anim/1/4.png Binary files differindex 6bd9947f0..f8061fcfc 100644 --- a/data/tilesets/secondary/mauville/anim/1/4.png +++ b/data/tilesets/secondary/mauville/anim/1/4.png diff --git a/data/tilesets/secondary/mauville/tiles.png b/data/tilesets/secondary/mauville/tiles.png Binary files differindex 66a5b9409..43029c47b 100644 --- a/data/tilesets/secondary/mauville/tiles.png +++ b/data/tilesets/secondary/mauville/tiles.png diff --git a/data/tilesets/secondary/mauville_game_corner/tiles.png b/data/tilesets/secondary/mauville_game_corner/tiles.png Binary files differindex c8f0dd1ee..50e341fde 100644 --- a/data/tilesets/secondary/mauville_game_corner/tiles.png +++ b/data/tilesets/secondary/mauville_game_corner/tiles.png diff --git a/data/tilesets/secondary/mauville_gym/anim/0.png b/data/tilesets/secondary/mauville_gym/anim/0.png Binary files differindex 009e26376..ebf603978 100644 --- a/data/tilesets/secondary/mauville_gym/anim/0.png +++ b/data/tilesets/secondary/mauville_gym/anim/0.png diff --git a/data/tilesets/secondary/mauville_gym/anim/1.png b/data/tilesets/secondary/mauville_gym/anim/1.png Binary files differindex 9decb30cc..34072707f 100644 --- a/data/tilesets/secondary/mauville_gym/anim/1.png +++ b/data/tilesets/secondary/mauville_gym/anim/1.png diff --git a/data/tilesets/secondary/mauville_gym/tiles.png b/data/tilesets/secondary/mauville_gym/tiles.png Binary files differindex e48835bd4..31ab2420d 100644 --- a/data/tilesets/secondary/mauville_gym/tiles.png +++ b/data/tilesets/secondary/mauville_gym/tiles.png diff --git a/data/tilesets/secondary/meteor_falls/tiles.png b/data/tilesets/secondary/meteor_falls/tiles.png Binary files differindex 391b509a4..95f665a06 100644 --- a/data/tilesets/secondary/meteor_falls/tiles.png +++ b/data/tilesets/secondary/meteor_falls/tiles.png diff --git a/data/tilesets/secondary/mossdeep/tiles.png b/data/tilesets/secondary/mossdeep/tiles.png Binary files differindex 4e79dd23c..d38750f93 100644 --- a/data/tilesets/secondary/mossdeep/tiles.png +++ b/data/tilesets/secondary/mossdeep/tiles.png diff --git a/data/tilesets/secondary/mossdeep_gym/tiles.png b/data/tilesets/secondary/mossdeep_gym/tiles.png Binary files differindex a804c3ed1..b9e5b0a54 100644 --- a/data/tilesets/secondary/mossdeep_gym/tiles.png +++ b/data/tilesets/secondary/mossdeep_gym/tiles.png diff --git a/data/tilesets/secondary/oceanic_museum/tiles.png b/data/tilesets/secondary/oceanic_museum/tiles.png Binary files differindex 25a20d586..bda540d6b 100644 --- a/data/tilesets/secondary/oceanic_museum/tiles.png +++ b/data/tilesets/secondary/oceanic_museum/tiles.png diff --git a/data/tilesets/secondary/pacifidlog/anim/0/0.png b/data/tilesets/secondary/pacifidlog/anim/0/0.png Binary files differindex 796919f75..1b99b24a1 100644 --- a/data/tilesets/secondary/pacifidlog/anim/0/0.png +++ b/data/tilesets/secondary/pacifidlog/anim/0/0.png diff --git a/data/tilesets/secondary/pacifidlog/anim/0/1.png b/data/tilesets/secondary/pacifidlog/anim/0/1.png Binary files differindex ece22253b..74c510efe 100644 --- a/data/tilesets/secondary/pacifidlog/anim/0/1.png +++ b/data/tilesets/secondary/pacifidlog/anim/0/1.png diff --git a/data/tilesets/secondary/pacifidlog/anim/0/2.png b/data/tilesets/secondary/pacifidlog/anim/0/2.png Binary files differindex cf2b2dea0..7e9811c4e 100644 --- a/data/tilesets/secondary/pacifidlog/anim/0/2.png +++ b/data/tilesets/secondary/pacifidlog/anim/0/2.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/0.png b/data/tilesets/secondary/pacifidlog/anim/1/0.png Binary files differindex 6510bf558..6d432eb25 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/0.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/0.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/1.png b/data/tilesets/secondary/pacifidlog/anim/1/1.png Binary files differindex b31301a5e..7588b8a72 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/1.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/1.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/2.png b/data/tilesets/secondary/pacifidlog/anim/1/2.png Binary files differindex 6287c3c56..2a11e5065 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/2.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/2.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/3.png b/data/tilesets/secondary/pacifidlog/anim/1/3.png Binary files differindex b015319e4..be4089ff4 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/3.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/3.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/4.png b/data/tilesets/secondary/pacifidlog/anim/1/4.png Binary files differindex 66d150608..4c16111de 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/4.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/4.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/5.png b/data/tilesets/secondary/pacifidlog/anim/1/5.png Binary files differindex fcb3e7fda..93bbc6375 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/5.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/5.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/6.png b/data/tilesets/secondary/pacifidlog/anim/1/6.png Binary files differindex e6fd8abb2..b08f5a0d9 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/6.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/6.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/7.png b/data/tilesets/secondary/pacifidlog/anim/1/7.png Binary files differindex 7b4785692..1a5f0ae5c 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/7.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/7.png diff --git a/data/tilesets/secondary/pacifidlog/tiles.png b/data/tilesets/secondary/pacifidlog/tiles.png Binary files differindex 836fa205f..2b38b82b8 100644 --- a/data/tilesets/secondary/pacifidlog/tiles.png +++ b/data/tilesets/secondary/pacifidlog/tiles.png diff --git a/data/tilesets/secondary/petalburg/tiles.png b/data/tilesets/secondary/petalburg/tiles.png Binary files differindex 645d3d1f3..e938a0237 100644 --- a/data/tilesets/secondary/petalburg/tiles.png +++ b/data/tilesets/secondary/petalburg/tiles.png diff --git a/data/tilesets/secondary/petalburg_gym/tiles.png b/data/tilesets/secondary/petalburg_gym/tiles.png Binary files differindex c9654b13c..1050f8d34 100644 --- a/data/tilesets/secondary/petalburg_gym/tiles.png +++ b/data/tilesets/secondary/petalburg_gym/tiles.png diff --git a/data/tilesets/secondary/pokemon_center/tiles.png b/data/tilesets/secondary/pokemon_center/tiles.png Binary files differindex 47ef09750..e2294af02 100644 --- a/data/tilesets/secondary/pokemon_center/tiles.png +++ b/data/tilesets/secondary/pokemon_center/tiles.png diff --git a/data/tilesets/secondary/pokemon_day_care/tiles.png b/data/tilesets/secondary/pokemon_day_care/tiles.png Binary files differindex eab49af32..a45206efc 100644 --- a/data/tilesets/secondary/pokemon_day_care/tiles.png +++ b/data/tilesets/secondary/pokemon_day_care/tiles.png diff --git a/data/tilesets/secondary/pokemon_fan_club/tiles.png b/data/tilesets/secondary/pokemon_fan_club/tiles.png Binary files differindex 2714292f0..fa42a5ef1 100644 --- a/data/tilesets/secondary/pokemon_fan_club/tiles.png +++ b/data/tilesets/secondary/pokemon_fan_club/tiles.png diff --git a/data/tilesets/secondary/pokemon_school/tiles.png b/data/tilesets/secondary/pokemon_school/tiles.png Binary files differindex 3c8c4dffe..8ea0e8fbd 100644 --- a/data/tilesets/secondary/pokemon_school/tiles.png +++ b/data/tilesets/secondary/pokemon_school/tiles.png diff --git a/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png b/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png Binary files differindex 7a9e44935..daf4e05b4 100644 --- a/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png +++ b/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png diff --git a/data/tilesets/secondary/rustboro/anim/0/0.png b/data/tilesets/secondary/rustboro/anim/0/0.png Binary files differindex 0ffce1460..af00b97c7 100644 --- a/data/tilesets/secondary/rustboro/anim/0/0.png +++ b/data/tilesets/secondary/rustboro/anim/0/0.png diff --git a/data/tilesets/secondary/rustboro/anim/0/1.png b/data/tilesets/secondary/rustboro/anim/0/1.png Binary files differindex b29ebd10c..20b1ef630 100644 --- a/data/tilesets/secondary/rustboro/anim/0/1.png +++ b/data/tilesets/secondary/rustboro/anim/0/1.png diff --git a/data/tilesets/secondary/rustboro/anim/0/2.png b/data/tilesets/secondary/rustboro/anim/0/2.png Binary files differindex 7716d0b1a..44c4b2cdc 100644 --- a/data/tilesets/secondary/rustboro/anim/0/2.png +++ b/data/tilesets/secondary/rustboro/anim/0/2.png diff --git a/data/tilesets/secondary/rustboro/anim/0/3.png b/data/tilesets/secondary/rustboro/anim/0/3.png Binary files differindex 7716d0b1a..44c4b2cdc 100644 --- a/data/tilesets/secondary/rustboro/anim/0/3.png +++ b/data/tilesets/secondary/rustboro/anim/0/3.png diff --git a/data/tilesets/secondary/rustboro/anim/0/4.png b/data/tilesets/secondary/rustboro/anim/0/4.png Binary files differindex 7716d0b1a..44c4b2cdc 100644 --- a/data/tilesets/secondary/rustboro/anim/0/4.png +++ b/data/tilesets/secondary/rustboro/anim/0/4.png diff --git a/data/tilesets/secondary/rustboro/anim/0/5.png b/data/tilesets/secondary/rustboro/anim/0/5.png Binary files differindex 7716d0b1a..44c4b2cdc 100644 --- a/data/tilesets/secondary/rustboro/anim/0/5.png +++ b/data/tilesets/secondary/rustboro/anim/0/5.png diff --git a/data/tilesets/secondary/rustboro/anim/0/6.png b/data/tilesets/secondary/rustboro/anim/0/6.png Binary files differindex 7716d0b1a..44c4b2cdc 100644 --- a/data/tilesets/secondary/rustboro/anim/0/6.png +++ b/data/tilesets/secondary/rustboro/anim/0/6.png diff --git a/data/tilesets/secondary/rustboro/anim/0/7.png b/data/tilesets/secondary/rustboro/anim/0/7.png Binary files differindex 7716d0b1a..44c4b2cdc 100644 --- a/data/tilesets/secondary/rustboro/anim/0/7.png +++ b/data/tilesets/secondary/rustboro/anim/0/7.png diff --git a/data/tilesets/secondary/rustboro/anim/1/0.png b/data/tilesets/secondary/rustboro/anim/1/0.png Binary files differindex d975c947f..cc28fd1c0 100644 --- a/data/tilesets/secondary/rustboro/anim/1/0.png +++ b/data/tilesets/secondary/rustboro/anim/1/0.png diff --git a/data/tilesets/secondary/rustboro/anim/1/1.png b/data/tilesets/secondary/rustboro/anim/1/1.png Binary files differindex 751ba9cef..8752818ed 100644 --- a/data/tilesets/secondary/rustboro/anim/1/1.png +++ b/data/tilesets/secondary/rustboro/anim/1/1.png diff --git a/data/tilesets/secondary/rustboro/tiles.png b/data/tilesets/secondary/rustboro/tiles.png Binary files differindex 59ddc0135..32d35a419 100644 --- a/data/tilesets/secondary/rustboro/tiles.png +++ b/data/tilesets/secondary/rustboro/tiles.png diff --git a/data/tilesets/secondary/rustboro_gym/tiles.png b/data/tilesets/secondary/rustboro_gym/tiles.png Binary files differindex 760816284..7e2406d68 100644 --- a/data/tilesets/secondary/rustboro_gym/tiles.png +++ b/data/tilesets/secondary/rustboro_gym/tiles.png diff --git a/data/tilesets/secondary/rusturf_tunnel/tiles.png b/data/tilesets/secondary/rusturf_tunnel/tiles.png Binary files differindex a01a09844..3f94257c8 100644 --- a/data/tilesets/secondary/rusturf_tunnel/tiles.png +++ b/data/tilesets/secondary/rusturf_tunnel/tiles.png diff --git a/data/tilesets/secondary/seashore_house/tiles.png b/data/tilesets/secondary/seashore_house/tiles.png Binary files differindex 695f83037..14100fa06 100644 --- a/data/tilesets/secondary/seashore_house/tiles.png +++ b/data/tilesets/secondary/seashore_house/tiles.png diff --git a/data/tilesets/secondary/secret_base/blue_cave/tiles.png b/data/tilesets/secondary/secret_base/blue_cave/tiles.png Binary files differindex 207e8d845..ed7126297 100644 --- a/data/tilesets/secondary/secret_base/blue_cave/tiles.png +++ b/data/tilesets/secondary/secret_base/blue_cave/tiles.png diff --git a/data/tilesets/secondary/secret_base/brown_cave/tiles.png b/data/tilesets/secondary/secret_base/brown_cave/tiles.png Binary files differindex 7888f8cc2..7beb706d9 100644 --- a/data/tilesets/secondary/secret_base/brown_cave/tiles.png +++ b/data/tilesets/secondary/secret_base/brown_cave/tiles.png diff --git a/data/tilesets/secondary/secret_base/red_cave/tiles.png b/data/tilesets/secondary/secret_base/red_cave/tiles.png Binary files differindex 5c21865e2..5146810e1 100644 --- a/data/tilesets/secondary/secret_base/red_cave/tiles.png +++ b/data/tilesets/secondary/secret_base/red_cave/tiles.png diff --git a/data/tilesets/secondary/secret_base/shrub/tiles.png b/data/tilesets/secondary/secret_base/shrub/tiles.png Binary files differindex 2e0a6d028..a64727c6e 100644 --- a/data/tilesets/secondary/secret_base/shrub/tiles.png +++ b/data/tilesets/secondary/secret_base/shrub/tiles.png diff --git a/data/tilesets/secondary/secret_base/tree/tiles.png b/data/tilesets/secondary/secret_base/tree/tiles.png Binary files differindex 83ddd6144..f07999cb0 100644 --- a/data/tilesets/secondary/secret_base/tree/tiles.png +++ b/data/tilesets/secondary/secret_base/tree/tiles.png diff --git a/data/tilesets/secondary/secret_base/yellow_cave/tiles.png b/data/tilesets/secondary/secret_base/yellow_cave/tiles.png Binary files differindex e8386a804..d4535523b 100644 --- a/data/tilesets/secondary/secret_base/yellow_cave/tiles.png +++ b/data/tilesets/secondary/secret_base/yellow_cave/tiles.png diff --git a/data/tilesets/secondary/ship/tiles.png b/data/tilesets/secondary/ship/tiles.png Binary files differindex d4b0471b2..5ddbe2859 100644 --- a/data/tilesets/secondary/ship/tiles.png +++ b/data/tilesets/secondary/ship/tiles.png diff --git a/data/tilesets/secondary/shop/tiles.png b/data/tilesets/secondary/shop/tiles.png Binary files differindex b5a0a4936..9715afa0e 100644 --- a/data/tilesets/secondary/shop/tiles.png +++ b/data/tilesets/secondary/shop/tiles.png diff --git a/data/tilesets/secondary/slateport/tiles.png b/data/tilesets/secondary/slateport/tiles.png Binary files differindex d51c0dea5..f350b3b8d 100644 --- a/data/tilesets/secondary/slateport/tiles.png +++ b/data/tilesets/secondary/slateport/tiles.png diff --git a/data/tilesets/secondary/sootopolis/tiles.png b/data/tilesets/secondary/sootopolis/tiles.png Binary files differindex 588e5e8e9..8c5dddc76 100644 --- a/data/tilesets/secondary/sootopolis/tiles.png +++ b/data/tilesets/secondary/sootopolis/tiles.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png b/data/tilesets/secondary/sootopolis_gym/anim/0/0.png Binary files differindex 6d2101cb3..180b5522e 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/0/0.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png b/data/tilesets/secondary/sootopolis_gym/anim/0/1.png Binary files differindex 0d5143569..af3ab12d2 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/0/1.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png b/data/tilesets/secondary/sootopolis_gym/anim/0/2.png Binary files differindex 2f8981ba2..8481c0cde 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/0/2.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png b/data/tilesets/secondary/sootopolis_gym/anim/1/0.png Binary files differindex 7b863adf3..dc6cf500e 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/1/0.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png b/data/tilesets/secondary/sootopolis_gym/anim/1/1.png Binary files differindex d685a9a03..93dd79753 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/1/1.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png b/data/tilesets/secondary/sootopolis_gym/anim/1/2.png Binary files differindex 0966ce903..30961482c 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/1/2.png diff --git a/data/tilesets/secondary/sootopolis_gym/tiles.png b/data/tilesets/secondary/sootopolis_gym/tiles.png Binary files differindex ca53f06f7..5231d92ab 100644 --- a/data/tilesets/secondary/sootopolis_gym/tiles.png +++ b/data/tilesets/secondary/sootopolis_gym/tiles.png diff --git a/data/tilesets/secondary/trick_house_puzzle/tiles.png b/data/tilesets/secondary/trick_house_puzzle/tiles.png Binary files differindex c1a8d7055..e74f00aa2 100644 --- a/data/tilesets/secondary/trick_house_puzzle/tiles.png +++ b/data/tilesets/secondary/trick_house_puzzle/tiles.png diff --git a/data/tilesets/secondary/underwater/anim/0.png b/data/tilesets/secondary/underwater/anim/0.png Binary files differindex 50a737609..fab28e54f 100644 --- a/data/tilesets/secondary/underwater/anim/0.png +++ b/data/tilesets/secondary/underwater/anim/0.png diff --git a/data/tilesets/secondary/underwater/anim/1.png b/data/tilesets/secondary/underwater/anim/1.png Binary files differindex da52e9b17..869bc6060 100644 --- a/data/tilesets/secondary/underwater/anim/1.png +++ b/data/tilesets/secondary/underwater/anim/1.png diff --git a/data/tilesets/secondary/underwater/anim/2.png b/data/tilesets/secondary/underwater/anim/2.png Binary files differindex 5055f6a01..64e4b267d 100644 --- a/data/tilesets/secondary/underwater/anim/2.png +++ b/data/tilesets/secondary/underwater/anim/2.png diff --git a/data/tilesets/secondary/underwater/anim/3.png b/data/tilesets/secondary/underwater/anim/3.png Binary files differindex 25514326d..0c1392011 100644 --- a/data/tilesets/secondary/underwater/anim/3.png +++ b/data/tilesets/secondary/underwater/anim/3.png diff --git a/data/tilesets/secondary/underwater/tiles.png b/data/tilesets/secondary/underwater/tiles.png Binary files differindex e0569d970..811b0cae4 100644 --- a/data/tilesets/secondary/underwater/tiles.png +++ b/data/tilesets/secondary/underwater/tiles.png diff --git a/data/tilesets/secondary/unused_1/tiles.png b/data/tilesets/secondary/unused_1/tiles.png Binary files differindex 0a35187c8..9347405d4 100644 --- a/data/tilesets/secondary/unused_1/tiles.png +++ b/data/tilesets/secondary/unused_1/tiles.png diff --git a/data/tilesets/secondary/unused_2/tiles.png b/data/tilesets/secondary/unused_2/tiles.png Binary files differindex b9c594303..d734e826d 100644 --- a/data/tilesets/secondary/unused_2/tiles.png +++ b/data/tilesets/secondary/unused_2/tiles.png diff --git a/graphics/event_objects/pics/berry_trees/aguav.png b/graphics/event_objects/pics/berry_trees/aguav.png Binary files differnew file mode 100755 index 000000000..fca4b0dd5 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/aguav.png diff --git a/graphics/event_objects/pics/berry_trees/aguav/0.png b/graphics/event_objects/pics/berry_trees/aguav/0.png Binary files differdeleted file mode 100644 index 0463d51db..000000000 --- a/graphics/event_objects/pics/berry_trees/aguav/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/aguav/1.png b/graphics/event_objects/pics/berry_trees/aguav/1.png Binary files differdeleted file mode 100644 index a5f4b8bee..000000000 --- a/graphics/event_objects/pics/berry_trees/aguav/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/aguav/2.png b/graphics/event_objects/pics/berry_trees/aguav/2.png Binary files differdeleted file mode 100644 index 7af57fd97..000000000 --- a/graphics/event_objects/pics/berry_trees/aguav/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/aguav/3.png b/graphics/event_objects/pics/berry_trees/aguav/3.png Binary files differdeleted file mode 100644 index 0fdd3f994..000000000 --- a/graphics/event_objects/pics/berry_trees/aguav/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/aguav/4.png b/graphics/event_objects/pics/berry_trees/aguav/4.png Binary files differdeleted file mode 100644 index f3fc70076..000000000 --- a/graphics/event_objects/pics/berry_trees/aguav/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/aguav/5.png b/graphics/event_objects/pics/berry_trees/aguav/5.png Binary files differdeleted file mode 100644 index b437940bf..000000000 --- a/graphics/event_objects/pics/berry_trees/aguav/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/aspear.png b/graphics/event_objects/pics/berry_trees/aspear.png Binary files differnew file mode 100755 index 000000000..d0782166e --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/aspear.png diff --git a/graphics/event_objects/pics/berry_trees/aspear/0.png b/graphics/event_objects/pics/berry_trees/aspear/0.png Binary files differdeleted file mode 100644 index 933957413..000000000 --- a/graphics/event_objects/pics/berry_trees/aspear/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/aspear/1.png b/graphics/event_objects/pics/berry_trees/aspear/1.png Binary files differdeleted file mode 100644 index ee750e7f3..000000000 --- a/graphics/event_objects/pics/berry_trees/aspear/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/aspear/2.png b/graphics/event_objects/pics/berry_trees/aspear/2.png Binary files differdeleted file mode 100644 index e3a4e47bb..000000000 --- a/graphics/event_objects/pics/berry_trees/aspear/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/aspear/3.png b/graphics/event_objects/pics/berry_trees/aspear/3.png Binary files differdeleted file mode 100644 index df16ae330..000000000 --- a/graphics/event_objects/pics/berry_trees/aspear/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/aspear/4.png b/graphics/event_objects/pics/berry_trees/aspear/4.png Binary files differdeleted file mode 100644 index 8d9bd38fb..000000000 --- a/graphics/event_objects/pics/berry_trees/aspear/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/aspear/5.png b/graphics/event_objects/pics/berry_trees/aspear/5.png Binary files differdeleted file mode 100644 index 495119480..000000000 --- a/graphics/event_objects/pics/berry_trees/aspear/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/cheri.png b/graphics/event_objects/pics/berry_trees/cheri.png Binary files differnew file mode 100755 index 000000000..ec2db0ae3 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/cheri.png diff --git a/graphics/event_objects/pics/berry_trees/cheri/0.png b/graphics/event_objects/pics/berry_trees/cheri/0.png Binary files differdeleted file mode 100644 index 18588dc6c..000000000 --- a/graphics/event_objects/pics/berry_trees/cheri/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/cheri/1.png b/graphics/event_objects/pics/berry_trees/cheri/1.png Binary files differdeleted file mode 100644 index e9419d0fe..000000000 --- a/graphics/event_objects/pics/berry_trees/cheri/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/cheri/2.png b/graphics/event_objects/pics/berry_trees/cheri/2.png Binary files differdeleted file mode 100644 index 4022a7e5e..000000000 --- a/graphics/event_objects/pics/berry_trees/cheri/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/cheri/3.png b/graphics/event_objects/pics/berry_trees/cheri/3.png Binary files differdeleted file mode 100644 index c2572383c..000000000 --- a/graphics/event_objects/pics/berry_trees/cheri/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/cheri/4.png b/graphics/event_objects/pics/berry_trees/cheri/4.png Binary files differdeleted file mode 100644 index 462596c51..000000000 --- a/graphics/event_objects/pics/berry_trees/cheri/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/cheri/5.png b/graphics/event_objects/pics/berry_trees/cheri/5.png Binary files differdeleted file mode 100644 index 447f1d865..000000000 --- a/graphics/event_objects/pics/berry_trees/cheri/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/chesto.png b/graphics/event_objects/pics/berry_trees/chesto.png Binary files differnew file mode 100755 index 000000000..3087de2b2 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/chesto.png diff --git a/graphics/event_objects/pics/berry_trees/chesto/0.png b/graphics/event_objects/pics/berry_trees/chesto/0.png Binary files differdeleted file mode 100644 index 516a334c1..000000000 --- a/graphics/event_objects/pics/berry_trees/chesto/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/chesto/1.png b/graphics/event_objects/pics/berry_trees/chesto/1.png Binary files differdeleted file mode 100644 index dacc90fb3..000000000 --- a/graphics/event_objects/pics/berry_trees/chesto/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/chesto/2.png b/graphics/event_objects/pics/berry_trees/chesto/2.png Binary files differdeleted file mode 100644 index c0a2ec30d..000000000 --- a/graphics/event_objects/pics/berry_trees/chesto/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/chesto/3.png b/graphics/event_objects/pics/berry_trees/chesto/3.png Binary files differdeleted file mode 100644 index 328fee834..000000000 --- a/graphics/event_objects/pics/berry_trees/chesto/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/chesto/4.png b/graphics/event_objects/pics/berry_trees/chesto/4.png Binary files differdeleted file mode 100644 index d40a393a2..000000000 --- a/graphics/event_objects/pics/berry_trees/chesto/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/chesto/5.png b/graphics/event_objects/pics/berry_trees/chesto/5.png Binary files differdeleted file mode 100644 index 3d3d03d64..000000000 --- a/graphics/event_objects/pics/berry_trees/chesto/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/cornn.png b/graphics/event_objects/pics/berry_trees/cornn.png Binary files differnew file mode 100755 index 000000000..de3ba7003 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/cornn.png diff --git a/graphics/event_objects/pics/berry_trees/cornn/0.png b/graphics/event_objects/pics/berry_trees/cornn/0.png Binary files differdeleted file mode 100644 index 8388b030c..000000000 --- a/graphics/event_objects/pics/berry_trees/cornn/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/cornn/1.png b/graphics/event_objects/pics/berry_trees/cornn/1.png Binary files differdeleted file mode 100644 index 23d529796..000000000 --- a/graphics/event_objects/pics/berry_trees/cornn/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/cornn/2.png b/graphics/event_objects/pics/berry_trees/cornn/2.png Binary files differdeleted file mode 100644 index 969020d39..000000000 --- a/graphics/event_objects/pics/berry_trees/cornn/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/cornn/3.png b/graphics/event_objects/pics/berry_trees/cornn/3.png Binary files differdeleted file mode 100644 index 88d136547..000000000 --- a/graphics/event_objects/pics/berry_trees/cornn/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/cornn/4.png b/graphics/event_objects/pics/berry_trees/cornn/4.png Binary files differdeleted file mode 100644 index c50789645..000000000 --- a/graphics/event_objects/pics/berry_trees/cornn/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/cornn/5.png b/graphics/event_objects/pics/berry_trees/cornn/5.png Binary files differdeleted file mode 100644 index de7b7f4ad..000000000 --- a/graphics/event_objects/pics/berry_trees/cornn/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/dirt_pile.png b/graphics/event_objects/pics/berry_trees/dirt_pile.png Binary files differindex 3790fd846..ed2a38b3f 100644 --- a/graphics/event_objects/pics/berry_trees/dirt_pile.png +++ b/graphics/event_objects/pics/berry_trees/dirt_pile.png diff --git a/graphics/event_objects/pics/berry_trees/durin.png b/graphics/event_objects/pics/berry_trees/durin.png Binary files differnew file mode 100755 index 000000000..c0caf166f --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/durin.png diff --git a/graphics/event_objects/pics/berry_trees/durin/0.png b/graphics/event_objects/pics/berry_trees/durin/0.png Binary files differdeleted file mode 100644 index eefe4ba78..000000000 --- a/graphics/event_objects/pics/berry_trees/durin/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/durin/1.png b/graphics/event_objects/pics/berry_trees/durin/1.png Binary files differdeleted file mode 100644 index d5b75b3b3..000000000 --- a/graphics/event_objects/pics/berry_trees/durin/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/durin/2.png b/graphics/event_objects/pics/berry_trees/durin/2.png Binary files differdeleted file mode 100644 index cf854194d..000000000 --- a/graphics/event_objects/pics/berry_trees/durin/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/durin/3.png b/graphics/event_objects/pics/berry_trees/durin/3.png Binary files differdeleted file mode 100644 index 41425502f..000000000 --- a/graphics/event_objects/pics/berry_trees/durin/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/durin/4.png b/graphics/event_objects/pics/berry_trees/durin/4.png Binary files differdeleted file mode 100644 index 66337024c..000000000 --- a/graphics/event_objects/pics/berry_trees/durin/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/durin/5.png b/graphics/event_objects/pics/berry_trees/durin/5.png Binary files differdeleted file mode 100644 index 22c672fac..000000000 --- a/graphics/event_objects/pics/berry_trees/durin/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/figy.png b/graphics/event_objects/pics/berry_trees/figy.png Binary files differnew file mode 100755 index 000000000..6ca366296 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/figy.png diff --git a/graphics/event_objects/pics/berry_trees/figy/0.png b/graphics/event_objects/pics/berry_trees/figy/0.png Binary files differdeleted file mode 100644 index 0eea8f98c..000000000 --- a/graphics/event_objects/pics/berry_trees/figy/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/figy/1.png b/graphics/event_objects/pics/berry_trees/figy/1.png Binary files differdeleted file mode 100644 index 018e0ae3f..000000000 --- a/graphics/event_objects/pics/berry_trees/figy/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/figy/2.png b/graphics/event_objects/pics/berry_trees/figy/2.png Binary files differdeleted file mode 100644 index df10bb526..000000000 --- a/graphics/event_objects/pics/berry_trees/figy/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/figy/3.png b/graphics/event_objects/pics/berry_trees/figy/3.png Binary files differdeleted file mode 100644 index bf1785f87..000000000 --- a/graphics/event_objects/pics/berry_trees/figy/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/figy/4.png b/graphics/event_objects/pics/berry_trees/figy/4.png Binary files differdeleted file mode 100644 index 46d794635..000000000 --- a/graphics/event_objects/pics/berry_trees/figy/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/figy/5.png b/graphics/event_objects/pics/berry_trees/figy/5.png Binary files differdeleted file mode 100644 index 945773fda..000000000 --- a/graphics/event_objects/pics/berry_trees/figy/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/grepa.png b/graphics/event_objects/pics/berry_trees/grepa.png Binary files differnew file mode 100755 index 000000000..33788c4a4 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/grepa.png diff --git a/graphics/event_objects/pics/berry_trees/grepa/0.png b/graphics/event_objects/pics/berry_trees/grepa/0.png Binary files differdeleted file mode 100644 index abd265e0b..000000000 --- a/graphics/event_objects/pics/berry_trees/grepa/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/grepa/1.png b/graphics/event_objects/pics/berry_trees/grepa/1.png Binary files differdeleted file mode 100644 index 27e90c9bd..000000000 --- a/graphics/event_objects/pics/berry_trees/grepa/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/grepa/2.png b/graphics/event_objects/pics/berry_trees/grepa/2.png Binary files differdeleted file mode 100644 index 22e354eb0..000000000 --- a/graphics/event_objects/pics/berry_trees/grepa/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/grepa/3.png b/graphics/event_objects/pics/berry_trees/grepa/3.png Binary files differdeleted file mode 100644 index e23824dd3..000000000 --- a/graphics/event_objects/pics/berry_trees/grepa/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/grepa/4.png b/graphics/event_objects/pics/berry_trees/grepa/4.png Binary files differdeleted file mode 100644 index 4b8ad19a0..000000000 --- a/graphics/event_objects/pics/berry_trees/grepa/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/grepa/5.png b/graphics/event_objects/pics/berry_trees/grepa/5.png Binary files differdeleted file mode 100644 index 9bf54a3e0..000000000 --- a/graphics/event_objects/pics/berry_trees/grepa/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/hondew.png b/graphics/event_objects/pics/berry_trees/hondew.png Binary files differnew file mode 100755 index 000000000..c07bc17f7 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/hondew.png diff --git a/graphics/event_objects/pics/berry_trees/hondew/0.png b/graphics/event_objects/pics/berry_trees/hondew/0.png Binary files differdeleted file mode 100644 index ab1cffe55..000000000 --- a/graphics/event_objects/pics/berry_trees/hondew/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/hondew/1.png b/graphics/event_objects/pics/berry_trees/hondew/1.png Binary files differdeleted file mode 100644 index e24fd5b95..000000000 --- a/graphics/event_objects/pics/berry_trees/hondew/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/hondew/2.png b/graphics/event_objects/pics/berry_trees/hondew/2.png Binary files differdeleted file mode 100644 index dc7938958..000000000 --- a/graphics/event_objects/pics/berry_trees/hondew/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/hondew/3.png b/graphics/event_objects/pics/berry_trees/hondew/3.png Binary files differdeleted file mode 100644 index 5c9536e87..000000000 --- a/graphics/event_objects/pics/berry_trees/hondew/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/hondew/4.png b/graphics/event_objects/pics/berry_trees/hondew/4.png Binary files differdeleted file mode 100644 index 2419d058b..000000000 --- a/graphics/event_objects/pics/berry_trees/hondew/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/hondew/5.png b/graphics/event_objects/pics/berry_trees/hondew/5.png Binary files differdeleted file mode 100644 index 76aa9a8e3..000000000 --- a/graphics/event_objects/pics/berry_trees/hondew/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/iapapa.png b/graphics/event_objects/pics/berry_trees/iapapa.png Binary files differnew file mode 100755 index 000000000..98eb27c1d --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/iapapa.png diff --git a/graphics/event_objects/pics/berry_trees/iapapa/0.png b/graphics/event_objects/pics/berry_trees/iapapa/0.png Binary files differdeleted file mode 100644 index 506c8bb4b..000000000 --- a/graphics/event_objects/pics/berry_trees/iapapa/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/iapapa/1.png b/graphics/event_objects/pics/berry_trees/iapapa/1.png Binary files differdeleted file mode 100644 index 6eae7f4ba..000000000 --- a/graphics/event_objects/pics/berry_trees/iapapa/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/iapapa/2.png b/graphics/event_objects/pics/berry_trees/iapapa/2.png Binary files differdeleted file mode 100644 index d779ca7fb..000000000 --- a/graphics/event_objects/pics/berry_trees/iapapa/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/iapapa/3.png b/graphics/event_objects/pics/berry_trees/iapapa/3.png Binary files differdeleted file mode 100644 index 4bbd498e3..000000000 --- a/graphics/event_objects/pics/berry_trees/iapapa/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/iapapa/4.png b/graphics/event_objects/pics/berry_trees/iapapa/4.png Binary files differdeleted file mode 100644 index 36cde6254..000000000 --- a/graphics/event_objects/pics/berry_trees/iapapa/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/iapapa/5.png b/graphics/event_objects/pics/berry_trees/iapapa/5.png Binary files differdeleted file mode 100644 index b6a39d318..000000000 --- a/graphics/event_objects/pics/berry_trees/iapapa/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/kelpsy.png b/graphics/event_objects/pics/berry_trees/kelpsy.png Binary files differnew file mode 100755 index 000000000..7fdf1d8bd --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/kelpsy.png diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/0.png b/graphics/event_objects/pics/berry_trees/kelpsy/0.png Binary files differdeleted file mode 100644 index bb794552a..000000000 --- a/graphics/event_objects/pics/berry_trees/kelpsy/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/1.png b/graphics/event_objects/pics/berry_trees/kelpsy/1.png Binary files differdeleted file mode 100644 index 90257b261..000000000 --- a/graphics/event_objects/pics/berry_trees/kelpsy/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/2.png b/graphics/event_objects/pics/berry_trees/kelpsy/2.png Binary files differdeleted file mode 100644 index 2f3fec1ec..000000000 --- a/graphics/event_objects/pics/berry_trees/kelpsy/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/3.png b/graphics/event_objects/pics/berry_trees/kelpsy/3.png Binary files differdeleted file mode 100644 index 2efd0d160..000000000 --- a/graphics/event_objects/pics/berry_trees/kelpsy/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/4.png b/graphics/event_objects/pics/berry_trees/kelpsy/4.png Binary files differdeleted file mode 100644 index cf0c47d0a..000000000 --- a/graphics/event_objects/pics/berry_trees/kelpsy/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/5.png b/graphics/event_objects/pics/berry_trees/kelpsy/5.png Binary files differdeleted file mode 100644 index e31dfd23f..000000000 --- a/graphics/event_objects/pics/berry_trees/kelpsy/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/lansat.png b/graphics/event_objects/pics/berry_trees/lansat.png Binary files differnew file mode 100755 index 000000000..3271c1ceb --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/lansat.png diff --git a/graphics/event_objects/pics/berry_trees/lansat/0.png b/graphics/event_objects/pics/berry_trees/lansat/0.png Binary files differdeleted file mode 100644 index 56d59b0a7..000000000 --- a/graphics/event_objects/pics/berry_trees/lansat/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/lansat/1.png b/graphics/event_objects/pics/berry_trees/lansat/1.png Binary files differdeleted file mode 100644 index 59e7edcfa..000000000 --- a/graphics/event_objects/pics/berry_trees/lansat/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/lansat/2.png b/graphics/event_objects/pics/berry_trees/lansat/2.png Binary files differdeleted file mode 100644 index f4d1145ef..000000000 --- a/graphics/event_objects/pics/berry_trees/lansat/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/lansat/3.png b/graphics/event_objects/pics/berry_trees/lansat/3.png Binary files differdeleted file mode 100644 index 32ca5e3e9..000000000 --- a/graphics/event_objects/pics/berry_trees/lansat/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/lansat/4.png b/graphics/event_objects/pics/berry_trees/lansat/4.png Binary files differdeleted file mode 100644 index bf285b8ee..000000000 --- a/graphics/event_objects/pics/berry_trees/lansat/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/lansat/5.png b/graphics/event_objects/pics/berry_trees/lansat/5.png Binary files differdeleted file mode 100644 index 3a8dae404..000000000 --- a/graphics/event_objects/pics/berry_trees/lansat/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/leppa.png b/graphics/event_objects/pics/berry_trees/leppa.png Binary files differnew file mode 100755 index 000000000..601945e43 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/leppa.png diff --git a/graphics/event_objects/pics/berry_trees/leppa/0.png b/graphics/event_objects/pics/berry_trees/leppa/0.png Binary files differdeleted file mode 100644 index cecd61e2d..000000000 --- a/graphics/event_objects/pics/berry_trees/leppa/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/leppa/1.png b/graphics/event_objects/pics/berry_trees/leppa/1.png Binary files differdeleted file mode 100644 index f3ce88199..000000000 --- a/graphics/event_objects/pics/berry_trees/leppa/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/leppa/2.png b/graphics/event_objects/pics/berry_trees/leppa/2.png Binary files differdeleted file mode 100644 index d00cf5f89..000000000 --- a/graphics/event_objects/pics/berry_trees/leppa/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/leppa/3.png b/graphics/event_objects/pics/berry_trees/leppa/3.png Binary files differdeleted file mode 100644 index 8a9ed3c34..000000000 --- a/graphics/event_objects/pics/berry_trees/leppa/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/leppa/4.png b/graphics/event_objects/pics/berry_trees/leppa/4.png Binary files differdeleted file mode 100644 index dd4fc6df2..000000000 --- a/graphics/event_objects/pics/berry_trees/leppa/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/leppa/5.png b/graphics/event_objects/pics/berry_trees/leppa/5.png Binary files differdeleted file mode 100644 index 056518295..000000000 --- a/graphics/event_objects/pics/berry_trees/leppa/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/liechi.png b/graphics/event_objects/pics/berry_trees/liechi.png Binary files differnew file mode 100755 index 000000000..b65074c80 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/liechi.png diff --git a/graphics/event_objects/pics/berry_trees/liechi/0.png b/graphics/event_objects/pics/berry_trees/liechi/0.png Binary files differdeleted file mode 100644 index 51827869f..000000000 --- a/graphics/event_objects/pics/berry_trees/liechi/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/liechi/1.png b/graphics/event_objects/pics/berry_trees/liechi/1.png Binary files differdeleted file mode 100644 index 182400260..000000000 --- a/graphics/event_objects/pics/berry_trees/liechi/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/liechi/2.png b/graphics/event_objects/pics/berry_trees/liechi/2.png Binary files differdeleted file mode 100644 index a24565623..000000000 --- a/graphics/event_objects/pics/berry_trees/liechi/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/liechi/3.png b/graphics/event_objects/pics/berry_trees/liechi/3.png Binary files differdeleted file mode 100644 index b7bde2e7f..000000000 --- a/graphics/event_objects/pics/berry_trees/liechi/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/liechi/4.png b/graphics/event_objects/pics/berry_trees/liechi/4.png Binary files differdeleted file mode 100644 index 2ed774c17..000000000 --- a/graphics/event_objects/pics/berry_trees/liechi/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/liechi/5.png b/graphics/event_objects/pics/berry_trees/liechi/5.png Binary files differdeleted file mode 100644 index d8fe39b21..000000000 --- a/graphics/event_objects/pics/berry_trees/liechi/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/lum.png b/graphics/event_objects/pics/berry_trees/lum.png Binary files differnew file mode 100755 index 000000000..a2e156ddd --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/lum.png diff --git a/graphics/event_objects/pics/berry_trees/lum/0.png b/graphics/event_objects/pics/berry_trees/lum/0.png Binary files differdeleted file mode 100644 index 4c08ea797..000000000 --- a/graphics/event_objects/pics/berry_trees/lum/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/lum/1.png b/graphics/event_objects/pics/berry_trees/lum/1.png Binary files differdeleted file mode 100644 index b2035c555..000000000 --- a/graphics/event_objects/pics/berry_trees/lum/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/lum/2.png b/graphics/event_objects/pics/berry_trees/lum/2.png Binary files differdeleted file mode 100644 index b09991fd9..000000000 --- a/graphics/event_objects/pics/berry_trees/lum/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/lum/3.png b/graphics/event_objects/pics/berry_trees/lum/3.png Binary files differdeleted file mode 100644 index e32e7b64a..000000000 --- a/graphics/event_objects/pics/berry_trees/lum/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/lum/4.png b/graphics/event_objects/pics/berry_trees/lum/4.png Binary files differdeleted file mode 100644 index 1347d66b2..000000000 --- a/graphics/event_objects/pics/berry_trees/lum/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/lum/5.png b/graphics/event_objects/pics/berry_trees/lum/5.png Binary files differdeleted file mode 100644 index 1c601d09b..000000000 --- a/graphics/event_objects/pics/berry_trees/lum/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/mago.png b/graphics/event_objects/pics/berry_trees/mago.png Binary files differnew file mode 100755 index 000000000..182a3dea8 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/mago.png diff --git a/graphics/event_objects/pics/berry_trees/mago/0.png b/graphics/event_objects/pics/berry_trees/mago/0.png Binary files differdeleted file mode 100644 index b58d4aba1..000000000 --- a/graphics/event_objects/pics/berry_trees/mago/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/mago/1.png b/graphics/event_objects/pics/berry_trees/mago/1.png Binary files differdeleted file mode 100644 index 0ed2ad6ad..000000000 --- a/graphics/event_objects/pics/berry_trees/mago/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/mago/2.png b/graphics/event_objects/pics/berry_trees/mago/2.png Binary files differdeleted file mode 100644 index 221af2806..000000000 --- a/graphics/event_objects/pics/berry_trees/mago/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/mago/3.png b/graphics/event_objects/pics/berry_trees/mago/3.png Binary files differdeleted file mode 100644 index 71a8d4294..000000000 --- a/graphics/event_objects/pics/berry_trees/mago/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/mago/4.png b/graphics/event_objects/pics/berry_trees/mago/4.png Binary files differdeleted file mode 100644 index ba6bf2d00..000000000 --- a/graphics/event_objects/pics/berry_trees/mago/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/mago/5.png b/graphics/event_objects/pics/berry_trees/mago/5.png Binary files differdeleted file mode 100644 index 6271425a3..000000000 --- a/graphics/event_objects/pics/berry_trees/mago/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/nomel.png b/graphics/event_objects/pics/berry_trees/nomel.png Binary files differnew file mode 100755 index 000000000..fa60688b8 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/nomel.png diff --git a/graphics/event_objects/pics/berry_trees/nomel/0.png b/graphics/event_objects/pics/berry_trees/nomel/0.png Binary files differdeleted file mode 100644 index d504524eb..000000000 --- a/graphics/event_objects/pics/berry_trees/nomel/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/nomel/1.png b/graphics/event_objects/pics/berry_trees/nomel/1.png Binary files differdeleted file mode 100644 index 37ff4b082..000000000 --- a/graphics/event_objects/pics/berry_trees/nomel/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/nomel/2.png b/graphics/event_objects/pics/berry_trees/nomel/2.png Binary files differdeleted file mode 100644 index 4e5c03cb4..000000000 --- a/graphics/event_objects/pics/berry_trees/nomel/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/nomel/3.png b/graphics/event_objects/pics/berry_trees/nomel/3.png Binary files differdeleted file mode 100644 index 7fd46d627..000000000 --- a/graphics/event_objects/pics/berry_trees/nomel/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/nomel/4.png b/graphics/event_objects/pics/berry_trees/nomel/4.png Binary files differdeleted file mode 100644 index 913274d81..000000000 --- a/graphics/event_objects/pics/berry_trees/nomel/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/nomel/5.png b/graphics/event_objects/pics/berry_trees/nomel/5.png Binary files differdeleted file mode 100644 index 3af9a516a..000000000 --- a/graphics/event_objects/pics/berry_trees/nomel/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/oran.png b/graphics/event_objects/pics/berry_trees/oran.png Binary files differnew file mode 100755 index 000000000..484fb7eb2 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/oran.png diff --git a/graphics/event_objects/pics/berry_trees/oran/0.png b/graphics/event_objects/pics/berry_trees/oran/0.png Binary files differdeleted file mode 100644 index 8770230de..000000000 --- a/graphics/event_objects/pics/berry_trees/oran/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/oran/1.png b/graphics/event_objects/pics/berry_trees/oran/1.png Binary files differdeleted file mode 100644 index afeb286a9..000000000 --- a/graphics/event_objects/pics/berry_trees/oran/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/oran/2.png b/graphics/event_objects/pics/berry_trees/oran/2.png Binary files differdeleted file mode 100644 index 7b7dc8b1a..000000000 --- a/graphics/event_objects/pics/berry_trees/oran/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/oran/3.png b/graphics/event_objects/pics/berry_trees/oran/3.png Binary files differdeleted file mode 100644 index 81857442d..000000000 --- a/graphics/event_objects/pics/berry_trees/oran/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/oran/4.png b/graphics/event_objects/pics/berry_trees/oran/4.png Binary files differdeleted file mode 100644 index 58a197d08..000000000 --- a/graphics/event_objects/pics/berry_trees/oran/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/oran/5.png b/graphics/event_objects/pics/berry_trees/oran/5.png Binary files differdeleted file mode 100644 index 8878c8550..000000000 --- a/graphics/event_objects/pics/berry_trees/oran/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pamtre.png b/graphics/event_objects/pics/berry_trees/pamtre.png Binary files differnew file mode 100755 index 000000000..a9f306012 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/pamtre.png diff --git a/graphics/event_objects/pics/berry_trees/pamtre/0.png b/graphics/event_objects/pics/berry_trees/pamtre/0.png Binary files differdeleted file mode 100644 index ac56c5370..000000000 --- a/graphics/event_objects/pics/berry_trees/pamtre/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pamtre/1.png b/graphics/event_objects/pics/berry_trees/pamtre/1.png Binary files differdeleted file mode 100644 index 105974668..000000000 --- a/graphics/event_objects/pics/berry_trees/pamtre/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pamtre/2.png b/graphics/event_objects/pics/berry_trees/pamtre/2.png Binary files differdeleted file mode 100644 index 09363b8ba..000000000 --- a/graphics/event_objects/pics/berry_trees/pamtre/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pamtre/3.png b/graphics/event_objects/pics/berry_trees/pamtre/3.png Binary files differdeleted file mode 100644 index 263856830..000000000 --- a/graphics/event_objects/pics/berry_trees/pamtre/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pamtre/4.png b/graphics/event_objects/pics/berry_trees/pamtre/4.png Binary files differdeleted file mode 100644 index 509057976..000000000 --- a/graphics/event_objects/pics/berry_trees/pamtre/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pamtre/5.png b/graphics/event_objects/pics/berry_trees/pamtre/5.png Binary files differdeleted file mode 100644 index 1adf263df..000000000 --- a/graphics/event_objects/pics/berry_trees/pamtre/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pecha.png b/graphics/event_objects/pics/berry_trees/pecha.png Binary files differnew file mode 100755 index 000000000..3bfec5753 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/pecha.png diff --git a/graphics/event_objects/pics/berry_trees/pecha/0.png b/graphics/event_objects/pics/berry_trees/pecha/0.png Binary files differdeleted file mode 100644 index 8a69441a4..000000000 --- a/graphics/event_objects/pics/berry_trees/pecha/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pecha/1.png b/graphics/event_objects/pics/berry_trees/pecha/1.png Binary files differdeleted file mode 100644 index 4d1923735..000000000 --- a/graphics/event_objects/pics/berry_trees/pecha/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pecha/2.png b/graphics/event_objects/pics/berry_trees/pecha/2.png Binary files differdeleted file mode 100644 index a93a37738..000000000 --- a/graphics/event_objects/pics/berry_trees/pecha/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pecha/3.png b/graphics/event_objects/pics/berry_trees/pecha/3.png Binary files differdeleted file mode 100644 index 5cd4f5e3c..000000000 --- a/graphics/event_objects/pics/berry_trees/pecha/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pecha/4.png b/graphics/event_objects/pics/berry_trees/pecha/4.png Binary files differdeleted file mode 100644 index 451d74260..000000000 --- a/graphics/event_objects/pics/berry_trees/pecha/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pecha/5.png b/graphics/event_objects/pics/berry_trees/pecha/5.png Binary files differdeleted file mode 100644 index 242a9b53f..000000000 --- a/graphics/event_objects/pics/berry_trees/pecha/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/persim.png b/graphics/event_objects/pics/berry_trees/persim.png Binary files differnew file mode 100755 index 000000000..eb5450b8b --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/persim.png diff --git a/graphics/event_objects/pics/berry_trees/persim/0.png b/graphics/event_objects/pics/berry_trees/persim/0.png Binary files differdeleted file mode 100644 index 1996615ff..000000000 --- a/graphics/event_objects/pics/berry_trees/persim/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/persim/1.png b/graphics/event_objects/pics/berry_trees/persim/1.png Binary files differdeleted file mode 100644 index eda84785f..000000000 --- a/graphics/event_objects/pics/berry_trees/persim/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/persim/2.png b/graphics/event_objects/pics/berry_trees/persim/2.png Binary files differdeleted file mode 100644 index 6e71b3786..000000000 --- a/graphics/event_objects/pics/berry_trees/persim/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/persim/3.png b/graphics/event_objects/pics/berry_trees/persim/3.png Binary files differdeleted file mode 100644 index f45bf0646..000000000 --- a/graphics/event_objects/pics/berry_trees/persim/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/persim/4.png b/graphics/event_objects/pics/berry_trees/persim/4.png Binary files differdeleted file mode 100644 index a5aeda410..000000000 --- a/graphics/event_objects/pics/berry_trees/persim/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/persim/5.png b/graphics/event_objects/pics/berry_trees/persim/5.png Binary files differdeleted file mode 100644 index 72c69c068..000000000 --- a/graphics/event_objects/pics/berry_trees/persim/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pomeg.png b/graphics/event_objects/pics/berry_trees/pomeg.png Binary files differnew file mode 100755 index 000000000..cd0e5e6c3 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/pomeg.png diff --git a/graphics/event_objects/pics/berry_trees/pomeg/0.png b/graphics/event_objects/pics/berry_trees/pomeg/0.png Binary files differdeleted file mode 100644 index c343bc210..000000000 --- a/graphics/event_objects/pics/berry_trees/pomeg/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pomeg/1.png b/graphics/event_objects/pics/berry_trees/pomeg/1.png Binary files differdeleted file mode 100644 index cc1c08f92..000000000 --- a/graphics/event_objects/pics/berry_trees/pomeg/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pomeg/2.png b/graphics/event_objects/pics/berry_trees/pomeg/2.png Binary files differdeleted file mode 100644 index 46d0fb7cc..000000000 --- a/graphics/event_objects/pics/berry_trees/pomeg/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pomeg/3.png b/graphics/event_objects/pics/berry_trees/pomeg/3.png Binary files differdeleted file mode 100644 index d2475b748..000000000 --- a/graphics/event_objects/pics/berry_trees/pomeg/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pomeg/4.png b/graphics/event_objects/pics/berry_trees/pomeg/4.png Binary files differdeleted file mode 100644 index 4f3019213..000000000 --- a/graphics/event_objects/pics/berry_trees/pomeg/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/pomeg/5.png b/graphics/event_objects/pics/berry_trees/pomeg/5.png Binary files differdeleted file mode 100644 index f519675ce..000000000 --- a/graphics/event_objects/pics/berry_trees/pomeg/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/rabuta.png b/graphics/event_objects/pics/berry_trees/rabuta.png Binary files differnew file mode 100755 index 000000000..59f9baff2 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/rabuta.png diff --git a/graphics/event_objects/pics/berry_trees/rabuta/0.png b/graphics/event_objects/pics/berry_trees/rabuta/0.png Binary files differdeleted file mode 100644 index 5fe85e4e3..000000000 --- a/graphics/event_objects/pics/berry_trees/rabuta/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/rabuta/1.png b/graphics/event_objects/pics/berry_trees/rabuta/1.png Binary files differdeleted file mode 100644 index 0973e21cb..000000000 --- a/graphics/event_objects/pics/berry_trees/rabuta/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/rabuta/2.png b/graphics/event_objects/pics/berry_trees/rabuta/2.png Binary files differdeleted file mode 100644 index c2d027ebd..000000000 --- a/graphics/event_objects/pics/berry_trees/rabuta/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/rabuta/3.png b/graphics/event_objects/pics/berry_trees/rabuta/3.png Binary files differdeleted file mode 100644 index 79b2cc45f..000000000 --- a/graphics/event_objects/pics/berry_trees/rabuta/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/rabuta/4.png b/graphics/event_objects/pics/berry_trees/rabuta/4.png Binary files differdeleted file mode 100644 index 931350042..000000000 --- a/graphics/event_objects/pics/berry_trees/rabuta/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/rabuta/5.png b/graphics/event_objects/pics/berry_trees/rabuta/5.png Binary files differdeleted file mode 100644 index efa1ac89e..000000000 --- a/graphics/event_objects/pics/berry_trees/rabuta/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/rawst.png b/graphics/event_objects/pics/berry_trees/rawst.png Binary files differnew file mode 100755 index 000000000..aad761f5b --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/rawst.png diff --git a/graphics/event_objects/pics/berry_trees/rawst/0.png b/graphics/event_objects/pics/berry_trees/rawst/0.png Binary files differdeleted file mode 100644 index ef3548002..000000000 --- a/graphics/event_objects/pics/berry_trees/rawst/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/rawst/1.png b/graphics/event_objects/pics/berry_trees/rawst/1.png Binary files differdeleted file mode 100644 index dccad21b0..000000000 --- a/graphics/event_objects/pics/berry_trees/rawst/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/rawst/2.png b/graphics/event_objects/pics/berry_trees/rawst/2.png Binary files differdeleted file mode 100644 index d89f7484e..000000000 --- a/graphics/event_objects/pics/berry_trees/rawst/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/rawst/3.png b/graphics/event_objects/pics/berry_trees/rawst/3.png Binary files differdeleted file mode 100644 index afd11e0f6..000000000 --- a/graphics/event_objects/pics/berry_trees/rawst/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/rawst/4.png b/graphics/event_objects/pics/berry_trees/rawst/4.png Binary files differdeleted file mode 100644 index aada33789..000000000 --- a/graphics/event_objects/pics/berry_trees/rawst/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/rawst/5.png b/graphics/event_objects/pics/berry_trees/rawst/5.png Binary files differdeleted file mode 100644 index 311044bf0..000000000 --- a/graphics/event_objects/pics/berry_trees/rawst/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/razz.png b/graphics/event_objects/pics/berry_trees/razz.png Binary files differnew file mode 100755 index 000000000..dc2dd1723 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/razz.png diff --git a/graphics/event_objects/pics/berry_trees/razz/0.png b/graphics/event_objects/pics/berry_trees/razz/0.png Binary files differdeleted file mode 100644 index 4685d0977..000000000 --- a/graphics/event_objects/pics/berry_trees/razz/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/razz/1.png b/graphics/event_objects/pics/berry_trees/razz/1.png Binary files differdeleted file mode 100644 index 396122c5b..000000000 --- a/graphics/event_objects/pics/berry_trees/razz/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/razz/2.png b/graphics/event_objects/pics/berry_trees/razz/2.png Binary files differdeleted file mode 100644 index f48a2c6e2..000000000 --- a/graphics/event_objects/pics/berry_trees/razz/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/razz/3.png b/graphics/event_objects/pics/berry_trees/razz/3.png Binary files differdeleted file mode 100644 index 47e6a52c1..000000000 --- a/graphics/event_objects/pics/berry_trees/razz/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/razz/4.png b/graphics/event_objects/pics/berry_trees/razz/4.png Binary files differdeleted file mode 100644 index 075c4674b..000000000 --- a/graphics/event_objects/pics/berry_trees/razz/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/razz/5.png b/graphics/event_objects/pics/berry_trees/razz/5.png Binary files differdeleted file mode 100644 index 7ae7b7bba..000000000 --- a/graphics/event_objects/pics/berry_trees/razz/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/sitrus.png b/graphics/event_objects/pics/berry_trees/sitrus.png Binary files differnew file mode 100755 index 000000000..c5392e3ad --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/sitrus.png diff --git a/graphics/event_objects/pics/berry_trees/sitrus/0.png b/graphics/event_objects/pics/berry_trees/sitrus/0.png Binary files differdeleted file mode 100644 index 64671e0a1..000000000 --- a/graphics/event_objects/pics/berry_trees/sitrus/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/sitrus/1.png b/graphics/event_objects/pics/berry_trees/sitrus/1.png Binary files differdeleted file mode 100644 index 13f82d092..000000000 --- a/graphics/event_objects/pics/berry_trees/sitrus/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/sitrus/2.png b/graphics/event_objects/pics/berry_trees/sitrus/2.png Binary files differdeleted file mode 100644 index 7a382402a..000000000 --- a/graphics/event_objects/pics/berry_trees/sitrus/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/sitrus/3.png b/graphics/event_objects/pics/berry_trees/sitrus/3.png Binary files differdeleted file mode 100644 index 6bbc0dca0..000000000 --- a/graphics/event_objects/pics/berry_trees/sitrus/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/sitrus/4.png b/graphics/event_objects/pics/berry_trees/sitrus/4.png Binary files differdeleted file mode 100644 index 1e6ff6838..000000000 --- a/graphics/event_objects/pics/berry_trees/sitrus/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/sitrus/5.png b/graphics/event_objects/pics/berry_trees/sitrus/5.png Binary files differdeleted file mode 100644 index cd97f552f..000000000 --- a/graphics/event_objects/pics/berry_trees/sitrus/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/spelon.png b/graphics/event_objects/pics/berry_trees/spelon.png Binary files differnew file mode 100755 index 000000000..572b4d4f9 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/spelon.png diff --git a/graphics/event_objects/pics/berry_trees/spelon/0.png b/graphics/event_objects/pics/berry_trees/spelon/0.png Binary files differdeleted file mode 100644 index 32bd06af1..000000000 --- a/graphics/event_objects/pics/berry_trees/spelon/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/spelon/1.png b/graphics/event_objects/pics/berry_trees/spelon/1.png Binary files differdeleted file mode 100644 index 37e77e391..000000000 --- a/graphics/event_objects/pics/berry_trees/spelon/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/spelon/2.png b/graphics/event_objects/pics/berry_trees/spelon/2.png Binary files differdeleted file mode 100644 index d36cf3b16..000000000 --- a/graphics/event_objects/pics/berry_trees/spelon/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/spelon/3.png b/graphics/event_objects/pics/berry_trees/spelon/3.png Binary files differdeleted file mode 100644 index 6a7099d83..000000000 --- a/graphics/event_objects/pics/berry_trees/spelon/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/spelon/4.png b/graphics/event_objects/pics/berry_trees/spelon/4.png Binary files differdeleted file mode 100644 index de1c24e58..000000000 --- a/graphics/event_objects/pics/berry_trees/spelon/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/spelon/5.png b/graphics/event_objects/pics/berry_trees/spelon/5.png Binary files differdeleted file mode 100644 index 578231a24..000000000 --- a/graphics/event_objects/pics/berry_trees/spelon/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/sprout.png b/graphics/event_objects/pics/berry_trees/sprout.png Binary files differnew file mode 100755 index 000000000..e34359627 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/sprout.png diff --git a/graphics/event_objects/pics/berry_trees/sprout/0.png b/graphics/event_objects/pics/berry_trees/sprout/0.png Binary files differdeleted file mode 100644 index df37532a7..000000000 --- a/graphics/event_objects/pics/berry_trees/sprout/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/sprout/1.png b/graphics/event_objects/pics/berry_trees/sprout/1.png Binary files differdeleted file mode 100644 index f0a67f382..000000000 --- a/graphics/event_objects/pics/berry_trees/sprout/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/tamato.png b/graphics/event_objects/pics/berry_trees/tamato.png Binary files differnew file mode 100755 index 000000000..d12af1922 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/tamato.png diff --git a/graphics/event_objects/pics/berry_trees/tamato/0.png b/graphics/event_objects/pics/berry_trees/tamato/0.png Binary files differdeleted file mode 100644 index 499e473bc..000000000 --- a/graphics/event_objects/pics/berry_trees/tamato/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/tamato/1.png b/graphics/event_objects/pics/berry_trees/tamato/1.png Binary files differdeleted file mode 100644 index 2c45d60d8..000000000 --- a/graphics/event_objects/pics/berry_trees/tamato/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/tamato/2.png b/graphics/event_objects/pics/berry_trees/tamato/2.png Binary files differdeleted file mode 100644 index ef3ac700b..000000000 --- a/graphics/event_objects/pics/berry_trees/tamato/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/tamato/3.png b/graphics/event_objects/pics/berry_trees/tamato/3.png Binary files differdeleted file mode 100644 index 57b60904f..000000000 --- a/graphics/event_objects/pics/berry_trees/tamato/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/tamato/4.png b/graphics/event_objects/pics/berry_trees/tamato/4.png Binary files differdeleted file mode 100644 index 823ff49a7..000000000 --- a/graphics/event_objects/pics/berry_trees/tamato/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/tamato/5.png b/graphics/event_objects/pics/berry_trees/tamato/5.png Binary files differdeleted file mode 100644 index 8656cb5db..000000000 --- a/graphics/event_objects/pics/berry_trees/tamato/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/wepear.png b/graphics/event_objects/pics/berry_trees/wepear.png Binary files differnew file mode 100755 index 000000000..63e5ae53d --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/wepear.png diff --git a/graphics/event_objects/pics/berry_trees/wepear/0.png b/graphics/event_objects/pics/berry_trees/wepear/0.png Binary files differdeleted file mode 100644 index ccf834a94..000000000 --- a/graphics/event_objects/pics/berry_trees/wepear/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/wepear/1.png b/graphics/event_objects/pics/berry_trees/wepear/1.png Binary files differdeleted file mode 100644 index d46390bdd..000000000 --- a/graphics/event_objects/pics/berry_trees/wepear/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/wepear/2.png b/graphics/event_objects/pics/berry_trees/wepear/2.png Binary files differdeleted file mode 100644 index 040a70931..000000000 --- a/graphics/event_objects/pics/berry_trees/wepear/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/wepear/3.png b/graphics/event_objects/pics/berry_trees/wepear/3.png Binary files differdeleted file mode 100644 index 94918f7ff..000000000 --- a/graphics/event_objects/pics/berry_trees/wepear/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/wepear/4.png b/graphics/event_objects/pics/berry_trees/wepear/4.png Binary files differdeleted file mode 100644 index ee242d657..000000000 --- a/graphics/event_objects/pics/berry_trees/wepear/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/wepear/5.png b/graphics/event_objects/pics/berry_trees/wepear/5.png Binary files differdeleted file mode 100644 index 1b5256a9e..000000000 --- a/graphics/event_objects/pics/berry_trees/wepear/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/wiki.png b/graphics/event_objects/pics/berry_trees/wiki.png Binary files differnew file mode 100755 index 000000000..2fa0c0b01 --- /dev/null +++ b/graphics/event_objects/pics/berry_trees/wiki.png diff --git a/graphics/event_objects/pics/berry_trees/wiki/0.png b/graphics/event_objects/pics/berry_trees/wiki/0.png Binary files differdeleted file mode 100644 index e51325e18..000000000 --- a/graphics/event_objects/pics/berry_trees/wiki/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/wiki/1.png b/graphics/event_objects/pics/berry_trees/wiki/1.png Binary files differdeleted file mode 100644 index f7f28e44b..000000000 --- a/graphics/event_objects/pics/berry_trees/wiki/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/wiki/2.png b/graphics/event_objects/pics/berry_trees/wiki/2.png Binary files differdeleted file mode 100644 index e7d6c3824..000000000 --- a/graphics/event_objects/pics/berry_trees/wiki/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/wiki/3.png b/graphics/event_objects/pics/berry_trees/wiki/3.png Binary files differdeleted file mode 100644 index 6447302a6..000000000 --- a/graphics/event_objects/pics/berry_trees/wiki/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/wiki/4.png b/graphics/event_objects/pics/berry_trees/wiki/4.png Binary files differdeleted file mode 100644 index a494a7eaa..000000000 --- a/graphics/event_objects/pics/berry_trees/wiki/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/berry_trees/wiki/5.png b/graphics/event_objects/pics/berry_trees/wiki/5.png Binary files differdeleted file mode 100644 index 5a6b9f193..000000000 --- a/graphics/event_objects/pics/berry_trees/wiki/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/cushions/ball_cushion.png b/graphics/event_objects/pics/cushions/ball_cushion.png Binary files differindex 54ecc1980..2b45f8fd2 100644 --- a/graphics/event_objects/pics/cushions/ball_cushion.png +++ b/graphics/event_objects/pics/cushions/ball_cushion.png diff --git a/graphics/event_objects/pics/cushions/diamond_cushion.png b/graphics/event_objects/pics/cushions/diamond_cushion.png Binary files differindex 747866941..c6c7bc761 100644 --- a/graphics/event_objects/pics/cushions/diamond_cushion.png +++ b/graphics/event_objects/pics/cushions/diamond_cushion.png diff --git a/graphics/event_objects/pics/cushions/fire_cushion.png b/graphics/event_objects/pics/cushions/fire_cushion.png Binary files differindex aa9a70f2e..ee6715037 100644 --- a/graphics/event_objects/pics/cushions/fire_cushion.png +++ b/graphics/event_objects/pics/cushions/fire_cushion.png diff --git a/graphics/event_objects/pics/cushions/grass_cushion.png b/graphics/event_objects/pics/cushions/grass_cushion.png Binary files differindex 8ee854f17..44862882e 100644 --- a/graphics/event_objects/pics/cushions/grass_cushion.png +++ b/graphics/event_objects/pics/cushions/grass_cushion.png diff --git a/graphics/event_objects/pics/cushions/kiss_cushion.png b/graphics/event_objects/pics/cushions/kiss_cushion.png Binary files differindex 6a99348c9..e24bd9dea 100644 --- a/graphics/event_objects/pics/cushions/kiss_cushion.png +++ b/graphics/event_objects/pics/cushions/kiss_cushion.png diff --git a/graphics/event_objects/pics/cushions/pika_cushion.png b/graphics/event_objects/pics/cushions/pika_cushion.png Binary files differindex 947713c39..16661bc01 100644 --- a/graphics/event_objects/pics/cushions/pika_cushion.png +++ b/graphics/event_objects/pics/cushions/pika_cushion.png diff --git a/graphics/event_objects/pics/cushions/round_cushion.png b/graphics/event_objects/pics/cushions/round_cushion.png Binary files differindex 0e7b71ad5..2a2c6d9d9 100644 --- a/graphics/event_objects/pics/cushions/round_cushion.png +++ b/graphics/event_objects/pics/cushions/round_cushion.png diff --git a/graphics/event_objects/pics/cushions/spin_cushion.png b/graphics/event_objects/pics/cushions/spin_cushion.png Binary files differindex 81eba708c..cfac6c811 100644 --- a/graphics/event_objects/pics/cushions/spin_cushion.png +++ b/graphics/event_objects/pics/cushions/spin_cushion.png diff --git a/graphics/event_objects/pics/cushions/water_cushion.png b/graphics/event_objects/pics/cushions/water_cushion.png Binary files differindex 9ed16c633..848b0cd35 100644 --- a/graphics/event_objects/pics/cushions/water_cushion.png +++ b/graphics/event_objects/pics/cushions/water_cushion.png diff --git a/graphics/event_objects/pics/cushions/zigzag_cushion.png b/graphics/event_objects/pics/cushions/zigzag_cushion.png Binary files differindex 407e6a66b..88bb74868 100644 --- a/graphics/event_objects/pics/cushions/zigzag_cushion.png +++ b/graphics/event_objects/pics/cushions/zigzag_cushion.png diff --git a/graphics/event_objects/pics/dolls/azurill_doll.png b/graphics/event_objects/pics/dolls/azurill_doll.png Binary files differindex 1d1f7492f..2c2a49639 100644 --- a/graphics/event_objects/pics/dolls/azurill_doll.png +++ b/graphics/event_objects/pics/dolls/azurill_doll.png diff --git a/graphics/event_objects/pics/dolls/baltoy_doll.png b/graphics/event_objects/pics/dolls/baltoy_doll.png Binary files differindex 5205123da..c64d26033 100644 --- a/graphics/event_objects/pics/dolls/baltoy_doll.png +++ b/graphics/event_objects/pics/dolls/baltoy_doll.png diff --git a/graphics/event_objects/pics/dolls/big_blastoise_doll.png b/graphics/event_objects/pics/dolls/big_blastoise_doll.png Binary files differindex fa295f302..0873117d8 100644 --- a/graphics/event_objects/pics/dolls/big_blastoise_doll.png +++ b/graphics/event_objects/pics/dolls/big_blastoise_doll.png diff --git a/graphics/event_objects/pics/dolls/big_charizard_doll.png b/graphics/event_objects/pics/dolls/big_charizard_doll.png Binary files differindex 4fa5aed45..8bf206e5b 100644 --- a/graphics/event_objects/pics/dolls/big_charizard_doll.png +++ b/graphics/event_objects/pics/dolls/big_charizard_doll.png diff --git a/graphics/event_objects/pics/dolls/big_lapras_doll.png b/graphics/event_objects/pics/dolls/big_lapras_doll.png Binary files differindex 572d3c810..9695a0ea5 100644 --- a/graphics/event_objects/pics/dolls/big_lapras_doll.png +++ b/graphics/event_objects/pics/dolls/big_lapras_doll.png diff --git a/graphics/event_objects/pics/dolls/big_regice_doll.png b/graphics/event_objects/pics/dolls/big_regice_doll.png Binary files differindex e437d3558..eff1de492 100644 --- a/graphics/event_objects/pics/dolls/big_regice_doll.png +++ b/graphics/event_objects/pics/dolls/big_regice_doll.png diff --git a/graphics/event_objects/pics/dolls/big_regirock_doll.png b/graphics/event_objects/pics/dolls/big_regirock_doll.png Binary files differindex 139abbb28..63ed27236 100644 --- a/graphics/event_objects/pics/dolls/big_regirock_doll.png +++ b/graphics/event_objects/pics/dolls/big_regirock_doll.png diff --git a/graphics/event_objects/pics/dolls/big_registeel_doll.png b/graphics/event_objects/pics/dolls/big_registeel_doll.png Binary files differindex 632a2cadd..b7ab0821a 100644 --- a/graphics/event_objects/pics/dolls/big_registeel_doll.png +++ b/graphics/event_objects/pics/dolls/big_registeel_doll.png diff --git a/graphics/event_objects/pics/dolls/big_rhydon_doll.png b/graphics/event_objects/pics/dolls/big_rhydon_doll.png Binary files differindex 2e059f8c9..4e439330a 100644 --- a/graphics/event_objects/pics/dolls/big_rhydon_doll.png +++ b/graphics/event_objects/pics/dolls/big_rhydon_doll.png diff --git a/graphics/event_objects/pics/dolls/big_snorlax_doll.png b/graphics/event_objects/pics/dolls/big_snorlax_doll.png Binary files differindex 397c9baac..dcb1699bf 100644 --- a/graphics/event_objects/pics/dolls/big_snorlax_doll.png +++ b/graphics/event_objects/pics/dolls/big_snorlax_doll.png diff --git a/graphics/event_objects/pics/dolls/big_venusaur_doll.png b/graphics/event_objects/pics/dolls/big_venusaur_doll.png Binary files differindex 9d1961608..1910d1c6e 100644 --- a/graphics/event_objects/pics/dolls/big_venusaur_doll.png +++ b/graphics/event_objects/pics/dolls/big_venusaur_doll.png diff --git a/graphics/event_objects/pics/dolls/big_wailmer_doll.png b/graphics/event_objects/pics/dolls/big_wailmer_doll.png Binary files differindex a174d30f7..13cbbccf3 100644 --- a/graphics/event_objects/pics/dolls/big_wailmer_doll.png +++ b/graphics/event_objects/pics/dolls/big_wailmer_doll.png diff --git a/graphics/event_objects/pics/dolls/chikorita_doll.png b/graphics/event_objects/pics/dolls/chikorita_doll.png Binary files differindex 6b5e6417d..9942fc9dc 100644 --- a/graphics/event_objects/pics/dolls/chikorita_doll.png +++ b/graphics/event_objects/pics/dolls/chikorita_doll.png diff --git a/graphics/event_objects/pics/dolls/clefairy_doll.png b/graphics/event_objects/pics/dolls/clefairy_doll.png Binary files differindex 137b20213..3aed333ad 100644 --- a/graphics/event_objects/pics/dolls/clefairy_doll.png +++ b/graphics/event_objects/pics/dolls/clefairy_doll.png diff --git a/graphics/event_objects/pics/dolls/cyndaquil_doll.png b/graphics/event_objects/pics/dolls/cyndaquil_doll.png Binary files differindex b76221e1d..2f026816e 100644 --- a/graphics/event_objects/pics/dolls/cyndaquil_doll.png +++ b/graphics/event_objects/pics/dolls/cyndaquil_doll.png diff --git a/graphics/event_objects/pics/dolls/ditto_doll.png b/graphics/event_objects/pics/dolls/ditto_doll.png Binary files differindex da4c33018..7b8cb48ae 100644 --- a/graphics/event_objects/pics/dolls/ditto_doll.png +++ b/graphics/event_objects/pics/dolls/ditto_doll.png diff --git a/graphics/event_objects/pics/dolls/duskull_doll.png b/graphics/event_objects/pics/dolls/duskull_doll.png Binary files differindex fdfbe3fec..6e69796d7 100644 --- a/graphics/event_objects/pics/dolls/duskull_doll.png +++ b/graphics/event_objects/pics/dolls/duskull_doll.png diff --git a/graphics/event_objects/pics/dolls/gulpin_doll.png b/graphics/event_objects/pics/dolls/gulpin_doll.png Binary files differindex 48bf1824b..5ffdefb0c 100644 --- a/graphics/event_objects/pics/dolls/gulpin_doll.png +++ b/graphics/event_objects/pics/dolls/gulpin_doll.png diff --git a/graphics/event_objects/pics/dolls/jigglypuff_doll.png b/graphics/event_objects/pics/dolls/jigglypuff_doll.png Binary files differindex 1a2c8d44a..75dcbe1eb 100644 --- a/graphics/event_objects/pics/dolls/jigglypuff_doll.png +++ b/graphics/event_objects/pics/dolls/jigglypuff_doll.png diff --git a/graphics/event_objects/pics/dolls/kecleon_doll.png b/graphics/event_objects/pics/dolls/kecleon_doll.png Binary files differindex 92869882f..a70feb67c 100644 --- a/graphics/event_objects/pics/dolls/kecleon_doll.png +++ b/graphics/event_objects/pics/dolls/kecleon_doll.png diff --git a/graphics/event_objects/pics/dolls/lotad_doll.png b/graphics/event_objects/pics/dolls/lotad_doll.png Binary files differindex 9ee2182d1..69065a424 100644 --- a/graphics/event_objects/pics/dolls/lotad_doll.png +++ b/graphics/event_objects/pics/dolls/lotad_doll.png diff --git a/graphics/event_objects/pics/dolls/marill_doll.png b/graphics/event_objects/pics/dolls/marill_doll.png Binary files differindex d5372f7dd..d90c0cee1 100644 --- a/graphics/event_objects/pics/dolls/marill_doll.png +++ b/graphics/event_objects/pics/dolls/marill_doll.png diff --git a/graphics/event_objects/pics/dolls/meowth_doll.png b/graphics/event_objects/pics/dolls/meowth_doll.png Binary files differindex 67ce3db4c..cb093acfa 100644 --- a/graphics/event_objects/pics/dolls/meowth_doll.png +++ b/graphics/event_objects/pics/dolls/meowth_doll.png diff --git a/graphics/event_objects/pics/dolls/mudkip_doll.png b/graphics/event_objects/pics/dolls/mudkip_doll.png Binary files differindex 8d6af157f..440fde84b 100644 --- a/graphics/event_objects/pics/dolls/mudkip_doll.png +++ b/graphics/event_objects/pics/dolls/mudkip_doll.png diff --git a/graphics/event_objects/pics/dolls/pichu_doll.png b/graphics/event_objects/pics/dolls/pichu_doll.png Binary files differindex 7a2aefc31..69bcc64ae 100644 --- a/graphics/event_objects/pics/dolls/pichu_doll.png +++ b/graphics/event_objects/pics/dolls/pichu_doll.png diff --git a/graphics/event_objects/pics/dolls/pikachu_doll.png b/graphics/event_objects/pics/dolls/pikachu_doll.png Binary files differindex a762f1e15..1c9342ad1 100644 --- a/graphics/event_objects/pics/dolls/pikachu_doll.png +++ b/graphics/event_objects/pics/dolls/pikachu_doll.png diff --git a/graphics/event_objects/pics/dolls/seedot_doll.png b/graphics/event_objects/pics/dolls/seedot_doll.png Binary files differindex e00c485ae..255b4c55d 100644 --- a/graphics/event_objects/pics/dolls/seedot_doll.png +++ b/graphics/event_objects/pics/dolls/seedot_doll.png diff --git a/graphics/event_objects/pics/dolls/skitty_doll.png b/graphics/event_objects/pics/dolls/skitty_doll.png Binary files differindex 57ae4c5ed..6e04a9cb1 100644 --- a/graphics/event_objects/pics/dolls/skitty_doll.png +++ b/graphics/event_objects/pics/dolls/skitty_doll.png diff --git a/graphics/event_objects/pics/dolls/smoochum_doll.png b/graphics/event_objects/pics/dolls/smoochum_doll.png Binary files differindex 4adacdfd5..7dc1180fd 100644 --- a/graphics/event_objects/pics/dolls/smoochum_doll.png +++ b/graphics/event_objects/pics/dolls/smoochum_doll.png diff --git a/graphics/event_objects/pics/dolls/swablu_doll.png b/graphics/event_objects/pics/dolls/swablu_doll.png Binary files differindex 94e3051d7..271576db8 100644 --- a/graphics/event_objects/pics/dolls/swablu_doll.png +++ b/graphics/event_objects/pics/dolls/swablu_doll.png diff --git a/graphics/event_objects/pics/dolls/togepi_doll.png b/graphics/event_objects/pics/dolls/togepi_doll.png Binary files differindex 4deda750c..aa527b44b 100644 --- a/graphics/event_objects/pics/dolls/togepi_doll.png +++ b/graphics/event_objects/pics/dolls/togepi_doll.png diff --git a/graphics/event_objects/pics/dolls/torchic_doll.png b/graphics/event_objects/pics/dolls/torchic_doll.png Binary files differindex 067eae9fb..80969c424 100644 --- a/graphics/event_objects/pics/dolls/torchic_doll.png +++ b/graphics/event_objects/pics/dolls/torchic_doll.png diff --git a/graphics/event_objects/pics/dolls/totodile_doll.png b/graphics/event_objects/pics/dolls/totodile_doll.png Binary files differindex b347125c9..46324159e 100644 --- a/graphics/event_objects/pics/dolls/totodile_doll.png +++ b/graphics/event_objects/pics/dolls/totodile_doll.png diff --git a/graphics/event_objects/pics/dolls/treecko_doll.png b/graphics/event_objects/pics/dolls/treecko_doll.png Binary files differindex 3ccf44a58..6487fe805 100644 --- a/graphics/event_objects/pics/dolls/treecko_doll.png +++ b/graphics/event_objects/pics/dolls/treecko_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_magnemite_doll.png b/graphics/event_objects/pics/dolls/unused_magnemite_doll.png Binary files differindex bbf386e6a..2c9ef10c7 100644 --- a/graphics/event_objects/pics/dolls/unused_magnemite_doll.png +++ b/graphics/event_objects/pics/dolls/unused_magnemite_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_natu_doll.png b/graphics/event_objects/pics/dolls/unused_natu_doll.png Binary files differindex a2c4995e3..8087db81d 100644 --- a/graphics/event_objects/pics/dolls/unused_natu_doll.png +++ b/graphics/event_objects/pics/dolls/unused_natu_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_pikachu_doll.png b/graphics/event_objects/pics/dolls/unused_pikachu_doll.png Binary files differindex 9bf762d02..2e5181977 100644 --- a/graphics/event_objects/pics/dolls/unused_pikachu_doll.png +++ b/graphics/event_objects/pics/dolls/unused_pikachu_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_porygon2_doll.png b/graphics/event_objects/pics/dolls/unused_porygon2_doll.png Binary files differindex 465b7a092..f68182762 100644 --- a/graphics/event_objects/pics/dolls/unused_porygon2_doll.png +++ b/graphics/event_objects/pics/dolls/unused_porygon2_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_squirtle_doll.png b/graphics/event_objects/pics/dolls/unused_squirtle_doll.png Binary files differindex ccc526aae..0480227d0 100644 --- a/graphics/event_objects/pics/dolls/unused_squirtle_doll.png +++ b/graphics/event_objects/pics/dolls/unused_squirtle_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_wooper_doll.png b/graphics/event_objects/pics/dolls/unused_wooper_doll.png Binary files differindex 29bc8fd99..69d73eada 100644 --- a/graphics/event_objects/pics/dolls/unused_wooper_doll.png +++ b/graphics/event_objects/pics/dolls/unused_wooper_doll.png diff --git a/graphics/event_objects/pics/dolls/wynaut_doll.png b/graphics/event_objects/pics/dolls/wynaut_doll.png Binary files differindex 3ac3d1311..543328178 100644 --- a/graphics/event_objects/pics/dolls/wynaut_doll.png +++ b/graphics/event_objects/pics/dolls/wynaut_doll.png diff --git a/graphics/event_objects/pics/misc/birchs_bag.png b/graphics/event_objects/pics/misc/birchs_bag.png Binary files differindex 045e5546c..21f463b71 100644 --- a/graphics/event_objects/pics/misc/birchs_bag.png +++ b/graphics/event_objects/pics/misc/birchs_bag.png diff --git a/graphics/event_objects/pics/misc/breakable_rock.png b/graphics/event_objects/pics/misc/breakable_rock.png Binary files differnew file mode 100755 index 000000000..c5054da41 --- /dev/null +++ b/graphics/event_objects/pics/misc/breakable_rock.png diff --git a/graphics/event_objects/pics/misc/breakable_rock/0.png b/graphics/event_objects/pics/misc/breakable_rock/0.png Binary files differdeleted file mode 100644 index 058324c86..000000000 --- a/graphics/event_objects/pics/misc/breakable_rock/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/breakable_rock/1.png b/graphics/event_objects/pics/misc/breakable_rock/1.png Binary files differdeleted file mode 100644 index 6c8b3133a..000000000 --- a/graphics/event_objects/pics/misc/breakable_rock/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/breakable_rock/2.png b/graphics/event_objects/pics/misc/breakable_rock/2.png Binary files differdeleted file mode 100644 index 737148d66..000000000 --- a/graphics/event_objects/pics/misc/breakable_rock/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/breakable_rock/3.png b/graphics/event_objects/pics/misc/breakable_rock/3.png Binary files differdeleted file mode 100644 index 89eedd1aa..000000000 --- a/graphics/event_objects/pics/misc/breakable_rock/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/cable_car.png b/graphics/event_objects/pics/misc/cable_car.png Binary files differindex e0bd21ddf..67f581fb9 100644 --- a/graphics/event_objects/pics/misc/cable_car.png +++ b/graphics/event_objects/pics/misc/cable_car.png diff --git a/graphics/event_objects/pics/misc/cuttable_tree.png b/graphics/event_objects/pics/misc/cuttable_tree.png Binary files differnew file mode 100755 index 000000000..fba4ced1a --- /dev/null +++ b/graphics/event_objects/pics/misc/cuttable_tree.png diff --git a/graphics/event_objects/pics/misc/cuttable_tree/0.png b/graphics/event_objects/pics/misc/cuttable_tree/0.png Binary files differdeleted file mode 100644 index 509d8b03c..000000000 --- a/graphics/event_objects/pics/misc/cuttable_tree/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/cuttable_tree/1.png b/graphics/event_objects/pics/misc/cuttable_tree/1.png Binary files differdeleted file mode 100644 index afa42cf16..000000000 --- a/graphics/event_objects/pics/misc/cuttable_tree/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/cuttable_tree/2.png b/graphics/event_objects/pics/misc/cuttable_tree/2.png Binary files differdeleted file mode 100644 index f222ece43..000000000 --- a/graphics/event_objects/pics/misc/cuttable_tree/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/cuttable_tree/3.png b/graphics/event_objects/pics/misc/cuttable_tree/3.png Binary files differdeleted file mode 100644 index 09ffefd29..000000000 --- a/graphics/event_objects/pics/misc/cuttable_tree/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/fossil.png b/graphics/event_objects/pics/misc/fossil.png Binary files differindex a8da0e8ff..3e070a6c9 100644 --- a/graphics/event_objects/pics/misc/fossil.png +++ b/graphics/event_objects/pics/misc/fossil.png diff --git a/graphics/event_objects/pics/misc/item_ball.png b/graphics/event_objects/pics/misc/item_ball.png Binary files differindex a30e02fb1..ef02e158c 100644 --- a/graphics/event_objects/pics/misc/item_ball.png +++ b/graphics/event_objects/pics/misc/item_ball.png diff --git a/graphics/event_objects/pics/misc/moving_box.png b/graphics/event_objects/pics/misc/moving_box.png Binary files differindex 3cbc41900..43b65c2c1 100644 --- a/graphics/event_objects/pics/misc/moving_box.png +++ b/graphics/event_objects/pics/misc/moving_box.png diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat.png b/graphics/event_objects/pics/misc/mr_brineys_boat.png Binary files differnew file mode 100755 index 000000000..249f25b51 --- /dev/null +++ b/graphics/event_objects/pics/misc/mr_brineys_boat.png diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat/0.png b/graphics/event_objects/pics/misc/mr_brineys_boat/0.png Binary files differdeleted file mode 100644 index 593ed07c8..000000000 --- a/graphics/event_objects/pics/misc/mr_brineys_boat/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat/1.png b/graphics/event_objects/pics/misc/mr_brineys_boat/1.png Binary files differdeleted file mode 100644 index 39b75fd73..000000000 --- a/graphics/event_objects/pics/misc/mr_brineys_boat/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat/2.png b/graphics/event_objects/pics/misc/mr_brineys_boat/2.png Binary files differdeleted file mode 100644 index 9db6b11fe..000000000 --- a/graphics/event_objects/pics/misc/mr_brineys_boat/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/misc/pushable_boulder.png b/graphics/event_objects/pics/misc/pushable_boulder.png Binary files differindex a6962123c..eba6a116f 100644 --- a/graphics/event_objects/pics/misc/pushable_boulder.png +++ b/graphics/event_objects/pics/misc/pushable_boulder.png diff --git a/graphics/event_objects/pics/misc/ss_tidal.png b/graphics/event_objects/pics/misc/ss_tidal.png Binary files differindex 40ca9a3f3..44510d25a 100644 --- a/graphics/event_objects/pics/misc/ss_tidal.png +++ b/graphics/event_objects/pics/misc/ss_tidal.png diff --git a/graphics/event_objects/pics/misc/submarine_shadow.png b/graphics/event_objects/pics/misc/submarine_shadow.png Binary files differindex b9dfc4c55..d43bc98dc 100644 --- a/graphics/event_objects/pics/misc/submarine_shadow.png +++ b/graphics/event_objects/pics/misc/submarine_shadow.png diff --git a/graphics/event_objects/pics/misc/truck.png b/graphics/event_objects/pics/misc/truck.png Binary files differindex 28bd00111..8dc1762ad 100644 --- a/graphics/event_objects/pics/misc/truck.png +++ b/graphics/event_objects/pics/misc/truck.png diff --git a/graphics/event_objects/pics/people/aqua_member_f.png b/graphics/event_objects/pics/people/aqua_member_f.png Binary files differnew file mode 100755 index 000000000..cba3e0d06 --- /dev/null +++ b/graphics/event_objects/pics/people/aqua_member_f.png diff --git a/graphics/event_objects/pics/people/aqua_member_f/0.png b/graphics/event_objects/pics/people/aqua_member_f/0.png Binary files differdeleted file mode 100644 index c4fcfc90e..000000000 --- a/graphics/event_objects/pics/people/aqua_member_f/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_f/1.png b/graphics/event_objects/pics/people/aqua_member_f/1.png Binary files differdeleted file mode 100644 index 59de99021..000000000 --- a/graphics/event_objects/pics/people/aqua_member_f/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_f/2.png b/graphics/event_objects/pics/people/aqua_member_f/2.png Binary files differdeleted file mode 100644 index 20f50bc67..000000000 --- a/graphics/event_objects/pics/people/aqua_member_f/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_f/3.png b/graphics/event_objects/pics/people/aqua_member_f/3.png Binary files differdeleted file mode 100644 index 001d2c144..000000000 --- a/graphics/event_objects/pics/people/aqua_member_f/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_f/4.png b/graphics/event_objects/pics/people/aqua_member_f/4.png Binary files differdeleted file mode 100644 index ff2bf22a8..000000000 --- a/graphics/event_objects/pics/people/aqua_member_f/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_f/5.png b/graphics/event_objects/pics/people/aqua_member_f/5.png Binary files differdeleted file mode 100644 index 8189d4625..000000000 --- a/graphics/event_objects/pics/people/aqua_member_f/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_f/6.png b/graphics/event_objects/pics/people/aqua_member_f/6.png Binary files differdeleted file mode 100644 index 84b7104aa..000000000 --- a/graphics/event_objects/pics/people/aqua_member_f/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_f/7.png b/graphics/event_objects/pics/people/aqua_member_f/7.png Binary files differdeleted file mode 100644 index e0f6311d8..000000000 --- a/graphics/event_objects/pics/people/aqua_member_f/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_f/8.png b/graphics/event_objects/pics/people/aqua_member_f/8.png Binary files differdeleted file mode 100644 index 03572a720..000000000 --- a/graphics/event_objects/pics/people/aqua_member_f/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_m.png b/graphics/event_objects/pics/people/aqua_member_m.png Binary files differnew file mode 100755 index 000000000..5a74d1a0f --- /dev/null +++ b/graphics/event_objects/pics/people/aqua_member_m.png diff --git a/graphics/event_objects/pics/people/aqua_member_m/0.png b/graphics/event_objects/pics/people/aqua_member_m/0.png Binary files differdeleted file mode 100644 index fed477fac..000000000 --- a/graphics/event_objects/pics/people/aqua_member_m/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_m/1.png b/graphics/event_objects/pics/people/aqua_member_m/1.png Binary files differdeleted file mode 100644 index d87426a18..000000000 --- a/graphics/event_objects/pics/people/aqua_member_m/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_m/2.png b/graphics/event_objects/pics/people/aqua_member_m/2.png Binary files differdeleted file mode 100644 index 05142a5ee..000000000 --- a/graphics/event_objects/pics/people/aqua_member_m/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_m/3.png b/graphics/event_objects/pics/people/aqua_member_m/3.png Binary files differdeleted file mode 100644 index ee0014022..000000000 --- a/graphics/event_objects/pics/people/aqua_member_m/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_m/4.png b/graphics/event_objects/pics/people/aqua_member_m/4.png Binary files differdeleted file mode 100644 index 194e13628..000000000 --- a/graphics/event_objects/pics/people/aqua_member_m/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_m/5.png b/graphics/event_objects/pics/people/aqua_member_m/5.png Binary files differdeleted file mode 100644 index 647cfb95c..000000000 --- a/graphics/event_objects/pics/people/aqua_member_m/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_m/6.png b/graphics/event_objects/pics/people/aqua_member_m/6.png Binary files differdeleted file mode 100644 index 3918e64e9..000000000 --- a/graphics/event_objects/pics/people/aqua_member_m/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_m/7.png b/graphics/event_objects/pics/people/aqua_member_m/7.png Binary files differdeleted file mode 100644 index f5505b7df..000000000 --- a/graphics/event_objects/pics/people/aqua_member_m/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/aqua_member_m/8.png b/graphics/event_objects/pics/people/aqua_member_m/8.png Binary files differdeleted file mode 100644 index dead93ba5..000000000 --- a/graphics/event_objects/pics/people/aqua_member_m/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/archie.png b/graphics/event_objects/pics/people/archie.png Binary files differnew file mode 100755 index 000000000..6ece66e06 --- /dev/null +++ b/graphics/event_objects/pics/people/archie.png diff --git a/graphics/event_objects/pics/people/archie/0.png b/graphics/event_objects/pics/people/archie/0.png Binary files differdeleted file mode 100644 index dd091bd16..000000000 --- a/graphics/event_objects/pics/people/archie/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/archie/1.png b/graphics/event_objects/pics/people/archie/1.png Binary files differdeleted file mode 100644 index 1d278db6d..000000000 --- a/graphics/event_objects/pics/people/archie/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/archie/2.png b/graphics/event_objects/pics/people/archie/2.png Binary files differdeleted file mode 100644 index 2e1b7a1ce..000000000 --- a/graphics/event_objects/pics/people/archie/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/archie/3.png b/graphics/event_objects/pics/people/archie/3.png Binary files differdeleted file mode 100644 index 576abb99d..000000000 --- a/graphics/event_objects/pics/people/archie/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/archie/4.png b/graphics/event_objects/pics/people/archie/4.png Binary files differdeleted file mode 100644 index f48687318..000000000 --- a/graphics/event_objects/pics/people/archie/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/archie/5.png b/graphics/event_objects/pics/people/archie/5.png Binary files differdeleted file mode 100644 index f21490b7b..000000000 --- a/graphics/event_objects/pics/people/archie/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/archie/6.png b/graphics/event_objects/pics/people/archie/6.png Binary files differdeleted file mode 100644 index 29305a952..000000000 --- a/graphics/event_objects/pics/people/archie/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/archie/7.png b/graphics/event_objects/pics/people/archie/7.png Binary files differdeleted file mode 100644 index 778a7e964..000000000 --- a/graphics/event_objects/pics/people/archie/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/archie/8.png b/graphics/event_objects/pics/people/archie/8.png Binary files differdeleted file mode 100644 index 237101046..000000000 --- a/graphics/event_objects/pics/people/archie/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/artist.png b/graphics/event_objects/pics/people/artist.png Binary files differnew file mode 100755 index 000000000..1a98032a7 --- /dev/null +++ b/graphics/event_objects/pics/people/artist.png diff --git a/graphics/event_objects/pics/people/artist/0.png b/graphics/event_objects/pics/people/artist/0.png Binary files differdeleted file mode 100644 index 9f25f9ea0..000000000 --- a/graphics/event_objects/pics/people/artist/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/artist/1.png b/graphics/event_objects/pics/people/artist/1.png Binary files differdeleted file mode 100644 index 6056f77a5..000000000 --- a/graphics/event_objects/pics/people/artist/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/artist/2.png b/graphics/event_objects/pics/people/artist/2.png Binary files differdeleted file mode 100644 index f1908e664..000000000 --- a/graphics/event_objects/pics/people/artist/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/artist/3.png b/graphics/event_objects/pics/people/artist/3.png Binary files differdeleted file mode 100644 index 62cafaa79..000000000 --- a/graphics/event_objects/pics/people/artist/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/artist/4.png b/graphics/event_objects/pics/people/artist/4.png Binary files differdeleted file mode 100644 index 718ad2d3b..000000000 --- a/graphics/event_objects/pics/people/artist/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/artist/5.png b/graphics/event_objects/pics/people/artist/5.png Binary files differdeleted file mode 100644 index cb37c0138..000000000 --- a/graphics/event_objects/pics/people/artist/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/artist/6.png b/graphics/event_objects/pics/people/artist/6.png Binary files differdeleted file mode 100644 index 281724e3d..000000000 --- a/graphics/event_objects/pics/people/artist/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/artist/7.png b/graphics/event_objects/pics/people/artist/7.png Binary files differdeleted file mode 100644 index 36157c6ee..000000000 --- a/graphics/event_objects/pics/people/artist/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/artist/8.png b/graphics/event_objects/pics/people/artist/8.png Binary files differdeleted file mode 100644 index df7afa65e..000000000 --- a/graphics/event_objects/pics/people/artist/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/beauty.png b/graphics/event_objects/pics/people/beauty.png Binary files differnew file mode 100755 index 000000000..dd3a3d76b --- /dev/null +++ b/graphics/event_objects/pics/people/beauty.png diff --git a/graphics/event_objects/pics/people/beauty/0.png b/graphics/event_objects/pics/people/beauty/0.png Binary files differdeleted file mode 100644 index 50e0ece37..000000000 --- a/graphics/event_objects/pics/people/beauty/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/beauty/1.png b/graphics/event_objects/pics/people/beauty/1.png Binary files differdeleted file mode 100644 index 3a1ba51e9..000000000 --- a/graphics/event_objects/pics/people/beauty/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/beauty/2.png b/graphics/event_objects/pics/people/beauty/2.png Binary files differdeleted file mode 100644 index 5787f360f..000000000 --- a/graphics/event_objects/pics/people/beauty/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/beauty/3.png b/graphics/event_objects/pics/people/beauty/3.png Binary files differdeleted file mode 100644 index cc200158f..000000000 --- a/graphics/event_objects/pics/people/beauty/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/beauty/4.png b/graphics/event_objects/pics/people/beauty/4.png Binary files differdeleted file mode 100644 index f49ef45c6..000000000 --- a/graphics/event_objects/pics/people/beauty/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/beauty/5.png b/graphics/event_objects/pics/people/beauty/5.png Binary files differdeleted file mode 100644 index c8eed61d1..000000000 --- a/graphics/event_objects/pics/people/beauty/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/beauty/6.png b/graphics/event_objects/pics/people/beauty/6.png Binary files differdeleted file mode 100644 index fb298aa74..000000000 --- a/graphics/event_objects/pics/people/beauty/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/beauty/7.png b/graphics/event_objects/pics/people/beauty/7.png Binary files differdeleted file mode 100644 index 0b576e71a..000000000 --- a/graphics/event_objects/pics/people/beauty/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/beauty/8.png b/graphics/event_objects/pics/people/beauty/8.png Binary files differdeleted file mode 100644 index 77de6d5c5..000000000 --- a/graphics/event_objects/pics/people/beauty/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/black_belt.png b/graphics/event_objects/pics/people/black_belt.png Binary files differnew file mode 100755 index 000000000..e6c901933 --- /dev/null +++ b/graphics/event_objects/pics/people/black_belt.png diff --git a/graphics/event_objects/pics/people/black_belt/0.png b/graphics/event_objects/pics/people/black_belt/0.png Binary files differdeleted file mode 100644 index 0003a1a88..000000000 --- a/graphics/event_objects/pics/people/black_belt/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/black_belt/1.png b/graphics/event_objects/pics/people/black_belt/1.png Binary files differdeleted file mode 100644 index c3e3b8a1d..000000000 --- a/graphics/event_objects/pics/people/black_belt/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/black_belt/2.png b/graphics/event_objects/pics/people/black_belt/2.png Binary files differdeleted file mode 100644 index 0cb8f30bf..000000000 --- a/graphics/event_objects/pics/people/black_belt/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/black_belt/3.png b/graphics/event_objects/pics/people/black_belt/3.png Binary files differdeleted file mode 100644 index 8bae80b47..000000000 --- a/graphics/event_objects/pics/people/black_belt/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/black_belt/4.png b/graphics/event_objects/pics/people/black_belt/4.png Binary files differdeleted file mode 100644 index aacf9c3f7..000000000 --- a/graphics/event_objects/pics/people/black_belt/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/black_belt/5.png b/graphics/event_objects/pics/people/black_belt/5.png Binary files differdeleted file mode 100644 index 41c60075c..000000000 --- a/graphics/event_objects/pics/people/black_belt/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/black_belt/6.png b/graphics/event_objects/pics/people/black_belt/6.png Binary files differdeleted file mode 100644 index fa1c426a1..000000000 --- a/graphics/event_objects/pics/people/black_belt/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/black_belt/7.png b/graphics/event_objects/pics/people/black_belt/7.png Binary files differdeleted file mode 100644 index 013986add..000000000 --- a/graphics/event_objects/pics/people/black_belt/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/black_belt/8.png b/graphics/event_objects/pics/people/black_belt/8.png Binary files differdeleted file mode 100644 index 5efef483a..000000000 --- a/graphics/event_objects/pics/people/black_belt/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_1.png b/graphics/event_objects/pics/people/boy_1.png Binary files differnew file mode 100755 index 000000000..cd7507c9b --- /dev/null +++ b/graphics/event_objects/pics/people/boy_1.png diff --git a/graphics/event_objects/pics/people/boy_1/0.png b/graphics/event_objects/pics/people/boy_1/0.png Binary files differdeleted file mode 100644 index ddb78aa81..000000000 --- a/graphics/event_objects/pics/people/boy_1/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_1/1.png b/graphics/event_objects/pics/people/boy_1/1.png Binary files differdeleted file mode 100644 index 57c6245b2..000000000 --- a/graphics/event_objects/pics/people/boy_1/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_1/2.png b/graphics/event_objects/pics/people/boy_1/2.png Binary files differdeleted file mode 100644 index cc0797ac8..000000000 --- a/graphics/event_objects/pics/people/boy_1/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_1/3.png b/graphics/event_objects/pics/people/boy_1/3.png Binary files differdeleted file mode 100644 index aa08c6302..000000000 --- a/graphics/event_objects/pics/people/boy_1/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_1/4.png b/graphics/event_objects/pics/people/boy_1/4.png Binary files differdeleted file mode 100644 index d60c49f7e..000000000 --- a/graphics/event_objects/pics/people/boy_1/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_1/5.png b/graphics/event_objects/pics/people/boy_1/5.png Binary files differdeleted file mode 100644 index e60d62e06..000000000 --- a/graphics/event_objects/pics/people/boy_1/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_1/6.png b/graphics/event_objects/pics/people/boy_1/6.png Binary files differdeleted file mode 100644 index 9c515fb2a..000000000 --- a/graphics/event_objects/pics/people/boy_1/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_1/7.png b/graphics/event_objects/pics/people/boy_1/7.png Binary files differdeleted file mode 100644 index 422ce9d9c..000000000 --- a/graphics/event_objects/pics/people/boy_1/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_1/8.png b/graphics/event_objects/pics/people/boy_1/8.png Binary files differdeleted file mode 100644 index 1fcff3113..000000000 --- a/graphics/event_objects/pics/people/boy_1/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_2.png b/graphics/event_objects/pics/people/boy_2.png Binary files differnew file mode 100755 index 000000000..ff57b602b --- /dev/null +++ b/graphics/event_objects/pics/people/boy_2.png diff --git a/graphics/event_objects/pics/people/boy_2/0.png b/graphics/event_objects/pics/people/boy_2/0.png Binary files differdeleted file mode 100644 index aefd58a96..000000000 --- a/graphics/event_objects/pics/people/boy_2/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_2/1.png b/graphics/event_objects/pics/people/boy_2/1.png Binary files differdeleted file mode 100644 index 8b0d448cb..000000000 --- a/graphics/event_objects/pics/people/boy_2/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_2/2.png b/graphics/event_objects/pics/people/boy_2/2.png Binary files differdeleted file mode 100644 index cad6a6cda..000000000 --- a/graphics/event_objects/pics/people/boy_2/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_2/3.png b/graphics/event_objects/pics/people/boy_2/3.png Binary files differdeleted file mode 100644 index 11dea03b8..000000000 --- a/graphics/event_objects/pics/people/boy_2/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_2/4.png b/graphics/event_objects/pics/people/boy_2/4.png Binary files differdeleted file mode 100644 index 7aa11f526..000000000 --- a/graphics/event_objects/pics/people/boy_2/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_2/5.png b/graphics/event_objects/pics/people/boy_2/5.png Binary files differdeleted file mode 100644 index 0ff4cc622..000000000 --- a/graphics/event_objects/pics/people/boy_2/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_2/6.png b/graphics/event_objects/pics/people/boy_2/6.png Binary files differdeleted file mode 100644 index 5e7e98f4d..000000000 --- a/graphics/event_objects/pics/people/boy_2/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_2/7.png b/graphics/event_objects/pics/people/boy_2/7.png Binary files differdeleted file mode 100644 index 3b7188f3a..000000000 --- a/graphics/event_objects/pics/people/boy_2/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_2/8.png b/graphics/event_objects/pics/people/boy_2/8.png Binary files differdeleted file mode 100644 index aea1fee46..000000000 --- a/graphics/event_objects/pics/people/boy_2/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_3.png b/graphics/event_objects/pics/people/boy_3.png Binary files differnew file mode 100755 index 000000000..b6dba7944 --- /dev/null +++ b/graphics/event_objects/pics/people/boy_3.png diff --git a/graphics/event_objects/pics/people/boy_3/0.png b/graphics/event_objects/pics/people/boy_3/0.png Binary files differdeleted file mode 100644 index 6ac8b18c2..000000000 --- a/graphics/event_objects/pics/people/boy_3/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_3/1.png b/graphics/event_objects/pics/people/boy_3/1.png Binary files differdeleted file mode 100644 index e42abeb9f..000000000 --- a/graphics/event_objects/pics/people/boy_3/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_3/2.png b/graphics/event_objects/pics/people/boy_3/2.png Binary files differdeleted file mode 100644 index f6fdc1f83..000000000 --- a/graphics/event_objects/pics/people/boy_3/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_3/3.png b/graphics/event_objects/pics/people/boy_3/3.png Binary files differdeleted file mode 100644 index 8edb25b0c..000000000 --- a/graphics/event_objects/pics/people/boy_3/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_3/4.png b/graphics/event_objects/pics/people/boy_3/4.png Binary files differdeleted file mode 100644 index 016f12fd4..000000000 --- a/graphics/event_objects/pics/people/boy_3/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_3/5.png b/graphics/event_objects/pics/people/boy_3/5.png Binary files differdeleted file mode 100644 index b5d5bda85..000000000 --- a/graphics/event_objects/pics/people/boy_3/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_3/6.png b/graphics/event_objects/pics/people/boy_3/6.png Binary files differdeleted file mode 100644 index 703bcdbbc..000000000 --- a/graphics/event_objects/pics/people/boy_3/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_3/7.png b/graphics/event_objects/pics/people/boy_3/7.png Binary files differdeleted file mode 100644 index aeaf29942..000000000 --- a/graphics/event_objects/pics/people/boy_3/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_3/8.png b/graphics/event_objects/pics/people/boy_3/8.png Binary files differdeleted file mode 100644 index 26ef82fc3..000000000 --- a/graphics/event_objects/pics/people/boy_3/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_4.png b/graphics/event_objects/pics/people/boy_4.png Binary files differnew file mode 100755 index 000000000..6536d2c23 --- /dev/null +++ b/graphics/event_objects/pics/people/boy_4.png diff --git a/graphics/event_objects/pics/people/boy_4/0.png b/graphics/event_objects/pics/people/boy_4/0.png Binary files differdeleted file mode 100644 index a0b93b2f4..000000000 --- a/graphics/event_objects/pics/people/boy_4/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_4/1.png b/graphics/event_objects/pics/people/boy_4/1.png Binary files differdeleted file mode 100644 index 9c287e39d..000000000 --- a/graphics/event_objects/pics/people/boy_4/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_4/2.png b/graphics/event_objects/pics/people/boy_4/2.png Binary files differdeleted file mode 100644 index e1cead5ad..000000000 --- a/graphics/event_objects/pics/people/boy_4/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_4/3.png b/graphics/event_objects/pics/people/boy_4/3.png Binary files differdeleted file mode 100644 index d64420afd..000000000 --- a/graphics/event_objects/pics/people/boy_4/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_4/4.png b/graphics/event_objects/pics/people/boy_4/4.png Binary files differdeleted file mode 100644 index f7779a135..000000000 --- a/graphics/event_objects/pics/people/boy_4/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_4/5.png b/graphics/event_objects/pics/people/boy_4/5.png Binary files differdeleted file mode 100644 index 76485893d..000000000 --- a/graphics/event_objects/pics/people/boy_4/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_4/6.png b/graphics/event_objects/pics/people/boy_4/6.png Binary files differdeleted file mode 100644 index 9f63aba4e..000000000 --- a/graphics/event_objects/pics/people/boy_4/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_4/7.png b/graphics/event_objects/pics/people/boy_4/7.png Binary files differdeleted file mode 100644 index 40d19f455..000000000 --- a/graphics/event_objects/pics/people/boy_4/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_4/8.png b/graphics/event_objects/pics/people/boy_4/8.png Binary files differdeleted file mode 100644 index 1ed4d0da0..000000000 --- a/graphics/event_objects/pics/people/boy_4/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_5.png b/graphics/event_objects/pics/people/boy_5.png Binary files differnew file mode 100755 index 000000000..b0b742651 --- /dev/null +++ b/graphics/event_objects/pics/people/boy_5.png diff --git a/graphics/event_objects/pics/people/boy_5/0.png b/graphics/event_objects/pics/people/boy_5/0.png Binary files differdeleted file mode 100644 index 2a0ab6a07..000000000 --- a/graphics/event_objects/pics/people/boy_5/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_5/1.png b/graphics/event_objects/pics/people/boy_5/1.png Binary files differdeleted file mode 100644 index 65f7f1dcf..000000000 --- a/graphics/event_objects/pics/people/boy_5/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/boy_5/2.png b/graphics/event_objects/pics/people/boy_5/2.png Binary files differdeleted file mode 100644 index ece405a28..000000000 --- a/graphics/event_objects/pics/people/boy_5/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brawly.png b/graphics/event_objects/pics/people/brawly.png Binary files differnew file mode 100755 index 000000000..58fdc532a --- /dev/null +++ b/graphics/event_objects/pics/people/brawly.png diff --git a/graphics/event_objects/pics/people/brawly/0.png b/graphics/event_objects/pics/people/brawly/0.png Binary files differdeleted file mode 100644 index 1913b53c7..000000000 --- a/graphics/event_objects/pics/people/brawly/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brawly/1.png b/graphics/event_objects/pics/people/brawly/1.png Binary files differdeleted file mode 100644 index f99f71ac2..000000000 --- a/graphics/event_objects/pics/people/brawly/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brawly/2.png b/graphics/event_objects/pics/people/brawly/2.png Binary files differdeleted file mode 100644 index e1a8df5e9..000000000 --- a/graphics/event_objects/pics/people/brawly/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike.png b/graphics/event_objects/pics/people/brendan/acro_bike.png Binary files differnew file mode 100755 index 000000000..e3c5f93b3 --- /dev/null +++ b/graphics/event_objects/pics/people/brendan/acro_bike.png diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/00.png b/graphics/event_objects/pics/people/brendan/acro_bike/00.png Binary files differdeleted file mode 100644 index 95606e81a..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/00.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/01.png b/graphics/event_objects/pics/people/brendan/acro_bike/01.png Binary files differdeleted file mode 100644 index 0f188f3ad..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/01.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/02.png b/graphics/event_objects/pics/people/brendan/acro_bike/02.png Binary files differdeleted file mode 100644 index dfb45c61e..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/02.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/03.png b/graphics/event_objects/pics/people/brendan/acro_bike/03.png Binary files differdeleted file mode 100644 index b3891b6f1..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/03.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/04.png b/graphics/event_objects/pics/people/brendan/acro_bike/04.png Binary files differdeleted file mode 100644 index 6df515502..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/04.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/05.png b/graphics/event_objects/pics/people/brendan/acro_bike/05.png Binary files differdeleted file mode 100644 index b0436c325..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/05.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/06.png b/graphics/event_objects/pics/people/brendan/acro_bike/06.png Binary files differdeleted file mode 100644 index 9e91f5b44..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/06.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/07.png b/graphics/event_objects/pics/people/brendan/acro_bike/07.png Binary files differdeleted file mode 100644 index 516a7e4b5..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/07.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/08.png b/graphics/event_objects/pics/people/brendan/acro_bike/08.png Binary files differdeleted file mode 100644 index 5cfa852ee..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/08.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/09.png b/graphics/event_objects/pics/people/brendan/acro_bike/09.png Binary files differdeleted file mode 100644 index 1b0908c07..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/09.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/10.png b/graphics/event_objects/pics/people/brendan/acro_bike/10.png Binary files differdeleted file mode 100644 index 1178939e5..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/10.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/11.png b/graphics/event_objects/pics/people/brendan/acro_bike/11.png Binary files differdeleted file mode 100644 index 788ce4e5c..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/11.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/12.png b/graphics/event_objects/pics/people/brendan/acro_bike/12.png Binary files differdeleted file mode 100644 index 67d1892ef..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/12.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/13.png b/graphics/event_objects/pics/people/brendan/acro_bike/13.png Binary files differdeleted file mode 100644 index 8c4cf1ae8..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/13.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/14.png b/graphics/event_objects/pics/people/brendan/acro_bike/14.png Binary files differdeleted file mode 100644 index f87f0da16..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/14.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/15.png b/graphics/event_objects/pics/people/brendan/acro_bike/15.png Binary files differdeleted file mode 100644 index da93aad5e..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/15.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/16.png b/graphics/event_objects/pics/people/brendan/acro_bike/16.png Binary files differdeleted file mode 100644 index 2d6729fa0..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/16.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/17.png b/graphics/event_objects/pics/people/brendan/acro_bike/17.png Binary files differdeleted file mode 100644 index b6192ef1d..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/17.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/18.png b/graphics/event_objects/pics/people/brendan/acro_bike/18.png Binary files differdeleted file mode 100644 index c21c22806..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/18.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/19.png b/graphics/event_objects/pics/people/brendan/acro_bike/19.png Binary files differdeleted file mode 100644 index 119d68761..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/19.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/20.png b/graphics/event_objects/pics/people/brendan/acro_bike/20.png Binary files differdeleted file mode 100644 index a02ee9600..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/20.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/21.png b/graphics/event_objects/pics/people/brendan/acro_bike/21.png Binary files differdeleted file mode 100644 index 2cce84cc4..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/21.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/22.png b/graphics/event_objects/pics/people/brendan/acro_bike/22.png Binary files differdeleted file mode 100644 index fd1bb2c85..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/22.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/23.png b/graphics/event_objects/pics/people/brendan/acro_bike/23.png Binary files differdeleted file mode 100644 index 58aff383e..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/23.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/24.png b/graphics/event_objects/pics/people/brendan/acro_bike/24.png Binary files differdeleted file mode 100644 index f380d8e5c..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/24.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/25.png b/graphics/event_objects/pics/people/brendan/acro_bike/25.png Binary files differdeleted file mode 100644 index 5e07407d5..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/25.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/26.png b/graphics/event_objects/pics/people/brendan/acro_bike/26.png Binary files differdeleted file mode 100644 index eff56c059..000000000 --- a/graphics/event_objects/pics/people/brendan/acro_bike/26.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/decorating.png b/graphics/event_objects/pics/people/brendan/decorating.png Binary files differindex 7045d6da3..81eccea11 100644 --- a/graphics/event_objects/pics/people/brendan/decorating.png +++ b/graphics/event_objects/pics/people/brendan/decorating.png diff --git a/graphics/event_objects/pics/people/brendan/field_move.png b/graphics/event_objects/pics/people/brendan/field_move.png Binary files differnew file mode 100755 index 000000000..a7e583b4c --- /dev/null +++ b/graphics/event_objects/pics/people/brendan/field_move.png diff --git a/graphics/event_objects/pics/people/brendan/field_move/0.png b/graphics/event_objects/pics/people/brendan/field_move/0.png Binary files differdeleted file mode 100644 index e0a2876a2..000000000 --- a/graphics/event_objects/pics/people/brendan/field_move/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/field_move/1.png b/graphics/event_objects/pics/people/brendan/field_move/1.png Binary files differdeleted file mode 100644 index f19154b6f..000000000 --- a/graphics/event_objects/pics/people/brendan/field_move/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/field_move/2.png b/graphics/event_objects/pics/people/brendan/field_move/2.png Binary files differdeleted file mode 100644 index fea8469cb..000000000 --- a/graphics/event_objects/pics/people/brendan/field_move/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/field_move/3.png b/graphics/event_objects/pics/people/brendan/field_move/3.png Binary files differdeleted file mode 100644 index 7d394584d..000000000 --- a/graphics/event_objects/pics/people/brendan/field_move/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/field_move/4.png b/graphics/event_objects/pics/people/brendan/field_move/4.png Binary files differdeleted file mode 100644 index 298e83d0f..000000000 --- a/graphics/event_objects/pics/people/brendan/field_move/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/fishing.png b/graphics/event_objects/pics/people/brendan/fishing.png Binary files differnew file mode 100755 index 000000000..440734776 --- /dev/null +++ b/graphics/event_objects/pics/people/brendan/fishing.png diff --git a/graphics/event_objects/pics/people/brendan/fishing/00.png b/graphics/event_objects/pics/people/brendan/fishing/00.png Binary files differdeleted file mode 100644 index 6b8c0e202..000000000 --- a/graphics/event_objects/pics/people/brendan/fishing/00.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/fishing/01.png b/graphics/event_objects/pics/people/brendan/fishing/01.png Binary files differdeleted file mode 100644 index 6938e7892..000000000 --- a/graphics/event_objects/pics/people/brendan/fishing/01.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/fishing/02.png b/graphics/event_objects/pics/people/brendan/fishing/02.png Binary files differdeleted file mode 100644 index 2fd184fbd..000000000 --- a/graphics/event_objects/pics/people/brendan/fishing/02.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/fishing/03.png b/graphics/event_objects/pics/people/brendan/fishing/03.png Binary files differdeleted file mode 100644 index 6dcc27682..000000000 --- a/graphics/event_objects/pics/people/brendan/fishing/03.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/fishing/04.png b/graphics/event_objects/pics/people/brendan/fishing/04.png Binary files differdeleted file mode 100644 index b7667b374..000000000 --- a/graphics/event_objects/pics/people/brendan/fishing/04.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/fishing/05.png b/graphics/event_objects/pics/people/brendan/fishing/05.png Binary files differdeleted file mode 100644 index 41ad9bbf5..000000000 --- a/graphics/event_objects/pics/people/brendan/fishing/05.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/fishing/06.png b/graphics/event_objects/pics/people/brendan/fishing/06.png Binary files differdeleted file mode 100644 index ec546ea55..000000000 --- a/graphics/event_objects/pics/people/brendan/fishing/06.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/fishing/07.png b/graphics/event_objects/pics/people/brendan/fishing/07.png Binary files differdeleted file mode 100644 index ebe68dd24..000000000 --- a/graphics/event_objects/pics/people/brendan/fishing/07.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/fishing/08.png b/graphics/event_objects/pics/people/brendan/fishing/08.png Binary files differdeleted file mode 100644 index e32beea65..000000000 --- a/graphics/event_objects/pics/people/brendan/fishing/08.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/fishing/09.png b/graphics/event_objects/pics/people/brendan/fishing/09.png Binary files differdeleted file mode 100644 index b575fd9e4..000000000 --- a/graphics/event_objects/pics/people/brendan/fishing/09.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/fishing/10.png b/graphics/event_objects/pics/people/brendan/fishing/10.png Binary files differdeleted file mode 100644 index 7182b32f1..000000000 --- a/graphics/event_objects/pics/people/brendan/fishing/10.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/fishing/11.png b/graphics/event_objects/pics/people/brendan/fishing/11.png Binary files differdeleted file mode 100644 index 308824fee..000000000 --- a/graphics/event_objects/pics/people/brendan/fishing/11.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/mach_bike.png b/graphics/event_objects/pics/people/brendan/mach_bike.png Binary files differnew file mode 100755 index 000000000..efd7474aa --- /dev/null +++ b/graphics/event_objects/pics/people/brendan/mach_bike.png diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/0.png b/graphics/event_objects/pics/people/brendan/mach_bike/0.png Binary files differdeleted file mode 100644 index 95606e81a..000000000 --- a/graphics/event_objects/pics/people/brendan/mach_bike/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/1.png b/graphics/event_objects/pics/people/brendan/mach_bike/1.png Binary files differdeleted file mode 100644 index 0f188f3ad..000000000 --- a/graphics/event_objects/pics/people/brendan/mach_bike/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/2.png b/graphics/event_objects/pics/people/brendan/mach_bike/2.png Binary files differdeleted file mode 100644 index dfb45c61e..000000000 --- a/graphics/event_objects/pics/people/brendan/mach_bike/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/3.png b/graphics/event_objects/pics/people/brendan/mach_bike/3.png Binary files differdeleted file mode 100644 index b3891b6f1..000000000 --- a/graphics/event_objects/pics/people/brendan/mach_bike/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/4.png b/graphics/event_objects/pics/people/brendan/mach_bike/4.png Binary files differdeleted file mode 100644 index 6df515502..000000000 --- a/graphics/event_objects/pics/people/brendan/mach_bike/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/5.png b/graphics/event_objects/pics/people/brendan/mach_bike/5.png Binary files differdeleted file mode 100644 index b0436c325..000000000 --- a/graphics/event_objects/pics/people/brendan/mach_bike/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/6.png b/graphics/event_objects/pics/people/brendan/mach_bike/6.png Binary files differdeleted file mode 100644 index 9e91f5b44..000000000 --- a/graphics/event_objects/pics/people/brendan/mach_bike/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/7.png b/graphics/event_objects/pics/people/brendan/mach_bike/7.png Binary files differdeleted file mode 100644 index 516a7e4b5..000000000 --- a/graphics/event_objects/pics/people/brendan/mach_bike/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/8.png b/graphics/event_objects/pics/people/brendan/mach_bike/8.png Binary files differdeleted file mode 100644 index 5cfa852ee..000000000 --- a/graphics/event_objects/pics/people/brendan/mach_bike/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal.png b/graphics/event_objects/pics/people/brendan/normal.png Binary files differnew file mode 100755 index 000000000..a4ea93191 --- /dev/null +++ b/graphics/event_objects/pics/people/brendan/normal.png diff --git a/graphics/event_objects/pics/people/brendan/normal/00.png b/graphics/event_objects/pics/people/brendan/normal/00.png Binary files differdeleted file mode 100644 index 780360c4f..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/00.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/01.png b/graphics/event_objects/pics/people/brendan/normal/01.png Binary files differdeleted file mode 100644 index f83064047..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/01.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/02.png b/graphics/event_objects/pics/people/brendan/normal/02.png Binary files differdeleted file mode 100644 index ffb8ad34b..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/02.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/03.png b/graphics/event_objects/pics/people/brendan/normal/03.png Binary files differdeleted file mode 100644 index d0721bbb4..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/03.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/04.png b/graphics/event_objects/pics/people/brendan/normal/04.png Binary files differdeleted file mode 100644 index 07817e55f..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/04.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/05.png b/graphics/event_objects/pics/people/brendan/normal/05.png Binary files differdeleted file mode 100644 index afc322129..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/05.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/06.png b/graphics/event_objects/pics/people/brendan/normal/06.png Binary files differdeleted file mode 100644 index 84a8cceb1..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/06.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/07.png b/graphics/event_objects/pics/people/brendan/normal/07.png Binary files differdeleted file mode 100644 index ca518d8a0..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/07.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/08.png b/graphics/event_objects/pics/people/brendan/normal/08.png Binary files differdeleted file mode 100644 index 3430ff243..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/08.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/09.png b/graphics/event_objects/pics/people/brendan/normal/09.png Binary files differdeleted file mode 100644 index 392f019e7..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/09.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/10.png b/graphics/event_objects/pics/people/brendan/normal/10.png Binary files differdeleted file mode 100644 index 722f2d04d..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/10.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/11.png b/graphics/event_objects/pics/people/brendan/normal/11.png Binary files differdeleted file mode 100644 index eff0cbc5f..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/11.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/12.png b/graphics/event_objects/pics/people/brendan/normal/12.png Binary files differdeleted file mode 100644 index 0a5037d43..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/12.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/13.png b/graphics/event_objects/pics/people/brendan/normal/13.png Binary files differdeleted file mode 100644 index 8dc245c0e..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/13.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/14.png b/graphics/event_objects/pics/people/brendan/normal/14.png Binary files differdeleted file mode 100644 index 53844c0c1..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/14.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/15.png b/graphics/event_objects/pics/people/brendan/normal/15.png Binary files differdeleted file mode 100644 index 34d73e7f6..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/15.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/16.png b/graphics/event_objects/pics/people/brendan/normal/16.png Binary files differdeleted file mode 100644 index b324f5538..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/16.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/normal/17.png b/graphics/event_objects/pics/people/brendan/normal/17.png Binary files differdeleted file mode 100644 index 9a736dc02..000000000 --- a/graphics/event_objects/pics/people/brendan/normal/17.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/surfing.png b/graphics/event_objects/pics/people/brendan/surfing.png Binary files differnew file mode 100755 index 000000000..9eac596f8 --- /dev/null +++ b/graphics/event_objects/pics/people/brendan/surfing.png diff --git a/graphics/event_objects/pics/people/brendan/surfing/0.png b/graphics/event_objects/pics/people/brendan/surfing/0.png Binary files differdeleted file mode 100644 index 851640543..000000000 --- a/graphics/event_objects/pics/people/brendan/surfing/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/surfing/1.png b/graphics/event_objects/pics/people/brendan/surfing/1.png Binary files differdeleted file mode 100644 index 434be47ea..000000000 --- a/graphics/event_objects/pics/people/brendan/surfing/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/surfing/2.png b/graphics/event_objects/pics/people/brendan/surfing/2.png Binary files differdeleted file mode 100644 index 94979b4a3..000000000 --- a/graphics/event_objects/pics/people/brendan/surfing/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/surfing/3.png b/graphics/event_objects/pics/people/brendan/surfing/3.png Binary files differdeleted file mode 100644 index 70b6bf2a3..000000000 --- a/graphics/event_objects/pics/people/brendan/surfing/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/surfing/4.png b/graphics/event_objects/pics/people/brendan/surfing/4.png Binary files differdeleted file mode 100644 index fed2883fb..000000000 --- a/graphics/event_objects/pics/people/brendan/surfing/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/surfing/5.png b/graphics/event_objects/pics/people/brendan/surfing/5.png Binary files differdeleted file mode 100644 index ea1408694..000000000 --- a/graphics/event_objects/pics/people/brendan/surfing/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/underwater.png b/graphics/event_objects/pics/people/brendan/underwater.png Binary files differnew file mode 100755 index 000000000..47f926b61 --- /dev/null +++ b/graphics/event_objects/pics/people/brendan/underwater.png diff --git a/graphics/event_objects/pics/people/brendan/underwater/0.png b/graphics/event_objects/pics/people/brendan/underwater/0.png Binary files differdeleted file mode 100644 index 79951c29c..000000000 --- a/graphics/event_objects/pics/people/brendan/underwater/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/underwater/1.png b/graphics/event_objects/pics/people/brendan/underwater/1.png Binary files differdeleted file mode 100644 index d7c3f0783..000000000 --- a/graphics/event_objects/pics/people/brendan/underwater/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/underwater/2.png b/graphics/event_objects/pics/people/brendan/underwater/2.png Binary files differdeleted file mode 100644 index 628a2ac88..000000000 --- a/graphics/event_objects/pics/people/brendan/underwater/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/underwater/3.png b/graphics/event_objects/pics/people/brendan/underwater/3.png Binary files differdeleted file mode 100644 index 7756a96db..000000000 --- a/graphics/event_objects/pics/people/brendan/underwater/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/watering.png b/graphics/event_objects/pics/people/brendan/watering.png Binary files differnew file mode 100755 index 000000000..8fcff0925 --- /dev/null +++ b/graphics/event_objects/pics/people/brendan/watering.png diff --git a/graphics/event_objects/pics/people/brendan/watering/0.png b/graphics/event_objects/pics/people/brendan/watering/0.png Binary files differdeleted file mode 100644 index 0e9c477fd..000000000 --- a/graphics/event_objects/pics/people/brendan/watering/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/watering/1.png b/graphics/event_objects/pics/people/brendan/watering/1.png Binary files differdeleted file mode 100644 index d1b59baf8..000000000 --- a/graphics/event_objects/pics/people/brendan/watering/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/watering/2.png b/graphics/event_objects/pics/people/brendan/watering/2.png Binary files differdeleted file mode 100644 index b35a92e15..000000000 --- a/graphics/event_objects/pics/people/brendan/watering/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/watering/3.png b/graphics/event_objects/pics/people/brendan/watering/3.png Binary files differdeleted file mode 100644 index be8cdbfe1..000000000 --- a/graphics/event_objects/pics/people/brendan/watering/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/watering/4.png b/graphics/event_objects/pics/people/brendan/watering/4.png Binary files differdeleted file mode 100644 index 762b9060c..000000000 --- a/graphics/event_objects/pics/people/brendan/watering/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/brendan/watering/5.png b/graphics/event_objects/pics/people/brendan/watering/5.png Binary files differdeleted file mode 100644 index cfed73765..000000000 --- a/graphics/event_objects/pics/people/brendan/watering/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/bug_catcher.png b/graphics/event_objects/pics/people/bug_catcher.png Binary files differnew file mode 100755 index 000000000..7f733b936 --- /dev/null +++ b/graphics/event_objects/pics/people/bug_catcher.png diff --git a/graphics/event_objects/pics/people/bug_catcher/0.png b/graphics/event_objects/pics/people/bug_catcher/0.png Binary files differdeleted file mode 100644 index 860449379..000000000 --- a/graphics/event_objects/pics/people/bug_catcher/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/bug_catcher/1.png b/graphics/event_objects/pics/people/bug_catcher/1.png Binary files differdeleted file mode 100644 index a0a3b3df1..000000000 --- a/graphics/event_objects/pics/people/bug_catcher/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/bug_catcher/2.png b/graphics/event_objects/pics/people/bug_catcher/2.png Binary files differdeleted file mode 100644 index 96363e4a8..000000000 --- a/graphics/event_objects/pics/people/bug_catcher/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/bug_catcher/3.png b/graphics/event_objects/pics/people/bug_catcher/3.png Binary files differdeleted file mode 100644 index 472fa42cb..000000000 --- a/graphics/event_objects/pics/people/bug_catcher/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/bug_catcher/4.png b/graphics/event_objects/pics/people/bug_catcher/4.png Binary files differdeleted file mode 100644 index f6da1bb97..000000000 --- a/graphics/event_objects/pics/people/bug_catcher/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/bug_catcher/5.png b/graphics/event_objects/pics/people/bug_catcher/5.png Binary files differdeleted file mode 100644 index bd5aea560..000000000 --- a/graphics/event_objects/pics/people/bug_catcher/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/bug_catcher/6.png b/graphics/event_objects/pics/people/bug_catcher/6.png Binary files differdeleted file mode 100644 index 2a93fc6b7..000000000 --- a/graphics/event_objects/pics/people/bug_catcher/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/bug_catcher/7.png b/graphics/event_objects/pics/people/bug_catcher/7.png Binary files differdeleted file mode 100644 index fded025e3..000000000 --- a/graphics/event_objects/pics/people/bug_catcher/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/bug_catcher/8.png b/graphics/event_objects/pics/people/bug_catcher/8.png Binary files differdeleted file mode 100644 index df561597b..000000000 --- a/graphics/event_objects/pics/people/bug_catcher/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cameraman.png b/graphics/event_objects/pics/people/cameraman.png Binary files differnew file mode 100755 index 000000000..10f74faa6 --- /dev/null +++ b/graphics/event_objects/pics/people/cameraman.png diff --git a/graphics/event_objects/pics/people/cameraman/0.png b/graphics/event_objects/pics/people/cameraman/0.png Binary files differdeleted file mode 100644 index af6ad2878..000000000 --- a/graphics/event_objects/pics/people/cameraman/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cameraman/1.png b/graphics/event_objects/pics/people/cameraman/1.png Binary files differdeleted file mode 100644 index 112ee86b4..000000000 --- a/graphics/event_objects/pics/people/cameraman/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cameraman/2.png b/graphics/event_objects/pics/people/cameraman/2.png Binary files differdeleted file mode 100644 index 6eaca8266..000000000 --- a/graphics/event_objects/pics/people/cameraman/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cameraman/3.png b/graphics/event_objects/pics/people/cameraman/3.png Binary files differdeleted file mode 100644 index 6f28f9ff4..000000000 --- a/graphics/event_objects/pics/people/cameraman/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cameraman/4.png b/graphics/event_objects/pics/people/cameraman/4.png Binary files differdeleted file mode 100644 index a74cd6c8c..000000000 --- a/graphics/event_objects/pics/people/cameraman/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cameraman/5.png b/graphics/event_objects/pics/people/cameraman/5.png Binary files differdeleted file mode 100644 index 44c1a768c..000000000 --- a/graphics/event_objects/pics/people/cameraman/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cameraman/6.png b/graphics/event_objects/pics/people/cameraman/6.png Binary files differdeleted file mode 100644 index e8c41883d..000000000 --- a/graphics/event_objects/pics/people/cameraman/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cameraman/7.png b/graphics/event_objects/pics/people/cameraman/7.png Binary files differdeleted file mode 100644 index 2ccfeae84..000000000 --- a/graphics/event_objects/pics/people/cameraman/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cameraman/8.png b/graphics/event_objects/pics/people/cameraman/8.png Binary files differdeleted file mode 100644 index e2af57df1..000000000 --- a/graphics/event_objects/pics/people/cameraman/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/camper.png b/graphics/event_objects/pics/people/camper.png Binary files differnew file mode 100755 index 000000000..3719d64f3 --- /dev/null +++ b/graphics/event_objects/pics/people/camper.png diff --git a/graphics/event_objects/pics/people/camper/0.png b/graphics/event_objects/pics/people/camper/0.png Binary files differdeleted file mode 100644 index ffdea18b6..000000000 --- a/graphics/event_objects/pics/people/camper/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/camper/1.png b/graphics/event_objects/pics/people/camper/1.png Binary files differdeleted file mode 100644 index ea5ef4d86..000000000 --- a/graphics/event_objects/pics/people/camper/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/camper/2.png b/graphics/event_objects/pics/people/camper/2.png Binary files differdeleted file mode 100644 index c25c51a78..000000000 --- a/graphics/event_objects/pics/people/camper/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/camper/3.png b/graphics/event_objects/pics/people/camper/3.png Binary files differdeleted file mode 100644 index 451f9c469..000000000 --- a/graphics/event_objects/pics/people/camper/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/camper/4.png b/graphics/event_objects/pics/people/camper/4.png Binary files differdeleted file mode 100644 index b17781df4..000000000 --- a/graphics/event_objects/pics/people/camper/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/camper/5.png b/graphics/event_objects/pics/people/camper/5.png Binary files differdeleted file mode 100644 index ea79ad5d2..000000000 --- a/graphics/event_objects/pics/people/camper/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/camper/6.png b/graphics/event_objects/pics/people/camper/6.png Binary files differdeleted file mode 100644 index 7f003b53f..000000000 --- a/graphics/event_objects/pics/people/camper/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/camper/7.png b/graphics/event_objects/pics/people/camper/7.png Binary files differdeleted file mode 100644 index 4dcb217b3..000000000 --- a/graphics/event_objects/pics/people/camper/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/camper/8.png b/graphics/event_objects/pics/people/camper/8.png Binary files differdeleted file mode 100644 index 888a0d17f..000000000 --- a/graphics/event_objects/pics/people/camper/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/contest_judge.png b/graphics/event_objects/pics/people/contest_judge.png Binary files differnew file mode 100755 index 000000000..919230cb7 --- /dev/null +++ b/graphics/event_objects/pics/people/contest_judge.png diff --git a/graphics/event_objects/pics/people/contest_judge/0.png b/graphics/event_objects/pics/people/contest_judge/0.png Binary files differdeleted file mode 100644 index 118a34463..000000000 --- a/graphics/event_objects/pics/people/contest_judge/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/contest_judge/1.png b/graphics/event_objects/pics/people/contest_judge/1.png Binary files differdeleted file mode 100644 index 75f9010dd..000000000 --- a/graphics/event_objects/pics/people/contest_judge/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/contest_judge/2.png b/graphics/event_objects/pics/people/contest_judge/2.png Binary files differdeleted file mode 100644 index 8ca543cef..000000000 --- a/graphics/event_objects/pics/people/contest_judge/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/contest_judge/3.png b/graphics/event_objects/pics/people/contest_judge/3.png Binary files differdeleted file mode 100644 index 16015e53c..000000000 --- a/graphics/event_objects/pics/people/contest_judge/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/contest_judge/4.png b/graphics/event_objects/pics/people/contest_judge/4.png Binary files differdeleted file mode 100644 index e4fdfcc13..000000000 --- a/graphics/event_objects/pics/people/contest_judge/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/contest_judge/5.png b/graphics/event_objects/pics/people/contest_judge/5.png Binary files differdeleted file mode 100644 index 5de4a6b80..000000000 --- a/graphics/event_objects/pics/people/contest_judge/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/contest_judge/6.png b/graphics/event_objects/pics/people/contest_judge/6.png Binary files differdeleted file mode 100644 index ebcb577d4..000000000 --- a/graphics/event_objects/pics/people/contest_judge/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/contest_judge/7.png b/graphics/event_objects/pics/people/contest_judge/7.png Binary files differdeleted file mode 100644 index d01f156c1..000000000 --- a/graphics/event_objects/pics/people/contest_judge/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/contest_judge/8.png b/graphics/event_objects/pics/people/contest_judge/8.png Binary files differdeleted file mode 100644 index 84e5690b7..000000000 --- a/graphics/event_objects/pics/people/contest_judge/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cook.png b/graphics/event_objects/pics/people/cook.png Binary files differnew file mode 100755 index 000000000..9ac187130 --- /dev/null +++ b/graphics/event_objects/pics/people/cook.png diff --git a/graphics/event_objects/pics/people/cook/0.png b/graphics/event_objects/pics/people/cook/0.png Binary files differdeleted file mode 100644 index 1413ce869..000000000 --- a/graphics/event_objects/pics/people/cook/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cook/1.png b/graphics/event_objects/pics/people/cook/1.png Binary files differdeleted file mode 100644 index 622e2b2d2..000000000 --- a/graphics/event_objects/pics/people/cook/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cook/2.png b/graphics/event_objects/pics/people/cook/2.png Binary files differdeleted file mode 100644 index b2c2231a2..000000000 --- a/graphics/event_objects/pics/people/cook/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f.png b/graphics/event_objects/pics/people/cycling_triathlete_f.png Binary files differnew file mode 100755 index 000000000..a291b79c5 --- /dev/null +++ b/graphics/event_objects/pics/people/cycling_triathlete_f.png diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/0.png b/graphics/event_objects/pics/people/cycling_triathlete_f/0.png Binary files differdeleted file mode 100644 index 452ba3daf..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_f/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/1.png b/graphics/event_objects/pics/people/cycling_triathlete_f/1.png Binary files differdeleted file mode 100644 index e4c8c78cb..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_f/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/2.png b/graphics/event_objects/pics/people/cycling_triathlete_f/2.png Binary files differdeleted file mode 100644 index 20986da62..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_f/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/3.png b/graphics/event_objects/pics/people/cycling_triathlete_f/3.png Binary files differdeleted file mode 100644 index 5cfda5ff6..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_f/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/4.png b/graphics/event_objects/pics/people/cycling_triathlete_f/4.png Binary files differdeleted file mode 100644 index e52cac84e..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_f/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/5.png b/graphics/event_objects/pics/people/cycling_triathlete_f/5.png Binary files differdeleted file mode 100644 index 8376cc00e..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_f/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/6.png b/graphics/event_objects/pics/people/cycling_triathlete_f/6.png Binary files differdeleted file mode 100644 index d99951529..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_f/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/7.png b/graphics/event_objects/pics/people/cycling_triathlete_f/7.png Binary files differdeleted file mode 100644 index a1c953c83..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_f/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/8.png b/graphics/event_objects/pics/people/cycling_triathlete_f/8.png Binary files differdeleted file mode 100644 index 63a6ebb0c..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_f/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m.png b/graphics/event_objects/pics/people/cycling_triathlete_m.png Binary files differnew file mode 100755 index 000000000..08a848d27 --- /dev/null +++ b/graphics/event_objects/pics/people/cycling_triathlete_m.png diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/0.png b/graphics/event_objects/pics/people/cycling_triathlete_m/0.png Binary files differdeleted file mode 100644 index 107589cbc..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_m/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/1.png b/graphics/event_objects/pics/people/cycling_triathlete_m/1.png Binary files differdeleted file mode 100644 index 39cf99a21..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_m/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/2.png b/graphics/event_objects/pics/people/cycling_triathlete_m/2.png Binary files differdeleted file mode 100644 index f5ab76d10..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_m/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/3.png b/graphics/event_objects/pics/people/cycling_triathlete_m/3.png Binary files differdeleted file mode 100644 index d54d3fcdb..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_m/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/4.png b/graphics/event_objects/pics/people/cycling_triathlete_m/4.png Binary files differdeleted file mode 100644 index b065a1294..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_m/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/5.png b/graphics/event_objects/pics/people/cycling_triathlete_m/5.png Binary files differdeleted file mode 100644 index bbb47a869..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_m/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/6.png b/graphics/event_objects/pics/people/cycling_triathlete_m/6.png Binary files differdeleted file mode 100644 index 7f126858f..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_m/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/7.png b/graphics/event_objects/pics/people/cycling_triathlete_m/7.png Binary files differdeleted file mode 100644 index 43f2e2739..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_m/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/8.png b/graphics/event_objects/pics/people/cycling_triathlete_m/8.png Binary files differdeleted file mode 100644 index 1168c440b..000000000 --- a/graphics/event_objects/pics/people/cycling_triathlete_m/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/drake.png b/graphics/event_objects/pics/people/drake.png Binary files differnew file mode 100755 index 000000000..9fde008ff --- /dev/null +++ b/graphics/event_objects/pics/people/drake.png diff --git a/graphics/event_objects/pics/people/drake/0.png b/graphics/event_objects/pics/people/drake/0.png Binary files differdeleted file mode 100644 index 8c12cbe40..000000000 --- a/graphics/event_objects/pics/people/drake/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/drake/1.png b/graphics/event_objects/pics/people/drake/1.png Binary files differdeleted file mode 100644 index b401c3b14..000000000 --- a/graphics/event_objects/pics/people/drake/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/drake/2.png b/graphics/event_objects/pics/people/drake/2.png Binary files differdeleted file mode 100644 index c116a283e..000000000 --- a/graphics/event_objects/pics/people/drake/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fat_man.png b/graphics/event_objects/pics/people/fat_man.png Binary files differnew file mode 100755 index 000000000..392f0446e --- /dev/null +++ b/graphics/event_objects/pics/people/fat_man.png diff --git a/graphics/event_objects/pics/people/fat_man/0.png b/graphics/event_objects/pics/people/fat_man/0.png Binary files differdeleted file mode 100644 index 290a7f9ed..000000000 --- a/graphics/event_objects/pics/people/fat_man/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fat_man/1.png b/graphics/event_objects/pics/people/fat_man/1.png Binary files differdeleted file mode 100644 index d5d81dcdb..000000000 --- a/graphics/event_objects/pics/people/fat_man/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fat_man/2.png b/graphics/event_objects/pics/people/fat_man/2.png Binary files differdeleted file mode 100644 index 5b99f60da..000000000 --- a/graphics/event_objects/pics/people/fat_man/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fat_man/3.png b/graphics/event_objects/pics/people/fat_man/3.png Binary files differdeleted file mode 100644 index 2c6b5f0d1..000000000 --- a/graphics/event_objects/pics/people/fat_man/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fat_man/4.png b/graphics/event_objects/pics/people/fat_man/4.png Binary files differdeleted file mode 100644 index 846d52b99..000000000 --- a/graphics/event_objects/pics/people/fat_man/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fat_man/5.png b/graphics/event_objects/pics/people/fat_man/5.png Binary files differdeleted file mode 100644 index ee751217f..000000000 --- a/graphics/event_objects/pics/people/fat_man/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fat_man/6.png b/graphics/event_objects/pics/people/fat_man/6.png Binary files differdeleted file mode 100644 index 8eb76d809..000000000 --- a/graphics/event_objects/pics/people/fat_man/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fat_man/7.png b/graphics/event_objects/pics/people/fat_man/7.png Binary files differdeleted file mode 100644 index 5694df27b..000000000 --- a/graphics/event_objects/pics/people/fat_man/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fat_man/8.png b/graphics/event_objects/pics/people/fat_man/8.png Binary files differdeleted file mode 100644 index f3528f332..000000000 --- a/graphics/event_objects/pics/people/fat_man/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fisherman.png b/graphics/event_objects/pics/people/fisherman.png Binary files differnew file mode 100755 index 000000000..486fc36ed --- /dev/null +++ b/graphics/event_objects/pics/people/fisherman.png diff --git a/graphics/event_objects/pics/people/fisherman/0.png b/graphics/event_objects/pics/people/fisherman/0.png Binary files differdeleted file mode 100644 index 5e963f889..000000000 --- a/graphics/event_objects/pics/people/fisherman/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fisherman/1.png b/graphics/event_objects/pics/people/fisherman/1.png Binary files differdeleted file mode 100644 index 5bd83e7e1..000000000 --- a/graphics/event_objects/pics/people/fisherman/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fisherman/2.png b/graphics/event_objects/pics/people/fisherman/2.png Binary files differdeleted file mode 100644 index f587de8d9..000000000 --- a/graphics/event_objects/pics/people/fisherman/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fisherman/3.png b/graphics/event_objects/pics/people/fisherman/3.png Binary files differdeleted file mode 100644 index 5d79a1da8..000000000 --- a/graphics/event_objects/pics/people/fisherman/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fisherman/4.png b/graphics/event_objects/pics/people/fisherman/4.png Binary files differdeleted file mode 100644 index dd3104436..000000000 --- a/graphics/event_objects/pics/people/fisherman/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fisherman/5.png b/graphics/event_objects/pics/people/fisherman/5.png Binary files differdeleted file mode 100644 index 515f9c638..000000000 --- a/graphics/event_objects/pics/people/fisherman/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fisherman/6.png b/graphics/event_objects/pics/people/fisherman/6.png Binary files differdeleted file mode 100644 index 83ea1ff57..000000000 --- a/graphics/event_objects/pics/people/fisherman/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fisherman/7.png b/graphics/event_objects/pics/people/fisherman/7.png Binary files differdeleted file mode 100644 index 6f886b92e..000000000 --- a/graphics/event_objects/pics/people/fisherman/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/fisherman/8.png b/graphics/event_objects/pics/people/fisherman/8.png Binary files differdeleted file mode 100644 index 26826b5e2..000000000 --- a/graphics/event_objects/pics/people/fisherman/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/flannery.png b/graphics/event_objects/pics/people/flannery.png Binary files differnew file mode 100755 index 000000000..6d944c5e9 --- /dev/null +++ b/graphics/event_objects/pics/people/flannery.png diff --git a/graphics/event_objects/pics/people/flannery/0.png b/graphics/event_objects/pics/people/flannery/0.png Binary files differdeleted file mode 100644 index 0c1fda0fe..000000000 --- a/graphics/event_objects/pics/people/flannery/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/flannery/1.png b/graphics/event_objects/pics/people/flannery/1.png Binary files differdeleted file mode 100644 index 17f6c4101..000000000 --- a/graphics/event_objects/pics/people/flannery/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/flannery/2.png b/graphics/event_objects/pics/people/flannery/2.png Binary files differdeleted file mode 100644 index 72e96c97d..000000000 --- a/graphics/event_objects/pics/people/flannery/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/gentleman.png b/graphics/event_objects/pics/people/gentleman.png Binary files differnew file mode 100755 index 000000000..2f6341f83 --- /dev/null +++ b/graphics/event_objects/pics/people/gentleman.png diff --git a/graphics/event_objects/pics/people/gentleman/0.png b/graphics/event_objects/pics/people/gentleman/0.png Binary files differdeleted file mode 100644 index 356e5caa6..000000000 --- a/graphics/event_objects/pics/people/gentleman/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/gentleman/1.png b/graphics/event_objects/pics/people/gentleman/1.png Binary files differdeleted file mode 100644 index dd615b27a..000000000 --- a/graphics/event_objects/pics/people/gentleman/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/gentleman/2.png b/graphics/event_objects/pics/people/gentleman/2.png Binary files differdeleted file mode 100644 index 221a43b7b..000000000 --- a/graphics/event_objects/pics/people/gentleman/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/gentleman/3.png b/graphics/event_objects/pics/people/gentleman/3.png Binary files differdeleted file mode 100644 index 0f262d088..000000000 --- a/graphics/event_objects/pics/people/gentleman/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/gentleman/4.png b/graphics/event_objects/pics/people/gentleman/4.png Binary files differdeleted file mode 100644 index 9d57f34cb..000000000 --- a/graphics/event_objects/pics/people/gentleman/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/gentleman/5.png b/graphics/event_objects/pics/people/gentleman/5.png Binary files differdeleted file mode 100644 index 78f7da03e..000000000 --- a/graphics/event_objects/pics/people/gentleman/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/gentleman/6.png b/graphics/event_objects/pics/people/gentleman/6.png Binary files differdeleted file mode 100644 index 9aafe9f17..000000000 --- a/graphics/event_objects/pics/people/gentleman/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/gentleman/7.png b/graphics/event_objects/pics/people/gentleman/7.png Binary files differdeleted file mode 100644 index 56d80353d..000000000 --- a/graphics/event_objects/pics/people/gentleman/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/gentleman/8.png b/graphics/event_objects/pics/people/gentleman/8.png Binary files differdeleted file mode 100644 index d5571b4e8..000000000 --- a/graphics/event_objects/pics/people/gentleman/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_1.png b/graphics/event_objects/pics/people/girl_1.png Binary files differnew file mode 100755 index 000000000..d0666c1c3 --- /dev/null +++ b/graphics/event_objects/pics/people/girl_1.png diff --git a/graphics/event_objects/pics/people/girl_1/0.png b/graphics/event_objects/pics/people/girl_1/0.png Binary files differdeleted file mode 100644 index 4b812ef41..000000000 --- a/graphics/event_objects/pics/people/girl_1/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_1/1.png b/graphics/event_objects/pics/people/girl_1/1.png Binary files differdeleted file mode 100644 index 3ec86b337..000000000 --- a/graphics/event_objects/pics/people/girl_1/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_1/2.png b/graphics/event_objects/pics/people/girl_1/2.png Binary files differdeleted file mode 100644 index 4bea7b7ca..000000000 --- a/graphics/event_objects/pics/people/girl_1/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_1/3.png b/graphics/event_objects/pics/people/girl_1/3.png Binary files differdeleted file mode 100644 index 06425c9eb..000000000 --- a/graphics/event_objects/pics/people/girl_1/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_1/4.png b/graphics/event_objects/pics/people/girl_1/4.png Binary files differdeleted file mode 100644 index fb940eadb..000000000 --- a/graphics/event_objects/pics/people/girl_1/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_1/5.png b/graphics/event_objects/pics/people/girl_1/5.png Binary files differdeleted file mode 100644 index 1bf4c2dc8..000000000 --- a/graphics/event_objects/pics/people/girl_1/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_1/6.png b/graphics/event_objects/pics/people/girl_1/6.png Binary files differdeleted file mode 100644 index 256567cbf..000000000 --- a/graphics/event_objects/pics/people/girl_1/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_1/7.png b/graphics/event_objects/pics/people/girl_1/7.png Binary files differdeleted file mode 100644 index 13bfe2af3..000000000 --- a/graphics/event_objects/pics/people/girl_1/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_1/8.png b/graphics/event_objects/pics/people/girl_1/8.png Binary files differdeleted file mode 100644 index 5675d705d..000000000 --- a/graphics/event_objects/pics/people/girl_1/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_2.png b/graphics/event_objects/pics/people/girl_2.png Binary files differnew file mode 100755 index 000000000..fa54bd715 --- /dev/null +++ b/graphics/event_objects/pics/people/girl_2.png diff --git a/graphics/event_objects/pics/people/girl_2/0.png b/graphics/event_objects/pics/people/girl_2/0.png Binary files differdeleted file mode 100644 index 5f336f20f..000000000 --- a/graphics/event_objects/pics/people/girl_2/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_2/1.png b/graphics/event_objects/pics/people/girl_2/1.png Binary files differdeleted file mode 100644 index 3009e228c..000000000 --- a/graphics/event_objects/pics/people/girl_2/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_2/2.png b/graphics/event_objects/pics/people/girl_2/2.png Binary files differdeleted file mode 100644 index 3f1c04b4b..000000000 --- a/graphics/event_objects/pics/people/girl_2/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_2/3.png b/graphics/event_objects/pics/people/girl_2/3.png Binary files differdeleted file mode 100644 index 4713b70dd..000000000 --- a/graphics/event_objects/pics/people/girl_2/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_2/4.png b/graphics/event_objects/pics/people/girl_2/4.png Binary files differdeleted file mode 100644 index 3a12aa48e..000000000 --- a/graphics/event_objects/pics/people/girl_2/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_2/5.png b/graphics/event_objects/pics/people/girl_2/5.png Binary files differdeleted file mode 100644 index 885ee2de9..000000000 --- a/graphics/event_objects/pics/people/girl_2/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_2/6.png b/graphics/event_objects/pics/people/girl_2/6.png Binary files differdeleted file mode 100644 index 5ce644500..000000000 --- a/graphics/event_objects/pics/people/girl_2/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_2/7.png b/graphics/event_objects/pics/people/girl_2/7.png Binary files differdeleted file mode 100644 index 28e8ed5a8..000000000 --- a/graphics/event_objects/pics/people/girl_2/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_2/8.png b/graphics/event_objects/pics/people/girl_2/8.png Binary files differdeleted file mode 100644 index e9b5e587e..000000000 --- a/graphics/event_objects/pics/people/girl_2/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_3.png b/graphics/event_objects/pics/people/girl_3.png Binary files differnew file mode 100755 index 000000000..7e329f628 --- /dev/null +++ b/graphics/event_objects/pics/people/girl_3.png diff --git a/graphics/event_objects/pics/people/girl_3/0.png b/graphics/event_objects/pics/people/girl_3/0.png Binary files differdeleted file mode 100644 index 5927a264a..000000000 --- a/graphics/event_objects/pics/people/girl_3/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_3/1.png b/graphics/event_objects/pics/people/girl_3/1.png Binary files differdeleted file mode 100644 index 6f3f32180..000000000 --- a/graphics/event_objects/pics/people/girl_3/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_3/2.png b/graphics/event_objects/pics/people/girl_3/2.png Binary files differdeleted file mode 100644 index 1a01b0031..000000000 --- a/graphics/event_objects/pics/people/girl_3/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_3/3.png b/graphics/event_objects/pics/people/girl_3/3.png Binary files differdeleted file mode 100644 index 2fb3db97b..000000000 --- a/graphics/event_objects/pics/people/girl_3/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_3/4.png b/graphics/event_objects/pics/people/girl_3/4.png Binary files differdeleted file mode 100644 index 03287ab27..000000000 --- a/graphics/event_objects/pics/people/girl_3/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_3/5.png b/graphics/event_objects/pics/people/girl_3/5.png Binary files differdeleted file mode 100644 index c30ead499..000000000 --- a/graphics/event_objects/pics/people/girl_3/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_3/6.png b/graphics/event_objects/pics/people/girl_3/6.png Binary files differdeleted file mode 100644 index 10eb415ad..000000000 --- a/graphics/event_objects/pics/people/girl_3/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_3/7.png b/graphics/event_objects/pics/people/girl_3/7.png Binary files differdeleted file mode 100644 index 28fa0238b..000000000 --- a/graphics/event_objects/pics/people/girl_3/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/girl_3/8.png b/graphics/event_objects/pics/people/girl_3/8.png Binary files differdeleted file mode 100644 index 8dc1a2fbc..000000000 --- a/graphics/event_objects/pics/people/girl_3/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/glacia.png b/graphics/event_objects/pics/people/glacia.png Binary files differnew file mode 100755 index 000000000..fcf6dbde2 --- /dev/null +++ b/graphics/event_objects/pics/people/glacia.png diff --git a/graphics/event_objects/pics/people/glacia/0.png b/graphics/event_objects/pics/people/glacia/0.png Binary files differdeleted file mode 100644 index 4ee3c3b3e..000000000 --- a/graphics/event_objects/pics/people/glacia/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/glacia/1.png b/graphics/event_objects/pics/people/glacia/1.png Binary files differdeleted file mode 100644 index 866937df3..000000000 --- a/graphics/event_objects/pics/people/glacia/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/glacia/2.png b/graphics/event_objects/pics/people/glacia/2.png Binary files differdeleted file mode 100644 index 5d66ef03e..000000000 --- a/graphics/event_objects/pics/people/glacia/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hex_maniac.png b/graphics/event_objects/pics/people/hex_maniac.png Binary files differnew file mode 100755 index 000000000..b0e3b22a0 --- /dev/null +++ b/graphics/event_objects/pics/people/hex_maniac.png diff --git a/graphics/event_objects/pics/people/hex_maniac/0.png b/graphics/event_objects/pics/people/hex_maniac/0.png Binary files differdeleted file mode 100644 index da93178a0..000000000 --- a/graphics/event_objects/pics/people/hex_maniac/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hex_maniac/1.png b/graphics/event_objects/pics/people/hex_maniac/1.png Binary files differdeleted file mode 100644 index 7925ac221..000000000 --- a/graphics/event_objects/pics/people/hex_maniac/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hex_maniac/2.png b/graphics/event_objects/pics/people/hex_maniac/2.png Binary files differdeleted file mode 100644 index 24598f0b0..000000000 --- a/graphics/event_objects/pics/people/hex_maniac/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hex_maniac/3.png b/graphics/event_objects/pics/people/hex_maniac/3.png Binary files differdeleted file mode 100644 index c3544aac1..000000000 --- a/graphics/event_objects/pics/people/hex_maniac/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hex_maniac/4.png b/graphics/event_objects/pics/people/hex_maniac/4.png Binary files differdeleted file mode 100644 index f07338c7a..000000000 --- a/graphics/event_objects/pics/people/hex_maniac/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hex_maniac/5.png b/graphics/event_objects/pics/people/hex_maniac/5.png Binary files differdeleted file mode 100644 index 925d6ccf9..000000000 --- a/graphics/event_objects/pics/people/hex_maniac/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hex_maniac/6.png b/graphics/event_objects/pics/people/hex_maniac/6.png Binary files differdeleted file mode 100644 index a41a7a72b..000000000 --- a/graphics/event_objects/pics/people/hex_maniac/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hex_maniac/7.png b/graphics/event_objects/pics/people/hex_maniac/7.png Binary files differdeleted file mode 100644 index 06bfa10d0..000000000 --- a/graphics/event_objects/pics/people/hex_maniac/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hex_maniac/8.png b/graphics/event_objects/pics/people/hex_maniac/8.png Binary files differdeleted file mode 100644 index 1c3a57faf..000000000 --- a/graphics/event_objects/pics/people/hex_maniac/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hiker.png b/graphics/event_objects/pics/people/hiker.png Binary files differnew file mode 100755 index 000000000..8c7b026a1 --- /dev/null +++ b/graphics/event_objects/pics/people/hiker.png diff --git a/graphics/event_objects/pics/people/hiker/0.png b/graphics/event_objects/pics/people/hiker/0.png Binary files differdeleted file mode 100644 index 715cdc4f9..000000000 --- a/graphics/event_objects/pics/people/hiker/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hiker/1.png b/graphics/event_objects/pics/people/hiker/1.png Binary files differdeleted file mode 100644 index 7af8fb736..000000000 --- a/graphics/event_objects/pics/people/hiker/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hiker/2.png b/graphics/event_objects/pics/people/hiker/2.png Binary files differdeleted file mode 100644 index 2b74ec3db..000000000 --- a/graphics/event_objects/pics/people/hiker/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hiker/3.png b/graphics/event_objects/pics/people/hiker/3.png Binary files differdeleted file mode 100644 index a7e0d91d5..000000000 --- a/graphics/event_objects/pics/people/hiker/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hiker/4.png b/graphics/event_objects/pics/people/hiker/4.png Binary files differdeleted file mode 100644 index d0bb9fa9d..000000000 --- a/graphics/event_objects/pics/people/hiker/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hiker/5.png b/graphics/event_objects/pics/people/hiker/5.png Binary files differdeleted file mode 100644 index b405de51b..000000000 --- a/graphics/event_objects/pics/people/hiker/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hiker/6.png b/graphics/event_objects/pics/people/hiker/6.png Binary files differdeleted file mode 100644 index 7271f7d4d..000000000 --- a/graphics/event_objects/pics/people/hiker/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hiker/7.png b/graphics/event_objects/pics/people/hiker/7.png Binary files differdeleted file mode 100644 index 36db0a370..000000000 --- a/graphics/event_objects/pics/people/hiker/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hiker/8.png b/graphics/event_objects/pics/people/hiker/8.png Binary files differdeleted file mode 100644 index dbcfd8c41..000000000 --- a/graphics/event_objects/pics/people/hiker/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman.png b/graphics/event_objects/pics/people/hot_springs_old_woman.png Binary files differnew file mode 100755 index 000000000..874ba8a45 --- /dev/null +++ b/graphics/event_objects/pics/people/hot_springs_old_woman.png diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/0.png b/graphics/event_objects/pics/people/hot_springs_old_woman/0.png Binary files differdeleted file mode 100644 index abb6cca16..000000000 --- a/graphics/event_objects/pics/people/hot_springs_old_woman/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/1.png b/graphics/event_objects/pics/people/hot_springs_old_woman/1.png Binary files differdeleted file mode 100644 index e45ab1ac4..000000000 --- a/graphics/event_objects/pics/people/hot_springs_old_woman/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/2.png b/graphics/event_objects/pics/people/hot_springs_old_woman/2.png Binary files differdeleted file mode 100644 index f5b9364b1..000000000 --- a/graphics/event_objects/pics/people/hot_springs_old_woman/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/3.png b/graphics/event_objects/pics/people/hot_springs_old_woman/3.png Binary files differdeleted file mode 100644 index 8bd8dc9fb..000000000 --- a/graphics/event_objects/pics/people/hot_springs_old_woman/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/4.png b/graphics/event_objects/pics/people/hot_springs_old_woman/4.png Binary files differdeleted file mode 100644 index 8bd8dc9fb..000000000 --- a/graphics/event_objects/pics/people/hot_springs_old_woman/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/5.png b/graphics/event_objects/pics/people/hot_springs_old_woman/5.png Binary files differdeleted file mode 100644 index ee043baeb..000000000 --- a/graphics/event_objects/pics/people/hot_springs_old_woman/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/6.png b/graphics/event_objects/pics/people/hot_springs_old_woman/6.png Binary files differdeleted file mode 100644 index ee043baeb..000000000 --- a/graphics/event_objects/pics/people/hot_springs_old_woman/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/7.png b/graphics/event_objects/pics/people/hot_springs_old_woman/7.png Binary files differdeleted file mode 100644 index f1498d71f..000000000 --- a/graphics/event_objects/pics/people/hot_springs_old_woman/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/8.png b/graphics/event_objects/pics/people/hot_springs_old_woman/8.png Binary files differdeleted file mode 100644 index f1498d71f..000000000 --- a/graphics/event_objects/pics/people/hot_springs_old_woman/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/lass.png b/graphics/event_objects/pics/people/lass.png Binary files differnew file mode 100755 index 000000000..9e27f70dd --- /dev/null +++ b/graphics/event_objects/pics/people/lass.png diff --git a/graphics/event_objects/pics/people/lass/0.png b/graphics/event_objects/pics/people/lass/0.png Binary files differdeleted file mode 100644 index 602f557c7..000000000 --- a/graphics/event_objects/pics/people/lass/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/lass/1.png b/graphics/event_objects/pics/people/lass/1.png Binary files differdeleted file mode 100644 index c11380b4a..000000000 --- a/graphics/event_objects/pics/people/lass/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/lass/2.png b/graphics/event_objects/pics/people/lass/2.png Binary files differdeleted file mode 100644 index 887cc834b..000000000 --- a/graphics/event_objects/pics/people/lass/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/lass/3.png b/graphics/event_objects/pics/people/lass/3.png Binary files differdeleted file mode 100644 index 510d0812c..000000000 --- a/graphics/event_objects/pics/people/lass/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/lass/4.png b/graphics/event_objects/pics/people/lass/4.png Binary files differdeleted file mode 100644 index 8929a426b..000000000 --- a/graphics/event_objects/pics/people/lass/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/lass/5.png b/graphics/event_objects/pics/people/lass/5.png Binary files differdeleted file mode 100644 index da422040c..000000000 --- a/graphics/event_objects/pics/people/lass/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/lass/6.png b/graphics/event_objects/pics/people/lass/6.png Binary files differdeleted file mode 100644 index c9235c9aa..000000000 --- a/graphics/event_objects/pics/people/lass/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/lass/7.png b/graphics/event_objects/pics/people/lass/7.png Binary files differdeleted file mode 100644 index 1adfcd0ba..000000000 --- a/graphics/event_objects/pics/people/lass/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/lass/8.png b/graphics/event_objects/pics/people/lass/8.png Binary files differdeleted file mode 100644 index 392d65f93..000000000 --- a/graphics/event_objects/pics/people/lass/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_1.png b/graphics/event_objects/pics/people/little_boy_1.png Binary files differnew file mode 100755 index 000000000..ce4f3e92c --- /dev/null +++ b/graphics/event_objects/pics/people/little_boy_1.png diff --git a/graphics/event_objects/pics/people/little_boy_1/0.png b/graphics/event_objects/pics/people/little_boy_1/0.png Binary files differdeleted file mode 100644 index b96c644fb..000000000 --- a/graphics/event_objects/pics/people/little_boy_1/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_1/1.png b/graphics/event_objects/pics/people/little_boy_1/1.png Binary files differdeleted file mode 100644 index 01f7f13d0..000000000 --- a/graphics/event_objects/pics/people/little_boy_1/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_1/2.png b/graphics/event_objects/pics/people/little_boy_1/2.png Binary files differdeleted file mode 100644 index e080899f6..000000000 --- a/graphics/event_objects/pics/people/little_boy_1/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_1/3.png b/graphics/event_objects/pics/people/little_boy_1/3.png Binary files differdeleted file mode 100644 index 08dbedbff..000000000 --- a/graphics/event_objects/pics/people/little_boy_1/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_1/4.png b/graphics/event_objects/pics/people/little_boy_1/4.png Binary files differdeleted file mode 100644 index ed0f1c791..000000000 --- a/graphics/event_objects/pics/people/little_boy_1/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_1/5.png b/graphics/event_objects/pics/people/little_boy_1/5.png Binary files differdeleted file mode 100644 index 761263392..000000000 --- a/graphics/event_objects/pics/people/little_boy_1/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_1/6.png b/graphics/event_objects/pics/people/little_boy_1/6.png Binary files differdeleted file mode 100644 index f8d72807f..000000000 --- a/graphics/event_objects/pics/people/little_boy_1/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_1/7.png b/graphics/event_objects/pics/people/little_boy_1/7.png Binary files differdeleted file mode 100644 index 0f7c16ebb..000000000 --- a/graphics/event_objects/pics/people/little_boy_1/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_1/8.png b/graphics/event_objects/pics/people/little_boy_1/8.png Binary files differdeleted file mode 100644 index b3df6d38a..000000000 --- a/graphics/event_objects/pics/people/little_boy_1/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_2.png b/graphics/event_objects/pics/people/little_boy_2.png Binary files differnew file mode 100755 index 000000000..1b62a36d0 --- /dev/null +++ b/graphics/event_objects/pics/people/little_boy_2.png diff --git a/graphics/event_objects/pics/people/little_boy_2/0.png b/graphics/event_objects/pics/people/little_boy_2/0.png Binary files differdeleted file mode 100644 index 1cb5472fc..000000000 --- a/graphics/event_objects/pics/people/little_boy_2/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_2/1.png b/graphics/event_objects/pics/people/little_boy_2/1.png Binary files differdeleted file mode 100644 index 235933d0a..000000000 --- a/graphics/event_objects/pics/people/little_boy_2/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_2/2.png b/graphics/event_objects/pics/people/little_boy_2/2.png Binary files differdeleted file mode 100644 index ced688956..000000000 --- a/graphics/event_objects/pics/people/little_boy_2/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_2/3.png b/graphics/event_objects/pics/people/little_boy_2/3.png Binary files differdeleted file mode 100644 index 8c743b2a3..000000000 --- a/graphics/event_objects/pics/people/little_boy_2/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_2/4.png b/graphics/event_objects/pics/people/little_boy_2/4.png Binary files differdeleted file mode 100644 index 7af7cdbaa..000000000 --- a/graphics/event_objects/pics/people/little_boy_2/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_2/5.png b/graphics/event_objects/pics/people/little_boy_2/5.png Binary files differdeleted file mode 100644 index 1db5b13ba..000000000 --- a/graphics/event_objects/pics/people/little_boy_2/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_2/6.png b/graphics/event_objects/pics/people/little_boy_2/6.png Binary files differdeleted file mode 100644 index 00633ff85..000000000 --- a/graphics/event_objects/pics/people/little_boy_2/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_2/7.png b/graphics/event_objects/pics/people/little_boy_2/7.png Binary files differdeleted file mode 100644 index ac2697065..000000000 --- a/graphics/event_objects/pics/people/little_boy_2/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_2/8.png b/graphics/event_objects/pics/people/little_boy_2/8.png Binary files differdeleted file mode 100644 index fd02ff7a6..000000000 --- a/graphics/event_objects/pics/people/little_boy_2/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_3.png b/graphics/event_objects/pics/people/little_boy_3.png Binary files differnew file mode 100755 index 000000000..41bc20afb --- /dev/null +++ b/graphics/event_objects/pics/people/little_boy_3.png diff --git a/graphics/event_objects/pics/people/little_boy_3/0.png b/graphics/event_objects/pics/people/little_boy_3/0.png Binary files differdeleted file mode 100644 index fb4365f0e..000000000 --- a/graphics/event_objects/pics/people/little_boy_3/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_3/1.png b/graphics/event_objects/pics/people/little_boy_3/1.png Binary files differdeleted file mode 100644 index f681154dd..000000000 --- a/graphics/event_objects/pics/people/little_boy_3/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_3/2.png b/graphics/event_objects/pics/people/little_boy_3/2.png Binary files differdeleted file mode 100644 index 20f838bb2..000000000 --- a/graphics/event_objects/pics/people/little_boy_3/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_3/3.png b/graphics/event_objects/pics/people/little_boy_3/3.png Binary files differdeleted file mode 100644 index 4a83b0c97..000000000 --- a/graphics/event_objects/pics/people/little_boy_3/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_3/4.png b/graphics/event_objects/pics/people/little_boy_3/4.png Binary files differdeleted file mode 100644 index b6573d454..000000000 --- a/graphics/event_objects/pics/people/little_boy_3/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_3/5.png b/graphics/event_objects/pics/people/little_boy_3/5.png Binary files differdeleted file mode 100644 index a1a9b08cf..000000000 --- a/graphics/event_objects/pics/people/little_boy_3/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_3/6.png b/graphics/event_objects/pics/people/little_boy_3/6.png Binary files differdeleted file mode 100644 index 8f34c74e4..000000000 --- a/graphics/event_objects/pics/people/little_boy_3/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_3/7.png b/graphics/event_objects/pics/people/little_boy_3/7.png Binary files differdeleted file mode 100644 index 7d8d2c23c..000000000 --- a/graphics/event_objects/pics/people/little_boy_3/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_boy_3/8.png b/graphics/event_objects/pics/people/little_boy_3/8.png Binary files differdeleted file mode 100644 index 4799db90c..000000000 --- a/graphics/event_objects/pics/people/little_boy_3/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_1.png b/graphics/event_objects/pics/people/little_girl_1.png Binary files differnew file mode 100755 index 000000000..5ce59ea1b --- /dev/null +++ b/graphics/event_objects/pics/people/little_girl_1.png diff --git a/graphics/event_objects/pics/people/little_girl_1/0.png b/graphics/event_objects/pics/people/little_girl_1/0.png Binary files differdeleted file mode 100644 index a4954285b..000000000 --- a/graphics/event_objects/pics/people/little_girl_1/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_1/1.png b/graphics/event_objects/pics/people/little_girl_1/1.png Binary files differdeleted file mode 100644 index 0c6b9d411..000000000 --- a/graphics/event_objects/pics/people/little_girl_1/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_1/2.png b/graphics/event_objects/pics/people/little_girl_1/2.png Binary files differdeleted file mode 100644 index 6e3b1e77d..000000000 --- a/graphics/event_objects/pics/people/little_girl_1/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_1/3.png b/graphics/event_objects/pics/people/little_girl_1/3.png Binary files differdeleted file mode 100644 index b680b277a..000000000 --- a/graphics/event_objects/pics/people/little_girl_1/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_1/4.png b/graphics/event_objects/pics/people/little_girl_1/4.png Binary files differdeleted file mode 100644 index 3211eecbb..000000000 --- a/graphics/event_objects/pics/people/little_girl_1/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_1/5.png b/graphics/event_objects/pics/people/little_girl_1/5.png Binary files differdeleted file mode 100644 index 182a1a416..000000000 --- a/graphics/event_objects/pics/people/little_girl_1/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_1/6.png b/graphics/event_objects/pics/people/little_girl_1/6.png Binary files differdeleted file mode 100644 index 1b0daa637..000000000 --- a/graphics/event_objects/pics/people/little_girl_1/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_1/7.png b/graphics/event_objects/pics/people/little_girl_1/7.png Binary files differdeleted file mode 100644 index f91406654..000000000 --- a/graphics/event_objects/pics/people/little_girl_1/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_1/8.png b/graphics/event_objects/pics/people/little_girl_1/8.png Binary files differdeleted file mode 100644 index 5c5bcbc2a..000000000 --- a/graphics/event_objects/pics/people/little_girl_1/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_2.png b/graphics/event_objects/pics/people/little_girl_2.png Binary files differnew file mode 100755 index 000000000..2540d84af --- /dev/null +++ b/graphics/event_objects/pics/people/little_girl_2.png diff --git a/graphics/event_objects/pics/people/little_girl_2/0.png b/graphics/event_objects/pics/people/little_girl_2/0.png Binary files differdeleted file mode 100644 index fadfdad57..000000000 --- a/graphics/event_objects/pics/people/little_girl_2/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_2/1.png b/graphics/event_objects/pics/people/little_girl_2/1.png Binary files differdeleted file mode 100644 index df2b66187..000000000 --- a/graphics/event_objects/pics/people/little_girl_2/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_2/2.png b/graphics/event_objects/pics/people/little_girl_2/2.png Binary files differdeleted file mode 100644 index ac49cae9f..000000000 --- a/graphics/event_objects/pics/people/little_girl_2/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_2/3.png b/graphics/event_objects/pics/people/little_girl_2/3.png Binary files differdeleted file mode 100644 index 869c4a1b3..000000000 --- a/graphics/event_objects/pics/people/little_girl_2/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_2/4.png b/graphics/event_objects/pics/people/little_girl_2/4.png Binary files differdeleted file mode 100644 index b92551f18..000000000 --- a/graphics/event_objects/pics/people/little_girl_2/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_2/5.png b/graphics/event_objects/pics/people/little_girl_2/5.png Binary files differdeleted file mode 100644 index 778a644f2..000000000 --- a/graphics/event_objects/pics/people/little_girl_2/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_2/6.png b/graphics/event_objects/pics/people/little_girl_2/6.png Binary files differdeleted file mode 100644 index 1ca242176..000000000 --- a/graphics/event_objects/pics/people/little_girl_2/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_2/7.png b/graphics/event_objects/pics/people/little_girl_2/7.png Binary files differdeleted file mode 100644 index d71a37cec..000000000 --- a/graphics/event_objects/pics/people/little_girl_2/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/little_girl_2/8.png b/graphics/event_objects/pics/people/little_girl_2/8.png Binary files differdeleted file mode 100644 index dd76b53e0..000000000 --- a/graphics/event_objects/pics/people/little_girl_2/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/liza.png b/graphics/event_objects/pics/people/liza.png Binary files differnew file mode 100755 index 000000000..6a1eec536 --- /dev/null +++ b/graphics/event_objects/pics/people/liza.png diff --git a/graphics/event_objects/pics/people/liza/0.png b/graphics/event_objects/pics/people/liza/0.png Binary files differdeleted file mode 100644 index e85ea4c5b..000000000 --- a/graphics/event_objects/pics/people/liza/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/liza/1.png b/graphics/event_objects/pics/people/liza/1.png Binary files differdeleted file mode 100644 index dd7c4b2a6..000000000 --- a/graphics/event_objects/pics/people/liza/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/liza/2.png b/graphics/event_objects/pics/people/liza/2.png Binary files differdeleted file mode 100644 index 96b4628fa..000000000 --- a/graphics/event_objects/pics/people/liza/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_f.png b/graphics/event_objects/pics/people/magma_member_f.png Binary files differnew file mode 100755 index 000000000..0041c83aa --- /dev/null +++ b/graphics/event_objects/pics/people/magma_member_f.png diff --git a/graphics/event_objects/pics/people/magma_member_f/0.png b/graphics/event_objects/pics/people/magma_member_f/0.png Binary files differdeleted file mode 100644 index 2fe38a59e..000000000 --- a/graphics/event_objects/pics/people/magma_member_f/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_f/1.png b/graphics/event_objects/pics/people/magma_member_f/1.png Binary files differdeleted file mode 100644 index ee9260cfe..000000000 --- a/graphics/event_objects/pics/people/magma_member_f/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_f/2.png b/graphics/event_objects/pics/people/magma_member_f/2.png Binary files differdeleted file mode 100644 index 13e1d048a..000000000 --- a/graphics/event_objects/pics/people/magma_member_f/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_f/3.png b/graphics/event_objects/pics/people/magma_member_f/3.png Binary files differdeleted file mode 100644 index d18d04f62..000000000 --- a/graphics/event_objects/pics/people/magma_member_f/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_f/4.png b/graphics/event_objects/pics/people/magma_member_f/4.png Binary files differdeleted file mode 100644 index 27919c026..000000000 --- a/graphics/event_objects/pics/people/magma_member_f/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_f/5.png b/graphics/event_objects/pics/people/magma_member_f/5.png Binary files differdeleted file mode 100644 index 62ae28188..000000000 --- a/graphics/event_objects/pics/people/magma_member_f/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_f/6.png b/graphics/event_objects/pics/people/magma_member_f/6.png Binary files differdeleted file mode 100644 index 660b48874..000000000 --- a/graphics/event_objects/pics/people/magma_member_f/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_f/7.png b/graphics/event_objects/pics/people/magma_member_f/7.png Binary files differdeleted file mode 100644 index f641b9b4c..000000000 --- a/graphics/event_objects/pics/people/magma_member_f/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_f/8.png b/graphics/event_objects/pics/people/magma_member_f/8.png Binary files differdeleted file mode 100644 index fb149e752..000000000 --- a/graphics/event_objects/pics/people/magma_member_f/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_m.png b/graphics/event_objects/pics/people/magma_member_m.png Binary files differnew file mode 100755 index 000000000..f4c9e1fcf --- /dev/null +++ b/graphics/event_objects/pics/people/magma_member_m.png diff --git a/graphics/event_objects/pics/people/magma_member_m/0.png b/graphics/event_objects/pics/people/magma_member_m/0.png Binary files differdeleted file mode 100644 index 99cae3300..000000000 --- a/graphics/event_objects/pics/people/magma_member_m/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_m/1.png b/graphics/event_objects/pics/people/magma_member_m/1.png Binary files differdeleted file mode 100644 index 95e1c2f54..000000000 --- a/graphics/event_objects/pics/people/magma_member_m/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_m/2.png b/graphics/event_objects/pics/people/magma_member_m/2.png Binary files differdeleted file mode 100644 index 48b8a3647..000000000 --- a/graphics/event_objects/pics/people/magma_member_m/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_m/3.png b/graphics/event_objects/pics/people/magma_member_m/3.png Binary files differdeleted file mode 100644 index ffa6f9b05..000000000 --- a/graphics/event_objects/pics/people/magma_member_m/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_m/4.png b/graphics/event_objects/pics/people/magma_member_m/4.png Binary files differdeleted file mode 100644 index 16b756d19..000000000 --- a/graphics/event_objects/pics/people/magma_member_m/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_m/5.png b/graphics/event_objects/pics/people/magma_member_m/5.png Binary files differdeleted file mode 100644 index 6702f5442..000000000 --- a/graphics/event_objects/pics/people/magma_member_m/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_m/6.png b/graphics/event_objects/pics/people/magma_member_m/6.png Binary files differdeleted file mode 100644 index 4d344f8a9..000000000 --- a/graphics/event_objects/pics/people/magma_member_m/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_m/7.png b/graphics/event_objects/pics/people/magma_member_m/7.png Binary files differdeleted file mode 100644 index 2637b84ea..000000000 --- a/graphics/event_objects/pics/people/magma_member_m/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/magma_member_m/8.png b/graphics/event_objects/pics/people/magma_member_m/8.png Binary files differdeleted file mode 100644 index b036d898b..000000000 --- a/graphics/event_objects/pics/people/magma_member_m/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_1.png b/graphics/event_objects/pics/people/man_1.png Binary files differnew file mode 100755 index 000000000..32c3c643d --- /dev/null +++ b/graphics/event_objects/pics/people/man_1.png diff --git a/graphics/event_objects/pics/people/man_1/0.png b/graphics/event_objects/pics/people/man_1/0.png Binary files differdeleted file mode 100644 index 28e2f2b27..000000000 --- a/graphics/event_objects/pics/people/man_1/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_1/1.png b/graphics/event_objects/pics/people/man_1/1.png Binary files differdeleted file mode 100644 index 0fc4824a3..000000000 --- a/graphics/event_objects/pics/people/man_1/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_1/2.png b/graphics/event_objects/pics/people/man_1/2.png Binary files differdeleted file mode 100644 index ea35dbd1a..000000000 --- a/graphics/event_objects/pics/people/man_1/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_1/3.png b/graphics/event_objects/pics/people/man_1/3.png Binary files differdeleted file mode 100644 index d5c95f938..000000000 --- a/graphics/event_objects/pics/people/man_1/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_1/4.png b/graphics/event_objects/pics/people/man_1/4.png Binary files differdeleted file mode 100644 index 5903808ed..000000000 --- a/graphics/event_objects/pics/people/man_1/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_1/5.png b/graphics/event_objects/pics/people/man_1/5.png Binary files differdeleted file mode 100644 index 5923e998d..000000000 --- a/graphics/event_objects/pics/people/man_1/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_1/6.png b/graphics/event_objects/pics/people/man_1/6.png Binary files differdeleted file mode 100644 index 34f2c1d59..000000000 --- a/graphics/event_objects/pics/people/man_1/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_1/7.png b/graphics/event_objects/pics/people/man_1/7.png Binary files differdeleted file mode 100644 index 9a7d59234..000000000 --- a/graphics/event_objects/pics/people/man_1/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_1/8.png b/graphics/event_objects/pics/people/man_1/8.png Binary files differdeleted file mode 100644 index 191bfbf85..000000000 --- a/graphics/event_objects/pics/people/man_1/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_2.png b/graphics/event_objects/pics/people/man_2.png Binary files differnew file mode 100755 index 000000000..5bf3f1405 --- /dev/null +++ b/graphics/event_objects/pics/people/man_2.png diff --git a/graphics/event_objects/pics/people/man_2/0.png b/graphics/event_objects/pics/people/man_2/0.png Binary files differdeleted file mode 100644 index d8ef35173..000000000 --- a/graphics/event_objects/pics/people/man_2/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_2/1.png b/graphics/event_objects/pics/people/man_2/1.png Binary files differdeleted file mode 100644 index 63122436d..000000000 --- a/graphics/event_objects/pics/people/man_2/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_2/2.png b/graphics/event_objects/pics/people/man_2/2.png Binary files differdeleted file mode 100644 index 16471c084..000000000 --- a/graphics/event_objects/pics/people/man_2/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_2/3.png b/graphics/event_objects/pics/people/man_2/3.png Binary files differdeleted file mode 100644 index 9b11950ac..000000000 --- a/graphics/event_objects/pics/people/man_2/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_2/4.png b/graphics/event_objects/pics/people/man_2/4.png Binary files differdeleted file mode 100644 index 0fec0c524..000000000 --- a/graphics/event_objects/pics/people/man_2/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_2/5.png b/graphics/event_objects/pics/people/man_2/5.png Binary files differdeleted file mode 100644 index 6365daab3..000000000 --- a/graphics/event_objects/pics/people/man_2/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_2/6.png b/graphics/event_objects/pics/people/man_2/6.png Binary files differdeleted file mode 100644 index f3d2db78a..000000000 --- a/graphics/event_objects/pics/people/man_2/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_2/7.png b/graphics/event_objects/pics/people/man_2/7.png Binary files differdeleted file mode 100644 index 710afb6ab..000000000 --- a/graphics/event_objects/pics/people/man_2/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_2/8.png b/graphics/event_objects/pics/people/man_2/8.png Binary files differdeleted file mode 100644 index 3deb37967..000000000 --- a/graphics/event_objects/pics/people/man_2/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_3.png b/graphics/event_objects/pics/people/man_3.png Binary files differnew file mode 100755 index 000000000..a41a1ee9b --- /dev/null +++ b/graphics/event_objects/pics/people/man_3.png diff --git a/graphics/event_objects/pics/people/man_3/0.png b/graphics/event_objects/pics/people/man_3/0.png Binary files differdeleted file mode 100644 index 073e015f7..000000000 --- a/graphics/event_objects/pics/people/man_3/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_3/1.png b/graphics/event_objects/pics/people/man_3/1.png Binary files differdeleted file mode 100644 index c0762c7ff..000000000 --- a/graphics/event_objects/pics/people/man_3/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_3/2.png b/graphics/event_objects/pics/people/man_3/2.png Binary files differdeleted file mode 100644 index 21608c48a..000000000 --- a/graphics/event_objects/pics/people/man_3/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_3/3.png b/graphics/event_objects/pics/people/man_3/3.png Binary files differdeleted file mode 100644 index 85b6765b0..000000000 --- a/graphics/event_objects/pics/people/man_3/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_3/4.png b/graphics/event_objects/pics/people/man_3/4.png Binary files differdeleted file mode 100644 index e47dbe0fe..000000000 --- a/graphics/event_objects/pics/people/man_3/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_3/5.png b/graphics/event_objects/pics/people/man_3/5.png Binary files differdeleted file mode 100644 index 9f30a6dad..000000000 --- a/graphics/event_objects/pics/people/man_3/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_3/6.png b/graphics/event_objects/pics/people/man_3/6.png Binary files differdeleted file mode 100644 index 3f6144f1a..000000000 --- a/graphics/event_objects/pics/people/man_3/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_3/7.png b/graphics/event_objects/pics/people/man_3/7.png Binary files differdeleted file mode 100644 index e70347dce..000000000 --- a/graphics/event_objects/pics/people/man_3/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_3/8.png b/graphics/event_objects/pics/people/man_3/8.png Binary files differdeleted file mode 100644 index 274a02280..000000000 --- a/graphics/event_objects/pics/people/man_3/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_4.png b/graphics/event_objects/pics/people/man_4.png Binary files differnew file mode 100755 index 000000000..05a87d4dd --- /dev/null +++ b/graphics/event_objects/pics/people/man_4.png diff --git a/graphics/event_objects/pics/people/man_4/0.png b/graphics/event_objects/pics/people/man_4/0.png Binary files differdeleted file mode 100644 index 0297b592c..000000000 --- a/graphics/event_objects/pics/people/man_4/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_4/1.png b/graphics/event_objects/pics/people/man_4/1.png Binary files differdeleted file mode 100644 index d73e6ed5c..000000000 --- a/graphics/event_objects/pics/people/man_4/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_4/2.png b/graphics/event_objects/pics/people/man_4/2.png Binary files differdeleted file mode 100644 index 6cd7f5798..000000000 --- a/graphics/event_objects/pics/people/man_4/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_4/3.png b/graphics/event_objects/pics/people/man_4/3.png Binary files differdeleted file mode 100644 index 2486efd7f..000000000 --- a/graphics/event_objects/pics/people/man_4/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_4/4.png b/graphics/event_objects/pics/people/man_4/4.png Binary files differdeleted file mode 100644 index 732ff9c8d..000000000 --- a/graphics/event_objects/pics/people/man_4/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_4/5.png b/graphics/event_objects/pics/people/man_4/5.png Binary files differdeleted file mode 100644 index 7e20d5af9..000000000 --- a/graphics/event_objects/pics/people/man_4/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_4/6.png b/graphics/event_objects/pics/people/man_4/6.png Binary files differdeleted file mode 100644 index 3d4ae58f0..000000000 --- a/graphics/event_objects/pics/people/man_4/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_4/7.png b/graphics/event_objects/pics/people/man_4/7.png Binary files differdeleted file mode 100644 index 12a9d1fa8..000000000 --- a/graphics/event_objects/pics/people/man_4/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_4/8.png b/graphics/event_objects/pics/people/man_4/8.png Binary files differdeleted file mode 100644 index 43bea13ce..000000000 --- a/graphics/event_objects/pics/people/man_4/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_5.png b/graphics/event_objects/pics/people/man_5.png Binary files differnew file mode 100755 index 000000000..234d67924 --- /dev/null +++ b/graphics/event_objects/pics/people/man_5.png diff --git a/graphics/event_objects/pics/people/man_5/0.png b/graphics/event_objects/pics/people/man_5/0.png Binary files differdeleted file mode 100644 index f1da52790..000000000 --- a/graphics/event_objects/pics/people/man_5/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_5/1.png b/graphics/event_objects/pics/people/man_5/1.png Binary files differdeleted file mode 100644 index 80dde6ec6..000000000 --- a/graphics/event_objects/pics/people/man_5/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_5/2.png b/graphics/event_objects/pics/people/man_5/2.png Binary files differdeleted file mode 100644 index 95ee60f02..000000000 --- a/graphics/event_objects/pics/people/man_5/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_5/3.png b/graphics/event_objects/pics/people/man_5/3.png Binary files differdeleted file mode 100644 index 52d4e65f0..000000000 --- a/graphics/event_objects/pics/people/man_5/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_5/4.png b/graphics/event_objects/pics/people/man_5/4.png Binary files differdeleted file mode 100644 index 23e440b88..000000000 --- a/graphics/event_objects/pics/people/man_5/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_5/5.png b/graphics/event_objects/pics/people/man_5/5.png Binary files differdeleted file mode 100644 index c587b3762..000000000 --- a/graphics/event_objects/pics/people/man_5/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_5/6.png b/graphics/event_objects/pics/people/man_5/6.png Binary files differdeleted file mode 100644 index 7ee45b6db..000000000 --- a/graphics/event_objects/pics/people/man_5/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_5/7.png b/graphics/event_objects/pics/people/man_5/7.png Binary files differdeleted file mode 100644 index 24a578a34..000000000 --- a/graphics/event_objects/pics/people/man_5/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_5/8.png b/graphics/event_objects/pics/people/man_5/8.png Binary files differdeleted file mode 100644 index 6040f6f4d..000000000 --- a/graphics/event_objects/pics/people/man_5/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_6.png b/graphics/event_objects/pics/people/man_6.png Binary files differnew file mode 100755 index 000000000..f86aff0e4 --- /dev/null +++ b/graphics/event_objects/pics/people/man_6.png diff --git a/graphics/event_objects/pics/people/man_6/0.png b/graphics/event_objects/pics/people/man_6/0.png Binary files differdeleted file mode 100644 index ddcd545aa..000000000 --- a/graphics/event_objects/pics/people/man_6/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_6/1.png b/graphics/event_objects/pics/people/man_6/1.png Binary files differdeleted file mode 100644 index 0d7007e10..000000000 --- a/graphics/event_objects/pics/people/man_6/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_6/2.png b/graphics/event_objects/pics/people/man_6/2.png Binary files differdeleted file mode 100644 index 4daabc15d..000000000 --- a/graphics/event_objects/pics/people/man_6/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_6/3.png b/graphics/event_objects/pics/people/man_6/3.png Binary files differdeleted file mode 100644 index 0373f371d..000000000 --- a/graphics/event_objects/pics/people/man_6/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_6/4.png b/graphics/event_objects/pics/people/man_6/4.png Binary files differdeleted file mode 100644 index b0d8ee814..000000000 --- a/graphics/event_objects/pics/people/man_6/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_6/5.png b/graphics/event_objects/pics/people/man_6/5.png Binary files differdeleted file mode 100644 index 3f95859a1..000000000 --- a/graphics/event_objects/pics/people/man_6/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_6/6.png b/graphics/event_objects/pics/people/man_6/6.png Binary files differdeleted file mode 100644 index 5a89dfc33..000000000 --- a/graphics/event_objects/pics/people/man_6/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_6/7.png b/graphics/event_objects/pics/people/man_6/7.png Binary files differdeleted file mode 100644 index 6c2e07884..000000000 --- a/graphics/event_objects/pics/people/man_6/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_6/8.png b/graphics/event_objects/pics/people/man_6/8.png Binary files differdeleted file mode 100644 index 3db124eab..000000000 --- a/graphics/event_objects/pics/people/man_6/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_7.png b/graphics/event_objects/pics/people/man_7.png Binary files differnew file mode 100755 index 000000000..3da80a760 --- /dev/null +++ b/graphics/event_objects/pics/people/man_7.png diff --git a/graphics/event_objects/pics/people/man_7/0.png b/graphics/event_objects/pics/people/man_7/0.png Binary files differdeleted file mode 100644 index 5012da446..000000000 --- a/graphics/event_objects/pics/people/man_7/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_7/1.png b/graphics/event_objects/pics/people/man_7/1.png Binary files differdeleted file mode 100644 index c44eb21bd..000000000 --- a/graphics/event_objects/pics/people/man_7/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_7/2.png b/graphics/event_objects/pics/people/man_7/2.png Binary files differdeleted file mode 100644 index a9a654e80..000000000 --- a/graphics/event_objects/pics/people/man_7/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_7/3.png b/graphics/event_objects/pics/people/man_7/3.png Binary files differdeleted file mode 100644 index f71dda552..000000000 --- a/graphics/event_objects/pics/people/man_7/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_7/4.png b/graphics/event_objects/pics/people/man_7/4.png Binary files differdeleted file mode 100644 index b2038c37e..000000000 --- a/graphics/event_objects/pics/people/man_7/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_7/5.png b/graphics/event_objects/pics/people/man_7/5.png Binary files differdeleted file mode 100644 index 286eba97f..000000000 --- a/graphics/event_objects/pics/people/man_7/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_7/6.png b/graphics/event_objects/pics/people/man_7/6.png Binary files differdeleted file mode 100644 index 5d2549964..000000000 --- a/graphics/event_objects/pics/people/man_7/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_7/7.png b/graphics/event_objects/pics/people/man_7/7.png Binary files differdeleted file mode 100644 index d93ade7b8..000000000 --- a/graphics/event_objects/pics/people/man_7/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/man_7/8.png b/graphics/event_objects/pics/people/man_7/8.png Binary files differdeleted file mode 100644 index 84a62fe04..000000000 --- a/graphics/event_objects/pics/people/man_7/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maniac.png b/graphics/event_objects/pics/people/maniac.png Binary files differnew file mode 100755 index 000000000..29829c309 --- /dev/null +++ b/graphics/event_objects/pics/people/maniac.png diff --git a/graphics/event_objects/pics/people/maniac/0.png b/graphics/event_objects/pics/people/maniac/0.png Binary files differdeleted file mode 100644 index 01f066910..000000000 --- a/graphics/event_objects/pics/people/maniac/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maniac/1.png b/graphics/event_objects/pics/people/maniac/1.png Binary files differdeleted file mode 100644 index fc8efb1d4..000000000 --- a/graphics/event_objects/pics/people/maniac/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maniac/2.png b/graphics/event_objects/pics/people/maniac/2.png Binary files differdeleted file mode 100644 index ea211288f..000000000 --- a/graphics/event_objects/pics/people/maniac/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maniac/3.png b/graphics/event_objects/pics/people/maniac/3.png Binary files differdeleted file mode 100644 index 7a0ab0ba1..000000000 --- a/graphics/event_objects/pics/people/maniac/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maniac/4.png b/graphics/event_objects/pics/people/maniac/4.png Binary files differdeleted file mode 100644 index 93083333d..000000000 --- a/graphics/event_objects/pics/people/maniac/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maniac/5.png b/graphics/event_objects/pics/people/maniac/5.png Binary files differdeleted file mode 100644 index ac18fea6e..000000000 --- a/graphics/event_objects/pics/people/maniac/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maniac/6.png b/graphics/event_objects/pics/people/maniac/6.png Binary files differdeleted file mode 100644 index d8db27038..000000000 --- a/graphics/event_objects/pics/people/maniac/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maniac/7.png b/graphics/event_objects/pics/people/maniac/7.png Binary files differdeleted file mode 100644 index 647c69838..000000000 --- a/graphics/event_objects/pics/people/maniac/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maniac/8.png b/graphics/event_objects/pics/people/maniac/8.png Binary files differdeleted file mode 100644 index 5d37c6d40..000000000 --- a/graphics/event_objects/pics/people/maniac/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mart_employee.png b/graphics/event_objects/pics/people/mart_employee.png Binary files differnew file mode 100755 index 000000000..43bdfef79 --- /dev/null +++ b/graphics/event_objects/pics/people/mart_employee.png diff --git a/graphics/event_objects/pics/people/mart_employee/0.png b/graphics/event_objects/pics/people/mart_employee/0.png Binary files differdeleted file mode 100644 index 4dfc880b7..000000000 --- a/graphics/event_objects/pics/people/mart_employee/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mart_employee/1.png b/graphics/event_objects/pics/people/mart_employee/1.png Binary files differdeleted file mode 100644 index 25320fff0..000000000 --- a/graphics/event_objects/pics/people/mart_employee/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mart_employee/2.png b/graphics/event_objects/pics/people/mart_employee/2.png Binary files differdeleted file mode 100644 index 31ad7d75b..000000000 --- a/graphics/event_objects/pics/people/mart_employee/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mart_employee/3.png b/graphics/event_objects/pics/people/mart_employee/3.png Binary files differdeleted file mode 100644 index 4e7e389d8..000000000 --- a/graphics/event_objects/pics/people/mart_employee/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mart_employee/4.png b/graphics/event_objects/pics/people/mart_employee/4.png Binary files differdeleted file mode 100644 index 4357a5946..000000000 --- a/graphics/event_objects/pics/people/mart_employee/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mart_employee/5.png b/graphics/event_objects/pics/people/mart_employee/5.png Binary files differdeleted file mode 100644 index 46ae73fd2..000000000 --- a/graphics/event_objects/pics/people/mart_employee/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mart_employee/6.png b/graphics/event_objects/pics/people/mart_employee/6.png Binary files differdeleted file mode 100644 index 9eb51a482..000000000 --- a/graphics/event_objects/pics/people/mart_employee/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mart_employee/7.png b/graphics/event_objects/pics/people/mart_employee/7.png Binary files differdeleted file mode 100644 index b3ffb8036..000000000 --- a/graphics/event_objects/pics/people/mart_employee/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mart_employee/8.png b/graphics/event_objects/pics/people/mart_employee/8.png Binary files differdeleted file mode 100644 index b2268286c..000000000 --- a/graphics/event_objects/pics/people/mart_employee/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_1.png b/graphics/event_objects/pics/people/mauville_old_man_1.png Binary files differnew file mode 100755 index 000000000..0950dc209 --- /dev/null +++ b/graphics/event_objects/pics/people/mauville_old_man_1.png diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/0.png b/graphics/event_objects/pics/people/mauville_old_man_1/0.png Binary files differdeleted file mode 100644 index 3e18501f2..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_1/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/1.png b/graphics/event_objects/pics/people/mauville_old_man_1/1.png Binary files differdeleted file mode 100644 index 323f17510..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_1/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/2.png b/graphics/event_objects/pics/people/mauville_old_man_1/2.png Binary files differdeleted file mode 100644 index 79fd38508..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_1/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/3.png b/graphics/event_objects/pics/people/mauville_old_man_1/3.png Binary files differdeleted file mode 100644 index adc86db63..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_1/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/4.png b/graphics/event_objects/pics/people/mauville_old_man_1/4.png Binary files differdeleted file mode 100644 index fc8eff4d9..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_1/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/5.png b/graphics/event_objects/pics/people/mauville_old_man_1/5.png Binary files differdeleted file mode 100644 index 38d073fd2..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_1/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/6.png b/graphics/event_objects/pics/people/mauville_old_man_1/6.png Binary files differdeleted file mode 100644 index 701059382..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_1/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/7.png b/graphics/event_objects/pics/people/mauville_old_man_1/7.png Binary files differdeleted file mode 100644 index 14cad5679..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_1/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/8.png b/graphics/event_objects/pics/people/mauville_old_man_1/8.png Binary files differdeleted file mode 100644 index 72522180b..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_1/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_2.png b/graphics/event_objects/pics/people/mauville_old_man_2.png Binary files differnew file mode 100755 index 000000000..cb1c47d62 --- /dev/null +++ b/graphics/event_objects/pics/people/mauville_old_man_2.png diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/0.png b/graphics/event_objects/pics/people/mauville_old_man_2/0.png Binary files differdeleted file mode 100644 index d913bcbdb..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_2/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/1.png b/graphics/event_objects/pics/people/mauville_old_man_2/1.png Binary files differdeleted file mode 100644 index f98c0ecde..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_2/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/2.png b/graphics/event_objects/pics/people/mauville_old_man_2/2.png Binary files differdeleted file mode 100644 index abe9050a0..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_2/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/3.png b/graphics/event_objects/pics/people/mauville_old_man_2/3.png Binary files differdeleted file mode 100644 index 4d71ce720..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_2/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/4.png b/graphics/event_objects/pics/people/mauville_old_man_2/4.png Binary files differdeleted file mode 100644 index 9e0330a61..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_2/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/5.png b/graphics/event_objects/pics/people/mauville_old_man_2/5.png Binary files differdeleted file mode 100644 index 92135f48a..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_2/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/6.png b/graphics/event_objects/pics/people/mauville_old_man_2/6.png Binary files differdeleted file mode 100644 index 3a328ba04..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_2/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/7.png b/graphics/event_objects/pics/people/mauville_old_man_2/7.png Binary files differdeleted file mode 100644 index ea1b4d95b..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_2/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/8.png b/graphics/event_objects/pics/people/mauville_old_man_2/8.png Binary files differdeleted file mode 100644 index ac7a5e12d..000000000 --- a/graphics/event_objects/pics/people/mauville_old_man_2/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maxie.png b/graphics/event_objects/pics/people/maxie.png Binary files differnew file mode 100755 index 000000000..cc8b180ed --- /dev/null +++ b/graphics/event_objects/pics/people/maxie.png diff --git a/graphics/event_objects/pics/people/maxie/0.png b/graphics/event_objects/pics/people/maxie/0.png Binary files differdeleted file mode 100644 index 21ca72fd2..000000000 --- a/graphics/event_objects/pics/people/maxie/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maxie/1.png b/graphics/event_objects/pics/people/maxie/1.png Binary files differdeleted file mode 100644 index d7347de17..000000000 --- a/graphics/event_objects/pics/people/maxie/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maxie/2.png b/graphics/event_objects/pics/people/maxie/2.png Binary files differdeleted file mode 100644 index f80bb07a5..000000000 --- a/graphics/event_objects/pics/people/maxie/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maxie/3.png b/graphics/event_objects/pics/people/maxie/3.png Binary files differdeleted file mode 100644 index 6cb101536..000000000 --- a/graphics/event_objects/pics/people/maxie/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maxie/4.png b/graphics/event_objects/pics/people/maxie/4.png Binary files differdeleted file mode 100644 index c513206a6..000000000 --- a/graphics/event_objects/pics/people/maxie/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maxie/5.png b/graphics/event_objects/pics/people/maxie/5.png Binary files differdeleted file mode 100644 index fd6a81dc5..000000000 --- a/graphics/event_objects/pics/people/maxie/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maxie/6.png b/graphics/event_objects/pics/people/maxie/6.png Binary files differdeleted file mode 100644 index ac1564204..000000000 --- a/graphics/event_objects/pics/people/maxie/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maxie/7.png b/graphics/event_objects/pics/people/maxie/7.png Binary files differdeleted file mode 100644 index adb1aa235..000000000 --- a/graphics/event_objects/pics/people/maxie/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/maxie/8.png b/graphics/event_objects/pics/people/maxie/8.png Binary files differdeleted file mode 100644 index 765803561..000000000 --- a/graphics/event_objects/pics/people/maxie/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike.png b/graphics/event_objects/pics/people/may/acro_bike.png Binary files differnew file mode 100755 index 000000000..2743624b1 --- /dev/null +++ b/graphics/event_objects/pics/people/may/acro_bike.png diff --git a/graphics/event_objects/pics/people/may/acro_bike/00.png b/graphics/event_objects/pics/people/may/acro_bike/00.png Binary files differdeleted file mode 100644 index 838b03c3f..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/00.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/01.png b/graphics/event_objects/pics/people/may/acro_bike/01.png Binary files differdeleted file mode 100644 index 5496c3288..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/01.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/02.png b/graphics/event_objects/pics/people/may/acro_bike/02.png Binary files differdeleted file mode 100644 index 2b8e86165..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/02.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/03.png b/graphics/event_objects/pics/people/may/acro_bike/03.png Binary files differdeleted file mode 100644 index c9740c4d9..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/03.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/04.png b/graphics/event_objects/pics/people/may/acro_bike/04.png Binary files differdeleted file mode 100644 index 959fbaec1..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/04.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/05.png b/graphics/event_objects/pics/people/may/acro_bike/05.png Binary files differdeleted file mode 100644 index 029c92f34..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/05.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/06.png b/graphics/event_objects/pics/people/may/acro_bike/06.png Binary files differdeleted file mode 100644 index e3c069efe..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/06.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/07.png b/graphics/event_objects/pics/people/may/acro_bike/07.png Binary files differdeleted file mode 100644 index 43d747292..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/07.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/08.png b/graphics/event_objects/pics/people/may/acro_bike/08.png Binary files differdeleted file mode 100644 index a12425a1e..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/08.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/09.png b/graphics/event_objects/pics/people/may/acro_bike/09.png Binary files differdeleted file mode 100644 index 3c6e4b852..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/09.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/10.png b/graphics/event_objects/pics/people/may/acro_bike/10.png Binary files differdeleted file mode 100644 index 2683b5990..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/10.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/11.png b/graphics/event_objects/pics/people/may/acro_bike/11.png Binary files differdeleted file mode 100644 index 60858ec54..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/11.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/12.png b/graphics/event_objects/pics/people/may/acro_bike/12.png Binary files differdeleted file mode 100644 index 2926a64c1..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/12.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/13.png b/graphics/event_objects/pics/people/may/acro_bike/13.png Binary files differdeleted file mode 100644 index ee2f1860b..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/13.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/14.png b/graphics/event_objects/pics/people/may/acro_bike/14.png Binary files differdeleted file mode 100644 index e8c93b214..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/14.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/15.png b/graphics/event_objects/pics/people/may/acro_bike/15.png Binary files differdeleted file mode 100644 index 713a05eee..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/15.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/16.png b/graphics/event_objects/pics/people/may/acro_bike/16.png Binary files differdeleted file mode 100644 index 30e065122..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/16.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/17.png b/graphics/event_objects/pics/people/may/acro_bike/17.png Binary files differdeleted file mode 100644 index be5ffcc5a..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/17.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/18.png b/graphics/event_objects/pics/people/may/acro_bike/18.png Binary files differdeleted file mode 100644 index 7d8757fc8..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/18.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/19.png b/graphics/event_objects/pics/people/may/acro_bike/19.png Binary files differdeleted file mode 100644 index 2f66fc466..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/19.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/20.png b/graphics/event_objects/pics/people/may/acro_bike/20.png Binary files differdeleted file mode 100644 index 5c85fa463..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/20.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/21.png b/graphics/event_objects/pics/people/may/acro_bike/21.png Binary files differdeleted file mode 100644 index db4795213..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/21.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/22.png b/graphics/event_objects/pics/people/may/acro_bike/22.png Binary files differdeleted file mode 100644 index 0da29524b..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/22.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/23.png b/graphics/event_objects/pics/people/may/acro_bike/23.png Binary files differdeleted file mode 100644 index fd77a607a..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/23.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/24.png b/graphics/event_objects/pics/people/may/acro_bike/24.png Binary files differdeleted file mode 100644 index 6a74a2dc1..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/24.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/25.png b/graphics/event_objects/pics/people/may/acro_bike/25.png Binary files differdeleted file mode 100644 index f1de9a530..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/25.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/acro_bike/26.png b/graphics/event_objects/pics/people/may/acro_bike/26.png Binary files differdeleted file mode 100644 index db55197e7..000000000 --- a/graphics/event_objects/pics/people/may/acro_bike/26.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/field_move.png b/graphics/event_objects/pics/people/may/field_move.png Binary files differnew file mode 100755 index 000000000..22e315f1c --- /dev/null +++ b/graphics/event_objects/pics/people/may/field_move.png diff --git a/graphics/event_objects/pics/people/may/field_move/0.png b/graphics/event_objects/pics/people/may/field_move/0.png Binary files differdeleted file mode 100644 index 59d735b2b..000000000 --- a/graphics/event_objects/pics/people/may/field_move/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/field_move/1.png b/graphics/event_objects/pics/people/may/field_move/1.png Binary files differdeleted file mode 100644 index 3e2c7c38b..000000000 --- a/graphics/event_objects/pics/people/may/field_move/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/field_move/2.png b/graphics/event_objects/pics/people/may/field_move/2.png Binary files differdeleted file mode 100644 index 01d835f6b..000000000 --- a/graphics/event_objects/pics/people/may/field_move/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/field_move/3.png b/graphics/event_objects/pics/people/may/field_move/3.png Binary files differdeleted file mode 100644 index 05b057875..000000000 --- a/graphics/event_objects/pics/people/may/field_move/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/field_move/4.png b/graphics/event_objects/pics/people/may/field_move/4.png Binary files differdeleted file mode 100644 index 28d108c5f..000000000 --- a/graphics/event_objects/pics/people/may/field_move/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/fishing.png b/graphics/event_objects/pics/people/may/fishing.png Binary files differnew file mode 100755 index 000000000..b404d6fac --- /dev/null +++ b/graphics/event_objects/pics/people/may/fishing.png diff --git a/graphics/event_objects/pics/people/may/fishing/00.png b/graphics/event_objects/pics/people/may/fishing/00.png Binary files differdeleted file mode 100644 index e279aeaee..000000000 --- a/graphics/event_objects/pics/people/may/fishing/00.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/fishing/01.png b/graphics/event_objects/pics/people/may/fishing/01.png Binary files differdeleted file mode 100644 index bdbc20487..000000000 --- a/graphics/event_objects/pics/people/may/fishing/01.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/fishing/02.png b/graphics/event_objects/pics/people/may/fishing/02.png Binary files differdeleted file mode 100644 index 7f49aae3f..000000000 --- a/graphics/event_objects/pics/people/may/fishing/02.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/fishing/03.png b/graphics/event_objects/pics/people/may/fishing/03.png Binary files differdeleted file mode 100644 index ee84ffa20..000000000 --- a/graphics/event_objects/pics/people/may/fishing/03.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/fishing/04.png b/graphics/event_objects/pics/people/may/fishing/04.png Binary files differdeleted file mode 100644 index 0a9fe3109..000000000 --- a/graphics/event_objects/pics/people/may/fishing/04.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/fishing/05.png b/graphics/event_objects/pics/people/may/fishing/05.png Binary files differdeleted file mode 100644 index 460b4df5a..000000000 --- a/graphics/event_objects/pics/people/may/fishing/05.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/fishing/06.png b/graphics/event_objects/pics/people/may/fishing/06.png Binary files differdeleted file mode 100644 index 598da6cfc..000000000 --- a/graphics/event_objects/pics/people/may/fishing/06.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/fishing/07.png b/graphics/event_objects/pics/people/may/fishing/07.png Binary files differdeleted file mode 100644 index 5d410c6b4..000000000 --- a/graphics/event_objects/pics/people/may/fishing/07.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/fishing/08.png b/graphics/event_objects/pics/people/may/fishing/08.png Binary files differdeleted file mode 100644 index b441380d4..000000000 --- a/graphics/event_objects/pics/people/may/fishing/08.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/fishing/09.png b/graphics/event_objects/pics/people/may/fishing/09.png Binary files differdeleted file mode 100644 index 7f7de260f..000000000 --- a/graphics/event_objects/pics/people/may/fishing/09.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/fishing/10.png b/graphics/event_objects/pics/people/may/fishing/10.png Binary files differdeleted file mode 100644 index b6fc1ee12..000000000 --- a/graphics/event_objects/pics/people/may/fishing/10.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/fishing/11.png b/graphics/event_objects/pics/people/may/fishing/11.png Binary files differdeleted file mode 100644 index 304cb7344..000000000 --- a/graphics/event_objects/pics/people/may/fishing/11.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/mach_bike.png b/graphics/event_objects/pics/people/may/mach_bike.png Binary files differnew file mode 100755 index 000000000..b84f1142a --- /dev/null +++ b/graphics/event_objects/pics/people/may/mach_bike.png diff --git a/graphics/event_objects/pics/people/may/mach_bike/0.png b/graphics/event_objects/pics/people/may/mach_bike/0.png Binary files differdeleted file mode 100644 index 838b03c3f..000000000 --- a/graphics/event_objects/pics/people/may/mach_bike/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/mach_bike/1.png b/graphics/event_objects/pics/people/may/mach_bike/1.png Binary files differdeleted file mode 100644 index 5496c3288..000000000 --- a/graphics/event_objects/pics/people/may/mach_bike/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/mach_bike/2.png b/graphics/event_objects/pics/people/may/mach_bike/2.png Binary files differdeleted file mode 100644 index 2b8e86165..000000000 --- a/graphics/event_objects/pics/people/may/mach_bike/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/mach_bike/3.png b/graphics/event_objects/pics/people/may/mach_bike/3.png Binary files differdeleted file mode 100644 index c9740c4d9..000000000 --- a/graphics/event_objects/pics/people/may/mach_bike/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/mach_bike/4.png b/graphics/event_objects/pics/people/may/mach_bike/4.png Binary files differdeleted file mode 100644 index 959fbaec1..000000000 --- a/graphics/event_objects/pics/people/may/mach_bike/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/mach_bike/5.png b/graphics/event_objects/pics/people/may/mach_bike/5.png Binary files differdeleted file mode 100644 index 029c92f34..000000000 --- a/graphics/event_objects/pics/people/may/mach_bike/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/mach_bike/6.png b/graphics/event_objects/pics/people/may/mach_bike/6.png Binary files differdeleted file mode 100644 index e3c069efe..000000000 --- a/graphics/event_objects/pics/people/may/mach_bike/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/mach_bike/7.png b/graphics/event_objects/pics/people/may/mach_bike/7.png Binary files differdeleted file mode 100644 index 43d747292..000000000 --- a/graphics/event_objects/pics/people/may/mach_bike/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/mach_bike/8.png b/graphics/event_objects/pics/people/may/mach_bike/8.png Binary files differdeleted file mode 100644 index a12425a1e..000000000 --- a/graphics/event_objects/pics/people/may/mach_bike/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal.png b/graphics/event_objects/pics/people/may/normal.png Binary files differnew file mode 100755 index 000000000..a644db880 --- /dev/null +++ b/graphics/event_objects/pics/people/may/normal.png diff --git a/graphics/event_objects/pics/people/may/normal/00.png b/graphics/event_objects/pics/people/may/normal/00.png Binary files differdeleted file mode 100644 index 2ccd3399a..000000000 --- a/graphics/event_objects/pics/people/may/normal/00.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/01.png b/graphics/event_objects/pics/people/may/normal/01.png Binary files differdeleted file mode 100644 index 94aad9ac7..000000000 --- a/graphics/event_objects/pics/people/may/normal/01.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/02.png b/graphics/event_objects/pics/people/may/normal/02.png Binary files differdeleted file mode 100644 index e61943fbb..000000000 --- a/graphics/event_objects/pics/people/may/normal/02.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/03.png b/graphics/event_objects/pics/people/may/normal/03.png Binary files differdeleted file mode 100644 index b8d1255d5..000000000 --- a/graphics/event_objects/pics/people/may/normal/03.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/04.png b/graphics/event_objects/pics/people/may/normal/04.png Binary files differdeleted file mode 100644 index 7d3cac765..000000000 --- a/graphics/event_objects/pics/people/may/normal/04.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/05.png b/graphics/event_objects/pics/people/may/normal/05.png Binary files differdeleted file mode 100644 index d5a4ab94e..000000000 --- a/graphics/event_objects/pics/people/may/normal/05.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/06.png b/graphics/event_objects/pics/people/may/normal/06.png Binary files differdeleted file mode 100644 index d22684057..000000000 --- a/graphics/event_objects/pics/people/may/normal/06.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/07.png b/graphics/event_objects/pics/people/may/normal/07.png Binary files differdeleted file mode 100644 index d0f0c3716..000000000 --- a/graphics/event_objects/pics/people/may/normal/07.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/08.png b/graphics/event_objects/pics/people/may/normal/08.png Binary files differdeleted file mode 100644 index dbb26c4e7..000000000 --- a/graphics/event_objects/pics/people/may/normal/08.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/09.png b/graphics/event_objects/pics/people/may/normal/09.png Binary files differdeleted file mode 100644 index 714316485..000000000 --- a/graphics/event_objects/pics/people/may/normal/09.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/10.png b/graphics/event_objects/pics/people/may/normal/10.png Binary files differdeleted file mode 100644 index 07897594f..000000000 --- a/graphics/event_objects/pics/people/may/normal/10.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/11.png b/graphics/event_objects/pics/people/may/normal/11.png Binary files differdeleted file mode 100644 index e4583aa91..000000000 --- a/graphics/event_objects/pics/people/may/normal/11.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/12.png b/graphics/event_objects/pics/people/may/normal/12.png Binary files differdeleted file mode 100644 index 34405b837..000000000 --- a/graphics/event_objects/pics/people/may/normal/12.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/13.png b/graphics/event_objects/pics/people/may/normal/13.png Binary files differdeleted file mode 100644 index 3b0ec86b3..000000000 --- a/graphics/event_objects/pics/people/may/normal/13.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/14.png b/graphics/event_objects/pics/people/may/normal/14.png Binary files differdeleted file mode 100644 index 18ee35cb9..000000000 --- a/graphics/event_objects/pics/people/may/normal/14.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/15.png b/graphics/event_objects/pics/people/may/normal/15.png Binary files differdeleted file mode 100644 index ea5e0fd5f..000000000 --- a/graphics/event_objects/pics/people/may/normal/15.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/16.png b/graphics/event_objects/pics/people/may/normal/16.png Binary files differdeleted file mode 100644 index c7e9dd58b..000000000 --- a/graphics/event_objects/pics/people/may/normal/16.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/normal/17.png b/graphics/event_objects/pics/people/may/normal/17.png Binary files differdeleted file mode 100644 index e79de8152..000000000 --- a/graphics/event_objects/pics/people/may/normal/17.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/surfing.png b/graphics/event_objects/pics/people/may/surfing.png Binary files differnew file mode 100755 index 000000000..a5e0bda9b --- /dev/null +++ b/graphics/event_objects/pics/people/may/surfing.png diff --git a/graphics/event_objects/pics/people/may/surfing/0.png b/graphics/event_objects/pics/people/may/surfing/0.png Binary files differdeleted file mode 100644 index 5f9dfbeb5..000000000 --- a/graphics/event_objects/pics/people/may/surfing/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/surfing/1.png b/graphics/event_objects/pics/people/may/surfing/1.png Binary files differdeleted file mode 100644 index 0e0bf6f7b..000000000 --- a/graphics/event_objects/pics/people/may/surfing/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/surfing/2.png b/graphics/event_objects/pics/people/may/surfing/2.png Binary files differdeleted file mode 100644 index 2af51190c..000000000 --- a/graphics/event_objects/pics/people/may/surfing/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/surfing/3.png b/graphics/event_objects/pics/people/may/surfing/3.png Binary files differdeleted file mode 100644 index 66e52fdaf..000000000 --- a/graphics/event_objects/pics/people/may/surfing/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/surfing/4.png b/graphics/event_objects/pics/people/may/surfing/4.png Binary files differdeleted file mode 100644 index 85c545d86..000000000 --- a/graphics/event_objects/pics/people/may/surfing/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/surfing/5.png b/graphics/event_objects/pics/people/may/surfing/5.png Binary files differdeleted file mode 100644 index 10b009954..000000000 --- a/graphics/event_objects/pics/people/may/surfing/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/underwater.png b/graphics/event_objects/pics/people/may/underwater.png Binary files differnew file mode 100755 index 000000000..8c260d932 --- /dev/null +++ b/graphics/event_objects/pics/people/may/underwater.png diff --git a/graphics/event_objects/pics/people/may/underwater/0.png b/graphics/event_objects/pics/people/may/underwater/0.png Binary files differdeleted file mode 100644 index 678dc4bb6..000000000 --- a/graphics/event_objects/pics/people/may/underwater/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/underwater/1.png b/graphics/event_objects/pics/people/may/underwater/1.png Binary files differdeleted file mode 100644 index 697cec2d1..000000000 --- a/graphics/event_objects/pics/people/may/underwater/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/underwater/2.png b/graphics/event_objects/pics/people/may/underwater/2.png Binary files differdeleted file mode 100644 index 423f01f88..000000000 --- a/graphics/event_objects/pics/people/may/underwater/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/underwater/3.png b/graphics/event_objects/pics/people/may/underwater/3.png Binary files differdeleted file mode 100644 index 4118573a3..000000000 --- a/graphics/event_objects/pics/people/may/underwater/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/watering.png b/graphics/event_objects/pics/people/may/watering.png Binary files differnew file mode 100755 index 000000000..d892d6306 --- /dev/null +++ b/graphics/event_objects/pics/people/may/watering.png diff --git a/graphics/event_objects/pics/people/may/watering/0.png b/graphics/event_objects/pics/people/may/watering/0.png Binary files differdeleted file mode 100644 index e3bde143f..000000000 --- a/graphics/event_objects/pics/people/may/watering/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/watering/1.png b/graphics/event_objects/pics/people/may/watering/1.png Binary files differdeleted file mode 100644 index d41fe3561..000000000 --- a/graphics/event_objects/pics/people/may/watering/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/watering/2.png b/graphics/event_objects/pics/people/may/watering/2.png Binary files differdeleted file mode 100644 index 15f1e5fa4..000000000 --- a/graphics/event_objects/pics/people/may/watering/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/watering/3.png b/graphics/event_objects/pics/people/may/watering/3.png Binary files differdeleted file mode 100644 index 9ac0b2a2a..000000000 --- a/graphics/event_objects/pics/people/may/watering/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/watering/4.png b/graphics/event_objects/pics/people/may/watering/4.png Binary files differdeleted file mode 100644 index 11e6b0e3a..000000000 --- a/graphics/event_objects/pics/people/may/watering/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/may/watering/5.png b/graphics/event_objects/pics/people/may/watering/5.png Binary files differdeleted file mode 100644 index d4fe7b838..000000000 --- a/graphics/event_objects/pics/people/may/watering/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mom.png b/graphics/event_objects/pics/people/mom.png Binary files differnew file mode 100755 index 000000000..252eccf48 --- /dev/null +++ b/graphics/event_objects/pics/people/mom.png diff --git a/graphics/event_objects/pics/people/mom/0.png b/graphics/event_objects/pics/people/mom/0.png Binary files differdeleted file mode 100644 index c2b592c9f..000000000 --- a/graphics/event_objects/pics/people/mom/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mom/1.png b/graphics/event_objects/pics/people/mom/1.png Binary files differdeleted file mode 100644 index e1d1797cb..000000000 --- a/graphics/event_objects/pics/people/mom/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mom/2.png b/graphics/event_objects/pics/people/mom/2.png Binary files differdeleted file mode 100644 index 8cd0c1d72..000000000 --- a/graphics/event_objects/pics/people/mom/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mom/3.png b/graphics/event_objects/pics/people/mom/3.png Binary files differdeleted file mode 100644 index 3a682f892..000000000 --- a/graphics/event_objects/pics/people/mom/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mom/4.png b/graphics/event_objects/pics/people/mom/4.png Binary files differdeleted file mode 100644 index 96de53b7b..000000000 --- a/graphics/event_objects/pics/people/mom/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mom/5.png b/graphics/event_objects/pics/people/mom/5.png Binary files differdeleted file mode 100644 index 567e8fb53..000000000 --- a/graphics/event_objects/pics/people/mom/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mom/6.png b/graphics/event_objects/pics/people/mom/6.png Binary files differdeleted file mode 100644 index 4dfaed492..000000000 --- a/graphics/event_objects/pics/people/mom/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mom/7.png b/graphics/event_objects/pics/people/mom/7.png Binary files differdeleted file mode 100644 index 3ce984e75..000000000 --- a/graphics/event_objects/pics/people/mom/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/mom/8.png b/graphics/event_objects/pics/people/mom/8.png Binary files differdeleted file mode 100644 index 6a3da67d1..000000000 --- a/graphics/event_objects/pics/people/mom/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/norman.png b/graphics/event_objects/pics/people/norman.png Binary files differnew file mode 100755 index 000000000..48755d3bd --- /dev/null +++ b/graphics/event_objects/pics/people/norman.png diff --git a/graphics/event_objects/pics/people/norman/0.png b/graphics/event_objects/pics/people/norman/0.png Binary files differdeleted file mode 100644 index 5f0bd1686..000000000 --- a/graphics/event_objects/pics/people/norman/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/norman/1.png b/graphics/event_objects/pics/people/norman/1.png Binary files differdeleted file mode 100644 index 88ea12ada..000000000 --- a/graphics/event_objects/pics/people/norman/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/norman/2.png b/graphics/event_objects/pics/people/norman/2.png Binary files differdeleted file mode 100644 index 04d8694ef..000000000 --- a/graphics/event_objects/pics/people/norman/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/norman/3.png b/graphics/event_objects/pics/people/norman/3.png Binary files differdeleted file mode 100644 index 90d16f675..000000000 --- a/graphics/event_objects/pics/people/norman/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/norman/4.png b/graphics/event_objects/pics/people/norman/4.png Binary files differdeleted file mode 100644 index 0df4412fb..000000000 --- a/graphics/event_objects/pics/people/norman/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/norman/5.png b/graphics/event_objects/pics/people/norman/5.png Binary files differdeleted file mode 100644 index ea68e0952..000000000 --- a/graphics/event_objects/pics/people/norman/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/norman/6.png b/graphics/event_objects/pics/people/norman/6.png Binary files differdeleted file mode 100644 index 45f8e5119..000000000 --- a/graphics/event_objects/pics/people/norman/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/norman/7.png b/graphics/event_objects/pics/people/norman/7.png Binary files differdeleted file mode 100644 index 27ff65ec0..000000000 --- a/graphics/event_objects/pics/people/norman/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/norman/8.png b/graphics/event_objects/pics/people/norman/8.png Binary files differdeleted file mode 100644 index aa18f3d73..000000000 --- a/graphics/event_objects/pics/people/norman/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/nurse.png b/graphics/event_objects/pics/people/nurse.png Binary files differnew file mode 100755 index 000000000..e6cb474ac --- /dev/null +++ b/graphics/event_objects/pics/people/nurse.png diff --git a/graphics/event_objects/pics/people/nurse/0.png b/graphics/event_objects/pics/people/nurse/0.png Binary files differdeleted file mode 100644 index 4d4245884..000000000 --- a/graphics/event_objects/pics/people/nurse/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/nurse/1.png b/graphics/event_objects/pics/people/nurse/1.png Binary files differdeleted file mode 100644 index 11b60d2c1..000000000 --- a/graphics/event_objects/pics/people/nurse/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/nurse/2.png b/graphics/event_objects/pics/people/nurse/2.png Binary files differdeleted file mode 100644 index 5953352b7..000000000 --- a/graphics/event_objects/pics/people/nurse/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/nurse/3.png b/graphics/event_objects/pics/people/nurse/3.png Binary files differdeleted file mode 100644 index 99598a966..000000000 --- a/graphics/event_objects/pics/people/nurse/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/nurse/4.png b/graphics/event_objects/pics/people/nurse/4.png Binary files differdeleted file mode 100644 index 4cfa6b408..000000000 --- a/graphics/event_objects/pics/people/nurse/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/nurse/5.png b/graphics/event_objects/pics/people/nurse/5.png Binary files differdeleted file mode 100644 index 98a3cbe65..000000000 --- a/graphics/event_objects/pics/people/nurse/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/nurse/6.png b/graphics/event_objects/pics/people/nurse/6.png Binary files differdeleted file mode 100644 index 3fe9ac785..000000000 --- a/graphics/event_objects/pics/people/nurse/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/nurse/7.png b/graphics/event_objects/pics/people/nurse/7.png Binary files differdeleted file mode 100644 index 4989ec83d..000000000 --- a/graphics/event_objects/pics/people/nurse/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/nurse/8.png b/graphics/event_objects/pics/people/nurse/8.png Binary files differdeleted file mode 100644 index 6fa3fbfcc..000000000 --- a/graphics/event_objects/pics/people/nurse/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/nurse/9.png b/graphics/event_objects/pics/people/nurse/9.png Binary files differdeleted file mode 100644 index cd8066ddf..000000000 --- a/graphics/event_objects/pics/people/nurse/9.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_man_1.png b/graphics/event_objects/pics/people/old_man_1.png Binary files differnew file mode 100755 index 000000000..b5f66e745 --- /dev/null +++ b/graphics/event_objects/pics/people/old_man_1.png diff --git a/graphics/event_objects/pics/people/old_man_1/0.png b/graphics/event_objects/pics/people/old_man_1/0.png Binary files differdeleted file mode 100644 index a73cc5877..000000000 --- a/graphics/event_objects/pics/people/old_man_1/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_man_1/1.png b/graphics/event_objects/pics/people/old_man_1/1.png Binary files differdeleted file mode 100644 index a0f7bbe64..000000000 --- a/graphics/event_objects/pics/people/old_man_1/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_man_1/2.png b/graphics/event_objects/pics/people/old_man_1/2.png Binary files differdeleted file mode 100644 index 9b8a3060b..000000000 --- a/graphics/event_objects/pics/people/old_man_1/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_man_1/3.png b/graphics/event_objects/pics/people/old_man_1/3.png Binary files differdeleted file mode 100644 index db0462886..000000000 --- a/graphics/event_objects/pics/people/old_man_1/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_man_1/4.png b/graphics/event_objects/pics/people/old_man_1/4.png Binary files differdeleted file mode 100644 index 9fb0a1c55..000000000 --- a/graphics/event_objects/pics/people/old_man_1/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_man_1/5.png b/graphics/event_objects/pics/people/old_man_1/5.png Binary files differdeleted file mode 100644 index bac4bfd20..000000000 --- a/graphics/event_objects/pics/people/old_man_1/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_man_1/6.png b/graphics/event_objects/pics/people/old_man_1/6.png Binary files differdeleted file mode 100644 index 8fa8bd93b..000000000 --- a/graphics/event_objects/pics/people/old_man_1/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_man_1/7.png b/graphics/event_objects/pics/people/old_man_1/7.png Binary files differdeleted file mode 100644 index 72ee8b1b7..000000000 --- a/graphics/event_objects/pics/people/old_man_1/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_man_1/8.png b/graphics/event_objects/pics/people/old_man_1/8.png Binary files differdeleted file mode 100644 index 47d81e333..000000000 --- a/graphics/event_objects/pics/people/old_man_1/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_man_2.png b/graphics/event_objects/pics/people/old_man_2.png Binary files differnew file mode 100755 index 000000000..f8c965895 --- /dev/null +++ b/graphics/event_objects/pics/people/old_man_2.png diff --git a/graphics/event_objects/pics/people/old_man_2/0.png b/graphics/event_objects/pics/people/old_man_2/0.png Binary files differdeleted file mode 100644 index 095c0e936..000000000 --- a/graphics/event_objects/pics/people/old_man_2/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_man_2/1.png b/graphics/event_objects/pics/people/old_man_2/1.png Binary files differdeleted file mode 100644 index 683cecc20..000000000 --- a/graphics/event_objects/pics/people/old_man_2/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_man_2/2.png b/graphics/event_objects/pics/people/old_man_2/2.png Binary files differdeleted file mode 100644 index 31ccdbd11..000000000 --- a/graphics/event_objects/pics/people/old_man_2/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_woman_1.png b/graphics/event_objects/pics/people/old_woman_1.png Binary files differnew file mode 100755 index 000000000..1213f3afc --- /dev/null +++ b/graphics/event_objects/pics/people/old_woman_1.png diff --git a/graphics/event_objects/pics/people/old_woman_1/0.png b/graphics/event_objects/pics/people/old_woman_1/0.png Binary files differdeleted file mode 100644 index 8498de6cd..000000000 --- a/graphics/event_objects/pics/people/old_woman_1/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_woman_1/1.png b/graphics/event_objects/pics/people/old_woman_1/1.png Binary files differdeleted file mode 100644 index bb90a3425..000000000 --- a/graphics/event_objects/pics/people/old_woman_1/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_woman_1/2.png b/graphics/event_objects/pics/people/old_woman_1/2.png Binary files differdeleted file mode 100644 index a85d926f9..000000000 --- a/graphics/event_objects/pics/people/old_woman_1/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_woman_1/3.png b/graphics/event_objects/pics/people/old_woman_1/3.png Binary files differdeleted file mode 100644 index 40fc7f909..000000000 --- a/graphics/event_objects/pics/people/old_woman_1/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_woman_1/4.png b/graphics/event_objects/pics/people/old_woman_1/4.png Binary files differdeleted file mode 100644 index 6b0df84d6..000000000 --- a/graphics/event_objects/pics/people/old_woman_1/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_woman_1/5.png b/graphics/event_objects/pics/people/old_woman_1/5.png Binary files differdeleted file mode 100644 index 1355af05f..000000000 --- a/graphics/event_objects/pics/people/old_woman_1/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_woman_1/6.png b/graphics/event_objects/pics/people/old_woman_1/6.png Binary files differdeleted file mode 100644 index 27c5656a3..000000000 --- a/graphics/event_objects/pics/people/old_woman_1/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_woman_1/7.png b/graphics/event_objects/pics/people/old_woman_1/7.png Binary files differdeleted file mode 100644 index 642aba402..000000000 --- a/graphics/event_objects/pics/people/old_woman_1/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_woman_1/8.png b/graphics/event_objects/pics/people/old_woman_1/8.png Binary files differdeleted file mode 100644 index 641ed8234..000000000 --- a/graphics/event_objects/pics/people/old_woman_1/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_woman_2.png b/graphics/event_objects/pics/people/old_woman_2.png Binary files differnew file mode 100755 index 000000000..c2fc0d4e4 --- /dev/null +++ b/graphics/event_objects/pics/people/old_woman_2.png diff --git a/graphics/event_objects/pics/people/old_woman_2/0.png b/graphics/event_objects/pics/people/old_woman_2/0.png Binary files differdeleted file mode 100644 index 5547acfa7..000000000 --- a/graphics/event_objects/pics/people/old_woman_2/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_woman_2/1.png b/graphics/event_objects/pics/people/old_woman_2/1.png Binary files differdeleted file mode 100644 index d3ed6c11a..000000000 --- a/graphics/event_objects/pics/people/old_woman_2/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/old_woman_2/2.png b/graphics/event_objects/pics/people/old_woman_2/2.png Binary files differdeleted file mode 100644 index d99d91ddd..000000000 --- a/graphics/event_objects/pics/people/old_woman_2/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/phoebe.png b/graphics/event_objects/pics/people/phoebe.png Binary files differnew file mode 100755 index 000000000..243057ae2 --- /dev/null +++ b/graphics/event_objects/pics/people/phoebe.png diff --git a/graphics/event_objects/pics/people/phoebe/0.png b/graphics/event_objects/pics/people/phoebe/0.png Binary files differdeleted file mode 100644 index 06188b539..000000000 --- a/graphics/event_objects/pics/people/phoebe/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/phoebe/1.png b/graphics/event_objects/pics/people/phoebe/1.png Binary files differdeleted file mode 100644 index 505190902..000000000 --- a/graphics/event_objects/pics/people/phoebe/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/phoebe/2.png b/graphics/event_objects/pics/people/phoebe/2.png Binary files differdeleted file mode 100644 index a5f66cdbf..000000000 --- a/graphics/event_objects/pics/people/phoebe/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/picnicker.png b/graphics/event_objects/pics/people/picnicker.png Binary files differnew file mode 100755 index 000000000..a15eeb644 --- /dev/null +++ b/graphics/event_objects/pics/people/picnicker.png diff --git a/graphics/event_objects/pics/people/picnicker/0.png b/graphics/event_objects/pics/people/picnicker/0.png Binary files differdeleted file mode 100644 index 310170def..000000000 --- a/graphics/event_objects/pics/people/picnicker/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/picnicker/1.png b/graphics/event_objects/pics/people/picnicker/1.png Binary files differdeleted file mode 100644 index 9caeb6de2..000000000 --- a/graphics/event_objects/pics/people/picnicker/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/picnicker/2.png b/graphics/event_objects/pics/people/picnicker/2.png Binary files differdeleted file mode 100644 index 17ca91044..000000000 --- a/graphics/event_objects/pics/people/picnicker/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/picnicker/3.png b/graphics/event_objects/pics/people/picnicker/3.png Binary files differdeleted file mode 100644 index e80ca4b4e..000000000 --- a/graphics/event_objects/pics/people/picnicker/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/picnicker/4.png b/graphics/event_objects/pics/people/picnicker/4.png Binary files differdeleted file mode 100644 index 1c2ad0709..000000000 --- a/graphics/event_objects/pics/people/picnicker/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/picnicker/5.png b/graphics/event_objects/pics/people/picnicker/5.png Binary files differdeleted file mode 100644 index a5dce80dd..000000000 --- a/graphics/event_objects/pics/people/picnicker/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/picnicker/6.png b/graphics/event_objects/pics/people/picnicker/6.png Binary files differdeleted file mode 100644 index 1895ff667..000000000 --- a/graphics/event_objects/pics/people/picnicker/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/picnicker/7.png b/graphics/event_objects/pics/people/picnicker/7.png Binary files differdeleted file mode 100644 index 62d0c2f68..000000000 --- a/graphics/event_objects/pics/people/picnicker/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/picnicker/8.png b/graphics/event_objects/pics/people/picnicker/8.png Binary files differdeleted file mode 100644 index 076c2c32b..000000000 --- a/graphics/event_objects/pics/people/picnicker/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/prof_birch.png b/graphics/event_objects/pics/people/prof_birch.png Binary files differnew file mode 100755 index 000000000..d3ea18c31 --- /dev/null +++ b/graphics/event_objects/pics/people/prof_birch.png diff --git a/graphics/event_objects/pics/people/prof_birch/0.png b/graphics/event_objects/pics/people/prof_birch/0.png Binary files differdeleted file mode 100644 index 2dbe3bef5..000000000 --- a/graphics/event_objects/pics/people/prof_birch/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/prof_birch/1.png b/graphics/event_objects/pics/people/prof_birch/1.png Binary files differdeleted file mode 100644 index b27c2174a..000000000 --- a/graphics/event_objects/pics/people/prof_birch/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/prof_birch/2.png b/graphics/event_objects/pics/people/prof_birch/2.png Binary files differdeleted file mode 100644 index 195a3da01..000000000 --- a/graphics/event_objects/pics/people/prof_birch/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/prof_birch/3.png b/graphics/event_objects/pics/people/prof_birch/3.png Binary files differdeleted file mode 100644 index 5f9d2750e..000000000 --- a/graphics/event_objects/pics/people/prof_birch/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/prof_birch/4.png b/graphics/event_objects/pics/people/prof_birch/4.png Binary files differdeleted file mode 100644 index a44244f15..000000000 --- a/graphics/event_objects/pics/people/prof_birch/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/prof_birch/5.png b/graphics/event_objects/pics/people/prof_birch/5.png Binary files differdeleted file mode 100644 index 3c6c16ff1..000000000 --- a/graphics/event_objects/pics/people/prof_birch/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/prof_birch/6.png b/graphics/event_objects/pics/people/prof_birch/6.png Binary files differdeleted file mode 100644 index 802b89fd6..000000000 --- a/graphics/event_objects/pics/people/prof_birch/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/prof_birch/7.png b/graphics/event_objects/pics/people/prof_birch/7.png Binary files differdeleted file mode 100644 index 59af318a2..000000000 --- a/graphics/event_objects/pics/people/prof_birch/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/prof_birch/8.png b/graphics/event_objects/pics/people/prof_birch/8.png Binary files differdeleted file mode 100644 index 0a936308a..000000000 --- a/graphics/event_objects/pics/people/prof_birch/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/psychic_m.png b/graphics/event_objects/pics/people/psychic_m.png Binary files differnew file mode 100755 index 000000000..3efe5c0af --- /dev/null +++ b/graphics/event_objects/pics/people/psychic_m.png diff --git a/graphics/event_objects/pics/people/psychic_m/0.png b/graphics/event_objects/pics/people/psychic_m/0.png Binary files differdeleted file mode 100644 index 099e65aa1..000000000 --- a/graphics/event_objects/pics/people/psychic_m/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/psychic_m/1.png b/graphics/event_objects/pics/people/psychic_m/1.png Binary files differdeleted file mode 100644 index 6203b8f3a..000000000 --- a/graphics/event_objects/pics/people/psychic_m/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/psychic_m/2.png b/graphics/event_objects/pics/people/psychic_m/2.png Binary files differdeleted file mode 100644 index 00f19c8c3..000000000 --- a/graphics/event_objects/pics/people/psychic_m/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/psychic_m/3.png b/graphics/event_objects/pics/people/psychic_m/3.png Binary files differdeleted file mode 100644 index ec8733d45..000000000 --- a/graphics/event_objects/pics/people/psychic_m/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/psychic_m/4.png b/graphics/event_objects/pics/people/psychic_m/4.png Binary files differdeleted file mode 100644 index 7a2f06947..000000000 --- a/graphics/event_objects/pics/people/psychic_m/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/psychic_m/5.png b/graphics/event_objects/pics/people/psychic_m/5.png Binary files differdeleted file mode 100644 index 64133327d..000000000 --- a/graphics/event_objects/pics/people/psychic_m/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/psychic_m/6.png b/graphics/event_objects/pics/people/psychic_m/6.png Binary files differdeleted file mode 100644 index 7c55b4f4d..000000000 --- a/graphics/event_objects/pics/people/psychic_m/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/psychic_m/7.png b/graphics/event_objects/pics/people/psychic_m/7.png Binary files differdeleted file mode 100644 index 134953f5c..000000000 --- a/graphics/event_objects/pics/people/psychic_m/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/psychic_m/8.png b/graphics/event_objects/pics/people/psychic_m/8.png Binary files differdeleted file mode 100644 index 79ea167fe..000000000 --- a/graphics/event_objects/pics/people/psychic_m/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/quinty_plump.png b/graphics/event_objects/pics/people/quinty_plump.png Binary files differnew file mode 100755 index 000000000..49d4c7038 --- /dev/null +++ b/graphics/event_objects/pics/people/quinty_plump.png diff --git a/graphics/event_objects/pics/people/quinty_plump/0.png b/graphics/event_objects/pics/people/quinty_plump/0.png Binary files differdeleted file mode 100644 index 7a29230f4..000000000 --- a/graphics/event_objects/pics/people/quinty_plump/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/quinty_plump/1.png b/graphics/event_objects/pics/people/quinty_plump/1.png Binary files differdeleted file mode 100644 index 6fbd85a26..000000000 --- a/graphics/event_objects/pics/people/quinty_plump/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/quinty_plump/2.png b/graphics/event_objects/pics/people/quinty_plump/2.png Binary files differdeleted file mode 100644 index 238f0a55c..000000000 --- a/graphics/event_objects/pics/people/quinty_plump/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/quinty_plump/3.png b/graphics/event_objects/pics/people/quinty_plump/3.png Binary files differdeleted file mode 100644 index d1cb5d7e7..000000000 --- a/graphics/event_objects/pics/people/quinty_plump/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/quinty_plump/4.png b/graphics/event_objects/pics/people/quinty_plump/4.png Binary files differdeleted file mode 100644 index 4afac2056..000000000 --- a/graphics/event_objects/pics/people/quinty_plump/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/quinty_plump/5.png b/graphics/event_objects/pics/people/quinty_plump/5.png Binary files differdeleted file mode 100644 index 9f9404aef..000000000 --- a/graphics/event_objects/pics/people/quinty_plump/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/quinty_plump/6.png b/graphics/event_objects/pics/people/quinty_plump/6.png Binary files differdeleted file mode 100644 index 11316499c..000000000 --- a/graphics/event_objects/pics/people/quinty_plump/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_f.png b/graphics/event_objects/pics/people/reporter_f.png Binary files differnew file mode 100755 index 000000000..289aef6d9 --- /dev/null +++ b/graphics/event_objects/pics/people/reporter_f.png diff --git a/graphics/event_objects/pics/people/reporter_f/0.png b/graphics/event_objects/pics/people/reporter_f/0.png Binary files differdeleted file mode 100644 index d22968ddd..000000000 --- a/graphics/event_objects/pics/people/reporter_f/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_f/1.png b/graphics/event_objects/pics/people/reporter_f/1.png Binary files differdeleted file mode 100644 index fb29ac66f..000000000 --- a/graphics/event_objects/pics/people/reporter_f/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_f/2.png b/graphics/event_objects/pics/people/reporter_f/2.png Binary files differdeleted file mode 100644 index 4ac633368..000000000 --- a/graphics/event_objects/pics/people/reporter_f/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_f/3.png b/graphics/event_objects/pics/people/reporter_f/3.png Binary files differdeleted file mode 100644 index 3fc93ee7f..000000000 --- a/graphics/event_objects/pics/people/reporter_f/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_f/4.png b/graphics/event_objects/pics/people/reporter_f/4.png Binary files differdeleted file mode 100644 index fa20a54c8..000000000 --- a/graphics/event_objects/pics/people/reporter_f/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_f/5.png b/graphics/event_objects/pics/people/reporter_f/5.png Binary files differdeleted file mode 100644 index 015575483..000000000 --- a/graphics/event_objects/pics/people/reporter_f/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_f/6.png b/graphics/event_objects/pics/people/reporter_f/6.png Binary files differdeleted file mode 100644 index e2c9d3d11..000000000 --- a/graphics/event_objects/pics/people/reporter_f/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_f/7.png b/graphics/event_objects/pics/people/reporter_f/7.png Binary files differdeleted file mode 100644 index 1b986e616..000000000 --- a/graphics/event_objects/pics/people/reporter_f/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_f/8.png b/graphics/event_objects/pics/people/reporter_f/8.png Binary files differdeleted file mode 100644 index d1dfc31a6..000000000 --- a/graphics/event_objects/pics/people/reporter_f/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_m.png b/graphics/event_objects/pics/people/reporter_m.png Binary files differnew file mode 100755 index 000000000..09b2b964e --- /dev/null +++ b/graphics/event_objects/pics/people/reporter_m.png diff --git a/graphics/event_objects/pics/people/reporter_m/0.png b/graphics/event_objects/pics/people/reporter_m/0.png Binary files differdeleted file mode 100644 index b052abfee..000000000 --- a/graphics/event_objects/pics/people/reporter_m/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_m/1.png b/graphics/event_objects/pics/people/reporter_m/1.png Binary files differdeleted file mode 100644 index 0a273f5aa..000000000 --- a/graphics/event_objects/pics/people/reporter_m/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_m/2.png b/graphics/event_objects/pics/people/reporter_m/2.png Binary files differdeleted file mode 100644 index a47cef17b..000000000 --- a/graphics/event_objects/pics/people/reporter_m/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_m/3.png b/graphics/event_objects/pics/people/reporter_m/3.png Binary files differdeleted file mode 100644 index 780f128b3..000000000 --- a/graphics/event_objects/pics/people/reporter_m/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_m/4.png b/graphics/event_objects/pics/people/reporter_m/4.png Binary files differdeleted file mode 100644 index cb57002ab..000000000 --- a/graphics/event_objects/pics/people/reporter_m/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_m/5.png b/graphics/event_objects/pics/people/reporter_m/5.png Binary files differdeleted file mode 100644 index 6f488296c..000000000 --- a/graphics/event_objects/pics/people/reporter_m/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_m/6.png b/graphics/event_objects/pics/people/reporter_m/6.png Binary files differdeleted file mode 100644 index 4aad5d2c6..000000000 --- a/graphics/event_objects/pics/people/reporter_m/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_m/7.png b/graphics/event_objects/pics/people/reporter_m/7.png Binary files differdeleted file mode 100644 index 7ac1d360d..000000000 --- a/graphics/event_objects/pics/people/reporter_m/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/reporter_m/8.png b/graphics/event_objects/pics/people/reporter_m/8.png Binary files differdeleted file mode 100644 index 25b07efb4..000000000 --- a/graphics/event_objects/pics/people/reporter_m/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman.png b/graphics/event_objects/pics/people/rooftop_sale_woman.png Binary files differnew file mode 100755 index 000000000..f1f9bc72b --- /dev/null +++ b/graphics/event_objects/pics/people/rooftop_sale_woman.png diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/0.png b/graphics/event_objects/pics/people/rooftop_sale_woman/0.png Binary files differdeleted file mode 100644 index f73f91631..000000000 --- a/graphics/event_objects/pics/people/rooftop_sale_woman/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/1.png b/graphics/event_objects/pics/people/rooftop_sale_woman/1.png Binary files differdeleted file mode 100644 index 855079988..000000000 --- a/graphics/event_objects/pics/people/rooftop_sale_woman/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/2.png b/graphics/event_objects/pics/people/rooftop_sale_woman/2.png Binary files differdeleted file mode 100644 index 643eb4eb2..000000000 --- a/graphics/event_objects/pics/people/rooftop_sale_woman/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/3.png b/graphics/event_objects/pics/people/rooftop_sale_woman/3.png Binary files differdeleted file mode 100644 index dbea9b53c..000000000 --- a/graphics/event_objects/pics/people/rooftop_sale_woman/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/4.png b/graphics/event_objects/pics/people/rooftop_sale_woman/4.png Binary files differdeleted file mode 100644 index d6bbc98b8..000000000 --- a/graphics/event_objects/pics/people/rooftop_sale_woman/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/5.png b/graphics/event_objects/pics/people/rooftop_sale_woman/5.png Binary files differdeleted file mode 100644 index bd99cf10f..000000000 --- a/graphics/event_objects/pics/people/rooftop_sale_woman/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/6.png b/graphics/event_objects/pics/people/rooftop_sale_woman/6.png Binary files differdeleted file mode 100644 index c5c447997..000000000 --- a/graphics/event_objects/pics/people/rooftop_sale_woman/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/7.png b/graphics/event_objects/pics/people/rooftop_sale_woman/7.png Binary files differdeleted file mode 100644 index 64b7691c4..000000000 --- a/graphics/event_objects/pics/people/rooftop_sale_woman/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/8.png b/graphics/event_objects/pics/people/rooftop_sale_woman/8.png Binary files differdeleted file mode 100644 index b588d2b26..000000000 --- a/graphics/event_objects/pics/people/rooftop_sale_woman/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/roxanne.png b/graphics/event_objects/pics/people/roxanne.png Binary files differnew file mode 100755 index 000000000..c1a1421a0 --- /dev/null +++ b/graphics/event_objects/pics/people/roxanne.png diff --git a/graphics/event_objects/pics/people/roxanne/0.png b/graphics/event_objects/pics/people/roxanne/0.png Binary files differdeleted file mode 100644 index 0a73a0723..000000000 --- a/graphics/event_objects/pics/people/roxanne/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/roxanne/1.png b/graphics/event_objects/pics/people/roxanne/1.png Binary files differdeleted file mode 100644 index 133f097bf..000000000 --- a/graphics/event_objects/pics/people/roxanne/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/roxanne/2.png b/graphics/event_objects/pics/people/roxanne/2.png Binary files differdeleted file mode 100644 index 946765eb2..000000000 --- a/graphics/event_objects/pics/people/roxanne/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_f.png b/graphics/event_objects/pics/people/running_triathlete_f.png Binary files differnew file mode 100755 index 000000000..f95eb2be2 --- /dev/null +++ b/graphics/event_objects/pics/people/running_triathlete_f.png diff --git a/graphics/event_objects/pics/people/running_triathlete_f/0.png b/graphics/event_objects/pics/people/running_triathlete_f/0.png Binary files differdeleted file mode 100644 index 195edef7b..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_f/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_f/1.png b/graphics/event_objects/pics/people/running_triathlete_f/1.png Binary files differdeleted file mode 100644 index 1a7069621..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_f/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_f/2.png b/graphics/event_objects/pics/people/running_triathlete_f/2.png Binary files differdeleted file mode 100644 index aab9ca24b..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_f/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_f/3.png b/graphics/event_objects/pics/people/running_triathlete_f/3.png Binary files differdeleted file mode 100644 index 909fc0f60..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_f/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_f/4.png b/graphics/event_objects/pics/people/running_triathlete_f/4.png Binary files differdeleted file mode 100644 index 301d13d09..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_f/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_f/5.png b/graphics/event_objects/pics/people/running_triathlete_f/5.png Binary files differdeleted file mode 100644 index 84914d619..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_f/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_f/6.png b/graphics/event_objects/pics/people/running_triathlete_f/6.png Binary files differdeleted file mode 100644 index 9ee690631..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_f/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_f/7.png b/graphics/event_objects/pics/people/running_triathlete_f/7.png Binary files differdeleted file mode 100644 index 2441def63..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_f/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_f/8.png b/graphics/event_objects/pics/people/running_triathlete_f/8.png Binary files differdeleted file mode 100644 index a96d1e221..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_f/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_m.png b/graphics/event_objects/pics/people/running_triathlete_m.png Binary files differnew file mode 100755 index 000000000..b2b681201 --- /dev/null +++ b/graphics/event_objects/pics/people/running_triathlete_m.png diff --git a/graphics/event_objects/pics/people/running_triathlete_m/0.png b/graphics/event_objects/pics/people/running_triathlete_m/0.png Binary files differdeleted file mode 100644 index 0d02be87e..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_m/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_m/1.png b/graphics/event_objects/pics/people/running_triathlete_m/1.png Binary files differdeleted file mode 100644 index 21e2fdf11..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_m/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_m/2.png b/graphics/event_objects/pics/people/running_triathlete_m/2.png Binary files differdeleted file mode 100644 index d571938e3..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_m/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_m/3.png b/graphics/event_objects/pics/people/running_triathlete_m/3.png Binary files differdeleted file mode 100644 index f60cc6b5b..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_m/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_m/4.png b/graphics/event_objects/pics/people/running_triathlete_m/4.png Binary files differdeleted file mode 100644 index 6ec60997a..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_m/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_m/5.png b/graphics/event_objects/pics/people/running_triathlete_m/5.png Binary files differdeleted file mode 100644 index 4f5742f1a..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_m/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_m/6.png b/graphics/event_objects/pics/people/running_triathlete_m/6.png Binary files differdeleted file mode 100644 index be048ac7e..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_m/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_m/7.png b/graphics/event_objects/pics/people/running_triathlete_m/7.png Binary files differdeleted file mode 100644 index 9a972be67..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_m/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/running_triathlete_m/8.png b/graphics/event_objects/pics/people/running_triathlete_m/8.png Binary files differdeleted file mode 100644 index 18ea0d178..000000000 --- a/graphics/event_objects/pics/people/running_triathlete_m/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/sailor.png b/graphics/event_objects/pics/people/sailor.png Binary files differnew file mode 100755 index 000000000..6c8a867f4 --- /dev/null +++ b/graphics/event_objects/pics/people/sailor.png diff --git a/graphics/event_objects/pics/people/sailor/0.png b/graphics/event_objects/pics/people/sailor/0.png Binary files differdeleted file mode 100644 index 8dc44669a..000000000 --- a/graphics/event_objects/pics/people/sailor/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/sailor/1.png b/graphics/event_objects/pics/people/sailor/1.png Binary files differdeleted file mode 100644 index 8cb9ba620..000000000 --- a/graphics/event_objects/pics/people/sailor/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/sailor/2.png b/graphics/event_objects/pics/people/sailor/2.png Binary files differdeleted file mode 100644 index 34a832cbf..000000000 --- a/graphics/event_objects/pics/people/sailor/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/sailor/3.png b/graphics/event_objects/pics/people/sailor/3.png Binary files differdeleted file mode 100644 index 1ad0918a8..000000000 --- a/graphics/event_objects/pics/people/sailor/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/sailor/4.png b/graphics/event_objects/pics/people/sailor/4.png Binary files differdeleted file mode 100644 index 623c42211..000000000 --- a/graphics/event_objects/pics/people/sailor/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/sailor/5.png b/graphics/event_objects/pics/people/sailor/5.png Binary files differdeleted file mode 100644 index 01795d75f..000000000 --- a/graphics/event_objects/pics/people/sailor/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/sailor/6.png b/graphics/event_objects/pics/people/sailor/6.png Binary files differdeleted file mode 100644 index a3babaa42..000000000 --- a/graphics/event_objects/pics/people/sailor/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/sailor/7.png b/graphics/event_objects/pics/people/sailor/7.png Binary files differdeleted file mode 100644 index 08abf8a71..000000000 --- a/graphics/event_objects/pics/people/sailor/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/sailor/8.png b/graphics/event_objects/pics/people/sailor/8.png Binary files differdeleted file mode 100644 index f7d2ec655..000000000 --- a/graphics/event_objects/pics/people/sailor/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/school_kid_m.png b/graphics/event_objects/pics/people/school_kid_m.png Binary files differnew file mode 100755 index 000000000..ddfc28b10 --- /dev/null +++ b/graphics/event_objects/pics/people/school_kid_m.png diff --git a/graphics/event_objects/pics/people/school_kid_m/0.png b/graphics/event_objects/pics/people/school_kid_m/0.png Binary files differdeleted file mode 100644 index 3f700ffaf..000000000 --- a/graphics/event_objects/pics/people/school_kid_m/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/school_kid_m/1.png b/graphics/event_objects/pics/people/school_kid_m/1.png Binary files differdeleted file mode 100644 index c47d69d34..000000000 --- a/graphics/event_objects/pics/people/school_kid_m/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/school_kid_m/2.png b/graphics/event_objects/pics/people/school_kid_m/2.png Binary files differdeleted file mode 100644 index b4116862b..000000000 --- a/graphics/event_objects/pics/people/school_kid_m/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/school_kid_m/3.png b/graphics/event_objects/pics/people/school_kid_m/3.png Binary files differdeleted file mode 100644 index 078ce5bc4..000000000 --- a/graphics/event_objects/pics/people/school_kid_m/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/school_kid_m/4.png b/graphics/event_objects/pics/people/school_kid_m/4.png Binary files differdeleted file mode 100644 index 330979128..000000000 --- a/graphics/event_objects/pics/people/school_kid_m/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/school_kid_m/5.png b/graphics/event_objects/pics/people/school_kid_m/5.png Binary files differdeleted file mode 100644 index 44ab9e8aa..000000000 --- a/graphics/event_objects/pics/people/school_kid_m/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/school_kid_m/6.png b/graphics/event_objects/pics/people/school_kid_m/6.png Binary files differdeleted file mode 100644 index ba20fc113..000000000 --- a/graphics/event_objects/pics/people/school_kid_m/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/school_kid_m/7.png b/graphics/event_objects/pics/people/school_kid_m/7.png Binary files differdeleted file mode 100644 index c4a5444e0..000000000 --- a/graphics/event_objects/pics/people/school_kid_m/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/school_kid_m/8.png b/graphics/event_objects/pics/people/school_kid_m/8.png Binary files differdeleted file mode 100644 index 047b340fb..000000000 --- a/graphics/event_objects/pics/people/school_kid_m/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_1.png b/graphics/event_objects/pics/people/scientist_1.png Binary files differnew file mode 100755 index 000000000..2b1f6605d --- /dev/null +++ b/graphics/event_objects/pics/people/scientist_1.png diff --git a/graphics/event_objects/pics/people/scientist_1/0.png b/graphics/event_objects/pics/people/scientist_1/0.png Binary files differdeleted file mode 100644 index ef85b5985..000000000 --- a/graphics/event_objects/pics/people/scientist_1/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_1/1.png b/graphics/event_objects/pics/people/scientist_1/1.png Binary files differdeleted file mode 100644 index 2a2ade370..000000000 --- a/graphics/event_objects/pics/people/scientist_1/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_1/2.png b/graphics/event_objects/pics/people/scientist_1/2.png Binary files differdeleted file mode 100644 index 6d3e31618..000000000 --- a/graphics/event_objects/pics/people/scientist_1/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_1/3.png b/graphics/event_objects/pics/people/scientist_1/3.png Binary files differdeleted file mode 100644 index 433dd879d..000000000 --- a/graphics/event_objects/pics/people/scientist_1/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_1/4.png b/graphics/event_objects/pics/people/scientist_1/4.png Binary files differdeleted file mode 100644 index 3c0594e4f..000000000 --- a/graphics/event_objects/pics/people/scientist_1/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_1/5.png b/graphics/event_objects/pics/people/scientist_1/5.png Binary files differdeleted file mode 100644 index 12fdc5c84..000000000 --- a/graphics/event_objects/pics/people/scientist_1/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_1/6.png b/graphics/event_objects/pics/people/scientist_1/6.png Binary files differdeleted file mode 100644 index 6ea4c5577..000000000 --- a/graphics/event_objects/pics/people/scientist_1/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_1/7.png b/graphics/event_objects/pics/people/scientist_1/7.png Binary files differdeleted file mode 100644 index 7496fcc98..000000000 --- a/graphics/event_objects/pics/people/scientist_1/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_1/8.png b/graphics/event_objects/pics/people/scientist_1/8.png Binary files differdeleted file mode 100644 index 7487b1b46..000000000 --- a/graphics/event_objects/pics/people/scientist_1/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_2.png b/graphics/event_objects/pics/people/scientist_2.png Binary files differnew file mode 100755 index 000000000..ba4759a71 --- /dev/null +++ b/graphics/event_objects/pics/people/scientist_2.png diff --git a/graphics/event_objects/pics/people/scientist_2/0.png b/graphics/event_objects/pics/people/scientist_2/0.png Binary files differdeleted file mode 100644 index 0a2f65a81..000000000 --- a/graphics/event_objects/pics/people/scientist_2/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_2/1.png b/graphics/event_objects/pics/people/scientist_2/1.png Binary files differdeleted file mode 100644 index c7ef46ca1..000000000 --- a/graphics/event_objects/pics/people/scientist_2/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_2/2.png b/graphics/event_objects/pics/people/scientist_2/2.png Binary files differdeleted file mode 100644 index 3e8d2f530..000000000 --- a/graphics/event_objects/pics/people/scientist_2/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_2/3.png b/graphics/event_objects/pics/people/scientist_2/3.png Binary files differdeleted file mode 100644 index 9c3f70989..000000000 --- a/graphics/event_objects/pics/people/scientist_2/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_2/4.png b/graphics/event_objects/pics/people/scientist_2/4.png Binary files differdeleted file mode 100644 index 28ac9b4cb..000000000 --- a/graphics/event_objects/pics/people/scientist_2/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_2/5.png b/graphics/event_objects/pics/people/scientist_2/5.png Binary files differdeleted file mode 100644 index 836241dc9..000000000 --- a/graphics/event_objects/pics/people/scientist_2/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_2/6.png b/graphics/event_objects/pics/people/scientist_2/6.png Binary files differdeleted file mode 100644 index 894ba989e..000000000 --- a/graphics/event_objects/pics/people/scientist_2/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_2/7.png b/graphics/event_objects/pics/people/scientist_2/7.png Binary files differdeleted file mode 100644 index b3176d10e..000000000 --- a/graphics/event_objects/pics/people/scientist_2/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/scientist_2/8.png b/graphics/event_objects/pics/people/scientist_2/8.png Binary files differdeleted file mode 100644 index 4666c2f9a..000000000 --- a/graphics/event_objects/pics/people/scientist_2/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/sidney.png b/graphics/event_objects/pics/people/sidney.png Binary files differnew file mode 100755 index 000000000..de9d08719 --- /dev/null +++ b/graphics/event_objects/pics/people/sidney.png diff --git a/graphics/event_objects/pics/people/sidney/0.png b/graphics/event_objects/pics/people/sidney/0.png Binary files differdeleted file mode 100644 index abbbcd3fb..000000000 --- a/graphics/event_objects/pics/people/sidney/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/sidney/1.png b/graphics/event_objects/pics/people/sidney/1.png Binary files differdeleted file mode 100644 index e13e8ef32..000000000 --- a/graphics/event_objects/pics/people/sidney/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/sidney/2.png b/graphics/event_objects/pics/people/sidney/2.png Binary files differdeleted file mode 100644 index 8c6d51434..000000000 --- a/graphics/event_objects/pics/people/sidney/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/steven.png b/graphics/event_objects/pics/people/steven.png Binary files differnew file mode 100755 index 000000000..da692f51d --- /dev/null +++ b/graphics/event_objects/pics/people/steven.png diff --git a/graphics/event_objects/pics/people/steven/0.png b/graphics/event_objects/pics/people/steven/0.png Binary files differdeleted file mode 100644 index 35cc4d404..000000000 --- a/graphics/event_objects/pics/people/steven/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/steven/1.png b/graphics/event_objects/pics/people/steven/1.png Binary files differdeleted file mode 100644 index 37a8367ea..000000000 --- a/graphics/event_objects/pics/people/steven/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/steven/2.png b/graphics/event_objects/pics/people/steven/2.png Binary files differdeleted file mode 100644 index 4d0447529..000000000 --- a/graphics/event_objects/pics/people/steven/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/steven/3.png b/graphics/event_objects/pics/people/steven/3.png Binary files differdeleted file mode 100644 index b2094c8b6..000000000 --- a/graphics/event_objects/pics/people/steven/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/steven/4.png b/graphics/event_objects/pics/people/steven/4.png Binary files differdeleted file mode 100644 index d47448bc8..000000000 --- a/graphics/event_objects/pics/people/steven/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/steven/5.png b/graphics/event_objects/pics/people/steven/5.png Binary files differdeleted file mode 100644 index e023078ee..000000000 --- a/graphics/event_objects/pics/people/steven/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/steven/6.png b/graphics/event_objects/pics/people/steven/6.png Binary files differdeleted file mode 100644 index fb885a1bd..000000000 --- a/graphics/event_objects/pics/people/steven/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/steven/7.png b/graphics/event_objects/pics/people/steven/7.png Binary files differdeleted file mode 100644 index ee2fbbb5f..000000000 --- a/graphics/event_objects/pics/people/steven/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/steven/8.png b/graphics/event_objects/pics/people/steven/8.png Binary files differdeleted file mode 100644 index e140731cd..000000000 --- a/graphics/event_objects/pics/people/steven/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_f.png b/graphics/event_objects/pics/people/swimmer_f.png Binary files differnew file mode 100755 index 000000000..962e60a9c --- /dev/null +++ b/graphics/event_objects/pics/people/swimmer_f.png diff --git a/graphics/event_objects/pics/people/swimmer_f/0.png b/graphics/event_objects/pics/people/swimmer_f/0.png Binary files differdeleted file mode 100644 index e34972cc7..000000000 --- a/graphics/event_objects/pics/people/swimmer_f/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_f/1.png b/graphics/event_objects/pics/people/swimmer_f/1.png Binary files differdeleted file mode 100644 index 64c3c79e5..000000000 --- a/graphics/event_objects/pics/people/swimmer_f/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_f/2.png b/graphics/event_objects/pics/people/swimmer_f/2.png Binary files differdeleted file mode 100644 index cf4d17d5d..000000000 --- a/graphics/event_objects/pics/people/swimmer_f/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_f/3.png b/graphics/event_objects/pics/people/swimmer_f/3.png Binary files differdeleted file mode 100644 index e8edbc9a6..000000000 --- a/graphics/event_objects/pics/people/swimmer_f/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_f/4.png b/graphics/event_objects/pics/people/swimmer_f/4.png Binary files differdeleted file mode 100644 index 1f5abf77e..000000000 --- a/graphics/event_objects/pics/people/swimmer_f/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_f/5.png b/graphics/event_objects/pics/people/swimmer_f/5.png Binary files differdeleted file mode 100644 index 5e19861cb..000000000 --- a/graphics/event_objects/pics/people/swimmer_f/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_f/6.png b/graphics/event_objects/pics/people/swimmer_f/6.png Binary files differdeleted file mode 100644 index c4b602391..000000000 --- a/graphics/event_objects/pics/people/swimmer_f/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_f/7.png b/graphics/event_objects/pics/people/swimmer_f/7.png Binary files differdeleted file mode 100644 index beb17704a..000000000 --- a/graphics/event_objects/pics/people/swimmer_f/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_f/8.png b/graphics/event_objects/pics/people/swimmer_f/8.png Binary files differdeleted file mode 100644 index db5588f7c..000000000 --- a/graphics/event_objects/pics/people/swimmer_f/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_m.png b/graphics/event_objects/pics/people/swimmer_m.png Binary files differnew file mode 100755 index 000000000..eb1733da8 --- /dev/null +++ b/graphics/event_objects/pics/people/swimmer_m.png diff --git a/graphics/event_objects/pics/people/swimmer_m/0.png b/graphics/event_objects/pics/people/swimmer_m/0.png Binary files differdeleted file mode 100644 index 51d63bb26..000000000 --- a/graphics/event_objects/pics/people/swimmer_m/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_m/1.png b/graphics/event_objects/pics/people/swimmer_m/1.png Binary files differdeleted file mode 100644 index d1f976558..000000000 --- a/graphics/event_objects/pics/people/swimmer_m/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_m/2.png b/graphics/event_objects/pics/people/swimmer_m/2.png Binary files differdeleted file mode 100644 index b4087efb5..000000000 --- a/graphics/event_objects/pics/people/swimmer_m/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_m/3.png b/graphics/event_objects/pics/people/swimmer_m/3.png Binary files differdeleted file mode 100644 index 4f445b8a8..000000000 --- a/graphics/event_objects/pics/people/swimmer_m/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_m/4.png b/graphics/event_objects/pics/people/swimmer_m/4.png Binary files differdeleted file mode 100644 index 940e8cf5d..000000000 --- a/graphics/event_objects/pics/people/swimmer_m/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_m/5.png b/graphics/event_objects/pics/people/swimmer_m/5.png Binary files differdeleted file mode 100644 index d6be697b0..000000000 --- a/graphics/event_objects/pics/people/swimmer_m/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_m/6.png b/graphics/event_objects/pics/people/swimmer_m/6.png Binary files differdeleted file mode 100644 index cb2de823b..000000000 --- a/graphics/event_objects/pics/people/swimmer_m/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_m/7.png b/graphics/event_objects/pics/people/swimmer_m/7.png Binary files differdeleted file mode 100644 index b17892261..000000000 --- a/graphics/event_objects/pics/people/swimmer_m/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/swimmer_m/8.png b/graphics/event_objects/pics/people/swimmer_m/8.png Binary files differdeleted file mode 100644 index 1f3fd48d0..000000000 --- a/graphics/event_objects/pics/people/swimmer_m/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tate.png b/graphics/event_objects/pics/people/tate.png Binary files differnew file mode 100755 index 000000000..f73ee136b --- /dev/null +++ b/graphics/event_objects/pics/people/tate.png diff --git a/graphics/event_objects/pics/people/tate/0.png b/graphics/event_objects/pics/people/tate/0.png Binary files differdeleted file mode 100644 index f2481f1e2..000000000 --- a/graphics/event_objects/pics/people/tate/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tate/1.png b/graphics/event_objects/pics/people/tate/1.png Binary files differdeleted file mode 100644 index ff1608cf2..000000000 --- a/graphics/event_objects/pics/people/tate/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tate/2.png b/graphics/event_objects/pics/people/tate/2.png Binary files differdeleted file mode 100644 index 9fba8459d..000000000 --- a/graphics/event_objects/pics/people/tate/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/teala.png b/graphics/event_objects/pics/people/teala.png Binary files differnew file mode 100755 index 000000000..cfc47b112 --- /dev/null +++ b/graphics/event_objects/pics/people/teala.png diff --git a/graphics/event_objects/pics/people/teala/0.png b/graphics/event_objects/pics/people/teala/0.png Binary files differdeleted file mode 100644 index 173152306..000000000 --- a/graphics/event_objects/pics/people/teala/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/teala/1.png b/graphics/event_objects/pics/people/teala/1.png Binary files differdeleted file mode 100644 index 2340f3262..000000000 --- a/graphics/event_objects/pics/people/teala/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/teala/2.png b/graphics/event_objects/pics/people/teala/2.png Binary files differdeleted file mode 100644 index 1900d9e8d..000000000 --- a/graphics/event_objects/pics/people/teala/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/teala/3.png b/graphics/event_objects/pics/people/teala/3.png Binary files differdeleted file mode 100644 index f3d46c920..000000000 --- a/graphics/event_objects/pics/people/teala/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/teala/4.png b/graphics/event_objects/pics/people/teala/4.png Binary files differdeleted file mode 100644 index 5b70939b2..000000000 --- a/graphics/event_objects/pics/people/teala/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/teala/5.png b/graphics/event_objects/pics/people/teala/5.png Binary files differdeleted file mode 100644 index fcba35792..000000000 --- a/graphics/event_objects/pics/people/teala/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/teala/6.png b/graphics/event_objects/pics/people/teala/6.png Binary files differdeleted file mode 100644 index 85a574bb8..000000000 --- a/graphics/event_objects/pics/people/teala/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/teala/7.png b/graphics/event_objects/pics/people/teala/7.png Binary files differdeleted file mode 100644 index 882d7adca..000000000 --- a/graphics/event_objects/pics/people/teala/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/teala/8.png b/graphics/event_objects/pics/people/teala/8.png Binary files differdeleted file mode 100644 index 4366d38f9..000000000 --- a/graphics/event_objects/pics/people/teala/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_f.png b/graphics/event_objects/pics/people/tuber_f.png Binary files differnew file mode 100755 index 000000000..bfcab635a --- /dev/null +++ b/graphics/event_objects/pics/people/tuber_f.png diff --git a/graphics/event_objects/pics/people/tuber_f/0.png b/graphics/event_objects/pics/people/tuber_f/0.png Binary files differdeleted file mode 100644 index 34081dbad..000000000 --- a/graphics/event_objects/pics/people/tuber_f/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_f/1.png b/graphics/event_objects/pics/people/tuber_f/1.png Binary files differdeleted file mode 100644 index 5ad154c38..000000000 --- a/graphics/event_objects/pics/people/tuber_f/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_f/2.png b/graphics/event_objects/pics/people/tuber_f/2.png Binary files differdeleted file mode 100644 index d87de1307..000000000 --- a/graphics/event_objects/pics/people/tuber_f/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_f/3.png b/graphics/event_objects/pics/people/tuber_f/3.png Binary files differdeleted file mode 100644 index 17ffb8845..000000000 --- a/graphics/event_objects/pics/people/tuber_f/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_f/4.png b/graphics/event_objects/pics/people/tuber_f/4.png Binary files differdeleted file mode 100644 index 9de7aa0ab..000000000 --- a/graphics/event_objects/pics/people/tuber_f/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_f/5.png b/graphics/event_objects/pics/people/tuber_f/5.png Binary files differdeleted file mode 100644 index 16bd9c685..000000000 --- a/graphics/event_objects/pics/people/tuber_f/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_f/6.png b/graphics/event_objects/pics/people/tuber_f/6.png Binary files differdeleted file mode 100644 index e026ea45d..000000000 --- a/graphics/event_objects/pics/people/tuber_f/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_f/7.png b/graphics/event_objects/pics/people/tuber_f/7.png Binary files differdeleted file mode 100644 index fbabc200d..000000000 --- a/graphics/event_objects/pics/people/tuber_f/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_f/8.png b/graphics/event_objects/pics/people/tuber_f/8.png Binary files differdeleted file mode 100644 index ad08f016b..000000000 --- a/graphics/event_objects/pics/people/tuber_f/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m.png b/graphics/event_objects/pics/people/tuber_m.png Binary files differnew file mode 100755 index 000000000..48bc3b3b4 --- /dev/null +++ b/graphics/event_objects/pics/people/tuber_m.png diff --git a/graphics/event_objects/pics/people/tuber_m/0.png b/graphics/event_objects/pics/people/tuber_m/0.png Binary files differdeleted file mode 100644 index 323439703..000000000 --- a/graphics/event_objects/pics/people/tuber_m/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m/1.png b/graphics/event_objects/pics/people/tuber_m/1.png Binary files differdeleted file mode 100644 index dfce73bbc..000000000 --- a/graphics/event_objects/pics/people/tuber_m/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m/2.png b/graphics/event_objects/pics/people/tuber_m/2.png Binary files differdeleted file mode 100644 index 1b1de564f..000000000 --- a/graphics/event_objects/pics/people/tuber_m/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m/3.png b/graphics/event_objects/pics/people/tuber_m/3.png Binary files differdeleted file mode 100644 index 39f37a19b..000000000 --- a/graphics/event_objects/pics/people/tuber_m/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m/4.png b/graphics/event_objects/pics/people/tuber_m/4.png Binary files differdeleted file mode 100644 index 78fae1160..000000000 --- a/graphics/event_objects/pics/people/tuber_m/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m/5.png b/graphics/event_objects/pics/people/tuber_m/5.png Binary files differdeleted file mode 100644 index 690add8ad..000000000 --- a/graphics/event_objects/pics/people/tuber_m/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m/6.png b/graphics/event_objects/pics/people/tuber_m/6.png Binary files differdeleted file mode 100644 index ff61406b9..000000000 --- a/graphics/event_objects/pics/people/tuber_m/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m/7.png b/graphics/event_objects/pics/people/tuber_m/7.png Binary files differdeleted file mode 100644 index d8c7b98cf..000000000 --- a/graphics/event_objects/pics/people/tuber_m/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m/8.png b/graphics/event_objects/pics/people/tuber_m/8.png Binary files differdeleted file mode 100644 index 4ec4b5599..000000000 --- a/graphics/event_objects/pics/people/tuber_m/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m_swimming.png b/graphics/event_objects/pics/people/tuber_m_swimming.png Binary files differnew file mode 100755 index 000000000..15dedb259 --- /dev/null +++ b/graphics/event_objects/pics/people/tuber_m_swimming.png diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/0.png b/graphics/event_objects/pics/people/tuber_m_swimming/0.png Binary files differdeleted file mode 100644 index c6ba83d87..000000000 --- a/graphics/event_objects/pics/people/tuber_m_swimming/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/1.png b/graphics/event_objects/pics/people/tuber_m_swimming/1.png Binary files differdeleted file mode 100644 index 85eb42650..000000000 --- a/graphics/event_objects/pics/people/tuber_m_swimming/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/2.png b/graphics/event_objects/pics/people/tuber_m_swimming/2.png Binary files differdeleted file mode 100644 index 1cca717b0..000000000 --- a/graphics/event_objects/pics/people/tuber_m_swimming/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/3.png b/graphics/event_objects/pics/people/tuber_m_swimming/3.png Binary files differdeleted file mode 100644 index 253d75ed0..000000000 --- a/graphics/event_objects/pics/people/tuber_m_swimming/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/4.png b/graphics/event_objects/pics/people/tuber_m_swimming/4.png Binary files differdeleted file mode 100644 index d64c9033f..000000000 --- a/graphics/event_objects/pics/people/tuber_m_swimming/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/5.png b/graphics/event_objects/pics/people/tuber_m_swimming/5.png Binary files differdeleted file mode 100644 index 2a8e7d67d..000000000 --- a/graphics/event_objects/pics/people/tuber_m_swimming/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/6.png b/graphics/event_objects/pics/people/tuber_m_swimming/6.png Binary files differdeleted file mode 100644 index c55acdf29..000000000 --- a/graphics/event_objects/pics/people/tuber_m_swimming/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/7.png b/graphics/event_objects/pics/people/tuber_m_swimming/7.png Binary files differdeleted file mode 100644 index 7a203920f..000000000 --- a/graphics/event_objects/pics/people/tuber_m_swimming/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/8.png b/graphics/event_objects/pics/people/tuber_m_swimming/8.png Binary files differdeleted file mode 100644 index 321f8acca..000000000 --- a/graphics/event_objects/pics/people/tuber_m_swimming/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wallace.png b/graphics/event_objects/pics/people/wallace.png Binary files differnew file mode 100755 index 000000000..7ca572a18 --- /dev/null +++ b/graphics/event_objects/pics/people/wallace.png diff --git a/graphics/event_objects/pics/people/wallace/0.png b/graphics/event_objects/pics/people/wallace/0.png Binary files differdeleted file mode 100644 index a3b4bd5bf..000000000 --- a/graphics/event_objects/pics/people/wallace/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wallace/1.png b/graphics/event_objects/pics/people/wallace/1.png Binary files differdeleted file mode 100644 index 583f2a807..000000000 --- a/graphics/event_objects/pics/people/wallace/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wallace/2.png b/graphics/event_objects/pics/people/wallace/2.png Binary files differdeleted file mode 100644 index 31249d0cd..000000000 --- a/graphics/event_objects/pics/people/wallace/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wallace/3.png b/graphics/event_objects/pics/people/wallace/3.png Binary files differdeleted file mode 100644 index 850ec7250..000000000 --- a/graphics/event_objects/pics/people/wallace/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wallace/4.png b/graphics/event_objects/pics/people/wallace/4.png Binary files differdeleted file mode 100644 index 99e2dd897..000000000 --- a/graphics/event_objects/pics/people/wallace/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wallace/5.png b/graphics/event_objects/pics/people/wallace/5.png Binary files differdeleted file mode 100644 index 5923b1b5b..000000000 --- a/graphics/event_objects/pics/people/wallace/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wallace/6.png b/graphics/event_objects/pics/people/wallace/6.png Binary files differdeleted file mode 100644 index 1f2b655c0..000000000 --- a/graphics/event_objects/pics/people/wallace/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wallace/7.png b/graphics/event_objects/pics/people/wallace/7.png Binary files differdeleted file mode 100644 index a56ab6d58..000000000 --- a/graphics/event_objects/pics/people/wallace/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wallace/8.png b/graphics/event_objects/pics/people/wallace/8.png Binary files differdeleted file mode 100644 index b76c611cc..000000000 --- a/graphics/event_objects/pics/people/wallace/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wally.png b/graphics/event_objects/pics/people/wally.png Binary files differnew file mode 100755 index 000000000..190ee6713 --- /dev/null +++ b/graphics/event_objects/pics/people/wally.png diff --git a/graphics/event_objects/pics/people/wally/0.png b/graphics/event_objects/pics/people/wally/0.png Binary files differdeleted file mode 100644 index b185bc294..000000000 --- a/graphics/event_objects/pics/people/wally/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wally/1.png b/graphics/event_objects/pics/people/wally/1.png Binary files differdeleted file mode 100644 index 42f5a3f0a..000000000 --- a/graphics/event_objects/pics/people/wally/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wally/2.png b/graphics/event_objects/pics/people/wally/2.png Binary files differdeleted file mode 100644 index ed32f1f41..000000000 --- a/graphics/event_objects/pics/people/wally/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wally/3.png b/graphics/event_objects/pics/people/wally/3.png Binary files differdeleted file mode 100644 index 5d2213b2c..000000000 --- a/graphics/event_objects/pics/people/wally/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wally/4.png b/graphics/event_objects/pics/people/wally/4.png Binary files differdeleted file mode 100644 index af996a72a..000000000 --- a/graphics/event_objects/pics/people/wally/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wally/5.png b/graphics/event_objects/pics/people/wally/5.png Binary files differdeleted file mode 100644 index de23077ce..000000000 --- a/graphics/event_objects/pics/people/wally/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wally/6.png b/graphics/event_objects/pics/people/wally/6.png Binary files differdeleted file mode 100644 index 42397e95e..000000000 --- a/graphics/event_objects/pics/people/wally/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wally/7.png b/graphics/event_objects/pics/people/wally/7.png Binary files differdeleted file mode 100644 index 46dbdfa3b..000000000 --- a/graphics/event_objects/pics/people/wally/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wally/8.png b/graphics/event_objects/pics/people/wally/8.png Binary files differdeleted file mode 100644 index 5b7038b44..000000000 --- a/graphics/event_objects/pics/people/wally/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wattson.png b/graphics/event_objects/pics/people/wattson.png Binary files differnew file mode 100755 index 000000000..73ab5e8fc --- /dev/null +++ b/graphics/event_objects/pics/people/wattson.png diff --git a/graphics/event_objects/pics/people/wattson/0.png b/graphics/event_objects/pics/people/wattson/0.png Binary files differdeleted file mode 100644 index 28eaa1bf2..000000000 --- a/graphics/event_objects/pics/people/wattson/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wattson/1.png b/graphics/event_objects/pics/people/wattson/1.png Binary files differdeleted file mode 100644 index b26ab83f4..000000000 --- a/graphics/event_objects/pics/people/wattson/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/wattson/2.png b/graphics/event_objects/pics/people/wattson/2.png Binary files differdeleted file mode 100644 index 2d7fe024b..000000000 --- a/graphics/event_objects/pics/people/wattson/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/winona.png b/graphics/event_objects/pics/people/winona.png Binary files differnew file mode 100755 index 000000000..9a1ce83eb --- /dev/null +++ b/graphics/event_objects/pics/people/winona.png diff --git a/graphics/event_objects/pics/people/winona/0.png b/graphics/event_objects/pics/people/winona/0.png Binary files differdeleted file mode 100644 index 4df463363..000000000 --- a/graphics/event_objects/pics/people/winona/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/winona/1.png b/graphics/event_objects/pics/people/winona/1.png Binary files differdeleted file mode 100644 index 75d255c7a..000000000 --- a/graphics/event_objects/pics/people/winona/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/winona/2.png b/graphics/event_objects/pics/people/winona/2.png Binary files differdeleted file mode 100644 index 569dea105..000000000 --- a/graphics/event_objects/pics/people/winona/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_1.png b/graphics/event_objects/pics/people/woman_1.png Binary files differnew file mode 100755 index 000000000..2207993f7 --- /dev/null +++ b/graphics/event_objects/pics/people/woman_1.png diff --git a/graphics/event_objects/pics/people/woman_1/0.png b/graphics/event_objects/pics/people/woman_1/0.png Binary files differdeleted file mode 100644 index cb2949038..000000000 --- a/graphics/event_objects/pics/people/woman_1/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_1/1.png b/graphics/event_objects/pics/people/woman_1/1.png Binary files differdeleted file mode 100644 index ea8dc9119..000000000 --- a/graphics/event_objects/pics/people/woman_1/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_1/2.png b/graphics/event_objects/pics/people/woman_1/2.png Binary files differdeleted file mode 100644 index b0bd3e1b1..000000000 --- a/graphics/event_objects/pics/people/woman_1/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_1/3.png b/graphics/event_objects/pics/people/woman_1/3.png Binary files differdeleted file mode 100644 index e7ed6c112..000000000 --- a/graphics/event_objects/pics/people/woman_1/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_1/4.png b/graphics/event_objects/pics/people/woman_1/4.png Binary files differdeleted file mode 100644 index 05f7e7839..000000000 --- a/graphics/event_objects/pics/people/woman_1/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_1/5.png b/graphics/event_objects/pics/people/woman_1/5.png Binary files differdeleted file mode 100644 index e23e364cd..000000000 --- a/graphics/event_objects/pics/people/woman_1/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_1/6.png b/graphics/event_objects/pics/people/woman_1/6.png Binary files differdeleted file mode 100644 index a1e6f69ab..000000000 --- a/graphics/event_objects/pics/people/woman_1/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_1/7.png b/graphics/event_objects/pics/people/woman_1/7.png Binary files differdeleted file mode 100644 index 985172d52..000000000 --- a/graphics/event_objects/pics/people/woman_1/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_1/8.png b/graphics/event_objects/pics/people/woman_1/8.png Binary files differdeleted file mode 100644 index f5e560b59..000000000 --- a/graphics/event_objects/pics/people/woman_1/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_2.png b/graphics/event_objects/pics/people/woman_2.png Binary files differnew file mode 100755 index 000000000..c97fc3507 --- /dev/null +++ b/graphics/event_objects/pics/people/woman_2.png diff --git a/graphics/event_objects/pics/people/woman_2/0.png b/graphics/event_objects/pics/people/woman_2/0.png Binary files differdeleted file mode 100644 index d9656ce73..000000000 --- a/graphics/event_objects/pics/people/woman_2/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_2/1.png b/graphics/event_objects/pics/people/woman_2/1.png Binary files differdeleted file mode 100644 index 23d97812b..000000000 --- a/graphics/event_objects/pics/people/woman_2/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_2/2.png b/graphics/event_objects/pics/people/woman_2/2.png Binary files differdeleted file mode 100644 index f298e6eea..000000000 --- a/graphics/event_objects/pics/people/woman_2/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_2/3.png b/graphics/event_objects/pics/people/woman_2/3.png Binary files differdeleted file mode 100644 index 53809fd32..000000000 --- a/graphics/event_objects/pics/people/woman_2/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_2/4.png b/graphics/event_objects/pics/people/woman_2/4.png Binary files differdeleted file mode 100644 index 8f3fbe35f..000000000 --- a/graphics/event_objects/pics/people/woman_2/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_2/5.png b/graphics/event_objects/pics/people/woman_2/5.png Binary files differdeleted file mode 100644 index d02680904..000000000 --- a/graphics/event_objects/pics/people/woman_2/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_2/6.png b/graphics/event_objects/pics/people/woman_2/6.png Binary files differdeleted file mode 100644 index 4999cf1b1..000000000 --- a/graphics/event_objects/pics/people/woman_2/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_2/7.png b/graphics/event_objects/pics/people/woman_2/7.png Binary files differdeleted file mode 100644 index 17e669531..000000000 --- a/graphics/event_objects/pics/people/woman_2/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_2/8.png b/graphics/event_objects/pics/people/woman_2/8.png Binary files differdeleted file mode 100644 index f59199574..000000000 --- a/graphics/event_objects/pics/people/woman_2/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_3.png b/graphics/event_objects/pics/people/woman_3.png Binary files differnew file mode 100755 index 000000000..8d35b1653 --- /dev/null +++ b/graphics/event_objects/pics/people/woman_3.png diff --git a/graphics/event_objects/pics/people/woman_3/0.png b/graphics/event_objects/pics/people/woman_3/0.png Binary files differdeleted file mode 100644 index ac9ed557e..000000000 --- a/graphics/event_objects/pics/people/woman_3/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_3/1.png b/graphics/event_objects/pics/people/woman_3/1.png Binary files differdeleted file mode 100644 index a7dbe7ec3..000000000 --- a/graphics/event_objects/pics/people/woman_3/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_3/2.png b/graphics/event_objects/pics/people/woman_3/2.png Binary files differdeleted file mode 100644 index 23852c71b..000000000 --- a/graphics/event_objects/pics/people/woman_3/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_3/3.png b/graphics/event_objects/pics/people/woman_3/3.png Binary files differdeleted file mode 100644 index 525958cbb..000000000 --- a/graphics/event_objects/pics/people/woman_3/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_3/4.png b/graphics/event_objects/pics/people/woman_3/4.png Binary files differdeleted file mode 100644 index 6feabedd0..000000000 --- a/graphics/event_objects/pics/people/woman_3/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_3/5.png b/graphics/event_objects/pics/people/woman_3/5.png Binary files differdeleted file mode 100644 index f174b0184..000000000 --- a/graphics/event_objects/pics/people/woman_3/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_3/6.png b/graphics/event_objects/pics/people/woman_3/6.png Binary files differdeleted file mode 100644 index 1b4b6d08a..000000000 --- a/graphics/event_objects/pics/people/woman_3/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_3/7.png b/graphics/event_objects/pics/people/woman_3/7.png Binary files differdeleted file mode 100644 index d8c2bfd99..000000000 --- a/graphics/event_objects/pics/people/woman_3/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_3/8.png b/graphics/event_objects/pics/people/woman_3/8.png Binary files differdeleted file mode 100644 index 0517b9993..000000000 --- a/graphics/event_objects/pics/people/woman_3/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_4.png b/graphics/event_objects/pics/people/woman_4.png Binary files differnew file mode 100755 index 000000000..2a29acae3 --- /dev/null +++ b/graphics/event_objects/pics/people/woman_4.png diff --git a/graphics/event_objects/pics/people/woman_4/0.png b/graphics/event_objects/pics/people/woman_4/0.png Binary files differdeleted file mode 100644 index 88489b6a6..000000000 --- a/graphics/event_objects/pics/people/woman_4/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_4/1.png b/graphics/event_objects/pics/people/woman_4/1.png Binary files differdeleted file mode 100644 index 1cc24ca36..000000000 --- a/graphics/event_objects/pics/people/woman_4/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_4/2.png b/graphics/event_objects/pics/people/woman_4/2.png Binary files differdeleted file mode 100644 index efedc4a01..000000000 --- a/graphics/event_objects/pics/people/woman_4/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_4/3.png b/graphics/event_objects/pics/people/woman_4/3.png Binary files differdeleted file mode 100644 index a186b454e..000000000 --- a/graphics/event_objects/pics/people/woman_4/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_4/4.png b/graphics/event_objects/pics/people/woman_4/4.png Binary files differdeleted file mode 100644 index c5cc8670d..000000000 --- a/graphics/event_objects/pics/people/woman_4/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_4/5.png b/graphics/event_objects/pics/people/woman_4/5.png Binary files differdeleted file mode 100644 index f08133faa..000000000 --- a/graphics/event_objects/pics/people/woman_4/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_4/6.png b/graphics/event_objects/pics/people/woman_4/6.png Binary files differdeleted file mode 100644 index dec6f3146..000000000 --- a/graphics/event_objects/pics/people/woman_4/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_4/7.png b/graphics/event_objects/pics/people/woman_4/7.png Binary files differdeleted file mode 100644 index 4912065a5..000000000 --- a/graphics/event_objects/pics/people/woman_4/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_4/8.png b/graphics/event_objects/pics/people/woman_4/8.png Binary files differdeleted file mode 100644 index 21cd91f67..000000000 --- a/graphics/event_objects/pics/people/woman_4/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_5.png b/graphics/event_objects/pics/people/woman_5.png Binary files differnew file mode 100755 index 000000000..95dfc76da --- /dev/null +++ b/graphics/event_objects/pics/people/woman_5.png diff --git a/graphics/event_objects/pics/people/woman_5/0.png b/graphics/event_objects/pics/people/woman_5/0.png Binary files differdeleted file mode 100644 index 30ff1cf1c..000000000 --- a/graphics/event_objects/pics/people/woman_5/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_5/1.png b/graphics/event_objects/pics/people/woman_5/1.png Binary files differdeleted file mode 100644 index 3a5cf543e..000000000 --- a/graphics/event_objects/pics/people/woman_5/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_5/2.png b/graphics/event_objects/pics/people/woman_5/2.png Binary files differdeleted file mode 100644 index 066d52259..000000000 --- a/graphics/event_objects/pics/people/woman_5/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_5/3.png b/graphics/event_objects/pics/people/woman_5/3.png Binary files differdeleted file mode 100644 index 737877bb6..000000000 --- a/graphics/event_objects/pics/people/woman_5/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_5/4.png b/graphics/event_objects/pics/people/woman_5/4.png Binary files differdeleted file mode 100644 index 170d45929..000000000 --- a/graphics/event_objects/pics/people/woman_5/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_5/5.png b/graphics/event_objects/pics/people/woman_5/5.png Binary files differdeleted file mode 100644 index 2bae62dde..000000000 --- a/graphics/event_objects/pics/people/woman_5/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_5/6.png b/graphics/event_objects/pics/people/woman_5/6.png Binary files differdeleted file mode 100644 index 519897644..000000000 --- a/graphics/event_objects/pics/people/woman_5/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_5/7.png b/graphics/event_objects/pics/people/woman_5/7.png Binary files differdeleted file mode 100644 index c8ec75432..000000000 --- a/graphics/event_objects/pics/people/woman_5/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_5/8.png b/graphics/event_objects/pics/people/woman_5/8.png Binary files differdeleted file mode 100644 index c4c05fcd9..000000000 --- a/graphics/event_objects/pics/people/woman_5/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_6.png b/graphics/event_objects/pics/people/woman_6.png Binary files differnew file mode 100755 index 000000000..2ffdd5af6 --- /dev/null +++ b/graphics/event_objects/pics/people/woman_6.png diff --git a/graphics/event_objects/pics/people/woman_6/0.png b/graphics/event_objects/pics/people/woman_6/0.png Binary files differdeleted file mode 100644 index 61cce57b0..000000000 --- a/graphics/event_objects/pics/people/woman_6/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_6/1.png b/graphics/event_objects/pics/people/woman_6/1.png Binary files differdeleted file mode 100644 index ea399ef74..000000000 --- a/graphics/event_objects/pics/people/woman_6/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_6/2.png b/graphics/event_objects/pics/people/woman_6/2.png Binary files differdeleted file mode 100644 index 574121114..000000000 --- a/graphics/event_objects/pics/people/woman_6/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_6/3.png b/graphics/event_objects/pics/people/woman_6/3.png Binary files differdeleted file mode 100644 index 538e60433..000000000 --- a/graphics/event_objects/pics/people/woman_6/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_6/4.png b/graphics/event_objects/pics/people/woman_6/4.png Binary files differdeleted file mode 100644 index 746cefd09..000000000 --- a/graphics/event_objects/pics/people/woman_6/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_6/5.png b/graphics/event_objects/pics/people/woman_6/5.png Binary files differdeleted file mode 100644 index 4c4e2c5b0..000000000 --- a/graphics/event_objects/pics/people/woman_6/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_6/6.png b/graphics/event_objects/pics/people/woman_6/6.png Binary files differdeleted file mode 100644 index efd7b76ca..000000000 --- a/graphics/event_objects/pics/people/woman_6/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_6/7.png b/graphics/event_objects/pics/people/woman_6/7.png Binary files differdeleted file mode 100644 index 2009f5e9a..000000000 --- a/graphics/event_objects/pics/people/woman_6/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_6/8.png b/graphics/event_objects/pics/people/woman_6/8.png Binary files differdeleted file mode 100644 index 9dd33b643..000000000 --- a/graphics/event_objects/pics/people/woman_6/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_7.png b/graphics/event_objects/pics/people/woman_7.png Binary files differnew file mode 100755 index 000000000..b526e9bc6 --- /dev/null +++ b/graphics/event_objects/pics/people/woman_7.png diff --git a/graphics/event_objects/pics/people/woman_7/0.png b/graphics/event_objects/pics/people/woman_7/0.png Binary files differdeleted file mode 100644 index 3adafee30..000000000 --- a/graphics/event_objects/pics/people/woman_7/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_7/1.png b/graphics/event_objects/pics/people/woman_7/1.png Binary files differdeleted file mode 100644 index 835bc5fec..000000000 --- a/graphics/event_objects/pics/people/woman_7/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_7/2.png b/graphics/event_objects/pics/people/woman_7/2.png Binary files differdeleted file mode 100644 index b912ef4bf..000000000 --- a/graphics/event_objects/pics/people/woman_7/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_7/3.png b/graphics/event_objects/pics/people/woman_7/3.png Binary files differdeleted file mode 100644 index b83b62226..000000000 --- a/graphics/event_objects/pics/people/woman_7/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_7/4.png b/graphics/event_objects/pics/people/woman_7/4.png Binary files differdeleted file mode 100644 index 193f9a4dd..000000000 --- a/graphics/event_objects/pics/people/woman_7/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_7/5.png b/graphics/event_objects/pics/people/woman_7/5.png Binary files differdeleted file mode 100644 index 3704875b2..000000000 --- a/graphics/event_objects/pics/people/woman_7/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_7/6.png b/graphics/event_objects/pics/people/woman_7/6.png Binary files differdeleted file mode 100644 index ba829becd..000000000 --- a/graphics/event_objects/pics/people/woman_7/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_7/7.png b/graphics/event_objects/pics/people/woman_7/7.png Binary files differdeleted file mode 100644 index b6aac4b99..000000000 --- a/graphics/event_objects/pics/people/woman_7/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_7/8.png b/graphics/event_objects/pics/people/woman_7/8.png Binary files differdeleted file mode 100644 index b9c8b50fc..000000000 --- a/graphics/event_objects/pics/people/woman_7/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_8.png b/graphics/event_objects/pics/people/woman_8.png Binary files differnew file mode 100755 index 000000000..d69514e5f --- /dev/null +++ b/graphics/event_objects/pics/people/woman_8.png diff --git a/graphics/event_objects/pics/people/woman_8/0.png b/graphics/event_objects/pics/people/woman_8/0.png Binary files differdeleted file mode 100644 index c6d9e955f..000000000 --- a/graphics/event_objects/pics/people/woman_8/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_8/1.png b/graphics/event_objects/pics/people/woman_8/1.png Binary files differdeleted file mode 100644 index 7ed02247b..000000000 --- a/graphics/event_objects/pics/people/woman_8/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_8/2.png b/graphics/event_objects/pics/people/woman_8/2.png Binary files differdeleted file mode 100644 index 6fc203557..000000000 --- a/graphics/event_objects/pics/people/woman_8/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_8/3.png b/graphics/event_objects/pics/people/woman_8/3.png Binary files differdeleted file mode 100644 index 2533909b9..000000000 --- a/graphics/event_objects/pics/people/woman_8/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_8/4.png b/graphics/event_objects/pics/people/woman_8/4.png Binary files differdeleted file mode 100644 index bd4cb52fc..000000000 --- a/graphics/event_objects/pics/people/woman_8/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_8/5.png b/graphics/event_objects/pics/people/woman_8/5.png Binary files differdeleted file mode 100644 index d7efe0f70..000000000 --- a/graphics/event_objects/pics/people/woman_8/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_8/6.png b/graphics/event_objects/pics/people/woman_8/6.png Binary files differdeleted file mode 100644 index 67cd94743..000000000 --- a/graphics/event_objects/pics/people/woman_8/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_8/7.png b/graphics/event_objects/pics/people/woman_8/7.png Binary files differdeleted file mode 100644 index fba5ff510..000000000 --- a/graphics/event_objects/pics/people/woman_8/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/woman_8/8.png b/graphics/event_objects/pics/people/woman_8/8.png Binary files differdeleted file mode 100644 index 3f807597d..000000000 --- a/graphics/event_objects/pics/people/woman_8/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/youngster.png b/graphics/event_objects/pics/people/youngster.png Binary files differnew file mode 100755 index 000000000..c17e7c6cf --- /dev/null +++ b/graphics/event_objects/pics/people/youngster.png diff --git a/graphics/event_objects/pics/people/youngster/0.png b/graphics/event_objects/pics/people/youngster/0.png Binary files differdeleted file mode 100644 index b370f8141..000000000 --- a/graphics/event_objects/pics/people/youngster/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/youngster/1.png b/graphics/event_objects/pics/people/youngster/1.png Binary files differdeleted file mode 100644 index 1c1f15b89..000000000 --- a/graphics/event_objects/pics/people/youngster/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/youngster/2.png b/graphics/event_objects/pics/people/youngster/2.png Binary files differdeleted file mode 100644 index c8a936dd2..000000000 --- a/graphics/event_objects/pics/people/youngster/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/youngster/3.png b/graphics/event_objects/pics/people/youngster/3.png Binary files differdeleted file mode 100644 index c9fa72ddb..000000000 --- a/graphics/event_objects/pics/people/youngster/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/youngster/4.png b/graphics/event_objects/pics/people/youngster/4.png Binary files differdeleted file mode 100644 index ba17f34ac..000000000 --- a/graphics/event_objects/pics/people/youngster/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/youngster/5.png b/graphics/event_objects/pics/people/youngster/5.png Binary files differdeleted file mode 100644 index fcd2f196a..000000000 --- a/graphics/event_objects/pics/people/youngster/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/youngster/6.png b/graphics/event_objects/pics/people/youngster/6.png Binary files differdeleted file mode 100644 index fd12b99ea..000000000 --- a/graphics/event_objects/pics/people/youngster/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/youngster/7.png b/graphics/event_objects/pics/people/youngster/7.png Binary files differdeleted file mode 100644 index 626716b8d..000000000 --- a/graphics/event_objects/pics/people/youngster/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/people/youngster/8.png b/graphics/event_objects/pics/people/youngster/8.png Binary files differdeleted file mode 100644 index 3c9662746..000000000 --- a/graphics/event_objects/pics/people/youngster/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/azumarill.png b/graphics/event_objects/pics/pokemon/azumarill.png Binary files differnew file mode 100755 index 000000000..84b07ea5b --- /dev/null +++ b/graphics/event_objects/pics/pokemon/azumarill.png diff --git a/graphics/event_objects/pics/pokemon/azumarill/0.png b/graphics/event_objects/pics/pokemon/azumarill/0.png Binary files differdeleted file mode 100644 index 9b219e552..000000000 --- a/graphics/event_objects/pics/pokemon/azumarill/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/azumarill/1.png b/graphics/event_objects/pics/pokemon/azumarill/1.png Binary files differdeleted file mode 100644 index 16e493f8b..000000000 --- a/graphics/event_objects/pics/pokemon/azumarill/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/azumarill/2.png b/graphics/event_objects/pics/pokemon/azumarill/2.png Binary files differdeleted file mode 100644 index b10e6a283..000000000 --- a/graphics/event_objects/pics/pokemon/azumarill/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/azurill.png b/graphics/event_objects/pics/pokemon/azurill.png Binary files differnew file mode 100755 index 000000000..99cd25fe5 --- /dev/null +++ b/graphics/event_objects/pics/pokemon/azurill.png diff --git a/graphics/event_objects/pics/pokemon/azurill/0.png b/graphics/event_objects/pics/pokemon/azurill/0.png Binary files differdeleted file mode 100644 index efbcea03f..000000000 --- a/graphics/event_objects/pics/pokemon/azurill/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/azurill/1.png b/graphics/event_objects/pics/pokemon/azurill/1.png Binary files differdeleted file mode 100644 index 4e00acdc6..000000000 --- a/graphics/event_objects/pics/pokemon/azurill/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/azurill/2.png b/graphics/event_objects/pics/pokemon/azurill/2.png Binary files differdeleted file mode 100644 index 08bf43c5b..000000000 --- a/graphics/event_objects/pics/pokemon/azurill/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/groudon.png b/graphics/event_objects/pics/pokemon/groudon.png Binary files differnew file mode 100755 index 000000000..fc9ded1f9 --- /dev/null +++ b/graphics/event_objects/pics/pokemon/groudon.png diff --git a/graphics/event_objects/pics/pokemon/groudon/0.png b/graphics/event_objects/pics/pokemon/groudon/0.png Binary files differdeleted file mode 100644 index 9109fcb12..000000000 --- a/graphics/event_objects/pics/pokemon/groudon/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/groudon/1.png b/graphics/event_objects/pics/pokemon/groudon/1.png Binary files differdeleted file mode 100644 index 6f3b6d4fd..000000000 --- a/graphics/event_objects/pics/pokemon/groudon/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/kecleon.png b/graphics/event_objects/pics/pokemon/kecleon.png Binary files differnew file mode 100755 index 000000000..47ae584b7 --- /dev/null +++ b/graphics/event_objects/pics/pokemon/kecleon.png diff --git a/graphics/event_objects/pics/pokemon/kecleon/0.png b/graphics/event_objects/pics/pokemon/kecleon/0.png Binary files differdeleted file mode 100644 index 691797af0..000000000 --- a/graphics/event_objects/pics/pokemon/kecleon/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/kecleon/1.png b/graphics/event_objects/pics/pokemon/kecleon/1.png Binary files differdeleted file mode 100644 index 0d82cc66d..000000000 --- a/graphics/event_objects/pics/pokemon/kecleon/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/kecleon/2.png b/graphics/event_objects/pics/pokemon/kecleon/2.png Binary files differdeleted file mode 100644 index 2713ce057..000000000 --- a/graphics/event_objects/pics/pokemon/kecleon/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/kyogre.png b/graphics/event_objects/pics/pokemon/kyogre.png Binary files differnew file mode 100755 index 000000000..420c034b8 --- /dev/null +++ b/graphics/event_objects/pics/pokemon/kyogre.png diff --git a/graphics/event_objects/pics/pokemon/kyogre/0.png b/graphics/event_objects/pics/pokemon/kyogre/0.png Binary files differdeleted file mode 100644 index 60a2560d5..000000000 --- a/graphics/event_objects/pics/pokemon/kyogre/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/kyogre/1.png b/graphics/event_objects/pics/pokemon/kyogre/1.png Binary files differdeleted file mode 100644 index 8a548648c..000000000 --- a/graphics/event_objects/pics/pokemon/kyogre/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/latias_latios.png b/graphics/event_objects/pics/pokemon/latias_latios.png Binary files differnew file mode 100755 index 000000000..fb3f75f54 --- /dev/null +++ b/graphics/event_objects/pics/pokemon/latias_latios.png diff --git a/graphics/event_objects/pics/pokemon/latias_latios/0.png b/graphics/event_objects/pics/pokemon/latias_latios/0.png Binary files differdeleted file mode 100644 index 3410e8311..000000000 --- a/graphics/event_objects/pics/pokemon/latias_latios/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/latias_latios/1.png b/graphics/event_objects/pics/pokemon/latias_latios/1.png Binary files differdeleted file mode 100644 index 428c2b174..000000000 --- a/graphics/event_objects/pics/pokemon/latias_latios/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/latias_latios/2.png b/graphics/event_objects/pics/pokemon/latias_latios/2.png Binary files differdeleted file mode 100644 index d8fe6dc7a..000000000 --- a/graphics/event_objects/pics/pokemon/latias_latios/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/machoke_carrying_box.png b/graphics/event_objects/pics/pokemon/machoke_carrying_box.png Binary files differnew file mode 100755 index 000000000..d23aa5204 --- /dev/null +++ b/graphics/event_objects/pics/pokemon/machoke_carrying_box.png diff --git a/graphics/event_objects/pics/pokemon/machoke_carrying_box/0.png b/graphics/event_objects/pics/pokemon/machoke_carrying_box/0.png Binary files differdeleted file mode 100644 index 62e6261b7..000000000 --- a/graphics/event_objects/pics/pokemon/machoke_carrying_box/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/machoke_carrying_box/1.png b/graphics/event_objects/pics/pokemon/machoke_carrying_box/1.png Binary files differdeleted file mode 100644 index 770387e17..000000000 --- a/graphics/event_objects/pics/pokemon/machoke_carrying_box/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/machoke_carrying_box/2.png b/graphics/event_objects/pics/pokemon/machoke_carrying_box/2.png Binary files differdeleted file mode 100644 index f22e43af7..000000000 --- a/graphics/event_objects/pics/pokemon/machoke_carrying_box/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/machoke_facing_away.png b/graphics/event_objects/pics/pokemon/machoke_facing_away.png Binary files differnew file mode 100755 index 000000000..1a824432e --- /dev/null +++ b/graphics/event_objects/pics/pokemon/machoke_facing_away.png diff --git a/graphics/event_objects/pics/pokemon/machoke_facing_away/0.png b/graphics/event_objects/pics/pokemon/machoke_facing_away/0.png Binary files differdeleted file mode 100644 index 0913e3f12..000000000 --- a/graphics/event_objects/pics/pokemon/machoke_facing_away/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/machoke_facing_away/1.png b/graphics/event_objects/pics/pokemon/machoke_facing_away/1.png Binary files differdeleted file mode 100644 index a04e17a64..000000000 --- a/graphics/event_objects/pics/pokemon/machoke_facing_away/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/pikachu.png b/graphics/event_objects/pics/pokemon/pikachu.png Binary files differnew file mode 100755 index 000000000..ee742fc87 --- /dev/null +++ b/graphics/event_objects/pics/pokemon/pikachu.png diff --git a/graphics/event_objects/pics/pokemon/pikachu/0.png b/graphics/event_objects/pics/pokemon/pikachu/0.png Binary files differdeleted file mode 100644 index f0db4aa80..000000000 --- a/graphics/event_objects/pics/pokemon/pikachu/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/pikachu/1.png b/graphics/event_objects/pics/pokemon/pikachu/1.png Binary files differdeleted file mode 100644 index 420e6c4c7..000000000 --- a/graphics/event_objects/pics/pokemon/pikachu/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/pikachu/2.png b/graphics/event_objects/pics/pokemon/pikachu/2.png Binary files differdeleted file mode 100644 index 06a3f4b0e..000000000 --- a/graphics/event_objects/pics/pokemon/pikachu/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/poochyena.png b/graphics/event_objects/pics/pokemon/poochyena.png Binary files differnew file mode 100755 index 000000000..171a551d3 --- /dev/null +++ b/graphics/event_objects/pics/pokemon/poochyena.png diff --git a/graphics/event_objects/pics/pokemon/poochyena/0.png b/graphics/event_objects/pics/pokemon/poochyena/0.png Binary files differdeleted file mode 100644 index 1ee042572..000000000 --- a/graphics/event_objects/pics/pokemon/poochyena/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/poochyena/1.png b/graphics/event_objects/pics/pokemon/poochyena/1.png Binary files differdeleted file mode 100644 index 3dbdb383c..000000000 --- a/graphics/event_objects/pics/pokemon/poochyena/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/poochyena/2.png b/graphics/event_objects/pics/pokemon/poochyena/2.png Binary files differdeleted file mode 100644 index bda367b94..000000000 --- a/graphics/event_objects/pics/pokemon/poochyena/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/poochyena/3.png b/graphics/event_objects/pics/pokemon/poochyena/3.png Binary files differdeleted file mode 100644 index 8b7d8f803..000000000 --- a/graphics/event_objects/pics/pokemon/poochyena/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/poochyena/4.png b/graphics/event_objects/pics/pokemon/poochyena/4.png Binary files differdeleted file mode 100644 index 47012ad54..000000000 --- a/graphics/event_objects/pics/pokemon/poochyena/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/poochyena/5.png b/graphics/event_objects/pics/pokemon/poochyena/5.png Binary files differdeleted file mode 100644 index e256e8a07..000000000 --- a/graphics/event_objects/pics/pokemon/poochyena/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/poochyena/6.png b/graphics/event_objects/pics/pokemon/poochyena/6.png Binary files differdeleted file mode 100644 index 173b9fe5e..000000000 --- a/graphics/event_objects/pics/pokemon/poochyena/6.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/poochyena/7.png b/graphics/event_objects/pics/pokemon/poochyena/7.png Binary files differdeleted file mode 100644 index 8fdc28209..000000000 --- a/graphics/event_objects/pics/pokemon/poochyena/7.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/poochyena/8.png b/graphics/event_objects/pics/pokemon/poochyena/8.png Binary files differdeleted file mode 100644 index 911619f6a..000000000 --- a/graphics/event_objects/pics/pokemon/poochyena/8.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/rayquaza.png b/graphics/event_objects/pics/pokemon/rayquaza.png Binary files differnew file mode 100755 index 000000000..713d7852d --- /dev/null +++ b/graphics/event_objects/pics/pokemon/rayquaza.png diff --git a/graphics/event_objects/pics/pokemon/rayquaza/0.png b/graphics/event_objects/pics/pokemon/rayquaza/0.png Binary files differdeleted file mode 100644 index 4abbb047a..000000000 --- a/graphics/event_objects/pics/pokemon/rayquaza/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/rayquaza/1.png b/graphics/event_objects/pics/pokemon/rayquaza/1.png Binary files differdeleted file mode 100644 index 137fe24b1..000000000 --- a/graphics/event_objects/pics/pokemon/rayquaza/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/regi.png b/graphics/event_objects/pics/pokemon/regi.png Binary files differindex 8425040dd..c3bb15e57 100644 --- a/graphics/event_objects/pics/pokemon/regi.png +++ b/graphics/event_objects/pics/pokemon/regi.png diff --git a/graphics/event_objects/pics/pokemon/skitty.png b/graphics/event_objects/pics/pokemon/skitty.png Binary files differnew file mode 100755 index 000000000..2b7810412 --- /dev/null +++ b/graphics/event_objects/pics/pokemon/skitty.png diff --git a/graphics/event_objects/pics/pokemon/skitty/0.png b/graphics/event_objects/pics/pokemon/skitty/0.png Binary files differdeleted file mode 100644 index 105611a10..000000000 --- a/graphics/event_objects/pics/pokemon/skitty/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/skitty/1.png b/graphics/event_objects/pics/pokemon/skitty/1.png Binary files differdeleted file mode 100644 index 66a9640e0..000000000 --- a/graphics/event_objects/pics/pokemon/skitty/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/skitty/2.png b/graphics/event_objects/pics/pokemon/skitty/2.png Binary files differdeleted file mode 100644 index 2ab6cabfa..000000000 --- a/graphics/event_objects/pics/pokemon/skitty/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/wingull.png b/graphics/event_objects/pics/pokemon/wingull.png Binary files differnew file mode 100755 index 000000000..149733830 --- /dev/null +++ b/graphics/event_objects/pics/pokemon/wingull.png diff --git a/graphics/event_objects/pics/pokemon/wingull/0.png b/graphics/event_objects/pics/pokemon/wingull/0.png Binary files differdeleted file mode 100644 index 82fe258d1..000000000 --- a/graphics/event_objects/pics/pokemon/wingull/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/wingull/1.png b/graphics/event_objects/pics/pokemon/wingull/1.png Binary files differdeleted file mode 100644 index 55a020ee6..000000000 --- a/graphics/event_objects/pics/pokemon/wingull/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/wingull/2.png b/graphics/event_objects/pics/pokemon/wingull/2.png Binary files differdeleted file mode 100644 index e1ada8014..000000000 --- a/graphics/event_objects/pics/pokemon/wingull/2.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/wingull/3.png b/graphics/event_objects/pics/pokemon/wingull/3.png Binary files differdeleted file mode 100644 index 47206a591..000000000 --- a/graphics/event_objects/pics/pokemon/wingull/3.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/wingull/4.png b/graphics/event_objects/pics/pokemon/wingull/4.png Binary files differdeleted file mode 100644 index 5c36d7413..000000000 --- a/graphics/event_objects/pics/pokemon/wingull/4.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/wingull/5.png b/graphics/event_objects/pics/pokemon/wingull/5.png Binary files differdeleted file mode 100644 index e1ada8014..000000000 --- a/graphics/event_objects/pics/pokemon/wingull/5.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/zigzagoon.png b/graphics/event_objects/pics/pokemon/zigzagoon.png Binary files differnew file mode 100755 index 000000000..2eaf2403d --- /dev/null +++ b/graphics/event_objects/pics/pokemon/zigzagoon.png diff --git a/graphics/event_objects/pics/pokemon/zigzagoon/0.png b/graphics/event_objects/pics/pokemon/zigzagoon/0.png Binary files differdeleted file mode 100644 index 0601efade..000000000 --- a/graphics/event_objects/pics/pokemon/zigzagoon/0.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/zigzagoon/1.png b/graphics/event_objects/pics/pokemon/zigzagoon/1.png Binary files differdeleted file mode 100644 index c7e067a6d..000000000 --- a/graphics/event_objects/pics/pokemon/zigzagoon/1.png +++ /dev/null diff --git a/graphics/event_objects/pics/pokemon/zigzagoon/2.png b/graphics/event_objects/pics/pokemon/zigzagoon/2.png Binary files differdeleted file mode 100644 index d44a71b8d..000000000 --- a/graphics/event_objects/pics/pokemon/zigzagoon/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/arrow.png b/graphics/field_effect_objects/pics/arrow.png Binary files differnew file mode 100755 index 000000000..a2fe7653e --- /dev/null +++ b/graphics/field_effect_objects/pics/arrow.png diff --git a/graphics/field_effect_objects/pics/arrow/0.png b/graphics/field_effect_objects/pics/arrow/0.png Binary files differdeleted file mode 100644 index 2774db910..000000000 --- a/graphics/field_effect_objects/pics/arrow/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/arrow/1.png b/graphics/field_effect_objects/pics/arrow/1.png Binary files differdeleted file mode 100644 index 718cf340a..000000000 --- a/graphics/field_effect_objects/pics/arrow/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/arrow/2.png b/graphics/field_effect_objects/pics/arrow/2.png Binary files differdeleted file mode 100644 index cece2ff99..000000000 --- a/graphics/field_effect_objects/pics/arrow/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/arrow/3.png b/graphics/field_effect_objects/pics/arrow/3.png Binary files differdeleted file mode 100644 index 57ffd42e0..000000000 --- a/graphics/field_effect_objects/pics/arrow/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/arrow/4.png b/graphics/field_effect_objects/pics/arrow/4.png Binary files differdeleted file mode 100644 index 792952367..000000000 --- a/graphics/field_effect_objects/pics/arrow/4.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/arrow/5.png b/graphics/field_effect_objects/pics/arrow/5.png Binary files differdeleted file mode 100644 index 1d81be4a5..000000000 --- a/graphics/field_effect_objects/pics/arrow/5.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/arrow/6.png b/graphics/field_effect_objects/pics/arrow/6.png Binary files differdeleted file mode 100644 index 38810c04c..000000000 --- a/graphics/field_effect_objects/pics/arrow/6.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/arrow/7.png b/graphics/field_effect_objects/pics/arrow/7.png Binary files differdeleted file mode 100644 index e59666376..000000000 --- a/graphics/field_effect_objects/pics/arrow/7.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/ash.png b/graphics/field_effect_objects/pics/ash.png Binary files differnew file mode 100755 index 000000000..8890d5ab8 --- /dev/null +++ b/graphics/field_effect_objects/pics/ash.png diff --git a/graphics/field_effect_objects/pics/ash/0.png b/graphics/field_effect_objects/pics/ash/0.png Binary files differdeleted file mode 100644 index 96a4b8f2a..000000000 --- a/graphics/field_effect_objects/pics/ash/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/ash/1.png b/graphics/field_effect_objects/pics/ash/1.png Binary files differdeleted file mode 100644 index 8d973518d..000000000 --- a/graphics/field_effect_objects/pics/ash/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/ash/2.png b/graphics/field_effect_objects/pics/ash/2.png Binary files differdeleted file mode 100644 index eccd2e02d..000000000 --- a/graphics/field_effect_objects/pics/ash/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/ash/3.png b/graphics/field_effect_objects/pics/ash/3.png Binary files differdeleted file mode 100644 index 5ad0b8e5a..000000000 --- a/graphics/field_effect_objects/pics/ash/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/ash/4.png b/graphics/field_effect_objects/pics/ash/4.png Binary files differdeleted file mode 100644 index 7208f6a5b..000000000 --- a/graphics/field_effect_objects/pics/ash/4.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/berry_tree_growth_sparkle.png b/graphics/field_effect_objects/pics/berry_tree_growth_sparkle.png Binary files differnew file mode 100755 index 000000000..d066833e2 --- /dev/null +++ b/graphics/field_effect_objects/pics/berry_tree_growth_sparkle.png diff --git a/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/0.png b/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/0.png Binary files differdeleted file mode 100644 index f3e751d3a..000000000 --- a/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/1.png b/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/1.png Binary files differdeleted file mode 100644 index d48fd1234..000000000 --- a/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/2.png b/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/2.png Binary files differdeleted file mode 100644 index 9a9abf73e..000000000 --- a/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/3.png b/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/3.png Binary files differdeleted file mode 100644 index 857abfb0b..000000000 --- a/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/4.png b/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/4.png Binary files differdeleted file mode 100644 index bce9df4c7..000000000 --- a/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/4.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/5.png b/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/5.png Binary files differdeleted file mode 100644 index 4c757bf6b..000000000 --- a/graphics/field_effect_objects/pics/berry_tree_growth_sparkle/5.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/bike_tire_tracks.png b/graphics/field_effect_objects/pics/bike_tire_tracks.png Binary files differnew file mode 100755 index 000000000..2d989d28c --- /dev/null +++ b/graphics/field_effect_objects/pics/bike_tire_tracks.png diff --git a/graphics/field_effect_objects/pics/bike_tire_tracks/0.png b/graphics/field_effect_objects/pics/bike_tire_tracks/0.png Binary files differdeleted file mode 100644 index d4fd46f9b..000000000 --- a/graphics/field_effect_objects/pics/bike_tire_tracks/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/bike_tire_tracks/1.png b/graphics/field_effect_objects/pics/bike_tire_tracks/1.png Binary files differdeleted file mode 100644 index 9095cdd74..000000000 --- a/graphics/field_effect_objects/pics/bike_tire_tracks/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/bike_tire_tracks/2.png b/graphics/field_effect_objects/pics/bike_tire_tracks/2.png Binary files differdeleted file mode 100644 index 56907c153..000000000 --- a/graphics/field_effect_objects/pics/bike_tire_tracks/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/bike_tire_tracks/3.png b/graphics/field_effect_objects/pics/bike_tire_tracks/3.png Binary files differdeleted file mode 100644 index 397bfb418..000000000 --- a/graphics/field_effect_objects/pics/bike_tire_tracks/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/bird.png b/graphics/field_effect_objects/pics/bird.png Binary files differindex c7f2fe782..5400383c6 100644 --- a/graphics/field_effect_objects/pics/bird.png +++ b/graphics/field_effect_objects/pics/bird.png diff --git a/graphics/field_effect_objects/pics/bubbles.png b/graphics/field_effect_objects/pics/bubbles.png Binary files differnew file mode 100755 index 000000000..b04ceaf09 --- /dev/null +++ b/graphics/field_effect_objects/pics/bubbles.png diff --git a/graphics/field_effect_objects/pics/bubbles/0.png b/graphics/field_effect_objects/pics/bubbles/0.png Binary files differdeleted file mode 100644 index b71b193ae..000000000 --- a/graphics/field_effect_objects/pics/bubbles/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/bubbles/1.png b/graphics/field_effect_objects/pics/bubbles/1.png Binary files differdeleted file mode 100644 index 0bd744ef2..000000000 --- a/graphics/field_effect_objects/pics/bubbles/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/bubbles/2.png b/graphics/field_effect_objects/pics/bubbles/2.png Binary files differdeleted file mode 100644 index 4241e8f24..000000000 --- a/graphics/field_effect_objects/pics/bubbles/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/bubbles/3.png b/graphics/field_effect_objects/pics/bubbles/3.png Binary files differdeleted file mode 100644 index 3b440d9a7..000000000 --- a/graphics/field_effect_objects/pics/bubbles/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/bubbles/4.png b/graphics/field_effect_objects/pics/bubbles/4.png Binary files differdeleted file mode 100644 index de9e66a25..000000000 --- a/graphics/field_effect_objects/pics/bubbles/4.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/bubbles/5.png b/graphics/field_effect_objects/pics/bubbles/5.png Binary files differdeleted file mode 100644 index 54b9d768b..000000000 --- a/graphics/field_effect_objects/pics/bubbles/5.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/bubbles/6.png b/graphics/field_effect_objects/pics/bubbles/6.png Binary files differdeleted file mode 100644 index 35c26e633..000000000 --- a/graphics/field_effect_objects/pics/bubbles/6.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/bubbles/7.png b/graphics/field_effect_objects/pics/bubbles/7.png Binary files differdeleted file mode 100644 index 6323e0cc5..000000000 --- a/graphics/field_effect_objects/pics/bubbles/7.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/cut_grass.png b/graphics/field_effect_objects/pics/cut_grass.png Binary files differindex 3c41d28b3..c44d28d06 100644 --- a/graphics/field_effect_objects/pics/cut_grass.png +++ b/graphics/field_effect_objects/pics/cut_grass.png diff --git a/graphics/field_effect_objects/pics/deep_sand_footprints.png b/graphics/field_effect_objects/pics/deep_sand_footprints.png Binary files differnew file mode 100755 index 000000000..ea7484b23 --- /dev/null +++ b/graphics/field_effect_objects/pics/deep_sand_footprints.png diff --git a/graphics/field_effect_objects/pics/deep_sand_footprints/0.png b/graphics/field_effect_objects/pics/deep_sand_footprints/0.png Binary files differdeleted file mode 100644 index c449b223e..000000000 --- a/graphics/field_effect_objects/pics/deep_sand_footprints/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/deep_sand_footprints/1.png b/graphics/field_effect_objects/pics/deep_sand_footprints/1.png Binary files differdeleted file mode 100644 index 2a1d5cce5..000000000 --- a/graphics/field_effect_objects/pics/deep_sand_footprints/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/dust.png b/graphics/field_effect_objects/pics/dust.png Binary files differnew file mode 100755 index 000000000..d4562fe57 --- /dev/null +++ b/graphics/field_effect_objects/pics/dust.png diff --git a/graphics/field_effect_objects/pics/dust/0.png b/graphics/field_effect_objects/pics/dust/0.png Binary files differdeleted file mode 100644 index 57e2e8898..000000000 --- a/graphics/field_effect_objects/pics/dust/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/dust/1.png b/graphics/field_effect_objects/pics/dust/1.png Binary files differdeleted file mode 100644 index d91554b6e..000000000 --- a/graphics/field_effect_objects/pics/dust/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/dust/2.png b/graphics/field_effect_objects/pics/dust/2.png Binary files differdeleted file mode 100644 index 8d0235141..000000000 --- a/graphics/field_effect_objects/pics/dust/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/hot_springs_water.png b/graphics/field_effect_objects/pics/hot_springs_water.png Binary files differindex 1b6550b19..18892239e 100644 --- a/graphics/field_effect_objects/pics/hot_springs_water.png +++ b/graphics/field_effect_objects/pics/hot_springs_water.png diff --git a/graphics/field_effect_objects/pics/jump_big_splash.png b/graphics/field_effect_objects/pics/jump_big_splash.png Binary files differnew file mode 100755 index 000000000..171d23457 --- /dev/null +++ b/graphics/field_effect_objects/pics/jump_big_splash.png diff --git a/graphics/field_effect_objects/pics/jump_big_splash/0.png b/graphics/field_effect_objects/pics/jump_big_splash/0.png Binary files differdeleted file mode 100644 index 420663da8..000000000 --- a/graphics/field_effect_objects/pics/jump_big_splash/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_big_splash/1.png b/graphics/field_effect_objects/pics/jump_big_splash/1.png Binary files differdeleted file mode 100644 index 72ca8fa1c..000000000 --- a/graphics/field_effect_objects/pics/jump_big_splash/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_big_splash/2.png b/graphics/field_effect_objects/pics/jump_big_splash/2.png Binary files differdeleted file mode 100644 index 96c224cdf..000000000 --- a/graphics/field_effect_objects/pics/jump_big_splash/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_big_splash/3.png b/graphics/field_effect_objects/pics/jump_big_splash/3.png Binary files differdeleted file mode 100644 index b549ea78c..000000000 --- a/graphics/field_effect_objects/pics/jump_big_splash/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_long_grass.png b/graphics/field_effect_objects/pics/jump_long_grass.png Binary files differnew file mode 100755 index 000000000..bb4789f9f --- /dev/null +++ b/graphics/field_effect_objects/pics/jump_long_grass.png diff --git a/graphics/field_effect_objects/pics/jump_long_grass/0.png b/graphics/field_effect_objects/pics/jump_long_grass/0.png Binary files differdeleted file mode 100644 index 491801c32..000000000 --- a/graphics/field_effect_objects/pics/jump_long_grass/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_long_grass/1.png b/graphics/field_effect_objects/pics/jump_long_grass/1.png Binary files differdeleted file mode 100644 index f83ca15da..000000000 --- a/graphics/field_effect_objects/pics/jump_long_grass/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_long_grass/2.png b/graphics/field_effect_objects/pics/jump_long_grass/2.png Binary files differdeleted file mode 100644 index 073aa9b7e..000000000 --- a/graphics/field_effect_objects/pics/jump_long_grass/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_long_grass/3.png b/graphics/field_effect_objects/pics/jump_long_grass/3.png Binary files differdeleted file mode 100644 index e7b5c96cf..000000000 --- a/graphics/field_effect_objects/pics/jump_long_grass/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_long_grass/4.png b/graphics/field_effect_objects/pics/jump_long_grass/4.png Binary files differdeleted file mode 100644 index 8972d5d81..000000000 --- a/graphics/field_effect_objects/pics/jump_long_grass/4.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_long_grass/5.png b/graphics/field_effect_objects/pics/jump_long_grass/5.png Binary files differdeleted file mode 100644 index d570a9a8d..000000000 --- a/graphics/field_effect_objects/pics/jump_long_grass/5.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_long_grass/unused.png b/graphics/field_effect_objects/pics/jump_long_grass/unused.png Binary files differdeleted file mode 100644 index 0a6311550..000000000 --- a/graphics/field_effect_objects/pics/jump_long_grass/unused.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_small_splash.png b/graphics/field_effect_objects/pics/jump_small_splash.png Binary files differnew file mode 100755 index 000000000..e98ded025 --- /dev/null +++ b/graphics/field_effect_objects/pics/jump_small_splash.png diff --git a/graphics/field_effect_objects/pics/jump_small_splash/0.png b/graphics/field_effect_objects/pics/jump_small_splash/0.png Binary files differdeleted file mode 100644 index b5cccb306..000000000 --- a/graphics/field_effect_objects/pics/jump_small_splash/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_small_splash/1.png b/graphics/field_effect_objects/pics/jump_small_splash/1.png Binary files differdeleted file mode 100644 index 548198c09..000000000 --- a/graphics/field_effect_objects/pics/jump_small_splash/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_small_splash/2.png b/graphics/field_effect_objects/pics/jump_small_splash/2.png Binary files differdeleted file mode 100644 index e8b86dfcb..000000000 --- a/graphics/field_effect_objects/pics/jump_small_splash/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_tall_grass.png b/graphics/field_effect_objects/pics/jump_tall_grass.png Binary files differnew file mode 100755 index 000000000..c43da9f28 --- /dev/null +++ b/graphics/field_effect_objects/pics/jump_tall_grass.png diff --git a/graphics/field_effect_objects/pics/jump_tall_grass/0.png b/graphics/field_effect_objects/pics/jump_tall_grass/0.png Binary files differdeleted file mode 100644 index d2768ec0c..000000000 --- a/graphics/field_effect_objects/pics/jump_tall_grass/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_tall_grass/1.png b/graphics/field_effect_objects/pics/jump_tall_grass/1.png Binary files differdeleted file mode 100644 index 7816f4d00..000000000 --- a/graphics/field_effect_objects/pics/jump_tall_grass/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_tall_grass/2.png b/graphics/field_effect_objects/pics/jump_tall_grass/2.png Binary files differdeleted file mode 100644 index 00c51d276..000000000 --- a/graphics/field_effect_objects/pics/jump_tall_grass/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/jump_tall_grass/3.png b/graphics/field_effect_objects/pics/jump_tall_grass/3.png Binary files differdeleted file mode 100644 index 210382b93..000000000 --- a/graphics/field_effect_objects/pics/jump_tall_grass/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/lavaridge_gym_warp.png b/graphics/field_effect_objects/pics/lavaridge_gym_warp.png Binary files differnew file mode 100755 index 000000000..26b852200 --- /dev/null +++ b/graphics/field_effect_objects/pics/lavaridge_gym_warp.png diff --git a/graphics/field_effect_objects/pics/lavaridge_gym_warp/0.png b/graphics/field_effect_objects/pics/lavaridge_gym_warp/0.png Binary files differdeleted file mode 100644 index 2241eabd3..000000000 --- a/graphics/field_effect_objects/pics/lavaridge_gym_warp/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/lavaridge_gym_warp/1.png b/graphics/field_effect_objects/pics/lavaridge_gym_warp/1.png Binary files differdeleted file mode 100644 index 5f90405d8..000000000 --- a/graphics/field_effect_objects/pics/lavaridge_gym_warp/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/lavaridge_gym_warp/2.png b/graphics/field_effect_objects/pics/lavaridge_gym_warp/2.png Binary files differdeleted file mode 100644 index 3f1c3a76a..000000000 --- a/graphics/field_effect_objects/pics/lavaridge_gym_warp/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/lavaridge_gym_warp/3.png b/graphics/field_effect_objects/pics/lavaridge_gym_warp/3.png Binary files differdeleted file mode 100644 index 2696f4a5a..000000000 --- a/graphics/field_effect_objects/pics/lavaridge_gym_warp/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/lavaridge_gym_warp/4.png b/graphics/field_effect_objects/pics/lavaridge_gym_warp/4.png Binary files differdeleted file mode 100644 index c2d1785bf..000000000 --- a/graphics/field_effect_objects/pics/lavaridge_gym_warp/4.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/long_grass.png b/graphics/field_effect_objects/pics/long_grass.png Binary files differnew file mode 100755 index 000000000..265e45056 --- /dev/null +++ b/graphics/field_effect_objects/pics/long_grass.png diff --git a/graphics/field_effect_objects/pics/long_grass/0.png b/graphics/field_effect_objects/pics/long_grass/0.png Binary files differdeleted file mode 100644 index 4a02b3d17..000000000 --- a/graphics/field_effect_objects/pics/long_grass/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/long_grass/1.png b/graphics/field_effect_objects/pics/long_grass/1.png Binary files differdeleted file mode 100644 index 97f652c6d..000000000 --- a/graphics/field_effect_objects/pics/long_grass/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/long_grass/2.png b/graphics/field_effect_objects/pics/long_grass/2.png Binary files differdeleted file mode 100644 index 313226f8b..000000000 --- a/graphics/field_effect_objects/pics/long_grass/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/long_grass/3.png b/graphics/field_effect_objects/pics/long_grass/3.png Binary files differdeleted file mode 100644 index 0565b4069..000000000 --- a/graphics/field_effect_objects/pics/long_grass/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/mountain_disguise.png b/graphics/field_effect_objects/pics/mountain_disguise.png Binary files differnew file mode 100755 index 000000000..c394855e6 --- /dev/null +++ b/graphics/field_effect_objects/pics/mountain_disguise.png diff --git a/graphics/field_effect_objects/pics/mountain_disguise/0.png b/graphics/field_effect_objects/pics/mountain_disguise/0.png Binary files differdeleted file mode 100644 index 104056e46..000000000 --- a/graphics/field_effect_objects/pics/mountain_disguise/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/mountain_disguise/1.png b/graphics/field_effect_objects/pics/mountain_disguise/1.png Binary files differdeleted file mode 100644 index 4b2d35963..000000000 --- a/graphics/field_effect_objects/pics/mountain_disguise/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/mountain_disguise/2.png b/graphics/field_effect_objects/pics/mountain_disguise/2.png Binary files differdeleted file mode 100644 index e2ea3b855..000000000 --- a/graphics/field_effect_objects/pics/mountain_disguise/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/mountain_disguise/3.png b/graphics/field_effect_objects/pics/mountain_disguise/3.png Binary files differdeleted file mode 100644 index 8f0a1be2c..000000000 --- a/graphics/field_effect_objects/pics/mountain_disguise/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/mountain_disguise/4.png b/graphics/field_effect_objects/pics/mountain_disguise/4.png Binary files differdeleted file mode 100644 index 8fd4df410..000000000 --- a/graphics/field_effect_objects/pics/mountain_disguise/4.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/mountain_disguise/5.png b/graphics/field_effect_objects/pics/mountain_disguise/5.png Binary files differdeleted file mode 100644 index a364b234d..000000000 --- a/graphics/field_effect_objects/pics/mountain_disguise/5.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/mountain_disguise/6.png b/graphics/field_effect_objects/pics/mountain_disguise/6.png Binary files differdeleted file mode 100644 index 2644aa9f1..000000000 --- a/graphics/field_effect_objects/pics/mountain_disguise/6.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/pop_out_of_ash.png b/graphics/field_effect_objects/pics/pop_out_of_ash.png Binary files differnew file mode 100755 index 000000000..3247b8169 --- /dev/null +++ b/graphics/field_effect_objects/pics/pop_out_of_ash.png diff --git a/graphics/field_effect_objects/pics/pop_out_of_ash/0.png b/graphics/field_effect_objects/pics/pop_out_of_ash/0.png Binary files differdeleted file mode 100644 index 50f9796b2..000000000 --- a/graphics/field_effect_objects/pics/pop_out_of_ash/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/pop_out_of_ash/1.png b/graphics/field_effect_objects/pics/pop_out_of_ash/1.png Binary files differdeleted file mode 100644 index 685d31fac..000000000 --- a/graphics/field_effect_objects/pics/pop_out_of_ash/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/pop_out_of_ash/2.png b/graphics/field_effect_objects/pics/pop_out_of_ash/2.png Binary files differdeleted file mode 100644 index 9f11f176f..000000000 --- a/graphics/field_effect_objects/pics/pop_out_of_ash/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/pop_out_of_ash/3.png b/graphics/field_effect_objects/pics/pop_out_of_ash/3.png Binary files differdeleted file mode 100644 index 124581f75..000000000 --- a/graphics/field_effect_objects/pics/pop_out_of_ash/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/pop_out_of_ash/4.png b/graphics/field_effect_objects/pics/pop_out_of_ash/4.png Binary files differdeleted file mode 100644 index 6e584a4dc..000000000 --- a/graphics/field_effect_objects/pics/pop_out_of_ash/4.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/ripple.png b/graphics/field_effect_objects/pics/ripple.png Binary files differnew file mode 100755 index 000000000..87e6dd617 --- /dev/null +++ b/graphics/field_effect_objects/pics/ripple.png diff --git a/graphics/field_effect_objects/pics/ripple/0.png b/graphics/field_effect_objects/pics/ripple/0.png Binary files differdeleted file mode 100644 index 24055c7d2..000000000 --- a/graphics/field_effect_objects/pics/ripple/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/ripple/1.png b/graphics/field_effect_objects/pics/ripple/1.png Binary files differdeleted file mode 100644 index a47853925..000000000 --- a/graphics/field_effect_objects/pics/ripple/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/ripple/2.png b/graphics/field_effect_objects/pics/ripple/2.png Binary files differdeleted file mode 100644 index 6670cb779..000000000 --- a/graphics/field_effect_objects/pics/ripple/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/ripple/3.png b/graphics/field_effect_objects/pics/ripple/3.png Binary files differdeleted file mode 100644 index 122df1940..000000000 --- a/graphics/field_effect_objects/pics/ripple/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/ripple/4.png b/graphics/field_effect_objects/pics/ripple/4.png Binary files differdeleted file mode 100644 index f4f79afe2..000000000 --- a/graphics/field_effect_objects/pics/ripple/4.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/sand_disguise.png b/graphics/field_effect_objects/pics/sand_disguise.png Binary files differnew file mode 100755 index 000000000..76808a53b --- /dev/null +++ b/graphics/field_effect_objects/pics/sand_disguise.png diff --git a/graphics/field_effect_objects/pics/sand_disguise/0.png b/graphics/field_effect_objects/pics/sand_disguise/0.png Binary files differdeleted file mode 100644 index df242de2f..000000000 --- a/graphics/field_effect_objects/pics/sand_disguise/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/sand_disguise/1.png b/graphics/field_effect_objects/pics/sand_disguise/1.png Binary files differdeleted file mode 100644 index 2e993b30e..000000000 --- a/graphics/field_effect_objects/pics/sand_disguise/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/sand_disguise/2.png b/graphics/field_effect_objects/pics/sand_disguise/2.png Binary files differdeleted file mode 100644 index 3d6864e41..000000000 --- a/graphics/field_effect_objects/pics/sand_disguise/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/sand_disguise/3.png b/graphics/field_effect_objects/pics/sand_disguise/3.png Binary files differdeleted file mode 100644 index 690110a8c..000000000 --- a/graphics/field_effect_objects/pics/sand_disguise/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/sand_disguise/4.png b/graphics/field_effect_objects/pics/sand_disguise/4.png Binary files differdeleted file mode 100644 index caa568eac..000000000 --- a/graphics/field_effect_objects/pics/sand_disguise/4.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/sand_disguise/5.png b/graphics/field_effect_objects/pics/sand_disguise/5.png Binary files differdeleted file mode 100644 index 0d0bd9886..000000000 --- a/graphics/field_effect_objects/pics/sand_disguise/5.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/sand_disguise/6.png b/graphics/field_effect_objects/pics/sand_disguise/6.png Binary files differdeleted file mode 100644 index ed40527d0..000000000 --- a/graphics/field_effect_objects/pics/sand_disguise/6.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/sand_footprints.png b/graphics/field_effect_objects/pics/sand_footprints.png Binary files differnew file mode 100755 index 000000000..71c54f787 --- /dev/null +++ b/graphics/field_effect_objects/pics/sand_footprints.png diff --git a/graphics/field_effect_objects/pics/sand_footprints/0.png b/graphics/field_effect_objects/pics/sand_footprints/0.png Binary files differdeleted file mode 100644 index 3cc79aa18..000000000 --- a/graphics/field_effect_objects/pics/sand_footprints/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/sand_footprints/1.png b/graphics/field_effect_objects/pics/sand_footprints/1.png Binary files differdeleted file mode 100644 index 80d33783b..000000000 --- a/graphics/field_effect_objects/pics/sand_footprints/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/sand_pile.png b/graphics/field_effect_objects/pics/sand_pile.png Binary files differnew file mode 100755 index 000000000..03f89a5f5 --- /dev/null +++ b/graphics/field_effect_objects/pics/sand_pile.png diff --git a/graphics/field_effect_objects/pics/sand_pile/0.png b/graphics/field_effect_objects/pics/sand_pile/0.png Binary files differdeleted file mode 100644 index 87fe91c97..000000000 --- a/graphics/field_effect_objects/pics/sand_pile/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/sand_pile/1.png b/graphics/field_effect_objects/pics/sand_pile/1.png Binary files differdeleted file mode 100644 index c20fb34bb..000000000 --- a/graphics/field_effect_objects/pics/sand_pile/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/sand_pile/2.png b/graphics/field_effect_objects/pics/sand_pile/2.png Binary files differdeleted file mode 100644 index def972b20..000000000 --- a/graphics/field_effect_objects/pics/sand_pile/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/shadow_extra_large.png b/graphics/field_effect_objects/pics/shadow_extra_large.png Binary files differindex 990e22de0..aca87bf85 100644 --- a/graphics/field_effect_objects/pics/shadow_extra_large.png +++ b/graphics/field_effect_objects/pics/shadow_extra_large.png diff --git a/graphics/field_effect_objects/pics/shadow_large.png b/graphics/field_effect_objects/pics/shadow_large.png Binary files differindex 06da09d91..9624db889 100644 --- a/graphics/field_effect_objects/pics/shadow_large.png +++ b/graphics/field_effect_objects/pics/shadow_large.png diff --git a/graphics/field_effect_objects/pics/shadow_medium.png b/graphics/field_effect_objects/pics/shadow_medium.png Binary files differindex 331b92f60..3d1311dfe 100644 --- a/graphics/field_effect_objects/pics/shadow_medium.png +++ b/graphics/field_effect_objects/pics/shadow_medium.png diff --git a/graphics/field_effect_objects/pics/shadow_small.png b/graphics/field_effect_objects/pics/shadow_small.png Binary files differindex d6e02584a..df81d4883 100644 --- a/graphics/field_effect_objects/pics/shadow_small.png +++ b/graphics/field_effect_objects/pics/shadow_small.png diff --git a/graphics/field_effect_objects/pics/short_grass.png b/graphics/field_effect_objects/pics/short_grass.png Binary files differnew file mode 100755 index 000000000..dc477e29f --- /dev/null +++ b/graphics/field_effect_objects/pics/short_grass.png diff --git a/graphics/field_effect_objects/pics/short_grass/0.png b/graphics/field_effect_objects/pics/short_grass/0.png Binary files differdeleted file mode 100644 index a5d5181db..000000000 --- a/graphics/field_effect_objects/pics/short_grass/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/short_grass/1.png b/graphics/field_effect_objects/pics/short_grass/1.png Binary files differdeleted file mode 100644 index 17a62968a..000000000 --- a/graphics/field_effect_objects/pics/short_grass/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/sparkle.png b/graphics/field_effect_objects/pics/sparkle.png Binary files differnew file mode 100755 index 000000000..b2072bd26 --- /dev/null +++ b/graphics/field_effect_objects/pics/sparkle.png diff --git a/graphics/field_effect_objects/pics/sparkle/0.png b/graphics/field_effect_objects/pics/sparkle/0.png Binary files differdeleted file mode 100644 index c2ae128f7..000000000 --- a/graphics/field_effect_objects/pics/sparkle/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/sparkle/1.png b/graphics/field_effect_objects/pics/sparkle/1.png Binary files differdeleted file mode 100644 index fe68b19fd..000000000 --- a/graphics/field_effect_objects/pics/sparkle/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/splash.png b/graphics/field_effect_objects/pics/splash.png Binary files differnew file mode 100755 index 000000000..6e55ffae0 --- /dev/null +++ b/graphics/field_effect_objects/pics/splash.png diff --git a/graphics/field_effect_objects/pics/splash/0.png b/graphics/field_effect_objects/pics/splash/0.png Binary files differdeleted file mode 100644 index 2b29c76ae..000000000 --- a/graphics/field_effect_objects/pics/splash/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/splash/1.png b/graphics/field_effect_objects/pics/splash/1.png Binary files differdeleted file mode 100644 index 180721342..000000000 --- a/graphics/field_effect_objects/pics/splash/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/surf_blob.png b/graphics/field_effect_objects/pics/surf_blob.png Binary files differnew file mode 100755 index 000000000..871a9f081 --- /dev/null +++ b/graphics/field_effect_objects/pics/surf_blob.png diff --git a/graphics/field_effect_objects/pics/surf_blob/0.png b/graphics/field_effect_objects/pics/surf_blob/0.png Binary files differdeleted file mode 100644 index 2fa8749fc..000000000 --- a/graphics/field_effect_objects/pics/surf_blob/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/surf_blob/1.png b/graphics/field_effect_objects/pics/surf_blob/1.png Binary files differdeleted file mode 100644 index 220e54d97..000000000 --- a/graphics/field_effect_objects/pics/surf_blob/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/surf_blob/2.png b/graphics/field_effect_objects/pics/surf_blob/2.png Binary files differdeleted file mode 100644 index e6304c7d9..000000000 --- a/graphics/field_effect_objects/pics/surf_blob/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/tall_grass.png b/graphics/field_effect_objects/pics/tall_grass.png Binary files differnew file mode 100755 index 000000000..919fc6f8a --- /dev/null +++ b/graphics/field_effect_objects/pics/tall_grass.png diff --git a/graphics/field_effect_objects/pics/tall_grass/0.png b/graphics/field_effect_objects/pics/tall_grass/0.png Binary files differdeleted file mode 100644 index 00d596b4c..000000000 --- a/graphics/field_effect_objects/pics/tall_grass/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/tall_grass/1.png b/graphics/field_effect_objects/pics/tall_grass/1.png Binary files differdeleted file mode 100644 index 0c8bdd84e..000000000 --- a/graphics/field_effect_objects/pics/tall_grass/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/tall_grass/2.png b/graphics/field_effect_objects/pics/tall_grass/2.png Binary files differdeleted file mode 100644 index 55d971758..000000000 --- a/graphics/field_effect_objects/pics/tall_grass/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/tall_grass/3.png b/graphics/field_effect_objects/pics/tall_grass/3.png Binary files differdeleted file mode 100644 index 0add11083..000000000 --- a/graphics/field_effect_objects/pics/tall_grass/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/tall_grass/4.png b/graphics/field_effect_objects/pics/tall_grass/4.png Binary files differdeleted file mode 100644 index ca164d3cc..000000000 --- a/graphics/field_effect_objects/pics/tall_grass/4.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/tree_disguise.png b/graphics/field_effect_objects/pics/tree_disguise.png Binary files differnew file mode 100755 index 000000000..468785b13 --- /dev/null +++ b/graphics/field_effect_objects/pics/tree_disguise.png diff --git a/graphics/field_effect_objects/pics/tree_disguise/0.png b/graphics/field_effect_objects/pics/tree_disguise/0.png Binary files differdeleted file mode 100644 index 29b2ec262..000000000 --- a/graphics/field_effect_objects/pics/tree_disguise/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/tree_disguise/1.png b/graphics/field_effect_objects/pics/tree_disguise/1.png Binary files differdeleted file mode 100644 index 42b188a78..000000000 --- a/graphics/field_effect_objects/pics/tree_disguise/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/tree_disguise/2.png b/graphics/field_effect_objects/pics/tree_disguise/2.png Binary files differdeleted file mode 100644 index 549496fa0..000000000 --- a/graphics/field_effect_objects/pics/tree_disguise/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/tree_disguise/3.png b/graphics/field_effect_objects/pics/tree_disguise/3.png Binary files differdeleted file mode 100644 index 69a6f34ea..000000000 --- a/graphics/field_effect_objects/pics/tree_disguise/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/tree_disguise/4.png b/graphics/field_effect_objects/pics/tree_disguise/4.png Binary files differdeleted file mode 100644 index 74f5af949..000000000 --- a/graphics/field_effect_objects/pics/tree_disguise/4.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/tree_disguise/5.png b/graphics/field_effect_objects/pics/tree_disguise/5.png Binary files differdeleted file mode 100644 index 501380713..000000000 --- a/graphics/field_effect_objects/pics/tree_disguise/5.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/tree_disguise/6.png b/graphics/field_effect_objects/pics/tree_disguise/6.png Binary files differdeleted file mode 100644 index bc9333162..000000000 --- a/graphics/field_effect_objects/pics/tree_disguise/6.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_17.png b/graphics/field_effect_objects/pics/unknown_17.png Binary files differnew file mode 100755 index 000000000..f158bebc8 --- /dev/null +++ b/graphics/field_effect_objects/pics/unknown_17.png diff --git a/graphics/field_effect_objects/pics/unknown_17/0.png b/graphics/field_effect_objects/pics/unknown_17/0.png Binary files differdeleted file mode 100644 index 9c804844e..000000000 --- a/graphics/field_effect_objects/pics/unknown_17/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_17/1.png b/graphics/field_effect_objects/pics/unknown_17/1.png Binary files differdeleted file mode 100644 index 6628b5820..000000000 --- a/graphics/field_effect_objects/pics/unknown_17/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_17/2.png b/graphics/field_effect_objects/pics/unknown_17/2.png Binary files differdeleted file mode 100644 index a5cdcca57..000000000 --- a/graphics/field_effect_objects/pics/unknown_17/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_17/3.png b/graphics/field_effect_objects/pics/unknown_17/3.png Binary files differdeleted file mode 100644 index 2f9a20019..000000000 --- a/graphics/field_effect_objects/pics/unknown_17/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_17/4.png b/graphics/field_effect_objects/pics/unknown_17/4.png Binary files differdeleted file mode 100644 index ce0bc29aa..000000000 --- a/graphics/field_effect_objects/pics/unknown_17/4.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_17/5.png b/graphics/field_effect_objects/pics/unknown_17/5.png Binary files differdeleted file mode 100644 index f92888a3a..000000000 --- a/graphics/field_effect_objects/pics/unknown_17/5.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_17/6.png b/graphics/field_effect_objects/pics/unknown_17/6.png Binary files differdeleted file mode 100644 index 7e740a956..000000000 --- a/graphics/field_effect_objects/pics/unknown_17/6.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_17/7.png b/graphics/field_effect_objects/pics/unknown_17/7.png Binary files differdeleted file mode 100644 index 25d90e16c..000000000 --- a/graphics/field_effect_objects/pics/unknown_17/7.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_18.png b/graphics/field_effect_objects/pics/unknown_18.png Binary files differnew file mode 100755 index 000000000..65f4d97e2 --- /dev/null +++ b/graphics/field_effect_objects/pics/unknown_18.png diff --git a/graphics/field_effect_objects/pics/unknown_18/0.png b/graphics/field_effect_objects/pics/unknown_18/0.png Binary files differdeleted file mode 100644 index 70b39df59..000000000 --- a/graphics/field_effect_objects/pics/unknown_18/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_18/1.png b/graphics/field_effect_objects/pics/unknown_18/1.png Binary files differdeleted file mode 100644 index 392298f5a..000000000 --- a/graphics/field_effect_objects/pics/unknown_18/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_18/2.png b/graphics/field_effect_objects/pics/unknown_18/2.png Binary files differdeleted file mode 100644 index ff418e940..000000000 --- a/graphics/field_effect_objects/pics/unknown_18/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_18/3.png b/graphics/field_effect_objects/pics/unknown_18/3.png Binary files differdeleted file mode 100644 index 0e1e13438..000000000 --- a/graphics/field_effect_objects/pics/unknown_18/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_19.png b/graphics/field_effect_objects/pics/unknown_19.png Binary files differnew file mode 100755 index 000000000..4ae851e58 --- /dev/null +++ b/graphics/field_effect_objects/pics/unknown_19.png diff --git a/graphics/field_effect_objects/pics/unknown_19/0.png b/graphics/field_effect_objects/pics/unknown_19/0.png Binary files differdeleted file mode 100644 index ef8005066..000000000 --- a/graphics/field_effect_objects/pics/unknown_19/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_19/1.png b/graphics/field_effect_objects/pics/unknown_19/1.png Binary files differdeleted file mode 100644 index 6fde1a291..000000000 --- a/graphics/field_effect_objects/pics/unknown_19/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_19/2.png b/graphics/field_effect_objects/pics/unknown_19/2.png Binary files differdeleted file mode 100644 index c385fd84c..000000000 --- a/graphics/field_effect_objects/pics/unknown_19/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_19/3.png b/graphics/field_effect_objects/pics/unknown_19/3.png Binary files differdeleted file mode 100644 index 084c20314..000000000 --- a/graphics/field_effect_objects/pics/unknown_19/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_20.png b/graphics/field_effect_objects/pics/unknown_20.png Binary files differnew file mode 100755 index 000000000..7d6af5e0c --- /dev/null +++ b/graphics/field_effect_objects/pics/unknown_20.png diff --git a/graphics/field_effect_objects/pics/unknown_20/0.png b/graphics/field_effect_objects/pics/unknown_20/0.png Binary files differdeleted file mode 100644 index eec853d53..000000000 --- a/graphics/field_effect_objects/pics/unknown_20/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_20/1.png b/graphics/field_effect_objects/pics/unknown_20/1.png Binary files differdeleted file mode 100644 index f4782fc67..000000000 --- a/graphics/field_effect_objects/pics/unknown_20/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_20/2.png b/graphics/field_effect_objects/pics/unknown_20/2.png Binary files differdeleted file mode 100644 index 416dae69d..000000000 --- a/graphics/field_effect_objects/pics/unknown_20/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_20/3.png b/graphics/field_effect_objects/pics/unknown_20/3.png Binary files differdeleted file mode 100644 index 3d966e81c..000000000 --- a/graphics/field_effect_objects/pics/unknown_20/3.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unknown_20/4.png b/graphics/field_effect_objects/pics/unknown_20/4.png Binary files differdeleted file mode 100644 index 6bbfbca12..000000000 --- a/graphics/field_effect_objects/pics/unknown_20/4.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unused_grass.png b/graphics/field_effect_objects/pics/unused_grass.png Binary files differnew file mode 100755 index 000000000..ffd68ec1d --- /dev/null +++ b/graphics/field_effect_objects/pics/unused_grass.png diff --git a/graphics/field_effect_objects/pics/unused_grass/0.png b/graphics/field_effect_objects/pics/unused_grass/0.png Binary files differdeleted file mode 100644 index 2e16f15cb..000000000 --- a/graphics/field_effect_objects/pics/unused_grass/0.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unused_grass/1.png b/graphics/field_effect_objects/pics/unused_grass/1.png Binary files differdeleted file mode 100644 index dd33b0d88..000000000 --- a/graphics/field_effect_objects/pics/unused_grass/1.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unused_grass/2.png b/graphics/field_effect_objects/pics/unused_grass/2.png Binary files differdeleted file mode 100644 index 345d454cd..000000000 --- a/graphics/field_effect_objects/pics/unused_grass/2.png +++ /dev/null diff --git a/graphics/field_effect_objects/pics/unused_grass/3.png b/graphics/field_effect_objects/pics/unused_grass/3.png Binary files differdeleted file mode 100644 index 087676102..000000000 --- a/graphics/field_effect_objects/pics/unused_grass/3.png +++ /dev/null diff --git a/include/fieldmap.h b/include/fieldmap.h index e77342b72..cc2a29914 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -2,6 +2,13 @@ #define GUARD_FIELDMAP2_H #include "event_object_movement.h" +#define NUM_TILES_IN_PRIMARY 512 +#define NUM_TILES_TOTAL 1024 +#define NUM_METATILES_IN_PRIMARY 512 +#define NUM_METATILES_TOTAL 1024 +#define NUM_PALS_IN_PRIMARY 6 +#define NUM_PALS_TOTAL 12 + extern struct BackupMapLayout gUnknown_03004870; struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection); int GetMapBorderIdAt(int x, int y); diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h index ff92fcc40..9df1ed940 100644 --- a/include/gba/m4a_internal.h +++ b/include/gba/m4a_internal.h @@ -368,7 +368,7 @@ extern const u8 gNoiseTable[]; extern const struct PokemonCrySong gPokemonCrySongTemplate; -extern const struct ToneData voicegroup_pokemon_cry; +extern const struct ToneData voicegroup000; extern char gNumMusicPlayers[]; extern char gMaxLines[]; diff --git a/include/pokedex.h b/include/pokedex.h index f051b4afe..1d3d9b388 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -3,6 +3,9 @@ #include "sprite.h" +#define HOENN_DEX_COUNT 202 +#define NATIONAL_DEX_COUNT 386 + void ResetPokedex(void); void sub_808C0A0(void); void CB2_InitPokedex(void); diff --git a/include/pokenav.h b/include/pokenav.h index 57cd1552e..a72cea9c4 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -42,6 +42,11 @@ struct UnkUsePokeblockSub { /*0x3*/ u8 unk4:1; }; +struct UnkPokenav11 { + u16 unk0; + u16 unk2; +}; + struct UnkPokenavStruct { /*0x0000*/ u16 unk0[6][0x40]; /*0x0300*/ u8 filler0300[0x6]; @@ -115,13 +120,16 @@ struct UnkPokenavStruct { /*0x87C8*/ u8 unk87C8; /*0x87C9*/ u8 unk87C9; /*0x87CA*/ u8 unk87CA; + /*0x87CB*/ u8 unk87CB; /*0x87CC*/ struct Sprite *unk87CC; /*0x87D0*/ struct Sprite *unk87D0[2]; - /*0x87D8*/ u8 filler87D8[0x2]; + /*0x87D8*/ u8 unk87D8; + /*0x87D9*/ u8 filler87D9[0x1]; /*0x87DA*/ s16 unk87DA; /*0x87DC*/ s16 unk87DC; - /*0x87DE*/ s16 unk87DE; - /*0x87E0*/ void *unk87E0; + /*0x87DE*/ u8 unk87DE; + /*0x87DF*/ u8 filler87DF[0x1]; + /*0x87E0*/ bool8 (*unk87E0)(void); /*0x87E4*/ struct Sprite *unk87E4[7]; /*0x8800*/ struct Sprite *unk8800[10]; /*0x8828*/ u8 unk8828; @@ -130,14 +138,25 @@ struct UnkPokenavStruct { /*0x8931*/ u8 unk8931[3]; /*0x8934*/ u8 unk8934[3]; /*0x8937*/ u8 unk8937[5]; - /*0x893C*/ struct UnkUsePokeblockSub unk893c[0x1ab]; - /*0x8fe8*/ u8 fil8fe8[1]; + /*0x893C*/ struct UnkUsePokeblockSub unk893c[0x1AA]; + /*0x8FE4*/ u16 unk8FE4; + /*0x8FE6*/ u8 unk8FE6; + /*0x8FE7*/ u8 unk8FE7; + /*0x8FE8*/ u8 filler8FE8[0x1]; /*0x8fe9*/ s8 unk8fe9; - /*0x8fea*/ u8 fil8fea[6]; - /*0x8ff0*/ u8 unk8ff0; - /*0x8ff1*/ u8 filler8ff1[0x13]; - /*0x9004*/ u8 unk9004[3][20]; - /*0x9040*/ u8 unk9040[0x304]; + /*0x8fea*/ s8 unk8FEA; + /*0x8feb*/ s8 unk8FEB; + /*0x8fec*/ s8 unk8FEC; + /*0x8FED*/ u8 filler8FED[0x1]; + /*0x8fee*/ u16 unk8FEE; + /*0x8ff0*/ u8 unk8ff0[4][5]; + /*0x9004*/ struct UnkPokenav11 unk9004[3][5]; + /*0x9040*/ struct UnkPokenav11 unk9040[5]; + /*0x9054*/ struct UnkPokenav11 unk9054[9][5]; + /*0x9108*/ u8 unk9108[0x14]; + /*0x911C*/ struct UnkPokenav11 unk911C[5]; + /*0x9130*/ u8 filler9130[0x212]; + /*0x9342*/ u16 unk9342; /*0x9344*/ u8 unk9344; /*0x9345*/ u8 filler9345[3]; /*0x9348*/ struct Sprite *unk9348; @@ -174,7 +193,8 @@ struct UnkPokenavStruct { /*0xD160*/ u16 unkD160; /*0xD162*/ u8 unkD162; /*0xD164*/ struct UnkPokenavStruct_Sub1 unkD164; - /*0xD1D4*/ u8 fillerD1D4[0x8]; + /*0xD1D4*/ u8 fillerD1D6[0x2]; + /*0xD1D6*/ u16 unkD1D6[3]; /*0xD1DC*/ u16 unkD1DC; /*0xD1DE*/ u16 unkD1DE; /*0xD1E0*/ u8 *unkD1E0; @@ -196,7 +216,7 @@ void sub_80F33A8(void); void sub_80F3C94(void); void sub_80F3D00(void); void sub_80F4BD0(void); -void sub_80F556C(void *); +void sub_80F556C(struct UnkPokenav11*); void sub_80F567C(void *, void *); void sub_80F5B38(void); bool8 sub_80F5B50(void); @@ -205,7 +225,7 @@ void sub_80EBA5C(void); void sub_80F5060(bool8); void move_anim_execute(void); bool8 gpu_sync_bg_show(void); -void sub_80F5550(void *, void *); +void sub_80F5550(struct UnkPokenav11*, struct UnkPokenav11*); bool8 sub_80F555C(void); void sub_80F7224(u8); void sub_80F5BDC(void); diff --git a/include/sprite.h b/include/sprite.h index 9a5deb3c4..ff5493afe 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -25,6 +25,8 @@ struct SpriteFrameImage #define obj_frame_tiles(ptr) {.data = (u8 *)ptr, .size = sizeof ptr} +#define overworld_frame(ptr, width, height, frame) {.data = (u8 *)ptr + (width * height * frame * 64)/2, .size = (width * height * 64)/2} + struct SpritePalette { const u16 *data; // Raw uncompressed palette data diff --git a/ld_script.txt b/ld_script.txt index 3fcea2b4b..552feb804 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -282,7 +282,6 @@ SECTIONS { src/battle/anim/fight.o(.text); src/battle/anim/poison.o(.text); src/battle/anim/flying.o(.text); - asm/flying.o(.text); src/battle/anim/psychic.o(.text); src/battle/anim/bug.o(.text); src/battle/anim/rock.o(.text); diff --git a/sound/song_table.inc b/sound/song_table.inc index d2aa7d327..605a6ec8a 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -437,7 +437,7 @@ gSongTable:: @ 845548C song bgm_machupi, 0, 0 @ Mt. Pyte (Outside) song bgm_p_school, 0, 0 @ Pokémon Trainer's School song bgm_dendou, 0, 0 @ Hall of Fame - song bgm_tonekusa, 0, 0 @ Lavaridge Town + song bgm_tonekusa, 0, 0 @ Fallarbor Town song bgm_maborosi, 0, 0 @ Sealed Chamber song bgm_con_fan, 0, 0 @ You are the Champion! song bgm_contest0, 0, 0 @ Pokémon Contest diff --git a/sound/songs/bgm_ajito.s b/sound/songs/bgm_ajito.s index 3e4abaeca..fcb8323ae 100644 --- a/sound/songs/bgm_ajito.s +++ b/sound/songs/bgm_ajito.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_ajito_grp, voicegroup_84455E8 + .equ bgm_ajito_grp, voicegroup073 .equ bgm_ajito_pri, 0 .equ bgm_ajito_rev, reverb_set+50 .equ bgm_ajito_mvl, 127 diff --git a/sound/songs/bgm_aqa_0.s b/sound/songs/bgm_aqa_0.s index 6f88eebfe..e111b9427 100644 --- a/sound/songs/bgm_aqa_0.s +++ b/sound/songs/bgm_aqa_0.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_aqa_0_grp, voicegroup_84413E8 + .equ bgm_aqa_0_grp, voicegroup062 .equ bgm_aqa_0_pri, 0 .equ bgm_aqa_0_rev, reverb_set+50 .equ bgm_aqa_0_mvl, 127 diff --git a/sound/songs/bgm_ashroad.s b/sound/songs/bgm_ashroad.s index c099a726f..eab28f8da 100644 --- a/sound/songs/bgm_ashroad.s +++ b/sound/songs/bgm_ashroad.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_ashroad_grp, voicegroup_843D9BC + .equ bgm_ashroad_grp, voicegroup052 .equ bgm_ashroad_pri, 0 .equ bgm_ashroad_rev, reverb_set+50 .equ bgm_ashroad_mvl, 127 diff --git a/sound/songs/bgm_ayasii.s b/sound/songs/bgm_ayasii.s index a39491ed7..01453a757 100644 --- a/sound/songs/bgm_ayasii.s +++ b/sound/songs/bgm_ayasii.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_ayasii_grp, voicegroup_8442BE8 + .equ bgm_ayasii_grp, voicegroup066 .equ bgm_ayasii_pri, 0 .equ bgm_ayasii_rev, reverb_set+50 .equ bgm_ayasii_mvl, 127 diff --git a/sound/songs/bgm_b_tower.s b/sound/songs/bgm_b_tower.s index 597da9917..e93233872 100644 --- a/sound/songs/bgm_b_tower.s +++ b/sound/songs/bgm_b_tower.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_b_tower_grp, voicegroup_843708C + .equ bgm_b_tower_grp, voicegroup032 .equ bgm_b_tower_pri, 0 .equ bgm_b_tower_rev, reverb_set+50 .equ bgm_b_tower_mvl, 127 diff --git a/sound/songs/bgm_battle20.s b/sound/songs/bgm_battle20.s index 5a2d2bfce..a058feaf6 100644 --- a/sound/songs/bgm_battle20.s +++ b/sound/songs/bgm_battle20.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_battle20_grp, voicegroup_844F50C + .equ bgm_battle20_grp, voicegroup102 .equ bgm_battle20_pri, 1 .equ bgm_battle20_rev, reverb_set+50 .equ bgm_battle20_mvl, 127 diff --git a/sound/songs/bgm_battle27.s b/sound/songs/bgm_battle27.s index 07f0de876..9960267d8 100644 --- a/sound/songs/bgm_battle27.s +++ b/sound/songs/bgm_battle27.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_battle27_grp, voicegroup_844ECF0 + .equ bgm_battle27_grp, voicegroup100 .equ bgm_battle27_pri, 1 .equ bgm_battle27_rev, reverb_set+50 .equ bgm_battle27_mvl, 127 diff --git a/sound/songs/bgm_battle30.s b/sound/songs/bgm_battle30.s index 57727d0d6..57f5e3e42 100644 --- a/sound/songs/bgm_battle30.s +++ b/sound/songs/bgm_battle30.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_battle30_grp, voicegroup_8451390 + .equ bgm_battle30_grp, voicegroup109 .equ bgm_battle30_pri, 1 .equ bgm_battle30_rev, reverb_set+50 .equ bgm_battle30_mvl, 127 diff --git a/sound/songs/bgm_battle31.s b/sound/songs/bgm_battle31.s index 11d2a745e..1bcf122a3 100644 --- a/sound/songs/bgm_battle31.s +++ b/sound/songs/bgm_battle31.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_battle31_grp, voicegroup_844F0C8 + .equ bgm_battle31_grp, voicegroup101 .equ bgm_battle31_pri, 1 .equ bgm_battle31_rev, reverb_set+50 .equ bgm_battle31_mvl, 127 diff --git a/sound/songs/bgm_battle32.s b/sound/songs/bgm_battle32.s index c5bd1d608..d27f5a171 100644 --- a/sound/songs/bgm_battle32.s +++ b/sound/songs/bgm_battle32.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_battle32_grp, voicegroup_844F950 + .equ bgm_battle32_grp, voicegroup103 .equ bgm_battle32_pri, 1 .equ bgm_battle32_rev, reverb_set+50 .equ bgm_battle32_mvl, 127 diff --git a/sound/songs/bgm_battle33.s b/sound/songs/bgm_battle33.s index 3ad9c4d6c..da51f1dfb 100644 --- a/sound/songs/bgm_battle33.s +++ b/sound/songs/bgm_battle33.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_battle33_grp, voicegroup_844FD94 + .equ bgm_battle33_grp, voicegroup104 .equ bgm_battle33_pri, 1 .equ bgm_battle33_rev, reverb_set+50 .equ bgm_battle33_mvl, 127 diff --git a/sound/songs/bgm_battle34.s b/sound/songs/bgm_battle34.s index 82954f5f8..bb83efda3 100644 --- a/sound/songs/bgm_battle34.s +++ b/sound/songs/bgm_battle34.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_battle34_grp, voicegroup_845058C + .equ bgm_battle34_grp, voicegroup106 .equ bgm_battle34_pri, 1 .equ bgm_battle34_rev, reverb_set+50 .equ bgm_battle34_mvl, 127 diff --git a/sound/songs/bgm_battle35.s b/sound/songs/bgm_battle35.s index 8d4fafb33..178d04844 100644 --- a/sound/songs/bgm_battle35.s +++ b/sound/songs/bgm_battle35.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_battle35_grp, voicegroup_8450B8C + .equ bgm_battle35_grp, voicegroup107 .equ bgm_battle35_pri, 1 .equ bgm_battle35_rev, reverb_set+50 .equ bgm_battle35_mvl, 127 diff --git a/sound/songs/bgm_battle36.s b/sound/songs/bgm_battle36.s index 7f5f81ee3..75080c72d 100644 --- a/sound/songs/bgm_battle36.s +++ b/sound/songs/bgm_battle36.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_battle36_grp, voicegroup_845019C + .equ bgm_battle36_grp, voicegroup105 .equ bgm_battle36_pri, 1 .equ bgm_battle36_rev, reverb_set+50 .equ bgm_battle36_mvl, 127 diff --git a/sound/songs/bgm_battle38.s b/sound/songs/bgm_battle38.s index 67682909e..78d40f682 100644 --- a/sound/songs/bgm_battle38.s +++ b/sound/songs/bgm_battle38.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_battle38_grp, voicegroup_8450FA0 + .equ bgm_battle38_grp, voicegroup108 .equ bgm_battle38_pri, 1 .equ bgm_battle38_rev, reverb_set+50 .equ bgm_battle38_mvl, 127 diff --git a/sound/songs/bgm_bd_time.s b/sound/songs/bgm_bd_time.s index 1a92f0d9f..dd1cf0a63 100644 --- a/sound/songs/bgm_bd_time.s +++ b/sound/songs/bgm_bd_time.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_bd_time_grp, voicegroup_8437EB4 + .equ bgm_bd_time_grp, voicegroup035 .equ bgm_bd_time_pri, 0 .equ bgm_bd_time_rev, reverb_set+50 .equ bgm_bd_time_mvl, 127 diff --git a/sound/songs/bgm_bijyutu.s b/sound/songs/bgm_bijyutu.s index b17b09253..fc1b17083 100644 --- a/sound/songs/bgm_bijyutu.s +++ b/sound/songs/bgm_bijyutu.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_bijyutu_grp, voicegroup_8433534 + .equ bgm_bijyutu_grp, voicegroup017 .equ bgm_bijyutu_pri, 0 .equ bgm_bijyutu_rev, reverb_set+50 .equ bgm_bijyutu_mvl, 127 diff --git a/sound/songs/bgm_boy_sup.s b/sound/songs/bgm_boy_sup.s index dfffd22c9..f7df3d52e 100644 --- a/sound/songs/bgm_boy_sup.s +++ b/sound/songs/bgm_boy_sup.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_boy_sup_grp, voicegroup_8441FE8 + .equ bgm_boy_sup_grp, voicegroup064 .equ bgm_boy_sup_pri, 0 .equ bgm_boy_sup_rev, reverb_set+50 .equ bgm_boy_sup_mvl, 127 diff --git a/sound/songs/bgm_boyeye.s b/sound/songs/bgm_boyeye.s index d5e9acdb9..800f30dfc 100644 --- a/sound/songs/bgm_boyeye.s +++ b/sound/songs/bgm_boyeye.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_boyeye_grp, voicegroup_8435514 + .equ bgm_boyeye_grp, voicegroup025 .equ bgm_boyeye_pri, 0 .equ bgm_boyeye_rev, reverb_set+50 .equ bgm_boyeye_mvl, 127 diff --git a/sound/songs/bgm_c_road.s b/sound/songs/bgm_c_road.s index 3f3eb0bb7..52093e41b 100644 --- a/sound/songs/bgm_c_road.s +++ b/sound/songs/bgm_c_road.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_c_road_grp, voicegroup_8444FE8 + .equ bgm_c_road_grp, voicegroup072 .equ bgm_c_road_pri, 0 .equ bgm_c_road_rev, reverb_set+50 .equ bgm_c_road_mvl, 127 diff --git a/sound/songs/bgm_casino.s b/sound/songs/bgm_casino.s index 3cba37299..89887267a 100644 --- a/sound/songs/bgm_casino.s +++ b/sound/songs/bgm_casino.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_casino_grp, voicegroup_8443DE8 + .equ bgm_casino_grp, voicegroup069 .equ bgm_casino_pri, 0 .equ bgm_casino_rev, reverb_set+50 .equ bgm_casino_mvl, 127 diff --git a/sound/songs/bgm_con_fan.s b/sound/songs/bgm_con_fan.s index 4c37906fa..279d778f0 100644 --- a/sound/songs/bgm_con_fan.s +++ b/sound/songs/bgm_con_fan.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_con_fan_grp, voicegroup_84483F0 + .equ bgm_con_fan_grp, voicegroup082 .equ bgm_con_fan_pri, 0 .equ bgm_con_fan_rev, reverb_set+50 .equ bgm_con_fan_mvl, 127 diff --git a/sound/songs/bgm_con_k.s b/sound/songs/bgm_con_k.s index b5f13ec91..aa73f0c7d 100644 --- a/sound/songs/bgm_con_k.s +++ b/sound/songs/bgm_con_k.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_con_k_grp, voicegroup_844ADF0 + .equ bgm_con_k_grp, voicegroup089 .equ bgm_con_k_pri, 0 .equ bgm_con_k_rev, reverb_set+50 .equ bgm_con_k_mvl, 127 diff --git a/sound/songs/bgm_conlobby.s b/sound/songs/bgm_conlobby.s index 0de5e57db..9b2f66f3f 100644 --- a/sound/songs/bgm_conlobby.s +++ b/sound/songs/bgm_conlobby.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_conlobby_grp, voicegroup_844D1F0 + .equ bgm_conlobby_grp, voicegroup095 .equ bgm_conlobby_pri, 0 .equ bgm_conlobby_rev, reverb_set+50 .equ bgm_conlobby_mvl, 127 diff --git a/sound/songs/bgm_contest0.s b/sound/songs/bgm_contest0.s index f3b610234..34fbf0af1 100644 --- a/sound/songs/bgm_contest0.s +++ b/sound/songs/bgm_contest0.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_contest0_grp, voicegroup_84489F0 + .equ bgm_contest0_grp, voicegroup083 .equ bgm_contest0_pri, 0 .equ bgm_contest0_rev, reverb_set+50 .equ bgm_contest0_mvl, 127 diff --git a/sound/songs/bgm_cycling.s b/sound/songs/bgm_cycling.s index 87605f57a..043f98129 100644 --- a/sound/songs/bgm_cycling.s +++ b/sound/songs/bgm_cycling.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_cycling_grp, voicegroup_843B844 + .equ bgm_cycling_grp, voicegroup046 .equ bgm_cycling_pri, 0 .equ bgm_cycling_rev, reverb_set+50 .equ bgm_cycling_mvl, 127 diff --git a/sound/songs/bgm_daigo.s b/sound/songs/bgm_daigo.s index 4e50a1a38..93fc33842 100644 --- a/sound/songs/bgm_daigo.s +++ b/sound/songs/bgm_daigo.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_daigo_grp, voicegroup_844DDF0 + .equ bgm_daigo_grp, voicegroup097 .equ bgm_daigo_pri, 0 .equ bgm_daigo_rev, reverb_set+50 .equ bgm_daigo_mvl, 127 diff --git a/sound/songs/bgm_dan01.s b/sound/songs/bgm_dan01.s index 2612ba317..a7fcb1659 100644 --- a/sound/songs/bgm_dan01.s +++ b/sound/songs/bgm_dan01.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_dan01_grp, voicegroup_8432B38 + .equ bgm_dan01_grp, voicegroup015 .equ bgm_dan01_pri, 0 .equ bgm_dan01_rev, reverb_set+50 .equ bgm_dan01_mvl, 127 diff --git a/sound/songs/bgm_dan02.s b/sound/songs/bgm_dan02.s index fc739a6f3..cf8531108 100644 --- a/sound/songs/bgm_dan02.s +++ b/sound/songs/bgm_dan02.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_dan02_grp, voicegroup_8435D18 + .equ bgm_dan02_grp, voicegroup027 .equ bgm_dan02_pri, 0 .equ bgm_dan02_rev, reverb_set+50 .equ bgm_dan02_mvl, 127 diff --git a/sound/songs/bgm_dan03.s b/sound/songs/bgm_dan03.s index bc6a60725..2db05620c 100644 --- a/sound/songs/bgm_dan03.s +++ b/sound/songs/bgm_dan03.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_dan03_grp, voicegroup_8437A88 + .equ bgm_dan03_grp, voicegroup034 .equ bgm_dan03_pri, 0 .equ bgm_dan03_rev, reverb_set+50 .equ bgm_dan03_mvl, 127 diff --git a/sound/songs/bgm_deepdeep.s b/sound/songs/bgm_deepdeep.s index c6912e061..cba06ab17 100644 --- a/sound/songs/bgm_deepdeep.s +++ b/sound/songs/bgm_deepdeep.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_deepdeep_grp, voicegroup_843E5BC + .equ bgm_deepdeep_grp, voicegroup054 .equ bgm_deepdeep_pri, 0 .equ bgm_deepdeep_rev, reverb_set+50 .equ bgm_deepdeep_mvl, 127 diff --git a/sound/songs/bgm_demo1.s b/sound/songs/bgm_demo1.s index 7ed6f7666..340d61a93 100644 --- a/sound/songs/bgm_demo1.s +++ b/sound/songs/bgm_demo1.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_demo1_grp, voicegroup_843F5E8 + .equ bgm_demo1_grp, voicegroup057 .equ bgm_demo1_pri, 0 .equ bgm_demo1_rev, reverb_set+50 .equ bgm_demo1_mvl, 127 diff --git a/sound/songs/bgm_dendou.s b/sound/songs/bgm_dendou.s index 83f6018cb..8aed5918d 100644 --- a/sound/songs/bgm_dendou.s +++ b/sound/songs/bgm_dendou.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_dendou_grp, voicegroup_8447400 + .equ bgm_dendou_grp, voicegroup079 .equ bgm_dendou_pri, 0 .equ bgm_dendou_rev, reverb_set+50 .equ bgm_dendou_mvl, 127 diff --git a/sound/songs/bgm_dooro1.s b/sound/songs/bgm_dooro1.s index 9effdf9a8..c316e7eb4 100644 --- a/sound/songs/bgm_dooro1.s +++ b/sound/songs/bgm_dooro1.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_dooro1_grp, voicegroup_8430C9C + .equ bgm_dooro1_grp, voicegroup008 .equ bgm_dooro1_pri, 0 .equ bgm_dooro1_rev, reverb_set+50 .equ bgm_dooro1_mvl, 127 diff --git a/sound/songs/bgm_dooro_x1.s b/sound/songs/bgm_dooro_x1.s index 8d62e9578..9e7ca8a27 100644 --- a/sound/songs/bgm_dooro_x1.s +++ b/sound/songs/bgm_dooro_x1.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_dooro_x1_grp, voicegroup_84308AC + .equ bgm_dooro_x1_grp, voicegroup007 .equ bgm_dooro_x1_pri, 0 .equ bgm_dooro_x1_rev, reverb_set+50 .equ bgm_dooro_x1_mvl, 127 diff --git a/sound/songs/bgm_dooro_x3.s b/sound/songs/bgm_dooro_x3.s index ec87080e0..3586016a6 100644 --- a/sound/songs/bgm_dooro_x3.s +++ b/sound/songs/bgm_dooro_x3.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_dooro_x3_grp, voicegroup_8431B9C + .equ bgm_dooro_x3_grp, voicegroup011 .equ bgm_dooro_x3_pri, 0 .equ bgm_dooro_x3_rev, reverb_set+50 .equ bgm_dooro_x3_mvl, 127 diff --git a/sound/songs/bgm_dooro_x4.s b/sound/songs/bgm_dooro_x4.s index 346983557..4d18c9295 100644 --- a/sound/songs/bgm_dooro_x4.s +++ b/sound/songs/bgm_dooro_x4.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_dooro_x4_grp, voicegroup_8433948 + .equ bgm_dooro_x4_grp, voicegroup018 .equ bgm_dooro_x4_pri, 0 .equ bgm_dooro_x4_rev, reverb_set+50 .equ bgm_dooro_x4_mvl, 127 diff --git a/sound/songs/bgm_eikou_r.s b/sound/songs/bgm_eikou_r.s index 298623ed3..0d5718394 100644 --- a/sound/songs/bgm_eikou_r.s +++ b/sound/songs/bgm_eikou_r.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_eikou_r_grp, voicegroup_844B3F0 + .equ bgm_eikou_r_grp, voicegroup090 .equ bgm_eikou_r_pri, 0 .equ bgm_eikou_r_rev, reverb_set+50 .equ bgm_eikou_r_mvl, 127 diff --git a/sound/songs/bgm_end.s b/sound/songs/bgm_end.s index c583f7163..8f95bbbdf 100644 --- a/sound/songs/bgm_end.s +++ b/sound/songs/bgm_end.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_end_grp, voicegroup_844E918 + .equ bgm_end_grp, voicegroup099 .equ bgm_end_pri, 0 .equ bgm_end_rev, reverb_set+50 .equ bgm_end_mvl, 127 diff --git a/sound/songs/bgm_event0.s b/sound/songs/bgm_event0.s index 12bab711f..976d1d899 100644 --- a/sound/songs/bgm_event0.s +++ b/sound/songs/bgm_event0.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_event0_grp, voicegroup_843DFBC + .equ bgm_event0_grp, voicegroup053 .equ bgm_event0_pri, 0 .equ bgm_event0_rev, reverb_set+50 .equ bgm_event0_mvl, 127 diff --git a/sound/songs/bgm_fanfa1.s b/sound/songs/bgm_fanfa1.s index 4a4ceef29..ac5b1f2f6 100644 --- a/sound/songs/bgm_fanfa1.s +++ b/sound/songs/bgm_fanfa1.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_fanfa1_grp, voicegroup_843129C + .equ bgm_fanfa1_grp, voicegroup009 .equ bgm_fanfa1_pri, 5 .equ bgm_fanfa1_rev, reverb_set+50 .equ bgm_fanfa1_mvl, 127 diff --git a/sound/songs/bgm_fanfa4.s b/sound/songs/bgm_fanfa4.s index f02ff9d19..c7a329e5f 100644 --- a/sound/songs/bgm_fanfa4.s +++ b/sound/songs/bgm_fanfa4.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_fanfa4_grp, voicegroup_843129C + .equ bgm_fanfa4_grp, voicegroup009 .equ bgm_fanfa4_pri, 5 .equ bgm_fanfa4_rev, reverb_set+50 .equ bgm_fanfa4_mvl, 127 diff --git a/sound/songs/bgm_fanfa5.s b/sound/songs/bgm_fanfa5.s index d2ec96b8e..c08ccc80b 100644 --- a/sound/songs/bgm_fanfa5.s +++ b/sound/songs/bgm_fanfa5.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_fanfa5_grp, voicegroup_843129C + .equ bgm_fanfa5_grp, voicegroup009 .equ bgm_fanfa5_pri, 5 .equ bgm_fanfa5_rev, reverb_set+50 .equ bgm_fanfa5_mvl, 127 diff --git a/sound/songs/bgm_field13.s b/sound/songs/bgm_field13.s index 2b6b8383a..e09c90ece 100644 --- a/sound/songs/bgm_field13.s +++ b/sound/songs/bgm_field13.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_field13_grp, voicegroup_pokemon_cry + .equ bgm_field13_grp, voicegroup000 .equ bgm_field13_pri, 0 .equ bgm_field13_rev, reverb_set+50 .equ bgm_field13_mvl, 127 diff --git a/sound/songs/bgm_finecity.s b/sound/songs/bgm_finecity.s index cc1e84b2c..62f585729 100644 --- a/sound/songs/bgm_finecity.s +++ b/sound/songs/bgm_finecity.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_finecity_grp, voicegroup_84467E8 + .equ bgm_finecity_grp, voicegroup076 .equ bgm_finecity_pri, 0 .equ bgm_finecity_rev, reverb_set+50 .equ bgm_finecity_mvl, 127 diff --git a/sound/songs/bgm_friendly.s b/sound/songs/bgm_friendly.s index 3cc8982e8..959cfd79a 100644 --- a/sound/songs/bgm_friendly.s +++ b/sound/songs/bgm_friendly.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_friendly_grp, voicegroup_843BE44 + .equ bgm_friendly_grp, voicegroup047 .equ bgm_friendly_pri, 0 .equ bgm_friendly_rev, reverb_set+50 .equ bgm_friendly_mvl, 127 diff --git a/sound/songs/bgm_fune_kan.s b/sound/songs/bgm_fune_kan.s index 72e600154..87977b0ec 100644 --- a/sound/songs/bgm_fune_kan.s +++ b/sound/songs/bgm_fune_kan.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_fune_kan_grp, voicegroup_8433EB8 + .equ bgm_fune_kan_grp, voicegroup020 .equ bgm_fune_kan_pri, 0 .equ bgm_fune_kan_rev, reverb_set+50 .equ bgm_fune_kan_mvl, 127 diff --git a/sound/songs/bgm_gim.s b/sound/songs/bgm_gim.s index 2b0692ead..51ea72bd8 100644 --- a/sound/songs/bgm_gim.s +++ b/sound/songs/bgm_gim.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_gim_grp, voicegroup_8431764 + .equ bgm_gim_grp, voicegroup010 .equ bgm_gim_pri, 0 .equ bgm_gim_rev, reverb_set+50 .equ bgm_gim_mvl, 127 diff --git a/sound/songs/bgm_girl_sup.s b/sound/songs/bgm_girl_sup.s index 0ec928556..07b496f6c 100644 --- a/sound/songs/bgm_girl_sup.s +++ b/sound/songs/bgm_girl_sup.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_girl_sup_grp, voicegroup_843FBE8 + .equ bgm_girl_sup_grp, voicegroup058 .equ bgm_girl_sup_pri, 0 .equ bgm_girl_sup_rev, reverb_set+50 .equ bgm_girl_sup_mvl, 127 diff --git a/sound/songs/bgm_girleye.s b/sound/songs/bgm_girleye.s index d0d9562d6..ed5437e42 100644 --- a/sound/songs/bgm_girleye.s +++ b/sound/songs/bgm_girleye.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_girleye_grp, voicegroup_843CDBC + .equ bgm_girleye_grp, voicegroup050 .equ bgm_girleye_pri, 0 .equ bgm_girleye_rev, reverb_set+50 .equ bgm_girleye_mvl, 127 diff --git a/sound/songs/bgm_gomachi0.s b/sound/songs/bgm_gomachi0.s index 91227fe92..a5ebcfa25 100644 --- a/sound/songs/bgm_gomachi0.s +++ b/sound/songs/bgm_gomachi0.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_gomachi0_grp, voicegroup_8439E58 + .equ bgm_gomachi0_grp, voicegroup041 .equ bgm_gomachi0_pri, 0 .equ bgm_gomachi0_rev, reverb_set+50 .equ bgm_gomachi0_mvl, 127 diff --git a/sound/songs/bgm_gotown.s b/sound/songs/bgm_gotown.s index 748c3195f..c06102a91 100644 --- a/sound/songs/bgm_gotown.s +++ b/sound/songs/bgm_gotown.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_gotown_grp, voicegroup_843A224 + .equ bgm_gotown_grp, voicegroup042 .equ bgm_gotown_pri, 0 .equ bgm_gotown_rev, reverb_set+50 .equ bgm_gotown_mvl, 127 diff --git a/sound/songs/bgm_granroad.s b/sound/songs/bgm_granroad.s index 036d00dcf..d51e08206 100644 --- a/sound/songs/bgm_granroad.s +++ b/sound/songs/bgm_granroad.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_granroad_grp, voicegroup_843B424 + .equ bgm_granroad_grp, voicegroup045 .equ bgm_granroad_pri, 0 .equ bgm_granroad_rev, reverb_set+50 .equ bgm_granroad_mvl, 127 diff --git a/sound/songs/bgm_hageshii.s b/sound/songs/bgm_hageshii.s index cb9d17845..5c5a9d6fb 100644 --- a/sound/songs/bgm_hageshii.s +++ b/sound/songs/bgm_hageshii.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_hageshii_grp, voicegroup_84401E8 + .equ bgm_hageshii_grp, voicegroup059 .equ bgm_hageshii_pri, 0 .equ bgm_hageshii_rev, reverb_set+50 .equ bgm_hageshii_mvl, 127 diff --git a/sound/songs/bgm_hideri.s b/sound/songs/bgm_hideri.s index ca6910c2d..fee95288a 100644 --- a/sound/songs/bgm_hideri.s +++ b/sound/songs/bgm_hideri.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_hideri_grp, voicegroup_844A1F0 + .equ bgm_hideri_grp, voicegroup087 .equ bgm_hideri_pri, 0 .equ bgm_hideri_rev, reverb_set+50 .equ bgm_hideri_mvl, 127 diff --git a/sound/songs/bgm_hightown.s b/sound/songs/bgm_hightown.s index 4cec38184..c33708266 100644 --- a/sound/songs/bgm_hightown.s +++ b/sound/songs/bgm_hightown.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_hightown_grp, voicegroup_84443E8 + .equ bgm_hightown_grp, voicegroup070 .equ bgm_hightown_pri, 0 .equ bgm_hightown_rev, reverb_set+50 .equ bgm_hightown_mvl, 127 diff --git a/sound/songs/bgm_hutago.s b/sound/songs/bgm_hutago.s index d1e63ccc4..2987917fb 100644 --- a/sound/songs/bgm_hutago.s +++ b/sound/songs/bgm_hutago.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_hutago_grp, voicegroup_844BFF0 + .equ bgm_hutago_grp, voicegroup092 .equ bgm_hutago_pri, 0 .equ bgm_hutago_rev, reverb_set+50 .equ bgm_hutago_mvl, 127 diff --git a/sound/songs/bgm_inter_v.s b/sound/songs/bgm_inter_v.s index 2bfc85843..39a90a378 100644 --- a/sound/songs/bgm_inter_v.s +++ b/sound/songs/bgm_inter_v.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_inter_v_grp, voicegroup_844D7F0 + .equ bgm_inter_v_grp, voicegroup096 .equ bgm_inter_v_pri, 0 .equ bgm_inter_v_rev, reverb_set+50 .equ bgm_inter_v_mvl, 127 diff --git a/sound/songs/bgm_kachi1.s b/sound/songs/bgm_kachi1.s index ccc6c813f..9fa0fd0fa 100644 --- a/sound/songs/bgm_kachi1.s +++ b/sound/songs/bgm_kachi1.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_kachi1_grp, voicegroup_843EBBC + .equ bgm_kachi1_grp, voicegroup055 .equ bgm_kachi1_pri, 0 .equ bgm_kachi1_rev, reverb_set+50 .equ bgm_kachi1_mvl, 127 diff --git a/sound/songs/bgm_kachi2.s b/sound/songs/bgm_kachi2.s index cfb3be47f..828baa6f8 100644 --- a/sound/songs/bgm_kachi2.s +++ b/sound/songs/bgm_kachi2.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_kachi2_grp, voicegroup_8434728 + .equ bgm_kachi2_grp, voicegroup022 .equ bgm_kachi2_pri, 0 .equ bgm_kachi2_rev, reverb_set+50 .equ bgm_kachi2_mvl, 127 diff --git a/sound/songs/bgm_kachi22.s b/sound/songs/bgm_kachi22.s index 81fdecd0d..081350f36 100644 --- a/sound/songs/bgm_kachi22.s +++ b/sound/songs/bgm_kachi22.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_kachi22_grp, voicegroup_8434728 + .equ bgm_kachi22_grp, voicegroup022 .equ bgm_kachi22_pri, 0 .equ bgm_kachi22_rev, reverb_set+50 .equ bgm_kachi22_mvl, 127 diff --git a/sound/songs/bgm_kachi3.s b/sound/songs/bgm_kachi3.s index 73cf775ee..bbaf98982 100644 --- a/sound/songs/bgm_kachi3.s +++ b/sound/songs/bgm_kachi3.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_kachi3_grp, voicegroup_84342E4 + .equ bgm_kachi3_grp, voicegroup021 .equ bgm_kachi3_pri, 0 .equ bgm_kachi3_rev, reverb_set+50 .equ bgm_kachi3_mvl, 127 diff --git a/sound/songs/bgm_kachi4.s b/sound/songs/bgm_kachi4.s index 1136dda33..1f776e16e 100644 --- a/sound/songs/bgm_kachi4.s +++ b/sound/songs/bgm_kachi4.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_kachi4_grp, voicegroup_84431E8 + .equ bgm_kachi4_grp, voicegroup067 .equ bgm_kachi4_pri, 0 .equ bgm_kachi4_rev, reverb_set+50 .equ bgm_kachi4_mvl, 127 diff --git a/sound/songs/bgm_kachi5.s b/sound/songs/bgm_kachi5.s index 753692426..cef1c47bf 100644 --- a/sound/songs/bgm_kachi5.s +++ b/sound/songs/bgm_kachi5.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_kachi5_grp, voicegroup_84358F8 + .equ bgm_kachi5_grp, voicegroup026 .equ bgm_kachi5_pri, 0 .equ bgm_kachi5_rev, reverb_set+50 .equ bgm_kachi5_mvl, 127 diff --git a/sound/songs/bgm_kakkoii.s b/sound/songs/bgm_kakkoii.s index 4c8211681..bcef07517 100644 --- a/sound/songs/bgm_kakkoii.s +++ b/sound/songs/bgm_kakkoii.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_kakkoii_grp, voicegroup_84407E8 + .equ bgm_kakkoii_grp, voicegroup060 .equ bgm_kakkoii_pri, 0 .equ bgm_kakkoii_rev, reverb_set+50 .equ bgm_kakkoii_mvl, 127 diff --git a/sound/songs/bgm_karakuri.s b/sound/songs/bgm_karakuri.s index e4b861167..bedf9fc71 100644 --- a/sound/songs/bgm_karakuri.s +++ b/sound/songs/bgm_karakuri.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_karakuri_grp, voicegroup_844B9F0 + .equ bgm_karakuri_grp, voicegroup091 .equ bgm_karakuri_pri, 0 .equ bgm_karakuri_rev, reverb_set+50 .equ bgm_karakuri_mvl, 127 diff --git a/sound/songs/bgm_kazanbai.s b/sound/songs/bgm_kazanbai.s index daf884056..250805a6e 100644 --- a/sound/songs/bgm_kazanbai.s +++ b/sound/songs/bgm_kazanbai.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_kazanbai_grp, voicegroup_8440DE8 + .equ bgm_kazanbai_grp, voicegroup061 .equ bgm_kazanbai_pri, 0 .equ bgm_kazanbai_rev, reverb_set+50 .equ bgm_kazanbai_mvl, 127 diff --git a/sound/songs/bgm_m_boat.s b/sound/songs/bgm_m_boat.s index 7769cd2a4..383d18923 100644 --- a/sound/songs/bgm_m_boat.s +++ b/sound/songs/bgm_m_boat.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_m_boat_grp, voicegroup_8445BE8 + .equ bgm_m_boat_grp, voicegroup074 .equ bgm_m_boat_pri, 0 .equ bgm_m_boat_rev, reverb_set+50 .equ bgm_m_boat_mvl, 127 diff --git a/sound/songs/bgm_m_dungon.s b/sound/songs/bgm_m_dungon.s index 74b29c16c..dbd7ec229 100644 --- a/sound/songs/bgm_m_dungon.s +++ b/sound/songs/bgm_m_dungon.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_m_dungon_grp, voicegroup_84461E8 + .equ bgm_m_dungon_grp, voicegroup075 .equ bgm_m_dungon_pri, 0 .equ bgm_m_dungon_rev, reverb_set+50 .equ bgm_m_dungon_mvl, 127 diff --git a/sound/songs/bgm_maborosi.s b/sound/songs/bgm_maborosi.s index 42e6757a2..6f2aeec15 100644 --- a/sound/songs/bgm_maborosi.s +++ b/sound/songs/bgm_maborosi.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_maborosi_grp, voicegroup_8447DF0 + .equ bgm_maborosi_grp, voicegroup081 .equ bgm_maborosi_pri, 0 .equ bgm_maborosi_rev, reverb_set+50 .equ bgm_maborosi_mvl, 127 diff --git a/sound/songs/bgm_machi_s2.s b/sound/songs/bgm_machi_s2.s index 8d4758b10..8aa35c18f 100644 --- a/sound/songs/bgm_machi_s2.s +++ b/sound/songs/bgm_machi_s2.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_machi_s2_grp, voicegroup_8431F98 + .equ bgm_machi_s2_grp, voicegroup012 .equ bgm_machi_s2_pri, 0 .equ bgm_machi_s2_rev, reverb_set+50 .equ bgm_machi_s2_mvl, 127 diff --git a/sound/songs/bgm_machi_s3.s b/sound/songs/bgm_machi_s3.s index 68540037b..624b2132f 100644 --- a/sound/songs/bgm_machi_s3.s +++ b/sound/songs/bgm_machi_s3.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_machi_s3_grp, voicegroup_84362B8 + .equ bgm_machi_s3_grp, voicegroup029 .equ bgm_machi_s3_pri, 0 .equ bgm_machi_s3_rev, reverb_set+50 .equ bgm_machi_s3_mvl, 127 diff --git a/sound/songs/bgm_machi_s4.s b/sound/songs/bgm_machi_s4.s index cf05e1099..258c4220b 100644 --- a/sound/songs/bgm_machi_s4.s +++ b/sound/songs/bgm_machi_s4.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_machi_s4_grp, voicegroup_8433138 + .equ bgm_machi_s4_grp, voicegroup016 .equ bgm_machi_s4_pri, 0 .equ bgm_machi_s4_rev, reverb_set+50 .equ bgm_machi_s4_mvl, 127 diff --git a/sound/songs/bgm_machupi.s b/sound/songs/bgm_machupi.s index 39e3d1356..15c3a1116 100644 --- a/sound/songs/bgm_machupi.s +++ b/sound/songs/bgm_machupi.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_machupi_grp, voicegroup_8446DE8 + .equ bgm_machupi_grp, voicegroup077 .equ bgm_machupi_pri, 0 .equ bgm_machupi_rev, reverb_set+50 .equ bgm_machupi_mvl, 127 diff --git a/sound/songs/bgm_me_asa.s b/sound/songs/bgm_me_asa.s index 1b6ba784d..cd0180d7d 100644 --- a/sound/songs/bgm_me_asa.s +++ b/sound/songs/bgm_me_asa.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_me_asa_grp, voicegroup_843129C + .equ bgm_me_asa_grp, voicegroup009 .equ bgm_me_asa_pri, 5 .equ bgm_me_asa_rev, reverb_set+50 .equ bgm_me_asa_mvl, 127 diff --git a/sound/songs/bgm_me_b_big.s b/sound/songs/bgm_me_b_big.s index b59c162bb..c58a17a22 100644 --- a/sound/songs/bgm_me_b_big.s +++ b/sound/songs/bgm_me_b_big.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_me_b_big_grp, voicegroup_843129C + .equ bgm_me_b_big_grp, voicegroup009 .equ bgm_me_b_big_pri, 5 .equ bgm_me_b_big_rev, reverb_set+50 .equ bgm_me_b_big_mvl, 127 diff --git a/sound/songs/bgm_me_b_small.s b/sound/songs/bgm_me_b_small.s index d92fb9aae..e3db8b351 100644 --- a/sound/songs/bgm_me_b_small.s +++ b/sound/songs/bgm_me_b_small.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_me_b_small_grp, voicegroup_843129C + .equ bgm_me_b_small_grp, voicegroup009 .equ bgm_me_b_small_pri, 5 .equ bgm_me_b_small_rev, reverb_set+50 .equ bgm_me_b_small_mvl, 127 diff --git a/sound/songs/bgm_me_bachi.s b/sound/songs/bgm_me_bachi.s index d7ddef294..038c78577 100644 --- a/sound/songs/bgm_me_bachi.s +++ b/sound/songs/bgm_me_bachi.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_me_bachi_grp, voicegroup_843129C + .equ bgm_me_bachi_grp, voicegroup009 .equ bgm_me_bachi_pri, 5 .equ bgm_me_bachi_rev, reverb_set+50 .equ bgm_me_bachi_mvl, 127 diff --git a/sound/songs/bgm_me_kinomi.s b/sound/songs/bgm_me_kinomi.s index 8cbfd9ffa..4a23339dc 100644 --- a/sound/songs/bgm_me_kinomi.s +++ b/sound/songs/bgm_me_kinomi.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_me_kinomi_grp, voicegroup_843129C + .equ bgm_me_kinomi_grp, voicegroup009 .equ bgm_me_kinomi_pri, 5 .equ bgm_me_kinomi_rev, reverb_set+50 .equ bgm_me_kinomi_mvl, 127 diff --git a/sound/songs/bgm_me_shinka.s b/sound/songs/bgm_me_shinka.s index 6d6e66c0b..a8023124a 100644 --- a/sound/songs/bgm_me_shinka.s +++ b/sound/songs/bgm_me_shinka.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_me_shinka_grp, voicegroup_8434B18 + .equ bgm_me_shinka_grp, voicegroup023 .equ bgm_me_shinka_pri, 0 .equ bgm_me_shinka_rev, reverb_set+50 .equ bgm_me_shinka_mvl, 127 diff --git a/sound/songs/bgm_me_tama.s b/sound/songs/bgm_me_tama.s index 9079ce7ef..45ddf72bf 100644 --- a/sound/songs/bgm_me_tama.s +++ b/sound/songs/bgm_me_tama.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_me_tama_grp, voicegroup_843129C + .equ bgm_me_tama_grp, voicegroup009 .equ bgm_me_tama_pri, 5 .equ bgm_me_tama_rev, reverb_set+50 .equ bgm_me_tama_mvl, 127 diff --git a/sound/songs/bgm_me_wasure.s b/sound/songs/bgm_me_wasure.s index b76d5919f..34eabc907 100644 --- a/sound/songs/bgm_me_wasure.s +++ b/sound/songs/bgm_me_wasure.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_me_wasure_grp, voicegroup_843129C + .equ bgm_me_wasure_grp, voicegroup009 .equ bgm_me_wasure_pri, 5 .equ bgm_me_wasure_rev, reverb_set+50 .equ bgm_me_wasure_mvl, 127 diff --git a/sound/songs/bgm_me_waza.s b/sound/songs/bgm_me_waza.s index 2a2ae9815..1ed3d6c0b 100644 --- a/sound/songs/bgm_me_waza.s +++ b/sound/songs/bgm_me_waza.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_me_waza_grp, voicegroup_843129C + .equ bgm_me_waza_grp, voicegroup009 .equ bgm_me_waza_pri, 5 .equ bgm_me_waza_rev, reverb_set+50 .equ bgm_me_waza_mvl, 127 diff --git a/sound/songs/bgm_me_zannen.s b/sound/songs/bgm_me_zannen.s index 4eed890b1..9c8d946b5 100644 --- a/sound/songs/bgm_me_zannen.s +++ b/sound/songs/bgm_me_zannen.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_me_zannen_grp, voicegroup_843129C + .equ bgm_me_zannen_grp, voicegroup009 .equ bgm_me_zannen_pri, 5 .equ bgm_me_zannen_rev, reverb_set+50 .equ bgm_me_zannen_mvl, 127 diff --git a/sound/songs/bgm_mgm0.s b/sound/songs/bgm_mgm0.s index 80af6ec2e..1ffccf466 100644 --- a/sound/songs/bgm_mgm0.s +++ b/sound/songs/bgm_mgm0.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_mgm0_grp, voicegroup_8448FF0 + .equ bgm_mgm0_grp, voicegroup084 .equ bgm_mgm0_pri, 0 .equ bgm_mgm0_rev, reverb_set+50 .equ bgm_mgm0_mvl, 127 diff --git a/sound/songs/bgm_minamo.s b/sound/songs/bgm_minamo.s index e06b579f0..fb087ec8b 100644 --- a/sound/songs/bgm_minamo.s +++ b/sound/songs/bgm_minamo.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_minamo_grp, voicegroup_843D3BC + .equ bgm_minamo_grp, voicegroup051 .equ bgm_minamo_pri, 0 .equ bgm_minamo_rev, reverb_set+50 .equ bgm_minamo_mvl, 127 diff --git a/sound/songs/bgm_mishiro.s b/sound/songs/bgm_mishiro.s index 9c5b2209c..287d74f38 100644 --- a/sound/songs/bgm_mishiro.s +++ b/sound/songs/bgm_mishiro.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_mishiro_grp, voicegroup_843C444 + .equ bgm_mishiro_grp, voicegroup048 .equ bgm_mishiro_pri, 0 .equ bgm_mishiro_rev, reverb_set+50 .equ bgm_mishiro_mvl, 127 diff --git a/sound/songs/bgm_naminori.s b/sound/songs/bgm_naminori.s index a1869acba..8b4ee8864 100644 --- a/sound/songs/bgm_naminori.s +++ b/sound/songs/bgm_naminori.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_naminori_grp, voicegroup_84326F4 + .equ bgm_naminori_grp, voicegroup014 .equ bgm_naminori_pri, 0 .equ bgm_naminori_rev, reverb_set+50 .equ bgm_naminori_mvl, 127 diff --git a/sound/songs/bgm_nextroad.s b/sound/songs/bgm_nextroad.s index 646bf392e..db51b999c 100644 --- a/sound/songs/bgm_nextroad.s +++ b/sound/songs/bgm_nextroad.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_nextroad_grp, voicegroup_843AE24 + .equ bgm_nextroad_grp, voicegroup044 .equ bgm_nextroad_pri, 0 .equ bgm_nextroad_rev, reverb_set+50 .equ bgm_nextroad_mvl, 127 diff --git a/sound/songs/bgm_nibi.s b/sound/songs/bgm_nibi.s index 9520d02a6..ae1736dea 100644 --- a/sound/songs/bgm_nibi.s +++ b/sound/songs/bgm_nibi.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_nibi_grp, voicegroup_pokemon_cry + .equ bgm_nibi_grp, voicegroup000 .equ bgm_nibi_pri, 0 .equ bgm_nibi_rev, reverb_set+50 .equ bgm_nibi_mvl, 127 diff --git a/sound/songs/bgm_odamaki.s b/sound/songs/bgm_odamaki.s index 31ed12d90..7fe0af66c 100644 --- a/sound/songs/bgm_odamaki.s +++ b/sound/songs/bgm_odamaki.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_odamaki_grp, voicegroup_84368B8 + .equ bgm_odamaki_grp, voicegroup030 .equ bgm_odamaki_pri, 0 .equ bgm_odamaki_rev, reverb_set+50 .equ bgm_odamaki_mvl, 127 diff --git a/sound/songs/bgm_ooame.s b/sound/songs/bgm_ooame.s index 26ba20fa4..aa7bf51c4 100644 --- a/sound/songs/bgm_ooame.s +++ b/sound/songs/bgm_ooame.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_ooame_grp, voicegroup_8449BF0 + .equ bgm_ooame_grp, voicegroup086 .equ bgm_ooame_pri, 0 .equ bgm_ooame_rev, reverb_set+50 .equ bgm_ooame_mvl, 127 diff --git a/sound/songs/bgm_p_school.s b/sound/songs/bgm_p_school.s index 1d40846a4..2b85ac891 100644 --- a/sound/songs/bgm_p_school.s +++ b/sound/songs/bgm_p_school.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_p_school_grp, voicegroup_84473E8 + .equ bgm_p_school_grp, voicegroup078 .equ bgm_p_school_pri, 0 .equ bgm_p_school_rev, reverb_set+50 .equ bgm_p_school_mvl, 127 diff --git a/sound/songs/bgm_pcc.s b/sound/songs/bgm_pcc.s index a6e76660f..4bf0d3c07 100644 --- a/sound/songs/bgm_pcc.s +++ b/sound/songs/bgm_pcc.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_pcc_grp, voicegroup_pokemon_cry + .equ bgm_pcc_grp, voicegroup000 .equ bgm_pcc_pri, 0 .equ bgm_pcc_rev, reverb_set+50 .equ bgm_pcc_mvl, 127 diff --git a/sound/songs/bgm_pokecen.s b/sound/songs/bgm_pokecen.s index 6114b5ded..36a91db9c 100644 --- a/sound/songs/bgm_pokecen.s +++ b/sound/songs/bgm_pokecen.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_pokecen_grp, voicegroup_843A824 + .equ bgm_pokecen_grp, voicegroup043 .equ bgm_pokecen_pri, 0 .equ bgm_pokecen_rev, reverb_set+50 .equ bgm_pokecen_mvl, 127 diff --git a/sound/songs/bgm_radio_tower_occupied.s b/sound/songs/bgm_radio_tower_occupied.s index 29ea26185..748170bd4 100644 --- a/sound/songs/bgm_radio_tower_occupied.s +++ b/sound/songs/bgm_radio_tower_occupied.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_radio_tower_occupied_grp, voicegroup_8454C54 + .equ bgm_radio_tower_occupied_grp, voicegroup113 .equ bgm_radio_tower_occupied_pri, 0 .equ bgm_radio_tower_occupied_rev, reverb_set+50 .equ bgm_radio_tower_occupied_mvl, 127 diff --git a/sound/songs/bgm_rainbow.s b/sound/songs/bgm_rainbow.s index 3654f964b..ab04ca574 100644 --- a/sound/songs/bgm_rainbow.s +++ b/sound/songs/bgm_rainbow.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_rainbow_grp, voicegroup_84425E8 + .equ bgm_rainbow_grp, voicegroup065 .equ bgm_rainbow_pri, 0 .equ bgm_rainbow_rev, reverb_set+50 .equ bgm_rainbow_mvl, 127 diff --git a/sound/songs/bgm_ropeway.s b/sound/songs/bgm_ropeway.s index dc9144b71..97af82cd5 100644 --- a/sound/songs/bgm_ropeway.s +++ b/sound/songs/bgm_ropeway.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_ropeway_grp, voicegroup_84437E8 + .equ bgm_ropeway_grp, voicegroup068 .equ bgm_ropeway_pri, 0 .equ bgm_ropeway_rev, reverb_set+50 .equ bgm_ropeway_mvl, 127 diff --git a/sound/songs/bgm_runecity.s b/sound/songs/bgm_runecity.s index fb5697292..ae56b2d64 100644 --- a/sound/songs/bgm_runecity.s +++ b/sound/songs/bgm_runecity.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_runecity_grp, voicegroup_844A7F0 + .equ bgm_runecity_grp, voicegroup088 .equ bgm_runecity_pri, 0 .equ bgm_runecity_rev, reverb_set+50 .equ bgm_runecity_mvl, 127 diff --git a/sound/songs/bgm_safari.s b/sound/songs/bgm_safari.s index e1ea3da29..ecb083768 100644 --- a/sound/songs/bgm_safari.s +++ b/sound/songs/bgm_safari.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_safari_grp, voicegroup_84449E8 + .equ bgm_safari_grp, voicegroup071 .equ bgm_safari_pri, 0 .equ bgm_safari_rev, reverb_set+50 .equ bgm_safari_mvl, 127 diff --git a/sound/songs/bgm_shinka.s b/sound/songs/bgm_shinka.s index 1c79f9659..64adf44e0 100644 --- a/sound/songs/bgm_shinka.s +++ b/sound/songs/bgm_shinka.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_shinka_grp, voicegroup_8434B18 + .equ bgm_shinka_grp, voicegroup023 .equ bgm_shinka_pri, 0 .equ bgm_shinka_rev, reverb_set+50 .equ bgm_shinka_mvl, 127 diff --git a/sound/songs/bgm_sitennou.s b/sound/songs/bgm_sitennou.s index 08fb38d34..4013ae66f 100644 --- a/sound/songs/bgm_sitennou.s +++ b/sound/songs/bgm_sitennou.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_sitennou_grp, voicegroup_844C5F0 + .equ bgm_sitennou_grp, voicegroup093 .equ bgm_sitennou_pri, 0 .equ bgm_sitennou_rev, reverb_set+50 .equ bgm_sitennou_mvl, 127 diff --git a/sound/songs/bgm_suikun.s b/sound/songs/bgm_suikun.s index 738e574f1..7d6caa1b6 100644 --- a/sound/songs/bgm_suikun.s +++ b/sound/songs/bgm_suikun.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_suikun_grp, voicegroup_pokemon_cry + .equ bgm_suikun_grp, voicegroup000 .equ bgm_suikun_pri, 0 .equ bgm_suikun_rev, reverb_set+50 .equ bgm_suikun_mvl, 127 diff --git a/sound/songs/bgm_swimeye.s b/sound/songs/bgm_swimeye.s index 78908522f..404f17531 100644 --- a/sound/songs/bgm_swimeye.s +++ b/sound/songs/bgm_swimeye.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_swimeye_grp, voicegroup_8437488 + .equ bgm_swimeye_grp, voicegroup033 .equ bgm_swimeye_pri, 0 .equ bgm_swimeye_rev, reverb_set+50 .equ bgm_swimeye_mvl, 127 diff --git a/sound/songs/bgm_syoujoeye.s b/sound/songs/bgm_syoujoeye.s index ae1151bbf..6ec1d5674 100644 --- a/sound/songs/bgm_syoujoeye.s +++ b/sound/songs/bgm_syoujoeye.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_syoujoeye_grp, voicegroup_8434F14 + .equ bgm_syoujoeye_grp, voicegroup024 .equ bgm_syoujoeye_pri, 0 .equ bgm_syoujoeye_rev, reverb_set+50 .equ bgm_syoujoeye_mvl, 127 diff --git a/sound/songs/bgm_t_battle.s b/sound/songs/bgm_t_battle.s index d7302b8ed..43d60972a 100644 --- a/sound/songs/bgm_t_battle.s +++ b/sound/songs/bgm_t_battle.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_t_battle_grp, voicegroup_84495F0 + .equ bgm_t_battle_grp, voicegroup085 .equ bgm_t_battle_pri, 0 .equ bgm_t_battle_rev, reverb_set+50 .equ bgm_t_battle_mvl, 127 diff --git a/sound/songs/bgm_test.s b/sound/songs/bgm_test.s index 5d2a0282a..32b2108d2 100644 --- a/sound/songs/bgm_test.s +++ b/sound/songs/bgm_test.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_test_grp, voicegroup_8439A8C + .equ bgm_test_grp, voicegroup040 .equ bgm_test_pri, 0 .equ bgm_test_rev, reverb_set+50 .equ bgm_test_mvl, 127 diff --git a/sound/songs/bgm_test1.s b/sound/songs/bgm_test1.s index 32e6596bc..882b40b36 100644 --- a/sound/songs/bgm_test1.s +++ b/sound/songs/bgm_test1.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_test1_grp, voicegroup_843828C + .equ bgm_test1_grp, voicegroup036 .equ bgm_test1_pri, 0 .equ bgm_test1_rev, reverb_set+50 .equ bgm_test1_mvl, 127 diff --git a/sound/songs/bgm_test2.s b/sound/songs/bgm_test2.s index 52b68ffa6..626f87c63 100644 --- a/sound/songs/bgm_test2.s +++ b/sound/songs/bgm_test2.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_test2_grp, voicegroup_843888C + .equ bgm_test2_grp, voicegroup037 .equ bgm_test2_pri, 0 .equ bgm_test2_rev, reverb_set+50 .equ bgm_test2_mvl, 127 diff --git a/sound/songs/bgm_test3.s b/sound/songs/bgm_test3.s index ae0058591..06641901d 100644 --- a/sound/songs/bgm_test3.s +++ b/sound/songs/bgm_test3.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_test3_grp, voicegroup_8438E8C + .equ bgm_test3_grp, voicegroup038 .equ bgm_test3_pri, 0 .equ bgm_test3_rev, reverb_set+50 .equ bgm_test3_mvl, 127 diff --git a/sound/songs/bgm_test4.s b/sound/songs/bgm_test4.s index 38ad34413..cbe5371f9 100644 --- a/sound/songs/bgm_test4.s +++ b/sound/songs/bgm_test4.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_test4_grp, voicegroup_843948C + .equ bgm_test4_grp, voicegroup039 .equ bgm_test4_pri, 0 .equ bgm_test4_rev, reverb_set+50 .equ bgm_test4_mvl, 127 diff --git a/sound/songs/bgm_tetsuji.s b/sound/songs/bgm_tetsuji.s index 9ed5c9cd4..de5ffa3f3 100644 --- a/sound/songs/bgm_tetsuji.s +++ b/sound/songs/bgm_tetsuji.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_tetsuji_grp, voicegroup_8436C9C + .equ bgm_tetsuji_grp, voicegroup031 .equ bgm_tetsuji_pri, 0 .equ bgm_tetsuji_rev, reverb_set+50 .equ bgm_tetsuji_mvl, 127 diff --git a/sound/songs/bgm_thankfor.s b/sound/songs/bgm_thankfor.s index edbc7c383..f79b556bf 100644 --- a/sound/songs/bgm_thankfor.s +++ b/sound/songs/bgm_thankfor.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_thankfor_grp, voicegroup_844E3F0 + .equ bgm_thankfor_grp, voicegroup098 .equ bgm_thankfor_pri, 0 .equ bgm_thankfor_rev, reverb_set+50 .equ bgm_thankfor_mvl, 127 diff --git a/sound/songs/bgm_title3.s b/sound/songs/bgm_title3.s index 0e71a203d..6a696bae9 100644 --- a/sound/songs/bgm_title3.s +++ b/sound/songs/bgm_title3.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_title3_grp, voicegroup_843F1BC + .equ bgm_title3_grp, voicegroup056 .equ bgm_title3_pri, 0 .equ bgm_title3_rev, reverb_set+50 .equ bgm_title3_mvl, 127 diff --git a/sound/songs/bgm_tonekusa.s b/sound/songs/bgm_tonekusa.s index af64b10c5..0507fed2a 100644 --- a/sound/songs/bgm_tonekusa.s +++ b/sound/songs/bgm_tonekusa.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_tonekusa_grp, voicegroup_8447A00 + .equ bgm_tonekusa_grp, voicegroup080 .equ bgm_tonekusa_pri, 0 .equ bgm_tonekusa_rev, reverb_set+50 .equ bgm_tonekusa_mvl, 127 diff --git a/sound/songs/bgm_tozan.s b/sound/songs/bgm_tozan.s index aca0cb03d..42c47046d 100644 --- a/sound/songs/bgm_tozan.s +++ b/sound/songs/bgm_tozan.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_tozan_grp, voicegroup_843C7BC + .equ bgm_tozan_grp, voicegroup049 .equ bgm_tozan_pri, 0 .equ bgm_tozan_rev, reverb_set+50 .equ bgm_tozan_mvl, 127 diff --git a/sound/songs/bgm_tsuretek.s b/sound/songs/bgm_tsuretek.s index 25ee83556..f0c51e321 100644 --- a/sound/songs/bgm_tsuretek.s +++ b/sound/songs/bgm_tsuretek.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_tsuretek_grp, voicegroup_84419E8 + .equ bgm_tsuretek_grp, voicegroup063 .equ bgm_tsuretek_pri, 0 .equ bgm_tsuretek_rev, reverb_set+50 .equ bgm_tsuretek_mvl, 127 diff --git a/sound/songs/bgm_yama_eye.s b/sound/songs/bgm_yama_eye.s index 517fee6cd..31b79b2ed 100644 --- a/sound/songs/bgm_yama_eye.s +++ b/sound/songs/bgm_yama_eye.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_yama_eye_grp, voicegroup_844CBF0 + .equ bgm_yama_eye_grp, voicegroup094 .equ bgm_yama_eye_pri, 0 .equ bgm_yama_eye_rev, reverb_set+50 .equ bgm_yama_eye_mvl, 127 diff --git a/sound/songs/se_a.s b/sound/songs/se_a.s index 40acc4e17..67b3c22a3 100644 --- a/sound/songs/se_a.s +++ b/sound/songs/se_a.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_a_grp, voicegroup_8451F90 + .equ se_a_grp, voicegroup111 .equ se_a_pri, 4 .equ se_a_rev, reverb_set+50 .equ se_a_mvl, 127 diff --git a/sound/songs/se_ban.s b/sound/songs/se_ban.s index e1e6d3c67..7481f2cf1 100644 --- a/sound/songs/se_ban.s +++ b/sound/songs/se_ban.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_ban_grp, voicegroup_8451F90 + .equ se_ban_grp, voicegroup111 .equ se_ban_pri, 4 .equ se_ban_rev, reverb_set+50 .equ se_ban_mvl, 127 diff --git a/sound/songs/se_basabasa.s b/sound/songs/se_basabasa.s index fcc748bf1..b95cca124 100644 --- a/sound/songs/se_basabasa.s +++ b/sound/songs/se_basabasa.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_basabasa_grp, voicegroup_8451F90 + .equ se_basabasa_grp, voicegroup111 .equ se_basabasa_pri, 5 .equ se_basabasa_rev, reverb_set+50 .equ se_basabasa_mvl, 127 diff --git a/sound/songs/se_bidoro.s b/sound/songs/se_bidoro.s index a0b316a50..5e7fce2f7 100644 --- a/sound/songs/se_bidoro.s +++ b/sound/songs/se_bidoro.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_bidoro_grp, voicegroup_8451F90 + .equ se_bidoro_grp, voicegroup111 .equ se_bidoro_pri, 5 .equ se_bidoro_rev, reverb_set+50 .equ se_bidoro_mvl, 127 diff --git a/sound/songs/se_boo.s b/sound/songs/se_boo.s index b91c0e009..5e483da7d 100644 --- a/sound/songs/se_boo.s +++ b/sound/songs/se_boo.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_boo_grp, voicegroup_8451990 + .equ se_boo_grp, voicegroup110 .equ se_boo_pri, 4 .equ se_boo_rev, reverb_set+50 .equ se_boo_mvl, 127 diff --git a/sound/songs/se_bowa.s b/sound/songs/se_bowa.s index db224e4a2..c918a99b9 100644 --- a/sound/songs/se_bowa.s +++ b/sound/songs/se_bowa.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_bowa_grp, voicegroup_8451990 + .equ se_bowa_grp, voicegroup110 .equ se_bowa_pri, 4 .equ se_bowa_rev, reverb_set+50 .equ se_bowa_mvl, 127 diff --git a/sound/songs/se_bowa2.s b/sound/songs/se_bowa2.s index 1d21871e0..02cfb9084 100644 --- a/sound/songs/se_bowa2.s +++ b/sound/songs/se_bowa2.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_bowa2_grp, voicegroup_8451990 + .equ se_bowa2_grp, voicegroup110 .equ se_bowa2_pri, 5 .equ se_bowa2_rev, reverb_set+50 .equ se_bowa2_mvl, 127 diff --git a/sound/songs/se_bt_start.s b/sound/songs/se_bt_start.s index ea699104b..92404bbf2 100644 --- a/sound/songs/se_bt_start.s +++ b/sound/songs/se_bt_start.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_bt_start_grp, voicegroup_8451F90 + .equ se_bt_start_grp, voicegroup111 .equ se_bt_start_pri, 5 .equ se_bt_start_rev, reverb_set+50 .equ se_bt_start_mvl, 127 diff --git a/sound/songs/se_c_gaji.s b/sound/songs/se_c_gaji.s index fa87d3f12..e0e412f39 100644 --- a/sound/songs/se_c_gaji.s +++ b/sound/songs/se_c_gaji.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_c_gaji_grp, voicegroup_8451F90 + .equ se_c_gaji_grp, voicegroup111 .equ se_c_gaji_pri, 5 .equ se_c_gaji_rev, reverb_set+50 .equ se_c_gaji_mvl, 127 diff --git a/sound/songs/se_c_maku_d.s b/sound/songs/se_c_maku_d.s index e143734a6..1ce08606a 100644 --- a/sound/songs/se_c_maku_d.s +++ b/sound/songs/se_c_maku_d.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_c_maku_d_grp, voicegroup_8451F90 + .equ se_c_maku_d_grp, voicegroup111 .equ se_c_maku_d_pri, 5 .equ se_c_maku_d_rev, reverb_set+50 .equ se_c_maku_d_mvl, 127 diff --git a/sound/songs/se_c_maku_u.s b/sound/songs/se_c_maku_u.s index b2025dda7..c7dcfabc5 100644 --- a/sound/songs/se_c_maku_u.s +++ b/sound/songs/se_c_maku_u.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_c_maku_u_grp, voicegroup_8451F90 + .equ se_c_maku_u_grp, voicegroup111 .equ se_c_maku_u_pri, 5 .equ se_c_maku_u_rev, reverb_set+50 .equ se_c_maku_u_mvl, 127 diff --git a/sound/songs/se_c_pasi.s b/sound/songs/se_c_pasi.s index 530db344f..3767debf7 100644 --- a/sound/songs/se_c_pasi.s +++ b/sound/songs/se_c_pasi.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_c_pasi_grp, voicegroup_8451F90 + .equ se_c_pasi_grp, voicegroup111 .equ se_c_pasi_pri, 5 .equ se_c_pasi_rev, reverb_set+50 .equ se_c_pasi_mvl, 127 diff --git a/sound/songs/se_c_pikon.s b/sound/songs/se_c_pikon.s index ff0d49778..404f419bf 100644 --- a/sound/songs/se_c_pikon.s +++ b/sound/songs/se_c_pikon.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_c_pikon_grp, voicegroup_8451F90 + .equ se_c_pikon_grp, voicegroup111 .equ se_c_pikon_pri, 5 .equ se_c_pikon_rev, reverb_set+50 .equ se_c_pikon_mvl, 127 diff --git a/sound/songs/se_c_syu.s b/sound/songs/se_c_syu.s index 9d6b5be03..d0432b343 100644 --- a/sound/songs/se_c_syu.s +++ b/sound/songs/se_c_syu.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_c_syu_grp, voicegroup_8451F90 + .equ se_c_syu_grp, voicegroup111 .equ se_c_syu_pri, 5 .equ se_c_syu_rev, reverb_set+50 .equ se_c_syu_mvl, 127 diff --git a/sound/songs/se_card.s b/sound/songs/se_card.s index 43ee32232..06c8a8bf1 100644 --- a/sound/songs/se_card.s +++ b/sound/songs/se_card.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_card_grp, voicegroup_8451F90 + .equ se_card_grp, voicegroup111 .equ se_card_pri, 4 .equ se_card_rev, reverb_set+50 .equ se_card_mvl, 127 diff --git a/sound/songs/se_dansa.s b/sound/songs/se_dansa.s index 414ee2cee..14677b51f 100644 --- a/sound/songs/se_dansa.s +++ b/sound/songs/se_dansa.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_dansa_grp, voicegroup_8451990 + .equ se_dansa_grp, voicegroup110 .equ se_dansa_pri, 4 .equ se_dansa_rev, reverb_set+50 .equ se_dansa_mvl, 127 diff --git a/sound/songs/se_daugi.s b/sound/songs/se_daugi.s index b61c9628a..22c9d0257 100644 --- a/sound/songs/se_daugi.s +++ b/sound/songs/se_daugi.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_daugi_grp, voicegroup_8451990 + .equ se_daugi_grp, voicegroup110 .equ se_daugi_pri, 5 .equ se_daugi_rev, reverb_set+50 .equ se_daugi_mvl, 127 diff --git a/sound/songs/se_dendou.s b/sound/songs/se_dendou.s index 8cf2a0d1e..211779af2 100644 --- a/sound/songs/se_dendou.s +++ b/sound/songs/se_dendou.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_dendou_grp, voicegroup_8451F90 + .equ se_dendou_grp, voicegroup111 .equ se_dendou_pri, 5 .equ se_dendou_rev, reverb_set+50 .equ se_dendou_mvl, 127 diff --git a/sound/songs/se_doku.s b/sound/songs/se_doku.s index c4f470dbd..b3f56d47f 100644 --- a/sound/songs/se_doku.s +++ b/sound/songs/se_doku.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_doku_grp, voicegroup_8451990 + .equ se_doku_grp, voicegroup110 .equ se_doku_pri, 5 .equ se_doku_rev, reverb_set+50 .equ se_doku_mvl, 127 diff --git a/sound/songs/se_door.s b/sound/songs/se_door.s index 847f3ccea..9488908cf 100644 --- a/sound/songs/se_door.s +++ b/sound/songs/se_door.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_door_grp, voicegroup_8451990 + .equ se_door_grp, voicegroup110 .equ se_door_pri, 5 .equ se_door_rev, reverb_set+50 .equ se_door_mvl, 127 diff --git a/sound/songs/se_e.s b/sound/songs/se_e.s index dd524b0e2..e643cbcd8 100644 --- a/sound/songs/se_e.s +++ b/sound/songs/se_e.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_e_grp, voicegroup_8451F90 + .equ se_e_grp, voicegroup111 .equ se_e_pri, 4 .equ se_e_rev, reverb_set+50 .equ se_e_mvl, 127 diff --git a/sound/songs/se_elebeta.s b/sound/songs/se_elebeta.s index e1b24e85e..ae0916a4b 100644 --- a/sound/songs/se_elebeta.s +++ b/sound/songs/se_elebeta.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_elebeta_grp, voicegroup_8451F90 + .equ se_elebeta_grp, voicegroup111 .equ se_elebeta_pri, 4 .equ se_elebeta_rev, reverb_set+50 .equ se_elebeta_mvl, 127 diff --git a/sound/songs/se_esuka.s b/sound/songs/se_esuka.s index 7b094c5b3..a3e649077 100644 --- a/sound/songs/se_esuka.s +++ b/sound/songs/se_esuka.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_esuka_grp, voicegroup_8451F90 + .equ se_esuka_grp, voicegroup111 .equ se_esuka_pri, 4 .equ se_esuka_rev, reverb_set+50 .equ se_esuka_mvl, 127 diff --git a/sound/songs/se_exp.s b/sound/songs/se_exp.s index 36ffde851..f76b3e54f 100644 --- a/sound/songs/se_exp.s +++ b/sound/songs/se_exp.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_exp_grp, voicegroup_8451F90 + .equ se_exp_grp, voicegroup111 .equ se_exp_pri, 5 .equ se_exp_rev, reverb_set+50 .equ se_exp_mvl, 127 diff --git a/sound/songs/se_expmax.s b/sound/songs/se_expmax.s index 2e34c941d..f106ff6cb 100644 --- a/sound/songs/se_expmax.s +++ b/sound/songs/se_expmax.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_expmax_grp, voicegroup_8451F90 + .equ se_expmax_grp, voicegroup111 .equ se_expmax_pri, 5 .equ se_expmax_rev, reverb_set+50 .equ se_expmax_mvl, 127 diff --git a/sound/songs/se_fu_zaku.s b/sound/songs/se_fu_zaku.s index 813e9bec6..413d5418b 100644 --- a/sound/songs/se_fu_zaku.s +++ b/sound/songs/se_fu_zaku.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_fu_zaku_grp, voicegroup_8451990 + .equ se_fu_zaku_grp, voicegroup110 .equ se_fu_zaku_pri, 4 .equ se_fu_zaku_rev, reverb_set+50 .equ se_fu_zaku_mvl, 127 diff --git a/sound/songs/se_fu_zaku2.s b/sound/songs/se_fu_zaku2.s index db2a316d1..92313a3ad 100644 --- a/sound/songs/se_fu_zaku2.s +++ b/sound/songs/se_fu_zaku2.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_fu_zaku2_grp, voicegroup_8451990 + .equ se_fu_zaku2_grp, voicegroup110 .equ se_fu_zaku2_pri, 4 .equ se_fu_zaku2_rev, reverb_set+50 .equ se_fu_zaku2_mvl, 127 diff --git a/sound/songs/se_fu_zuzuzu.s b/sound/songs/se_fu_zuzuzu.s index 3b7446301..5afa89731 100644 --- a/sound/songs/se_fu_zuzuzu.s +++ b/sound/songs/se_fu_zuzuzu.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_fu_zuzuzu_grp, voicegroup_8451990 + .equ se_fu_zuzuzu_grp, voicegroup110 .equ se_fu_zuzuzu_pri, 4 .equ se_fu_zuzuzu_rev, reverb_set+50 .equ se_fu_zuzuzu_mvl, 127 diff --git a/sound/songs/se_fuusen1.s b/sound/songs/se_fuusen1.s index e0ae744ce..e496a6661 100644 --- a/sound/songs/se_fuusen1.s +++ b/sound/songs/se_fuusen1.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_fuusen1_grp, voicegroup_8451F90 + .equ se_fuusen1_grp, voicegroup111 .equ se_fuusen1_pri, 4 .equ se_fuusen1_rev, reverb_set+50 .equ se_fuusen1_mvl, 127 diff --git a/sound/songs/se_fuusen2.s b/sound/songs/se_fuusen2.s index 29bc3b40f..c47ba5206 100644 --- a/sound/songs/se_fuusen2.s +++ b/sound/songs/se_fuusen2.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_fuusen2_grp, voicegroup_8451F90 + .equ se_fuusen2_grp, voicegroup111 .equ se_fuusen2_pri, 4 .equ se_fuusen2_rev, reverb_set+50 .equ se_fuusen2_mvl, 127 diff --git a/sound/songs/se_fuusen3.s b/sound/songs/se_fuusen3.s index 5e659c2a0..40c993e00 100644 --- a/sound/songs/se_fuusen3.s +++ b/sound/songs/se_fuusen3.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_fuusen3_grp, voicegroup_8451F90 + .equ se_fuusen3_grp, voicegroup111 .equ se_fuusen3_pri, 4 .equ se_fuusen3_rev, reverb_set+50 .equ se_fuusen3_mvl, 127 diff --git a/sound/songs/se_hashi.s b/sound/songs/se_hashi.s index e5705792b..6a1556cad 100644 --- a/sound/songs/se_hashi.s +++ b/sound/songs/se_hashi.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_hashi_grp, voicegroup_8451F90 + .equ se_hashi_grp, voicegroup111 .equ se_hashi_pri, 4 .equ se_hashi_rev, reverb_set+50 .equ se_hashi_mvl, 127 diff --git a/sound/songs/se_hazure.s b/sound/songs/se_hazure.s index 9b50d444a..5a12618a0 100644 --- a/sound/songs/se_hazure.s +++ b/sound/songs/se_hazure.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_hazure_grp, voicegroup_8451990 + .equ se_hazure_grp, voicegroup110 .equ se_hazure_pri, 4 .equ se_hazure_rev, reverb_set+50 .equ se_hazure_mvl, 127 diff --git a/sound/songs/se_hi_turun.s b/sound/songs/se_hi_turun.s index 95271dbb2..6c7917e5d 100644 --- a/sound/songs/se_hi_turun.s +++ b/sound/songs/se_hi_turun.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_hi_turun_grp, voicegroup_8451F90 + .equ se_hi_turun_grp, voicegroup111 .equ se_hi_turun_pri, 4 .equ se_hi_turun_rev, reverb_set+50 .equ se_hi_turun_mvl, 127 diff --git a/sound/songs/se_hinsi.s b/sound/songs/se_hinsi.s index 90d12a0f3..fa209245a 100644 --- a/sound/songs/se_hinsi.s +++ b/sound/songs/se_hinsi.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_hinsi_grp, voicegroup_8451990 + .equ se_hinsi_grp, voicegroup110 .equ se_hinsi_pri, 3 .equ se_hinsi_rev, reverb_set+50 .equ se_hinsi_mvl, 127 diff --git a/sound/songs/se_i.s b/sound/songs/se_i.s index c6a94b534..5a309dfa4 100644 --- a/sound/songs/se_i.s +++ b/sound/songs/se_i.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_i_grp, voicegroup_8451F90 + .equ se_i_grp, voicegroup111 .equ se_i_pri, 4 .equ se_i_rev, reverb_set+50 .equ se_i_mvl, 127 diff --git a/sound/songs/se_jido_doa.s b/sound/songs/se_jido_doa.s index ba1dc67e5..4dd946566 100644 --- a/sound/songs/se_jido_doa.s +++ b/sound/songs/se_jido_doa.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_jido_doa_grp, voicegroup_8451F90 + .equ se_jido_doa_grp, voicegroup111 .equ se_jido_doa_pri, 4 .equ se_jido_doa_rev, reverb_set+50 .equ se_jido_doa_mvl, 127 diff --git a/sound/songs/se_jihanki.s b/sound/songs/se_jihanki.s index 50d9b74e4..dd739a407 100644 --- a/sound/songs/se_jihanki.s +++ b/sound/songs/se_jihanki.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_jihanki_grp, voicegroup_8451F90 + .equ se_jihanki_grp, voicegroup111 .equ se_jihanki_pri, 4 .equ se_jihanki_rev, reverb_set+50 .equ se_jihanki_mvl, 127 diff --git a/sound/songs/se_jite_pyoko.s b/sound/songs/se_jite_pyoko.s index 08ec5c2eb..bea4ba251 100644 --- a/sound/songs/se_jite_pyoko.s +++ b/sound/songs/se_jite_pyoko.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_jite_pyoko_grp, voicegroup_8451990 + .equ se_jite_pyoko_grp, voicegroup110 .equ se_jite_pyoko_pri, 4 .equ se_jite_pyoko_rev, reverb_set+50 .equ se_jite_pyoko_mvl, 127 diff --git a/sound/songs/se_jitensya.s b/sound/songs/se_jitensya.s index 1ad6ed41b..eb447f59f 100644 --- a/sound/songs/se_jitensya.s +++ b/sound/songs/se_jitensya.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_jitensya_grp, voicegroup_8451F90 + .equ se_jitensya_grp, voicegroup111 .equ se_jitensya_pri, 4 .equ se_jitensya_rev, reverb_set+50 .equ se_jitensya_mvl, 127 diff --git a/sound/songs/se_jyuni.s b/sound/songs/se_jyuni.s index e319bc5f5..3587b107c 100644 --- a/sound/songs/se_jyuni.s +++ b/sound/songs/se_jyuni.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_jyuni_grp, voicegroup_8451990 + .equ se_jyuni_grp, voicegroup110 .equ se_jyuni_pri, 4 .equ se_jyuni_rev, reverb_set+50 .equ se_jyuni_mvl, 127 diff --git a/sound/songs/se_kaidan.s b/sound/songs/se_kaidan.s index 731e15331..4c0a42c06 100644 --- a/sound/songs/se_kaidan.s +++ b/sound/songs/se_kaidan.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_kaidan_grp, voicegroup_8451990 + .equ se_kaidan_grp, voicegroup110 .equ se_kaidan_pri, 5 .equ se_kaidan_rev, reverb_set+50 .equ se_kaidan_mvl, 127 diff --git a/sound/songs/se_kaifuku.s b/sound/songs/se_kaifuku.s index 4dd43574d..8fef0a0d2 100644 --- a/sound/songs/se_kaifuku.s +++ b/sound/songs/se_kaifuku.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_kaifuku_grp, voicegroup_8451990 + .equ se_kaifuku_grp, voicegroup110 .equ se_kaifuku_pri, 5 .equ se_kaifuku_rev, reverb_set+50 .equ se_kaifuku_mvl, 127 diff --git a/sound/songs/se_ki_gasyan.s b/sound/songs/se_ki_gasyan.s index 5337efa04..97a59487b 100644 --- a/sound/songs/se_ki_gasyan.s +++ b/sound/songs/se_ki_gasyan.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_ki_gasyan_grp, voicegroup_8451F90 + .equ se_ki_gasyan_grp, voicegroup111 .equ se_ki_gasyan_pri, 4 .equ se_ki_gasyan_rev, reverb_set+50 .equ se_ki_gasyan_mvl, 127 diff --git a/sound/songs/se_kon.s b/sound/songs/se_kon.s index bac102a13..dae80e70d 100644 --- a/sound/songs/se_kon.s +++ b/sound/songs/se_kon.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_kon_grp, voicegroup_8451F90 + .equ se_kon_grp, voicegroup111 .equ se_kon_pri, 4 .equ se_kon_rev, reverb_set+50 .equ se_kon_mvl, 127 diff --git a/sound/songs/se_kon2.s b/sound/songs/se_kon2.s index 82c8cfc8d..16c353497 100644 --- a/sound/songs/se_kon2.s +++ b/sound/songs/se_kon2.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_kon2_grp, voicegroup_8451F90 + .equ se_kon2_grp, voicegroup111 .equ se_kon2_pri, 4 .equ se_kon2_rev, reverb_set+50 .equ se_kon2_mvl, 127 diff --git a/sound/songs/se_kon3.s b/sound/songs/se_kon3.s index b18e2c23c..756ffe67b 100644 --- a/sound/songs/se_kon3.s +++ b/sound/songs/se_kon3.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_kon3_grp, voicegroup_8451F90 + .equ se_kon3_grp, voicegroup111 .equ se_kon3_pri, 4 .equ se_kon3_rev, reverb_set+50 .equ se_kon3_mvl, 127 diff --git a/sound/songs/se_kon4.s b/sound/songs/se_kon4.s index ef5881065..162b8513d 100644 --- a/sound/songs/se_kon4.s +++ b/sound/songs/se_kon4.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_kon4_grp, voicegroup_8451F90 + .equ se_kon4_grp, voicegroup111 .equ se_kon4_pri, 4 .equ se_kon4_rev, reverb_set+50 .equ se_kon4_mvl, 127 diff --git a/sound/songs/se_kouka_h.s b/sound/songs/se_kouka_h.s index 35a7318e8..ee667b618 100644 --- a/sound/songs/se_kouka_h.s +++ b/sound/songs/se_kouka_h.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_kouka_h_grp, voicegroup_8451990 + .equ se_kouka_h_grp, voicegroup110 .equ se_kouka_h_pri, 5 .equ se_kouka_h_rev, reverb_set+50 .equ se_kouka_h_mvl, 127 diff --git a/sound/songs/se_kouka_l.s b/sound/songs/se_kouka_l.s index 1fa9a8043..79c6fcdc9 100644 --- a/sound/songs/se_kouka_l.s +++ b/sound/songs/se_kouka_l.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_kouka_l_grp, voicegroup_8451990 + .equ se_kouka_l_grp, voicegroup110 .equ se_kouka_l_pri, 5 .equ se_kouka_l_rev, reverb_set+50 .equ se_kouka_l_mvl, 127 diff --git a/sound/songs/se_kouka_m.s b/sound/songs/se_kouka_m.s index f60b84adb..ee6e66e9a 100644 --- a/sound/songs/se_kouka_m.s +++ b/sound/songs/se_kouka_m.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_kouka_m_grp, voicegroup_8451990 + .equ se_kouka_m_grp, voicegroup110 .equ se_kouka_m_pri, 5 .equ se_kouka_m_rev, reverb_set+50 .equ se_kouka_m_mvl, 127 diff --git a/sound/songs/se_mizu.s b/sound/songs/se_mizu.s index 2d0ad81ab..0d3a4a411 100644 --- a/sound/songs/se_mizu.s +++ b/sound/songs/se_mizu.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_mizu_grp, voicegroup_8451F90 + .equ se_mizu_grp, voicegroup111 .equ se_mizu_pri, 4 .equ se_mizu_rev, reverb_set+50 .equ se_mizu_mvl, 127 diff --git a/sound/songs/se_moter.s b/sound/songs/se_moter.s index 688987228..62f5234c7 100644 --- a/sound/songs/se_moter.s +++ b/sound/songs/se_moter.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_moter_grp, voicegroup_8451F90 + .equ se_moter_grp, voicegroup111 .equ se_moter_pri, 4 .equ se_moter_rev, reverb_set+50 .equ se_moter_mvl, 127 diff --git a/sound/songs/se_mu_pachi.s b/sound/songs/se_mu_pachi.s index dab374614..4dc86c869 100644 --- a/sound/songs/se_mu_pachi.s +++ b/sound/songs/se_mu_pachi.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_mu_pachi_grp, voicegroup_8451990 + .equ se_mu_pachi_grp, voicegroup110 .equ se_mu_pachi_pri, 4 .equ se_mu_pachi_rev, reverb_set+50 .equ se_mu_pachi_mvl, 127 diff --git a/sound/songs/se_n.s b/sound/songs/se_n.s index fbdda1ba6..ff7636ec5 100644 --- a/sound/songs/se_n.s +++ b/sound/songs/se_n.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_n_grp, voicegroup_8451F90 + .equ se_n_grp, voicegroup111 .equ se_n_pri, 4 .equ se_n_rev, reverb_set+50 .equ se_n_mvl, 127 diff --git a/sound/songs/se_nageru.s b/sound/songs/se_nageru.s index 4afab82c1..81ae6e313 100644 --- a/sound/songs/se_nageru.s +++ b/sound/songs/se_nageru.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_nageru_grp, voicegroup_8451F90 + .equ se_nageru_grp, voicegroup111 .equ se_nageru_pri, 5 .equ se_nageru_rev, reverb_set+50 .equ se_nageru_mvl, 127 diff --git a/sound/songs/se_naminori.s b/sound/songs/se_naminori.s index ae9fabfa7..ea129e279 100644 --- a/sound/songs/se_naminori.s +++ b/sound/songs/se_naminori.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_naminori_grp, voicegroup_8451990 + .equ se_naminori_grp, voicegroup110 .equ se_naminori_pri, 4 .equ se_naminori_rev, reverb_set+50 .equ se_naminori_mvl, 127 diff --git a/sound/songs/se_nigeru.s b/sound/songs/se_nigeru.s index e70852566..d52af188b 100644 --- a/sound/songs/se_nigeru.s +++ b/sound/songs/se_nigeru.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_nigeru_grp, voicegroup_8451990 + .equ se_nigeru_grp, voicegroup110 .equ se_nigeru_pri, 5 .equ se_nigeru_rev, reverb_set+50 .equ se_nigeru_mvl, 127 diff --git a/sound/songs/se_o.s b/sound/songs/se_o.s index 47373ea36..51f0ae5fc 100644 --- a/sound/songs/se_o.s +++ b/sound/songs/se_o.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_o_grp, voicegroup_8451F90 + .equ se_o_grp, voicegroup111 .equ se_o_pri, 4 .equ se_o_rev, reverb_set+50 .equ se_o_mvl, 127 diff --git a/sound/songs/se_op_basyu.s b/sound/songs/se_op_basyu.s index f452019c8..a285cf558 100644 --- a/sound/songs/se_op_basyu.s +++ b/sound/songs/se_op_basyu.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_op_basyu_grp, voicegroup_8451990 + .equ se_op_basyu_grp, voicegroup110 .equ se_op_basyu_pri, 5 .equ se_op_basyu_rev, reverb_set+50 .equ se_op_basyu_mvl, 127 diff --git a/sound/songs/se_pc_logon.s b/sound/songs/se_pc_logon.s index 520d41844..a1bffea83 100644 --- a/sound/songs/se_pc_logon.s +++ b/sound/songs/se_pc_logon.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_pc_logon_grp, voicegroup_8451990 + .equ se_pc_logon_grp, voicegroup110 .equ se_pc_logon_pri, 5 .equ se_pc_logon_rev, reverb_set+50 .equ se_pc_logon_mvl, 127 diff --git a/sound/songs/se_pc_off.s b/sound/songs/se_pc_off.s index 671532c03..a27368e45 100644 --- a/sound/songs/se_pc_off.s +++ b/sound/songs/se_pc_off.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_pc_off_grp, voicegroup_8451990 + .equ se_pc_off_grp, voicegroup110 .equ se_pc_off_pri, 5 .equ se_pc_off_rev, reverb_set+50 .equ se_pc_off_mvl, 127 diff --git a/sound/songs/se_pc_on.s b/sound/songs/se_pc_on.s index a649fda69..8c12bda4c 100644 --- a/sound/songs/se_pc_on.s +++ b/sound/songs/se_pc_on.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_pc_on_grp, voicegroup_8451990 + .equ se_pc_on_grp, voicegroup110 .equ se_pc_on_pri, 5 .equ se_pc_on_rev, reverb_set+50 .equ se_pc_on_mvl, 127 diff --git a/sound/songs/se_pin.s b/sound/songs/se_pin.s index c145163a0..25887f691 100644 --- a/sound/songs/se_pin.s +++ b/sound/songs/se_pin.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_pin_grp, voicegroup_8451990 + .equ se_pin_grp, voicegroup110 .equ se_pin_pri, 4 .equ se_pin_rev, reverb_set+50 .equ se_pin_mvl, 127 diff --git a/sound/songs/se_pinpon.s b/sound/songs/se_pinpon.s index 0dfea28ea..dd2d8eb3e 100644 --- a/sound/songs/se_pinpon.s +++ b/sound/songs/se_pinpon.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_pinpon_grp, voicegroup_8451990 + .equ se_pinpon_grp, voicegroup110 .equ se_pinpon_pri, 5 .equ se_pinpon_rev, reverb_set+50 .equ se_pinpon_mvl, 127 diff --git a/sound/songs/se_pn_off.s b/sound/songs/se_pn_off.s index 48cbc5da8..a9c5437bc 100644 --- a/sound/songs/se_pn_off.s +++ b/sound/songs/se_pn_off.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_pn_off_grp, voicegroup_8451990 + .equ se_pn_off_grp, voicegroup110 .equ se_pn_off_pri, 5 .equ se_pn_off_rev, reverb_set+50 .equ se_pn_off_mvl, 127 diff --git a/sound/songs/se_pn_on.s b/sound/songs/se_pn_on.s index d0f515aaf..753508303 100644 --- a/sound/songs/se_pn_on.s +++ b/sound/songs/se_pn_on.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_pn_on_grp, voicegroup_8451990 + .equ se_pn_on_grp, voicegroup110 .equ se_pn_on_pri, 5 .equ se_pn_on_rev, reverb_set+50 .equ se_pn_on_mvl, 127 diff --git a/sound/songs/se_poke_dead.s b/sound/songs/se_poke_dead.s index fb7f58770..c571eabf3 100644 --- a/sound/songs/se_poke_dead.s +++ b/sound/songs/se_poke_dead.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_poke_dead_grp, voicegroup_8451990 + .equ se_poke_dead_grp, voicegroup110 .equ se_poke_dead_pri, 5 .equ se_poke_dead_rev, reverb_set+50 .equ se_poke_dead_mvl, 127 diff --git a/sound/songs/se_reapoke.s b/sound/songs/se_reapoke.s index 366d5c84a..cd22622bd 100644 --- a/sound/songs/se_reapoke.s +++ b/sound/songs/se_reapoke.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_reapoke_grp, voicegroup_8451F90 + .equ se_reapoke_grp, voicegroup111 .equ se_reapoke_pri, 5 .equ se_reapoke_rev, reverb_set+50 .equ se_reapoke_mvl, 127 diff --git a/sound/songs/se_regi.s b/sound/songs/se_regi.s index 295f1e47f..d047f270f 100644 --- a/sound/songs/se_regi.s +++ b/sound/songs/se_regi.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_regi_grp, voicegroup_8451990 + .equ se_regi_grp, voicegroup110 .equ se_regi_pri, 5 .equ se_regi_rev, reverb_set+50 .equ se_regi_mvl, 127 diff --git a/sound/songs/se_ru_bari.s b/sound/songs/se_ru_bari.s index dc73542e2..d3a72147d 100644 --- a/sound/songs/se_ru_bari.s +++ b/sound/songs/se_ru_bari.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_ru_bari_grp, voicegroup_8451990 + .equ se_ru_bari_grp, voicegroup110 .equ se_ru_bari_pri, 4 .equ se_ru_bari_rev, reverb_set+50 .equ se_ru_bari_mvl, 127 diff --git a/sound/songs/se_ru_gashin.s b/sound/songs/se_ru_gashin.s index 10c136a92..268713b27 100644 --- a/sound/songs/se_ru_gashin.s +++ b/sound/songs/se_ru_gashin.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_ru_gashin_grp, voicegroup_8451F90 + .equ se_ru_gashin_grp, voicegroup111 .equ se_ru_gashin_pri, 4 .equ se_ru_gashin_rev, reverb_set+50 .equ se_ru_gashin_mvl, 127 diff --git a/sound/songs/se_ru_gasyan.s b/sound/songs/se_ru_gasyan.s index 15ccd44ed..ddcd2f8b3 100644 --- a/sound/songs/se_ru_gasyan.s +++ b/sound/songs/se_ru_gasyan.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_ru_gasyan_grp, voicegroup_8451F90 + .equ se_ru_gasyan_grp, voicegroup111 .equ se_ru_gasyan_pri, 4 .equ se_ru_gasyan_rev, reverb_set+50 .equ se_ru_gasyan_mvl, 127 diff --git a/sound/songs/se_ru_hyuu.s b/sound/songs/se_ru_hyuu.s index d46442223..7edb6ed5b 100644 --- a/sound/songs/se_ru_hyuu.s +++ b/sound/songs/se_ru_hyuu.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_ru_hyuu_grp, voicegroup_8451F90 + .equ se_ru_hyuu_grp, voicegroup111 .equ se_ru_hyuu_pri, 4 .equ se_ru_hyuu_rev, reverb_set+50 .equ se_ru_hyuu_mvl, 127 diff --git a/sound/songs/se_save.s b/sound/songs/se_save.s index 3e8f1ea3a..7ae2d2a39 100644 --- a/sound/songs/se_save.s +++ b/sound/songs/se_save.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_save_grp, voicegroup_8451F90 + .equ se_save_grp, voicegroup111 .equ se_save_pri, 5 .equ se_save_rev, reverb_set+50 .equ se_save_mvl, 127 diff --git a/sound/songs/se_seikai.s b/sound/songs/se_seikai.s index b5bebbcc7..1487eb508 100644 --- a/sound/songs/se_seikai.s +++ b/sound/songs/se_seikai.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_seikai_grp, voicegroup_8451990 + .equ se_seikai_grp, voicegroup110 .equ se_seikai_pri, 4 .equ se_seikai_rev, reverb_set+50 .equ se_seikai_mvl, 127 diff --git a/sound/songs/se_select.s b/sound/songs/se_select.s index 21645c326..c62917e32 100644 --- a/sound/songs/se_select.s +++ b/sound/songs/se_select.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_select_grp, voicegroup_8451990 + .equ se_select_grp, voicegroup110 .equ se_select_pri, 5 .equ se_select_rev, reverb_set+50 .equ se_select_mvl, 127 diff --git a/sound/songs/se_stop.s b/sound/songs/se_stop.s index 6e540d2b9..f527ab84a 100644 --- a/sound/songs/se_stop.s +++ b/sound/songs/se_stop.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_stop_grp, voicegroup_pokemon_cry + .equ se_stop_grp, voicegroup000 .equ se_stop_pri, 0 .equ se_stop_rev, reverb_set+40 .equ se_stop_mvl, 127 diff --git a/sound/songs/se_suikomu.s b/sound/songs/se_suikomu.s index d548245b3..ae8c72d77 100644 --- a/sound/songs/se_suikomu.s +++ b/sound/songs/se_suikomu.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_suikomu_grp, voicegroup_8451990 + .equ se_suikomu_grp, voicegroup110 .equ se_suikomu_pri, 5 .equ se_suikomu_rev, reverb_set+50 .equ se_suikomu_mvl, 127 diff --git a/sound/songs/se_t_ame.s b/sound/songs/se_t_ame.s index 674159e22..35cee7692 100644 --- a/sound/songs/se_t_ame.s +++ b/sound/songs/se_t_ame.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_t_ame_grp, voicegroup_8451F90 + .equ se_t_ame_grp, voicegroup111 .equ se_t_ame_pri, 2 .equ se_t_ame_rev, reverb_set+50 .equ se_t_ame_mvl, 127 diff --git a/sound/songs/se_t_ame_e.s b/sound/songs/se_t_ame_e.s index a959e9476..8511f55d0 100644 --- a/sound/songs/se_t_ame_e.s +++ b/sound/songs/se_t_ame_e.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_t_ame_e_grp, voicegroup_8451F90 + .equ se_t_ame_e_grp, voicegroup111 .equ se_t_ame_e_pri, 2 .equ se_t_ame_e_rev, reverb_set+50 .equ se_t_ame_e_mvl, 127 diff --git a/sound/songs/se_t_kami.s b/sound/songs/se_t_kami.s index b1446d227..c5997261f 100644 --- a/sound/songs/se_t_kami.s +++ b/sound/songs/se_t_kami.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_t_kami_grp, voicegroup_8451F90 + .equ se_t_kami_grp, voicegroup111 .equ se_t_kami_pri, 3 .equ se_t_kami_rev, reverb_set+50 .equ se_t_kami_mvl, 127 diff --git a/sound/songs/se_t_kami2.s b/sound/songs/se_t_kami2.s index 9b601e438..951beeb4f 100644 --- a/sound/songs/se_t_kami2.s +++ b/sound/songs/se_t_kami2.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_t_kami2_grp, voicegroup_8451F90 + .equ se_t_kami2_grp, voicegroup111 .equ se_t_kami2_pri, 3 .equ se_t_kami2_rev, reverb_set+50 .equ se_t_kami2_mvl, 127 diff --git a/sound/songs/se_t_koame.s b/sound/songs/se_t_koame.s index 81852541e..3dbcc7559 100644 --- a/sound/songs/se_t_koame.s +++ b/sound/songs/se_t_koame.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_t_koame_grp, voicegroup_8451F90 + .equ se_t_koame_grp, voicegroup111 .equ se_t_koame_pri, 2 .equ se_t_koame_rev, reverb_set+50 .equ se_t_koame_mvl, 127 diff --git a/sound/songs/se_t_koame_e.s b/sound/songs/se_t_koame_e.s index b36ddd99f..fc9b1ee72 100644 --- a/sound/songs/se_t_koame_e.s +++ b/sound/songs/se_t_koame_e.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_t_koame_e_grp, voicegroup_8451F90 + .equ se_t_koame_e_grp, voicegroup111 .equ se_t_koame_e_pri, 2 .equ se_t_koame_e_rev, reverb_set+50 .equ se_t_koame_e_mvl, 127 diff --git a/sound/songs/se_t_ooame.s b/sound/songs/se_t_ooame.s index 37fbc5339..eb2b6374d 100644 --- a/sound/songs/se_t_ooame.s +++ b/sound/songs/se_t_ooame.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_t_ooame_grp, voicegroup_8451F90 + .equ se_t_ooame_grp, voicegroup111 .equ se_t_ooame_pri, 2 .equ se_t_ooame_rev, reverb_set+50 .equ se_t_ooame_mvl, 127 diff --git a/sound/songs/se_t_ooame_e.s b/sound/songs/se_t_ooame_e.s index 7d17a4d7a..43a2b6f26 100644 --- a/sound/songs/se_t_ooame_e.s +++ b/sound/songs/se_t_ooame_e.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_t_ooame_e_grp, voicegroup_8451F90 + .equ se_t_ooame_e_grp, voicegroup111 .equ se_t_ooame_e_pri, 2 .equ se_t_ooame_e_rev, reverb_set+50 .equ se_t_ooame_e_mvl, 127 diff --git a/sound/songs/se_tama.s b/sound/songs/se_tama.s index 28f6a4b8e..897b8d3d4 100644 --- a/sound/songs/se_tama.s +++ b/sound/songs/se_tama.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_tama_grp, voicegroup_8451F90 + .equ se_tama_grp, voicegroup111 .equ se_tama_pri, 5 .equ se_tama_rev, reverb_set+50 .equ se_tama_mvl, 127 diff --git a/sound/songs/se_tamago.s b/sound/songs/se_tamago.s index a88927fa6..670710bd2 100644 --- a/sound/songs/se_tamago.s +++ b/sound/songs/se_tamago.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_tamago_grp, voicegroup_8451F90 + .equ se_tamago_grp, voicegroup111 .equ se_tamago_pri, 5 .equ se_tamago_rev, reverb_set+50 .equ se_tamago_mvl, 127 diff --git a/sound/songs/se_tamakoro.s b/sound/songs/se_tamakoro.s index 758e97a08..4950c81a8 100644 --- a/sound/songs/se_tamakoro.s +++ b/sound/songs/se_tamakoro.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_tamakoro_grp, voicegroup_8451F90 + .equ se_tamakoro_grp, voicegroup111 .equ se_tamakoro_pri, 2 .equ se_tamakoro_rev, reverb_set+50 .equ se_tamakoro_mvl, 127 diff --git a/sound/songs/se_tamakoro_e.s b/sound/songs/se_tamakoro_e.s index a296e5b27..17c5db1fe 100644 --- a/sound/songs/se_tamakoro_e.s +++ b/sound/songs/se_tamakoro_e.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_tamakoro_e_grp, voicegroup_8451F90 + .equ se_tamakoro_e_grp, voicegroup111 .equ se_tamakoro_e_pri, 2 .equ se_tamakoro_e_rev, reverb_set+50 .equ se_tamakoro_e_mvl, 127 diff --git a/sound/songs/se_tb_kara.s b/sound/songs/se_tb_kara.s index a808d91c9..4f5a44de8 100644 --- a/sound/songs/se_tb_kara.s +++ b/sound/songs/se_tb_kara.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_tb_kara_grp, voicegroup_8451990 + .equ se_tb_kara_grp, voicegroup110 .equ se_tb_kara_pri, 5 .equ se_tb_kara_rev, reverb_set+50 .equ se_tb_kara_mvl, 127 diff --git a/sound/songs/se_tb_kon.s b/sound/songs/se_tb_kon.s index d5e811e91..920f48ba8 100644 --- a/sound/songs/se_tb_kon.s +++ b/sound/songs/se_tb_kon.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_tb_kon_grp, voicegroup_8451F90 + .equ se_tb_kon_grp, voicegroup111 .equ se_tb_kon_pri, 5 .equ se_tb_kon_rev, reverb_set+50 .equ se_tb_kon_mvl, 127 diff --git a/sound/songs/se_tb_start.s b/sound/songs/se_tb_start.s index 0106ec5b1..54795b6e3 100644 --- a/sound/songs/se_tb_start.s +++ b/sound/songs/se_tb_start.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_tb_start_grp, voicegroup_8451F90 + .equ se_tb_start_grp, voicegroup111 .equ se_tb_start_pri, 5 .equ se_tb_start_rev, reverb_set+50 .equ se_tb_start_mvl, 127 diff --git a/sound/songs/se_tk_kasya.s b/sound/songs/se_tk_kasya.s index 9658c2b1e..ff5f48561 100644 --- a/sound/songs/se_tk_kasya.s +++ b/sound/songs/se_tk_kasya.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_tk_kasya_grp, voicegroup_8451990 + .equ se_tk_kasya_grp, voicegroup110 .equ se_tk_kasya_pri, 4 .equ se_tk_kasya_rev, reverb_set+50 .equ se_tk_kasya_mvl, 127 diff --git a/sound/songs/se_tk_warpin.s b/sound/songs/se_tk_warpin.s index c7121f797..00c7ee207 100644 --- a/sound/songs/se_tk_warpin.s +++ b/sound/songs/se_tk_warpin.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_tk_warpin_grp, voicegroup_8451990 + .equ se_tk_warpin_grp, voicegroup110 .equ se_tk_warpin_pri, 4 .equ se_tk_warpin_rev, reverb_set+50 .equ se_tk_warpin_mvl, 127 diff --git a/sound/songs/se_tk_warpout.s b/sound/songs/se_tk_warpout.s index fd9f2f377..622001349 100644 --- a/sound/songs/se_tk_warpout.s +++ b/sound/songs/se_tk_warpout.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_tk_warpout_grp, voicegroup_8451990 + .equ se_tk_warpout_grp, voicegroup110 .equ se_tk_warpout_pri, 4 .equ se_tk_warpout_rev, reverb_set+50 .equ se_tk_warpout_mvl, 127 diff --git a/sound/songs/se_toy_a.s b/sound/songs/se_toy_a.s index 88a189413..53067b62c 100644 --- a/sound/songs/se_toy_a.s +++ b/sound/songs/se_toy_a.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_toy_a_grp, voicegroup_8451F90 + .equ se_toy_a_grp, voicegroup111 .equ se_toy_a_pri, 4 .equ se_toy_a_rev, reverb_set+50 .equ se_toy_a_mvl, 127 diff --git a/sound/songs/se_toy_b.s b/sound/songs/se_toy_b.s index 4200959eb..0ed76d9bd 100644 --- a/sound/songs/se_toy_b.s +++ b/sound/songs/se_toy_b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_toy_b_grp, voicegroup_8451F90 + .equ se_toy_b_grp, voicegroup111 .equ se_toy_b_pri, 4 .equ se_toy_b_rev, reverb_set+50 .equ se_toy_b_mvl, 127 diff --git a/sound/songs/se_toy_c.s b/sound/songs/se_toy_c.s index 48b705b93..6341fd96e 100644 --- a/sound/songs/se_toy_c.s +++ b/sound/songs/se_toy_c.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_toy_c_grp, voicegroup_8451F90 + .equ se_toy_c_grp, voicegroup111 .equ se_toy_c_pri, 4 .equ se_toy_c_rev, reverb_set+50 .equ se_toy_c_mvl, 127 diff --git a/sound/songs/se_toy_c1.s b/sound/songs/se_toy_c1.s index 3ca357f5e..02c595b68 100644 --- a/sound/songs/se_toy_c1.s +++ b/sound/songs/se_toy_c1.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_toy_c1_grp, voicegroup_8451F90 + .equ se_toy_c1_grp, voicegroup111 .equ se_toy_c1_pri, 4 .equ se_toy_c1_rev, reverb_set+50 .equ se_toy_c1_mvl, 127 diff --git a/sound/songs/se_toy_d.s b/sound/songs/se_toy_d.s index 4a267d6f5..9d75f98e8 100644 --- a/sound/songs/se_toy_d.s +++ b/sound/songs/se_toy_d.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_toy_d_grp, voicegroup_8451F90 + .equ se_toy_d_grp, voicegroup111 .equ se_toy_d_pri, 4 .equ se_toy_d_rev, reverb_set+50 .equ se_toy_d_mvl, 127 diff --git a/sound/songs/se_toy_dango.s b/sound/songs/se_toy_dango.s index d04759c63..28da6dfe3 100644 --- a/sound/songs/se_toy_dango.s +++ b/sound/songs/se_toy_dango.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_toy_dango_grp, voicegroup_8451F90 + .equ se_toy_dango_grp, voicegroup111 .equ se_toy_dango_pri, 4 .equ se_toy_dango_rev, reverb_set+50 .equ se_toy_dango_mvl, 127 diff --git a/sound/songs/se_toy_e.s b/sound/songs/se_toy_e.s index 289902e7a..bee25515c 100644 --- a/sound/songs/se_toy_e.s +++ b/sound/songs/se_toy_e.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_toy_e_grp, voicegroup_8451F90 + .equ se_toy_e_grp, voicegroup111 .equ se_toy_e_pri, 4 .equ se_toy_e_rev, reverb_set+50 .equ se_toy_e_mvl, 127 diff --git a/sound/songs/se_toy_f.s b/sound/songs/se_toy_f.s index 38c12638c..90ee9e99f 100644 --- a/sound/songs/se_toy_f.s +++ b/sound/songs/se_toy_f.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_toy_f_grp, voicegroup_8451F90 + .equ se_toy_f_grp, voicegroup111 .equ se_toy_f_pri, 4 .equ se_toy_f_rev, reverb_set+50 .equ se_toy_f_mvl, 127 diff --git a/sound/songs/se_toy_g.s b/sound/songs/se_toy_g.s index 9a9183f73..272017429 100644 --- a/sound/songs/se_toy_g.s +++ b/sound/songs/se_toy_g.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_toy_g_grp, voicegroup_8451F90 + .equ se_toy_g_grp, voicegroup111 .equ se_toy_g_pri, 4 .equ se_toy_g_rev, reverb_set+50 .equ se_toy_g_mvl, 127 diff --git a/sound/songs/se_toy_kabe.s b/sound/songs/se_toy_kabe.s index 9956dd7a8..9ed31f6bf 100644 --- a/sound/songs/se_toy_kabe.s +++ b/sound/songs/se_toy_kabe.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_toy_kabe_grp, voicegroup_8451F90 + .equ se_toy_kabe_grp, voicegroup111 .equ se_toy_kabe_pri, 4 .equ se_toy_kabe_rev, reverb_set+50 .equ se_toy_kabe_mvl, 127 diff --git a/sound/songs/se_track_door.s b/sound/songs/se_track_door.s index 88eb8b8e3..458028a1b 100644 --- a/sound/songs/se_track_door.s +++ b/sound/songs/se_track_door.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_track_door_grp, voicegroup_8451F90 + .equ se_track_door_grp, voicegroup111 .equ se_track_door_pri, 4 .equ se_track_door_rev, reverb_set+50 .equ se_track_door_mvl, 127 diff --git a/sound/songs/se_track_haik.s b/sound/songs/se_track_haik.s index bdba51513..40aa10994 100644 --- a/sound/songs/se_track_haik.s +++ b/sound/songs/se_track_haik.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_track_haik_grp, voicegroup_8451990 + .equ se_track_haik_grp, voicegroup110 .equ se_track_haik_pri, 4 .equ se_track_haik_rev, reverb_set+50 .equ se_track_haik_mvl, 127 diff --git a/sound/songs/se_track_move.s b/sound/songs/se_track_move.s index d73bb5a5f..bb88ef18f 100644 --- a/sound/songs/se_track_move.s +++ b/sound/songs/se_track_move.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_track_move_grp, voicegroup_8451F90 + .equ se_track_move_grp, voicegroup111 .equ se_track_move_pri, 4 .equ se_track_move_rev, reverb_set+50 .equ se_track_move_mvl, 127 diff --git a/sound/songs/se_track_stop.s b/sound/songs/se_track_stop.s index 8b658db50..ec12865b7 100644 --- a/sound/songs/se_track_stop.s +++ b/sound/songs/se_track_stop.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_track_stop_grp, voicegroup_8451F90 + .equ se_track_stop_grp, voicegroup111 .equ se_track_stop_pri, 4 .equ se_track_stop_rev, reverb_set+50 .equ se_track_stop_mvl, 127 diff --git a/sound/songs/se_tu_saa.s b/sound/songs/se_tu_saa.s index 53279de6c..8bbd09cdd 100644 --- a/sound/songs/se_tu_saa.s +++ b/sound/songs/se_tu_saa.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_tu_saa_grp, voicegroup_8451990 + .equ se_tu_saa_grp, voicegroup110 .equ se_tu_saa_pri, 4 .equ se_tu_saa_rev, reverb_set+50 .equ se_tu_saa_mvl, 127 diff --git a/sound/songs/se_u.s b/sound/songs/se_u.s index 637d29424..4852c5a2a 100644 --- a/sound/songs/se_u.s +++ b/sound/songs/se_u.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_u_grp, voicegroup_8451F90 + .equ se_u_grp, voicegroup111 .equ se_u_pri, 4 .equ se_u_rev, reverb_set+50 .equ se_u_mvl, 127 diff --git a/sound/songs/se_w003.s b/sound/songs/se_w003.s index 3a0547f02..f85be9174 100644 --- a/sound/songs/se_w003.s +++ b/sound/songs/se_w003.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w003_grp, voicegroup_8451F90 + .equ se_w003_grp, voicegroup111 .equ se_w003_pri, 4 .equ se_w003_rev, reverb_set+50 .equ se_w003_mvl, 127 diff --git a/sound/songs/se_w004.s b/sound/songs/se_w004.s index 95d5fc727..4ba8de97d 100644 --- a/sound/songs/se_w004.s +++ b/sound/songs/se_w004.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w004_grp, voicegroup_8451F90 + .equ se_w004_grp, voicegroup111 .equ se_w004_pri, 4 .equ se_w004_rev, reverb_set+50 .equ se_w004_mvl, 127 diff --git a/sound/songs/se_w006.s b/sound/songs/se_w006.s index c50707ba8..01d8c9ce9 100644 --- a/sound/songs/se_w006.s +++ b/sound/songs/se_w006.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w006_grp, voicegroup_8451F90 + .equ se_w006_grp, voicegroup111 .equ se_w006_pri, 4 .equ se_w006_rev, reverb_set+50 .equ se_w006_mvl, 127 diff --git a/sound/songs/se_w007.s b/sound/songs/se_w007.s index 8e6977178..6eb9d5d9b 100644 --- a/sound/songs/se_w007.s +++ b/sound/songs/se_w007.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w007_grp, voicegroup_8451F90 + .equ se_w007_grp, voicegroup111 .equ se_w007_pri, 4 .equ se_w007_rev, reverb_set+50 .equ se_w007_mvl, 127 diff --git a/sound/songs/se_w010.s b/sound/songs/se_w010.s index 4c0cd4d0e..f0c12048d 100644 --- a/sound/songs/se_w010.s +++ b/sound/songs/se_w010.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w010_grp, voicegroup_8451F90 + .equ se_w010_grp, voicegroup111 .equ se_w010_pri, 4 .equ se_w010_rev, reverb_set+50 .equ se_w010_mvl, 127 diff --git a/sound/songs/se_w011.s b/sound/songs/se_w011.s index 914499938..bc5c16716 100644 --- a/sound/songs/se_w011.s +++ b/sound/songs/se_w011.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w011_grp, voicegroup_8451F90 + .equ se_w011_grp, voicegroup111 .equ se_w011_pri, 4 .equ se_w011_rev, reverb_set+50 .equ se_w011_mvl, 127 diff --git a/sound/songs/se_w013.s b/sound/songs/se_w013.s index ce4d5eb93..332205c9c 100644 --- a/sound/songs/se_w013.s +++ b/sound/songs/se_w013.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w013_grp, voicegroup_8451F90 + .equ se_w013_grp, voicegroup111 .equ se_w013_pri, 4 .equ se_w013_rev, reverb_set+50 .equ se_w013_mvl, 127 diff --git a/sound/songs/se_w013b.s b/sound/songs/se_w013b.s index cf58f3d10..f2a13cd8d 100644 --- a/sound/songs/se_w013b.s +++ b/sound/songs/se_w013b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w013b_grp, voicegroup_8451F90 + .equ se_w013b_grp, voicegroup111 .equ se_w013b_pri, 4 .equ se_w013b_rev, reverb_set+50 .equ se_w013b_mvl, 127 diff --git a/sound/songs/se_w014.s b/sound/songs/se_w014.s index d865869f2..796aecee4 100644 --- a/sound/songs/se_w014.s +++ b/sound/songs/se_w014.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w014_grp, voicegroup_8451F90 + .equ se_w014_grp, voicegroup111 .equ se_w014_pri, 4 .equ se_w014_rev, reverb_set+50 .equ se_w014_mvl, 127 diff --git a/sound/songs/se_w015.s b/sound/songs/se_w015.s index c084a2fd5..d5af31577 100644 --- a/sound/songs/se_w015.s +++ b/sound/songs/se_w015.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w015_grp, voicegroup_8451F90 + .equ se_w015_grp, voicegroup111 .equ se_w015_pri, 4 .equ se_w015_rev, reverb_set+50 .equ se_w015_mvl, 127 diff --git a/sound/songs/se_w016.s b/sound/songs/se_w016.s index 96bba5689..7b1f27026 100644 --- a/sound/songs/se_w016.s +++ b/sound/songs/se_w016.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w016_grp, voicegroup_8451F90 + .equ se_w016_grp, voicegroup111 .equ se_w016_pri, 4 .equ se_w016_rev, reverb_set+50 .equ se_w016_mvl, 127 diff --git a/sound/songs/se_w016b.s b/sound/songs/se_w016b.s index 16eb22b52..e09bfd94e 100644 --- a/sound/songs/se_w016b.s +++ b/sound/songs/se_w016b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w016b_grp, voicegroup_8451F90 + .equ se_w016b_grp, voicegroup111 .equ se_w016b_pri, 4 .equ se_w016b_rev, reverb_set+50 .equ se_w016b_mvl, 127 diff --git a/sound/songs/se_w017.s b/sound/songs/se_w017.s index 7b72c55fd..91ec8431b 100644 --- a/sound/songs/se_w017.s +++ b/sound/songs/se_w017.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w017_grp, voicegroup_8451F90 + .equ se_w017_grp, voicegroup111 .equ se_w017_pri, 4 .equ se_w017_rev, reverb_set+50 .equ se_w017_mvl, 127 diff --git a/sound/songs/se_w019.s b/sound/songs/se_w019.s index c9b20488e..0820f7c2b 100644 --- a/sound/songs/se_w019.s +++ b/sound/songs/se_w019.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w019_grp, voicegroup_8451F90 + .equ se_w019_grp, voicegroup111 .equ se_w019_pri, 4 .equ se_w019_rev, reverb_set+50 .equ se_w019_mvl, 127 diff --git a/sound/songs/se_w020.s b/sound/songs/se_w020.s index 34a6e5823..48faac8e9 100644 --- a/sound/songs/se_w020.s +++ b/sound/songs/se_w020.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w020_grp, voicegroup_8451F90 + .equ se_w020_grp, voicegroup111 .equ se_w020_pri, 4 .equ se_w020_rev, reverb_set+50 .equ se_w020_mvl, 127 diff --git a/sound/songs/se_w025.s b/sound/songs/se_w025.s index 0736a80bc..d091bc26f 100644 --- a/sound/songs/se_w025.s +++ b/sound/songs/se_w025.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w025_grp, voicegroup_8451F90 + .equ se_w025_grp, voicegroup111 .equ se_w025_pri, 4 .equ se_w025_rev, reverb_set+50 .equ se_w025_mvl, 127 diff --git a/sound/songs/se_w025b.s b/sound/songs/se_w025b.s index 7d3c05b4c..751be3773 100644 --- a/sound/songs/se_w025b.s +++ b/sound/songs/se_w025b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w025b_grp, voicegroup_8451F90 + .equ se_w025b_grp, voicegroup111 .equ se_w025b_pri, 4 .equ se_w025b_rev, reverb_set+50 .equ se_w025b_mvl, 127 diff --git a/sound/songs/se_w026.s b/sound/songs/se_w026.s index d0f7335e1..418e5febd 100644 --- a/sound/songs/se_w026.s +++ b/sound/songs/se_w026.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w026_grp, voicegroup_8451F90 + .equ se_w026_grp, voicegroup111 .equ se_w026_pri, 4 .equ se_w026_rev, reverb_set+50 .equ se_w026_mvl, 127 diff --git a/sound/songs/se_w028.s b/sound/songs/se_w028.s index 36eb70a19..7232ba420 100644 --- a/sound/songs/se_w028.s +++ b/sound/songs/se_w028.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w028_grp, voicegroup_8451F90 + .equ se_w028_grp, voicegroup111 .equ se_w028_pri, 4 .equ se_w028_rev, reverb_set+50 .equ se_w028_mvl, 127 diff --git a/sound/songs/se_w029.s b/sound/songs/se_w029.s index 8faaaabf6..59f85da16 100644 --- a/sound/songs/se_w029.s +++ b/sound/songs/se_w029.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w029_grp, voicegroup_8451F90 + .equ se_w029_grp, voicegroup111 .equ se_w029_pri, 4 .equ se_w029_rev, reverb_set+50 .equ se_w029_mvl, 127 diff --git a/sound/songs/se_w030.s b/sound/songs/se_w030.s index 7a7ab0bf7..88efd2b75 100644 --- a/sound/songs/se_w030.s +++ b/sound/songs/se_w030.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w030_grp, voicegroup_8451F90 + .equ se_w030_grp, voicegroup111 .equ se_w030_pri, 4 .equ se_w030_rev, reverb_set+50 .equ se_w030_mvl, 127 diff --git a/sound/songs/se_w036.s b/sound/songs/se_w036.s index af1acfc08..ace942b7d 100644 --- a/sound/songs/se_w036.s +++ b/sound/songs/se_w036.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w036_grp, voicegroup_8451F90 + .equ se_w036_grp, voicegroup111 .equ se_w036_pri, 4 .equ se_w036_rev, reverb_set+50 .equ se_w036_mvl, 127 diff --git a/sound/songs/se_w039.s b/sound/songs/se_w039.s index a7f7743b8..acab66c7f 100644 --- a/sound/songs/se_w039.s +++ b/sound/songs/se_w039.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w039_grp, voicegroup_8451F90 + .equ se_w039_grp, voicegroup111 .equ se_w039_pri, 4 .equ se_w039_rev, reverb_set+50 .equ se_w039_mvl, 127 diff --git a/sound/songs/se_w043.s b/sound/songs/se_w043.s index 43a7da037..e965526e3 100644 --- a/sound/songs/se_w043.s +++ b/sound/songs/se_w043.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w043_grp, voicegroup_8451F90 + .equ se_w043_grp, voicegroup111 .equ se_w043_pri, 4 .equ se_w043_rev, reverb_set+50 .equ se_w043_mvl, 127 diff --git a/sound/songs/se_w044.s b/sound/songs/se_w044.s index db359a673..c4855b4ae 100644 --- a/sound/songs/se_w044.s +++ b/sound/songs/se_w044.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w044_grp, voicegroup_8451F90 + .equ se_w044_grp, voicegroup111 .equ se_w044_pri, 4 .equ se_w044_rev, reverb_set+50 .equ se_w044_mvl, 127 diff --git a/sound/songs/se_w047.s b/sound/songs/se_w047.s index c5eff393d..16d8c2fdb 100644 --- a/sound/songs/se_w047.s +++ b/sound/songs/se_w047.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w047_grp, voicegroup_8451F90 + .equ se_w047_grp, voicegroup111 .equ se_w047_pri, 4 .equ se_w047_rev, reverb_set+50 .equ se_w047_mvl, 127 diff --git a/sound/songs/se_w048.s b/sound/songs/se_w048.s index 5cd1512df..268f706ca 100644 --- a/sound/songs/se_w048.s +++ b/sound/songs/se_w048.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w048_grp, voicegroup_8451F90 + .equ se_w048_grp, voicegroup111 .equ se_w048_pri, 4 .equ se_w048_rev, reverb_set+50 .equ se_w048_mvl, 127 diff --git a/sound/songs/se_w052.s b/sound/songs/se_w052.s index 6aa7ed4d7..583791fb8 100644 --- a/sound/songs/se_w052.s +++ b/sound/songs/se_w052.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w052_grp, voicegroup_8451F90 + .equ se_w052_grp, voicegroup111 .equ se_w052_pri, 4 .equ se_w052_rev, reverb_set+50 .equ se_w052_mvl, 127 diff --git a/sound/songs/se_w053.s b/sound/songs/se_w053.s index eb5b88c47..772ca9741 100644 --- a/sound/songs/se_w053.s +++ b/sound/songs/se_w053.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w053_grp, voicegroup_8451F90 + .equ se_w053_grp, voicegroup111 .equ se_w053_pri, 4 .equ se_w053_rev, reverb_set+50 .equ se_w053_mvl, 127 diff --git a/sound/songs/se_w054.s b/sound/songs/se_w054.s index 050ddf3be..9a747aef8 100644 --- a/sound/songs/se_w054.s +++ b/sound/songs/se_w054.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w054_grp, voicegroup_8451F90 + .equ se_w054_grp, voicegroup111 .equ se_w054_pri, 4 .equ se_w054_rev, reverb_set+50 .equ se_w054_mvl, 127 diff --git a/sound/songs/se_w056.s b/sound/songs/se_w056.s index f4c0ee502..cbbee4b57 100644 --- a/sound/songs/se_w056.s +++ b/sound/songs/se_w056.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w056_grp, voicegroup_8451F90 + .equ se_w056_grp, voicegroup111 .equ se_w056_pri, 4 .equ se_w056_rev, reverb_set+50 .equ se_w056_mvl, 127 diff --git a/sound/songs/se_w057.s b/sound/songs/se_w057.s index 64d14cd1f..4d6225c29 100644 --- a/sound/songs/se_w057.s +++ b/sound/songs/se_w057.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w057_grp, voicegroup_8451F90 + .equ se_w057_grp, voicegroup111 .equ se_w057_pri, 4 .equ se_w057_rev, reverb_set+50 .equ se_w057_mvl, 127 diff --git a/sound/songs/se_w059.s b/sound/songs/se_w059.s index 24139fbd5..cb2aa5c82 100644 --- a/sound/songs/se_w059.s +++ b/sound/songs/se_w059.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w059_grp, voicegroup_8451F90 + .equ se_w059_grp, voicegroup111 .equ se_w059_pri, 4 .equ se_w059_rev, reverb_set+50 .equ se_w059_mvl, 127 diff --git a/sound/songs/se_w059b.s b/sound/songs/se_w059b.s index 4c3f6bbe0..ea58b07a0 100644 --- a/sound/songs/se_w059b.s +++ b/sound/songs/se_w059b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w059b_grp, voicegroup_8451F90 + .equ se_w059b_grp, voicegroup111 .equ se_w059b_pri, 4 .equ se_w059b_rev, reverb_set+50 .equ se_w059b_mvl, 127 diff --git a/sound/songs/se_w060.s b/sound/songs/se_w060.s index 7daa91edf..bedbdaab9 100644 --- a/sound/songs/se_w060.s +++ b/sound/songs/se_w060.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w060_grp, voicegroup_8451F90 + .equ se_w060_grp, voicegroup111 .equ se_w060_pri, 4 .equ se_w060_rev, reverb_set+50 .equ se_w060_mvl, 127 diff --git a/sound/songs/se_w060b.s b/sound/songs/se_w060b.s index ab4922db2..a22bf1eed 100644 --- a/sound/songs/se_w060b.s +++ b/sound/songs/se_w060b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w060b_grp, voicegroup_8451F90 + .equ se_w060b_grp, voicegroup111 .equ se_w060b_pri, 4 .equ se_w060b_rev, reverb_set+50 .equ se_w060b_mvl, 127 diff --git a/sound/songs/se_w062.s b/sound/songs/se_w062.s index cc091bebc..d40a0100c 100644 --- a/sound/songs/se_w062.s +++ b/sound/songs/se_w062.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w062_grp, voicegroup_8451F90 + .equ se_w062_grp, voicegroup111 .equ se_w062_pri, 4 .equ se_w062_rev, reverb_set+50 .equ se_w062_mvl, 127 diff --git a/sound/songs/se_w062b.s b/sound/songs/se_w062b.s index d3cc6f923..107ded25d 100644 --- a/sound/songs/se_w062b.s +++ b/sound/songs/se_w062b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w062b_grp, voicegroup_8451F90 + .equ se_w062b_grp, voicegroup111 .equ se_w062b_pri, 4 .equ se_w062b_rev, reverb_set+50 .equ se_w062b_mvl, 127 diff --git a/sound/songs/se_w063.s b/sound/songs/se_w063.s index 41c8bf8c7..6e9b971cf 100644 --- a/sound/songs/se_w063.s +++ b/sound/songs/se_w063.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w063_grp, voicegroup_8451F90 + .equ se_w063_grp, voicegroup111 .equ se_w063_pri, 4 .equ se_w063_rev, reverb_set+50 .equ se_w063_mvl, 127 diff --git a/sound/songs/se_w063b.s b/sound/songs/se_w063b.s index 2bd19b566..9bdd874e9 100644 --- a/sound/songs/se_w063b.s +++ b/sound/songs/se_w063b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w063b_grp, voicegroup_8451F90 + .equ se_w063b_grp, voicegroup111 .equ se_w063b_pri, 4 .equ se_w063b_rev, reverb_set+50 .equ se_w063b_mvl, 127 diff --git a/sound/songs/se_w070.s b/sound/songs/se_w070.s index d57092d4b..5e1cfc5f2 100644 --- a/sound/songs/se_w070.s +++ b/sound/songs/se_w070.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w070_grp, voicegroup_8451F90 + .equ se_w070_grp, voicegroup111 .equ se_w070_pri, 4 .equ se_w070_rev, reverb_set+50 .equ se_w070_mvl, 127 diff --git a/sound/songs/se_w071.s b/sound/songs/se_w071.s index efd1c6208..4907eff95 100644 --- a/sound/songs/se_w071.s +++ b/sound/songs/se_w071.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w071_grp, voicegroup_8451F90 + .equ se_w071_grp, voicegroup111 .equ se_w071_pri, 4 .equ se_w071_rev, reverb_set+50 .equ se_w071_mvl, 127 diff --git a/sound/songs/se_w071b.s b/sound/songs/se_w071b.s index 757a3b9fb..68c8466f1 100644 --- a/sound/songs/se_w071b.s +++ b/sound/songs/se_w071b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w071b_grp, voicegroup_8451F90 + .equ se_w071b_grp, voicegroup111 .equ se_w071b_pri, 4 .equ se_w071b_rev, reverb_set+50 .equ se_w071b_mvl, 127 diff --git a/sound/songs/se_w076.s b/sound/songs/se_w076.s index d95eda140..ac0d8cf09 100644 --- a/sound/songs/se_w076.s +++ b/sound/songs/se_w076.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w076_grp, voicegroup_8451F90 + .equ se_w076_grp, voicegroup111 .equ se_w076_pri, 4 .equ se_w076_rev, reverb_set+50 .equ se_w076_mvl, 127 diff --git a/sound/songs/se_w077.s b/sound/songs/se_w077.s index a5c5f9e77..22deee477 100644 --- a/sound/songs/se_w077.s +++ b/sound/songs/se_w077.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w077_grp, voicegroup_8451F90 + .equ se_w077_grp, voicegroup111 .equ se_w077_pri, 4 .equ se_w077_rev, reverb_set+50 .equ se_w077_mvl, 127 diff --git a/sound/songs/se_w080.s b/sound/songs/se_w080.s index 6250805c5..fdfda4f4a 100644 --- a/sound/songs/se_w080.s +++ b/sound/songs/se_w080.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w080_grp, voicegroup_8451F90 + .equ se_w080_grp, voicegroup111 .equ se_w080_pri, 4 .equ se_w080_rev, reverb_set+50 .equ se_w080_mvl, 127 diff --git a/sound/songs/se_w081.s b/sound/songs/se_w081.s index be80ed3e0..248ca6f1f 100644 --- a/sound/songs/se_w081.s +++ b/sound/songs/se_w081.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w081_grp, voicegroup_8451F90 + .equ se_w081_grp, voicegroup111 .equ se_w081_pri, 4 .equ se_w081_rev, reverb_set+50 .equ se_w081_mvl, 127 diff --git a/sound/songs/se_w081b.s b/sound/songs/se_w081b.s index f4a0446f4..18eef9015 100644 --- a/sound/songs/se_w081b.s +++ b/sound/songs/se_w081b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w081b_grp, voicegroup_8451F90 + .equ se_w081b_grp, voicegroup111 .equ se_w081b_pri, 4 .equ se_w081b_rev, reverb_set+50 .equ se_w081b_mvl, 127 diff --git a/sound/songs/se_w082.s b/sound/songs/se_w082.s index 92bcac888..e84421803 100644 --- a/sound/songs/se_w082.s +++ b/sound/songs/se_w082.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w082_grp, voicegroup_8451F90 + .equ se_w082_grp, voicegroup111 .equ se_w082_pri, 4 .equ se_w082_rev, reverb_set+50 .equ se_w082_mvl, 127 diff --git a/sound/songs/se_w085.s b/sound/songs/se_w085.s index bf9f919b0..3fc4960a8 100644 --- a/sound/songs/se_w085.s +++ b/sound/songs/se_w085.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w085_grp, voicegroup_8451F90 + .equ se_w085_grp, voicegroup111 .equ se_w085_pri, 4 .equ se_w085_rev, reverb_set+50 .equ se_w085_mvl, 127 diff --git a/sound/songs/se_w085b.s b/sound/songs/se_w085b.s index 34dfa6594..c660825a6 100644 --- a/sound/songs/se_w085b.s +++ b/sound/songs/se_w085b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w085b_grp, voicegroup_8451F90 + .equ se_w085b_grp, voicegroup111 .equ se_w085b_pri, 4 .equ se_w085b_rev, reverb_set+50 .equ se_w085b_mvl, 127 diff --git a/sound/songs/se_w086.s b/sound/songs/se_w086.s index d4c8e7f38..a52693608 100644 --- a/sound/songs/se_w086.s +++ b/sound/songs/se_w086.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w086_grp, voicegroup_8451F90 + .equ se_w086_grp, voicegroup111 .equ se_w086_pri, 4 .equ se_w086_rev, reverb_set+50 .equ se_w086_mvl, 127 diff --git a/sound/songs/se_w088.s b/sound/songs/se_w088.s index 424bcbcf0..6176f8059 100644 --- a/sound/songs/se_w088.s +++ b/sound/songs/se_w088.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w088_grp, voicegroup_8451F90 + .equ se_w088_grp, voicegroup111 .equ se_w088_pri, 4 .equ se_w088_rev, reverb_set+50 .equ se_w088_mvl, 127 diff --git a/sound/songs/se_w089.s b/sound/songs/se_w089.s index 8e28d251b..f6d4d3bd2 100644 --- a/sound/songs/se_w089.s +++ b/sound/songs/se_w089.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w089_grp, voicegroup_8451F90 + .equ se_w089_grp, voicegroup111 .equ se_w089_pri, 4 .equ se_w089_rev, reverb_set+50 .equ se_w089_mvl, 127 diff --git a/sound/songs/se_w091.s b/sound/songs/se_w091.s index 6ad6434aa..977252d0d 100644 --- a/sound/songs/se_w091.s +++ b/sound/songs/se_w091.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w091_grp, voicegroup_8451F90 + .equ se_w091_grp, voicegroup111 .equ se_w091_pri, 4 .equ se_w091_rev, reverb_set+50 .equ se_w091_mvl, 127 diff --git a/sound/songs/se_w092.s b/sound/songs/se_w092.s index 199f1ab37..badb9a746 100644 --- a/sound/songs/se_w092.s +++ b/sound/songs/se_w092.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w092_grp, voicegroup_8451F90 + .equ se_w092_grp, voicegroup111 .equ se_w092_pri, 4 .equ se_w092_rev, reverb_set+50 .equ se_w092_mvl, 127 diff --git a/sound/songs/se_w100.s b/sound/songs/se_w100.s index 57ccf1e8e..df2b316e1 100644 --- a/sound/songs/se_w100.s +++ b/sound/songs/se_w100.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w100_grp, voicegroup_8451F90 + .equ se_w100_grp, voicegroup111 .equ se_w100_pri, 4 .equ se_w100_rev, reverb_set+50 .equ se_w100_mvl, 127 diff --git a/sound/songs/se_w103.s b/sound/songs/se_w103.s index bb109878e..010c02a41 100644 --- a/sound/songs/se_w103.s +++ b/sound/songs/se_w103.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w103_grp, voicegroup_8451F90 + .equ se_w103_grp, voicegroup111 .equ se_w103_pri, 4 .equ se_w103_rev, reverb_set+50 .equ se_w103_mvl, 127 diff --git a/sound/songs/se_w104.s b/sound/songs/se_w104.s index 813a0bde9..eed30349c 100644 --- a/sound/songs/se_w104.s +++ b/sound/songs/se_w104.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w104_grp, voicegroup_8451F90 + .equ se_w104_grp, voicegroup111 .equ se_w104_pri, 4 .equ se_w104_rev, reverb_set+50 .equ se_w104_mvl, 127 diff --git a/sound/songs/se_w107.s b/sound/songs/se_w107.s index 189df237e..1ff5e8ceb 100644 --- a/sound/songs/se_w107.s +++ b/sound/songs/se_w107.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w107_grp, voicegroup_8451F90 + .equ se_w107_grp, voicegroup111 .equ se_w107_pri, 4 .equ se_w107_rev, reverb_set+50 .equ se_w107_mvl, 127 diff --git a/sound/songs/se_w109.s b/sound/songs/se_w109.s index 7528dba40..f971262a5 100644 --- a/sound/songs/se_w109.s +++ b/sound/songs/se_w109.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w109_grp, voicegroup_8451F90 + .equ se_w109_grp, voicegroup111 .equ se_w109_pri, 4 .equ se_w109_rev, reverb_set+50 .equ se_w109_mvl, 127 diff --git a/sound/songs/se_w112.s b/sound/songs/se_w112.s index f4d352131..648e7006c 100644 --- a/sound/songs/se_w112.s +++ b/sound/songs/se_w112.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w112_grp, voicegroup_8451F90 + .equ se_w112_grp, voicegroup111 .equ se_w112_pri, 4 .equ se_w112_rev, reverb_set+50 .equ se_w112_mvl, 127 diff --git a/sound/songs/se_w114.s b/sound/songs/se_w114.s index bc8b90fe1..f784ffadf 100644 --- a/sound/songs/se_w114.s +++ b/sound/songs/se_w114.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w114_grp, voicegroup_8451F90 + .equ se_w114_grp, voicegroup111 .equ se_w114_pri, 4 .equ se_w114_rev, reverb_set+50 .equ se_w114_mvl, 127 diff --git a/sound/songs/se_w115.s b/sound/songs/se_w115.s index 1e2769cb0..2b522c738 100644 --- a/sound/songs/se_w115.s +++ b/sound/songs/se_w115.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w115_grp, voicegroup_8451F90 + .equ se_w115_grp, voicegroup111 .equ se_w115_pri, 4 .equ se_w115_rev, reverb_set+50 .equ se_w115_mvl, 127 diff --git a/sound/songs/se_w118.s b/sound/songs/se_w118.s index 60c13547f..dd9ccc783 100644 --- a/sound/songs/se_w118.s +++ b/sound/songs/se_w118.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w118_grp, voicegroup_8451F90 + .equ se_w118_grp, voicegroup111 .equ se_w118_pri, 4 .equ se_w118_rev, reverb_set+50 .equ se_w118_mvl, 127 diff --git a/sound/songs/se_w120.s b/sound/songs/se_w120.s index 789065289..fd7e2e641 100644 --- a/sound/songs/se_w120.s +++ b/sound/songs/se_w120.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w120_grp, voicegroup_8451F90 + .equ se_w120_grp, voicegroup111 .equ se_w120_pri, 4 .equ se_w120_rev, reverb_set+50 .equ se_w120_mvl, 127 diff --git a/sound/songs/se_w122.s b/sound/songs/se_w122.s index 4c6b81893..96ecf729f 100644 --- a/sound/songs/se_w122.s +++ b/sound/songs/se_w122.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w122_grp, voicegroup_8451F90 + .equ se_w122_grp, voicegroup111 .equ se_w122_pri, 4 .equ se_w122_rev, reverb_set+50 .equ se_w122_mvl, 127 diff --git a/sound/songs/se_w127.s b/sound/songs/se_w127.s index 7d137009e..cff01289a 100644 --- a/sound/songs/se_w127.s +++ b/sound/songs/se_w127.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w127_grp, voicegroup_8451F90 + .equ se_w127_grp, voicegroup111 .equ se_w127_pri, 4 .equ se_w127_rev, reverb_set+50 .equ se_w127_mvl, 127 diff --git a/sound/songs/se_w129.s b/sound/songs/se_w129.s index cbcd01478..47930cc7f 100644 --- a/sound/songs/se_w129.s +++ b/sound/songs/se_w129.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w129_grp, voicegroup_8451F90 + .equ se_w129_grp, voicegroup111 .equ se_w129_pri, 4 .equ se_w129_rev, reverb_set+50 .equ se_w129_mvl, 127 diff --git a/sound/songs/se_w145.s b/sound/songs/se_w145.s index 0c2e0b1ab..15570d08f 100644 --- a/sound/songs/se_w145.s +++ b/sound/songs/se_w145.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w145_grp, voicegroup_8451F90 + .equ se_w145_grp, voicegroup111 .equ se_w145_pri, 4 .equ se_w145_rev, reverb_set+50 .equ se_w145_mvl, 127 diff --git a/sound/songs/se_w145b.s b/sound/songs/se_w145b.s index 01014e8b1..a7da8b0bb 100644 --- a/sound/songs/se_w145b.s +++ b/sound/songs/se_w145b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w145b_grp, voicegroup_8451F90 + .equ se_w145b_grp, voicegroup111 .equ se_w145b_pri, 4 .equ se_w145b_rev, reverb_set+50 .equ se_w145b_mvl, 127 diff --git a/sound/songs/se_w145c.s b/sound/songs/se_w145c.s index 68803d046..bae0686a9 100644 --- a/sound/songs/se_w145c.s +++ b/sound/songs/se_w145c.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w145c_grp, voicegroup_8451F90 + .equ se_w145c_grp, voicegroup111 .equ se_w145c_pri, 4 .equ se_w145c_rev, reverb_set+50 .equ se_w145c_mvl, 127 diff --git a/sound/songs/se_w146.s b/sound/songs/se_w146.s index 12b535f8b..4bae143ab 100644 --- a/sound/songs/se_w146.s +++ b/sound/songs/se_w146.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w146_grp, voicegroup_8451F90 + .equ se_w146_grp, voicegroup111 .equ se_w146_pri, 4 .equ se_w146_rev, reverb_set+50 .equ se_w146_mvl, 127 diff --git a/sound/songs/se_w151.s b/sound/songs/se_w151.s index aadf24b57..7344a95c5 100644 --- a/sound/songs/se_w151.s +++ b/sound/songs/se_w151.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w151_grp, voicegroup_8451F90 + .equ se_w151_grp, voicegroup111 .equ se_w151_pri, 4 .equ se_w151_rev, reverb_set+50 .equ se_w151_mvl, 127 diff --git a/sound/songs/se_w152.s b/sound/songs/se_w152.s index 1a33d262b..ca4f6d745 100644 --- a/sound/songs/se_w152.s +++ b/sound/songs/se_w152.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w152_grp, voicegroup_8451F90 + .equ se_w152_grp, voicegroup111 .equ se_w152_pri, 4 .equ se_w152_rev, reverb_set+50 .equ se_w152_mvl, 127 diff --git a/sound/songs/se_w153.s b/sound/songs/se_w153.s index 85121c951..b38d8f8a9 100644 --- a/sound/songs/se_w153.s +++ b/sound/songs/se_w153.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w153_grp, voicegroup_8451F90 + .equ se_w153_grp, voicegroup111 .equ se_w153_pri, 4 .equ se_w153_rev, reverb_set+50 .equ se_w153_mvl, 127 diff --git a/sound/songs/se_w155.s b/sound/songs/se_w155.s index cf3631754..aaf0c7990 100644 --- a/sound/songs/se_w155.s +++ b/sound/songs/se_w155.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w155_grp, voicegroup_8451F90 + .equ se_w155_grp, voicegroup111 .equ se_w155_pri, 4 .equ se_w155_rev, reverb_set+50 .equ se_w155_mvl, 127 diff --git a/sound/songs/se_w161.s b/sound/songs/se_w161.s index 277eb277b..ccc4724bd 100644 --- a/sound/songs/se_w161.s +++ b/sound/songs/se_w161.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w161_grp, voicegroup_8451F90 + .equ se_w161_grp, voicegroup111 .equ se_w161_pri, 4 .equ se_w161_rev, reverb_set+50 .equ se_w161_mvl, 127 diff --git a/sound/songs/se_w161b.s b/sound/songs/se_w161b.s index 8b9c06e41..1971de63d 100644 --- a/sound/songs/se_w161b.s +++ b/sound/songs/se_w161b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w161b_grp, voicegroup_8451F90 + .equ se_w161b_grp, voicegroup111 .equ se_w161b_pri, 4 .equ se_w161b_rev, reverb_set+50 .equ se_w161b_mvl, 127 diff --git a/sound/songs/se_w166.s b/sound/songs/se_w166.s index e357e5315..e9068bb2a 100644 --- a/sound/songs/se_w166.s +++ b/sound/songs/se_w166.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w166_grp, voicegroup_8451F90 + .equ se_w166_grp, voicegroup111 .equ se_w166_pri, 4 .equ se_w166_rev, reverb_set+50 .equ se_w166_mvl, 127 diff --git a/sound/songs/se_w171.s b/sound/songs/se_w171.s index 56a179151..189b5a842 100644 --- a/sound/songs/se_w171.s +++ b/sound/songs/se_w171.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w171_grp, voicegroup_8451F90 + .equ se_w171_grp, voicegroup111 .equ se_w171_pri, 4 .equ se_w171_rev, reverb_set+50 .equ se_w171_mvl, 127 diff --git a/sound/songs/se_w172.s b/sound/songs/se_w172.s index 161199a3e..f8d8e3913 100644 --- a/sound/songs/se_w172.s +++ b/sound/songs/se_w172.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w172_grp, voicegroup_8451F90 + .equ se_w172_grp, voicegroup111 .equ se_w172_pri, 4 .equ se_w172_rev, reverb_set+50 .equ se_w172_mvl, 127 diff --git a/sound/songs/se_w172b.s b/sound/songs/se_w172b.s index 819fed35e..04f576bf1 100644 --- a/sound/songs/se_w172b.s +++ b/sound/songs/se_w172b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w172b_grp, voicegroup_8451F90 + .equ se_w172b_grp, voicegroup111 .equ se_w172b_pri, 4 .equ se_w172b_rev, reverb_set+50 .equ se_w172b_mvl, 127 diff --git a/sound/songs/se_w173.s b/sound/songs/se_w173.s index 8300a9ac3..86f01dc56 100644 --- a/sound/songs/se_w173.s +++ b/sound/songs/se_w173.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w173_grp, voicegroup_8451F90 + .equ se_w173_grp, voicegroup111 .equ se_w173_pri, 4 .equ se_w173_rev, reverb_set+50 .equ se_w173_mvl, 127 diff --git a/sound/songs/se_w179.s b/sound/songs/se_w179.s index e28036608..cc451e1ec 100644 --- a/sound/songs/se_w179.s +++ b/sound/songs/se_w179.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w179_grp, voicegroup_8451F90 + .equ se_w179_grp, voicegroup111 .equ se_w179_pri, 4 .equ se_w179_rev, reverb_set+50 .equ se_w179_mvl, 127 diff --git a/sound/songs/se_w185.s b/sound/songs/se_w185.s index 9f3b3c016..2b5189af0 100644 --- a/sound/songs/se_w185.s +++ b/sound/songs/se_w185.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w185_grp, voicegroup_8451F90 + .equ se_w185_grp, voicegroup111 .equ se_w185_pri, 4 .equ se_w185_rev, reverb_set+50 .equ se_w185_mvl, 127 diff --git a/sound/songs/se_w187.s b/sound/songs/se_w187.s index 8ecb3d22e..5e4de1a90 100644 --- a/sound/songs/se_w187.s +++ b/sound/songs/se_w187.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w187_grp, voicegroup_8451F90 + .equ se_w187_grp, voicegroup111 .equ se_w187_pri, 4 .equ se_w187_rev, reverb_set+50 .equ se_w187_mvl, 127 diff --git a/sound/songs/se_w195.s b/sound/songs/se_w195.s index fe7dba273..27b09c5dd 100644 --- a/sound/songs/se_w195.s +++ b/sound/songs/se_w195.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w195_grp, voicegroup_8451F90 + .equ se_w195_grp, voicegroup111 .equ se_w195_pri, 4 .equ se_w195_rev, reverb_set+50 .equ se_w195_mvl, 127 diff --git a/sound/songs/se_w196.s b/sound/songs/se_w196.s index e1dafd1e1..c532f5095 100644 --- a/sound/songs/se_w196.s +++ b/sound/songs/se_w196.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w196_grp, voicegroup_8451F90 + .equ se_w196_grp, voicegroup111 .equ se_w196_pri, 4 .equ se_w196_rev, reverb_set+50 .equ se_w196_mvl, 127 diff --git a/sound/songs/se_w197.s b/sound/songs/se_w197.s index f63bb5dce..41b8482c6 100644 --- a/sound/songs/se_w197.s +++ b/sound/songs/se_w197.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w197_grp, voicegroup_8451F90 + .equ se_w197_grp, voicegroup111 .equ se_w197_pri, 4 .equ se_w197_rev, reverb_set+50 .equ se_w197_mvl, 127 diff --git a/sound/songs/se_w199.s b/sound/songs/se_w199.s index 6a3a095ab..1808670a0 100644 --- a/sound/songs/se_w199.s +++ b/sound/songs/se_w199.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w199_grp, voicegroup_8451F90 + .equ se_w199_grp, voicegroup111 .equ se_w199_pri, 4 .equ se_w199_rev, reverb_set+50 .equ se_w199_mvl, 127 diff --git a/sound/songs/se_w201.s b/sound/songs/se_w201.s index d4138d506..debba1c75 100644 --- a/sound/songs/se_w201.s +++ b/sound/songs/se_w201.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w201_grp, voicegroup_8451F90 + .equ se_w201_grp, voicegroup111 .equ se_w201_pri, 4 .equ se_w201_rev, reverb_set+50 .equ se_w201_mvl, 127 diff --git a/sound/songs/se_w202.s b/sound/songs/se_w202.s index db70105f3..db0cb40ff 100644 --- a/sound/songs/se_w202.s +++ b/sound/songs/se_w202.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w202_grp, voicegroup_8451F90 + .equ se_w202_grp, voicegroup111 .equ se_w202_pri, 4 .equ se_w202_rev, reverb_set+50 .equ se_w202_mvl, 127 diff --git a/sound/songs/se_w204.s b/sound/songs/se_w204.s index b9e3f259d..51f9e50d8 100644 --- a/sound/songs/se_w204.s +++ b/sound/songs/se_w204.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w204_grp, voicegroup_8451F90 + .equ se_w204_grp, voicegroup111 .equ se_w204_pri, 4 .equ se_w204_rev, reverb_set+50 .equ se_w204_mvl, 127 diff --git a/sound/songs/se_w207.s b/sound/songs/se_w207.s index 7967c0e92..5fd26245b 100644 --- a/sound/songs/se_w207.s +++ b/sound/songs/se_w207.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w207_grp, voicegroup_8451F90 + .equ se_w207_grp, voicegroup111 .equ se_w207_pri, 4 .equ se_w207_rev, reverb_set+50 .equ se_w207_mvl, 127 diff --git a/sound/songs/se_w207b.s b/sound/songs/se_w207b.s index 031a6bf04..8d80ac30d 100644 --- a/sound/songs/se_w207b.s +++ b/sound/songs/se_w207b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w207b_grp, voicegroup_8451F90 + .equ se_w207b_grp, voicegroup111 .equ se_w207b_pri, 4 .equ se_w207b_rev, reverb_set+50 .equ se_w207b_mvl, 127 diff --git a/sound/songs/se_w208.s b/sound/songs/se_w208.s index 1c7b58cf0..ee77f93bd 100644 --- a/sound/songs/se_w208.s +++ b/sound/songs/se_w208.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w208_grp, voicegroup_8451F90 + .equ se_w208_grp, voicegroup111 .equ se_w208_pri, 4 .equ se_w208_rev, reverb_set+50 .equ se_w208_mvl, 127 diff --git a/sound/songs/se_w213.s b/sound/songs/se_w213.s index 730ba9310..fa16e6d13 100644 --- a/sound/songs/se_w213.s +++ b/sound/songs/se_w213.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w213_grp, voicegroup_8451F90 + .equ se_w213_grp, voicegroup111 .equ se_w213_pri, 4 .equ se_w213_rev, reverb_set+50 .equ se_w213_mvl, 127 diff --git a/sound/songs/se_w213b.s b/sound/songs/se_w213b.s index 235000bd4..488e3e580 100644 --- a/sound/songs/se_w213b.s +++ b/sound/songs/se_w213b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w213b_grp, voicegroup_8451F90 + .equ se_w213b_grp, voicegroup111 .equ se_w213b_pri, 4 .equ se_w213b_rev, reverb_set+50 .equ se_w213b_mvl, 127 diff --git a/sound/songs/se_w215.s b/sound/songs/se_w215.s index aa0f20b9c..9861f142d 100644 --- a/sound/songs/se_w215.s +++ b/sound/songs/se_w215.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w215_grp, voicegroup_8451F90 + .equ se_w215_grp, voicegroup111 .equ se_w215_pri, 4 .equ se_w215_rev, reverb_set+50 .equ se_w215_mvl, 127 diff --git a/sound/songs/se_w221.s b/sound/songs/se_w221.s index 4b7c2559d..0a3151d7c 100644 --- a/sound/songs/se_w221.s +++ b/sound/songs/se_w221.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w221_grp, voicegroup_8451F90 + .equ se_w221_grp, voicegroup111 .equ se_w221_pri, 4 .equ se_w221_rev, reverb_set+50 .equ se_w221_mvl, 127 diff --git a/sound/songs/se_w221b.s b/sound/songs/se_w221b.s index e781c0a3c..2994f2749 100644 --- a/sound/songs/se_w221b.s +++ b/sound/songs/se_w221b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w221b_grp, voicegroup_8451F90 + .equ se_w221b_grp, voicegroup111 .equ se_w221b_pri, 4 .equ se_w221b_rev, reverb_set+50 .equ se_w221b_mvl, 127 diff --git a/sound/songs/se_w226.s b/sound/songs/se_w226.s index 849294d9f..c802ade78 100644 --- a/sound/songs/se_w226.s +++ b/sound/songs/se_w226.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w226_grp, voicegroup_8451F90 + .equ se_w226_grp, voicegroup111 .equ se_w226_pri, 4 .equ se_w226_rev, reverb_set+50 .equ se_w226_mvl, 127 diff --git a/sound/songs/se_w227.s b/sound/songs/se_w227.s index 572d586cf..c326cb1ee 100644 --- a/sound/songs/se_w227.s +++ b/sound/songs/se_w227.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w227_grp, voicegroup_8451F90 + .equ se_w227_grp, voicegroup111 .equ se_w227_pri, 4 .equ se_w227_rev, reverb_set+50 .equ se_w227_mvl, 127 diff --git a/sound/songs/se_w227b.s b/sound/songs/se_w227b.s index 8c45bdcb0..95d32ba7b 100644 --- a/sound/songs/se_w227b.s +++ b/sound/songs/se_w227b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w227b_grp, voicegroup_8451F90 + .equ se_w227b_grp, voicegroup111 .equ se_w227b_pri, 4 .equ se_w227b_rev, reverb_set+50 .equ se_w227b_mvl, 127 diff --git a/sound/songs/se_w230.s b/sound/songs/se_w230.s index a1c9ed108..0d9bd6712 100644 --- a/sound/songs/se_w230.s +++ b/sound/songs/se_w230.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w230_grp, voicegroup_8451F90 + .equ se_w230_grp, voicegroup111 .equ se_w230_pri, 4 .equ se_w230_rev, reverb_set+50 .equ se_w230_mvl, 127 diff --git a/sound/songs/se_w231.s b/sound/songs/se_w231.s index 596c9b219..7acb85288 100644 --- a/sound/songs/se_w231.s +++ b/sound/songs/se_w231.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w231_grp, voicegroup_8451F90 + .equ se_w231_grp, voicegroup111 .equ se_w231_pri, 4 .equ se_w231_rev, reverb_set+50 .equ se_w231_mvl, 127 diff --git a/sound/songs/se_w233.s b/sound/songs/se_w233.s index 21366e40e..169f522a9 100644 --- a/sound/songs/se_w233.s +++ b/sound/songs/se_w233.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w233_grp, voicegroup_8451F90 + .equ se_w233_grp, voicegroup111 .equ se_w233_pri, 4 .equ se_w233_rev, reverb_set+50 .equ se_w233_mvl, 127 diff --git a/sound/songs/se_w233b.s b/sound/songs/se_w233b.s index de6316afb..05713b161 100644 --- a/sound/songs/se_w233b.s +++ b/sound/songs/se_w233b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w233b_grp, voicegroup_8451F90 + .equ se_w233b_grp, voicegroup111 .equ se_w233b_pri, 4 .equ se_w233b_rev, reverb_set+50 .equ se_w233b_mvl, 127 diff --git a/sound/songs/se_w234.s b/sound/songs/se_w234.s index 732d01a11..0455028ce 100644 --- a/sound/songs/se_w234.s +++ b/sound/songs/se_w234.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w234_grp, voicegroup_8451F90 + .equ se_w234_grp, voicegroup111 .equ se_w234_pri, 5 .equ se_w234_rev, reverb_set+50 .equ se_w234_mvl, 127 diff --git a/sound/songs/se_w236.s b/sound/songs/se_w236.s index 03589421d..c238c9094 100644 --- a/sound/songs/se_w236.s +++ b/sound/songs/se_w236.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w236_grp, voicegroup_8451F90 + .equ se_w236_grp, voicegroup111 .equ se_w236_pri, 4 .equ se_w236_rev, reverb_set+50 .equ se_w236_mvl, 127 diff --git a/sound/songs/se_w239.s b/sound/songs/se_w239.s index a4a4270fe..8b3782b97 100644 --- a/sound/songs/se_w239.s +++ b/sound/songs/se_w239.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w239_grp, voicegroup_8451F90 + .equ se_w239_grp, voicegroup111 .equ se_w239_pri, 4 .equ se_w239_rev, reverb_set+50 .equ se_w239_mvl, 127 diff --git a/sound/songs/se_w240.s b/sound/songs/se_w240.s index d445038bf..50ff00605 100644 --- a/sound/songs/se_w240.s +++ b/sound/songs/se_w240.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w240_grp, voicegroup_8451F90 + .equ se_w240_grp, voicegroup111 .equ se_w240_pri, 4 .equ se_w240_rev, reverb_set+50 .equ se_w240_mvl, 127 diff --git a/sound/songs/se_w250.s b/sound/songs/se_w250.s index ac5c123e7..372bde412 100644 --- a/sound/songs/se_w250.s +++ b/sound/songs/se_w250.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w250_grp, voicegroup_8451F90 + .equ se_w250_grp, voicegroup111 .equ se_w250_pri, 4 .equ se_w250_rev, reverb_set+50 .equ se_w250_mvl, 127 diff --git a/sound/songs/se_w253.s b/sound/songs/se_w253.s index 3588725f3..086a60a58 100644 --- a/sound/songs/se_w253.s +++ b/sound/songs/se_w253.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w253_grp, voicegroup_8451F90 + .equ se_w253_grp, voicegroup111 .equ se_w253_pri, 4 .equ se_w253_rev, reverb_set+50 .equ se_w253_mvl, 127 diff --git a/sound/songs/se_w255.s b/sound/songs/se_w255.s index f00a1be05..00e1617b6 100644 --- a/sound/songs/se_w255.s +++ b/sound/songs/se_w255.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w255_grp, voicegroup_8451F90 + .equ se_w255_grp, voicegroup111 .equ se_w255_pri, 4 .equ se_w255_rev, reverb_set+50 .equ se_w255_mvl, 127 diff --git a/sound/songs/se_w257.s b/sound/songs/se_w257.s index dcc3750ba..c0183715a 100644 --- a/sound/songs/se_w257.s +++ b/sound/songs/se_w257.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w257_grp, voicegroup_8451F90 + .equ se_w257_grp, voicegroup111 .equ se_w257_pri, 4 .equ se_w257_rev, reverb_set+50 .equ se_w257_mvl, 127 diff --git a/sound/songs/se_w258.s b/sound/songs/se_w258.s index 52c4b826d..36fef253f 100644 --- a/sound/songs/se_w258.s +++ b/sound/songs/se_w258.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w258_grp, voicegroup_8451F90 + .equ se_w258_grp, voicegroup111 .equ se_w258_pri, 4 .equ se_w258_rev, reverb_set+50 .equ se_w258_mvl, 127 diff --git a/sound/songs/se_w260.s b/sound/songs/se_w260.s index 11874e1f3..7502b6fd0 100644 --- a/sound/songs/se_w260.s +++ b/sound/songs/se_w260.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w260_grp, voicegroup_8451F90 + .equ se_w260_grp, voicegroup111 .equ se_w260_pri, 4 .equ se_w260_rev, reverb_set+50 .equ se_w260_mvl, 127 diff --git a/sound/songs/se_w268.s b/sound/songs/se_w268.s index 3b45b223f..3f0004eed 100644 --- a/sound/songs/se_w268.s +++ b/sound/songs/se_w268.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w268_grp, voicegroup_8451F90 + .equ se_w268_grp, voicegroup111 .equ se_w268_pri, 4 .equ se_w268_rev, reverb_set+50 .equ se_w268_mvl, 127 diff --git a/sound/songs/se_w280.s b/sound/songs/se_w280.s index fb7766e79..459690ad2 100644 --- a/sound/songs/se_w280.s +++ b/sound/songs/se_w280.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w280_grp, voicegroup_8451F90 + .equ se_w280_grp, voicegroup111 .equ se_w280_pri, 4 .equ se_w280_rev, reverb_set+50 .equ se_w280_mvl, 127 diff --git a/sound/songs/se_w281.s b/sound/songs/se_w281.s index 0cb5b56c3..b8ba1a3e5 100644 --- a/sound/songs/se_w281.s +++ b/sound/songs/se_w281.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w281_grp, voicegroup_8451F90 + .equ se_w281_grp, voicegroup111 .equ se_w281_pri, 4 .equ se_w281_rev, reverb_set+50 .equ se_w281_mvl, 127 diff --git a/sound/songs/se_w287.s b/sound/songs/se_w287.s index 9964c6dee..61297bcd6 100644 --- a/sound/songs/se_w287.s +++ b/sound/songs/se_w287.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w287_grp, voicegroup_8451F90 + .equ se_w287_grp, voicegroup111 .equ se_w287_pri, 4 .equ se_w287_rev, reverb_set+50 .equ se_w287_mvl, 127 diff --git a/sound/songs/se_w287b.s b/sound/songs/se_w287b.s index 0fd968bdb..f4164d724 100644 --- a/sound/songs/se_w287b.s +++ b/sound/songs/se_w287b.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w287b_grp, voicegroup_8451F90 + .equ se_w287b_grp, voicegroup111 .equ se_w287b_pri, 4 .equ se_w287b_rev, reverb_set+50 .equ se_w287b_mvl, 127 diff --git a/sound/songs/se_w291.s b/sound/songs/se_w291.s index 6c1bce800..d5807e60f 100644 --- a/sound/songs/se_w291.s +++ b/sound/songs/se_w291.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w291_grp, voicegroup_8451F90 + .equ se_w291_grp, voicegroup111 .equ se_w291_pri, 4 .equ se_w291_rev, reverb_set+50 .equ se_w291_mvl, 127 diff --git a/sound/songs/se_w298.s b/sound/songs/se_w298.s index 4f36ca8c6..0add056de 100644 --- a/sound/songs/se_w298.s +++ b/sound/songs/se_w298.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w298_grp, voicegroup_8451F90 + .equ se_w298_grp, voicegroup111 .equ se_w298_pri, 4 .equ se_w298_rev, reverb_set+50 .equ se_w298_mvl, 127 diff --git a/sound/songs/se_w320.s b/sound/songs/se_w320.s index a0e4cbc2c..e8b24d3f4 100644 --- a/sound/songs/se_w320.s +++ b/sound/songs/se_w320.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w320_grp, voicegroup_8451F90 + .equ se_w320_grp, voicegroup111 .equ se_w320_pri, 4 .equ se_w320_rev, reverb_set+50 .equ se_w320_mvl, 127 diff --git a/sound/songs/se_w322.s b/sound/songs/se_w322.s index ba1442dcf..23506e2b3 100644 --- a/sound/songs/se_w322.s +++ b/sound/songs/se_w322.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w322_grp, voicegroup_8451F90 + .equ se_w322_grp, voicegroup111 .equ se_w322_pri, 4 .equ se_w322_rev, reverb_set+50 .equ se_w322_mvl, 127 diff --git a/sound/songs/se_w327.s b/sound/songs/se_w327.s index b5adcc2b1..f2affbb1b 100644 --- a/sound/songs/se_w327.s +++ b/sound/songs/se_w327.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w327_grp, voicegroup_8451F90 + .equ se_w327_grp, voicegroup111 .equ se_w327_pri, 4 .equ se_w327_rev, reverb_set+50 .equ se_w327_mvl, 127 diff --git a/sound/songs/se_w328.s b/sound/songs/se_w328.s index a5926e443..4395ea733 100644 --- a/sound/songs/se_w328.s +++ b/sound/songs/se_w328.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_w328_grp, voicegroup_8451F90 + .equ se_w328_grp, voicegroup111 .equ se_w328_pri, 4 .equ se_w328_rev, reverb_set+50 .equ se_w328_mvl, 127 diff --git a/sound/songs/se_wall_hit.s b/sound/songs/se_wall_hit.s index 0e2695e33..42034ecf9 100644 --- a/sound/songs/se_wall_hit.s +++ b/sound/songs/se_wall_hit.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_wall_hit_grp, voicegroup_8451990 + .equ se_wall_hit_grp, voicegroup110 .equ se_wall_hit_pri, 2 .equ se_wall_hit_rev, reverb_set+50 .equ se_wall_hit_mvl, 127 diff --git a/sound/songs/se_win_open.s b/sound/songs/se_win_open.s index cab4d51a4..6db9e3b2f 100644 --- a/sound/songs/se_win_open.s +++ b/sound/songs/se_win_open.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_win_open_grp, voicegroup_8451990 + .equ se_win_open_grp, voicegroup110 .equ se_win_open_pri, 5 .equ se_win_open_rev, reverb_set+50 .equ se_win_open_mvl, 127 diff --git a/sound/songs/se_z_page.s b/sound/songs/se_z_page.s index 1c805a6c4..30347bbd2 100644 --- a/sound/songs/se_z_page.s +++ b/sound/songs/se_z_page.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_z_page_grp, voicegroup_8451990 + .equ se_z_page_grp, voicegroup110 .equ se_z_page_pri, 5 .equ se_z_page_rev, reverb_set+50 .equ se_z_page_mvl, 127 diff --git a/sound/songs/se_z_scroll.s b/sound/songs/se_z_scroll.s index 33f24e961..1806e4b77 100644 --- a/sound/songs/se_z_scroll.s +++ b/sound/songs/se_z_scroll.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_z_scroll_grp, voicegroup_8451990 + .equ se_z_scroll_grp, voicegroup110 .equ se_z_scroll_pri, 5 .equ se_z_scroll_rev, reverb_set+50 .equ se_z_scroll_mvl, 127 diff --git a/sound/songs/se_z_search.s b/sound/songs/se_z_search.s index 2469b5279..89603ec88 100644 --- a/sound/songs/se_z_search.s +++ b/sound/songs/se_z_search.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_z_search_grp, voicegroup_8451990 + .equ se_z_search_grp, voicegroup110 .equ se_z_search_pri, 5 .equ se_z_search_rev, reverb_set+50 .equ se_z_search_mvl, 127 diff --git a/sound/songs/song_248.s b/sound/songs/song_248.s index 121b187c2..6586d6578 100644 --- a/sound/songs/song_248.s +++ b/sound/songs/song_248.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_248_grp, voicegroup_84549F0 + .equ song_248_grp, voicegroup112 .equ song_248_pri, 4 .equ song_248_rev, 0 .equ song_248_mvl, 127 diff --git a/sound/songs/song_249.s b/sound/songs/song_249.s index 71d1b6aa0..770e24395 100644 --- a/sound/songs/song_249.s +++ b/sound/songs/song_249.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_249_grp, voicegroup_84549F0 + .equ song_249_grp, voicegroup112 .equ song_249_pri, 4 .equ song_249_rev, 0 .equ song_249_mvl, 127 diff --git a/sound/songs/song_250.s b/sound/songs/song_250.s index 62e725123..47926edbe 100644 --- a/sound/songs/song_250.s +++ b/sound/songs/song_250.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_250_grp, voicegroup_84549F0 + .equ song_250_grp, voicegroup112 .equ song_250_pri, 4 .equ song_250_rev, 0 .equ song_250_mvl, 127 diff --git a/sound/songs/song_251.s b/sound/songs/song_251.s index 1e1c10bff..ffef147ba 100644 --- a/sound/songs/song_251.s +++ b/sound/songs/song_251.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_251_grp, voicegroup_84549F0 + .equ song_251_grp, voicegroup112 .equ song_251_pri, 4 .equ song_251_rev, 0 .equ song_251_mvl, 127 diff --git a/sound/songs/song_252.s b/sound/songs/song_252.s index 88e91e9aa..758a42d72 100644 --- a/sound/songs/song_252.s +++ b/sound/songs/song_252.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_252_grp, voicegroup_84549F0 + .equ song_252_grp, voicegroup112 .equ song_252_pri, 4 .equ song_252_rev, 0 .equ song_252_mvl, 127 diff --git a/sound/songs/song_253.s b/sound/songs/song_253.s index 00fabf09b..f25a72b64 100644 --- a/sound/songs/song_253.s +++ b/sound/songs/song_253.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_253_grp, voicegroup_84549F0 + .equ song_253_grp, voicegroup112 .equ song_253_pri, 4 .equ song_253_rev, 0 .equ song_253_mvl, 127 diff --git a/sound/songs/song_254.s b/sound/songs/song_254.s index ada594c03..13648f844 100644 --- a/sound/songs/song_254.s +++ b/sound/songs/song_254.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_254_grp, voicegroup_84549F0 + .equ song_254_grp, voicegroup112 .equ song_254_pri, 4 .equ song_254_rev, 0 .equ song_254_mvl, 127 diff --git a/sound/songs/song_255.s b/sound/songs/song_255.s index ebc528c13..5e990c2d0 100644 --- a/sound/songs/song_255.s +++ b/sound/songs/song_255.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_255_grp, voicegroup_84549F0 + .equ song_255_grp, voicegroup112 .equ song_255_pri, 4 .equ song_255_rev, 0 .equ song_255_mvl, 127 diff --git a/sound/songs/song_256.s b/sound/songs/song_256.s index 165f6e841..13d1f52cb 100644 --- a/sound/songs/song_256.s +++ b/sound/songs/song_256.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_256_grp, voicegroup_84549F0 + .equ song_256_grp, voicegroup112 .equ song_256_pri, 4 .equ song_256_rev, 0 .equ song_256_mvl, 127 diff --git a/sound/songs/song_257.s b/sound/songs/song_257.s index 3866c45a8..58d946bac 100644 --- a/sound/songs/song_257.s +++ b/sound/songs/song_257.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_257_grp, voicegroup_84549F0 + .equ song_257_grp, voicegroup112 .equ song_257_pri, 4 .equ song_257_rev, 0 .equ song_257_mvl, 127 diff --git a/sound/songs/song_258.s b/sound/songs/song_258.s index 8672eb4de..c8264eef5 100644 --- a/sound/songs/song_258.s +++ b/sound/songs/song_258.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_258_grp, voicegroup_84549F0 + .equ song_258_grp, voicegroup112 .equ song_258_pri, 4 .equ song_258_rev, 0 .equ song_258_mvl, 127 diff --git a/sound/songs/song_259.s b/sound/songs/song_259.s index d4a2ac094..754d0ee3d 100644 --- a/sound/songs/song_259.s +++ b/sound/songs/song_259.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_259_grp, voicegroup_84549F0 + .equ song_259_grp, voicegroup112 .equ song_259_pri, 4 .equ song_259_rev, 0 .equ song_259_mvl, 127 diff --git a/sound/songs/song_260.s b/sound/songs/song_260.s index a281d8feb..e2404a026 100644 --- a/sound/songs/song_260.s +++ b/sound/songs/song_260.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_260_grp, voicegroup_84549F0 + .equ song_260_grp, voicegroup112 .equ song_260_pri, 4 .equ song_260_rev, 0 .equ song_260_mvl, 127 diff --git a/sound/songs/song_261.s b/sound/songs/song_261.s index b0e012095..c6aa7c83b 100644 --- a/sound/songs/song_261.s +++ b/sound/songs/song_261.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_261_grp, voicegroup_84549F0 + .equ song_261_grp, voicegroup112 .equ song_261_pri, 4 .equ song_261_rev, 0 .equ song_261_mvl, 127 diff --git a/sound/songs/song_262.s b/sound/songs/song_262.s index cbd714193..41becc40f 100644 --- a/sound/songs/song_262.s +++ b/sound/songs/song_262.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_262_grp, voicegroup_84549F0 + .equ song_262_grp, voicegroup112 .equ song_262_pri, 4 .equ song_262_rev, 0 .equ song_262_mvl, 127 diff --git a/sound/songs/song_263.s b/sound/songs/song_263.s index 820231977..92b2aa904 100644 --- a/sound/songs/song_263.s +++ b/sound/songs/song_263.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_263_grp, voicegroup_84549F0 + .equ song_263_grp, voicegroup112 .equ song_263_pri, 4 .equ song_263_rev, 0 .equ song_263_mvl, 127 diff --git a/sound/songs/song_264.s b/sound/songs/song_264.s index f4d4378dd..c37908cd1 100644 --- a/sound/songs/song_264.s +++ b/sound/songs/song_264.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_264_grp, voicegroup_84549F0 + .equ song_264_grp, voicegroup112 .equ song_264_pri, 4 .equ song_264_rev, 0 .equ song_264_mvl, 127 diff --git a/sound/songs/song_265.s b/sound/songs/song_265.s index d260db139..3a470e403 100644 --- a/sound/songs/song_265.s +++ b/sound/songs/song_265.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_265_grp, voicegroup_84549F0 + .equ song_265_grp, voicegroup112 .equ song_265_pri, 4 .equ song_265_rev, 0 .equ song_265_mvl, 127 diff --git a/sound/songs/song_266.s b/sound/songs/song_266.s index df363ab6c..ac0a6c4d0 100644 --- a/sound/songs/song_266.s +++ b/sound/songs/song_266.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_266_grp, voicegroup_84549F0 + .equ song_266_grp, voicegroup112 .equ song_266_pri, 4 .equ song_266_rev, 0 .equ song_266_mvl, 127 diff --git a/sound/songs/song_267.s b/sound/songs/song_267.s index 8c94ff670..163f6e756 100644 --- a/sound/songs/song_267.s +++ b/sound/songs/song_267.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_267_grp, voicegroup_84549F0 + .equ song_267_grp, voicegroup112 .equ song_267_pri, 4 .equ song_267_rev, 0 .equ song_267_mvl, 127 diff --git a/sound/songs/song_268.s b/sound/songs/song_268.s index 0c5191090..37d23fcb6 100644 --- a/sound/songs/song_268.s +++ b/sound/songs/song_268.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_268_grp, voicegroup_84549F0 + .equ song_268_grp, voicegroup112 .equ song_268_pri, 4 .equ song_268_rev, 0 .equ song_268_mvl, 127 diff --git a/sound/songs/song_269.s b/sound/songs/song_269.s index be39b4ee7..7a103a7df 100644 --- a/sound/songs/song_269.s +++ b/sound/songs/song_269.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_269_grp, voicegroup_84549F0 + .equ song_269_grp, voicegroup112 .equ song_269_pri, 4 .equ song_269_rev, 0 .equ song_269_mvl, 127 diff --git a/sound/songs/song_270.s b/sound/songs/song_270.s index f16490f00..799531a5d 100644 --- a/sound/songs/song_270.s +++ b/sound/songs/song_270.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_270_grp, voicegroup_84549F0 + .equ song_270_grp, voicegroup112 .equ song_270_pri, 4 .equ song_270_rev, 0 .equ song_270_mvl, 127 diff --git a/sound/songs/song_271.s b/sound/songs/song_271.s index 538733ae0..bbca2ed7c 100644 --- a/sound/songs/song_271.s +++ b/sound/songs/song_271.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_271_grp, voicegroup_84549F0 + .equ song_271_grp, voicegroup112 .equ song_271_pri, 4 .equ song_271_rev, 0 .equ song_271_mvl, 127 diff --git a/sound/songs/song_272.s b/sound/songs/song_272.s index 4bd212afd..6ca06fa97 100644 --- a/sound/songs/song_272.s +++ b/sound/songs/song_272.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_272_grp, voicegroup_84549F0 + .equ song_272_grp, voicegroup112 .equ song_272_pri, 4 .equ song_272_rev, 0 .equ song_272_mvl, 127 diff --git a/sound/songs/song_273.s b/sound/songs/song_273.s index 0e30a0f46..0f59a1e92 100644 --- a/sound/songs/song_273.s +++ b/sound/songs/song_273.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_273_grp, voicegroup_84549F0 + .equ song_273_grp, voicegroup112 .equ song_273_pri, 4 .equ song_273_rev, 0 .equ song_273_mvl, 127 diff --git a/sound/songs/song_274.s b/sound/songs/song_274.s index 2a49b42cf..c20cc0489 100644 --- a/sound/songs/song_274.s +++ b/sound/songs/song_274.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_274_grp, voicegroup_84549F0 + .equ song_274_grp, voicegroup112 .equ song_274_pri, 4 .equ song_274_rev, 0 .equ song_274_mvl, 127 diff --git a/sound/songs/song_275.s b/sound/songs/song_275.s index e0a6ee390..838e3a422 100644 --- a/sound/songs/song_275.s +++ b/sound/songs/song_275.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_275_grp, voicegroup_84549F0 + .equ song_275_grp, voicegroup112 .equ song_275_pri, 4 .equ song_275_rev, 0 .equ song_275_mvl, 127 diff --git a/sound/songs/song_276.s b/sound/songs/song_276.s index 3f135f6e0..cc239a191 100644 --- a/sound/songs/song_276.s +++ b/sound/songs/song_276.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_276_grp, voicegroup_84549F0 + .equ song_276_grp, voicegroup112 .equ song_276_pri, 4 .equ song_276_rev, 0 .equ song_276_mvl, 127 diff --git a/sound/songs/song_277.s b/sound/songs/song_277.s index fdcb69900..baf7b0b7f 100644 --- a/sound/songs/song_277.s +++ b/sound/songs/song_277.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_277_grp, voicegroup_84549F0 + .equ song_277_grp, voicegroup112 .equ song_277_pri, 4 .equ song_277_rev, 0 .equ song_277_mvl, 127 diff --git a/sound/songs/song_278.s b/sound/songs/song_278.s index 7b65f622d..18919f036 100644 --- a/sound/songs/song_278.s +++ b/sound/songs/song_278.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_278_grp, voicegroup_84549F0 + .equ song_278_grp, voicegroup112 .equ song_278_pri, 4 .equ song_278_rev, 0 .equ song_278_mvl, 127 diff --git a/sound/songs/song_279.s b/sound/songs/song_279.s index 5e8b1da4b..7f46acc46 100644 --- a/sound/songs/song_279.s +++ b/sound/songs/song_279.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_279_grp, voicegroup_84549F0 + .equ song_279_grp, voicegroup112 .equ song_279_pri, 4 .equ song_279_rev, 0 .equ song_279_mvl, 127 diff --git a/sound/songs/song_280.s b/sound/songs/song_280.s index 0ae6e2303..47e96bed0 100644 --- a/sound/songs/song_280.s +++ b/sound/songs/song_280.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_280_grp, voicegroup_84549F0 + .equ song_280_grp, voicegroup112 .equ song_280_pri, 4 .equ song_280_rev, 0 .equ song_280_mvl, 127 diff --git a/sound/songs/song_281.s b/sound/songs/song_281.s index cd4f9e83e..8f37bade2 100644 --- a/sound/songs/song_281.s +++ b/sound/songs/song_281.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_281_grp, voicegroup_84549F0 + .equ song_281_grp, voicegroup112 .equ song_281_pri, 4 .equ song_281_rev, 0 .equ song_281_mvl, 127 diff --git a/sound/songs/song_282.s b/sound/songs/song_282.s index c6d2dd05b..9b109ae7e 100644 --- a/sound/songs/song_282.s +++ b/sound/songs/song_282.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_282_grp, voicegroup_84549F0 + .equ song_282_grp, voicegroup112 .equ song_282_pri, 4 .equ song_282_rev, 0 .equ song_282_mvl, 127 diff --git a/sound/songs/song_283.s b/sound/songs/song_283.s index 5560ec5eb..2b49a4f9a 100644 --- a/sound/songs/song_283.s +++ b/sound/songs/song_283.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_283_grp, voicegroup_84549F0 + .equ song_283_grp, voicegroup112 .equ song_283_pri, 4 .equ song_283_rev, 0 .equ song_283_mvl, 127 diff --git a/sound/songs/song_284.s b/sound/songs/song_284.s index eba776867..ce5489999 100644 --- a/sound/songs/song_284.s +++ b/sound/songs/song_284.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_284_grp, voicegroup_84549F0 + .equ song_284_grp, voicegroup112 .equ song_284_pri, 4 .equ song_284_rev, 0 .equ song_284_mvl, 127 diff --git a/sound/songs/song_285.s b/sound/songs/song_285.s index e81278e98..18605965a 100644 --- a/sound/songs/song_285.s +++ b/sound/songs/song_285.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_285_grp, voicegroup_84549F0 + .equ song_285_grp, voicegroup112 .equ song_285_pri, 4 .equ song_285_rev, 0 .equ song_285_mvl, 127 diff --git a/sound/songs/song_286.s b/sound/songs/song_286.s index 9737ee3c5..d72d601d9 100644 --- a/sound/songs/song_286.s +++ b/sound/songs/song_286.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_286_grp, voicegroup_84549F0 + .equ song_286_grp, voicegroup112 .equ song_286_pri, 4 .equ song_286_rev, 0 .equ song_286_mvl, 127 diff --git a/sound/songs/song_287.s b/sound/songs/song_287.s index c714045a6..279339f0a 100644 --- a/sound/songs/song_287.s +++ b/sound/songs/song_287.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_287_grp, voicegroup_84549F0 + .equ song_287_grp, voicegroup112 .equ song_287_pri, 4 .equ song_287_rev, 0 .equ song_287_mvl, 127 diff --git a/sound/songs/song_288.s b/sound/songs/song_288.s index 8a2d7a965..f5f09e907 100644 --- a/sound/songs/song_288.s +++ b/sound/songs/song_288.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_288_grp, voicegroup_84549F0 + .equ song_288_grp, voicegroup112 .equ song_288_pri, 4 .equ song_288_rev, 0 .equ song_288_mvl, 127 diff --git a/sound/songs/song_289.s b/sound/songs/song_289.s index a20988873..09c96ed93 100644 --- a/sound/songs/song_289.s +++ b/sound/songs/song_289.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_289_grp, voicegroup_84549F0 + .equ song_289_grp, voicegroup112 .equ song_289_pri, 4 .equ song_289_rev, 0 .equ song_289_mvl, 127 diff --git a/sound/songs/song_290.s b/sound/songs/song_290.s index 97d1039fc..000cfd41f 100644 --- a/sound/songs/song_290.s +++ b/sound/songs/song_290.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_290_grp, voicegroup_84549F0 + .equ song_290_grp, voicegroup112 .equ song_290_pri, 4 .equ song_290_rev, 0 .equ song_290_mvl, 127 diff --git a/sound/songs/song_291.s b/sound/songs/song_291.s index f7f53e22e..14c2c0403 100644 --- a/sound/songs/song_291.s +++ b/sound/songs/song_291.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_291_grp, voicegroup_84549F0 + .equ song_291_grp, voicegroup112 .equ song_291_pri, 4 .equ song_291_rev, 0 .equ song_291_mvl, 127 diff --git a/sound/songs/song_292.s b/sound/songs/song_292.s index d9307019b..a55779eb1 100644 --- a/sound/songs/song_292.s +++ b/sound/songs/song_292.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_292_grp, voicegroup_84549F0 + .equ song_292_grp, voicegroup112 .equ song_292_pri, 4 .equ song_292_rev, 0 .equ song_292_mvl, 127 diff --git a/sound/songs/song_293.s b/sound/songs/song_293.s index d6e173d50..28976cfd9 100644 --- a/sound/songs/song_293.s +++ b/sound/songs/song_293.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_293_grp, voicegroup_84549F0 + .equ song_293_grp, voicegroup112 .equ song_293_pri, 4 .equ song_293_rev, 0 .equ song_293_mvl, 127 diff --git a/sound/songs/song_294.s b/sound/songs/song_294.s index 140137585..1b5ab2d75 100644 --- a/sound/songs/song_294.s +++ b/sound/songs/song_294.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_294_grp, voicegroup_84549F0 + .equ song_294_grp, voicegroup112 .equ song_294_pri, 4 .equ song_294_rev, 0 .equ song_294_mvl, 127 diff --git a/sound/songs/song_295.s b/sound/songs/song_295.s index cefa6f021..6a8ac6cfa 100644 --- a/sound/songs/song_295.s +++ b/sound/songs/song_295.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_295_grp, voicegroup_84549F0 + .equ song_295_grp, voicegroup112 .equ song_295_pri, 4 .equ song_295_rev, 0 .equ song_295_mvl, 127 diff --git a/sound/songs/song_296.s b/sound/songs/song_296.s index 52577505e..9226b1a6c 100644 --- a/sound/songs/song_296.s +++ b/sound/songs/song_296.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_296_grp, voicegroup_84549F0 + .equ song_296_grp, voicegroup112 .equ song_296_pri, 4 .equ song_296_rev, 0 .equ song_296_mvl, 127 diff --git a/sound/songs/song_297.s b/sound/songs/song_297.s index 420d5acfd..d92598fd4 100644 --- a/sound/songs/song_297.s +++ b/sound/songs/song_297.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_297_grp, voicegroup_84549F0 + .equ song_297_grp, voicegroup112 .equ song_297_pri, 4 .equ song_297_rev, 0 .equ song_297_mvl, 127 diff --git a/sound/songs/song_298.s b/sound/songs/song_298.s index bf318d547..0bcf70111 100644 --- a/sound/songs/song_298.s +++ b/sound/songs/song_298.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ song_298_grp, voicegroup_84549F0 + .equ song_298_grp, voicegroup112 .equ song_298_pri, 4 .equ song_298_rev, 0 .equ song_298_mvl, 127 diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc index 80f57a512..267dddea6 100644 --- a/sound/voice_groups.inc +++ b/sound/voice_groups.inc @@ -1,7 +1,7 @@ .align 2 -voicegroup_pokemon_cry:: @ 842FC8 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup000:: @ 842FC88 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -48,18 +48,18 @@ voicegroup_pokemon_cry:: @ 842FC8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 204, 193, 239 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 .align 2 -voicegroup_842FEF8:: @ 842FEF8 +voicegroup001:: @ 842FEF8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -122,20 +122,20 @@ voicegroup_842FEF8:: @ 842FEF8 voice_directsound_no_resample 72, 222, DirectSoundWaveData_SC88_DrumKitLowConga, 255, 0, 255, 0 .align 2 -voicegroup_8430204:: @ 8430204 +voicegroup002:: @ 8430204 voice_directsound 60, 0, DirectSoundWaveData_SC88_SteelStringGuitar, 255, 252, 0, 239 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano3, 255, 250, 0, 221 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano2, 255, 250, 0, 221 voice_directsound 60, 0, DirectSoundWaveData_SC88_UnisonSlap, 255, 247, 0, 221 .align 2 -voicegroup_8430234:: @ 8430234 +voicegroup003:: @ 8430234 voice_directsound 60, 0, DirectSoundWaveData_SC88_Strings, 255, 0, 255, 196 voice_directsound 60, 0, DirectSoundWaveData_SC88_StringsPlusFlute, 255, 0, 255, 196 voice_directsound 60, 0, DirectSoundWaveData_SC88_StringsPlusHorn, 255, 0, 255, 196 .align 2 -voicegroup_8430258:: @ 8430258 +voicegroup004:: @ 8430258 voice_directsound 60, 0, DirectSoundWaveData_SC88_Trumpet, 255, 0, 193, 127 voice_directsound 60, 0, DirectSoundWaveData_SC88_Trombone, 255, 0, 193, 127 voice_directsound 60, 0, DirectSoundWaveData_SC88_Tuba, 255, 0, 193, 127 @@ -269,18 +269,18 @@ voicegroup_8430258:: @ 8430258 voice_square_1_alt 21, 2, 0, 0, 15, 2 .align 2 -voicegroup_843087C:: @ 843087 +voicegroup005:: @ 843087C voice_directsound 60, 0, DirectSoundWaveData_SC88_CupMutedTrumpet, 255, 0, 255, 165 voice_directsound 60, 0, DirectSoundWaveData_SC88_MutedTrumpet3, 255, 0, 255, 165 .align 2 -voicegroup_8430894:: @ 8430894 +voicegroup006:: @ 8430894 voice_directsound 60, 0, DirectSoundWaveData_SC88_FrenchHorns, 255, 0, 224, 165 voice_directsound 60, 0, DirectSoundWaveData_SC88_WideFrenchHorns, 255, 0, 218, 165 .align 2 -voicegroup_84308AC:: @ 84308AC - voice_keysplit_all voicegroup_8435FAC +voicegroup007:: @ 84308AC + voice_keysplit_all voicegroup028 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -328,7 +328,7 @@ voicegroup_84308AC:: @ 84308AC voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -336,11 +336,11 @@ voicegroup_84308AC:: @ 84308AC voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -366,8 +366,8 @@ voicegroup_84308AC:: @ 84308AC voice_square_1 0, 3, 0, 0, 7, 1 .align 2 -voicegroup_8430C9C:: @ 8430C9C - voice_keysplit_all voicegroup_8433BAC +voicegroup008:: @ 8430C9C + voice_keysplit_all voicegroup019 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -415,7 +415,7 @@ voicegroup_8430C9C:: @ 8430C9C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -497,9 +497,9 @@ voicegroup_8430C9C:: @ 8430C9C voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_843129C:: @ 843129C - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup009:: @ 843129C + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_directsound 60, 0, DirectSoundWaveData_SC88_WaspySynth, 255, 178, 180, 165 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -546,7 +546,7 @@ voicegroup_843129C:: @ 843129C voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -554,11 +554,11 @@ voicegroup_843129C:: @ 843129C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -602,8 +602,8 @@ voicegroup_843129C:: @ 843129C voice_square_1_alt 22, 2, 0, 2, 0, 0 .align 2 -voicegroup_8431764:: @ 8431764 - voice_keysplit_all voicegroup_842FEF8 +voicegroup010:: @ 8431764 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -651,7 +651,7 @@ voicegroup_8431764:: @ 8431764 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -659,11 +659,11 @@ voicegroup_8431764:: @ 8431764 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -695,9 +695,9 @@ voicegroup_8431764:: @ 8431764 voice_square_1_alt 0, 3, 0, 0, 7, 1 .align 2 -voicegroup_8431B9C:: @ 8431B9C - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup011:: @ 8431B9C + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_2_alt 3, 0, 1, 6, 1 @@ -744,7 +744,7 @@ voicegroup_8431B9C:: @ 8431B9C voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -752,11 +752,11 @@ voicegroup_8431B9C:: @ 8431B9C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -783,9 +783,9 @@ voicegroup_8431B9C:: @ 8431B9C voice_square_1_alt 0, 3, 0, 0, 7, 0 .align 2 -voicegroup_8431F98:: @ 8431F98 - voice_keysplit_all voicegroup_84323E8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup012:: @ 8431F98 + voice_keysplit_all voicegroup013 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -832,7 +832,7 @@ voicegroup_8431F98:: @ 8431F98 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -878,7 +878,7 @@ voicegroup_8431F98:: @ 8431F98 voice_square_1 0, 2, 0, 0, 15, 0 .align 2 -voicegroup_84323E8:: @ 84323E8 +voicegroup013:: @ 84323E8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -946,8 +946,8 @@ voicegroup_84323E8:: @ 84323E8 voice_directsound_no_resample 72, 190, DirectSoundWaveData_SC88_DrumKitLowConga, 255, 0, 255, 0 .align 2 -voicegroup_84326F4:: @ 84326F4 - voice_keysplit_all voicegroup_842FEF8 +voicegroup014:: @ 84326F4 + voice_keysplit_all voicegroup001 voice_square_2_alt 2, 0, 3, 3, 1 voice_square_1_alt 0, 2, 0, 3, 3, 1 voice_square_1 0, 2, 0, 0, 15, 0 @@ -995,7 +995,7 @@ voicegroup_84326F4:: @ 84326F4 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1005,9 +1005,9 @@ voicegroup_84326F4:: @ 84326F4 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1040,9 +1040,9 @@ voicegroup_84326F4:: @ 84326F4 voice_square_1_alt 0, 1, 0, 0, 6, 2 .align 2 -voicegroup_8432B38:: @ 8432B38 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup015:: @ 8432B38 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_2_alt 0, 0, 1, 7, 1 @@ -1089,7 +1089,7 @@ voicegroup_8432B38:: @ 8432B38 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1171,7 +1171,7 @@ voicegroup_8432B38:: @ 8432B38 voice_noise_alt 1, 0, 1, 0, 3 .align 2 -voicegroup_8433138:: @ 8433138 +voicegroup016:: @ 8433138 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1220,7 +1220,7 @@ voicegroup_8433138:: @ 8433138 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1230,9 +1230,9 @@ voicegroup_8433138:: @ 8433138 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1259,8 +1259,8 @@ voicegroup_8433138:: @ 8433138 voice_square_1_alt 0, 1, 0, 0, 7, 1 .align 2 -voicegroup_8433534:: @ 8433534 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup017:: @ 8433534 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1308,7 +1308,7 @@ voicegroup_8433534:: @ 8433534 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1318,7 +1318,7 @@ voicegroup_8433534:: @ 8433534 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1349,8 +1349,8 @@ voicegroup_8433534:: @ 8433534 voice_square_1 0, 2, 0, 0, 7, 1 .align 2 -voicegroup_8433948:: @ 8433948 - voice_keysplit_all voicegroup_842FEF8 +voicegroup018:: @ 8433948 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_2_alt 3, 0, 2, 0, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1398,22 +1398,22 @@ voicegroup_8433948:: @ 8433948 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 .align 2 -voicegroup_8433BAC:: @ 8433BAC +voicegroup019:: @ 8433BAC voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1471,9 +1471,9 @@ voicegroup_8433BAC:: @ 8433BAC voice_directsound_no_resample 72, 189, DirectSoundWaveData_SC88_DrumKitLowConga, 255, 0, 255, 0 .align 2 -voicegroup_8433EB8:: @ 8433EB8 - voice_keysplit voicegroup_8430204, KeySplitTable1 - voice_keysplit_all voicegroup_842FEF8 +voicegroup020:: @ 8433EB8 + voice_keysplit voicegroup002, KeySplitTable1 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1520,7 +1520,7 @@ voicegroup_8433EB8:: @ 8433EB8 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1528,7 +1528,7 @@ voicegroup_8433EB8:: @ 8433EB8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1563,8 +1563,8 @@ voicegroup_8433EB8:: @ 8433EB8 voice_square_1_alt 0, 3, 0, 0, 7, 0 .align 2 -voicegroup_84342E4:: @ 84342E4 - voice_keysplit_all voicegroup_842FEF8 +voicegroup021:: @ 84342E4 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1612,7 +1612,7 @@ voicegroup_84342E4:: @ 84342E4 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1620,11 +1620,11 @@ voicegroup_84342E4:: @ 84342E4 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1657,8 +1657,8 @@ voicegroup_84342E4:: @ 84342E4 voice_programmable_wave_alt ProgrammableWaveData_845541C, 0, 7, 15, 1 .align 2 -voicegroup_8434728:: @ 8434728 - voice_keysplit_all voicegroup_842FEF8 +voicegroup022:: @ 8434728 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1714,9 +1714,9 @@ voicegroup_8434728:: @ 8434728 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1744,8 +1744,8 @@ voicegroup_8434728:: @ 8434728 voice_square_2_alt 2, 0, 1, 0, 0 .align 2 -voicegroup_8434B18:: @ 8434B18 - voice_keysplit_all voicegroup_842FEF8 +voicegroup023:: @ 8434B18 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1805,7 +1805,7 @@ voicegroup_8434B18:: @ 8434B18 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1832,9 +1832,9 @@ voicegroup_8434B18:: @ 8434B18 voice_square_1_alt 0, 3, 0, 1, 7, 0 .align 2 -voicegroup_8434F14:: @ 8434F14 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup024:: @ 8434F14 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -1963,8 +1963,8 @@ voicegroup_8434F14:: @ 8434F14 voice_noise_alt 0, 0, 1, 0, 2 .align 2 -voicegroup_8435514:: @ 8435514 - voice_keysplit_all voicegroup_842FEF8 +voicegroup025:: @ 8435514 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 3, 0, 1, 0, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2020,7 +2020,7 @@ voicegroup_8435514:: @ 8435514 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2049,8 +2049,8 @@ voicegroup_8435514:: @ 8435514 voice_square_2 3, 0, 4, 0, 0 .align 2 -voicegroup_84358F8:: @ 84358F8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup026:: @ 84358F8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2098,7 +2098,7 @@ voicegroup_84358F8:: @ 84358F8 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2106,11 +2106,11 @@ voicegroup_84358F8:: @ 84358F8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2140,9 +2140,9 @@ voicegroup_84358F8:: @ 84358F8 voice_square_1_alt 0, 0, 0, 1, 7, 0 .align 2 -voicegroup_8435D18:: @ 8435D18 - voice_keysplit_all voicegroup_8435FAC - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup027:: @ 8435D18 + voice_keysplit_all voicegroup028 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2198,13 +2198,13 @@ voicegroup_8435D18:: @ 8435D18 voice_square_1 0, 2, 0, 0, 15, 0 .align 2 -voicegroup_8435FAC:: @ 8435FAC +voicegroup028:: @ 8435FAC voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2266,9 +2266,9 @@ voicegroup_8435FAC:: @ 8435FAC voice_directsound_no_resample 72, 202, DirectSoundWaveData_SC88_DrumKitLowConga, 255, 0, 255, 0 .align 2 -voicegroup_84362B8:: @ 84362B8 - voice_keysplit_all voicegroup_84323E8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup029:: @ 84362B8 + voice_keysplit_all voicegroup013 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2397,8 +2397,8 @@ voicegroup_84362B8:: @ 84362B8 voice_noise_alt 0, 0, 1, 0, 2 .align 2 -voicegroup_84368B8:: @ 84368B8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup030:: @ 84368B8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2446,7 +2446,7 @@ voicegroup_84368B8:: @ 84368B8 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2458,7 +2458,7 @@ voicegroup_84368B8:: @ 84368B8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2483,9 +2483,9 @@ voicegroup_84368B8:: @ 84368B8 voice_square_1_alt 0, 2, 0, 1, 4, 1 .align 2 -voicegroup_8436C9C:: @ 8436C9C - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup031:: @ 8436C9C + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_2 2, 0, 1, 4, 2 @@ -2532,7 +2532,7 @@ voicegroup_8436C9C:: @ 8436C9C voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2570,9 +2570,9 @@ voicegroup_8436C9C:: @ 8436C9C voice_programmable_wave ProgrammableWaveData_845544C, 0, 7, 15, 2 .align 2 -voicegroup_843708C:: @ 843708C - voice_keysplit_all voicegroup_8435FAC - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup032:: @ 843708C + voice_keysplit_all voicegroup028 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_2_alt 2, 0, 1, 7, 1 @@ -2619,7 +2619,7 @@ voicegroup_843708C:: @ 843708C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2627,11 +2627,11 @@ voicegroup_843708C:: @ 843708C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2658,8 +2658,8 @@ voicegroup_843708C:: @ 843708C voice_square_1_alt 0, 3, 0, 0, 6, 1 .align 2 -voicegroup_8437488:: @ 8437488 - voice_keysplit_all voicegroup_842FEF8 +voicegroup033:: @ 8437488 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2707,7 +2707,7 @@ voicegroup_8437488:: @ 8437488 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2719,7 +2719,7 @@ voicegroup_8437488:: @ 8437488 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2789,8 +2789,8 @@ voicegroup_8437488:: @ 8437488 voice_noise_alt 0, 0, 1, 0, 2 .align 2 -voicegroup_8437A88:: @ 8437A88 - voice_keysplit_all voicegroup_8435FAC +voicegroup034:: @ 8437A88 + voice_keysplit_all voicegroup028 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2838,7 +2838,7 @@ voicegroup_8437A88:: @ 8437A88 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2848,9 +2848,9 @@ voicegroup_8437A88:: @ 8437A88 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2881,8 +2881,8 @@ voicegroup_8437A88:: @ 8437A88 voice_programmable_wave_alt ProgrammableWaveData_845541C, 0, 7, 15, 2 .align 2 -voicegroup_8437EB4:: @ 8437EB4 - voice_keysplit_all voicegroup_842FEF8 +voicegroup035:: @ 8437EB4 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -2966,8 +2966,8 @@ voicegroup_8437EB4:: @ 8437EB4 voice_programmable_wave_alt ProgrammableWaveData_84553DC, 0, 7, 15, 0 .align 2 -voicegroup_843828C:: @ 843828C - voice_keysplit_all voicegroup_842FEF8 +voicegroup036:: @ 843828C + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3015,7 +3015,7 @@ voicegroup_843828C:: @ 843828C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3023,11 +3023,11 @@ voicegroup_843828C:: @ 843828C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3097,8 +3097,8 @@ voicegroup_843828C:: @ 843828C voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_843888C:: @ 843888C - voice_keysplit_all voicegroup_842FEF8 +voicegroup037:: @ 843888C + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3146,7 +3146,7 @@ voicegroup_843888C:: @ 843888C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3154,11 +3154,11 @@ voicegroup_843888C:: @ 843888C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3228,8 +3228,8 @@ voicegroup_843888C:: @ 843888C voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_8438E8C:: @ 8438E8C - voice_keysplit_all voicegroup_842FEF8 +voicegroup038:: @ 8438E8C + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3277,7 +3277,7 @@ voicegroup_8438E8C:: @ 8438E8C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3285,11 +3285,11 @@ voicegroup_8438E8C:: @ 8438E8C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3359,8 +3359,8 @@ voicegroup_8438E8C:: @ 8438E8C voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_843948C:: @ 843948C - voice_keysplit_all voicegroup_842FEF8 +voicegroup039:: @ 843948C + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3408,7 +3408,7 @@ voicegroup_843948C:: @ 843948C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3416,11 +3416,11 @@ voicegroup_843948C:: @ 843948C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3490,9 +3490,9 @@ voicegroup_843948C:: @ 843948C voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_8439A8C:: @ 8439A8C +voicegroup040:: @ 8439A8C voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430204, KeySplitTable1 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3539,7 +3539,7 @@ voicegroup_8439A8C:: @ 8439A8C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3549,7 +3549,7 @@ voicegroup_8439A8C:: @ 8439A8C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3574,8 +3574,8 @@ voicegroup_8439A8C:: @ 8439A8C voice_square_2_alt 1, 0, 2, 4, 0 .align 2 -voicegroup_8439E58:: @ 8439E58 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup041:: @ 8439E58 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3623,7 +3623,7 @@ voicegroup_8439E58:: @ 8439E58 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3658,8 +3658,8 @@ voicegroup_8439E58:: @ 8439E58 voice_programmable_wave_alt ProgrammableWaveData_845540C, 0, 7, 15, 1 .align 2 -voicegroup_843A224:: @ 843A224 - voice_keysplit_all voicegroup_842FEF8 +voicegroup042:: @ 843A224 + voice_keysplit_all voicegroup001 voice_square_1_alt 0, 1, 0, 2, 0, 1 voice_square_1_alt 0, 3, 1, 2, 6, 0 voice_square_2_alt 3, 1, 2, 6, 0 @@ -3669,7 +3669,7 @@ voicegroup_843A224:: @ 843A224 voice_programmable_wave_alt ProgrammableWaveData_84553EC, 1, 7, 15, 1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430204, KeySplitTable1 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3707,7 +3707,7 @@ voicegroup_843A224:: @ 843A224 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3789,8 +3789,8 @@ voicegroup_843A224:: @ 843A224 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_843A824:: @ 843A824 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup043:: @ 843A824 + voice_keysplit voicegroup002, KeySplitTable1 voice_programmable_wave_alt ProgrammableWaveData_845542C, 0, 1, 12, 0 voice_square_1_alt 0, 0, 1, 1, 9, 0 voice_square_2_alt 2, 0, 2, 6, 3 @@ -3838,7 +3838,7 @@ voicegroup_843A824:: @ 843A824 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 165 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3920,8 +3920,8 @@ voicegroup_843A824:: @ 843A824 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_843AE24:: @ 843AE24 - voice_keysplit_all voicegroup_842FEF8 +voicegroup044:: @ 843AE24 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3969,7 +3969,7 @@ voicegroup_843AE24:: @ 843AE24 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 204, 193, 239 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -3977,11 +3977,11 @@ voicegroup_843AE24:: @ 843AE24 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4051,8 +4051,8 @@ voicegroup_843AE24:: @ 843AE24 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_843B424:: @ 843B424 - voice_keysplit_all voicegroup_842FEF8 +voicegroup045:: @ 843B424 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4100,7 +4100,7 @@ voicegroup_843B424:: @ 843B424 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 193, 239 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4108,11 +4108,11 @@ voicegroup_843B424:: @ 843B424 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4142,9 +4142,9 @@ voicegroup_843B424:: @ 843B424 voice_square_2_alt 0, 0, 2, 4, 0 .align 2 -voicegroup_843B844:: @ 843B844 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup046:: @ 843B844 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4191,7 +4191,7 @@ voicegroup_843B844:: @ 843B844 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 193, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4199,11 +4199,11 @@ voicegroup_843B844:: @ 843B844 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4273,9 +4273,9 @@ voicegroup_843B844:: @ 843B844 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_843BE44:: @ 843BE44 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup047:: @ 843BE44 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4404,9 +4404,9 @@ voicegroup_843BE44:: @ 843BE44 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_843C444:: @ 843C444 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup048:: @ 843C444 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_2_alt 2, 1, 4, 4, 2 @@ -4453,7 +4453,7 @@ voicegroup_843C444:: @ 843C444 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 99 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4481,8 +4481,8 @@ voicegroup_843C444:: @ 843C444 voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 .align 2 -voicegroup_843C7BC:: @ 843C7BC - voice_keysplit_all voicegroup_842FEF8 +voicegroup049:: @ 843C7BC + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 3, 1, 2, 6, 0 voice_square_2 3, 1, 2, 6, 0 @@ -4530,7 +4530,7 @@ voicegroup_843C7BC:: @ 843C7BC voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 193, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4538,11 +4538,11 @@ voicegroup_843C7BC:: @ 843C7BC voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4612,9 +4612,9 @@ voicegroup_843C7BC:: @ 843C7BC voice_noise_alt 0, 0, 2, 0, 0 .align 2 -voicegroup_843CDBC:: @ 843CDBC - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup050:: @ 843CDBC + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4661,7 +4661,7 @@ voicegroup_843CDBC:: @ 843CDBC voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4743,8 +4743,8 @@ voicegroup_843CDBC:: @ 843CDBC voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_843D3BC:: @ 843D3BC - voice_keysplit_all voicegroup_842FEF8 +voicegroup051:: @ 843D3BC + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4792,7 +4792,7 @@ voicegroup_843D3BC:: @ 843D3BC voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4802,9 +4802,9 @@ voicegroup_843D3BC:: @ 843D3BC voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4874,8 +4874,8 @@ voicegroup_843D3BC:: @ 843D3BC voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_843D9BC:: @ 843D9BC - voice_keysplit_all voicegroup_842FEF8 +voicegroup052:: @ 843D9BC + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4923,7 +4923,7 @@ voicegroup_843D9BC:: @ 843D9BC voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 204, 193, 239 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -4931,11 +4931,11 @@ voicegroup_843D9BC:: @ 843D9BC voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5005,8 +5005,8 @@ voicegroup_843D9BC:: @ 843D9BC voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_843DFBC:: @ 843DFBC - voice_keysplit_all voicegroup_842FEF8 +voicegroup053:: @ 843DFBC + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5054,7 +5054,7 @@ voicegroup_843DFBC:: @ 843DFBC voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5066,7 +5066,7 @@ voicegroup_843DFBC:: @ 843DFBC voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5136,8 +5136,8 @@ voicegroup_843DFBC:: @ 843DFBC voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_843E5BC:: @ 843E5BC - voice_keysplit_all voicegroup_842FEF8 +voicegroup054:: @ 843E5BC + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5185,7 +5185,7 @@ voicegroup_843E5BC:: @ 843E5BC voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 193, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5267,8 +5267,8 @@ voicegroup_843E5BC:: @ 843E5BC voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_843EBBC:: @ 843EBBC - voice_keysplit_all voicegroup_842FEF8 +voicegroup055:: @ 843EBBC + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5324,9 +5324,9 @@ voicegroup_843EBBC:: @ 843EBBC voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5398,9 +5398,9 @@ voicegroup_843EBBC:: @ 843EBBC voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_843F1BC:: @ 843F1BC - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup056:: @ 843F1BC + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_2_alt 1, 1, 1, 6, 2 @@ -5447,7 +5447,7 @@ voicegroup_843F1BC:: @ 843F1BC voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 239 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5455,11 +5455,11 @@ voicegroup_843F1BC:: @ 843F1BC voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5490,9 +5490,9 @@ voicegroup_843F1BC:: @ 843F1BC voice_square_2_alt 3, 0, 1, 6, 2 .align 2 -voicegroup_843F5E8:: @ 843F5E8 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup057:: @ 843F5E8 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5539,7 +5539,7 @@ voicegroup_843F5E8:: @ 843F5E8 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 128, 226, 0, 38 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5547,11 +5547,11 @@ voicegroup_843F5E8:: @ 843F5E8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5621,8 +5621,8 @@ voicegroup_843F5E8:: @ 843F5E8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_843FBE8:: @ 843FBE8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup058:: @ 843FBE8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5678,7 +5678,7 @@ voicegroup_843FBE8:: @ 843FBE8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5752,8 +5752,8 @@ voicegroup_843FBE8:: @ 843FBE8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_84401E8:: @ 84401E8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup059:: @ 84401E8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5809,7 +5809,7 @@ voicegroup_84401E8:: @ 84401E8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5883,8 +5883,8 @@ voicegroup_84401E8:: @ 84401E8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_84407E8:: @ 84407E8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup060:: @ 84407E8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -5940,7 +5940,7 @@ voicegroup_84407E8:: @ 84407E8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6014,8 +6014,8 @@ voicegroup_84407E8:: @ 84407E8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_8440DE8:: @ 8440DE8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup061:: @ 8440DE8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6063,7 +6063,7 @@ voicegroup_8440DE8:: @ 8440DE8 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6075,7 +6075,7 @@ voicegroup_8440DE8:: @ 8440DE8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6145,9 +6145,9 @@ voicegroup_8440DE8:: @ 8440DE8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_84413E8:: @ 84413E8 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup062:: @ 84413E8 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6202,7 +6202,7 @@ voicegroup_84413E8:: @ 84413E8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6276,8 +6276,8 @@ voicegroup_84413E8:: @ 84413E8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_84419E8:: @ 84419E8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup063:: @ 84419E8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6407,9 +6407,9 @@ voicegroup_84419E8:: @ 84419E8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_8441FE8:: @ 8441FE8 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup064:: @ 8441FE8 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6464,7 +6464,7 @@ voicegroup_8441FE8:: @ 8441FE8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6538,9 +6538,9 @@ voicegroup_8441FE8:: @ 8441FE8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_84425E8:: @ 84425E8 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup065:: @ 84425E8 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6595,7 +6595,7 @@ voicegroup_84425E8:: @ 84425E8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6669,8 +6669,8 @@ voicegroup_84425E8:: @ 84425E8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_8442BE8:: @ 8442BE8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup066:: @ 8442BE8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6718,7 +6718,7 @@ voicegroup_8442BE8:: @ 8442BE8 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6728,7 +6728,7 @@ voicegroup_8442BE8:: @ 8442BE8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6800,8 +6800,8 @@ voicegroup_8442BE8:: @ 8442BE8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_84431E8:: @ 84431E8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup067:: @ 84431E8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6849,7 +6849,7 @@ voicegroup_84431E8:: @ 84431E8 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6857,7 +6857,7 @@ voicegroup_84431E8:: @ 84431E8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6931,8 +6931,8 @@ voicegroup_84431E8:: @ 84431E8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_84437E8:: @ 84437E8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup068:: @ 84437E8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -6988,11 +6988,11 @@ voicegroup_84437E8:: @ 84437E8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7062,9 +7062,9 @@ voicegroup_84437E8:: @ 84437E8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_8443DE8:: @ 8443DE8 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup069:: @ 8443DE8 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7111,7 +7111,7 @@ voicegroup_8443DE8:: @ 8443DE8 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7119,11 +7119,11 @@ voicegroup_8443DE8:: @ 8443DE8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7193,9 +7193,9 @@ voicegroup_8443DE8:: @ 8443DE8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_84443E8:: @ 84443E8 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup070:: @ 84443E8 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7242,7 +7242,7 @@ voicegroup_84443E8:: @ 84443E8 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7250,11 +7250,11 @@ voicegroup_84443E8:: @ 84443E8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7324,8 +7324,8 @@ voicegroup_84443E8:: @ 84443E8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_84449E8:: @ 84449E8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup071:: @ 84449E8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7455,9 +7455,9 @@ voicegroup_84449E8:: @ 84449E8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_8444FE8:: @ 8444FE8 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup072:: @ 8444FE8 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7504,7 +7504,7 @@ voicegroup_8444FE8:: @ 8444FE8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7512,11 +7512,11 @@ voicegroup_8444FE8:: @ 8444FE8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7586,8 +7586,8 @@ voicegroup_8444FE8:: @ 8444FE8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_84455E8:: @ 84455E8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup073:: @ 84455E8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7643,7 +7643,7 @@ voicegroup_84455E8:: @ 84455E8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7717,8 +7717,8 @@ voicegroup_84455E8:: @ 84455E8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_8445BE8:: @ 8445BE8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup074:: @ 8445BE8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7766,7 +7766,7 @@ voicegroup_8445BE8:: @ 8445BE8 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7848,8 +7848,8 @@ voicegroup_8445BE8:: @ 8445BE8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_84461E8:: @ 84461E8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup075:: @ 84461E8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7897,7 +7897,7 @@ voicegroup_84461E8:: @ 84461E8 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7909,7 +7909,7 @@ voicegroup_84461E8:: @ 84461E8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -7979,9 +7979,9 @@ voicegroup_84461E8:: @ 84461E8 voice_noise_alt 0, 0, 2, 0, 2 .align 2 -voicegroup_84467E8:: @ 84467E8 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup076:: @ 84467E8 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8028,7 +8028,7 @@ voicegroup_84467E8:: @ 84467E8 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8110,8 +8110,8 @@ voicegroup_84467E8:: @ 84467E8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_8446DE8:: @ 8446DE8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup077:: @ 8446DE8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8159,7 +8159,7 @@ voicegroup_8446DE8:: @ 8446DE8 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8171,7 +8171,7 @@ voicegroup_8446DE8:: @ 8446DE8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8241,14 +8241,14 @@ voicegroup_8446DE8:: @ 8446DE8 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_84473E8:: @ 84473E8 +voicegroup078:: @ 84473E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84473E8 - voice_keysplit voicegroup_8430204, KeySplitTable1 + voice_keysplit voicegroup002, KeySplitTable1 .align 2 -voicegroup_8447400:: @ 8447400 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup079:: @ 8447400 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8295,7 +8295,7 @@ voicegroup_8447400:: @ 8447400 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8303,11 +8303,11 @@ voicegroup_8447400:: @ 8447400 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8377,9 +8377,9 @@ voicegroup_8447400:: @ 8447400 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_8447A00:: @ 8447A00 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup080:: @ 8447A00 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8426,7 +8426,7 @@ voicegroup_8447A00:: @ 8447A00 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8436,9 +8436,9 @@ voicegroup_8447A00:: @ 8447A00 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8464,8 +8464,8 @@ voicegroup_8447A00:: @ 8447A00 voice_programmable_wave_alt ProgrammableWaveData_84553BC, 0, 2, 6, 1 .align 2 -voicegroup_8447DF0:: @ 8447DF0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup081:: @ 8447DF0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8513,7 +8513,7 @@ voicegroup_8447DF0:: @ 8447DF0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8525,7 +8525,7 @@ voicegroup_8447DF0:: @ 8447DF0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8595,8 +8595,8 @@ voicegroup_8447DF0:: @ 8447DF0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_84483F0:: @ 84483F0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup082:: @ 84483F0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8652,7 +8652,7 @@ voicegroup_84483F0:: @ 84483F0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8726,8 +8726,8 @@ voicegroup_84483F0:: @ 84483F0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_84489F0:: @ 84489F0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup083:: @ 84489F0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8775,7 +8775,7 @@ voicegroup_84489F0:: @ 84489F0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8783,11 +8783,11 @@ voicegroup_84489F0:: @ 84489F0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8857,8 +8857,8 @@ voicegroup_84489F0:: @ 84489F0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_8448FF0:: @ 8448FF0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup084:: @ 8448FF0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8914,11 +8914,11 @@ voicegroup_8448FF0:: @ 8448FF0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -8988,9 +8988,9 @@ voicegroup_8448FF0:: @ 8448FF0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_84495F0:: @ 84495F0 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup085:: @ 84495F0 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_2_alt 1, 1, 1, 6, 2 @@ -9037,7 +9037,7 @@ voicegroup_84495F0:: @ 84495F0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 239 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9045,11 +9045,11 @@ voicegroup_84495F0:: @ 84495F0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9119,8 +9119,8 @@ voicegroup_84495F0:: @ 84495F0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_8449BF0:: @ 8449BF0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup086:: @ 8449BF0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9168,7 +9168,7 @@ voicegroup_8449BF0:: @ 8449BF0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9180,7 +9180,7 @@ voicegroup_8449BF0:: @ 8449BF0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9250,8 +9250,8 @@ voicegroup_8449BF0:: @ 8449BF0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_844A1F0:: @ 844A1F0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup087:: @ 844A1F0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9381,9 +9381,9 @@ voicegroup_844A1F0:: @ 844A1F0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_844A7F0:: @ 844A7F0 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup088:: @ 844A7F0 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9430,7 +9430,7 @@ voicegroup_844A7F0:: @ 844A7F0 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9440,9 +9440,9 @@ voicegroup_844A7F0:: @ 844A7F0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9512,8 +9512,8 @@ voicegroup_844A7F0:: @ 844A7F0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_844ADF0:: @ 844ADF0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup089:: @ 844ADF0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9643,8 +9643,8 @@ voicegroup_844ADF0:: @ 844ADF0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_844B3F0:: @ 844B3F0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup090:: @ 844B3F0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9692,7 +9692,7 @@ voicegroup_844B3F0:: @ 844B3F0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9702,9 +9702,9 @@ voicegroup_844B3F0:: @ 844B3F0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9774,8 +9774,8 @@ voicegroup_844B3F0:: @ 844B3F0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_844B9F0:: @ 844B9F0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup091:: @ 844B9F0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9823,7 +9823,7 @@ voicegroup_844B9F0:: @ 844B9F0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9831,11 +9831,11 @@ voicegroup_844B9F0:: @ 844B9F0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -9905,8 +9905,8 @@ voicegroup_844B9F0:: @ 844B9F0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_844BFF0:: @ 844BFF0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup092:: @ 844BFF0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10036,8 +10036,8 @@ voicegroup_844BFF0:: @ 844BFF0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_844C5F0:: @ 844C5F0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup093:: @ 844C5F0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10093,7 +10093,7 @@ voicegroup_844C5F0:: @ 844C5F0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10167,9 +10167,9 @@ voicegroup_844C5F0:: @ 844C5F0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_844CBF0:: @ 844CBF0 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup094:: @ 844CBF0 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10226,9 +10226,9 @@ voicegroup_844CBF0:: @ 844CBF0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10298,8 +10298,8 @@ voicegroup_844CBF0:: @ 844CBF0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_844D1F0:: @ 844D1F0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup095:: @ 844D1F0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10355,9 +10355,9 @@ voicegroup_844D1F0:: @ 844D1F0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10429,8 +10429,8 @@ voicegroup_844D1F0:: @ 844D1F0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_844D7F0:: @ 844D7F0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup096:: @ 844D7F0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10486,7 +10486,7 @@ voicegroup_844D7F0:: @ 844D7F0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10560,8 +10560,8 @@ voicegroup_844D7F0:: @ 844D7F0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_844DDF0:: @ 844DDF0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup097:: @ 844DDF0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10617,7 +10617,7 @@ voicegroup_844DDF0:: @ 844DDF0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10691,9 +10691,9 @@ voicegroup_844DDF0:: @ 844DDF0 voice_noise_alt 0, 0, 1, 0, 0 .align 2 -voicegroup_844E3F0:: @ 844E3F0 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup098:: @ 844E3F0 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1_alt 0, 1, 1, 5, 2, 4 @@ -10740,7 +10740,7 @@ voicegroup_844E3F0:: @ 844E3F0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 239 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10748,11 +10748,11 @@ voicegroup_844E3F0:: @ 844E3F0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10804,7 +10804,7 @@ voicegroup_844E3F0:: @ 844E3F0 voice_square_2_alt 0, 1, 1, 6, 1 .align 2 -voicegroup_844E918:: @ 844E918 +voicegroup099:: @ 844E918 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10889,8 +10889,8 @@ voicegroup_844E918:: @ 844E918 voice_square_2_alt 2, 0, 6, 0, 6 .align 2 -voicegroup_844ECF0:: @ 844ECF0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup100:: @ 844ECF0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10938,7 +10938,7 @@ voicegroup_844ECF0:: @ 844ECF0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10946,11 +10946,11 @@ voicegroup_844ECF0:: @ 844ECF0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -10974,8 +10974,8 @@ voicegroup_844ECF0:: @ 844ECF0 voice_programmable_wave_alt ProgrammableWaveData_84553DC, 0, 7, 15, 2 .align 2 -voicegroup_844F0C8:: @ 844F0C8 - voice_keysplit_all voicegroup_842FEF8 +voicegroup101:: @ 844F0C8 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11023,7 +11023,7 @@ voicegroup_844F0C8:: @ 844F0C8 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11033,9 +11033,9 @@ voicegroup_844F0C8:: @ 844F0C8 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_843087C, KeySplitTable4 + voice_keysplit voicegroup005, KeySplitTable4 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11068,9 +11068,9 @@ voicegroup_844F0C8:: @ 844F0C8 voice_directsound 60, 0, DirectSoundWaveData_SC88_JPSuperSaw, 255, 0, 255, 127 .align 2 -voicegroup_844F50C:: @ 844F50C - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup102:: @ 844F50C + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_2 0, 0, 2, 4, 1 @@ -11117,7 +11117,7 @@ voicegroup_844F50C:: @ 844F50C voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound_no_resample 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale1, 255, 246, 0, 226 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11125,11 +11125,11 @@ voicegroup_844F50C:: @ 844F50C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11162,9 +11162,9 @@ voicegroup_844F50C:: @ 844F50C voice_programmable_wave_alt ProgrammableWaveData_845541C, 0, 7, 15, 2 .align 2 -voicegroup_844F950:: @ 844F950 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup103:: @ 844F950 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_2 2, 0, 2, 6, 1 @@ -11211,7 +11211,7 @@ voicegroup_844F950:: @ 844F950 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11219,11 +11219,11 @@ voicegroup_844F950:: @ 844F950 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11256,9 +11256,9 @@ voicegroup_844F950:: @ 844F950 voice_programmable_wave_alt ProgrammableWaveData_845541C, 0, 7, 15, 2 .align 2 -voicegroup_844FD94:: @ 844FD94 - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup104:: @ 844FD94 + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11305,7 +11305,7 @@ voicegroup_844FD94:: @ 844FD94 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11313,11 +11313,11 @@ voicegroup_844FD94:: @ 844FD94 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11345,8 +11345,8 @@ voicegroup_844FD94:: @ 844FD94 voice_square_1 0, 0, 0, 0, 7, 1 .align 2 -voicegroup_845019C:: @ 845019C - voice_keysplit_all voicegroup_842FEF8 +voicegroup105:: @ 845019C + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11394,7 +11394,7 @@ voicegroup_845019C:: @ 845019C voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11406,7 +11406,7 @@ voicegroup_845019C:: @ 845019C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11432,8 +11432,8 @@ voicegroup_845019C:: @ 845019C voice_square_1 0, 3, 0, 0, 9, 1 .align 2 -voicegroup_845058C:: @ 845058C - voice_keysplit_all voicegroup_842FEF8 +voicegroup106:: @ 845058C + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11481,7 +11481,7 @@ voicegroup_845058C:: @ 845058C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11489,11 +11489,11 @@ voicegroup_845058C:: @ 845058C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11563,9 +11563,9 @@ voicegroup_845058C:: @ 845058C voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 255, 246, 0, 216 .align 2 -voicegroup_8450B8C:: @ 8450B8C - voice_keysplit_all voicegroup_842FEF8 - voice_keysplit voicegroup_8430204, KeySplitTable1 +voicegroup107:: @ 8450B8C + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup002, KeySplitTable1 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_2 2, 0, 2, 3, 1 @@ -11612,7 +11612,7 @@ voicegroup_8450B8C:: @ 8450B8C voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11620,11 +11620,11 @@ voicegroup_8450B8C:: @ 8450B8C voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11653,8 +11653,8 @@ voicegroup_8450B8C:: @ 8450B8C voice_square_2 3, 0, 2, 7, 1 .align 2 -voicegroup_8450FA0:: @ 8450FA0 - voice_keysplit_all voicegroup_842FEF8 +voicegroup108:: @ 8450FA0 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11702,7 +11702,7 @@ voicegroup_8450FA0:: @ 8450FA0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11710,11 +11710,11 @@ voicegroup_8450FA0:: @ 8450FA0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11740,8 +11740,8 @@ voicegroup_8450FA0:: @ 8450FA0 voice_square_1 0, 3, 0, 0, 7, 1 .align 2 -voicegroup_8451390:: @ 8451390 - voice_keysplit_all voicegroup_842FEF8 +voicegroup109:: @ 8451390 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11789,7 +11789,7 @@ voicegroup_8451390:: @ 8451390 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11797,11 +11797,11 @@ voicegroup_8451390:: @ 8451390 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430258, KeySplitTable3 + voice_keysplit voicegroup004, KeySplitTable3 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 - voice_keysplit voicegroup_8430894, KeySplitTable5 + voice_keysplit voicegroup006, KeySplitTable5 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11871,7 +11871,7 @@ voicegroup_8451390:: @ 8451390 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 255, 246, 0, 216 .align 2 -voicegroup_8451990:: @ 8451990 +voicegroup110:: @ 8451990 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare4, 255, 249, 103, 165 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -11920,7 +11920,7 @@ voicegroup_8451990:: @ 8451990 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 - voice_keysplit voicegroup_8430234, KeySplitTable2 + voice_keysplit voicegroup003, KeySplitTable2 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 @@ -12002,7 +12002,7 @@ voicegroup_8451990:: @ 8451990 voice_noise_alt 0, 0, 1, 0, 1 .align 2 -voicegroup_8451F90:: @ 8451F90 +voicegroup111:: @ 8451F90 voice_directsound_no_resample 60, 0, DirectSoundWaveData_Ring, 255, 249, 0, 165 voice_directsound_alt 60, 0, DirectSoundWaveData_Ring, 255, 0, 255, 165 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare4, 255, 0, 255, 165 @@ -12133,7 +12133,7 @@ voicegroup_8451F90:: @ 8451F90 voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel6, 255, 0, 255, 165 .align 2 -voicegroup_8452590:: @ 8452590 +gCryTable:: @ 8452590 cry Cry_Bulbasaur cry Cry_Ivysaur cry Cry_Venusaur @@ -12262,9 +12262,6 @@ voicegroup_8452590:: @ 8452590 cry Cry_Magmar cry Cry_Pinsir cry Cry_Tauros - - .align 2 -voicegroup_8452B90:: @ 8452B90 cry Cry_Magikarp cry Cry_Gyarados cry Cry_Lapras @@ -12393,9 +12390,6 @@ voicegroup_8452B90:: @ 8452B90 cry Cry_Torkoal cry Cry_Electrike cry Cry_Manectric - - .align 2 -voicegroup_8453190:: @ 8453190 cry Cry_Duskull cry Cry_Latias cry Cry_Wynaut @@ -12524,16 +12518,13 @@ voicegroup_8453190:: @ 8453190 cry Cry_Wailord cry Cry_Whismur cry Cry_Snorunt - - .align 2 -voicegroup_8453790:: @ 8453790 cry Cry_Latios cry Cry_Jirachi cry Cry_Deoxys cry Cry_Chimecho .align 2 -voicegroup_84537C0:: @ 84537C0 +gCryTable2:: @ 84537C0 cry2 Cry_Bulbasaur cry2 Cry_Ivysaur cry2 Cry_Venusaur @@ -12662,9 +12653,6 @@ voicegroup_84537C0:: @ 84537C0 cry2 Cry_Magmar cry2 Cry_Pinsir cry2 Cry_Tauros - - .align 2 -voicegroup_8453DC0:: @ 8453DC0 cry2 Cry_Magikarp cry2 Cry_Gyarados cry2 Cry_Lapras @@ -12793,9 +12781,6 @@ voicegroup_8453DC0:: @ 8453DC0 cry2 Cry_Torkoal cry2 Cry_Electrike cry2 Cry_Manectric - - .align 2 -voicegroup_84543C0:: @ 84543C0 cry2 Cry_Duskull cry2 Cry_Latias cry2 Cry_Wynaut @@ -12924,16 +12909,13 @@ voicegroup_84543C0:: @ 84543C0 cry2 Cry_Wailord cry2 Cry_Whismur cry2 Cry_Snorunt - - .align 2 -voicegroup_84549C0:: @ 84549C0 cry2 Cry_Latios cry2 Cry_Jirachi cry2 Cry_Deoxys cry2 Cry_Chimecho .align 2 -voicegroup_84549F0:: @ 84549F0 +voicegroup112:: @ 84549F0 voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel7, 255, 0, 255, 0 voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel8, 255, 0, 255, 0 voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel9, 255, 0, 255, 0 @@ -12987,8 +12969,8 @@ voicegroup_84549F0:: @ 84549F0 voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel57, 255, 0, 255, 0 .align 2 -voicegroup_8454C54:: @ 8454C54 - voice_keysplit_all voicegroup_842FEF8 +voicegroup113:: @ 8454C54 + voice_keysplit_all voicegroup001 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 voice_square_1 0, 2, 0, 0, 15, 0 diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk new file mode 100755 index 000000000..a2097cb7e --- /dev/null +++ b/spritesheet_rules.mk @@ -0,0 +1,578 @@ +EVENTOBJGFXDIR := graphics/event_objects/pics +FIELDEFFGFXDIR := graphics/field_effect_objects/pics + +$(EVENTOBJGFXDIR)/berry_trees/aguav.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/aspear.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/cheri.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/chesto.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/cornn.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/durin.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/figy.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/grepa.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/hondew.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/iapapa.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/kelpsy.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/lansat.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/leppa.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/liechi.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/lum.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/mago.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/nomel.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/oran.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/pamtre.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/pecha.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/persim.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/pomeg.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/rabuta.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/rawst.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/razz.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/sitrus.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/spelon.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/sprout.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/berry_trees/tamato.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/wepear.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/wiki.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + + +$(EVENTOBJGFXDIR)/misc/breakable_rock.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/misc/cuttable_tree.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/misc/mr_brineys_boat.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + + +$(EVENTOBJGFXDIR)/people/brendan/acro_bike.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brendan/field_move.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brendan/fishing.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brendan/mach_bike.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brendan/normal.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brendan/surfing.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brendan/underwater.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brendan/watering.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + + +$(EVENTOBJGFXDIR)/people/may/acro_bike.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/may/field_move.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/may/fishing.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/may/mach_bike.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/may/normal.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/may/surfing.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/may/underwater.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/may/watering.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + + +$(EVENTOBJGFXDIR)/people/aqua_member_f.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/aqua_member_m.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/archie.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/artist.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/beauty.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/boy_1.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/boy_4.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/boy_5.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brawly.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/camper.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/contest_judge.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/cook.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/cycling_triathlete_f.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/cycling_triathlete_m.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/drake.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/fat_man.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/fisherman.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/flannery.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/gentleman.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/girl_1.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/girl_2.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/girl_3.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/glacia.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/hex_maniac.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/hiker.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/hot_springs_old_woman.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/lass.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/little_boy_1.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/people/little_boy_2.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/people/little_boy_3.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/people/little_girl_1.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/little_girl_2.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/people/liza.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/magma_member_f.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/magma_member_m.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/man_1.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/man_2.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/man_3.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/man_4.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/man_5.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/man_6.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/man_7.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/maniac.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/mart_employee.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/mauville_old_man_1.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/mauville_old_man_2.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/maxie.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/mom.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/norman.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/nurse.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/old_man_1.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/old_man_2.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/old_woman_1.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/old_woman_2.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/phoebe.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/prof_birch.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/psychic_m.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/quinty_plump.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/reporter_f.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/reporter_m.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/rooftop_sale_woman.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/roxanne.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/running_triathlete_f.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/running_triathlete_m.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/sailor.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/school_kid_m.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/scientist_1.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/scientist_2.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/sidney.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/steven.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/swimmer_f.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/swimmer_m.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/tate.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/teala.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/tuber_f.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/people/tuber_m.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/people/tuber_m_swimming.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/people/wallace.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/wally.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/wattson.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/winona.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/woman_4.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/woman_6.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/woman_7.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/woman_8.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/youngster.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + + +$(EVENTOBJGFXDIR)/pokemon/azumarill.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/pokemon/azurill.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/pokemon/groudon.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/kecleon.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/pokemon/kyogre.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/latias_latios.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/machoke_carrying_box.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/machoke_facing_away.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/pikachu.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/pokemon/poochyena.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/rayquaza.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/skitty.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/pokemon/wingull.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/pokemon/zigzagoon.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + + +$(FIELDEFFGFXDIR)/arrow.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/ash.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/berry_tree_growth_sparkle.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/bike_tire_tracks.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/bubbles.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(FIELDEFFGFXDIR)/deep_sand_footprints.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/dust.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 1 + +$(FIELDEFFGFXDIR)/jump_big_splash.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/jump_long_grass.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/jump_small_splash.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 1 + +$(FIELDEFFGFXDIR)/jump_tall_grass.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 1 + +$(FIELDEFFGFXDIR)/lavaridge_gym_warp.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/long_grass.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/mountain_disguise.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(FIELDEFFGFXDIR)/pop_out_of_ash.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/ripple.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/sand_disguise.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(FIELDEFFGFXDIR)/sand_footprints.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/sand_pile.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 1 + +$(FIELDEFFGFXDIR)/short_grass.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/sparkle.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/splash.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 1 + +$(FIELDEFFGFXDIR)/surf_blob.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 + +$(FIELDEFFGFXDIR)/tall_grass.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/tree_disguise.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 4 + +$(FIELDEFFGFXDIR)/unknown_17.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/unknown_18.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/unknown_19.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/unknown_20.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 + +$(FIELDEFFGFXDIR)/unused_grass.4bpp: %.4bpp: %.png + $(GBAGFX) $< $@ -mwidth 2 -mheight 2 diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c index 35022db1f..5c2f3a357 100644 --- a/src/battle/anim/flying.c +++ b/src/battle/anim/flying.c @@ -4,11 +4,16 @@ #include "palette.h" #include "rom_8077ABC.h" #include "trig.h" +#include "main.h" +#include "random.h" extern s16 gBattleAnimArgs[]; extern u8 gAnimBankAttacker; extern u8 gAnimBankTarget; extern u8 gAnimVisualTaskCount; +extern struct OamMatrix gOamMatrices[]; +extern u8 gBanksBySide[]; +extern const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB538; void sub_80785E4(struct Sprite *sprite); void sub_80DA034(struct Sprite *sprite); @@ -21,16 +26,24 @@ void sub_80DA348(struct Sprite *sprite); void sub_80DA38C(struct Sprite *sprite); void sub_80DA4D8(struct Sprite *sprite); void sub_80DA410(struct Sprite *sprite); +void sub_80DA6F0(struct Sprite *sprite); void sub_80DAD30(struct Sprite *sprite); void sub_80DAD84(struct Sprite *sprite); +void sub_80DAF0C(struct Sprite *sprite); void sub_80DB000(struct Sprite *sprite); +void sub_80DB0A0(struct Sprite *sprite); void sub_80DB194(struct Sprite *sprite); void sub_80DB1F4(struct Sprite *sprite); void sub_80DB288(struct Sprite *sprite); +void sub_80DB2D0(struct Sprite *sprite); +void sub_80DB330(struct Sprite *sprite); void sub_80DB374(struct Sprite *sprite); void sub_80DB458(struct Sprite *sprite); +void sub_80DB508(struct Sprite *sprite); void sub_80DB564(struct Sprite *sprite); +void sub_80DB578(struct Sprite *sprite); void sub_80DB5E4(struct Sprite *sprite); +void sub_80DB6A0(struct Sprite *sprite); void sub_80DA0DC(u8 taskId); @@ -104,7 +117,7 @@ const union AffineAnimCmd gSpriteAffineAnim_83DA3FC[] = const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA424[] = { - gSpriteAffineAnim_83DA3FC, + gSpriteAffineAnim_83DA3FC, }; const union AffineAnimCmd gSpriteAffineAnim_83DA428[] = @@ -356,7 +369,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA65C = .callback = sub_80DB5E4, }; -void sub_80DA034(struct Sprite *sprite) +void sub_80DA034(struct Sprite *sprite) { sub_8078764(sprite, 0); sprite->pos1.y += 20; @@ -365,18 +378,16 @@ void sub_80DA034(struct Sprite *sprite) sub_80DA05C(sprite); } -void sub_80DA05C(struct Sprite *sprite) -{ +void sub_80DA05C(struct Sprite *sprite) { sprite->pos2.x = Sin(sprite->data[1], 0x20); sprite->pos2.y = Cos(sprite->data[1], 0x8); sprite->data[1] = (sprite->data[1] + 5) & 0xFF; - if(++sprite->data[0] == 0x47) - { + if (++sprite->data[0] == 0x47) { DestroyAnimSprite(sprite); } } -void sub_80DA09C(u8 taskId) +void sub_80DA09C(u8 taskId) { gTasks[taskId].data[0] = gBattleAnimArgs[1]; gTasks[taskId].data[1] = gBattleAnimArgs[0]; @@ -384,113 +395,45 @@ void sub_80DA09C(u8 taskId) gTasks[taskId].func = sub_80DA0DC; } -#ifdef NONMATCHING void sub_80DA0DC(u8 taskId) { - gTasks[taskId].data[10]++; - if(gTasks[taskId].data[10] == gTasks[taskId].data[1]) + u8 data2; + u16 temp; + int i, base; + + if (gTasks[taskId].data[10]++ == gTasks[taskId].data[1]) { - u16 r0; - u16 r2; - s32 i; - gTasks[taskId].data[10] = 0; - r0 = gTasks[taskId].data[2]; - r2 = gPlttBufferFaded[r0 * 8]; - for(i = 0; i < 8; i++) - gPlttBufferFaded[r0 * 8 + i + 0x107] = gPlttBufferFaded[r0 * 8 + i + 0x107]; - gTasks[taskId].data[2] = ((r0 + 0x101) * 2) + r2; + + data2 = gTasks[taskId].data[2]; + temp = gPlttBufferFaded[16 * data2 + 0x108]; + + i = 7; + base = data2 * 16; + + do + { + gPlttBufferFaded[base + 0x101 + i] = gPlttBufferFaded[base + 0x100 + i]; + i--; + } + while (i > 0); + + gPlttBufferFaded[base + 0x101] = temp; } - gTasks[taskId].data[0] = gTasks[taskId].data[0] * 32; - if(gTasks[taskId].data[0] == 0) + + if (--gTasks[taskId].data[0] == 0) { DestroyAnimVisualTask(taskId); } } -#else -NAKED -void sub_80DA0DC(u8 taskId) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - ldr r2, _080DA15C @ =gTasks\n\ - lsls r0, r5, 2\n\ - adds r0, r5\n\ - lsls r0, 3\n\ - adds r3, r0, r2\n\ - ldrh r0, [r3, 0x1C]\n\ - adds r1, r0, 0x1\n\ - strh r1, [r3, 0x1C]\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - movs r4, 0xA\n\ - ldrsh r1, [r3, r4]\n\ - adds r7, r2, 0\n\ - cmp r0, r1\n\ - bne _080DA13A\n\ - movs r0, 0\n\ - strh r0, [r3, 0x1C]\n\ - ldrb r0, [r3, 0xC]\n\ - ldr r2, _080DA160 @ =gPlttBufferFaded\n\ - lsls r0, 4\n\ - movs r3, 0x84\n\ - lsls r3, 1\n\ - adds r1, r0, r3\n\ - lsls r1, 1\n\ - adds r1, r2\n\ - ldrh r6, [r1]\n\ - movs r4, 0x7\n\ - mov r12, r0\n\ - ldr r0, _080DA164 @ =0x00000107\n\ - add r0, r12\n\ - lsls r0, 1\n\ - adds r3, r0, r2\n\ -_080DA122:\n\ - ldrh r0, [r3]\n\ - strh r0, [r1]\n\ - subs r3, 0x2\n\ - subs r1, 0x2\n\ - subs r4, 0x1\n\ - cmp r4, 0\n\ - bgt _080DA122\n\ - ldr r0, _080DA168 @ =0x00000101\n\ - add r0, r12\n\ - lsls r0, 1\n\ - adds r0, r2\n\ - strh r6, [r0]\n\ -_080DA13A:\n\ - lsls r0, r5, 2\n\ - adds r0, r5\n\ - lsls r0, 3\n\ - adds r0, r7\n\ - ldrh r1, [r0, 0x8]\n\ - subs r1, 0x1\n\ - strh r1, [r0, 0x8]\n\ - lsls r1, 16\n\ - cmp r1, 0\n\ - bne _080DA154\n\ - adds r0, r5, 0\n\ - bl DestroyAnimVisualTask\n\ -_080DA154:\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080DA15C: .4byte gTasks\n\ -_080DA160: .4byte gPlttBufferFaded\n\ -_080DA164: .4byte 0x00000107\n\ -_080DA168: .4byte 0x00000101\n\ - .syntax divided\n"); -} -#endif void sub_80DA16C(struct Sprite *sprite) { InitAnimSpritePos(sprite, 1); if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + } sprite->data[0] = gBattleAnimArgs[4]; sprite->data[1] = sprite->pos1.x; sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; @@ -605,14 +548,14 @@ void sub_80DA410(struct Sprite *sprite) sprite->data[0] = 1; TranslateAnimLinear(sprite); - if (((u16)sprite->data[3] >> 8) > 200) + if (((u16) sprite->data[3] >> 8) > 200) { sprite->pos1.x += sprite->pos2.x; sprite->pos2.x = 0; sprite->data[3] &= 0xFF; } - if ((u32)(sprite->pos1.x + sprite->pos2.x + 32) > 304 || sprite->pos1.y + sprite->pos2.y > 160) + if ((u32) (sprite->pos1.x + sprite->pos2.x + 32) > 304 || sprite->pos1.y + sprite->pos2.y > 160) { gSprites[GetAnimBattlerSpriteId(0)].invisible = 0; DestroyAnimSprite(sprite); @@ -628,8 +571,2106 @@ void sub_80DA48C(struct Sprite *sprite) FreeOamMatrix(sprite->oam.matrixNum); sprite->oam.affineMode = 0; } - + DestroySprite(sprite); gAnimVisualTaskCount--; } } + +// FAKEMATCHING +void sub_80DA4D8(struct Sprite *sprite) +{ + s16 *data; + u8 slot; + s16 spriteCoord; + int t1, t2; + u32 arg2; + u32 matrixNum; + u8 sinIndex; + register s16 sinVal asm ("r4"); + register int sinVal2 asm ("r0"); + + data = sprite->data; + + if (gBattleAnimArgs[7] & 0x100) + { + slot = gAnimBankAttacker; + } + else + { + slot = gAnimBankTarget; + } + + if (GetBattlerSide(slot) == 0) + { + gBattleAnimArgs[0] = -gBattleAnimArgs[0]; + } + + sprite->pos1.x = GetBattlerSpriteCoord(slot, 0) + gBattleAnimArgs[0]; + spriteCoord = GetBattlerSpriteCoord(slot, 1); + sprite->pos1.y = spriteCoord + gBattleAnimArgs[1]; + data[4] = sprite->pos1.y << 8; + + t1 = (spriteCoord + (u16) gBattleAnimArgs[6]) << 1; + data[7] = (data[7] & 1) | t1; + ((u8 *) data)[0] |= 4; + + arg2 = (u16) gBattleAnimArgs[2]; + data[1] = (u8) gBattleAnimArgs[2]; + arg2 <<= 16; + data[5] = arg2 >> 24; + data[2] = gBattleAnimArgs[3]; + data[3] = gBattleAnimArgs[4]; + data[6] = gBattleAnimArgs[5]; + + if ((u16) (data[1] - 64) <= 0x7f) + { + if (gMain.inBattle) + { + sprite->oam.priority = sub_8079ED4(slot) + 1; + } + else + { + sprite->oam.priority = sub_8079ED4(slot); + } + + ((u8 *) data)[14] = data[7] & -2; + + if (!(data[2] & 0x8000)) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + + sprite->animBeginning = 1; + sprite->animEnded = 0; + } + } + else + { + sprite->oam.priority = sub_8079ED4(slot); + ((u8 *) data)[14] |= 1; + + if (data[2] & 0x8000) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + + sprite->animBeginning = 1; + sprite->animEnded = 0; + } + } + + t2 = (u16) data[1] >> 6 << 4; + ((u8 *) data)[0] = (15 & data[0]) | t2; + + sprite->pos2.x = (gSineTable[(u16) data[1]] * (u8) data[6]) >> 8; + + matrixNum = sprite->oam.matrixNum; + + sinIndex = (-sprite->pos2.x >> 1) + data[5]; + sinVal = gSineTable[sinIndex]; + + gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64]; + gOamMatrices[matrixNum].b = sinVal; + sinVal2 = -sinVal; + gOamMatrices[matrixNum].c = sinVal2; + + sprite->callback = sub_80DA6F0; +} + +#ifdef NONMATCHING +void sub_80DA6F0(struct Sprite * sprite) +{ + // (Probably) Functionally equivalent + + struct dataStruct { + u8 one:1; + u8 two:1; + u8 three:1; + u8 four:1; + u8 fiveeight:4; + }; + + u8 zero; + s16 * data; + u8 * dataByte; + + u16 r8; + u32 matrixNum; + u8 sinIndex; + s16 sinVal; + + zero = 0; + data = sprite->data; + dataByte = (u8 *)data; + + if (dataByte[0] & 1) + { + u32 t1; + + t1 = dataByte[1]; + dataByte[1] += 0xff; + + t1 <<= 24; + if (t1 == 0) + { + // 080da724 + ((struct dataStruct *)dataByte)[0].one = 0; + dataByte[1] = zero; + } + + } + else + { + // 080da730 + u16 tData; + u16 t2; + + tData = data[1]; + t2 = tData >> 6; + r8 = tData; + + switch (t2) + { + case (0): + // 080da756 + + if (dataByte[0] >> 4 == 1) + { + dataByte[0] |= 8; + dataByte[0] |= 1; + dataByte[1] = zero; + } + else if (dataByte[0] >> 4 == 3) + { + /*080da76c*/ + ((struct dataStruct *)dataByte)[0].two ^= 1; + ((struct dataStruct *)dataByte)[0].one = 1; + dataByte[1] = zero; + } + else + { + // 080da790 + if (dataByte[0] & 8) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + sprite->animBeginning = 1; + sprite->animEnded = 0; + + if ((dataByte)[0] & 4) + { + u8 b; + if (gMain.inBattle) + { + if (!(dataByte[14] & 1)) + { + sprite->oam.priority -= 1; + } + else + { + // 080da814 + sprite->oam.priority += 1; + } + } + else + { + // 080da82e + if (!(dataByte[14] & 1)) + { + sprite->subpriority -= 12; + } + else + { + // 080da85c + sprite->subpriority += 12; + } + } + b = (((u32)(dataByte[14] << 31) >> 31) ^ 1) & 1; + dataByte[14] = (dataByte[14] & -2) | b; + } + // 080da87a + ((struct dataStruct *)dataByte)[0].four = 0; + r8 = data[1]; + } + } + + // 080da88a + dataByte[0] &= 15; + // 080dac52 + break; + case (1): + // 080da896 + if (dataByte[0] >> 4 == 0) + { + dataByte[0] |= 8; + dataByte[0] |= 1; + dataByte[1] = zero; + } + else/*080da8ac*/if (dataByte[0] >> 4 == 2) + { + dataByte[0] |= 1; + dataByte[1] = zero; + } + else + { + // 080da8be + if (dataByte[0] & 8) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + sprite->animBeginning = 1; + sprite->animEnded = 0; + + if (dataByte[0] & 4) + { + u8 b; + if (gMain.inBattle) + { + if (!(dataByte[14] & 1)) + { + sprite->oam.priority -= 1; + } + else + { + // 080da948 + sprite->oam.priority += 1; + } + } + else + { + // 080da962 + if (!(dataByte[14] & 1)) + { + sprite->subpriority -=12; + } + else + { + // 080da98c + sprite->subpriority += 12; + } + } + // 080da978 + 080da996 + b = (((u32)(dataByte[14] << 31) >> 31) ^ 1) & 1; + dataByte[14] = (dataByte[14] & -2) | b; + } + // 080da9ac + ((struct dataStruct *)dataByte)[0].four = 0; + r8 = data[1]; + } + } + // 080da9bc + dataByte[0] &= 15; + dataByte[0] |= 16; + // 080dac52 + break; + case (2): + // 080da9c8 + if (dataByte[0] >> 4 == 3) + { + dataByte[0] |= 8; + dataByte[0] |= 1; + dataByte[1] = zero; + } + else/*080da9de*/if (dataByte[0] >> 4 == 1) + { + dataByte[0] |= 1; + dataByte[1] = zero; + } + else + { + // 080da9f0 + if (dataByte[0] & 8) + { + // 080da9fa + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + sprite->animBeginning = 1; + sprite->animEnded = 0; + + if (dataByte[0] & 4) + { + u8 b; + if (gMain.inBattle) + { + if (!(dataByte[14] & 1)) + { + sprite->oam.priority -= 1; + } + else + { + // 080daa74 + sprite->oam.priority += 1; + } + } + else + { + // 080daaa4 + if (!(dataByte[14] & 1)) + { + sprite->subpriority -= 12; + } + else + { + // 080daace + sprite->subpriority += 12; + } + } + b = (((u32)(dataByte[14] << 31) >> 31) ^ 1) & 1; + dataByte[14] = (dataByte[14] & -2) | b; + } + // 080daaec + ((struct dataStruct *)dataByte)[0].four = 0; + r8 = data[1]; + } + } + // 080daafe + dataByte[0] &= 15; + dataByte[0] |= 32; + // 080dac52 + break; + case (3): + // 080dab0e + if (dataByte[0] >> 4 == 2) + { + dataByte[0] |= 8; + // 080dac42 + } + else/*080dab20*/if (dataByte[0] >> 4 == 0) + { + ((struct dataStruct *)dataByte)[0].two ^= 1; + ((struct dataStruct *)dataByte)[0].one = 1; + dataByte[1] = zero; + // 080dac42 + } + else + { + // 080dab44 + if (dataByte[0] & 8) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + sprite->animBeginning = 1; + sprite->animEnded = 0; + + if (dataByte[0] & 4) + { + u8 b; + if (gMain.inBattle) + { + if (!(dataByte[14] & 1)) + { + sprite->oam.priority -= 1; + } + else + { + // 080dabcc + sprite->oam.priority += 1; + } + } + else + { + // 080dabe6 + if (!(dataByte[14] & 1)) + { + sprite->subpriority -= 12; + } + else + { + // 080dac14 + sprite->subpriority += 12; + } + } + // 080dac00 + 080dac1e + b = (((u32)(dataByte[14]) << 31 >> 31) ^ 1) & 1; + dataByte[14] = (-2 & dataByte[14]) | b; + } + // 080dac32 + ((struct dataStruct *)dataByte)[0].four = 0; + r8 = data[1]; + } + } + // 080dac42 + dataByte[0] &= 15; + dataByte[0] |= 48; + break; + } + + // 080dac52 + + sprite->pos2.x = (dataByte[12 + ((struct dataStruct *)dataByte)[0].two] * gSineTable[r8]) >> 8; + + matrixNum = sprite->oam.matrixNum; + + sinIndex = (-sprite->pos2.x >> 1) + dataByte[10]; + sinVal = gSineTable[sinIndex]; + + gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64]; + gOamMatrices[matrixNum].b = sinVal; + gOamMatrices[matrixNum].c = -sinVal; + + data[4] += data[3]; + + sprite->pos1.y = (u16)data[4] >> 8; + + if (data[2] & (0x80 << 8)) + { + data[1] = (data[1] - (data[2] & ((0x80 << 8) - 1))) & 0xff; + } + else + { + // 080dace8 + data[1] = ((data[2] & 0x7fff) + data[1]) & 0xff; + } + // 080dacfe + if (sprite->pos1.y + sprite->pos2.y >= (u16)data[7] / 2) + { + sprite->data[0] = 0; + sprite->callback = sub_80DA48C; + } + } +} +#else +NAKED +void sub_80DA6F0(struct Sprite *sprite) +{ + asm_unified("push {r4-r7,lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6,r7}\n\ + adds r5, r0, 0\n\ + movs r6, 0\n\ + movs r0, 0x2E\n\ + adds r0, r5\n\ + mov r12, r0\n\ + ldrb r2, [r0]\n\ + movs r7, 0x1\n\ + movs r1, 0x1\n\ + mov r9, r1\n\ + mov r0, r9\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _080DA730\n\ + mov r3, r12\n\ + ldrb r0, [r3, 0x1]\n\ + adds r1, r0, 0\n\ + adds r1, 0xFF\n\ + strb r1, [r3, 0x1]\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _080DA724\n\ + b _080DAD1A\n\ +_080DA724:\n\ + movs r0, 0x2\n\ + negs r0, r0\n\ + ands r0, r2\n\ + strb r0, [r3]\n\ + strb r6, [r3, 0x1]\n\ + b _080DAD1A\n\ +_080DA730:\n\ + mov r4, r12\n\ + ldrh r0, [r4, 0x2]\n\ + lsrs r4, r0, 6\n\ + mov r8, r0\n\ + cmp r4, 0x1\n\ + bne _080DA73E\n\ + b _080DA896\n\ +_080DA73E:\n\ + cmp r4, 0x1\n\ + bgt _080DA748\n\ + cmp r4, 0\n\ + beq _080DA756\n\ + b _080DAC52\n\ +_080DA748:\n\ + cmp r4, 0x2\n\ + bne _080DA74E\n\ + b _080DA9C8\n\ +_080DA74E:\n\ + cmp r4, 0x3\n\ + bne _080DA754\n\ + b _080DAB0E\n\ +_080DA754:\n\ + b _080DAC52\n\ +_080DA756:\n\ + lsls r1, r2, 24\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x1\n\ + bne _080DA76C\n\ + movs r0, 0x8\n\ + orrs r0, r2\n\ + orrs r0, r7\n\ + mov r1, r12\n\ + strb r0, [r1]\n\ + strb r6, [r1, 0x1]\n\ + b _080DA88A\n\ +_080DA76C:\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x3\n\ + bne _080DA790\n\ + lsls r0, r2, 30\n\ + lsrs r0, 31\n\ + movs r1, 0x1\n\ + eors r0, r1\n\ + ands r0, r7\n\ + lsls r0, 1\n\ + movs r1, 0x3\n\ + negs r1, r1\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + orrs r1, r7\n\ + mov r2, r12\n\ + strb r1, [r2]\n\ + strb r6, [r2, 0x1]\n\ + b _080DA88A\n\ +_080DA790:\n\ + movs r0, 0x8\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _080DA88A\n\ + adds r3, r5, 0\n\ + adds r3, 0x3F\n\ + ldrb r2, [r3]\n\ + lsls r1, r2, 31\n\ + lsrs r1, 31\n\ + movs r4, 0x1\n\ + eors r1, r4\n\ + ands r1, r7\n\ + movs r6, 0x2\n\ + negs r6, r6\n\ + adds r0, r6, 0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r3]\n\ + lsls r0, 31\n\ + lsrs r0, 31\n\ + adds r1, r5, 0\n\ + adds r1, 0x2A\n\ + strb r0, [r1]\n\ + ldrb r0, [r3]\n\ + movs r1, 0x4\n\ + orrs r0, r1\n\ + movs r1, 0x11\n\ + negs r1, r1\n\ + ands r0, r1\n\ + strb r0, [r3]\n\ + mov r3, r12\n\ + ldrb r1, [r3]\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DA87A\n\ + ldr r0, _080DA80C @ =gMain\n\ + ldr r1, _080DA810 @ =0x0000043d\n\ + adds r0, r1\n\ + ldrb r1, [r0]\n\ + movs r0, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DA82E\n\ + ldrb r1, [r3, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DA814\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + subs r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _080DA868\n\ + .align 2, 0\n\ +_080DA80C: .4byte gMain\n\ +_080DA810: .4byte 0x0000043d\n\ +_080DA814:\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + adds r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _080DA866\n\ +_080DA82E:\n\ + mov r0, r12\n\ + ldrb r1, [r0, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DA85C\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + subs r0, 0xC\n\ + strb r0, [r1]\n\ + mov r1, r12\n\ + ldrb r2, [r1, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r4\n\ + ands r0, r7\n\ + adds r1, r6, 0\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + mov r2, r12\n\ + strb r1, [r2, 0xE]\n\ + b _080DA87A\n\ +_080DA85C:\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + adds r0, 0xC\n\ + strb r0, [r1]\n\ +_080DA866:\n\ + mov r3, r12\n\ +_080DA868:\n\ + ldrb r2, [r3, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r4\n\ + ands r0, r7\n\ + adds r1, r6, 0\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + strb r1, [r3, 0xE]\n\ +_080DA87A:\n\ + mov r4, r12\n\ + ldrb r1, [r4]\n\ + movs r0, 0x9\n\ + negs r0, r0\n\ + ands r0, r1\n\ + strb r0, [r4]\n\ + ldrh r0, [r4, 0x2]\n\ + mov r8, r0\n\ +_080DA88A:\n\ + mov r2, r12\n\ + ldrb r1, [r2]\n\ + movs r0, 0xF\n\ + ands r0, r1\n\ + strb r0, [r2]\n\ + b _080DAC52\n\ +_080DA896:\n\ + lsls r1, r2, 24\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0\n\ + bne _080DA8AC\n\ + movs r0, 0x8\n\ + orrs r0, r2\n\ + orrs r0, r7\n\ + mov r3, r12\n\ + strb r0, [r3]\n\ + strb r6, [r3, 0x1]\n\ + b _080DA9BC\n\ +_080DA8AC:\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x2\n\ + bne _080DA8BE\n\ + adds r0, r2, 0\n\ + orrs r0, r7\n\ + mov r4, r12\n\ + strb r0, [r4]\n\ + strb r6, [r4, 0x1]\n\ + b _080DA9BC\n\ +_080DA8BE:\n\ + movs r0, 0x8\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _080DA9BC\n\ + adds r3, r5, 0\n\ + adds r3, 0x3F\n\ + ldrb r2, [r3]\n\ + lsls r1, r2, 31\n\ + lsrs r1, 31\n\ + movs r4, 0x1\n\ + eors r1, r4\n\ + ands r1, r7\n\ + movs r6, 0x2\n\ + negs r6, r6\n\ + adds r0, r6, 0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r3]\n\ + lsls r0, 31\n\ + lsrs r0, 31\n\ + adds r1, r5, 0\n\ + adds r1, 0x2A\n\ + strb r0, [r1]\n\ + ldrb r0, [r3]\n\ + movs r1, 0x4\n\ + orrs r0, r1\n\ + movs r1, 0x11\n\ + negs r1, r1\n\ + ands r0, r1\n\ + strb r0, [r3]\n\ + mov r0, r12\n\ + ldrb r1, [r0]\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DA9AC\n\ + ldr r0, _080DA940 @ =gMain\n\ + ldr r1, _080DA944 @ =0x0000043d\n\ + adds r0, r1\n\ + ldrb r1, [r0]\n\ + movs r0, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DA962\n\ + mov r2, r12\n\ + ldrb r1, [r2, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DA948\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + subs r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + mov r3, r12\n\ + b _080DA978\n\ + .align 2, 0\n\ +_080DA940: .4byte gMain\n\ +_080DA944: .4byte 0x0000043d\n\ +_080DA948:\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + adds r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _080DA996\n\ +_080DA962:\n\ + mov r3, r12\n\ + ldrb r1, [r3, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DA98C\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + subs r0, 0xC\n\ + strb r0, [r1]\n\ +_080DA978:\n\ + ldrb r2, [r3, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r4\n\ + ands r0, r7\n\ + adds r1, r6, 0\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + strb r1, [r3, 0xE]\n\ + b _080DA9AC\n\ +_080DA98C:\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + adds r0, 0xC\n\ + strb r0, [r1]\n\ +_080DA996:\n\ + mov r0, r12\n\ + ldrb r2, [r0, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r4\n\ + ands r0, r7\n\ + adds r1, r6, 0\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + mov r2, r12\n\ + strb r1, [r2, 0xE]\n\ +_080DA9AC:\n\ + mov r3, r12\n\ + ldrb r1, [r3]\n\ + movs r0, 0x9\n\ + negs r0, r0\n\ + ands r0, r1\n\ + strb r0, [r3]\n\ + ldrh r4, [r3, 0x2]\n\ + mov r8, r4\n\ +_080DA9BC:\n\ + mov r1, r12\n\ + ldrb r0, [r1]\n\ + movs r1, 0xF\n\ + ands r1, r0\n\ + movs r0, 0x10\n\ + b _080DAC4C\n\ +_080DA9C8:\n\ + lsls r1, r2, 24\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x3\n\ + bne _080DA9DE\n\ + movs r0, 0x8\n\ + orrs r0, r2\n\ + orrs r0, r7\n\ + mov r3, r12\n\ + strb r0, [r3]\n\ + strb r6, [r3, 0x1]\n\ + b _080DAAFE\n\ +_080DA9DE:\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x1\n\ + bne _080DA9F0\n\ + adds r0, r2, 0\n\ + orrs r0, r7\n\ + mov r4, r12\n\ + strb r0, [r4]\n\ + strb r6, [r4, 0x1]\n\ + b _080DAAFE\n\ +_080DA9F0:\n\ + movs r0, 0x8\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + bne _080DA9FA\n\ + b _080DAAFE\n\ +_080DA9FA:\n\ + adds r3, r5, 0\n\ + adds r3, 0x3F\n\ + ldrb r2, [r3]\n\ + lsls r1, r2, 31\n\ + lsrs r1, 31\n\ + movs r6, 0x1\n\ + eors r1, r6\n\ + ands r1, r7\n\ + movs r0, 0x2\n\ + negs r0, r0\n\ + mov r8, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r3]\n\ + lsls r0, 31\n\ + lsrs r0, 31\n\ + adds r1, r5, 0\n\ + adds r1, 0x2A\n\ + strb r0, [r1]\n\ + ldrb r0, [r3]\n\ + movs r1, 0x4\n\ + orrs r0, r1\n\ + movs r1, 0x11\n\ + negs r1, r1\n\ + ands r0, r1\n\ + strb r0, [r3]\n\ + mov r2, r12\n\ + ldrb r1, [r2]\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DAAEC\n\ + ldr r0, _080DAA6C @ =gMain\n\ + ldr r3, _080DAA70 @ =0x0000043d\n\ + adds r0, r3\n\ + ldrb r0, [r0]\n\ + ands r4, r0\n\ + cmp r4, 0\n\ + beq _080DAAA4\n\ + ldrb r1, [r2, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DAA74\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + subs r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _080DAAD8\n\ + .align 2, 0\n\ +_080DAA6C: .4byte gMain\n\ +_080DAA70: .4byte 0x0000043d\n\ +_080DAA74:\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + adds r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + mov r0, r12\n\ + ldrb r2, [r0, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r6\n\ + ands r0, r7\n\ + mov r1, r8\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + mov r2, r12\n\ + strb r1, [r2, 0xE]\n\ + b _080DAAEC\n\ +_080DAAA4:\n\ + mov r3, r12\n\ + ldrb r1, [r3, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DAACE\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + subs r0, 0xC\n\ + strb r0, [r1]\n\ + ldrb r2, [r3, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r6\n\ + ands r0, r7\n\ + mov r1, r8\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + strb r1, [r3, 0xE]\n\ + b _080DAAEC\n\ +_080DAACE:\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + adds r0, 0xC\n\ + strb r0, [r1]\n\ +_080DAAD8:\n\ + mov r4, r12\n\ + ldrb r2, [r4, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r6\n\ + ands r0, r7\n\ + mov r1, r8\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + strb r1, [r4, 0xE]\n\ +_080DAAEC:\n\ + mov r0, r12\n\ + ldrb r1, [r0]\n\ + movs r0, 0x9\n\ + negs r0, r0\n\ + ands r0, r1\n\ + mov r1, r12\n\ + strb r0, [r1]\n\ + ldrh r2, [r1, 0x2]\n\ + mov r8, r2\n\ +_080DAAFE:\n\ + mov r3, r12\n\ + ldrb r0, [r3]\n\ + movs r1, 0xF\n\ + ands r1, r0\n\ + movs r0, 0x20\n\ + orrs r1, r0\n\ + strb r1, [r3]\n\ + b _080DAC52\n\ +_080DAB0E:\n\ + lsls r1, r2, 24\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x2\n\ + bne _080DAB20\n\ + movs r0, 0x8\n\ + orrs r0, r2\n\ + mov r4, r12\n\ + strb r0, [r4]\n\ + b _080DAC42\n\ +_080DAB20:\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0\n\ + bne _080DAB44\n\ + lsls r0, r2, 30\n\ + lsrs r0, 31\n\ + movs r1, 0x1\n\ + eors r0, r1\n\ + ands r0, r7\n\ + lsls r0, 1\n\ + movs r1, 0x3\n\ + negs r1, r1\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + orrs r1, r7\n\ + mov r0, r12\n\ + strb r1, [r0]\n\ + strb r6, [r0, 0x1]\n\ + b _080DAC42\n\ +_080DAB44:\n\ + movs r0, 0x8\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _080DAC42\n\ + adds r3, r5, 0\n\ + adds r3, 0x3F\n\ + ldrb r2, [r3]\n\ + lsls r1, r2, 31\n\ + lsrs r1, 31\n\ + movs r4, 0x1\n\ + eors r1, r4\n\ + ands r1, r7\n\ + movs r6, 0x2\n\ + negs r6, r6\n\ + adds r0, r6, 0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r3]\n\ + lsls r0, 31\n\ + lsrs r0, 31\n\ + adds r1, r5, 0\n\ + adds r1, 0x2A\n\ + strb r0, [r1]\n\ + ldrb r0, [r3]\n\ + movs r1, 0x4\n\ + orrs r0, r1\n\ + movs r1, 0x11\n\ + negs r1, r1\n\ + ands r0, r1\n\ + strb r0, [r3]\n\ + mov r2, r12\n\ + ldrb r1, [r2]\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DAC32\n\ + ldr r0, _080DABC4 @ =gMain\n\ + ldr r3, _080DABC8 @ =0x0000043d\n\ + adds r0, r3\n\ + ldrb r1, [r0]\n\ + movs r0, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DABE6\n\ + ldrb r1, [r2, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DABCC\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + subs r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + mov r0, r12\n\ + ldrb r2, [r0, 0xE]\n\ + b _080DAC00\n\ + .align 2, 0\n\ +_080DABC4: .4byte gMain\n\ +_080DABC8: .4byte 0x0000043d\n\ +_080DABCC:\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + adds r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _080DAC1E\n\ +_080DABE6:\n\ + mov r0, r12\n\ + ldrb r1, [r0, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DAC14\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + subs r0, 0xC\n\ + strb r0, [r1]\n\ + mov r1, r12\n\ + ldrb r2, [r1, 0xE]\n\ +_080DAC00:\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r4\n\ + ands r0, r7\n\ + adds r1, r6, 0\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + mov r2, r12\n\ + strb r1, [r2, 0xE]\n\ + b _080DAC32\n\ +_080DAC14:\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + adds r0, 0xC\n\ + strb r0, [r1]\n\ +_080DAC1E:\n\ + mov r3, r12\n\ + ldrb r2, [r3, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r4\n\ + ands r0, r7\n\ + adds r1, r6, 0\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + strb r1, [r3, 0xE]\n\ +_080DAC32:\n\ + mov r4, r12\n\ + ldrb r1, [r4]\n\ + movs r0, 0x9\n\ + negs r0, r0\n\ + ands r0, r1\n\ + strb r0, [r4]\n\ + ldrh r0, [r4, 0x2]\n\ + mov r8, r0\n\ +_080DAC42:\n\ + mov r1, r12\n\ + ldrb r0, [r1]\n\ + movs r1, 0xF\n\ + ands r1, r0\n\ + movs r0, 0x30\n\ +_080DAC4C:\n\ + orrs r1, r0\n\ + mov r2, r12\n\ + strb r1, [r2]\n\ +_080DAC52:\n\ + mov r3, r12\n\ + ldrb r1, [r3]\n\ + lsls r1, 30\n\ + lsrs r1, 31\n\ + mov r0, r12\n\ + adds r0, 0xC\n\ + adds r0, r1\n\ + ldrb r1, [r0]\n\ + ldr r3, _080DACE0 @ =gSineTable\n\ + mov r4, r8\n\ + lsls r0, r4, 1\n\ + adds r0, r3\n\ + movs r2, 0\n\ + ldrsh r0, [r0, r2]\n\ + muls r0, r1\n\ + asrs r0, 8\n\ + strh r0, [r5, 0x24]\n\ + ldrb r2, [r5, 0x3]\n\ + lsls r2, 26\n\ + lsrs r2, 27\n\ + movs r4, 0x24\n\ + ldrsh r0, [r5, r4]\n\ + negs r0, r0\n\ + asrs r0, 1\n\ + mov r1, r12\n\ + ldrb r1, [r1, 0xA]\n\ + adds r0, r1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + lsls r1, r0, 1\n\ + adds r1, r3\n\ + ldrh r6, [r1]\n\ + ldr r1, _080DACE4 @ =gOamMatrices\n\ + lsls r2, 3\n\ + adds r2, r1\n\ + adds r0, 0x40\n\ + lsls r0, 1\n\ + adds r0, r3\n\ + ldrh r0, [r0]\n\ + strh r0, [r2, 0x6]\n\ + strh r0, [r2]\n\ + strh r6, [r2, 0x2]\n\ + lsls r0, r6, 16\n\ + asrs r0, 16\n\ + negs r0, r0\n\ + strh r0, [r2, 0x4]\n\ + mov r2, r12\n\ + ldrh r0, [r2, 0x6]\n\ + ldrh r3, [r2, 0x8]\n\ + adds r0, r3\n\ + strh r0, [r2, 0x8]\n\ + lsls r0, 16\n\ + lsrs r0, 24\n\ + strh r0, [r5, 0x22]\n\ + movs r4, 0x4\n\ + ldrsh r0, [r2, r4]\n\ + movs r1, 0x80\n\ + lsls r1, 8\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DACE8\n\ + ldrh r0, [r2, 0x4]\n\ + subs r1, 0x1\n\ + ands r1, r0\n\ + ldrh r0, [r2, 0x2]\n\ + subs r0, r1\n\ + movs r1, 0xFF\n\ + ands r0, r1\n\ + strh r0, [r2, 0x2]\n\ + b _080DACFE\n\ + .align 2, 0\n\ +_080DACE0: .4byte gSineTable\n\ +_080DACE4: .4byte gOamMatrices\n\ +_080DACE8:\n\ + mov r1, r12\n\ + ldrh r0, [r1, 0x4]\n\ + ldr r1, _080DAD28 @ =0x00007fff\n\ + ands r1, r0\n\ + mov r2, r12\n\ + ldrh r2, [r2, 0x2]\n\ + adds r1, r2\n\ + movs r0, 0xFF\n\ + ands r1, r0\n\ + mov r3, r12\n\ + strh r1, [r3, 0x2]\n\ +_080DACFE:\n\ + movs r4, 0x22\n\ + ldrsh r1, [r5, r4]\n\ + movs r2, 0x26\n\ + ldrsh r0, [r5, r2]\n\ + adds r1, r0\n\ + mov r3, r12\n\ + ldrh r0, [r3, 0xE]\n\ + lsrs r0, 1\n\ + cmp r1, r0\n\ + blt _080DAD1A\n\ + movs r0, 0\n\ + strh r0, [r5, 0x2E]\n\ + ldr r0, _080DAD2C @ =sub_80DA48C\n\ + str r0, [r5, 0x1C]\n\ +_080DAD1A:\n\ + pop {r3,r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_080DAD28: .4byte 0x00007fff\n\ +_080DAD2C: .4byte sub_80DA48C\n"); +}; +#endif + +void sub_80DAD30(struct Sprite *sprite) +{ + sprite->oam.priority = sub_8079ED4(gAnimBankTarget); + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->callback = TranslateAnimSpriteToTargetMonLocation; +} + +void sub_80DAD84(struct Sprite * sprite) +{ + s16 matrixNum; + s16 rand; + s16 sinVal; + + sprite->data[1] = gBattleAnimArgs[0]; + sprite->data[2] = gBattleAnimArgs[1]; + sprite->data[3] = gBattleAnimArgs[2]; + + if (gMain.inBattle) + { + if (gBanksBySide[gAnimBankTarget] & 1) + { + sprite->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3]; + } + else + { + // 080dade0 + sprite->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 40; + } + + if (gBattleAnimArgs[4]) + { + sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1; + // 080dae24 + } + else + { + sprite->oam.priority = sub_8079ED4(gAnimBankTarget); + } + } + else + { + sprite->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3]; + } + + sprite->data[4] = gSineTable[sprite->data[1] & 0xff]; + sprite->data[5] = -gSineTable[(sprite->data[1] & 0xff) + 64]; + sprite->data[6] = 0; + sprite->pos2.x = sprite->pos2.y = 0; + + matrixNum = sprite->oam.matrixNum; + sprite->data[1] = (u8) (sprite->data[1] >> 8); + + rand = Random(); + if (rand & 0x8000) + { + sprite->data[1] = 0xff - sprite->data[1]; + } + + sinVal = gSineTable[sprite->data[1]]; + + gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sprite->data[1] + 64]; + gOamMatrices[matrixNum].b = sinVal; + gOamMatrices[matrixNum].c = -sinVal; + + sprite->animBeginning = 1; + sprite->animEnded = 0; + + if (rand & 1) + { + sprite->animNum = 1; + sprite->hFlip = 1; + } + + sprite->callback = sub_80DAF0C; + +} + +#ifdef NONMATCHING +void sub_80DAF0C(struct Sprite *sprite) +{ + + /* NONMATCHING - Functionally equivalent + * + * differences: + * + * asm contains useless: + * movs r1, 0 + * mov r8, r1 + * where r8 is never used can't be matched + * + * 0x8001 and 0x8002 loaded then added with 0 to r0 instead of loaded straight there */ + + u16 *data; + u16 dataCpy[8]; + int higher; + + data = sprite->data; + + if (++sprite->data[0] > 4) + { + sprite->pos2.x = (sprite->data[4] * sprite->data[6]) >> 8; + sprite->pos2.y = (sprite->data[5] * sprite->data[6]) >> 8; + + sprite->data[6] += sprite->data[3] & 0xff; + + if (sprite->data[6] >= (sprite->data[2] & 0xff)) + { + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + + sprite->pos2.x = 0; + sprite->pos2.y = 0; + + memcpy(dataCpy, data, 16); + memset(data, 0, 16); + + data[4] = sprite->pos1.y << 8; + data[3] = dataCpy[3] >> 8; + data[1] = 0; + data[5] = dataCpy[1]; + + if (sprite->animNum != 0) + { + if (data[3] & 8) + { + data[2] = 0x8001; + } + else + { + data[2] = 0x8002; + } + } + else + { + if (data[3] & 8) + { + data[2] = 1; + } + else + { + data[2] = 2; + } + } + + ((u8 *) data)[12] = dataCpy[2] >> 8; + ((u8 *) data)[13] = (u8) data[6] - 2; + + higher = dataCpy[7] << 1; + data[7] = (data[7] & 1) | higher; + + sprite->callback = sub_80DA6F0; + } + } +} +#else +NAKED +void sub_80DAF0C(struct Sprite *sprite) +{ + asm_unified("push {r4-r7,lr}\n\ + mov r7, r8\n\ + push {r7}\n\ + sub sp, 0x10\n\ + adds r4, r0, 0\n\ + adds r5, r4, 0\n\ + adds r5, 0x2E\n\ + ldrh r0, [r4, 0x2E]\n\ + adds r0, 0x1\n\ + movs r1, 0\n\ + mov r8, r1\n\ + movs r7, 0\n\ + strh r0, [r4, 0x2E]\n\ + lsls r0, 16\n\ + asrs r0, 16\n\ + cmp r0, 0x4\n\ + ble _080DAFF0\n\ + movs r2, 0x36\n\ + ldrsh r1, [r4, r2]\n\ + movs r2, 0x3A\n\ + ldrsh r0, [r4, r2]\n\ + muls r0, r1\n\ + asrs r6, r0, 8\n\ + strh r6, [r4, 0x24]\n\ + movs r0, 0x38\n\ + ldrsh r1, [r4, r0]\n\ + movs r2, 0x3A\n\ + ldrsh r0, [r4, r2]\n\ + muls r0, r1\n\ + asrs r3, r0, 8\n\ + strh r3, [r4, 0x26]\n\ + ldrh r2, [r4, 0x34]\n\ + movs r1, 0xFF\n\ + adds r0, r1, 0\n\ + ands r0, r2\n\ + ldrh r2, [r4, 0x3A]\n\ + adds r0, r2\n\ + strh r0, [r4, 0x3A]\n\ + ldrh r2, [r4, 0x32]\n\ + lsls r0, 16\n\ + asrs r0, 16\n\ + ands r1, r2\n\ + cmp r0, r1\n\ + blt _080DAFF0\n\ + ldrh r0, [r4, 0x20]\n\ + adds r0, r6\n\ + strh r0, [r4, 0x20]\n\ + ldrh r0, [r4, 0x22]\n\ + adds r0, r3\n\ + strh r0, [r4, 0x22]\n\ + strh r7, [r4, 0x24]\n\ + strh r7, [r4, 0x26]\n\ + mov r0, sp\n\ + adds r1, r5, 0\n\ + movs r2, 0x10\n\ + bl memcpy\n\ + adds r0, r5, 0\n\ + movs r1, 0\n\ + movs r2, 0x10\n\ + bl memset\n\ + ldrh r0, [r4, 0x22]\n\ + lsls r0, 8\n\ + strh r0, [r5, 0x8]\n\ + mov r0, sp\n\ + ldrh r0, [r0, 0x6]\n\ + lsrs r1, r0, 8\n\ + strh r1, [r5, 0x6]\n\ + strh r7, [r5, 0x2]\n\ + mov r0, sp\n\ + ldrh r0, [r0, 0x2]\n\ + strh r0, [r5, 0xA]\n\ + adds r0, r4, 0\n\ + adds r0, 0x2A\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + beq _080DAFC0\n\ + movs r0, 0x8\n\ + ands r1, r0\n\ + cmp r1, 0\n\ + beq _080DAFB8\n\ + ldr r0, _080DAFB4 @ =0x00008001\n\ + b _080DAFCE\n\ + .align 2, 0\n\ + _080DAFB4: .4byte 0x00008001\n\ + _080DAFB8:\n\ + ldr r0, _080DAFBC @ =0x00008002\n\ + b _080DAFCE\n\ + .align 2, 0\n\ + _080DAFBC: .4byte 0x00008002\n\ + _080DAFC0:\n\ + movs r0, 0x8\n\ + ands r1, r0\n\ + cmp r1, 0\n\ + beq _080DAFCC\n\ + movs r0, 0x1\n\ + b _080DAFCE\n\ + _080DAFCC:\n\ + movs r0, 0x2\n\ + _080DAFCE:\n\ + strh r0, [r5, 0x4]\n\ + mov r0, sp\n\ + ldrh r0, [r0, 0x4]\n\ + lsrs r0, 8\n\ + strb r0, [r5, 0xC]\n\ + subs r0, 0x2\n\ + strb r0, [r5, 0xD]\n\ + mov r0, sp\n\ + ldrh r1, [r0, 0xE]\n\ + lsls r1, 1\n\ + ldrh r2, [r5, 0xE]\n\ + movs r0, 0x1\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strh r0, [r5, 0xE]\n\ + ldr r0, _080DAFFC @ =sub_80DA6F0\n\ + str r0, [r4, 0x1C]\n\ + _080DAFF0:\n\ + add sp, 0x10\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ + _080DAFFC: .4byte sub_80DA6F0\n"); + +} +#endif + +void sub_80DB000(struct Sprite *sprite) +{ + u16 arg; + u8 mult; + + if (gBattleAnimArgs[2] == 0) + { + InitAnimSpritePos(sprite, 0); + } + else + { + sub_8078764(sprite, 0); + } + + if ((!gBattleAnimArgs[2] && !GetBattlerSide(gAnimBankAttacker)) + || (gBattleAnimArgs[2] == 1 && !GetBattlerSide(gAnimBankTarget))) + { + sprite->pos1.x += 8; + } + + SeekSpriteAnim(sprite, gBattleAnimArgs[4]); + sprite->pos1.x -= 32; + sprite->data[1] = 0x0ccc; + + arg = gBattleAnimArgs[4]; + mult = 12; + sprite->pos2.x += mult * arg; + sprite->data[0] = arg; + sprite->data[7] = gBattleAnimArgs[3]; + sprite->callback = sub_80DB0A0; +} + +void sub_80DB0A0(struct Sprite *sprite) +{ + sprite->pos2.x += sprite->data[1] >> 8; + + if (++sprite->data[0] == 6) + { + sprite->data[0] = 0; + sprite->pos2.x = 0; + StartSpriteAnim(sprite, 0); + } + + if (--sprite->data[7] == -1) + { + DestroyAnimSprite(sprite); + } +} + +void sub_80DB0E8(u8 task) +{ + u16 data = gTasks[task].data[0]; + if ((data & 31) == 0) + { + ++gAnimVisualTaskCount; + + gBattleAnimArgs[0] = Sin(gTasks[task].data[0], -13); + gBattleAnimArgs[1] = Cos(gTasks[task].data[0], -13); + gBattleAnimArgs[2] = 1; + gBattleAnimArgs[3] = 3; + + CreateSpriteAndAnimate(&gBattleAnimSpriteTemplate_83DB538, + GetBattlerSpriteCoord(gAnimBankTarget, 2), + GetBattlerSpriteCoord(gAnimBankTarget, 3), + 3); + } + + gTasks[task].data[0] += 8; + + if (gTasks[task].data[0] > 0xff) + { + DestroyAnimVisualTask(task); + } +} + +void sub_80DB194(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + InitAnimSpritePos(sprite, 1); + gSprites[GetAnimBattlerSpriteId(0)].invisible = 1; + ++sprite->data[0]; + break; + case 1: + if (sprite->affineAnimEnded) + { + DestroyAnimSprite(sprite); + } + } +} + +void sub_80DB1F4(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1); + sprite->pos2.y = -sprite->pos1.y - 32; + ++sprite->data[0]; + break; + case 1: + sprite->pos2.y += 10; + if (sprite->pos2.y >= 0) + { + ++sprite->data[0]; + } + break; + case 2: + sprite->pos2.y -= 10; + if (sprite->pos1.y + sprite->pos2.y < -32) + { + gSprites[GetAnimBattlerSpriteId(0)].invisible = 0; + DestroyAnimSprite(sprite); + } + } +} + +void sub_80DB288(struct Sprite *sprite) +{ + InitAnimSpritePos(sprite, 1); + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->callback = sub_80DB2D0; + gSprites[GetAnimBattlerSpriteId(0)].invisible = 1; +} + +void sub_80DB2D0(struct Sprite *sprite) +{ + if (sprite->data[0] > 0) + { + --sprite->data[0]; + } + else if (sprite->pos1.y + sprite->pos2.y > -32) + { + sprite->data[2] += sprite->data[1]; + sprite->pos2.y -= (sprite->data[2] >> 8); + } + else + { + sprite->invisible = 1; + if (sprite->data[3]++ > 20) + { + sprite->callback = sub_80DB330; + } + } +} + +void sub_80DB330(struct Sprite *sprite) +{ + sprite->pos2.y += sprite->data[2] >> 8; + + if (sprite->pos1.y + sprite->pos2.y > -32) + { + sprite->invisible = 0; + } + + if (sprite->pos2.y > 0) + { + DestroyAnimSprite(sprite); + } +} + +#ifdef NONMATCHING +void sub_80DB374(struct Sprite *sprite) +{ + // NONMATCHING - Functionally equivalent - slight register swap at end + + u32 matrixNum; + int t1, t3; + s16 t2; + + switch (sprite->data[0]) + { + + case 0: + if (!gBattleAnimArgs[0]) + { + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1); + } + else + { + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1); + } + + sprite->data[1] = 512; + + sub_8078FDC(sprite, 0, 256, sprite->data[1], 0); + ++sprite->data[0]; + break; + case 1: + if (sprite->data[2] <= 11) + { + sprite->data[1] -= 40; + } + else + { + sprite->data[1] += 40; + } + + ++sprite->data[2]; + + sub_8078FDC(sprite, 0, 256, sprite->data[1], 0); + + matrixNum = sprite->oam.matrixNum; + + t1 = 15616; + t2 = gOamMatrices[matrixNum].d; + t3 = t1 / t2 + 1; + + if (t3 > 128) + { + t3 = 128; + } + + /* NONMATCHING + * compiles to: + * asr r0, r0, #0x1 + strh r0, [r5, #0x26] + * needed: + * asrs r1, r0, 1 + * strh r1, [r5, 0x26] */ + sprite->pos2.y = (64 - t3) / 2; + + if (sprite->data[2] == 24) + { + sub_8079098(sprite); + DestroyAnimSprite(sprite); + } + } +} +#else +NAKED +void sub_80DB374(struct Sprite *sprite) +{ + asm_unified("push {r4,r5,lr}\n\ + sub sp, 0x4\n\ + adds r5, r0, 0\n\ + movs r1, 0x2E\n\ + ldrsh r0, [r5, r1]\n\ + cmp r0, 0\n\ + beq _080DB388\n\ + cmp r0, 0x1\n\ + beq _080DB3E0\n\ + b _080DB44C\n\ +_080DB388:\n\ + ldr r0, _080DB398 @ =gBattleAnimArgs\n\ + movs r2, 0\n\ + ldrsh r0, [r0, r2]\n\ + cmp r0, 0\n\ + bne _080DB3A0\n\ + ldr r4, _080DB39C @ =gAnimBankAttacker\n\ + b _080DB3A2\n\ + .align 2, 0\n\ +_080DB398: .4byte gBattleAnimArgs\n\ +_080DB39C: .4byte gAnimBankAttacker\n\ +_080DB3A0:\n\ + ldr r4, _080DB3DC @ =gAnimBankTarget\n\ +_080DB3A2:\n\ + ldrb r0, [r4]\n\ + movs r1, 0\n\ + bl GetBattlerSpriteCoord\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + strh r0, [r5, 0x20]\n\ + ldrb r0, [r4]\n\ + movs r1, 0x1\n\ + bl GetBattlerSpriteCoord\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + strh r0, [r5, 0x22]\n\ + movs r0, 0\n\ + movs r3, 0x80\n\ + lsls r3, 2\n\ + strh r3, [r5, 0x30]\n\ + movs r2, 0x80\n\ + lsls r2, 1\n\ + str r0, [sp]\n\ + adds r0, r5, 0\n\ + movs r1, 0\n\ + bl sub_8078FDC\n\ + ldrh r0, [r5, 0x2E]\n\ + adds r0, 0x1\n\ + strh r0, [r5, 0x2E]\n\ + b _080DB44C\n\ + .align 2, 0\n\ +_080DB3DC: .4byte gAnimBankTarget\n\ +_080DB3E0:\n\ + movs r1, 0x32\n\ + ldrsh r0, [r5, r1]\n\ + cmp r0, 0xB\n\ + bgt _080DB3EE\n\ + ldrh r0, [r5, 0x30]\n\ + subs r0, 0x28\n\ + b _080DB3F2\n\ +_080DB3EE:\n\ + ldrh r0, [r5, 0x30]\n\ + adds r0, 0x28\n\ +_080DB3F2:\n\ + strh r0, [r5, 0x30]\n\ + ldrh r0, [r5, 0x32]\n\ + adds r0, 0x1\n\ + movs r1, 0\n\ + strh r0, [r5, 0x32]\n\ + movs r2, 0x80\n\ + lsls r2, 1\n\ + movs r0, 0x30\n\ + ldrsh r3, [r5, r0]\n\ + str r1, [sp]\n\ + adds r0, r5, 0\n\ + bl sub_8078FDC\n\ + ldrb r1, [r5, 0x3]\n\ + lsls r1, 26\n\ + lsrs r1, 27\n\ + movs r0, 0xF4\n\ + lsls r0, 6\n\ + ldr r2, _080DB454 @ =gOamMatrices\n\ + lsls r1, 3\n\ + adds r1, r2\n\ + movs r2, 0x6\n\ + ldrsh r1, [r1, r2]\n\ + bl __divsi3\n\ + adds r1, r0, 0x1\n\ + cmp r1, 0x80\n\ + ble _080DB42C\n\ + movs r1, 0x80\n\ +_080DB42C:\n\ + movs r0, 0x40\n\ + subs r0, r1\n\ + lsrs r1, r0, 31\n\ + adds r0, r1\n\ + asrs r1, r0, 1\n\ + strh r1, [r5, 0x26]\n\ + movs r1, 0x32\n\ + ldrsh r0, [r5, r1]\n\ + cmp r0, 0x18\n\ + bne _080DB44C\n\ + adds r0, r5, 0\n\ + bl sub_8079098\n\ + adds r0, r5, 0\n\ + bl DestroyAnimSprite\n\ +_080DB44C:\n\ + add sp, 0x4\n\ + pop {r4,r5}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_080DB454: .4byte gOamMatrices\n"); +} +#endif + +void sub_80DB458(struct Sprite *sprite) +{ + int v1, v2; + + v1 = 0x1ff & Random(); + v2 = 0x7f & Random(); + + if (v1 & 1) + { + sprite->data[0] = 736 + v1; + } + else + { + sprite->data[0] = 736 - v1; + } + + if (v2 & 1) + { + sprite->data[1] = 896 + v2; + } + else + { + sprite->data[1] = 896 - v2; + } + + sprite->data[2] = gBattleAnimArgs[0]; + + if (sprite->data[2]) + { + sprite->oam.matrixNum = 8; + } + + if (gBattleAnimArgs[1] == 0) + { + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 32; + } + else + { + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 32; + } + + sprite->callback = sub_80DB508; +} + +void sub_80DB508(struct Sprite *sprite) +{ + if (sprite->data[2] == 0) + { + sprite->pos2.x += sprite->data[0] >> 8; + sprite->pos2.y -= sprite->data[1] >> 8; + } + else + { + sprite->pos2.x -= sprite->data[0] >> 8; + sprite->pos2.y -= sprite->data[1] >> 8; + } + + sprite->data[0] = sprite->data[0]; + sprite->data[1] -= 32; + + if (sprite->data[0] < 0) + { + sprite->data[0] = 0; + } + + if (++sprite->data[3] == 31) + { + DestroyAnimSprite(sprite); + } +} + +void sub_80DB564(struct Sprite *sprite) +{ + sprite->data[6] = 0; + sprite->data[7] = 0x40; + sprite->callback = sub_80DB578; +} + +void sub_80DB578(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + if (++sprite->data[1] > 8) + { + sprite->data[1] = 0; + sprite->invisible ^= 1; + if (++sprite->data[2] > 5 && sprite->invisible) + { + sprite->data[0]++; + } + } + break; + case 1: + DestroyAnimSprite(sprite); + } +} + +void sub_80DB5E4(struct Sprite *sprite) +{ + s16 posx, posy; + u16 rotation; + + posx = sprite->pos1.x; + posy = sprite->pos1.y; + + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + + sprite->data[4] = sprite->pos1.x << 4; + sprite->data[5] = sprite->pos1.y << 4; + + sprite->data[6] = ((posx - sprite->pos1.x) << 4) / 12; + sprite->data[7] = ((posy - sprite->pos1.y) << 4) / 12; + + rotation = ArcTan2Neg(posx - sprite->pos1.x, posy - sprite->pos1.y); + rotation += 0xc000; + + sub_8078FDC(sprite, 1, 0x100, 0x100, rotation); + + sprite->callback = sub_80DB6A0; +} + +void sub_80DB6A0(struct Sprite *sprite) +{ + sprite->data[4] += sprite->data[6]; + sprite->data[5] += sprite->data[7]; + + sprite->pos1.x = sprite->data[4] >> 4; + sprite->pos1.y = sprite->data[5] >> 4; + + if ((u16) (sprite->pos1.x + 0x2d) > 0x14a || sprite->pos1.y > 0x9d || sprite->pos1.y < -0x2d) + { + move_anim_8074EE0(sprite); + } +} + +void unref_sub_80DB6E4(u8 taskId) +{ + if (gBattleAnimArgs[0] == 0) + { + u8 spriteId = GetAnimBattlerSpriteId(0); + gSprites[spriteId].invisible = 1; + } + else + { + u8 spriteId = GetAnimBattlerSpriteId(0); + gSprites[spriteId].invisible = 0; + } + + DestroyAnimVisualTask(taskId); +}
\ No newline at end of file diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 54cacd0cb..39ba0318b 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -13996,153 +13996,30 @@ static void atkC0_recoverbasedonsunlight(void) } } -NAKED static void atkC1_hiddenpowercalc(void) { - asm(".syntax unified\n\ -push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - ldr r2, _08029894 @ =gBattleMons\n\ - ldr r0, _08029898 @ =gBankAttacker\n\ - ldrb r1, [r0]\n\ - movs r0, 0x58\n\ - adds r4, r1, 0\n\ - muls r4, r0\n\ - adds r4, r2\n\ - ldrb r0, [r4, 0x14]\n\ - mov r10, r0\n\ - mov r7, r10\n\ - lsls r7, 27\n\ - adds r0, r7, 0\n\ - lsrs r0, 27\n\ - mov r10, r0\n\ - movs r1, 0x2\n\ - mov r2, r10\n\ - ands r2, r1\n\ - asrs r2, 1\n\ - ldrh r7, [r4, 0x14]\n\ - mov r9, r7\n\ - mov r0, r9\n\ - lsls r0, 22\n\ - mov r9, r0\n\ - lsrs r3, r0, 27\n\ - adds r0, r1, 0\n\ - ands r0, r3\n\ - orrs r2, r0\n\ - ldrb r7, [r4, 0x15]\n\ - mov r8, r7\n\ - mov r0, r8\n\ - lsls r0, 25\n\ - mov r8, r0\n\ - lsrs r3, r0, 27\n\ - adds r0, r1, 0\n\ - ands r0, r3\n\ - lsls r0, 1\n\ - orrs r2, r0\n\ - ldr r6, [r4, 0x14]\n\ - lsls r6, 12\n\ - lsrs r3, r6, 27\n\ - adds r0, r1, 0\n\ - ands r0, r3\n\ - lsls r0, 2\n\ - orrs r2, r0\n\ - ldrh r5, [r4, 0x16]\n\ - lsls r5, 23\n\ - lsrs r3, r5, 27\n\ - adds r0, r1, 0\n\ - ands r0, r3\n\ - lsls r0, 3\n\ - orrs r2, r0\n\ - ldrb r3, [r4, 0x17]\n\ - lsls r3, 26\n\ - lsrs r0, r3, 27\n\ - ands r1, r0\n\ - lsls r1, 4\n\ - orrs r2, r1\n\ - movs r1, 0x1\n\ - adds r4, r1, 0\n\ - mov r7, r10\n\ - ands r4, r7\n\ - mov r0, r9\n\ - lsrs r0, 27\n\ - mov r9, r0\n\ - adds r0, r1, 0\n\ - mov r7, r9\n\ - ands r0, r7\n\ - lsls r0, 1\n\ - orrs r4, r0\n\ - mov r0, r8\n\ - lsrs r0, 27\n\ - mov r8, r0\n\ - adds r0, r1, 0\n\ - mov r7, r8\n\ - ands r0, r7\n\ - lsls r0, 2\n\ - orrs r4, r0\n\ - lsrs r6, 27\n\ - adds r0, r1, 0\n\ - ands r0, r6\n\ - lsls r0, 3\n\ - orrs r4, r0\n\ - lsrs r5, 27\n\ - adds r0, r1, 0\n\ - ands r0, r5\n\ - lsls r0, 4\n\ - orrs r4, r0\n\ - lsrs r3, 27\n\ - ands r1, r3\n\ - lsls r1, 5\n\ - orrs r4, r1\n\ - ldr r5, _0802989C @ =gDynamicBasePower\n\ - lsls r0, r2, 2\n\ - adds r0, r2\n\ - lsls r0, 3\n\ - movs r1, 0x3F\n\ - bl __divsi3\n\ - adds r0, 0x1E\n\ - strh r0, [r5]\n\ - ldr r5, _080298A0 @ =gSharedMem\n\ - lsls r0, r4, 4\n\ - subs r0, r4\n\ - movs r1, 0x3F\n\ - bl __divsi3\n\ - adds r1, r0, 0x1\n\ - ldr r0, _080298A4 @ =0x0001601c\n\ - adds r5, r0\n\ - strb r1, [r5]\n\ - lsls r0, r1, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0x8\n\ - bls _08029876\n\ - adds r0, r1, 0x1\n\ - strb r0, [r5]\n\ -_08029876:\n\ - ldrb r0, [r5]\n\ - movs r1, 0xC0\n\ - orrs r0, r1\n\ - strb r0, [r5]\n\ - ldr r1, _080298A8 @ =gBattlescriptCurrInstr\n\ - ldr r0, [r1]\n\ - adds r0, 0x1\n\ - str r0, [r1]\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_08029894: .4byte gBattleMons\n\ -_08029898: .4byte gBankAttacker\n\ -_0802989C: .4byte gDynamicBasePower\n\ -_080298A0: .4byte gSharedMem\n\ -_080298A4: .4byte 0x0001601c\n\ -_080298A8: .4byte gBattlescriptCurrInstr\n\ - .syntax divided"); + u8 power = ((gBattleMons[gBankAttacker].hpIV & 2) >> 1) | + ((gBattleMons[gBankAttacker].attackIV & 2)) | + ((gBattleMons[gBankAttacker].defenseIV & 2) << 1) | + ((gBattleMons[gBankAttacker].speedIV & 2) << 2) | + ((gBattleMons[gBankAttacker].spAttackIV & 2) << 3) | + ((gBattleMons[gBankAttacker].spDefenseIV & 2) << 4); + u8 type = ((gBattleMons[gBankAttacker].hpIV & 1)) | + ((gBattleMons[gBankAttacker].attackIV & 1) << 1) | + ((gBattleMons[gBankAttacker].defenseIV & 1) << 2) | + ((gBattleMons[gBankAttacker].speedIV & 1) << 3) | + ((gBattleMons[gBankAttacker].spAttackIV & 1) << 4) | + ((gBattleMons[gBankAttacker].spDefenseIV & 1) << 5); + + gDynamicBasePower = 30 + (power * 40 / 63); + + gBattleStruct->dynamicMoveType = ((type * 15) / 63) + 1; + if (gBattleStruct->dynamicMoveType >= TYPE_MYSTERY) + gBattleStruct->dynamicMoveType++; + + gBattleStruct->dynamicMoveType |= 0xC0; + + gBattlescriptCurrInstr++; } static void atkC2_selectfirstvalidtarget(void) diff --git a/src/birch_pc.c b/src/birch_pc.c index 4b0025504..2a76b3c8c 100644 --- a/src/birch_pc.c +++ b/src/birch_pc.c @@ -87,24 +87,24 @@ const u8 *GetPokedexRatingText(u16 count) return gBirchDexRatingText_LessThan180; if (count < 190) return gBirchDexRatingText_LessThan190; - if (count < 200) + if (count < HOENN_DEX_COUNT - 2) return gBirchDexRatingText_LessThan200; - if (count == 200) + if (count == HOENN_DEX_COUNT - 2) { if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), 1) || GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), 1)) // Jirachi or Deoxys is not counted towards the dex completion. If either of these flags are enabled, it means the actual count is less than 200. return gBirchDexRatingText_LessThan200; return gBirchDexRatingText_DexCompleted; } - if (count == 201) + if (count == HOENN_DEX_COUNT - 1) { if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), 1) && GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), 1)) // If both of these flags are enabled, it means the actual count is less than 200. return gBirchDexRatingText_LessThan200; return gBirchDexRatingText_DexCompleted; } - if (count == 202) - return gBirchDexRatingText_DexCompleted; // Hoenn dex is considered complete, even though the hoenn dex count is 210. + if (count == HOENN_DEX_COUNT) + return gBirchDexRatingText_DexCompleted; // Hoenn dex is considered complete, a count of 202 means Jirachi and Deoxys are obtained return gBirchDexRatingText_LessThan10; } diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h index 185efc68e..69f33c393 100644 --- a/src/data/field_event_obj/berry_tree_graphics_tables.h +++ b/src/data/field_event_obj/berry_tree_graphics_tables.h @@ -6,421 +6,421 @@ #define POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_0), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_1), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_2), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_3), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_4), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_0), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_1), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_2), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_3), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_4), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_0), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_1), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_2), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_3), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_4), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_0), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_1), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_2), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_3), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_4), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_0), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_1), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_2), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_3), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_4), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_0), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_1), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_2), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_3), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_4), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_0), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_1), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_2), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_3), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_4), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_LumBerryTree_0), - obj_frame_tiles(gEventObjectPic_LumBerryTree_1), - obj_frame_tiles(gEventObjectPic_LumBerryTree_2), - obj_frame_tiles(gEventObjectPic_LumBerryTree_3), - obj_frame_tiles(gEventObjectPic_LumBerryTree_4), - obj_frame_tiles(gEventObjectPic_LumBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_0), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_1), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_2), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_3), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_4), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_0), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_1), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_2), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_3), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_4), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_0), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_1), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_2), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_3), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_4), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_0), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_1), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_2), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_3), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_4), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_0), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_1), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_2), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_3), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_4), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_0), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_1), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_2), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_3), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_4), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_0), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_1), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_2), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_3), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_4), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_0), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_1), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_2), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_3), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_4), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_0), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_1), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_2), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_3), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_4), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_0), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_1), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_2), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_3), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_4), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_0), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_1), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_2), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_3), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_4), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_0), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_1), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_2), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_3), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_4), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_0), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_1), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_2), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_3), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_4), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_OranBerryTree_0), - obj_frame_tiles(gEventObjectPic_OranBerryTree_1), - obj_frame_tiles(gEventObjectPic_OranBerryTree_2), - obj_frame_tiles(gEventObjectPic_OranBerryTree_3), - obj_frame_tiles(gEventObjectPic_OranBerryTree_4), - obj_frame_tiles(gEventObjectPic_OranBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_0), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_1), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_2), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_3), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_4), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_0), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_1), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_2), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_3), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_4), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_0), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_1), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_2), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_3), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_4), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_0), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_1), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_2), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_3), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_4), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_0), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_1), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_2), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_3), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_4), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_0), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_1), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_2), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_3), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_4), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_0), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_1), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_2), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_3), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_4), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_0), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_1), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_2), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_3), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_4), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index 8f1bb96a8..0be0be30a 100644 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -1,24 +1,7 @@ #ifndef POKERUBY_EVENT_OBJECT_GFX_H #define POKERUBY_EVENT_OBJECT_GFX_H -const u32 gEventObjectPic_BrendanNormal_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/00.4bpp"); -const u32 gEventObjectPic_BrendanNormal_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/01.4bpp"); -const u32 gEventObjectPic_BrendanNormal_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/02.4bpp"); -const u32 gEventObjectPic_BrendanNormal_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/03.4bpp"); -const u32 gEventObjectPic_BrendanNormal_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/04.4bpp"); -const u32 gEventObjectPic_BrendanNormal_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/05.4bpp"); -const u32 gEventObjectPic_BrendanNormal_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/06.4bpp"); -const u32 gEventObjectPic_BrendanNormal_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/07.4bpp"); -const u32 gEventObjectPic_BrendanNormal_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/08.4bpp"); -const u32 gEventObjectPic_BrendanNormal_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/09.4bpp"); -const u32 gEventObjectPic_BrendanNormal_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/10.4bpp"); -const u32 gEventObjectPic_BrendanNormal_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/11.4bpp"); -const u32 gEventObjectPic_BrendanNormal_12[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/12.4bpp"); -const u32 gEventObjectPic_BrendanNormal_13[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/13.4bpp"); -const u32 gEventObjectPic_BrendanNormal_14[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/14.4bpp"); -const u32 gEventObjectPic_BrendanNormal_15[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/15.4bpp"); -const u32 gEventObjectPic_BrendanNormal_16[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/16.4bpp"); -const u32 gEventObjectPic_BrendanNormal_17[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/17.4bpp"); +const u32 gEventObjectPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal.4bpp"); const u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/08.gbapal"); const u16 NullPalette_8310F68[16] = {}; const u16 NullPalette_8310F88[16] = {}; @@ -37,100 +20,18 @@ const u16 NullPalette_8311108[16] = {}; const u16 NullPalette_8311128[16] = {}; const u16 gEventObjectPalette9[] = INCBIN_U16("graphics/event_objects/palettes/09.gbapal"); const u16 gEventObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/10.gbapal"); -const u32 gEventObjectPic_BrendanFieldMove_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/0.4bpp"); -const u32 gEventObjectPic_BrendanFieldMove_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/1.4bpp"); -const u32 gEventObjectPic_BrendanFieldMove_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/2.4bpp"); -const u32 gEventObjectPic_BrendanFieldMove_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/3.4bpp"); -const u32 gEventObjectPic_BrendanFieldMove_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/4.4bpp"); -const u32 gEventObjectPic_BrendanSurfing_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/0.4bpp"); -const u32 gEventObjectPic_BrendanSurfing_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/3.4bpp"); -const u32 gEventObjectPic_BrendanSurfing_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/1.4bpp"); -const u32 gEventObjectPic_BrendanSurfing_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/4.4bpp"); -const u32 gEventObjectPic_BrendanSurfing_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/2.4bpp"); -const u32 gEventObjectPic_BrendanSurfing_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/5.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/0.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/1.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/2.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/3.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/4.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/5.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/6.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/7.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/8.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/00.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/01.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/02.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/03.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/04.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/05.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/06.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/07.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/08.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/09.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/10.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/11.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_12[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/12.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_13[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/13.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_14[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/14.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_15[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/15.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_16[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/16.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_17[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/17.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_18[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/18.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_19[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/19.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_20[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/20.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_21[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/21.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_22[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/22.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_23[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/23.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_24[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/24.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_25[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/25.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_26[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/26.4bpp"); -const u32 gEventObjectPic_BrendanFishing_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/00.4bpp"); -const u32 gEventObjectPic_BrendanFishing_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/01.4bpp"); -const u32 gEventObjectPic_BrendanFishing_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/02.4bpp"); -const u32 gEventObjectPic_BrendanFishing_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/03.4bpp"); -const u32 gEventObjectPic_BrendanFishing_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/04.4bpp"); -const u32 gEventObjectPic_BrendanFishing_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/05.4bpp"); -const u32 gEventObjectPic_BrendanFishing_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/06.4bpp"); -const u32 gEventObjectPic_BrendanFishing_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/07.4bpp"); -const u32 gEventObjectPic_BrendanFishing_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/08.4bpp"); -const u32 gEventObjectPic_BrendanFishing_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/09.4bpp"); -const u32 gEventObjectPic_BrendanFishing_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/10.4bpp"); -const u32 gEventObjectPic_BrendanFishing_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/11.4bpp"); -const u32 gEventObjectPic_BrendanWatering_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/0.4bpp"); -const u32 gEventObjectPic_BrendanWatering_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/3.4bpp"); -const u32 gEventObjectPic_BrendanWatering_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/1.4bpp"); -const u32 gEventObjectPic_BrendanWatering_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/4.4bpp"); -const u32 gEventObjectPic_BrendanWatering_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/2.4bpp"); -const u32 gEventObjectPic_BrendanWatering_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/5.4bpp"); +const u32 gEventObjectPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp"); +const u32 gEventObjectPic_BrendanSurfing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing.4bpp"); +const u32 gEventObjectPic_BrendanMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike.4bpp"); +const u32 gEventObjectPic_BrendanFishing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing.4bpp"); +const u32 gEventObjectPic_BrendanWatering[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering.4bpp"); const u32 gEventObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp"); const u32 gEventObjectPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/0.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/1.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/2.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/3.4bpp"); -const u32 gEventObjectPic_MayUnderwater_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/0.4bpp"); -const u32 gEventObjectPic_MayUnderwater_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/1.4bpp"); -const u32 gEventObjectPic_MayUnderwater_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/2.4bpp"); -const u32 gEventObjectPic_MayUnderwater_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/3.4bpp"); +const u32 gEventObjectPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp"); +const u32 gEventObjectPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp"); const u16 gEventObjectPalette11[] = INCBIN_U16("graphics/event_objects/palettes/11.gbapal"); -const u32 gEventObjectPic_MayNormal_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/00.4bpp"); -const u32 gEventObjectPic_MayNormal_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/01.4bpp"); -const u32 gEventObjectPic_MayNormal_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/02.4bpp"); -const u32 gEventObjectPic_MayNormal_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/03.4bpp"); -const u32 gEventObjectPic_MayNormal_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/04.4bpp"); -const u32 gEventObjectPic_MayNormal_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/05.4bpp"); -const u32 gEventObjectPic_MayNormal_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/06.4bpp"); -const u32 gEventObjectPic_MayNormal_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/07.4bpp"); -const u32 gEventObjectPic_MayNormal_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/08.4bpp"); -const u32 gEventObjectPic_MayNormal_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/09.4bpp"); -const u32 gEventObjectPic_MayNormal_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/10.4bpp"); -const u32 gEventObjectPic_MayNormal_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/11.4bpp"); -const u32 gEventObjectPic_MayNormal_12[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/12.4bpp"); -const u32 gEventObjectPic_MayNormal_13[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/13.4bpp"); -const u32 gEventObjectPic_MayNormal_14[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/14.4bpp"); -const u32 gEventObjectPic_MayNormal_15[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/15.4bpp"); -const u32 gEventObjectPic_MayNormal_16[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/16.4bpp"); -const u32 gEventObjectPic_MayNormal_17[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/17.4bpp"); +const u32 gEventObjectPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal.4bpp"); const u16 gEventObjectPalette17[] = INCBIN_U16("graphics/event_objects/palettes/17.gbapal"); const u16 gEventObjectPalette18[] = INCBIN_U16("graphics/event_objects/palettes/18.gbapal"); const u16 NullPalette_831B7E8[16] = {}; @@ -147,71 +48,12 @@ const u16 NullPalette_831B928[16] = {}; const u16 NullPalette_831B948[16] = {}; const u16 NullPalette_831B968[16] = {}; const u16 NullPalette_831B988[16] = {}; -const u32 gEventObjectPic_MayMachBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/0.4bpp"); -const u32 gEventObjectPic_MayMachBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/1.4bpp"); -const u32 gEventObjectPic_MayMachBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/2.4bpp"); -const u32 gEventObjectPic_MayMachBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/3.4bpp"); -const u32 gEventObjectPic_MayMachBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/4.4bpp"); -const u32 gEventObjectPic_MayMachBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/5.4bpp"); -const u32 gEventObjectPic_MayMachBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/6.4bpp"); -const u32 gEventObjectPic_MayMachBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/7.4bpp"); -const u32 gEventObjectPic_MayMachBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/8.4bpp"); -const u32 gEventObjectPic_MayAcroBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/00.4bpp"); -const u32 gEventObjectPic_MayAcroBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/01.4bpp"); -const u32 gEventObjectPic_MayAcroBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/02.4bpp"); -const u32 gEventObjectPic_MayAcroBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/03.4bpp"); -const u32 gEventObjectPic_MayAcroBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/04.4bpp"); -const u32 gEventObjectPic_MayAcroBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/05.4bpp"); -const u32 gEventObjectPic_MayAcroBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/06.4bpp"); -const u32 gEventObjectPic_MayAcroBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/07.4bpp"); -const u32 gEventObjectPic_MayAcroBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/08.4bpp"); -const u32 gEventObjectPic_MayAcroBike_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/09.4bpp"); -const u32 gEventObjectPic_MayAcroBike_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/10.4bpp"); -const u32 gEventObjectPic_MayAcroBike_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/11.4bpp"); -const u32 gEventObjectPic_MayAcroBike_12[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/12.4bpp"); -const u32 gEventObjectPic_MayAcroBike_13[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/13.4bpp"); -const u32 gEventObjectPic_MayAcroBike_14[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/14.4bpp"); -const u32 gEventObjectPic_MayAcroBike_15[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/15.4bpp"); -const u32 gEventObjectPic_MayAcroBike_16[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/16.4bpp"); -const u32 gEventObjectPic_MayAcroBike_17[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/17.4bpp"); -const u32 gEventObjectPic_MayAcroBike_18[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/18.4bpp"); -const u32 gEventObjectPic_MayAcroBike_19[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/19.4bpp"); -const u32 gEventObjectPic_MayAcroBike_20[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/20.4bpp"); -const u32 gEventObjectPic_MayAcroBike_21[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/21.4bpp"); -const u32 gEventObjectPic_MayAcroBike_22[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/22.4bpp"); -const u32 gEventObjectPic_MayAcroBike_23[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/23.4bpp"); -const u32 gEventObjectPic_MayAcroBike_24[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/24.4bpp"); -const u32 gEventObjectPic_MayAcroBike_25[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/25.4bpp"); -const u32 gEventObjectPic_MayAcroBike_26[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/26.4bpp"); -const u32 gEventObjectPic_MaySurfing_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/0.4bpp"); -const u32 gEventObjectPic_MaySurfing_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/3.4bpp"); -const u32 gEventObjectPic_MaySurfing_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/1.4bpp"); -const u32 gEventObjectPic_MaySurfing_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/4.4bpp"); -const u32 gEventObjectPic_MaySurfing_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/2.4bpp"); -const u32 gEventObjectPic_MaySurfing_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/5.4bpp"); -const u32 gEventObjectPic_MayFieldMove_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/0.4bpp"); -const u32 gEventObjectPic_MayFieldMove_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/1.4bpp"); -const u32 gEventObjectPic_MayFieldMove_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/2.4bpp"); -const u32 gEventObjectPic_MayFieldMove_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/3.4bpp"); -const u32 gEventObjectPic_MayFieldMove_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/4.4bpp"); -const u32 gEventObjectPic_MayFishing_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/00.4bpp"); -const u32 gEventObjectPic_MayFishing_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/01.4bpp"); -const u32 gEventObjectPic_MayFishing_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/02.4bpp"); -const u32 gEventObjectPic_MayFishing_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/03.4bpp"); -const u32 gEventObjectPic_MayFishing_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/04.4bpp"); -const u32 gEventObjectPic_MayFishing_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/05.4bpp"); -const u32 gEventObjectPic_MayFishing_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/06.4bpp"); -const u32 gEventObjectPic_MayFishing_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/07.4bpp"); -const u32 gEventObjectPic_MayFishing_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/08.4bpp"); -const u32 gEventObjectPic_MayFishing_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/09.4bpp"); -const u32 gEventObjectPic_MayFishing_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/10.4bpp"); -const u32 gEventObjectPic_MayFishing_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/11.4bpp"); -const u32 gEventObjectPic_MayWatering_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/0.4bpp"); -const u32 gEventObjectPic_MayWatering_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/3.4bpp"); -const u32 gEventObjectPic_MayWatering_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/1.4bpp"); -const u32 gEventObjectPic_MayWatering_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/4.4bpp"); -const u32 gEventObjectPic_MayWatering_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/2.4bpp"); -const u32 gEventObjectPic_MayWatering_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/5.4bpp"); +const u32 gEventObjectPic_MayMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike.4bpp"); +const u32 gEventObjectPic_MayAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike.4bpp"); +const u32 gEventObjectPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing.4bpp"); +const u32 gEventObjectPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp"); +const u32 gEventObjectPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp"); +const u32 gEventObjectPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp"); const u16 gEventObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/00.gbapal"); const u16 gEventObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/01.gbapal"); const u16 gEventObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/02.gbapal"); @@ -220,807 +62,114 @@ const u16 gEventObjectPalette4[] = INCBIN_U16("graphics/event_objects/palettes/0 const u16 gEventObjectPalette5[] = INCBIN_U16("graphics/event_objects/palettes/05.gbapal"); const u16 gEventObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/06.gbapal"); const u16 gEventObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/07.gbapal"); -const u32 gEventObjectPic_LittleBoy1_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/0.4bpp"); -const u32 gEventObjectPic_LittleBoy1_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/1.4bpp"); -const u32 gEventObjectPic_LittleBoy1_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/2.4bpp"); -const u32 gEventObjectPic_LittleBoy1_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/3.4bpp"); -const u32 gEventObjectPic_LittleBoy1_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/4.4bpp"); -const u32 gEventObjectPic_LittleBoy1_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/5.4bpp"); -const u32 gEventObjectPic_LittleBoy1_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/6.4bpp"); -const u32 gEventObjectPic_LittleBoy1_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/7.4bpp"); -const u32 gEventObjectPic_LittleBoy1_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/8.4bpp"); -const u32 gEventObjectPic_LittleGirl1_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/0.4bpp"); -const u32 gEventObjectPic_LittleGirl1_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/1.4bpp"); -const u32 gEventObjectPic_LittleGirl1_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/2.4bpp"); -const u32 gEventObjectPic_LittleGirl1_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/3.4bpp"); -const u32 gEventObjectPic_LittleGirl1_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/4.4bpp"); -const u32 gEventObjectPic_LittleGirl1_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/5.4bpp"); -const u32 gEventObjectPic_LittleGirl1_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/6.4bpp"); -const u32 gEventObjectPic_LittleGirl1_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/7.4bpp"); -const u32 gEventObjectPic_LittleGirl1_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/8.4bpp"); -const u32 gEventObjectPic_Boy1_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/0.4bpp"); -const u32 gEventObjectPic_Boy1_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/1.4bpp"); -const u32 gEventObjectPic_Boy1_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/2.4bpp"); -const u32 gEventObjectPic_Boy1_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/3.4bpp"); -const u32 gEventObjectPic_Boy1_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/4.4bpp"); -const u32 gEventObjectPic_Boy1_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/5.4bpp"); -const u32 gEventObjectPic_Boy1_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/6.4bpp"); -const u32 gEventObjectPic_Boy1_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/7.4bpp"); -const u32 gEventObjectPic_Boy1_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/8.4bpp"); -const u32 gEventObjectPic_Girl1_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/0.4bpp"); -const u32 gEventObjectPic_Girl1_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/1.4bpp"); -const u32 gEventObjectPic_Girl1_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/2.4bpp"); -const u32 gEventObjectPic_Girl1_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/3.4bpp"); -const u32 gEventObjectPic_Girl1_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/4.4bpp"); -const u32 gEventObjectPic_Girl1_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/5.4bpp"); -const u32 gEventObjectPic_Girl1_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/6.4bpp"); -const u32 gEventObjectPic_Girl1_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/7.4bpp"); -const u32 gEventObjectPic_Girl1_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/8.4bpp"); -const u32 gEventObjectPic_Boy2_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/0.4bpp"); -const u32 gEventObjectPic_Boy2_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/1.4bpp"); -const u32 gEventObjectPic_Boy2_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/2.4bpp"); -const u32 gEventObjectPic_Boy2_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/3.4bpp"); -const u32 gEventObjectPic_Boy2_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/4.4bpp"); -const u32 gEventObjectPic_Boy2_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/5.4bpp"); -const u32 gEventObjectPic_Boy2_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/6.4bpp"); -const u32 gEventObjectPic_Boy2_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/7.4bpp"); -const u32 gEventObjectPic_Boy2_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/8.4bpp"); -const u32 gEventObjectPic_Girl2_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/0.4bpp"); -const u32 gEventObjectPic_Girl2_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/1.4bpp"); -const u32 gEventObjectPic_Girl2_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/2.4bpp"); -const u32 gEventObjectPic_Girl2_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/3.4bpp"); -const u32 gEventObjectPic_Girl2_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/4.4bpp"); -const u32 gEventObjectPic_Girl2_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/5.4bpp"); -const u32 gEventObjectPic_Girl2_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/6.4bpp"); -const u32 gEventObjectPic_Girl2_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/7.4bpp"); -const u32 gEventObjectPic_Girl2_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/8.4bpp"); -const u32 gEventObjectPic_LittleBoy2_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/0.4bpp"); -const u32 gEventObjectPic_LittleBoy2_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/1.4bpp"); -const u32 gEventObjectPic_LittleBoy2_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/2.4bpp"); -const u32 gEventObjectPic_LittleBoy2_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/3.4bpp"); -const u32 gEventObjectPic_LittleBoy2_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/4.4bpp"); -const u32 gEventObjectPic_LittleBoy2_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/5.4bpp"); -const u32 gEventObjectPic_LittleBoy2_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/6.4bpp"); -const u32 gEventObjectPic_LittleBoy2_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/7.4bpp"); -const u32 gEventObjectPic_LittleBoy2_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/8.4bpp"); -const u32 gEventObjectPic_LittleGirl2_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/0.4bpp"); -const u32 gEventObjectPic_LittleGirl2_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/1.4bpp"); -const u32 gEventObjectPic_LittleGirl2_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/2.4bpp"); -const u32 gEventObjectPic_LittleGirl2_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/3.4bpp"); -const u32 gEventObjectPic_LittleGirl2_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/4.4bpp"); -const u32 gEventObjectPic_LittleGirl2_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/5.4bpp"); -const u32 gEventObjectPic_LittleGirl2_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/6.4bpp"); -const u32 gEventObjectPic_LittleGirl2_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/7.4bpp"); -const u32 gEventObjectPic_LittleGirl2_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/8.4bpp"); -const u32 gEventObjectPic_Boy3_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/0.4bpp"); -const u32 gEventObjectPic_Boy3_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/1.4bpp"); -const u32 gEventObjectPic_Boy3_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/2.4bpp"); -const u32 gEventObjectPic_Boy3_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/3.4bpp"); -const u32 gEventObjectPic_Boy3_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/4.4bpp"); -const u32 gEventObjectPic_Boy3_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/5.4bpp"); -const u32 gEventObjectPic_Boy3_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/6.4bpp"); -const u32 gEventObjectPic_Boy3_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/7.4bpp"); -const u32 gEventObjectPic_Boy3_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/8.4bpp"); -const u32 gEventObjectPic_Girl3_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/0.4bpp"); -const u32 gEventObjectPic_Girl3_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/1.4bpp"); -const u32 gEventObjectPic_Girl3_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/2.4bpp"); -const u32 gEventObjectPic_Girl3_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/3.4bpp"); -const u32 gEventObjectPic_Girl3_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/4.4bpp"); -const u32 gEventObjectPic_Girl3_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/5.4bpp"); -const u32 gEventObjectPic_Girl3_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/6.4bpp"); -const u32 gEventObjectPic_Girl3_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/7.4bpp"); -const u32 gEventObjectPic_Girl3_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/8.4bpp"); -const u32 gEventObjectPic_Boy4_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/0.4bpp"); -const u32 gEventObjectPic_Boy4_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/1.4bpp"); -const u32 gEventObjectPic_Boy4_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/2.4bpp"); -const u32 gEventObjectPic_Boy4_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/3.4bpp"); -const u32 gEventObjectPic_Boy4_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/4.4bpp"); -const u32 gEventObjectPic_Boy4_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/5.4bpp"); -const u32 gEventObjectPic_Boy4_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/6.4bpp"); -const u32 gEventObjectPic_Boy4_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/7.4bpp"); -const u32 gEventObjectPic_Boy4_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/8.4bpp"); -const u32 gEventObjectPic_Woman1_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/0.4bpp"); -const u32 gEventObjectPic_Woman1_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/1.4bpp"); -const u32 gEventObjectPic_Woman1_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/2.4bpp"); -const u32 gEventObjectPic_Woman1_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/3.4bpp"); -const u32 gEventObjectPic_Woman1_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/4.4bpp"); -const u32 gEventObjectPic_Woman1_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/5.4bpp"); -const u32 gEventObjectPic_Woman1_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/6.4bpp"); -const u32 gEventObjectPic_Woman1_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/7.4bpp"); -const u32 gEventObjectPic_Woman1_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/8.4bpp"); -const u32 gEventObjectPic_FatMan_0[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/0.4bpp"); -const u32 gEventObjectPic_FatMan_1[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/1.4bpp"); -const u32 gEventObjectPic_FatMan_2[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/2.4bpp"); -const u32 gEventObjectPic_FatMan_3[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/3.4bpp"); -const u32 gEventObjectPic_FatMan_4[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/4.4bpp"); -const u32 gEventObjectPic_FatMan_5[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/5.4bpp"); -const u32 gEventObjectPic_FatMan_6[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/6.4bpp"); -const u32 gEventObjectPic_FatMan_7[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/7.4bpp"); -const u32 gEventObjectPic_FatMan_8[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/8.4bpp"); -const u32 gEventObjectPic_Woman2_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/0.4bpp"); -const u32 gEventObjectPic_Woman2_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/1.4bpp"); -const u32 gEventObjectPic_Woman2_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/2.4bpp"); -const u32 gEventObjectPic_Woman2_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/3.4bpp"); -const u32 gEventObjectPic_Woman2_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/4.4bpp"); -const u32 gEventObjectPic_Woman2_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/5.4bpp"); -const u32 gEventObjectPic_Woman2_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/6.4bpp"); -const u32 gEventObjectPic_Woman2_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/7.4bpp"); -const u32 gEventObjectPic_Woman2_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/8.4bpp"); -const u32 gEventObjectPic_Man1_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/0.4bpp"); -const u32 gEventObjectPic_Man1_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/1.4bpp"); -const u32 gEventObjectPic_Man1_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/2.4bpp"); -const u32 gEventObjectPic_Man1_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/3.4bpp"); -const u32 gEventObjectPic_Man1_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/4.4bpp"); -const u32 gEventObjectPic_Man1_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/5.4bpp"); -const u32 gEventObjectPic_Man1_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/6.4bpp"); -const u32 gEventObjectPic_Man1_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/7.4bpp"); -const u32 gEventObjectPic_Man1_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/8.4bpp"); -const u32 gEventObjectPic_Woman3_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/0.4bpp"); -const u32 gEventObjectPic_Woman3_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/1.4bpp"); -const u32 gEventObjectPic_Woman3_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/2.4bpp"); -const u32 gEventObjectPic_Woman3_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/3.4bpp"); -const u32 gEventObjectPic_Woman3_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/4.4bpp"); -const u32 gEventObjectPic_Woman3_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/5.4bpp"); -const u32 gEventObjectPic_Woman3_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/6.4bpp"); -const u32 gEventObjectPic_Woman3_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/7.4bpp"); -const u32 gEventObjectPic_Woman3_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/8.4bpp"); -const u32 gEventObjectPic_OldMan1_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/0.4bpp"); -const u32 gEventObjectPic_OldMan1_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/1.4bpp"); -const u32 gEventObjectPic_OldMan1_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/2.4bpp"); -const u32 gEventObjectPic_OldMan1_3[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/3.4bpp"); -const u32 gEventObjectPic_OldMan1_4[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/4.4bpp"); -const u32 gEventObjectPic_OldMan1_5[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/5.4bpp"); -const u32 gEventObjectPic_OldMan1_6[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/6.4bpp"); -const u32 gEventObjectPic_OldMan1_7[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/7.4bpp"); -const u32 gEventObjectPic_OldMan1_8[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/8.4bpp"); -const u32 gEventObjectPic_OldWoman1_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/0.4bpp"); -const u32 gEventObjectPic_OldWoman1_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/1.4bpp"); -const u32 gEventObjectPic_OldWoman1_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/2.4bpp"); -const u32 gEventObjectPic_OldWoman1_3[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/3.4bpp"); -const u32 gEventObjectPic_OldWoman1_4[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/4.4bpp"); -const u32 gEventObjectPic_OldWoman1_5[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/5.4bpp"); -const u32 gEventObjectPic_OldWoman1_6[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/6.4bpp"); -const u32 gEventObjectPic_OldWoman1_7[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/7.4bpp"); -const u32 gEventObjectPic_OldWoman1_8[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/8.4bpp"); -const u32 gEventObjectPic_Man2_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/0.4bpp"); -const u32 gEventObjectPic_Man2_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/1.4bpp"); -const u32 gEventObjectPic_Man2_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/2.4bpp"); -const u32 gEventObjectPic_Man2_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/3.4bpp"); -const u32 gEventObjectPic_Man2_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/4.4bpp"); -const u32 gEventObjectPic_Man2_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/5.4bpp"); -const u32 gEventObjectPic_Man2_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/6.4bpp"); -const u32 gEventObjectPic_Man2_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/7.4bpp"); -const u32 gEventObjectPic_Man2_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/8.4bpp"); -const u32 gEventObjectPic_Woman4_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/0.4bpp"); -const u32 gEventObjectPic_Woman4_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/1.4bpp"); -const u32 gEventObjectPic_Woman4_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/2.4bpp"); -const u32 gEventObjectPic_Woman4_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/3.4bpp"); -const u32 gEventObjectPic_Woman4_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/4.4bpp"); -const u32 gEventObjectPic_Woman4_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/5.4bpp"); -const u32 gEventObjectPic_Woman4_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/6.4bpp"); -const u32 gEventObjectPic_Woman4_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/7.4bpp"); -const u32 gEventObjectPic_Woman4_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/8.4bpp"); -const u32 gEventObjectPic_Man3_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/0.4bpp"); -const u32 gEventObjectPic_Man3_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/1.4bpp"); -const u32 gEventObjectPic_Man3_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/2.4bpp"); -const u32 gEventObjectPic_Man3_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/3.4bpp"); -const u32 gEventObjectPic_Man3_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/4.4bpp"); -const u32 gEventObjectPic_Man3_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/5.4bpp"); -const u32 gEventObjectPic_Man3_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/6.4bpp"); -const u32 gEventObjectPic_Man3_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/7.4bpp"); -const u32 gEventObjectPic_Man3_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/8.4bpp"); -const u32 gEventObjectPic_Woman5_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/0.4bpp"); -const u32 gEventObjectPic_Woman5_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/1.4bpp"); -const u32 gEventObjectPic_Woman5_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/2.4bpp"); -const u32 gEventObjectPic_Woman5_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/3.4bpp"); -const u32 gEventObjectPic_Woman5_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/4.4bpp"); -const u32 gEventObjectPic_Woman5_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/5.4bpp"); -const u32 gEventObjectPic_Woman5_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/6.4bpp"); -const u32 gEventObjectPic_Woman5_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/7.4bpp"); -const u32 gEventObjectPic_Woman5_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/8.4bpp"); -const u32 gEventObjectPic_Cook_0[] = INCBIN_U32("graphics/event_objects/pics/people/cook/0.4bpp"); -const u32 gEventObjectPic_Cook_1[] = INCBIN_U32("graphics/event_objects/pics/people/cook/1.4bpp"); -const u32 gEventObjectPic_Cook_2[] = INCBIN_U32("graphics/event_objects/pics/people/cook/2.4bpp"); -const u32 gEventObjectPic_Woman6_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/0.4bpp"); -const u32 gEventObjectPic_Woman6_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/1.4bpp"); -const u32 gEventObjectPic_Woman6_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/2.4bpp"); -const u32 gEventObjectPic_Woman6_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/3.4bpp"); -const u32 gEventObjectPic_Woman6_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/4.4bpp"); -const u32 gEventObjectPic_Woman6_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/5.4bpp"); -const u32 gEventObjectPic_Woman6_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/6.4bpp"); -const u32 gEventObjectPic_Woman6_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/7.4bpp"); -const u32 gEventObjectPic_Woman6_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/8.4bpp"); -const u32 gEventObjectPic_OldMan2_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/0.4bpp"); -const u32 gEventObjectPic_OldMan2_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/1.4bpp"); -const u32 gEventObjectPic_OldMan2_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/2.4bpp"); -const u32 gEventObjectPic_OldWoman2_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/0.4bpp"); -const u32 gEventObjectPic_OldWoman2_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/1.4bpp"); -const u32 gEventObjectPic_OldWoman2_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/2.4bpp"); -const u32 gEventObjectPic_Camper_0[] = INCBIN_U32("graphics/event_objects/pics/people/camper/0.4bpp"); -const u32 gEventObjectPic_Camper_1[] = INCBIN_U32("graphics/event_objects/pics/people/camper/1.4bpp"); -const u32 gEventObjectPic_Camper_2[] = INCBIN_U32("graphics/event_objects/pics/people/camper/2.4bpp"); -const u32 gEventObjectPic_Camper_3[] = INCBIN_U32("graphics/event_objects/pics/people/camper/3.4bpp"); -const u32 gEventObjectPic_Camper_4[] = INCBIN_U32("graphics/event_objects/pics/people/camper/4.4bpp"); -const u32 gEventObjectPic_Camper_5[] = INCBIN_U32("graphics/event_objects/pics/people/camper/5.4bpp"); -const u32 gEventObjectPic_Camper_6[] = INCBIN_U32("graphics/event_objects/pics/people/camper/6.4bpp"); -const u32 gEventObjectPic_Camper_7[] = INCBIN_U32("graphics/event_objects/pics/people/camper/7.4bpp"); -const u32 gEventObjectPic_Camper_8[] = INCBIN_U32("graphics/event_objects/pics/people/camper/8.4bpp"); -const u32 gEventObjectPic_Picnicker_0[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/0.4bpp"); -const u32 gEventObjectPic_Picnicker_1[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/1.4bpp"); -const u32 gEventObjectPic_Picnicker_2[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/2.4bpp"); -const u32 gEventObjectPic_Picnicker_3[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/3.4bpp"); -const u32 gEventObjectPic_Picnicker_4[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/4.4bpp"); -const u32 gEventObjectPic_Picnicker_5[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/5.4bpp"); -const u32 gEventObjectPic_Picnicker_6[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/6.4bpp"); -const u32 gEventObjectPic_Picnicker_7[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/7.4bpp"); -const u32 gEventObjectPic_Picnicker_8[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/8.4bpp"); -const u32 gEventObjectPic_Man4_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/0.4bpp"); -const u32 gEventObjectPic_Man4_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/1.4bpp"); -const u32 gEventObjectPic_Man4_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/2.4bpp"); -const u32 gEventObjectPic_Man4_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/3.4bpp"); -const u32 gEventObjectPic_Man4_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/4.4bpp"); -const u32 gEventObjectPic_Man4_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/5.4bpp"); -const u32 gEventObjectPic_Man4_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/6.4bpp"); -const u32 gEventObjectPic_Man4_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/7.4bpp"); -const u32 gEventObjectPic_Man4_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/8.4bpp"); -const u32 gEventObjectPic_Woman7_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/0.4bpp"); -const u32 gEventObjectPic_Woman7_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/1.4bpp"); -const u32 gEventObjectPic_Woman7_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/2.4bpp"); -const u32 gEventObjectPic_Woman7_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/3.4bpp"); -const u32 gEventObjectPic_Woman7_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/4.4bpp"); -const u32 gEventObjectPic_Woman7_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/5.4bpp"); -const u32 gEventObjectPic_Woman7_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/6.4bpp"); -const u32 gEventObjectPic_Woman7_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/7.4bpp"); -const u32 gEventObjectPic_Woman7_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/8.4bpp"); -const u32 gEventObjectPic_Youngster_0[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/0.4bpp"); -const u32 gEventObjectPic_Youngster_1[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/1.4bpp"); -const u32 gEventObjectPic_Youngster_2[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/2.4bpp"); -const u32 gEventObjectPic_Youngster_3[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/3.4bpp"); -const u32 gEventObjectPic_Youngster_4[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/4.4bpp"); -const u32 gEventObjectPic_Youngster_5[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/5.4bpp"); -const u32 gEventObjectPic_Youngster_6[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/6.4bpp"); -const u32 gEventObjectPic_Youngster_7[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/7.4bpp"); -const u32 gEventObjectPic_Youngster_8[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/8.4bpp"); -const u32 gEventObjectPic_BugCatcher_0[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/0.4bpp"); -const u32 gEventObjectPic_BugCatcher_1[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/1.4bpp"); -const u32 gEventObjectPic_BugCatcher_2[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/2.4bpp"); -const u32 gEventObjectPic_BugCatcher_3[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/3.4bpp"); -const u32 gEventObjectPic_BugCatcher_4[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/4.4bpp"); -const u32 gEventObjectPic_BugCatcher_5[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/5.4bpp"); -const u32 gEventObjectPic_BugCatcher_6[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/6.4bpp"); -const u32 gEventObjectPic_BugCatcher_7[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/7.4bpp"); -const u32 gEventObjectPic_BugCatcher_8[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/8.4bpp"); -const u32 gEventObjectPic_PsychicM_0[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/0.4bpp"); -const u32 gEventObjectPic_PsychicM_1[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/1.4bpp"); -const u32 gEventObjectPic_PsychicM_2[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/2.4bpp"); -const u32 gEventObjectPic_PsychicM_3[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/3.4bpp"); -const u32 gEventObjectPic_PsychicM_4[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/4.4bpp"); -const u32 gEventObjectPic_PsychicM_5[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/5.4bpp"); -const u32 gEventObjectPic_PsychicM_6[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/6.4bpp"); -const u32 gEventObjectPic_PsychicM_7[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/7.4bpp"); -const u32 gEventObjectPic_PsychicM_8[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/8.4bpp"); -const u32 gEventObjectPic_SchoolKidM_0[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/0.4bpp"); -const u32 gEventObjectPic_SchoolKidM_1[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/1.4bpp"); -const u32 gEventObjectPic_SchoolKidM_2[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/2.4bpp"); -const u32 gEventObjectPic_SchoolKidM_3[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/3.4bpp"); -const u32 gEventObjectPic_SchoolKidM_4[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/4.4bpp"); -const u32 gEventObjectPic_SchoolKidM_5[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/5.4bpp"); -const u32 gEventObjectPic_SchoolKidM_6[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/6.4bpp"); -const u32 gEventObjectPic_SchoolKidM_7[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/7.4bpp"); -const u32 gEventObjectPic_SchoolKidM_8[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/8.4bpp"); -const u32 gEventObjectPic_Maniac_0[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/0.4bpp"); -const u32 gEventObjectPic_Maniac_1[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/1.4bpp"); -const u32 gEventObjectPic_Maniac_2[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/2.4bpp"); -const u32 gEventObjectPic_Maniac_3[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/3.4bpp"); -const u32 gEventObjectPic_Maniac_4[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/4.4bpp"); -const u32 gEventObjectPic_Maniac_5[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/5.4bpp"); -const u32 gEventObjectPic_Maniac_6[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/6.4bpp"); -const u32 gEventObjectPic_Maniac_7[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/7.4bpp"); -const u32 gEventObjectPic_Maniac_8[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/8.4bpp"); -const u32 gEventObjectPic_HexManiac_0[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/0.4bpp"); -const u32 gEventObjectPic_HexManiac_1[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/1.4bpp"); -const u32 gEventObjectPic_HexManiac_2[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/2.4bpp"); -const u32 gEventObjectPic_HexManiac_3[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/3.4bpp"); -const u32 gEventObjectPic_HexManiac_4[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/4.4bpp"); -const u32 gEventObjectPic_HexManiac_5[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/5.4bpp"); -const u32 gEventObjectPic_HexManiac_6[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/6.4bpp"); -const u32 gEventObjectPic_HexManiac_7[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/7.4bpp"); -const u32 gEventObjectPic_HexManiac_8[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/8.4bpp"); -const u32 gEventObjectPic_Woman8_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/0.4bpp"); -const u32 gEventObjectPic_Woman8_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/1.4bpp"); -const u32 gEventObjectPic_Woman8_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/2.4bpp"); -const u32 gEventObjectPic_Woman8_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/3.4bpp"); -const u32 gEventObjectPic_Woman8_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/4.4bpp"); -const u32 gEventObjectPic_Woman8_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/5.4bpp"); -const u32 gEventObjectPic_Woman8_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/6.4bpp"); -const u32 gEventObjectPic_Woman8_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/7.4bpp"); -const u32 gEventObjectPic_Woman8_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/8.4bpp"); -const u32 gEventObjectPic_SwimmerM_0[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/0.4bpp"); -const u32 gEventObjectPic_SwimmerM_1[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/1.4bpp"); -const u32 gEventObjectPic_SwimmerM_2[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/2.4bpp"); -const u32 gEventObjectPic_SwimmerM_3[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/3.4bpp"); -const u32 gEventObjectPic_SwimmerM_4[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/4.4bpp"); -const u32 gEventObjectPic_SwimmerM_5[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/5.4bpp"); -const u32 gEventObjectPic_SwimmerM_6[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/6.4bpp"); -const u32 gEventObjectPic_SwimmerM_7[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/7.4bpp"); -const u32 gEventObjectPic_SwimmerM_8[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/8.4bpp"); -const u32 gEventObjectPic_SwimmerF_0[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/0.4bpp"); -const u32 gEventObjectPic_SwimmerF_1[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/1.4bpp"); -const u32 gEventObjectPic_SwimmerF_2[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/2.4bpp"); -const u32 gEventObjectPic_SwimmerF_3[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/3.4bpp"); -const u32 gEventObjectPic_SwimmerF_4[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/4.4bpp"); -const u32 gEventObjectPic_SwimmerF_5[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/5.4bpp"); -const u32 gEventObjectPic_SwimmerF_6[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/6.4bpp"); -const u32 gEventObjectPic_SwimmerF_7[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/7.4bpp"); -const u32 gEventObjectPic_SwimmerF_8[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/8.4bpp"); -const u32 gEventObjectPic_BlackBelt_0[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/0.4bpp"); -const u32 gEventObjectPic_BlackBelt_1[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/1.4bpp"); -const u32 gEventObjectPic_BlackBelt_2[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/2.4bpp"); -const u32 gEventObjectPic_BlackBelt_3[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/3.4bpp"); -const u32 gEventObjectPic_BlackBelt_4[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/4.4bpp"); -const u32 gEventObjectPic_BlackBelt_5[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/5.4bpp"); -const u32 gEventObjectPic_BlackBelt_6[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/6.4bpp"); -const u32 gEventObjectPic_BlackBelt_7[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/7.4bpp"); -const u32 gEventObjectPic_BlackBelt_8[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/8.4bpp"); -const u32 gEventObjectPic_Beauty_0[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/0.4bpp"); -const u32 gEventObjectPic_Beauty_1[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/1.4bpp"); -const u32 gEventObjectPic_Beauty_2[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/2.4bpp"); -const u32 gEventObjectPic_Beauty_3[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/3.4bpp"); -const u32 gEventObjectPic_Beauty_4[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/4.4bpp"); -const u32 gEventObjectPic_Beauty_5[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/5.4bpp"); -const u32 gEventObjectPic_Beauty_6[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/6.4bpp"); -const u32 gEventObjectPic_Beauty_7[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/7.4bpp"); -const u32 gEventObjectPic_Beauty_8[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/8.4bpp"); -const u32 gEventObjectPic_Scientist1_0[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/0.4bpp"); -const u32 gEventObjectPic_Scientist1_1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/1.4bpp"); -const u32 gEventObjectPic_Scientist1_2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/2.4bpp"); -const u32 gEventObjectPic_Scientist1_3[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/3.4bpp"); -const u32 gEventObjectPic_Scientist1_4[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/4.4bpp"); -const u32 gEventObjectPic_Scientist1_5[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/5.4bpp"); -const u32 gEventObjectPic_Scientist1_6[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/6.4bpp"); -const u32 gEventObjectPic_Scientist1_7[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/7.4bpp"); -const u32 gEventObjectPic_Scientist1_8[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/8.4bpp"); -const u32 gEventObjectPic_Lass_0[] = INCBIN_U32("graphics/event_objects/pics/people/lass/0.4bpp"); -const u32 gEventObjectPic_Lass_1[] = INCBIN_U32("graphics/event_objects/pics/people/lass/1.4bpp"); -const u32 gEventObjectPic_Lass_2[] = INCBIN_U32("graphics/event_objects/pics/people/lass/2.4bpp"); -const u32 gEventObjectPic_Lass_3[] = INCBIN_U32("graphics/event_objects/pics/people/lass/3.4bpp"); -const u32 gEventObjectPic_Lass_4[] = INCBIN_U32("graphics/event_objects/pics/people/lass/4.4bpp"); -const u32 gEventObjectPic_Lass_5[] = INCBIN_U32("graphics/event_objects/pics/people/lass/5.4bpp"); -const u32 gEventObjectPic_Lass_6[] = INCBIN_U32("graphics/event_objects/pics/people/lass/6.4bpp"); -const u32 gEventObjectPic_Lass_7[] = INCBIN_U32("graphics/event_objects/pics/people/lass/7.4bpp"); -const u32 gEventObjectPic_Lass_8[] = INCBIN_U32("graphics/event_objects/pics/people/lass/8.4bpp"); -const u32 gEventObjectPic_Gentleman_0[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/0.4bpp"); -const u32 gEventObjectPic_Gentleman_1[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/1.4bpp"); -const u32 gEventObjectPic_Gentleman_2[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/2.4bpp"); -const u32 gEventObjectPic_Gentleman_3[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/3.4bpp"); -const u32 gEventObjectPic_Gentleman_4[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/4.4bpp"); -const u32 gEventObjectPic_Gentleman_5[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/5.4bpp"); -const u32 gEventObjectPic_Gentleman_6[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/6.4bpp"); -const u32 gEventObjectPic_Gentleman_7[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/7.4bpp"); -const u32 gEventObjectPic_Gentleman_8[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/8.4bpp"); -const u32 gEventObjectPic_Sailor_0[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/0.4bpp"); -const u32 gEventObjectPic_Sailor_1[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/1.4bpp"); -const u32 gEventObjectPic_Sailor_2[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/2.4bpp"); -const u32 gEventObjectPic_Sailor_3[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/3.4bpp"); -const u32 gEventObjectPic_Sailor_4[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/4.4bpp"); -const u32 gEventObjectPic_Sailor_5[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/5.4bpp"); -const u32 gEventObjectPic_Sailor_6[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/6.4bpp"); -const u32 gEventObjectPic_Sailor_7[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/7.4bpp"); -const u32 gEventObjectPic_Sailor_8[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/8.4bpp"); -const u32 gEventObjectPic_Fisherman_0[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/0.4bpp"); -const u32 gEventObjectPic_Fisherman_1[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/1.4bpp"); -const u32 gEventObjectPic_Fisherman_2[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/2.4bpp"); -const u32 gEventObjectPic_Fisherman_3[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/3.4bpp"); -const u32 gEventObjectPic_Fisherman_4[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/4.4bpp"); -const u32 gEventObjectPic_Fisherman_5[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/5.4bpp"); -const u32 gEventObjectPic_Fisherman_6[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/6.4bpp"); -const u32 gEventObjectPic_Fisherman_7[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/7.4bpp"); -const u32 gEventObjectPic_Fisherman_8[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/8.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_0[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/0.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_1[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/1.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_2[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/2.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_3[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/3.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_4[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/4.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_5[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/5.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_6[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/6.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_7[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/7.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_8[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/8.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_0[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/0.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_1[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/1.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_2[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/2.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_3[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/3.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_4[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/4.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_5[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/5.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_6[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/6.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_7[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/7.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_8[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/8.4bpp"); -const u32 gEventObjectPic_TuberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/0.4bpp"); -const u32 gEventObjectPic_TuberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/1.4bpp"); -const u32 gEventObjectPic_TuberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/2.4bpp"); -const u32 gEventObjectPic_TuberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/3.4bpp"); -const u32 gEventObjectPic_TuberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/4.4bpp"); -const u32 gEventObjectPic_TuberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/5.4bpp"); -const u32 gEventObjectPic_TuberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/6.4bpp"); -const u32 gEventObjectPic_TuberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/7.4bpp"); -const u32 gEventObjectPic_TuberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/8.4bpp"); -const u32 gEventObjectPic_TuberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/0.4bpp"); -const u32 gEventObjectPic_TuberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/1.4bpp"); -const u32 gEventObjectPic_TuberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/2.4bpp"); -const u32 gEventObjectPic_TuberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/3.4bpp"); -const u32 gEventObjectPic_TuberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/4.4bpp"); -const u32 gEventObjectPic_TuberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/5.4bpp"); -const u32 gEventObjectPic_TuberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/6.4bpp"); -const u32 gEventObjectPic_TuberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/7.4bpp"); -const u32 gEventObjectPic_TuberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/8.4bpp"); -const u32 gEventObjectPic_Hiker_0[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/0.4bpp"); -const u32 gEventObjectPic_Hiker_1[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/1.4bpp"); -const u32 gEventObjectPic_Hiker_2[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/2.4bpp"); -const u32 gEventObjectPic_Hiker_3[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/3.4bpp"); -const u32 gEventObjectPic_Hiker_4[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/4.4bpp"); -const u32 gEventObjectPic_Hiker_5[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/5.4bpp"); -const u32 gEventObjectPic_Hiker_6[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/6.4bpp"); -const u32 gEventObjectPic_Hiker_7[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/7.4bpp"); -const u32 gEventObjectPic_Hiker_8[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/8.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_0[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/0.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_1[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/1.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_2[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/2.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_3[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/3.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_4[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/4.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_5[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/5.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_6[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/6.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_7[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/7.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_8[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/8.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_0[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/0.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_1[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/1.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_2[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/2.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_3[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/3.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_4[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/4.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_5[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/5.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_6[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/6.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_7[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/7.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_8[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/8.4bpp"); -const u32 gEventObjectPic_Man5_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/0.4bpp"); -const u32 gEventObjectPic_Man5_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/1.4bpp"); -const u32 gEventObjectPic_Man5_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/2.4bpp"); -const u32 gEventObjectPic_Man5_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/3.4bpp"); -const u32 gEventObjectPic_Man5_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/4.4bpp"); -const u32 gEventObjectPic_Man5_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/5.4bpp"); -const u32 gEventObjectPic_Man5_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/6.4bpp"); -const u32 gEventObjectPic_Man5_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/7.4bpp"); -const u32 gEventObjectPic_Man5_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/8.4bpp"); -const u32 gEventObjectPic_Man6_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/0.4bpp"); -const u32 gEventObjectPic_Man6_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/1.4bpp"); -const u32 gEventObjectPic_Man6_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/2.4bpp"); -const u32 gEventObjectPic_Man6_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/3.4bpp"); -const u32 gEventObjectPic_Man6_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/4.4bpp"); -const u32 gEventObjectPic_Man6_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/5.4bpp"); -const u32 gEventObjectPic_Man6_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/6.4bpp"); -const u32 gEventObjectPic_Man6_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/7.4bpp"); -const u32 gEventObjectPic_Man6_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/8.4bpp"); -const u32 gEventObjectPic_Nurse_0[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/0.4bpp"); -const u32 gEventObjectPic_Nurse_1[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/1.4bpp"); -const u32 gEventObjectPic_Nurse_2[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/2.4bpp"); -const u32 gEventObjectPic_Nurse_3[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/3.4bpp"); -const u32 gEventObjectPic_Nurse_4[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/4.4bpp"); -const u32 gEventObjectPic_Nurse_5[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/5.4bpp"); -const u32 gEventObjectPic_Nurse_6[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/6.4bpp"); -const u32 gEventObjectPic_Nurse_7[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/7.4bpp"); -const u32 gEventObjectPic_Nurse_8[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/8.4bpp"); -const u32 gEventObjectPic_Nurse_9[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/9.4bpp"); +const u32 gEventObjectPic_LittleBoy1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1.4bpp"); +const u32 gEventObjectPic_LittleGirl1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1.4bpp"); +const u32 gEventObjectPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp"); +const u32 gEventObjectPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1.4bpp"); +const u32 gEventObjectPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp"); +const u32 gEventObjectPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp"); +const u32 gEventObjectPic_LittleBoy2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2.4bpp"); +const u32 gEventObjectPic_LittleGirl2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2.4bpp"); +const u32 gEventObjectPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp"); +const u32 gEventObjectPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp"); +const u32 gEventObjectPic_Boy4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4.4bpp"); +const u32 gEventObjectPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp"); +const u32 gEventObjectPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp"); +const u32 gEventObjectPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp"); +const u32 gEventObjectPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp"); +const u32 gEventObjectPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp"); +const u32 gEventObjectPic_OldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1.4bpp"); +const u32 gEventObjectPic_OldWoman1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1.4bpp"); +const u32 gEventObjectPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp"); +const u32 gEventObjectPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.4bpp"); +const u32 gEventObjectPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp"); +const u32 gEventObjectPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp"); +const u32 gEventObjectPic_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp"); +const u32 gEventObjectPic_Woman6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6.4bpp"); +const u32 gEventObjectPic_OldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2.4bpp"); +const u32 gEventObjectPic_OldWoman2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2.4bpp"); +const u32 gEventObjectPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp"); +const u32 gEventObjectPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp"); +const u32 gEventObjectPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp"); +const u32 gEventObjectPic_Woman7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7.4bpp"); +const u32 gEventObjectPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp"); +const u32 gEventObjectPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp"); +const u32 gEventObjectPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp"); +const u32 gEventObjectPic_SchoolKidM[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m.4bpp"); +const u32 gEventObjectPic_Maniac[] = INCBIN_U32("graphics/event_objects/pics/people/maniac.4bpp"); +const u32 gEventObjectPic_HexManiac[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac.4bpp"); +const u32 gEventObjectPic_Woman8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8.4bpp"); +const u32 gEventObjectPic_SwimmerM[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m.4bpp"); +const u32 gEventObjectPic_SwimmerF[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f.4bpp"); +const u32 gEventObjectPic_BlackBelt[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt.4bpp"); +const u32 gEventObjectPic_Beauty[] = INCBIN_U32("graphics/event_objects/pics/people/beauty.4bpp"); +const u32 gEventObjectPic_Scientist1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1.4bpp"); +const u32 gEventObjectPic_Lass[] = INCBIN_U32("graphics/event_objects/pics/people/lass.4bpp"); +const u32 gEventObjectPic_Gentleman[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman.4bpp"); +const u32 gEventObjectPic_Sailor[] = INCBIN_U32("graphics/event_objects/pics/people/sailor.4bpp"); +const u32 gEventObjectPic_Fisherman[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman.4bpp"); +const u32 gEventObjectPic_RunningTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m.4bpp"); +const u32 gEventObjectPic_RunningTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f.4bpp"); +const u32 gEventObjectPic_TuberF[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f.4bpp"); +const u32 gEventObjectPic_TuberM[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m.4bpp"); +const u32 gEventObjectPic_Hiker[] = INCBIN_U32("graphics/event_objects/pics/people/hiker.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f.4bpp"); +const u32 gEventObjectPic_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp"); +const u32 gEventObjectPic_Man6[] = INCBIN_U32("graphics/event_objects/pics/people/man_6.4bpp"); +const u32 gEventObjectPic_Nurse[] = INCBIN_U32("graphics/event_objects/pics/people/nurse.4bpp"); const u32 gEventObjectPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp"); -const u32 gEventObjectPic_ProfBirch_0[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/0.4bpp"); -const u32 gEventObjectPic_ProfBirch_1[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/1.4bpp"); -const u32 gEventObjectPic_ProfBirch_2[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/2.4bpp"); -const u32 gEventObjectPic_ProfBirch_3[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/3.4bpp"); -const u32 gEventObjectPic_ProfBirch_4[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/4.4bpp"); -const u32 gEventObjectPic_ProfBirch_5[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/5.4bpp"); -const u32 gEventObjectPic_ProfBirch_6[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/6.4bpp"); -const u32 gEventObjectPic_ProfBirch_7[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/7.4bpp"); -const u32 gEventObjectPic_ProfBirch_8[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/8.4bpp"); -const u32 gEventObjectPic_ReporterM_0[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/0.4bpp"); -const u32 gEventObjectPic_ReporterM_1[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/1.4bpp"); -const u32 gEventObjectPic_ReporterM_2[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/2.4bpp"); -const u32 gEventObjectPic_ReporterM_3[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/3.4bpp"); -const u32 gEventObjectPic_ReporterM_4[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/4.4bpp"); -const u32 gEventObjectPic_ReporterM_5[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/5.4bpp"); -const u32 gEventObjectPic_ReporterM_6[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/6.4bpp"); -const u32 gEventObjectPic_ReporterM_7[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/7.4bpp"); -const u32 gEventObjectPic_ReporterM_8[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/8.4bpp"); -const u32 gEventObjectPic_ReporterF_0[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/0.4bpp"); -const u32 gEventObjectPic_ReporterF_1[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/1.4bpp"); -const u32 gEventObjectPic_ReporterF_2[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/2.4bpp"); -const u32 gEventObjectPic_ReporterF_3[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/3.4bpp"); -const u32 gEventObjectPic_ReporterF_4[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/4.4bpp"); -const u32 gEventObjectPic_ReporterF_5[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/5.4bpp"); -const u32 gEventObjectPic_ReporterF_6[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/6.4bpp"); -const u32 gEventObjectPic_ReporterF_7[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/7.4bpp"); -const u32 gEventObjectPic_ReporterF_8[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/8.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_0[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/0.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/1.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/2.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_3[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/3.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_4[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/4.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_5[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/5.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_6[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/6.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_7[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/7.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_8[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/8.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_0[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/0.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/1.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/2.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_3[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/3.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_4[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/4.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_5[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/5.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_6[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/6.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_7[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/7.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_8[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/8.4bpp"); -const u32 gEventObjectPic_MartEmployee_0[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/0.4bpp"); -const u32 gEventObjectPic_MartEmployee_1[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/1.4bpp"); -const u32 gEventObjectPic_MartEmployee_2[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/2.4bpp"); -const u32 gEventObjectPic_MartEmployee_3[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/3.4bpp"); -const u32 gEventObjectPic_MartEmployee_4[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/4.4bpp"); -const u32 gEventObjectPic_MartEmployee_5[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/5.4bpp"); -const u32 gEventObjectPic_MartEmployee_6[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/6.4bpp"); -const u32 gEventObjectPic_MartEmployee_7[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/7.4bpp"); -const u32 gEventObjectPic_MartEmployee_8[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/8.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_0[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/0.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_1[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/1.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_2[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/2.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_3[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/3.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_4[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/4.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_5[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/5.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_6[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/6.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_7[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/7.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_8[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/8.4bpp"); -const u32 gEventObjectPic_Teala_0[] = INCBIN_U32("graphics/event_objects/pics/people/teala/0.4bpp"); -const u32 gEventObjectPic_Teala_1[] = INCBIN_U32("graphics/event_objects/pics/people/teala/1.4bpp"); -const u32 gEventObjectPic_Teala_2[] = INCBIN_U32("graphics/event_objects/pics/people/teala/2.4bpp"); -const u32 gEventObjectPic_Teala_3[] = INCBIN_U32("graphics/event_objects/pics/people/teala/3.4bpp"); -const u32 gEventObjectPic_Teala_4[] = INCBIN_U32("graphics/event_objects/pics/people/teala/4.4bpp"); -const u32 gEventObjectPic_Teala_5[] = INCBIN_U32("graphics/event_objects/pics/people/teala/5.4bpp"); -const u32 gEventObjectPic_Teala_6[] = INCBIN_U32("graphics/event_objects/pics/people/teala/6.4bpp"); -const u32 gEventObjectPic_Teala_7[] = INCBIN_U32("graphics/event_objects/pics/people/teala/7.4bpp"); -const u32 gEventObjectPic_Teala_8[] = INCBIN_U32("graphics/event_objects/pics/people/teala/8.4bpp"); -const u32 gEventObjectPic_Artist_0[] = INCBIN_U32("graphics/event_objects/pics/people/artist/0.4bpp"); -const u32 gEventObjectPic_Artist_1[] = INCBIN_U32("graphics/event_objects/pics/people/artist/1.4bpp"); -const u32 gEventObjectPic_Artist_2[] = INCBIN_U32("graphics/event_objects/pics/people/artist/2.4bpp"); -const u32 gEventObjectPic_Artist_3[] = INCBIN_U32("graphics/event_objects/pics/people/artist/3.4bpp"); -const u32 gEventObjectPic_Artist_4[] = INCBIN_U32("graphics/event_objects/pics/people/artist/4.4bpp"); -const u32 gEventObjectPic_Artist_5[] = INCBIN_U32("graphics/event_objects/pics/people/artist/5.4bpp"); -const u32 gEventObjectPic_Artist_6[] = INCBIN_U32("graphics/event_objects/pics/people/artist/6.4bpp"); -const u32 gEventObjectPic_Artist_7[] = INCBIN_U32("graphics/event_objects/pics/people/artist/7.4bpp"); -const u32 gEventObjectPic_Artist_8[] = INCBIN_U32("graphics/event_objects/pics/people/artist/8.4bpp"); -const u32 gEventObjectPic_Cameraman_0[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/0.4bpp"); -const u32 gEventObjectPic_Cameraman_1[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/1.4bpp"); -const u32 gEventObjectPic_Cameraman_2[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/2.4bpp"); -const u32 gEventObjectPic_Cameraman_3[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/3.4bpp"); -const u32 gEventObjectPic_Cameraman_4[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/4.4bpp"); -const u32 gEventObjectPic_Cameraman_5[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/5.4bpp"); -const u32 gEventObjectPic_Cameraman_6[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/6.4bpp"); -const u32 gEventObjectPic_Cameraman_7[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/7.4bpp"); -const u32 gEventObjectPic_Cameraman_8[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/8.4bpp"); -const u32 gEventObjectPic_Scientist2_0[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/0.4bpp"); -const u32 gEventObjectPic_Scientist2_1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/1.4bpp"); -const u32 gEventObjectPic_Scientist2_2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/2.4bpp"); -const u32 gEventObjectPic_Scientist2_3[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/3.4bpp"); -const u32 gEventObjectPic_Scientist2_4[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/4.4bpp"); -const u32 gEventObjectPic_Scientist2_5[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/5.4bpp"); -const u32 gEventObjectPic_Scientist2_6[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/6.4bpp"); -const u32 gEventObjectPic_Scientist2_7[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/7.4bpp"); -const u32 gEventObjectPic_Scientist2_8[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/8.4bpp"); -const u32 gEventObjectPic_Man7_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/0.4bpp"); -const u32 gEventObjectPic_Man7_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/1.4bpp"); -const u32 gEventObjectPic_Man7_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/2.4bpp"); -const u32 gEventObjectPic_Man7_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/3.4bpp"); -const u32 gEventObjectPic_Man7_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/4.4bpp"); -const u32 gEventObjectPic_Man7_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/5.4bpp"); -const u32 gEventObjectPic_Man7_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/6.4bpp"); -const u32 gEventObjectPic_Man7_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/7.4bpp"); -const u32 gEventObjectPic_Man7_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/8.4bpp"); -const u32 gEventObjectPic_AquaMemberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/0.4bpp"); -const u32 gEventObjectPic_AquaMemberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/1.4bpp"); -const u32 gEventObjectPic_AquaMemberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/2.4bpp"); -const u32 gEventObjectPic_AquaMemberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/3.4bpp"); -const u32 gEventObjectPic_AquaMemberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/4.4bpp"); -const u32 gEventObjectPic_AquaMemberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/5.4bpp"); -const u32 gEventObjectPic_AquaMemberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/6.4bpp"); -const u32 gEventObjectPic_AquaMemberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/7.4bpp"); -const u32 gEventObjectPic_AquaMemberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/8.4bpp"); -const u32 gEventObjectPic_AquaMemberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/0.4bpp"); -const u32 gEventObjectPic_AquaMemberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/1.4bpp"); -const u32 gEventObjectPic_AquaMemberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/2.4bpp"); -const u32 gEventObjectPic_AquaMemberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/3.4bpp"); -const u32 gEventObjectPic_AquaMemberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/4.4bpp"); -const u32 gEventObjectPic_AquaMemberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/5.4bpp"); -const u32 gEventObjectPic_AquaMemberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/6.4bpp"); -const u32 gEventObjectPic_AquaMemberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/7.4bpp"); -const u32 gEventObjectPic_AquaMemberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/8.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/0.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/1.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/2.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/3.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/4.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/5.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/6.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/7.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/8.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/0.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/1.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/2.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/3.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/4.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/5.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/6.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/7.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/8.4bpp"); -const u32 gEventObjectPic_Sidney_0[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/0.4bpp"); -const u32 gEventObjectPic_Sidney_1[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/1.4bpp"); -const u32 gEventObjectPic_Sidney_2[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/2.4bpp"); -const u32 gEventObjectPic_Phoebe_0[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/0.4bpp"); -const u32 gEventObjectPic_Phoebe_1[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/1.4bpp"); -const u32 gEventObjectPic_Phoebe_2[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/2.4bpp"); -const u32 gEventObjectPic_Glacia_0[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/0.4bpp"); -const u32 gEventObjectPic_Glacia_1[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/1.4bpp"); -const u32 gEventObjectPic_Glacia_2[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/2.4bpp"); -const u32 gEventObjectPic_Drake_0[] = INCBIN_U32("graphics/event_objects/pics/people/drake/0.4bpp"); -const u32 gEventObjectPic_Drake_1[] = INCBIN_U32("graphics/event_objects/pics/people/drake/1.4bpp"); -const u32 gEventObjectPic_Drake_2[] = INCBIN_U32("graphics/event_objects/pics/people/drake/2.4bpp"); -const u32 gEventObjectPic_Roxanne_0[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/0.4bpp"); -const u32 gEventObjectPic_Roxanne_1[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/1.4bpp"); -const u32 gEventObjectPic_Roxanne_2[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/2.4bpp"); -const u32 gEventObjectPic_Brawly_0[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/0.4bpp"); -const u32 gEventObjectPic_Brawly_1[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/1.4bpp"); -const u32 gEventObjectPic_Brawly_2[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/2.4bpp"); -const u32 gEventObjectPic_Wattson_0[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/0.4bpp"); -const u32 gEventObjectPic_Wattson_1[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/1.4bpp"); -const u32 gEventObjectPic_Wattson_2[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/2.4bpp"); -const u32 gEventObjectPic_Flannery_0[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/0.4bpp"); -const u32 gEventObjectPic_Flannery_1[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/1.4bpp"); -const u32 gEventObjectPic_Flannery_2[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/2.4bpp"); -const u32 gEventObjectPic_Norman_0[] = INCBIN_U32("graphics/event_objects/pics/people/norman/0.4bpp"); -const u32 gEventObjectPic_Norman_1[] = INCBIN_U32("graphics/event_objects/pics/people/norman/1.4bpp"); -const u32 gEventObjectPic_Norman_2[] = INCBIN_U32("graphics/event_objects/pics/people/norman/2.4bpp"); -const u32 gEventObjectPic_Norman_3[] = INCBIN_U32("graphics/event_objects/pics/people/norman/3.4bpp"); -const u32 gEventObjectPic_Norman_4[] = INCBIN_U32("graphics/event_objects/pics/people/norman/4.4bpp"); -const u32 gEventObjectPic_Norman_5[] = INCBIN_U32("graphics/event_objects/pics/people/norman/5.4bpp"); -const u32 gEventObjectPic_Norman_6[] = INCBIN_U32("graphics/event_objects/pics/people/norman/6.4bpp"); -const u32 gEventObjectPic_Norman_7[] = INCBIN_U32("graphics/event_objects/pics/people/norman/7.4bpp"); -const u32 gEventObjectPic_Norman_8[] = INCBIN_U32("graphics/event_objects/pics/people/norman/8.4bpp"); -const u32 gEventObjectPic_Winona_0[] = INCBIN_U32("graphics/event_objects/pics/people/winona/0.4bpp"); -const u32 gEventObjectPic_Winona_1[] = INCBIN_U32("graphics/event_objects/pics/people/winona/1.4bpp"); -const u32 gEventObjectPic_Winona_2[] = INCBIN_U32("graphics/event_objects/pics/people/winona/2.4bpp"); -const u32 gEventObjectPic_Liza_0[] = INCBIN_U32("graphics/event_objects/pics/people/liza/0.4bpp"); -const u32 gEventObjectPic_Liza_1[] = INCBIN_U32("graphics/event_objects/pics/people/liza/1.4bpp"); -const u32 gEventObjectPic_Liza_2[] = INCBIN_U32("graphics/event_objects/pics/people/liza/2.4bpp"); -const u32 gEventObjectPic_Tate_0[] = INCBIN_U32("graphics/event_objects/pics/people/tate/0.4bpp"); -const u32 gEventObjectPic_Tate_1[] = INCBIN_U32("graphics/event_objects/pics/people/tate/1.4bpp"); -const u32 gEventObjectPic_Tate_2[] = INCBIN_U32("graphics/event_objects/pics/people/tate/2.4bpp"); -const u32 gEventObjectPic_Wallace_0[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/0.4bpp"); -const u32 gEventObjectPic_Wallace_1[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/1.4bpp"); -const u32 gEventObjectPic_Wallace_2[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/2.4bpp"); -const u32 gEventObjectPic_Wallace_3[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/3.4bpp"); -const u32 gEventObjectPic_Wallace_4[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/4.4bpp"); -const u32 gEventObjectPic_Wallace_5[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/5.4bpp"); -const u32 gEventObjectPic_Wallace_6[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/6.4bpp"); -const u32 gEventObjectPic_Wallace_7[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/7.4bpp"); -const u32 gEventObjectPic_Wallace_8[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/8.4bpp"); -const u32 gEventObjectPic_Steven_0[] = INCBIN_U32("graphics/event_objects/pics/people/steven/0.4bpp"); -const u32 gEventObjectPic_Steven_1[] = INCBIN_U32("graphics/event_objects/pics/people/steven/1.4bpp"); -const u32 gEventObjectPic_Steven_2[] = INCBIN_U32("graphics/event_objects/pics/people/steven/2.4bpp"); -const u32 gEventObjectPic_Steven_3[] = INCBIN_U32("graphics/event_objects/pics/people/steven/3.4bpp"); -const u32 gEventObjectPic_Steven_4[] = INCBIN_U32("graphics/event_objects/pics/people/steven/4.4bpp"); -const u32 gEventObjectPic_Steven_5[] = INCBIN_U32("graphics/event_objects/pics/people/steven/5.4bpp"); -const u32 gEventObjectPic_Steven_6[] = INCBIN_U32("graphics/event_objects/pics/people/steven/6.4bpp"); -const u32 gEventObjectPic_Steven_7[] = INCBIN_U32("graphics/event_objects/pics/people/steven/7.4bpp"); -const u32 gEventObjectPic_Steven_8[] = INCBIN_U32("graphics/event_objects/pics/people/steven/8.4bpp"); -const u32 gEventObjectPic_Wally_0[] = INCBIN_U32("graphics/event_objects/pics/people/wally/0.4bpp"); -const u32 gEventObjectPic_Wally_1[] = INCBIN_U32("graphics/event_objects/pics/people/wally/1.4bpp"); -const u32 gEventObjectPic_Wally_2[] = INCBIN_U32("graphics/event_objects/pics/people/wally/2.4bpp"); -const u32 gEventObjectPic_Wally_3[] = INCBIN_U32("graphics/event_objects/pics/people/wally/3.4bpp"); -const u32 gEventObjectPic_Wally_4[] = INCBIN_U32("graphics/event_objects/pics/people/wally/4.4bpp"); -const u32 gEventObjectPic_Wally_5[] = INCBIN_U32("graphics/event_objects/pics/people/wally/5.4bpp"); -const u32 gEventObjectPic_Wally_6[] = INCBIN_U32("graphics/event_objects/pics/people/wally/6.4bpp"); -const u32 gEventObjectPic_Wally_7[] = INCBIN_U32("graphics/event_objects/pics/people/wally/7.4bpp"); -const u32 gEventObjectPic_Wally_8[] = INCBIN_U32("graphics/event_objects/pics/people/wally/8.4bpp"); -const u32 gEventObjectPic_LittleBoy3_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/0.4bpp"); -const u32 gEventObjectPic_LittleBoy3_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/1.4bpp"); -const u32 gEventObjectPic_LittleBoy3_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/2.4bpp"); -const u32 gEventObjectPic_LittleBoy3_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/3.4bpp"); -const u32 gEventObjectPic_LittleBoy3_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/4.4bpp"); -const u32 gEventObjectPic_LittleBoy3_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/5.4bpp"); -const u32 gEventObjectPic_LittleBoy3_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/6.4bpp"); -const u32 gEventObjectPic_LittleBoy3_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/7.4bpp"); -const u32 gEventObjectPic_LittleBoy3_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/8.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_0[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/0.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_1[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/1.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_2[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/2.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_3[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/3.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_4[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/4.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_5[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/5.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_6[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/6.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_7[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/7.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_8[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/8.4bpp"); -const u32 gEventObjectPic_LatiasLatios_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/0.4bpp"); -const u32 gEventObjectPic_LatiasLatios_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/1.4bpp"); -const u32 gEventObjectPic_LatiasLatios_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/2.4bpp"); -const u32 gEventObjectPic_Boy5_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/0.4bpp"); -const u32 gEventObjectPic_Boy5_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/1.4bpp"); -const u32 gEventObjectPic_Boy5_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/2.4bpp"); -const u32 gEventObjectPic_ContestJudge_0[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/0.4bpp"); -const u32 gEventObjectPic_ContestJudge_1[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/1.4bpp"); -const u32 gEventObjectPic_ContestJudge_2[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/2.4bpp"); -const u32 gEventObjectPic_ContestJudge_3[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/3.4bpp"); -const u32 gEventObjectPic_ContestJudge_4[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/4.4bpp"); -const u32 gEventObjectPic_ContestJudge_5[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/5.4bpp"); -const u32 gEventObjectPic_ContestJudge_6[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/6.4bpp"); -const u32 gEventObjectPic_ContestJudge_7[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/7.4bpp"); -const u32 gEventObjectPic_ContestJudge_8[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/8.4bpp"); -const u32 gEventObjectPic_Archie_0[] = INCBIN_U32("graphics/event_objects/pics/people/archie/0.4bpp"); -const u32 gEventObjectPic_Archie_1[] = INCBIN_U32("graphics/event_objects/pics/people/archie/1.4bpp"); -const u32 gEventObjectPic_Archie_2[] = INCBIN_U32("graphics/event_objects/pics/people/archie/2.4bpp"); -const u32 gEventObjectPic_Archie_3[] = INCBIN_U32("graphics/event_objects/pics/people/archie/3.4bpp"); -const u32 gEventObjectPic_Archie_4[] = INCBIN_U32("graphics/event_objects/pics/people/archie/4.4bpp"); -const u32 gEventObjectPic_Archie_5[] = INCBIN_U32("graphics/event_objects/pics/people/archie/5.4bpp"); -const u32 gEventObjectPic_Archie_6[] = INCBIN_U32("graphics/event_objects/pics/people/archie/6.4bpp"); -const u32 gEventObjectPic_Archie_7[] = INCBIN_U32("graphics/event_objects/pics/people/archie/7.4bpp"); -const u32 gEventObjectPic_Archie_8[] = INCBIN_U32("graphics/event_objects/pics/people/archie/8.4bpp"); -const u32 gEventObjectPic_Maxie_0[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/0.4bpp"); -const u32 gEventObjectPic_Maxie_1[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/1.4bpp"); -const u32 gEventObjectPic_Maxie_2[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/2.4bpp"); -const u32 gEventObjectPic_Maxie_3[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/3.4bpp"); -const u32 gEventObjectPic_Maxie_4[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/4.4bpp"); -const u32 gEventObjectPic_Maxie_5[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/5.4bpp"); -const u32 gEventObjectPic_Maxie_6[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/6.4bpp"); -const u32 gEventObjectPic_Maxie_7[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/7.4bpp"); -const u32 gEventObjectPic_Maxie_8[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/8.4bpp"); -const u32 gEventObjectPic_Kyogre_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre/0.4bpp"); -const u32 gEventObjectPic_Kyogre_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre/1.4bpp"); -const u32 gEventObjectPic_Groudon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon/0.4bpp"); -const u32 gEventObjectPic_Groudon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon/1.4bpp"); +const u32 gEventObjectPic_ProfBirch[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch.4bpp"); +const u32 gEventObjectPic_ReporterM[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m.4bpp"); +const u32 gEventObjectPic_ReporterF[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2.4bpp"); +const u32 gEventObjectPic_MartEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee.4bpp"); +const u32 gEventObjectPic_RooftopSaleWoman[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman.4bpp"); +const u32 gEventObjectPic_Teala[] = INCBIN_U32("graphics/event_objects/pics/people/teala.4bpp"); +const u32 gEventObjectPic_Artist[] = INCBIN_U32("graphics/event_objects/pics/people/artist.4bpp"); +const u32 gEventObjectPic_Cameraman[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman.4bpp"); +const u32 gEventObjectPic_Scientist2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2.4bpp"); +const u32 gEventObjectPic_Man7[] = INCBIN_U32("graphics/event_objects/pics/people/man_7.4bpp"); +const u32 gEventObjectPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m.4bpp"); +const u32 gEventObjectPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f.4bpp"); +const u32 gEventObjectPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m.4bpp"); +const u32 gEventObjectPic_MagmaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f.4bpp"); +const u32 gEventObjectPic_Sidney[] = INCBIN_U32("graphics/event_objects/pics/people/sidney.4bpp"); +const u32 gEventObjectPic_Phoebe[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe.4bpp"); +const u32 gEventObjectPic_Glacia[] = INCBIN_U32("graphics/event_objects/pics/people/glacia.4bpp"); +const u32 gEventObjectPic_Drake[] = INCBIN_U32("graphics/event_objects/pics/people/drake.4bpp"); +const u32 gEventObjectPic_Roxanne[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne.4bpp"); +const u32 gEventObjectPic_Brawly[] = INCBIN_U32("graphics/event_objects/pics/people/brawly.4bpp"); +const u32 gEventObjectPic_Wattson[] = INCBIN_U32("graphics/event_objects/pics/people/wattson.4bpp"); +const u32 gEventObjectPic_Flannery[] = INCBIN_U32("graphics/event_objects/pics/people/flannery.4bpp"); +const u32 gEventObjectPic_Norman[] = INCBIN_U32("graphics/event_objects/pics/people/norman.4bpp"); +const u32 gEventObjectPic_Winona[] = INCBIN_U32("graphics/event_objects/pics/people/winona.4bpp"); +const u32 gEventObjectPic_Liza[] = INCBIN_U32("graphics/event_objects/pics/people/liza.4bpp"); +const u32 gEventObjectPic_Tate[] = INCBIN_U32("graphics/event_objects/pics/people/tate.4bpp"); +const u32 gEventObjectPic_Wallace[] = INCBIN_U32("graphics/event_objects/pics/people/wallace.4bpp"); +const u32 gEventObjectPic_Steven[] = INCBIN_U32("graphics/event_objects/pics/people/steven.4bpp"); +const u32 gEventObjectPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/people/wally.4bpp"); +const u32 gEventObjectPic_LittleBoy3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3.4bpp"); +const u32 gEventObjectPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp"); +const u32 gEventObjectPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp"); +const u32 gEventObjectPic_Boy5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5.4bpp"); +const u32 gEventObjectPic_ContestJudge[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge.4bpp"); +const u32 gEventObjectPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/archie.4bpp"); +const u32 gEventObjectPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/maxie.4bpp"); +const u32 gEventObjectPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp"); +const u32 gEventObjectPic_Groudon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp"); const u32 gEventObjectPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp"); -const u32 gEventObjectPic_Skitty_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/0.4bpp"); -const u32 gEventObjectPic_Skitty_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/1.4bpp"); -const u32 gEventObjectPic_Skitty_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/2.4bpp"); -const u32 gEventObjectPic_Kecleon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/0.4bpp"); -const u32 gEventObjectPic_Kecleon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/1.4bpp"); -const u32 gEventObjectPic_Kecleon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/2.4bpp"); -const u32 gEventObjectPic_Rayquaza_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/0.4bpp"); -const u32 gEventObjectPic_Rayquaza_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/1.4bpp"); -const u32 gEventObjectPic_Zigzagoon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/0.4bpp"); -const u32 gEventObjectPic_Zigzagoon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/1.4bpp"); -const u32 gEventObjectPic_Zigzagoon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/2.4bpp"); -const u32 gEventObjectPic_Pikachu_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/0.4bpp"); -const u32 gEventObjectPic_Pikachu_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/1.4bpp"); -const u32 gEventObjectPic_Pikachu_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/2.4bpp"); -const u32 gEventObjectPic_Azumarill_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/0.4bpp"); -const u32 gEventObjectPic_Azumarill_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/1.4bpp"); -const u32 gEventObjectPic_Azumarill_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/2.4bpp"); -const u32 gEventObjectPic_Wingull_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/0.4bpp"); -const u32 gEventObjectPic_Wingull_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/3.4bpp"); -const u32 gEventObjectPic_Wingull_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/1.4bpp"); -const u32 gEventObjectPic_Wingull_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/4.4bpp"); -const u32 gEventObjectPic_Wingull_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/2.4bpp"); -const u32 gEventObjectPic_Wingull_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/5.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/0.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/1.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/2.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/3.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/4.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/5.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/6.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/7.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/8.4bpp"); -const u32 gEventObjectPic_Azurill_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/0.4bpp"); -const u32 gEventObjectPic_Azurill_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/1.4bpp"); -const u32 gEventObjectPic_Azurill_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/2.4bpp"); -const u32 gEventObjectPic_Mom_0[] = INCBIN_U32("graphics/event_objects/pics/people/mom/0.4bpp"); -const u32 gEventObjectPic_Mom_1[] = INCBIN_U32("graphics/event_objects/pics/people/mom/1.4bpp"); -const u32 gEventObjectPic_Mom_2[] = INCBIN_U32("graphics/event_objects/pics/people/mom/2.4bpp"); -const u32 gEventObjectPic_Mom_3[] = INCBIN_U32("graphics/event_objects/pics/people/mom/3.4bpp"); -const u32 gEventObjectPic_Mom_4[] = INCBIN_U32("graphics/event_objects/pics/people/mom/4.4bpp"); -const u32 gEventObjectPic_Mom_5[] = INCBIN_U32("graphics/event_objects/pics/people/mom/5.4bpp"); -const u32 gEventObjectPic_Mom_6[] = INCBIN_U32("graphics/event_objects/pics/people/mom/6.4bpp"); -const u32 gEventObjectPic_Mom_7[] = INCBIN_U32("graphics/event_objects/pics/people/mom/7.4bpp"); -const u32 gEventObjectPic_Mom_8[] = INCBIN_U32("graphics/event_objects/pics/people/mom/8.4bpp"); +const u32 gEventObjectPic_Skitty[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp"); +const u32 gEventObjectPic_Kecleon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon.4bpp"); +const u32 gEventObjectPic_Rayquaza[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza.4bpp"); +const u32 gEventObjectPic_Zigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon.4bpp"); +const u32 gEventObjectPic_Pikachu[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu.4bpp"); +const u32 gEventObjectPic_Azumarill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill.4bpp"); +const u32 gEventObjectPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull.4bpp"); +const u32 gEventObjectPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp"); +const u32 gEventObjectPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp"); +const u32 gEventObjectPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp"); const u16 gEventObjectPalette22[] = INCBIN_U16("graphics/event_objects/palettes/22.gbapal"); const u16 gEventObjectPalette23[] = INCBIN_U16("graphics/event_objects/palettes/23.gbapal"); const u16 gEventObjectPalette24[] = INCBIN_U16("graphics/event_objects/palettes/24.gbapal"); @@ -1076,243 +225,60 @@ const u32 gEventObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/ const u32 gEventObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp"); const u32 gEventObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp"); const u32 gEventObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp"); -const u32 gEventObjectPic_CuttableTree_0[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/0.4bpp"); -const u32 gEventObjectPic_CuttableTree_1[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/1.4bpp"); -const u32 gEventObjectPic_CuttableTree_2[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/2.4bpp"); -const u32 gEventObjectPic_CuttableTree_3[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/3.4bpp"); -const u32 gEventObjectPic_BreakableRock_0[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/0.4bpp"); -const u32 gEventObjectPic_BreakableRock_1[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/1.4bpp"); -const u32 gEventObjectPic_BreakableRock_2[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/2.4bpp"); -const u32 gEventObjectPic_BreakableRock_3[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/3.4bpp"); +const u32 gEventObjectPic_CuttableTree[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree.4bpp"); +const u32 gEventObjectPic_BreakableRock[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock.4bpp"); const u32 gEventObjectPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp"); -const u32 gEventObjectPic_MrBrineysBoat_0[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/0.4bpp"); -const u32 gEventObjectPic_MrBrineysBoat_1[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/1.4bpp"); -const u32 gEventObjectPic_MrBrineysBoat_2[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/2.4bpp"); +const u32 gEventObjectPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp"); const u32 gEventObjectPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp"); const u32 gEventObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp"); const u16 gEventObjectPalette26[] = INCBIN_U16("graphics/event_objects/palettes/26.gbapal"); const u32 gEventObjectPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp"); const u16 gEventObjectPalette14[] = INCBIN_U16("graphics/event_objects/palettes/14.gbapal"); -const u32 gEventObjectPic_MachokeCarryingBox_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_carrying_box/0.4bpp"); -const u32 gEventObjectPic_MachokeCarryingBox_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_carrying_box/1.4bpp"); -const u32 gEventObjectPic_MachokeCarryingBox_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_carrying_box/2.4bpp"); -const u32 gEventObjectPic_MachokeFacingAway_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_facing_away/0.4bpp"); -const u32 gEventObjectPic_MachokeFacingAway_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_facing_away/1.4bpp"); +const u32 gEventObjectPic_MachokeCarryingBox[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_carrying_box.4bpp"); +const u32 gEventObjectPic_MachokeFacingAway[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_facing_away.4bpp"); const u16 gEventObjectPalette15[] = INCBIN_U16("graphics/event_objects/palettes/15.gbapal"); const u32 gEventObjectPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp"); -const u32 gEventObjectPic_Poochyena_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/0.4bpp"); -const u32 gEventObjectPic_Poochyena_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/1.4bpp"); -const u32 gEventObjectPic_Poochyena_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/2.4bpp"); -const u32 gEventObjectPic_Poochyena_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/3.4bpp"); -const u32 gEventObjectPic_Poochyena_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/4.4bpp"); -const u32 gEventObjectPic_Poochyena_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/5.4bpp"); -const u32 gEventObjectPic_Poochyena_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/6.4bpp"); -const u32 gEventObjectPic_Poochyena_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/7.4bpp"); -const u32 gEventObjectPic_Poochyena_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/8.4bpp"); +const u32 gEventObjectPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp"); const u16 gEventObjectPalette16[] = INCBIN_U16("graphics/event_objects/palettes/16.gbapal"); const u32 gEventObjectPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp"); const u16 gEventObjectPalette20[] = INCBIN_U16("graphics/event_objects/palettes/20.gbapal"); const u32 gEventObjectPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp"); const u16 gEventObjectPalette21[] = INCBIN_U16("graphics/event_objects/palettes/21.gbapal"); -const u32 gFieldEffectPic_BerryTreeGrowthSparkle_0[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/0.4bpp"); -const u32 gFieldEffectPic_BerryTreeGrowthSparkle_1[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/1.4bpp"); -const u32 gFieldEffectPic_BerryTreeGrowthSparkle_2[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/2.4bpp"); -const u32 gFieldEffectPic_BerryTreeGrowthSparkle_3[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/3.4bpp"); -const u32 gFieldEffectPic_BerryTreeGrowthSparkle_4[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/4.4bpp"); -const u32 gFieldEffectPic_BerryTreeGrowthSparkle_5[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/5.4bpp"); +const u32 gFieldEffectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle.4bpp"); const u32 gEventObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp"); -const u32 gEventObjectPic_BerryTreeSprout_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout/0.4bpp"); -const u32 gEventObjectPic_BerryTreeSprout_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout/1.4bpp"); -const u32 gEventObjectPic_PechaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/0.4bpp"); -const u32 gEventObjectPic_PechaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/1.4bpp"); -const u32 gEventObjectPic_PechaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/2.4bpp"); -const u32 gEventObjectPic_PechaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/3.4bpp"); -const u32 gEventObjectPic_PechaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/4.4bpp"); -const u32 gEventObjectPic_PechaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/5.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/0.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/1.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/2.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/3.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/4.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/5.4bpp"); -const u32 gEventObjectPic_WepearBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/0.4bpp"); -const u32 gEventObjectPic_WepearBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/1.4bpp"); -const u32 gEventObjectPic_WepearBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/2.4bpp"); -const u32 gEventObjectPic_WepearBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/3.4bpp"); -const u32 gEventObjectPic_WepearBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/4.4bpp"); -const u32 gEventObjectPic_WepearBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/5.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/0.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/1.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/2.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/3.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/4.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/5.4bpp"); -const u32 gEventObjectPic_CheriBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/0.4bpp"); -const u32 gEventObjectPic_CheriBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/1.4bpp"); -const u32 gEventObjectPic_CheriBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/2.4bpp"); -const u32 gEventObjectPic_CheriBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/3.4bpp"); -const u32 gEventObjectPic_CheriBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/4.4bpp"); -const u32 gEventObjectPic_CheriBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/5.4bpp"); -const u32 gEventObjectPic_FigyBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/0.4bpp"); -const u32 gEventObjectPic_FigyBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/1.4bpp"); -const u32 gEventObjectPic_FigyBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/2.4bpp"); -const u32 gEventObjectPic_FigyBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/3.4bpp"); -const u32 gEventObjectPic_FigyBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/4.4bpp"); -const u32 gEventObjectPic_FigyBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/5.4bpp"); -const u32 gEventObjectPic_MagoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/0.4bpp"); -const u32 gEventObjectPic_MagoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/1.4bpp"); -const u32 gEventObjectPic_MagoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/2.4bpp"); -const u32 gEventObjectPic_MagoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/3.4bpp"); -const u32 gEventObjectPic_MagoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/4.4bpp"); -const u32 gEventObjectPic_MagoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/5.4bpp"); -const u32 gEventObjectPic_LumBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/0.4bpp"); -const u32 gEventObjectPic_LumBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/1.4bpp"); -const u32 gEventObjectPic_LumBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/2.4bpp"); -const u32 gEventObjectPic_LumBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/3.4bpp"); -const u32 gEventObjectPic_LumBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/4.4bpp"); -const u32 gEventObjectPic_LumBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/5.4bpp"); -const u32 gEventObjectPic_RazzBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/0.4bpp"); -const u32 gEventObjectPic_RazzBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/1.4bpp"); -const u32 gEventObjectPic_RazzBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/2.4bpp"); -const u32 gEventObjectPic_RazzBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/3.4bpp"); -const u32 gEventObjectPic_RazzBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/4.4bpp"); -const u32 gEventObjectPic_RazzBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/5.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/0.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/1.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/2.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/3.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/4.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/5.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/0.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/1.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/2.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/3.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/4.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/5.4bpp"); -const u32 gEventObjectPic_NomelBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/0.4bpp"); -const u32 gEventObjectPic_NomelBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/1.4bpp"); -const u32 gEventObjectPic_NomelBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/2.4bpp"); -const u32 gEventObjectPic_NomelBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/3.4bpp"); -const u32 gEventObjectPic_NomelBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/4.4bpp"); -const u32 gEventObjectPic_NomelBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/5.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/0.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/1.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/2.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/3.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/4.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/5.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/0.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/1.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/2.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/3.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/4.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/5.4bpp"); -const u32 gEventObjectPic_HondewBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/0.4bpp"); -const u32 gEventObjectPic_HondewBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/1.4bpp"); -const u32 gEventObjectPic_HondewBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/2.4bpp"); -const u32 gEventObjectPic_HondewBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/3.4bpp"); -const u32 gEventObjectPic_HondewBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/4.4bpp"); -const u32 gEventObjectPic_HondewBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/5.4bpp"); -const u32 gEventObjectPic_AguavBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/0.4bpp"); -const u32 gEventObjectPic_AguavBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/1.4bpp"); -const u32 gEventObjectPic_AguavBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/2.4bpp"); -const u32 gEventObjectPic_AguavBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/3.4bpp"); -const u32 gEventObjectPic_AguavBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/4.4bpp"); -const u32 gEventObjectPic_AguavBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/5.4bpp"); -const u32 gEventObjectPic_WikiBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/0.4bpp"); -const u32 gEventObjectPic_WikiBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/1.4bpp"); -const u32 gEventObjectPic_WikiBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/2.4bpp"); -const u32 gEventObjectPic_WikiBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/3.4bpp"); -const u32 gEventObjectPic_WikiBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/4.4bpp"); -const u32 gEventObjectPic_WikiBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/5.4bpp"); -const u32 gEventObjectPic_PomegBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/0.4bpp"); -const u32 gEventObjectPic_PomegBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/1.4bpp"); -const u32 gEventObjectPic_PomegBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/2.4bpp"); -const u32 gEventObjectPic_PomegBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/3.4bpp"); -const u32 gEventObjectPic_PomegBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/4.4bpp"); -const u32 gEventObjectPic_PomegBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/5.4bpp"); -const u32 gEventObjectPic_RawstBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/0.4bpp"); -const u32 gEventObjectPic_RawstBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/1.4bpp"); -const u32 gEventObjectPic_RawstBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/2.4bpp"); -const u32 gEventObjectPic_RawstBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/3.4bpp"); -const u32 gEventObjectPic_RawstBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/4.4bpp"); -const u32 gEventObjectPic_RawstBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/5.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/0.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/1.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/2.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/3.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/4.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/5.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/0.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/1.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/2.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/3.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/4.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/5.4bpp"); -const u32 gEventObjectPic_OranBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/0.4bpp"); -const u32 gEventObjectPic_OranBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/1.4bpp"); -const u32 gEventObjectPic_OranBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/2.4bpp"); -const u32 gEventObjectPic_OranBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/3.4bpp"); -const u32 gEventObjectPic_OranBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/4.4bpp"); -const u32 gEventObjectPic_OranBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/5.4bpp"); -const u32 gEventObjectPic_PersimBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/0.4bpp"); -const u32 gEventObjectPic_PersimBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/1.4bpp"); -const u32 gEventObjectPic_PersimBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/2.4bpp"); -const u32 gEventObjectPic_PersimBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/3.4bpp"); -const u32 gEventObjectPic_PersimBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/4.4bpp"); -const u32 gEventObjectPic_PersimBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/5.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/0.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/1.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/2.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/3.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/4.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/5.4bpp"); -const u32 gEventObjectPic_AspearBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/0.4bpp"); -const u32 gEventObjectPic_AspearBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/1.4bpp"); -const u32 gEventObjectPic_AspearBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/2.4bpp"); -const u32 gEventObjectPic_AspearBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/3.4bpp"); -const u32 gEventObjectPic_AspearBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/4.4bpp"); -const u32 gEventObjectPic_AspearBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/5.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/0.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/1.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/2.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/3.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/4.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/5.4bpp"); -const u32 gEventObjectPic_CornnBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/0.4bpp"); -const u32 gEventObjectPic_CornnBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/1.4bpp"); -const u32 gEventObjectPic_CornnBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/2.4bpp"); -const u32 gEventObjectPic_CornnBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/3.4bpp"); -const u32 gEventObjectPic_CornnBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/4.4bpp"); -const u32 gEventObjectPic_CornnBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/5.4bpp"); -const u32 gEventObjectPic_LansatBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/0.4bpp"); -const u32 gEventObjectPic_LansatBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/1.4bpp"); -const u32 gEventObjectPic_LansatBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/2.4bpp"); -const u32 gEventObjectPic_LansatBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/3.4bpp"); -const u32 gEventObjectPic_LansatBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/4.4bpp"); -const u32 gEventObjectPic_LansatBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/5.4bpp"); -const u32 gEventObjectPic_DurinBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/0.4bpp"); -const u32 gEventObjectPic_DurinBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/1.4bpp"); -const u32 gEventObjectPic_DurinBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/2.4bpp"); -const u32 gEventObjectPic_DurinBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/3.4bpp"); -const u32 gEventObjectPic_DurinBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/4.4bpp"); -const u32 gEventObjectPic_DurinBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/5.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/0.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/1.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/2.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/3.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/4.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/5.4bpp"); -const u32 gFieldEffectPic_SurfBlob_0[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob/0.4bpp"); -const u32 gFieldEffectPic_SurfBlob_1[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob/1.4bpp"); -const u32 gFieldEffectPic_SurfBlob_2[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob/2.4bpp"); -const u32 gEventObjectPic_QuintyPlump_0[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/0.4bpp"); -const u32 gEventObjectPic_QuintyPlump_1[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/1.4bpp"); -const u32 gEventObjectPic_QuintyPlump_2[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/2.4bpp"); -const u32 gEventObjectPic_QuintyPlump_3[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/3.4bpp"); -const u32 gEventObjectPic_QuintyPlump_4[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/4.4bpp"); -const u32 gEventObjectPic_QuintyPlump_5[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/5.4bpp"); -const u32 gEventObjectPic_QuintyPlump_6[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/6.4bpp"); +const u32 gEventObjectPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp"); +const u32 gEventObjectPic_PechaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha.4bpp"); +const u32 gEventObjectPic_KelpsyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy.4bpp"); +const u32 gEventObjectPic_WepearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear.4bpp"); +const u32 gEventObjectPic_IapapaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa.4bpp"); +const u32 gEventObjectPic_CheriBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri.4bpp"); +const u32 gEventObjectPic_FigyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy.4bpp"); +const u32 gEventObjectPic_MagoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago.4bpp"); +const u32 gEventObjectPic_LumBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum.4bpp"); +const u32 gEventObjectPic_RazzBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz.4bpp"); +const u32 gEventObjectPic_GrepaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa.4bpp"); +const u32 gEventObjectPic_RabutaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta.4bpp"); +const u32 gEventObjectPic_NomelBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel.4bpp"); +const u32 gEventObjectPic_LeppaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa.4bpp"); +const u32 gEventObjectPic_LiechiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi.4bpp"); +const u32 gEventObjectPic_HondewBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew.4bpp"); +const u32 gEventObjectPic_AguavBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav.4bpp"); +const u32 gEventObjectPic_WikiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki.4bpp"); +const u32 gEventObjectPic_PomegBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg.4bpp"); +const u32 gEventObjectPic_RawstBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst.4bpp"); +const u32 gEventObjectPic_SpelonBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon.4bpp"); +const u32 gEventObjectPic_ChestoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto.4bpp"); +const u32 gEventObjectPic_OranBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran.4bpp"); +const u32 gEventObjectPic_PersimBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim.4bpp"); +const u32 gEventObjectPic_SitrusBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus.4bpp"); +const u32 gEventObjectPic_AspearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear.4bpp"); +const u32 gEventObjectPic_PamtreBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre.4bpp"); +const u32 gEventObjectPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn.4bpp"); +const u32 gEventObjectPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp"); +const u32 gEventObjectPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp"); +const u32 gEventObjectPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp"); +const u32 gFieldEffectPic_SurfBlob[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob.4bpp"); +const u32 gEventObjectPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp"); const u16 gEventObjectPalette12[] = INCBIN_U16("graphics/event_objects/palettes/12.gbapal"); const u16 gEventObjectPalette13[] = INCBIN_U16("graphics/event_objects/palettes/13.gbapal"); diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h index f7ed77f93..5a21a7f57 100644 --- a/src/data/field_event_obj/event_object_pic_tables.h +++ b/src/data/field_event_obj/event_object_pic_tables.h @@ -6,1874 +6,1874 @@ #define POKERUBY_EVENT_OBJECT_PIC_TABLES_H const struct SpriteFrameImage gEventObjectPicTable_BrendanNormal[] = { - obj_frame_tiles(gEventObjectPic_BrendanNormal_0), - obj_frame_tiles(gEventObjectPic_BrendanNormal_1), - obj_frame_tiles(gEventObjectPic_BrendanNormal_2), - obj_frame_tiles(gEventObjectPic_BrendanNormal_3), - obj_frame_tiles(gEventObjectPic_BrendanNormal_4), - obj_frame_tiles(gEventObjectPic_BrendanNormal_5), - obj_frame_tiles(gEventObjectPic_BrendanNormal_6), - obj_frame_tiles(gEventObjectPic_BrendanNormal_7), - obj_frame_tiles(gEventObjectPic_BrendanNormal_8), - obj_frame_tiles(gEventObjectPic_BrendanNormal_9), - obj_frame_tiles(gEventObjectPic_BrendanNormal_10), - obj_frame_tiles(gEventObjectPic_BrendanNormal_11), - obj_frame_tiles(gEventObjectPic_BrendanNormal_12), - obj_frame_tiles(gEventObjectPic_BrendanNormal_13), - obj_frame_tiles(gEventObjectPic_BrendanNormal_14), - obj_frame_tiles(gEventObjectPic_BrendanNormal_15), - obj_frame_tiles(gEventObjectPic_BrendanNormal_16), - obj_frame_tiles(gEventObjectPic_BrendanNormal_17) + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 0), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 1), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 2), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 3), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 4), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 5), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 6), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 7), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 8), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 9), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 10), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 11), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 12), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 13), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 14), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 15), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 16), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 17) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanMachBike[] = { - obj_frame_tiles(gEventObjectPic_BrendanMachBike_0), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_1), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_2), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_3), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_4), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_5), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_6), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_7), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_8) + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 5), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 6), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 7), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanAcroBike[] = { - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_0), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_1), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_2), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_3), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_4), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_5), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_6), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_7), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_8), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_9), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_10), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_11), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_12), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_13), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_14), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_15), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_16), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_17), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_18), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_19), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_20), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_21), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_22), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_23), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_24), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_25), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_26) + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 5), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 6), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 7), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 8), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 9), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 10), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 11), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 12), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 13), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 14), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 15), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 16), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 17), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 18), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 19), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 20), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 21), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 22), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 23), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 24), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 25), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 26) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanSurfing[] = { - obj_frame_tiles(gEventObjectPic_BrendanSurfing_0), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_1), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_2), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_0), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_0), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_1), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_1), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_2), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_2), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_3), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_4), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_5) + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 5) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanUnderwater[] = { - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2) + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanFieldMove[] = { - obj_frame_tiles(gEventObjectPic_BrendanFieldMove_0), - obj_frame_tiles(gEventObjectPic_BrendanFieldMove_1), - obj_frame_tiles(gEventObjectPic_BrendanFieldMove_2), - obj_frame_tiles(gEventObjectPic_BrendanFieldMove_3), - obj_frame_tiles(gEventObjectPic_BrendanFieldMove_4) + overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 4) }; const struct SpriteFrameImage gEventObjectPicTable_QuintyPlump[] = { - obj_frame_tiles(gEventObjectPic_QuintyPlump_0), - obj_frame_tiles(gEventObjectPic_QuintyPlump_1), - obj_frame_tiles(gEventObjectPic_QuintyPlump_2), - obj_frame_tiles(gEventObjectPic_QuintyPlump_3), - obj_frame_tiles(gEventObjectPic_QuintyPlump_4), - obj_frame_tiles(gEventObjectPic_QuintyPlump_5), - obj_frame_tiles(gEventObjectPic_QuintyPlump_6) + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 0), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 1), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 2), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 3), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 4), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 5), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 6) }; const struct SpriteFrameImage gEventObjectPicTable_LittleBoy1[] = { - obj_frame_tiles(gEventObjectPic_LittleBoy1_0), - obj_frame_tiles(gEventObjectPic_LittleBoy1_1), - obj_frame_tiles(gEventObjectPic_LittleBoy1_2), - obj_frame_tiles(gEventObjectPic_LittleBoy1_3), - obj_frame_tiles(gEventObjectPic_LittleBoy1_4), - obj_frame_tiles(gEventObjectPic_LittleBoy1_5), - obj_frame_tiles(gEventObjectPic_LittleBoy1_6), - obj_frame_tiles(gEventObjectPic_LittleBoy1_7), - obj_frame_tiles(gEventObjectPic_LittleBoy1_8) + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 0), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 1), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 2), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 3), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 4), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 5), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 6), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 7), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 8) }; const struct SpriteFrameImage gEventObjectPicTable_LittleGirl1[] = { - obj_frame_tiles(gEventObjectPic_LittleGirl1_0), - obj_frame_tiles(gEventObjectPic_LittleGirl1_1), - obj_frame_tiles(gEventObjectPic_LittleGirl1_2), - obj_frame_tiles(gEventObjectPic_LittleGirl1_3), - obj_frame_tiles(gEventObjectPic_LittleGirl1_4), - obj_frame_tiles(gEventObjectPic_LittleGirl1_5), - obj_frame_tiles(gEventObjectPic_LittleGirl1_6), - obj_frame_tiles(gEventObjectPic_LittleGirl1_7), - obj_frame_tiles(gEventObjectPic_LittleGirl1_8) + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 0), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 1), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 2), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 3), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 4), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 5), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 6), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 7), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Boy1[] = { - obj_frame_tiles(gEventObjectPic_Boy1_0), - obj_frame_tiles(gEventObjectPic_Boy1_1), - obj_frame_tiles(gEventObjectPic_Boy1_2), - obj_frame_tiles(gEventObjectPic_Boy1_3), - obj_frame_tiles(gEventObjectPic_Boy1_4), - obj_frame_tiles(gEventObjectPic_Boy1_5), - obj_frame_tiles(gEventObjectPic_Boy1_6), - obj_frame_tiles(gEventObjectPic_Boy1_7), - obj_frame_tiles(gEventObjectPic_Boy1_8) + overworld_frame(gEventObjectPic_Boy1, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 3), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 4), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 5), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 6), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 7), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Girl1[] = { - obj_frame_tiles(gEventObjectPic_Girl1_0), - obj_frame_tiles(gEventObjectPic_Girl1_1), - obj_frame_tiles(gEventObjectPic_Girl1_2), - obj_frame_tiles(gEventObjectPic_Girl1_3), - obj_frame_tiles(gEventObjectPic_Girl1_4), - obj_frame_tiles(gEventObjectPic_Girl1_5), - obj_frame_tiles(gEventObjectPic_Girl1_6), - obj_frame_tiles(gEventObjectPic_Girl1_7), - obj_frame_tiles(gEventObjectPic_Girl1_8) + overworld_frame(gEventObjectPic_Girl1, 2, 4, 0), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 1), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 2), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 3), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 4), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 5), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 6), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 7), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Boy2[] = { - obj_frame_tiles(gEventObjectPic_Boy2_0), - obj_frame_tiles(gEventObjectPic_Boy2_1), - obj_frame_tiles(gEventObjectPic_Boy2_2), - obj_frame_tiles(gEventObjectPic_Boy2_3), - obj_frame_tiles(gEventObjectPic_Boy2_4), - obj_frame_tiles(gEventObjectPic_Boy2_5), - obj_frame_tiles(gEventObjectPic_Boy2_6), - obj_frame_tiles(gEventObjectPic_Boy2_7), - obj_frame_tiles(gEventObjectPic_Boy2_8) + overworld_frame(gEventObjectPic_Boy2, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 3), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 4), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 5), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 6), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 7), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Girl2[] = { - obj_frame_tiles(gEventObjectPic_Girl2_0), - obj_frame_tiles(gEventObjectPic_Girl2_1), - obj_frame_tiles(gEventObjectPic_Girl2_2), - obj_frame_tiles(gEventObjectPic_Girl2_3), - obj_frame_tiles(gEventObjectPic_Girl2_4), - obj_frame_tiles(gEventObjectPic_Girl2_5), - obj_frame_tiles(gEventObjectPic_Girl2_6), - obj_frame_tiles(gEventObjectPic_Girl2_7), - obj_frame_tiles(gEventObjectPic_Girl2_8) + overworld_frame(gEventObjectPic_Girl2, 2, 4, 0), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 1), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 2), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 3), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 4), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 5), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 6), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 7), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_LittleBoy2[] = { - obj_frame_tiles(gEventObjectPic_LittleBoy2_0), - obj_frame_tiles(gEventObjectPic_LittleBoy2_1), - obj_frame_tiles(gEventObjectPic_LittleBoy2_2), - obj_frame_tiles(gEventObjectPic_LittleBoy2_3), - obj_frame_tiles(gEventObjectPic_LittleBoy2_4), - obj_frame_tiles(gEventObjectPic_LittleBoy2_5), - obj_frame_tiles(gEventObjectPic_LittleBoy2_6), - obj_frame_tiles(gEventObjectPic_LittleBoy2_7), - obj_frame_tiles(gEventObjectPic_LittleBoy2_8) + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 0), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 1), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 2), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 3), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 4), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 5), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 6), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 7), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 8) }; const struct SpriteFrameImage gEventObjectPicTable_LittleGirl2[] = { - obj_frame_tiles(gEventObjectPic_LittleGirl2_0), - obj_frame_tiles(gEventObjectPic_LittleGirl2_1), - obj_frame_tiles(gEventObjectPic_LittleGirl2_2), - obj_frame_tiles(gEventObjectPic_LittleGirl2_3), - obj_frame_tiles(gEventObjectPic_LittleGirl2_4), - obj_frame_tiles(gEventObjectPic_LittleGirl2_5), - obj_frame_tiles(gEventObjectPic_LittleGirl2_6), - obj_frame_tiles(gEventObjectPic_LittleGirl2_7), - obj_frame_tiles(gEventObjectPic_LittleGirl2_8) + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 0), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 1), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 2), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 3), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 4), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 5), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 6), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 7), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = { - obj_frame_tiles(gEventObjectPic_Boy3_0), - obj_frame_tiles(gEventObjectPic_Boy3_1), - obj_frame_tiles(gEventObjectPic_Boy3_2), - obj_frame_tiles(gEventObjectPic_Boy3_3), - obj_frame_tiles(gEventObjectPic_Boy3_4), - obj_frame_tiles(gEventObjectPic_Boy3_5), - obj_frame_tiles(gEventObjectPic_Boy3_6), - obj_frame_tiles(gEventObjectPic_Boy3_7), - obj_frame_tiles(gEventObjectPic_Boy3_8) + overworld_frame(gEventObjectPic_Boy3, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 3), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 4), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 5), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 6), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 7), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Girl3[] = { - obj_frame_tiles(gEventObjectPic_Girl3_0), - obj_frame_tiles(gEventObjectPic_Girl3_1), - obj_frame_tiles(gEventObjectPic_Girl3_2), - obj_frame_tiles(gEventObjectPic_Girl3_3), - obj_frame_tiles(gEventObjectPic_Girl3_4), - obj_frame_tiles(gEventObjectPic_Girl3_5), - obj_frame_tiles(gEventObjectPic_Girl3_6), - obj_frame_tiles(gEventObjectPic_Girl3_7), - obj_frame_tiles(gEventObjectPic_Girl3_8) + overworld_frame(gEventObjectPic_Girl3, 2, 4, 0), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 1), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 2), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 3), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 4), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 5), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 6), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 7), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Boy4[] = { - obj_frame_tiles(gEventObjectPic_Boy4_0), - obj_frame_tiles(gEventObjectPic_Boy4_1), - obj_frame_tiles(gEventObjectPic_Boy4_2), - obj_frame_tiles(gEventObjectPic_Boy4_3), - obj_frame_tiles(gEventObjectPic_Boy4_4), - obj_frame_tiles(gEventObjectPic_Boy4_5), - obj_frame_tiles(gEventObjectPic_Boy4_6), - obj_frame_tiles(gEventObjectPic_Boy4_7), - obj_frame_tiles(gEventObjectPic_Boy4_8) + overworld_frame(gEventObjectPic_Boy4, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 3), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 4), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 5), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 6), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 7), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = { - obj_frame_tiles(gEventObjectPic_Woman1_0), - obj_frame_tiles(gEventObjectPic_Woman1_1), - obj_frame_tiles(gEventObjectPic_Woman1_2), - obj_frame_tiles(gEventObjectPic_Woman1_3), - obj_frame_tiles(gEventObjectPic_Woman1_4), - obj_frame_tiles(gEventObjectPic_Woman1_5), - obj_frame_tiles(gEventObjectPic_Woman1_6), - obj_frame_tiles(gEventObjectPic_Woman1_7), - obj_frame_tiles(gEventObjectPic_Woman1_8) + overworld_frame(gEventObjectPic_Woman1, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_FatMan[] = { - obj_frame_tiles(gEventObjectPic_FatMan_0), - obj_frame_tiles(gEventObjectPic_FatMan_1), - obj_frame_tiles(gEventObjectPic_FatMan_2), - obj_frame_tiles(gEventObjectPic_FatMan_3), - obj_frame_tiles(gEventObjectPic_FatMan_4), - obj_frame_tiles(gEventObjectPic_FatMan_5), - obj_frame_tiles(gEventObjectPic_FatMan_6), - obj_frame_tiles(gEventObjectPic_FatMan_7), - obj_frame_tiles(gEventObjectPic_FatMan_8) + overworld_frame(gEventObjectPic_FatMan, 2, 4, 0), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 1), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 2), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 3), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 4), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 5), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 6), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 7), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = { - obj_frame_tiles(gEventObjectPic_Woman2_0), - obj_frame_tiles(gEventObjectPic_Woman2_1), - obj_frame_tiles(gEventObjectPic_Woman2_2), - obj_frame_tiles(gEventObjectPic_Woman2_3), - obj_frame_tiles(gEventObjectPic_Woman2_4), - obj_frame_tiles(gEventObjectPic_Woman2_5), - obj_frame_tiles(gEventObjectPic_Woman2_6), - obj_frame_tiles(gEventObjectPic_Woman2_7), - obj_frame_tiles(gEventObjectPic_Woman2_8) + overworld_frame(gEventObjectPic_Woman2, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Man1[] = { - obj_frame_tiles(gEventObjectPic_Man1_0), - obj_frame_tiles(gEventObjectPic_Man1_1), - obj_frame_tiles(gEventObjectPic_Man1_2), - obj_frame_tiles(gEventObjectPic_Man1_3), - obj_frame_tiles(gEventObjectPic_Man1_4), - obj_frame_tiles(gEventObjectPic_Man1_5), - obj_frame_tiles(gEventObjectPic_Man1_6), - obj_frame_tiles(gEventObjectPic_Man1_7), - obj_frame_tiles(gEventObjectPic_Man1_8) + overworld_frame(gEventObjectPic_Man1, 2, 4, 0), + overworld_frame(gEventObjectPic_Man1, 2, 4, 1), + overworld_frame(gEventObjectPic_Man1, 2, 4, 2), + overworld_frame(gEventObjectPic_Man1, 2, 4, 3), + overworld_frame(gEventObjectPic_Man1, 2, 4, 4), + overworld_frame(gEventObjectPic_Man1, 2, 4, 5), + overworld_frame(gEventObjectPic_Man1, 2, 4, 6), + overworld_frame(gEventObjectPic_Man1, 2, 4, 7), + overworld_frame(gEventObjectPic_Man1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = { - obj_frame_tiles(gEventObjectPic_Woman3_0), - obj_frame_tiles(gEventObjectPic_Woman3_1), - obj_frame_tiles(gEventObjectPic_Woman3_2), - obj_frame_tiles(gEventObjectPic_Woman3_3), - obj_frame_tiles(gEventObjectPic_Woman3_4), - obj_frame_tiles(gEventObjectPic_Woman3_5), - obj_frame_tiles(gEventObjectPic_Woman3_6), - obj_frame_tiles(gEventObjectPic_Woman3_7), - obj_frame_tiles(gEventObjectPic_Woman3_8) + overworld_frame(gEventObjectPic_Woman3, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_OldMan1[] = { - obj_frame_tiles(gEventObjectPic_OldMan1_0), - obj_frame_tiles(gEventObjectPic_OldMan1_1), - obj_frame_tiles(gEventObjectPic_OldMan1_2), - obj_frame_tiles(gEventObjectPic_OldMan1_3), - obj_frame_tiles(gEventObjectPic_OldMan1_4), - obj_frame_tiles(gEventObjectPic_OldMan1_5), - obj_frame_tiles(gEventObjectPic_OldMan1_6), - obj_frame_tiles(gEventObjectPic_OldMan1_7), - obj_frame_tiles(gEventObjectPic_OldMan1_8) + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 0), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 1), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 2), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 3), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 4), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 5), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 6), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 7), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_OldWoman1[] = { - obj_frame_tiles(gEventObjectPic_OldWoman1_0), - obj_frame_tiles(gEventObjectPic_OldWoman1_1), - obj_frame_tiles(gEventObjectPic_OldWoman1_2), - obj_frame_tiles(gEventObjectPic_OldWoman1_3), - obj_frame_tiles(gEventObjectPic_OldWoman1_4), - obj_frame_tiles(gEventObjectPic_OldWoman1_5), - obj_frame_tiles(gEventObjectPic_OldWoman1_6), - obj_frame_tiles(gEventObjectPic_OldWoman1_7), - obj_frame_tiles(gEventObjectPic_OldWoman1_8) + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 0), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 1), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 2), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 3), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 4), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 5), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 6), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 7), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Man2[] = { - obj_frame_tiles(gEventObjectPic_Man2_0), - obj_frame_tiles(gEventObjectPic_Man2_1), - obj_frame_tiles(gEventObjectPic_Man2_2), - obj_frame_tiles(gEventObjectPic_Man2_3), - obj_frame_tiles(gEventObjectPic_Man2_4), - obj_frame_tiles(gEventObjectPic_Man2_5), - obj_frame_tiles(gEventObjectPic_Man2_6), - obj_frame_tiles(gEventObjectPic_Man2_7), - obj_frame_tiles(gEventObjectPic_Man2_8) + overworld_frame(gEventObjectPic_Man2, 2, 4, 0), + overworld_frame(gEventObjectPic_Man2, 2, 4, 1), + overworld_frame(gEventObjectPic_Man2, 2, 4, 2), + overworld_frame(gEventObjectPic_Man2, 2, 4, 3), + overworld_frame(gEventObjectPic_Man2, 2, 4, 4), + overworld_frame(gEventObjectPic_Man2, 2, 4, 5), + overworld_frame(gEventObjectPic_Man2, 2, 4, 6), + overworld_frame(gEventObjectPic_Man2, 2, 4, 7), + overworld_frame(gEventObjectPic_Man2, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = { - obj_frame_tiles(gEventObjectPic_Woman4_0), - obj_frame_tiles(gEventObjectPic_Woman4_1), - obj_frame_tiles(gEventObjectPic_Woman4_2), - obj_frame_tiles(gEventObjectPic_Woman4_3), - obj_frame_tiles(gEventObjectPic_Woman4_4), - obj_frame_tiles(gEventObjectPic_Woman4_5), - obj_frame_tiles(gEventObjectPic_Woman4_6), - obj_frame_tiles(gEventObjectPic_Woman4_7), - obj_frame_tiles(gEventObjectPic_Woman4_8) + overworld_frame(gEventObjectPic_Woman4, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Man3[] = { - obj_frame_tiles(gEventObjectPic_Man3_0), - obj_frame_tiles(gEventObjectPic_Man3_1), - obj_frame_tiles(gEventObjectPic_Man3_2), - obj_frame_tiles(gEventObjectPic_Man3_3), - obj_frame_tiles(gEventObjectPic_Man3_4), - obj_frame_tiles(gEventObjectPic_Man3_5), - obj_frame_tiles(gEventObjectPic_Man3_6), - obj_frame_tiles(gEventObjectPic_Man3_7), - obj_frame_tiles(gEventObjectPic_Man3_8) + overworld_frame(gEventObjectPic_Man3, 2, 4, 0), + overworld_frame(gEventObjectPic_Man3, 2, 4, 1), + overworld_frame(gEventObjectPic_Man3, 2, 4, 2), + overworld_frame(gEventObjectPic_Man3, 2, 4, 3), + overworld_frame(gEventObjectPic_Man3, 2, 4, 4), + overworld_frame(gEventObjectPic_Man3, 2, 4, 5), + overworld_frame(gEventObjectPic_Man3, 2, 4, 6), + overworld_frame(gEventObjectPic_Man3, 2, 4, 7), + overworld_frame(gEventObjectPic_Man3, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = { - obj_frame_tiles(gEventObjectPic_Woman5_0), - obj_frame_tiles(gEventObjectPic_Woman5_1), - obj_frame_tiles(gEventObjectPic_Woman5_2), - obj_frame_tiles(gEventObjectPic_Woman5_3), - obj_frame_tiles(gEventObjectPic_Woman5_4), - obj_frame_tiles(gEventObjectPic_Woman5_5), - obj_frame_tiles(gEventObjectPic_Woman5_6), - obj_frame_tiles(gEventObjectPic_Woman5_7), - obj_frame_tiles(gEventObjectPic_Woman5_8) + overworld_frame(gEventObjectPic_Woman5, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Cook[] = { - obj_frame_tiles(gEventObjectPic_Cook_0), - obj_frame_tiles(gEventObjectPic_Cook_1), - obj_frame_tiles(gEventObjectPic_Cook_2), - obj_frame_tiles(gEventObjectPic_Cook_0), - obj_frame_tiles(gEventObjectPic_Cook_0), - obj_frame_tiles(gEventObjectPic_Cook_1), - obj_frame_tiles(gEventObjectPic_Cook_1), - obj_frame_tiles(gEventObjectPic_Cook_2), - obj_frame_tiles(gEventObjectPic_Cook_2) + overworld_frame(gEventObjectPic_Cook, 2, 4, 0), + overworld_frame(gEventObjectPic_Cook, 2, 4, 1), + overworld_frame(gEventObjectPic_Cook, 2, 4, 2), + overworld_frame(gEventObjectPic_Cook, 2, 4, 0), + overworld_frame(gEventObjectPic_Cook, 2, 4, 0), + overworld_frame(gEventObjectPic_Cook, 2, 4, 1), + overworld_frame(gEventObjectPic_Cook, 2, 4, 1), + overworld_frame(gEventObjectPic_Cook, 2, 4, 2), + overworld_frame(gEventObjectPic_Cook, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Woman6[] = { - obj_frame_tiles(gEventObjectPic_Woman6_0), - obj_frame_tiles(gEventObjectPic_Woman6_1), - obj_frame_tiles(gEventObjectPic_Woman6_2), - obj_frame_tiles(gEventObjectPic_Woman6_3), - obj_frame_tiles(gEventObjectPic_Woman6_4), - obj_frame_tiles(gEventObjectPic_Woman6_5), - obj_frame_tiles(gEventObjectPic_Woman6_6), - obj_frame_tiles(gEventObjectPic_Woman6_7), - obj_frame_tiles(gEventObjectPic_Woman6_8) + overworld_frame(gEventObjectPic_Woman6, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_OldMan2[] = { - obj_frame_tiles(gEventObjectPic_OldMan2_0), - obj_frame_tiles(gEventObjectPic_OldMan2_1), - obj_frame_tiles(gEventObjectPic_OldMan2_2), - obj_frame_tiles(gEventObjectPic_OldMan2_0), - obj_frame_tiles(gEventObjectPic_OldMan2_0), - obj_frame_tiles(gEventObjectPic_OldMan2_1), - obj_frame_tiles(gEventObjectPic_OldMan2_1), - obj_frame_tiles(gEventObjectPic_OldMan2_2), - obj_frame_tiles(gEventObjectPic_OldMan2_2) + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_OldWoman2[] = { - obj_frame_tiles(gEventObjectPic_OldWoman2_0), - obj_frame_tiles(gEventObjectPic_OldWoman2_1), - obj_frame_tiles(gEventObjectPic_OldWoman2_2), - obj_frame_tiles(gEventObjectPic_OldWoman2_0), - obj_frame_tiles(gEventObjectPic_OldWoman2_0), - obj_frame_tiles(gEventObjectPic_OldWoman2_1), - obj_frame_tiles(gEventObjectPic_OldWoman2_1), - obj_frame_tiles(gEventObjectPic_OldWoman2_2), - obj_frame_tiles(gEventObjectPic_OldWoman2_2) + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 2), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 2), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Camper[] = { - obj_frame_tiles(gEventObjectPic_Camper_0), - obj_frame_tiles(gEventObjectPic_Camper_1), - obj_frame_tiles(gEventObjectPic_Camper_2), - obj_frame_tiles(gEventObjectPic_Camper_3), - obj_frame_tiles(gEventObjectPic_Camper_4), - obj_frame_tiles(gEventObjectPic_Camper_5), - obj_frame_tiles(gEventObjectPic_Camper_6), - obj_frame_tiles(gEventObjectPic_Camper_7), - obj_frame_tiles(gEventObjectPic_Camper_8) + overworld_frame(gEventObjectPic_Camper, 2, 4, 0), + overworld_frame(gEventObjectPic_Camper, 2, 4, 1), + overworld_frame(gEventObjectPic_Camper, 2, 4, 2), + overworld_frame(gEventObjectPic_Camper, 2, 4, 3), + overworld_frame(gEventObjectPic_Camper, 2, 4, 4), + overworld_frame(gEventObjectPic_Camper, 2, 4, 5), + overworld_frame(gEventObjectPic_Camper, 2, 4, 6), + overworld_frame(gEventObjectPic_Camper, 2, 4, 7), + overworld_frame(gEventObjectPic_Camper, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Picnicker[] = { - obj_frame_tiles(gEventObjectPic_Picnicker_0), - obj_frame_tiles(gEventObjectPic_Picnicker_1), - obj_frame_tiles(gEventObjectPic_Picnicker_2), - obj_frame_tiles(gEventObjectPic_Picnicker_3), - obj_frame_tiles(gEventObjectPic_Picnicker_4), - obj_frame_tiles(gEventObjectPic_Picnicker_5), - obj_frame_tiles(gEventObjectPic_Picnicker_6), - obj_frame_tiles(gEventObjectPic_Picnicker_7), - obj_frame_tiles(gEventObjectPic_Picnicker_8) + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 0), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 1), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 2), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 3), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 4), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 5), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 6), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 7), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Man4[] = { - obj_frame_tiles(gEventObjectPic_Man4_0), - obj_frame_tiles(gEventObjectPic_Man4_1), - obj_frame_tiles(gEventObjectPic_Man4_2), - obj_frame_tiles(gEventObjectPic_Man4_3), - obj_frame_tiles(gEventObjectPic_Man4_4), - obj_frame_tiles(gEventObjectPic_Man4_5), - obj_frame_tiles(gEventObjectPic_Man4_6), - obj_frame_tiles(gEventObjectPic_Man4_7), - obj_frame_tiles(gEventObjectPic_Man4_8) + overworld_frame(gEventObjectPic_Man4, 2, 4, 0), + overworld_frame(gEventObjectPic_Man4, 2, 4, 1), + overworld_frame(gEventObjectPic_Man4, 2, 4, 2), + overworld_frame(gEventObjectPic_Man4, 2, 4, 3), + overworld_frame(gEventObjectPic_Man4, 2, 4, 4), + overworld_frame(gEventObjectPic_Man4, 2, 4, 5), + overworld_frame(gEventObjectPic_Man4, 2, 4, 6), + overworld_frame(gEventObjectPic_Man4, 2, 4, 7), + overworld_frame(gEventObjectPic_Man4, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Woman7[] = { - obj_frame_tiles(gEventObjectPic_Woman7_0), - obj_frame_tiles(gEventObjectPic_Woman7_1), - obj_frame_tiles(gEventObjectPic_Woman7_2), - obj_frame_tiles(gEventObjectPic_Woman7_3), - obj_frame_tiles(gEventObjectPic_Woman7_4), - obj_frame_tiles(gEventObjectPic_Woman7_5), - obj_frame_tiles(gEventObjectPic_Woman7_6), - obj_frame_tiles(gEventObjectPic_Woman7_7), - obj_frame_tiles(gEventObjectPic_Woman7_8) + overworld_frame(gEventObjectPic_Woman7, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Youngster[] = { - obj_frame_tiles(gEventObjectPic_Youngster_0), - obj_frame_tiles(gEventObjectPic_Youngster_1), - obj_frame_tiles(gEventObjectPic_Youngster_2), - obj_frame_tiles(gEventObjectPic_Youngster_3), - obj_frame_tiles(gEventObjectPic_Youngster_4), - obj_frame_tiles(gEventObjectPic_Youngster_5), - obj_frame_tiles(gEventObjectPic_Youngster_6), - obj_frame_tiles(gEventObjectPic_Youngster_7), - obj_frame_tiles(gEventObjectPic_Youngster_8) + overworld_frame(gEventObjectPic_Youngster, 2, 4, 0), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 1), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 2), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 3), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 4), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 5), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 6), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 7), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_BugCatcher[] = { - obj_frame_tiles(gEventObjectPic_BugCatcher_0), - obj_frame_tiles(gEventObjectPic_BugCatcher_1), - obj_frame_tiles(gEventObjectPic_BugCatcher_2), - obj_frame_tiles(gEventObjectPic_BugCatcher_3), - obj_frame_tiles(gEventObjectPic_BugCatcher_4), - obj_frame_tiles(gEventObjectPic_BugCatcher_5), - obj_frame_tiles(gEventObjectPic_BugCatcher_6), - obj_frame_tiles(gEventObjectPic_BugCatcher_7), - obj_frame_tiles(gEventObjectPic_BugCatcher_8) + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 0), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 1), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 2), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 3), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 4), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 5), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 6), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 7), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_PsychicM[] = { - obj_frame_tiles(gEventObjectPic_PsychicM_0), - obj_frame_tiles(gEventObjectPic_PsychicM_1), - obj_frame_tiles(gEventObjectPic_PsychicM_2), - obj_frame_tiles(gEventObjectPic_PsychicM_3), - obj_frame_tiles(gEventObjectPic_PsychicM_4), - obj_frame_tiles(gEventObjectPic_PsychicM_5), - obj_frame_tiles(gEventObjectPic_PsychicM_6), - obj_frame_tiles(gEventObjectPic_PsychicM_7), - obj_frame_tiles(gEventObjectPic_PsychicM_8) + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 0), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 1), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 2), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 3), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 4), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 5), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 6), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 7), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_SchoolKidM[] = { - obj_frame_tiles(gEventObjectPic_SchoolKidM_0), - obj_frame_tiles(gEventObjectPic_SchoolKidM_1), - obj_frame_tiles(gEventObjectPic_SchoolKidM_2), - obj_frame_tiles(gEventObjectPic_SchoolKidM_3), - obj_frame_tiles(gEventObjectPic_SchoolKidM_4), - obj_frame_tiles(gEventObjectPic_SchoolKidM_5), - obj_frame_tiles(gEventObjectPic_SchoolKidM_6), - obj_frame_tiles(gEventObjectPic_SchoolKidM_7), - obj_frame_tiles(gEventObjectPic_SchoolKidM_8) + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 0), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 1), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 2), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 3), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 4), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 5), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 6), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 7), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Maniac[] = { - obj_frame_tiles(gEventObjectPic_Maniac_0), - obj_frame_tiles(gEventObjectPic_Maniac_1), - obj_frame_tiles(gEventObjectPic_Maniac_2), - obj_frame_tiles(gEventObjectPic_Maniac_3), - obj_frame_tiles(gEventObjectPic_Maniac_4), - obj_frame_tiles(gEventObjectPic_Maniac_5), - obj_frame_tiles(gEventObjectPic_Maniac_6), - obj_frame_tiles(gEventObjectPic_Maniac_7), - obj_frame_tiles(gEventObjectPic_Maniac_8) + overworld_frame(gEventObjectPic_Maniac, 2, 4, 0), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 1), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 2), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 3), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 4), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 5), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 6), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 7), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_HexManiac[] = { - obj_frame_tiles(gEventObjectPic_HexManiac_0), - obj_frame_tiles(gEventObjectPic_HexManiac_1), - obj_frame_tiles(gEventObjectPic_HexManiac_2), - obj_frame_tiles(gEventObjectPic_HexManiac_3), - obj_frame_tiles(gEventObjectPic_HexManiac_4), - obj_frame_tiles(gEventObjectPic_HexManiac_5), - obj_frame_tiles(gEventObjectPic_HexManiac_6), - obj_frame_tiles(gEventObjectPic_HexManiac_7), - obj_frame_tiles(gEventObjectPic_HexManiac_8) + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 0), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 1), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 2), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 3), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 4), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 5), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 6), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 7), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Woman8[] = { - obj_frame_tiles(gEventObjectPic_Woman8_0), - obj_frame_tiles(gEventObjectPic_Woman8_1), - obj_frame_tiles(gEventObjectPic_Woman8_2), - obj_frame_tiles(gEventObjectPic_Woman8_3), - obj_frame_tiles(gEventObjectPic_Woman8_4), - obj_frame_tiles(gEventObjectPic_Woman8_5), - obj_frame_tiles(gEventObjectPic_Woman8_6), - obj_frame_tiles(gEventObjectPic_Woman8_7), - obj_frame_tiles(gEventObjectPic_Woman8_8) + overworld_frame(gEventObjectPic_Woman8, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_SwimmerM[] = { - obj_frame_tiles(gEventObjectPic_SwimmerM_0), - obj_frame_tiles(gEventObjectPic_SwimmerM_1), - obj_frame_tiles(gEventObjectPic_SwimmerM_2), - obj_frame_tiles(gEventObjectPic_SwimmerM_3), - obj_frame_tiles(gEventObjectPic_SwimmerM_4), - obj_frame_tiles(gEventObjectPic_SwimmerM_5), - obj_frame_tiles(gEventObjectPic_SwimmerM_6), - obj_frame_tiles(gEventObjectPic_SwimmerM_7), - obj_frame_tiles(gEventObjectPic_SwimmerM_8) + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 0), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 1), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 2), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 3), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 4), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 5), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 6), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 7), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_SwimmerF[] = { - obj_frame_tiles(gEventObjectPic_SwimmerF_0), - obj_frame_tiles(gEventObjectPic_SwimmerF_1), - obj_frame_tiles(gEventObjectPic_SwimmerF_2), - obj_frame_tiles(gEventObjectPic_SwimmerF_3), - obj_frame_tiles(gEventObjectPic_SwimmerF_4), - obj_frame_tiles(gEventObjectPic_SwimmerF_5), - obj_frame_tiles(gEventObjectPic_SwimmerF_6), - obj_frame_tiles(gEventObjectPic_SwimmerF_7), - obj_frame_tiles(gEventObjectPic_SwimmerF_8) + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 0), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 1), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 2), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 3), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 4), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 5), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 6), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 7), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_BlackBelt[] = { - obj_frame_tiles(gEventObjectPic_BlackBelt_0), - obj_frame_tiles(gEventObjectPic_BlackBelt_1), - obj_frame_tiles(gEventObjectPic_BlackBelt_2), - obj_frame_tiles(gEventObjectPic_BlackBelt_3), - obj_frame_tiles(gEventObjectPic_BlackBelt_4), - obj_frame_tiles(gEventObjectPic_BlackBelt_5), - obj_frame_tiles(gEventObjectPic_BlackBelt_6), - obj_frame_tiles(gEventObjectPic_BlackBelt_7), - obj_frame_tiles(gEventObjectPic_BlackBelt_8) + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 0), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 1), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 2), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 3), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 4), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 5), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 6), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 7), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Beauty[] = { - obj_frame_tiles(gEventObjectPic_Beauty_0), - obj_frame_tiles(gEventObjectPic_Beauty_1), - obj_frame_tiles(gEventObjectPic_Beauty_2), - obj_frame_tiles(gEventObjectPic_Beauty_3), - obj_frame_tiles(gEventObjectPic_Beauty_4), - obj_frame_tiles(gEventObjectPic_Beauty_5), - obj_frame_tiles(gEventObjectPic_Beauty_6), - obj_frame_tiles(gEventObjectPic_Beauty_7), - obj_frame_tiles(gEventObjectPic_Beauty_8) + overworld_frame(gEventObjectPic_Beauty, 2, 4, 0), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 1), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 2), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 3), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 4), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 5), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 6), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 7), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Scientist1[] = { - obj_frame_tiles(gEventObjectPic_Scientist1_0), - obj_frame_tiles(gEventObjectPic_Scientist1_1), - obj_frame_tiles(gEventObjectPic_Scientist1_2), - obj_frame_tiles(gEventObjectPic_Scientist1_3), - obj_frame_tiles(gEventObjectPic_Scientist1_4), - obj_frame_tiles(gEventObjectPic_Scientist1_5), - obj_frame_tiles(gEventObjectPic_Scientist1_6), - obj_frame_tiles(gEventObjectPic_Scientist1_7), - obj_frame_tiles(gEventObjectPic_Scientist1_8) + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 0), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 1), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 2), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 3), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 4), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 5), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 6), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 7), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Lass[] = { - obj_frame_tiles(gEventObjectPic_Lass_0), - obj_frame_tiles(gEventObjectPic_Lass_1), - obj_frame_tiles(gEventObjectPic_Lass_2), - obj_frame_tiles(gEventObjectPic_Lass_3), - obj_frame_tiles(gEventObjectPic_Lass_4), - obj_frame_tiles(gEventObjectPic_Lass_5), - obj_frame_tiles(gEventObjectPic_Lass_6), - obj_frame_tiles(gEventObjectPic_Lass_7), - obj_frame_tiles(gEventObjectPic_Lass_8) + overworld_frame(gEventObjectPic_Lass, 2, 4, 0), + overworld_frame(gEventObjectPic_Lass, 2, 4, 1), + overworld_frame(gEventObjectPic_Lass, 2, 4, 2), + overworld_frame(gEventObjectPic_Lass, 2, 4, 3), + overworld_frame(gEventObjectPic_Lass, 2, 4, 4), + overworld_frame(gEventObjectPic_Lass, 2, 4, 5), + overworld_frame(gEventObjectPic_Lass, 2, 4, 6), + overworld_frame(gEventObjectPic_Lass, 2, 4, 7), + overworld_frame(gEventObjectPic_Lass, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Gentleman[] = { - obj_frame_tiles(gEventObjectPic_Gentleman_0), - obj_frame_tiles(gEventObjectPic_Gentleman_1), - obj_frame_tiles(gEventObjectPic_Gentleman_2), - obj_frame_tiles(gEventObjectPic_Gentleman_3), - obj_frame_tiles(gEventObjectPic_Gentleman_4), - obj_frame_tiles(gEventObjectPic_Gentleman_5), - obj_frame_tiles(gEventObjectPic_Gentleman_6), - obj_frame_tiles(gEventObjectPic_Gentleman_7), - obj_frame_tiles(gEventObjectPic_Gentleman_8) + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 0), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 1), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 2), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 3), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 4), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 5), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 6), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 7), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Sailor[] = { - obj_frame_tiles(gEventObjectPic_Sailor_0), - obj_frame_tiles(gEventObjectPic_Sailor_1), - obj_frame_tiles(gEventObjectPic_Sailor_2), - obj_frame_tiles(gEventObjectPic_Sailor_3), - obj_frame_tiles(gEventObjectPic_Sailor_4), - obj_frame_tiles(gEventObjectPic_Sailor_5), - obj_frame_tiles(gEventObjectPic_Sailor_6), - obj_frame_tiles(gEventObjectPic_Sailor_7), - obj_frame_tiles(gEventObjectPic_Sailor_8) + overworld_frame(gEventObjectPic_Sailor, 2, 4, 0), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 1), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 2), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 3), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 4), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 5), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 6), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 7), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Fisherman[] = { - obj_frame_tiles(gEventObjectPic_Fisherman_0), - obj_frame_tiles(gEventObjectPic_Fisherman_1), - obj_frame_tiles(gEventObjectPic_Fisherman_2), - obj_frame_tiles(gEventObjectPic_Fisherman_3), - obj_frame_tiles(gEventObjectPic_Fisherman_4), - obj_frame_tiles(gEventObjectPic_Fisherman_5), - obj_frame_tiles(gEventObjectPic_Fisherman_6), - obj_frame_tiles(gEventObjectPic_Fisherman_7), - obj_frame_tiles(gEventObjectPic_Fisherman_8) + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 0), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 1), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 2), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 3), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 4), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 5), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 6), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 7), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteM[] = { - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_0), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_1), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_2), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_3), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_4), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_5), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_6), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_7), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_8) + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 0), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 1), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 2), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 3), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 4), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 5), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 6), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 7), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteF[] = { - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_0), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_1), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_2), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_3), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_4), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_5), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_6), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_7), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_8) + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 0), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 1), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 2), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 3), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 4), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 5), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 6), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 7), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_TuberF[] = { - obj_frame_tiles(gEventObjectPic_TuberF_0), - obj_frame_tiles(gEventObjectPic_TuberF_1), - obj_frame_tiles(gEventObjectPic_TuberF_2), - obj_frame_tiles(gEventObjectPic_TuberF_3), - obj_frame_tiles(gEventObjectPic_TuberF_4), - obj_frame_tiles(gEventObjectPic_TuberF_5), - obj_frame_tiles(gEventObjectPic_TuberF_6), - obj_frame_tiles(gEventObjectPic_TuberF_7), - obj_frame_tiles(gEventObjectPic_TuberF_8) + overworld_frame(gEventObjectPic_TuberF, 2, 2, 0), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 1), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 2), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 3), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 4), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 5), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 6), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 7), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 8) }; const struct SpriteFrameImage gEventObjectPicTable_TuberM[] = { - obj_frame_tiles(gEventObjectPic_TuberM_0), - obj_frame_tiles(gEventObjectPic_TuberM_1), - obj_frame_tiles(gEventObjectPic_TuberM_2), - obj_frame_tiles(gEventObjectPic_TuberM_3), - obj_frame_tiles(gEventObjectPic_TuberM_4), - obj_frame_tiles(gEventObjectPic_TuberM_5), - obj_frame_tiles(gEventObjectPic_TuberM_6), - obj_frame_tiles(gEventObjectPic_TuberM_7), - obj_frame_tiles(gEventObjectPic_TuberM_8) + overworld_frame(gEventObjectPic_TuberM, 2, 2, 0), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 1), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 2), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 3), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 4), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 5), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 6), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 7), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Hiker[] = { - obj_frame_tiles(gEventObjectPic_Hiker_0), - obj_frame_tiles(gEventObjectPic_Hiker_1), - obj_frame_tiles(gEventObjectPic_Hiker_2), - obj_frame_tiles(gEventObjectPic_Hiker_3), - obj_frame_tiles(gEventObjectPic_Hiker_4), - obj_frame_tiles(gEventObjectPic_Hiker_5), - obj_frame_tiles(gEventObjectPic_Hiker_6), - obj_frame_tiles(gEventObjectPic_Hiker_7), - obj_frame_tiles(gEventObjectPic_Hiker_8) + overworld_frame(gEventObjectPic_Hiker, 2, 4, 0), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 1), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 2), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 3), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 4), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 5), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 6), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 7), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteM[] = { - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_0), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_1), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_2), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_3), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_4), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_5), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_6), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_7), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_8) + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 0), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 1), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 2), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 3), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 4), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 5), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 6), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 7), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteF[] = { - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_0), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_1), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_2), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_3), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_4), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_5), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_6), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_7), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_8) + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 0), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 1), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 2), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 3), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 4), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 5), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 6), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 7), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Nurse[] = { - obj_frame_tiles(gEventObjectPic_Nurse_0), - obj_frame_tiles(gEventObjectPic_Nurse_1), - obj_frame_tiles(gEventObjectPic_Nurse_2), - obj_frame_tiles(gEventObjectPic_Nurse_3), - obj_frame_tiles(gEventObjectPic_Nurse_4), - obj_frame_tiles(gEventObjectPic_Nurse_5), - obj_frame_tiles(gEventObjectPic_Nurse_6), - obj_frame_tiles(gEventObjectPic_Nurse_7), - obj_frame_tiles(gEventObjectPic_Nurse_8), - obj_frame_tiles(gEventObjectPic_Nurse_9) + overworld_frame(gEventObjectPic_Nurse, 2, 4, 0), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 1), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 2), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 3), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 4), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 5), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 6), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 7), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 8), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 9) }; const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = { - obj_frame_tiles(gEventObjectPic_ItemBall) + overworld_frame(gEventObjectPic_ItemBall, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_ProfBirch[] = { - obj_frame_tiles(gEventObjectPic_ProfBirch_0), - obj_frame_tiles(gEventObjectPic_ProfBirch_1), - obj_frame_tiles(gEventObjectPic_ProfBirch_2), - obj_frame_tiles(gEventObjectPic_ProfBirch_3), - obj_frame_tiles(gEventObjectPic_ProfBirch_4), - obj_frame_tiles(gEventObjectPic_ProfBirch_5), - obj_frame_tiles(gEventObjectPic_ProfBirch_6), - obj_frame_tiles(gEventObjectPic_ProfBirch_7), - obj_frame_tiles(gEventObjectPic_ProfBirch_8) + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 0), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 1), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 2), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 3), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 4), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 5), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 6), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 7), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Man5[] = { - obj_frame_tiles(gEventObjectPic_Man5_0), - obj_frame_tiles(gEventObjectPic_Man5_1), - obj_frame_tiles(gEventObjectPic_Man5_2), - obj_frame_tiles(gEventObjectPic_Man5_3), - obj_frame_tiles(gEventObjectPic_Man5_4), - obj_frame_tiles(gEventObjectPic_Man5_5), - obj_frame_tiles(gEventObjectPic_Man5_6), - obj_frame_tiles(gEventObjectPic_Man5_7), - obj_frame_tiles(gEventObjectPic_Man5_8) + overworld_frame(gEventObjectPic_Man5, 2, 4, 0), + overworld_frame(gEventObjectPic_Man5, 2, 4, 1), + overworld_frame(gEventObjectPic_Man5, 2, 4, 2), + overworld_frame(gEventObjectPic_Man5, 2, 4, 3), + overworld_frame(gEventObjectPic_Man5, 2, 4, 4), + overworld_frame(gEventObjectPic_Man5, 2, 4, 5), + overworld_frame(gEventObjectPic_Man5, 2, 4, 6), + overworld_frame(gEventObjectPic_Man5, 2, 4, 7), + overworld_frame(gEventObjectPic_Man5, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Man6[] = { - obj_frame_tiles(gEventObjectPic_Man6_0), - obj_frame_tiles(gEventObjectPic_Man6_1), - obj_frame_tiles(gEventObjectPic_Man6_2), - obj_frame_tiles(gEventObjectPic_Man6_3), - obj_frame_tiles(gEventObjectPic_Man6_4), - obj_frame_tiles(gEventObjectPic_Man6_5), - obj_frame_tiles(gEventObjectPic_Man6_6), - obj_frame_tiles(gEventObjectPic_Man6_7), - obj_frame_tiles(gEventObjectPic_Man6_8) + overworld_frame(gEventObjectPic_Man6, 2, 4, 0), + overworld_frame(gEventObjectPic_Man6, 2, 4, 1), + overworld_frame(gEventObjectPic_Man6, 2, 4, 2), + overworld_frame(gEventObjectPic_Man6, 2, 4, 3), + overworld_frame(gEventObjectPic_Man6, 2, 4, 4), + overworld_frame(gEventObjectPic_Man6, 2, 4, 5), + overworld_frame(gEventObjectPic_Man6, 2, 4, 6), + overworld_frame(gEventObjectPic_Man6, 2, 4, 7), + overworld_frame(gEventObjectPic_Man6, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_ReporterM[] = { - obj_frame_tiles(gEventObjectPic_ReporterM_0), - obj_frame_tiles(gEventObjectPic_ReporterM_1), - obj_frame_tiles(gEventObjectPic_ReporterM_2), - obj_frame_tiles(gEventObjectPic_ReporterM_3), - obj_frame_tiles(gEventObjectPic_ReporterM_4), - obj_frame_tiles(gEventObjectPic_ReporterM_5), - obj_frame_tiles(gEventObjectPic_ReporterM_6), - obj_frame_tiles(gEventObjectPic_ReporterM_7), - obj_frame_tiles(gEventObjectPic_ReporterM_8) + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 0), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 1), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 2), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 3), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 4), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 5), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 6), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 7), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_ReporterF[] = { - obj_frame_tiles(gEventObjectPic_ReporterF_0), - obj_frame_tiles(gEventObjectPic_ReporterF_1), - obj_frame_tiles(gEventObjectPic_ReporterF_2), - obj_frame_tiles(gEventObjectPic_ReporterF_3), - obj_frame_tiles(gEventObjectPic_ReporterF_4), - obj_frame_tiles(gEventObjectPic_ReporterF_5), - obj_frame_tiles(gEventObjectPic_ReporterF_6), - obj_frame_tiles(gEventObjectPic_ReporterF_7), - obj_frame_tiles(gEventObjectPic_ReporterF_8) + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 0), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 1), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 2), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 3), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 4), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 5), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 6), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 7), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan1[] = { - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_0), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_1), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_2), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_3), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_4), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_5), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_6), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_7), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_8) + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 0), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 1), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 2), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 3), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 4), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 5), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 6), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 7), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan2[] = { - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_0), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_1), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_2), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_3), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_4), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_5), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_6), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_7), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_8) + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 0), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 1), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 2), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 3), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 4), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 5), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 6), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 7), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_UnusedNatuDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedNatuDoll) + overworld_frame(gEventObjectPic_UnusedNatuDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_UnusedMagnemiteDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedMagnemiteDoll) + overworld_frame(gEventObjectPic_UnusedMagnemiteDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_UnusedSquirtleDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedSquirtleDoll) + overworld_frame(gEventObjectPic_UnusedSquirtleDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_UnusedWooperDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedWooperDoll) + overworld_frame(gEventObjectPic_UnusedWooperDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_UnusedPikachuDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedPikachuDoll) + overworld_frame(gEventObjectPic_UnusedPikachuDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_UnusedPorygon2Doll[] = { - obj_frame_tiles(gEventObjectPic_UnusedPorygon2Doll) + overworld_frame(gEventObjectPic_UnusedPorygon2Doll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_CuttableTree[] = { - obj_frame_tiles(gEventObjectPic_CuttableTree_0), - obj_frame_tiles(gEventObjectPic_CuttableTree_1), - obj_frame_tiles(gEventObjectPic_CuttableTree_2), - obj_frame_tiles(gEventObjectPic_CuttableTree_3) + overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 0), + overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 1), + overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 2), + overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 3) }; const struct SpriteFrameImage gEventObjectPicTable_MartEmployee[] = { - obj_frame_tiles(gEventObjectPic_MartEmployee_0), - obj_frame_tiles(gEventObjectPic_MartEmployee_1), - obj_frame_tiles(gEventObjectPic_MartEmployee_2), - obj_frame_tiles(gEventObjectPic_MartEmployee_3), - obj_frame_tiles(gEventObjectPic_MartEmployee_4), - obj_frame_tiles(gEventObjectPic_MartEmployee_5), - obj_frame_tiles(gEventObjectPic_MartEmployee_6), - obj_frame_tiles(gEventObjectPic_MartEmployee_7), - obj_frame_tiles(gEventObjectPic_MartEmployee_8) + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 0), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 1), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 2), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 3), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 4), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 5), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 6), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 7), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_RooftopSaleWoman[] = { - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_0), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_1), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_2), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_3), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_4), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_5), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_6), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_7), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_8) + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 0), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 1), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 2), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 3), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 4), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 5), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 6), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 7), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Teala[] = { - obj_frame_tiles(gEventObjectPic_Teala_0), - obj_frame_tiles(gEventObjectPic_Teala_1), - obj_frame_tiles(gEventObjectPic_Teala_2), - obj_frame_tiles(gEventObjectPic_Teala_3), - obj_frame_tiles(gEventObjectPic_Teala_4), - obj_frame_tiles(gEventObjectPic_Teala_5), - obj_frame_tiles(gEventObjectPic_Teala_6), - obj_frame_tiles(gEventObjectPic_Teala_7), - obj_frame_tiles(gEventObjectPic_Teala_8) + overworld_frame(gEventObjectPic_Teala, 2, 4, 0), + overworld_frame(gEventObjectPic_Teala, 2, 4, 1), + overworld_frame(gEventObjectPic_Teala, 2, 4, 2), + overworld_frame(gEventObjectPic_Teala, 2, 4, 3), + overworld_frame(gEventObjectPic_Teala, 2, 4, 4), + overworld_frame(gEventObjectPic_Teala, 2, 4, 5), + overworld_frame(gEventObjectPic_Teala, 2, 4, 6), + overworld_frame(gEventObjectPic_Teala, 2, 4, 7), + overworld_frame(gEventObjectPic_Teala, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_BreakableRock[] = { - obj_frame_tiles(gEventObjectPic_BreakableRock_0), - obj_frame_tiles(gEventObjectPic_BreakableRock_1), - obj_frame_tiles(gEventObjectPic_BreakableRock_2), - obj_frame_tiles(gEventObjectPic_BreakableRock_3) + overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 0), + overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 1), + overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 2), + overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 3) }; const struct SpriteFrameImage gEventObjectPicTable_PushableBoulder[] = { - obj_frame_tiles(gEventObjectPic_PushableBoulder) + overworld_frame(gEventObjectPic_PushableBoulder, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_MrBrineysBoat[] = { - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2) + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Truck[] = { - obj_frame_tiles(gEventObjectPic_Truck) + overworld_frame(gEventObjectPic_Truck, 6, 6, 0) }; const struct SpriteFrameImage gEventObjectPicTable_MachokeCarryingBox[] = { - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_0), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_0), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_0), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_1), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_2), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_1), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_2), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_1), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_2) + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 0), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 0), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 0), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 2), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 2), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_MachokeFacingAway[] = { - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_0), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_0), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_0), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1) + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 0), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 0), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 0), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1) }; const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = { - obj_frame_tiles(gEventObjectPic_BirchsBag) + overworld_frame(gEventObjectPic_BirchsBag, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_Poochyena[] = { - obj_frame_tiles(gEventObjectPic_Poochyena_0), - obj_frame_tiles(gEventObjectPic_Poochyena_1), - obj_frame_tiles(gEventObjectPic_Poochyena_2), - obj_frame_tiles(gEventObjectPic_Poochyena_3), - obj_frame_tiles(gEventObjectPic_Poochyena_4), - obj_frame_tiles(gEventObjectPic_Poochyena_5), - obj_frame_tiles(gEventObjectPic_Poochyena_6), - obj_frame_tiles(gEventObjectPic_Poochyena_7), - obj_frame_tiles(gEventObjectPic_Poochyena_8) + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 0), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 1), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 2), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 3), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 4), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 5), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 6), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 7), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Artist[] = { - obj_frame_tiles(gEventObjectPic_Artist_0), - obj_frame_tiles(gEventObjectPic_Artist_1), - obj_frame_tiles(gEventObjectPic_Artist_2), - obj_frame_tiles(gEventObjectPic_Artist_3), - obj_frame_tiles(gEventObjectPic_Artist_4), - obj_frame_tiles(gEventObjectPic_Artist_5), - obj_frame_tiles(gEventObjectPic_Artist_6), - obj_frame_tiles(gEventObjectPic_Artist_7), - obj_frame_tiles(gEventObjectPic_Artist_8) + overworld_frame(gEventObjectPic_Artist, 2, 4, 0), + overworld_frame(gEventObjectPic_Artist, 2, 4, 1), + overworld_frame(gEventObjectPic_Artist, 2, 4, 2), + overworld_frame(gEventObjectPic_Artist, 2, 4, 3), + overworld_frame(gEventObjectPic_Artist, 2, 4, 4), + overworld_frame(gEventObjectPic_Artist, 2, 4, 5), + overworld_frame(gEventObjectPic_Artist, 2, 4, 6), + overworld_frame(gEventObjectPic_Artist, 2, 4, 7), + overworld_frame(gEventObjectPic_Artist, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_MayNormal[] = { - obj_frame_tiles(gEventObjectPic_MayNormal_0), - obj_frame_tiles(gEventObjectPic_MayNormal_1), - obj_frame_tiles(gEventObjectPic_MayNormal_2), - obj_frame_tiles(gEventObjectPic_MayNormal_3), - obj_frame_tiles(gEventObjectPic_MayNormal_4), - obj_frame_tiles(gEventObjectPic_MayNormal_5), - obj_frame_tiles(gEventObjectPic_MayNormal_6), - obj_frame_tiles(gEventObjectPic_MayNormal_7), - obj_frame_tiles(gEventObjectPic_MayNormal_8), - obj_frame_tiles(gEventObjectPic_MayNormal_9), - obj_frame_tiles(gEventObjectPic_MayNormal_10), - obj_frame_tiles(gEventObjectPic_MayNormal_11), - obj_frame_tiles(gEventObjectPic_MayNormal_12), - obj_frame_tiles(gEventObjectPic_MayNormal_13), - obj_frame_tiles(gEventObjectPic_MayNormal_14), - obj_frame_tiles(gEventObjectPic_MayNormal_15), - obj_frame_tiles(gEventObjectPic_MayNormal_16), - obj_frame_tiles(gEventObjectPic_MayNormal_17) + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 0), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 1), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 2), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 3), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 4), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 5), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 6), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 7), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 8), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 9), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 10), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 11), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 12), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 13), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 14), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 15), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 16), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 17) }; const struct SpriteFrameImage gEventObjectPicTable_MayMachBike[] = { - obj_frame_tiles(gEventObjectPic_MayMachBike_0), - obj_frame_tiles(gEventObjectPic_MayMachBike_1), - obj_frame_tiles(gEventObjectPic_MayMachBike_2), - obj_frame_tiles(gEventObjectPic_MayMachBike_3), - obj_frame_tiles(gEventObjectPic_MayMachBike_4), - obj_frame_tiles(gEventObjectPic_MayMachBike_5), - obj_frame_tiles(gEventObjectPic_MayMachBike_6), - obj_frame_tiles(gEventObjectPic_MayMachBike_7), - obj_frame_tiles(gEventObjectPic_MayMachBike_8) + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 0), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 1), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 2), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 3), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 4), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 5), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 6), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 7), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_MayAcroBike[] = { - obj_frame_tiles(gEventObjectPic_MayAcroBike_0), - obj_frame_tiles(gEventObjectPic_MayAcroBike_1), - obj_frame_tiles(gEventObjectPic_MayAcroBike_2), - obj_frame_tiles(gEventObjectPic_MayAcroBike_3), - obj_frame_tiles(gEventObjectPic_MayAcroBike_4), - obj_frame_tiles(gEventObjectPic_MayAcroBike_5), - obj_frame_tiles(gEventObjectPic_MayAcroBike_6), - obj_frame_tiles(gEventObjectPic_MayAcroBike_7), - obj_frame_tiles(gEventObjectPic_MayAcroBike_8), - obj_frame_tiles(gEventObjectPic_MayAcroBike_9), - obj_frame_tiles(gEventObjectPic_MayAcroBike_10), - obj_frame_tiles(gEventObjectPic_MayAcroBike_11), - obj_frame_tiles(gEventObjectPic_MayAcroBike_12), - obj_frame_tiles(gEventObjectPic_MayAcroBike_13), - obj_frame_tiles(gEventObjectPic_MayAcroBike_14), - obj_frame_tiles(gEventObjectPic_MayAcroBike_15), - obj_frame_tiles(gEventObjectPic_MayAcroBike_16), - obj_frame_tiles(gEventObjectPic_MayAcroBike_17), - obj_frame_tiles(gEventObjectPic_MayAcroBike_18), - obj_frame_tiles(gEventObjectPic_MayAcroBike_19), - obj_frame_tiles(gEventObjectPic_MayAcroBike_20), - obj_frame_tiles(gEventObjectPic_MayAcroBike_21), - obj_frame_tiles(gEventObjectPic_MayAcroBike_22), - obj_frame_tiles(gEventObjectPic_MayAcroBike_23), - obj_frame_tiles(gEventObjectPic_MayAcroBike_24), - obj_frame_tiles(gEventObjectPic_MayAcroBike_25), - obj_frame_tiles(gEventObjectPic_MayAcroBike_26) + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 0), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 1), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 2), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 3), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 4), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 5), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 6), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 7), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 8), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 9), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 10), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 11), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 12), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 13), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 14), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 15), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 16), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 17), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 18), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 19), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 20), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 21), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 22), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 23), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 24), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 25), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 26) }; const struct SpriteFrameImage gEventObjectPicTable_MaySurfing[] = { - obj_frame_tiles(gEventObjectPic_MaySurfing_0), - obj_frame_tiles(gEventObjectPic_MaySurfing_1), - obj_frame_tiles(gEventObjectPic_MaySurfing_2), - obj_frame_tiles(gEventObjectPic_MaySurfing_0), - obj_frame_tiles(gEventObjectPic_MaySurfing_0), - obj_frame_tiles(gEventObjectPic_MaySurfing_1), - obj_frame_tiles(gEventObjectPic_MaySurfing_1), - obj_frame_tiles(gEventObjectPic_MaySurfing_2), - obj_frame_tiles(gEventObjectPic_MaySurfing_2), - obj_frame_tiles(gEventObjectPic_MaySurfing_3), - obj_frame_tiles(gEventObjectPic_MaySurfing_4), - obj_frame_tiles(gEventObjectPic_MaySurfing_5) + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 1), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 3), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 5) }; const struct SpriteFrameImage gEventObjectPicTable_MayUnderwater[] = { - obj_frame_tiles(gEventObjectPic_MayUnderwater_0), - obj_frame_tiles(gEventObjectPic_MayUnderwater_1), - obj_frame_tiles(gEventObjectPic_MayUnderwater_2), - obj_frame_tiles(gEventObjectPic_MayUnderwater_0), - obj_frame_tiles(gEventObjectPic_MayUnderwater_0), - obj_frame_tiles(gEventObjectPic_MayUnderwater_1), - obj_frame_tiles(gEventObjectPic_MayUnderwater_1), - obj_frame_tiles(gEventObjectPic_MayUnderwater_2), - obj_frame_tiles(gEventObjectPic_MayUnderwater_2) + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_MayFieldMove[] = { - obj_frame_tiles(gEventObjectPic_MayFieldMove_0), - obj_frame_tiles(gEventObjectPic_MayFieldMove_1), - obj_frame_tiles(gEventObjectPic_MayFieldMove_2), - obj_frame_tiles(gEventObjectPic_MayFieldMove_3), - obj_frame_tiles(gEventObjectPic_MayFieldMove_4) + overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 0), + overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 1), + overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 2), + overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 3), + overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 4) }; const struct SpriteFrameImage gEventObjectPicTable_Cameraman[] = { - obj_frame_tiles(gEventObjectPic_Cameraman_0), - obj_frame_tiles(gEventObjectPic_Cameraman_1), - obj_frame_tiles(gEventObjectPic_Cameraman_2), - obj_frame_tiles(gEventObjectPic_Cameraman_3), - obj_frame_tiles(gEventObjectPic_Cameraman_4), - obj_frame_tiles(gEventObjectPic_Cameraman_5), - obj_frame_tiles(gEventObjectPic_Cameraman_6), - obj_frame_tiles(gEventObjectPic_Cameraman_7), - obj_frame_tiles(gEventObjectPic_Cameraman_8) + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 0), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 1), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 2), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 3), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 4), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 5), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 6), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 7), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_MovingBox[] = { - obj_frame_tiles(gEventObjectPic_MovingBox) + overworld_frame(gEventObjectPic_MovingBox, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_CableCar[] = { - obj_frame_tiles(gEventObjectPic_CableCar) + overworld_frame(gEventObjectPic_CableCar, 8, 8, 0) }; const struct SpriteFrameImage gEventObjectPicTable_Scientist2[] = { - obj_frame_tiles(gEventObjectPic_Scientist2_0), - obj_frame_tiles(gEventObjectPic_Scientist2_1), - obj_frame_tiles(gEventObjectPic_Scientist2_2), - obj_frame_tiles(gEventObjectPic_Scientist2_3), - obj_frame_tiles(gEventObjectPic_Scientist2_4), - obj_frame_tiles(gEventObjectPic_Scientist2_5), - obj_frame_tiles(gEventObjectPic_Scientist2_6), - obj_frame_tiles(gEventObjectPic_Scientist2_7), - obj_frame_tiles(gEventObjectPic_Scientist2_8) + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 0), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 1), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 2), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 3), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 4), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 5), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 6), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 7), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Man7[] = { - obj_frame_tiles(gEventObjectPic_Man7_0), - obj_frame_tiles(gEventObjectPic_Man7_1), - obj_frame_tiles(gEventObjectPic_Man7_2), - obj_frame_tiles(gEventObjectPic_Man7_3), - obj_frame_tiles(gEventObjectPic_Man7_4), - obj_frame_tiles(gEventObjectPic_Man7_5), - obj_frame_tiles(gEventObjectPic_Man7_6), - obj_frame_tiles(gEventObjectPic_Man7_7), - obj_frame_tiles(gEventObjectPic_Man7_8) + overworld_frame(gEventObjectPic_Man7, 2, 4, 0), + overworld_frame(gEventObjectPic_Man7, 2, 4, 1), + overworld_frame(gEventObjectPic_Man7, 2, 4, 2), + overworld_frame(gEventObjectPic_Man7, 2, 4, 3), + overworld_frame(gEventObjectPic_Man7, 2, 4, 4), + overworld_frame(gEventObjectPic_Man7, 2, 4, 5), + overworld_frame(gEventObjectPic_Man7, 2, 4, 6), + overworld_frame(gEventObjectPic_Man7, 2, 4, 7), + overworld_frame(gEventObjectPic_Man7, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_AquaMemberM[] = { - obj_frame_tiles(gEventObjectPic_AquaMemberM_0), - obj_frame_tiles(gEventObjectPic_AquaMemberM_1), - obj_frame_tiles(gEventObjectPic_AquaMemberM_2), - obj_frame_tiles(gEventObjectPic_AquaMemberM_3), - obj_frame_tiles(gEventObjectPic_AquaMemberM_4), - obj_frame_tiles(gEventObjectPic_AquaMemberM_5), - obj_frame_tiles(gEventObjectPic_AquaMemberM_6), - obj_frame_tiles(gEventObjectPic_AquaMemberM_7), - obj_frame_tiles(gEventObjectPic_AquaMemberM_8) + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 0), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 1), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 2), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 3), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 4), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 5), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 6), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 7), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_AquaMemberF[] = { - obj_frame_tiles(gEventObjectPic_AquaMemberF_0), - obj_frame_tiles(gEventObjectPic_AquaMemberF_1), - obj_frame_tiles(gEventObjectPic_AquaMemberF_2), - obj_frame_tiles(gEventObjectPic_AquaMemberF_3), - obj_frame_tiles(gEventObjectPic_AquaMemberF_4), - obj_frame_tiles(gEventObjectPic_AquaMemberF_5), - obj_frame_tiles(gEventObjectPic_AquaMemberF_6), - obj_frame_tiles(gEventObjectPic_AquaMemberF_7), - obj_frame_tiles(gEventObjectPic_AquaMemberF_8) + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 0), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 1), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 2), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 3), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 4), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 5), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 6), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 7), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberM[] = { - obj_frame_tiles(gEventObjectPic_MagmaMemberM_0), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_1), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_2), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_3), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_4), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_5), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_6), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_7), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_8) + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 0), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 1), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 2), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 3), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 4), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 5), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 6), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 7), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberF[] = { - obj_frame_tiles(gEventObjectPic_MagmaMemberF_0), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_1), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_2), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_3), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_4), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_5), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_6), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_7), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_8) + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 0), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 1), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 2), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 3), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 4), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 5), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 6), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 7), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Sidney[] = { - obj_frame_tiles(gEventObjectPic_Sidney_0), - obj_frame_tiles(gEventObjectPic_Sidney_1), - obj_frame_tiles(gEventObjectPic_Sidney_2), - obj_frame_tiles(gEventObjectPic_Sidney_0), - obj_frame_tiles(gEventObjectPic_Sidney_0), - obj_frame_tiles(gEventObjectPic_Sidney_1), - obj_frame_tiles(gEventObjectPic_Sidney_1), - obj_frame_tiles(gEventObjectPic_Sidney_2), - obj_frame_tiles(gEventObjectPic_Sidney_2) + overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Phoebe[] = { - obj_frame_tiles(gEventObjectPic_Phoebe_0), - obj_frame_tiles(gEventObjectPic_Phoebe_1), - obj_frame_tiles(gEventObjectPic_Phoebe_2), - obj_frame_tiles(gEventObjectPic_Phoebe_0), - obj_frame_tiles(gEventObjectPic_Phoebe_0), - obj_frame_tiles(gEventObjectPic_Phoebe_1), - obj_frame_tiles(gEventObjectPic_Phoebe_1), - obj_frame_tiles(gEventObjectPic_Phoebe_2), - obj_frame_tiles(gEventObjectPic_Phoebe_2) + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Glacia[] = { - obj_frame_tiles(gEventObjectPic_Glacia_0), - obj_frame_tiles(gEventObjectPic_Glacia_1), - obj_frame_tiles(gEventObjectPic_Glacia_2), - obj_frame_tiles(gEventObjectPic_Glacia_0), - obj_frame_tiles(gEventObjectPic_Glacia_0), - obj_frame_tiles(gEventObjectPic_Glacia_1), - obj_frame_tiles(gEventObjectPic_Glacia_1), - obj_frame_tiles(gEventObjectPic_Glacia_2), - obj_frame_tiles(gEventObjectPic_Glacia_2) + overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Drake[] = { - obj_frame_tiles(gEventObjectPic_Drake_0), - obj_frame_tiles(gEventObjectPic_Drake_1), - obj_frame_tiles(gEventObjectPic_Drake_2), - obj_frame_tiles(gEventObjectPic_Drake_0), - obj_frame_tiles(gEventObjectPic_Drake_0), - obj_frame_tiles(gEventObjectPic_Drake_1), - obj_frame_tiles(gEventObjectPic_Drake_1), - obj_frame_tiles(gEventObjectPic_Drake_2), - obj_frame_tiles(gEventObjectPic_Drake_2) + overworld_frame(gEventObjectPic_Drake, 2, 4, 0), + overworld_frame(gEventObjectPic_Drake, 2, 4, 1), + overworld_frame(gEventObjectPic_Drake, 2, 4, 2), + overworld_frame(gEventObjectPic_Drake, 2, 4, 0), + overworld_frame(gEventObjectPic_Drake, 2, 4, 0), + overworld_frame(gEventObjectPic_Drake, 2, 4, 1), + overworld_frame(gEventObjectPic_Drake, 2, 4, 1), + overworld_frame(gEventObjectPic_Drake, 2, 4, 2), + overworld_frame(gEventObjectPic_Drake, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Roxanne[] = { - obj_frame_tiles(gEventObjectPic_Roxanne_0), - obj_frame_tiles(gEventObjectPic_Roxanne_1), - obj_frame_tiles(gEventObjectPic_Roxanne_2), - obj_frame_tiles(gEventObjectPic_Roxanne_0), - obj_frame_tiles(gEventObjectPic_Roxanne_0), - obj_frame_tiles(gEventObjectPic_Roxanne_1), - obj_frame_tiles(gEventObjectPic_Roxanne_1), - obj_frame_tiles(gEventObjectPic_Roxanne_2), - obj_frame_tiles(gEventObjectPic_Roxanne_2) + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Brawly[] = { - obj_frame_tiles(gEventObjectPic_Brawly_0), - obj_frame_tiles(gEventObjectPic_Brawly_1), - obj_frame_tiles(gEventObjectPic_Brawly_2), - obj_frame_tiles(gEventObjectPic_Brawly_0), - obj_frame_tiles(gEventObjectPic_Brawly_0), - obj_frame_tiles(gEventObjectPic_Brawly_1), - obj_frame_tiles(gEventObjectPic_Brawly_1), - obj_frame_tiles(gEventObjectPic_Brawly_2), - obj_frame_tiles(gEventObjectPic_Brawly_2) + overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Wattson[] = { - obj_frame_tiles(gEventObjectPic_Wattson_0), - obj_frame_tiles(gEventObjectPic_Wattson_1), - obj_frame_tiles(gEventObjectPic_Wattson_2), - obj_frame_tiles(gEventObjectPic_Wattson_0), - obj_frame_tiles(gEventObjectPic_Wattson_0), - obj_frame_tiles(gEventObjectPic_Wattson_1), - obj_frame_tiles(gEventObjectPic_Wattson_1), - obj_frame_tiles(gEventObjectPic_Wattson_2), - obj_frame_tiles(gEventObjectPic_Wattson_2) + overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Flannery[] = { - obj_frame_tiles(gEventObjectPic_Flannery_0), - obj_frame_tiles(gEventObjectPic_Flannery_1), - obj_frame_tiles(gEventObjectPic_Flannery_2), - obj_frame_tiles(gEventObjectPic_Flannery_0), - obj_frame_tiles(gEventObjectPic_Flannery_0), - obj_frame_tiles(gEventObjectPic_Flannery_1), - obj_frame_tiles(gEventObjectPic_Flannery_1), - obj_frame_tiles(gEventObjectPic_Flannery_2), - obj_frame_tiles(gEventObjectPic_Flannery_2) + overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Norman[] = { - obj_frame_tiles(gEventObjectPic_Norman_0), - obj_frame_tiles(gEventObjectPic_Norman_1), - obj_frame_tiles(gEventObjectPic_Norman_2), - obj_frame_tiles(gEventObjectPic_Norman_3), - obj_frame_tiles(gEventObjectPic_Norman_4), - obj_frame_tiles(gEventObjectPic_Norman_5), - obj_frame_tiles(gEventObjectPic_Norman_6), - obj_frame_tiles(gEventObjectPic_Norman_7), - obj_frame_tiles(gEventObjectPic_Norman_8) + overworld_frame(gEventObjectPic_Norman, 2, 4, 0), + overworld_frame(gEventObjectPic_Norman, 2, 4, 1), + overworld_frame(gEventObjectPic_Norman, 2, 4, 2), + overworld_frame(gEventObjectPic_Norman, 2, 4, 3), + overworld_frame(gEventObjectPic_Norman, 2, 4, 4), + overworld_frame(gEventObjectPic_Norman, 2, 4, 5), + overworld_frame(gEventObjectPic_Norman, 2, 4, 6), + overworld_frame(gEventObjectPic_Norman, 2, 4, 7), + overworld_frame(gEventObjectPic_Norman, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Winona[] = { - obj_frame_tiles(gEventObjectPic_Winona_0), - obj_frame_tiles(gEventObjectPic_Winona_1), - obj_frame_tiles(gEventObjectPic_Winona_2), - obj_frame_tiles(gEventObjectPic_Winona_0), - obj_frame_tiles(gEventObjectPic_Winona_0), - obj_frame_tiles(gEventObjectPic_Winona_1), - obj_frame_tiles(gEventObjectPic_Winona_1), - obj_frame_tiles(gEventObjectPic_Winona_2), - obj_frame_tiles(gEventObjectPic_Winona_2) + overworld_frame(gEventObjectPic_Winona, 2, 4, 0), + overworld_frame(gEventObjectPic_Winona, 2, 4, 1), + overworld_frame(gEventObjectPic_Winona, 2, 4, 2), + overworld_frame(gEventObjectPic_Winona, 2, 4, 0), + overworld_frame(gEventObjectPic_Winona, 2, 4, 0), + overworld_frame(gEventObjectPic_Winona, 2, 4, 1), + overworld_frame(gEventObjectPic_Winona, 2, 4, 1), + overworld_frame(gEventObjectPic_Winona, 2, 4, 2), + overworld_frame(gEventObjectPic_Winona, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Liza[] = { - obj_frame_tiles(gEventObjectPic_Liza_0), - obj_frame_tiles(gEventObjectPic_Liza_1), - obj_frame_tiles(gEventObjectPic_Liza_2), - obj_frame_tiles(gEventObjectPic_Liza_0), - obj_frame_tiles(gEventObjectPic_Liza_0), - obj_frame_tiles(gEventObjectPic_Liza_1), - obj_frame_tiles(gEventObjectPic_Liza_1), - obj_frame_tiles(gEventObjectPic_Liza_2), - obj_frame_tiles(gEventObjectPic_Liza_2) + overworld_frame(gEventObjectPic_Liza, 2, 4, 0), + overworld_frame(gEventObjectPic_Liza, 2, 4, 1), + overworld_frame(gEventObjectPic_Liza, 2, 4, 2), + overworld_frame(gEventObjectPic_Liza, 2, 4, 0), + overworld_frame(gEventObjectPic_Liza, 2, 4, 0), + overworld_frame(gEventObjectPic_Liza, 2, 4, 1), + overworld_frame(gEventObjectPic_Liza, 2, 4, 1), + overworld_frame(gEventObjectPic_Liza, 2, 4, 2), + overworld_frame(gEventObjectPic_Liza, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Tate[] = { - obj_frame_tiles(gEventObjectPic_Tate_0), - obj_frame_tiles(gEventObjectPic_Tate_1), - obj_frame_tiles(gEventObjectPic_Tate_2), - obj_frame_tiles(gEventObjectPic_Tate_0), - obj_frame_tiles(gEventObjectPic_Tate_0), - obj_frame_tiles(gEventObjectPic_Tate_1), - obj_frame_tiles(gEventObjectPic_Tate_1), - obj_frame_tiles(gEventObjectPic_Tate_2), - obj_frame_tiles(gEventObjectPic_Tate_2) + overworld_frame(gEventObjectPic_Tate, 2, 4, 0), + overworld_frame(gEventObjectPic_Tate, 2, 4, 1), + overworld_frame(gEventObjectPic_Tate, 2, 4, 2), + overworld_frame(gEventObjectPic_Tate, 2, 4, 0), + overworld_frame(gEventObjectPic_Tate, 2, 4, 0), + overworld_frame(gEventObjectPic_Tate, 2, 4, 1), + overworld_frame(gEventObjectPic_Tate, 2, 4, 1), + overworld_frame(gEventObjectPic_Tate, 2, 4, 2), + overworld_frame(gEventObjectPic_Tate, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Wallace[] = { - obj_frame_tiles(gEventObjectPic_Wallace_0), - obj_frame_tiles(gEventObjectPic_Wallace_1), - obj_frame_tiles(gEventObjectPic_Wallace_2), - obj_frame_tiles(gEventObjectPic_Wallace_3), - obj_frame_tiles(gEventObjectPic_Wallace_4), - obj_frame_tiles(gEventObjectPic_Wallace_5), - obj_frame_tiles(gEventObjectPic_Wallace_6), - obj_frame_tiles(gEventObjectPic_Wallace_7), - obj_frame_tiles(gEventObjectPic_Wallace_8) + overworld_frame(gEventObjectPic_Wallace, 2, 4, 0), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 1), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 2), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 3), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 4), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 5), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 6), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 7), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Steven[] = { - obj_frame_tiles(gEventObjectPic_Steven_0), - obj_frame_tiles(gEventObjectPic_Steven_1), - obj_frame_tiles(gEventObjectPic_Steven_2), - obj_frame_tiles(gEventObjectPic_Steven_3), - obj_frame_tiles(gEventObjectPic_Steven_4), - obj_frame_tiles(gEventObjectPic_Steven_5), - obj_frame_tiles(gEventObjectPic_Steven_6), - obj_frame_tiles(gEventObjectPic_Steven_7), - obj_frame_tiles(gEventObjectPic_Steven_8) + overworld_frame(gEventObjectPic_Steven, 2, 4, 0), + overworld_frame(gEventObjectPic_Steven, 2, 4, 1), + overworld_frame(gEventObjectPic_Steven, 2, 4, 2), + overworld_frame(gEventObjectPic_Steven, 2, 4, 3), + overworld_frame(gEventObjectPic_Steven, 2, 4, 4), + overworld_frame(gEventObjectPic_Steven, 2, 4, 5), + overworld_frame(gEventObjectPic_Steven, 2, 4, 6), + overworld_frame(gEventObjectPic_Steven, 2, 4, 7), + overworld_frame(gEventObjectPic_Steven, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Wally[] = { - obj_frame_tiles(gEventObjectPic_Wally_0), - obj_frame_tiles(gEventObjectPic_Wally_1), - obj_frame_tiles(gEventObjectPic_Wally_2), - obj_frame_tiles(gEventObjectPic_Wally_3), - obj_frame_tiles(gEventObjectPic_Wally_4), - obj_frame_tiles(gEventObjectPic_Wally_5), - obj_frame_tiles(gEventObjectPic_Wally_6), - obj_frame_tiles(gEventObjectPic_Wally_7), - obj_frame_tiles(gEventObjectPic_Wally_8) + overworld_frame(gEventObjectPic_Wally, 2, 4, 0), + overworld_frame(gEventObjectPic_Wally, 2, 4, 1), + overworld_frame(gEventObjectPic_Wally, 2, 4, 2), + overworld_frame(gEventObjectPic_Wally, 2, 4, 3), + overworld_frame(gEventObjectPic_Wally, 2, 4, 4), + overworld_frame(gEventObjectPic_Wally, 2, 4, 5), + overworld_frame(gEventObjectPic_Wally, 2, 4, 6), + overworld_frame(gEventObjectPic_Wally, 2, 4, 7), + overworld_frame(gEventObjectPic_Wally, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_LittleBoy3[] = { - obj_frame_tiles(gEventObjectPic_LittleBoy3_0), - obj_frame_tiles(gEventObjectPic_LittleBoy3_1), - obj_frame_tiles(gEventObjectPic_LittleBoy3_2), - obj_frame_tiles(gEventObjectPic_LittleBoy3_3), - obj_frame_tiles(gEventObjectPic_LittleBoy3_4), - obj_frame_tiles(gEventObjectPic_LittleBoy3_5), - obj_frame_tiles(gEventObjectPic_LittleBoy3_6), - obj_frame_tiles(gEventObjectPic_LittleBoy3_7), - obj_frame_tiles(gEventObjectPic_LittleBoy3_8) + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 0), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 1), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 2), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 3), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 4), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 5), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 6), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 7), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 8) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanFishing[] = { - obj_frame_tiles(gEventObjectPic_BrendanFishing_0), - obj_frame_tiles(gEventObjectPic_BrendanFishing_1), - obj_frame_tiles(gEventObjectPic_BrendanFishing_2), - obj_frame_tiles(gEventObjectPic_BrendanFishing_3), - obj_frame_tiles(gEventObjectPic_BrendanFishing_4), - obj_frame_tiles(gEventObjectPic_BrendanFishing_5), - obj_frame_tiles(gEventObjectPic_BrendanFishing_6), - obj_frame_tiles(gEventObjectPic_BrendanFishing_7), - obj_frame_tiles(gEventObjectPic_BrendanFishing_8), - obj_frame_tiles(gEventObjectPic_BrendanFishing_9), - obj_frame_tiles(gEventObjectPic_BrendanFishing_10), - obj_frame_tiles(gEventObjectPic_BrendanFishing_11) + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 5), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 6), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 7), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 8), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 9), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 10), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 11) }; const struct SpriteFrameImage gEventObjectPicTable_MayFishing[] = { - obj_frame_tiles(gEventObjectPic_MayFishing_0), - obj_frame_tiles(gEventObjectPic_MayFishing_1), - obj_frame_tiles(gEventObjectPic_MayFishing_2), - obj_frame_tiles(gEventObjectPic_MayFishing_3), - obj_frame_tiles(gEventObjectPic_MayFishing_4), - obj_frame_tiles(gEventObjectPic_MayFishing_5), - obj_frame_tiles(gEventObjectPic_MayFishing_6), - obj_frame_tiles(gEventObjectPic_MayFishing_7), - obj_frame_tiles(gEventObjectPic_MayFishing_8), - obj_frame_tiles(gEventObjectPic_MayFishing_9), - obj_frame_tiles(gEventObjectPic_MayFishing_10), - obj_frame_tiles(gEventObjectPic_MayFishing_11) + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 0), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 1), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 2), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 3), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 4), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 5), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 6), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 7), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 8), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 9), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 10), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 11) }; const struct SpriteFrameImage gEventObjectPicTable_HotSpringsOldWoman[] = { - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_0), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_1), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_2), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_3), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_4), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_5), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_6), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_7), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_8) + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 0), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 1), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 2), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 3), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 4), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 5), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 6), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 7), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_SSTidal[] = { - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal) + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0) }; const struct SpriteFrameImage gEventObjectPicTable_SubmarineShadow[] = { - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow) + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_PichuDoll[] = { - obj_frame_tiles(gEventObjectPic_PichuDoll) + overworld_frame(gEventObjectPic_PichuDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_PikachuDoll[] = { - obj_frame_tiles(gEventObjectPic_PikachuDoll) + overworld_frame(gEventObjectPic_PikachuDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_MarillDoll[] = { - obj_frame_tiles(gEventObjectPic_MarillDoll) + overworld_frame(gEventObjectPic_MarillDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_TogepiDoll[] = { - obj_frame_tiles(gEventObjectPic_TogepiDoll) + overworld_frame(gEventObjectPic_TogepiDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_CyndaquilDoll[] = { - obj_frame_tiles(gEventObjectPic_CyndaquilDoll) + overworld_frame(gEventObjectPic_CyndaquilDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_ChikoritaDoll[] = { - obj_frame_tiles(gEventObjectPic_ChikoritaDoll) + overworld_frame(gEventObjectPic_ChikoritaDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_TotodileDoll[] = { - obj_frame_tiles(gEventObjectPic_TotodileDoll) + overworld_frame(gEventObjectPic_TotodileDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_JigglypuffDoll[] = { - obj_frame_tiles(gEventObjectPic_JigglypuffDoll) + overworld_frame(gEventObjectPic_JigglypuffDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_MeowthDoll[] = { - obj_frame_tiles(gEventObjectPic_MeowthDoll) + overworld_frame(gEventObjectPic_MeowthDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_ClefairyDoll[] = { - obj_frame_tiles(gEventObjectPic_ClefairyDoll) + overworld_frame(gEventObjectPic_ClefairyDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_DittoDoll[] = { - obj_frame_tiles(gEventObjectPic_DittoDoll) + overworld_frame(gEventObjectPic_DittoDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_SmoochumDoll[] = { - obj_frame_tiles(gEventObjectPic_SmoochumDoll) + overworld_frame(gEventObjectPic_SmoochumDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_TreeckoDoll[] = { - obj_frame_tiles(gEventObjectPic_TreeckoDoll) + overworld_frame(gEventObjectPic_TreeckoDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_TorchicDoll[] = { - obj_frame_tiles(gEventObjectPic_TorchicDoll) + overworld_frame(gEventObjectPic_TorchicDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_MudkipDoll[] = { - obj_frame_tiles(gEventObjectPic_MudkipDoll) + overworld_frame(gEventObjectPic_MudkipDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_DuskullDoll[] = { - obj_frame_tiles(gEventObjectPic_DuskullDoll) + overworld_frame(gEventObjectPic_DuskullDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_WynautDoll[] = { - obj_frame_tiles(gEventObjectPic_WynautDoll) + overworld_frame(gEventObjectPic_WynautDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BaltoyDoll[] = { - obj_frame_tiles(gEventObjectPic_BaltoyDoll) + overworld_frame(gEventObjectPic_BaltoyDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_KecleonDoll[] = { - obj_frame_tiles(gEventObjectPic_KecleonDoll) + overworld_frame(gEventObjectPic_KecleonDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_AzurillDoll[] = { - obj_frame_tiles(gEventObjectPic_AzurillDoll) + overworld_frame(gEventObjectPic_AzurillDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_SkittyDoll[] = { - obj_frame_tiles(gEventObjectPic_SkittyDoll) + overworld_frame(gEventObjectPic_SkittyDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_SwabluDoll[] = { - obj_frame_tiles(gEventObjectPic_SwabluDoll) + overworld_frame(gEventObjectPic_SwabluDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_GulpinDoll[] = { - obj_frame_tiles(gEventObjectPic_GulpinDoll) + overworld_frame(gEventObjectPic_GulpinDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_LotadDoll[] = { - obj_frame_tiles(gEventObjectPic_LotadDoll) + overworld_frame(gEventObjectPic_LotadDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_SeedotDoll[] = { - obj_frame_tiles(gEventObjectPic_SeedotDoll) + overworld_frame(gEventObjectPic_SeedotDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_PikaCushion[] = { - obj_frame_tiles(gEventObjectPic_PikaCushion) + overworld_frame(gEventObjectPic_PikaCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_RoundCushion[] = { - obj_frame_tiles(gEventObjectPic_RoundCushion) + overworld_frame(gEventObjectPic_RoundCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_KissCushion[] = { - obj_frame_tiles(gEventObjectPic_KissCushion) + overworld_frame(gEventObjectPic_KissCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_ZigzagCushion[] = { - obj_frame_tiles(gEventObjectPic_ZigzagCushion) + overworld_frame(gEventObjectPic_ZigzagCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_SpinCushion[] = { - obj_frame_tiles(gEventObjectPic_SpinCushion) + overworld_frame(gEventObjectPic_SpinCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_DiamondCushion[] = { - obj_frame_tiles(gEventObjectPic_DiamondCushion) + overworld_frame(gEventObjectPic_DiamondCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BallCushion[] = { - obj_frame_tiles(gEventObjectPic_BallCushion) + overworld_frame(gEventObjectPic_BallCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_GrassCushion[] = { - obj_frame_tiles(gEventObjectPic_GrassCushion) + overworld_frame(gEventObjectPic_GrassCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_FireCushion[] = { - obj_frame_tiles(gEventObjectPic_FireCushion) + overworld_frame(gEventObjectPic_FireCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_WaterCushion[] = { - obj_frame_tiles(gEventObjectPic_WaterCushion) + overworld_frame(gEventObjectPic_WaterCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigSnorlaxDoll[] = { - obj_frame_tiles(gEventObjectPic_BigSnorlaxDoll) + overworld_frame(gEventObjectPic_BigSnorlaxDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigRhydonDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRhydonDoll) + overworld_frame(gEventObjectPic_BigRhydonDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigLaprasDoll[] = { - obj_frame_tiles(gEventObjectPic_BigLaprasDoll) + overworld_frame(gEventObjectPic_BigLaprasDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigVenusaurDoll[] = { - obj_frame_tiles(gEventObjectPic_BigVenusaurDoll) + overworld_frame(gEventObjectPic_BigVenusaurDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigCharizardDoll[] = { - obj_frame_tiles(gEventObjectPic_BigCharizardDoll) + overworld_frame(gEventObjectPic_BigCharizardDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigBlastoiseDoll[] = { - obj_frame_tiles(gEventObjectPic_BigBlastoiseDoll) + overworld_frame(gEventObjectPic_BigBlastoiseDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigWailmerDoll[] = { - obj_frame_tiles(gEventObjectPic_BigWailmerDoll) + overworld_frame(gEventObjectPic_BigWailmerDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigRegirockDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRegirockDoll) + overworld_frame(gEventObjectPic_BigRegirockDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigRegiceDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRegiceDoll) + overworld_frame(gEventObjectPic_BigRegiceDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigRegisteelDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRegisteelDoll) + overworld_frame(gEventObjectPic_BigRegisteelDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_LatiasLatios[] = { - obj_frame_tiles(gEventObjectPic_LatiasLatios_0), - obj_frame_tiles(gEventObjectPic_LatiasLatios_0), - obj_frame_tiles(gEventObjectPic_LatiasLatios_0), - obj_frame_tiles(gEventObjectPic_LatiasLatios_1), - obj_frame_tiles(gEventObjectPic_LatiasLatios_2), - obj_frame_tiles(gEventObjectPic_LatiasLatios_1), - obj_frame_tiles(gEventObjectPic_LatiasLatios_2), - obj_frame_tiles(gEventObjectPic_LatiasLatios_1), - obj_frame_tiles(gEventObjectPic_LatiasLatios_2) + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Boy5[] = { - obj_frame_tiles(gEventObjectPic_Boy5_0), - obj_frame_tiles(gEventObjectPic_Boy5_1), - obj_frame_tiles(gEventObjectPic_Boy5_2), - obj_frame_tiles(gEventObjectPic_Boy5_0), - obj_frame_tiles(gEventObjectPic_Boy5_0), - obj_frame_tiles(gEventObjectPic_Boy5_1), - obj_frame_tiles(gEventObjectPic_Boy5_1), - obj_frame_tiles(gEventObjectPic_Boy5_2), - obj_frame_tiles(gEventObjectPic_Boy5_2) + overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_ContestJudge[] = { - obj_frame_tiles(gEventObjectPic_ContestJudge_0), - obj_frame_tiles(gEventObjectPic_ContestJudge_1), - obj_frame_tiles(gEventObjectPic_ContestJudge_2), - obj_frame_tiles(gEventObjectPic_ContestJudge_3), - obj_frame_tiles(gEventObjectPic_ContestJudge_4), - obj_frame_tiles(gEventObjectPic_ContestJudge_5), - obj_frame_tiles(gEventObjectPic_ContestJudge_6), - obj_frame_tiles(gEventObjectPic_ContestJudge_7), - obj_frame_tiles(gEventObjectPic_ContestJudge_8) + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 0), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 1), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 2), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 3), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 4), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 5), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 6), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 7), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanWatering[] = { - obj_frame_tiles(gEventObjectPic_BrendanWatering_0), - obj_frame_tiles(gEventObjectPic_BrendanWatering_1), - obj_frame_tiles(gEventObjectPic_BrendanWatering_2), - obj_frame_tiles(gEventObjectPic_BrendanWatering_3), - obj_frame_tiles(gEventObjectPic_BrendanWatering_3), - obj_frame_tiles(gEventObjectPic_BrendanWatering_4), - obj_frame_tiles(gEventObjectPic_BrendanWatering_4), - obj_frame_tiles(gEventObjectPic_BrendanWatering_5), - obj_frame_tiles(gEventObjectPic_BrendanWatering_5) + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 5), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 5) }; const struct SpriteFrameImage gEventObjectPicTable_MayWatering[] = { - obj_frame_tiles(gEventObjectPic_MayWatering_0), - obj_frame_tiles(gEventObjectPic_MayWatering_1), - obj_frame_tiles(gEventObjectPic_MayWatering_2), - obj_frame_tiles(gEventObjectPic_MayWatering_3), - obj_frame_tiles(gEventObjectPic_MayWatering_3), - obj_frame_tiles(gEventObjectPic_MayWatering_4), - obj_frame_tiles(gEventObjectPic_MayWatering_4), - obj_frame_tiles(gEventObjectPic_MayWatering_5), - obj_frame_tiles(gEventObjectPic_MayWatering_5) + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 0), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 2), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 4), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 1), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 1), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 3), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 3), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 5), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 5) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanDecorating[] = { - obj_frame_tiles(gEventObjectPic_BrendanDecorating) + overworld_frame(gEventObjectPic_BrendanDecorating, 2, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_MayDecorating[] = { - obj_frame_tiles(gEventObjectPic_MayDecorating) + overworld_frame(gEventObjectPic_MayDecorating, 2, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_Archie[] = { - obj_frame_tiles(gEventObjectPic_Archie_0), - obj_frame_tiles(gEventObjectPic_Archie_1), - obj_frame_tiles(gEventObjectPic_Archie_2), - obj_frame_tiles(gEventObjectPic_Archie_3), - obj_frame_tiles(gEventObjectPic_Archie_4), - obj_frame_tiles(gEventObjectPic_Archie_5), - obj_frame_tiles(gEventObjectPic_Archie_6), - obj_frame_tiles(gEventObjectPic_Archie_7), - obj_frame_tiles(gEventObjectPic_Archie_8) + overworld_frame(gEventObjectPic_Archie, 2, 4, 0), + overworld_frame(gEventObjectPic_Archie, 2, 4, 1), + overworld_frame(gEventObjectPic_Archie, 2, 4, 2), + overworld_frame(gEventObjectPic_Archie, 2, 4, 3), + overworld_frame(gEventObjectPic_Archie, 2, 4, 4), + overworld_frame(gEventObjectPic_Archie, 2, 4, 5), + overworld_frame(gEventObjectPic_Archie, 2, 4, 6), + overworld_frame(gEventObjectPic_Archie, 2, 4, 7), + overworld_frame(gEventObjectPic_Archie, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Maxie[] = { - obj_frame_tiles(gEventObjectPic_Maxie_0), - obj_frame_tiles(gEventObjectPic_Maxie_1), - obj_frame_tiles(gEventObjectPic_Maxie_2), - obj_frame_tiles(gEventObjectPic_Maxie_3), - obj_frame_tiles(gEventObjectPic_Maxie_4), - obj_frame_tiles(gEventObjectPic_Maxie_5), - obj_frame_tiles(gEventObjectPic_Maxie_6), - obj_frame_tiles(gEventObjectPic_Maxie_7), - obj_frame_tiles(gEventObjectPic_Maxie_8) + overworld_frame(gEventObjectPic_Maxie, 2, 4, 0), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 1), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 2), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 3), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 4), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 5), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 6), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 7), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Kyogre[] = { - obj_frame_tiles(gEventObjectPic_Kyogre_0), - obj_frame_tiles(gEventObjectPic_Kyogre_0), - obj_frame_tiles(gEventObjectPic_Kyogre_0), - obj_frame_tiles(gEventObjectPic_Kyogre_1), - obj_frame_tiles(gEventObjectPic_Kyogre_1), - obj_frame_tiles(gEventObjectPic_Kyogre_1), - obj_frame_tiles(gEventObjectPic_Kyogre_1), - obj_frame_tiles(gEventObjectPic_Kyogre_1), - obj_frame_tiles(gEventObjectPic_Kyogre_1) + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1) }; const struct SpriteFrameImage gEventObjectPicTable_Groudon[] = { - obj_frame_tiles(gEventObjectPic_Groudon_0), - obj_frame_tiles(gEventObjectPic_Groudon_0), - obj_frame_tiles(gEventObjectPic_Groudon_0), - obj_frame_tiles(gEventObjectPic_Groudon_1), - obj_frame_tiles(gEventObjectPic_Groudon_1), - obj_frame_tiles(gEventObjectPic_Groudon_1), - obj_frame_tiles(gEventObjectPic_Groudon_1), - obj_frame_tiles(gEventObjectPic_Groudon_1), - obj_frame_tiles(gEventObjectPic_Groudon_1) + overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1) }; const struct SpriteFrameImage gEventObjectPicTable_Fossil[] = { - obj_frame_tiles(gEventObjectPic_Fossil) + overworld_frame(gEventObjectPic_Fossil, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_Regi[] = { - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi) + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_Skitty[] = { - obj_frame_tiles(gEventObjectPic_Skitty_0), - obj_frame_tiles(gEventObjectPic_Skitty_1), - obj_frame_tiles(gEventObjectPic_Skitty_2), - obj_frame_tiles(gEventObjectPic_Skitty_0), - obj_frame_tiles(gEventObjectPic_Skitty_0), - obj_frame_tiles(gEventObjectPic_Skitty_1), - obj_frame_tiles(gEventObjectPic_Skitty_1), - obj_frame_tiles(gEventObjectPic_Skitty_2), - obj_frame_tiles(gEventObjectPic_Skitty_2) + overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Kecleon[] = { - obj_frame_tiles(gEventObjectPic_Kecleon_0), - obj_frame_tiles(gEventObjectPic_Kecleon_1), - obj_frame_tiles(gEventObjectPic_Kecleon_2), - obj_frame_tiles(gEventObjectPic_Kecleon_0), - obj_frame_tiles(gEventObjectPic_Kecleon_0), - obj_frame_tiles(gEventObjectPic_Kecleon_1), - obj_frame_tiles(gEventObjectPic_Kecleon_1), - obj_frame_tiles(gEventObjectPic_Kecleon_2), - obj_frame_tiles(gEventObjectPic_Kecleon_2) + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Rayquaza[] = { - obj_frame_tiles(gEventObjectPic_Rayquaza_0), - obj_frame_tiles(gEventObjectPic_Rayquaza_0), - obj_frame_tiles(gEventObjectPic_Rayquaza_0), - obj_frame_tiles(gEventObjectPic_Rayquaza_1), - obj_frame_tiles(gEventObjectPic_Rayquaza_1), - obj_frame_tiles(gEventObjectPic_Rayquaza_1), - obj_frame_tiles(gEventObjectPic_Rayquaza_1), - obj_frame_tiles(gEventObjectPic_Rayquaza_1), - obj_frame_tiles(gEventObjectPic_Rayquaza_1) + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1) }; const struct SpriteFrameImage gEventObjectPicTable_Zigzagoon[] = { - obj_frame_tiles(gEventObjectPic_Zigzagoon_0), - obj_frame_tiles(gEventObjectPic_Zigzagoon_1), - obj_frame_tiles(gEventObjectPic_Zigzagoon_2), - obj_frame_tiles(gEventObjectPic_Zigzagoon_0), - obj_frame_tiles(gEventObjectPic_Zigzagoon_0), - obj_frame_tiles(gEventObjectPic_Zigzagoon_1), - obj_frame_tiles(gEventObjectPic_Zigzagoon_1), - obj_frame_tiles(gEventObjectPic_Zigzagoon_2), - obj_frame_tiles(gEventObjectPic_Zigzagoon_2) + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Pikachu[] = { - obj_frame_tiles(gEventObjectPic_Pikachu_0), - obj_frame_tiles(gEventObjectPic_Pikachu_1), - obj_frame_tiles(gEventObjectPic_Pikachu_2), - obj_frame_tiles(gEventObjectPic_Pikachu_0), - obj_frame_tiles(gEventObjectPic_Pikachu_0), - obj_frame_tiles(gEventObjectPic_Pikachu_1), - obj_frame_tiles(gEventObjectPic_Pikachu_1), - obj_frame_tiles(gEventObjectPic_Pikachu_2), - obj_frame_tiles(gEventObjectPic_Pikachu_2) + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Azumarill[] = { - obj_frame_tiles(gEventObjectPic_Azumarill_0), - obj_frame_tiles(gEventObjectPic_Azumarill_1), - obj_frame_tiles(gEventObjectPic_Azumarill_2), - obj_frame_tiles(gEventObjectPic_Azumarill_0), - obj_frame_tiles(gEventObjectPic_Azumarill_0), - obj_frame_tiles(gEventObjectPic_Azumarill_1), - obj_frame_tiles(gEventObjectPic_Azumarill_1), - obj_frame_tiles(gEventObjectPic_Azumarill_2), - obj_frame_tiles(gEventObjectPic_Azumarill_2) + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Wingull[] = { - obj_frame_tiles(gEventObjectPic_Wingull_0), - obj_frame_tiles(gEventObjectPic_Wingull_1), - obj_frame_tiles(gEventObjectPic_Wingull_2), - obj_frame_tiles(gEventObjectPic_Wingull_3), - obj_frame_tiles(gEventObjectPic_Wingull_3), - obj_frame_tiles(gEventObjectPic_Wingull_4), - obj_frame_tiles(gEventObjectPic_Wingull_4), - obj_frame_tiles(gEventObjectPic_Wingull_5), - obj_frame_tiles(gEventObjectPic_Wingull_5) + overworld_frame(gEventObjectPic_Wingull, 2, 2, 0), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 2), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 4), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 1), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 1), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 3), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 3), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 5), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 5) }; const struct SpriteFrameImage gEventObjectPicTable_TuberMSwimming[] = { - obj_frame_tiles(gEventObjectPic_TuberMSwimming_0), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_1), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_2), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_3), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_4), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_5), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_6), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_7), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_8) + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 0), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 1), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 2), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 3), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 4), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 5), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 6), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 7), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Azurill[] = { - obj_frame_tiles(gEventObjectPic_Azurill_0), - obj_frame_tiles(gEventObjectPic_Azurill_1), - obj_frame_tiles(gEventObjectPic_Azurill_2), - obj_frame_tiles(gEventObjectPic_Azurill_0), - obj_frame_tiles(gEventObjectPic_Azurill_0), - obj_frame_tiles(gEventObjectPic_Azurill_1), - obj_frame_tiles(gEventObjectPic_Azurill_1), - obj_frame_tiles(gEventObjectPic_Azurill_2), - obj_frame_tiles(gEventObjectPic_Azurill_2) + overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Mom[] = { - obj_frame_tiles(gEventObjectPic_Mom_0), - obj_frame_tiles(gEventObjectPic_Mom_1), - obj_frame_tiles(gEventObjectPic_Mom_2), - obj_frame_tiles(gEventObjectPic_Mom_3), - obj_frame_tiles(gEventObjectPic_Mom_4), - obj_frame_tiles(gEventObjectPic_Mom_5), - obj_frame_tiles(gEventObjectPic_Mom_6), - obj_frame_tiles(gEventObjectPic_Mom_7), - obj_frame_tiles(gEventObjectPic_Mom_8), + overworld_frame(gEventObjectPic_Mom, 2, 4, 0), + overworld_frame(gEventObjectPic_Mom, 2, 4, 1), + overworld_frame(gEventObjectPic_Mom, 2, 4, 2), + overworld_frame(gEventObjectPic_Mom, 2, 4, 3), + overworld_frame(gEventObjectPic_Mom, 2, 4, 4), + overworld_frame(gEventObjectPic_Mom, 2, 4, 5), + overworld_frame(gEventObjectPic_Mom, 2, 4, 6), + overworld_frame(gEventObjectPic_Mom, 2, 4, 7), + overworld_frame(gEventObjectPic_Mom, 2, 4, 8), }; #endif //POKERUBY_EVENT_OBJECT_PIC_TABLES_H diff --git a/src/data/field_event_obj/field_effect_object_graphics.h b/src/data/field_event_obj/field_effect_object_graphics.h index 36850a4ec..e06fc7260 100644 --- a/src/data/field_event_obj/field_effect_object_graphics.h +++ b/src/data/field_event_obj/field_effect_object_graphics.h @@ -9,140 +9,39 @@ const u32 filler_8368A08[0x48] = {}; const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/field_effect_objects/pics/cut_grass.4bpp"); const u32 FieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/field_effect_objects/pics/cut_grass.4bpp"); const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/field_effect_objects/palettes/06.gbapal"); -const u32 gFieldEffectPic_Ripple_0[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/0.4bpp"); -const u32 gFieldEffectPic_Ripple_1[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/1.4bpp"); -const u32 gFieldEffectPic_Ripple_2[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/2.4bpp"); -const u32 gFieldEffectPic_Ripple_3[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/3.4bpp"); -const u32 gFieldEffectPic_Ripple_4[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/4.4bpp"); -const u32 gFieldEffectPic_Ash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/0.4bpp"); -const u32 gFieldEffectPic_Ash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/1.4bpp"); -const u32 gFieldEffectPic_Ash_2[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/2.4bpp"); -const u32 gFieldEffectPic_Ash_3[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/3.4bpp"); -const u32 gFieldEffectPic_Ash_4[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/4.4bpp"); -const u32 gFieldEffectPic_Arrow_0[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/0.4bpp"); -const u32 gFieldEffectPic_Arrow_1[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/1.4bpp"); -const u32 gFieldEffectPic_Arrow_2[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/2.4bpp"); -const u32 gFieldEffectPic_Arrow_3[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/3.4bpp"); -const u32 gFieldEffectPic_Arrow_4[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/4.4bpp"); -const u32 gFieldEffectPic_Arrow_5[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/5.4bpp"); -const u32 gFieldEffectPic_Arrow_6[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/6.4bpp"); -const u32 gFieldEffectPic_Arrow_7[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/7.4bpp"); +const u32 gFieldEffectPic_Ripple[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple.4bpp"); +const u32 gFieldEffectPic_Ash[] = INCBIN_U32("graphics/field_effect_objects/pics/ash.4bpp"); +const u32 gFieldEffectPic_Arrow[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow.4bpp"); const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effect_objects/palettes/00.gbapal"); const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effect_objects/palettes/01.gbapal"); -const u32 gFieldEffectPic_Dust_0[] = INCBIN_U32("graphics/field_effect_objects/pics/dust/0.4bpp"); -const u32 gFieldEffectPic_Dust_1[] = INCBIN_U32("graphics/field_effect_objects/pics/dust/1.4bpp"); -const u32 gFieldEffectPic_Dust_2[] = INCBIN_U32("graphics/field_effect_objects/pics/dust/2.4bpp"); +const u32 gFieldEffectPic_Dust[] = INCBIN_U32("graphics/field_effect_objects/pics/dust.4bpp"); const u32 unknown_8369588[] = INCBIN_U32("graphics/field_effect_objects/unknown.bin"); -const u32 gFieldEffectPic_JumpTallGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/0.4bpp"); -const u32 gFieldEffectPic_JumpTallGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/1.4bpp"); -const u32 gFieldEffectPic_JumpTallGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/2.4bpp"); -const u32 gFieldEffectPic_JumpTallGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/3.4bpp"); -const u32 UnusedGrass0[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/0.4bpp"); -const u32 UnusedGrass1[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/1.4bpp"); -const u32 UnusedGrass2[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/2.4bpp"); -const u32 UnusedGrass3[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/3.4bpp"); -const u32 gFieldEffectPic_JumpLongGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/0.4bpp"); -const u32 gFieldEffectPic_JumpLongGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/1.4bpp"); -const u32 gFieldEffectPic_JumpLongGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/2.4bpp"); -const u32 gFieldEffectPic_JumpLongGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/3.4bpp"); -const u32 gFieldEffectPic_JumpLongGrass_4[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/4.4bpp"); -const u32 UnusedGrassLong[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/unused.4bpp"); -const u32 gFieldEffectPic_JumpLongGrass_5[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/5.4bpp"); -const u32 gFieldEffectPic_Unknown17_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/0.4bpp"); -const u32 gFieldEffectPic_Unknown17_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/1.4bpp"); -const u32 gFieldEffectPic_Unknown17_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/2.4bpp"); -const u32 gFieldEffectPic_Unknown17_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/3.4bpp"); -const u32 gFieldEffectPic_Unknown17_4[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/4.4bpp"); -const u32 gFieldEffectPic_Unknown17_5[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/5.4bpp"); -const u32 gFieldEffectPic_Unknown17_6[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/6.4bpp"); -const u32 gFieldEffectPic_Unknown17_7[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/7.4bpp"); -const u32 gFieldEffectPic_Unknown18_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/0.4bpp"); -const u32 gFieldEffectPic_Unknown18_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/1.4bpp"); -const u32 gFieldEffectPic_Unknown18_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/2.4bpp"); -const u32 gFieldEffectPic_Unknown18_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/3.4bpp"); -const u32 gFieldEffectPic_LongGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/0.4bpp"); -const u32 gFieldEffectPic_LongGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/1.4bpp"); -const u32 gFieldEffectPic_LongGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/2.4bpp"); -const u32 gFieldEffectPic_LongGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/3.4bpp"); -const u32 gFieldEffectPic_TallGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/0.4bpp"); -const u32 gFieldEffectPic_TallGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/1.4bpp"); -const u32 gFieldEffectPic_TallGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/2.4bpp"); -const u32 gFieldEffectPic_TallGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/3.4bpp"); -const u32 gFieldEffectPic_TallGrass_4[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/4.4bpp"); -const u32 gFieldEffectPic_ShortGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/short_grass/0.4bpp"); -const u32 gFieldEffectPic_ShortGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/short_grass/1.4bpp"); -const u32 gFieldEffectPic_SandFootprints_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_footprints/0.4bpp"); -const u32 gFieldEffectPic_SandFootprints_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_footprints/1.4bpp"); -const u32 gFieldEffectPic_DeepSandFootprints_0[] = INCBIN_U32("graphics/field_effect_objects/pics/deep_sand_footprints/0.4bpp"); -const u32 gFieldEffectPic_DeepSandFootprints_1[] = INCBIN_U32("graphics/field_effect_objects/pics/deep_sand_footprints/1.4bpp"); -const u32 gFieldEffectPic_BikeTireTracks_0[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/0.4bpp"); -const u32 gFieldEffectPic_BikeTireTracks_1[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/1.4bpp"); -const u32 gFieldEffectPic_BikeTireTracks_2[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/2.4bpp"); -const u32 gFieldEffectPic_BikeTireTracks_3[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/3.4bpp"); -const u32 gFieldEffectPic_Unknown19_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/0.4bpp"); -const u32 gFieldEffectPic_Unknown19_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/1.4bpp"); -const u32 gFieldEffectPic_Unknown19_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/2.4bpp"); -const u32 gFieldEffectPic_Unknown19_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/3.4bpp"); -const u32 gFieldEffectPic_SandPile_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_pile/0.4bpp"); -const u32 gFieldEffectPic_SandPile_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_pile/1.4bpp"); -const u32 gFieldEffectPic_SandPile_2[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_pile/2.4bpp"); -const u32 gFieldEffectPic_JumpBigSplash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/0.4bpp"); -const u32 gFieldEffectPic_JumpBigSplash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/1.4bpp"); -const u32 gFieldEffectPic_JumpBigSplash_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/2.4bpp"); -const u32 gFieldEffectPic_JumpBigSplash_3[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/3.4bpp"); -const u32 gFieldEffectPic_Splash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/splash/0.4bpp"); -const u32 gFieldEffectPic_Splash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/splash/1.4bpp"); -const u32 gFieldEffectPic_JumpSmallSplash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_small_splash/0.4bpp"); -const u32 gFieldEffectPic_JumpSmallSplash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_small_splash/1.4bpp"); -const u32 gFieldEffectPic_JumpSmallSplash_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_small_splash/2.4bpp"); -const u32 gFieldEffectPic_Unknown20_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/0.4bpp"); -const u32 gFieldEffectPic_Unknown20_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/1.4bpp"); -const u32 gFieldEffectPic_Unknown20_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/2.4bpp"); -const u32 gFieldEffectPic_Unknown20_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/3.4bpp"); -const u32 gFieldEffectPic_Unknown20_4[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/4.4bpp"); -const u32 gFieldEffectPic_TreeDisguise_0[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/0.4bpp"); -const u32 gFieldEffectPic_TreeDisguise_1[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/1.4bpp"); -const u32 gFieldEffectPic_TreeDisguise_2[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/2.4bpp"); -const u32 gFieldEffectPic_TreeDisguise_3[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/3.4bpp"); -const u32 gFieldEffectPic_TreeDisguise_4[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/4.4bpp"); -const u32 gFieldEffectPic_TreeDisguise_5[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/5.4bpp"); -const u32 gFieldEffectPic_TreeDisguise_6[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/6.4bpp"); -const u32 gFieldEffectPic_MountainDisguise_0[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/0.4bpp"); -const u32 gFieldEffectPic_MountainDisguise_1[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/1.4bpp"); -const u32 gFieldEffectPic_MountainDisguise_2[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/2.4bpp"); -const u32 gFieldEffectPic_MountainDisguise_3[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/3.4bpp"); -const u32 gFieldEffectPic_MountainDisguise_4[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/4.4bpp"); -const u32 gFieldEffectPic_MountainDisguise_5[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/5.4bpp"); -const u32 gFieldEffectPic_MountainDisguise_6[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/6.4bpp"); -const u32 gFieldEffectPic_SandDisguise_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/0.4bpp"); -const u32 gFieldEffectPic_SandDisguise_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/1.4bpp"); -const u32 gFieldEffectPic_SandDisguise_2[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/2.4bpp"); -const u32 gFieldEffectPic_SandDisguise_3[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/3.4bpp"); -const u32 gFieldEffectPic_SandDisguise_4[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/4.4bpp"); -const u32 gFieldEffectPic_SandDisguise_5[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/5.4bpp"); -const u32 gFieldEffectPic_SandDisguise_6[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/6.4bpp"); +const u32 gFieldEffectPic_JumpTallGrass[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass.4bpp"); +const u32 gFieldEffectPic_UnusedGrass[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass.4bpp"); +const u32 gFieldEffectPic_JumpLongGrass[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass.4bpp"); +const u32 gFieldEffectPic_Unknown17[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17.4bpp"); +const u32 gFieldEffectPic_Unknown18[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18.4bpp"); +const u32 gFieldEffectPic_LongGrass[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass.4bpp"); +const u32 gFieldEffectPic_TallGrass[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass.4bpp"); +const u32 gFieldEffectPic_ShortGrass[] = INCBIN_U32("graphics/field_effect_objects/pics/short_grass.4bpp"); +const u32 gFieldEffectPic_SandFootprints[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_footprints.4bpp"); +const u32 gFieldEffectPic_DeepSandFootprints[] = INCBIN_U32("graphics/field_effect_objects/pics/deep_sand_footprints.4bpp"); +const u32 gFieldEffectPic_BikeTireTracks[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks.4bpp"); +const u32 gFieldEffectPic_Unknown19[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19.4bpp"); +const u32 gFieldEffectPic_SandPile[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_pile.4bpp"); +const u32 gFieldEffectPic_JumpBigSplash[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash.4bpp"); +const u32 gFieldEffectPic_Splash[] = INCBIN_U32("graphics/field_effect_objects/pics/splash.4bpp"); +const u32 gFieldEffectPic_JumpSmallSplash[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_small_splash.4bpp"); +const u32 gFieldEffectPic_Unknown20[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20.4bpp"); +const u32 gFieldEffectPic_TreeDisguise[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise.4bpp"); +const u32 gFieldEffectPic_MountainDisguise[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise.4bpp"); +const u32 gFieldEffectPic_SandDisguise[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise.4bpp"); const u32 gFieldEffectPic_HotSpringsWater[] = INCBIN_U32("graphics/field_effect_objects/pics/hot_springs_water.4bpp"); const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/field_effect_objects/palettes/02.gbapal"); -const u32 gFieldEffectPic_PopOutOfAsh_0[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/0.4bpp"); -const u32 gFieldEffectPic_PopOutOfAsh_1[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/1.4bpp"); -const u32 gFieldEffectPic_PopOutOfAsh_2[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/2.4bpp"); -const u32 gFieldEffectPic_PopOutOfAsh_3[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/3.4bpp"); -const u32 gFieldEffectPic_PopOutOfAsh_4[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/4.4bpp"); -const u32 gFieldEffectPic_LavaridgeGymWarp_0[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/0.4bpp"); -const u32 gFieldEffectPic_LavaridgeGymWarp_1[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/1.4bpp"); -const u32 gFieldEffectPic_LavaridgeGymWarp_2[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/2.4bpp"); -const u32 gFieldEffectPic_LavaridgeGymWarp_3[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/3.4bpp"); -const u32 gFieldEffectPic_LavaridgeGymWarp_4[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/4.4bpp"); -const u32 gFieldEffectPic_Bubbles_0[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/0.4bpp"); -const u32 gFieldEffectPic_Bubbles_1[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/1.4bpp"); -const u32 gFieldEffectPic_Bubbles_2[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/2.4bpp"); -const u32 gFieldEffectPic_Bubbles_3[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/3.4bpp"); -const u32 gFieldEffectPic_Bubbles_4[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/4.4bpp"); -const u32 gFieldEffectPic_Bubbles_5[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/5.4bpp"); -const u32 gFieldEffectPic_Bubbles_6[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/6.4bpp"); -const u32 gFieldEffectPic_Bubbles_7[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/7.4bpp"); -const u32 gFieldEffectPic_Sparkle_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sparkle/0.4bpp"); -const u32 gFieldEffectPic_Sparkle_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sparkle/1.4bpp"); +const u32 gFieldEffectPic_PopOutOfAsh[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash.4bpp"); +const u32 gFieldEffectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp.4bpp"); +const u32 gFieldEffectPic_Bubbles[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles.4bpp"); +const u32 gFieldEffectPic_Sparkle[] = INCBIN_U32("graphics/field_effect_objects/pics/sparkle.4bpp"); const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/field_effect_objects/palettes/03.gbapal"); const u32 gFieldEffectPic_Bird[] = INCBIN_U32("graphics/field_effect_objects/pics/bird.4bpp"); diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h index 8533b3cdd..d5d2f2016 100644 --- a/src/data/field_event_obj/field_effect_objects.h +++ b/src/data/field_event_obj/field_effect_objects.h @@ -19,19 +19,19 @@ const union AnimCmd *const gFieldEffectAnimTable_Shadow[] = { }; const struct SpriteFrameImage gFieldEffectPicTable_ShadowSmall[] = { - obj_frame_tiles(gFieldEffectPic_ShadowSmall) + overworld_frame(gFieldEffectPic_ShadowSmall, 1, 1, 0) }; const struct SpriteFrameImage gFieldEffectPicTable_ShadowMedium[] = { - obj_frame_tiles(gFieldEffectPic_ShadowMedium) + overworld_frame(gFieldEffectPic_ShadowMedium, 2, 1, 0) }; const struct SpriteFrameImage gFieldEffectPicTable_ShadowLarge[] = { - obj_frame_tiles(gFieldEffectPic_ShadowLarge) + overworld_frame(gFieldEffectPic_ShadowLarge, 4, 1, 0) }; const struct SpriteFrameImage gFieldEffectPicTable_ShadowExtraLarge[] = { - obj_frame_tiles(gFieldEffectPic_ShadowExtraLarge) + overworld_frame(gFieldEffectPic_ShadowExtraLarge, 8, 4, 0) }; const struct SpriteTemplate gFieldEffectSpriteTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gFieldOamData_8x8, gFieldEffectAnimTable_Shadow, gFieldEffectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; @@ -43,11 +43,11 @@ const struct SpriteTemplate gFieldEffectSpriteTemplate_ShadowLarge = {0xFFFF, 0x const struct SpriteTemplate gFieldEffectSpriteTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gFieldOamData_64x32, gFieldEffectAnimTable_Shadow, gFieldEffectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_TallGrass[] = { - obj_frame_tiles(gFieldEffectPic_TallGrass_0), - obj_frame_tiles(gFieldEffectPic_TallGrass_1), - obj_frame_tiles(gFieldEffectPic_TallGrass_2), - obj_frame_tiles(gFieldEffectPic_TallGrass_3), - obj_frame_tiles(gFieldEffectPic_TallGrass_4) + overworld_frame(gFieldEffectPic_TallGrass, 2, 2, 0), + overworld_frame(gFieldEffectPic_TallGrass, 2, 2, 1), + overworld_frame(gFieldEffectPic_TallGrass, 2, 2, 2), + overworld_frame(gFieldEffectPic_TallGrass, 2, 2, 3), + overworld_frame(gFieldEffectPic_TallGrass, 2, 2, 4) }; const union AnimCmd gFieldEffectAnim_83745E8[] = { @@ -66,11 +66,11 @@ const union AnimCmd *const gFieldEffectAnimTable_TallGrass[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_TallGrass = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_TallGrass, gFieldEffectPicTable_TallGrass, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_Ripple[] = { - obj_frame_tiles(gFieldEffectPic_Ripple_0), - obj_frame_tiles(gFieldEffectPic_Ripple_1), - obj_frame_tiles(gFieldEffectPic_Ripple_2), - obj_frame_tiles(gFieldEffectPic_Ripple_3), - obj_frame_tiles(gFieldEffectPic_Ripple_4) + overworld_frame(gFieldEffectPic_Ripple, 2, 2, 0), + overworld_frame(gFieldEffectPic_Ripple, 2, 2, 1), + overworld_frame(gFieldEffectPic_Ripple, 2, 2, 2), + overworld_frame(gFieldEffectPic_Ripple, 2, 2, 3), + overworld_frame(gFieldEffectPic_Ripple, 2, 2, 4) }; const union AnimCmd gFieldEffectAnim_8374644[] = { @@ -92,11 +92,11 @@ const union AnimCmd *const gFieldEffectAnimTable_Ripple[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Ripple = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_Ripple, gFieldEffectPicTable_Ripple, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectPicTable_Ash[] = { - obj_frame_tiles(gFieldEffectPic_Ash_0), - obj_frame_tiles(gFieldEffectPic_Ash_1), - obj_frame_tiles(gFieldEffectPic_Ash_2), - obj_frame_tiles(gFieldEffectPic_Ash_3), - obj_frame_tiles(gFieldEffectPic_Ash_4) + overworld_frame(gFieldEffectPic_Ash, 2, 2, 0), + overworld_frame(gFieldEffectPic_Ash, 2, 2, 1), + overworld_frame(gFieldEffectPic_Ash, 2, 2, 2), + overworld_frame(gFieldEffectPic_Ash, 2, 2, 3), + overworld_frame(gFieldEffectPic_Ash, 2, 2, 4) }; const union AnimCmd gFieldEffectAnim_83746AC[] = { @@ -115,9 +115,9 @@ const union AnimCmd *const gFieldEffectAnimTable_Ash[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Ash = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_Ash, gFieldEffectPicTable_Ash, gDummySpriteAffineAnimTable, UpdateAshFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_SurfBlob[] = { - obj_frame_tiles(gFieldEffectPic_SurfBlob_0), - obj_frame_tiles(gFieldEffectPic_SurfBlob_1), - obj_frame_tiles(gFieldEffectPic_SurfBlob_2) + overworld_frame(gFieldEffectPic_SurfBlob, 4, 4, 0), + overworld_frame(gFieldEffectPic_SurfBlob, 4, 4, 1), + overworld_frame(gFieldEffectPic_SurfBlob, 4, 4, 2) }; const union AnimCmd gFieldEffectAnim_83746F8[] = { @@ -150,14 +150,14 @@ const union AnimCmd *const gFieldEffectAnimTable_SurfBlob[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gFieldOamData_32x32, gFieldEffectAnimTable_SurfBlob, gFieldEffectPicTable_SurfBlob, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_Arrow[] = { - obj_frame_tiles(gFieldEffectPic_Arrow_0), - obj_frame_tiles(gFieldEffectPic_Arrow_1), - obj_frame_tiles(gFieldEffectPic_Arrow_2), - obj_frame_tiles(gFieldEffectPic_Arrow_3), - obj_frame_tiles(gFieldEffectPic_Arrow_4), - obj_frame_tiles(gFieldEffectPic_Arrow_5), - obj_frame_tiles(gFieldEffectPic_Arrow_6), - obj_frame_tiles(gFieldEffectPic_Arrow_7) + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 0), + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 1), + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 2), + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 3), + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 4), + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 5), + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 6), + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 7) }; const union AnimCmd gFieldEffectAnim_8374780[] = { @@ -194,9 +194,9 @@ const union AnimCmd *const gFieldEffectAnimTable_Arrow[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Arrow = {0xFFFF, 0xFFFF, &gFieldOamData_16x16, gFieldEffectAnimTable_Arrow, gFieldEffectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectPicTable_Dust[] = { - obj_frame_tiles(gFieldEffectPic_Dust_0), - obj_frame_tiles(gFieldEffectPic_Dust_1), - obj_frame_tiles(gFieldEffectPic_Dust_2) + overworld_frame(gFieldEffectPic_Dust, 2, 1, 0), + overworld_frame(gFieldEffectPic_Dust, 2, 1, 1), + overworld_frame(gFieldEffectPic_Dust, 2, 1, 2) }; const union AnimCmd gFieldEffectAnim_83747F0[] = { @@ -213,10 +213,10 @@ const union AnimCmd *const gFieldEffectAnimTable_Dust[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Dust = {0xFFFF, 0x1004, &gFieldOamData_16x8, gFieldEffectAnimTable_Dust, gFieldEffectPicTable_Dust, gDummySpriteAffineAnimTable, UpdateJumpLandingFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_JumpTallGrass[] = { - obj_frame_tiles(gFieldEffectPic_JumpTallGrass_0), - obj_frame_tiles(gFieldEffectPic_JumpTallGrass_1), - obj_frame_tiles(gFieldEffectPic_JumpTallGrass_2), - obj_frame_tiles(gFieldEffectPic_JumpTallGrass_3) + overworld_frame(gFieldEffectPic_JumpTallGrass, 2, 1, 0), + overworld_frame(gFieldEffectPic_JumpTallGrass, 2, 1, 1), + overworld_frame(gFieldEffectPic_JumpTallGrass, 2, 1, 2), + overworld_frame(gFieldEffectPic_JumpTallGrass, 2, 1, 3) }; const union AnimCmd gFieldEffectAnim_837483C[] = { @@ -234,8 +234,8 @@ const union AnimCmd *const gFieldEffectAnimTable_JumpTallGrass[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_JumpTallGrass = {0xFFFF, 0x1005, &gFieldOamData_16x8, gFieldEffectAnimTable_JumpTallGrass, gFieldEffectPicTable_JumpTallGrass, gDummySpriteAffineAnimTable, UpdateJumpLandingFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_SandFootprints[] = { - obj_frame_tiles(gFieldEffectPic_SandFootprints_0), - obj_frame_tiles(gFieldEffectPic_SandFootprints_1) + overworld_frame(gFieldEffectPic_SandFootprints, 2, 2, 0), + overworld_frame(gFieldEffectPic_SandFootprints, 2, 2, 1) }; const union AnimCmd gFieldEffectAnim_837487C[] = { @@ -269,8 +269,8 @@ const union AnimCmd *const gFieldEffectAnimTable_SandFootprints[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_SandFootprints = {0xFFFF, 0x1004, &gFieldOamData_16x16, gFieldEffectAnimTable_SandFootprints, gFieldEffectPicTable_SandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_DeepSandFootprints[] = { - obj_frame_tiles(gFieldEffectPic_DeepSandFootprints_0), - obj_frame_tiles(gFieldEffectPic_DeepSandFootprints_1) + overworld_frame(gFieldEffectPic_DeepSandFootprints, 2, 2, 0), + overworld_frame(gFieldEffectPic_DeepSandFootprints, 2, 2, 1) }; const union AnimCmd gFieldEffectAnim_83748D8[] = { @@ -304,10 +304,10 @@ const union AnimCmd *const gFieldEffectAnimTable_DeepSandFootprints[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gFieldOamData_16x16, gFieldEffectAnimTable_DeepSandFootprints, gFieldEffectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_BikeTireTracks[] = { - obj_frame_tiles(gFieldEffectPic_BikeTireTracks_0), - obj_frame_tiles(gFieldEffectPic_BikeTireTracks_1), - obj_frame_tiles(gFieldEffectPic_BikeTireTracks_2), - obj_frame_tiles(gFieldEffectPic_BikeTireTracks_3) + overworld_frame(gFieldEffectPic_BikeTireTracks, 2, 2, 0), + overworld_frame(gFieldEffectPic_BikeTireTracks, 2, 2, 1), + overworld_frame(gFieldEffectPic_BikeTireTracks, 2, 2, 2), + overworld_frame(gFieldEffectPic_BikeTireTracks, 2, 2, 3) }; const union AnimCmd gFieldEffectAnim_8374944[] = { @@ -365,10 +365,10 @@ const union AnimCmd *const gFieldEffectAnimTable_BikeTireTracks[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gFieldOamData_16x16, gFieldEffectAnimTable_BikeTireTracks, gFieldEffectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_JumpBigSplash[] = { - obj_frame_tiles(gFieldEffectPic_JumpBigSplash_0), - obj_frame_tiles(gFieldEffectPic_JumpBigSplash_1), - obj_frame_tiles(gFieldEffectPic_JumpBigSplash_2), - obj_frame_tiles(gFieldEffectPic_JumpBigSplash_3) + overworld_frame(gFieldEffectPic_JumpBigSplash, 2, 2, 0), + overworld_frame(gFieldEffectPic_JumpBigSplash, 2, 2, 1), + overworld_frame(gFieldEffectPic_JumpBigSplash, 2, 2, 2), + overworld_frame(gFieldEffectPic_JumpBigSplash, 2, 2, 3) }; const union AnimCmd gFieldEffectAnim_83749E0[] = { @@ -386,8 +386,8 @@ const union AnimCmd *const gFieldEffectAnimTable_JumpBigSplash[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_JumpBigSplash = {0xFFFF, 0x1004, &gFieldOamData_16x16, gFieldEffectAnimTable_JumpBigSplash, gFieldEffectPicTable_JumpBigSplash, gDummySpriteAffineAnimTable, UpdateJumpLandingFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_Splash[] = { - obj_frame_tiles(gFieldEffectPic_Splash_0), - obj_frame_tiles(gFieldEffectPic_Splash_1) + overworld_frame(gFieldEffectPic_Splash, 2, 1, 0), + overworld_frame(gFieldEffectPic_Splash, 2, 1, 1) }; const union AnimCmd gFieldEffectAnim_8374A20[] = { @@ -416,9 +416,9 @@ const union AnimCmd *const gFieldEffectAnimTable_Splash[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Splash = {0xFFFF, 0x1004, &gFieldOamData_16x8, gFieldEffectAnimTable_Splash, gFieldEffectPicTable_Splash, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_JumpSmallSplash[] = { - obj_frame_tiles(gFieldEffectPic_JumpSmallSplash_0), - obj_frame_tiles(gFieldEffectPic_JumpSmallSplash_1), - obj_frame_tiles(gFieldEffectPic_JumpSmallSplash_2) + overworld_frame(gFieldEffectPic_JumpSmallSplash, 2, 1, 0), + overworld_frame(gFieldEffectPic_JumpSmallSplash, 2, 1, 1), + overworld_frame(gFieldEffectPic_JumpSmallSplash, 2, 1, 2) }; const union AnimCmd gFieldEffectAnim_8374A88[] = { @@ -435,10 +435,10 @@ const union AnimCmd *const gFieldEffectAnimTable_JumpSmallSplash[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_JumpSmallSplash = {0xFFFF, 0x1004, &gFieldOamData_16x8, gFieldEffectAnimTable_JumpSmallSplash, gFieldEffectPicTable_JumpSmallSplash, gDummySpriteAffineAnimTable, UpdateJumpLandingFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_LongGrass[] = { - obj_frame_tiles(gFieldEffectPic_LongGrass_0), - obj_frame_tiles(gFieldEffectPic_LongGrass_1), - obj_frame_tiles(gFieldEffectPic_LongGrass_2), - obj_frame_tiles(gFieldEffectPic_LongGrass_3) + overworld_frame(gFieldEffectPic_LongGrass, 2, 2, 0), + overworld_frame(gFieldEffectPic_LongGrass, 2, 2, 1), + overworld_frame(gFieldEffectPic_LongGrass, 2, 2, 2), + overworld_frame(gFieldEffectPic_LongGrass, 2, 2, 3) }; const union AnimCmd gFieldEffectAnim_8374AD4[] = { @@ -459,12 +459,12 @@ const union AnimCmd *const gFieldEffectAnimTable_LongGrass[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_LongGrass = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_LongGrass, gFieldEffectPicTable_LongGrass, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_JumpLongGrass[] = { - obj_frame_tiles(gFieldEffectPic_JumpLongGrass_0), - obj_frame_tiles(gFieldEffectPic_JumpLongGrass_1), - obj_frame_tiles(gFieldEffectPic_JumpLongGrass_2), - obj_frame_tiles(gFieldEffectPic_JumpLongGrass_3), - obj_frame_tiles(gFieldEffectPic_JumpLongGrass_4), - obj_frame_tiles(gFieldEffectPic_JumpLongGrass_5) + overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 0), + overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 1), + overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 2), + overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 3), + overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 4), + overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 6) }; const union AnimCmd gFieldEffectAnim_8374B40[] = { @@ -484,15 +484,15 @@ const union AnimCmd *const gFieldEffectAnimTable_JumpLongGrass[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_JumpLongGrass = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_JumpLongGrass, gFieldEffectPicTable_JumpLongGrass, gDummySpriteAffineAnimTable, UpdateJumpLandingFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_Unknown17[] = { - obj_frame_tiles(gFieldEffectPic_JumpLongGrass_5), - obj_frame_tiles(gFieldEffectPic_Unknown17_0), - obj_frame_tiles(gFieldEffectPic_Unknown17_1), - obj_frame_tiles(gFieldEffectPic_Unknown17_2), - obj_frame_tiles(gFieldEffectPic_Unknown17_3), - obj_frame_tiles(gFieldEffectPic_Unknown17_4), - obj_frame_tiles(gFieldEffectPic_Unknown17_5), - obj_frame_tiles(gFieldEffectPic_Unknown17_6), - obj_frame_tiles(gFieldEffectPic_Unknown17_7) + overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 6), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 0), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 1), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 2), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 3), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 4), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 5), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 6), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 7) }; const union AnimCmd gFieldEffectAnim_8374BC0[] = { @@ -515,10 +515,10 @@ const union AnimCmd *const gFieldEffectAnimTable_Unknown17[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Unknown17 = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_Unknown17, gFieldEffectPicTable_Unknown17, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectPicTable_Unknown18[] = { - obj_frame_tiles(gFieldEffectPic_Unknown18_0), - obj_frame_tiles(gFieldEffectPic_Unknown18_1), - obj_frame_tiles(gFieldEffectPic_Unknown18_2), - obj_frame_tiles(gFieldEffectPic_Unknown18_3) + overworld_frame(gFieldEffectPic_Unknown18, 2, 2, 0), + overworld_frame(gFieldEffectPic_Unknown18, 2, 2, 1), + overworld_frame(gFieldEffectPic_Unknown18, 2, 2, 2), + overworld_frame(gFieldEffectPic_Unknown18, 2, 2, 3) }; const union AnimCmd gFieldEffectAnim_8374C24[] = { @@ -538,10 +538,10 @@ const union AnimCmd *const gFieldEffectAnimTable_Unknown18[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Unknown18 = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_Unknown18, gFieldEffectPicTable_Unknown18, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectPicTable_Unknown19[] = { - obj_frame_tiles(gFieldEffectPic_Unknown19_0), - obj_frame_tiles(gFieldEffectPic_Unknown19_1), - obj_frame_tiles(gFieldEffectPic_Unknown19_2), - obj_frame_tiles(gFieldEffectPic_Unknown19_3) + overworld_frame(gFieldEffectPic_Unknown19, 2, 2, 0), + overworld_frame(gFieldEffectPic_Unknown19, 2, 2, 1), + overworld_frame(gFieldEffectPic_Unknown19, 2, 2, 2), + overworld_frame(gFieldEffectPic_Unknown19, 2, 2, 3) }; const union AnimCmd gFieldEffectAnim_8374C7C[] = { @@ -559,9 +559,9 @@ const union AnimCmd *const gFieldEffectAnimTable_Unknown19[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Unknown19 = {0xFFFF, 0x1004, &gFieldOamData_16x16, gFieldEffectAnimTable_Unknown19, gFieldEffectPicTable_Unknown19, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectPicTable_SandPile[] = { - obj_frame_tiles(gFieldEffectPic_SandPile_0), - obj_frame_tiles(gFieldEffectPic_SandPile_1), - obj_frame_tiles(gFieldEffectPic_SandPile_2) + overworld_frame(gFieldEffectPic_SandPile, 2, 1, 0), + overworld_frame(gFieldEffectPic_SandPile, 2, 1, 1), + overworld_frame(gFieldEffectPic_SandPile, 2, 1, 2) }; const union AnimCmd gFieldEffectAnim_8374CC4[] = { @@ -578,10 +578,10 @@ const union AnimCmd *const gFieldEffectAnimTable_SandPile[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_SandPile = {0xFFFF, 0x1004, &gFieldOamData_16x8, gFieldEffectAnimTable_SandPile, gFieldEffectPicTable_SandPile, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_Unknown20[] = { - obj_frame_tiles(gFieldEffectPic_Unknown20_0), - obj_frame_tiles(gFieldEffectPic_Unknown20_1), - obj_frame_tiles(gFieldEffectPic_Unknown20_2), - obj_frame_tiles(gFieldEffectPic_Unknown20_3) + overworld_frame(gFieldEffectPic_Unknown20, 2, 2, 0), + overworld_frame(gFieldEffectPic_Unknown20, 2, 2, 1), + overworld_frame(gFieldEffectPic_Unknown20, 2, 2, 2), + overworld_frame(gFieldEffectPic_Unknown20, 2, 2, 3) }; const union AnimCmd gFieldEffectAnim_8374D10[] = { @@ -634,12 +634,12 @@ const union AffineAnimCmd *const gFieldEffectAffineAnimTable_Reflection[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Reflection = {0x0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gFieldEffectAffineAnimTable_Reflection, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectPicTable_BerryTreeGrowthSparkle[] = { - obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_0), - obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_1), - obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_2), - obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_3), - obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_4), - obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_5) + overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 0), + overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 1), + overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 2), + overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 3), + overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 4), + overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 5) }; const union AnimCmd gFieldEffectAnim_8374E38[] = { @@ -673,13 +673,13 @@ const union AnimCmd *const gFieldEffectAnimTable_BerryTreeGrowthSparkle[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gFieldOamData_16x16, gFieldEffectAnimTable_BerryTreeGrowthSparkle, gFieldEffectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectPicTable_TreeDisguise[] = { - obj_frame_tiles(gFieldEffectPic_TreeDisguise_0), - obj_frame_tiles(gFieldEffectPic_TreeDisguise_1), - obj_frame_tiles(gFieldEffectPic_TreeDisguise_2), - obj_frame_tiles(gFieldEffectPic_TreeDisguise_3), - obj_frame_tiles(gFieldEffectPic_TreeDisguise_4), - obj_frame_tiles(gFieldEffectPic_TreeDisguise_5), - obj_frame_tiles(gFieldEffectPic_TreeDisguise_6) + overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 0), + overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 1), + overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 2), + overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 3), + overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 4), + overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 5), + overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 6) }; const union AnimCmd gFieldEffectAnim_8374EE0[] = { @@ -706,13 +706,13 @@ const union AnimCmd *const gFieldEffectAnimTable_TreeDisguise[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gFieldOamData_16x32, gFieldEffectAnimTable_TreeDisguise, gFieldEffectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_MountainDisguise[] = { - obj_frame_tiles(gFieldEffectPic_MountainDisguise_0), - obj_frame_tiles(gFieldEffectPic_MountainDisguise_1), - obj_frame_tiles(gFieldEffectPic_MountainDisguise_2), - obj_frame_tiles(gFieldEffectPic_MountainDisguise_3), - obj_frame_tiles(gFieldEffectPic_MountainDisguise_4), - obj_frame_tiles(gFieldEffectPic_MountainDisguise_5), - obj_frame_tiles(gFieldEffectPic_MountainDisguise_6) + overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 0), + overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 1), + overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 2), + overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 3), + overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 4), + overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 5), + overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 6) }; const union AnimCmd gFieldEffectAnim_8374F60[] = { @@ -739,19 +739,19 @@ const union AnimCmd *const gFieldEffectAnimTable_MountainDisguise[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gFieldOamData_16x32, gFieldEffectAnimTable_MountainDisguise, gFieldEffectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_SandDisguise[] = { - obj_frame_tiles(gFieldEffectPic_SandDisguise_0), - obj_frame_tiles(gFieldEffectPic_SandDisguise_1), - obj_frame_tiles(gFieldEffectPic_SandDisguise_2), - obj_frame_tiles(gFieldEffectPic_SandDisguise_3), - obj_frame_tiles(gFieldEffectPic_SandDisguise_4), - obj_frame_tiles(gFieldEffectPic_SandDisguise_5), - obj_frame_tiles(gFieldEffectPic_SandDisguise_6) + overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 0), + overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 1), + overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 2), + overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 3), + overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 4), + overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 5), + overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 6) }; const struct SpriteTemplate gFieldEffectSpriteTemplate_SandDisguise = {0xFFFF, 0xFFFF, &gFieldOamData_16x32, gFieldEffectAnimTable_TreeDisguise, gFieldEffectPicTable_SandDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_Bird[] = { - obj_frame_tiles(gFieldEffectPic_Bird) + overworld_frame(gFieldEffectPic_Bird, 4, 4, 0) }; const union AnimCmd gFieldEffectAnim_8375000[] = { @@ -766,8 +766,8 @@ const union AnimCmd *const gFieldEffectAnimTable_Bird[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Bird = {0xFFFF, 0xFFFF, &gFieldOamData_32x32, gFieldEffectAnimTable_Bird, gFieldEffectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectPicTable_ShortGrass[] = { - obj_frame_tiles(gFieldEffectPic_ShortGrass_0), - obj_frame_tiles(gFieldEffectPic_ShortGrass_1) + overworld_frame(gFieldEffectPic_ShortGrass, 2, 2, 0), + overworld_frame(gFieldEffectPic_ShortGrass, 2, 2, 1) }; const union AnimCmd gFieldEffectAnim_8375034[] = { @@ -783,7 +783,7 @@ const union AnimCmd *const gFieldEffectAnimTable_ShortGrass[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_ShortGrass = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_ShortGrass, gFieldEffectPicTable_ShortGrass, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_HotSpringsWater[] = { - obj_frame_tiles(gFieldEffectPic_HotSpringsWater) + overworld_frame(gFieldEffectPic_HotSpringsWater, 2, 2, 0) }; const union AnimCmd gFieldEffectAnim_8375064[] = { @@ -798,11 +798,11 @@ const union AnimCmd *const gFieldEffectAnimTable_HotSpringsWater[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_HotSpringsWater, gFieldEffectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_PopOutOfAsh[] = { - obj_frame_tiles(gFieldEffectPic_PopOutOfAsh_0), - obj_frame_tiles(gFieldEffectPic_PopOutOfAsh_1), - obj_frame_tiles(gFieldEffectPic_PopOutOfAsh_2), - obj_frame_tiles(gFieldEffectPic_PopOutOfAsh_3), - obj_frame_tiles(gFieldEffectPic_PopOutOfAsh_4) + overworld_frame(gFieldEffectPic_PopOutOfAsh, 2, 2, 0), + overworld_frame(gFieldEffectPic_PopOutOfAsh, 2, 2, 1), + overworld_frame(gFieldEffectPic_PopOutOfAsh, 2, 2, 2), + overworld_frame(gFieldEffectPic_PopOutOfAsh, 2, 2, 3), + overworld_frame(gFieldEffectPic_PopOutOfAsh, 2, 2, 4) }; const union AnimCmd gFieldEffectAnim_83750B0[] = { @@ -823,11 +823,11 @@ const struct SpriteTemplate gFieldEffectSpriteTemplate_PopOutOfAsh = {0xFFFF, 0x const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D}; const struct SpriteFrameImage gFieldEffectPicTable_LavaridgeGymWarp[] = { - obj_frame_tiles(gFieldEffectPic_LavaridgeGymWarp_0), - obj_frame_tiles(gFieldEffectPic_LavaridgeGymWarp_1), - obj_frame_tiles(gFieldEffectPic_LavaridgeGymWarp_2), - obj_frame_tiles(gFieldEffectPic_LavaridgeGymWarp_3), - obj_frame_tiles(gFieldEffectPic_LavaridgeGymWarp_4) + overworld_frame(gFieldEffectPic_LavaridgeGymWarp, 2, 2, 0), + overworld_frame(gFieldEffectPic_LavaridgeGymWarp, 2, 2, 1), + overworld_frame(gFieldEffectPic_LavaridgeGymWarp, 2, 2, 2), + overworld_frame(gFieldEffectPic_LavaridgeGymWarp, 2, 2, 3), + overworld_frame(gFieldEffectPic_LavaridgeGymWarp, 2, 2, 4) }; const union AnimCmd gFieldEffectAnim_8375114[] = { @@ -846,14 +846,14 @@ const union AnimCmd *const gFieldEffectAnimTable_LavaridgeGymWarp[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_LavaridgeGymWarp = {0xFFFF, 0x100D, &gFieldOamData_16x16, gFieldEffectAnimTable_LavaridgeGymWarp, gFieldEffectPicTable_LavaridgeGymWarp, gDummySpriteAffineAnimTable, sub_8087638}; const struct SpriteFrameImage gFieldEffectPicTable_Bubbles[] = { - obj_frame_tiles(gFieldEffectPic_Bubbles_0), - obj_frame_tiles(gFieldEffectPic_Bubbles_1), - obj_frame_tiles(gFieldEffectPic_Bubbles_2), - obj_frame_tiles(gFieldEffectPic_Bubbles_3), - obj_frame_tiles(gFieldEffectPic_Bubbles_4), - obj_frame_tiles(gFieldEffectPic_Bubbles_5), - obj_frame_tiles(gFieldEffectPic_Bubbles_6), - obj_frame_tiles(gFieldEffectPic_Bubbles_7) + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 0), + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 1), + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 2), + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 3), + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 4), + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 5), + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 6), + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 7) }; const union AnimCmd gFieldEffectAnim_8375188[] = { @@ -875,8 +875,8 @@ const union AnimCmd *const gFieldEffectAnimTable_Bubbles[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Bubbles = {0xFFFF, 0x1004, &gFieldOamData_16x32, gFieldEffectAnimTable_Bubbles, gFieldEffectPicTable_Bubbles, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_Sparkle[] = { - obj_frame_tiles(gFieldEffectPic_Sparkle_0), - obj_frame_tiles(gFieldEffectPic_Sparkle_1) + overworld_frame(gFieldEffectPic_Sparkle, 2, 2, 0), + overworld_frame(gFieldEffectPic_Sparkle, 2, 2, 1) }; const union AnimCmd gFieldEffectAnim_83751D8[] = { diff --git a/src/data/pokedex_orders.h b/src/data/pokedex_orders.h index 736c0df6a..830f3d70a 100644 --- a/src/data/pokedex_orders.h +++ b/src/data/pokedex_orders.h @@ -1,1609 +1,1609 @@ #if ENGLISH static const u16 gPokedexOrder_Alphabetical[] = { - 387, - 388, - 389, - 390, - 391, - 392, - 393, - 394, - 395, - 396, - 397, - 398, - 399, - 400, - 401, - 402, - 403, - 404, - 405, - 406, - 407, - 408, - 409, - 410, - 411, - 63, // Abra - 359, // Absol - 142, // Aerodactyl - 306, // Aggron - 190, // Aipom - 65, // Alakazam - 334, // Altaria - 181, // Ampharos - 347, // Anorith - 24, // Arbok - 59, // Arcanine - 168, // Ariados - 348, // Armaldo - 304, // Aron - 144, // Articuno - 184, // Azumarill - 298, // Azurill - 371, // Bagon - 343, // Baltoy - 354, // Banette - 339, // Barboach - 153, // Bayleef - 267, // Beautifly - 15, // Beedrill - 374, // Beldum - 182, // Bellossom - 69, // Bellsprout - 9, // Blastoise - 257, // Blaziken - 242, // Blissey - 286, // Breloom - 1, // Bulbasaur - 12, // Butterfree - 331, // Cacnea - 332, // Cacturne - 323, // Camerupt - 318, // Carvanha - 268, // Cascoon - 351, // Castform - 10, // Caterpie - 251, // Celebi - 113, // Chansey - 6, // Charizard - 4, // Charmander - 5, // Charmeleon - 152, // Chikorita - 358, // Chimecho - 170, // Chinchou - 366, // Clamperl - 344, // Claydol - 36, // Clefable - 35, // Clefairy - 173, // Cleffa - 91, // Cloyster - 256, // Combusken - 341, // Corphish - 222, // Corsola - 346, // Cradily - 342, // Crawdaunt - 169, // Crobat - 159, // Croconaw - 104, // Cubone - 155, // Cyndaquil - 301, // Delcatty - 225, // Delibird - 386, // Deoxys - 87, // Dewgong - 50, // Diglett - 132, // Ditto - 85, // Dodrio - 84, // Doduo - 232, // Donphan - 148, // Dragonair - 149, // Dragonite - 147, // Dratini - 96, // Drowzee - 51, // Dugtrio - 206, // Dunsparce - 356, // Dusclops - 355, // Duskull - 269, // Dustox - 133, // Eevee - 23, // Ekans - 125, // Electabuzz - 309, // Electrike - 101, // Electrode - 239, // Elekid - 244, // Entei - 196, // Espeon - 102, // Exeggcute - 103, // Exeggutor - 295, // Exploud - 83, // Farfetch'd - 22, // Fearow - 349, // Feebas - 160, // Feraligatr - 180, // Flaaffy - 136, // Flareon - 330, // Flygon - 205, // Forretress - 162, // Furret - 282, // Gardevoir - 92, // Gastly - 94, // Gengar - 74, // Geodude - 203, // Girafarig - 362, // Glalie - 207, // Gligar - 44, // Gloom - 42, // Golbat - 118, // Goldeen - 55, // Golduck - 76, // Golem - 368, // Gorebyss - 210, // Granbull - 75, // Graveler - 88, // Grimer - 383, // Groudon - 253, // Grovyle - 58, // Growlithe - 326, // Grumpig - 316, // Gulpin - 130, // Gyarados - 297, // Hariyama - 93, // Haunter - 214, // Heracross - 107, // Hitmonchan - 106, // Hitmonlee - 237, // Hitmontop - 250, // Ho-Oh - 163, // Hoothoot - 187, // Hoppip - 116, // Horsea - 229, // Houndoom - 228, // Houndour - 367, // Huntail - 97, // Hypno - 174, // Igglybuff - 314, // Illumise - 2, // Ivysaur - 39, // Jigglypuff - 385, // Jirachi - 135, // Jolteon - 189, // Jumpluff - 124, // Jynx - 140, // Kabuto - 141, // Kabutops - 64, // Kadabra - 14, // Kakuna - 115, // Kangaskhan - 352, // Kecleon - 230, // Kingdra - 99, // Kingler - 281, // Kirlia - 109, // Koffing - 98, // Krabby - 382, // Kyogre - 305, // Lairon - 171, // Lanturn - 131, // Lapras - 246, // Larvitar - 380, // Latias - 381, // Latios - 166, // Ledian - 165, // Ledyba - 108, // Lickitung - 345, // Lileep - 264, // Linoone - 271, // Lombre - 270, // Lotad - 294, // Loudred - 272, // Ludicolo - 249, // Lugia - 337, // Lunatone - 370, // Luvdisc - 68, // Machamp - 67, // Machoke - 66, // Machop - 240, // Magby - 219, // Magcargo - 129, // Magikarp - 126, // Magmar - 81, // Magnemite - 82, // Magneton - 296, // Makuhita - 310, // Manectric - 56, // Mankey - 226, // Mantine - 179, // Mareep - 183, // Marill - 105, // Marowak - 259, // Marshtomp - 284, // Masquerain - 303, // Mawile - 308, // Medicham - 307, // Meditite - 154, // Meganium - 52, // Meowth - 376, // Metagross - 375, // Metang - 11, // Metapod - 151, // Mew - 150, // Mewtwo - 262, // Mightyena - 350, // Milotic - 241, // Miltank - 312, // Minun - 200, // Misdreavus - 146, // Moltres - 122, // Mr. mime - 258, // Mudkip - 89, // Muk - 198, // Murkrow - 177, // Natu - 34, // Nidoking - 31, // Nidoqueen - 29, // Nidoran? - 32, // Nidoran? - 30, // Nidorina - 33, // Nidorino - 290, // Nincada - 38, // Ninetales - 291, // Ninjask - 164, // Noctowl - 299, // Nosepass - 322, // Numel - 274, // Nuzleaf - 224, // Octillery - 43, // Oddish - 138, // Omanyte - 139, // Omastar - 95, // Onix - 46, // Paras - 47, // Parasect - 279, // Pelipper - 53, // Persian - 231, // Phanpy - 172, // Pichu - 18, // Pidgeot - 17, // Pidgeotto - 16, // Pidgey - 25, // Pikachu - 221, // Piloswine - 204, // Pineco - 127, // Pinsir - 311, // Plusle - 186, // Politoed - 60, // Poliwag - 61, // Poliwhirl - 62, // Poliwrath - 77, // Ponyta - 261, // Poochyena - 137, // Porygon - 233, // Porygon2 - 57, // Primeape - 54, // Psyduck - 247, // Pupitar - 195, // Quagsire - 156, // Quilava - 211, // Qwilfish - 26, // Raichu - 243, // Raikou - 280, // Ralts - 78, // Rapidash - 20, // Raticate - 19, // Rattata - 384, // Rayquaza - 378, // Regice - 377, // Regirock - 379, // Registeel - 369, // Relicanth - 223, // Remoraid - 112, // Rhydon - 111, // Rhyhorn - 315, // Roselia - 302, // Sableye - 373, // Salamence - 27, // Sandshrew - 28, // Sandslash - 254, // Sceptile - 212, // Scizor - 123, // Scyther - 117, // Seadra - 119, // Seaking - 364, // Sealeo - 273, // Seedot - 86, // Seel - 161, // Sentret - 336, // Seviper - 319, // Sharpedo - 292, // Shedinja - 372, // Shelgon - 90, // Shellder - 275, // Shiftry - 285, // Shroomish - 213, // Shuckle - 353, // Shuppet - 266, // Silcoon - 227, // Skarmory - 188, // Skiploom - 300, // Skitty - 289, // Slaking - 287, // Slakoth - 80, // Slowbro - 199, // Slowking - 79, // Slowpoke - 218, // Slugma - 235, // Smeargle - 238, // Smoochum - 215, // Sneasel - 143, // Snorlax - 361, // Snorunt - 209, // Snubbull - 338, // Solrock - 21, // Spearow - 363, // Spheal - 167, // Spinarak - 327, // Spinda - 325, // Spoink - 7, // Squirtle - 234, // Stantler - 121, // Starmie - 120, // Staryu - 208, // Steelix - 185, // Sudowoodo - 245, // Suicune - 192, // Sunflora - 191, // Sunkern - 283, // Surskit - 333, // Swablu - 317, // Swalot - 260, // Swampert - 277, // Swellow - 220, // Swinub - 276, // Taillow - 114, // Tangela - 128, // Tauros - 216, // Teddiursa - 72, // Tentacool - 73, // Tentacruel - 175, // Togepi - 176, // Togetic - 255, // Torchic - 324, // Torkoal - 158, // Totodile - 328, // Trapinch - 252, // Treecko - 357, // Tropius - 157, // Typhlosion - 248, // Tyranitar - 236, // Tyrogue - 197, // Umbreon - 201, // Unown - 217, // Ursaring - 134, // Vaporeon - 49, // Venomoth - 48, // Venonat - 3, // Venusaur - 329, // Vibrava - 71, // Victreebel - 288, // Vigoroth - 45, // Vileplume - 313, // Volbeat - 100, // Voltorb - 37, // Vulpix - 320, // Wailmer - 321, // Wailord - 365, // Walrein - 8, // Wartortle - 13, // Weedle - 70, // Weepinbell - 110, // Weezing - 340, // Whiscash - 293, // Whismur - 40, // Wigglytuff - 278, // Wingull - 202, // Wobbuffet - 194, // Wooper - 265, // Wurmple - 360, // Wynaut - 178, // Xatu - 193, // Yanma - 335, // Zangoose - 145, // Zapdos - 263, // Zigzagoon - 41, // Zubat + NATIONAL_DEX_OLD_UNOWN_B, + NATIONAL_DEX_OLD_UNOWN_C, + NATIONAL_DEX_OLD_UNOWN_D, + NATIONAL_DEX_OLD_UNOWN_E, + NATIONAL_DEX_OLD_UNOWN_F, + NATIONAL_DEX_OLD_UNOWN_G, + NATIONAL_DEX_OLD_UNOWN_H, + NATIONAL_DEX_OLD_UNOWN_I, + NATIONAL_DEX_OLD_UNOWN_J, + NATIONAL_DEX_OLD_UNOWN_K, + NATIONAL_DEX_OLD_UNOWN_L, + NATIONAL_DEX_OLD_UNOWN_M, + NATIONAL_DEX_OLD_UNOWN_N, + NATIONAL_DEX_OLD_UNOWN_O, + NATIONAL_DEX_OLD_UNOWN_P, + NATIONAL_DEX_OLD_UNOWN_Q, + NATIONAL_DEX_OLD_UNOWN_R, + NATIONAL_DEX_OLD_UNOWN_S, + NATIONAL_DEX_OLD_UNOWN_T, + NATIONAL_DEX_OLD_UNOWN_U, + NATIONAL_DEX_OLD_UNOWN_V, + NATIONAL_DEX_OLD_UNOWN_W, + NATIONAL_DEX_OLD_UNOWN_X, + NATIONAL_DEX_OLD_UNOWN_Y, + NATIONAL_DEX_OLD_UNOWN_Z, + NATIONAL_DEX_ABRA, + NATIONAL_DEX_ABSOL, + NATIONAL_DEX_AERODACTYL, + NATIONAL_DEX_AGGRON, + NATIONAL_DEX_AIPOM, + NATIONAL_DEX_ALAKAZAM, + NATIONAL_DEX_ALTARIA, + NATIONAL_DEX_AMPHAROS, + NATIONAL_DEX_ANORITH, + NATIONAL_DEX_ARBOK, + NATIONAL_DEX_ARCANINE, + NATIONAL_DEX_ARIADOS, + NATIONAL_DEX_ARMALDO, + NATIONAL_DEX_ARON, + NATIONAL_DEX_ARTICUNO, + NATIONAL_DEX_AZUMARILL, + NATIONAL_DEX_AZURILL, + NATIONAL_DEX_BAGON, + NATIONAL_DEX_BALTOY, + NATIONAL_DEX_BANETTE, + NATIONAL_DEX_BARBOACH, + NATIONAL_DEX_BAYLEEF, + NATIONAL_DEX_BEAUTIFLY, + NATIONAL_DEX_BEEDRILL, + NATIONAL_DEX_BELDUM, + NATIONAL_DEX_BELLOSSOM, + NATIONAL_DEX_BELLSPROUT, + NATIONAL_DEX_BLASTOISE, + NATIONAL_DEX_BLAZIKEN, + NATIONAL_DEX_BLISSEY, + NATIONAL_DEX_BRELOOM, + NATIONAL_DEX_BULBASAUR, + NATIONAL_DEX_BUTTERFREE, + NATIONAL_DEX_CACNEA, + NATIONAL_DEX_CACTURNE, + NATIONAL_DEX_CAMERUPT, + NATIONAL_DEX_CARVANHA, + NATIONAL_DEX_CASCOON, + NATIONAL_DEX_CASTFORM, + NATIONAL_DEX_CATERPIE, + NATIONAL_DEX_CELEBI, + NATIONAL_DEX_CHANSEY, + NATIONAL_DEX_CHARIZARD, + NATIONAL_DEX_CHARMANDER, + NATIONAL_DEX_CHARMELEON, + NATIONAL_DEX_CHIKORITA, + NATIONAL_DEX_CHIMECHO, + NATIONAL_DEX_CHINCHOU, + NATIONAL_DEX_CLAMPERL, + NATIONAL_DEX_CLAYDOL, + NATIONAL_DEX_CLEFABLE, + NATIONAL_DEX_CLEFAIRY, + NATIONAL_DEX_CLEFFA, + NATIONAL_DEX_CLOYSTER, + NATIONAL_DEX_COMBUSKEN, + NATIONAL_DEX_CORPHISH, + NATIONAL_DEX_CORSOLA, + NATIONAL_DEX_CRADILY, + NATIONAL_DEX_CRAWDAUNT, + NATIONAL_DEX_CROBAT, + NATIONAL_DEX_CROCONAW, + NATIONAL_DEX_CUBONE, + NATIONAL_DEX_CYNDAQUIL, + NATIONAL_DEX_DELCATTY, + NATIONAL_DEX_DELIBIRD, + NATIONAL_DEX_DEOXYS, + NATIONAL_DEX_DEWGONG, + NATIONAL_DEX_DIGLETT, + NATIONAL_DEX_DITTO, + NATIONAL_DEX_DODRIO, + NATIONAL_DEX_DODUO, + NATIONAL_DEX_DONPHAN, + NATIONAL_DEX_DRAGONAIR, + NATIONAL_DEX_DRAGONITE, + NATIONAL_DEX_DRATINI, + NATIONAL_DEX_DROWZEE, + NATIONAL_DEX_DUGTRIO, + NATIONAL_DEX_DUNSPARCE, + NATIONAL_DEX_DUSCLOPS, + NATIONAL_DEX_DUSKULL, + NATIONAL_DEX_DUSTOX, + NATIONAL_DEX_EEVEE, + NATIONAL_DEX_EKANS, + NATIONAL_DEX_ELECTABUZZ, + NATIONAL_DEX_ELECTRIKE, + NATIONAL_DEX_ELECTRODE, + NATIONAL_DEX_ELEKID, + NATIONAL_DEX_ENTEI, + NATIONAL_DEX_ESPEON, + NATIONAL_DEX_EXEGGCUTE, + NATIONAL_DEX_EXEGGUTOR, + NATIONAL_DEX_EXPLOUD, + NATIONAL_DEX_FARFETCHD, + NATIONAL_DEX_FEAROW, + NATIONAL_DEX_FEEBAS, + NATIONAL_DEX_FERALIGATR, + NATIONAL_DEX_FLAAFFY, + NATIONAL_DEX_FLAREON, + NATIONAL_DEX_FLYGON, + NATIONAL_DEX_FORRETRESS, + NATIONAL_DEX_FURRET, + NATIONAL_DEX_GARDEVOIR, + NATIONAL_DEX_GASTLY, + NATIONAL_DEX_GENGAR, + NATIONAL_DEX_GEODUDE, + NATIONAL_DEX_GIRAFARIG, + NATIONAL_DEX_GLALIE, + NATIONAL_DEX_GLIGAR, + NATIONAL_DEX_GLOOM, + NATIONAL_DEX_GOLBAT, + NATIONAL_DEX_GOLDEEN, + NATIONAL_DEX_GOLDUCK, + NATIONAL_DEX_GOLEM, + NATIONAL_DEX_GOREBYSS, + NATIONAL_DEX_GRANBULL, + NATIONAL_DEX_GRAVELER, + NATIONAL_DEX_GRIMER, + NATIONAL_DEX_GROUDON, + NATIONAL_DEX_GROVYLE, + NATIONAL_DEX_GROWLITHE, + NATIONAL_DEX_GRUMPIG, + NATIONAL_DEX_GULPIN, + NATIONAL_DEX_GYARADOS, + NATIONAL_DEX_HARIYAMA, + NATIONAL_DEX_HAUNTER, + NATIONAL_DEX_HERACROSS, + NATIONAL_DEX_HITMONCHAN, + NATIONAL_DEX_HITMONLEE, + NATIONAL_DEX_HITMONTOP, + NATIONAL_DEX_HO_OH, + NATIONAL_DEX_HOOTHOOT, + NATIONAL_DEX_HOPPIP, + NATIONAL_DEX_HORSEA, + NATIONAL_DEX_HOUNDOOM, + NATIONAL_DEX_HOUNDOUR, + NATIONAL_DEX_HUNTAIL, + NATIONAL_DEX_HYPNO, + NATIONAL_DEX_IGGLYBUFF, + NATIONAL_DEX_ILLUMISE, + NATIONAL_DEX_IVYSAUR, + NATIONAL_DEX_JIGGLYPUFF, + NATIONAL_DEX_JIRACHI, + NATIONAL_DEX_JOLTEON, + NATIONAL_DEX_JUMPLUFF, + NATIONAL_DEX_JYNX, + NATIONAL_DEX_KABUTO, + NATIONAL_DEX_KABUTOPS, + NATIONAL_DEX_KADABRA, + NATIONAL_DEX_KAKUNA, + NATIONAL_DEX_KANGASKHAN, + NATIONAL_DEX_KECLEON, + NATIONAL_DEX_KINGDRA, + NATIONAL_DEX_KINGLER, + NATIONAL_DEX_KIRLIA, + NATIONAL_DEX_KOFFING, + NATIONAL_DEX_KRABBY, + NATIONAL_DEX_KYOGRE, + NATIONAL_DEX_LAIRON, + NATIONAL_DEX_LANTURN, + NATIONAL_DEX_LAPRAS, + NATIONAL_DEX_LARVITAR, + NATIONAL_DEX_LATIAS, + NATIONAL_DEX_LATIOS, + NATIONAL_DEX_LEDIAN, + NATIONAL_DEX_LEDYBA, + NATIONAL_DEX_LICKITUNG, + NATIONAL_DEX_LILEEP, + NATIONAL_DEX_LINOONE, + NATIONAL_DEX_LOMBRE, + NATIONAL_DEX_LOTAD, + NATIONAL_DEX_LOUDRED, + NATIONAL_DEX_LUDICOLO, + NATIONAL_DEX_LUGIA, + NATIONAL_DEX_LUNATONE, + NATIONAL_DEX_LUVDISC, + NATIONAL_DEX_MACHAMP, + NATIONAL_DEX_MACHOKE, + NATIONAL_DEX_MACHOP, + NATIONAL_DEX_MAGBY, + NATIONAL_DEX_MAGCARGO, + NATIONAL_DEX_MAGIKARP, + NATIONAL_DEX_MAGMAR, + NATIONAL_DEX_MAGNEMITE, + NATIONAL_DEX_MAGNETON, + NATIONAL_DEX_MAKUHITA, + NATIONAL_DEX_MANECTRIC, + NATIONAL_DEX_MANKEY, + NATIONAL_DEX_MANTINE, + NATIONAL_DEX_MAREEP, + NATIONAL_DEX_MARILL, + NATIONAL_DEX_MAROWAK, + NATIONAL_DEX_MARSHTOMP, + NATIONAL_DEX_MASQUERAIN, + NATIONAL_DEX_MAWILE, + NATIONAL_DEX_MEDICHAM, + NATIONAL_DEX_MEDITITE, + NATIONAL_DEX_MEGANIUM, + NATIONAL_DEX_MEOWTH, + NATIONAL_DEX_METAGROSS, + NATIONAL_DEX_METANG, + NATIONAL_DEX_METAPOD, + NATIONAL_DEX_MEW, + NATIONAL_DEX_MEWTWO, + NATIONAL_DEX_MIGHTYENA, + NATIONAL_DEX_MILOTIC, + NATIONAL_DEX_MILTANK, + NATIONAL_DEX_MINUN, + NATIONAL_DEX_MISDREAVUS, + NATIONAL_DEX_MOLTRES, + NATIONAL_DEX_MR_MIME, + NATIONAL_DEX_MUDKIP, + NATIONAL_DEX_MUK, + NATIONAL_DEX_MURKROW, + NATIONAL_DEX_NATU, + NATIONAL_DEX_NIDOKING, + NATIONAL_DEX_NIDOQUEEN, + NATIONAL_DEX_NIDORAN_F, + NATIONAL_DEX_NIDORAN_M, + NATIONAL_DEX_NIDORINA, + NATIONAL_DEX_NIDORINO, + NATIONAL_DEX_NINCADA, + NATIONAL_DEX_NINETALES, + NATIONAL_DEX_NINJASK, + NATIONAL_DEX_NOCTOWL, + NATIONAL_DEX_NOSEPASS, + NATIONAL_DEX_NUMEL, + NATIONAL_DEX_NUZLEAF, + NATIONAL_DEX_OCTILLERY, + NATIONAL_DEX_ODDISH, + NATIONAL_DEX_OMANYTE, + NATIONAL_DEX_OMASTAR, + NATIONAL_DEX_ONIX, + NATIONAL_DEX_PARAS, + NATIONAL_DEX_PARASECT, + NATIONAL_DEX_PELIPPER, + NATIONAL_DEX_PERSIAN, + NATIONAL_DEX_PHANPY, + NATIONAL_DEX_PICHU, + NATIONAL_DEX_PIDGEOT, + NATIONAL_DEX_PIDGEOTTO, + NATIONAL_DEX_PIDGEY, + NATIONAL_DEX_PIKACHU, + NATIONAL_DEX_PILOSWINE, + NATIONAL_DEX_PINECO, + NATIONAL_DEX_PINSIR, + NATIONAL_DEX_PLUSLE, + NATIONAL_DEX_POLITOED, + NATIONAL_DEX_POLIWAG, + NATIONAL_DEX_POLIWHIRL, + NATIONAL_DEX_POLIWRATH, + NATIONAL_DEX_PONYTA, + NATIONAL_DEX_POOCHYENA, + NATIONAL_DEX_PORYGON, + NATIONAL_DEX_PORYGON2, + NATIONAL_DEX_PRIMEAPE, + NATIONAL_DEX_PSYDUCK, + NATIONAL_DEX_PUPITAR, + NATIONAL_DEX_QUAGSIRE, + NATIONAL_DEX_QUILAVA, + NATIONAL_DEX_QWILFISH, + NATIONAL_DEX_RAICHU, + NATIONAL_DEX_RAIKOU, + NATIONAL_DEX_RALTS, + NATIONAL_DEX_RAPIDASH, + NATIONAL_DEX_RATICATE, + NATIONAL_DEX_RATTATA, + NATIONAL_DEX_RAYQUAZA, + NATIONAL_DEX_REGICE, + NATIONAL_DEX_REGIROCK, + NATIONAL_DEX_REGISTEEL, + NATIONAL_DEX_RELICANTH, + NATIONAL_DEX_REMORAID, + NATIONAL_DEX_RHYDON, + NATIONAL_DEX_RHYHORN, + NATIONAL_DEX_ROSELIA, + NATIONAL_DEX_SABLEYE, + NATIONAL_DEX_SALAMENCE, + NATIONAL_DEX_SANDSHREW, + NATIONAL_DEX_SANDSLASH, + NATIONAL_DEX_SCEPTILE, + NATIONAL_DEX_SCIZOR, + NATIONAL_DEX_SCYTHER, + NATIONAL_DEX_SEADRA, + NATIONAL_DEX_SEAKING, + NATIONAL_DEX_SEALEO, + NATIONAL_DEX_SEEDOT, + NATIONAL_DEX_SEEL, + NATIONAL_DEX_SENTRET, + NATIONAL_DEX_SEVIPER, + NATIONAL_DEX_SHARPEDO, + NATIONAL_DEX_SHEDINJA, + NATIONAL_DEX_SHELGON, + NATIONAL_DEX_SHELLDER, + NATIONAL_DEX_SHIFTRY, + NATIONAL_DEX_SHROOMISH, + NATIONAL_DEX_SHUCKLE, + NATIONAL_DEX_SHUPPET, + NATIONAL_DEX_SILCOON, + NATIONAL_DEX_SKARMORY, + NATIONAL_DEX_SKIPLOOM, + NATIONAL_DEX_SKITTY, + NATIONAL_DEX_SLAKING, + NATIONAL_DEX_SLAKOTH, + NATIONAL_DEX_SLOWBRO, + NATIONAL_DEX_SLOWKING, + NATIONAL_DEX_SLOWPOKE, + NATIONAL_DEX_SLUGMA, + NATIONAL_DEX_SMEARGLE, + NATIONAL_DEX_SMOOCHUM, + NATIONAL_DEX_SNEASEL, + NATIONAL_DEX_SNORLAX, + NATIONAL_DEX_SNORUNT, + NATIONAL_DEX_SNUBBULL, + NATIONAL_DEX_SOLROCK, + NATIONAL_DEX_SPEAROW, + NATIONAL_DEX_SPHEAL, + NATIONAL_DEX_SPINARAK, + NATIONAL_DEX_SPINDA, + NATIONAL_DEX_SPOINK, + NATIONAL_DEX_SQUIRTLE, + NATIONAL_DEX_STANTLER, + NATIONAL_DEX_STARMIE, + NATIONAL_DEX_STARYU, + NATIONAL_DEX_STEELIX, + NATIONAL_DEX_SUDOWOODO, + NATIONAL_DEX_SUICUNE, + NATIONAL_DEX_SUNFLORA, + NATIONAL_DEX_SUNKERN, + NATIONAL_DEX_SURSKIT, + NATIONAL_DEX_SWABLU, + NATIONAL_DEX_SWALOT, + NATIONAL_DEX_SWAMPERT, + NATIONAL_DEX_SWELLOW, + NATIONAL_DEX_SWINUB, + NATIONAL_DEX_TAILLOW, + NATIONAL_DEX_TANGELA, + NATIONAL_DEX_TAUROS, + NATIONAL_DEX_TEDDIURSA, + NATIONAL_DEX_TENTACOOL, + NATIONAL_DEX_TENTACRUEL, + NATIONAL_DEX_TOGEPI, + NATIONAL_DEX_TOGETIC, + NATIONAL_DEX_TORCHIC, + NATIONAL_DEX_TORKOAL, + NATIONAL_DEX_TOTODILE, + NATIONAL_DEX_TRAPINCH, + NATIONAL_DEX_TREECKO, + NATIONAL_DEX_TROPIUS, + NATIONAL_DEX_TYPHLOSION, + NATIONAL_DEX_TYRANITAR, + NATIONAL_DEX_TYROGUE, + NATIONAL_DEX_UMBREON, + NATIONAL_DEX_UNOWN, + NATIONAL_DEX_URSARING, + NATIONAL_DEX_VAPOREON, + NATIONAL_DEX_VENOMOTH, + NATIONAL_DEX_VENONAT, + NATIONAL_DEX_VENUSAUR, + NATIONAL_DEX_VIBRAVA, + NATIONAL_DEX_VICTREEBEL, + NATIONAL_DEX_VIGOROTH, + NATIONAL_DEX_VILEPLUME, + NATIONAL_DEX_VOLBEAT, + NATIONAL_DEX_VOLTORB, + NATIONAL_DEX_VULPIX, + NATIONAL_DEX_WAILMER, + NATIONAL_DEX_WAILORD, + NATIONAL_DEX_WALREIN, + NATIONAL_DEX_WARTORTLE, + NATIONAL_DEX_WEEDLE, + NATIONAL_DEX_WEEPINBELL, + NATIONAL_DEX_WEEZING, + NATIONAL_DEX_WHISCASH, + NATIONAL_DEX_WHISMUR, + NATIONAL_DEX_WIGGLYTUFF, + NATIONAL_DEX_WINGULL, + NATIONAL_DEX_WOBBUFFET, + NATIONAL_DEX_WOOPER, + NATIONAL_DEX_WURMPLE, + NATIONAL_DEX_WYNAUT, + NATIONAL_DEX_XATU, + NATIONAL_DEX_YANMA, + NATIONAL_DEX_ZANGOOSE, + NATIONAL_DEX_ZAPDOS, + NATIONAL_DEX_ZIGZAGOON, + NATIONAL_DEX_ZUBAT, }; #elif GERMAN static const u16 gPokedexOrder_Alphabetical[] = { - 387, - 388, - 389, - 390, - 391, - 392, - 393, - 394, - 395, - 396, - 397, - 398, - 399, - 400, - 401, - 402, - 403, - 404, - 405, - 406, - 407, - 408, - 409, - 410, - 411, - 367, // Aalabyss - 63, // Abra - 359, // Absol - 142, // Aerodactyl - 93, // Alpollo - 334, // Altaria - 138, // Amonitas - 139, // Amoroso - 181, // Ampharos - 347, // Anorith - 134, // Aquana - 24, // Arbok - 168, // Ariados - 59, // Arkani - 144, // Arktos - 348, // Armaldo - 91, // Austos - 184, // Azumarill - 298, // Azurill - 211, // Baldorfish - 354, // Banette - 349, // Barschwa - 15, // Bibor - 3, // Bisaflor - 2, // Bisaknosp - 1, // Bisasam - 274, // Blanas - 135, // Blitza - 182, // Blubella - 48, // Bluzuk - 225, // Botogel - 373, // Brutalanda - 287, // Bummelz - 322, // Camaub - 323, // Camerupt - 251, // Celebi - 113, // Chaneira - 222, // Corasonn - 234, // Damhirplex - 386, // Deoxys - 248, // Despotar - 50, // Digda - 51, // Digdri - 132, // Ditto - 85, // Dodri - 84, // Dodu - 232, // Donphan - 148, // Dragonir - 149, // Dragoran - 372, // Draschel - 147, // Dratini - 44, // Duflor - 206, // Dummisel - 239, // Elekid - 125, // Elektek - 152, // Endivie - 300, // Eneco - 301, // Enekoro - 244, // Entei - 54, // Enton - 55, // Entoron - 133, // Evoli - 235, // Farbeagle - 194, // Felino - 155, // Feurigel - 261, // Fiffyen - 362, // Firnontor - 136, // Flamara - 79, // Flegmon - 255, // Flemmli - 174, // Fluffeluff - 303, // Flunkifer - 293, // Flurmel - 351, // Formeo - 205, // Forstellka - 309, // Frizelbliz - 58, // Fukano - 78, // Gallopa - 130, // Garados - 252, // Geckarbor - 283, // Gehweiher - 94, // Gengar - 75, // Georok - 76, // Geowaz - 264, // Geradaks - 254, // Gewaldro - 45, // Giflor - 203, // Girafarig - 4, // Glumanda - 6, // Glurak - 5, // Glutexo - 42, // Golbat - 118, // Goldini - 119, // Golking - 210, // Granbull - 190, // Griffel - 326, // Groink - 383, // Groudon - 282, // Guardevoir - 21, // Habitak - 297, // Hariyama - 242, // Heiteira - 250, // Ho-oh - 163, // Hoothoot - 187, // Hoppspross - 13, // Hornliu - 188, // Hubelupf - 229, // Hundemon - 228, // Hunduster - 258, // Hydropi - 97, // Hypno - 22, // Ibitak - 201, // Icognito - 156, // Igelavar - 169, // Iksbat - 314, // Illumise - 160, // Impergator - 360, // Isso - 385, // Jirachi - 87, // Jugong - 256, // Jungglut - 86, // Jurob - 140, // Kabuto - 141, // Kabutops - 64, // Kadabra - 115, // Kangama - 318, // Kanivanha - 286, // Kapilz - 237, // Kapoera - 272, // Kappalores - 158, // Karnimani - 129, // Karpador - 352, // Kecleon - 221, // Keifel - 106, // Kicklee - 371, // Kindwurm - 99, // Kingler - 281, // Kirlia - 74, // Kleinstein - 328, // Knacklion - 285, // Knilz - 69, // Knofensa - 105, // Knogga - 40, // Knuddeluff - 103, // Kokowei - 14, // Kokuna - 98, // Krabby - 294, // Krakeelo - 198, // Kramurx - 295, // Krawumms - 341, // Krebscorps - 342, // Krebutack - 238, // Kussilla - 382, // Kyogre - 80, // Lahmus - 170, // Lampi - 171, // Lanturn - 131, // Lapras - 246, // Larvitar - 199, // Laschoking - 380, // Latias - 381, // Latios - 146, // Lavados - 166, // Ledian - 165, // Ledyba - 101, // Lektrobal - 344, // Lepumentas - 289, // Letarking - 330, // Libelldra - 370, // Liebiskus - 345, // Liliep - 257, // Lohgock - 271, // Lombrero - 153, // Lorblatt - 270, // Loturzel - 249, // Lugia - 337, // Lunastein - 66, // Machollo - 68, // Machomei - 240, // Magby - 219, // Magcargo - 126, // Magmar - 262, // Magnayen - 81, // Magnetilo - 82, // Magneton - 296, // Makuhita - 226, // Mantax - 183, // Marill - 67, // Maschock - 284, // Maskeregen - 52, // Mauzi - 308, // Meditalis - 307, // Meditie - 154, // Meganie - 56, // Menki - 376, // Metagross - 375, // Metang - 151, // Mew - 150, // Mewtu - 350, // Milotic - 241, // Miltank - 312, // Minun - 185, // Mogelbaum - 259, // Moorabbel - 195, // Morlord - 288, // Muntier - 90, // Muschas - 43, // Myrapla - 197, // Nachtara - 299, // Nasgnet - 177, // Natu - 92, // Nebulak - 34, // Nidoking - 31, // Nidoqueen - 29, // Nidoran♀ - 32, // Nidoran♂ - 30, // Nidorina - 33, // Nidorino - 290, // Nincada - 291, // Ninjask - 292, // Ninjatom - 107, // Nockchan - 164, // Noctuh - 332, // Noktuska - 224, // Octillery - 49, // Omot - 95, // Onix - 102, // Owei - 358, // Palimpalim - 327, // Pandir - 268, // Panekon - 122, // Pantimos - 227, // Panzaeron - 267, // Papinella - 189, // Papungha - 46, // Paras - 47, // Parasek - 279, // Pelipper - 366, // Perlu - 231, // Phanpy - 172, // Pichu - 35, // Piepi - 173, // Pii - 25, // Pikachu - 127, // Pinsir - 36, // Pixi - 311, // Plusle - 77, // Ponita - 83, // Porenta - 137, // Porygon - 233, // Porygon2 - 213, // Pottrott - 196, // Psiana - 269, // Pudox - 39, // Pummeluff - 247, // Pupitar - 343, // Puppance - 62, // Quappo - 60, // Quapsel - 61, // Quaputzi - 186, // Quaxo - 220, // Quiekel - 324, // Qurtel - 236, // Rabauz - 26, // Raichu - 243, // Raikou - 57, // Rasaff - 19, // Rattfratz - 20, // Rattikarl - 10, // Raupy - 384, // Rayquaza - 378, // Regice - 377, // Regirock - 379, // Registeel - 143, // Relaxo - 369, // Relicanth - 223, // Remoraid - 253, // Reptain - 23, // Rettan - 111, // Rihorn - 112, // Rizeros - 315, // Roselia - 124, // Rossana - 11, // Safcon - 368, // Saganabyss - 273, // Samurzel - 28, // Sandamer - 27, // Sandan - 71, // Sarzenia - 266, // Schaloko - 212, // Scherox - 7, // Schiggy - 8, // Schillok - 317, // Schlukwech - 316, // Schluppuck - 108, // Schlurp - 339, // Schmerbe - 218, // Schneckmag - 361, // Schneppke - 276, // Schwalbini - 277, // Schwalboss - 230, // Seedraking - 364, // Seejong - 117, // Seemon - 363, // Seemops - 116, // Seeper - 335, // Sengo - 353, // Shuppet - 123, // Sichlor - 65, // Simsala - 214, // Skaraborn - 207, // Skorgla - 88, // Sleima - 89, // Sleimok - 12, // Smettbo - 110, // Smogmog - 109, // Smogon - 215, // Sniebel - 53, // Snobilikat - 209, // Snubbull - 338, // Sonnfel - 192, // Sonnflora - 191, // Sonnkern - 325, // Spoink - 208, // Stahlos - 121, // Starmie - 120, // Sterndu - 306, // Stolloss - 305, // Stollrak - 304, // Stollunior - 245, // Suicune - 260, // Sumpex - 114, // Tangela - 374, // Tanhel - 204, // Tannza - 17, // Tauboga - 18, // Tauboss - 16, // Taubsi - 128, // Tauros - 216, // Teddiursa - 275, // Tengulist - 72, // Tentacha - 73, // Tentoxa - 175, // Togepi - 176, // Togetic - 319, // Tohaido - 157, // Tornupto - 104, // Tragosso - 280, // Trasla - 96, // Traumato - 200, // Traunfugil - 357, // Tropius - 9, // Turtok - 331, // Tuska - 159, // Tyracroc - 70, // Ultrigaria - 217, // Ursaring - 329, // Vibrava - 336, // Vipitis - 313, // Volbeat - 310, // Voltenso - 179, // Voltilamm - 100, // Voltobal - 38, // Vulnona - 37, // Vulpix - 180, // Waaty - 333, // Wablu - 320, // Wailmer - 321, // Wailord - 365, // Walraisa - 265, // Waumpel - 167, // Webarak - 340, // Welsar - 346, // Wielie - 162, // Wiesenior - 161, // Wiesor - 278, // Wingull - 202, // Woingenau - 178, // Xatu - 193, // Yanma - 145, // Zapdos - 263, // Zigzachs - 302, // Zobiris - 41, // Zubat - 356, // Zwirrklop - 355, // Zwirrlicht + NATIONAL_DEX_OLD_UNOWN_B, + NATIONAL_DEX_OLD_UNOWN_C, + NATIONAL_DEX_OLD_UNOWN_D, + NATIONAL_DEX_OLD_UNOWN_E, + NATIONAL_DEX_OLD_UNOWN_F, + NATIONAL_DEX_OLD_UNOWN_G, + NATIONAL_DEX_OLD_UNOWN_H, + NATIONAL_DEX_OLD_UNOWN_I, + NATIONAL_DEX_OLD_UNOWN_J, + NATIONAL_DEX_OLD_UNOWN_K, + NATIONAL_DEX_OLD_UNOWN_L, + NATIONAL_DEX_OLD_UNOWN_M, + NATIONAL_DEX_OLD_UNOWN_N, + NATIONAL_DEX_OLD_UNOWN_O, + NATIONAL_DEX_OLD_UNOWN_P, + NATIONAL_DEX_OLD_UNOWN_Q, + NATIONAL_DEX_OLD_UNOWN_R, + NATIONAL_DEX_OLD_UNOWN_S, + NATIONAL_DEX_OLD_UNOWN_T, + NATIONAL_DEX_OLD_UNOWN_U, + NATIONAL_DEX_OLD_UNOWN_V, + NATIONAL_DEX_OLD_UNOWN_W, + NATIONAL_DEX_OLD_UNOWN_X, + NATIONAL_DEX_OLD_UNOWN_Y, + NATIONAL_DEX_OLD_UNOWN_Z, + NATIONAL_DEX_HUNTAIL, // Aalabyss + NATIONAL_DEX_ABRA, // Abra + NATIONAL_DEX_ABSOL, // Absol + NATIONAL_DEX_AERODACTYL, // Aerodactyl + NATIONAL_DEX_HAUNTER, // Alpollo + NATIONAL_DEX_ALTARIA, // Altaria + NATIONAL_DEX_OMANYTE, // Amonitas + NATIONAL_DEX_OMASTAR, // Amoroso + NATIONAL_DEX_AMPHAROS, // Ampharos + NATIONAL_DEX_ANORITH, // Anorith + NATIONAL_DEX_VAPOREON, // Aquana + NATIONAL_DEX_ARBOK, // Arbok + NATIONAL_DEX_ARIADOS, // Ariados + NATIONAL_DEX_ARCANINE, // Arkani + NATIONAL_DEX_ARTICUNO, // Arktos + NATIONAL_DEX_ARMALDO, // Armaldo + NATIONAL_DEX_CLOYSTER, // Austos + NATIONAL_DEX_AZUMARILL, // Azumarill + NATIONAL_DEX_AZURILL, // Azurill + NATIONAL_DEX_QWILFISH, // Baldorfish + NATIONAL_DEX_BANETTE, // Banette + NATIONAL_DEX_FEEBAS, // Barschwa + NATIONAL_DEX_BEEDRILL, // Bibor + NATIONAL_DEX_VENUSAUR, // Bisaflor + NATIONAL_DEX_IVYSAUR, // Bisaknosp + NATIONAL_DEX_BULBASAUR, // Bisasam + NATIONAL_DEX_NUZLEAF, // Blanas + NATIONAL_DEX_JOLTEON, // Blitza + NATIONAL_DEX_BELLOSSOM, // Blubella + NATIONAL_DEX_VENONAT, // Bluzuk + NATIONAL_DEX_DELIBIRD, // Botogel + NATIONAL_DEX_SALAMENCE, // Brutalanda + NATIONAL_DEX_SLAKOTH, // Bummelz + NATIONAL_DEX_NUMEL, // Camaub + NATIONAL_DEX_CAMERUPT, // Camerupt + NATIONAL_DEX_CELEBI, // Celebi + NATIONAL_DEX_CHANSEY, // Chaneira + NATIONAL_DEX_CORSOLA, // Corasonn + NATIONAL_DEX_STANTLER, // Damhirplex + NATIONAL_DEX_DEOXYS, // Deoxys + NATIONAL_DEX_TYRANITAR, // Despotar + NATIONAL_DEX_DIGLETT, // Digda + NATIONAL_DEX_DUGTRIO, // Digdri + NATIONAL_DEX_DITTO, // Ditto + NATIONAL_DEX_DODRIO, // Dodri + NATIONAL_DEX_DODUO, // Dodu + NATIONAL_DEX_DONPHAN, // Donphan + NATIONAL_DEX_DRAGONAIR, // Dragonir + NATIONAL_DEX_DRAGONITE, // Dragoran + NATIONAL_DEX_SHELGON, // Draschel + NATIONAL_DEX_DRATINI, // Dratini + NATIONAL_DEX_GLOOM, // Duflor + NATIONAL_DEX_DUNSPARCE, // Dummisel + NATIONAL_DEX_ELEKID, // Elekid + NATIONAL_DEX_ELECTABUZZ, // Elektek + NATIONAL_DEX_CHIKORITA, // Endivie + NATIONAL_DEX_SKITTY, // Eneco + NATIONAL_DEX_DELCATTY, // Enekoro + NATIONAL_DEX_ENTEI, // Entei + NATIONAL_DEX_PSYDUCK, // Enton + NATIONAL_DEX_GOLDUCK, // Entoron + NATIONAL_DEX_EEVEE, // Evoli + NATIONAL_DEX_SMEARGLE, // Farbeagle + NATIONAL_DEX_WOOPER, // Felino + NATIONAL_DEX_CYNDAQUIL, // Feurigel + NATIONAL_DEX_POOCHYENA, // Fiffyen + NATIONAL_DEX_GLALIE, // Firnontor + NATIONAL_DEX_FLAREON, // Flamara + NATIONAL_DEX_SLOWPOKE, // Flegmon + NATIONAL_DEX_TORCHIC, // Flemmli + NATIONAL_DEX_IGGLYBUFF, // Fluffeluff + NATIONAL_DEX_MAWILE, // Flunkifer + NATIONAL_DEX_WHISMUR, // Flurmel + NATIONAL_DEX_CASTFORM, // Formeo + NATIONAL_DEX_FORRETRESS, // Forstellka + NATIONAL_DEX_ELECTRIKE, // Frizelbliz + NATIONAL_DEX_GROWLITHE, // Fukano + NATIONAL_DEX_RAPIDASH, // Gallopa + NATIONAL_DEX_GYARADOS, // Garados + NATIONAL_DEX_TREECKO, // Geckarbor + NATIONAL_DEX_SURSKIT, // Gehweiher + NATIONAL_DEX_GENGAR, // Gengar + NATIONAL_DEX_GRAVELER, // Georok + NATIONAL_DEX_GOLEM, // Geowaz + NATIONAL_DEX_LINOONE, // Geradaks + NATIONAL_DEX_SCEPTILE, // Gewaldro + NATIONAL_DEX_VILEPLUME, // Giflor + NATIONAL_DEX_GIRAFARIG, // Girafarig + NATIONAL_DEX_CHARMANDER, // Glumanda + NATIONAL_DEX_CHARIZARD, // Glurak + NATIONAL_DEX_CHARMELEON, // Glutexo + NATIONAL_DEX_GOLBAT, // Golbat + NATIONAL_DEX_GOLDEEN, // Goldini + NATIONAL_DEX_SEAKING, // Golking + NATIONAL_DEX_GRANBULL, // Granbull + NATIONAL_DEX_AIPOM, // Griffel + NATIONAL_DEX_GRUMPIG, // Groink + NATIONAL_DEX_GROUDON, // Groudon + NATIONAL_DEX_GARDEVOIR, // Guardevoir + NATIONAL_DEX_SPEAROW, // Habitak + NATIONAL_DEX_HARIYAMA, // Hariyama + NATIONAL_DEX_BLISSEY, // Heiteira + NATIONAL_DEX_HO_OH, // Ho-oh + NATIONAL_DEX_HOOTHOOT, // Hoothoot + NATIONAL_DEX_HOPPIP, // Hoppspross + NATIONAL_DEX_WEEDLE, // Hornliu + NATIONAL_DEX_SKIPLOOM, // Hubelupf + NATIONAL_DEX_HOUNDOOM, // Hundemon + NATIONAL_DEX_HOUNDOUR, // Hunduster + NATIONAL_DEX_MUDKIP, // Hydropi + NATIONAL_DEX_HYPNO, // Hypno + NATIONAL_DEX_FEAROW, // Ibitak + NATIONAL_DEX_UNOWN, // Icognito + NATIONAL_DEX_QUILAVA, // Igelavar + NATIONAL_DEX_CROBAT, // Iksbat + NATIONAL_DEX_ILLUMISE, // Illumise + NATIONAL_DEX_FERALIGATR, // Impergator + NATIONAL_DEX_WYNAUT, // Isso + NATIONAL_DEX_JIRACHI, // Jirachi + NATIONAL_DEX_DEWGONG, // Jugong + NATIONAL_DEX_COMBUSKEN, // Jungglut + NATIONAL_DEX_SEEL, // Jurob + NATIONAL_DEX_KABUTO, // Kabuto + NATIONAL_DEX_KABUTOPS, // Kabutops + NATIONAL_DEX_KADABRA, // Kadabra + NATIONAL_DEX_KANGASKHAN, // Kangama + NATIONAL_DEX_CARVANHA, // Kanivanha + NATIONAL_DEX_BRELOOM, // Kapilz + NATIONAL_DEX_HITMONTOP, // Kapoera + NATIONAL_DEX_LUDICOLO, // Kappalores + NATIONAL_DEX_TOTODILE, // Karnimani + NATIONAL_DEX_MAGIKARP, // Karpador + NATIONAL_DEX_KECLEON, // Kecleon + NATIONAL_DEX_PILOSWINE, // Keifel + NATIONAL_DEX_HITMONLEE, // Kicklee + NATIONAL_DEX_BAGON, // Kindwurm + NATIONAL_DEX_KINGLER, // Kingler + NATIONAL_DEX_KIRLIA, // Kirlia + NATIONAL_DEX_GEODUDE, // Kleinstein + NATIONAL_DEX_TRAPINCH, // Knacklion + NATIONAL_DEX_SHROOMISH, // Knilz + NATIONAL_DEX_BELLSPROUT, // Knofensa + NATIONAL_DEX_MAROWAK, // Knogga + NATIONAL_DEX_WIGGLYTUFF, // Knuddeluff + NATIONAL_DEX_EXEGGUTOR, // Kokowei + NATIONAL_DEX_KAKUNA, // Kokuna + NATIONAL_DEX_KRABBY, // Krabby + NATIONAL_DEX_LOUDRED, // Krakeelo + NATIONAL_DEX_MURKROW, // Kramurx + NATIONAL_DEX_EXPLOUD, // Krawumms + NATIONAL_DEX_CORPHISH, // Krebscorps + NATIONAL_DEX_CRAWDAUNT, // Krebutack + NATIONAL_DEX_SMOOCHUM, // Kussilla + NATIONAL_DEX_KYOGRE, // Kyogre + NATIONAL_DEX_SLOWBRO, // Lahmus + NATIONAL_DEX_CHINCHOU, // Lampi + NATIONAL_DEX_LANTURN, // Lanturn + NATIONAL_DEX_LAPRAS, // Lapras + NATIONAL_DEX_LARVITAR, // Larvitar + NATIONAL_DEX_SLOWKING, // Laschoking + NATIONAL_DEX_LATIAS, // Latias + NATIONAL_DEX_LATIOS, // Latios + NATIONAL_DEX_MOLTRES, // Lavados + NATIONAL_DEX_LEDIAN, // Ledian + NATIONAL_DEX_LEDYBA, // Ledyba + NATIONAL_DEX_ELECTRODE, // Lektrobal + NATIONAL_DEX_CLAYDOL, // Lepumentas + NATIONAL_DEX_SLAKING, // Letarking + NATIONAL_DEX_FLYGON, // Libelldra + NATIONAL_DEX_LUVDISC, // Liebiskus + NATIONAL_DEX_LILEEP, // Liliep + NATIONAL_DEX_BLAZIKEN, // Lohgock + NATIONAL_DEX_LOMBRE, // Lombrero + NATIONAL_DEX_BAYLEEF, // Lorblatt + NATIONAL_DEX_LOTAD, // Loturzel + NATIONAL_DEX_LUGIA, // Lugia + NATIONAL_DEX_LUNATONE, // Lunastein + NATIONAL_DEX_MACHOP, // Machollo + NATIONAL_DEX_MACHAMP, // Machomei + NATIONAL_DEX_MAGBY, // Magby + NATIONAL_DEX_MAGCARGO, // Magcargo + NATIONAL_DEX_MAGMAR, // Magmar + NATIONAL_DEX_MIGHTYENA, // Magnayen + NATIONAL_DEX_MAGNEMITE, // Magnetilo + NATIONAL_DEX_MAGNETON, // Magneton + NATIONAL_DEX_MAKUHITA, // Makuhita + NATIONAL_DEX_MANTINE, // Mantax + NATIONAL_DEX_MARILL, // Marill + NATIONAL_DEX_MACHOKE, // Maschock + NATIONAL_DEX_MASQUERAIN, // Maskeregen + NATIONAL_DEX_MEOWTH, // Mauzi + NATIONAL_DEX_MEDICHAM, // Meditalis + NATIONAL_DEX_MEDITITE, // Meditie + NATIONAL_DEX_MEGANIUM, // Meganie + NATIONAL_DEX_MANKEY, // Menki + NATIONAL_DEX_METAGROSS, // Metagross + NATIONAL_DEX_METANG, // Metang + NATIONAL_DEX_MEW, // Mew + NATIONAL_DEX_MEWTWO, // Mewtu + NATIONAL_DEX_MILOTIC, // Milotic + NATIONAL_DEX_MILTANK, // Miltank + NATIONAL_DEX_MINUN, // Minun + NATIONAL_DEX_SUDOWOODO, // Mogelbaum + NATIONAL_DEX_MARSHTOMP, // Moorabbel + NATIONAL_DEX_QUAGSIRE, // Morlord + NATIONAL_DEX_VIGOROTH, // Muntier + NATIONAL_DEX_SHELLDER, // Muschas + NATIONAL_DEX_ODDISH, // Myrapla + NATIONAL_DEX_UMBREON, // Nachtara + NATIONAL_DEX_NOSEPASS, // Nasgnet + NATIONAL_DEX_NATU, // Natu + NATIONAL_DEX_GASTLY, // Nebulak + NATIONAL_DEX_NIDOKING, // Nidoking + NATIONAL_DEX_NIDOQUEEN, // Nidoqueen + NATIONAL_DEX_NIDORAN_F, // Nidoran♀ + NATIONAL_DEX_NIDORAN_M, // Nidoran♂ + NATIONAL_DEX_NIDORINA, // Nidorina + NATIONAL_DEX_NIDORINO, // Nidorino + NATIONAL_DEX_NINCADA, // Nincada + NATIONAL_DEX_NINJASK, // Ninjask + NATIONAL_DEX_SHEDINJA, // Ninjatom + NATIONAL_DEX_HITMONCHAN, // Nockchan + NATIONAL_DEX_NOCTOWL, // Noctuh + NATIONAL_DEX_CACTURNE, // Noktuska + NATIONAL_DEX_OCTILLERY, // Octillery + NATIONAL_DEX_VENOMOTH, // Omot + NATIONAL_DEX_ONIX, // Onix + NATIONAL_DEX_EXEGGCUTE, // Owei + NATIONAL_DEX_CHIMECHO, // Palimpalim + NATIONAL_DEX_SPINDA, // Pandir + NATIONAL_DEX_CASCOON, // Panekon + NATIONAL_DEX_MR_MIME, // Pantimos + NATIONAL_DEX_SKARMORY, // Panzaeron + NATIONAL_DEX_BEAUTIFLY, // Papinella + NATIONAL_DEX_JUMPLUFF, // Papungha + NATIONAL_DEX_PARAS, // Paras + NATIONAL_DEX_PARASECT, // Parasek + NATIONAL_DEX_PELIPPER, // Pelipper + NATIONAL_DEX_CLAMPERL, // Perlu + NATIONAL_DEX_PHANPY, // Phanpy + NATIONAL_DEX_PICHU, // Pichu + NATIONAL_DEX_CLEFAIRY, // Piepi + NATIONAL_DEX_CLEFFA, // Pii + NATIONAL_DEX_PIKACHU, // Pikachu + NATIONAL_DEX_PINSIR, // Pinsir + NATIONAL_DEX_CLEFABLE, // Pixi + NATIONAL_DEX_PLUSLE, // Plusle + NATIONAL_DEX_PONYTA, // Ponita + NATIONAL_DEX_FARFETCHD, // Porenta + NATIONAL_DEX_PORYGON, // Porygon + NATIONAL_DEX_PORYGON2, // Porygon2 + NATIONAL_DEX_SHUCKLE, // Pottrott + NATIONAL_DEX_ESPEON, // Psiana + NATIONAL_DEX_DUSTOX, // Pudox + NATIONAL_DEX_JIGGLYPUFF, // Pummeluff + NATIONAL_DEX_PUPITAR, // Pupitar + NATIONAL_DEX_BALTOY, // Puppance + NATIONAL_DEX_POLIWRATH, // Quappo + NATIONAL_DEX_POLIWAG, // Quapsel + NATIONAL_DEX_POLIWHIRL, // Quaputzi + NATIONAL_DEX_POLITOED, // Quaxo + NATIONAL_DEX_SWINUB, // Quiekel + NATIONAL_DEX_TORKOAL, // Qurtel + NATIONAL_DEX_TYROGUE, // Rabauz + NATIONAL_DEX_RAICHU, // Raichu + NATIONAL_DEX_RAIKOU, // Raikou + NATIONAL_DEX_PRIMEAPE, // Rasaff + NATIONAL_DEX_RATTATA, // Rattfratz + NATIONAL_DEX_RATICATE, // Rattikarl + NATIONAL_DEX_CATERPIE, // Raupy + NATIONAL_DEX_RAYQUAZA, // Rayquaza + NATIONAL_DEX_REGICE, // Regice + NATIONAL_DEX_REGIROCK, // Regirock + NATIONAL_DEX_REGISTEEL, // Registeel + NATIONAL_DEX_SNORLAX, // Relaxo + NATIONAL_DEX_RELICANTH, // Relicanth + NATIONAL_DEX_REMORAID, // Remoraid + NATIONAL_DEX_GROVYLE, // Reptain + NATIONAL_DEX_EKANS, // Rettan + NATIONAL_DEX_RHYHORN, // Rihorn + NATIONAL_DEX_RHYDON, // Rizeros + NATIONAL_DEX_ROSELIA, // Roselia + NATIONAL_DEX_JYNX, // Rossana + NATIONAL_DEX_METAPOD, // Safcon + NATIONAL_DEX_GOREBYSS, // Saganabyss + NATIONAL_DEX_SEEDOT, // Samurzel + NATIONAL_DEX_SANDSLASH, // Sandamer + NATIONAL_DEX_SANDSHREW, // Sandan + NATIONAL_DEX_VICTREEBEL, // Sarzenia + NATIONAL_DEX_SILCOON, // Schaloko + NATIONAL_DEX_SCIZOR, // Scherox + NATIONAL_DEX_SQUIRTLE, // Schiggy + NATIONAL_DEX_WARTORTLE, // Schillok + NATIONAL_DEX_SWALOT, // Schlukwech + NATIONAL_DEX_GULPIN, // Schluppuck + NATIONAL_DEX_LICKITUNG, // Schlurp + NATIONAL_DEX_BARBOACH, // Schmerbe + NATIONAL_DEX_SLUGMA, // Schneckmag + NATIONAL_DEX_SNORUNT, // Schneppke + NATIONAL_DEX_TAILLOW, // Schwalbini + NATIONAL_DEX_SWELLOW, // Schwalboss + NATIONAL_DEX_KINGDRA, // Seedraking + NATIONAL_DEX_SEALEO, // Seejong + NATIONAL_DEX_SEADRA, // Seemon + NATIONAL_DEX_SPHEAL, // Seemops + NATIONAL_DEX_HORSEA, // Seeper + NATIONAL_DEX_ZANGOOSE, // Sengo + NATIONAL_DEX_SHUPPET, // Shuppet + NATIONAL_DEX_SCYTHER, // Sichlor + NATIONAL_DEX_ALAKAZAM, // Simsala + NATIONAL_DEX_HERACROSS, // Skaraborn + NATIONAL_DEX_GLIGAR, // Skorgla + NATIONAL_DEX_GRIMER, // Sleima + NATIONAL_DEX_MUK, // Sleimok + NATIONAL_DEX_BUTTERFREE, // Smettbo + NATIONAL_DEX_WEEZING, // Smogmog + NATIONAL_DEX_KOFFING, // Smogon + NATIONAL_DEX_SNEASEL, // Sniebel + NATIONAL_DEX_PERSIAN, // Snobilikat + NATIONAL_DEX_SNUBBULL, // Snubbull + NATIONAL_DEX_SOLROCK, // Sonnfel + NATIONAL_DEX_SUNFLORA, // Sonnflora + NATIONAL_DEX_SUNKERN, // Sonnkern + NATIONAL_DEX_SPOINK, // Spoink + NATIONAL_DEX_STEELIX, // Stahlos + NATIONAL_DEX_STARMIE, // Starmie + NATIONAL_DEX_STARYU, // Sterndu + NATIONAL_DEX_AGGRON, // Stolloss + NATIONAL_DEX_LAIRON, // Stollrak + NATIONAL_DEX_ARON, // Stollunior + NATIONAL_DEX_SUICUNE, // Suicune + NATIONAL_DEX_SWAMPERT, // Sumpex + NATIONAL_DEX_TANGELA, // Tangela + NATIONAL_DEX_BELDUM, // Tanhel + NATIONAL_DEX_PINECO, // Tannza + NATIONAL_DEX_PIDGEOTTO, // Tauboga + NATIONAL_DEX_PIDGEOT, // Tauboss + NATIONAL_DEX_PIDGEY, // Taubsi + NATIONAL_DEX_TAUROS, // Tauros + NATIONAL_DEX_TEDDIURSA, // Teddiursa + NATIONAL_DEX_SHIFTRY, // Tengulist + NATIONAL_DEX_TENTACOOL, // Tentacha + NATIONAL_DEX_TENTACRUEL, // Tentoxa + NATIONAL_DEX_TOGEPI, // Togepi + NATIONAL_DEX_TOGETIC, // Togetic + NATIONAL_DEX_SHARPEDO, // Tohaido + NATIONAL_DEX_TYPHLOSION, // Tornupto + NATIONAL_DEX_CUBONE, // Tragosso + NATIONAL_DEX_RALTS, // Trasla + NATIONAL_DEX_DROWZEE, // Traumato + NATIONAL_DEX_MISDREAVUS, // Traunfugil + NATIONAL_DEX_TROPIUS, // Tropius + NATIONAL_DEX_BLASTOISE, // Turtok + NATIONAL_DEX_CACNEA, // Tuska + NATIONAL_DEX_CROCONAW, // Tyracroc + NATIONAL_DEX_WEEPINBELL, // Ultrigaria + NATIONAL_DEX_URSARING, // Ursaring + NATIONAL_DEX_VIBRAVA, // Vibrava + NATIONAL_DEX_SEVIPER, // Vipitis + NATIONAL_DEX_VOLBEAT, // Volbeat + NATIONAL_DEX_MANECTRIC, // Voltenso + NATIONAL_DEX_MAREEP, // Voltilamm + NATIONAL_DEX_VOLTORB, // Voltobal + NATIONAL_DEX_NINETALES, // Vulnona + NATIONAL_DEX_VULPIX, // Vulpix + NATIONAL_DEX_FLAAFFY, // Waaty + NATIONAL_DEX_SWABLU, // Wablu + NATIONAL_DEX_WAILMER, // Wailmer + NATIONAL_DEX_WAILORD, // Wailord + NATIONAL_DEX_WALREIN, // Walraisa + NATIONAL_DEX_WURMPLE, // Waumpel + NATIONAL_DEX_SPINARAK, // Webarak + NATIONAL_DEX_WHISCASH, // Welsar + NATIONAL_DEX_CRADILY, // Wielie + NATIONAL_DEX_FURRET, // Wiesenior + NATIONAL_DEX_SENTRET, // Wiesor + NATIONAL_DEX_WINGULL, // Wingull + NATIONAL_DEX_WOBBUFFET, // Woingenau + NATIONAL_DEX_XATU, // Xatu + NATIONAL_DEX_YANMA, // Yanma + NATIONAL_DEX_ZAPDOS, // Zapdos + NATIONAL_DEX_ZIGZAGOON, // Zigzachs + NATIONAL_DEX_SABLEYE, // Zobiris + NATIONAL_DEX_ZUBAT, // Zubat + NATIONAL_DEX_DUSCLOPS, // Zwirrklop + NATIONAL_DEX_DUSKULL, // Zwirrlicht }; #endif static const u16 gPokedexOrder_Weight[] = { - 92, // Gastly - 93, // Haunter - 187, // Hoppip - 50, // Diglett - 351, // Castform - 109, // Koffing - 174, // Igglybuff - 200, // Misdreavus - 358, // Chimecho - 188, // Skiploom - 385, // Jirachi - 333, // Swablu - 292, // Shedinja - 175, // Togepi - 283, // Surskit - 16, // Pidgey - 191, // Sunkern - 339, // Barboach - 172, // Pichu - 298, // Azurill - 315, // Roselia - 177, // Natu - 21, // Spearow - 198, // Murkrow - 353, // Shuppet - 276, // Taillow - 102, // Exeggcute - 255, // Torchic - 270, // Lotad - 10, // Caterpie - 189, // Jumpluff - 173, // Cleffa - 13, // Weedle - 176, // Togetic - 147, // Dratini - 19, // Rattata - 284, // Masquerain - 265, // Wurmple - 211, // Qwilfish - 151, // Mew - 90, // Shellder - 273, // Seedot - 132, // Ditto - 69, // Bellsprout - 311, // Plusle - 52, // Meowth - 312, // Minun - 285, // Shroomish - 251, // Celebi - 222, // Corsola - 252, // Treecko - 327, // Spinda - 201, // Unown - 46, // Paras - 43, // Oddish - 39, // Jigglypuff - 290, // Nincada - 182, // Bellossom - 81, // Magnemite - 25, // Pikachu - 238, // Smoochum - 161, // Sentret - 70, // Weepinbell - 152, // Chikorita - 220, // Swinub - 133, // Eevee - 98, // Krabby - 104, // Cubone - 280, // Ralts - 1, // Bulbasaur - 23, // Ekans - 29, // Nidoran? - 204, // Pineco - 349, // Feebas - 138, // Omanyte - 41, // Zubat - 35, // Clefairy - 258, // Mudkip - 209, // Snubbull - 179, // Mareep - 155, // Cyndaquil - 116, // Horsea - 4, // Charmander - 192, // Sunflora - 183, // Marill - 194, // Wooper - 167, // Spinarak - 44, // Gloom - 370, // Luvdisc - 216, // Teddiursa - 32, // Nidoran? - 7, // Squirtle - 278, // Wingull - 158, // Totodile - 110, // Weezing - 37, // Vulpix - 11, // Metapod - 266, // Silcoon - 129, // Magikarp - 14, // Kakuna - 316, // Gulpin - 100, // Voltorb - 165, // Ledyba - 228, // Houndour - 300, // Skitty - 302, // Sableye - 307, // Meditite - 341, // Corphish - 190, // Aipom - 268, // Cascoon - 303, // Mawile - 140, // Kabuto - 40, // Wigglytuff - 27, // Sandshrew - 223, // Remoraid - 291, // Ninjask - 170, // Chinchou - 60, // Poliwag - 347, // Anorith - 49, // Venomoth - 354, // Banette - 2, // Ivysaur - 180, // Flaaffy - 261, // Poochyena - 360, // Wynaut - 206, // Dunsparce - 178, // Xatu - 355, // Duskull - 83, // Farfetch'd - 328, // Trapinch - 118, // Goldeen - 309, // Electrike - 329, // Vibrava - 71, // Victreebel - 153, // Bayleef - 225, // Delibird - 293, // Whismur - 148, // Dragonair - 361, // Snorunt - 263, // Zigzagoon - 314, // Illumise - 313, // Volbeat - 20, // Raticate - 45, // Vileplume - 156, // Quilava - 5, // Charmeleon - 58, // Growlithe - 256, // Combusken - 66, // Machop - 63, // Abra - 33, // Nidorino - 54, // Psyduck - 277, // Swellow - 38, // Ninetales - 30, // Nidorina - 61, // Poliwhirl - 74, // Geodude - 281, // Kirlia - 213, // Shuckle - 334, // Altaria - 318, // Carvanha - 236, // Tyrogue - 163, // Hoothoot - 240, // Magby - 343, // Baltoy - 253, // Grovyle - 352, // Kecleon - 171, // Lanturn - 8, // Wartortle - 368, // Gorebyss - 369, // Relicanth - 239, // Elekid - 340, // Whiscash - 345, // Lileep - 322, // Numel - 287, // Slakoth - 135, // Jolteon - 159, // Croconaw - 136, // Flareon - 117, // Seadra - 196, // Espeon - 367, // Huntail - 197, // Umbreon - 259, // Marshtomp - 274, // Nuzleaf - 215, // Sneasel - 56, // Mankey - 279, // Pelipper - 267, // Beautifly - 224, // Octillery - 184, // Azumarill - 202, // Wobbuffet - 134, // Vaporeon - 28, // Sandslash - 47, // Parasect - 15, // Beedrill - 89, // Muk - 17, // Pidgeotto - 88, // Grimer - 26, // Raichu - 77, // Ponyta - 125, // Electabuzz - 48, // Venonat - 325, // Spoink - 356, // Dusclops - 308, // Medicham - 269, // Dustox - 53, // Persian - 12, // Butterfree - 57, // Primeape - 96, // Drowzee - 162, // Furret - 233, // Porygon2 - 271, // Lombre - 264, // Linoone - 301, // Delcatty - 342, // Crawdaunt - 51, // Dugtrio - 168, // Ariados - 231, // Phanpy - 186, // Politoed - 120, // Staryu - 113, // Chansey - 139, // Omastar - 114, // Tangela - 218, // Slugma - 229, // Houndoom - 166, // Ledian - 79, // Slowpoke - 137, // Porygon - 262, // Mightyena - 193, // Yanma - 22, // Fearow - 185, // Sudowoodo - 119, // Seaking - 286, // Breloom - 84, // Doduo - 18, // Pidgeot - 363, // Spheal - 36, // Clefable - 380, // Latias - 310, // Manectric - 335, // Zangoose - 141, // Kabutops - 94, // Gengar - 294, // Loudred - 124, // Jynx - 164, // Noctowl - 203, // Girafarig - 371, // Bagon - 126, // Magmar - 105, // Marowak - 72, // Tentacool - 288, // Vigoroth - 242, // Blissey - 359, // Absol - 65, // Alakazam - 237, // Hitmontop - 282, // Gardevoir - 210, // Granbull - 106, // Hitmonlee - 107, // Hitmonchan - 227, // Skarmory - 331, // Cacnea - 257, // Blaziken - 254, // Sceptile - 336, // Seviper - 366, // Clamperl - 145, // Zapdos - 214, // Heracross - 62, // Poliwrath - 122, // Mr. mime - 127, // Pinsir - 272, // Ludicolo - 73, // Tentacruel - 42, // Golbat - 219, // Magcargo - 144, // Articuno - 221, // Piloswine - 123, // Scyther - 64, // Kadabra - 235, // Smeargle - 142, // Aerodactyl - 275, // Shiftry - 99, // Kingler - 31, // Nidoqueen - 82, // Magneton - 304, // Aron - 381, // Latios - 146, // Moltres - 346, // Cradily - 386, // Deoxys - 181, // Ampharos - 34, // Nidoking - 207, // Gligar - 24, // Arbok - 108, // Lickitung - 101, // Electrode - 348, // Armaldo - 67, // Machoke - 234, // Stantler - 326, // Grumpig - 246, // Larvitar - 169, // Crobat - 195, // Quagsire - 241, // Miltank - 97, // Hypno - 55, // Golduck - 332, // Cacturne - 80, // Slowbro - 157, // Typhlosion - 199, // Slowking - 115, // Kangaskhan - 121, // Starmie - 317, // Swalot - 324, // Torkoal - 260, // Swampert - 330, // Flygon - 295, // Exploud - 85, // Dodrio - 9, // Blastoise - 296, // Makuhita - 364, // Sealeo - 128, // Tauros - 319, // Sharpedo - 160, // Feraligatr - 86, // Seel - 6, // Charizard - 78, // Rapidash - 374, // Beldum - 299, // Nosepass - 3, // Venusaur - 357, // Tropius - 154, // Meganium - 373, // Salamence - 75, // Graveler - 344, // Claydol - 372, // Shelgon - 111, // Rhyhorn - 212, // Scizor - 87, // Dewgong - 112, // Rhydon - 232, // Donphan - 103, // Exeggutor - 305, // Lairon - 150, // Mewtwo - 217, // Ursaring - 205, // Forretress - 68, // Machamp - 320, // Wailmer - 289, // Slaking - 91, // Cloyster - 365, // Walrein - 247, // Pupitar - 230, // Kingdra - 338, // Solrock - 59, // Arcanine - 350, // Milotic - 337, // Lunatone - 378, // Regice - 243, // Raikou - 245, // Suicune - 244, // Entei - 250, // Ho-Oh - 248, // Tyranitar - 375, // Metang - 379, // Registeel - 384, // Rayquaza - 95, // Onix - 149, // Dragonite - 249, // Lugia - 131, // Lapras - 323, // Camerupt - 226, // Mantine - 377, // Regirock - 130, // Gyarados - 297, // Hariyama - 362, // Glalie - 76, // Golem - 382, // Kyogre - 306, // Aggron - 321, // Wailord - 208, // Steelix - 143, // Snorlax - 376, // Metagross - 383, // Groudon + NATIONAL_DEX_GASTLY, + NATIONAL_DEX_HAUNTER, + NATIONAL_DEX_HOPPIP, + NATIONAL_DEX_DIGLETT, + NATIONAL_DEX_CASTFORM, + NATIONAL_DEX_KOFFING, + NATIONAL_DEX_IGGLYBUFF, + NATIONAL_DEX_MISDREAVUS, + NATIONAL_DEX_CHIMECHO, + NATIONAL_DEX_SKIPLOOM, + NATIONAL_DEX_JIRACHI, + NATIONAL_DEX_SWABLU, + NATIONAL_DEX_SHEDINJA, + NATIONAL_DEX_TOGEPI, + NATIONAL_DEX_SURSKIT, + NATIONAL_DEX_PIDGEY, + NATIONAL_DEX_SUNKERN, + NATIONAL_DEX_BARBOACH, + NATIONAL_DEX_PICHU, + NATIONAL_DEX_AZURILL, + NATIONAL_DEX_ROSELIA, + NATIONAL_DEX_NATU, + NATIONAL_DEX_SPEAROW, + NATIONAL_DEX_MURKROW, + NATIONAL_DEX_SHUPPET, + NATIONAL_DEX_TAILLOW, + NATIONAL_DEX_EXEGGCUTE, + NATIONAL_DEX_TORCHIC, + NATIONAL_DEX_LOTAD, + NATIONAL_DEX_CATERPIE, + NATIONAL_DEX_JUMPLUFF, + NATIONAL_DEX_CLEFFA, + NATIONAL_DEX_WEEDLE, + NATIONAL_DEX_TOGETIC, + NATIONAL_DEX_DRATINI, + NATIONAL_DEX_RATTATA, + NATIONAL_DEX_MASQUERAIN, + NATIONAL_DEX_WURMPLE, + NATIONAL_DEX_QWILFISH, + NATIONAL_DEX_MEW, + NATIONAL_DEX_SHELLDER, + NATIONAL_DEX_SEEDOT, + NATIONAL_DEX_DITTO, + NATIONAL_DEX_BELLSPROUT, + NATIONAL_DEX_PLUSLE, + NATIONAL_DEX_MEOWTH, + NATIONAL_DEX_MINUN, + NATIONAL_DEX_SHROOMISH, + NATIONAL_DEX_CELEBI, + NATIONAL_DEX_CORSOLA, + NATIONAL_DEX_TREECKO, + NATIONAL_DEX_SPINDA, + NATIONAL_DEX_UNOWN, + NATIONAL_DEX_PARAS, + NATIONAL_DEX_ODDISH, + NATIONAL_DEX_JIGGLYPUFF, + NATIONAL_DEX_NINCADA, + NATIONAL_DEX_BELLOSSOM, + NATIONAL_DEX_MAGNEMITE, + NATIONAL_DEX_PIKACHU, + NATIONAL_DEX_SMOOCHUM, + NATIONAL_DEX_SENTRET, + NATIONAL_DEX_WEEPINBELL, + NATIONAL_DEX_CHIKORITA, + NATIONAL_DEX_SWINUB, + NATIONAL_DEX_EEVEE, + NATIONAL_DEX_KRABBY, + NATIONAL_DEX_CUBONE, + NATIONAL_DEX_RALTS, + NATIONAL_DEX_BULBASAUR, + NATIONAL_DEX_EKANS, + NATIONAL_DEX_NIDORAN_F, + NATIONAL_DEX_PINECO, + NATIONAL_DEX_FEEBAS, + NATIONAL_DEX_OMANYTE, + NATIONAL_DEX_ZUBAT, + NATIONAL_DEX_CLEFAIRY, + NATIONAL_DEX_MUDKIP, + NATIONAL_DEX_SNUBBULL, + NATIONAL_DEX_MAREEP, + NATIONAL_DEX_CYNDAQUIL, + NATIONAL_DEX_HORSEA, + NATIONAL_DEX_CHARMANDER, + NATIONAL_DEX_SUNFLORA, + NATIONAL_DEX_MARILL, + NATIONAL_DEX_WOOPER, + NATIONAL_DEX_SPINARAK, + NATIONAL_DEX_GLOOM, + NATIONAL_DEX_LUVDISC, + NATIONAL_DEX_TEDDIURSA, + NATIONAL_DEX_NIDORAN_M, + NATIONAL_DEX_SQUIRTLE, + NATIONAL_DEX_WINGULL, + NATIONAL_DEX_TOTODILE, + NATIONAL_DEX_WEEZING, + NATIONAL_DEX_VULPIX, + NATIONAL_DEX_METAPOD, + NATIONAL_DEX_SILCOON, + NATIONAL_DEX_MAGIKARP, + NATIONAL_DEX_KAKUNA, + NATIONAL_DEX_GULPIN, + NATIONAL_DEX_VOLTORB, + NATIONAL_DEX_LEDYBA, + NATIONAL_DEX_HOUNDOUR, + NATIONAL_DEX_SKITTY, + NATIONAL_DEX_SABLEYE, + NATIONAL_DEX_MEDITITE, + NATIONAL_DEX_CORPHISH, + NATIONAL_DEX_AIPOM, + NATIONAL_DEX_CASCOON, + NATIONAL_DEX_MAWILE, + NATIONAL_DEX_KABUTO, + NATIONAL_DEX_WIGGLYTUFF, + NATIONAL_DEX_SANDSHREW, + NATIONAL_DEX_REMORAID, + NATIONAL_DEX_NINJASK, + NATIONAL_DEX_CHINCHOU, + NATIONAL_DEX_POLIWAG, + NATIONAL_DEX_ANORITH, + NATIONAL_DEX_VENOMOTH, + NATIONAL_DEX_BANETTE, + NATIONAL_DEX_IVYSAUR, + NATIONAL_DEX_FLAAFFY, + NATIONAL_DEX_POOCHYENA, + NATIONAL_DEX_WYNAUT, + NATIONAL_DEX_DUNSPARCE, + NATIONAL_DEX_XATU, + NATIONAL_DEX_DUSKULL, + NATIONAL_DEX_FARFETCHD, + NATIONAL_DEX_TRAPINCH, + NATIONAL_DEX_GOLDEEN, + NATIONAL_DEX_ELECTRIKE, + NATIONAL_DEX_VIBRAVA, + NATIONAL_DEX_VICTREEBEL, + NATIONAL_DEX_BAYLEEF, + NATIONAL_DEX_DELIBIRD, + NATIONAL_DEX_WHISMUR, + NATIONAL_DEX_DRAGONAIR, + NATIONAL_DEX_SNORUNT, + NATIONAL_DEX_ZIGZAGOON, + NATIONAL_DEX_ILLUMISE, + NATIONAL_DEX_VOLBEAT, + NATIONAL_DEX_RATICATE, + NATIONAL_DEX_VILEPLUME, + NATIONAL_DEX_QUILAVA, + NATIONAL_DEX_CHARMELEON, + NATIONAL_DEX_GROWLITHE, + NATIONAL_DEX_COMBUSKEN, + NATIONAL_DEX_MACHOP, + NATIONAL_DEX_ABRA, + NATIONAL_DEX_NIDORINO, + NATIONAL_DEX_PSYDUCK, + NATIONAL_DEX_SWELLOW, + NATIONAL_DEX_NINETALES, + NATIONAL_DEX_NIDORINA, + NATIONAL_DEX_POLIWHIRL, + NATIONAL_DEX_GEODUDE, + NATIONAL_DEX_KIRLIA, + NATIONAL_DEX_SHUCKLE, + NATIONAL_DEX_ALTARIA, + NATIONAL_DEX_CARVANHA, + NATIONAL_DEX_TYROGUE, + NATIONAL_DEX_HOOTHOOT, + NATIONAL_DEX_MAGBY, + NATIONAL_DEX_BALTOY, + NATIONAL_DEX_GROVYLE, + NATIONAL_DEX_KECLEON, + NATIONAL_DEX_LANTURN, + NATIONAL_DEX_WARTORTLE, + NATIONAL_DEX_GOREBYSS, + NATIONAL_DEX_RELICANTH, + NATIONAL_DEX_ELEKID, + NATIONAL_DEX_WHISCASH, + NATIONAL_DEX_LILEEP, + NATIONAL_DEX_NUMEL, + NATIONAL_DEX_SLAKOTH, + NATIONAL_DEX_JOLTEON, + NATIONAL_DEX_CROCONAW, + NATIONAL_DEX_FLAREON, + NATIONAL_DEX_SEADRA, + NATIONAL_DEX_ESPEON, + NATIONAL_DEX_HUNTAIL, + NATIONAL_DEX_UMBREON, + NATIONAL_DEX_MARSHTOMP, + NATIONAL_DEX_NUZLEAF, + NATIONAL_DEX_SNEASEL, + NATIONAL_DEX_MANKEY, + NATIONAL_DEX_PELIPPER, + NATIONAL_DEX_BEAUTIFLY, + NATIONAL_DEX_OCTILLERY, + NATIONAL_DEX_AZUMARILL, + NATIONAL_DEX_WOBBUFFET, + NATIONAL_DEX_VAPOREON, + NATIONAL_DEX_SANDSLASH, + NATIONAL_DEX_PARASECT, + NATIONAL_DEX_BEEDRILL, + NATIONAL_DEX_MUK, + NATIONAL_DEX_PIDGEOTTO, + NATIONAL_DEX_GRIMER, + NATIONAL_DEX_RAICHU, + NATIONAL_DEX_PONYTA, + NATIONAL_DEX_ELECTABUZZ, + NATIONAL_DEX_VENONAT, + NATIONAL_DEX_SPOINK, + NATIONAL_DEX_DUSCLOPS, + NATIONAL_DEX_MEDICHAM, + NATIONAL_DEX_DUSTOX, + NATIONAL_DEX_PERSIAN, + NATIONAL_DEX_BUTTERFREE, + NATIONAL_DEX_PRIMEAPE, + NATIONAL_DEX_DROWZEE, + NATIONAL_DEX_FURRET, + NATIONAL_DEX_PORYGON2, + NATIONAL_DEX_LOMBRE, + NATIONAL_DEX_LINOONE, + NATIONAL_DEX_DELCATTY, + NATIONAL_DEX_CRAWDAUNT, + NATIONAL_DEX_DUGTRIO, + NATIONAL_DEX_ARIADOS, + NATIONAL_DEX_PHANPY, + NATIONAL_DEX_POLITOED, + NATIONAL_DEX_STARYU, + NATIONAL_DEX_CHANSEY, + NATIONAL_DEX_OMASTAR, + NATIONAL_DEX_TANGELA, + NATIONAL_DEX_SLUGMA, + NATIONAL_DEX_HOUNDOOM, + NATIONAL_DEX_LEDIAN, + NATIONAL_DEX_SLOWPOKE, + NATIONAL_DEX_PORYGON, + NATIONAL_DEX_MIGHTYENA, + NATIONAL_DEX_YANMA, + NATIONAL_DEX_FEAROW, + NATIONAL_DEX_SUDOWOODO, + NATIONAL_DEX_SEAKING, + NATIONAL_DEX_BRELOOM, + NATIONAL_DEX_DODUO, + NATIONAL_DEX_PIDGEOT, + NATIONAL_DEX_SPHEAL, + NATIONAL_DEX_CLEFABLE, + NATIONAL_DEX_LATIAS, + NATIONAL_DEX_MANECTRIC, + NATIONAL_DEX_ZANGOOSE, + NATIONAL_DEX_KABUTOPS, + NATIONAL_DEX_GENGAR, + NATIONAL_DEX_LOUDRED, + NATIONAL_DEX_JYNX, + NATIONAL_DEX_NOCTOWL, + NATIONAL_DEX_GIRAFARIG, + NATIONAL_DEX_BAGON, + NATIONAL_DEX_MAGMAR, + NATIONAL_DEX_MAROWAK, + NATIONAL_DEX_TENTACOOL, + NATIONAL_DEX_VIGOROTH, + NATIONAL_DEX_BLISSEY, + NATIONAL_DEX_ABSOL, + NATIONAL_DEX_ALAKAZAM, + NATIONAL_DEX_HITMONTOP, + NATIONAL_DEX_GARDEVOIR, + NATIONAL_DEX_GRANBULL, + NATIONAL_DEX_HITMONLEE, + NATIONAL_DEX_HITMONCHAN, + NATIONAL_DEX_SKARMORY, + NATIONAL_DEX_CACNEA, + NATIONAL_DEX_BLAZIKEN, + NATIONAL_DEX_SCEPTILE, + NATIONAL_DEX_SEVIPER, + NATIONAL_DEX_CLAMPERL, + NATIONAL_DEX_ZAPDOS, + NATIONAL_DEX_HERACROSS, + NATIONAL_DEX_POLIWRATH, + NATIONAL_DEX_MR_MIME, + NATIONAL_DEX_PINSIR, + NATIONAL_DEX_LUDICOLO, + NATIONAL_DEX_TENTACRUEL, + NATIONAL_DEX_GOLBAT, + NATIONAL_DEX_MAGCARGO, + NATIONAL_DEX_ARTICUNO, + NATIONAL_DEX_PILOSWINE, + NATIONAL_DEX_SCYTHER, + NATIONAL_DEX_KADABRA, + NATIONAL_DEX_SMEARGLE, + NATIONAL_DEX_AERODACTYL, + NATIONAL_DEX_SHIFTRY, + NATIONAL_DEX_KINGLER, + NATIONAL_DEX_NIDOQUEEN, + NATIONAL_DEX_MAGNETON, + NATIONAL_DEX_ARON, + NATIONAL_DEX_LATIOS, + NATIONAL_DEX_MOLTRES, + NATIONAL_DEX_CRADILY, + NATIONAL_DEX_DEOXYS, + NATIONAL_DEX_AMPHAROS, + NATIONAL_DEX_NIDOKING, + NATIONAL_DEX_GLIGAR, + NATIONAL_DEX_ARBOK, + NATIONAL_DEX_LICKITUNG, + NATIONAL_DEX_ELECTRODE, + NATIONAL_DEX_ARMALDO, + NATIONAL_DEX_MACHOKE, + NATIONAL_DEX_STANTLER, + NATIONAL_DEX_GRUMPIG, + NATIONAL_DEX_LARVITAR, + NATIONAL_DEX_CROBAT, + NATIONAL_DEX_QUAGSIRE, + NATIONAL_DEX_MILTANK, + NATIONAL_DEX_HYPNO, + NATIONAL_DEX_GOLDUCK, + NATIONAL_DEX_CACTURNE, + NATIONAL_DEX_SLOWBRO, + NATIONAL_DEX_TYPHLOSION, + NATIONAL_DEX_SLOWKING, + NATIONAL_DEX_KANGASKHAN, + NATIONAL_DEX_STARMIE, + NATIONAL_DEX_SWALOT, + NATIONAL_DEX_TORKOAL, + NATIONAL_DEX_SWAMPERT, + NATIONAL_DEX_FLYGON, + NATIONAL_DEX_EXPLOUD, + NATIONAL_DEX_DODRIO, + NATIONAL_DEX_BLASTOISE, + NATIONAL_DEX_MAKUHITA, + NATIONAL_DEX_SEALEO, + NATIONAL_DEX_TAUROS, + NATIONAL_DEX_SHARPEDO, + NATIONAL_DEX_FERALIGATR, + NATIONAL_DEX_SEEL, + NATIONAL_DEX_CHARIZARD, + NATIONAL_DEX_RAPIDASH, + NATIONAL_DEX_BELDUM, + NATIONAL_DEX_NOSEPASS, + NATIONAL_DEX_VENUSAUR, + NATIONAL_DEX_TROPIUS, + NATIONAL_DEX_MEGANIUM, + NATIONAL_DEX_SALAMENCE, + NATIONAL_DEX_GRAVELER, + NATIONAL_DEX_CLAYDOL, + NATIONAL_DEX_SHELGON, + NATIONAL_DEX_RHYHORN, + NATIONAL_DEX_SCIZOR, + NATIONAL_DEX_DEWGONG, + NATIONAL_DEX_RHYDON, + NATIONAL_DEX_DONPHAN, + NATIONAL_DEX_EXEGGUTOR, + NATIONAL_DEX_LAIRON, + NATIONAL_DEX_MEWTWO, + NATIONAL_DEX_URSARING, + NATIONAL_DEX_FORRETRESS, + NATIONAL_DEX_MACHAMP, + NATIONAL_DEX_WAILMER, + NATIONAL_DEX_SLAKING, + NATIONAL_DEX_CLOYSTER, + NATIONAL_DEX_WALREIN, + NATIONAL_DEX_PUPITAR, + NATIONAL_DEX_KINGDRA, + NATIONAL_DEX_SOLROCK, + NATIONAL_DEX_ARCANINE, + NATIONAL_DEX_MILOTIC, + NATIONAL_DEX_LUNATONE, + NATIONAL_DEX_REGICE, + NATIONAL_DEX_RAIKOU, + NATIONAL_DEX_SUICUNE, + NATIONAL_DEX_ENTEI, + NATIONAL_DEX_HO_OH, + NATIONAL_DEX_TYRANITAR, + NATIONAL_DEX_METANG, + NATIONAL_DEX_REGISTEEL, + NATIONAL_DEX_RAYQUAZA, + NATIONAL_DEX_ONIX, + NATIONAL_DEX_DRAGONITE, + NATIONAL_DEX_LUGIA, + NATIONAL_DEX_LAPRAS, + NATIONAL_DEX_CAMERUPT, + NATIONAL_DEX_MANTINE, + NATIONAL_DEX_REGIROCK, + NATIONAL_DEX_GYARADOS, + NATIONAL_DEX_HARIYAMA, + NATIONAL_DEX_GLALIE, + NATIONAL_DEX_GOLEM, + NATIONAL_DEX_KYOGRE, + NATIONAL_DEX_AGGRON, + NATIONAL_DEX_WAILORD, + NATIONAL_DEX_STEELIX, + NATIONAL_DEX_SNORLAX, + NATIONAL_DEX_METAGROSS, + NATIONAL_DEX_GROUDON, }; static const u16 gPokedexOrder_Height[] = { - 50, // Diglett - 298, // Azurill - 177, // Natu - 13, // Weedle - 172, // Pichu - 173, // Cleffa - 175, // Togepi - 351, // Castform - 174, // Igglybuff - 10, // Caterpie - 276, // Taillow - 132, // Ditto - 133, // Eevee - 315, // Roselia - 21, // Spearow - 16, // Pidgey - 191, // Sunkern - 90, // Shellder - 19, // Rattata - 81, // Magnemite - 46, // Paras - 265, // Wurmple - 385, // Jirachi - 104, // Cubone - 258, // Mudkip - 194, // Wooper - 116, // Horsea - 52, // Meowth - 29, // Nidoran? - 220, // Swinub - 151, // Mew - 333, // Swablu - 304, // Aron - 311, // Plusle - 312, // Minun - 102, // Exeggcute - 25, // Pikachu - 182, // Bellossom - 316, // Gulpin - 263, // Zigzagoon - 285, // Shroomish - 138, // Omanyte - 331, // Cacnea - 98, // Krabby - 280, // Ralts - 187, // Hoppip - 255, // Torchic - 366, // Clamperl - 74, // Geodude - 183, // Marill - 339, // Barboach - 238, // Smoochum - 100, // Voltorb - 290, // Nincada - 302, // Sableye - 198, // Murkrow - 211, // Qwilfish - 7, // Squirtle - 252, // Treecko - 343, // Baltoy - 43, // Oddish - 270, // Lotad - 39, // Jigglypuff - 283, // Surskit - 155, // Cyndaquil - 140, // Kabuto - 264, // Linoone - 324, // Torkoal - 32, // Nidoran? - 167, // Spinarak - 56, // Mankey - 273, // Seedot - 261, // Poochyena - 231, // Phanpy - 201, // Unown - 170, // Chinchou - 233, // Porygon2 - 60, // Poliwag - 371, // Bagon - 349, // Feebas - 353, // Shuppet - 158, // Totodile - 251, // Celebi - 360, // Wynaut - 27, // Sandshrew - 358, // Chimecho - 370, // Luvdisc - 228, // Houndour - 266, // Silcoon - 309, // Electrike - 4, // Charmander - 307, // Meditite - 278, // Wingull - 223, // Remoraid - 341, // Corphish - 222, // Corsola - 314, // Illumise - 209, // Snubbull - 37, // Vulpix - 246, // Larvitar - 374, // Beldum - 293, // Whismur - 204, // Pineco - 239, // Elekid - 35, // Clefairy - 213, // Shuckle - 216, // Teddiursa - 14, // Kakuna - 300, // Skitty - 176, // Togetic - 118, // Goldeen - 303, // Mawile - 179, // Mareep - 188, // Skiploom - 109, // Koffing - 51, // Dugtrio - 268, // Cascoon - 322, // Numel - 347, // Anorith - 313, // Volbeat - 163, // Hoothoot - 328, // Trapinch - 325, // Spoink - 11, // Metapod - 69, // Bellsprout - 361, // Snorunt - 20, // Raticate - 259, // Marshtomp - 277, // Swellow - 240, // Magby - 58, // Growlithe - 200, // Misdreavus - 1, // Bulbasaur - 236, // Tyrogue - 218, // Slugma - 287, // Slakoth - 281, // Kirlia - 190, // Aipom - 135, // Jolteon - 30, // Nidorina - 184, // Azumarill - 292, // Shedinja - 66, // Machop - 291, // Ninjask - 284, // Masquerain - 355, // Duskull - 192, // Sunflora - 189, // Jumpluff - 120, // Staryu - 180, // Flaaffy - 363, // Spheal - 54, // Psyduck - 219, // Magcargo - 83, // Farfetch'd - 41, // Zubat - 137, // Porygon - 161, // Sentret - 318, // Carvanha - 44, // Gloom - 26, // Raichu - 129, // Magikarp - 215, // Sneasel - 305, // Lairon - 256, // Combusken - 224, // Octillery - 33, // Nidorino - 136, // Flareon - 225, // Delibird - 72, // Tentacool - 63, // Abra - 253, // Grovyle - 340, // Whiscash - 156, // Quilava - 196, // Espeon - 88, // Grimer - 152, // Chikorita - 326, // Grumpig - 299, // Nosepass - 53, // Persian - 262, // Mightyena - 48, // Venonat - 82, // Magneton - 77, // Ponyta - 296, // Makuhita - 337, // Lunatone - 28, // Sandslash - 96, // Drowzee - 114, // Tangela - 57, // Primeape - 165, // Ledyba - 40, // Wigglytuff - 47, // Parasect - 139, // Omastar - 294, // Loudred - 8, // Wartortle - 75, // Graveler - 197, // Umbreon - 345, // Lileep - 61, // Poliwhirl - 134, // Vaporeon - 15, // Beedrill - 105, // Marowak - 70, // Weepinbell - 369, // Relicanth - 111, // Rhyhorn - 2, // Ivysaur - 352, // Kecleon - 274, // Nuzleaf - 267, // Beautifly - 17, // Pidgeotto - 168, // Ariados - 86, // Seel - 186, // Politoed - 159, // Croconaw - 113, // Chansey - 354, // Banette - 232, // Donphan - 121, // Starmie - 5, // Charmeleon - 221, // Piloswine - 12, // Butterfree - 329, // Vibrava - 125, // Electabuzz - 342, // Crawdaunt - 301, // Delcatty - 334, // Altaria - 372, // Shelgon - 38, // Ninetales - 207, // Gligar - 364, // Sealeo - 327, // Spinda - 247, // Pupitar - 79, // Slowpoke - 338, // Solrock - 241, // Miltank - 22, // Fearow - 45, // Vileplume - 89, // Muk - 205, // Forretress - 185, // Sudowoodo - 359, // Absol - 193, // Yanma - 269, // Dustox - 108, // Lickitung - 235, // Smeargle - 171, // Lanturn - 101, // Electrode - 271, // Lombre - 286, // Breloom - 153, // Bayleef - 117, // Seadra - 110, // Weezing - 279, // Pelipper - 375, // Metang - 31, // Nidoqueen - 332, // Cacturne - 275, // Shiftry - 308, // Medicham - 335, // Zangoose - 141, // Kabutops - 99, // Kingler - 64, // Kadabra - 119, // Seaking - 36, // Clefable - 126, // Magmar - 202, // Wobbuffet - 92, // Gastly - 122, // Mr. mime - 62, // Poliwrath - 128, // Tauros - 380, // Latias - 181, // Ampharos - 288, // Vigoroth - 166, // Ledian - 76, // Golem - 365, // Walrein - 84, // Doduo - 229, // Houndoom - 34, // Nidoking - 124, // Jynx - 107, // Hitmonchan - 234, // Stantler - 210, // Granbull - 237, // Hitmontop - 195, // Quagsire - 344, // Claydol - 260, // Swampert - 242, // Blissey - 272, // Ludicolo - 295, // Exploud - 206, // Dunsparce - 127, // Pinsir - 91, // Cloyster - 67, // Machoke - 203, // Girafarig - 18, // Pidgeot - 178, // Xatu - 346, // Cradily - 106, // Hitmonlee - 49, // Venomoth - 94, // Gengar - 214, // Heracross - 362, // Glalie - 123, // Scyther - 373, // Salamence - 310, // Manectric - 348, // Armaldo - 65, // Alakazam - 97, // Hypno - 164, // Noctowl - 73, // Tentacruel - 356, // Dusclops - 145, // Zapdos - 42, // Golbat - 376, // Metagross - 282, // Gardevoir - 9, // Blastoise - 80, // Slowbro - 93, // Haunter - 68, // Machamp - 377, // Regirock - 317, // Swalot - 254, // Sceptile - 227, // Skarmory - 55, // Golduck - 386, // Deoxys - 71, // Victreebel - 78, // Rapidash - 6, // Charizard - 367, // Huntail - 87, // Dewgong - 144, // Articuno - 157, // Typhlosion - 142, // Aerodactyl - 368, // Gorebyss - 217, // Ursaring - 154, // Meganium - 378, // Regice - 212, // Scizor - 230, // Kingdra - 147, // Dratini - 85, // Dodrio - 319, // Sharpedo - 169, // Crobat - 162, // Furret - 59, // Arcanine - 243, // Raikou - 257, // Blaziken - 323, // Camerupt - 112, // Rhydon - 379, // Registeel - 23, // Ekans - 330, // Flygon - 357, // Tropius - 381, // Latios - 245, // Suicune - 146, // Moltres - 3, // Venusaur - 103, // Exeggutor - 199, // Slowking - 248, // Tyranitar - 289, // Slaking - 320, // Wailmer - 150, // Mewtwo - 306, // Aggron - 143, // Snorlax - 226, // Mantine - 244, // Entei - 149, // Dragonite - 115, // Kangaskhan - 297, // Hariyama - 160, // Feraligatr - 131, // Lapras - 336, // Seviper - 24, // Arbok - 383, // Groudon - 250, // Ho-Oh - 148, // Dragonair - 382, // Kyogre - 249, // Lugia - 350, // Milotic - 130, // Gyarados - 384, // Rayquaza - 95, // Onix - 208, // Steelix - 321, // Wailord + NATIONAL_DEX_DIGLETT, + NATIONAL_DEX_AZURILL, + NATIONAL_DEX_NATU, + NATIONAL_DEX_WEEDLE, + NATIONAL_DEX_PICHU, + NATIONAL_DEX_CLEFFA, + NATIONAL_DEX_TOGEPI, + NATIONAL_DEX_CASTFORM, + NATIONAL_DEX_IGGLYBUFF, + NATIONAL_DEX_CATERPIE, + NATIONAL_DEX_TAILLOW, + NATIONAL_DEX_DITTO, + NATIONAL_DEX_EEVEE, + NATIONAL_DEX_ROSELIA, + NATIONAL_DEX_SPEAROW, + NATIONAL_DEX_PIDGEY, + NATIONAL_DEX_SUNKERN, + NATIONAL_DEX_SHELLDER, + NATIONAL_DEX_RATTATA, + NATIONAL_DEX_MAGNEMITE, + NATIONAL_DEX_PARAS, + NATIONAL_DEX_WURMPLE, + NATIONAL_DEX_JIRACHI, + NATIONAL_DEX_CUBONE, + NATIONAL_DEX_MUDKIP, + NATIONAL_DEX_WOOPER, + NATIONAL_DEX_HORSEA, + NATIONAL_DEX_MEOWTH, + NATIONAL_DEX_NIDORAN_F, + NATIONAL_DEX_SWINUB, + NATIONAL_DEX_MEW, + NATIONAL_DEX_SWABLU, + NATIONAL_DEX_ARON, + NATIONAL_DEX_PLUSLE, + NATIONAL_DEX_MINUN, + NATIONAL_DEX_EXEGGCUTE, + NATIONAL_DEX_PIKACHU, + NATIONAL_DEX_BELLOSSOM, + NATIONAL_DEX_GULPIN, + NATIONAL_DEX_ZIGZAGOON, + NATIONAL_DEX_SHROOMISH, + NATIONAL_DEX_OMANYTE, + NATIONAL_DEX_CACNEA, + NATIONAL_DEX_KRABBY, + NATIONAL_DEX_RALTS, + NATIONAL_DEX_HOPPIP, + NATIONAL_DEX_TORCHIC, + NATIONAL_DEX_CLAMPERL, + NATIONAL_DEX_GEODUDE, + NATIONAL_DEX_MARILL, + NATIONAL_DEX_BARBOACH, + NATIONAL_DEX_SMOOCHUM, + NATIONAL_DEX_VOLTORB, + NATIONAL_DEX_NINCADA, + NATIONAL_DEX_SABLEYE, + NATIONAL_DEX_MURKROW, + NATIONAL_DEX_QWILFISH, + NATIONAL_DEX_SQUIRTLE, + NATIONAL_DEX_TREECKO, + NATIONAL_DEX_BALTOY, + NATIONAL_DEX_ODDISH, + NATIONAL_DEX_LOTAD, + NATIONAL_DEX_JIGGLYPUFF, + NATIONAL_DEX_SURSKIT, + NATIONAL_DEX_CYNDAQUIL, + NATIONAL_DEX_KABUTO, + NATIONAL_DEX_LINOONE, + NATIONAL_DEX_TORKOAL, + NATIONAL_DEX_NIDORAN_M, + NATIONAL_DEX_SPINARAK, + NATIONAL_DEX_MANKEY, + NATIONAL_DEX_SEEDOT, + NATIONAL_DEX_POOCHYENA, + NATIONAL_DEX_PHANPY, + NATIONAL_DEX_UNOWN, + NATIONAL_DEX_CHINCHOU, + NATIONAL_DEX_PORYGON2, + NATIONAL_DEX_POLIWAG, + NATIONAL_DEX_BAGON, + NATIONAL_DEX_FEEBAS, + NATIONAL_DEX_SHUPPET, + NATIONAL_DEX_TOTODILE, + NATIONAL_DEX_CELEBI, + NATIONAL_DEX_WYNAUT, + NATIONAL_DEX_SANDSHREW, + NATIONAL_DEX_CHIMECHO, + NATIONAL_DEX_LUVDISC, + NATIONAL_DEX_HOUNDOUR, + NATIONAL_DEX_SILCOON, + NATIONAL_DEX_ELECTRIKE, + NATIONAL_DEX_CHARMANDER, + NATIONAL_DEX_MEDITITE, + NATIONAL_DEX_WINGULL, + NATIONAL_DEX_REMORAID, + NATIONAL_DEX_CORPHISH, + NATIONAL_DEX_CORSOLA, + NATIONAL_DEX_ILLUMISE, + NATIONAL_DEX_SNUBBULL, + NATIONAL_DEX_VULPIX, + NATIONAL_DEX_LARVITAR, + NATIONAL_DEX_BELDUM, + NATIONAL_DEX_WHISMUR, + NATIONAL_DEX_PINECO, + NATIONAL_DEX_ELEKID, + NATIONAL_DEX_CLEFAIRY, + NATIONAL_DEX_SHUCKLE, + NATIONAL_DEX_TEDDIURSA, + NATIONAL_DEX_KAKUNA, + NATIONAL_DEX_SKITTY, + NATIONAL_DEX_TOGETIC, + NATIONAL_DEX_GOLDEEN, + NATIONAL_DEX_MAWILE, + NATIONAL_DEX_MAREEP, + NATIONAL_DEX_SKIPLOOM, + NATIONAL_DEX_KOFFING, + NATIONAL_DEX_DUGTRIO, + NATIONAL_DEX_CASCOON, + NATIONAL_DEX_NUMEL, + NATIONAL_DEX_ANORITH, + NATIONAL_DEX_VOLBEAT, + NATIONAL_DEX_HOOTHOOT, + NATIONAL_DEX_TRAPINCH, + NATIONAL_DEX_SPOINK, + NATIONAL_DEX_METAPOD, + NATIONAL_DEX_BELLSPROUT, + NATIONAL_DEX_SNORUNT, + NATIONAL_DEX_RATICATE, + NATIONAL_DEX_MARSHTOMP, + NATIONAL_DEX_SWELLOW, + NATIONAL_DEX_MAGBY, + NATIONAL_DEX_GROWLITHE, + NATIONAL_DEX_MISDREAVUS, + NATIONAL_DEX_BULBASAUR, + NATIONAL_DEX_TYROGUE, + NATIONAL_DEX_SLUGMA, + NATIONAL_DEX_SLAKOTH, + NATIONAL_DEX_KIRLIA, + NATIONAL_DEX_AIPOM, + NATIONAL_DEX_JOLTEON, + NATIONAL_DEX_NIDORINA, + NATIONAL_DEX_AZUMARILL, + NATIONAL_DEX_SHEDINJA, + NATIONAL_DEX_MACHOP, + NATIONAL_DEX_NINJASK, + NATIONAL_DEX_MASQUERAIN, + NATIONAL_DEX_DUSKULL, + NATIONAL_DEX_SUNFLORA, + NATIONAL_DEX_JUMPLUFF, + NATIONAL_DEX_STARYU, + NATIONAL_DEX_FLAAFFY, + NATIONAL_DEX_SPHEAL, + NATIONAL_DEX_PSYDUCK, + NATIONAL_DEX_MAGCARGO, + NATIONAL_DEX_FARFETCHD, + NATIONAL_DEX_ZUBAT, + NATIONAL_DEX_PORYGON, + NATIONAL_DEX_SENTRET, + NATIONAL_DEX_CARVANHA, + NATIONAL_DEX_GLOOM, + NATIONAL_DEX_RAICHU, + NATIONAL_DEX_MAGIKARP, + NATIONAL_DEX_SNEASEL, + NATIONAL_DEX_LAIRON, + NATIONAL_DEX_COMBUSKEN, + NATIONAL_DEX_OCTILLERY, + NATIONAL_DEX_NIDORINO, + NATIONAL_DEX_FLAREON, + NATIONAL_DEX_DELIBIRD, + NATIONAL_DEX_TENTACOOL, + NATIONAL_DEX_ABRA, + NATIONAL_DEX_GROVYLE, + NATIONAL_DEX_WHISCASH, + NATIONAL_DEX_QUILAVA, + NATIONAL_DEX_ESPEON, + NATIONAL_DEX_GRIMER, + NATIONAL_DEX_CHIKORITA, + NATIONAL_DEX_GRUMPIG, + NATIONAL_DEX_NOSEPASS, + NATIONAL_DEX_PERSIAN, + NATIONAL_DEX_MIGHTYENA, + NATIONAL_DEX_VENONAT, + NATIONAL_DEX_MAGNETON, + NATIONAL_DEX_PONYTA, + NATIONAL_DEX_MAKUHITA, + NATIONAL_DEX_LUNATONE, + NATIONAL_DEX_SANDSLASH, + NATIONAL_DEX_DROWZEE, + NATIONAL_DEX_TANGELA, + NATIONAL_DEX_PRIMEAPE, + NATIONAL_DEX_LEDYBA, + NATIONAL_DEX_WIGGLYTUFF, + NATIONAL_DEX_PARASECT, + NATIONAL_DEX_OMASTAR, + NATIONAL_DEX_LOUDRED, + NATIONAL_DEX_WARTORTLE, + NATIONAL_DEX_GRAVELER, + NATIONAL_DEX_UMBREON, + NATIONAL_DEX_LILEEP, + NATIONAL_DEX_POLIWHIRL, + NATIONAL_DEX_VAPOREON, + NATIONAL_DEX_BEEDRILL, + NATIONAL_DEX_MAROWAK, + NATIONAL_DEX_WEEPINBELL, + NATIONAL_DEX_RELICANTH, + NATIONAL_DEX_RHYHORN, + NATIONAL_DEX_IVYSAUR, + NATIONAL_DEX_KECLEON, + NATIONAL_DEX_NUZLEAF, + NATIONAL_DEX_BEAUTIFLY, + NATIONAL_DEX_PIDGEOTTO, + NATIONAL_DEX_ARIADOS, + NATIONAL_DEX_SEEL, + NATIONAL_DEX_POLITOED, + NATIONAL_DEX_CROCONAW, + NATIONAL_DEX_CHANSEY, + NATIONAL_DEX_BANETTE, + NATIONAL_DEX_DONPHAN, + NATIONAL_DEX_STARMIE, + NATIONAL_DEX_CHARMELEON, + NATIONAL_DEX_PILOSWINE, + NATIONAL_DEX_BUTTERFREE, + NATIONAL_DEX_VIBRAVA, + NATIONAL_DEX_ELECTABUZZ, + NATIONAL_DEX_CRAWDAUNT, + NATIONAL_DEX_DELCATTY, + NATIONAL_DEX_ALTARIA, + NATIONAL_DEX_SHELGON, + NATIONAL_DEX_NINETALES, + NATIONAL_DEX_GLIGAR, + NATIONAL_DEX_SEALEO, + NATIONAL_DEX_SPINDA, + NATIONAL_DEX_PUPITAR, + NATIONAL_DEX_SLOWPOKE, + NATIONAL_DEX_SOLROCK, + NATIONAL_DEX_MILTANK, + NATIONAL_DEX_FEAROW, + NATIONAL_DEX_VILEPLUME, + NATIONAL_DEX_MUK, + NATIONAL_DEX_FORRETRESS, + NATIONAL_DEX_SUDOWOODO, + NATIONAL_DEX_ABSOL, + NATIONAL_DEX_YANMA, + NATIONAL_DEX_DUSTOX, + NATIONAL_DEX_LICKITUNG, + NATIONAL_DEX_SMEARGLE, + NATIONAL_DEX_LANTURN, + NATIONAL_DEX_ELECTRODE, + NATIONAL_DEX_LOMBRE, + NATIONAL_DEX_BRELOOM, + NATIONAL_DEX_BAYLEEF, + NATIONAL_DEX_SEADRA, + NATIONAL_DEX_WEEZING, + NATIONAL_DEX_PELIPPER, + NATIONAL_DEX_METANG, + NATIONAL_DEX_NIDOQUEEN, + NATIONAL_DEX_CACTURNE, + NATIONAL_DEX_SHIFTRY, + NATIONAL_DEX_MEDICHAM, + NATIONAL_DEX_ZANGOOSE, + NATIONAL_DEX_KABUTOPS, + NATIONAL_DEX_KINGLER, + NATIONAL_DEX_KADABRA, + NATIONAL_DEX_SEAKING, + NATIONAL_DEX_CLEFABLE, + NATIONAL_DEX_MAGMAR, + NATIONAL_DEX_WOBBUFFET, + NATIONAL_DEX_GASTLY, + NATIONAL_DEX_MR_MIME, + NATIONAL_DEX_POLIWRATH, + NATIONAL_DEX_TAUROS, + NATIONAL_DEX_LATIAS, + NATIONAL_DEX_AMPHAROS, + NATIONAL_DEX_VIGOROTH, + NATIONAL_DEX_LEDIAN, + NATIONAL_DEX_GOLEM, + NATIONAL_DEX_WALREIN, + NATIONAL_DEX_DODUO, + NATIONAL_DEX_HOUNDOOM, + NATIONAL_DEX_NIDOKING, + NATIONAL_DEX_JYNX, + NATIONAL_DEX_HITMONCHAN, + NATIONAL_DEX_STANTLER, + NATIONAL_DEX_GRANBULL, + NATIONAL_DEX_HITMONTOP, + NATIONAL_DEX_QUAGSIRE, + NATIONAL_DEX_CLAYDOL, + NATIONAL_DEX_SWAMPERT, + NATIONAL_DEX_BLISSEY, + NATIONAL_DEX_LUDICOLO, + NATIONAL_DEX_EXPLOUD, + NATIONAL_DEX_DUNSPARCE, + NATIONAL_DEX_PINSIR, + NATIONAL_DEX_CLOYSTER, + NATIONAL_DEX_MACHOKE, + NATIONAL_DEX_GIRAFARIG, + NATIONAL_DEX_PIDGEOT, + NATIONAL_DEX_XATU, + NATIONAL_DEX_CRADILY, + NATIONAL_DEX_HITMONLEE, + NATIONAL_DEX_VENOMOTH, + NATIONAL_DEX_GENGAR, + NATIONAL_DEX_HERACROSS, + NATIONAL_DEX_GLALIE, + NATIONAL_DEX_SCYTHER, + NATIONAL_DEX_SALAMENCE, + NATIONAL_DEX_MANECTRIC, + NATIONAL_DEX_ARMALDO, + NATIONAL_DEX_ALAKAZAM, + NATIONAL_DEX_HYPNO, + NATIONAL_DEX_NOCTOWL, + NATIONAL_DEX_TENTACRUEL, + NATIONAL_DEX_DUSCLOPS, + NATIONAL_DEX_ZAPDOS, + NATIONAL_DEX_GOLBAT, + NATIONAL_DEX_METAGROSS, + NATIONAL_DEX_GARDEVOIR, + NATIONAL_DEX_BLASTOISE, + NATIONAL_DEX_SLOWBRO, + NATIONAL_DEX_HAUNTER, + NATIONAL_DEX_MACHAMP, + NATIONAL_DEX_REGIROCK, + NATIONAL_DEX_SWALOT, + NATIONAL_DEX_SCEPTILE, + NATIONAL_DEX_SKARMORY, + NATIONAL_DEX_GOLDUCK, + NATIONAL_DEX_DEOXYS, + NATIONAL_DEX_VICTREEBEL, + NATIONAL_DEX_RAPIDASH, + NATIONAL_DEX_CHARIZARD, + NATIONAL_DEX_HUNTAIL, + NATIONAL_DEX_DEWGONG, + NATIONAL_DEX_ARTICUNO, + NATIONAL_DEX_TYPHLOSION, + NATIONAL_DEX_AERODACTYL, + NATIONAL_DEX_GOREBYSS, + NATIONAL_DEX_URSARING, + NATIONAL_DEX_MEGANIUM, + NATIONAL_DEX_REGICE, + NATIONAL_DEX_SCIZOR, + NATIONAL_DEX_KINGDRA, + NATIONAL_DEX_DRATINI, + NATIONAL_DEX_DODRIO, + NATIONAL_DEX_SHARPEDO, + NATIONAL_DEX_CROBAT, + NATIONAL_DEX_FURRET, + NATIONAL_DEX_ARCANINE, + NATIONAL_DEX_RAIKOU, + NATIONAL_DEX_BLAZIKEN, + NATIONAL_DEX_CAMERUPT, + NATIONAL_DEX_RHYDON, + NATIONAL_DEX_REGISTEEL, + NATIONAL_DEX_EKANS, + NATIONAL_DEX_FLYGON, + NATIONAL_DEX_TROPIUS, + NATIONAL_DEX_LATIOS, + NATIONAL_DEX_SUICUNE, + NATIONAL_DEX_MOLTRES, + NATIONAL_DEX_VENUSAUR, + NATIONAL_DEX_EXEGGUTOR, + NATIONAL_DEX_SLOWKING, + NATIONAL_DEX_TYRANITAR, + NATIONAL_DEX_SLAKING, + NATIONAL_DEX_WAILMER, + NATIONAL_DEX_MEWTWO, + NATIONAL_DEX_AGGRON, + NATIONAL_DEX_SNORLAX, + NATIONAL_DEX_MANTINE, + NATIONAL_DEX_ENTEI, + NATIONAL_DEX_DRAGONITE, + NATIONAL_DEX_KANGASKHAN, + NATIONAL_DEX_HARIYAMA, + NATIONAL_DEX_FERALIGATR, + NATIONAL_DEX_LAPRAS, + NATIONAL_DEX_SEVIPER, + NATIONAL_DEX_ARBOK, + NATIONAL_DEX_GROUDON, + NATIONAL_DEX_HO_OH, + NATIONAL_DEX_DRAGONAIR, + NATIONAL_DEX_KYOGRE, + NATIONAL_DEX_LUGIA, + NATIONAL_DEX_MILOTIC, + NATIONAL_DEX_GYARADOS, + NATIONAL_DEX_RAYQUAZA, + NATIONAL_DEX_ONIX, + NATIONAL_DEX_STEELIX, + NATIONAL_DEX_WAILORD, }; diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c index d57c699da..ba2439a64 100644 --- a/src/debug/sound_check_menu.c +++ b/src/debug/sound_check_menu.c @@ -44,14 +44,8 @@ enum MAX }; -extern struct ToneData voicegroup_84537C0[]; -extern struct ToneData voicegroup_8452590[]; -extern struct ToneData voicegroup_8453DC0[]; -extern struct ToneData voicegroup_8452B90[]; -extern struct ToneData voicegroup_84543C0[]; -extern struct ToneData voicegroup_8453190[]; -extern struct ToneData voicegroup_84549C0[]; -extern struct ToneData voicegroup_8453790[]; +extern struct ToneData gCryTable[]; +extern struct ToneData gCryTable2[]; static EWRAM_DATA u8 gUnknown_020387B0 = 0; static EWRAM_DATA u8 gUnknown_020387B1 = 0; @@ -544,27 +538,27 @@ void Task_ProcessDriverTestInput(u8 taskId) { case 0: if (gUnknown_020387D8) - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_84537C0[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable2[(128 * 0) + remaining]); else - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_8452590[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable[(128 * 0) + remaining]); break; case 1: if (gUnknown_020387D8) - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_8453DC0[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable2[(128 * 1) + remaining]); else - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_8452B90[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable[(128 * 1) + remaining]); break; case 2: if (gUnknown_020387D8) - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_84543C0[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable2[(128 * 2) + remaining]); else - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_8453190[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable[(128 * 2) + remaining]); break; case 3: if (gUnknown_020387D8) - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_84549C0[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable2[(128 * 3) + remaining]); else - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_8453790[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable[(128 * 3) + remaining]); break; } } diff --git a/src/field_camera.c b/src/field_camera.c index 29cdf0496..319c8a540 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -231,17 +231,17 @@ static void DrawMetatileAt(struct MapLayout *mapLayout, u16 offset, int x, int y u16 *metatiles; u16 metatileId = MapGridGetMetatileIdAt(x, y); - if (metatileId > 0x400) + if (metatileId > NUM_METATILES_TOTAL) metatileId = 0; - if (metatileId < 0x200) + if (metatileId < NUM_METATILES_IN_PRIMARY) { metatiles = mapLayout->primaryTileset->metatiles; } else { metatiles = mapLayout->secondaryTileset->metatiles; - metatileId -= 0x200; + metatileId -= NUM_METATILES_IN_PRIMARY; } DrawMetatile(MapGridGetMetatileLayerTypeAt(x, y), metatiles + metatileId * 8, offset); diff --git a/src/fieldmap.c b/src/fieldmap.c index 874df23b0..abb46fd35 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -463,15 +463,15 @@ void MapGridSetMetatileEntryAt(int x, int y, u16 metatile) u32 GetBehaviorByMetatileId(u16 metatile) { u16 *attributes; - if (metatile <= 0x1ff) + if (metatile < NUM_METATILES_IN_PRIMARY) { attributes = gMapHeader.mapLayout->primaryTileset->metatileAttributes; return attributes[metatile]; } - else if (metatile <= 0x3ff) + else if (metatile < NUM_METATILES_TOTAL) { attributes = gMapHeader.mapLayout->secondaryTileset->metatileAttributes; - return attributes[metatile - 0x200]; + return attributes[metatile - NUM_METATILES_IN_PRIMARY]; } else { @@ -878,17 +878,17 @@ void GetCameraCoords(u16 *x, u16 *y) *y = gSaveBlock1.pos.y; } -void sub_8056C98(struct Tileset *tileset, void *src) +void sub_8056C98(struct Tileset *tileset, void *dest) { if (tileset) { if (!tileset->isCompressed) { - CpuFastSet(tileset->tiles, src, 0x1000); + CpuFastCopy(tileset->tiles, dest, NUM_TILES_IN_PRIMARY * 16 * 2); } else { - LZ77UnCompVram(tileset->tiles, src); + LZ77UnCompVram(tileset->tiles, dest); } } } @@ -906,7 +906,7 @@ void sub_8056CBC(struct Tileset *tileset, int offset, int size) } else if (tileset->isSecondary == TRUE) { - LoadPalette(tileset->palettes + 0xc0, offset, size); + LoadPalette((u16*)tileset->palettes + (NUM_PALS_IN_PRIMARY * 16), offset, size); } else { @@ -918,24 +918,24 @@ void sub_8056CBC(struct Tileset *tileset, int offset, int size) void sub_8056D28(struct MapLayout *mapLayout) { - void *src = (void*)(BG_VRAM); - sub_8056C98(mapLayout->primaryTileset, src); + void *dest = (void*)(BG_VRAM); + sub_8056C98(mapLayout->primaryTileset, dest); } void sub_8056D38(struct MapLayout *mapLayout) { - void *src = (void*)(BG_VRAM + 0x4000); - sub_8056C98(mapLayout->secondaryTileset, src); + void *dest = (void*)(BG_VRAM + NUM_TILES_IN_PRIMARY * 16 * 2); + sub_8056C98(mapLayout->secondaryTileset, dest); } void apply_map_tileset1_palette(struct MapLayout *mapLayout) { - sub_8056CBC(mapLayout->primaryTileset, 0, 0xc0); + sub_8056CBC(mapLayout->primaryTileset, 0, NUM_PALS_IN_PRIMARY * 16 * 2); } void apply_map_tileset2_palette(struct MapLayout *mapLayout) { - sub_8056CBC(mapLayout->secondaryTileset, 0x60, 0xc0); + sub_8056CBC(mapLayout->secondaryTileset, NUM_PALS_IN_PRIMARY * 16, (NUM_PALS_TOTAL - NUM_PALS_IN_PRIMARY) * 16 * 2); } void copy_map_tileset1_tileset2_to_vram(struct MapLayout *mapLayout) diff --git a/src/item_menu.c b/src/item_menu.c index 12d02ebd8..95a84b1fb 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1119,13 +1119,13 @@ static void sub_80A41E0(u8 *a, u16 b, const u8 *c, u16 d, u8 e) AlignInt1InMenuWindow(a, d, 0x78, 1); } -static u8 *sub_80A425C(u8 taskId, u8 *text, u8 c) +static u8 *sub_80A425C(u8 taskId, u8 *text, u8 itemSlot) { - if (gTasks[taskId].data[10] - gBagPocketScrollStates[sCurrentBagPocket].scrollTop - 1 == c) + if (gTasks[taskId].data[10] - gBagPocketScrollStates[sCurrentBagPocket].scrollTop - 1 == itemSlot) { text[0] = EXT_CTRL_CODE_BEGIN; text[1] = 1; - text[2] = 2; + text[2] = TEXT_COLOR_RED; text += 3; } return text; @@ -1222,275 +1222,61 @@ static void sub_80A444C(u16 a, int b, int c, int d) } } -// more gBGTilemapBuffers shenanigans -#ifdef NONMATCHING -static void sub_80A4548(u16 a, int b, int c, int d) +static void sub_80A4548(u16 taskId, int topItemOffset, int bottomItemOffset, int d) { u8 i; - for (i = b; i <= c; i++) + for (i = topItemOffset; i <= bottomItemOffset; i++) { - u8 r4; - u8 sp10; - u32 r5; + u8 slot; + u8 y; + u16 tilemapOffset; u8 *text; if (sub_80A42B0(i, d) == TRUE) break; - r4 = gBagPocketScrollStates[sCurrentBagPocket].scrollTop + i; - sp10 = i * 2 + 2; - r5 = sp10 * 32 + 14; + + slot = gBagPocketScrollStates[sCurrentBagPocket].scrollTop + i; + y = i * 2 + 2; + tilemapOffset = y * 32 + 14; text = gStringVar1; - text = sub_80A425C(a, text, i); - if (gCurrentBagPocketItemSlots[r4].itemId < 0x153) + text = sub_80A425C(taskId, text, i); + + if (gCurrentBagPocketItemSlots[slot].itemId < ITEM_HM01_CUT) { - const u8 *r2; - - gBGTilemapBuffers[2][r5 + 0] = 0x59; - gBGTilemapBuffers[2][r5 + 1] = 0x4F; - gBGTilemapBuffers[2][r5 + 32] = 0x69; - gBGTilemapBuffers[2][r5 + 33] = 0x4F; - r2 = gMoveNames[ItemIdToBattleMoveId(gCurrentBagPocketItemSlots[r4].itemId)]; - sub_80A41E0(text, gCurrentBagPocketItemSlots[r4].itemId - 288, r2, gCurrentBagPocketItemSlots[r4].quantity, 2); + const u8 *moveName; + gBGTilemapBuffers[2][tilemapOffset + 0] = 0x59; + gBGTilemapBuffers[2][tilemapOffset + 1] = 0x4F; + gBGTilemapBuffers[2][tilemapOffset + 32] = 0x69; + gBGTilemapBuffers[2][tilemapOffset + 33] = 0x4F; + moveName = gMoveNames[ItemIdToBattleMoveId(gCurrentBagPocketItemSlots[slot].itemId)]; + sub_80A41E0(text, gCurrentBagPocketItemSlots[slot].itemId - (ITEM_TM01_FOCUS_PUNCH - 1), moveName, gCurrentBagPocketItemSlots[slot].quantity, 2); } else { const u8 *moveName; - - gBGTilemapBuffers[2][r5 + 0] = 0x105D; - gBGTilemapBuffers[2][r5 + 1] = 0x105E; - gBGTilemapBuffers[2][r5 + 32] = 0x106D; - gBGTilemapBuffers[2][r5 + 33] = 0x106E; + gBGTilemapBuffers[2][tilemapOffset + 0] = 0x105D; + gBGTilemapBuffers[2][tilemapOffset + 1] = 0x105E; + gBGTilemapBuffers[2][tilemapOffset + 32] = 0x106D; + gBGTilemapBuffers[2][tilemapOffset + 33] = 0x106E; text[0] = EXT_CTRL_CODE_BEGIN; text[1] = 0x13; text[2] = 0x11; text += 3; - text = ConvertIntToDecimalString(text, gCurrentBagPocketItemSlots[r4].itemId); + text = ConvertIntToDecimalString(text, gCurrentBagPocketItemSlots[slot].itemId - (ITEM_HM01_CUT - 1)); text[0] = EXT_CTRL_CODE_BEGIN; text[1] = 0x13; text[2] = 0x18; text += 3; - moveName = gMoveNames[ItemIdToBattleMoveId(gCurrentBagPocketItemSlots[r4].itemId)]; + moveName = gMoveNames[ItemIdToBattleMoveId(gCurrentBagPocketItemSlots[slot].itemId)]; AlignStringInMenuWindow(text, moveName, 0x78, 0); } - Menu_PrintText(gStringVar1, 14, sp10); + + Menu_PrintText(gStringVar1, 14, y); } } -#else -NAKED -static void sub_80A4548(u16 a, int b, int c, int d) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x14\n\ - str r2, [sp, 0x8]\n\ - str r3, [sp, 0xC]\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - str r0, [sp, 0x4]\n\ - lsls r1, 24\n\ - lsrs r1, 24\n\ - mov r8, r1\n\ - ldr r0, _080A456C @ =gBGTilemapBuffers + 0x1000\n\ - mov r9, r0\n\ - b _080A46C2\n\ - .align 2, 0\n\ -_080A456C: .4byte gBGTilemapBuffers + 0x1000\n\ -_080A4570:\n\ - ldr r1, _080A461C @ =gBagPocketScrollStates\n\ - ldr r0, _080A4620 @ =sCurrentBagPocket\n\ - ldrb r0, [r0]\n\ - lsls r0, 24\n\ - asrs r0, 24\n\ - lsls r0, 2\n\ - adds r0, r1\n\ - ldrb r4, [r0, 0x1]\n\ - add r4, r8\n\ - lsls r4, 24\n\ - lsrs r4, 24\n\ - mov r1, r8\n\ - lsls r0, r1, 25\n\ - movs r3, 0x80\n\ - lsls r3, 18\n\ - adds r0, r3\n\ - lsrs r0, 24\n\ - str r0, [sp, 0x10]\n\ - lsls r0, 5\n\ - adds r0, 0xE\n\ - adds r5, r0, 0\n\ - ldr r6, _080A4624 @ =gStringVar1\n\ - ldr r1, [sp, 0x4]\n\ - lsls r0, r1, 24\n\ - lsrs r0, 24\n\ - adds r1, r6, 0\n\ - mov r2, r8\n\ - bl sub_80A425C\n\ - adds r6, r0, 0\n\ - ldr r3, _080A4628 @ =gCurrentBagPocketItemSlots\n\ - mov r10, r3\n\ - ldr r0, [r3]\n\ - lsls r7, r4, 2\n\ - adds r3, r7, r0\n\ - ldrh r1, [r3]\n\ - movs r0, 0xA9\n\ - lsls r0, 1\n\ - cmp r1, r0\n\ - bhi _080A4634\n\ - lsls r0, r5, 1\n\ - add r0, r9\n\ - movs r1, 0x59\n\ - strh r1, [r0]\n\ - adds r0, r5, 0x1\n\ - lsls r0, 1\n\ - add r0, r9\n\ - movs r2, 0x4F\n\ - strh r2, [r0]\n\ - adds r0, r5, 0\n\ - adds r0, 0x20\n\ - lsls r0, 1\n\ - add r0, r9\n\ - movs r1, 0x69\n\ - strh r1, [r0]\n\ - adds r0, r5, 0\n\ - adds r0, 0x21\n\ - lsls r0, 1\n\ - add r0, r9\n\ - strh r2, [r0]\n\ - ldrh r0, [r3]\n\ - bl ItemIdToBattleMoveId\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - movs r1, 0xD\n\ - adds r2, r0, 0\n\ - muls r2, r1\n\ - ldr r0, _080A462C @ =gMoveNames\n\ - adds r2, r0\n\ - mov r1, r10\n\ - ldr r0, [r1]\n\ - adds r0, r7, r0\n\ - ldr r3, _080A4630 @ =0xfffffee0\n\ - adds r1, r3, 0\n\ - ldrh r3, [r0]\n\ - adds r1, r3\n\ - lsls r1, 16\n\ - lsrs r1, 16\n\ - ldrh r3, [r0, 0x2]\n\ - movs r0, 0x2\n\ - str r0, [sp]\n\ - adds r0, r6, 0\n\ - bl sub_80A41E0\n\ - b _080A46AE\n\ - .align 2, 0\n\ -_080A461C: .4byte gBagPocketScrollStates\n\ -_080A4620: .4byte sCurrentBagPocket\n\ -_080A4624: .4byte gStringVar1\n\ -_080A4628: .4byte gCurrentBagPocketItemSlots\n\ -_080A462C: .4byte gMoveNames\n\ -_080A4630: .4byte 0xfffffee0\n\ -_080A4634:\n\ - lsls r0, r5, 1\n\ - add r0, r9\n\ - ldr r1, _080A46EC @ =0x0000105d\n\ - strh r1, [r0]\n\ - adds r0, r5, 0x1\n\ - lsls r0, 1\n\ - add r0, r9\n\ - adds r1, 0x1\n\ - strh r1, [r0]\n\ - adds r0, r5, 0\n\ - adds r0, 0x20\n\ - lsls r0, 1\n\ - add r0, r9\n\ - adds r1, 0xF\n\ - strh r1, [r0]\n\ - adds r0, r5, 0\n\ - adds r0, 0x21\n\ - lsls r0, 1\n\ - add r0, r9\n\ - adds r1, 0x1\n\ - strh r1, [r0]\n\ - movs r0, 0xFC\n\ - strb r0, [r6]\n\ - movs r4, 0x13\n\ - strb r4, [r6, 0x1]\n\ - movs r0, 0x11\n\ - strb r0, [r6, 0x2]\n\ - adds r6, 0x3\n\ - mov r1, r10\n\ - ldr r0, [r1]\n\ - adds r0, r7, r0\n\ - ldrh r1, [r0]\n\ - ldr r3, _080A46F0 @ =0xfffffeae\n\ - adds r1, r3\n\ - adds r0, r6, 0\n\ - bl ConvertIntToDecimalString\n\ - adds r6, r0, 0\n\ - movs r0, 0xFC\n\ - strb r0, [r6]\n\ - strb r4, [r6, 0x1]\n\ - movs r0, 0x18\n\ - strb r0, [r6, 0x2]\n\ - adds r6, 0x3\n\ - mov r1, r10\n\ - ldr r0, [r1]\n\ - adds r0, r7, r0\n\ - ldrh r0, [r0]\n\ - bl ItemIdToBattleMoveId\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - movs r1, 0xD\n\ - muls r1, r0\n\ - ldr r0, _080A46F4 @ =gMoveNames\n\ - adds r1, r0\n\ - adds r0, r6, 0\n\ - movs r2, 0x78\n\ - movs r3, 0\n\ - bl AlignStringInMenuWindow\n\ -_080A46AE:\n\ - ldr r0, _080A46F8 @ =gStringVar1\n\ - movs r1, 0xE\n\ - ldr r2, [sp, 0x10]\n\ - bl Menu_PrintText\n\ - mov r0, r8\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r8, r0\n\ -_080A46C2:\n\ - ldr r3, [sp, 0x8]\n\ - cmp r8, r3\n\ - bgt _080A46DA\n\ - mov r0, r8\n\ - ldr r1, [sp, 0xC]\n\ - bl sub_80A42B0\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0x1\n\ - beq _080A46DA\n\ - b _080A4570\n\ -_080A46DA:\n\ - add sp, 0x14\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080A46EC: .4byte 0x0000105d\n\ -_080A46F0: .4byte 0xfffffeae\n\ -_080A46F4: .4byte gMoveNames\n\ -_080A46F8: .4byte gStringVar1\n\ - .syntax divided\n"); -} -#endif -static void sub_80A46FC(u16 a, int b, int c, int d) +static void sub_80A46FC(u16 taskId, int b, int c, int d) { u8 i; @@ -1512,29 +1298,29 @@ static void sub_80A46FC(u16 a, int b, int c, int d) gBGTilemapBuffers[2][var] = 0x69; text = gStringVar1; - text = sub_80A425C(a, text, i); + text = sub_80A425C(taskId, text, i); CopyItemName(gCurrentBagPocketItemSlots[r4].itemId, gStringVar2); sub_80A41E0(text, gCurrentBagPocketItemSlots[r4].itemId - 0x84, gStringVar2, gCurrentBagPocketItemSlots[r4].quantity, 3); Menu_PrintText(gStringVar1, 14, r5); } } -static void sub_80A47E8(u16 a, int b, int c, int d) +static void sub_80A47E8(u16 taskId, int topItemOffset, int bottomItemOffset, int d) { switch (sCurrentBagPocket) { case BAG_POCKET_ITEMS: case BAG_POCKET_POKE_BALLS: - sub_80A4380(a, b, c, d); + sub_80A4380(taskId, topItemOffset, bottomItemOffset, d); break; case BAG_POCKET_KEY_ITEMS: - sub_80A444C(a, b, c, d); + sub_80A444C(taskId, topItemOffset, bottomItemOffset, d); break; case BAG_POCKET_TMs_HMs: - sub_80A4548(a, b, c, d); + sub_80A4548(taskId, topItemOffset, bottomItemOffset, d); break; case BAG_POCKET_BERRIES: - sub_80A46FC(a, b, c, d); + sub_80A46FC(taskId, topItemOffset, bottomItemOffset, d); break; } if (gBagPocketScrollStates[sCurrentBagPocket].scrollTop != 0) @@ -1548,9 +1334,9 @@ static void sub_80A47E8(u16 a, int b, int c, int d) SetVerticalScrollIndicators(BOTTOM_ARROW, INVISIBLE); } -static void sub_80A48E8(u16 taskId, int b, int c) +static void sub_80A48E8(u16 taskId, int topItemOffset, int bottomItemOffset) { - sub_80A47E8(taskId, b, c, 0); + sub_80A47E8(taskId, topItemOffset, bottomItemOffset, 0); } static void sub_80A48F8(u16 taskId) diff --git a/src/libs/m4a_tables.c b/src/libs/m4a_tables.c index 91f00a31d..9a4ea32e6 100644 --- a/src/libs/m4a_tables.c +++ b/src/libs/m4a_tables.c @@ -261,7 +261,7 @@ const struct PokemonCrySong gPokemonCrySongTemplate = 0, // block count 255, // priority 0, // reverb - (struct ToneData *)&voicegroup_pokemon_cry, + (struct ToneData *)&voicegroup000, NULL, NULL, 0, diff --git a/src/pokedex.c b/src/pokedex.c index eb4d1d918..caa6a1565 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -26,7 +26,6 @@ #include "scanline_effect.h" #include "ewram.h" -#define NATIONAL_DEX_COUNT 386 struct PokedexListItem { @@ -1971,7 +1970,7 @@ static void SortPokedex(u8 dexMode, u8 sortMode) { default: case DEX_MODE_HOENN: - vars[0] = 202; + vars[0] = HOENN_DEX_COUNT; vars[1] = 1; break; case DEX_MODE_NATIONAL: @@ -1982,7 +1981,7 @@ static void SortPokedex(u8 dexMode, u8 sortMode) } else { - vars[0] = 202; + vars[0] = HOENN_DEX_COUNT; vars[1] = 1; } break; @@ -2028,7 +2027,7 @@ static void SortPokedex(u8 dexMode, u8 sortMode) } break; case 1: - for (i = 0; i < 411; i++) + for (i = 0; i < POKEMON_SLOTS_NUMBER - 1; i++) { vars[2] = gPokedexOrder_Alphabetical[i]; @@ -4060,7 +4059,7 @@ u16 GetHoennPokedexCount(u8 caseID) u16 count = 0; u16 i; - for (i = 0; i < 202; i++) + for (i = 0; i < HOENN_DEX_COUNT; i++) { switch (caseID) { diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 30e9503cd..4814c900d 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -12,6 +12,7 @@ #include "main.h" #include "move_tutor_menu.h" #include "pokemon.h" +#include "pokedex.h" #include "random.h" #include "overworld.h" #include "rom_8077ABC.h" @@ -390,10 +391,10 @@ u16 HoennPokedexNumToSpecies(u16 hoennNum) species = 0; - while (species < 411 && gSpeciesToHoennPokedexNum[species] != hoennNum) + while (species < POKEMON_SLOTS_NUMBER - 1 && gSpeciesToHoennPokedexNum[species] != hoennNum) species++; - if (species == 411) + if (species == POKEMON_SLOTS_NUMBER - 1) return 0; return species + 1; @@ -408,10 +409,10 @@ u16 NationalPokedexNumToSpecies(u16 nationalNum) species = 0; - while (species < 411 && gSpeciesToNationalPokedexNum[species] != nationalNum) + while (species < POKEMON_SLOTS_NUMBER - 1 && gSpeciesToNationalPokedexNum[species] != nationalNum) species++; - if (species == 411) + if (species == POKEMON_SLOTS_NUMBER - 1) return 0; return species + 1; @@ -426,10 +427,10 @@ u16 NationalToHoennOrder(u16 nationalNum) hoennNum = 0; - while (hoennNum < 411 && gHoennToNationalOrder[hoennNum] != nationalNum) + while (hoennNum < POKEMON_SLOTS_NUMBER - 1 && gHoennToNationalOrder[hoennNum] != nationalNum) hoennNum++; - if (hoennNum == 411) + if (hoennNum == POKEMON_SLOTS_NUMBER - 1) return 0; return hoennNum + 1; @@ -1095,7 +1096,7 @@ u16 SpeciesToPokedexNum(u16 species) else { species = SpeciesToHoennPokedexNum(species); - if (species <= 202) + if (species <= HOENN_DEX_COUNT) return species; return 0xFFFF; } diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 8ae582222..710756c11 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -5,6 +5,7 @@ #include "battle.h" #include "data2.h" #include "de_rom_8040FE0.h" +#include "decompress.h" #include "event_data.h" #include "constants/flags.h" #include "landmark.h" @@ -281,7 +282,7 @@ void sub_80F13FC(void); void sub_80F1438(void); static void sub_80F1494(void); bool8 sub_80F162C(u8); -void sub_80F01E0(u16); +static void sub_80F01E0(u16); static void sub_80F19FC(void); static void sub_80F1A74(void); static void sub_80F1A80(void); @@ -347,6 +348,15 @@ static void sub_80F42C4(u8*); static void sub_80F4394(void); u8 *sub_80F6514(u8*, u16, u8); static u8 *sub_80F443C(u8 *, u16); +void sub_80F55AC(u8*, struct UnkPokenav11 *); +static void sub_80F4CF0(void); +static void sub_80F4D44(void); +static bool8 sub_80F4D88(void); +static void sub_80F53EC(struct UnkPokenav11*, struct UnkPokenav11*); +static bool8 sub_80F5504(void); +static bool8 sub_80F5264(void); +static bool8 sub_80F52F8(void); +static bool8 sub_80F5364(void); extern void sub_80F0900(void); extern void sub_80F01A4(void); @@ -375,13 +385,10 @@ extern u8 sub_80F68E8(); extern void sub_80F66E0(); extern void sub_80F638C(); extern bool8 sub_80F63D0(); -extern void sub_80F4CF0(); extern void sub_80EFF34(); extern bool8 sub_80EFF68(); extern void sub_80F6134(); extern u8 sub_80F5DD4(); -extern void sub_80F4D44(); -extern bool8 sub_80F4D88(); extern void sub_80F0264(u8); extern bool8 sub_80F02A0(); extern void sub_80EF9F8(void); @@ -4676,7 +4683,7 @@ void sub_80F01A4(void) REG_WINOUT = 0x001B; } -void sub_80F01E0(u16 a) +static void sub_80F01E0(u16 a) { Menu_PrintText(gUnknown_083DFEC4->unk8829[a], 13, 1); @@ -8100,7 +8107,7 @@ static u8 *sub_80F445C(u8 *arg0, u16 arg1) return buffer; } -int sub_80F44B0(u16 box, u16 monIndex, int monDataField, int *text) +u32 sub_80F44B0(u16 box, u16 monIndex, int monDataField, int *text) { if (box == 14) { @@ -8126,7 +8133,7 @@ static void SetMonMarkings(u16 box, u16 monIndex, u8 markings) SetBoxMonData(&gPokemonStorage.boxes[box][monIndex], MON_DATA_MARKINGS, &markings); } -void sub_80F45A0(s16 arg0, u8 arg1) +static void sub_80F45A0(s16 arg0, u8 arg1) { u8 box; u8 var0 = gUnknown_083DFEC4->unk893c[arg0].unk4; @@ -8148,3 +8155,585 @@ void sub_80F45A0(s16 arg0, u8 arg1) gUnknown_083DFEC4->unk8937[arg1] = var0; } } + +static void sub_80F468C(s16 arg0, u8 arg1) +{ + u16 i; + u16 box; + u16 monIndex; + + if (gUnknown_083DFEC4->unk893c[arg0].unk4) + { + box = gUnknown_083DFEC4->unk893c[arg0].unk1; + monIndex = gUnknown_083DFEC4->unk893c[arg0].partyIdx; + gUnknown_083DFEC4->unk8ff0[arg1][0] = sub_80F44B0(box, monIndex, MON_DATA_COOL, NULL); + gUnknown_083DFEC4->unk8ff0[arg1][1] = sub_80F44B0(box, monIndex, MON_DATA_TOUGH, NULL); + gUnknown_083DFEC4->unk8ff0[arg1][2] = sub_80F44B0(box, monIndex, MON_DATA_SMART, NULL); + gUnknown_083DFEC4->unk8ff0[arg1][3] = sub_80F44B0(box, monIndex, MON_DATA_CUTE, NULL); + gUnknown_083DFEC4->unk8ff0[arg1][4] = sub_80F44B0(box, monIndex, MON_DATA_BEAUTY, NULL); + + gUnknown_083DFEC4->unk8931[arg1] = sub_80F44B0(box, monIndex, MON_DATA_SHEEN, NULL) != 255 + ? sub_80F44B0(box, monIndex, MON_DATA_SHEEN, NULL) / 29 + : 9; + + gUnknown_083DFEC4->unk8934[arg1] = sub_80F44B0(box, monIndex, MON_DATA_MARKINGS, NULL); + sub_80F55AC(gUnknown_083DFEC4->unk8ff0[arg1], gUnknown_083DFEC4->unk9004[arg1]); + } + else + { + for (i = 0; i < 5; i++) + { + gUnknown_083DFEC4->unk8ff0[arg1][i] = 0; + gUnknown_083DFEC4->unk9004[arg1][i].unk0 = 0x9B; + gUnknown_083DFEC4->unk9004[arg1][i].unk2 = 0x5B; + } + } +} + +static void sub_80F4824(s16 arg0, u8 arg1) +{ + u16 species; + u32 otId; + u32 personality; + u16 box; + u16 monIndex; + + if (gUnknown_083DFEC4->unk893c[arg0].unk4) + { + box = gUnknown_083DFEC4->unk893c[arg0].unk1; + monIndex = gUnknown_083DFEC4->unk893c[arg0].partyIdx; + species = sub_80F44B0(box, monIndex, MON_DATA_SPECIES2, NULL); + otId = sub_80F44B0(box, monIndex, MON_DATA_OT_ID, NULL); + personality = sub_80F44B0(box, monIndex, MON_DATA_PERSONALITY, NULL); + + HandleLoadSpecialPokePic( + &gMonFrontPicTable[species], + gMonFrontPicCoords[species].coords, + 1, + (intptr_t)gUnknown_083DFEC4->unk131E4, + gUnknown_083DFEC4->unkD1E4[arg1], + species, + personality); + + LZ77UnCompWram(GetMonSpritePalFromOtIdPersonality(species, otId, personality), gUnknown_083DFEC4->unk0[arg1]); + gUnknown_083DFEC4->unkD1D6[arg1] = species; + } +} + +void sub_80F4900(s16 arg0, u8 arg1) +{ + sub_80F45A0(arg0, arg1); + sub_80F468C(arg0, arg1); + sub_80F4824(arg0, arg1); +} + +void sub_80F492C(void) +{ + gUnknown_083DFEC4->unk8FE4 = 0; +} + +#ifdef NONMATCHING +// registers r3/r4 are swapped +void sub_80F4944(struct UnkUsePokeblockSub *arg0) +{ + u16 i; + u16 r3; + u16 r4; + + i = 0; + r4 = gUnknown_083DFEC4->unk8FE4; + r3 = r4 / 2; + while (r3 != r4) + { + if (arg0->unk0 > gUnknown_083DFEC4->unk893c[r3].unk0) + r4 = r3; + else + i = r3 + 1; + + r3 = ((r4 - i) / 2) + i; + } + + r4 = gUnknown_083DFEC4->unk8FE4; + while (r4 > r3) + { + gUnknown_083DFEC4->unk893c[r4] = gUnknown_083DFEC4->unk893c[r4 - 1]; + r4--; + } + + gUnknown_083DFEC4->unk893c[r3] = *arg0; + gUnknown_083DFEC4->unk8FE4++; +} +#else +NAKED +void sub_80F4944(struct UnkUsePokeblockSub *arg0) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r8\n\ + push {r7}\n\ + mov r12, r0\n\ + movs r2, 0\n\ + ldr r1, _080F4978 @ =gUnknown_083DFEC4\n\ + ldr r5, [r1]\n\ + ldr r3, _080F497C @ =0x00008fe4\n\ + adds r0, r5, r3\n\ + ldrh r4, [r0]\n\ + lsrs r3, r4, 1\n\ + mov r8, r1\n\ + cmp r4, r3\n\ + beq _080F499C\n\ + adds r6, r5, 0\n\ + mov r0, r12\n\ + ldrb r5, [r0]\n\ + ldr r7, _080F4980 @ =0x0000893c\n\ +_080F4968:\n\ + lsls r0, r3, 2\n\ + adds r0, r6, r0\n\ + adds r0, r7\n\ + ldrb r0, [r0]\n\ + cmp r5, r0\n\ + bls _080F4984\n\ + adds r4, r3, 0\n\ + b _080F498A\n\ + .align 2, 0\n\ +_080F4978: .4byte gUnknown_083DFEC4\n\ +_080F497C: .4byte 0x00008fe4\n\ +_080F4980: .4byte 0x0000893c\n\ +_080F4984:\n\ + adds r0, r3, 0x1\n\ + lsls r0, 16\n\ + lsrs r2, r0, 16\n\ +_080F498A:\n\ + subs r0, r4, r2\n\ + lsrs r1, r0, 31\n\ + adds r0, r1\n\ + asrs r0, 1\n\ + adds r0, r2, r0\n\ + lsls r0, 16\n\ + lsrs r3, r0, 16\n\ + cmp r4, r3\n\ + bne _080F4968\n\ +_080F499C:\n\ + mov r1, r8\n\ + ldr r2, [r1]\n\ + ldr r1, _080F49EC @ =0x00008fe4\n\ + adds r0, r2, r1\n\ + ldrh r4, [r0]\n\ + lsls r6, r3, 2\n\ + cmp r4, r3\n\ + bls _080F49C6\n\ + ldr r0, _080F49F0 @ =0x0000893c\n\ + adds r5, r2, r0\n\ +_080F49B0:\n\ + lsls r2, r4, 2\n\ + adds r2, r5, r2\n\ + subs r1, r4, 0x1\n\ + lsls r0, r1, 2\n\ + adds r0, r5, r0\n\ + ldr r0, [r0]\n\ + str r0, [r2]\n\ + lsls r1, 16\n\ + lsrs r4, r1, 16\n\ + cmp r4, r3\n\ + bhi _080F49B0\n\ +_080F49C6:\n\ + mov r1, r8\n\ + ldr r2, [r1]\n\ + ldr r3, _080F49F0 @ =0x0000893c\n\ + adds r0, r2, r3\n\ + adds r0, r6\n\ + mov r3, r12\n\ + ldr r1, [r3]\n\ + str r1, [r0]\n\ + ldr r0, _080F49EC @ =0x00008fe4\n\ + adds r2, r0\n\ + ldrh r0, [r2]\n\ + adds r0, 0x1\n\ + strh r0, [r2]\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_080F49EC: .4byte 0x00008fe4\n\ +_080F49F0: .4byte 0x0000893c\n\ + .syntax divided\n"); +} +#endif // NONMATCHING + +void sub_80F49F4(void) +{ + u16 i; + + gUnknown_083DFEC4->unk893c[0].unk2 = 1; + for (i = 1; i < gUnknown_083DFEC4->unk8FE4; i++) + { + if (gUnknown_083DFEC4->unk893c[i].unk0 == gUnknown_083DFEC4->unk893c[i - 1].unk0) + gUnknown_083DFEC4->unk893c[i].unk2 = gUnknown_083DFEC4->unk893c[i - 1].unk2; + else + gUnknown_083DFEC4->unk893c[i].unk2 = i + 1; + } + + gUnknown_083DFEC4->unk876C = 0; + gUnknown_083DFEC4->unk8770 = 0; + gUnknown_083DFEC4->unk876E = 0; + gUnknown_083DFEC4->unk8772 = gUnknown_083DFEC4->unk8FE4 < 9 ? (gUnknown_083DFEC4->unk8FE4 - 1) : 7; + gUnknown_083DFEC4->unk8774 = gUnknown_083DFEC4->unk8FE4 - 1; + gUnknown_083DFEC4->unk87C9 = gUnknown_083DFEC4->unk8774 > 7; +} + +void sub_80F4B20(void) +{ + s16 var0; + s16 var1; + + sub_80F4900(gUnknown_083DFEC4->unk87DC, 0); + sub_80F2E18(0); + if (gUnknown_083DFEC4->unk87DA == 1) + { + gUnknown_083DFEC4->unk8fe9 = 0; + gUnknown_083DFEC4->unk8FEA = 0; + gUnknown_083DFEC4->unk8FEB = 0; + } + else + { + gUnknown_083DFEC4->unk8fe9 = 0; + gUnknown_083DFEC4->unk8FEA = 1; + gUnknown_083DFEC4->unk8FEB = 2; + + var0 = gUnknown_083DFEC4->unk87DC + 1; + if (var0 >= gUnknown_083DFEC4->unk87DA) + var0 = 0; + + var1 = gUnknown_083DFEC4->unk87DC - 1; + if (var1 < 0) + var1 = gUnknown_083DFEC4->unk87DA - 1; + + sub_80F4900(var0, 1); + sub_80F4900(var1, 2); + } +} + +void sub_80F4BD0(void) +{ + u16 i, j; + + for (i = 0, j = 0; i < gUnknown_083DFEC4->unk8828; i++) + { + if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG)) + { + gUnknown_083DFEC4->unk893c[j].unk1 = 14; + gUnknown_083DFEC4->unk893c[j].partyIdx = i; + gUnknown_083DFEC4->unk893c[j].unk2 = j + 1; + gUnknown_083DFEC4->unk893c[j].unk4 = 1; + j++; + } + } + + gUnknown_083DFEC4->unk893c[j].unk1 = 0; + gUnknown_083DFEC4->unk893c[j].partyIdx = 0; + gUnknown_083DFEC4->unk893c[j].unk2 = 0; + gUnknown_083DFEC4->unk893c[j].unk4 = 0; + gUnknown_083DFEC4->unk87DC = 0; + gUnknown_083DFEC4->unk87DA = j + 1; + sub_80F4B20(); + gUnknown_083DFEC4->unk87CB = 1; +} + +static void sub_80F4CF0(void) +{ + gUnknown_083DFEC4->unk87DC = gUnknown_083DFEC4->unk876E; + sub_80F4B20(); + + if (gUnknown_083DFEC4->unk8774 == 0) + gUnknown_083DFEC4->unk87CB = 0; + else + gUnknown_083DFEC4->unk87CB = 1; +} + +static void sub_80F4D44(void) +{ + gUnknown_083DFEC4->unk8FE6 = 0; + gUnknown_083DFEC4->unk8FE7 = 0; + sub_80F492C(); + + if (!gUnknown_083DFEC4->unk6DAC) + while (sub_80F4D88()); +} + +static bool8 sub_80F4D88(void) +{ + u16 i; + register int mask asm("r3"); // FIXME + int nextValue; + struct UnkUsePokeblockSub var0; + + switch (gUnknown_083DFEC4->unk8FE6) + { + default: + var0.unk4 = 1; + for (i = 0; i < 15; i++) + { + + if (GetBoxMonData(&gPokemonStorage.boxes[gUnknown_083DFEC4->unk8FE6][gUnknown_083DFEC4->unk8FE7], MON_DATA_SPECIES) + && !GetBoxMonData(&gPokemonStorage.boxes[gUnknown_083DFEC4->unk8FE6][gUnknown_083DFEC4->unk8FE7], MON_DATA_IS_EGG)) + { + var0.unk1 = gUnknown_083DFEC4->unk8FE6; + var0.partyIdx = gUnknown_083DFEC4->unk8FE7; + var0.unk0 = GetBoxMonData( + &gPokemonStorage.boxes[gUnknown_083DFEC4->unk8FE6][gUnknown_083DFEC4->unk8FE7], + gUnknown_083DFEC4->unk87D8); + sub_80F4944(&var0); + } + + gUnknown_083DFEC4->unk8FE7++; + mask = 0xFF; + if (gUnknown_083DFEC4->unk8FE7 == 30) + { + gUnknown_083DFEC4->unk8FE7 = 0; + nextValue = gUnknown_083DFEC4->unk8FE6 + 1; + gUnknown_083DFEC4->unk8FE6 = nextValue; + if ((nextValue & mask) == 14) + break; + } + } + break; + case 14: + var0.unk4 = 1; + var0.unk1 = 14; + for (i = 0; i < gUnknown_083DFEC4->unk8828; i++) + { + if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG)) + { + var0.partyIdx = i; + var0.unk0 = GetMonData(&gPlayerParty[i], gUnknown_083DFEC4->unk87D8); + sub_80F4944(&var0); + } + } + + sub_80F49F4(); + gUnknown_083DFEC4->unk87DA = gUnknown_083DFEC4->unk8FE4; + gUnknown_083DFEC4->unk8FE6++; + break; + case 15: + return FALSE; + } + + return TRUE; +} + +void sub_80F4F78(void) +{ + sub_80F53EC(gUnknown_083DFEC4->unk9040, gUnknown_083DFEC4->unk9004[gUnknown_083DFEC4->unk8fe9]); + sub_80F5504(); +} + +bool8 sub_80F4FB4(void) +{ + bool8 var0 = sub_80F5504(); + bool8 var1 = sub_80F170C(); + return var0 || var1; +} + +void sub_80F4FDC(void) +{ + if (gUnknown_083DFEC4->unk76AA || gUnknown_083DFEC4->unk87DC != gUnknown_083DFEC4->unk8828) + sub_80F53EC(gUnknown_083DFEC4->unk9004[gUnknown_083DFEC4->unk8fe9], gUnknown_083DFEC4->unk9040); +} + +bool8 sub_80F5038(void) +{ + bool8 var0 = sub_80F5504(); + bool8 var1 = sub_80F173C(); + return var0 || var1; +} + +void sub_80F5060(u8 arg0) +{ + u16 var0; + u8 var1; + u8 var2; + + if (arg0) + var0 = gUnknown_083DFEC4->unk8FEB; + else + var0 = gUnknown_083DFEC4->unk8FEA; + + sub_80F53EC(gUnknown_083DFEC4->unk9004[gUnknown_083DFEC4->unk8fe9], gUnknown_083DFEC4->unk9004[var0]); + var1 = gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk4; + if (arg0) + { + gUnknown_083DFEC4->unk8FEB = gUnknown_083DFEC4->unk8FEA; + gUnknown_083DFEC4->unk8FEA = gUnknown_083DFEC4->unk8fe9; + gUnknown_083DFEC4->unk8fe9 = var0; + gUnknown_083DFEC4->unk8FEC = gUnknown_083DFEC4->unk8FEB; + + gUnknown_083DFEC4->unk87DC = gUnknown_083DFEC4->unk87DC + ? gUnknown_083DFEC4->unk87DC - 1 + : gUnknown_083DFEC4->unk87DA - 1; + gUnknown_083DFEC4->unk8FEE = gUnknown_083DFEC4->unk87DC + ? gUnknown_083DFEC4->unk87DC - 1 + : gUnknown_083DFEC4->unk87DA - 1; + } + else + { + gUnknown_083DFEC4->unk8FEA = gUnknown_083DFEC4->unk8FEB; + gUnknown_083DFEC4->unk8FEB = gUnknown_083DFEC4->unk8fe9; + gUnknown_083DFEC4->unk8fe9 = var0; + gUnknown_083DFEC4->unk8FEC = gUnknown_083DFEC4->unk8FEA; + + gUnknown_083DFEC4->unk87DC = (gUnknown_083DFEC4->unk87DC < gUnknown_083DFEC4->unk87DA - 1) + ? gUnknown_083DFEC4->unk87DC + 1 + : 0; + gUnknown_083DFEC4->unk8FEE = (gUnknown_083DFEC4->unk87DC < gUnknown_083DFEC4->unk87DA - 1) + ? gUnknown_083DFEC4->unk87DC + 1 + : 0; + } + + var2 = gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk4; + if (!var1) + gUnknown_083DFEC4->unk87E0 = sub_80F5264; + else if (!var2) + gUnknown_083DFEC4->unk87E0 = sub_80F52F8; + else + gUnknown_083DFEC4->unk87E0 = sub_80F5364; + + gUnknown_083DFEC4->unk87DE = 0; +} + +bool8 gpu_sync_bg_show(void) +{ + return gUnknown_083DFEC4->unk87E0(); +} + +static bool8 sub_80F5264(void) +{ + switch (gUnknown_083DFEC4->unk87DE) + { + case 0: + sub_80F2E18(gUnknown_083DFEC4->unk8fe9); + sub_80F01E0(gUnknown_083DFEC4->unk8fe9); + gUnknown_083DFEC4->unk87DE++; + // fall through + case 1: + if (!sub_80F4FB4()) + { + sub_80F4900(gUnknown_083DFEC4->unk8FEE, gUnknown_083DFEC4->unk8FEC); + gUnknown_083DFEC4->unk87DE++; + } + break; + case 2: + return FALSE; + } + + return TRUE; +} + +static bool8 sub_80F52F8(void) +{ + switch (gUnknown_083DFEC4->unk87DE) + { + case 0: + if (!sub_80F5038()) + { + sub_80F01E0(gUnknown_083DFEC4->unk8fe9); + sub_80F4900(gUnknown_083DFEC4->unk8FEE, gUnknown_083DFEC4->unk8FEC); + gUnknown_083DFEC4->unk87DE++; + } + break; + case 1: + return FALSE; + } + + return TRUE; +} + +static bool8 sub_80F5364(void) +{ + switch (gUnknown_083DFEC4->unk87DE) + { + case 0: + sub_80F5504(); + if (!sub_80F173C()) + { + sub_80F2E18(gUnknown_083DFEC4->unk8fe9); + sub_80F01E0(gUnknown_083DFEC4->unk8fe9); + gUnknown_083DFEC4->unk87DE++; + } + break; + case 1: + if (!sub_80F4FB4()) + gUnknown_083DFEC4->unk87DE++; + break; + case 2: + sub_80F4900(gUnknown_083DFEC4->unk8FEE, gUnknown_083DFEC4->unk8FEC); + return FALSE; + } + + return TRUE; +} + +static void sub_80F53EC(struct UnkPokenav11 *arg0, struct UnkPokenav11 *arg1) +{ + u16 i, j; + int r5; + int r6; + + for (i = 0; i < 5; i++) + { + r5 = arg0[i].unk0 << 8; + r6 = ((arg1[i].unk0 - arg0[i].unk0) << 8) / 10; + for (j = 0; j < 9; j++) + { + gUnknown_083DFEC4->unk9054[j][i].unk0 = (r5 >> 8) + ((r5 >> 7) & 1); + r5 += r6; + } + + gUnknown_083DFEC4->unk9054[j][i].unk0 = arg1[i].unk0; + r5 = arg0[i].unk2 << 8; + r6 = ((arg1[i].unk2 - arg0[i].unk2) << 8) / 10; + for (j = 0; j < 9; j++) + { + gUnknown_083DFEC4->unk9054[j][i].unk2 = (r5 >> 8) + ((r5 >> 7) & 1); + r5 += r6; + } + + gUnknown_083DFEC4->unk9054[j][i].unk2 = arg1[i].unk2; + } + + gUnknown_083DFEC4->unk9342 = 0; +} + +static bool8 sub_80F5504(void) +{ + if (gUnknown_083DFEC4->unk9342 < 10) + { + sub_80F556C(gUnknown_083DFEC4->unk9054[gUnknown_083DFEC4->unk9342++]); + return gUnknown_083DFEC4->unk9342 != 10; + } + else + { + return FALSE; + } +} + +void sub_80F5550(struct UnkPokenav11 *arg0, struct UnkPokenav11 *arg1) +{ + sub_80F53EC(arg0, arg1); +} + +bool8 sub_80F555C(void) +{ + return sub_80F5504(); +} + +void sub_80F556C(struct UnkPokenav11 *arg0) +{ + u16 i; + + for (i = 0; i < 5; i++) + gUnknown_083DFEC4->unk911C[i] = arg0[i]; + + gUnknown_083DFEC4->unk9344 = 1; +} diff --git a/src/sound.c b/src/sound.c index 5b41acbc6..b9756c1dc 100644 --- a/src/sound.c +++ b/src/sound.c @@ -32,15 +32,8 @@ extern struct MusicPlayerInfo gMPlay_SE1; extern struct MusicPlayerInfo gMPlay_SE2; extern struct MusicPlayerInfo gMPlay_SE3; -extern struct ToneData voicegroup_8452590[]; -extern struct ToneData voicegroup_8452B90[]; -extern struct ToneData voicegroup_8453190[]; -extern struct ToneData voicegroup_8453790[]; - -extern struct ToneData voicegroup_84537C0[]; -extern struct ToneData voicegroup_8453DC0[]; -extern struct ToneData voicegroup_84543C0[]; -extern struct ToneData voicegroup_84549C0[]; +extern struct ToneData gCryTable[]; +extern struct ToneData gCryTable2[]; static const struct Fanfare sFanfares[] = { @@ -416,19 +409,19 @@ static void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode { case 0: gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &voicegroup_84537C0[index] : &voicegroup_8452590[index]); + v0 ? &gCryTable2[(128 * 0) + index] : &gCryTable[(128 * 0) + index]); break; case 1: gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &voicegroup_8453DC0[index] : &voicegroup_8452B90[index]); + v0 ? &gCryTable2[(128 * 1) + index] : &gCryTable[(128 * 1) + index]); break; case 2: gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &voicegroup_84543C0[index] : &voicegroup_8453190[index]); + v0 ? &gCryTable2[(128 * 2) + index] : &gCryTable[(128 * 2) + index]); break; case 3: gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &voicegroup_84549C0[index] : &voicegroup_8453790[index]); + v0 ? &gCryTable2[(128 * 3) + index] : &gCryTable[(128 * 3) + index]); break; } } diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index dd28bd148..c8506fbcf 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -317,7 +317,7 @@ static void sub_8136294(void) } break; case 19: - sub_80F556C(gUnknown_083DFEC4->unk9004); + sub_80F556C(gUnknown_083DFEC4->unk9004[0]); gUnknown_02039304->unk50++; break; case 20: diff --git a/tools/gbagfx/gfx.c b/tools/gbagfx/gfx.c index c0f7f492c..f927deed9 100644 --- a/tools/gbagfx/gfx.c +++ b/tools/gbagfx/gfx.c @@ -18,16 +18,35 @@ #define DOWNCONVERT_BIT_DEPTH(x) ((x) / 8) -static void ConvertFromTiles1Bpp(unsigned char *src, unsigned char *dest, int numTiles, int tilesWidth, bool invertColors) +static void AdvanceMetatilePosition(int *subTileX, int *subTileY, int *metatileX, int *metatileY, int metatilesWide, int metatileWidth, int metatileHeight) { - int tilesX = 0; - int tilesY = 0; - int pitch = tilesWidth; + (*subTileX)++; + if (*subTileX == metatileWidth) { + *subTileX = 0; + (*subTileY)++; + if (*subTileY == metatileHeight) { + *subTileY = 0; + (*metatileX)++; + if (*metatileX == metatilesWide) { + *metatileX = 0; + (*metatileY)++; + } + } + } +} + +static void ConvertFromTiles1Bpp(unsigned char *src, unsigned char *dest, int numTiles, int metatilesWide, int metatileWidth, int metatileHeight, bool invertColors) +{ + int subTileX = 0; + int subTileY = 0; + int metatileX = 0; + int metatileY = 0; + int pitch = metatilesWide * metatileWidth; for (int i = 0; i < numTiles; i++) { for (int j = 0; j < 8; j++) { - int destY = tilesY * 8 + j; - int destX = tilesX; + int destY = (metatileY * metatileHeight + subTileY) * 8 + j; + int destX = metatileX * metatileWidth + subTileX; unsigned char srcPixelOctet = *src++; unsigned char *destPixelOctet = &dest[destY * pitch + destX]; @@ -38,27 +57,24 @@ static void ConvertFromTiles1Bpp(unsigned char *src, unsigned char *dest, int nu } } - tilesX++; - - if (tilesX == tilesWidth) { - tilesX = 0; - tilesY++; - } + AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, metatileHeight); } } -static void ConvertFromTiles4Bpp(unsigned char *src, unsigned char *dest, int numTiles, int tilesWidth, bool invertColors) +static void ConvertFromTiles4Bpp(unsigned char *src, unsigned char *dest, int numTiles, int metatilesWide, int metatileWidth, int metatileHeight, bool invertColors) { - int tilesX = 0; - int tilesY = 0; - int pitch = tilesWidth * 4; + int subTileX = 0; + int subTileY = 0; + int metatileX = 0; + int metatileY = 0; + int pitch = (metatilesWide * metatileWidth) * 4; for (int i = 0; i < numTiles; i++) { for (int j = 0; j < 8; j++) { - int destY = tilesY * 8 + j; + int destY = (metatileY * metatileHeight + subTileY) * 8 + j; for (int k = 0; k < 4; k++) { - int destX = tilesX * 4 + k; + int destX = (metatileX * metatileWidth + subTileX) * 4 + k; unsigned char srcPixelPair = *src++; unsigned char leftPixel = srcPixelPair & 0xF; unsigned char rightPixel = srcPixelPair >> 4; @@ -72,27 +88,24 @@ static void ConvertFromTiles4Bpp(unsigned char *src, unsigned char *dest, int nu } } - tilesX++; - - if (tilesX == tilesWidth) { - tilesX = 0; - tilesY++; - } + AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, metatileHeight); } } -static void ConvertFromTiles8Bpp(unsigned char *src, unsigned char *dest, int numTiles, int tilesWidth, bool invertColors) +static void ConvertFromTiles8Bpp(unsigned char *src, unsigned char *dest, int numTiles, int metatilesWide, int metatileWidth, int metatileHeight, bool invertColors) { - int tilesX = 0; - int tilesY = 0; - int pitch = tilesWidth * 8; + int subTileX = 0; + int subTileY = 0; + int metatileX = 0; + int metatileY = 0; + int pitch = (metatilesWide * metatileWidth) * 8; for (int i = 0; i < numTiles; i++) { for (int j = 0; j < 8; j++) { - int destY = tilesY * 8 + j; + int destY = (metatileY * metatileHeight + subTileY) * 8 + j; for (int k = 0; k < 8; k++) { - int destX = tilesX * 8 + k; + int destX = (metatileX * metatileWidth + subTileX) * 8 + k; unsigned char srcPixel = *src++; if (invertColors) @@ -102,25 +115,22 @@ static void ConvertFromTiles8Bpp(unsigned char *src, unsigned char *dest, int nu } } - tilesX++; - - if (tilesX == tilesWidth) { - tilesX = 0; - tilesY++; - } + AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, metatileHeight); } } -static void ConvertToTiles1Bpp(unsigned char *src, unsigned char *dest, int numTiles, int tilesWidth, bool invertColors) +static void ConvertToTiles1Bpp(unsigned char *src, unsigned char *dest, int numTiles, int metatilesWide, int metatileWidth, int metatileHeight, bool invertColors) { - int tilesX = 0; - int tilesY = 0; - int pitch = tilesWidth; + int subTileX = 0; + int subTileY = 0; + int metatileX = 0; + int metatileY = 0; + int pitch = metatilesWide * metatileWidth; for (int i = 0; i < numTiles; i++) { for (int j = 0; j < 8; j++) { - int srcY = tilesY * 8 + j; - int srcX = tilesX; + int srcY = (metatileY * metatileHeight + subTileY) * 8 + j; + int srcX = metatileX * metatileWidth + subTileX; unsigned char srcPixelOctet = src[srcY * pitch + srcX]; unsigned char *destPixelOctet = dest++; @@ -131,27 +141,24 @@ static void ConvertToTiles1Bpp(unsigned char *src, unsigned char *dest, int numT } } - tilesX++; - - if (tilesX == tilesWidth) { - tilesX = 0; - tilesY++; - } + AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, metatileHeight); } } -static void ConvertToTiles4Bpp(unsigned char *src, unsigned char *dest, int numTiles, int tilesWidth, bool invertColors) +static void ConvertToTiles4Bpp(unsigned char *src, unsigned char *dest, int numTiles, int metatilesWide, int metatileWidth, int metatileHeight, bool invertColors) { - int tilesX = 0; - int tilesY = 0; - int pitch = tilesWidth * 4; + int subTileX = 0; + int subTileY = 0; + int metatileX = 0; + int metatileY = 0; + int pitch = (metatilesWide * metatileWidth) * 4; for (int i = 0; i < numTiles; i++) { for (int j = 0; j < 8; j++) { - int srcY = tilesY * 8 + j; + int srcY = (metatileY * metatileHeight + subTileY) * 8 + j; for (int k = 0; k < 4; k++) { - int srcX = tilesX * 4 + k; + int srcX = (metatileX * metatileWidth + subTileX) * 4 + k; unsigned char srcPixelPair = src[srcY * pitch + srcX]; unsigned char leftPixel = srcPixelPair >> 4; unsigned char rightPixel = srcPixelPair & 0xF; @@ -165,27 +172,24 @@ static void ConvertToTiles4Bpp(unsigned char *src, unsigned char *dest, int numT } } - tilesX++; - - if (tilesX == tilesWidth) { - tilesX = 0; - tilesY++; - } + AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, metatileHeight); } } -static void ConvertToTiles8Bpp(unsigned char *src, unsigned char *dest, int numTiles, int tilesWidth, bool invertColors) +static void ConvertToTiles8Bpp(unsigned char *src, unsigned char *dest, int numTiles, int metatilesWide, int metatileWidth, int metatileHeight, bool invertColors) { - int tilesX = 0; - int tilesY = 0; - int pitch = tilesWidth * 8; + int subTileX = 0; + int subTileY = 0; + int metatileX = 0; + int metatileY = 0; + int pitch = (metatilesWide * metatileWidth) * 8; for (int i = 0; i < numTiles; i++) { for (int j = 0; j < 8; j++) { - int srcY = tilesY * 8 + j; + int srcY = (metatileY * metatileHeight + subTileY) * 8 + j; for (int k = 0; k < 8; k++) { - int srcX = tilesX * 8 + k; + int srcX = (metatileX * metatileWidth + subTileX) * 8 + k; unsigned char srcPixel = src[srcY * pitch + srcX]; if (invertColors) @@ -195,16 +199,11 @@ static void ConvertToTiles8Bpp(unsigned char *src, unsigned char *dest, int numT } } - tilesX++; - - if (tilesX == tilesWidth) { - tilesX = 0; - tilesY++; - } + AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, metatileHeight); } } -void ReadImage(char *path, int tilesWidth, int bitDepth, struct Image *image, bool invertColors) +void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors) { int tileSize = bitDepth * 8; @@ -215,6 +214,12 @@ void ReadImage(char *path, int tilesWidth, int bitDepth, struct Image *image, bo int tilesHeight = (numTiles + tilesWidth - 1) / tilesWidth; + if (tilesWidth % metatileWidth != 0) + FATAL_ERROR("The width in tiles (%d) isn't a multiple of the specified metatile width (%d)", tilesWidth, metatileWidth); + + if (tilesHeight % metatileHeight != 0) + FATAL_ERROR("The height in tiles (%d) isn't a multiple of the specified metatile height (%d)", tilesHeight, metatileHeight); + image->width = tilesWidth * 8; image->height = tilesHeight * 8; image->bitDepth = bitDepth; @@ -223,22 +228,24 @@ void ReadImage(char *path, int tilesWidth, int bitDepth, struct Image *image, bo if (image->pixels == NULL) FATAL_ERROR("Failed to allocate memory for pixels.\n"); + int metatilesWide = tilesWidth / metatileWidth; + switch (bitDepth) { case 1: - ConvertFromTiles1Bpp(buffer, image->pixels, numTiles, tilesWidth, invertColors); + ConvertFromTiles1Bpp(buffer, image->pixels, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors); break; case 4: - ConvertFromTiles4Bpp(buffer, image->pixels, numTiles, tilesWidth, invertColors); + ConvertFromTiles4Bpp(buffer, image->pixels, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors); break; case 8: - ConvertFromTiles8Bpp(buffer, image->pixels, numTiles, tilesWidth, invertColors); + ConvertFromTiles8Bpp(buffer, image->pixels, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors); break; } free(buffer); } -void WriteImage(char *path, int numTiles, int bitDepth, struct Image *image, bool invertColors) +void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors) { int tileSize = bitDepth * 8; @@ -251,6 +258,12 @@ void WriteImage(char *path, int numTiles, int bitDepth, struct Image *image, boo int tilesWidth = image->width / 8; int tilesHeight = image->height / 8; + if (tilesWidth % metatileWidth != 0) + FATAL_ERROR("The width in tiles (%d) isn't a multiple of the specified metatile width (%d)", tilesWidth, metatileWidth); + + if (tilesHeight % metatileHeight != 0) + FATAL_ERROR("The height in tiles (%d) isn't a multiple of the specified metatile height (%d)", tilesHeight, metatileHeight); + int maxNumTiles = tilesWidth * tilesHeight; if (numTiles == 0) @@ -264,15 +277,17 @@ void WriteImage(char *path, int numTiles, int bitDepth, struct Image *image, boo if (buffer == NULL) FATAL_ERROR("Failed to allocate memory for pixels.\n"); + int metatilesWide = tilesWidth / metatileWidth; + switch (bitDepth) { case 1: - ConvertToTiles1Bpp(image->pixels, buffer, numTiles, tilesWidth, invertColors); + ConvertToTiles1Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors); break; case 4: - ConvertToTiles4Bpp(image->pixels, buffer, numTiles, tilesWidth, invertColors); + ConvertToTiles4Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors); break; case 8: - ConvertToTiles8Bpp(image->pixels, buffer, numTiles, tilesWidth, invertColors); + ConvertToTiles8Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors); break; } diff --git a/tools/gbagfx/gfx.h b/tools/gbagfx/gfx.h index ecd436652..5355ced85 100644 --- a/tools/gbagfx/gfx.h +++ b/tools/gbagfx/gfx.h @@ -27,8 +27,8 @@ struct Image { bool hasTransparency; }; -void ReadImage(char *path, int tilesWidth, int bitDepth, struct Image *image, bool invertColors); -void WriteImage(char *path, int numTiles, int bitDepth, struct Image *image, bool invertColors); +void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors); +void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors); void FreeImage(struct Image *image); void ReadGbaPalette(char *path, struct Palette *palette); void WriteGbaPalette(char *path, struct Palette *palette); diff --git a/tools/gbagfx/main.c b/tools/gbagfx/main.c index 97db60e84..86b0afa53 100644 --- a/tools/gbagfx/main.c +++ b/tools/gbagfx/main.c @@ -5,6 +5,7 @@ #include <stdbool.h> #include "global.h" #include "util.h" +#include "options.h" #include "gfx.h" #include "convert_png.h" #include "jasc_pal.h" @@ -19,13 +20,13 @@ struct CommandHandler void(*function)(char *inputPath, char *outputPath, int argc, char **argv); }; -void ConvertGbaToPng(char *inputPath, char *outputPath, int width, int bitDepth, char *paletteFilePath, bool hasTransparency) +void ConvertGbaToPng(char *inputPath, char *outputPath, struct GbaToPngOptions *options) { struct Image image; - if (paletteFilePath != NULL) + if (options->paletteFilePath != NULL) { - ReadGbaPalette(paletteFilePath, &image.palette); + ReadGbaPalette(options->paletteFilePath, &image.palette); image.hasPalette = true; } else @@ -33,24 +34,24 @@ void ConvertGbaToPng(char *inputPath, char *outputPath, int width, int bitDepth, image.hasPalette = false; } - ReadImage(inputPath, width, bitDepth, &image, !image.hasPalette); + ReadImage(inputPath, options->width, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette); - image.hasTransparency = hasTransparency; + image.hasTransparency = options->hasTransparency; WritePng(outputPath, &image); FreeImage(&image); } -void ConvertPngToGba(char *inputPath, char *outputPath, int numTiles, int bitDepth) +void ConvertPngToGba(char *inputPath, char *outputPath, struct PngToGbaOptions *options) { struct Image image; - image.bitDepth = bitDepth; + image.bitDepth = options->bitDepth; ReadPng(inputPath, &image); - WriteImage(outputPath, numTiles, bitDepth, &image, !image.hasPalette); + WriteImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette); FreeImage(&image); } @@ -58,10 +59,13 @@ void ConvertPngToGba(char *inputPath, char *outputPath, int numTiles, int bitDep void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **argv) { char *inputFileExtension = GetFileExtension(inputPath); - int bitDepth = inputFileExtension[0] - '0'; - char *paletteFilePath = NULL; - bool hasTransparency = false; - int width = 1; + struct GbaToPngOptions options; + options.paletteFilePath = NULL; + options.bitDepth = inputFileExtension[0] - '0'; + options.hasTransparency = false; + options.width = 1; + options.metatileWidth = 1; + options.metatileHeight = 1; for (int i = 3; i < argc; i++) { @@ -74,11 +78,11 @@ void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **a i++; - paletteFilePath = argv[i]; + options.paletteFilePath = argv[i]; } else if (strcmp(option, "-object") == 0) { - hasTransparency = true; + options.hasTransparency = true; } else if (strcmp(option, "-width") == 0) { @@ -87,26 +91,59 @@ void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **a i++; - if (!ParseNumber(argv[i], NULL, 10, &width)) + if (!ParseNumber(argv[i], NULL, 10, &options.width)) FATAL_ERROR("Failed to parse width.\n"); - if (width < 1) + if (options.width < 1) FATAL_ERROR("Width must be positive.\n"); } + else if (strcmp(option, "-mwidth") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No metatile width value following \"-mwidth\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &options.metatileWidth)) + FATAL_ERROR("Failed to parse metatile width.\n"); + + if (options.metatileWidth < 1) + FATAL_ERROR("metatile width must be positive.\n"); + } + else if (strcmp(option, "-mheight") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No metatile height value following \"-mheight\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &options.metatileHeight)) + FATAL_ERROR("Failed to parse metatile height.\n"); + + if (options.metatileHeight < 1) + FATAL_ERROR("metatile height must be positive.\n"); + } else { FATAL_ERROR("Unrecognized option \"%s\".\n", option); } } - ConvertGbaToPng(inputPath, outputPath, width, bitDepth, paletteFilePath, hasTransparency); + if (options.metatileWidth > options.width) + options.width = options.metatileWidth; + + ConvertGbaToPng(inputPath, outputPath, &options); } void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **argv) { char *outputFileExtension = GetFileExtension(outputPath); int bitDepth = outputFileExtension[0] - '0'; - int numTiles = 0; + struct PngToGbaOptions options; + options.numTiles = 0; + options.bitDepth = bitDepth; + options.metatileWidth = 1; + options.metatileHeight = 1; for (int i = 3; i < argc; i++) { @@ -119,19 +156,45 @@ void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **a i++; - if (!ParseNumber(argv[i], NULL, 10, &numTiles)) + if (!ParseNumber(argv[i], NULL, 10, &options.numTiles)) FATAL_ERROR("Failed to parse number of tiles.\n"); - if (numTiles < 1) + if (options.numTiles < 1) FATAL_ERROR("Number of tiles must be positive.\n"); } + else if (strcmp(option, "-mwidth") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No metatile width value following \"-mwidth\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &options.metatileWidth)) + FATAL_ERROR("Failed to parse metatile width.\n"); + + if (options.metatileWidth < 1) + FATAL_ERROR("metatile width must be positive.\n"); + } + else if (strcmp(option, "-mheight") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No metatile height value following \"-mheight\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &options.metatileHeight)) + FATAL_ERROR("Failed to parse metatile height.\n"); + + if (options.metatileHeight < 1) + FATAL_ERROR("metatile height must be positive.\n"); + } else { FATAL_ERROR("Unrecognized option \"%s\".\n", option); } } - ConvertPngToGba(inputPath, outputPath, numTiles, bitDepth); + ConvertPngToGba(inputPath, outputPath, &options); } void HandlePngToGbaPaletteCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) diff --git a/tools/gbagfx/options.h b/tools/gbagfx/options.h new file mode 100755 index 000000000..2ff3967a4 --- /dev/null +++ b/tools/gbagfx/options.h @@ -0,0 +1,24 @@ +// Copyright (c) 2018 huderlem + +#ifndef OPTIONS_H +#define OPTIONS_H + +#include <stdbool.h> + +struct GbaToPngOptions { + char *paletteFilePath; + int bitDepth; + bool hasTransparency; + int width; + int metatileWidth; + int metatileHeight; +}; + +struct PngToGbaOptions { + int numTiles; + int bitDepth; + int metatileWidth; + int metatileHeight; +}; + +#endif // OPTIONS_H diff --git a/tools/mid2agb/main.cpp b/tools/mid2agb/main.cpp index 9b883fba5..03feabdd8 100644 --- a/tools/mid2agb/main.cpp +++ b/tools/mid2agb/main.cpp @@ -50,7 +50,8 @@ bool g_compressionEnabled = true; " input_file filename(.mid) of MIDI file\n" " output_file filename(.s) for AGB file (default:input_file)\n" "\n" - "options -V??? master volume (default:127)\n" + "options -L??? label for assembler (default:output_file)\n" + " -V??? master volume (default:127)\n" " -G??? voice group number (default:0)\n" " -P??? priority (default:0)\n" " -R??? reverb (default:off)\n" @@ -85,57 +86,45 @@ static std::string GetExtension(std::string s) return ""; } -struct Option +static std::string BaseName(std::string s) { - char letter = 0; - const char *arg = NULL; -}; + std::size_t posAfterSlash = s.find_last_of("/\\"); -static Option ParseOption(int& index, const int argc, char** argv) -{ - static std::set<char> optionsWithArg = { 'L', 'V', 'G', 'P', 'R' }; - static std::set<char> optionsWithoutArg = { 'X', 'E', 'N' }; - - assert(index >= 0 && index < argc); - - const char *opt = argv[index]; + if (posAfterSlash == std::string::npos) + posAfterSlash = 0; + else + posAfterSlash++; - assert(opt[0] == '-'); - assert(std::strlen(opt) == 2); + std::size_t dotPos = s.find_first_of('.', posAfterSlash); + if (dotPos > posAfterSlash && dotPos != std::string::npos) + s = s.substr(posAfterSlash, dotPos - posAfterSlash); - char letter = std::toupper(opt[1]); - - bool isOption = false; - bool hasArg = false; + return s; +} - if (optionsWithArg.count(letter) != 0) - { - isOption = true; - hasArg = true; - } - else if (optionsWithoutArg.count(letter) != 0) - { - isOption = true; - } +static const char *GetArgument(int argc, char **argv, int& index) +{ + assert(index >= 0 && index < argc); - if (!isOption) - PrintUsage(); + const char *option = argv[index]; - Option retVal; + assert(option != nullptr); + assert(option[0] == '-'); - retVal.letter = letter; + // If there is text following the letter, return that. + if (std::strlen(option) >= 3) + return option + 2; - if (hasArg) + // Otherwise, try to get the next arg. + if (index + 1 < argc) { index++; - - if (index >= argc) - RaiseError("missing argument for \"-%c\"", letter); - - retVal.arg = argv[index]; + return argv[index]; + } + else + { + return nullptr; } - - return retVal; } int main(int argc, char** argv) @@ -145,51 +134,60 @@ int main(int argc, char** argv) for (int i = 1; i < argc; i++) { - if (argv[i][0] == '-' && std::strlen(argv[i]) == 2) + const char *option = argv[i]; + + if (option[0] == '-' && option[1] != '\0') { - Option option = ParseOption(i, argc, argv); + const char *arg = GetArgument(argc, argv, i); - switch (option.letter) + switch (std::toupper(option[1])) { case 'E': g_exactGateTime = true; break; case 'G': - g_voiceGroup = std::stoi(option.arg); + if (arg == nullptr) + PrintUsage(); + g_voiceGroup = std::stoi(arg); break; case 'L': - g_asmLabel = option.arg; + if (arg == nullptr) + PrintUsage(); + g_asmLabel = std::stoi(arg); break; case 'N': g_compressionEnabled = false; break; case 'P': - g_priority = std::stoi(option.arg); + if (arg == nullptr) + PrintUsage(); + g_priority = std::stoi(arg); break; case 'R': - g_reverb = std::stoi(option.arg); + if (arg == nullptr) + PrintUsage(); + g_reverb = std::stoi(arg); break; case 'V': - g_masterVolume = std::stoi(option.arg); + if (arg == nullptr) + PrintUsage(); + g_masterVolume = std::stoi(arg); break; case 'X': g_clocksPerBeat = 2; break; + default: + PrintUsage(); } } else { - switch (i) - { - case 1: + if (inputFilename.empty()) inputFilename = argv[i]; - break; - case 2: + else if (outputFilename.empty()) outputFilename = argv[i]; - break; - default: + else PrintUsage(); - } } } @@ -206,7 +204,7 @@ int main(int argc, char** argv) RaiseError("output filename extension is not \"s\""); if (g_asmLabel.empty()) - g_asmLabel = StripExtension(outputFilename); + g_asmLabel = BaseName(outputFilename); g_inputFile = std::fopen(inputFilename.c_str(), "rb"); diff --git a/tools/mid2agb/midi.cpp b/tools/mid2agb/midi.cpp index ba5dd654a..09480e139 100644 --- a/tools/mid2agb/midi.cpp +++ b/tools/mid2agb/midi.cpp @@ -52,6 +52,7 @@ static std::int32_t s_absoluteTime; static int s_blockCount = 0; static int s_minNote; static int s_maxNote; +static int s_runningStatus; void Seek(long offset) { @@ -170,6 +171,7 @@ void StartTrack() { Seek(s_trackDataStart); s_absoluteTime = 0; + s_runningStatus = 0; } void SkipEventData() @@ -181,15 +183,24 @@ void DetermineEventCategory(MidiEventCategory& category, int& typeChan, int& siz { typeChan = ReadInt8(); + if (typeChan < 0x80) + { + // If data byte was found, use the running status. + ungetc(typeChan, g_inputFile); + typeChan = s_runningStatus; + } + if (typeChan == 0xFF) { category = MidiEventCategory::Meta; size = 0; + s_runningStatus = 0; } else if (typeChan >= 0xF0) { category = MidiEventCategory::SysEx; size = 0; + s_runningStatus = 0; } else if (typeChan >= 0x80) { @@ -205,6 +216,7 @@ void DetermineEventCategory(MidiEventCategory& category, int& typeChan, int& siz size = 2; break; } + s_runningStatus = typeChan; } else { @@ -421,7 +433,10 @@ bool CheckNoteEnd(Event& event) void FindNoteEnd(Event& event) { + // Save the current file position and running status + // which get modified by CheckNoteEnd. long startPos = ftell(g_inputFile); + int savedRunningStatus = s_runningStatus; event.param2 = 0; @@ -429,6 +444,7 @@ void FindNoteEnd(Event& event) ; Seek(startPos); + s_runningStatus = savedRunningStatus; } bool ReadTrackEvent(Event& event) diff --git a/tools/preproc/c_file.cpp b/tools/preproc/c_file.cpp index 2f4bfea7c..229f568fa 100644 --- a/tools/preproc/c_file.cpp +++ b/tools/preproc/c_file.cpp @@ -325,66 +325,74 @@ void CFile::TryConvertIncbin() m_pos++; - SkipWhitespace(); + std::printf("{"); - if (m_buffer[m_pos] != '"') - RaiseError("expected double quote"); + while (true) + { + SkipWhitespace(); - m_pos++; + if (m_buffer[m_pos] != '"') + RaiseError("expected double quote"); - int startPos = m_pos; + m_pos++; - while (m_buffer[m_pos] != '"') - { - if (m_buffer[m_pos] == 0) - { - if (m_pos >= m_size) - RaiseError("unexpected EOF in path string"); - else - RaiseError("unexpected null character in path string"); - } + int startPos = m_pos; - if (m_buffer[m_pos] == '\r' || m_buffer[m_pos] == '\n') - RaiseError("unexpected end of line character in path string"); + while (m_buffer[m_pos] != '"') + { + if (m_buffer[m_pos] == 0) + { + if (m_pos >= m_size) + RaiseError("unexpected EOF in path string"); + else + RaiseError("unexpected null character in path string"); + } - if (m_buffer[m_pos] == '\\') - RaiseError("unexpected escape in path string"); - - m_pos++; - } + if (m_buffer[m_pos] == '\r' || m_buffer[m_pos] == '\n') + RaiseError("unexpected end of line character in path string"); - std::string path(&m_buffer[startPos], m_pos - startPos); + if (m_buffer[m_pos] == '\\') + RaiseError("unexpected escape in path string"); + + m_pos++; + } - m_pos++; + std::string path(&m_buffer[startPos], m_pos - startPos); - SkipWhitespace(); + m_pos++; - if (m_buffer[m_pos] != ')') - RaiseError("expected ')'"); + int fileSize; + std::unique_ptr<unsigned char[]> buffer = ReadWholeFile(path, fileSize); - m_pos++; + if ((fileSize % size) != 0) + RaiseError("Size %d doesn't evenly divide file size %d.\n", size, fileSize); - std::printf("{"); + int count = fileSize / size; + int offset = 0; - int fileSize; - std::unique_ptr<unsigned char[]> buffer = ReadWholeFile(path, fileSize); + for (int i = 0; i < count; i++) + { + int data = ExtractData(buffer, offset, size); + offset += size; - if ((fileSize % size) != 0) - RaiseError("Size %d doesn't evenly divide file size %d.\n", size, fileSize); + if (isSigned) + std::printf("%d,", data); + else + std::printf("%uu,", data); + } - int count = fileSize / size; - int offset = 0; + SkipWhitespace(); - for (int i = 0; i < count; i++) - { - int data = ExtractData(buffer, offset, size); - offset += size; + if (m_buffer[m_pos] != ',') + break; - if (isSigned) - std::printf("%d,", data); - else - std::printf("%uu,", data); + m_pos++; } + + if (m_buffer[m_pos] != ')') + RaiseError("expected ')'"); + + m_pos++; std::printf("}"); } diff --git a/tools/scaninc/c_file.cpp b/tools/scaninc/c_file.cpp index f7acc833f..d470f959d 100644 --- a/tools/scaninc/c_file.cpp +++ b/tools/scaninc/c_file.cpp @@ -244,18 +244,27 @@ void CFile::CheckIncbin() m_pos++; - SkipWhitespace(); + while (true) + { + SkipWhitespace(); - std::string path = ReadPath(); + std::string path = ReadPath(); - SkipWhitespace(); + SkipWhitespace(); + + m_incbins.emplace(path); + + if (m_buffer[m_pos] != ',') + break; + + m_pos++; + } if (m_buffer[m_pos] != ')') FATAL_INPUT_ERROR("expected ')'"); m_pos++; - m_incbins.emplace(path); } std::string CFile::ReadPath() |
