ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #456 from Diegoisawesome/trade

Browse Source 
trade.c
This commit is contained in:
Diegoisawesome 2018-12-31 02:34:42 -06:00 committed by GitHub
commit 935a098843
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
56 changed files with 6637 additions and 15799 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/contest_link_80F57C4.s
View File

@ -606,7 +606,7 @@ _080F5DE0:
movs r0, 0x64 movs r0, 0x64
b _080F5E2C b _080F5E2C
_080F5DF4: _080F5DF4:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080F5EBA beq _080F5EBA
@ -616,7 +616,7 @@ _080F5DF4:
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
b _080F5EBA b _080F5EBA
_080F5E0A: _080F5E0A:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -741,7 +741,7 @@ sub_80F5F30: @ 80F5F30
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080F5F60 beq _080F5F60
@ -5564,7 +5564,7 @@ sub_80F8714: @ 80F8714
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
bne _080F8748 bne _080F8748
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080F877E beq _080F877E

36
asm/contest_link_80FC4F4.s
View File

@ -213,7 +213,7 @@ sub_80FC670: @ 80FC670
beq _080FC6A0 beq _080FC6A0
cmp r0, 0x1 cmp r0, 0x1
beq _080FC6AE beq _080FC6AE
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -223,7 +223,7 @@ _080FC698:
b _080FC6B6 b _080FC6B6
.pool .pool
_080FC6A0: _080FC6A0:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FC6B4 beq _080FC6B4
@ -280,7 +280,7 @@ _080FC6FE:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FC738 bne _080FC738
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FC7F4 beq _080FC7F4
@ -412,7 +412,7 @@ _080FC830:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FC87A bne _080FC87A
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FC880 beq _080FC880
@ -494,7 +494,7 @@ _080FC8DE:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FC904 bne _080FC904
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FC986 beq _080FC986
@ -599,7 +599,7 @@ sub_80FC998: @ 80FC998
b _080FC9F0 b _080FC9F0
.pool .pool
_080FC9C4: _080FC9C4:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FC9F0 beq _080FC9F0
@ -653,7 +653,7 @@ sub_80FC9F8: @ 80FC9F8
b _080FCAB2 b _080FCAB2
.pool .pool
_080FCA30: _080FCA30:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCAB2 beq _080FCAB2
@ -763,7 +763,7 @@ _080FCAFC:
.4byte _080FCC38 .4byte _080FCC38
.4byte _080FCB6C .4byte _080FCB6C
_080FCB2C: _080FCB2C:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FCB38 bne _080FCB38
@ -810,7 +810,7 @@ _080FCB84:
strh r0, [r2, 0x8] strh r0, [r2, 0x8]
b _080FCC82 b _080FCC82
_080FCB90: _080FCB90:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCC82 beq _080FCC82
@ -833,7 +833,7 @@ _080FCBA4:
b _080FCC50 b _080FCC50
.pool .pool
_080FCBCC: _080FCBCC:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCC82 beq _080FCC82
@ -856,7 +856,7 @@ _080FCBE0:
b _080FCC50 b _080FCC50
.pool .pool
_080FCC08: _080FCC08:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCC82 beq _080FCC82
@ -949,7 +949,7 @@ _080FCCB8:
.4byte _080FCDF8 .4byte _080FCDF8
.4byte _080FCD30 .4byte _080FCD30
_080FCCE8: _080FCCE8:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FCCF4 bne _080FCCF4
@ -1000,7 +1000,7 @@ _080FCD48:
strh r0, [r2, 0x8] strh r0, [r2, 0x8]
b _080FCE42 b _080FCE42
_080FCD54: _080FCD54:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCE42 beq _080FCE42
@ -1027,7 +1027,7 @@ _080FCD6C:
b _080FCE10 b _080FCE10
.pool .pool
_080FCD98: _080FCD98:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCE42 beq _080FCE42
@ -1047,7 +1047,7 @@ _080FCDB0:
b _080FCE04 b _080FCE04
.pool .pool
_080FCDC8: _080FCDC8:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCE42 beq _080FCE42
@ -1149,7 +1149,7 @@ _080FCE92:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FCEB8 bne _080FCEB8
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCF2E beq _080FCF2E
@ -1258,7 +1258,7 @@ sub_80FCF40: @ 80FCF40
b _080FCFBE b _080FCFBE
.pool .pool
_080FCF80: _080FCF80:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCFBE beq _080FCFBE
@ -1324,7 +1324,7 @@ sub_80FCFD0: @ 80FCFD0
b _080FD04E b _080FD04E
.pool .pool
_080FD010: _080FD010:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FD04E beq _080FD04E

10
asm/contest_link_81D9DE4.s
View File

@ -434,7 +434,7 @@ sub_81DA160: @ 81DA160
b _081DA224 b _081DA224
.pool .pool
_081DA1A4: _081DA1A4:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081DA224 beq _081DA224
@ -536,7 +536,7 @@ _081DA284:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _081DA2CE bne _081DA2CE
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081DA2D4 beq _081DA2D4
@ -613,7 +613,7 @@ sub_81DA2E8: @ 81DA2E8
b _081DA39E b _081DA39E
.pool .pool
_081DA338: _081DA338:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081DA39E beq _081DA39E
@ -716,7 +716,7 @@ sub_81DA3B8: @ 81DA3B8
b _081DA46E b _081DA46E
.pool .pool
_081DA408: _081DA408:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081DA46E beq _081DA46E
@ -816,7 +816,7 @@ _081DA4CC:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _081DA4FA bne _081DA4FA
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081DA55C beq _081DA55C

82
asm/rom_8011DC0.s
View File

@ -8257,7 +8257,7 @@ _0801AF24:
b _0801AF8A b _0801AF8A
.pool .pool
_0801AF40: _0801AF40:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801AFAE beq _0801AFAE
@ -13680,7 +13680,7 @@ _0801DA72:
beq _0801DB46 beq _0801DB46
b _0801DB5E b _0801DB5E
_0801DA7C: _0801DA7C:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801DB5E beq _0801DB5E
@ -13713,7 +13713,7 @@ _0801DA7C:
b _0801DB3E b _0801DB3E
.pool .pool
_0801DAC8: _0801DAC8:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801DB5E beq _0801DB5E
@ -13752,7 +13752,7 @@ _0801DB08:
strh r0, [r4, 0x10] strh r0, [r4, 0x10]
b _0801DB5E b _0801DB5E
_0801DB1C: _0801DB1C:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801DB5E beq _0801DB5E
@ -14364,7 +14364,7 @@ _0801DFCE:
adds r0, 0x1 adds r0, 0x1
strh r0, [r1, 0x6] strh r0, [r1, 0x6]
_0801DFE0: _0801DFE0:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E028 beq _0801E028
@ -14389,7 +14389,7 @@ _0801DFE0:
b _0801E028 b _0801E028
.pool .pool
_0801E018: _0801E018:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E028 beq _0801E028
@ -14838,7 +14838,7 @@ _0801E3AC:
b _0801E458 b _0801E458
.pool .pool
_0801E3D4: _0801E3D4:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E414 beq _0801E414
@ -14978,7 +14978,7 @@ _0801E4E8:
b _0801E59A b _0801E59A
.pool .pool
_0801E50C: _0801E50C:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E5BC beq _0801E5BC
@ -15013,7 +15013,7 @@ _0801E540:
b _0801E59A b _0801E59A
.pool .pool
_0801E560: _0801E560:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E5BC beq _0801E5BC
@ -15100,7 +15100,7 @@ _0801E604:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0801E662 bne _0801E662
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E662 beq _0801E662
@ -15212,7 +15212,7 @@ _0801E6F0:
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
beq _0801E75C beq _0801E75C
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E75C beq _0801E75C
@ -15304,7 +15304,7 @@ _0801E7AC:
adds r0, 0x1 adds r0, 0x1
strh r0, [r1, 0x6] strh r0, [r1, 0x6]
_0801E7C0: _0801E7C0:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -15348,7 +15348,7 @@ _0801E812:
b _0801E830 b _0801E830
.pool .pool
_0801E820: _0801E820:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E830 beq _0801E830
@ -20715,7 +20715,7 @@ _08021358:
bl sub_8010434 bl sub_8010434
b _0802143E b _0802143E
_0802135E: _0802135E:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08021444 beq _08021444
@ -23804,7 +23804,7 @@ _08022CE4:
bl sub_8010434 bl sub_8010434
b _08022D06 b _08022D06
_08022CEA: _08022CEA:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08022D06 bne _08022D06
@ -24016,7 +24016,7 @@ _08022E6C:
bl sub_8010434 bl sub_8010434
b _08022E9C b _08022E9C
_08022E72: _08022E72:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08022EA2 beq _08022EA2
@ -24148,7 +24148,7 @@ _08022F74:
bl sub_8010434 bl sub_8010434
b _08023060 b _08023060
_08022F7A: _08022F7A:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08023066 beq _08023066
@ -24170,7 +24170,7 @@ _08022F7A:
bl SendBlock bl SendBlock
b _08023060 b _08023060
_08022FAA: _08022FAA:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08023066 beq _08023066
@ -24300,7 +24300,7 @@ _080230A8:
bl sub_8010434 bl sub_8010434
b _080231A8 b _080231A8
_080230BA: _080230BA:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080231AE beq _080231AE
@ -24369,7 +24369,7 @@ _08023120:
b _080231A8 b _080231A8
.pool .pool
_08023150: _08023150:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080231AE beq _080231AE
@ -24395,7 +24395,7 @@ _08023172:
bl sub_8010434 bl sub_8010434
b _080231A8 b _080231A8
_08023184: _08023184:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080231AE beq _080231AE
@ -24547,7 +24547,7 @@ _0802329C:
bl sub_8010434 bl sub_8010434
b _080232DC b _080232DC
_080232BE: _080232BE:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080232E2 beq _080232E2
@ -24591,7 +24591,7 @@ _08023302:
beq _08023338 beq _08023338
b _0802338C b _0802338C
_0802330C: _0802330C:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08023392 beq _08023392
@ -24612,7 +24612,7 @@ _08023332:
bl sub_8010434 bl sub_8010434
b _0802338C b _0802338C
_08023338: _08023338:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08023392 beq _08023392
@ -25683,7 +25683,7 @@ _08023B7A:
strh r0, [r4, 0x10] strh r0, [r4, 0x10]
b _08023BB2 b _08023BB2
_08023B94: _08023B94:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08023BB8 beq _08023BB8
@ -25785,7 +25785,7 @@ _08023C2A:
bl SetGpuReg bl SetGpuReg
b _08023C9C b _08023C9C
_08023C5C: _08023C5C:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08023CA2 beq _08023CA2
@ -25884,7 +25884,7 @@ _08023D12:
bl SendBlock bl SendBlock
b _0802402E b _0802402E
_08023D2A: _08023D2A:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08023D36 bne _08023D36
@ -26227,7 +26227,7 @@ _08023FC4:
bl SendBlock bl SendBlock
b _0802402E b _0802402E
_08023FD0: _08023FD0:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08024034 beq _08024034
@ -26451,7 +26451,7 @@ _080241A0:
bl sub_8010434 bl sub_8010434
b _08024218 b _08024218
_080241A6: _080241A6:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0802421E beq _0802421E
@ -26630,7 +26630,7 @@ _08024300:
bl sub_8010434 bl sub_8010434
b _080243AC b _080243AC
_08024306: _08024306:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080243B2 beq _080243B2
@ -26646,7 +26646,7 @@ _08024306:
bl SendBlock bl SendBlock
b _080243AC b _080243AC
_08024328: _08024328:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080243B2 beq _080243B2
@ -26914,7 +26914,7 @@ _08024522:
bl sub_8010434 bl sub_8010434
b _08024558 b _08024558
_08024528: _08024528:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0802455E beq _0802455E
@ -27814,7 +27814,7 @@ _08024C4C:
bl sub_8010434 bl sub_8010434
b _08024D20 b _08024D20
_08024C5A: _08024C5A:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08024D40 beq _08024D40
@ -28075,7 +28075,7 @@ _08024E90:
b _08024EF0 b _08024EF0
.pool .pool
_08024EA0: _08024EA0:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08024F08 beq _08024F08
@ -28116,7 +28116,7 @@ _08024EF0:
strb r0, [r1, 0x10] strb r0, [r1, 0x10]
b _08024F08 b _08024F08
_08024EF8: _08024EF8:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08024F08 beq _08024F08
@ -28475,7 +28475,7 @@ _080251BA:
strb r4, [r0, 0x8] strb r4, [r0, 0x8]
b _08025202 b _08025202
_080251D0: _080251D0:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08025226 beq _08025226
@ -28560,7 +28560,7 @@ _08025252:
ldr r1, [r5] ldr r1, [r5]
b _080252CC b _080252CC
_08025274: _08025274:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08025316 beq _08025316
@ -28710,7 +28710,7 @@ _0802539C:
b _08025448 b _08025448
.pool .pool
_080253BC: _080253BC:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08025466 beq _08025466
@ -28900,7 +28900,7 @@ _0802553C:
b _080255E8 b _080255E8
.pool .pool
_08025564: _08025564:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0802563C beq _0802563C
@ -29391,7 +29391,7 @@ _0802593E:
b _08025976 b _08025976
.pool .pool
_0802596C: _0802596C:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080259E8 beq _080259E8
@ -39683,7 +39683,7 @@ _0802AD3C:
b _0802ADC0 b _0802ADC0
.pool .pool
_0802AD68: _0802AD68:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0802AE08 beq _0802AE08

