diff options
| author | scnorton <scnorton@biociphers.org> | 2017-09-03 12:41:15 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-09-03 12:41:15 -0400 |
| commit | d0e2766ec23f63b1acb90bdaa1757a3c7bc71dd7 (patch) | |
| tree | 7713dba60b6a3a41cc78d09a11672e1d5eb09ce4 | |
| parent | fac5905a048fd08b5d41ef316d48d6c8d330405e (diff) | |
sub_804E144
| -rw-r--r-- | asm/trade.s | 23 | ||||
| -rw-r--r-- | src/trade.c | 12 |
2 files changed, 11 insertions, 24 deletions
diff --git a/asm/trade.s b/asm/trade.s index 4221e3c1b..d7a33b41b 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -5395,29 +5395,6 @@ _0804DAD0: .4byte gEnemyParty .section .text.sub_804DB2C - thumb_func_start sub_804E144 -sub_804E144: @ 804E144 - push {lr} - ldr r0, _0804E16C @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0804E158 - ldr r0, _0804E170 @ =sub_8047CD8 - bl SetMainCallback2 -_0804E158: - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl UpdatePaletteFade - pop {r0} - bx r0 - .align 2, 0 -_0804E16C: .4byte gPaletteFade -_0804E170: .4byte sub_8047CD8 - thumb_func_end sub_804E144 - thumb_func_start sub_804E174 sub_804E174: @ 804E174 push {lr} diff --git a/src/trade.c b/src/trade.c index 8eb9983c8..c29d7558b 100644 --- a/src/trade.c +++ b/src/trade.c @@ -193,7 +193,7 @@ void sub_804A51C(u8, u8, u8, u8, u8, u8); /*static*/ void sub_804BB78(void); /*static*/ void sub_804D63C(void); /*static*/ bool8 sub_804B2B0(void); -/*static*/ void sub_804E144(void); +static void sub_804E144(void); extern u8 gUnknown_020297D8[2]; extern u8 *gUnknown_020296CC[13]; @@ -3364,3 +3364,13 @@ void sub_804DC88(void) BuildOamBuffer(); UpdatePaletteFade(); } + +static void sub_804E144(void) +{ + if (!gPaletteFade.active) + SetMainCallback2((sub_8047CD8)); + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); +} |