diff options
| author | scnorton <scnorton@biociphers.org> | 2017-09-04 15:16:52 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-09-04 15:16:52 -0400 |
| commit | e09012be02234e323e14493d14b8533bb74dfad8 (patch) | |
| tree | 0d6970681e20107fa2481ce17a9f19bb7e85917e | |
| parent | 446a95451d059d7b824086c53595736a5ce68d8e (diff) | |
sub_804C164
| -rw-r--r-- | asm/trade.s | 26 | ||||
| -rw-r--r-- | src/trade.c | 10 |
2 files changed, 10 insertions, 26 deletions
diff --git a/asm/trade.s b/asm/trade.s index c0f1ca9b6..6d0c2135c 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -2490,30 +2490,4 @@ _0804C15A: _0804C160: .4byte gUnknown_03004828 thumb_func_end sub_804C0F8 - thumb_func_start sub_804C164 -sub_804C164: @ 804C164 - push {lr} - ldr r0, _0804C190 @ =gUnknown_082159A4 - bl LoadSpriteSheet - ldr r0, _0804C194 @ =gUnknown_082159F4 - bl LoadSpriteSheet - ldr r0, _0804C198 @ =gUnknown_08215A28 - bl LoadSpriteSheet - ldr r0, _0804C19C @ =gUnknown_08215A78 - bl LoadSpriteSheet - ldr r0, _0804C1A0 @ =gUnknown_082159AC - bl LoadSpritePalette - ldr r0, _0804C1A4 @ =gUnknown_082159B4 - bl LoadSpritePalette - pop {r0} - bx r0 - .align 2, 0 -_0804C190: .4byte gUnknown_082159A4 -_0804C194: .4byte gUnknown_082159F4 -_0804C198: .4byte gUnknown_08215A28 -_0804C19C: .4byte gUnknown_08215A78 -_0804C1A0: .4byte gUnknown_082159AC -_0804C1A4: .4byte gUnknown_082159B4 - thumb_func_end sub_804C164 - .align 2, 0 @ Don't pad with nop. diff --git a/src/trade.c b/src/trade.c index 2443f1a57..723b6e8f8 100644 --- a/src/trade.c +++ b/src/trade.c @@ -3497,6 +3497,16 @@ static bool8 sub_804ABF8(void) asm(".section .text.sub_804DAD4"); +void sub_804C164(void) +{ + LoadSpriteSheet(&gUnknown_082159A4); + LoadSpriteSheet(&gUnknown_082159F4); + LoadSpriteSheet(&gUnknown_08215A28); + LoadSpriteSheet(&gUnknown_08215A78); + LoadSpritePalette(&gUnknown_082159AC); + LoadSpritePalette(&gUnknown_082159B4); +} + void sub_804C1A8(void) { u8 mpId; |