14903
asm/trade.s
View File

File diff suppressed because it is too large Load Diff

8
data/maps/BattleFrontier_Lounge6/scripts.inc
View File

@ -7,7 +7,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
goto_if_set FLAG_0x09C, BattleFrontier_Lounge6_EventScript_265083 goto_if_set FLAG_0x09C, BattleFrontier_Lounge6_EventScript_265083
setvar VAR_0x8008, 3 setvar VAR_0x8008, 3
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT copyvar VAR_0x8009, VAR_RESULT
msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@ -18,14 +18,14 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
compare VAR_0x8004, 255 compare VAR_0x8004, 255
goto_if_eq BattleFrontier_Lounge6_EventScript_26506B goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_807E9D4 specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009 compare VAR_RESULT, VAR_0x8009
goto_if_ne BattleFrontier_Lounge6_EventScript_265075 goto_if_ne BattleFrontier_Lounge6_EventScript_265075
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10 special CreateInGameTradePokemon
special sub_807F0E4 special DoInGameTradeScene
waitstate waitstate
msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT
setflag FLAG_0x09C setflag FLAG_0x09C

8
data/maps/FortreeCity_House1/scripts.inc
View File

@ -7,7 +7,7 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB
goto_if_set FLAG_0x09B, FortreeCity_House1_EventScript_216355 goto_if_set FLAG_0x09B, FortreeCity_House1_EventScript_216355
setvar VAR_0x8008, 1 setvar VAR_0x8008, 1
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT copyvar VAR_0x8009, VAR_RESULT
msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@ -18,14 +18,14 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB
compare VAR_0x8004, 255 compare VAR_0x8004, 255
goto_if_eq FortreeCity_House1_EventScript_21633D goto_if_eq FortreeCity_House1_EventScript_21633D
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_807E9D4 specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009 compare VAR_RESULT, VAR_0x8009
goto_if_ne FortreeCity_House1_EventScript_216347 goto_if_ne FortreeCity_House1_EventScript_216347
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10 special CreateInGameTradePokemon
special sub_807F0E4 special DoInGameTradeScene
waitstate waitstate
bufferspeciesname 0, VAR_0x8009 bufferspeciesname 0, VAR_0x8009
msgbox FortreeCity_House1_Text_216440, MSGBOX_DEFAULT msgbox FortreeCity_House1_Text_216440, MSGBOX_DEFAULT

8
data/maps/PacifidlogTown_House3/scripts.inc
View File

@ -7,7 +7,7 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11
goto_if_set FLAG_0x09A, PacifidlogTown_House3_EventScript_203CAB goto_if_set FLAG_0x09A, PacifidlogTown_House3_EventScript_203CAB
setvar VAR_0x8008, 2 setvar VAR_0x8008, 2
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT copyvar VAR_0x8009, VAR_RESULT
msgbox PacifidlogTown_House3_Text_203CBE, MSGBOX_YESNO msgbox PacifidlogTown_House3_Text_203CBE, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@ -18,14 +18,14 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11
compare VAR_0x8004, 255 compare VAR_0x8004, 255
goto_if_eq PacifidlogTown_House3_EventScript_203C93 goto_if_eq PacifidlogTown_House3_EventScript_203C93
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_807E9D4 specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009 compare VAR_RESULT, VAR_0x8009
goto_if_ne PacifidlogTown_House3_EventScript_203C9D goto_if_ne PacifidlogTown_House3_EventScript_203C9D
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10 special CreateInGameTradePokemon
special sub_807F0E4 special DoInGameTradeScene
waitstate waitstate
bufferspeciesname 0, VAR_0x8009 bufferspeciesname 0, VAR_0x8009
msgbox PacifidlogTown_House3_Text_203D87, MSGBOX_DEFAULT msgbox PacifidlogTown_House3_Text_203D87, MSGBOX_DEFAULT

8
data/maps/RustboroCity_House1/scripts.inc
View File

@ -7,7 +7,7 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F
goto_if_set FLAG_0x099, RustboroCity_House1_EventScript_2159D5 goto_if_set FLAG_0x099, RustboroCity_House1_EventScript_2159D5
setvar VAR_0x8008, 0 setvar VAR_0x8008, 0
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT copyvar VAR_0x8009, VAR_RESULT
msgbox RustboroCity_House1_Text_2159E8, MSGBOX_YESNO msgbox RustboroCity_House1_Text_2159E8, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@ -18,14 +18,14 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F
compare VAR_0x8004, 255 compare VAR_0x8004, 255
goto_if_eq RustboroCity_House1_EventScript_2159BD goto_if_eq RustboroCity_House1_EventScript_2159BD
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_807E9D4 specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009 compare VAR_RESULT, VAR_0x8009
goto_if_ne RustboroCity_House1_EventScript_2159C7 goto_if_ne RustboroCity_House1_EventScript_2159C7
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10 special CreateInGameTradePokemon
special sub_807F0E4 special DoInGameTradeScene
waitstate waitstate
msgbox RustboroCity_House1_Text_215A77, MSGBOX_DEFAULT msgbox RustboroCity_House1_Text_215A77, MSGBOX_DEFAULT
setflag FLAG_0x099 setflag FLAG_0x099

8
data/specials.inc
View File

@ -263,10 +263,10 @@ gSpecials:: @ 81DBA64
def_special BedroomPC def_special BedroomPC
def_special PlayerPC def_special PlayerPC
def_special FieldShowRegionMap def_special FieldShowRegionMap
def_special sub_807E73C def_special GetInGameTradeSpeciesInfo
def_special sub_807EA10 def_special CreateInGameTradePokemon
def_special sub_807F0E4 def_special DoInGameTradeScene
def_special sub_807E9D4 def_special GetTradeSpecies
def_special GetWeekCount def_special GetWeekCount
def_special RetrieveLotteryNumber def_special RetrieveLotteryNumber
def_special PickLotteryCornerTicket def_special PickLotteryCornerTicket

646
data/trade.s
View File

