diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-02 15:23:49 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-02 15:23:49 -0400 |
| commit | fdce319c1c3e54948b476a6e27be80b07a80ac1d (patch) | |
| tree | 4be056efd3d64235628780da07e422abb233507e | |
| parent | 714503c895eb1fae6771fbf8d687f3d6ca16c3d8 (diff) | |
sub_8049DC4
| -rw-r--r-- | asm/trade.s | 17 | ||||
| -rw-r--r-- | include/rom4.h | 1 | ||||
| -rw-r--r-- | src/trade.c | 9 |
3 files changed, 10 insertions, 17 deletions
diff --git a/asm/trade.s b/asm/trade.s index 0403bc252..7e2912e06 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -10,23 +10,6 @@ .set sub_804A96C_alt, sub_804A96C .endif - thumb_func_start sub_8049DC4 -sub_8049DC4: @ 8049DC4 - push {lr} - ldr r0, _08049DD8 @ =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _08049DD4 - ldr r0, _08049DDC @ =sub_805465C - bl SetMainCallback2 -_08049DD4: - pop {r0} - bx r0 - .align 2, 0 -_08049DD8: .4byte gReceivedRemoteLinkPlayers -_08049DDC: .4byte sub_805465C - thumb_func_end sub_8049DC4 - thumb_func_start sub_8049DE0 sub_8049DE0: @ 8049DE0 push {lr} diff --git a/include/rom4.h b/include/rom4.h index daccad7e9..896530041 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -233,5 +233,6 @@ u8 npc_something3(u8, u8); u8 LinkPlayerDetectCollision(u8, u8, s16, s16); void CreateLinkPlayerSprite(u8); void SpriteCB_LinkPlayer(struct Sprite *); +void sub_805465C(void); #endif // GUARD_ROM4_H diff --git a/src/trade.c b/src/trade.c index 774b5f6d1..5989b1484 100644 --- a/src/trade.c +++ b/src/trade.c @@ -21,6 +21,7 @@ #include "sound.h" #include "data2.h" #include "pokemon_summary_screen.h" +#include "rom4.h" #include "trade.h" #ifdef ENGLISH @@ -1954,6 +1955,14 @@ static void sub_8049A20(void) } } +/*static*/ void sub_8049DC4(void) +{ + if (gReceivedRemoteLinkPlayers == 0) + { + SetMainCallback2(sub_805465C); + } +} + asm(".section .text.sub_804A96C"); /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) { |