diff options
42 files changed, 1656 insertions, 1635 deletions
diff --git a/asm/match_call.s b/asm/match_call.s new file mode 100644 index 000000000..b65a07a81 --- /dev/null +++ b/asm/match_call.s @@ -0,0 +1,800 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text + + thumb_func_start sub_81D1714 +sub_81D1714: @ 81D1714 + ldrb r0, [r0, 0x1] + bx lr + thumb_func_end sub_81D1714 + + thumb_func_start sub_81D1718 +sub_81D1718: @ 81D1718 + ldrb r0, [r0, 0x1] + bx lr + thumb_func_end sub_81D1718 + + thumb_func_start sub_81D171C +sub_81D171C: @ 81D171C + push {r4-r7,lr} + adds r5, r0, 0 + movs r6, 0 + ldr r7, =0x0000ffff + b _081D172E + .pool +_081D172C: + adds r6, 0x1 +_081D172E: + ldr r0, [r5, 0x10] + lsls r4, r6, 2 + adds r1, r4, r0 + ldrh r0, [r1] + cmp r0, r7 + beq _081D1744 + bl FlagGet + lsls r0, 24 + cmp r0, 0 + bne _081D172C +_081D1744: + ldr r0, [r5, 0x10] + adds r0, r4, r0 + ldrb r0, [r0, 0x2] + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_81D171C + + thumb_func_start sub_81D1750 +sub_81D1750: @ 81D1750 + movs r0, 0xD5 + bx lr + thumb_func_end sub_81D1750 + + thumb_func_start sub_81D1754 +sub_81D1754: @ 81D1754 + movs r0, 0xD5 + bx lr + thumb_func_end sub_81D1754 + + thumb_func_start sub_81D1758 +sub_81D1758: @ 81D1758 + push {r4,lr} + cmp r0, 0x14 + bhi _081D1784 + ldr r1, =gUnknown_086252A8 + lsls r0, 2 + adds r0, r1 + ldr r4, [r0] + adds r0, r4, 0 + bl sub_81D1574 + ldr r1, =gUnknown_08625324 + lsls r0, 2 + adds r0, r1 + ldr r1, [r0] + adds r0, r4, 0 + bl _call_via_r1 + b _081D1786 + .pool +_081D1784: + movs r0, 0 +_081D1786: + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_81D1758 + + thumb_func_start sub_81D178C +sub_81D178C: @ 81D178C + movs r0, 0 + bx lr + thumb_func_end sub_81D178C + + thumb_func_start sub_81D1790 +sub_81D1790: @ 81D1790 + push {lr} + adds r1, r0, 0 + ldrh r0, [r1, 0x4] + cmp r0, 0x48 + bhi _081D17B8 + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldr r2, =0x000009ca + adds r0, r2 + ldrh r1, [r1, 0x4] + adds r0, r1 + ldrb r1, [r0] + negs r0, r1 + orrs r0, r1 + lsrs r0, 31 + b _081D17BA + .pool +_081D17B8: + movs r0, 0 +_081D17BA: + pop {r1} + bx r1 + thumb_func_end sub_81D1790 + + thumb_func_start sub_81D17C0 +sub_81D17C0: @ 81D17C0 + ldr r1, =gSaveBlock1Ptr + ldr r1, [r1] + ldr r2, =0x000009ca + adds r1, r2 + ldrh r0, [r0, 0x4] + adds r1, r0 + ldrb r1, [r1] + negs r0, r1 + orrs r0, r1 + lsrs r0, 31 + bx lr + .pool + thumb_func_end sub_81D17C0 + + thumb_func_start sub_81D17E0 +sub_81D17E0: @ 81D17E0 + movs r0, 0 + bx lr + thumb_func_end sub_81D17E0 + + thumb_func_start sub_81D17E4 +sub_81D17E4: @ 81D17E4 + movs r0, 0 + bx lr + thumb_func_end sub_81D17E4 + + thumb_func_start sub_81D17E8 +sub_81D17E8: @ 81D17E8 + push {r4,r5,lr} + adds r5, r0, 0 + cmp r5, 0x14 + bhi _081D1832 + ldr r1, =gUnknown_086252A8 + lsls r0, r5, 2 + adds r0, r1 + ldr r4, [r0] + adds r0, r4, 0 + bl sub_81D1574 + adds r2, r0, 0 + ldr r1, =gUnknown_08625338 + lsls r0, r2, 2 + adds r0, r1 + ldr r1, [r0] + adds r0, r4, 0 + bl _call_via_r1 + cmp r0, 0 + beq _081D1820 +_081D1812: + movs r0, 0x1 + b _081D1834 + .pool +_081D1820: + movs r2, 0 + ldr r1, =gUnknown_08625388 +_081D1824: + ldrh r0, [r1] + cmp r0, r5 + beq _081D1812 + adds r1, 0x18 + adds r2, 0x1 + cmp r2, 0x3 + bls _081D1824 +_081D1832: + movs r0, 0 +_081D1834: + pop {r4,r5} + pop {r1} + bx r1 + .pool + thumb_func_end sub_81D17E8 + + thumb_func_start sub_81D1840 +sub_81D1840: @ 81D1840 + movs r0, 0 + bx lr + thumb_func_end sub_81D1840 + + thumb_func_start sub_81D1844 +sub_81D1844: @ 81D1844 + movs r0, 0x1 + bx lr + thumb_func_end sub_81D1844 + + thumb_func_start sub_81D1848 +sub_81D1848: @ 81D1848 + movs r0, 0x1 + bx lr + thumb_func_end sub_81D1848 + + thumb_func_start sub_81D184C +sub_81D184C: @ 81D184C + movs r0, 0 + bx lr + thumb_func_end sub_81D184C + + thumb_func_start sub_81D1850 +sub_81D1850: @ 81D1850 + movs r0, 0 + bx lr + thumb_func_end sub_81D1850 + + thumb_func_start sub_81D1854 +sub_81D1854: @ 81D1854 + push {r4,lr} + cmp r0, 0x14 + bhi _081D1880 + ldr r1, =gUnknown_086252A8 + lsls r0, 2 + adds r0, r1 + ldr r4, [r0] + adds r0, r4, 0 + bl sub_81D1574 + ldr r1, =gUnknown_0862534C + lsls r0, 2 + adds r0, r1 + ldr r1, [r0] + adds r0, r4, 0 + bl _call_via_r1 + b _081D1882 + .pool +_081D1880: + movs r0, 0x4E +_081D1882: + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_81D1854 + + thumb_func_start sub_81D1888 +sub_81D1888: @ 81D1888 + movs r0, 0x4E + bx lr + thumb_func_end sub_81D1888 + + thumb_func_start sub_81D188C +sub_81D188C: @ 81D188C + ldrh r0, [r0, 0x4] + bx lr + thumb_func_end sub_81D188C + + thumb_func_start sub_81D1890 +sub_81D1890: @ 81D1890 + ldrh r0, [r0, 0x4] + bx lr + thumb_func_end sub_81D1890 + + thumb_func_start sub_81D1894 +sub_81D1894: @ 81D1894 + movs r0, 0x4E + bx lr + thumb_func_end sub_81D1894 + + thumb_func_start sub_81D1898 +sub_81D1898: @ 81D1898 + movs r0, 0x4E + bx lr + thumb_func_end sub_81D1898 + + thumb_func_start sub_81D189C +sub_81D189C: @ 81D189C + push {r4,r5,lr} + adds r5, r1, 0 + cmp r0, 0x14 + bhi _081D18C2 + ldr r1, =gUnknown_086252A8 + lsls r0, 2 + adds r0, r1 + ldr r4, [r0] + adds r0, r4, 0 + bl sub_81D1574 + ldr r1, =gUnknown_08625360 + lsls r0, 2 + adds r0, r1 + ldr r2, [r0] + adds r0, r4, 0 + adds r1, r5, 0 + bl _call_via_r2 +_081D18C2: + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D189C + + thumb_func_start sub_81D18D0 +sub_81D18D0: @ 81D18D0 + push {lr} + ldr r0, [r0, 0xC] + bl sub_81D1920 + pop {r0} + bx r0 + thumb_func_end sub_81D18D0 + + thumb_func_start sub_81D18DC +sub_81D18DC: @ 81D18DC + push {lr} + adds r3, r0, 0 + adds r2, r1, 0 + ldrb r0, [r3] + cmp r0, 0x5 + beq _081D18F0 + ldr r0, [r3, 0x10] + bl sub_81D1920 + b _081D18F8 +_081D18F0: + ldr r0, [r3, 0x10] + ldrh r1, [r3, 0x4] + bl sub_81D199C +_081D18F8: + pop {r0} + bx r0 + thumb_func_end sub_81D18DC + + thumb_func_start sub_81D18FC +sub_81D18FC: @ 81D18FC + push {lr} + ldr r0, [r0, 0xC] + bl sub_81D1920 + pop {r0} + bx r0 + thumb_func_end sub_81D18FC + + thumb_func_start sub_81D1908 +sub_81D1908: @ 81D1908 + push {lr} + ldr r0, [r0, 0xC] + bl sub_81D1920 + pop {r0} + bx r0 + thumb_func_end sub_81D1908 + + thumb_func_start sub_81D1914 +sub_81D1914: @ 81D1914 + push {lr} + adds r0, r1, 0 + bl sub_8197080 + pop {r0} + bx r0 + thumb_func_end sub_81D1914 + + thumb_func_start sub_81D1920 +sub_81D1920: @ 81D1920 + push {r4-r7,lr} + mov r7, r9 + mov r6, r8 + push {r6,r7} + adds r6, r0, 0 + mov r9, r1 + movs r5, 0 + ldr r0, [r6] + cmp r0, 0 + beq _081D1940 + adds r1, r6, 0 +_081D1936: + adds r1, 0x8 + adds r5, 0x1 + ldr r0, [r1] + cmp r0, 0 + bne _081D1936 +_081D1940: + cmp r5, 0 + beq _081D1946 + subs r5, 0x1 +_081D1946: + ldr r0, =0x0000ffff + mov r8, r0 + lsls r0, r5, 3 + adds r0, 0x4 + adds r4, r0, r6 + b _081D195C + .pool +_081D1958: + subs r4, 0x8 + subs r5, 0x1 +_081D195C: + lsls r7, r5, 3 + cmp r5, 0 + beq _081D1974 + ldrh r0, [r4] + cmp r0, r8 + beq _081D1958 + bl FlagGet + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + bne _081D1958 +_081D1974: + adds r4, r7, r6 + ldrh r1, [r4, 0x6] + ldr r0, =0x0000ffff + cmp r1, r0 + beq _081D1984 + adds r0, r1, 0 + bl FlagSet +_081D1984: + ldr r1, [r4] + mov r0, r9 + bl StringExpandPlaceholders + pop {r3,r4} + mov r8, r3 + mov r9, r4 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D1920 + + thumb_func_start sub_81D199C +sub_81D199C: @ 81D199C + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + adds r6, r0, 0 + mov r10, r2 + lsls r1, 16 + lsrs r7, r1, 16 + movs r5, 0 + ldr r0, [r6] + cmp r0, 0 + beq _081D19E6 + ldrh r0, [r6, 0x4] + ldr r1, =0x0000fffe + cmp r0, r1 + beq _081D1A24 + ldr r0, =0x0000ffff + mov r9, r0 + mov r8, r1 + adds r4, r6, 0 +_081D19C6: + ldrh r0, [r4, 0x4] + cmp r0, r9 + beq _081D19D6 + bl FlagGet + lsls r0, 24 + cmp r0, 0 + beq _081D19E6 +_081D19D6: + adds r4, 0x8 + adds r5, 0x1 + ldr r0, [r4] + cmp r0, 0 + beq _081D19E6 + ldrh r0, [r4, 0x4] + cmp r0, r8 + bne _081D19C6 +_081D19E6: + lsls r0, r5, 3 + adds r0, r6 + ldrh r1, [r0, 0x4] + ldr r0, =0x0000fffe + cmp r1, r0 + beq _081D1A24 + cmp r5, 0 + beq _081D19F8 + subs r5, 0x1 +_081D19F8: + lsls r0, r5, 3 + adds r4, r0, r6 + ldrh r1, [r4, 0x6] + ldr r0, =0x0000ffff + cmp r1, r0 + beq _081D1A0A + adds r0, r1, 0 + bl FlagSet +_081D1A0A: + ldr r1, [r4] + mov r0, r10 + bl StringExpandPlaceholders + b _081D1A5C + .pool +_081D1A1C: + adds r5, 0x2 + b _081D1A50 +_081D1A20: + adds r5, 0x3 + b _081D1A50 +_081D1A24: + ldr r0, =0x00000864 + bl FlagGet + lsls r0, 24 + cmp r0, 0 + beq _081D1A50 + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldr r1, =0x000009ca + adds r0, r1 + adds r0, r7 + ldrb r0, [r0] + cmp r0, 0 + bne _081D1A1C + adds r0, r7, 0 + bl CountBattledRematchTeams + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x1 + bhi _081D1A20 + adds r5, 0x1 +_081D1A50: + lsls r0, r5, 3 + adds r0, r6 + ldr r1, [r0] + mov r0, r10 + bl StringExpandPlaceholders +_081D1A5C: + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D199C + + thumb_func_start sub_81D1A78 +sub_81D1A78: @ 81D1A78 + push {r4-r6,lr} + adds r5, r1, 0 + adds r6, r2, 0 + cmp r0, 0x14 + bhi _081D1AA2 + ldr r1, =gUnknown_086252A8 + lsls r0, 2 + adds r0, r1 + ldr r4, [r0] + adds r0, r4, 0 + bl sub_81D1574 + ldr r1, =gUnknown_08625374 + lsls r0, 2 + adds r0, r1 + ldr r3, [r0] + adds r0, r4, 0 + adds r1, r5, 0 + adds r2, r6, 0 + bl _call_via_r3 +_081D1AA2: + pop {r4-r6} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D1A78 + + thumb_func_start sub_81D1AB0 +sub_81D1AB0: @ 81D1AB0 + ldr r3, [r0, 0x4] + str r3, [r1] + ldr r0, [r0, 0x8] + str r0, [r2] + bx lr + thumb_func_end sub_81D1AB0 + + thumb_func_start sub_81D1ABC +sub_81D1ABC: @ 81D1ABC + push {r4,r5,lr} + adds r5, r1, 0 + adds r4, r0, 0 + ldr r0, [r4, 0xC] + cmp r0, 0 + bne _081D1AD0 + ldrh r0, [r4, 0x4] + bl sub_81D1B0C + b _081D1AD2 +_081D1AD0: + str r0, [r2] +_081D1AD2: + ldr r0, [r4, 0x8] + str r0, [r5] + pop {r4,r5} + pop {r0} + bx r0 + thumb_func_end sub_81D1ABC + + thumb_func_start sub_81D1ADC +sub_81D1ADC: @ 81D1ADC + push {r4,r5,lr} + adds r4, r0, 0 + adds r5, r1, 0 + ldrh r0, [r4, 0x4] + bl sub_81D1B0C + ldr r0, [r4, 0x8] + str r0, [r5] + pop {r4,r5} + pop {r0} + bx r0 + thumb_func_end sub_81D1ADC + + thumb_func_start sub_81D1AF4 +sub_81D1AF4: @ 81D1AF4 + ldr r3, [r0, 0x4] + str r3, [r1] + ldr r0, [r0, 0x8] + str r0, [r2] + bx lr + thumb_func_end sub_81D1AF4 + + thumb_func_start sub_81D1B00 +sub_81D1B00: @ 81D1B00 + ldr r3, [r0, 0x4] + str r3, [r1] + ldr r0, [r0, 0x8] + str r0, [r2] + bx lr + thumb_func_end sub_81D1B00 + + thumb_func_start sub_81D1B0C +sub_81D1B0C: @ 81D1B0C + push {r4,r5,lr} + adds r4, r1, 0 + adds r5, r2, 0 + bl sub_81D15BC + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + ldr r0, =gTrainers + adds r1, r0 + ldrb r2, [r1, 0x1] + movs r0, 0xD + muls r0, r2 + ldr r2, =gTrainerClassNames + adds r0, r2 + str r0, [r4] + adds r1, 0x4 + str r1, [r5] + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D1B0C + + thumb_func_start sub_81D1B40 +sub_81D1B40: @ 81D1B40 + push {r4-r7,lr} + mov r7, r9 + mov r6, r8 + push {r6,r7} + adds r6, r0, 0 + movs r5, 0 + ldr r2, =gUnknown_08625388 + movs r0, 0x8 + adds r0, r2 + mov r9, r0 +_081D1B54: + lsls r0, r5, 1 + adds r0, r5 + lsls r0, 3 + adds r0, r2 + ldrh r0, [r0] + cmp r0, r6 + bne _081D1BBC + adds r4, r5, 0x1 + lsls r1, 2 + mov r8, r1 + cmp r4, 0x3 + bhi _081D1BA8 + lsls r0, r4, 1 + adds r0, r4 + lsls r0, 3 + adds r0, r2 + ldrh r0, [r0] + cmp r0, r6 + bne _081D1BA8 + ldr r7, =gUnknown_08625388 +_081D1B7C: + lsls r0, r4, 1 + adds r0, r4 + lsls r0, 3 + adds r1, r7, 0x4 + adds r0, r1 + ldrh r0, [r0] + bl FlagGet + lsls r0, 24 + cmp r0, 0 + beq _081D1BA8 + adds r5, r4, 0 + adds r4, r5, 0x1 + cmp r4, 0x3 + bhi _081D1BA8 + lsls r0, r4, 1 + adds r0, r4 + lsls r0, 3 + adds r0, r7 + ldrh r0, [r0] + cmp r0, r6 + beq _081D1B7C +_081D1BA8: + lsls r0, r5, 1 + adds r0, r5 + lsls r0, 3 + add r0, r8 + add r0, r9 + ldr r0, [r0] + b _081D1BC4 + .pool +_081D1BBC: + adds r5, 0x1 + cmp r5, 0x3 + bls _081D1B54 + movs r0, 0 +_081D1BC4: + pop {r3,r4} + mov r8, r3 + mov r9, r4 + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_81D1B40 + + thumb_func_start sub_81D1BD0 +sub_81D1BD0: @ 81D1BD0 + push {lr} + adds r3, r0, 0 + movs r2, 0 + ldr r1, =gUnknown_08625388 +_081D1BD8: + ldrh r0, [r1] + cmp r0, r3 + bne _081D1BE8 + ldrh r0, [r1, 0x2] + b _081D1BF4 + .pool +_081D1BE8: + adds r1, 0x18 + adds r2, 0x1 + cmp r2, 0x3 + bls _081D1BD8 + movs r0, 0x1 + negs r0, r0 +_081D1BF4: + pop {r1} + bx r1 + thumb_func_end sub_81D1BD0 + + thumb_func_start sub_81D1BF8 +sub_81D1BF8: @ 81D1BF8 + push {r4,r5,lr} + adds r5, r0, 0 + movs r4, 0 +_081D1BFE: + adds r0, r4, 0 + bl sub_81D1854 + cmp r0, 0x4E + beq _081D1C10 + cmp r0, r5 + bne _081D1C10 + movs r0, 0x1 + b _081D1C18 +_081D1C10: + adds r4, 0x1 + cmp r4, 0x14 + ble _081D1BFE + movs r0, 0 +_081D1C18: + pop {r4,r5} + pop {r1} + bx r1 + thumb_func_end sub_81D1BF8 + + thumb_func_start SetMatchCallRegisteredFlag +SetMatchCallRegisteredFlag: @ 81D1C20 + push {lr} + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + bl sub_81D15CC + cmp r0, 0 + blt _081D1C3C + movs r1, 0xAE + lsls r1, 1 + adds r0, r1 + lsls r0, 16 + lsrs r0, 16 + bl FlagSet +_081D1C3C: + pop {r0} + bx r0 + .pool + thumb_func_end SetMatchCallRegisteredFlag diff --git a/asm/pokenav.s b/asm/pokenav.s index d14388ed5..fd214818c 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -20697,803 +20697,8 @@ _081D156A: .pool thumb_func_end sub_81D1538 -// MATCH CALL .section .text.after.match.call - thumb_func_start sub_81D1714 -sub_81D1714: @ 81D1714 - ldrb r0, [r0, 0x1] - bx lr - thumb_func_end sub_81D1714 - - thumb_func_start sub_81D1718 -sub_81D1718: @ 81D1718 - ldrb r0, [r0, 0x1] - bx lr - thumb_func_end sub_81D1718 - - thumb_func_start sub_81D171C -sub_81D171C: @ 81D171C - push {r4-r7,lr} - adds r5, r0, 0 - movs r6, 0 - ldr r7, =0x0000ffff - b _081D172E - .pool -_081D172C: - adds r6, 0x1 -_081D172E: - ldr r0, [r5, 0x10] - lsls r4, r6, 2 - adds r1, r4, r0 - ldrh r0, [r1] - cmp r0, r7 - beq _081D1744 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - bne _081D172C -_081D1744: - ldr r0, [r5, 0x10] - adds r0, r4, r0 - ldrb r0, [r0, 0x2] - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81D171C - - thumb_func_start sub_81D1750 -sub_81D1750: @ 81D1750 - movs r0, 0xD5 - bx lr - thumb_func_end sub_81D1750 - - thumb_func_start sub_81D1754 -sub_81D1754: @ 81D1754 - movs r0, 0xD5 - bx lr - thumb_func_end sub_81D1754 - - thumb_func_start sub_81D1758 -sub_81D1758: @ 81D1758 - push {r4,lr} - cmp r0, 0x14 - bhi _081D1784 - ldr r1, =gUnknown_086252A8 - lsls r0, 2 - adds r0, r1 - ldr r4, [r0] - adds r0, r4, 0 - bl sub_81D1574 - ldr r1, =gUnknown_08625324 - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - b _081D1786 - .pool -_081D1784: - movs r0, 0 -_081D1786: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81D1758 - - thumb_func_start sub_81D178C -sub_81D178C: @ 81D178C - movs r0, 0 - bx lr - thumb_func_end sub_81D178C - - thumb_func_start sub_81D1790 -sub_81D1790: @ 81D1790 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x4] - cmp r0, 0x48 - bhi _081D17B8 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x000009ca - adds r0, r2 - ldrh r1, [r1, 0x4] - adds r0, r1 - ldrb r1, [r0] - negs r0, r1 - orrs r0, r1 - lsrs r0, 31 - b _081D17BA - .pool -_081D17B8: - movs r0, 0 -_081D17BA: - pop {r1} - bx r1 - thumb_func_end sub_81D1790 - - thumb_func_start sub_81D17C0 -sub_81D17C0: @ 81D17C0 - ldr r1, =gSaveBlock1Ptr - ldr r1, [r1] - ldr r2, =0x000009ca - adds r1, r2 - ldrh r0, [r0, 0x4] - adds r1, r0 - ldrb r1, [r1] - negs r0, r1 - orrs r0, r1 - lsrs r0, 31 - bx lr - .pool - thumb_func_end sub_81D17C0 - - thumb_func_start sub_81D17E0 -sub_81D17E0: @ 81D17E0 - movs r0, 0 - bx lr - thumb_func_end sub_81D17E0 - - thumb_func_start sub_81D17E4 -sub_81D17E4: @ 81D17E4 - movs r0, 0 - bx lr - thumb_func_end sub_81D17E4 - - thumb_func_start sub_81D17E8 -sub_81D17E8: @ 81D17E8 - push {r4,r5,lr} - adds r5, r0, 0 - cmp r5, 0x14 - bhi _081D1832 - ldr r1, =gUnknown_086252A8 - lsls r0, r5, 2 - adds r0, r1 - ldr r4, [r0] - adds r0, r4, 0 - bl sub_81D1574 - adds r2, r0, 0 - ldr r1, =gUnknown_08625338 - lsls r0, r2, 2 - adds r0, r1 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - cmp r0, 0 - beq _081D1820 -_081D1812: - movs r0, 0x1 - b _081D1834 - .pool -_081D1820: - movs r2, 0 - ldr r1, =gUnknown_08625388 -_081D1824: - ldrh r0, [r1] - cmp r0, r5 - beq _081D1812 - adds r1, 0x18 - adds r2, 0x1 - cmp r2, 0x3 - bls _081D1824 -_081D1832: - movs r0, 0 -_081D1834: - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D17E8 - - thumb_func_start sub_81D1840 -sub_81D1840: @ 81D1840 - movs r0, 0 - bx lr - thumb_func_end sub_81D1840 - - thumb_func_start sub_81D1844 -sub_81D1844: @ 81D1844 - movs r0, 0x1 - bx lr - thumb_func_end sub_81D1844 - - thumb_func_start sub_81D1848 -sub_81D1848: @ 81D1848 - movs r0, 0x1 - bx lr - thumb_func_end sub_81D1848 - - thumb_func_start sub_81D184C -sub_81D184C: @ 81D184C - movs r0, 0 - bx lr - thumb_func_end sub_81D184C - - thumb_func_start sub_81D1850 -sub_81D1850: @ 81D1850 - movs r0, 0 - bx lr - thumb_func_end sub_81D1850 - - thumb_func_start sub_81D1854 -sub_81D1854: @ 81D1854 - push {r4,lr} - cmp r0, 0x14 - bhi _081D1880 - ldr r1, =gUnknown_086252A8 - lsls r0, 2 - adds r0, r1 - ldr r4, [r0] - adds r0, r4, 0 - bl sub_81D1574 - ldr r1, =gUnknown_0862534C - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - b _081D1882 - .pool -_081D1880: - movs r0, 0x4E -_081D1882: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81D1854 - - thumb_func_start sub_81D1888 -sub_81D1888: @ 81D1888 - movs r0, 0x4E - bx lr - thumb_func_end sub_81D1888 - - thumb_func_start sub_81D188C -sub_81D188C: @ 81D188C - ldrh r0, [r0, 0x4] - bx lr - thumb_func_end sub_81D188C - - thumb_func_start sub_81D1890 -sub_81D1890: @ 81D1890 - ldrh r0, [r0, 0x4] - bx lr - thumb_func_end sub_81D1890 - - thumb_func_start sub_81D1894 -sub_81D1894: @ 81D1894 - movs r0, 0x4E - bx lr - thumb_func_end sub_81D1894 - - thumb_func_start sub_81D1898 -sub_81D1898: @ 81D1898 - movs r0, 0x4E - bx lr - thumb_func_end sub_81D1898 - - thumb_func_start sub_81D189C -sub_81D189C: @ 81D189C - push {r4,r5,lr} - adds r5, r1, 0 - cmp r0, 0x14 - bhi _081D18C2 - ldr r1, =gUnknown_086252A8 - lsls r0, 2 - adds r0, r1 - ldr r4, [r0] - adds r0, r4, 0 - bl sub_81D1574 - ldr r1, =gUnknown_08625360 - lsls r0, 2 - adds r0, r1 - ldr r2, [r0] - adds r0, r4, 0 - adds r1, r5, 0 - bl _call_via_r2 -_081D18C2: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D189C - - thumb_func_start sub_81D18D0 -sub_81D18D0: @ 81D18D0 - push {lr} - ldr r0, [r0, 0xC] - bl sub_81D1920 - pop {r0} - bx r0 - thumb_func_end sub_81D18D0 - - thumb_func_start sub_81D18DC -sub_81D18DC: @ 81D18DC - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - ldrb r0, [r3] - cmp r0, 0x5 - beq _081D18F0 - ldr r0, [r3, 0x10] - bl sub_81D1920 - b _081D18F8 -_081D18F0: - ldr r0, [r3, 0x10] - ldrh r1, [r3, 0x4] - bl sub_81D199C -_081D18F8: - pop {r0} - bx r0 - thumb_func_end sub_81D18DC - - thumb_func_start sub_81D18FC -sub_81D18FC: @ 81D18FC - push {lr} - ldr r0, [r0, 0xC] - bl sub_81D1920 - pop {r0} - bx r0 - thumb_func_end sub_81D18FC - - thumb_func_start sub_81D1908 -sub_81D1908: @ 81D1908 - push {lr} - ldr r0, [r0, 0xC] - bl sub_81D1920 - pop {r0} - bx r0 - thumb_func_end sub_81D1908 - - thumb_func_start sub_81D1914 -sub_81D1914: @ 81D1914 - push {lr} - adds r0, r1, 0 - bl sub_8197080 - pop {r0} - bx r0 - thumb_func_end sub_81D1914 - - thumb_func_start sub_81D1920 -sub_81D1920: @ 81D1920 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r6, r0, 0 - mov r9, r1 - movs r5, 0 - ldr r0, [r6] - cmp r0, 0 - beq _081D1940 - adds r1, r6, 0 -_081D1936: - adds r1, 0x8 - adds r5, 0x1 - ldr r0, [r1] - cmp r0, 0 - bne _081D1936 -_081D1940: - cmp r5, 0 - beq _081D1946 - subs r5, 0x1 -_081D1946: - ldr r0, =0x0000ffff - mov r8, r0 - lsls r0, r5, 3 - adds r0, 0x4 - adds r4, r0, r6 - b _081D195C - .pool -_081D1958: - subs r4, 0x8 - subs r5, 0x1 -_081D195C: - lsls r7, r5, 3 - cmp r5, 0 - beq _081D1974 - ldrh r0, [r4] - cmp r0, r8 - beq _081D1958 - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _081D1958 -_081D1974: - adds r4, r7, r6 - ldrh r1, [r4, 0x6] - ldr r0, =0x0000ffff - cmp r1, r0 - beq _081D1984 - adds r0, r1, 0 - bl FlagSet -_081D1984: - ldr r1, [r4] - mov r0, r9 - bl StringExpandPlaceholders - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1920 - - thumb_func_start sub_81D199C -sub_81D199C: @ 81D199C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - adds r6, r0, 0 - mov r10, r2 - lsls r1, 16 - lsrs r7, r1, 16 - movs r5, 0 - ldr r0, [r6] - cmp r0, 0 - beq _081D19E6 - ldrh r0, [r6, 0x4] - ldr r1, =0x0000fffe - cmp r0, r1 - beq _081D1A24 - ldr r0, =0x0000ffff - mov r9, r0 - mov r8, r1 - adds r4, r6, 0 -_081D19C6: - ldrh r0, [r4, 0x4] - cmp r0, r9 - beq _081D19D6 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _081D19E6 -_081D19D6: - adds r4, 0x8 - adds r5, 0x1 - ldr r0, [r4] - cmp r0, 0 - beq _081D19E6 - ldrh r0, [r4, 0x4] - cmp r0, r8 - bne _081D19C6 -_081D19E6: - lsls r0, r5, 3 - adds r0, r6 - ldrh r1, [r0, 0x4] - ldr r0, =0x0000fffe - cmp r1, r0 - beq _081D1A24 - cmp r5, 0 - beq _081D19F8 - subs r5, 0x1 -_081D19F8: - lsls r0, r5, 3 - adds r4, r0, r6 - ldrh r1, [r4, 0x6] - ldr r0, =0x0000ffff - cmp r1, r0 - beq _081D1A0A - adds r0, r1, 0 - bl FlagSet -_081D1A0A: - ldr r1, [r4] - mov r0, r10 - bl StringExpandPlaceholders - b _081D1A5C - .pool -_081D1A1C: - adds r5, 0x2 - b _081D1A50 -_081D1A20: - adds r5, 0x3 - b _081D1A50 -_081D1A24: - ldr r0, =0x00000864 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _081D1A50 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x000009ca - adds r0, r1 - adds r0, r7 - ldrb r0, [r0] - cmp r0, 0 - bne _081D1A1C - adds r0, r7, 0 - bl CountBattledRematchTeams - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bhi _081D1A20 - adds r5, 0x1 -_081D1A50: - lsls r0, r5, 3 - adds r0, r6 - ldr r1, [r0] - mov r0, r10 - bl StringExpandPlaceholders -_081D1A5C: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D199C - - thumb_func_start sub_81D1A78 -sub_81D1A78: @ 81D1A78 - push {r4-r6,lr} - adds r5, r1, 0 - adds r6, r2, 0 - cmp r0, 0x14 - bhi _081D1AA2 - ldr r1, =gUnknown_086252A8 - lsls r0, 2 - adds r0, r1 - ldr r4, [r0] - adds r0, r4, 0 - bl sub_81D1574 - ldr r1, =gUnknown_08625374 - lsls r0, 2 - adds r0, r1 - ldr r3, [r0] - adds r0, r4, 0 - adds r1, r5, 0 - adds r2, r6, 0 - bl _call_via_r3 -_081D1AA2: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1A78 - - thumb_func_start sub_81D1AB0 -sub_81D1AB0: @ 81D1AB0 - ldr r3, [r0, 0x4] - str r3, [r1] - ldr r0, [r0, 0x8] - str r0, [r2] - bx lr - thumb_func_end sub_81D1AB0 - - thumb_func_start sub_81D1ABC -sub_81D1ABC: @ 81D1ABC - push {r4,r5,lr} - adds r5, r1, 0 - adds r4, r0, 0 - ldr r0, [r4, 0xC] - cmp r0, 0 - bne _081D1AD0 - ldrh r0, [r4, 0x4] - bl sub_81D1B0C - b _081D1AD2 -_081D1AD0: - str r0, [r2] -_081D1AD2: - ldr r0, [r4, 0x8] - str r0, [r5] - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81D1ABC - - thumb_func_start sub_81D1ADC -sub_81D1ADC: @ 81D1ADC - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldrh r0, [r4, 0x4] - bl sub_81D1B0C - ldr r0, [r4, 0x8] - str r0, [r5] - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81D1ADC - - thumb_func_start sub_81D1AF4 -sub_81D1AF4: @ 81D1AF4 - ldr r3, [r0, 0x4] - str r3, [r1] - ldr r0, [r0, 0x8] - str r0, [r2] - bx lr - thumb_func_end sub_81D1AF4 - - thumb_func_start sub_81D1B00 -sub_81D1B00: @ 81D1B00 - ldr r3, [r0, 0x4] - str r3, [r1] - ldr r0, [r0, 0x8] - str r0, [r2] - bx lr - thumb_func_end sub_81D1B00 - - thumb_func_start sub_81D1B0C -sub_81D1B0C: @ 81D1B0C - push {r4,r5,lr} - adds r4, r1, 0 - adds r5, r2, 0 - bl sub_81D15BC - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTrainers - adds r1, r0 - ldrb r2, [r1, 0x1] - movs r0, 0xD - muls r0, r2 - ldr r2, =gTrainerClassNames - adds r0, r2 - str r0, [r4] - adds r1, 0x4 - str r1, [r5] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1B0C - - thumb_func_start sub_81D1B40 -sub_81D1B40: @ 81D1B40 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r6, r0, 0 - movs r5, 0 - ldr r2, =gUnknown_08625388 - movs r0, 0x8 - adds r0, r2 - mov r9, r0 -_081D1B54: - lsls r0, r5, 1 - adds r0, r5 - lsls r0, 3 - adds r0, r2 - ldrh r0, [r0] - cmp r0, r6 - bne _081D1BBC - adds r4, r5, 0x1 - lsls r1, 2 - mov r8, r1 - cmp r4, 0x3 - bhi _081D1BA8 - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 3 - adds r0, r2 - ldrh r0, [r0] - cmp r0, r6 - bne _081D1BA8 - ldr r7, =gUnknown_08625388 -_081D1B7C: - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 3 - adds r1, r7, 0x4 - adds r0, r1 - ldrh r0, [r0] - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _081D1BA8 - adds r5, r4, 0 - adds r4, r5, 0x1 - cmp r4, 0x3 - bhi _081D1BA8 - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 3 - adds r0, r7 - ldrh r0, [r0] - cmp r0, r6 - beq _081D1B7C -_081D1BA8: - lsls r0, r5, 1 - adds r0, r5 - lsls r0, 3 - add r0, r8 - add r0, r9 - ldr r0, [r0] - b _081D1BC4 - .pool -_081D1BBC: - adds r5, 0x1 - cmp r5, 0x3 - bls _081D1B54 - movs r0, 0 -_081D1BC4: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81D1B40 - - thumb_func_start sub_81D1BD0 -sub_81D1BD0: @ 81D1BD0 - push {lr} - adds r3, r0, 0 - movs r2, 0 - ldr r1, =gUnknown_08625388 -_081D1BD8: - ldrh r0, [r1] - cmp r0, r3 - bne _081D1BE8 - ldrh r0, [r1, 0x2] - b _081D1BF4 - .pool -_081D1BE8: - adds r1, 0x18 - adds r2, 0x1 - cmp r2, 0x3 - bls _081D1BD8 - movs r0, 0x1 - negs r0, r0 -_081D1BF4: - pop {r1} - bx r1 - thumb_func_end sub_81D1BD0 - - thumb_func_start sub_81D1BF8 -sub_81D1BF8: @ 81D1BF8 - push {r4,r5,lr} - adds r5, r0, 0 - movs r4, 0 -_081D1BFE: - adds r0, r4, 0 - bl sub_81D1854 - cmp r0, 0x4E - beq _081D1C10 - cmp r0, r5 - bne _081D1C10 - movs r0, 0x1 - b _081D1C18 -_081D1C10: - adds r4, 0x1 - cmp r4, 0x14 - ble _081D1BFE - movs r0, 0 -_081D1C18: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81D1BF8 - - thumb_func_start sub_81D1C20 -sub_81D1C20: @ 81D1C20 - push {lr} - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - bl sub_81D15CC - cmp r0, 0 - blt _081D1C3C - movs r1, 0xAE - lsls r1, 1 - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - bl FlagSet -_081D1C3C: - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1C20 - thumb_func_start sub_81D1C44 sub_81D1C44: @ 81D1C44 push {r4,lr} diff --git a/data/match_call.s b/data/match_call.s new file mode 100644 index 000000000..fa8fa5a5a --- /dev/null +++ b/data/match_call.s @@ -0,0 +1,752 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +gUnknown_08624D1C:: @ 8624D1C + .4byte gText_MrStone_Pokenav_2B60C0 + .2byte 0xFFFF + .byte 0x58 + .byte 1 + .4byte gText_MrStone_Pokenav_2B61E6 + .byte 0x58 + .byte 1 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B6302 + .byte 0xBD + .byte 0 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B63A0 + .byte 16 + .byte 1 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B64A2 + .byte 0x6A + .byte 0 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B6526 + .byte 0xF4 + .byte 4 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B65BB + .byte 0x97 + .byte 0 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B6664 + .byte 0x6f + .byte 0 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B66B1 + .byte 0x70 + .byte 0 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B6703 + .byte 0xf7 + .byte 4 + .2byte 0xFFFF + .4byte gText_MrStone_Pokenav_2B67ED + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_08624D7C:: @ 8624D7C + .byte 0 + .byte 10 + .2byte 0xFFFF + .4byte gUnknown_085EFAEF + .4byte gUnknown_085EFAFA + .4byte gUnknown_08624D1C + +gUnknown_08624D8C:: @ 8624D8C + .4byte gText_Norman_Pokenav_2B5719 + .byte 0x32 + .byte 1 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5795 + .byte 0xF1 + .byte 4 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B584D + .byte 0xF3 + .byte 4 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B58E3 + .byte 0xF4 + .byte 4 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5979 + .byte 0xD4 + .byte 0 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5A07 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5A69 + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5ACF + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte gText_Norman_Pokenav_2B5B5E + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_08624DDC:: @ 8624DDC + .byte 5, 7, 0x32, 1, 0x45, 0, 0, 0 + .4byte gUnknown_085EFB25 + .4byte gUnknown_085EFB47 + .4byte gUnknown_08624D8C + +gUnknown_08624DF0:: @ 8624DF0 + .byte 3, 0, 0x19, 1 + .4byte gUnknown_085EFBC9 + .4byte gUnknown_085E8270 + +gUnknown_08624DFC:: @ 8624DFC + .4byte gText_Mom_Pokenav_2B227B + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Mom_Pokenav_2B2310 + .byte 0xF4 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_Mom_Pokenav_2B23F3 + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_08624E1C:: @ 8624E1C + .byte 0, 0, 0xD8, 0 + .4byte gUnknown_085EFB32 + .4byte gUnknown_085EFB4B + .4byte gUnknown_08624DFC + +gUnknown_08624E2C:: @ 8624E2C + .4byte gText_Steven_Pokenav_2B5B95 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5C53 + .byte 0xC7 + .byte 0 + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5CC9 + .byte 0xD4 + .byte 0 + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5DB4 + .byte 0x70 + .byte 0 + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5E26 + .byte 0xF6 + .byte 4 + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5EA2 + .byte 0x81 + .byte 0 + .2byte 0xFFFF + .4byte gText_Steven_Pokenav_2B5ED9 + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_08624E6C:: @ 8624E6C + .byte 0, 0xD5, 0x31, 1 + .4byte gUnknown_085EFB04 + .4byte gUnknown_085EFB11 + .4byte gUnknown_08624E2C + +gUnknown_08624E7C:: @ 8624E7C + .4byte gText_May_Pokenav_2B3AB3 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3B3F + .byte 0xF1 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3C13 + .byte 0x95 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3CF3 + .byte 0x24 + .byte 0x3 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3D4B + .byte 0x6A + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3DD1 + .byte 0xF3 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3E69 + .byte 0xF4 + .byte 4 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3ECD + .byte 0x97 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3F2B + .byte 0xD4 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B3FFB + .byte 0x6F + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B402B + .byte 0x61 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B414B + .byte 0x70 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B4228 + .byte 0x81 + .byte 0 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B42E0 + .byte 0xF7 + .byte 4 + .2byte 0xFFFF + .4byte gText_May_Pokenav_2B4350 + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_08624EFC:: @ 8624EFC + .byte 4, 0, 0xFD, 0 + .4byte gUnknown_085EFB18 + .4byte gExpandedPlaceholder_May + .4byte gUnknown_08624E7C + +gUnknown_08624F0C:: @ 8624F0C + .4byte gText_Brendan_Pokenav_2B43EF + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4486 + .byte 0xF1 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4560 + .byte 0x95 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B463F + .byte 0x24 + .byte 0x3 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B46B7 + .byte 0x6A + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4761 + .byte 0xF3 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B47F4 + .byte 0xF4 + .byte 4 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4882 + .byte 0x97 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4909 + .byte 0xD4 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B49C4 + .byte 0x6F + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4A44 + .byte 0x61 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4B28 + .byte 0x70 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4C15 + .byte 0x81 + .byte 0 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4CD8 + .byte 0xF7 + .byte 4 + .2byte 0xFFFF + .4byte gText_Brendan_Pokenav_2B4D46 + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_08624F8C:: @ 8624F8C + .byte 4, 1, 0xFD, 0 + .4byte gUnknown_085EFB18 + .4byte gExpandedPlaceholder_Brendan + .4byte gUnknown_08624F0C + +gUnknown_08624F9C:: @ 8624F9C + .4byte gText_Wally_Pokenav_2B4DE2 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B4E57 + .byte 0xC7 + .byte 0 + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B4EA5 + .byte 0xF3 + .byte 0x4 + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B4F41 + .byte 0x97 + .byte 0 + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B4FF3 + .byte 0x6F + .byte 0 + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B50B1 + .byte 0x81 + .byte 0 + .2byte 0xFFFF + .4byte gText_Wally_Pokenav_2B5100 + .byte 0x7E + .byte 0 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_08624FDC:: @ 8624FDC + .byte 0x24, 3, 5, 0 + .2byte 0x6F, 0xD5 + .byte 0x5A, 3, 0x46, 0, 0xFF, 0xFF, 0xD5, 0 + +gUnknown_08624FEC:: @ 8624FEC + .byte 2, 0, 0xD6, 0 + .4byte 0x40 + .4byte gUnknown_085EFB3E + .4byte gUnknown_08624F9C + .4byte gUnknown_08624FDC + +gUnknown_08624500:: @ 8624500 + .4byte gText_Scott_Pokenav_2B5184 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B5275 + .byte 0x8B + .byte 0 + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B5323 + .byte 0x97 + .byte 0 + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B53DB + .byte 0xD4 + .byte 0 + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B54A5 + .byte 0x70 + .byte 0 + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B5541 + .byte 0xF7 + .byte 4 + .2byte 0xFFFF + .4byte gText_Scott_Pokenav_2B56CA + .byte 0x64 + .byte 8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + + +gUnknown_08625040:: @ 8625040 + .byte 0, 0xD5, 0xD7, 0 + .4byte gUnknown_085EFB4F + .4byte gUnknown_085EFB5C + .4byte gUnknown_08624500 + +gUnknown_08625050:: @ 8625050 + .4byte gText_Roxanne_Pokenav_2B2456 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Roxanne_Pokenav_2B250E + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Roxanne_Pokenav_2B25C1 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Roxanne_Pokenav_2B2607 + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_08625078:: @ 8625078 + .byte 5, 10, 0xD3, 1 + .4byte 0x41 + .4byte gUnknown_085EFB62 + .4byte NULL + .4byte gUnknown_08625050 + +gUnknown_0862508C:: @ 862508C + .4byte gText_Brawly_Pokenav_2B2659 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Brawly_Pokenav_2B275D + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Brawly_Pokenav_2B286F + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Brawly_Pokenav_2B28D1 + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_086250B4:: @ 86250B4 + .byte 5, 2, 0xD4, 1 + .4byte 0x42 + .4byte gUnknown_085EFB6F + .4byte NULL + .4byte gUnknown_0862508C + +gUnknown_086250C8:: @ 86250C8 + .4byte gText_Wattson_Pokenav_2B2912 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Wattson_Pokenav_2B29CA + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Wattson_Pokenav_2B2AB6 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Wattson_Pokenav_2B2B01 + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_086250F0:: @ 86250F0 + .byte 5, 9, 0xD5, 1 + .4byte 0x43 + .4byte gUnknown_085EFB7B + .4byte NULL + .4byte gUnknown_086250C8 + +gUnknown_08625104:: @ 8625104 + .4byte gText_Flannery_Pokenav_2B2B4D + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Flannery_Pokenav_2B2C0E + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Flannery_Pokenav_2B2CF1 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Flannery_Pokenav_2B2D54 + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_0862512C:: @ 862512C + .byte 5, 3, 0xD6, 1 + .4byte 0x44 + .4byte gUnknown_085EFB87 + .4byte NULL + .4byte gUnknown_08625104 + +gUnknown_08625140:: @ 8625140 + .4byte gText_Winona_Pokenav_2B2DA4 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Winona_Pokenav_2B2E2B + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Winona_Pokenav_2B2EC2 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Winona_Pokenav_2B2F16 + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_08625168:: @ 8625168 + .byte 5, 11, 0xD7, 1 + .4byte 0x46 + .4byte gUnknown_085EFB94 + .4byte NULL + .4byte gUnknown_08625140 + +gUnknown_0862517C:: @ 862517C + .4byte gText_TateLiza_Pokenav_2B2F97 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_TateLiza_Pokenav_2B306E + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_TateLiza_Pokenav_2B3158 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_TateLiza_Pokenav_2B31CD + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_086251A4:: @ 86251A4 + .byte 5, 13, 0xD8, 1 + .4byte 0x47 + .4byte gUnknown_085EFB9E + .4byte NULL + .4byte gUnknown_0862517C + +gUnknown_086251B8:: @ 86251B8 + .4byte gText_Juan_Pokenav_2B3249 + .byte 0xFE + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Juan_Pokenav_2B32EC + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Juan_Pokenav_2B33AA + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte gText_Juan_Pokenav_2B341E + .byte 0x64 + .byte 0x8 + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_086251E0:: @ 86251E0 + .byte 5, 14, 0xD9, 1 + .4byte 0x48 + .4byte gUnknown_085EFBA9 + .4byte NULL + .4byte gUnknown_086251B8 + +gUnknown_086251F4:: @ 86251F4 + .4byte gText_Sidney_Pokenav_2B34CC + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_08625204:: @ 8625204 + .byte 5, 15, 0xA5, 1 + .4byte 0x49 + .4byte gUnknown_085EFBB5 + .4byte NULL + .4byte gUnknown_086251F4 + +gUnknown_08625218:: @ 8625218 + .4byte gText_Phoebe_Pokenav_2B3561 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_08625228:: @ 8625228 + .byte 5, 15, 0xA6, 1 + .4byte 0x4A + .4byte gUnknown_085EFBB5 + .4byte NULL + .4byte gUnknown_08625218 + +gUnknown_0862523C:: @ 862523C + .4byte gText_Glacia_Pokenav_2B35E4 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_0862524C:: @ 862524C + .byte 5, 15, 0xA7, 1 + .4byte 0x4B + .4byte gUnknown_085EFBB5 + .4byte NULL + .4byte gUnknown_0862523C + +gUnknown_08625260:: @ 8625260 + .4byte gText_Drake_Pokenav_2B368B + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_08625270:: @ 8625270 + .byte 5, 15, 0xA8, 1 + .4byte 0x4C + .4byte gUnknown_085EFBB5 + .4byte NULL + .4byte gUnknown_08625260 + +gUnknown_08625284:: @ 8625284 + .4byte gText_Wallace_Pokenav_2B3790 + .byte 0xFF + .byte 0xFF + .2byte 0xFFFF + .4byte NULL + .4byte 0xFFFFFFFF + +gUnknown_08625294:: @ 8625294 + .byte 5, 15, 0xA9, 1 + .4byte 0x4D + .4byte gUnknown_085EFBC0 + .4byte NULL + .4byte gUnknown_08625284 + +gUnknown_086252A8:: @ 86252A8 + .4byte gUnknown_08624D7C + .4byte gUnknown_08624DF0 + .4byte gUnknown_08624F8C + .4byte gUnknown_08624EFC + .4byte gUnknown_08624FEC + .4byte gUnknown_08624DDC + .4byte gUnknown_08624E1C + .4byte gUnknown_08624E6C + .4byte gUnknown_08625040 + .4byte gUnknown_08625078 + .4byte gUnknown_086250B4 + .4byte gUnknown_086250F0 + .4byte gUnknown_0862512C + .4byte gUnknown_08625168 + .4byte gUnknown_086251A4 + .4byte gUnknown_086251E0 + .4byte gUnknown_08625204 + .4byte gUnknown_08625228 + .4byte gUnknown_0862524C + .4byte gUnknown_08625270 + .4byte gUnknown_08625294 + +gUnknown_086252FC:: @ 86252FC + .4byte sub_81D1628 + .4byte sub_81D164C + .4byte sub_81D1670 + .4byte sub_81D1694 + .4byte sub_81D16CC + +gUnknown_08625310:: @ 8625310 + .4byte sub_81D1714 + .4byte sub_81D1718 + .4byte sub_81D171C + .4byte sub_81D1750 + .4byte sub_81D1754 + +gUnknown_08625324:: @ 8625324 + .4byte sub_81D178C + .4byte sub_81D1790 + .4byte sub_81D17C0 + .4byte sub_81D17E0 + .4byte sub_81D17E4 + +gUnknown_08625338:: @ 8625338 + .4byte sub_81D1840 + .4byte sub_81D1844 + .4byte sub_81D1848 + .4byte sub_81D184C + .4byte sub_81D1850 + +gUnknown_0862534C:: @ 862534C + .4byte sub_81D1888 + .4byte sub_81D188C + .4byte sub_81D1890 + .4byte sub_81D1894 + .4byte sub_81D1898 + +gUnknown_08625360:: @ 8625360 + .4byte sub_81D18D0 + .4byte sub_81D18DC + .4byte sub_81D18FC + .4byte sub_81D1908 + .4byte sub_81D1914 + +gUnknown_08625374:: @ 8625374 + .4byte sub_81D1AB0 + .4byte sub_81D1ABC + .4byte sub_81D1ADC + .4byte sub_81D1AF4 + .4byte sub_81D1B00 + +gUnknown_08625388:: @ 8625388 + .2byte 7, 0x4B, 0xFFFF, 0 + .4byte gUnknown_085ED453 + .4byte gUnknown_085ED46B + .4byte gUnknown_085ED483 + .4byte gUnknown_085ED49D + .2byte 7, 0x4B, 0x4F6, 0 + .4byte gUnknown_085ED453 + .4byte gUnknown_085ED46B + .4byte gUnknown_085ED4B3 + .4byte gUnknown_085ED4CE + .2byte 2, 0X3C, 0xFFFF, 0 + .4byte gUnknown_085ED4E3 + .4byte gUnknown_085ED4FA + .4byte gUnknown_085ED516 + .4byte gUnknown_085ED52F + .2byte 3, 0x3F, 0xFFFF, 0 + .4byte gUnknown_085ED547 + .4byte gUnknown_085ED563 + .4byte gUnknown_085ED579 + .4byte gUnknown_085ED58F diff --git a/data/pokenav.s b/data/pokenav.s index 03c0d4b8a..9a89e2251 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -2030,754 +2030,8 @@ gUnknown_08624CF8:: @ 8624CF8 gUnknown_08624D04:: @ 8624D04 spr_template 9, 15, gUnknown_08624CB0, gDummySpriteAnimTable, NULL, gUnknown_08624CF8, SpriteCallbackDummy - -gUnknown_08624D1C:: @ 8624D1C - .4byte gText_MrStone_Pokenav_2B60C0 - .2byte 0xFFFF - .byte 0x58 - .byte 1 - .4byte gText_MrStone_Pokenav_2B61E6 - .byte 0x58 - .byte 1 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B6302 - .byte 0xBD - .byte 0 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B63A0 - .byte 16 - .byte 1 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B64A2 - .byte 0x6A - .byte 0 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B6526 - .byte 0xF4 - .byte 4 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B65BB - .byte 0x97 - .byte 0 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B6664 - .byte 0x6f - .byte 0 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B66B1 - .byte 0x70 - .byte 0 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B6703 - .byte 0xf7 - .byte 4 - .2byte 0xFFFF - .4byte gText_MrStone_Pokenav_2B67ED - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_08624D7C:: @ 8624D7C - .byte 0 - .byte 10 - .2byte 0xFFFF - .4byte gUnknown_085EFAEF - .4byte gUnknown_085EFAFA - .4byte gUnknown_08624D1C - -gUnknown_08624D8C:: @ 8624D8C - .4byte gText_Norman_Pokenav_2B5719 - .byte 0x32 - .byte 1 - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B5795 - .byte 0xF1 - .byte 4 - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B584D - .byte 0xF3 - .byte 4 - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B58E3 - .byte 0xF4 - .byte 4 - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B5979 - .byte 0xD4 - .byte 0 - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B5A07 - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B5A69 - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B5ACF - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte gText_Norman_Pokenav_2B5B5E - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_08624DDC:: @ 8624DDC - .byte 5, 7, 0x32, 1, 0x45, 0, 0, 0 - .4byte gUnknown_085EFB25 - .4byte gUnknown_085EFB47 - .4byte gUnknown_08624D8C - -gUnknown_08624DF0:: @ 8624DF0 - .byte 3, 0, 0x19, 1 - .4byte gUnknown_085EFBC9 - .4byte gUnknown_085E8270 - -gUnknown_08624DFC:: @ 8624DFC - .4byte gText_Mom_Pokenav_2B227B - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Mom_Pokenav_2B2310 - .byte 0xF4 - .byte 0x4 - .2byte 0xFFFF - .4byte gText_Mom_Pokenav_2B23F3 - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_08624E1C:: @ 8624E1C - .byte 0, 0, 0xD8, 0 - .4byte gUnknown_085EFB32 - .4byte gUnknown_085EFB4B - .4byte gUnknown_08624DFC - -gUnknown_08624E2C:: @ 8624E2C - .4byte gText_Steven_Pokenav_2B5B95 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Steven_Pokenav_2B5C53 - .byte 0xC7 - .byte 0 - .2byte 0xFFFF - .4byte gText_Steven_Pokenav_2B5CC9 - .byte 0xD4 - .byte 0 - .2byte 0xFFFF - .4byte gText_Steven_Pokenav_2B5DB4 - .byte 0x70 - .byte 0 - .2byte 0xFFFF - .4byte gText_Steven_Pokenav_2B5E26 - .byte 0xF6 - .byte 4 - .2byte 0xFFFF - .4byte gText_Steven_Pokenav_2B5EA2 - .byte 0x81 - .byte 0 - .2byte 0xFFFF - .4byte gText_Steven_Pokenav_2B5ED9 - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_08624E6C:: @ 8624E6C - .byte 0, 0xD5, 0x31, 1 - .4byte gUnknown_085EFB04 - .4byte gUnknown_085EFB11 - .4byte gUnknown_08624E2C - -gUnknown_08624E7C:: @ 8624E7C - .4byte gText_May_Pokenav_2B3AB3 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3B3F - .byte 0xF1 - .byte 0x4 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3C13 - .byte 0x95 - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3CF3 - .byte 0x24 - .byte 0x3 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3D4B - .byte 0x6A - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3DD1 - .byte 0xF3 - .byte 0x4 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3E69 - .byte 0xF4 - .byte 4 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3ECD - .byte 0x97 - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3F2B - .byte 0xD4 - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B3FFB - .byte 0x6F - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B402B - .byte 0x61 - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B414B - .byte 0x70 - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B4228 - .byte 0x81 - .byte 0 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B42E0 - .byte 0xF7 - .byte 4 - .2byte 0xFFFF - .4byte gText_May_Pokenav_2B4350 - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_08624EFC:: @ 8624EFC - .byte 4, 0, 0xFD, 0 - .4byte gUnknown_085EFB18 - .4byte gExpandedPlaceholder_May - .4byte gUnknown_08624E7C - -gUnknown_08624F0C:: @ 8624F0C - .4byte gText_Brendan_Pokenav_2B43EF - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4486 - .byte 0xF1 - .byte 0x4 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4560 - .byte 0x95 - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B463F - .byte 0x24 - .byte 0x3 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B46B7 - .byte 0x6A - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4761 - .byte 0xF3 - .byte 0x4 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B47F4 - .byte 0xF4 - .byte 4 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4882 - .byte 0x97 - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4909 - .byte 0xD4 - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B49C4 - .byte 0x6F - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4A44 - .byte 0x61 - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4B28 - .byte 0x70 - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4C15 - .byte 0x81 - .byte 0 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4CD8 - .byte 0xF7 - .byte 4 - .2byte 0xFFFF - .4byte gText_Brendan_Pokenav_2B4D46 - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_08624F8C:: @ 8624F8C - .byte 4, 1, 0xFD, 0 - .4byte gUnknown_085EFB18 - .4byte gExpandedPlaceholder_Brendan - .4byte gUnknown_08624F0C - -gUnknown_08624F9C:: @ 8624F9C - .4byte gText_Wally_Pokenav_2B4DE2 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Wally_Pokenav_2B4E57 - .byte 0xC7 - .byte 0 - .2byte 0xFFFF - .4byte gText_Wally_Pokenav_2B4EA5 - .byte 0xF3 - .byte 0x4 - .2byte 0xFFFF - .4byte gText_Wally_Pokenav_2B4F41 - .byte 0x97 - .byte 0 - .2byte 0xFFFF - .4byte gText_Wally_Pokenav_2B4FF3 - .byte 0x6F - .byte 0 - .2byte 0xFFFF - .4byte gText_Wally_Pokenav_2B50B1 - .byte 0x81 - .byte 0 - .2byte 0xFFFF - .4byte gText_Wally_Pokenav_2B5100 - .byte 0x7E - .byte 0 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_08624FDC:: @ 8624FDC - .byte 0x24, 3, 5, 0 - .2byte 0x6F, 0xD5 - .byte 0x5A, 3, 0x46, 0, 0xFF, 0xFF, 0xD5, 0 - -gUnknown_08624FEC:: @ 8624FEC - .byte 2, 0, 0xD6, 0 - .4byte 0x40 - .4byte gUnknown_085EFB3E - .4byte gUnknown_08624F9C - .4byte gUnknown_08624FDC - -gUnknown_08624500:: @ 8624500 - .4byte gText_Scott_Pokenav_2B5184 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Scott_Pokenav_2B5275 - .byte 0x8B - .byte 0 - .2byte 0xFFFF - .4byte gText_Scott_Pokenav_2B5323 - .byte 0x97 - .byte 0 - .2byte 0xFFFF - .4byte gText_Scott_Pokenav_2B53DB - .byte 0xD4 - .byte 0 - .2byte 0xFFFF - .4byte gText_Scott_Pokenav_2B54A5 - .byte 0x70 - .byte 0 - .2byte 0xFFFF - .4byte gText_Scott_Pokenav_2B5541 - .byte 0xF7 - .byte 4 - .2byte 0xFFFF - .4byte gText_Scott_Pokenav_2B56CA - .byte 0x64 - .byte 8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_08625040:: @ 8625040 - .byte 0, 0xD5, 0xD7, 0 - .4byte gUnknown_085EFB4F - .4byte gUnknown_085EFB5C - .4byte gUnknown_08624500 - -gUnknown_08625050:: @ 8625050 - .4byte gText_Roxanne_Pokenav_2B2456 - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Roxanne_Pokenav_2B250E - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Roxanne_Pokenav_2B25C1 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Roxanne_Pokenav_2B2607 - .byte 0x64 - .byte 0x8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_08625078:: @ 8625078 - .byte 5, 10, 0xD3, 1 - .4byte 0x41 - .4byte gUnknown_085EFB62 - .4byte NULL - .4byte gUnknown_08625050 - -gUnknown_0862508C:: @ 862508C - .4byte gText_Brawly_Pokenav_2B2659 - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Brawly_Pokenav_2B275D - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Brawly_Pokenav_2B286F - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Brawly_Pokenav_2B28D1 - .byte 0x64 - .byte 0x8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_086250B4:: @ 86250B4 - .byte 5, 2, 0xD4, 1 - .4byte 0x42 - .4byte gUnknown_085EFB6F - .4byte NULL - .4byte gUnknown_0862508C - -gUnknown_086250C8:: @ 86250C8 - .4byte gText_Wattson_Pokenav_2B2912 - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Wattson_Pokenav_2B29CA - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Wattson_Pokenav_2B2AB6 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Wattson_Pokenav_2B2B01 - .byte 0x64 - .byte 0x8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_086250F0:: @ 86250F0 - .byte 5, 9, 0xD5, 1 - .4byte 0x43 - .4byte gUnknown_085EFB7B - .4byte NULL - .4byte gUnknown_086250C8 - -gUnknown_08625104:: @ 8625104 - .4byte gText_Flannery_Pokenav_2B2B4D - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Flannery_Pokenav_2B2C0E - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Flannery_Pokenav_2B2CF1 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Flannery_Pokenav_2B2D54 - .byte 0x64 - .byte 0x8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_0862512C:: @ 862512C - .byte 5, 3, 0xD6, 1 - .4byte 0x44 - .4byte gUnknown_085EFB87 - .4byte NULL - .4byte gUnknown_08625104 - -gUnknown_08625140:: @ 8625140 - .4byte gText_Winona_Pokenav_2B2DA4 - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Winona_Pokenav_2B2E2B - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Winona_Pokenav_2B2EC2 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Winona_Pokenav_2B2F16 - .byte 0x64 - .byte 0x8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_08625168:: @ 8625168 - .byte 5, 11, 0xD7, 1 - .4byte 0x46 - .4byte gUnknown_085EFB94 - .4byte NULL - .4byte gUnknown_08625140 - -gUnknown_0862517C:: @ 862517C - .4byte gText_TateLiza_Pokenav_2B2F97 - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_TateLiza_Pokenav_2B306E - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_TateLiza_Pokenav_2B3158 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_TateLiza_Pokenav_2B31CD - .byte 0x64 - .byte 0x8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_086251A4:: @ 86251A4 - .byte 5, 13, 0xD8, 1 - .4byte 0x47 - .4byte gUnknown_085EFB9E - .4byte NULL - .4byte gUnknown_0862517C - -gUnknown_086251B8:: @ 86251B8 - .4byte gText_Juan_Pokenav_2B3249 - .byte 0xFE - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Juan_Pokenav_2B32EC - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Juan_Pokenav_2B33AA - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte gText_Juan_Pokenav_2B341E - .byte 0x64 - .byte 0x8 - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_086251E0:: @ 86251E0 - .byte 5, 14, 0xD9, 1 - .4byte 0x48 - .4byte gUnknown_085EFBA9 - .4byte NULL - .4byte gUnknown_086251B8 - -gUnknown_086251F4:: @ 86251F4 - .4byte gText_Sidney_Pokenav_2B34CC - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_08625204:: @ 8625204 - .byte 5, 15, 0xA5, 1 - .4byte 0x49 - .4byte gUnknown_085EFBB5 - .4byte NULL - .4byte gUnknown_086251F4 - -gUnknown_08625218:: @ 8625218 - .4byte gText_Phoebe_Pokenav_2B3561 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_08625228:: @ 8625228 - .byte 5, 15, 0xA6, 1 - .4byte 0x4A - .4byte gUnknown_085EFBB5 - .4byte NULL - .4byte gUnknown_08625218 - -gUnknown_0862523C:: @ 862523C - .4byte gText_Glacia_Pokenav_2B35E4 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_0862524C:: @ 862524C - .byte 5, 15, 0xA7, 1 - .4byte 0x4B - .4byte gUnknown_085EFBB5 - .4byte NULL - .4byte gUnknown_0862523C - -gUnknown_08625260:: @ 8625260 - .4byte gText_Drake_Pokenav_2B368B - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_08625270:: @ 8625270 - .byte 5, 15, 0xA8, 1 - .4byte 0x4C - .4byte gUnknown_085EFBB5 - .4byte NULL - .4byte gUnknown_08625260 - -gUnknown_08625284:: @ 8625284 - .4byte gText_Wallace_Pokenav_2B3790 - .byte 0xFF - .byte 0xFF - .2byte 0xFFFF - .4byte NULL - .4byte 0xFFFFFFFF - -gUnknown_08625294:: @ 8625294 - .byte 5, 15, 0xA9, 1 - .4byte 0x4D - .4byte gUnknown_085EFBC0 - .4byte NULL - .4byte gUnknown_08625284 - -gUnknown_086252A8:: @ 86252A8 - .4byte gUnknown_08624D7C - .4byte gUnknown_08624DF0 - .4byte gUnknown_08624F8C - .4byte gUnknown_08624EFC - .4byte gUnknown_08624FEC - .4byte gUnknown_08624DDC - .4byte gUnknown_08624E1C - .4byte gUnknown_08624E6C - .4byte gUnknown_08625040 - .4byte gUnknown_08625078 - .4byte gUnknown_086250B4 - .4byte gUnknown_086250F0 - .4byte gUnknown_0862512C - .4byte gUnknown_08625168 - .4byte gUnknown_086251A4 - .4byte gUnknown_086251E0 - .4byte gUnknown_08625204 - .4byte gUnknown_08625228 - .4byte gUnknown_0862524C - .4byte gUnknown_08625270 - .4byte gUnknown_08625294 - -gUnknown_086252FC:: @ 86252FC - .4byte sub_81D1628 - .4byte sub_81D164C - .4byte sub_81D1670 - .4byte sub_81D1694 - .4byte sub_81D16CC - -gUnknown_08625310:: @ 8625310 - .4byte sub_81D1714 - .4byte sub_81D1718 - .4byte sub_81D171C - .4byte sub_81D1750 - .4byte sub_81D1754 - -gUnknown_08625324:: @ 8625324 - .4byte sub_81D178C - .4byte sub_81D1790 - .4byte sub_81D17C0 - .4byte sub_81D17E0 - .4byte sub_81D17E4 - -gUnknown_08625338:: @ 8625338 - .4byte sub_81D1840 - .4byte sub_81D1844 - .4byte sub_81D1848 - .4byte sub_81D184C - .4byte sub_81D1850 - -gUnknown_0862534C:: @ 862534C - .4byte sub_81D1888 - .4byte sub_81D188C - .4byte sub_81D1890 - .4byte sub_81D1894 - .4byte sub_81D1898 - -gUnknown_08625360:: @ 8625360 - .4byte sub_81D18D0 - .4byte sub_81D18DC - .4byte sub_81D18FC - .4byte sub_81D1908 - .4byte sub_81D1914 - -gUnknown_08625374:: @ 8625374 - .4byte sub_81D1AB0 - .4byte sub_81D1ABC - .4byte sub_81D1ADC - .4byte sub_81D1AF4 - .4byte sub_81D1B00 - -gUnknown_08625388:: @ 8625388 - .2byte 7, 0x4B, 0xFFFF, 0 - .4byte gUnknown_085ED453 - .4byte gUnknown_085ED46B - .4byte gUnknown_085ED483 - .4byte gUnknown_085ED49D - .2byte 7, 0x4B, 0x4F6, 0 - .4byte gUnknown_085ED453 - .4byte gUnknown_085ED46B - .4byte gUnknown_085ED4B3 - .4byte gUnknown_085ED4CE - .2byte 2, 0X3C, 0xFFFF, 0 - .4byte gUnknown_085ED4E3 - .4byte gUnknown_085ED4FA - .4byte gUnknown_085ED516 - .4byte gUnknown_085ED52F - .2byte 3, 0x3F, 0xFFFF, 0 - .4byte gUnknown_085ED547 - .4byte gUnknown_085ED563 - .4byte gUnknown_085ED579 - .4byte gUnknown_085ED58F + .section .rodata.after.match.call gUnknown_086253E8:: @ 86253E8 .4byte 0x8010100 diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index ab710546b..2ffe3afc7 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -13,7 +13,7 @@ AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7 msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4 setvar VAR_0x8004, 642 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 642 callstd 8 release @@ -36,7 +36,7 @@ AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4 setvar VAR_0x8004, 642 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 642 callstd 8 release diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.inc b/data/scripts/maps/AbandonedShip_Rooms_1F.inc index 00fde5ccb..2a6bc36b6 100644 --- a/data/scripts/maps/AbandonedShip_Rooms_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms_1F.inc @@ -24,7 +24,7 @@ AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF waitmovement 0 msgbox AbandonedShip_Rooms_1F_Text_237C2A, 4 setvar VAR_0x8004, 144 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 144 callstd 8 release diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index e5c393221..15ac1bae6 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -115,7 +115,7 @@ JaggedPass_EventScript_2307C8:: @ 82307C8 special sub_80B4808 msgbox JaggedPass_Text_230A2C, 4 setvar VAR_0x8004, 474 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 474 callstd 8 release @@ -139,7 +139,7 @@ JaggedPass_EventScript_230827:: @ 8230827 special sub_80B4808 msgbox JaggedPass_Text_230BC6, 4 setvar VAR_0x8004, 216 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 216 callstd 8 release diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index 76aad489f..4f4ab7c6b 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -15,7 +15,7 @@ MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A waitmovement 0 msgbox MeteorFalls_1F_2R_Text_22C6F6, 4 setvar VAR_0x8004, 392 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 392 callstd 8 release @@ -38,7 +38,7 @@ MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570 msgbox MeteorFalls_1F_2R_Text_22C99C, 4 setvar VAR_0x8004, 681 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 681 callstd 8 release @@ -61,7 +61,7 @@ MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4 msgbox MeteorFalls_1F_2R_Text_22C99C, 4 setvar VAR_0x8004, 681 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 681 callstd 8 release diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index e445fc23f..b4825579c 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -500,7 +500,7 @@ MtChimney_EventScript_22F176:: @ 822F176 waitmovement 0 msgbox MtChimney_Text_2300E3, 4 setvar VAR_0x8004, 313 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 313 callstd 8 release @@ -545,7 +545,7 @@ MtChimney_EventScript_22F234:: @ 822F234 waitmovement 0 msgbox MtChimney_Text_230557, 4 setvar VAR_0x8004, 1 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 1 callstd 8 release diff --git a/data/scripts/maps/MtPyre_3F.inc b/data/scripts/maps/MtPyre_3F.inc index 0d733a433..ec5373509 100644 --- a/data/scripts/maps/MtPyre_3F.inc +++ b/data/scripts/maps/MtPyre_3F.inc @@ -25,7 +25,7 @@ MtPyre_3F_EventScript_2317AD:: @ 82317AD waitmovement 0 msgbox MtPyre_3F_Text_231A49, 4 setvar VAR_0x8004, 9 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 9 callstd 8 release diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 7a98eb2ab..8d5d912c2 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -15,7 +15,7 @@ MtPyre_6F_EventScript_231D67:: @ 8231D67 waitmovement 0 msgbox MtPyre_6F_Text_231E43, 4 setvar VAR_0x8004, 108 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 108 callstd 8 release diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 5afb12d68..907f07623 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -301,7 +301,7 @@ PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 msgbox PetalburgWoods_Text_22E8C3, 4 setvar VAR_0x8004, 621 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 621 callstd 8 release @@ -317,7 +317,7 @@ PetalburgWoods_EventScript_22E2EF:: @ 822E2EF PetalburgWoods_EventScript_22E302:: @ 822E302 msgbox PetalburgWoods_Text_22E914, 4 setvar VAR_0x8004, 621 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 621 callstd 8 release diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index ae82ea0b4..cd817df35 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -41,7 +41,7 @@ Route102_EventScript_1EC146:: @ 81EC146 Route102_EventScript_1EC157:: @ 81EC157 msgbox Route102_Text_294668, 4 setvar VAR_0x8004, 318 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 318 callstd 8 release @@ -57,7 +57,7 @@ Route102_EventScript_1EC170:: @ 81EC170 Route102_EventScript_1EC183:: @ 81EC183 msgbox Route102_Text_2945EB, 4 setvar VAR_0x8004, 318 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 318 callstd 8 release diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index fa055a971..d71ec729c 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -218,7 +218,7 @@ Route103_EventScript_1EC60B:: @ 81EC60B Route103_EventScript_1EC63A:: @ 81EC63A msgbox Route103_Text_294B8A, 4 setvar VAR_0x8004, 481 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 481 callstd 8 release @@ -240,7 +240,7 @@ Route103_EventScript_1EC66E:: @ 81EC66E Route103_EventScript_1EC69D:: @ 81EC69D msgbox Route103_Text_294B8A, 4 setvar VAR_0x8004, 481 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 481 callstd 8 release @@ -270,7 +270,7 @@ Route103_EventScript_1EC714:: @ 81EC714 waitmovement 0 msgbox Route103_Text_294F7E, 4 setvar VAR_0x8004, 293 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 293 callstd 8 release diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index e672b7ad2..314b47e1d 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -904,7 +904,7 @@ Route104_EventScript_1ED3CE:: @ 81ED3CE Route104_EventScript_1ED3DF:: @ 81ED3DF msgbox Route104_Text_29576B, 4 setvar VAR_0x8004, 604 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 604 callstd 8 release @@ -920,7 +920,7 @@ Route104_EventScript_1ED3F8:: @ 81ED3F8 Route104_EventScript_1ED40B:: @ 81ED40B msgbox Route104_Text_2956FF, 4 setvar VAR_0x8004, 604 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 604 callstd 8 release @@ -955,7 +955,7 @@ Route104_EventScript_1ED47C:: @ 81ED47C Route104_EventScript_1ED48D:: @ 81ED48D msgbox Route104_Text_29595A, 4 setvar VAR_0x8004, 136 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 136 callstd 8 release @@ -971,7 +971,7 @@ Route104_EventScript_1ED4A6:: @ 81ED4A6 Route104_EventScript_1ED4B9:: @ 81ED4B9 msgbox Route104_Text_2958F8, 4 setvar VAR_0x8004, 136 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 136 callstd 8 release @@ -1006,7 +1006,7 @@ Route104_EventScript_1ED52A:: @ 81ED52A Route104_EventScript_1ED53B:: @ 81ED53B msgbox Route104_Text_295B60, 4 setvar VAR_0x8004, 114 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 114 callstd 8 release @@ -1022,7 +1022,7 @@ Route104_EventScript_1ED554:: @ 81ED554 Route104_EventScript_1ED567:: @ 81ED567 msgbox Route104_Text_295B01, 4 setvar VAR_0x8004, 114 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 114 callstd 8 release diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index 32c6826af..3cb6d9ae6 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -75,7 +75,7 @@ Route105_EventScript_1EE300:: @ 81EE300 waitmovement 0 msgbox Route105_Text_296159, 4 setvar VAR_0x8004, 737 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 737 callstd 8 release diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 132621cb8..fdfff0587 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -29,7 +29,7 @@ Route106_EventScript_1EE4ED:: @ 81EE4ED waitmovement 0 msgbox Route106_Text_2963E3, 4 setvar VAR_0x8004, 339 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 339 callstd 8 release diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index b7d144ef2..2c8364592 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -20,7 +20,7 @@ Route107_EventScript_1EE5D8:: @ 81EE5D8 waitmovement 0 msgbox Route107_Text_29685A, 4 setvar VAR_0x8004, 155 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 155 callstd 8 release diff --git a/data/scripts/maps/Route108.inc b/data/scripts/maps/Route108.inc index e77006508..25657c5a4 100644 --- a/data/scripts/maps/Route108.inc +++ b/data/scripts/maps/Route108.inc @@ -40,7 +40,7 @@ Route108_EventScript_1EE729:: @ 81EE729 waitmovement 0 msgbox Route108_Text_296FD8, 4 setvar VAR_0x8004, 740 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 740 callstd 8 release diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index d708246de..123f78db1 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -409,7 +409,7 @@ Route109_EventScript_1EEAC5:: @ 81EEAC5 waitmovement 0 msgbox Route109_Text_2973C1, 4 setvar VAR_0x8004, 64 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 64 callstd 8 release @@ -434,7 +434,7 @@ Route109_EventScript_1EEB27:: @ 81EEB27 waitmovement 0 msgbox Route109_Text_297520, 4 setvar VAR_0x8004, 57 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 57 callstd 8 release diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 3c743fb3c..9d00303c9 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -188,7 +188,7 @@ Route110_EventScript_1EF44C:: @ 81EF44C waitmovement 0 msgbox Route110_Text_298201, 4 setvar VAR_0x8004, 512 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 512 callstd 8 release @@ -228,7 +228,7 @@ Route110_EventScript_1EF4F3:: @ 81EF4F3 waitmovement 0 msgbox Route110_Text_297CFE, 4 setvar VAR_0x8004, 353 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 353 callstd 8 release @@ -258,7 +258,7 @@ Route110_EventScript_1EF56C:: @ 81EF56C waitmovement 0 msgbox Route110_Text_297ECD, 4 setvar VAR_0x8004, 358 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 358 callstd 8 release @@ -283,7 +283,7 @@ Route110_EventScript_1EF5CE:: @ 81EF5CE waitmovement 0 msgbox Route110_Text_2983EE, 4 setvar VAR_0x8004, 302 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 302 callstd 8 release diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 8e1672dfe..a23565c14 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -485,7 +485,7 @@ Route111_EventScript_1F128C:: @ 81F128C waitmovement 0 msgbox Route111_Text_298C00, 4 setvar VAR_0x8004, 44 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 44 callstd 8 release @@ -525,7 +525,7 @@ Route111_EventScript_1F1333:: @ 81F1333 waitmovement 0 msgbox Route111_Text_29903D, 4 setvar VAR_0x8004, 78 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 78 callstd 8 release @@ -550,7 +550,7 @@ Route111_EventScript_1F1395:: @ 81F1395 waitmovement 0 msgbox Route111_Text_29921D, 4 setvar VAR_0x8004, 94 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 94 callstd 8 release diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index 88262fadb..0ad5ee47c 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -79,7 +79,7 @@ Route112_EventScript_1F1EAD:: @ 81F1EAD waitmovement 0 msgbox Route112_Text_29993C, 4 setvar VAR_0x8004, 627 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 627 callstd 8 release diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index c1ce29b72..d990527a6 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -72,7 +72,7 @@ Route113_EventScript_1F221A:: @ 81F221A waitmovement 0 msgbox Route113_Text_299F49, 4 setvar VAR_0x8004, 434 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 434 callstd 8 release @@ -97,7 +97,7 @@ Route113_EventScript_1F227C:: @ 81F227C waitmovement 0 msgbox Route113_Text_29A0A2, 4 setvar VAR_0x8004, 419 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 419 callstd 8 release diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 6be6bea91..9443d35bc 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -122,7 +122,7 @@ Route114_EventScript_1F26C8:: @ 81F26C8 waitmovement 0 msgbox Route114_Text_29A9F7, 4 setvar VAR_0x8004, 143 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 143 callstd 8 release @@ -147,7 +147,7 @@ Route114_EventScript_1F272A:: @ 81F272A waitmovement 0 msgbox Route114_Text_29ABA6, 4 setvar VAR_0x8004, 206 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 206 callstd 8 release diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 69edd5830..2d4f7c2e3 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -50,7 +50,7 @@ Route115_EventScript_1F29BA:: @ 81F29BA waitmovement 0 msgbox Route115_Text_29B2B3, 4 setvar VAR_0x8004, 307 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 307 callstd 8 release @@ -80,7 +80,7 @@ Route115_EventScript_1F2A33:: @ 81F2A33 waitmovement 0 msgbox Route115_Text_29B50B, 4 setvar VAR_0x8004, 183 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 183 callstd 8 release @@ -105,7 +105,7 @@ Route115_EventScript_1F2A95:: @ 81F2A95 waitmovement 0 msgbox Route115_Text_29B6AB, 4 setvar VAR_0x8004, 427 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 427 callstd 8 release diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 00bc1ff6c..a8d73397c 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -281,7 +281,7 @@ Route116_EventScript_1F2F03:: @ 81F2F03 waitmovement 0 msgbox Route116_Text_29BE71, 4 setvar VAR_0x8004, 273 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 273 callstd 8 release @@ -297,7 +297,7 @@ Route116_EventScript_1F2F22:: @ 81F2F22 Route116_EventScript_1F2F35:: @ 81F2F35 msgbox Route116_Text_29BDEF, 4 setvar VAR_0x8004, 273 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 273 callstd 8 release @@ -342,7 +342,7 @@ Route116_EventScript_1F2FDF:: @ 81F2FDF waitmovement 0 msgbox Route116_Text_29C096, 4 setvar VAR_0x8004, 280 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 280 callstd 8 release @@ -358,7 +358,7 @@ Route116_EventScript_1F2FFE:: @ 81F2FFE Route116_EventScript_1F3011:: @ 81F3011 msgbox Route116_Text_29C052, 4 setvar VAR_0x8004, 280 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 280 callstd 8 release diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 20240dc82..55a7b910e 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -52,7 +52,7 @@ Route117_EventScript_1F39FC:: @ 81F39FC waitmovement 0 msgbox Route117_Text_29C508, 4 setvar VAR_0x8004, 538 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 538 callstd 8 release @@ -77,7 +77,7 @@ Route117_EventScript_1F3A5E:: @ 81F3A5E waitmovement 0 msgbox Route117_Text_29C6BC, 4 setvar VAR_0x8004, 545 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 545 callstd 8 release @@ -102,7 +102,7 @@ Route117_EventScript_1F3AC0:: @ 81F3AC0 waitmovement 0 msgbox Route117_Text_29C846, 4 setvar VAR_0x8004, 364 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 364 callstd 8 release @@ -127,7 +127,7 @@ Route117_EventScript_1F3B22:: @ 81F3B22 waitmovement 0 msgbox Route117_Text_29CA32, 4 setvar VAR_0x8004, 369 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 369 callstd 8 release @@ -155,7 +155,7 @@ Route117_EventScript_1F3B6F:: @ 81F3B6F Route117_EventScript_1F3B9F:: @ 81F3B9F msgbox Route117_Text_29CD1D, 4 setvar VAR_0x8004, 287 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 287 callstd 8 release @@ -178,7 +178,7 @@ Route117_EventScript_1F3BD3:: @ 81F3BD3 Route117_EventScript_1F3C03:: @ 81F3C03 msgbox Route117_Text_29CD1D, 4 setvar VAR_0x8004, 287 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 287 callstd 8 release diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 4894e8187..27a2539e1 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -200,7 +200,7 @@ Route118_EventScript_1F3FB3:: @ 81F3FB3 waitmovement 0 msgbox Route118_Text_29D343, 4 setvar VAR_0x8004, 37 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 37 callstd 8 release @@ -235,7 +235,7 @@ Route118_EventScript_1F4043:: @ 81F4043 waitmovement 0 msgbox Route118_Text_29D74A, 4 setvar VAR_0x8004, 196 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 196 callstd 8 release diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 2f99f7c4e..5f60851b4 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -380,7 +380,7 @@ Route119_EventScript_1F483C:: @ 81F483C waitmovement 0 msgbox Route119_Text_29DD1C, 4 setvar VAR_0x8004, 552 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 552 callstd 8 release @@ -405,7 +405,7 @@ Route119_EventScript_1F489E:: @ 81F489E waitmovement 0 msgbox Route119_Text_29DEF7, 4 setvar VAR_0x8004, 559 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 559 callstd 8 release diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index f89ac7e86..b3475a3ed 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -309,7 +309,7 @@ Route120_EventScript_1F581A:: @ 81F581A waitmovement 0 msgbox Route120_Text_29E75D, 4 setvar VAR_0x8004, 406 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 406 callstd 8 release @@ -344,7 +344,7 @@ Route120_EventScript_1F58AA:: @ 81F58AA waitmovement 0 msgbox Route120_Text_29EA31, 4 setvar VAR_0x8004, 226 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 226 callstd 8 release diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index c813fe6ac..d579401b8 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -84,7 +84,7 @@ Route121_EventScript_1F5EB7:: @ 81F5EB7 waitmovement 0 msgbox Route121_Text_29F25B, 4 setvar VAR_0x8004, 254 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 254 callstd 8 release @@ -124,7 +124,7 @@ Route121_EventScript_1F5F66:: @ 81F5F66 waitmovement 0 msgbox Route121_Text_29F69F, 4 setvar VAR_0x8004, 127 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 127 callstd 8 release @@ -169,7 +169,7 @@ Route121_EventScript_1F6024:: @ 81F6024 waitmovement 0 msgbox Route121_Text_29F80D, 4 setvar VAR_0x8004, 767 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 767 callstd 8 release diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index f6d535e38..b622a931b 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -74,7 +74,7 @@ Route123_EventScript_1F6236:: @ 81F6236 waitmovement 0 msgbox Route123_Text_29FE70, 4 setvar VAR_0x8004, 238 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 238 callstd 8 release @@ -99,7 +99,7 @@ Route123_EventScript_1F6298:: @ 81F6298 waitmovement 0 msgbox Route123_Text_2A0027, 4 setvar VAR_0x8004, 249 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 249 callstd 8 release @@ -174,7 +174,7 @@ Route123_EventScript_1F63E8:: @ 81F63E8 waitmovement 0 msgbox Route123_Text_2A03C1, 4 setvar VAR_0x8004, 195 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 195 callstd 8 release diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 2079c338d..b21e55417 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -35,7 +35,7 @@ Route124_EventScript_1F65DF:: @ 81F65DF waitmovement 0 msgbox Route124_Text_2A0C14, 4 setvar VAR_0x8004, 449 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 449 callstd 8 release @@ -68,7 +68,7 @@ Route124_EventScript_1F6643:: @ 81F6643 Route124_EventScript_1F6673:: @ 81F6673 msgbox Route124_Text_2A109F, 4 setvar VAR_0x8004, 687 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 687 callstd 8 release @@ -91,7 +91,7 @@ Route124_EventScript_1F66A7:: @ 81F66A7 Route124_EventScript_1F66D7:: @ 81F66D7 msgbox Route124_Text_2A109F, 4 setvar VAR_0x8004, 687 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 687 callstd 8 release diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index de3ae07b5..2dda3fb2d 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -60,7 +60,7 @@ Route125_EventScript_1F682C:: @ 81F682C waitmovement 0 msgbox Route125_Text_2A17CF, 4 setvar VAR_0x8004, 492 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 492 callstd 8 release diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index d03e08103..3ea9ba786 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -56,7 +56,7 @@ Route126_EventScript_1F69A3:: @ 81F69A3 waitmovement 0 msgbox Route126_Text_2A1F5A, 4 setvar VAR_0x8004, 377 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 377 callstd 8 release diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index cbc7d7da1..12e5bf127 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -75,7 +75,7 @@ Route127_EventScript_1F6B02:: @ 81F6B02 waitmovement 0 msgbox Route127_Text_2A26EE, 4 setvar VAR_0x8004, 672 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 672 callstd 8 release diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 6d336e464..f62f78404 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -189,7 +189,7 @@ Route128_EventScript_1F6CEA:: @ 81F6CEA waitmovement 0 msgbox Route128_Text_2A2916, 4 setvar VAR_0x8004, 376 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 376 callstd 8 release @@ -214,7 +214,7 @@ Route128_EventScript_1F6D4C:: @ 81F6D4C waitmovement 0 msgbox Route128_Text_2A2AF9, 4 setvar VAR_0x8004, 386 - special sub_81D1C20 + special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 386 callstd 8 release diff --git a/data/specials.inc b/data/specials.inc index 62dd9717e..48f602418 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -497,7 +497,7 @@ gSpecials:: @ 81DBA64 def_special ChangeBoxPokemonNickname def_special get_unknown_box_id def_special sub_813B21C - def_special sub_81D1C20 + def_special SetMatchCallRegisteredFlag def_special sub_8175280 def_special sub_813B2E4 def_special sub_813B374 diff --git a/include/constants/flags.h b/include/constants/flags.h index 63e053cbd..64e548698 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -348,6 +348,7 @@ #define FLAG_0x159 0x159 #define FLAG_0x15A 0x15A #define FLAG_0x15B 0x15B + #define FLAG_MATCH_CALL_REGISTERED 0x15C #define FLAG_0x15D 0x15D #define FLAG_0x15E 0x15E diff --git a/ld_script.txt b/ld_script.txt index bcfd6b079..7acbd18c4 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -265,6 +265,7 @@ SECTIONS { asm/pokemon_summary_screen.o(.text); asm/pokenav.o(.text); src/match_call.o(.text); + asm/match_call.o(.text); asm/pokenav.o(.text.after.match.call); src/rayquaza_scene.o(.text); src/walda_phrase.o(.text); @@ -536,6 +537,8 @@ SECTIONS { src/berry_fix_program.o(.rodata); data/pokemon_summary_screen.o(.rodata); data/pokenav.o(.rodata); + data/match_call.o(.rodata); + data/pokenav.o(.rodata.after.match.call); src/rayquaza_scene.o(.rodata); src/walda_phrase.o(.rodata); data/trainer_rematch.o(.rodata); diff --git a/src/match_call.c b/src/match_call.c index 8267d08be..58278bfbe 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -9,12 +9,18 @@ // Static type declarations typedef struct { + const u8 *text; + u16 v4; + u16 v6; +} match_call_script_t; + +typedef struct { u8 v0; - u8 v1; - u16 v2; - void *v4; - void *v8; - void *vC; + u8 gender; + u16 flag; + const u8 *name; + const u8 *desc; + match_call_script_t *script; } match_call_t; // Static RAM declarations @@ -79,40 +85,40 @@ bool32 sub_81D15F4(u32 idx) bool32 sub_81D1628(const match_call_t *matchCall) { - if (matchCall->v2 == 0xffff) + if (matchCall->flag == 0xffff) return TRUE; - return FlagGet(matchCall->v2); + return FlagGet(matchCall->flag); } bool32 sub_81D164C(const match_call_t *matchCall) { - if (matchCall->v2 == 0xffff) + if (matchCall->flag == 0xffff) return TRUE; - return FlagGet(matchCall->v2); + return FlagGet(matchCall->flag); } bool32 sub_81D1670(const match_call_t *matchCall) { - if (matchCall->v2 == 0xffff) + if (matchCall->flag == 0xffff) return TRUE; - return FlagGet(matchCall->v2); + return FlagGet(matchCall->flag); } bool32 sub_81D1694(const match_call_t *matchCall) { - if (matchCall->v1 != gSaveBlock2Ptr->playerGender) + if (matchCall->gender != gSaveBlock2Ptr->playerGender) return FALSE; - if (matchCall->v2 == 0xffff) + if (matchCall->flag == 0xffff) return TRUE; - return FlagGet(matchCall->v2); + return FlagGet(matchCall->flag); } bool32 sub_81D16CC(const match_call_t *matchCall) { - return FlagGet(matchCall->v2); + return FlagGet(matchCall->flag); } -bool8 sub_81D16DC(u32 idx) +u8 sub_81D16DC(u32 idx) { const match_call_t *matchCall; s32 v0; |