@ -1,646 +0,0 @@
#include "constants/species.h"
#include "constants/items.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_0832C6A8:: @ 832C6A8
.4byte 0x00000f2c, 0x00003d88, 0x0000001c, 0x00000024, 0x00000064, 0x00000528
.align 1
gTradeMovesBoxTilemap:: @ 832C6C0
.incbin "graphics/trade/moves_box_map.bin"
.align 1
gTradePartyBoxTilemap:: @ 832C8BE
.incbin "graphics/trade/party_box_map.bin"
.align 1
gTradeStripesBG2Tilemap:: @ 832CABC
.incbin "graphics/trade/stripes_bg2_map.bin"
.align 1
gTradeStripesBG3Tilemap:: @ 832D2BC
.incbin "graphics/trade/stripes_bg3_map.bin"
gText_EmptyString7:: @ 832DABC
.string "$"
gText_ClrWhtHltTrspntShdwDrkGry:: @ 832DABD
.string "{COLOR WHITE}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}$"
gText_MaleSymbol4:: @ 832DAC7
.string "♂$"
gText_FemaleSymbol4:: @ 832DAC9
.string "♀$"
gText_GenderlessSymbol:: @ 832DACB
.string "$"
gText_SpaceMove:: @ 832DACC
.string " MOVE$"
gText_NewLine3:: @ 832DAD2
.string "\n$"
gText_Slash2:: @ 832DAD4
.string "/$"
gText_Lv2:: @ 832DAD6
.string "Lv. $"
gText_ThreeDashes2:: @ 832DADB
.string "---$"
gText_FourQuestionMarks:: @ 832DADF
.string "????$"
gText_832DAE4:: @ 832DAE4
.string "$"
gText_IsThisTradeOkay:: @ 832DAE5
.string "Is this trade okay?$"
gText_Cancel6:: @ 832DAF9
.string "CANCEL$"
gText_ChooseAPkmn:: @ 832DB00
.string "Choose a POKéMON.$"
gText_Summary3:: @ 832DB12
.string "SUMMARY$"
gText_Trade2:: @ 832DB1A
.string "TRADE$"
gText_CancelTrade:: @ 832DB20
.string "Cancel trade?$"
gJPText_832DB2E:: @ 832DB2E
.string "Bボタン　で　もどります$"
gText_Summary4:: @ 832DB3B
.string "SUMMARY$"
gText_Trade3:: @ 832DB43
.string "TRADE$"
gText_CommunicationStandby6:: @ 832DB49
.string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Communication standby…\nPlease wait.$"
gText_TheTradeHasBeenCanceled:: @ 832DB76
.string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}The trade has\nbeen canceled.$"
gText_YourOnlyPkmnForBattle:: @ 832DB9C
.string "That's your only\nPOKéMON for battle.$"
gText_WaitingForYourFriend:: @ 832DBC1
.string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Waiting for your friend\nto finish…$"
gText_YourFriendWantsToTrade:: @ 832DBED
.string "Your friend wants\nto trade POKéMON.$"
.align 2
gOamData_832DC14:: @ 832DC14
.2byte 0x4000, 0x8000, 0x0400, 0x0000
.align 2
gOamData_832DC1C:: @ 832DC1C
.2byte 0x4000, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_832DC24:: @ 832DC24
.2byte 0x0000, 0x0005, 0xffff, 0x0000
.align 2
gSpriteAnim_832DC2C:: @ 832DC2C
.2byte 0x0020, 0x0005, 0xffff, 0x0000
.align 2
gSpriteAnimTable_832DC34:: @ 832DC34
.4byte gSpriteAnim_832DC24
.4byte gSpriteAnim_832DC2C
.align 2
gUnknown_0832DC3C:: @ 832DC3C
obj_tiles gUnknown_08DDC6E4, 0x0800, 0x012c
.align 2
gUnknown_0832DC44:: @ 832DC44
obj_pal gUnknown_08DDB444, 0x0929
.align 2
gSpriteAnim_832DC4C:: @ 832DC4C
.2byte 0x0000, 0x0005, 0xffff, 0x0000
.align 2
gSpriteAnim_832DC54:: @ 832DC54
.2byte 0x0008, 0x0005, 0xffff, 0x0000
.align 2
gSpriteAnim_832DC5C:: @ 832DC5C
.2byte 0x0010, 0x0005, 0xffff, 0x0000
.align 2
gSpriteAnim_832DC64:: @ 832DC64
.2byte 0x0018, 0x0005, 0xffff, 0x0000
.align 2
gSpriteAnim_832DC6C:: @ 832DC6C
.2byte 0x0020, 0x0005, 0xffff, 0x0000
.align 2
gSpriteAnim_832DC74:: @ 832DC74
.2byte 0x0028, 0x0005, 0xffff, 0x0000
.align 2
gSpriteAnimTable_832DC7C:: @ 832DC7C
.4byte gSpriteAnim_832DC4C
.4byte gSpriteAnim_832DC54
.4byte gSpriteAnim_832DC5C
.4byte gSpriteAnim_832DC64
.4byte gSpriteAnim_832DC6C
.4byte gSpriteAnim_832DC74
.align 2
gSpriteTemplate_832DC94:: @ 832DC94
spr_template 0x012c, 0x0929, gOamData_832DC1C, gSpriteAnimTable_832DC34, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gSpriteTemplate_832DCAC:: @ 832DCAC
spr_template 0x00c8, 0x133d, gOamData_832DC14, gSpriteAnimTable_832DC7C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
TradeScreenTextPalette:: @ 832DCC4
.incbin "graphics/trade/text.gbapal"
.align 2
gSpritePalette_TradeScreenText:: @ 832DCE4
obj_pal TradeScreenTextPalette, 0x133d
gUnknown_0832DCEC:: @ 832DCEC
.byte 0x04, 0x02, 0x0c, 0x0c, 0x00, 0x00, 0x02, 0x04, 0x0c, 0x0c, 0x00, 0x00, 0x07, 0x06, 0x01, 0x00, 0x00, 0x00, 0x01, 0x06, 0x07, 0x00, 0x00, 0x00, 0x05, 0x03, 0x0c, 0x0c, 0x00, 0x00, 0x03, 0x05
.byte 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x07, 0x06, 0x01, 0x00, 0x00, 0x06, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x08, 0x07, 0x06
.byte 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x05, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x09, 0x08, 0x07, 0x00, 0x00, 0x08, 0x09, 0x06, 0x06, 0x00, 0x00
.byte 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x01, 0x01
.byte 0x01, 0x01, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x0a, 0x08, 0x06, 0x00, 0x00, 0x00, 0x0a, 0x08, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x0a, 0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x09, 0x07, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x0c
.byte 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x04, 0x03, 0x02
.byte 0x01, 0x00, 0x0b, 0x09, 0x07, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x0b, 0x09, 0x07, 0x06, 0x00, 0x00, 0x07, 0x06, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_0832DE24:: @ 832DE24
.byte 0x01, 0x05, 0x08, 0x05, 0x01, 0x0a, 0x08, 0x0a, 0x01, 0x0f, 0x08, 0x0f, 0x10, 0x05, 0x17, 0x05, 0x10, 0x0a, 0x17, 0x0a, 0x10, 0x0f, 0x17, 0x0f, 0x17, 0x12
gUnknown_0832DE3E:: @ 832DE3E
.byte 0x05, 0x04, 0x0c, 0x04, 0x05, 0x09, 0x0c, 0x09, 0x05, 0x0e, 0x0c, 0x0e, 0x14, 0x04, 0x1b, 0x04, 0x14, 0x09, 0x1b, 0x09, 0x14, 0x0e, 0x1b, 0x0e
gUnknown_0832DE56:: @ 832DE56
.byte 0x01, 0x03, 0x08, 0x03, 0x01, 0x08, 0x08, 0x08, 0x01, 0x0d, 0x08, 0x0d, 0x10, 0x03, 0x17, 0x03, 0x10, 0x08, 0x17, 0x08, 0x10, 0x0d, 0x17, 0x0d, 0x00, 0x0e, 0x0f, 0x1d, 0x03, 0x05, 0x03, 0x07
.byte 0x12, 0x05, 0x12, 0x07, 0x08, 0x07, 0x16, 0x0c, 0x08, 0x07, 0x16, 0x0c, 0x06, 0x07, 0x18, 0x0c, 0x06, 0x07, 0x18, 0x0c, 0x08, 0x07, 0x16, 0x0c, 0x07, 0x07, 0x17, 0x0c, 0x00, 0x00
.align 2
gUnknown_0832DE94:: @ 832DE94
.4byte gText_Cancel6
.4byte gText_ChooseAPkmn
.4byte gText_Summary3
.4byte gText_Trade2
.4byte gText_CancelTrade
.4byte gJPText_832DB2E
.align 2
gUnknown_0832DEAC:: @ 832DEAC
.4byte gText_Summary4, sub_807A000
.4byte gText_Trade3, sub_807A024
.align 2
gUnknown_0832DEBC:: @ 832DEBC
.4byte gText_CommunicationStandby6
.4byte gText_TheTradeHasBeenCanceled
.4byte gText_YourOnlyPkmnForBattle
.4byte gText_OnlyPkmnForBattle
.4byte gText_WaitingForYourFriend
.4byte gText_YourFriendWantsToTrade
.4byte gText_PkmnCantBeTradedNow
.4byte gText_EggCantBeTradedNow
.4byte gText_OtherTrainersPkmnCantBeTraded
gUnknown_0832DEE0:: @ 832DEE0
.byte 0x00, 0x01, 0x02, 0x00
.align 2
gUnknown_0832DEE4:: @ 832DEE4
.4byte 0x000001f8, 0x00001051, 0x00002062, 0x00003073
.align 2
gUnknown_0832DEF4:: @ 832DEF4
window_template 0x00, 0x04, 0x07, 0x16, 0x04, 0x0f, 0x001e
window_template 0x00, 0x13, 0x0f, 0x0a, 0x04, 0x0f, 0x0076
window_template 0x00, 0x00, 0x05, 0x08, 0x02, 0x0d, 0x009e
window_template 0x00, 0x07, 0x05, 0x08, 0x02, 0x0d, 0x00ae
window_template 0x00, 0x00, 0x0a, 0x08, 0x02, 0x0d, 0x00be
window_template 0x00, 0x07, 0x0a, 0x08, 0x02, 0x0d, 0x00ce
window_template 0x00, 0x00, 0x0f, 0x08, 0x02, 0x0d, 0x00de
window_template 0x00, 0x07, 0x0f, 0x08, 0x02, 0x0d, 0x00ee
window_template 0x00, 0x0f, 0x05, 0x08, 0x02, 0x0d, 0x00fe
window_template 0x00, 0x16, 0x05, 0x08, 0x02, 0x0d, 0x010e
window_template 0x00, 0x0f, 0x0a, 0x08, 0x02, 0x0d, 0x011e
window_template 0x00, 0x16, 0x0a, 0x08, 0x02, 0x0d, 0x012e
window_template 0x00, 0x0f, 0x0f, 0x08, 0x02, 0x0d, 0x013e
window_template 0x00, 0x16, 0x0f, 0x08, 0x02, 0x0d, 0x014e
window_template 0x00, 0x02, 0x05, 0x0e, 0x02, 0x0d, 0x015e
window_template 0x00, 0x03, 0x08, 0x0b, 0x08, 0x0f, 0x017a
window_template 0x00, 0x11, 0x05, 0x0e, 0x02, 0x0f, 0x01d2
window_template 0x00, 0x12, 0x08, 0x0b, 0x08, 0x0f, 0x01ee
null_window_template
.align 2
gUnknown_0832DF8C:: @ 832DF8C
window_template 0x00, 0x17, 0x0d, 0x05, 0x04, 0x0f, 0x0246
gJPText_Shedinja:: @ 832DF94
.string "ヌケニン$"
gUnknown_0832DF99:: @ 832DF99
.byte 0x04, 0x03, 0x13, 0x03, 0x00, 0x00, 0x00
.align 2
gTradeBallPalette:: @ 832DFA0
.incbin "graphics/trade/ball.gbapal"
.align 2
gTradeBallTiles:: @ 832DFC0
.incbin "graphics/trade/ball.4bpp"
.align 2
gUnknown_832E5C0:: @ 832E5C0
.incbin "graphics/trade/pokeball_symbol.8bpp"
.align 2
gUnknown_0832FFC0:: @ 832FFC0
.incbin "graphics/trade/cable_closeup_map.bin"
.align 2
gUnknown_083307C0:: @ 83307C0
.incbin "graphics/trade/pokeball_symbol_map.bin"
.align 2
gUnknown_083308C0:: @ 83308C0
.incbin "graphics/trade/unknown_3308C0.gbapal"
.align 2
gUnknown_083308E0:: @ 83308E0
.incbin "graphics/trade/gba.gbapal"
.incbin "graphics/trade/shadow.gbapal"
.incbin "graphics/trade/black.gbapal"
.align 2
gUnknown_08330940:: @ 8330940
.incbin "graphics/trade/misc.gbapal"
.align 2
gTradeGlow1Tiles:: @ 8330960
.incbin "graphics/trade/glow1.4bpp"
.align 2
gTradeGlow2Tiles:: @ 8330B60
.incbin "graphics/trade/glow2.4bpp"
.align 2
gTradeCableEndTiles:: @ 8330D60
.incbin "graphics/trade/cable_end.4bpp"
.align 2
gTradeGBAScreenTiles:: @ 8330F60
.incbin "graphics/trade/gba_screen.4bpp"
.align 2
gUnknown_08331F60:: @ 8331F60
.incbin "graphics/trade/shadow_map.bin"
.align 2
gUnknown_08332F60:: @ 8332F60
.incbin "graphics/trade/gba_affine.8bpp"
.space 0x40
.align 2
gUnknown_083357A0:: @ 83357A0
.incbin "graphics/trade/gba_affine_map_cable.bin"
.align 2
gUnknown_083358A0:: @ 83358A0
.incbin "graphics/trade/gba_affine_map_wireless.bin"
.align 2
gUnknown_083359A0:: @ 83359A0
.incbin "graphics/trade/gba_map_wireless.bin"
.align 2
gUnknown_083369A0:: @ 83369A0
.incbin "graphics/trade/gba_map_cable.bin"
.align 2
gUnknown_083379A0:: @ 83379A0
.incbin "graphics/trade/unknown_3379A0.bin.lz"
.align 2
gUnknown_08337AA0:: @ 8337AA0
.incbin "graphics/trade/wireless_signal_send.gbapal"
.align 2
gUnknown_08337CA0:: @ 8337CA0
.incbin "graphics/trade/wireless_signal_receive.gbapal"
.align 2
gUnknown_08337EA0:: @ 8337EA0
.incbin "graphics/trade/black.gbapal"
.align 2
gUnknown_08337EC0:: @ 8337EC0
.incbin "graphics/trade/wireless_signal.4bpp.lz"
.align 2
gUnknown_08338550:: @ 8338550
.incbin "graphics/trade/wireless_signal.bin.lz"
.align 2
gOamData_8338C44:: @ 8338C44
.2byte 0x0100, 0x4000, 0x0000, 0x0000
.align 2
gSpriteAnim_8338C4C:: @ 8338C4C
.2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0x0010, 0x0003, 0x0014, 0x0003, 0x0018, 0x0003, 0x001c, 0x0003
.2byte 0x0020, 0x0003, 0x0024, 0x0003, 0x0028, 0x0003, 0x002c, 0x0003, 0xfffd, 0x0001, 0x0000, 0x0003, 0xffff, 0x0000
.align 2
gSpriteAnim_8338C88:: @ 8338C88
.2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0x0010, 0x0003, 0x0014, 0x0003, 0x0018, 0x0003, 0x001c, 0x0003
.2byte 0x0020, 0x0003, 0x0024, 0x0003, 0x0028, 0x0003, 0x002c, 0x0003, 0xfffd, 0x0002, 0x0000, 0x0003, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8338C88:: @ 8338CC4
.4byte gSpriteAnim_8338C4C
.4byte gSpriteAnim_8338C88
.align 2
gSpriteAffineAnim_8338CCC:: @ 8338CCC
.2byte 0x0000, 0x0000, 0x0100, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8338CDC:: @ 8338CDC
.2byte 0xfff8, 0x0000, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8338CEC:: @ 8338CEC
.2byte 0x0060, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0500, 0x0000, 0x0008, 0x0000, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_8338D0C:: @ 8338D0C
.4byte gSpriteAffineAnim_8338CCC
.4byte gSpriteAffineAnim_8338CDC
.4byte gSpriteAffineAnim_8338CEC
.align 2
gUnknown_08338D18:: @ 8338D18
obj_tiles gTradeBallTiles, 0x0600, 0x15b5
.align 2
gUnknown_08338D20:: @ 8338D20
obj_pal gTradeBallPalette, 0x15b6
.align 2
gSpriteTemplate_8338D28:: @ 8338D28
spr_template 0x15b5, 0x15b6, gOamData_8338C44, gSpriteAnimTable_8338C88, NULL, gSpriteAffineAnimTable_8338D0C, sub_807E55C
.align 2
gOamData_8338D40:: @ 8338D40
.2byte 0x0500, 0x8000, 0x0400, 0x0000
.align 2
gSpriteAnim_8338D48:: @ 8338D48
.2byte 0x0000, 0x00c5, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8338D50:: @ 8338D50
.4byte gSpriteAnim_8338D48
.align 2
gSpriteAffineAnim_8338D54:: @ 8338D54
.2byte 0xfff6, 0xfff6, 0x0500, 0x0000, 0x000a, 0x000a, 0x0500, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_8338D6C:: @ 8338D6C
.4byte gSpriteAffineAnim_8338D54
.align 2
gUnknown_08338D70:: @ 8338D70
obj_tiles gTradeGlow1Tiles, 0x0200, 0x15ae
.align 2
gUnknown_08338D78:: @ 8338D78
obj_pal gUnknown_08330940, 0x15af
.align 2
gUnknown_08338D80:: @ 8338D80
obj_pal gUnknown_083308E0, 0x15b3
.align 2
gUnknown_08338D88:: @ 8338D88
spr_template 0x15ae, 0x15af, gOamData_8338D40, gSpriteAnimTable_8338D50, NULL, gSpriteAffineAnimTable_8338D6C, sub_807AA28
.align 2
gOamData_8338DA0:: @ 8338DA0
.2byte 0x8000, 0x8000, 0x0400, 0x0000
.align 2
gSpriteAnim_8338DA8:: @ 8338DA8
.2byte 0x0000, 0x00c5, 0xffff, 0x0000
.align 2
gSpriteAnim_8338DB0:: @ 8338DB0
.2byte 0x0008, 0x00c5, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8338DB8:: @ 8338DB8
.4byte gSpriteAnim_8338DA8
.4byte gSpriteAnim_8338DB0
.align 2
gUnknown_08338DC0:: @ 8338DC0
obj_tiles gTradeGlow2Tiles, 0x0300, 0x15b0
.align 2
gSpriteTemplate_8338DC8:: @ 8338DC8
spr_template 0x15b0, 0x15af, gOamData_8338DA0, gSpriteAnimTable_8338DB8, NULL, gDummySpriteAffineAnimTable, sub_807AA7C
.align 2
gOamData_8338DE0:: @ 8338DE0
.2byte 0x8000, 0x8000, 0x0400, 0x0000
.align 2
gSpriteAnim_8338DE8:: @ 8338DE8
.2byte 0x0000, 0x000a, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8338DF0:: @ 8338DF0
.4byte gSpriteAnim_8338DE8
.align 2
gUnknown_08338DF4:: @ 8338DF4
obj_tiles gTradeCableEndTiles, 0x0100, 0x15b2
.align 2
gSpriteTemplate_8338DFC:: @ 8338DFC
spr_template 0x15b2, 0x15b3, gOamData_8338DE0, gSpriteAnimTable_8338DF0, NULL, gDummySpriteAffineAnimTable, sub_807AABC
.align 2
gOamData_8338E14:: @ 8338E14
.2byte 0x4000, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_8338E1C:: @ 8338E1C
.2byte 0x0000, 0x00c2, 0x0020, 0x00c2, 0x0040, 0x00c2, 0x0060, 0x00c2, 0x0040, 0x00c2, 0x0020, 0x00c2, 0x0000, 0x00c2, 0xfffd, 0x0008
.2byte 0xffff, 0x0000
.align 2
gSpriteAnim_8338E40:: @ 8338E40
.2byte 0x0000, 0x00c2, 0x0020, 0x00c2, 0x0040, 0x00c2, 0x0060, 0x00c2, 0x0040, 0x00c2, 0x0020, 0x00c2, 0x0000, 0x00c2, 0xfffd, 0x0002
.2byte 0xffff, 0x0000
.align 2
gSpriteAnimTable_8338E64:: @ 8338E64
.4byte gSpriteAnim_8338E1C
.align 2
gSpriteAnimTable_8338E68:: @ 8338E68
.4byte gSpriteAnim_8338E40
gUnknown_08338E6C:: @ 8338E6C
obj_tiles gTradeGBAScreenTiles, 0x1000, 0x15b4
.align 2
gSpriteTemplate_8338E74:: @ 8338E74
spr_template 0x15b4, 0x15b3, gOamData_8338E14, gSpriteAnimTable_8338E64, NULL, gDummySpriteAffineAnimTable, sub_807AB04
.align 2
gSpriteTemplate_8338E8C:: @ 8338E8C
spr_template 0x15b4, 0x15b3, gOamData_8338E14, gSpriteAnimTable_8338E68, NULL, gDummySpriteAffineAnimTable, sub_807AB04
.align 1
gUnknown_08338EA4:: @ 8338EA4
.incbin "graphics/trade/unknown_338EA4.gbapal"
.align 2
gSpriteAffineAnim_8338EBC:: @ 8338EBC
.2byte 0xff00, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_8338ECC:: @ 8338ECC
.4byte gSpriteAffineAnim_8338EBC
.align 2
gIngameTrades:: @ 8338ED0
.string "DOTS$", 11
.align 1
.2byte SPECIES_SEEDOT
.byte 5, 4, 5, 4, 4, 4
.byte 1
.align 2
.4byte 0x9746
.byte 30, 5, 5, 5, 5
.align 2
.4byte 0x84
.2byte ITEM_CHESTO_BERRY
.byte -1
.string "KOBE$", 11
.byte 0
.byte 10
.2byte SPECIES_RALTS
.align 2
.string "PLUSES$", 11
.align 1
.2byte SPECIES_PLUSLE
.byte 4, 4, 4, 5, 5, 4
.byte 0
.align 2
.4byte 0x1210c
.byte 5, 5, 30, 5, 5
.align 2
.4byte 0x6f
.2byte ITEM_WOOD_MAIL
.byte 0
.string "ROMAN$", 11
.byte 0
.byte 10
.2byte SPECIES_VOLBEAT
.align 2
.string "SEASOR$", 11
.align 1
.2byte SPECIES_HORSEA
.byte 5, 4, 4, 4, 5, 4
.byte 0
.align 2
.4byte 0xb4cd
.byte 5, 5, 5, 5, 30
.align 2
.4byte 0x7f
.2byte ITEM_WAVE_MAIL
.byte 1
.string "SKYLAR$", 11
.byte 0
.byte 10
.2byte SPECIES_BAGON
.align 2
.string "MEOWOW$", 11
.align 1
.2byte SPECIES_MEOWTH
.byte 4, 5, 4, 5, 4, 4
.byte 0
.align 2
.4byte 0x16559
.byte 5, 5, 5, 30, 5
.align 2
.4byte 0x8b
.2byte ITEM_RETRO_MAIL
.byte 2
.string "ISIS$", 11
.byte 1
.byte 10
.2byte SPECIES_SKITTY
.align 2
gUnknown_08338FC0:: @ 8338FC0
.2byte 0x1006, 0x1232, 0x102f, 0x0161, 0x0c00, 0x0182, 0x1000, 0x1006, 0x0e3b, 0x0000, 0x0a01, 0x1000, 0x161e, 0x018b, 0x0433, 0x1611
.2byte 0x180f, 0x0074, 0x1440, 0x0000, 0x0811, 0x102b, 0x013b, 0x2a34, 0x0c16, 0x1037, 0x1020, 0x0418, 0x0c23, 0x0000
.align 2
gUnknown_08338FFC:: @ 8338FFC
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0040
null_window_template
.align 2
gUnknown_0833900C:: @ 833900C
window_template 0x00, 0x15, 0x09, 0x05, 0x04, 0x0f, 0x00bc
.align 2
gUnknown_08339014:: @ 8339014
.4byte 0x000001fc, 0x00002051, 0x00002326, 0x00003063
gUnknown_08339024:: @ 8339024
.byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0xfc, 0xfc, 0xfc, 0xfd, 0xfd, 0xfd, 0xfd, 0xfe, 0xfe, 0xfe
.byte 0xfe, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04
.byte 0x04, 0x04, 0xfc, 0xfd, 0xfd, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0xfc, 0xfd, 0xfe, 0xff
.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x02, 0x03
gUnknown_08339090:: @ 8339090
.byte 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x01, 0x05, 0x02, 0x06, 0x02, 0x07, 0x02, 0x08, 0x02, 0x09, 0x02, 0x0a, 0x03, 0x0b, 0x03, 0x0c, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x0f, 0x02
.byte 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x01, 0x05, 0x02, 0x06, 0x02, 0x07, 0x02, 0x08, 0x02, 0x09, 0x02, 0x0a, 0x03, 0x0b, 0x03, 0x0c, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x10, 0x01
.byte 0x10, 0xff, 0x00, 0x00

