Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-06-02 22:04:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

MODE_PARENT; collapse gUnknown_3005450 --> Rfu

Browse Source
This commit is contained in:
PikalaxALT 2020-01-13 16:38:08 -05:00
parent 2a5cde336b
commit fcf0e62d1f
7 changed files with 390 additions and 431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
asm/berry_crush.s
View File

@ -78,7 +78,7 @@ sub_814B754: @ 814B754
_0814B772:
adds r0, r4, 0
bl SetMainCallback2
ldr r0, _0814B78C @ =gUnknown_3005450
ldr r0, _0814B78C @ =Rfu
mov r1, r8
strh r1, [r0, 0x10]
strh r1, [r0, 0x12]
@ -86,7 +86,7 @@ _0814B772:
.align 2, 0
_0814B784: .4byte gReceivedRemoteLinkPlayers
_0814B788: .4byte gWirelessCommType
_0814B78C: .4byte gUnknown_3005450
_0814B78C: .4byte Rfu
_0814B790:
bl GetLinkPlayerCount
lsls r0, 24
@ -103,13 +103,13 @@ _0814B790:
_0814B7AC:
adds r0, r4, 0
bl SetMainCallback2
ldr r0, _0814B7BC @ =gUnknown_3005450
ldr r0, _0814B7BC @ =Rfu
movs r1, 0
strh r1, [r0, 0x10]
strh r1, [r0, 0x12]
b _0814B7DC
.align 2, 0
_0814B7BC: .4byte gUnknown_3005450
_0814B7BC: .4byte Rfu
_0814B7C0:
ldr r6, _0814B7E8 @ =gUnknown_203F3DC
ldr r0, _0814B7EC @ =0x000041c0
@ -120,7 +120,7 @@ _0814B7C0:
bne _0814B7F4
adds r0, r4, 0
bl SetMainCallback2
ldr r0, _0814B7F0 @ =gUnknown_3005450
ldr r0, _0814B7F0 @ =Rfu
strh r5, [r0, 0x10]
strh r5, [r0, 0x12]
_0814B7DC:
@ -132,7 +132,7 @@ _0814B7DC:
.align 2, 0
_0814B7E8: .4byte gUnknown_203F3DC
_0814B7EC: .4byte 0x000041c0
_0814B7F0: .4byte gUnknown_3005450
_0814B7F0: .4byte Rfu
_0814B7F4:
str r4, [r5]
movs r4, 0

750
asm/link_rfu_2.s
View File

File diff suppressed because it is too large Load Diff

4
asm/overworld.s
View File

@ -7124,7 +7124,7 @@ _08058350: .4byte gWirelessCommType
_08058354: .4byte gLink
_08058358: .4byte 0x00000339
_0805835C:
ldr r0, _08058368 @ =gUnknown_3005450
ldr r0, _08058368 @ =Rfu
ldr r1, _0805836C @ =0x000008d2
adds r0, r1
ldrb r0, [r0]
@ -7132,7 +7132,7 @@ _08058364:
pop {r1}
bx r1
.align 2, 0
_08058368: .4byte gUnknown_3005450
_08058368: .4byte Rfu
_0805836C: .4byte 0x000008d2
thumb_func_end sub_805833C

4
asm/pokemon_jump_2.s
View File

@ -3930,7 +3930,7 @@ _081497FA:
sub_8149804: @ 8149804
push {lr}
movs r2, 0
ldr r1, _08149828 @ =gUnknown_3005450
ldr r1, _08149828 @ =Rfu
ldr r3, _0814982C @ =0x0000069e
adds r0, r1, r3
ldrb r0, [r0]
@ -3947,7 +3947,7 @@ _08149820:
pop {r1}
bx r1
.align 2, 0
_08149828: .4byte gUnknown_3005450
_08149828: .4byte Rfu
_0814982C: .4byte 0x0000069e
_08149830: .4byte 0x000008d2
thumb_func_end sub_8149804

2
data/link_rfu_2.s
View File

@ -13,7 +13,7 @@ gUnknown_843EBB4:: @ 843EBB4
.align 1
.2byte 0x0002
.4byte gUnknown_3005440
.4byte gUnknown_3005E00
.4byte Rfu+2480
.byte 0x01, 0x00
.2byte 0x0258, 0x012c
.align 2

2
src/librfu_rfu.c
View File

@ -1537,7 +1537,7 @@ void rfu_REQ_sendData(bool8 clockChangeFlag)
{
if (gRfuLinkStatus->parentChild != MODE_NEUTRAL)
{
if (gRfuLinkStatus->parentChild == 1
if (gRfuLinkStatus->parentChild == MODE_PARENT
&& !(gRfuLinkStatus->sendSlotNIFlag | gRfuLinkStatus->recvSlotNIFlag | gRfuLinkStatus->sendSlotUNIFlag))
{
if (gRfuStatic->commExistFlag)

47
sym_common.txt
View File

@ -78,50 +78,9 @@ gUnknown_3005430: @ 3005430
gUnknown_3005440: @ 3005440
.space 0x10
gUnknown_3005450: @ 3005450
.space 0x14
gUnknown_3005464: @ 3005464
.space 0x58
gUnknown_30054BC: @ 30054BC
.space 0x2
gUnknown_30054BE: @ 30054BE
.space 0x76
gUnknown_3005534: @ 3005534
.space 0xE
gUnknown_3005542: @ 3005542
.space 0x18
gUnknown_300555A: @ 300555A
.space 0x1A
gUnknown_3005574: @ 3005574
.space 0x57C
gUnknown_3005AF0: @ 3005AF0
.space 0x29F
gUnknown_3005D8F: @ 3005D8F
.space 0x47
gUnknown_3005DD6: @ 3005DD6
.space 0x3
gUnknown_3005DD9: @ 3005DD9
.space 0x4
gUnknown_3005DDD: @ 3005DDD
.space 0x9
gUnknown_3005DE6: @ 3005DE6
.space 0x1A
gUnknown_3005E00: @ 3005E00
.space 0x10
@ This name is necessary to match assert statements in link_rfu_2
Rfu: @ 3005450
.space 0x9C0
.align 4
.include "link_rfu.o"