diff options
Diffstat (limited to 'asm/trade.s')
| -rw-r--r-- | asm/trade.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/trade.s b/asm/trade.s index 756423ee7..e4d45ec73 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -3266,7 +3266,7 @@ _08049800: .4byte gUnknown_03004824 thumb_func_start sub_8049804 sub_8049804: @ 8049804 push {lr} - bl sub_8072DEC + bl HandleDestroyMenuCursors bl sub_804A80C ldr r3, _08049850 @ =gUnknown_03004824 ldr r0, [r3] @@ -4315,7 +4315,7 @@ _08049F8E: lsls r0, 2 adds r0, r7 bl sub_8078A34 - bl sub_8072DEC + bl HandleDestroyMenuCursors ldr r3, _0804A09C @ =gUnknown_03004824 ldr r0, [r3] adds r0, 0x4 @@ -5363,7 +5363,7 @@ _0804A89C: .4byte gUnknown_03004824 _0804A8A0: .4byte gUnknown_0820C330 _0804A8A4: .4byte gTradePartyBoxTilemap _0804A8A8: - bl sub_8072DEC + bl HandleDestroyMenuCursors ldr r4, _0804A924 @ =gUnknown_03004824 ldr r0, [r4] adds r0, 0x4 @@ -7560,10 +7560,10 @@ sub_804BA18: @ 804BA18 lsrs r4, 16 adds r0, r4, 0 movs r1, 0x2 - bl sub_8090D90 + bl GetNationalPokedexFlag adds r0, r4, 0 movs r1, 0x3 - bl sub_8090D90 + bl GetNationalPokedexFlag _0804BA5A: pop {r4} pop {r0} @@ -12051,7 +12051,7 @@ sub_804E1A0: @ 804E1A0 bne _0804E1C4 ldr r0, _0804E1D0 @ =sub_804B790 bl SetMainCallback2 - ldr r1, _0804E1D4 @ =gUnknown_0300485C + ldr r1, _0804E1D4 @ =gFieldCallback ldr r0, _0804E1D8 @ =sub_8080990 str r0, [r1] adds r0, r4, 0 @@ -12063,7 +12063,7 @@ _0804E1C4: .align 2, 0 _0804E1CC: .4byte gPaletteFade _0804E1D0: .4byte sub_804B790 -_0804E1D4: .4byte gUnknown_0300485C +_0804E1D4: .4byte gFieldCallback _0804E1D8: .4byte sub_8080990 thumb_func_end sub_804E1A0 |