5
include/battle_anim.h
View File

@ -122,7 +122,7 @@ s16 CloneBattlerSpriteWithBlend(u8);
void obj_delete_but_dont_free_vram(struct Sprite*); void obj_delete_but_dont_free_vram(struct Sprite*);
u8 sub_80A89C8(int, u8, int); u8 sub_80A89C8(int, u8, int);
void sub_80A6D60(struct UnknownAnimStruct2*, const void*, u32); void sub_80A6D60(struct UnknownAnimStruct2*, const void*, u32);
void sub_80A6CC0(u32, const void*, u32); void sub_80A6CC0(u32, const u32*, u32);
void sub_80A6DAC(bool8); void sub_80A6DAC(bool8);
void TranslateSpriteInGrowingCircleOverDuration(struct Sprite *); void TranslateSpriteInGrowingCircleOverDuration(struct Sprite *);
void sub_80A653C(struct Sprite *); void sub_80A653C(struct Sprite *);
@ -148,6 +148,7 @@ void sub_80A6BFC(struct UnknownAnimStruct2 *unk, u8 unused);
u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10); u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10);
void sub_80A749C(struct Sprite *sprite); void sub_80A749C(struct Sprite *sprite);
void sub_80A6814(u8 taskId); void sub_80A6814(u8 taskId);
void sub_80A6DEC(struct Sprite *sprite);
void DestroySpriteAndFreeResources_(struct Sprite *sprite); void DestroySpriteAndFreeResources_(struct Sprite *sprite);
void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId); void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId);
@ -209,7 +210,7 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes,
// battle_anim_utility_funcs.s // battle_anim_utility_funcs.s
void sub_8116EB4(u8); void sub_8116EB4(u8);
void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u8 *arg8, const u8 *arg9, const u16 *palette); void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *arg8, const u32 *arg9, const u32 *palette);
u32 UnpackSelectedBattleAnimPalettes(s16); u32 UnpackSelectedBattleAnimPalettes(s16);

2
include/gba/defines.h
View File

@ -66,6 +66,4 @@
#define TOTAL_OBJ_TILE_COUNT 1024 #define TOTAL_OBJ_TILE_COUNT 1024
#define WIN_RANGE(a, b) (((a) << 8) | (b))
#endif // GUARD_GBA_DEFINES #endif // GUARD_GBA_DEFINES

3
include/gba/io_reg.h
View File

@ -576,6 +576,9 @@
#define WINOUT_WINOBJ_OBJ (1 << 12) #define WINOUT_WINOBJ_OBJ (1 << 12)
#define WINOUT_WINOBJ_CLR (1 << 13) #define WINOUT_WINOBJ_CLR (1 << 13)
#define WIN_RANGE(a, b) (((a) << 8) | (b))
#define WIN_RANGE2(a, b) ((b) | ((a) << 8))
// BLDCNT // BLDCNT
// Bits 0-5 select layers for the 1st target // Bits 0-5 select layers for the 1st target
#define BLDCNT_TGT1_BG0 (1 << 0) #define BLDCNT_TGT1_BG0 (1 << 0)

28
include/graphics.h
View File

