diff --git a/asm/code.s b/asm/code_08018500.s similarity index 98% rename from asm/code.s rename to asm/code_08018500.s index 72d27260..c0f46922 100644 --- a/asm/code.s +++ b/asm/code_08018500.s @@ -10651,126 +10651,3 @@ sub_0801D5D4: @ 0x0801D5D4 ands r0, r2 bx lr - thumb_func_start sub_0801D5EC -sub_0801D5EC: @ 0x0801D5EC - sub sp, #4 - mov r3, sp - strh r0, [r3] - ldr r3, _0801D60C @ =0x040000D4 - mov r0, sp - str r0, [r3] - str r1, [r3, #4] - lsrs r2, r2, #1 - movs r0, #0x81 - lsls r0, r0, #0x18 - orrs r2, r0 - str r2, [r3, #8] - ldr r0, [r3, #8] - add sp, #4 - bx lr - .align 2, 0 -_0801D60C: .4byte 0x040000D4 - - thumb_func_start sub_0801D610 -sub_0801D610: @ 0x0801D610 - sub sp, #4 - str r0, [sp] - ldr r3, _0801D62C @ =0x040000D4 - mov r0, sp - str r0, [r3] - str r1, [r3, #4] - lsrs r2, r2, #2 - movs r0, #0x85 - lsls r0, r0, #0x18 - orrs r2, r0 - str r2, [r3, #8] - ldr r0, [r3, #8] - add sp, #4 - bx lr - .align 2, 0 -_0801D62C: .4byte 0x040000D4 - - thumb_func_start sub_0801D630 -sub_0801D630: @ 0x0801D630 - push {r4, lr} - adds r3, r0, #0 - adds r2, r1, #0 - movs r4, #0 - adds r1, r3, #0 - orrs r1, r2 - movs r0, #3 - ands r1, r0 - cmp r1, #0 - beq _0801D64A - cmp r1, #2 - beq _0801D654 - b _0801D65E -_0801D64A: - movs r0, #0 - adds r1, r3, #0 - bl sub_0801D610 - b _0801D668 -_0801D654: - movs r0, #0 - adds r1, r3, #0 - bl sub_0801D5EC - b _0801D668 -_0801D65E: - strb r4, [r3] - adds r3, #1 - subs r2, #1 - cmp r2, #0 - bne _0801D65E -_0801D668: - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0801D66C -sub_0801D66C: @ 0x0801D66C - push {r4, lr} - adds r3, r0, #0 - adds r4, r2, #0 - adds r2, r3, #0 - orrs r2, r1 - orrs r2, r4 - movs r0, #3 - ands r2, r0 - cmp r2, #0 - beq _0801D686 - cmp r2, #2 - beq _0801D698 - b _0801D6B0 -_0801D686: - ldr r2, _0801D694 @ =0x040000D4 - str r3, [r2] - str r1, [r2, #4] - lsrs r0, r4, #2 - movs r1, #0x84 - lsls r1, r1, #0x18 - b _0801D6A4 - .align 2, 0 -_0801D694: .4byte 0x040000D4 -_0801D698: - ldr r2, _0801D6AC @ =0x040000D4 - str r3, [r2] - str r1, [r2, #4] - lsrs r0, r4, #1 - movs r1, #0x80 - lsls r1, r1, #0x18 -_0801D6A4: - orrs r0, r1 - str r0, [r2, #8] - ldr r0, [r2, #8] - b _0801D6BE - .align 2, 0 -_0801D6AC: .4byte 0x040000D4 -_0801D6B0: - ldrb r0, [r3] - strb r0, [r1] - adds r3, #1 - adds r1, #1 - subs r4, #1 - cmp r4, #0 - bne _0801D6B0 -_0801D6BE: - pop {r4, pc} \ No newline at end of file diff --git a/asm/code_08052620.s b/asm/code_08052620.s index 7e4b34d4..58ab56f0 100644 --- a/asm/code_08052620.s +++ b/asm/code_08052620.s @@ -7252,53 +7252,3 @@ _08055E02: pop {pc} .align 2, 0 _08055E04: .4byte gUnk_02000080 - - thumb_func_start sub_08055E08 -sub_08055E08: @ 0x08055E08 - push {lr} - ldr r1, _08055E1C @ =gUnk_080FF420 - ldr r0, _08055E20 @ =gUnk_02000080 - ldrb r0, [r0, #6] - lsls r0, r0, #2 - adds r0, r0, r1 - ldr r0, [r0] - bl _call_via_r0 - pop {pc} - .align 2, 0 -_08055E1C: .4byte gUnk_080FF420 -_08055E20: .4byte gUnk_02000080 - - thumb_func_start sub_08055E24 -sub_08055E24: @ 0x08055E24 - push {r4, lr} - ldr r4, _08055E5C @ =gUnk_02000080 - ldrb r0, [r4, #6] - adds r0, #1 - strb r0, [r4, #6] - ldr r1, _08055E60 @ =gUnk_02000070 - movs r0, #1 - strb r0, [r1] - ldr r1, [r4, #0xc] - ldrb r0, [r1, #2] - ldrb r1, [r1, #3] - bl sub_0804B0B0 - ldr r0, _08055E64 @ =gUnk_080FF400 - bl LoadRoomEntityList - ldrb r0, [r4, #4] - movs r1, #0 - movs r2, #0 - movs r3, #0 - bl sub_08055B70 - movs r0, #4 - movs r1, #0x10 - bl sub_08050054 - pop {r4, pc} - .align 2, 0 -_08055E5C: .4byte gUnk_02000080 -_08055E60: .4byte gUnk_02000070 -_08055E64: .4byte gUnk_080FF400 - - thumb_func_start nullsub_493 -nullsub_493: @ 0x08055E68 - bx lr - .align 2, 0 \ No newline at end of file diff --git a/asm/code_08055FF4.s b/asm/code_08055FF4.s index 83308d98..ebe03d7a 100644 --- a/asm/code_08055FF4.s +++ b/asm/code_08055FF4.s @@ -17074,408 +17074,4 @@ _0805E386: .align 2, 0 _0805E394: .4byte gUnk_030010A0 _0805E398: .4byte gUnk_081091F8 -_0805E39C: .4byte gUnk_081091EE - - thumb_func_start sub_0805E3A0 -sub_0805E3A0: @ 0x0805E3A0 - movs r3, #0xf - adds r2, r1, #0 - ands r2, r3 - lsls r1, r1, #4 - orrs r1, r2 - strb r1, [r0, #0x11] - bx lr - .align 2, 0 - - thumb_func_start sub_0805E3B0 -sub_0805E3B0: @ 0x0805E3B0 - push {lr} - adds r3, r0, #0 - ldrb r1, [r3, #0x10] - movs r0, #0x10 - ands r0, r1 - cmp r0, #0 - beq _0805E3C2 - movs r0, #1 - b _0805E404 -_0805E3C2: - ldrb r0, [r3, #0xc] - cmp r0, #0 - bne _0805E3CC - movs r0, #0 - b _0805E404 -_0805E3CC: - ldr r1, _0805E3DC @ =gUnk_03003DC0 - ldrb r0, [r1] - ldrb r2, [r1, #1] - cmp r0, r2 - bls _0805E3E0 - adds r2, r0, #0 - b _0805E3E2 - .align 2, 0 -_0805E3DC: .4byte gUnk_03003DC0 -_0805E3E0: - ldrb r2, [r1, #1] -_0805E3E2: - ldr r0, _0805E408 @ =gUnk_02000050 - ldrb r1, [r0] - movs r0, #0x7f - ands r0, r1 - cmp r0, #0 - beq _0805E3F4 - cmp r2, #2 - bhs _0805E3F4 - movs r2, #2 -_0805E3F4: - movs r1, #0 - ldrb r0, [r3, #0x11] - lsls r0, r0, #0x1c - lsrs r0, r0, #0x1c - cmp r2, r0 - bls _0805E402 - movs r1, #1 -_0805E402: - adds r0, r1, #0 -_0805E404: - pop {pc} - .align 2, 0 -_0805E408: .4byte gUnk_02000050 - - thumb_func_start sub_0805E40C -sub_0805E40C: @ 0x0805E40C - push {lr} - ldr r1, _0805E424 @ =gUnk_03003DC0 - ldrb r0, [r1] - ldrb r2, [r1, #1] - cmp r0, r2 - bhi _0805E41A - ldrb r0, [r1, #1] -_0805E41A: - cmp r0, #0 - beq _0805E420 - movs r0, #1 -_0805E420: - pop {pc} - .align 2, 0 -_0805E424: .4byte gUnk_03003DC0 - - thumb_func_start sub_0805E428 -sub_0805E428: @ 0x0805E428 - push {lr} - bl sub_0805E524 - ldr r2, _0805E440 @ =gUnk_03003DC0 - ldrb r3, [r2, #2] - adds r1, r3, #0 - cmp r1, #0 - beq _0805E444 - movs r0, #0 - strb r3, [r2, #1] - strb r0, [r2, #2] - b _0805E44E - .align 2, 0 -_0805E440: .4byte gUnk_03003DC0 -_0805E444: - ldrb r0, [r2, #3] - cmp r0, #0 - beq _0805E44E - strb r1, [r2, #3] - strb r1, [r2, #1] -_0805E44E: - pop {pc} - - thumb_func_start sub_0805E450 -sub_0805E450: @ 0x0805E450 - push {lr} - ldr r1, _0805E464 @ =gUnk_03003DC0 - ldrb r2, [r1, #2] - cmp r0, r2 - blo _0805E460 - ldrb r2, [r1, #1] - cmp r0, r2 - bhs _0805E468 -_0805E460: - movs r0, #0 - b _0805E46C - .align 2, 0 -_0805E464: .4byte gUnk_03003DC0 -_0805E468: - strb r0, [r1, #2] - movs r0, #1 -_0805E46C: - pop {pc} - .align 2, 0 - - thumb_func_start sub_0805E470 -sub_0805E470: @ 0x0805E470 - ldr r1, _0805E478 @ =gUnk_03003DC0 - movs r0, #1 - strb r0, [r1, #3] - bx lr - .align 2, 0 -_0805E478: .4byte gUnk_03003DC0 - - thumb_func_start sub_0805E47C -sub_0805E47C: @ 0x0805E47C - push {r4, lr} - adds r4, r0, #0 - ldrb r0, [r4, #0x11] - lsls r0, r0, #0x1c - lsrs r0, r0, #0x18 - movs r1, #2 - orrs r0, r1 - strb r0, [r4, #0x11] - movs r0, #2 - bl sub_0805E450 - cmp r0, #0 - beq _0805E49A - ldr r0, _0805E49C @ =gUnk_03003DC0 - str r4, [r0, #4] -_0805E49A: - pop {r4, pc} - .align 2, 0 -_0805E49C: .4byte gUnk_03003DC0 - - thumb_func_start sub_0805E4A0 -sub_0805E4A0: @ 0x0805E4A0 - push {r4, lr} - adds r4, r0, #0 - movs r0, #1 - bl sub_08078A90 - ldrb r0, [r4, #0x11] - lsls r0, r0, #0x1c - lsrs r0, r0, #0x18 - movs r1, #3 - orrs r0, r1 - strb r0, [r4, #0x11] - movs r0, #1 - bl sub_0805E450 - cmp r0, #0 - beq _0805E4C4 - ldr r0, _0805E4C8 @ =gUnk_03003DC0 - str r4, [r0, #4] -_0805E4C4: - pop {r4, pc} - .align 2, 0 -_0805E4C8: .4byte gUnk_03003DC0 - - thumb_func_start sub_0805E4CC -sub_0805E4CC: @ 0x0805E4CC - push {r4, lr} - adds r4, r0, #0 - movs r0, #0 - bl sub_08078A90 - adds r0, r4, #0 - bl sub_0805E584 - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0805E4E0 -sub_0805E4E0: @ 0x0805E4E0 - push {r4, r5, lr} - adds r4, r0, #0 - adds r5, r1, #0 - cmp r4, #0 - beq _0805E4F6 - ldrb r0, [r4, #0x11] - lsls r0, r0, #0x1c - lsrs r0, r0, #0x18 - movs r1, #3 - orrs r0, r1 - strb r0, [r4, #0x11] -_0805E4F6: - movs r0, #1 - bl sub_0805E450 - cmp r0, #0 - beq _0805E504 - ldr r0, _0805E50C @ =gUnk_03003DC0 - str r4, [r0, #4] -_0805E504: - adds r0, r5, #0 - bl sub_0805E510 - pop {r4, r5, pc} - .align 2, 0 -_0805E50C: .4byte gUnk_03003DC0 - - thumb_func_start sub_0805E510 -sub_0805E510: @ 0x0805E510 - push {lr} - adds r1, r0, #0 - ldr r2, _0805E520 @ =gUnk_03003DC0 - ldrh r0, [r2, #8] - cmp r0, r1 - bhs _0805E51E - strh r1, [r2, #8] -_0805E51E: - pop {pc} - .align 2, 0 -_0805E520: .4byte gUnk_03003DC0 - - thumb_func_start sub_0805E524 -sub_0805E524: @ 0x0805E524 - push {lr} - ldr r1, _0805E540 @ =gUnk_03003DC0 - ldrh r0, [r1, #8] - cmp r0, #0 - beq _0805E53C - subs r0, #1 - strh r0, [r1, #8] - lsls r0, r0, #0x10 - cmp r0, #0 - bne _0805E53C - bl sub_0805E470 -_0805E53C: - pop {pc} - .align 2, 0 -_0805E540: .4byte gUnk_03003DC0 - - thumb_func_start sub_0805E544 -sub_0805E544: @ 0x0805E544 - ldr r1, _0805E55C @ =gUnk_03003DC0 - movs r3, #6 - movs r0, #6 - strb r0, [r1] - ldr r2, _0805E560 @ =gLinkEntity - ldrb r1, [r2, #0x11] - subs r0, #0x16 - ands r0, r1 - orrs r0, r3 - strb r0, [r2, #0x11] - bx lr - .align 2, 0 -_0805E55C: .4byte gUnk_03003DC0 -_0805E560: .4byte gLinkEntity - - thumb_func_start sub_0805E564 -sub_0805E564: @ 0x0805E564 - ldr r1, _0805E57C @ =gUnk_03003DC0 - movs r0, #0 - strb r0, [r1] - ldr r2, _0805E580 @ =gLinkEntity - ldrb r1, [r2, #0x11] - subs r0, #0x10 - ands r0, r1 - movs r1, #1 - orrs r0, r1 - strb r0, [r2, #0x11] - bx lr - .align 2, 0 -_0805E57C: .4byte gUnk_03003DC0 -_0805E580: .4byte gLinkEntity - - thumb_func_start sub_0805E584 -sub_0805E584: @ 0x0805E584 - push {lr} - ldrb r2, [r0, #0x11] - lsrs r3, r2, #4 - movs r1, #0x10 - rsbs r1, r1, #0 - ands r1, r2 - orrs r1, r3 - strb r1, [r0, #0x11] - bl sub_0805E470 - pop {pc} - .align 2, 0 - - thumb_func_start sub_0805E59C -sub_0805E59C: @ 0x0805E59C - ldr r1, _0805E5A4 @ =gUnk_03003DC0 - movs r0, #6 - strb r0, [r1] - bx lr - .align 2, 0 -_0805E5A4: .4byte gUnk_03003DC0 - - thumb_func_start sub_0805E5A8 -sub_0805E5A8: @ 0x0805E5A8 - ldr r1, _0805E5B0 @ =gUnk_03003DC0 - movs r0, #7 - strb r0, [r1] - bx lr - .align 2, 0 -_0805E5B0: .4byte gUnk_03003DC0 - - thumb_func_start sub_0805E5B4 -sub_0805E5B4: @ 0x0805E5B4 - ldr r1, _0805E5BC @ =gUnk_03003DC0 - movs r0, #0 - strb r0, [r1] - bx lr - .align 2, 0 -_0805E5BC: .4byte gUnk_03003DC0 - - thumb_func_start sub_0805E5C0 -sub_0805E5C0: @ 0x0805E5C0 - push {lr} - ldr r0, _0805E5F0 @ =gUnk_02034350 - ldrb r1, [r0, #4] - movs r2, #0 - strb r1, [r0, #5] - strb r2, [r0, #4] - bl sub_0805ED30 - bl sub_0805E428 - bl sub_080175E8 - bl sub_0806F0A4 - ldr r1, _0805E5F4 @ =gUnk_03005F40 - movs r0, #0 - bl _call_via_r1 - bl sub_0805E84C - bl sub_0805EE88 - pop {pc} - .align 2, 0 -_0805E5F0: .4byte gUnk_02034350 -_0805E5F4: .4byte gUnk_03005F40 - - thumb_func_start sub_0805E5F8 -sub_0805E5F8: @ 0x0805E5F8 - push {lr} - ldr r1, _0805E608 @ =gUnk_03005F40 - movs r0, #1 - bl _call_via_r1 - bl sub_0805E84C - pop {pc} - .align 2, 0 -_0805E608: .4byte gUnk_03005F40 - - thumb_func_start sub_0805E60C -sub_0805E60C: @ 0x0805E60C - push {lr} - bl sub_0805E89C - ldr r0, _0805E654 @ =gUnk_03003DC0 - movs r1, #0xc - bl sub_0801D630 - ldr r0, _0805E658 @ =gLinkEntity - movs r1, #0xaa - lsls r1, r1, #6 - bl sub_0801D630 - ldr r0, _0805E65C @ =gUnk_02033290 - movs r1, #0x80 - lsls r1, r1, #4 - bl sub_0801D630 - bl sub_0805E98C - ldr r0, _0805E660 @ =gUnk_03003DBC - movs r1, #0 - strb r1, [r0] - ldr r0, _0805E664 @ =gUnk_020354B4 - strb r1, [r0] - ldr r1, _0805E668 @ =gUnk_03000000 - ldr r2, _0805E66C @ =0x00000427 - adds r0, r1, r2 - movs r2, #1 - strb r2, [r0] - ldr r3, _0805E670 @ =0x00000426 - adds r0, r1, r3 - strb r2, [r0] - ldr r0, _0805E674 @ =0x0000042E - adds r1, r1, r0 - strb r2, [r1] - pop {pc} - .align 2, 0 -_0805E654: .4byte gUnk_03003DC0 -_0805E658: .4byte gLinkEntity -_0805E65C: .4byte gUnk_02033290 -_0805E660: .4byte gUnk_03003DBC -_0805E664: .4byte gUnk_020354B4 -_0805E668: .4byte gUnk_03000000 -_0805E66C: .4byte 0x00000427 -_0805E670: .4byte 0x00000426 -_0805E674: .4byte 0x0000042E +_0805E39C: .4byte gUnk_081091EE \ No newline at end of file diff --git a/asm/code_0805E3B0.s b/asm/code_0805E3B0.s new file mode 100644 index 00000000..86b15413 --- /dev/null +++ b/asm/code_0805E3B0.s @@ -0,0 +1,399 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text + + thumb_func_start sub_0805E3B0 +sub_0805E3B0: @ 0x0805E3B0 + push {lr} + adds r3, r0, #0 + ldrb r1, [r3, #0x10] + movs r0, #0x10 + ands r0, r1 + cmp r0, #0 + beq _0805E3C2 + movs r0, #1 + b _0805E404 +_0805E3C2: + ldrb r0, [r3, #0xc] + cmp r0, #0 + bne _0805E3CC + movs r0, #0 + b _0805E404 +_0805E3CC: + ldr r1, _0805E3DC @ =gUnk_03003DC0 + ldrb r0, [r1] + ldrb r2, [r1, #1] + cmp r0, r2 + bls _0805E3E0 + adds r2, r0, #0 + b _0805E3E2 + .align 2, 0 +_0805E3DC: .4byte gUnk_03003DC0 +_0805E3E0: + ldrb r2, [r1, #1] +_0805E3E2: + ldr r0, _0805E408 @ =gUnk_02000050 + ldrb r1, [r0] + movs r0, #0x7f + ands r0, r1 + cmp r0, #0 + beq _0805E3F4 + cmp r2, #2 + bhs _0805E3F4 + movs r2, #2 +_0805E3F4: + movs r1, #0 + ldrb r0, [r3, #0x11] + lsls r0, r0, #0x1c + lsrs r0, r0, #0x1c + cmp r2, r0 + bls _0805E402 + movs r1, #1 +_0805E402: + adds r0, r1, #0 +_0805E404: + pop {pc} + .align 2, 0 +_0805E408: .4byte gUnk_02000050 + + thumb_func_start sub_0805E40C +sub_0805E40C: @ 0x0805E40C + push {lr} + ldr r1, _0805E424 @ =gUnk_03003DC0 + ldrb r0, [r1] + ldrb r2, [r1, #1] + cmp r0, r2 + bhi _0805E41A + ldrb r0, [r1, #1] +_0805E41A: + cmp r0, #0 + beq _0805E420 + movs r0, #1 +_0805E420: + pop {pc} + .align 2, 0 +_0805E424: .4byte gUnk_03003DC0 + + thumb_func_start sub_0805E428 +sub_0805E428: @ 0x0805E428 + push {lr} + bl sub_0805E524 + ldr r2, _0805E440 @ =gUnk_03003DC0 + ldrb r3, [r2, #2] + adds r1, r3, #0 + cmp r1, #0 + beq _0805E444 + movs r0, #0 + strb r3, [r2, #1] + strb r0, [r2, #2] + b _0805E44E + .align 2, 0 +_0805E440: .4byte gUnk_03003DC0 +_0805E444: + ldrb r0, [r2, #3] + cmp r0, #0 + beq _0805E44E + strb r1, [r2, #3] + strb r1, [r2, #1] +_0805E44E: + pop {pc} + + thumb_func_start sub_0805E450 +sub_0805E450: @ 0x0805E450 + push {lr} + ldr r1, _0805E464 @ =gUnk_03003DC0 + ldrb r2, [r1, #2] + cmp r0, r2 + blo _0805E460 + ldrb r2, [r1, #1] + cmp r0, r2 + bhs _0805E468 +_0805E460: + movs r0, #0 + b _0805E46C + .align 2, 0 +_0805E464: .4byte gUnk_03003DC0 +_0805E468: + strb r0, [r1, #2] + movs r0, #1 +_0805E46C: + pop {pc} + .align 2, 0 + + thumb_func_start sub_0805E470 +sub_0805E470: @ 0x0805E470 + ldr r1, _0805E478 @ =gUnk_03003DC0 + movs r0, #1 + strb r0, [r1, #3] + bx lr + .align 2, 0 +_0805E478: .4byte gUnk_03003DC0 + + thumb_func_start sub_0805E47C +sub_0805E47C: @ 0x0805E47C + push {r4, lr} + adds r4, r0, #0 + ldrb r0, [r4, #0x11] + lsls r0, r0, #0x1c + lsrs r0, r0, #0x18 + movs r1, #2 + orrs r0, r1 + strb r0, [r4, #0x11] + movs r0, #2 + bl sub_0805E450 + cmp r0, #0 + beq _0805E49A + ldr r0, _0805E49C @ =gUnk_03003DC0 + str r4, [r0, #4] +_0805E49A: + pop {r4, pc} + .align 2, 0 +_0805E49C: .4byte gUnk_03003DC0 + + thumb_func_start sub_0805E4A0 +sub_0805E4A0: @ 0x0805E4A0 + push {r4, lr} + adds r4, r0, #0 + movs r0, #1 + bl sub_08078A90 + ldrb r0, [r4, #0x11] + lsls r0, r0, #0x1c + lsrs r0, r0, #0x18 + movs r1, #3 + orrs r0, r1 + strb r0, [r4, #0x11] + movs r0, #1 + bl sub_0805E450 + cmp r0, #0 + beq _0805E4C4 + ldr r0, _0805E4C8 @ =gUnk_03003DC0 + str r4, [r0, #4] +_0805E4C4: + pop {r4, pc} + .align 2, 0 +_0805E4C8: .4byte gUnk_03003DC0 + + thumb_func_start sub_0805E4CC +sub_0805E4CC: @ 0x0805E4CC + push {r4, lr} + adds r4, r0, #0 + movs r0, #0 + bl sub_08078A90 + adds r0, r4, #0 + bl sub_0805E584 + pop {r4, pc} + .align 2, 0 + + thumb_func_start sub_0805E4E0 +sub_0805E4E0: @ 0x0805E4E0 + push {r4, r5, lr} + adds r4, r0, #0 + adds r5, r1, #0 + cmp r4, #0 + beq _0805E4F6 + ldrb r0, [r4, #0x11] + lsls r0, r0, #0x1c + lsrs r0, r0, #0x18 + movs r1, #3 + orrs r0, r1 + strb r0, [r4, #0x11] +_0805E4F6: + movs r0, #1 + bl sub_0805E450 + cmp r0, #0 + beq _0805E504 + ldr r0, _0805E50C @ =gUnk_03003DC0 + str r4, [r0, #4] +_0805E504: + adds r0, r5, #0 + bl sub_0805E510 + pop {r4, r5, pc} + .align 2, 0 +_0805E50C: .4byte gUnk_03003DC0 + + thumb_func_start sub_0805E510 +sub_0805E510: @ 0x0805E510 + push {lr} + adds r1, r0, #0 + ldr r2, _0805E520 @ =gUnk_03003DC0 + ldrh r0, [r2, #8] + cmp r0, r1 + bhs _0805E51E + strh r1, [r2, #8] +_0805E51E: + pop {pc} + .align 2, 0 +_0805E520: .4byte gUnk_03003DC0 + + thumb_func_start sub_0805E524 +sub_0805E524: @ 0x0805E524 + push {lr} + ldr r1, _0805E540 @ =gUnk_03003DC0 + ldrh r0, [r1, #8] + cmp r0, #0 + beq _0805E53C + subs r0, #1 + strh r0, [r1, #8] + lsls r0, r0, #0x10 + cmp r0, #0 + bne _0805E53C + bl sub_0805E470 +_0805E53C: + pop {pc} + .align 2, 0 +_0805E540: .4byte gUnk_03003DC0 + + thumb_func_start sub_0805E544 +sub_0805E544: @ 0x0805E544 + ldr r1, _0805E55C @ =gUnk_03003DC0 + movs r3, #6 + movs r0, #6 + strb r0, [r1] + ldr r2, _0805E560 @ =gLinkEntity + ldrb r1, [r2, #0x11] + subs r0, #0x16 + ands r0, r1 + orrs r0, r3 + strb r0, [r2, #0x11] + bx lr + .align 2, 0 +_0805E55C: .4byte gUnk_03003DC0 +_0805E560: .4byte gLinkEntity + + thumb_func_start sub_0805E564 +sub_0805E564: @ 0x0805E564 + ldr r1, _0805E57C @ =gUnk_03003DC0 + movs r0, #0 + strb r0, [r1] + ldr r2, _0805E580 @ =gLinkEntity + ldrb r1, [r2, #0x11] + subs r0, #0x10 + ands r0, r1 + movs r1, #1 + orrs r0, r1 + strb r0, [r2, #0x11] + bx lr + .align 2, 0 +_0805E57C: .4byte gUnk_03003DC0 +_0805E580: .4byte gLinkEntity + + thumb_func_start sub_0805E584 +sub_0805E584: @ 0x0805E584 + push {lr} + ldrb r2, [r0, #0x11] + lsrs r3, r2, #4 + movs r1, #0x10 + rsbs r1, r1, #0 + ands r1, r2 + orrs r1, r3 + strb r1, [r0, #0x11] + bl sub_0805E470 + pop {pc} + .align 2, 0 + + thumb_func_start sub_0805E59C +sub_0805E59C: @ 0x0805E59C + ldr r1, _0805E5A4 @ =gUnk_03003DC0 + movs r0, #6 + strb r0, [r1] + bx lr + .align 2, 0 +_0805E5A4: .4byte gUnk_03003DC0 + + thumb_func_start sub_0805E5A8 +sub_0805E5A8: @ 0x0805E5A8 + ldr r1, _0805E5B0 @ =gUnk_03003DC0 + movs r0, #7 + strb r0, [r1] + bx lr + .align 2, 0 +_0805E5B0: .4byte gUnk_03003DC0 + + thumb_func_start sub_0805E5B4 +sub_0805E5B4: @ 0x0805E5B4 + ldr r1, _0805E5BC @ =gUnk_03003DC0 + movs r0, #0 + strb r0, [r1] + bx lr + .align 2, 0 +_0805E5BC: .4byte gUnk_03003DC0 + + thumb_func_start sub_0805E5C0 +sub_0805E5C0: @ 0x0805E5C0 + push {lr} + ldr r0, _0805E5F0 @ =gUnk_02034350 + ldrb r1, [r0, #4] + movs r2, #0 + strb r1, [r0, #5] + strb r2, [r0, #4] + bl sub_0805ED30 + bl sub_0805E428 + bl sub_080175E8 + bl sub_0806F0A4 + ldr r1, _0805E5F4 @ =gUnk_03005F40 + movs r0, #0 + bl _call_via_r1 + bl sub_0805E84C + bl sub_0805EE88 + pop {pc} + .align 2, 0 +_0805E5F0: .4byte gUnk_02034350 +_0805E5F4: .4byte gUnk_03005F40 + + thumb_func_start sub_0805E5F8 +sub_0805E5F8: @ 0x0805E5F8 + push {lr} + ldr r1, _0805E608 @ =gUnk_03005F40 + movs r0, #1 + bl _call_via_r1 + bl sub_0805E84C + pop {pc} + .align 2, 0 +_0805E608: .4byte gUnk_03005F40 + + thumb_func_start sub_0805E60C +sub_0805E60C: @ 0x0805E60C + push {lr} + bl sub_0805E89C + ldr r0, _0805E654 @ =gUnk_03003DC0 + movs r1, #0xc + bl sub_0801D630 + ldr r0, _0805E658 @ =gLinkEntity + movs r1, #0xaa + lsls r1, r1, #6 + bl sub_0801D630 + ldr r0, _0805E65C @ =gUnk_02033290 + movs r1, #0x80 + lsls r1, r1, #4 + bl sub_0801D630 + bl sub_0805E98C + ldr r0, _0805E660 @ =gUnk_03003DBC + movs r1, #0 + strb r1, [r0] + ldr r0, _0805E664 @ =gUnk_020354B4 + strb r1, [r0] + ldr r1, _0805E668 @ =gUnk_03000000 + ldr r2, _0805E66C @ =0x00000427 + adds r0, r1, r2 + movs r2, #1 + strb r2, [r0] + ldr r3, _0805E670 @ =0x00000426 + adds r0, r1, r3 + strb r2, [r0] + ldr r0, _0805E674 @ =0x0000042E + adds r1, r1, r0 + strb r2, [r1] + pop {pc} + .align 2, 0 +_0805E654: .4byte gUnk_03003DC0 +_0805E658: .4byte gLinkEntity +_0805E65C: .4byte gUnk_02033290 +_0805E660: .4byte gUnk_03003DBC +_0805E664: .4byte gUnk_020354B4 +_0805E668: .4byte gUnk_03000000 +_0805E66C: .4byte 0x00000427 +_0805E670: .4byte 0x00000426 +_0805E674: .4byte 0x0000042E diff --git a/asm/sub_0801D630.s b/asm/sub_0801D630.s new file mode 100644 index 00000000..dad67676 --- /dev/null +++ b/asm/sub_0801D630.s @@ -0,0 +1,41 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text + + thumb_func_start sub_0801D630 +sub_0801D630: @ 0x0801D630 + push {r4, lr} + adds r3, r0, #0 + adds r2, r1, #0 + movs r4, #0 + adds r1, r3, #0 + orrs r1, r2 + movs r0, #3 + ands r1, r0 + cmp r1, #0 + beq _0801D64A + cmp r1, #2 + beq _0801D654 + b _0801D65E +_0801D64A: + movs r0, #0 + adds r1, r3, #0 + bl sub_0801D610 + b _0801D668 +_0801D654: + movs r0, #0 + adds r1, r3, #0 + bl sub_0801D5EC + b _0801D668 +_0801D65E: + strb r4, [r3] + adds r3, #1 + subs r2, #1 + cmp r2, #0 + bne _0801D65E +_0801D668: + pop {r4, pc} + .align 2, 0 \ No newline at end of file diff --git a/asm/sub_0801D66C.s b/asm/sub_0801D66C.s new file mode 100644 index 00000000..5976f92b --- /dev/null +++ b/asm/sub_0801D66C.s @@ -0,0 +1,56 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text + + thumb_func_start sub_0801D66C +sub_0801D66C: @ 0x0801D66C + push {r4, lr} + adds r3, r0, #0 + adds r4, r2, #0 + adds r2, r3, #0 + orrs r2, r1 + orrs r2, r4 + movs r0, #3 + ands r2, r0 + cmp r2, #0 + beq _0801D686 + cmp r2, #2 + beq _0801D698 + b _0801D6B0 +_0801D686: + ldr r2, _0801D694 @ =0x040000D4 + str r3, [r2] + str r1, [r2, #4] + lsrs r0, r4, #2 + movs r1, #0x84 + lsls r1, r1, #0x18 + b _0801D6A4 + .align 2, 0 +_0801D694: .4byte 0x040000D4 +_0801D698: + ldr r2, _0801D6AC @ =0x040000D4 + str r3, [r2] + str r1, [r2, #4] + lsrs r0, r4, #1 + movs r1, #0x80 + lsls r1, r1, #0x18 +_0801D6A4: + orrs r0, r1 + str r0, [r2, #8] + ldr r0, [r2, #8] + b _0801D6BE + .align 2, 0 +_0801D6AC: .4byte 0x040000D4 +_0801D6B0: + ldrb r0, [r3] + strb r0, [r1] + adds r3, #1 + adds r1, #1 + subs r4, #1 + cmp r4, #0 + bne _0801D6B0 +_0801D6BE: + pop {r4, pc} \ No newline at end of file diff --git a/asm/sub_08055E24.s b/asm/sub_08055E24.s new file mode 100644 index 00000000..104c91e2 --- /dev/null +++ b/asm/sub_08055E24.s @@ -0,0 +1,41 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text + + thumb_func_start sub_08055E24 +sub_08055E24: @ 0x08055E24 + push {r4, lr} + ldr r4, _08055E5C @ =gUnk_02000080 + ldrb r0, [r4, #6] + adds r0, #1 + strb r0, [r4, #6] + ldr r1, _08055E60 @ =gUnk_02000070 + movs r0, #1 + strb r0, [r1] + ldr r1, [r4, #0xc] + ldrb r0, [r1, #2] + ldrb r1, [r1, #3] + bl sub_0804B0B0 + ldr r0, _08055E64 @ =gUnk_080FF400 + bl LoadRoomEntityList + ldrb r0, [r4, #4] + movs r1, #0 + movs r2, #0 + movs r3, #0 + bl sub_08055B70 + movs r0, #4 + movs r1, #0x10 + bl sub_08050054 + pop {r4, pc} + .align 2, 0 +_08055E5C: .4byte gUnk_02000080 +_08055E60: .4byte gUnk_02000070 +_08055E64: .4byte gUnk_080FF400 + + thumb_func_start nullsub_493 +nullsub_493: @ 0x08055E68 + bx lr + .align 2, 0 \ No newline at end of file diff --git a/include/entity.h b/include/entity.h index 4df6fe00..63d0fec7 100644 --- a/include/entity.h +++ b/include/entity.h @@ -28,7 +28,8 @@ typedef struct u8 parameter3; u8 field_0xf; u8 flags; - u8 scriptedScene; + u8 scriptedScene:4; + u8 scriptedScene2:4; s16 spriteTileSize; u8 animationState; u8 direction; diff --git a/include/item.h b/include/item.h new file mode 100644 index 00000000..ad2ccd5d --- /dev/null +++ b/include/item.h @@ -0,0 +1,126 @@ +#include "global.h" + +#ifndef ITEM_H +#define ITEM_H + enum ItemType + { + Untyped, + SmithSword = 0x01, + GreenSword = 0x02, + RedSword = 0x03, + BlueSword = 0x04, + // UnusedSword = 0x05, + FourSword = 0x06, + Bombs = 0x07, + RemoteBombs = 0x08, + Bow = 0x09, + LightArrow = 0x0A, + Boomerang = 0x0B, + MagicBoomerang = 0x0C, + Shield = 0x0D, + MirrorShield = 0x0E, + LanternOff = 0x0F, + + GustJar = 0x11, + PacciCane = 0x12, + MoleMitts = 0x13, + RocsCape = 0x14, + PegasusBoots = 0x15, + FireRod = 0x16, + Ocarina = 0x17, + GreenOrb = 0x18, + BlueOrb = 0x19, + RedOrb = 0x1A, + Trap = 0x1B, + Bottle1 = 0x1C, + Bottle2 = 0x1D, + Bottle3 = 0x1E, + Bottle4 = 0x1F, + BottleEmpty = 0x20, + BottleButter = 0x21, + BottleMilk = 0x22, + BottleHalfMilk = 0x23, + BottleRedPotion = 0x24, + BottleBluePotion = 0x25, + BottleWater = 0x26, + BottleMineralWater = 0x27, + BottleFairy = 0x28, + BottlePicolyteRed = 0x29, + BottlePicolyteOrange = 0x2A, + BottlePicolyteYellow = 0x2B, + BottlePiclolyteGreen = 0x2C, + BottlePicolyteBlue = 0x2D, + BottlePicolyteWhite = 0x2E, + BottleCharmNayru = 0x2F, + BottleCharmFarore = 0x30, + BottleCharmDin = 0x31, + + + SmithSwordQuest = 0x34, + BrokenPicoriBlade = 0x35, + DogFoodBottle = 0x36, + LonLonKey = 0x37, + WakeUpMushroom = 0x38, + HyruleanBestiary = 0x39, + PicoriLegend = 0x3A, + MaskHistory = 0x3B, + GraveyardKey = 0x3C, + TingleTrophy = 0x3D, + CarlovMedal = 0x3E, + ShellsX = 0x3F, + EarthElement = 0x40, + FireElement = 0x41, + WaterElement = 0x42, + WindElement = 0x43, + GripRing = 0x44, + PowerBracelets = 0x45, + Flippers = 0x46, + HyruleMap = 0x47, + SpinAttack = 0x48, + RollAttack = 0x49, + DashAttack = 0x4A, + RockBreaker = 0x4B, + SwordBeam = 0x4C, + GreatSpin = 0x4D, + DownThrust = 0x4E, + PerilBeam = 0x4F, + DungeonMap = 0x50, + Compass = 0x51, + BigKey = 0x52, + SmallKey = 0x53, + Rupee1 = 0x54, + Rupee5 = 0x55, + Rupee20 = 0x56, + Rupee50 = 0x57, + Rupee100 = 0x58, + Rupee200 = 0x59, + + JabberNut = 0x5B, + KinstoneX = 0x5C, + Bombs5 = 0x5D, + Arrows5 = 0x5E, + SmallHeart = 0x5F, + Fairy = 0x60, + Shells30 = 0x61, + HeartContainer = 0x62, + PieceOfHeart = 0x63, + Wallet = 0x64, + BombBag = 0x65, + LargeQuiver = 0x66, + KinstoneBag = 0x67, + Brioche = 0x68, + Croissant = 0x69, + PieSlice = 0x6A, + CakeSlice = 0x6B, + Bombs10 = 0x6C, + Bombs30 = 0x6D, + Arrows10 = 0x6E, + Arrows30 = 0x6F, + ArrowButterfly = 0x70, + DigButterfly = 0x71, + SwimButterfly = 0x72, + FastSpin = 0x73, + FastSplit = 0x74, + LongSpin = 0x75 + } +#endif \ No newline at end of file diff --git a/linker.ld b/linker.ld index c1f5efca..b70ae7d4 100644 --- a/linker.ld +++ b/linker.ld @@ -297,8 +297,11 @@ SECTIONS { asm/updateBackgroundRegisters.o(.text); asm/code_08016DF8.o(.text); /* C source compiled without interworking */ - asm/code.o(.text); - src/readKeyInput.o(.text); + asm/code_08018500.o(.text); + src/sub_0801D5EC.o(.text); + src/sub_0801D610.o(.text); + asm/sub_0801D630.o(.text); + asm/sub_0801D66C.o(.text); asm/readKeyInput.o(.text); asm/code_0801D714.o(.text); src/createEnemy.o(.text); @@ -317,9 +320,13 @@ SECTIONS { asm/code_08050038.o(.text); asm/initializeLink.o(.text); asm/code_08052620.o(.text); + src/sub_08055E08.o(.text); + asm/sub_08055E24.o(.text); asm/mainLoop.o(.text); asm/sub_08055F70.o(.text); asm/code_08055FF4.o(.text); + src/sub_0805E3A0.o(.text); + asm/code_0805E3B0.o(.text); asm/getEmptyEntity.o(.text); asm/code_0805E744.o(.text); src/sub_0806FA30.o(.text); diff --git a/src/sub_0801D5EC.c b/src/sub_0801D5EC.c new file mode 100644 index 00000000..f5757230 --- /dev/null +++ b/src/sub_0801D5EC.c @@ -0,0 +1,5 @@ +#include "global.h" +void sub_0801D5EC(u32 a1, u32 a2, u32 a3) +{ + DmaFill16(3, a1, a2, a3); +} \ No newline at end of file diff --git a/src/sub_0801D610.c b/src/sub_0801D610.c new file mode 100644 index 00000000..d9a181e6 --- /dev/null +++ b/src/sub_0801D610.c @@ -0,0 +1,6 @@ +#include "global.h" + +void sub_0801D610(u32 a1, u32 a2, u32 a3) +{ + DmaFill32(3, a1, a2, a3); +} \ No newline at end of file diff --git a/src/sub_08055E08.c b/src/sub_08055E08.c new file mode 100644 index 00000000..310ceaaa --- /dev/null +++ b/src/sub_08055E08.c @@ -0,0 +1,13 @@ + +#include "global.h" + +extern u32 * _call_via_r0(u32 *func); +extern u8 gUnk_02000080; +extern u32 *gUnk_080FF420; + +void sub_08055E08() { + u32 **arr = &gUnk_080FF420; + u8 i = gUnk_02000080; + i = *(&gUnk_02000080 + 6); + _call_via_r0(arr[i]); +} \ No newline at end of file diff --git a/src/sub_0805E3A0.c b/src/sub_0805E3A0.c new file mode 100644 index 00000000..61b4cef7 --- /dev/null +++ b/src/sub_0805E3A0.c @@ -0,0 +1,9 @@ +#include "global.h" +#include "entity.h" + +Entity * sub_0805E3A0(Entity *ent, u32 param){ + //these are bitfields + ent->scriptedScene2 = param; + ent->scriptedScene = param; + return ent; +} diff --git a/tools/minishmaker-license.txt b/tools/minishmaker-license.txt new file mode 100644 index 00000000..e72bfdda --- /dev/null +++ b/tools/minishmaker-license.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file