@ -3071,7 +3071,7 @@ extern const u32 gTrainerBackPicPalette_Leaf[];
// pokeblock // pokeblock
extern const u32 gMenuPokeblock_Gfx[]; extern const u32 gMenuPokeblock_Gfx[];
extern const u8 gMenuPokeblock_Pal[]; extern const u32 gMenuPokeblock_Pal[];
extern const u32 gMenuPokeblock_Tilemap[]; extern const u32 gMenuPokeblock_Tilemap[];
extern const u32 gMenuPokeblockDevice_Gfx[]; extern const u32 gMenuPokeblockDevice_Gfx[];
extern const u32 gMenuPokeblockDevice_Pal[]; extern const u32 gMenuPokeblockDevice_Pal[];
@ -3859,8 +3859,8 @@ extern const u8 gFireRedMenuElements_Gfx[];
// item menu graphics // item menu graphics
extern const u32 gBagScreen_Gfx[]; extern const u32 gBagScreen_Gfx[];
extern const u16 gBagScreenFemale_Pal[]; extern const u32 gBagScreenFemale_Pal[];
extern const u16 gBagScreenMale_Pal[]; extern const u32 gBagScreenMale_Pal[];
extern const u8 gBagMenuHMIcon_Gfx[]; extern const u8 gBagMenuHMIcon_Gfx[];
// item menu icons graphics // item menu icons graphics
@ -3914,7 +3914,7 @@ extern const u32 gIntro2FlygonGfx[];
// party menu graphics // party menu graphics
extern const u32 gPartyMenuMisc_Gfx[]; extern const u32 gPartyMenuMisc_Gfx[];
extern const u32 gPartyMenuMisc_Tilemap[]; extern const u32 gPartyMenuMisc_Tilemap[];
extern const u8 gPartyMenuMisc_Pal[]; extern const u32 gPartyMenuMisc_Pal[];
// berry pics // berry pics
extern const u32 gBerryPic_Cheri[]; extern const u32 gBerryPic_Cheri[];
@ -4105,6 +4105,10 @@ extern const u32 gUnknown_08D83C3C[];
extern const u32 gUnknown_08D83900[]; extern const u32 gUnknown_08D83900[];
extern const u32 gBattleFrontierGfx_DomeOptions[]; extern const u32 gBattleFrontierGfx_DomeOptions[];
extern const u32 gUnknown_08D854E8[];
extern const u32 gUnknown_08D855E8[];
extern const u32 gContest2Pal[];
extern const u32 gBattleAnimSpriteSheet_000[]; extern const u32 gBattleAnimSpriteSheet_000[];
extern const u32 gBattleAnimSpriteSheet_001[]; extern const u32 gBattleAnimSpriteSheet_001[];
extern const u32 gBattleAnimSpriteSheet_002[]; extern const u32 gBattleAnimSpriteSheet_002[];
@ -4626,9 +4630,9 @@ extern const u32 gBattleAnimSpritePalette_241[];
extern const u32 gBattleAnimSpritePalette_242[]; extern const u32 gBattleAnimSpritePalette_242[];
extern const u32 gBattleAnimSpritePalette_243[]; extern const u32 gBattleAnimSpritePalette_243[];
extern const u32 gBattleAnimSpritePalette_244[]; extern const u32 gBattleAnimSpritePalette_244[];
extern const u8 gUnknown_08C2DC68[]; extern const u32 gUnknown_08C2DC68[];
extern const u16 gUnknown_08C2DDA4[]; extern const u32 gUnknown_08C2DDA4[];
extern const u8 gUnknown_08C2DDC4[]; extern const u32 gUnknown_08C2DDC4[];
extern const u32 gBattleAnimSpritePalette_245[]; extern const u32 gBattleAnimSpritePalette_245[];
extern const u32 gBattleAnimSpritePalette_248[]; extern const u32 gBattleAnimSpritePalette_248[];
extern const u32 gBattleAnimSpritePalette_249[]; extern const u32 gBattleAnimSpritePalette_249[];
@ -4797,6 +4801,16 @@ extern const u32 gCableCarDoor_Gfx[];
extern const u32 gCableCarCord_Gfx[]; extern const u32 gCableCarCord_Gfx[];
extern const u16 gCableCar_Pal[]; extern const u16 gCableCar_Pal[];
// Trade
extern const u16 gUnknown_08DDB3E4[];
extern const u8 gUnknown_08DDB464[];
extern const u16 gUnknown_08DDCF04[];
extern const u16 gTradeGba2_Pal[];
extern const u8 gTradeGba_Gfx[];
extern const u16 gUnknown_08DDD704[];
extern const u8 gUnknown_08DDC6E4[];
extern const u16 gUnknown_08DDB444[];
// Party menu // Party menu
extern const u32 gPartyMenuPokeball_Gfx[]; extern const u32 gPartyMenuPokeball_Gfx[];
extern const u32 gPartyMenuPokeballSmall_Gfx[]; extern const u32 gPartyMenuPokeballSmall_Gfx[];

2
include/librfu.h
View File

@ -255,6 +255,6 @@ void rfu_REQ_recvData(void);
void rfu_UNI_readySendData(u8 a0); void rfu_UNI_readySendData(u8 a0);
void rfu_UNI_clearRecvNewDataFlag(u8 a0); void rfu_UNI_clearRecvNewDataFlag(u8 a0);
void rfu_REQ_PARENT_resumeRetransmitAndChange(void); void rfu_REQ_PARENT_resumeRetransmitAndChange(void);
void rfu_NI_setSendData(u8, u8, u8 *, u8); void rfu_NI_setSendData(u8, u8, const void *, u32);
#endif // GUARD_LIBRFU_H #endif // GUARD_LIBRFU_H

3
include/link.h
View File

@ -240,7 +240,7 @@ void SerialCB(void);
u8 GetLinkPlayerCount(void); u8 GetLinkPlayerCount(void);
bool32 InUnionRoom(void); bool32 InUnionRoom(void);
void sub_800E0E8(void); void sub_800E0E8(void);
bool8 sub_800A520(void); bool8 IsLinkTaskFinished(void);
void CreateWirelessStatusIndicatorSprite(u8, u8); void CreateWirelessStatusIndicatorSprite(u8, u8);
void sub_800ADF8(void); void sub_800ADF8(void);
void sub_800B488(void); void sub_800B488(void);
@ -311,5 +311,6 @@ void sub_800AD10(void);
void sub_800AB18(void); void sub_800AB18(void);
void sub_8009F18(void); void sub_8009F18(void);
bool8 sub_800AA60(void); bool8 sub_800AA60(void);
void sub_800ABF4(u16 a0);
#endif // GUARD_LINK_H #endif // GUARD_LINK_H

2
include/link_rfu.h
View File

@ -279,5 +279,7 @@ void sub_8011DE0(u32 arg0);
u8 sub_801100C(int a0); u8 sub_801100C(int a0);
void sub_800EF7C(void); void sub_800EF7C(void);
bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx); bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx);
s32 sub_800E87C(u8 idx);
void sub_8011BA4(void);
#endif //GUARD_LINK_RFU_H #endif //GUARD_LINK_RFU_H

2
include/palette.h
View File

@ -43,7 +43,7 @@ extern u8 gPaletteDecompressionBuffer[];
extern u16 gPlttBufferUnfaded[]; extern u16 gPlttBufferUnfaded[];
extern u16 gPlttBufferFaded[]; extern u16 gPlttBufferFaded[];
void LoadCompressedPalette(const void *, u16, u16); void LoadCompressedPalette(const u32 *, u16, u16);
void LoadPalette(const void *, u16, u16); void LoadPalette(const void *, u16, u16);
void FillPalette(u16, u16, u16); void FillPalette(u16, u16, u16);
void TransferPlttBuffer(void); void TransferPlttBuffer(void);

1
include/rom_8011DC0.h
View File

@ -5,6 +5,7 @@
// Exported RAM declarations // Exported RAM declarations
extern u8 gUnknown_02022C2C;
extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38; extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38;
extern u16 gUnknown_02022C3C; extern u16 gUnknown_02022C3C;
extern u8 gUnknown_02022C3E; extern u8 gUnknown_02022C3E;

8
include/strings.h
View File

@ -1893,7 +1893,6 @@ extern const u8 gText_PkmnTransferredSomeonesPC[];
extern const u8 gText_PkmnTransferredLanettesPC[]; extern const u8 gText_PkmnTransferredLanettesPC[];
// hall of fame // hall of fame
extern const u8 gText_SavingDontTurnOffPower[];
extern const u8 gText_LeagueChamp[]; extern const u8 gText_LeagueChamp[];
extern const u8 gText_HOFNumber[]; extern const u8 gText_HOFNumber[];
extern const u8 gText_PickNextCancel[]; extern const u8 gText_PickNextCancel[];
@ -1984,4 +1983,11 @@ extern const u8 gText_EggCantBeTradedNow[];
extern const u8 gText_OtherTrainerCantAcceptPkmn[]; extern const u8 gText_OtherTrainerCantAcceptPkmn[];
extern const u8 gText_CantTradeWithTrainer[]; extern const u8 gText_CantTradeWithTrainer[];
// trade
extern const u8 gText_XWillBeSentToY[];
extern const u8 gText_ByeByeVar1[];
extern const u8 gText_XSentOverY[];
extern const u8 gText_TakeGoodCareOfX[];
extern const u8 gText_CommunicationStandby5[];
#endif //GUARD_STRINGS_H #endif //GUARD_STRINGS_H

8
include/trade.h
View File

@ -12,8 +12,12 @@
s32 sub_807A728(void); s32 sub_807A728(void);
void sub_80773AC(void); void sub_80773AC(void);
void sub_807AE50(void); void sub_807AE50(void);
int sub_807A8D0(u32 /* probably wrong */, u16, u16, u8); int sub_807A8D0(struct UnkLinkRfuStruct_02022B14Substruct a0, u16, u16, u8);
int sub_807A7E0(u32 /* probably wrong */, u32 /* probably wrong */, u16, u16, u16, u16, u8); int sub_807A7E0(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 a2, u16 a3, u8 a4, u16 a5, u8 a6);
int sub_807A918(struct Pokemon*, u16); int sub_807A918(struct Pokemon*, u16);
void sub_807B140(void);
void sub_807B154(void);
void sub_807F19C(void);
void sub_807F1A8(u8, const u8 *, u8);
#endif //GUARD_TRADE_H #endif //GUARD_TRADE_H

1
include/trainer_card.h
View File

@ -38,5 +38,6 @@ void sub_80C3120(struct TrainerCard *arg0, u16 *arg1, u8 gameVersion);
void TrainerCard_ShowLinkCard(u8 arg0, void (*callback)(void)); void TrainerCard_ShowLinkCard(u8 arg0, void (*callback)(void));
void TrainerCard_GenerateCardForPlayer(struct TrainerCard *); void TrainerCard_GenerateCardForPlayer(struct TrainerCard *);
u8 sub_80C4904(u8); u8 sub_80C4904(u8);
void sub_80C6D80(const u8 *, u8 *, u8, u8, u8);
#endif // GUARD_TRAINER_CARD_H #endif // GUARD_TRAINER_CARD_H

1
include/util.h
View File

@ -14,5 +14,6 @@ u16 CalcCRC16(u8 *data, s32 length);
u16 CalcCRC16WithTable(u8 *data, u32 length); u16 CalcCRC16WithTable(u8 *data, u32 length);
u32 CalcByteArraySum(const u8* data, u32 length); u32 CalcByteArraySum(const u8* data, u32 length);
void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor); void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor);
void DoBgAffineSet(struct BgAffineDstData *dest, u32 texX, u32 texY, s16 scrX, s16 scrY, s16 sx, s16 sy, u16 alpha);
#endif // GUARD_UTIL_H #endif // GUARD_UTIL_H

4
ld_script.txt
View File

@ -81,7 +81,7 @@ SECTIONS {
src/smokescreen.o(.text); src/smokescreen.o(.text);
src/pokeball.o(.text); src/pokeball.o(.text);
src/load_save.o(.text); src/load_save.o(.text);
asm/trade.o(.text); src/trade.o(.text);
src/berry_blender.o(.text); src/berry_blender.o(.text);
src/play_time.o(.text); src/play_time.o(.text);
src/new_game.o(.text); src/new_game.o(.text);
@ -418,7 +418,7 @@ SECTIONS {
src/battle_gfx_sfx_util.o(.rodata); src/battle_gfx_sfx_util.o(.rodata);
src/battle_interface.o(.rodata); src/battle_interface.o(.rodata);
src/pokeball.o(.rodata); src/pokeball.o(.rodata);
data/trade.o(.rodata); src/trade.o(.rodata);
src/berry_blender.o(.rodata); src/berry_blender.o(.rodata);
src/new_game.o(.rodata); src/new_game.o(.rodata);
src/overworld.o(.rodata); src/overworld.o(.rodata);

2
src/battle_anim_80A5C6C.c
View File

@ -948,7 +948,7 @@ void sub_80A6C68(u32 bgId)
CopyBgTilemapBufferToVram(unkStruct.bgId); CopyBgTilemapBufferToVram(unkStruct.bgId);
} }
void sub_80A6CC0(u32 bgId, const void *src, u32 tilesOffset) void sub_80A6CC0(u32 bgId, const u32 *src, u32 tilesOffset)
{ {
CpuFill32(0, gUnknown_0202305C, 0x2000); CpuFill32(0, gUnknown_0202305C, 0x2000);
LZDecompressWram(src, gUnknown_0202305C); LZDecompressWram(src, gUnknown_0202305C);

4
src/battle_anim_effects_2.c
View File

@ -3390,8 +3390,8 @@ void sub_81064F8(u8 taskId)
else else
sub_80A6D60(&unknownStruct, &gBattleAnimBackgroundTilemap_ScaryFaceOpponent, 0); sub_80A6D60(&unknownStruct, &gBattleAnimBackgroundTilemap_ScaryFaceOpponent, 0);
sub_80A6CC0(unknownStruct.bgId, &gUnknown_08C249F8, unknownStruct.tilesOffset); sub_80A6CC0(unknownStruct.bgId, gUnknown_08C249F8, unknownStruct.tilesOffset);
LoadCompressedPalette(&gUnknown_08C249D0, unknownStruct.unk8 << 4, 32); LoadCompressedPalette(gUnknown_08C249D0, unknownStruct.unk8 << 4, 32);
gTasks[taskId].func = sub_81065EC; gTasks[taskId].func = sub_81065EC;
} }

8
src/battle_anim_effects_3.c
View File

@ -2383,8 +2383,8 @@ void sub_815BB84(u8 taskId)
gBattle_BG1_Y = 0; gBattle_BG1_Y = 0;
} }
sub_80A6CC0(unknownStruct.bgId, &gUnknown_08C2A634, unknownStruct.tilesOffset); sub_80A6CC0(unknownStruct.bgId, gUnknown_08C2A634, unknownStruct.tilesOffset);
LoadCompressedPalette(&gUnknown_08C2A6D4, unknownStruct.unk8 << 4, 32); LoadCompressedPalette(gUnknown_08C2A6D4, unknownStruct.unk8 << 4, 32);
gTasks[taskId].data[10] = gBattle_BG1_X; gTasks[taskId].data[10] = gBattle_BG1_X;
gTasks[taskId].data[11] = gBattle_BG1_Y; gTasks[taskId].data[11] = gBattle_BG1_Y;
@ -2589,8 +2589,8 @@ void sub_815C0A4(u8 taskId)
gBattle_BG1_Y = 0; gBattle_BG1_Y = 0;
} }
sub_80A6CC0(unknownStruct.bgId, &gUnknown_08C2A634, unknownStruct.tilesOffset); sub_80A6CC0(unknownStruct.bgId, gUnknown_08C2A634, unknownStruct.tilesOffset);
LoadCompressedPalette(&gUnknown_08C2A6D4, unknownStruct.unk8 << 4, 32); LoadCompressedPalette(gUnknown_08C2A6D4, unknownStruct.unk8 << 4, 32);
gTasks[taskId].data[10] = gBattle_BG1_X; gTasks[taskId].data[10] = gBattle_BG1_X;
gTasks[taskId].data[11] = gBattle_BG1_Y; gTasks[taskId].data[11] = gBattle_BG1_Y;
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;

2
src/battle_anim_utility_funcs.c
View File

@ -767,7 +767,7 @@ void sub_81177E4(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u8 *arg8, const u8 *arg9, const u16 *palette) void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *arg8, const u32 *arg9, const u32 *palette)
{ {
u16 species; u16 species;
u8 spriteId, spriteId2; u8 spriteId, spriteId2;

4
src/battle_arena.c
View File

@ -8,6 +8,7 @@
#include "decompress.h" #include "decompress.h"
#include "event_data.h" #include "event_data.h"
#include "frontier_util.h" #include "frontier_util.h"
#include "graphics.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "item.h" #include "item.h"
#include "m4a.h" #include "m4a.h"
@ -23,9 +24,6 @@
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/moves.h" #include "constants/moves.h"
extern const u32 gUnknown_08D854E8[];
extern const u16 gUnknown_08D855E8[];
// This file's functions. // This file's functions.
static void sub_81A58B4(void); static void sub_81A58B4(void);
static void sub_81A5964(void); static void sub_81A5964(void);

4
src/battle_controller_player.c
View File

@ -869,7 +869,7 @@ static void sub_80586F8(void)
} }
else else
{ {
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
m4aSongNumStop(SE_HINSI); m4aSongNumStop(SE_HINSI);
gMain.inBattle = 0; gMain.inBattle = 0;
@ -888,7 +888,7 @@ void sub_80587B0(void)
{ {
if (gBattleTypeFlags & BATTLE_TYPE_LINK) if (gBattleTypeFlags & BATTLE_TYPE_LINK)
{ {
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
if (gWirelessCommType == 0) if (gWirelessCommType == 0)
sub_800AC34(); sub_800AC34();

2
src/battle_controllers.c
View File

@ -800,7 +800,7 @@ static void Task_HandleSendLinkBuffersData(u8 taskId)
} }
break; break;
case 4: case 4:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
blockSize = gLinkBattleSendBuffer[gTasks[taskId].data[15] + LINK_BUFF_SIZE_LO] | (gLinkBattleSendBuffer[gTasks[taskId].data[15] + LINK_BUFF_SIZE_HI] << 8); blockSize = gLinkBattleSendBuffer[gTasks[taskId].data[15] + LINK_BUFF_SIZE_LO] | (gLinkBattleSendBuffer[gTasks[taskId].data[15] + LINK_BUFF_SIZE_HI] << 8);
gTasks[taskId].data[13] = 1; gTasks[taskId].data[13] = 1;

48
src/battle_main.c
View File

@ -17,6 +17,7 @@
#include "dma3.h" #include "dma3.h"
#include "event_data.h" #include "event_data.h"
#include "evolution_scene.h" #include "evolution_scene.h"
#include "graphics.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "item.h" #include "item.h"
@ -60,7 +61,6 @@
extern struct MusicPlayerInfo gMPlayInfo_SE1; extern struct MusicPlayerInfo gMPlayInfo_SE1;
extern struct MusicPlayerInfo gMPlayInfo_SE2; extern struct MusicPlayerInfo gMPlayInfo_SE2;
extern const u16 gBattleTextboxPalette[];
extern const struct BgTemplate gBattleBgTemplates[]; extern const struct BgTemplate gBattleBgTemplates[];
extern const struct WindowTemplate *const gBattleWindowTemplates[]; extern const struct WindowTemplate *const gBattleWindowTemplates[];
extern const u8 *const gBattleScriptsForMoveEffects[]; extern const u8 *const gBattleScriptsForMoveEffects[];
@ -986,7 +986,7 @@ static void CB2_HandleStartBattle(void)
{ {
if (gReceivedRemoteLinkPlayers != 0) if (gReceivedRemoteLinkPlayers != 0)
{ {
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
*(&gBattleStruct->field_180) = 0; *(&gBattleStruct->field_180) = 0;
*(&gBattleStruct->field_181) = 3; *(&gBattleStruct->field_181) = 3;
@ -1035,7 +1035,7 @@ static void CB2_HandleStartBattle(void)
} }
break; break;
case 3: case 3:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(struct Pokemon) * 2); SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
@ -1050,7 +1050,7 @@ static void CB2_HandleStartBattle(void)
} }
break; break;
case 7: case 7:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(struct Pokemon) * 2); SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
@ -1065,7 +1065,7 @@ static void CB2_HandleStartBattle(void)
} }
break; break;
case 11: case 11:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 4, sizeof(struct Pokemon) * 2); SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 4, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
@ -1107,7 +1107,7 @@ static void CB2_HandleStartBattle(void)
} }
break; break;
case 16: case 16:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
SendBlock(bitmask_all_link_players_but_self(), &gRecordedBattleRngSeed, sizeof(gRecordedBattleRngSeed)); SendBlock(bitmask_all_link_players_but_self(), &gRecordedBattleRngSeed, sizeof(gRecordedBattleRngSeed));
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
@ -1194,7 +1194,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
GetBattleTowerTrainerLanguage(&language, gTrainerBattleOpponent_B); GetBattleTowerTrainerLanguage(&language, gTrainerBattleOpponent_B);
gLinkPlayers[3].language = language; gLinkPlayers[3].language = language;
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
*(&gBattleStruct->field_180) = 0; *(&gBattleStruct->field_180) = 0;
*(&gBattleStruct->field_181) = 3; *(&gBattleStruct->field_181) = 3;
@ -1234,7 +1234,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
} }
break; break;
case 3: case 3:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(struct Pokemon) * 2); SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
@ -1258,7 +1258,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
} }
break; break;
case 5: case 5:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(struct Pokemon)); SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(struct Pokemon));
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
@ -1282,7 +1282,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
} }
break; break;
case 7: case 7:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
SendBlock(bitmask_all_link_players_but_self(), gEnemyParty, sizeof(struct Pokemon) * 2); SendBlock(bitmask_all_link_players_but_self(), gEnemyParty, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
@ -1300,7 +1300,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
} }
break; break;
case 9: case 9:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
SendBlock(bitmask_all_link_players_but_self(), gEnemyParty + 2, sizeof(struct Pokemon) * 2); SendBlock(bitmask_all_link_players_but_self(), gEnemyParty + 2, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
@ -1318,7 +1318,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
} }
break; break;
case 11: case 11:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
SendBlock(bitmask_all_link_players_but_self(), gEnemyParty + 4, sizeof(struct Pokemon) * 2); SendBlock(bitmask_all_link_players_but_self(), gEnemyParty + 4, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
@ -1360,7 +1360,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
} }
break; break;
case 14: case 14:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
SendBlock(bitmask_all_link_players_but_self(), &gRecordedBattleRngSeed, sizeof(gRecordedBattleRngSeed)); SendBlock(bitmask_all_link_players_but_self(), &gRecordedBattleRngSeed, sizeof(gRecordedBattleRngSeed));
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
@ -1440,7 +1440,7 @@ static void CB2_PreInitMultiBattle(void)
switch (gBattleCommunication[MULTIUSE_STATE]) switch (gBattleCommunication[MULTIUSE_STATE])
{ {
case 0: case 0:
if (gReceivedRemoteLinkPlayers != 0 && sub_800A520()) if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished())
{ {
gUnknown_02023058 = Alloc(sizeof(struct UnknownPokemonStruct4) * 3); gUnknown_02023058 = Alloc(sizeof(struct UnknownPokemonStruct4) * 3);
sub_80379F8(0); sub_80379F8(0);
@ -1478,7 +1478,7 @@ static void CB2_PreInitMultiBattle(void)
} }
break; break;
case 2: case 2:
if (sub_800A520() && !gPaletteFade.active) if (IsLinkTaskFinished() && !gPaletteFade.active)
{ {
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
if (gWirelessCommType) if (gWirelessCommType)
@ -1581,7 +1581,7 @@ static void CB2_HandleStartMultiBattle(void)
{ {
if (gReceivedRemoteLinkPlayers != 0) if (gReceivedRemoteLinkPlayers != 0)
{ {
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
*(&gBattleStruct->field_180) = 0; *(&gBattleStruct->field_180) = 0;
*(&gBattleStruct->field_181) = 3; *(&gBattleStruct->field_181) = 3;
@ -1643,7 +1643,7 @@ static void CB2_HandleStartMultiBattle(void)
break; break;
// fall through // fall through
case 3: case 3:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(struct Pokemon) * 2); SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
@ -1706,7 +1706,7 @@ static void CB2_HandleStartMultiBattle(void)
} }
break; break;
case 5: case 5:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(struct Pokemon)); SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(struct Pokemon));
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
@ -1802,7 +1802,7 @@ static void CB2_HandleStartMultiBattle(void)
} }
break; break;
case 8: case 8:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
u32* ptr = (u32*)(&gBattleStruct->field_180); u32* ptr = (u32*)(&gBattleStruct->field_180);
ptr[0] = gBattleTypeFlags; ptr[0] = gBattleTypeFlags;
@ -2361,7 +2361,7 @@ static void sub_8038F34(void)
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
break; break;
case 6: case 6:
if (sub_800A520() == TRUE) if (IsLinkTaskFinished() == TRUE)
{ {
sub_800ADF8(); sub_800ADF8();
BattlePutTextOnWindow(gText_LinkStandby3, 0); BattlePutTextOnWindow(gText_LinkStandby3, 0);
@ -2371,7 +2371,7 @@ static void sub_8038F34(void)
case 7: case 7:
if (!IsTextPrinterActive(0)) if (!IsTextPrinterActive(0))
{ {
if (sub_800A520() == TRUE) if (IsLinkTaskFinished() == TRUE)
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
} }
break; break;
@ -2546,7 +2546,7 @@ static void sub_803939C(void)
} }
break; break;
case 6: case 6:
if (sub_800A520() == TRUE) if (IsLinkTaskFinished() == TRUE)
{ {
HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR); HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
if (gMain.field_439_x4) if (gMain.field_439_x4)
@ -2596,7 +2596,7 @@ static void sub_803939C(void)
} }
break; break;
case 11: case 11:
if (sub_800A520() == TRUE && !IsTextPrinterActive(0) && --gBattleCommunication[1] == 0) if (IsLinkTaskFinished() == TRUE && !IsTextPrinterActive(0) && --gBattleCommunication[1] == 0)
{ {
if (gMain.field_439_x4) if (gMain.field_439_x4)
{ {
@ -2612,7 +2612,7 @@ static void sub_803939C(void)
{ {
if (gMain.field_439_x4) if (gMain.field_439_x4)
{ {
if (sub_800A520() == TRUE) if (IsLinkTaskFinished() == TRUE)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattleCommunication[1] = 0x20; gBattleCommunication[1] = 0x20;

4
src/battle_tower.c
View File

@ -2799,7 +2799,7 @@ static void sub_8164B74(void)
if (battleMode == FRONTIER_MODE_LINK_MULTIS) if (battleMode == FRONTIER_MODE_LINK_MULTIS)
{ {
challengeNum = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] / 7; challengeNum = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] / 7;
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
SendBlock(bitmask_all_link_players_but_self(), &challengeNum, sizeof(challengeNum)); SendBlock(bitmask_all_link_players_but_self(), &challengeNum, sizeof(challengeNum));
gSpecialVar_Result = 1; gSpecialVar_Result = 1;
@ -2836,7 +2836,7 @@ static void sub_8164B74(void)
} }
break; break;
case 2: case 2:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
SendBlock(bitmask_all_link_players_but_self(), &gSaveBlock2Ptr->frontier.field_CB4, sizeof(gSaveBlock2Ptr->frontier.field_CB4)); SendBlock(bitmask_all_link_players_but_self(), &gSaveBlock2Ptr->frontier.field_CB4, sizeof(gSaveBlock2Ptr->frontier.field_CB4));
gSpecialVar_Result = 3; gSpecialVar_Result = 3;

16
src/berry_blender.c
View File

@ -1240,7 +1240,7 @@ static void sub_8080018(void)
sBerryBlenderData->framesToWait = 0; sBerryBlenderData->framesToWait = 0;
break; break;
case 9: case 9:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
ResetBlockReceivedFlags(); ResetBlockReceivedFlags();
if (GetMultiplayerId() == 0) if (GetMultiplayerId() == 0)
@ -1297,7 +1297,7 @@ static void sub_8080018(void)
} }
break; break;
case 13: case 13:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
sBerryBlenderData->mainState++; sBerryBlenderData->mainState++;
sub_8082CB4(&sBerryBlenderData->bgAffineSrc); sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
@ -1342,7 +1342,7 @@ static void sub_8080018(void)
sBerryBlenderData->mainState++; sBerryBlenderData->mainState++;
break; break;
case 20: case 20:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
sub_800A418(); sub_800A418();
sBerryBlenderData->mainState++; sBerryBlenderData->mainState++;
@ -2412,7 +2412,7 @@ static void CB2_HandleBlenderEndGame(void)
{ {
sBerryBlenderData->gameEndState++; sBerryBlenderData->gameEndState++;
} }
else if (sub_800A520()) else if (IsLinkTaskFinished())
{ {
if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType) if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType)
{ {
@ -2593,7 +2593,7 @@ static bool8 LinkPlayAgainHandleSaving(void)
sBerryBlenderData->framesToWait = 0; sBerryBlenderData->framesToWait = 0;
break; break;
case 1: case 1:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
sBerryBlenderData->field_1A0++; sBerryBlenderData->field_1A0++;
gSoftResetDisabled = TRUE; gSoftResetDisabled = TRUE;
@ -2612,7 +2612,7 @@ static bool8 LinkPlayAgainHandleSaving(void)
} }
break; break;
case 4: case 4:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
if (sub_8153474()) if (sub_8153474())
{ {
@ -2687,7 +2687,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void)
sBerryBlenderData->gameEndState++; sBerryBlenderData->gameEndState++;
break; break;
case 6: case 6:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
sBerryBlenderData->framesToWait = 0; sBerryBlenderData->framesToWait = 0;
sBerryBlenderData->gameEndState++; sBerryBlenderData->gameEndState++;
@ -2706,7 +2706,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void)
sub_800ADF8(); sub_800ADF8();
break; break;
case 9: case 9:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
sBerryBlenderData->gameEndState++; sBerryBlenderData->gameEndState++;

4
src/cable_club.c
View File

@ -898,7 +898,7 @@ static void sub_80B33BC(u8 taskId)
data[0] = 6; data[0] = 6;
break; break;
case 6: case 6:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
data[0] = 7; data[0] = 7;
} }
@ -1123,7 +1123,7 @@ static void sub_80B3894(u8 taskId)
data[0]++; data[0]++;
break; break;
case 3: case 3:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
sub_8013F78(); sub_8013F78();
DestroyTask(taskId); DestroyTask(taskId);

5
src/contest.c
View File

@ -217,7 +217,6 @@ extern const u8 gText_0827D597[];
extern const struct ContestPokemon gContestOpponents[96]; extern const struct ContestPokemon gContestOpponents[96];
extern const u8 gUnknown_085898A4[96]; extern const u8 gUnknown_085898A4[96];
extern const struct CompressedSpriteSheet gUnknown_08587C00; extern const struct CompressedSpriteSheet gUnknown_08587C00;
extern const u8 gContest2Pal[];
extern const struct SpriteTemplate gSpriteTemplate_8587BE8; extern const struct SpriteTemplate gSpriteTemplate_8587BE8;
extern const struct CompressedSpriteSheet gUnknown_08587C08; extern const struct CompressedSpriteSheet gUnknown_08587C08;
extern const struct CompressedSpritePalette gUnknown_08587C10; extern const struct CompressedSpritePalette gUnknown_08587C10;
@ -474,14 +473,14 @@ void sub_80D7CB4(u8 taskId)
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
// fallthrough // fallthrough
case 1: case 1:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
sub_800ADF8(); sub_800ADF8();
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
} }
return; return;
case 2: case 2:
if (sub_800A520() != TRUE) if (IsLinkTaskFinished() != TRUE)
return; return;
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;

6
src/egg_hatch.c
View File

@ -23,6 +23,7 @@
#include "bg.h" #include "bg.h"
#include "m4a.h" #include "m4a.h"
#include "window.h" #include "window.h"
#include "graphics.h"
#include "constants/abilities.h" #include "constants/abilities.h"
#include "daycare.h" #include "daycare.h"
#include "overworld.h" #include "overworld.h"
@ -52,11 +53,6 @@ struct EggHatchData
}; };
extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const u8 gBattleTextboxTiles[];
extern const u8 gBattleTextboxTilemap[];
extern const u8 gBattleTextboxPalette[];
extern const u16 gTradeGba2_Pal[]; // palette, gameboy advance
extern const u32 gTradeGba_Gfx[]; // tileset gameboy advance
extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle
extern const u8 gText_HatchedFromEgg[]; extern const u8 gText_HatchedFromEgg[];
extern const u8 gText_NickHatchPrompt[]; extern const u8 gText_NickHatchPrompt[];

51
src/evolution_scene.c
View File

@ -1,33 +1,34 @@
#include "global.h" #include "global.h"
#include "alloc.h"
#include "battle.h"
#include "battle_message.h"
#include "bg.h"
#include "data2.h"
#include "decompress.h"
#include "evolution_scene.h" #include "evolution_scene.h"
#include "evolution_graphics.h" #include "evolution_graphics.h"
#include "sprite.h" #include "gpu_regs.h"
#include "alloc.h" #include "link.h"
#include "task.h" #include "m4a.h"
#include "palette.h"
#include "main.h" #include "main.h"
#include "menu.h"
#include "overworld.h"
#include "palette.h"
#include "pokedex.h"
#include "pokemon.h"
#include "scanline_effect.h"
#include "sound.h"
#include "sprite.h"
#include "string_util.h"
#include "task.h"
#include "text.h" #include "text.h"
#include "text_window.h" #include "text_window.h"
#include "pokemon.h"
#include "string_util.h"
#include "battle.h"
#include "scanline_effect.h"
#include "decompress.h"
#include "m4a.h"
#include "menu.h"
#include "pokedex.h"
#include "constants/species.h"
#include "sound.h"
#include "constants/songs.h"
#include "overworld.h"
#include "battle_message.h"
#include "constants/battle_string_ids.h"
#include "gpu_regs.h"
#include "bg.h"
#include "link.h"
#include "util.h"
#include "trig.h" #include "trig.h"
#include "data2.h" #include "trade.h"
#include "util.h"
#include "constants/battle_string_ids.h"
#include "constants/species.h"
#include "constants/songs.h"
struct EvoInfo struct EvoInfo
{ {
@ -50,12 +51,8 @@ extern const struct CompressedSpriteSheet gMonFrontPicTable[];
// strings // strings
extern const u8 gText_CommunicationStandby5[]; extern const u8 gText_CommunicationStandby5[];
extern void sub_807B154(void);
extern void sub_807F19C(void);
extern void sub_807B140(void);
extern void ShowSelectMovePokemonSummaryScreen(struct Pokemon *party, u8 monId, u8 partyCount, void *CB2_ptr, u16 move); extern void ShowSelectMovePokemonSummaryScreen(struct Pokemon *party, u8 monId, u8 partyCount, void *CB2_ptr, u16 move);
extern u8 sub_81C1B94(void); extern u8 sub_81C1B94(void);
extern void sub_807F1A8(u8 arg0, const u8 *arg1, u8 arg2);
extern void sub_800E084(void); extern void sub_800E084(void);
// this file's functions // this file's functions

4
src/field_screen_effect.c
View File

@ -215,7 +215,7 @@ static void sub_80AF234(u8 taskId)
task->data[0]++; task->data[0]++;
break; break;
case 1: case 1:
if (!sub_800A520()) if (!IsLinkTaskFinished())
{ {
if (++task->data[1] > 1800) if (++task->data[1] > 1800)
sub_8011170(0x6000); sub_8011170(0x6000);
@ -248,7 +248,7 @@ void sub_80AF2B4(u8 taskId)
task->data[0]++; task->data[0]++;
break; break;
case 1: case 1:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
task->data[0]++; task->data[0]++;
} }

8
src/field_specials.c
View File

@ -3609,7 +3609,7 @@ static void sub_813B57C(u8 taskId)
} }
break; break;
case 1: case 1:
if (sub_800A520() == TRUE) if (IsLinkTaskFinished() == TRUE)
{ {
if (GetMultiplayerId() == 0) if (GetMultiplayerId() == 0)
{ {
@ -3650,7 +3650,7 @@ static void sub_813B57C(u8 taskId)
} }
break; break;
case 3: case 3:
if (sub_800A520() == TRUE) if (IsLinkTaskFinished() == TRUE)
{ {
if (GetMultiplayerId() != 0) if (GetMultiplayerId() != 0)
{ {
@ -3702,14 +3702,14 @@ static void sub_813B57C(u8 taskId)
} }
break; break;
case 7: case 7:
if (sub_800A520() == 1) if (IsLinkTaskFinished() == 1)
{ {
sub_800ADF8(); sub_800ADF8();
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
} }
break; break;
case 8: case 8:
if (sub_800A520() == 1) if (IsLinkTaskFinished() == 1)
{ {
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
} }

2
src/fieldmap.c
View File

@ -993,7 +993,7 @@ void apply_map_tileset_palette(struct Tileset const *tileset, u16 destOffset, u1
} }
else else
{ {
LoadCompressedPalette((u16*)tileset->palettes, destOffset, size); LoadCompressedPalette((u32*)tileset->palettes, destOffset, size);
nullsub_3(destOffset, size >> 1); nullsub_3(destOffset, size >> 1);
} }
} }

6
src/graphics.c
View File

@ -897,9 +897,9 @@ const u32 gBattleStatMask6_Pal[] = INCBIN_U32("graphics/battle_anims/masks/stat6
const u32 gBattleStatMask7_Pal[] = INCBIN_U32("graphics/battle_anims/masks/stat7.gbapal.lz"); const u32 gBattleStatMask7_Pal[] = INCBIN_U32("graphics/battle_anims/masks/stat7.gbapal.lz");
const u32 gBattleStatMask8_Pal[] = INCBIN_U32("graphics/battle_anims/masks/stat8.gbapal.lz"); const u32 gBattleStatMask8_Pal[] = INCBIN_U32("graphics/battle_anims/masks/stat8.gbapal.lz");
const u8 gUnknown_08C2DC68[] = INCBIN_U8("graphics/battle_anims/masks/cure_bubbles.4bpp.lz"); const u32 gUnknown_08C2DC68[] = INCBIN_U32("graphics/battle_anims/masks/cure_bubbles.4bpp.lz");
const u16 gUnknown_08C2DDA4[] = INCBIN_U16("graphics/battle_anims/masks/cure_bubbles.gbapal.lz"); const u32 gUnknown_08C2DDA4[] = INCBIN_U32("graphics/battle_anims/masks/cure_bubbles.gbapal.lz");
const u8 gUnknown_08C2DDC4[] = INCBIN_U8("graphics/battle_anims/masks/cure_bubbles.bin.lz"); const u32 gUnknown_08C2DDC4[] = INCBIN_U32("graphics/battle_anims/masks/cure_bubbles.bin.lz");
const u32 gBattleAnimSpritePalette_245[] = INCBIN_U32("graphics/battle_anims/sprites/245.gbapal.lz"); const u32 gBattleAnimSpritePalette_245[] = INCBIN_U32("graphics/battle_anims/sprites/245.gbapal.lz");
const u32 gBattleAnimSpriteSheet_245[] = INCBIN_U32("graphics/battle_anims/sprites/245.4bpp.lz"); const u32 gBattleAnimSpriteSheet_245[] = INCBIN_U32("graphics/battle_anims/sprites/245.4bpp.lz");

2
src/link.c
View File

@ -1080,7 +1080,7 @@ bool8 sub_800A4D8(u8 a0)
return FALSE; return FALSE;
} }
bool8 sub_800A520(void) bool8 IsLinkTaskFinished(void)
{ {
if (gWirelessCommType == TRUE) if (gWirelessCommType == TRUE)
{ {

4
src/link_rfu.c
View File

@ -4123,7 +4123,7 @@ void sub_8010AAC(u8 taskId)
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
case 5: case 5:
if (sub_800A520() && GetBlockReceivedStatus() & 1) if (IsLinkTaskFinished() && GetBlockReceivedStatus() & 1)
{ {
CpuFill16(0, gBlockRecvBuffer, sizeof(struct UnkRfuStruct_8010A14)); CpuFill16(0, gBlockRecvBuffer, sizeof(struct UnkRfuStruct_8010A14));
ResetBlockReceivedFlag(0); ResetBlockReceivedFlag(0);
@ -4162,7 +4162,7 @@ void sub_8010D0C(u8 taskId)
} }
break; break;
case 1: case 1:
if (sub_800A520()) if (IsLinkTaskFinished())
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
case 2: case 2:

2
src/palette.c
View File

@ -77,7 +77,7 @@ static const u8 sRoundedDownGrayscaleMap[] = {
31, 31 31, 31
}; };
void LoadCompressedPalette(const void *src, u16 offset, u16 size) void LoadCompressedPalette(const u32 *src, u16 offset, u16 size)
{ {
LZDecompressWram(src, gPaletteDecompressionBuffer); LZDecompressWram(src, gPaletteDecompressionBuffer);
CpuCopy16(gPaletteDecompressionBuffer, gPlttBufferUnfaded + offset, size); CpuCopy16(gPaletteDecompressionBuffer, gPlttBufferUnfaded + offset, size);

4
src/party_menu.c
View File

@ -4579,7 +4579,7 @@ static void CursorCb_Register(u8 taskId)
u16 species = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_SPECIES); u16 species = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_SPECIES);
u8 obedience = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_OBEDIENCE); u8 obedience = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_OBEDIENCE);
switch (sub_807A8D0(*(u32 *)sub_800F7DC() /* dirty cast, probably needs to be changed */, species2, species, obedience)) switch (sub_807A8D0(*(struct UnkLinkRfuStruct_02022B14Substruct *)sub_800F7DC(), species2, species, obedience))
{ {
case 1: case 1:
StringExpandPlaceholders(gStringVar4, gText_PkmnCantBeTradedNow); StringExpandPlaceholders(gStringVar4, gText_PkmnCantBeTradedNow);
@ -4605,7 +4605,7 @@ static void CursorCb_Trade1(u8 taskId)
u16 species2 = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_SPECIES2); u16 species2 = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_SPECIES2);
u16 species = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_SPECIES); u16 species = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_SPECIES);
u8 obedience = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_OBEDIENCE); u8 obedience = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_OBEDIENCE);
u32 stringId = sub_807A7E0(*(u32 *)sub_800F7DC() /* dirty cast, probably needs to be changed */, *(u32 *)&gUnknown_02022C38 /* dirty cast, probably needs to be changed */, species2, gUnknown_02022C3C, gUnknown_02022C3E, species, obedience); u32 stringId = sub_807A7E0(*(struct UnkLinkRfuStruct_02022B14Substruct *)sub_800F7DC(), gUnknown_02022C38, species2, gUnknown_02022C3C, gUnknown_02022C3E, species, obedience);
if (stringId != 0) if (stringId != 0)
{ {

2
src/pokemon_summary_screen.c
View File

@ -1271,7 +1271,7 @@ static bool8 SummaryScreen_DecompressGraphics(void)
pssData->unk40F0++; pssData->unk40F0++;
break; break;
case 12: case 12:
LoadCompressedPalette(&gMoveTypes_Pal, 0x1D0, 0x60); LoadCompressedPalette(gMoveTypes_Pal, 0x1D0, 0x60);
pssData->unk40F0 = 0; pssData->unk40F0 = 0;
return TRUE; return TRUE;
} }

2
src/record_mixing.c
View File

@ -1003,7 +1003,7 @@ static void sub_80E7FF8(u8 taskId)
task->data[0] ++; task->data[0] ++;
break; break;
case 9: case 9:
if (sub_800A520()) if (IsLinkTaskFinished())
DestroyTask(taskId); DestroyTask(taskId);
break; break;
} }

2
src/rock.c
View File

@ -421,7 +421,7 @@ void AnimTask_LoadSandstormBackground(u8 taskId)
sub_80A6B30(&unknownStruct); sub_80A6B30(&unknownStruct);
sub_80A6CC0(unknownStruct.bgId, gUnknown_08D8D58C, unknownStruct.tilesOffset); sub_80A6CC0(unknownStruct.bgId, gUnknown_08D8D58C, unknownStruct.tilesOffset);
sub_80A6D60(&unknownStruct, gUnknown_08D8D410, 0); sub_80A6D60(&unknownStruct, gUnknown_08D8D410, 0);
LoadCompressedPalette(&gBattleAnimSpritePalette_261, unknownStruct.unk8 * 16, 32); LoadCompressedPalette(gBattleAnimSpritePalette_261, unknownStruct.unk8 * 16, 32);
if (gBattleAnimArgs[0] && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (gBattleAnimArgs[0] && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
var0 = 1; var0 = 1;

12
src/rom_8011DC0.c
View File

@ -1838,7 +1838,7 @@ void sub_8014790(u8 taskId)
} }
break; break;
case 3: case 3:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
DestroyTask(taskId); DestroyTask(taskId);
sub_80149D8(); sub_80149D8();
@ -2095,7 +2095,7 @@ void sub_8014A40(u8 taskId)
data->state++; data->state++;
break; break;
case 17: case 17:
if (sub_800A520()) if (IsLinkTaskFinished())
DestroyTask(taskId); DestroyTask(taskId);
break; break;
} }
@ -2264,7 +2264,7 @@ void sub_8014F48(u8 taskId)
sub_800ADF8(); sub_800ADF8();
break; break;
case 12: case 12:
if (sub_800A520()) if (IsLinkTaskFinished())
DestroyTask(taskId); DestroyTask(taskId);
break; break;
} }
@ -2443,7 +2443,7 @@ void sub_80152F4(u8 taskId)
sub_800ADF8(); sub_800ADF8();
break; break;
case 14: case 14:
if (sub_800A520()) if (IsLinkTaskFinished())
DestroyTask(taskId); DestroyTask(taskId);
break; break;
} }
@ -2836,7 +2836,7 @@ void sub_80156E0(u8 taskId)
} }
break; break;
case 41: case 41:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
if (GetMultiplayerId() == 0) if (GetMultiplayerId() == 0)
{ {
@ -3033,7 +3033,7 @@ void sub_80156E0(u8 taskId)
data->state = 15; data->state = 15;
break; break;
case 15: case 15:
if (sub_800A520()) if (IsLinkTaskFinished())
data->state = 16; data->state = 16;
break; break;
case 16: case 16:

8
src/save.c
View File

@ -77,7 +77,7 @@ extern void DoSaveFailedScreen(u8); // save_failed_screen
extern bool32 ProgramFlashSectorAndVerify(u8 sector, u8 *data); extern bool32 ProgramFlashSectorAndVerify(u8 sector, u8 *data);
extern void save_serialize_map(void); extern void save_serialize_map(void);
extern void sub_800ADF8(void); extern void sub_800ADF8(void);
extern bool8 sub_800A520(void); extern bool8 IsLinkTaskFinished(void);
// iwram common // iwram common
u16 gLastWrittenSector; u16 gLastWrittenSector;
@ -914,7 +914,7 @@ void sub_8153688(u8 taskId)
taskData[0] = 2; taskData[0] = 2;
break; break;
case 2: case 2:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
if (taskData[2] == 0) if (taskData[2] == 0)
save_serialize_map(); save_serialize_map();
@ -951,7 +951,7 @@ void sub_8153688(u8 taskId)
taskData[0] = 8; taskData[0] = 8;
break; break;
case 8: case 8:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
sub_8153408(); sub_8153408();
taskData[0] = 9; taskData[0] = 9;
@ -962,7 +962,7 @@ void sub_8153688(u8 taskId)
taskData[0] = 10; taskData[0] = 10;
break; break;
case 10: case 10:
if (sub_800A520()) if (IsLinkTaskFinished())
taskData[0]++; taskData[0]++;
break; break;
case 11: case 11:

3
src/scrcmd.c
View File

@ -54,8 +54,7 @@
typedef u16 (*SpecialFunc)(void); typedef u16 (*SpecialFunc)(void);
typedef void (*NativeFunc)(void); typedef void (*NativeFunc)(void);
extern const u8 *gUnknown_020375C0; EWRAM_DATA const u8 *gUnknown_020375C0 = NULL;
static EWRAM_DATA u32 gUnknown_020375C4 = 0; static EWRAM_DATA u32 gUnknown_020375C4 = 0;
static EWRAM_DATA u16 sPauseCounter = 0; static EWRAM_DATA u16 sPauseCounter = 0;
static EWRAM_DATA u16 sMovingNpcId = 0; static EWRAM_DATA u16 sMovingNpcId = 0;

4
src/script_pokemon_util_80F87D8.c
View File

@ -451,7 +451,7 @@ static void sub_80F9088(u8 taskId)
switch (gTasks[taskId].data[0]) switch (gTasks[taskId].data[0])
{ {
case 0: case 0:
if (sub_800A520()) if (IsLinkTaskFinished())
{ {
sub_800ADF8(); sub_800ADF8();
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
@ -461,7 +461,7 @@ static void sub_80F9088(u8 taskId)
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
default: default:
if (sub_800A520() == 1) if (IsLinkTaskFinished() == 1)
{ {
EnableBothScriptContexts(); EnableBothScriptContexts();
DestroyTask(taskId); DestroyTask(taskId);

6389
src/trade.c Normal file
View File

File diff suppressed because it is too large Load Diff

25
sym_ewram.txt
View File

@ -111,25 +111,7 @@ gUnknown_02022D00: @ 2022D00
.include "src/random.o" .include "src/random.o"
.include "src/daycare.o" .include "src/daycare.o"
.include "src/load_save.o" .include "src/load_save.o"
.include "src/trade.o"
gUnknown_02032184: @ 2032184
.space 0x4
gUnknown_02032188: @ 2032188
.space 0x38
gUnknown_020321C0: @ 20321C0
.space 0xD8
gUnknown_02032298: @ 2032298
.space 0x4
gUnknown_0203229C: @ 203229C
.space 0x4
gUnknown_020322A0: @ 20322A0
.space 0x4
.include "src/berry_blender.o" .include "src/berry_blender.o"
.include "src/new_game.o" .include "src/new_game.o"
.include "src/overworld.o" .include "src/overworld.o"
@ -138,11 +120,6 @@ gUnknown_020322A0: @ 20322A0
.include "src/field_player_avatar.o" .include "src/field_player_avatar.o"
.include "src/event_object_movement.o" .include "src/event_object_movement.o"
.include "src/field_message_box.o" .include "src/field_message_box.o"
.align 2
gUnknown_020375C0: @ 20375C0
.space 0x4
.include "src/scrcmd.o" .include "src/scrcmd.o"
.include "src/field_control_avatar.o" .include "src/field_control_avatar.o"
.include "src/event_data.o" .include "src/event_data.o"