From 937428a19836f63897a5d8cfa283347e30f7342b Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Thu, 31 Aug 2017 11:15:52 -0400
Subject: Resume decompiling trade.s

---
 asm/trade.s         |   11 -
 data/trade.s        |  113 ------
 include/easy_chat.h | 1036 +++++++++++++++++++++++++++++++++++++++++++++++++++
 ld_script.txt       |    4 +-
 src/trade.c         |  104 +++++-
 5 files changed, 1141 insertions(+), 127 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 223f62474..be7729c10 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,17 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8047CD8
-sub_8047CD8: @ 8047CD8
-	push {lr}
-	ldr r0, _08047CE4 @ =sub_8047EC0
-	bl SetMainCallback2
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08047CE4: .4byte sub_8047EC0
-	thumb_func_end sub_8047CD8
-
 	thumb_func_start sub_8047CE8
 sub_8047CE8: @ 8047CE8
 	push {r4-r6,lr}
diff --git a/data/trade.s b/data/trade.s
index 8f96a72b1..d1b42b103 100644
--- a/data/trade.s
+++ b/data/trade.s
@@ -659,116 +659,3 @@ gSpriteAffineAnim_8215AB0:: @ 8215AB0
 	.align 2
 gSpriteAffineAnimTable_8215AC0:: @ 8215AC0
 	.4byte gSpriteAffineAnim_8215AB0
-
-@ 8215AC4
-	.include "data/ingame_trades.inc"
-
-gTradeBallVerticalVelocityTable:: @ 8215BA0
-	.byte  0
-	.byte  0
-	.byte  1
-	.byte  0
-	.byte  1
-	.byte  0
-	.byte  1
-	.byte  1
-	.byte  1
-	.byte  1
-	.byte  2
-	.byte  2
-	.byte  2
-	.byte  2
-	.byte  3
-	.byte  3
-	.byte  3
-	.byte  3
-	.byte  4
-	.byte  4
-	.byte  4
-	.byte  4
-	.byte -4
-	.byte -4
-	.byte -4
-	.byte -3
-	.byte -3
-	.byte -3
-	.byte -3
-	.byte -2
-	.byte -2
-	.byte -2
-	.byte -2
-	.byte -1
-	.byte -1
-	.byte -1
-	.byte -1
-	.byte  0
-	.byte -1
-	.byte  0
-	.byte -1
-	.byte  0
-	.byte  0
-	.byte  0
-	.byte  0
-	.byte  0
-	.byte  1
-	.byte  0
-	.byte  1
-	.byte  0
-	.byte  1
-	.byte  1
-	.byte  1
-	.byte  1
-	.byte  2
-	.byte  2
-	.byte  2
-	.byte  2
-	.byte  3
-	.byte  3
-	.byte  3
-	.byte  3
-	.byte  4
-	.byte  4
-	.byte  4
-	.byte  4
-	.byte -4
-	.byte -3
-	.byte -3
-	.byte -2
-	.byte -2
-	.byte -1
-	.byte -1
-	.byte -1
-	.byte  0
-	.byte -1
-	.byte  0
-	.byte  0
-	.byte  0
-	.byte  0
-	.byte  0
-	.byte  0
-	.byte  1
-	.byte  0
-	.byte  1
-	.byte  1
-	.byte  1
-	.byte  2
-	.byte  2
-	.byte  3
-	.byte  3
-	.byte  4
-	.byte -4
-	.byte -3
-	.byte -2
-	.byte -1
-	.byte -1
-	.byte -1
-	.byte  0
-	.byte  0
-	.byte  0
-	.byte  0
-	.byte  1
-	.byte  0
-	.byte  1
-	.byte  1
-	.byte  2
-	.byte  3
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 03e9bb737..ff018a5bc 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -26,6 +26,1042 @@ enum {
     EC_GROUP_POKEMON_2,
 };
 
+enum {
+    EC_WORD_I_CHOOSE_YOU = EC_GROUP_TRAINER << 9,
+    EC_WORD_GOTCHA,
+    EC_WORD_TRADE,
+    EC_WORD_SAPPHIRE,
+    EC_WORD_EVOLVE,
+    EC_WORD_ENCYCLOPEDIA,
+    EC_WORD_NATURE,
+    EC_WORD_CENTER,
+    EC_WORD_EGG,
+    EC_WORD_LINK,
+    EC_WORD_SP_ABILITY,
+    EC_WORD_TRAINER,
+    EC_WORD_VERSION,
+    EC_WORD_POKENAV,
+    EC_WORD_POKEMON,
+    EC_WORD_GET,
+    EC_WORD_POKEDEX,
+    EC_WORD_RUBY,
+    EC_WORD_LEVEL
+};
+enum {
+    EC_WORD_DARK = EC_GROUP_STATUS << 9,
+    EC_WORD_STENCH,
+    EC_WORD_THICK_FAT,
+    EC_WORD_RAIN_DISH,
+    EC_WORD_DRIZZLE,
+    EC_WORD_ARENA_TRAP,
+    EC_WORD_INTIMIDATE,
+    EC_WORD_ROCK_HEAD,
+    EC_WORD_COLOR,
+    EC_WORD_ALT_COLOR,
+    EC_WORD_ROCK,
+    EC_WORD_BEAUTIFUL,
+    EC_WORD_BEAUTY,
+    EC_WORD_AIR_LOCK,
+    EC_WORD_PSYCHIC,
+    EC_WORD_HYPER_CUTTER,
+    EC_WORD_FIGHTING,
+    EC_WORD_SHADOW_TAG,
+    EC_WORD_SMART,
+    EC_WORD_SMARTNESS,
+    EC_WORD_SPEED_BOOST,
+    EC_WORD_COOL,
+    EC_WORD_COOLNESS,
+    EC_WORD_BATTLE_ARMOR,
+    EC_WORD_CUTE,
+    EC_WORD_CUTENESS,
+    EC_WORD_STURDY,
+    EC_WORD_SUCTION_CUPS,
+    EC_WORD_GRASS,
+    EC_WORD_CLEAR_BODY,
+    EC_WORD_TORRENT,
+    EC_WORD_GHOST,
+    EC_WORD_ICE,
+    EC_WORD_GUTS,
+    EC_WORD_ROUGH_SKIN,
+    EC_WORD_SHELL_ARMOR,
+    EC_WORD_NATURAL_CURE,
+    EC_WORD_DAMP,
+    EC_WORD_GROUND,
+    EC_WORD_LIMBER,
+    EC_WORD_MAGNET_PULL,
+    EC_WORD_WHITE_SMOKE,
+    EC_WORD_SYNCHRONIZE,
+    EC_WORD_OVERGROW,
+    EC_WORD_SWIFT_SWIM,
+    EC_WORD_SAND_STREAM,
+    EC_WORD_SAND_VEIL,
+    EC_WORD_KEEN_EYE,
+    EC_WORD_INNER_FOCUS,
+    EC_WORD_STATIC,
+    EC_WORD_TYPE,
+    EC_WORD_TOUGH,
+    EC_WORD_TOUGHNESS,
+    EC_WORD_SHED_SKIN,
+    EC_WORD_HUGE_POWER,
+    EC_WORD_VOLT_ABSORB,
+    EC_WORD_WATER_ABSORB,
+    EC_WORD_ELECTRIC,
+    EC_WORD_FORECAST,
+    EC_WORD_SERENE_GRACE,
+    EC_WORD_POISON,
+    EC_WORD_POISON_POINT,
+    EC_WORD_DRAGON,
+    EC_WORD_TRACE,
+    EC_WORD_OBLIVIOUS,
+    EC_WORD_TRUANT,
+    EC_WORD_RUN_AWAY,
+    EC_WORD_STICKY_HOLD,
+    EC_WORD_CLOUD_NINE,
+    EC_WORD_NORMAL,
+    EC_WORD_STEEL,
+    EC_WORD_ILLUMINATE,
+    EC_WORD_EARLY_BIRD,
+    EC_WORD_HUSTLE,
+    EC_WORD_SHINE,
+    EC_WORD_FLYING,
+    EC_WORD_DROUGHT,
+    EC_WORD_LIGHTNINGROD,
+    EC_WORD_COMPOUNDEYES,
+    EC_WORD_MARVEL_SCALE,
+    EC_WORD_WONDER_GUARD,
+    EC_WORD_INSOMNIA,
+    EC_WORD_LEVITATE,
+    EC_WORD_PLUS,
+    EC_WORD_PRESSURE,
+    EC_WORD_LIQUID_OOZE,
+    EC_WORD_COLOR_CHANGE,
+    EC_WORD_SOUNDPROOF,
+    EC_WORD_EFFECT_SPORE,
+    EC_WORD_PKRS,
+    EC_WORD_FIRE,
+    EC_WORD_FLAME_BODY,
+    EC_WORD_MINUS,
+    EC_WORD_OWN_TEMPO,
+    EC_WORD_MAGMA_ARMOR,
+    EC_WORD_WATER,
+    EC_WORD_WATER_VEIL,
+    EC_WORD_BUG,
+    EC_WORD_SWARM,
+    EC_WORD_CUTE_CHARM,
+    EC_WORD_IMMUNITY,
+    EC_WORD_BLAZE,
+    EC_WORD_PICKUP,
+    EC_WORD_PATTERN,
+    EC_WORD_FLASH_FIRE,
+    EC_WORD_VITAL_SPIRIT,
+    EC_WORD_CHLOROPHYLL,
+    EC_WORD_PURE_POWER,
+    EC_WORD_SHIELD_DUST,
+};
+enum {
+    EC_WORD_MATCH_UP = EC_GROUP_BATTLE << 9,
+    EC_WORD_GO,
+    EC_WORD_NO_1,
+    EC_WORD_DECIDE,
+    EC_WORD_LET_ME_WIN,
+    EC_WORD_WINS,
+    EC_WORD_WIN,
+    EC_WORD_WON,
+    EC_WORD_IF_I_WIN,
+    EC_WORD_WHEN_I_WIN,
+    EC_WORD_CAN_T_WIN,
+    EC_WORD_CAN_WIN,
+    EC_WORD_NO_MATCH,
+    EC_WORD_SPIRIT,
+    EC_WORD_DECIDED,
+    EC_WORD_TRUMP_CARD,
+    EC_WORD_TAKE_THAT,
+    EC_WORD_COME_ON,
+    EC_WORD_ATTACK,
+    EC_WORD_SURRENDER,
+    EC_WORD_GUTSY,
+    EC_WORD_TALENT,
+    EC_WORD_STRATEGY,
+    EC_WORD_SMITE,
+    EC_WORD_MATCH,
+    EC_WORD_VICTORY,
+    EC_WORD_OFFENSIVE,
+    EC_WORD_SENSE,
+    EC_WORD_VERSUS,
+    EC_WORD_FIGHTS,
+    EC_WORD_POWER,
+    EC_WORD_CHALLENGE,
+    EC_WORD_STRONG,
+    EC_WORD_TOO_STRONG,
+    EC_WORD_GO_EASY,
+    EC_WORD_FOE,
+    EC_WORD_GENIUS,
+    EC_WORD_LEGEND,
+    EC_WORD_ESCAPE,
+    EC_WORD_AIM,
+    EC_WORD_BATTLE,
+    EC_WORD_FIGHT,
+    EC_WORD_RESUSCITATE,
+    EC_WORD_POINTS,
+    EC_WORD_SERIOUS,
+    EC_WORD_GIVE_UP,
+    EC_WORD_LOSS,
+    EC_WORD_IF_I_LOSE,
+    EC_WORD_LOST,
+    EC_WORD_LOSE,
+    EC_WORD_GUARD,
+    EC_WORD_PARTNER,
+    EC_WORD_REJECT,
+    EC_WORD_ACCEPT,
+    EC_WORD_INVINCIBLE,
+    EC_WORD_RECEIVED,
+    EC_WORD_EASY,
+    EC_WORD_WEAK,
+    EC_WORD_TOO_WEAK,
+    EC_WORD_PUSHOVER,
+    EC_WORD_LEADER,
+    EC_WORD_RULE,
+    EC_WORD_MOVE
+};
+enum {
+    EC_WORD_THANKS = EC_GROUP_GREETINGS << 9,
+    EC_WORD_YES,
+    EC_WORD_HERE_GOES,
+    EC_WORD_HERE_I_COME,
+    EC_WORD_HERE_IT_IS,
+    EC_WORD_YEAH,
+    EC_WORD_WELCOME,
+    EC_WORD_OI,
+    EC_WORD_HOW_DO,
+    EC_WORD_CONGRATS,
+    EC_WORD_GIVE_ME,
+    EC_WORD_SORRY,
+    EC_WORD_APOLOGIZE,
+    EC_WORD_FORGIVE,
+    EC_WORD_HEY_THERE,
+    EC_WORD_HELLO,
+    EC_WORD_GOOD_BYE,
+    EC_WORD_THANK_YOU,
+    EC_WORD_I_VE_ARRIVED,
+    EC_WORD_PARDON,
+    EC_WORD_EXCUSE,
+    EC_WORD_SEE_YA,
+    EC_WORD_EXCUSE_ME,
+    EC_WORD_WELL_THEN,
+    EC_WORD_GO_AHEAD,
+    EC_WORD_APPRECIATE,
+    EC_WORD_HEY_QUES,
+    EC_WORD_WHAT_S_UP_QUES,
+    EC_WORD_HUH_QUES,
+    EC_WORD_NO,
+    EC_WORD_HI,
+    EC_WORD_YEAH_YEAH,
+    EC_WORD_BYE_BYE,
+    EC_WORD_MEET_YOU,
+    EC_WORD_HEY,
+    EC_WORD_SMELL,
+    EC_WORD_LISTENING,
+    EC_WORD_HOO_HAH,
+    EC_WORD_YAHOO,
+    EC_WORD_YO,
+    EC_WORD_COME_OVER,
+    EC_WORD_COUNT_ON
+};
+enum {
+    EC_WORD_OPPONENT = EC_GROUP_PEOPLE << 9,
+    EC_WORD_I,
+    EC_WORD_YOU,
+    EC_WORD_YOURS,
+    EC_WORD_SON,
+    EC_WORD_YOUR,
+    EC_WORD_YOU_RE,
+    EC_WORD_YOU_VE,
+    EC_WORD_MOTHER,
+    EC_WORD_GRANDFATHER,
+    EC_WORD_UNCLE,
+    EC_WORD_FATHER,
+    EC_WORD_BOY,
+    EC_WORD_ADULT,
+    EC_WORD_BROTHER,
+    EC_WORD_SISTER,
+    EC_WORD_GRANDMOTHER,
+    EC_WORD_AUNT,
+    EC_WORD_PARENT,
+    EC_WORD_MAN,
+    EC_WORD_ME,
+    EC_WORD_GIRL,
+    EC_WORD_BABE,
+    EC_WORD_FAMILY,
+    EC_WORD_HER,
+    EC_WORD_HIM,
+    EC_WORD_HE,
+    EC_WORD_PLACE,
+    EC_WORD_DAUGHTER,
+    EC_WORD_HIS,
+    EC_WORD_HE_S,
+    EC_WORD_AREN_T,
+    EC_WORD_SIBLINGS,
+    EC_WORD_KID,
+    EC_WORD_CHILDREN,
+    EC_WORD_MR,
+    EC_WORD_MRS,
+    EC_WORD_MYSELF,
+    EC_WORD_I_WAS,
+    EC_WORD_TO_ME,
+    EC_WORD_MY,
+    EC_WORD_I_AM,
+    EC_WORD_I_VE,
+    EC_WORD_WHO,
+    EC_WORD_SOMEONE,
+    EC_WORD_WHO_WAS,
+    EC_WORD_TO_WHOM,
+    EC_WORD_WHOSE,
+    EC_WORD_WHO_IS,
+    EC_WORD_IT_S,
+    EC_WORD_LADY,
+    EC_WORD_FRIEND,
+    EC_WORD_ALLY,
+    EC_WORD_PERSON,
+    EC_WORD_DUDE,
+    EC_WORD_THEY,
+    EC_WORD_THEY_WERE,
+    EC_WORD_TO_THEM,
+    EC_WORD_THEIR,
+    EC_WORD_THEY_RE,
+    EC_WORD_THEY_VE,
+    EC_WORD_WE,
+    EC_WORD_BEEN,
+    EC_WORD_TO_US,
+    EC_WORD_OUR,
+    EC_WORD_WE_RE,
+    EC_WORD_RIVAL,
+    EC_WORD_WE_VE,
+    EC_WORD_WOMAN,
+    EC_WORD_SHE,
+    EC_WORD_SHE_WAS,
+    EC_WORD_TO_HER,
+    EC_WORD_HERS,
+    EC_WORD_SHE_IS,
+    EC_WORD_SOME
+};
+enum {
+    EC_WORD_EXCL = EC_GROUP_VOICES << 9,
+    EC_WORD_EXCL_EXCL,
+    EC_WORD_QUES_EXCL,
+    EC_WORD_QUES,
+    EC_WORD_ELLIPSIS,
+    EC_WORD_ELLIPSIS_EXCL,
+    EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS,
+    EC_WORD_DASH,
+    EC_WORD_DASH_DASH_DASH,
+    EC_WORD_UH_OH,
+    EC_WORD_WAAAH,
+    EC_WORD_AHAHA,
+    EC_WORD_OH_QUES,
+    EC_WORD_NOPE,
+    EC_WORD_URGH,
+    EC_WORD_HMM,
+    EC_WORD_WHOAH,
+    EC_WORD_WROOOAAR_EXCL,
+    EC_WORD_WOW,
+    EC_WORD_GIGGLE,
+    EC_WORD_SIGH,
+    EC_WORD_UNBELIEVABLE,
+    EC_WORD_CRIES,
+    EC_WORD_AGREE,
+    EC_WORD_EH_QUES,
+    EC_WORD_CRY,
+    EC_WORD_EHEHE,
+    EC_WORD_OI_OI_OI,
+    EC_WORD_OH_YEAH,
+    EC_WORD_OH,
+    EC_WORD_OOPS,
+    EC_WORD_SHOCKED,
+    EC_WORD_EEK,
+    EC_WORD_GRAAAH,
+    EC_WORD_GWAHAHAHA,
+    EC_WORD_WAY,
+    EC_WORD_TCH,
+    EC_WORD_HEHE,
+    EC_WORD_HAH,
+    EC_WORD_YUP,
+    EC_WORD_HAHAHA,
+    EC_WORD_AIYEEH,
+    EC_WORD_HIYAH,
+    EC_WORD_FUFUFU,
+    EC_WORD_LOL,
+    EC_WORD_SNORT,
+    EC_WORD_HUMPH,
+    EC_WORD_HEHEHE,
+    EC_WORD_HEH,
+    EC_WORD_HOHOHO,
+    EC_WORD_UH_HUH,
+    EC_WORD_OH_DEAR,
+    EC_WORD_ARRGH,
+    EC_WORD_MUFUFU,
+    EC_WORD_MMM,
+    EC_WORD_OH_KAY,
+    EC_WORD_OKAY,
+    EC_WORD_LALALA,
+    EC_WORD_YAY,
+    EC_WORD_AWW,
+    EC_WORD_WOWEE,
+    EC_WORD_GWAH,
+    EC_WORD_WAHAHAHA
+};
+enum {
+    EC_WORD_LISTEN = EC_GROUP_SPEECH << 9,
+    EC_WORD_NOT_VERY,
+    EC_WORD_MEAN,
+    EC_WORD_LIE,
+    EC_WORD_LAY,
+    EC_WORD_RECOMMEND,
+    EC_WORD_NITWIT,
+    EC_WORD_QUITE,
+    EC_WORD_FROM,
+    EC_WORD_FEELING,
+    EC_WORD_BUT,
+    EC_WORD_HOWEVER,
+    EC_WORD_CASE,
+    EC_WORD_THE,
+    EC_WORD_MISS,
+    EC_WORD_HOW,
+    EC_WORD_HIT,
+    EC_WORD_ENOUGH,
+    EC_WORD_A_LOT,
+    EC_WORD_A_LITTLE,
+    EC_WORD_ABSOLUTELY,
+    EC_WORD_AND,
+    EC_WORD_ONLY,
+    EC_WORD_AROUND,
+    EC_WORD_PROBABLY,
+    EC_WORD_IF,
+    EC_WORD_VERY,
+    EC_WORD_A_TINY_BIT,
+    EC_WORD_WILD,
+    EC_WORD_THAT_S,
+    EC_WORD_JUST,
+    EC_WORD_EVEN_SO,
+    EC_WORD_MUST_BE,
+    EC_WORD_NATURALLY,
+    EC_WORD_FOR_NOW,
+    EC_WORD_UNDERSTOOD,
+    EC_WORD_JOKING,
+    EC_WORD_READY,
+    EC_WORD_SOMETHING,
+    EC_WORD_SOMEHOW,
+    EC_WORD_ALTHOUGH,
+    EC_WORD_ALSO,
+    EC_WORD_PERFECT,
+    EC_WORD_AS_MUCH_AS,
+    EC_WORD_REALLY,
+    EC_WORD_TRULY,
+    EC_WORD_SERIOUSLY,
+    EC_WORD_TOTALLY,
+    EC_WORD_UNTIL,
+    EC_WORD_AS_IF,
+    EC_WORD_MOOD,
+    EC_WORD_RATHER,
+    EC_WORD_AWFULLY,
+    EC_WORD_MODE,
+    EC_WORD_MORE,
+    EC_WORD_TOO_LATE,
+    EC_WORD_FINALLY,
+    EC_WORD_ANY,
+    EC_WORD_INSTEAD,
+    EC_WORD_FANTASTIC
+};
+enum {
+    EC_WORD_WILL = EC_GROUP_ENDINGS << 9,
+    EC_WORD_WILL_BE_HERE,
+    EC_WORD_OR,
+    EC_WORD_TIMES,
+    EC_WORD_WONDER,
+    EC_WORD_IS_IT_QUES,
+    EC_WORD_BE,
+    EC_WORD_GIMME,
+    EC_WORD_COULD,
+    EC_WORD_LIKELY_TO,
+    EC_WORD_WOULD,
+    EC_WORD_IS,
+    EC_WORD_ISN_T_IT_QUES,
+    EC_WORD_LET_S,
+    EC_WORD_OTHER,
+    EC_WORD_ARE,
+    EC_WORD_WAS,
+    EC_WORD_WERE,
+    EC_WORD_THOSE,
+    EC_WORD_ISN_T,
+    EC_WORD_WON_T,
+    EC_WORD_CAN_T,
+    EC_WORD_CAN,
+    EC_WORD_DON_T,
+    EC_WORD_DO,
+    EC_WORD_DOES,
+    EC_WORD_WHOM,
+    EC_WORD_WHICH,
+    EC_WORD_WASN_T,
+    EC_WORD_WEREN_T,
+    EC_WORD_HAVE,
+    EC_WORD_HAVEN_T,
+    EC_WORD_A,
+    EC_WORD_AN,
+    EC_WORD_NOT,
+    EC_WORD_THERE,
+    EC_WORD_OK_QUES,
+    EC_WORD_SO,
+    EC_WORD_MAYBE,
+    EC_WORD_ABOUT,
+    EC_WORD_OVER,
+    EC_WORD_IT,
+    EC_WORD_ALL,
+    EC_WORD_FOR,
+    EC_WORD_ON,
+    EC_WORD_OFF,
+    EC_WORD_AS,
+    EC_WORD_TO,
+    EC_WORD_WITH,
+    EC_WORD_BETTER,
+    EC_WORD_EVER,
+    EC_WORD_SINCE,
+    EC_WORD_OF,
+    EC_WORD_BELONGS_TO,
+    EC_WORD_AT,
+    EC_WORD_IN,
+    EC_WORD_OUT,
+    EC_WORD_TOO,
+    EC_WORD_LIKE,
+    EC_WORD_DID,
+    EC_WORD_DIDN_T,
+    EC_WORD_DOESN_T,
+    EC_WORD_WITHOUT,
+    EC_WORD_AFTER,
+    EC_WORD_BEFORE,
+    EC_WORD_WHILE,
+    EC_WORD_THAN,
+    EC_WORD_ONCE,
+    EC_WORD_ANYWHERE
+};
+enum {
+    EC_WORD_MEET = EC_GROUP_FEELINGS << 9,
+    EC_WORD_PLAY,
+    EC_WORD_HURRIED,
+    EC_WORD_GOES,
+    EC_WORD_GIDDY,
+    EC_WORD_HAPPY,
+    EC_WORD_HAPPINESS,
+    EC_WORD_EXCITE,
+    EC_WORD_IMPORTANT,
+    EC_WORD_FUNNY,
+    EC_WORD_GOT,
+    EC_WORD_GO_HOME,
+    EC_WORD_DISAPPOINTED,
+    EC_WORD_DISAPPOINTS,
+    EC_WORD_SAD,
+    EC_WORD_TRY,
+    EC_WORD_TRIES,
+    EC_WORD_HEARS,
+    EC_WORD_THINK,
+    EC_WORD_HEAR,
+    EC_WORD_WANTS,
+    EC_WORD_MISHEARD,
+    EC_WORD_DISLIKE,
+    EC_WORD_ANGRY,
+    EC_WORD_ANGER,
+    EC_WORD_SCARY,
+    EC_WORD_LONESOME,
+    EC_WORD_DISAPPOINT,
+    EC_WORD_JOY,
+    EC_WORD_GETS,
+    EC_WORD_NEVER,
+    EC_WORD_DARN,
+    EC_WORD_DOWNCAST,
+    EC_WORD_INCREDIBLE,
+    EC_WORD_LIKES,
+    EC_WORD_DISLIKES,
+    EC_WORD_BORING,
+    EC_WORD_CARE,
+    EC_WORD_CARES,
+    EC_WORD_ALL_RIGHT,
+    EC_WORD_ADORE,
+    EC_WORD_DISASTER,
+    EC_WORD_ENJOY,
+    EC_WORD_ENJOYS,
+    EC_WORD_EAT,
+    EC_WORD_LACKING,
+    EC_WORD_BAD,
+    EC_WORD_HARD,
+    EC_WORD_TERRIBLE,
+    EC_WORD_SHOULD,
+    EC_WORD_NICE,
+    EC_WORD_DRINK,
+    EC_WORD_SURPRISE,
+    EC_WORD_FEAR,
+    EC_WORD_WANT,
+    EC_WORD_WAIT,
+    EC_WORD_SATISFIED,
+    EC_WORD_SEE,
+    EC_WORD_RARE,
+    EC_WORD_NEGATIVE,
+    EC_WORD_DONE,
+    EC_WORD_DANGER,
+    EC_WORD_DEFEATED,
+    EC_WORD_BEAT,
+    EC_WORD_GREAT,
+    EC_WORD_ROMANTIC,
+    EC_WORD_QUESTION,
+    EC_WORD_UNDERSTAND,
+    EC_WORD_UNDERSTANDS
+};
+enum {
+    EC_WORD_HOT = EC_GROUP_CONDITIONS << 9,
+    EC_WORD_EXISTS,
+    EC_WORD_EXCESS,
+    EC_WORD_APPROVED,
+    EC_WORD_HAS,
+    EC_WORD_GOOD,
+    EC_WORD_LESS,
+    EC_WORD_MOMENTUM,
+    EC_WORD_GOING,
+    EC_WORD_WEIRD,
+    EC_WORD_BUSY,
+    EC_WORD_TOGETHER,
+    EC_WORD_FULL,
+    EC_WORD_ABSENT,
+    EC_WORD_BEING,
+    EC_WORD_NEED,
+    EC_WORD_TASTY,
+    EC_WORD_SKILLED,
+    EC_WORD_NOISY,
+    EC_WORD_BIG,
+    EC_WORD_LATE,
+    EC_WORD_CLOSE,
+    EC_WORD_DOCILE,
+    EC_WORD_AMUSING,
+    EC_WORD_ENTERTAINING,
+    EC_WORD_PERFECTION,
+    EC_WORD_PRETTY,
+    EC_WORD_HEALTHY,
+    EC_WORD_EXCELLENT,
+    EC_WORD_UPSIDE_DOWN,
+    EC_WORD_COLD,
+    EC_WORD_REFRESHING,
+    EC_WORD_UNAVOIDABLE,
+    EC_WORD_MUCH,
+    EC_WORD_OVERWHELMING,
+    EC_WORD_FABULOUS,
+    EC_WORD_ELSE,
+    EC_WORD_EXPENSIVE,
+    EC_WORD_CORRECT,
+    EC_WORD_IMPOSSIBLE,
+    EC_WORD_SMALL,
+    EC_WORD_DIFFERENT,
+    EC_WORD_TIRED,
+    EC_WORD_SKILL,
+    EC_WORD_TOP,
+    EC_WORD_NON_STOP,
+    EC_WORD_PREPOSTEROUS,
+    EC_WORD_NONE,
+    EC_WORD_NOTHING,
+    EC_WORD_NATURAL,
+    EC_WORD_BECOMES,
+    EC_WORD_LUKEWARM,
+    EC_WORD_FAST,
+    EC_WORD_LOW,
+    EC_WORD_AWFUL,
+    EC_WORD_ALONE,
+    EC_WORD_BORED,
+    EC_WORD_SECRET,
+    EC_WORD_MYSTERY,
+    EC_WORD_LACKS,
+    EC_WORD_BEST,
+    EC_WORD_LOUSY,
+    EC_WORD_MISTAKE,
+    EC_WORD_KIND,
+    EC_WORD_WELL,
+    EC_WORD_WEAKENED,
+    EC_WORD_SIMPLE,
+    EC_WORD_SEEMS,
+    EC_WORD_BADLY
+};
+enum {
+    EC_WORD_MEETS = EC_GROUP_ACTIONS << 9,
+    EC_WORD_CONCEDE,
+    EC_WORD_GIVE,
+    EC_WORD_GIVES,
+    EC_WORD_PLAYED,
+    EC_WORD_PLAYS,
+    EC_WORD_COLLECT,
+    EC_WORD_WALKING,
+    EC_WORD_WALKS,
+    EC_WORD_SAYS,
+    EC_WORD_WENT,
+    EC_WORD_SAID,
+    EC_WORD_WAKE_UP,
+    EC_WORD_WAKES_UP,
+    EC_WORD_ANGERS,
+    EC_WORD_TEACH,
+    EC_WORD_TEACHES,
+    EC_WORD_PLEASE,
+    EC_WORD_LEARN,
+    EC_WORD_CHANGE,
+    EC_WORD_STORY,
+    EC_WORD_TRUST,
+    EC_WORD_LAVISH,
+    EC_WORD_LISTENS,
+    EC_WORD_HEARING,
+    EC_WORD_TRAINS,
+    EC_WORD_CHOOSE,
+    EC_WORD_COME,
+    EC_WORD_CAME,
+    EC_WORD_SEARCH,
+    EC_WORD_MAKE,
+    EC_WORD_CAUSE,
+    EC_WORD_KNOW,
+    EC_WORD_KNOWS,
+    EC_WORD_REFUSE,
+    EC_WORD_STORES,
+    EC_WORD_BRAG,
+    EC_WORD_IGNORANT,
+    EC_WORD_THINKS,
+    EC_WORD_BELIEVE,
+    EC_WORD_SLIDE,
+    EC_WORD_EATS,
+    EC_WORD_USE,
+    EC_WORD_USES,
+    EC_WORD_USING,
+    EC_WORD_COULDN_T,
+    EC_WORD_CAPABLE,
+    EC_WORD_DISAPPEAR,
+    EC_WORD_APPEAR,
+    EC_WORD_THROW,
+    EC_WORD_WORRY,
+    EC_WORD_SLEPT,
+    EC_WORD_SLEEP,
+    EC_WORD_RELEASE,
+    EC_WORD_DRINKS,
+    EC_WORD_RUNS,
+    EC_WORD_RUN,
+    EC_WORD_WORKS,
+    EC_WORD_WORKING,
+    EC_WORD_TALKING,
+    EC_WORD_TALK,
+    EC_WORD_SINK,
+    EC_WORD_SMACK,
+    EC_WORD_PRETEND,
+    EC_WORD_PRAISE,
+    EC_WORD_OVERDO,
+    EC_WORD_SHOW,
+    EC_WORD_LOOKS,
+    EC_WORD_SEES,
+    EC_WORD_SEEK,
+    EC_WORD_OWN,
+    EC_WORD_TAKE,
+    EC_WORD_ALLOW,
+    EC_WORD_FORGET,
+    EC_WORD_FORGETS,
+    EC_WORD_APPEARS,
+    EC_WORD_FAINT,
+    EC_WORD_FAINTED
+};
+enum {
+    EC_WORD_CHORES = EC_GROUP_LIFESTYLE << 9,
+    EC_WORD_HOME,
+    EC_WORD_MONEY,
+    EC_WORD_ALLOWANCE,
+    EC_WORD_BATH,
+    EC_WORD_CONVERSATION,
+    EC_WORD_SCHOOL,
+    EC_WORD_COMMEMORATE,
+    EC_WORD_HABIT,
+    EC_WORD_GROUP,
+    EC_WORD_WORD,
+    EC_WORD_STORE,
+    EC_WORD_SERVICE,
+    EC_WORD_WORK,
+    EC_WORD_SYSTEM,
+    EC_WORD_TRAIN,
+    EC_WORD_CLASS,
+    EC_WORD_LESSONS,
+    EC_WORD_INFORMATION,
+    EC_WORD_LIVING,
+    EC_WORD_TEACHER,
+    EC_WORD_TOURNAMENT,
+    EC_WORD_LETTER,
+    EC_WORD_EVENT,
+    EC_WORD_DIGITAL,
+    EC_WORD_TEST,
+    EC_WORD_DEPT_STORE,
+    EC_WORD_TELEVISION,
+    EC_WORD_PHONE,
+    EC_WORD_ITEM,
+    EC_WORD_NAME,
+    EC_WORD_NEWS,
+    EC_WORD_POPULAR,
+    EC_WORD_PARTY,
+    EC_WORD_STUDY,
+    EC_WORD_MACHINE,
+    EC_WORD_MAIL,
+    EC_WORD_MESSAGE,
+    EC_WORD_PROMISE,
+    EC_WORD_DREAM,
+    EC_WORD_KINDERGARTEN,
+    EC_WORD_LIFE,
+    EC_WORD_RADIO,
+    EC_WORD_RENTAL,
+    EC_WORD_WORLD
+};
+enum {
+    EC_WORD_IDOL = EC_GROUP_HOBBIES << 9,
+    EC_WORD_ANIME,
+    EC_WORD_SONG,
+    EC_WORD_MOVIE,
+    EC_WORD_SWEETS,
+    EC_WORD_CHAT,
+    EC_WORD_CHILD_S_PLAY,
+    EC_WORD_TOYS,
+    EC_WORD_MUSIC,
+    EC_WORD_CARDS,
+    EC_WORD_SHOPPING,
+    EC_WORD_CAMERA,
+    EC_WORD_VIEWING,
+    EC_WORD_SPECTATOR,
+    EC_WORD_GOURMET,
+    EC_WORD_GAME,
+    EC_WORD_RPG,
+    EC_WORD_COLLECTION,
+    EC_WORD_COMPLETE,
+    EC_WORD_MAGAZINE,
+    EC_WORD_WALK,
+    EC_WORD_BIKE,
+    EC_WORD_HOBBY,
+    EC_WORD_SPORTS,
+    EC_WORD_SOFTWARE,
+    EC_WORD_SONGS,
+    EC_WORD_DIET,
+    EC_WORD_TREASURE,
+    EC_WORD_TRAVEL,
+    EC_WORD_DANCE,
+    EC_WORD_CHANNEL,
+    EC_WORD_MAKING,
+    EC_WORD_FISHING,
+    EC_WORD_DATE,
+    EC_WORD_DESIGN,
+    EC_WORD_LOCOMOTIVE,
+    EC_WORD_PLUSH_DOLL,
+    EC_WORD_PC,
+    EC_WORD_FLOWERS,
+    EC_WORD_HERO,
+    EC_WORD_NAP,
+    EC_WORD_HEROINE,
+    EC_WORD_FASHION,
+    EC_WORD_ADVENTURE,
+    EC_WORD_BOARD,
+    EC_WORD_BALL,
+    EC_WORD_BOOK,
+    EC_WORD_FESTIVAL,
+    EC_WORD_COMICS,
+    EC_WORD_HOLIDAY,
+    EC_WORD_PLANS,
+    EC_WORD_TRENDY,
+    EC_WORD_VACATION,
+    EC_WORD_LOOK
+};
+enum {
+    EC_WORD_FALL = EC_GROUP_TIME << 9,
+    EC_WORD_MORNING,
+    EC_WORD_TOMORROW,
+    EC_WORD_LAST,
+    EC_WORD_DAY,
+    EC_WORD_SOMETIME,
+    EC_WORD_ALWAYS,
+    EC_WORD_CURRENT,
+    EC_WORD_FOREVER,
+    EC_WORD_DAYS,
+    EC_WORD_END,
+    EC_WORD_TUESDAY,
+    EC_WORD_YESTERDAY,
+    EC_WORD_TODAY,
+    EC_WORD_FRIDAY,
+    EC_WORD_MONDAY,
+    EC_WORD_LATER,
+    EC_WORD_EARLIER,
+    EC_WORD_ANOTHER,
+    EC_WORD_TIME,
+    EC_WORD_FINISH,
+    EC_WORD_WEDNESDAY,
+    EC_WORD_SOON,
+    EC_WORD_START,
+    EC_WORD_MONTH,
+    EC_WORD_STOP,
+    EC_WORD_NOW,
+    EC_WORD_FINAL,
+    EC_WORD_NEXT,
+    EC_WORD_AGE,
+    EC_WORD_SATURDAY,
+    EC_WORD_SUMMER,
+    EC_WORD_SUNDAY,
+    EC_WORD_BEGINNING,
+    EC_WORD_SPRING,
+    EC_WORD_DAYTIME,
+    EC_WORD_WINTER,
+    EC_WORD_DAILY,
+    EC_WORD_OLDEN,
+    EC_WORD_ALMOST,
+    EC_WORD_NEARLY,
+    EC_WORD_THURSDAY,
+    EC_WORD_NIGHTTIME,
+    EC_WORD_NIGHT,
+    EC_WORD_WEEK
+};
+enum {
+    EC_WORD_HIGHS = EC_GROUP_MISC << 9,
+    EC_WORD_LOWS,
+    EC_WORD_UM,
+    EC_WORD_REAR,
+    EC_WORD_THINGS,
+    EC_WORD_THING,
+    EC_WORD_BELOW,
+    EC_WORD_ABOVE,
+    EC_WORD_BACK,
+    EC_WORD_HIGH,
+    EC_WORD_HERE,
+    EC_WORD_INSIDE,
+    EC_WORD_OUTSIDE,
+    EC_WORD_BESIDE,
+    EC_WORD_THIS_IS_IT_EXCL,
+    EC_WORD_THIS,
+    EC_WORD_EVERY,
+    EC_WORD_THESE,
+    EC_WORD_THESE_WERE,
+    EC_WORD_DOWN,
+    EC_WORD_THAT,
+    EC_WORD_THOSE_ARE,
+    EC_WORD_THOSE_WERE,
+    EC_WORD_THAT_S_IT_EXCL,
+    EC_WORD_AM,
+    EC_WORD_THAT_WAS,
+    EC_WORD_FRONT,
+    EC_WORD_UP,
+    EC_WORD_CHOICE,
+    EC_WORD_FAR,
+    EC_WORD_AWAY,
+    EC_WORD_NEAR,
+    EC_WORD_WHERE,
+    EC_WORD_WHEN,
+    EC_WORD_WHAT,
+    EC_WORD_DEEP,
+    EC_WORD_SHALLOW,
+    EC_WORD_WHY,
+    EC_WORD_CONFUSED,
+    EC_WORD_OPPOSITE,
+    EC_WORD_LEFT,
+    EC_WORD_RIGHT
+};
+enum {
+    EC_WORD_WANDERING = EC_GROUP_ADJECTIVES << 9,
+    EC_WORD_RICKETY,
+    EC_WORD_ROCK_SOLID,
+    EC_WORD_HUNGRY,
+    EC_WORD_TIGHT,
+    EC_WORD_TICKLISH,
+    EC_WORD_TWIRLING,
+    EC_WORD_SPIRALING,
+    EC_WORD_THIRSTY,
+    EC_WORD_LOLLING,
+    EC_WORD_SILKY,
+    EC_WORD_SADLY,
+    EC_WORD_HOPELESS,
+    EC_WORD_USELESS,
+    EC_WORD_DROOLING,
+    EC_WORD_EXCITING,
+    EC_WORD_THICK,
+    EC_WORD_SMOOTH,
+    EC_WORD_SLIMY,
+    EC_WORD_THIN,
+    EC_WORD_BREAK,
+    EC_WORD_VORACIOUS,
+    EC_WORD_SCATTER,
+    EC_WORD_AWESOME,
+    EC_WORD_WIMPY,
+    EC_WORD_WOBBLY,
+    EC_WORD_SHAKY,
+    EC_WORD_RIPPED,
+    EC_WORD_SHREDDED,
+    EC_WORD_INCREASING,
+    EC_WORD_YET,
+    EC_WORD_DESTROYED,
+    EC_WORD_FIERY,
+    EC_WORD_LOVEY_DOVEY,
+    EC_WORD_HAPPILY,
+    EC_WORD_ANTICIPATION
+};
+enum {
+    EC_WORD_APPEAL = EC_GROUP_EVENTS << 9,
+    EC_WORD_EVENTS,
+    EC_WORD_STAY_AT_HOME,
+    EC_WORD_BERRY,
+    EC_WORD_CONTEST,
+    EC_WORD_MC,
+    EC_WORD_JUDGE,
+    EC_WORD_SUPER,
+    EC_WORD_STAGE,
+    EC_WORD_HALL_OF_FAME,
+    EC_WORD_EVOLUTION,
+    EC_WORD_HYPER,
+    EC_WORD_BATTLE_TOWER,
+    EC_WORD_LEADERS,
+    EC_WORD_BATTLE_ROOM,
+    EC_WORD_HIDDEN,
+    EC_WORD_SECRET_BASE,
+    EC_WORD_BLEND,
+    EC_WORD_POKEBLOCK,
+    EC_WORD_MASTER,
+    EC_WORD_RANK,
+    EC_WORD_RIBBON
+};
+enum {
+    EC_WORD_KTHX_BYE = EC_GROUP_TRENDY_SAYING << 9,
+    EC_WORD_YES_SIR_EXCL,
+    EC_WORD_AVANT_GARDE,
+    EC_WORD_COUPLE,
+    EC_WORD_MUCH_OBLIGED,
+    EC_WORD_YEEHAW_EXCL,
+    EC_WORD_MEGA,
+    EC_WORD_1_HIT_KO_EXCL,
+    EC_WORD_DESTINY,
+    EC_WORD_CANCEL,
+    EC_WORD_NEW,
+    EC_WORD_FLATTEN,
+    EC_WORD_KIDDING,
+    EC_WORD_LOSER,
+    EC_WORD_LOSING,
+    EC_WORD_HAPPENING,
+    EC_WORD_HIP_AND,
+    EC_WORD_SHAKE,
+    EC_WORD_SHADY,
+    EC_WORD_UPBEAT,
+    EC_WORD_MODERN,
+    EC_WORD_SMELL_YA,
+    EC_WORD_BANG,
+    EC_WORD_KNOCKOUT,
+    EC_WORD_HASSLE,
+    EC_WORD_WINNER,
+    EC_WORD_FEVER,
+    EC_WORD_WANNABE,
+    EC_WORD_BABY,
+    EC_WORD_HEART,
+    EC_WORD_OLD,
+    EC_WORD_YOUNG,
+    EC_WORD_UGLY
+};
+
+#define EC_POKEMON(mon) ((EC_GROUP_POKEMON << 9) | SPECIES_##mon)
+#define EC_POKEMON2(mon) ((EC_GROUP_POKEMON_2 << 9) | SPECIES_##mon)
+#define EC_MOVE(move) ((EC_GROUP_MOVE_1 << 9) | MOVE_##move)
+#define EC_MOVE2(move) ((EC_GROUP_MOVE_2 << 9) | MOVE_##move)
+
+extern u8 gUnknown_020388AC;
 
 u16 sub_80EB72C(u16 group);
 void sub_80EB6FC(u16 *, u16);
diff --git a/ld_script.txt b/ld_script.txt
index 4f3ff093d..26fbfaef0 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -78,8 +78,9 @@ SECTIONS {
         src/smokescreen.o(.text);
         src/pokeball.o(.text);
         src/load_save.o(.text);
-        asm/trade.o(.text);
         src/trade.o(.text);
+        asm/trade.o(.text);
+        src/trade.o(.text.sub_804A96C);
         asm/trade.o(.text.sub_804A9F4);
         src/trade.o(.text.sub_804DAD4);
         asm/trade.o(.text.sub_804DB2C);
@@ -346,6 +347,7 @@ SECTIONS {
         data/battle_interface.o(.rodata);
         src/pokeball.o(.rodata);
         data/trade.o(.rodata);
+        src/trade.o(.rodata);
         src/berry_blender.o(.rodata);
         src/new_game.o(.rodata);
         data/rom4.o(.rodata);
diff --git a/src/trade.c b/src/trade.c
index cb190d194..44eb8212a 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -2,6 +2,11 @@
 #include "name_string_util.h"
 #include "string_util.h"
 #include "text.h"
+#include "main.h"
+#include "species.h"
+#include "items.h"
+#include "moves.h"
+#include "easy_chat.h"
 
 struct InGameTrade {
     /*0x00*/ u8 name[11];
@@ -34,9 +39,104 @@ struct UnkStructD {
     /*0x12*/ u16 var12[1];
 };
 
-extern const struct InGameTrade gIngameTrades[];
-extern const u16 gIngameTradeMail[][10];
+void sub_8047EC0(void);
 
+const struct InGameTrade gIngameTrades[] = {
+    {
+        _("MAKIT"),
+        SPECIES_MAKUHITA,
+        5, 5, 4, 4, 4, 4,
+        TRUE, 49562,
+        5, 5, 5, 5, 30,
+        0x9C40,
+        ITEM_X_ATTACK, -1,
+        _("ELYSSA"),
+        MALE, 10, SPECIES_SLAKOTH
+    }, {
+        _("SKITIT"),
+        SPECIES_SKITTY,
+        5, 4, 4, 5, 4, 4,
+        FALSE, 2259,
+        5, 5, 30, 5, 5,
+        0x498A2E17,
+        ITEM_GLITTER_MAIL, 0,
+        _("DARRELL"),
+        FEMALE, 10, SPECIES_PIKACHU
+    }, {
+        _("COROSO"),
+        SPECIES_CORSOLA,
+        4, 4, 5, 4, 4, 5,
+        TRUE, 50183,
+        5, 30, 5, 5, 5,
+        0x4C970B7F,
+        ITEM_TROPIC_MAIL, 1,
+        _("LANE"),
+        FEMALE, 10, SPECIES_BELLOSSOM
+    }
+};
+
+const u16 gIngameTradeMail[][10] = {
+    {
+        EC_POKEMON(PIKACHU),
+        EC_WORD_THANK_YOU,
+        EC_WORD_EXCL,
+        EC_WORD_MY,
+        EC_POKEMON(SKITTY),
+        EC_WORD_EATS,
+        EC_WORD_A_LOT,
+        EC_WORD_NOW,
+        EC_WORD_EXCL,
+        0
+    }, {
+        EC_WORD_I,
+        EC_WORD_WANT,
+        EC_WORD_TO,
+        EC_WORD_SEE,
+        EC_WORD_A,
+        EC_MOVE2(PETAL_DANCE),
+        EC_WORD_IT_S,
+        EC_WORD_SO,
+        EC_WORD_PRETTY,
+        0
+    }
+};
+
+const s8 gTradeBallVerticalVelocityTable[] = {
+     0,  0,  1,  0,
+     1,  0,  1,  1,
+     1,  1,  2,  2,
+     2,  2,  3,  3,
+     3,  3,  4,  4,
+     4,  4, -4, -4,
+    -4, -3, -3, -3,
+    -3, -2, -2, -2,
+    -2, -1, -1, -1,
+    -1,  0, -1,  0,
+    -1,  0,  0,  0,
+     0,  0,  1,  0,
+     1,  0,  1,  1,
+     1,  1,  2,  2,
+     2,  2,  3,  3,
+     3,  3,  4,  4,
+     4,  4, -4, -3,
+    -3, -2, -2, -1,
+    -1, -1,  0, -1,
+     0,  0,  0,  0,
+     0,  0,  1,  0,
+     1,  1,  1,  2,
+     2,  3,  3,  4,
+    -4, -3, -2, -1,
+    -1, -1,  0,  0,
+     0,  0,  1,  0,
+     1,  1,  2,  3
+};
+
+void sub_8047CD8(void)
+{
+    SetMainCallback2(sub_8047EC0);
+}
+
+asm(".section .text.sub_804A96C");
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
     int y, x;
-- 
cgit v1.2.3


From b636d3cafa2a1b3314fddb3c7bde2bdb94c1e2c2 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Thu, 31 Aug 2017 11:35:14 -0400
Subject: sub_8047CE8

---
 asm/trade.s            |  49 ----------------------
 data/ingame_trades.inc | 108 -------------------------------------------------
 data/trade.s           |   9 +----
 ld_script.txt          |   2 +
 src/trade.c            |  56 ++++++++++++++++++++-----
 5 files changed, 49 insertions(+), 175 deletions(-)
 delete mode 100644 data/ingame_trades.inc

diff --git a/asm/trade.s b/asm/trade.s
index be7729c10..b5cdf211e 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,55 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8047CE8
-sub_8047CE8: @ 8047CE8
-	push {r4-r6,lr}
-	ldr r6, _08047D44 @ =gWindowConfig_81E725C
-	ldr r5, _08047D48 @ =gUnknown_020296CC
-	ldr r1, [r5]
-	ldr r2, _08047D4C @ =gSaveBlock2
-	adds r0, r6, 0
-	movs r3, 0xC
-	bl sub_804AFB8
-	bl GetMultiplayerId
-	lsls r0, 24
-	ldr r1, [r5, 0xC]
-	movs r3, 0x80
-	lsls r3, 17
-	eors r3, r0
-	lsrs r3, 24
-	lsls r2, r3, 3
-	subs r2, r3
-	lsls r2, 2
-	ldr r0, _08047D50 @ =gLinkPlayers + 0x8
-	adds r2, r0
-	adds r0, r6, 0
-	movs r3, 0xC
-	bl sub_804AFB8
-	ldr r1, [r5, 0x18]
-	ldr r4, _08047D54 @ =gUnknown_0820C14C
-	ldr r2, [r4]
-	adds r0, r6, 0
-	movs r3, 0x8
-	bl sub_804AFB8
-	ldr r0, [r4, 0x4]
-	ldr r1, [r5, 0x20]
-	movs r2, 0x14
-	bl sub_804ACD8
-	movs r0, 0x3
-	movs r1, 0
-	bl nullsub_5
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08047D44: .4byte gWindowConfig_81E725C
-_08047D48: .4byte gUnknown_020296CC
-_08047D4C: .4byte gSaveBlock2
-_08047D50: .4byte gLinkPlayers + 0x8
-_08047D54: .4byte gUnknown_0820C14C
-	thumb_func_end sub_8047CE8
-
 	thumb_func_start sub_8047D58
 sub_8047D58: @ 8047D58
 	push {r4-r7,lr}
diff --git a/data/ingame_trades.inc b/data/ingame_trades.inc
deleted file mode 100644
index f5258e26c..000000000
--- a/data/ingame_trades.inc
+++ /dev/null
@@ -1,108 +0,0 @@
-	.align 2
-gIngameTrades:: @ 8215AC4
-	.string "MAKIT$", 11 @ nickname
-	.space 1
-	.2byte SPECIES_MAKUHITA @ NPC mon species
-	.byte 5 @ HP IV
-	.byte 5 @ attack IV
-	.byte 4 @ defense IV
-	.byte 4 @ speed IV
-	.byte 4 @ sp. attack IV
-	.byte 4 @ sp. defense IV
-	.byte TRUE @ second ability
-	.space 3
-	.4byte 49562 @ OT ID
-	.byte 5 @ cool
-	.byte 5 @ beauty
-	.byte 5 @ cute
-	.byte 5 @ smart
-	.byte 30 @ tough
-	.space 3
-	.4byte 0x9C40 @ personality value
-	.2byte ITEM_X_ATTACK @ held item
-	.byte -1 @ mail num
-	.string "ELYSSA$", 11 @ OT name
-	.byte MALE @ OT gender
-	.byte 10 @ sheen
-	.2byte SPECIES_SLAKOTH @ player mon species
-	.space 2
-
-	.string "SKITIT$", 11 @ nickname
-	.space 1
-	.2byte SPECIES_SKITTY @ NPC mon species
-	.byte 5 @ HP IV
-	.byte 4 @ attack IV
-	.byte 4 @ defense IV
-	.byte 5 @ speed IV
-	.byte 4 @ sp. attack IV
-	.byte 4 @ sp. defense IV
-	.byte FALSE @ second ability
-	.space 3
-	.4byte 2259 @ OT ID
-	.byte 5 @ cool
-	.byte 5 @ beauty
-	.byte 30 @ cute
-	.byte 5 @ smart
-	.byte 5 @ tough
-	.space 3
-	.4byte 0x498A2E17 @ personality value
-	.2byte ITEM_GLITTER_MAIL @ held item
-	.byte 0 @ mail num
-	.string "DARRELL$", 11 @ OT name
-	.byte FEMALE @ OT gender
-	.byte 10 @ sheen
-	.2byte SPECIES_PIKACHU @ player mon species
-	.space 2
-
-	.string "COROSO$", 11 @ nickname
-	.space 1
-	.2byte SPECIES_CORSOLA @ NPC mon species
-	.byte 4 @ HP IV
-	.byte 4 @ attack IV
-	.byte 5 @ defense IV
-	.byte 4 @ speed IV
-	.byte 4 @ sp. attack IV
-	.byte 5 @ sp. defense IV
-	.byte TRUE @ second ability
-	.space 3
-	.4byte 50183 @ OT ID
-	.byte 5 @ cool
-	.byte 30 @ beauty
-	.byte 5 @ cute
-	.byte 5 @ smart
-	.byte 5 @ tough
-	.space 3
-	.4byte 0x4C970B7F @ personality value
-	.2byte ITEM_TROPIC_MAIL @ held item
-	.byte 1 @ mail num
-	.string "LANE$", 11 @ OT name
-	.byte FEMALE @ OT gender
-	.byte 10 @ sheen
-	.2byte SPECIES_BELLOSSOM @ player mon species
-	.space 2
-
-	.align 1
-gIngameTradeMail:: @ 8215B78
-@ 0
-	ec_pokemon1 PIKACHU
-	ec_word THANK_YOU
-	ec_word EXCL
-	ec_word MY
-	ec_pokemon1 SKITTY
-	ec_word EATS
-	ec_word A_LOT
-	ec_word NOW
-	ec_word EXCL
-	.2byte 0
-
-@ 1
-	ec_word I
-	ec_word WANT
-	ec_word TO
-	ec_word SEE
-	ec_word A
-	ec_move2 PETAL_DANCE
-	ec_word IT_S
-	ec_word SO
-	ec_word PRETTY
-	.2byte 0
diff --git a/data/trade.s b/data/trade.s
index d1b42b103..48919ca5f 100644
--- a/data/trade.s
+++ b/data/trade.s
@@ -135,14 +135,7 @@ gUnknown_0820C12C:: @ 820C12C
 gSpriteTemplate_820C134:: @ 820C134
 	spr_template 300, 2345, gOamData_820C104, gSpriteAnimTable_820C11C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
-	.align 2
-gUnknown_0820C14C:: @ 820C14C
-	.4byte TradeText_Cancel
-	.4byte TradeText_ChoosePoke
-	.4byte TradeText_Summary1
-	.4byte TradeText_Trade1
-	.4byte TradeText_CancelTradePrompt
-	.4byte TradeText_PressBToExit
+	.section .rodata.820C164
 
 @ This is used to determine the next mon to select when the D-Pad is
 @ pressed in a given direction.
diff --git a/ld_script.txt b/ld_script.txt
index 26fbfaef0..81f92bfaa 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -348,6 +348,8 @@ SECTIONS {
         src/pokeball.o(.rodata);
         data/trade.o(.rodata);
         src/trade.o(.rodata);
+        data/trade.o(.rodata.820C164);
+        src/trade.o(.rodata.igt);
         src/berry_blender.o(.rodata);
         src/new_game.o(.rodata);
         data/rom4.o(.rodata);
diff --git a/src/trade.c b/src/trade.c
index 44eb8212a..874a203ba 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -7,6 +7,8 @@
 #include "items.h"
 #include "moves.h"
 #include "easy_chat.h"
+#include "link.h"
+#include "strings2.h"
 
 struct InGameTrade {
     /*0x00*/ u8 name[11];
@@ -39,29 +41,52 @@ struct UnkStructD {
     /*0x12*/ u16 var12[1];
 };
 
+struct UnkStructE {
+    u8 *unk00;
+    u8 fil04[8];
+    u8 *unk0C;
+    u8 fil10[8];
+    u8 *unk18;
+    u8 fil1C[4];
+    void *unk20;
+};
+
 void sub_8047EC0(void);
+void sub_804AFB8(const struct WindowConfig *, u8 *, const u8 *, u8);
+void sub_804ACD8(const u8 *, u8 *, u8);
+void nullsub_5(u8, u8);
+
+extern struct UnkStructE gUnknown_020296CC;
+
+const u8 *const gUnknown_0820C14C[] = {
+    TradeText_Cancel,
+    TradeText_ChoosePoke,
+    TradeText_Summary1,
+    TradeText_Trade1,
+    TradeText_CancelTradePrompt,
+    TradeText_PressBToExit
+};
 
+asm(".section .rodata.igt");
 const struct InGameTrade gIngameTrades[] = {
     {
-        _("MAKIT"),
-        SPECIES_MAKUHITA,
+        _("MAKIT"), SPECIES_MAKUHITA,
         5, 5, 4, 4, 4, 4,
         TRUE, 49562,
         5, 5, 5, 5, 30,
         0x9C40,
         ITEM_X_ATTACK, -1,
-        _("ELYSSA"),
-        MALE, 10, SPECIES_SLAKOTH
+        _("ELYSSA"), MALE, 10,
+        SPECIES_SLAKOTH
     }, {
-        _("SKITIT"),
-        SPECIES_SKITTY,
+        _("SKITIT"), SPECIES_SKITTY,
         5, 4, 4, 5, 4, 4,
         FALSE, 2259,
         5, 5, 30, 5, 5,
         0x498A2E17,
         ITEM_GLITTER_MAIL, 0,
-        _("DARRELL"),
-        FEMALE, 10, SPECIES_PIKACHU
+        _("DARRELL"), FEMALE, 10,
+        SPECIES_PIKACHU
     }, {
         _("COROSO"),
         SPECIES_CORSOLA,
@@ -70,8 +95,8 @@ const struct InGameTrade gIngameTrades[] = {
         5, 30, 5, 5, 5,
         0x4C970B7F,
         ITEM_TROPIC_MAIL, 1,
-        _("LANE"),
-        FEMALE, 10, SPECIES_BELLOSSOM
+        _("LANE"), FEMALE, 10,
+        SPECIES_BELLOSSOM
     }
 };
 
@@ -136,6 +161,17 @@ void sub_8047CD8(void)
     SetMainCallback2(sub_8047EC0);
 }
 
+void sub_8047CE8(void)
+{
+    u8 mpId;
+    sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC.unk00, gSaveBlock2.playerName, 0xC);
+    mpId = GetMultiplayerId();
+    sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC.unk0C, gLinkPlayers[mpId ^ 1].name, 0xC);
+    sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC.unk18, gUnknown_0820C14C[0], 0x8);
+    sub_804ACD8(gUnknown_0820C14C[1], gUnknown_020296CC.unk20, 0x14);
+    nullsub_5(3, 0);
+}
+
 asm(".section .text.sub_804A96C");
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From d3dca02924bc19bff355feb74a667707751bcc8f Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Thu, 31 Aug 2017 13:46:14 -0400
Subject: Nonmatching sub_8047D58

---
 asm/trade.s        | 116 -------------
 data/trade.s       | 263 -----------------------------
 include/graphics.h |   3 +
 ld_script.txt      |   3 +-
 src/trade.c        | 487 +++++++++++++++++++++++++++++++++++++++++++++++++----
 5 files changed, 460 insertions(+), 412 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index b5cdf211e..8faba39dd 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,122 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8047D58
-sub_8047D58: @ 8047D58
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x18
-	ldr r0, _08047E30 @ =gSaveBlock2
-	bl StringLength
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0
-	cmp r0, 0x5
-	bls _08047D72
-	movs r1, 0x1
-_08047D72:
-	movs r5, 0
-	lsls r2, r1, 2
-	mov r6, sp
-	ldr r0, _08047E34 @ =gTradeUnknownSpriteCoords
-	adds r1, r0, 0x1
-	adds r1, r2
-	mov r8, r1
-	adds r0, r2, r0
-	ldrb r0, [r0]
-	lsls r4, r0, 16
-_08047D86:
-	mov r1, sp
-	ldr r0, _08047E38 @ =gSpriteTemplate_820C0EC
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	ldrh r0, [r6]
-	adds r0, r5
-	strh r0, [r6]
-	asrs r1, r4, 16
-	mov r0, sp
-	mov r3, r8
-	ldrb r2, [r3]
-	movs r3, 0x1
-	bl CreateSprite
-	movs r7, 0x80
-	lsls r7, 14
-	adds r4, r7
-	adds r5, 0x1
-	cmp r5, 0x2
-	ble _08047D86
-	bl GetMultiplayerId
-	lsls r0, 24
-	movs r1, 0x80
-	lsls r1, 17
-	eors r1, r0
-	lsrs r1, 24
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	ldr r1, _08047E3C @ =gLinkPlayers + 0x8
-	adds r0, r1
-	bl StringLength
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0
-	cmp r0, 0x5
-	bls _08047DDA
-	movs r1, 0x1
-_08047DDA:
-	movs r5, 0
-	lsls r2, r1, 2
-	mov r6, sp
-	ldr r0, _08047E40 @ =gTradeUnknownSpriteCoords + 0x3
-	adds r1, r2, r0
-	mov r8, r1
-	subs r0, 0x1
-	adds r0, r2, r0
-	ldrb r0, [r0]
-	lsls r4, r0, 16
-_08047DEE:
-	mov r1, sp
-	ldr r0, _08047E38 @ =gSpriteTemplate_820C0EC
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	adds r0, r5, 0x3
-	ldrh r1, [r6]
-	adds r0, r1
-	strh r0, [r6]
-	asrs r1, r4, 16
-	mov r0, sp
-	mov r3, r8
-	ldrb r2, [r3]
-	movs r3, 0x1
-	bl CreateSprite
-	movs r7, 0x80
-	lsls r7, 14
-	adds r4, r7
-	adds r5, 0x1
-	cmp r5, 0x2
-	ble _08047DEE
-	movs r0, 0x5
-	movs r1, 0
-	bl nullsub_5
-	add sp, 0x18
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08047E30: .4byte gSaveBlock2
-_08047E34: .4byte gTradeUnknownSpriteCoords
-_08047E38: .4byte gSpriteTemplate_820C0EC
-_08047E3C: .4byte gLinkPlayers + 0x8
-_08047E40: .4byte gTradeUnknownSpriteCoords + 0x3
-	thumb_func_end sub_8047D58
-
 	thumb_func_start sub_8047E44
 sub_8047E44: @ 8047E44
 	push {r4-r7,lr}
diff --git a/data/trade.s b/data/trade.s
index 48919ca5f..fcfbd8187 100644
--- a/data/trade.s
+++ b/data/trade.s
@@ -3,140 +3,6 @@
 
 	.section .rodata
 
-	.align 2
-	.byte 0x90, 0x08, 0x00, 0x00
-	.byte 0xC0, 0x3A, 0x00, 0x00
-	.byte 0x1C, 0x00, 0x00, 0x00
-	.byte 0x30, 0x05, 0x00, 0x00
-	.byte 0x24, 0x00, 0x00, 0x00
-	.byte 0x64, 0x00, 0x00, 0x00
-	.byte 0xD8, 0x04, 0x00, 0x00
-
-	.align 1
-gTradeMovesBoxTilemap:: @ 820ABF0
-	.incbin "graphics/trade/moves_box_map.bin"
-
-	.align 1
-gTradePartyBoxTilemap:: @ 820ADEE
-	.incbin "graphics/trade/party_box_map.bin"
-
-	.align 2
-gTradeStripesBG2Tilemap:: @ 820AFEC
-	.incbin "graphics/trade/stripes_bg2_map.bin"
-
-	.align 2
-gTradeStripesBG3Tilemap:: @ 820B7EC
-	.incbin "graphics/trade/stripes_bg3_map.bin"
-
-	.align 2
-gOamData_820BFEC:: @ 820BFEC
-	.2byte 0x4000
-	.2byte 0x8000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_820BFF4:: @ 820BFF4
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820BFFC:: @ 820BFFC
-	obj_image_anim_frame 8, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820C004:: @ 820C004
-	obj_image_anim_frame 16, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820C00C:: @ 820C00C
-	obj_image_anim_frame 24, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820C014:: @ 820C014
-	obj_image_anim_frame 32, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820C01C:: @ 820C01C
-	obj_image_anim_frame 40, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_820C024:: @ 820C024
-	.4byte gSpriteAnim_820BFF4
-	.4byte gSpriteAnim_820BFFC
-	.4byte gSpriteAnim_820C004
-	.4byte gSpriteAnim_820C00C
-	.4byte gSpriteAnim_820C014
-	.4byte gSpriteAnim_820C01C
-
-	.align 2
-TradeScreenTextPalette: @ 820C03C
-	.incbin "graphics/trade/text1.gbapal"
-	.incbin "graphics/trade/text2.gbapal" @ unused?
-
-	.align 2
-gUnknown_0820C07C:: @ 820C07C
-	obj_tiles 0x0201d000, 256, 0x00c8
-	obj_tiles 0x0201d100, 256, 0x00c9
-	obj_tiles 0x0201d200, 256, 0x00ca
-	obj_tiles 0x0201d300, 256, 0x00cb
-	obj_tiles 0x0201d400, 256, 0x00cc
-	obj_tiles 0x0201d500, 256, 0x00cd
-	obj_tiles 0x0201d600, 256, 0x00ce
-	obj_tiles 0x0201d700, 256, 0x00cf
-	obj_tiles 0x0201d800, 256, 0x00d0
-	obj_tiles 0x0201d900, 256, 0x00d1
-	obj_tiles 0x0201da00, 256, 0x00d2
-	obj_tiles 0x0201db00, 256, 0x00d3
-	obj_tiles 0x0201dc00, 256, 0x00d4
-
-	.align 2
-gSpritePalette_TradeScreenText:: @ 820C0E4
-	obj_pal TradeScreenTextPalette, 4925
-
-	.align 2
-gSpriteTemplate_820C0EC:: @ 820C0EC
-	spr_template 200, 4925, gOamData_820BFEC, gSpriteAnimTable_820C024, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gOamData_820C104:: @ 820C104
-	.2byte 0x4000
-	.2byte 0xC000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_820C10C:: @ 820C10C
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820C114:: @ 820C114
-	obj_image_anim_frame 32, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_820C11C:: @ 820C11C
-	.4byte gSpriteAnim_820C10C
-	.4byte gSpriteAnim_820C114
-
-	.align 2
-gUnknown_0820C124:: @ 820C124
-	obj_tiles gUnknown_08EA1DEC, 0x800, 300
-
-	.align 2
-gUnknown_0820C12C:: @ 820C12C
-	obj_pal gUnknown_08EA0328, 2345
-
-	.align 2
-gSpriteTemplate_820C134:: @ 820C134
-	spr_template 300, 2345, gOamData_820C104, gSpriteAnimTable_820C11C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.section .rodata.820C164
-
 @ This is used to determine the next mon to select when the D-Pad is
 @ pressed in a given direction.
 @ Note that the mons are laid out like this.
@@ -146,135 +12,6 @@ gSpriteTemplate_820C134:: @ 820C134
 @  2  3  8  9
 @  4  5 10 11
 @          12
-gTradeNextSelectedMonTable:: @ 820C164
-	@ 0
-	.byte  4,  2, 12, 12,  0,  0 @ up
-	.byte  2,  4, 12, 12,  0,  0 @ down
-	.byte  7,  6,  1,  0,  0,  0 @ left
-	.byte  1,  6,  7,  0,  0,  0 @ right
-	@ 1
-	.byte  5,  3, 12, 12,  0,  0 @ up
-	.byte  3,  5, 12, 12,  0,  0 @ down
-	.byte  0,  7,  6,  1,  0,  0 @ left
-	.byte  6,  7,  0,  1,  0,  0 @ right
-	@ 2
-	.byte  0,  0,  0,  0,  0,  0 @ up
-	.byte  4,  0,  0,  0,  0,  0 @ down
-	.byte  9,  8,  7,  6,  0,  0 @ left
-	.byte  3,  1,  0,  0,  0,  0 @ right
-	@ 3
-	.byte  1,  1,  1,  1,  0,  0 @ up
-	.byte  5,  1,  1,  1,  0,  0 @ down
-	.byte  2,  9,  8,  7,  0,  0 @ left
-	.byte  8,  9,  6,  6,  0,  0 @ right
-	@ 4
-	.byte  2,  2,  2,  2,  0,  0 @ up
-	.byte  0,  0,  0,  0,  0,  0 @ down
-	.byte 11, 10,  9,  8,  7,  6 @ left
-	.byte  5,  3,  1,  0,  0,  0 @ right
-	@ 5
-	.byte  3,  3,  3,  3,  0,  0 @ up
-	.byte  1,  1,  1,  1,  0,  0 @ down
-	.byte  4,  4,  4,  4,  0,  0 @ left
-	.byte 10,  8,  6,  0,  0,  0 @ right
-	@ 6
-	.byte 10,  8, 12,  0,  0,  0 @ up
-	.byte  8, 10, 12,  0,  0,  0 @ down
-	.byte  1,  0,  0,  0,  0,  0 @ left
-	.byte  7,  0,  1,  0,  0,  0 @ right
-	@ 7
-	.byte 12,  0,  0,  0,  0,  0 @ up
-	.byte  9, 12,  0,  0,  0,  0 @ down
-	.byte  6,  0,  0,  0,  0,  0 @ left
-	.byte  0,  0,  0,  0,  0,  0 @ right
-	@ 8
-	.byte  6,  0,  0,  0,  0,  0 @ up
-	.byte 10,  6,  0,  0,  0,  0 @ down
-	.byte  3,  2,  1,  0,  0,  0 @ left
-	.byte  9,  7,  0,  0,  0,  0 @ right
-	@ 9
-	.byte  7,  0,  0,  0,  0,  0 @ up
-	.byte 11, 12,  0,  0,  0,  0 @ down
-	.byte  8,  0,  0,  0,  0,  0 @ left
-	.byte  2,  1,  0,  0,  0,  0 @ right
-	@ 10
-	.byte  8,  0,  0,  0,  0,  0 @ up
-	.byte  6,  0,  0,  0,  0,  0 @ down
-	.byte  5,  4,  3,  2,  1,  0 @ left
-	.byte 11,  9,  7,  0,  0,  0 @ right
-	@ 11
-	.byte  9,  0,  0,  0,  0,  0 @ up
-	.byte 12,  0,  0,  0,  0,  0 @ down
-	.byte 10,  0,  0,  0,  0,  0 @ left
-	.byte  4,  2,  0,  0,  0,  0 @ right
-	@ 12
-	.byte 11,  9,  7,  6,  0,  0 @ up
-	.byte  7,  6,  0,  0,  0,  0 @ down
-	.byte 12,  0,  0,  0,  0,  0 @ left
-	.byte 12,  0,  0,  0,  0,  0 @ right
-
-@ The coordinates are in units of tiles.
-@ These are used for both mon icons and the selected mon cursor,
-@ but the origins of the coordinates differ.
-gTradeMonSpriteCoords:: @ 820C29C
-	@ left-side party
-	.byte  1,  5
-	.byte  8,  5
-	.byte  1, 10
-	.byte  8, 10
-	.byte  1, 15
-	.byte  8, 15
-
-	@ right-side party
-	.byte 16,  5
-	.byte 23,  5
-	.byte 16, 10
-	.byte 23, 10
-	.byte 16, 15
-	.byte 23, 15
-
-	@ cancel button
-	.byte 23, 18
-
-gTradeLevelDisplayCoords:: @ 820C2B6
-	@ left-side party
-	.byte  5,  4
-	.byte 12,  4
-	.byte  5,  9
-	.byte 12,  9
-	.byte  5, 14
-	.byte 12, 14
-
-	@ right-side party
-	.byte 20,  4
-	.byte 27,  4
-	.byte 20,  9
-	.byte 27,  9
-	.byte 20, 14
-	.byte 27, 14
-
-gTradeMonBoxCoords:: @ 820C2CE
-	@ left-side party
-	.byte  1,  3
-	.byte  8,  3
-	.byte  1,  8
-	.byte  8,  8
-	.byte  1, 13
-	.byte  8, 13
-
-	@ right-side party
-	.byte 16,  3
-	.byte 23,  3
-	.byte 16,  8
-	.byte 23,  8
-	.byte 16, 13
-	.byte 23, 13
-
-gTradeUnknownSpriteCoords:: @ 820C2E6
-	.byte  59, 10
-	.byte 179, 10
-	.byte  59, 10
-	.byte 179, 10
 
 	.align 2
 gUnknown_0820C2F0:: @ 820C2F0
diff --git a/include/graphics.h b/include/graphics.h
index 5632cb831..72688ec44 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2564,4 +2564,7 @@ extern const u8 gUnknown_08E8CFC0[];
 extern const u8 gUnknown_08E8D4C0[];
 extern const u8 gUnknown_08E8D9C0[];
 
+extern const u8 gUnknown_08EA1DEC[];
+extern const u16 gUnknown_08EA0328[];
+
 #endif  // GUARD_GRAPHICS_H
diff --git a/ld_script.txt b/ld_script.txt
index 81f92bfaa..98af35582 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -346,9 +346,8 @@ SECTIONS {
         src/egg_hatch.o(.rodata);
         data/battle_interface.o(.rodata);
         src/pokeball.o(.rodata);
-        data/trade.o(.rodata);
         src/trade.o(.rodata);
-        data/trade.o(.rodata.820C164);
+        data/trade.o(.rodata);
         src/trade.o(.rodata.igt);
         src/berry_blender.o(.rodata);
         src/new_game.o(.rodata);
diff --git a/src/trade.c b/src/trade.c
index 874a203ba..392ab881a 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -9,6 +9,7 @@
 #include "easy_chat.h"
 #include "link.h"
 #include "strings2.h"
+#include "graphics.h"
 
 struct InGameTrade {
     /*0x00*/ u8 name[11];
@@ -41,14 +42,9 @@ struct UnkStructD {
     /*0x12*/ u16 var12[1];
 };
 
-struct UnkStructE {
-    u8 *unk00;
-    u8 fil04[8];
-    u8 *unk0C;
-    u8 fil10[8];
-    u8 *unk18;
-    u8 fil1C[4];
-    void *unk20;
+struct TradeEwramStruct {
+    /*0x00000*/ u8 filler_00000[0xd000];
+    /*0x0d000*/ u8 tileBuffers[13][256];
 };
 
 void sub_8047EC0(void);
@@ -56,7 +52,143 @@ void sub_804AFB8(const struct WindowConfig *, u8 *, const u8 *, u8);
 void sub_804ACD8(const u8 *, u8 *, u8);
 void nullsub_5(u8, u8);
 
-extern struct UnkStructE gUnknown_020296CC;
+extern u8 *gUnknown_020296CC[13];
+
+extern u8 ewram[];
+#define ewram_2010000 (*(struct TradeEwramStruct *)(ewram + 0x10000))
+
+
+const u32 unref_data_820ABD4[] = {
+    0x00000890,
+    0x00003AC0,
+    0x0000001C,
+    0x00000530,
+    0x00000024,
+    0x00000064,
+    0x000004D8
+};
+
+const u16 gTradeMovesBoxTilemap[] = INCBIN_U16("graphics/trade/moves_box_map.bin");
+const u16 gTradePartyBoxTilemap[] = INCBIN_U16("graphics/trade/party_box_map.bin");
+const u16 gTradeStripesBG2Tilemap[] = INCBIN_U16("graphics/trade/stripes_bg2_map.bin");
+const u16 gTradeStripesBG3Tilemap[] = INCBIN_U16("graphics/trade/stripes_bg3_map.bin");
+
+const struct OamData gOamData_820BFEC = {
+    .shape = ST_OAM_H_RECTANGLE,
+    .size = 2,
+    .priority = 1
+};
+
+const union AnimCmd gSpriteAnim_820BFF4[] = {
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd gSpriteAnim_820BFFC[] = {
+    ANIMCMD_FRAME(8, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd gSpriteAnim_820C004[] = {
+    ANIMCMD_FRAME(16, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd gSpriteAnim_820C00C[] = {
+    ANIMCMD_FRAME(24, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd gSpriteAnim_820C014[] = {
+    ANIMCMD_FRAME(32, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd gSpriteAnim_820C01C[] = {
+    ANIMCMD_FRAME(40, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gSpriteAnimTable_820C024[] = {
+    gSpriteAnim_820BFF4,
+    gSpriteAnim_820BFFC,
+    gSpriteAnim_820C004,
+    gSpriteAnim_820C00C,
+    gSpriteAnim_820C014,
+    gSpriteAnim_820C01C
+};
+
+const u16 TradeScreenTextPalette[] = INCBIN_U16("graphics/trade/text1.gbapal");
+const u16 UnrefTradeScreenTextPalette[] = INCBIN_U16("graphics/trade/text2.gbapal");
+
+const struct SpriteSheet gUnknown_0820C07C[] = {
+    {ewram_2010000.tileBuffers[ 0], 256, 200},
+    {ewram_2010000.tileBuffers[ 1], 256, 201},
+    {ewram_2010000.tileBuffers[ 2], 256, 202},
+    {ewram_2010000.tileBuffers[ 3], 256, 203},
+    {ewram_2010000.tileBuffers[ 4], 256, 204},
+    {ewram_2010000.tileBuffers[ 5], 256, 205},
+    {ewram_2010000.tileBuffers[ 6], 256, 206},
+    {ewram_2010000.tileBuffers[ 7], 256, 207},
+    {ewram_2010000.tileBuffers[ 8], 256, 208},
+    {ewram_2010000.tileBuffers[ 9], 256, 209},
+    {ewram_2010000.tileBuffers[10], 256, 210},
+    {ewram_2010000.tileBuffers[11], 256, 211},
+    {ewram_2010000.tileBuffers[12], 256, 212},
+};
+
+const struct SpritePalette gSpritePalette_TradeScreenText = {
+    TradeScreenTextPalette, 4925
+};
+
+const struct SpriteTemplate gSpriteTemplate_820C0EC = {
+    200,
+    4925,
+    &gOamData_820BFEC,
+    gSpriteAnimTable_820C024,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    SpriteCallbackDummy
+};
+
+const struct OamData gOamData_820C104 = {
+    .shape = ST_OAM_H_RECTANGLE,
+    .size = 3,
+    .priority = 1
+};
+
+const union AnimCmd gSpriteAnim_820C10C[] = {
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd gSpriteAnim_820C114[] = {
+    ANIMCMD_FRAME(32, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gSpriteAnimTable_820C11C[] = {
+    gSpriteAnim_820C10C,
+    gSpriteAnim_820C114
+};
+
+const struct SpriteSheet gUnknown_0820C124 = {
+    gUnknown_08EA1DEC, 0x800, 300
+};
+
+const struct SpritePalette gUnknown_0820C12C = {
+    gUnknown_08EA0328, 2345
+};
+
+const struct SpriteTemplate gSpriteTemplate_820C134 = {
+    300,
+    2345,
+    &gOamData_820C104,
+    gSpriteAnimTable_820C11C,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    SpriteCallbackDummy
+};
 
 const u8 *const gUnknown_0820C14C[] = {
     TradeText_Cancel,
@@ -67,6 +199,153 @@ const u8 *const gUnknown_0820C14C[] = {
     TradeText_PressBToExit
 };
 
+// This is used to determine the next mon to select when the D-Pad is
+// pressed in a given direction.
+// Note that the mons are laid out like this.
+// 0-5 are the player's party and 6-11 are the trading partner's party.
+// 12 is the cancel button.
+//  0  1  6  7
+//  2  3  8  9
+//  4  5 10 11
+//          12
+
+const u8 gTradeNextSelectedMonTable[][4][6] = {
+    {
+        {4, 2, 12, 12, 0, 0},
+        {2, 4, 12, 12, 0, 0},
+        {7, 6, 1, 0, 0, 0},
+        {1, 6, 7, 0, 0, 0}
+    }, {
+        {5, 3, 12, 12, 0, 0},
+        {3, 5, 12, 12, 0, 0},
+        {0, 7, 6, 1, 0, 0},
+        {6, 7, 0, 1, 0, 0}
+    }, {
+        {0, 0, 0, 0, 0, 0},
+        {4, 0, 0, 0, 0, 0},
+        {9, 8, 7, 6, 0, 0},
+        {3, 1, 0, 0, 0, 0}
+    }, {
+        {1, 1, 1, 1, 0, 0},
+        {5, 1, 1, 1, 0, 0},
+        {2, 9, 8, 7, 0, 0},
+        {8, 9, 6, 6, 0, 0}
+    }, {
+        {2, 2, 2, 2, 0, 0},
+        {0, 0, 0, 0, 0, 0},
+        {11, 10, 9, 8, 7, 6},
+        {5, 3, 1, 0, 0, 0}
+    }, {
+        {3, 3, 3, 3, 0, 0},
+        {1, 1, 1, 1, 0, 0},
+        {4, 4, 4, 4, 0, 0},
+        {10, 8, 6, 0, 0, 0}
+    }, {
+        {10, 8, 12, 0, 0, 0},
+        {8, 10, 12, 0, 0, 0},
+        {1, 0, 0, 0, 0, 0},
+        {7, 0, 1, 0, 0, 0}
+    }, {
+        {12, 0, 0, 0, 0, 0},
+        {9, 12, 0, 0, 0, 0},
+        {6, 0, 0, 0, 0, 0},
+        {0, 0, 0, 0, 0, 0}
+    }, {
+        {6, 0, 0, 0, 0, 0},
+        {10, 6, 0, 0, 0, 0},
+        {3, 2, 1, 0, 0, 0},
+        {9, 7, 0, 0, 0, 0}
+    }, {
+        {7, 0, 0, 0, 0, 0},
+        {11, 12, 0, 0, 0, 0},
+        {8, 0, 0, 0, 0, 0},
+        {2, 1, 0, 0, 0, 0}
+    }, {
+        {8, 0, 0, 0, 0, 0},
+        {6, 0, 0, 0, 0, 0},
+        {5, 4, 3, 2, 1, 0},
+        {11, 9, 7, 0, 0, 0}
+    }, {
+        {9, 0, 0, 0, 0, 0},
+        {12, 0, 0, 0, 0, 0},
+        {10, 0, 0, 0, 0, 0},
+        {4, 2, 0, 0, 0, 0}
+    }, {
+        {11, 9, 7, 6, 0, 0},
+        {7, 6, 0, 0, 0, 0},
+        {12, 0, 0, 0, 0, 0},
+        {12, 0, 0, 0, 0, 0}
+    }
+};
+
+const u8 gTradeMonSpriteCoords[][2] = {
+    // Your party
+    {1, 5},
+    {8, 5},
+    {1, 10},
+    {8, 10},
+    {1, 15},
+    {8, 15},
+
+    // Friend's party
+    {16, 5},
+    {23, 5},
+    {16, 10},
+    {23, 10},
+    {16, 15},
+    {23, 15},
+
+    {23, 18} // CANCEL
+};
+
+const u8 gTradeLevelDisplayCoords[][2] = {
+    // Your party
+    { 5,  4},
+    {12,  4},
+    { 5,  9},
+    {12,  9},
+    { 5, 14},
+    {12, 14},
+
+    // Friend's party
+    {20,  4},
+    {27,  4},
+    {20,  9},
+    {27,  9},
+    {20, 14},
+    {27, 14}
+};
+
+const u8 gTradeMonBoxCoords[][2] = {
+    // Your party
+    { 1,  3},
+    { 8,  3},
+    { 1,  8},
+    { 8,  8},
+    { 1, 13},
+    { 8, 13},
+
+    // Friend's party
+    {16,  3},
+    {23,  3},
+    {16,  8},
+    {23,  8},
+    {16, 13},
+    {23, 13}
+};
+
+const u8 gTradeUnknownSpriteCoords[][2][2] = {
+    {
+        { 59, 10},
+        {179, 10},
+    },
+    {
+        { 59, 10},
+        {179, 10}
+    }
+};
+
+
 asm(".section .rodata.igt");
 const struct InGameTrade gIngameTrades[] = {
     {
@@ -127,33 +406,33 @@ const u16 gIngameTradeMail[][10] = {
 };
 
 const s8 gTradeBallVerticalVelocityTable[] = {
-     0,  0,  1,  0,
-     1,  0,  1,  1,
-     1,  1,  2,  2,
-     2,  2,  3,  3,
-     3,  3,  4,  4,
-     4,  4, -4, -4,
+    0,  0,  1,  0,
+    1,  0,  1,  1,
+    1,  1,  2,  2,
+    2,  2,  3,  3,
+    3,  3,  4,  4,
+    4,  4, -4, -4,
     -4, -3, -3, -3,
     -3, -2, -2, -2,
     -2, -1, -1, -1,
     -1,  0, -1,  0,
     -1,  0,  0,  0,
-     0,  0,  1,  0,
-     1,  0,  1,  1,
-     1,  1,  2,  2,
-     2,  2,  3,  3,
-     3,  3,  4,  4,
-     4,  4, -4, -3,
+    0,  0,  1,  0,
+    1,  0,  1,  1,
+    1,  1,  2,  2,
+    2,  2,  3,  3,
+    3,  3,  4,  4,
+    4,  4, -4, -3,
     -3, -2, -2, -1,
     -1, -1,  0, -1,
-     0,  0,  0,  0,
-     0,  0,  1,  0,
-     1,  1,  1,  2,
-     2,  3,  3,  4,
+    0,  0,  0,  0,
+    0,  0,  1,  0,
+    1,  1,  1,  2,
+    2,  3,  3,  4,
     -4, -3, -2, -1,
     -1, -1,  0,  0,
-     0,  0,  1,  0,
-     1,  1,  2,  3
+    0,  0,  1,  0,
+    1,  1,  2,  3
 };
 
 void sub_8047CD8(void)
@@ -164,14 +443,160 @@ void sub_8047CD8(void)
 void sub_8047CE8(void)
 {
     u8 mpId;
-    sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC.unk00, gSaveBlock2.playerName, 0xC);
+    sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC[0], gSaveBlock2.playerName, 0xC);
     mpId = GetMultiplayerId();
-    sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC.unk0C, gLinkPlayers[mpId ^ 1].name, 0xC);
-    sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC.unk18, gUnknown_0820C14C[0], 0x8);
-    sub_804ACD8(gUnknown_0820C14C[1], gUnknown_020296CC.unk20, 0x14);
+    sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC[3], gLinkPlayers[mpId ^ 1].name, 0xC);
+    sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC[6], gUnknown_0820C14C[0], 0x8);
+    sub_804ACD8(gUnknown_0820C14C[1], gUnknown_020296CC[8], 0x14);
     nullsub_5(3, 0);
 }
 
+#ifdef NONMATCHING
+void sub_8047D58(void)
+{
+    u8 language;
+    struct SpriteTemplate spriteTemplate;
+    int i;
+    s16 x;
+    u8 mpId;
+
+    language = StringLength(gSaveBlock2.playerName) <= 5 ? 0 : 1;
+    for (i = 0, x = gTradeUnknownSpriteCoords[language][0][0]; i < 3; x += 32, i ++)
+    {
+        spriteTemplate = gSpriteTemplate_820C0EC;
+        spriteTemplate.tileTag += i;
+        CreateSprite(&spriteTemplate, x, gTradeUnknownSpriteCoords[language][0][1], 1);
+    }
+
+    mpId = GetMultiplayerId();
+    language = StringLength(gLinkPlayers[mpId ^ 1].name) <= 5 ? 0 : 1;
+    for (i = 0, x = gTradeUnknownSpriteCoords[language][1][0]; i < 3; x += 32, i ++)
+    {
+        spriteTemplate = gSpriteTemplate_820C0EC;
+        spriteTemplate.tileTag += i + 3;
+        CreateSprite(&spriteTemplate, x, gTradeUnknownSpriteCoords[language][1][1], 1);
+    }
+    nullsub_5(5, 0);
+}
+#else
+__attribute__((naked))
+void sub_8047D58(void)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                    "\tmov r7, r8\n"
+                    "\tpush {r7}\n"
+                    "\tsub sp, 0x18\n"
+                    "\tldr r0, _08047E30 @ =gSaveBlock2\n"
+                    "\tbl StringLength\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tmovs r1, 0\n"
+                    "\tcmp r0, 0x5\n"
+                    "\tbls _08047D72\n"
+                    "\tmovs r1, 0x1\n"
+                    "_08047D72:\n"
+                    "\tmovs r5, 0\n"
+                    "\tlsls r2, r1, 2\n"
+                    "\tmov r6, sp\n"
+                    "\tldr r0, _08047E34 @ =gTradeUnknownSpriteCoords\n"
+                    "\tadds r1, r0, 0x1\n"
+                    "\tadds r1, r2\n"
+                    "\tmov r8, r1\n"
+                    "\tadds r0, r2, r0\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tlsls r4, r0, 16\n"
+                    "_08047D86:\n"
+                    "\tmov r1, sp\n"
+                    "\tldr r0, _08047E38 @ =gSpriteTemplate_820C0EC\n"
+                    "\tldm r0!, {r2,r3,r7}\n"
+                    "\tstm r1!, {r2,r3,r7}\n"
+                    "\tldm r0!, {r2,r3,r7}\n"
+                    "\tstm r1!, {r2,r3,r7}\n"
+                    "\tldrh r0, [r6]\n"
+                    "\tadds r0, r5\n"
+                    "\tstrh r0, [r6]\n"
+                    "\tasrs r1, r4, 16\n"
+                    "\tmov r0, sp\n"
+                    "\tmov r3, r8\n"
+                    "\tldrb r2, [r3]\n"
+                    "\tmovs r3, 0x1\n"
+                    "\tbl CreateSprite\n"
+                    "\tmovs r7, 0x80\n"
+                    "\tlsls r7, 14\n"
+                    "\tadds r4, r7\n"
+                    "\tadds r5, 0x1\n"
+                    "\tcmp r5, 0x2\n"
+                    "\tble _08047D86\n"
+                    "\tbl GetMultiplayerId\n"
+                    "\tlsls r0, 24\n"
+                    "\tmovs r1, 0x80\n"
+                    "\tlsls r1, 17\n"
+                    "\teors r1, r0\n"
+                    "\tlsrs r1, 24\n"
+                    "\tlsls r0, r1, 3\n"
+                    "\tsubs r0, r1\n"
+                    "\tlsls r0, 2\n"
+                    "\tldr r1, _08047E3C @ =gLinkPlayers + 0x8\n"
+                    "\tadds r0, r1\n"
+                    "\tbl StringLength\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tmovs r1, 0\n"
+                    "\tcmp r0, 0x5\n"
+                    "\tbls _08047DDA\n"
+                    "\tmovs r1, 0x1\n"
+                    "_08047DDA:\n"
+                    "\tmovs r5, 0\n"
+                    "\tlsls r2, r1, 2\n"
+                    "\tmov r6, sp\n"
+                    "\tldr r0, _08047E40 @ =gTradeUnknownSpriteCoords + 0x3\n"
+                    "\tadds r1, r2, r0\n"
+                    "\tmov r8, r1\n"
+                    "\tsubs r0, 0x1\n"
+                    "\tadds r0, r2, r0\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tlsls r4, r0, 16\n"
+                    "_08047DEE:\n"
+                    "\tmov r1, sp\n"
+                    "\tldr r0, _08047E38 @ =gSpriteTemplate_820C0EC\n"
+                    "\tldm r0!, {r2,r3,r7}\n"
+                    "\tstm r1!, {r2,r3,r7}\n"
+                    "\tldm r0!, {r2,r3,r7}\n"
+                    "\tstm r1!, {r2,r3,r7}\n"
+                    "\tadds r0, r5, 0x3\n"
+                    "\tldrh r1, [r6]\n"
+                    "\tadds r0, r1\n"
+                    "\tstrh r0, [r6]\n"
+                    "\tasrs r1, r4, 16\n"
+                    "\tmov r0, sp\n"
+                    "\tmov r3, r8\n"
+                    "\tldrb r2, [r3]\n"
+                    "\tmovs r3, 0x1\n"
+                    "\tbl CreateSprite\n"
+                    "\tmovs r7, 0x80\n"
+                    "\tlsls r7, 14\n"
+                    "\tadds r4, r7\n"
+                    "\tadds r5, 0x1\n"
+                    "\tcmp r5, 0x2\n"
+                    "\tble _08047DEE\n"
+                    "\tmovs r0, 0x5\n"
+                    "\tmovs r1, 0\n"
+                    "\tbl nullsub_5\n"
+                    "\tadd sp, 0x18\n"
+                    "\tpop {r3}\n"
+                    "\tmov r8, r3\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r0}\n"
+                    "\tbx r0\n"
+                    "\t.align 2, 0\n"
+                    "_08047E30: .4byte gSaveBlock2\n"
+                    "_08047E34: .4byte gTradeUnknownSpriteCoords\n"
+                    "_08047E38: .4byte gSpriteTemplate_820C0EC\n"
+                    "_08047E3C: .4byte gLinkPlayers + 0x8\n"
+                    "_08047E40: .4byte gTradeUnknownSpriteCoords + 0x3");
+}
+#endif
+
 asm(".section .text.sub_804A96C");
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From ea13e41fba35a8caf9e6a1657fdd63d04a1108e6 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Thu, 31 Aug 2017 13:56:08 -0400
Subject: nonmatching sub_8047E44

---
 asm/trade.s | 65 --------------------------------------------
 src/trade.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 87 insertions(+), 67 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 8faba39dd..490f838f5 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,71 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8047E44
-sub_8047E44: @ 8047E44
-	push {r4-r7,lr}
-	sub sp, 0x18
-	movs r4, 0
-	mov r5, sp
-	movs r6, 0xD6
-	lsls r6, 16
-_08047E50:
-	mov r1, sp
-	ldr r0, _08047EBC @ =gSpriteTemplate_820C0EC
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	adds r0, r4, 0x6
-	ldrh r1, [r5]
-	adds r0, r1
-	strh r0, [r5]
-	asrs r1, r6, 16
-	mov r0, sp
-	movs r2, 0x98
-	movs r3, 0x1
-	bl CreateSprite
-	movs r2, 0x80
-	lsls r2, 14
-	adds r6, r2
-	adds r4, 0x1
-	cmp r4, 0x1
-	ble _08047E50
-	movs r4, 0
-	mov r5, sp
-	movs r6, 0xC0
-	lsls r6, 13
-_08047E84:
-	mov r1, sp
-	ldr r0, _08047EBC @ =gSpriteTemplate_820C0EC
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	adds r0, r4, 0
-	adds r0, 0x8
-	ldrh r3, [r5]
-	adds r0, r3
-	strh r0, [r5]
-	asrs r1, r6, 16
-	mov r0, sp
-	movs r2, 0x96
-	movs r3, 0x1
-	bl CreateSprite
-	movs r7, 0x80
-	lsls r7, 14
-	adds r6, r7
-	adds r4, 0x1
-	cmp r4, 0x4
-	ble _08047E84
-	add sp, 0x18
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08047EBC: .4byte gSpriteTemplate_820C0EC
-	thumb_func_end sub_8047E44
-
 	thumb_func_start sub_8047EC0
 sub_8047EC0: @ 8047EC0
 	push {r4-r7,lr}
diff --git a/src/trade.c b/src/trade.c
index 392ab881a..a624dc861 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -478,9 +478,29 @@ void sub_8047D58(void)
     }
     nullsub_5(5, 0);
 }
+
+void sub_8047E44(void)
+{
+    struct SpriteTemplate spriteTemplate;
+    int i;
+    s16 x;
+
+    for (i = 0, x = 0xd6; i < 2; x += 32, i ++)
+    {
+        spriteTemplate = gSpriteTemplate_820C0EC;
+        spriteTemplate.tileTag += i + 6;
+        CreateSprite(&spriteTemplate, x, 0x98, 1);
+    }
+
+    for (i = 0, x = 0x18; i < 5; x += 32, i ++)
+    {
+        spriteTemplate = gSpriteTemplate_820C0EC;
+        spriteTemplate.tileTag += i + 8;
+        CreateSprite(&spriteTemplate, x, 0x96, 1);
+    }
+}
 #else
-__attribute__((naked))
-void sub_8047D58(void)
+__attribute__((naked)) void sub_8047D58(void)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tmov r7, r8\n"
@@ -595,6 +615,71 @@ void sub_8047D58(void)
                     "_08047E3C: .4byte gLinkPlayers + 0x8\n"
                     "_08047E40: .4byte gTradeUnknownSpriteCoords + 0x3");
 }
+
+__attribute__((naked)) void sub_8047E44(void)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                    "\tsub sp, 0x18\n"
+                    "\tmovs r4, 0\n"
+                    "\tmov r5, sp\n"
+                    "\tmovs r6, 0xD6\n"
+                    "\tlsls r6, 16\n"
+                    "_08047E50:\n"
+                    "\tmov r1, sp\n"
+                    "\tldr r0, _08047EBC @ =gSpriteTemplate_820C0EC\n"
+                    "\tldm r0!, {r2,r3,r7}\n"
+                    "\tstm r1!, {r2,r3,r7}\n"
+                    "\tldm r0!, {r2,r3,r7}\n"
+                    "\tstm r1!, {r2,r3,r7}\n"
+                    "\tadds r0, r4, 0x6\n"
+                    "\tldrh r1, [r5]\n"
+                    "\tadds r0, r1\n"
+                    "\tstrh r0, [r5]\n"
+                    "\tasrs r1, r6, 16\n"
+                    "\tmov r0, sp\n"
+                    "\tmovs r2, 0x98\n"
+                    "\tmovs r3, 0x1\n"
+                    "\tbl CreateSprite\n"
+                    "\tmovs r2, 0x80\n"
+                    "\tlsls r2, 14\n"
+                    "\tadds r6, r2\n"
+                    "\tadds r4, 0x1\n"
+                    "\tcmp r4, 0x1\n"
+                    "\tble _08047E50\n"
+                    "\tmovs r4, 0\n"
+                    "\tmov r5, sp\n"
+                    "\tmovs r6, 0xC0\n"
+                    "\tlsls r6, 13\n"
+                    "_08047E84:\n"
+                    "\tmov r1, sp\n"
+                    "\tldr r0, _08047EBC @ =gSpriteTemplate_820C0EC\n"
+                    "\tldm r0!, {r2,r3,r7}\n"
+                    "\tstm r1!, {r2,r3,r7}\n"
+                    "\tldm r0!, {r2,r3,r7}\n"
+                    "\tstm r1!, {r2,r3,r7}\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tadds r0, 0x8\n"
+                    "\tldrh r3, [r5]\n"
+                    "\tadds r0, r3\n"
+                    "\tstrh r0, [r5]\n"
+                    "\tasrs r1, r6, 16\n"
+                    "\tmov r0, sp\n"
+                    "\tmovs r2, 0x96\n"
+                    "\tmovs r3, 0x1\n"
+                    "\tbl CreateSprite\n"
+                    "\tmovs r7, 0x80\n"
+                    "\tlsls r7, 14\n"
+                    "\tadds r6, r7\n"
+                    "\tadds r4, 0x1\n"
+                    "\tcmp r4, 0x4\n"
+                    "\tble _08047E84\n"
+                    "\tadd sp, 0x18\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r0}\n"
+                    "\tbx r0\n"
+                    "\t.align 2, 0\n"
+                    "_08047EBC: .4byte gSpriteTemplate_820C0EC");
+}
 #endif
 
 asm(".section .text.sub_804A96C");
-- 
cgit v1.2.3


From f1f9da755ce51f6ebff2639be492ee11c7b04b9b Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Thu, 31 Aug 2017 17:44:07 -0400
Subject: sub_8047EC0

---
 asm/trade.s            | 696 -------------------------------------------------
 include/party_menu.h   |   1 +
 include/pokemon_icon.h |   2 +-
 src/trade.c            | 246 ++++++++++++++++-
 4 files changed, 247 insertions(+), 698 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 490f838f5..ccf0d094c 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,702 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8047EC0
-sub_8047EC0: @ 8047EC0
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x14
-	ldr r1, _08047EE4 @ =gMain
-	ldr r2, _08047EE8 @ =0x0000043c
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	adds r3, r1, 0
-	cmp r0, 0x15
-	bls _08047ED8
-	b _080484C6
-_08047ED8:
-	lsls r0, 2
-	ldr r1, _08047EEC @ =_08047EF0
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08047EE4: .4byte gMain
-_08047EE8: .4byte 0x0000043c
-_08047EEC: .4byte _08047EF0
-	.align 2, 0
-_08047EF0:
-	.4byte _08047F48
-	.4byte _08048048
-	.4byte _080480B4
-	.4byte _080480E0
-	.4byte _08048130
-	.4byte _08048160
-	.4byte _08048172
-	.4byte _080482B4
-	.4byte _080482DC
-	.4byte _08048300
-	.4byte _08048328
-	.4byte _0804834C
-	.4byte _08048360
-	.4byte _080483B8
-	.4byte _08048400
-	.4byte _08048418
-	.4byte _08048430
-	.4byte _08048448
-	.4byte _0804845A
-	.4byte _08048470
-	.4byte _08048488
-	.4byte _080484A8
-_08047F48:
-	ldr r5, _08048018 @ =gUnknown_03004824
-	ldr r6, _0804801C @ =0x02017000
-	str r6, [r5]
-	bl sub_804AA88
-	bl ResetSpriteData
-	bl FreeAllSpritePalettes
-	bl ResetTasks
-	ldr r0, [r5]
-	adds r0, 0xC8
-	ldr r1, _08048020 @ =0x06002800
-	bl sub_804A964
-	ldr r0, _08048024 @ =sub_80489F4
-	bl SetVBlankCallback
-	ldr r0, _08048028 @ =gWindowConfig_81E6CE4
-	bl InitMenuWindow
-	ldr r4, _0804802C @ =gWindowConfig_81E6F84
-	adds r0, r4, 0
-	bl SetUpWindowConfig
-	ldr r0, [r5]
-	adds r0, 0x4
-	adds r1, r4, 0
-	bl InitWindowFromConfig
-	movs r0, 0x14
-	bl SetTextWindowBaseTileNum
-	ldr r1, [r5]
-	adds r1, 0x7A
-	movs r4, 0
-	strb r0, [r1]
-	ldr r0, [r5]
-	adds r0, 0x4
-	bl LoadTextWindowGraphics
-	bl MenuZeroFillScreen
-	bl sub_809D51C
-	ldr r0, [r5]
-	adds r0, 0x75
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x7B
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x7C
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x80
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x81
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x86
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x87
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0xB4
-	strb r4, [r0]
-	ldr r0, _08048030 @ =gUnknown_03000508
-	strb r4, [r0]
-	ldr r1, _08048034 @ =gMain
-	ldr r3, _08048038 @ =0x0000043c
-	adds r1, r3
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	movs r0, 0
-	bl sub_804AA0C
-	add r0, sp, 0x10
-	strh r4, [r0]
-	movs r0, 0xC0
-	lsls r0, 7
-	adds r1, r6, r0
-	ldr r2, _0804803C @ =0x01000680
-	add r0, sp, 0x10
-	bl CpuSet
-	ldr r1, _08048040 @ =gUnknown_020296CC
-	movs r2, 0xD8
-	lsls r2, 7
-	adds r6, r2
-	adds r0, r1, 0
-	adds r0, 0x30
-	ldr r2, _08048044 @ =0xffffff00
-_0804800A:
-	str r6, [r0]
-	adds r6, r2
-	subs r0, 0x4
-	cmp r0, r1
-	bge _0804800A
-	b _080484C6
-	.align 2, 0
-_08048018: .4byte gUnknown_03004824
-_0804801C: .4byte 0x02017000
-_08048020: .4byte 0x06002800
-_08048024: .4byte sub_80489F4
-_08048028: .4byte gWindowConfig_81E6CE4
-_0804802C: .4byte gWindowConfig_81E6F84
-_08048030: .4byte gUnknown_03000508
-_08048034: .4byte gMain
-_08048038: .4byte 0x0000043c
-_0804803C: .4byte 0x01000680
-_08048040: .4byte gUnknown_020296CC
-_08048044: .4byte 0xffffff00
-_08048048:
-	ldr r1, _08048098 @ =gLinkType
-	ldr r3, _0804809C @ =0x00001122
-	adds r0, r3, 0
-	strh r0, [r1]
-	bl OpenLink
-	movs r6, 0
-	movs r4, 0
-_08048058:
-	movs r0, 0x64
-	muls r0, r6
-	ldr r1, _080480A0 @ =gEnemyParty
-	adds r0, r1
-	str r4, [sp]
-	str r4, [sp, 0x4]
-	str r4, [sp, 0x8]
-	str r4, [sp, 0xC]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x20
-	bl CreateMon
-	adds r6, 0x1
-	cmp r6, 0x5
-	ble _08048058
-	ldr r1, _080480A4 @ =gMain
-	ldr r0, _080480A8 @ =0x0000043c
-	adds r1, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	movs r2, 0
-	strb r0, [r1]
-	ldr r0, _080480AC @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0xB4
-	strb r2, [r0]
-	ldr r0, _080480B0 @ =sub_8083C50
-	movs r1, 0x1
-	bl CreateTask
-	b _080484C6
-	.align 2, 0
-_08048098: .4byte gLinkType
-_0804809C: .4byte 0x00001122
-_080480A0: .4byte gEnemyParty
-_080480A4: .4byte gMain
-_080480A8: .4byte 0x0000043c
-_080480AC: .4byte gUnknown_03004824
-_080480B0: .4byte sub_8083C50
-_080480B4:
-	ldr r2, _080480D8 @ =gUnknown_03004824
-	ldr r1, [r2]
-	adds r1, 0xB4
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r0, [r2]
-	adds r1, r0, 0
-	adds r1, 0xB4
-	ldrb r0, [r1]
-	cmp r0, 0xB
-	bhi _080480CE
-	b _080484C6
-_080480CE:
-	movs r0, 0
-	strb r0, [r1]
-	ldr r2, _080480DC @ =0x0000043c
-	adds r1, r3, r2
-	b _08048498
-	.align 2, 0
-_080480D8: .4byte gUnknown_03004824
-_080480DC: .4byte 0x0000043c
-_080480E0:
-	bl GetLinkPlayerCount_2
-	adds r4, r0, 0
-	bl sub_800820C
-	lsls r4, 24
-	lsls r0, 24
-	cmp r4, r0
-	bcs _080480F4
-	b _080484C6
-_080480F4:
-	bl IsLinkMaster
-	lsls r0, 24
-	cmp r0, 0
-	beq _08048120
-	ldr r0, _0804811C @ =gUnknown_03004824
-	ldr r1, [r0]
-	adds r1, 0xB4
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1E
-	bhi _08048114
-	b _080484C6
-_08048114:
-	bl sub_8007F4C
-	b _08048492
-	.align 2, 0
-_0804811C: .4byte gUnknown_03004824
-_08048120:
-	ldr r1, _08048128 @ =gMain
-	ldr r0, _0804812C @ =0x0000043c
-	adds r1, r0
-	b _08048498
-	.align 2, 0
-_08048128: .4byte gMain
-_0804812C: .4byte 0x0000043c
-_08048130:
-	ldr r0, _08048154 @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0804813A
-	b _080484C6
-_0804813A:
-	bl IsLinkPlayerDataExchangeComplete
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08048148
-	b _080484C6
-_08048148:
-	bl CalculatePlayerPartyCount
-	ldr r1, _08048158 @ =gMain
-	ldr r2, _0804815C @ =0x0000043c
-	adds r1, r2
-	b _08048498
-	.align 2, 0
-_08048154: .4byte gReceivedRemoteLinkPlayers
-_08048158: .4byte gMain
-_0804815C: .4byte 0x0000043c
-_08048160:
-	bl sub_8048D44
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804816C
-	b _080484C6
-_0804816C:
-	bl sub_804AF84
-	b _08048492
-_08048172:
-	bl CalculateEnemyPartyCount
-	ldr r4, _08048294 @ =gUnknown_03004824
-	ldr r0, [r4]
-	adds r0, 0x4
-	movs r1, 0x1D
-	str r1, [sp]
-	movs r1, 0x13
-	str r1, [sp, 0x4]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0
-	bl FillWindowRect_DefaultPalette
-	movs r1, 0x80
-	lsls r1, 19
-	movs r0, 0
-	strh r0, [r1]
-	ldr r0, [r4]
-	ldr r1, _08048298 @ =gPlayerPartyCount
-	ldrb r1, [r1]
-	adds r0, 0x42
-	strb r1, [r0]
-	ldr r0, [r4]
-	ldr r1, _0804829C @ =gEnemyPartyCount
-	ldrb r1, [r1]
-	adds r0, 0x43
-	strb r1, [r0]
-	movs r6, 0
-	ldr r0, [r4]
-	adds r0, 0x42
-	ldrb r0, [r0]
-	cmp r6, r0
-	bge _08048216
-	mov r8, r4
-	ldr r7, _080482A0 @ =gTradeMonSpriteCoords
-_080481BA:
-	movs r0, 0x64
-	adds r4, r6, 0
-	muls r4, r0
-	ldr r0, _080482A4 @ =gPlayerParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	adds r5, r0, 0
-	lsls r5, 16
-	lsrs r5, 16
-	adds r0, r4, 0
-	movs r1, 0
-	bl GetMonData
-	ldrb r2, [r7]
-	lsls r2, 19
-	movs r1, 0xE0
-	lsls r1, 12
-	adds r2, r1
-	asrs r2, 16
-	ldrb r3, [r7, 0x1]
-	lsls r3, 19
-	ldr r1, _080482A8 @ =0xfff40000
-	adds r3, r1
-	asrs r3, 16
-	movs r1, 0x1
-	str r1, [sp]
-	str r0, [sp, 0x4]
-	adds r0, r5, 0
-	ldr r1, _080482AC @ =sub_809D62C
-	bl CreateMonIcon
-	mov r2, r8
-	ldr r1, [r2]
-	adds r1, 0x34
-	adds r1, r6
-	strb r0, [r1]
-	adds r7, 0x2
-	adds r6, 0x1
-	ldr r0, [r2]
-	adds r0, 0x42
-	ldrb r0, [r0]
-	cmp r6, r0
-	blt _080481BA
-_08048216:
-	movs r6, 0
-	ldr r1, _08048294 @ =gUnknown_03004824
-	ldr r0, [r1]
-	adds r0, 0x43
-	ldrb r0, [r0]
-	cmp r6, r0
-	bge _0804828A
-	ldr r0, _080482A0 @ =gTradeMonSpriteCoords
-	mov r8, r1
-	adds r7, r0, 0
-	adds r7, 0xC
-_0804822C:
-	movs r0, 0x64
-	adds r4, r6, 0
-	muls r4, r0
-	ldr r0, _080482B0 @ =gEnemyParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x41
-	movs r2, 0
-	bl GetMonData
-	adds r5, r0, 0
-	lsls r5, 16
-	lsrs r5, 16
-	adds r0, r4, 0
-	movs r1, 0
-	bl GetMonData
-	ldrb r2, [r7]
-	lsls r2, 19
-	movs r3, 0xE0
-	lsls r3, 12
-	adds r2, r3
-	asrs r2, 16
-	ldrb r3, [r7, 0x1]
-	lsls r3, 19
-	ldr r1, _080482A8 @ =0xfff40000
-	adds r3, r1
-	asrs r3, 16
-	movs r1, 0x1
-	str r1, [sp]
-	str r0, [sp, 0x4]
-	adds r0, r5, 0
-	ldr r1, _080482AC @ =sub_809D62C
-	bl CreateMonIcon
-	mov r2, r8
-	ldr r1, [r2]
-	adds r1, 0x3A
-	adds r1, r6
-	strb r0, [r1]
-	adds r7, 0x2
-	adds r6, 0x1
-	ldr r0, [r2]
-	adds r0, 0x43
-	ldrb r0, [r0]
-	cmp r6, r0
-	blt _0804822C
-_0804828A:
-	movs r0, 0x2
-	movs r1, 0
-	bl nullsub_5
-	b _08048492
-	.align 2, 0
-_08048294: .4byte gUnknown_03004824
-_08048298: .4byte gPlayerPartyCount
-_0804829C: .4byte gEnemyPartyCount
-_080482A0: .4byte gTradeMonSpriteCoords
-_080482A4: .4byte gPlayerParty
-_080482A8: .4byte 0xfff40000
-_080482AC: .4byte sub_809D62C
-_080482B0: .4byte gEnemyParty
-_080482B4:
-	bl LoadHeldItemIconGraphics
-	ldr r0, _080482D0 @ =gUnknown_03004824
-	ldr r1, [r0]
-	adds r0, r1, 0
-	adds r0, 0x42
-	adds r1, 0x34
-	movs r2, 0
-	bl CreateHeldItemIcons
-	ldr r1, _080482D4 @ =gMain
-	ldr r0, _080482D8 @ =0x0000043c
-	adds r1, r0
-	b _08048498
-	.align 2, 0
-_080482D0: .4byte gUnknown_03004824
-_080482D4: .4byte gMain
-_080482D8: .4byte 0x0000043c
-_080482DC:
-	ldr r0, _080482F4 @ =gUnknown_03004824
-	ldr r1, [r0]
-	adds r0, r1, 0
-	adds r0, 0x42
-	adds r1, 0x34
-	movs r2, 0x1
-	bl CreateHeldItemIcons
-	ldr r1, _080482F8 @ =gMain
-	ldr r2, _080482FC @ =0x0000043c
-	adds r1, r2
-	b _08048498
-	.align 2, 0
-_080482F4: .4byte gUnknown_03004824
-_080482F8: .4byte gMain
-_080482FC: .4byte 0x0000043c
-_08048300:
-	bl sub_8047CE8
-	ldr r1, _0804831C @ =gMain
-	ldr r3, _08048320 @ =0x0000043c
-	adds r1, r3
-	ldrb r0, [r1]
-	adds r0, 0x1
-	movs r2, 0
-	strb r0, [r1]
-	ldr r0, _08048324 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0xB4
-	strb r2, [r0]
-	b _080484C6
-	.align 2, 0
-_0804831C: .4byte gMain
-_08048320: .4byte 0x0000043c
-_08048324: .4byte gUnknown_03004824
-_08048328:
-	movs r0, 0x4
-	movs r1, 0
-	bl nullsub_5
-	bl sub_804ABF8
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804833C
-	b _080484C6
-_0804833C:
-	ldr r1, _08048344 @ =gMain
-	ldr r0, _08048348 @ =0x0000043c
-	adds r1, r0
-	b _08048498
-	.align 2, 0
-_08048344: .4byte gMain
-_08048348: .4byte 0x0000043c
-_0804834C:
-	bl sub_8047D58
-	ldr r1, _08048358 @ =gMain
-	ldr r2, _0804835C @ =0x0000043c
-	adds r1, r2
-	b _08048498
-	.align 2, 0
-_08048358: .4byte gMain
-_0804835C: .4byte 0x0000043c
-_08048360:
-	bl sub_8047E44
-	ldr r0, _080483A4 @ =gSpriteTemplate_820C134
-	ldr r2, _080483A8 @ =gTradeMonSpriteCoords
-	ldrb r1, [r2]
-	lsls r1, 19
-	movs r3, 0x80
-	lsls r3, 14
-	adds r1, r3
-	asrs r1, 16
-	ldrb r2, [r2, 0x1]
-	lsls r2, 3
-	movs r3, 0x2
-	bl CreateSprite
-	ldr r2, _080483AC @ =gUnknown_03004824
-	ldr r1, [r2]
-	adds r1, 0x40
-	movs r3, 0
-	strb r0, [r1]
-	ldr r0, [r2]
-	adds r0, 0x41
-	strb r3, [r0]
-	ldr r1, _080483B0 @ =gMain
-	ldr r0, _080483B4 @ =0x0000043c
-	adds r1, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	movs r0, 0x6
-	movs r1, 0
-	bl nullsub_5
-	b _080484C6
-	.align 2, 0
-_080483A4: .4byte gSpriteTemplate_820C134
-_080483A8: .4byte gTradeMonSpriteCoords
-_080483AC: .4byte gUnknown_03004824
-_080483B0: .4byte gMain
-_080483B4: .4byte 0x0000043c
-_080483B8:
-	movs r0, 0
-	bl sub_804ACF4
-	movs r0, 0
-	bl sub_804A41C
-	ldr r2, _080483F0 @ =gUnknown_03004824
-	ldr r0, [r2]
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, [r2]
-	strb r1, [r0, 0x1]
-	bl sub_8048C70
-	ldr r1, _080483F4 @ =gMain
-	ldr r2, _080483F8 @ =0x0000043c
-	adds r1, r2
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	movs r0, 0x7
-	movs r1, 0
-	bl nullsub_5
-	ldr r0, _080483FC @ =0x000001b3
-	bl PlayBGM
-	b _080484C6
-	.align 2, 0
-_080483F0: .4byte gUnknown_03004824
-_080483F4: .4byte gMain
-_080483F8: .4byte 0x0000043c
-_080483FC: .4byte 0x000001b3
-_08048400:
-	movs r0, 0x1
-	bl sub_804ACF4
-	movs r0, 0x1
-	bl sub_804A41C
-	ldr r1, _08048428 @ =gMain
-	ldr r3, _0804842C @ =0x0000043c
-	adds r1, r3
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-_08048418:
-	movs r0, 0
-	bl sub_8048B0C
-	ldr r1, _08048428 @ =gMain
-	ldr r0, _0804842C @ =0x0000043c
-	adds r1, r0
-	b _08048498
-	.align 2, 0
-_08048428: .4byte gMain
-_0804842C: .4byte 0x0000043c
-_08048430:
-	movs r0, 0x1
-	bl sub_8048B0C
-	ldr r1, _08048440 @ =gMain
-	ldr r2, _08048444 @ =0x0000043c
-	adds r1, r2
-	b _08048498
-	.align 2, 0
-_08048440: .4byte gMain
-_08048444: .4byte 0x0000043c
-_08048448:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	b _08048492
-_0804845A:
-	movs r1, 0x80
-	lsls r1, 19
-	movs r2, 0xFA
-	lsls r2, 5
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r0, _0804846C @ =0x0000043c
-	adds r1, r3, r0
-	b _08048498
-	.align 2, 0
-_0804846C: .4byte 0x0000043c
-_08048470:
-	movs r0, 0
-	bl sub_804AE3C
-	ldr r1, _08048480 @ =gMain
-	ldr r2, _08048484 @ =0x0000043c
-	adds r1, r2
-	b _08048498
-	.align 2, 0
-_08048480: .4byte gMain
-_08048484: .4byte 0x0000043c
-_08048488:
-	movs r0, 0x1
-	bl sub_804AE3C
-	bl sub_804AF10
-_08048492:
-	ldr r1, _080484A0 @ =gMain
-	ldr r3, _080484A4 @ =0x0000043c
-	adds r1, r3
-_08048498:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _080484C6
-	.align 2, 0
-_080484A0: .4byte gMain
-_080484A4: .4byte 0x0000043c
-_080484A8:
-	ldr r0, _080484E4 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	bne _080484C6
-	ldr r0, _080484E8 @ =sub_80494D8
-	str r0, [r3]
-	ldr r0, _080484EC @ =sub_8048AB4
-	bl SetMainCallback2
-	ldr r0, _080484F0 @ =gUnknown_03000508
-	strb r4, [r0]
-_080484C6:
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	add sp, 0x14
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080484E4: .4byte gPaletteFade
-_080484E8: .4byte sub_80494D8
-_080484EC: .4byte sub_8048AB4
-_080484F0: .4byte gUnknown_03000508
-	thumb_func_end sub_8047EC0
-
 	thumb_func_start sub_80484F4
 sub_80484F4: @ 80484F4
 	push {r4-r7,lr}
diff --git a/include/party_menu.h b/include/party_menu.h
index 9ce476869..f3af77191 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -87,6 +87,7 @@ void LoadHeldItemIconGraphics(void);
 void LoadHeldItemIconGraphics(void);
 void CreateHeldItemIcons_806DC34(); // undefined args
 void CreateHeldItemIcons_806DC34();
+void CreateHeldItemIcons(u8 *, u8 *, u8);
 u8 GetMonIconSpriteId_maybe();
 void SetHeldItemIconVisibility();
 void TryPrintPartyMenuMonNickname();
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index 98f984564..20acb6676 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_POKEMON_ICON_H
 #define GUARD_POKEMON_ICON_H
 
-u8 CreateMonIcon();
+u8 CreateMonIcon(u16, void (*callback)(struct Sprite *), s16, s16, bool8, u32);
 u8 sub_809D3A4(u16 arg0, void (*)(struct Sprite *), int, u8 arg3, u32 arg4);
 u16 GetUnownLetterByPersonality(u32);
 u16 sub_809D4A8(u16);
diff --git a/src/trade.c b/src/trade.c
index a624dc861..a50024249 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -10,6 +10,15 @@
 #include "link.h"
 #include "strings2.h"
 #include "graphics.h"
+#include "palette.h"
+#include "task.h"
+#include "menu.h"
+#include "text_window.h"
+#include "pokemon_icon.h"
+#include "cable_club.h"
+#include "party_menu.h"
+#include "songs.h"
+#include "sound.h"
 
 struct InGameTrade {
     /*0x00*/ u8 name[11];
@@ -42,8 +51,45 @@ struct UnkStructD {
     /*0x12*/ u16 var12[1];
 };
 
+struct UnkStructE {
+    /*0x00*/ u8 filler_00[8];
+    /*0x08*/ void *vramAddr;
+    /*0x0c*/ u8 filler_0c[4];
+    /*0x10*/ u8 unk_10;
+};
+
+struct TradeEwramSubstruct {
+    /*0x0000*/ u8 unk_0000;
+    /*0x0001*/ u8 unk_0001;
+    /*0x0004*/ struct Window window;
+    /*0x0034*/ u8 playerPartyIcons[6];
+    /*0x003a*/ u8 friendPartyIcons[6];
+    /*0x0040*/ u8 unk_0040;
+    /*0x0041*/ u8 unk_0041;
+    /*0x0042*/ u8 playerPartyCount;
+    /*0x0043*/ u8 friendPartyCount;
+    /*0x0044*/ u8 filler_0044[0x31];
+    /*0x0075*/ u8 unk_0075;
+    /*0x0076*/ u8 filler_0076[4];
+    /*0x007a*/ u8 unk_007a;
+    /*0x007b*/ u8 unk_007b;
+    /*0x007c*/ u8 unk_007c;
+    /*0x007d*/ u8 filler_007d[3];
+    /*0x0080*/ u8 unk_0080;
+    /*0x0081*/ u8 unk_0081;
+    /*0x0082*/ u8 filler_0082[4];
+    /*0x0086*/ u8 unk_0086;
+    /*0x0087*/ u8 unk_0087;
+    /*0x0088*/ u8 filler_0088[0x2c];
+    /*0x00b4*/ u8 unk_00b4;
+    /*0x00b5*/ u8 filler_00b4[0x13];
+    /*0x00c8*/ struct UnkStructE unk_00c8;
+    /*0x00dc*/ u8 filler_00dc[0x5f24];
+};
+
 struct TradeEwramStruct {
-    /*0x00000*/ u8 filler_00000[0xd000];
+    /*0x00000*/ u8 filler_00000[0x7000];
+    /*0x07000*/ struct TradeEwramSubstruct unk_07000;
     /*0x0d000*/ u8 tileBuffers[13][256];
 };
 
@@ -51,8 +97,26 @@ void sub_8047EC0(void);
 void sub_804AFB8(const struct WindowConfig *, u8 *, const u8 *, u8);
 void sub_804ACD8(const u8 *, u8 *, u8);
 void nullsub_5(u8, u8);
+void sub_804AA88(void);
+void sub_804A964(struct UnkStructE *, void *);
+void sub_80489F4(void);
+void sub_804AA0C(u8);
+bool8 sub_8048D44(void);
+void sub_804AF84(void);
+void sub_809D62C(struct Sprite *);
+bool8 sub_804ABF8(void);
+void sub_804ACF4(u8);
+void sub_804A41C(u8);
+void sub_8048C70(void);
+void sub_8048B0C(u8);
+void sub_804AE3C(u8);
+void sub_804AF10(void);
+void sub_80494D8(void);
+void sub_8048AB4(void);
 
 extern u8 *gUnknown_020296CC[13];
+extern struct TradeEwramSubstruct *gUnknown_03004824;
+extern u8 gUnknown_03000508;
 
 extern u8 ewram[];
 #define ewram_2010000 (*(struct TradeEwramStruct *)(ewram + 0x10000))
@@ -682,6 +746,186 @@ __attribute__((naked)) void sub_8047E44(void)
 }
 #endif
 
+void sub_8047EC0(void)
+{
+    int i;
+
+    switch (gMain.state)
+    {
+        case  0:
+            gUnknown_03004824 = &ewram_2010000.unk_07000;
+            sub_804AA88();
+            ResetSpriteData();
+            FreeAllSpritePalettes();
+            ResetTasks();
+            sub_804A964(&gUnknown_03004824->unk_00c8, (void *)BG_SCREEN_ADDR(5));
+            SetVBlankCallback(sub_80489F4);
+            InitMenuWindow(&gWindowConfig_81E6CE4);
+            SetUpWindowConfig(&gWindowConfig_81E6F84);
+            InitWindowFromConfig(&gUnknown_03004824->window, &gWindowConfig_81E6F84);
+            gUnknown_03004824->unk_007a = SetTextWindowBaseTileNum(20);
+            LoadTextWindowGraphics(&gUnknown_03004824->window);
+            MenuZeroFillScreen();
+            sub_809D51C();
+            gUnknown_03004824->unk_0075 = 0;
+            gUnknown_03004824->unk_007b = 0;
+            gUnknown_03004824->unk_007c = 0;
+            gUnknown_03004824->unk_0080 = 0;
+            gUnknown_03004824->unk_0081 = 0;
+            gUnknown_03004824->unk_0086 = 0;
+            gUnknown_03004824->unk_0087 = 0;
+            gUnknown_03004824->unk_00b4 = 0;
+            gUnknown_03000508 = 0;
+            gMain.state ++;
+            sub_804AA0C(0);
+            CpuFill16(0, ewram_2010000.tileBuffers, sizeof(ewram_2010000.tileBuffers));
+            for (i = 0; i < 13; i ++)
+                gUnknown_020296CC[i] = ewram_2010000.tileBuffers[i];
+            break;
+        case  1:
+            gLinkType = 0x1122;
+            OpenLink();
+            for (i = 0; i < PARTY_SIZE; i ++)
+                CreateMon(&gEnemyParty[i], 0, 0, 0x20, FALSE, 0, FALSE, 0);
+            gMain.state ++;
+            gUnknown_03004824->unk_00b4 = 0;
+            CreateTask(sub_8083C50, 1);
+            break;
+        case  2:
+            gUnknown_03004824->unk_00b4 ++;
+            if (gUnknown_03004824->unk_00b4 > 11)
+            {
+                gUnknown_03004824->unk_00b4 = 0;
+                gMain.state ++;
+            }
+            break;
+        case  3:
+            if (GetLinkPlayerCount_2() >= sub_800820C())
+            {
+                if (IsLinkMaster())
+                {
+                    if (++gUnknown_03004824->unk_00b4 > 30)
+                    {
+                        sub_8007F4C();
+                        gMain.state ++;
+                    }
+                }
+                else
+                    gMain.state ++;
+            }
+            break;
+        case  4:
+            if (gReceivedRemoteLinkPlayers == 1 && IsLinkPlayerDataExchangeComplete() == TRUE)
+            {
+                CalculatePlayerPartyCount();
+                gMain.state ++;
+            }
+            break;
+        case  5:
+            if (sub_8048D44())
+            {
+                sub_804AF84();
+                gMain.state ++;
+            }
+            break;
+        case  6:
+            CalculateEnemyPartyCount();
+            FillWindowRect_DefaultPalette(&gUnknown_03004824->window, 0, 0, 0, 29, 19);
+            REG_DISPCNT = 0;
+            gUnknown_03004824->playerPartyCount = gPlayerPartyCount;
+            gUnknown_03004824->friendPartyCount = gEnemyPartyCount;
+            for (i = 0; i < gUnknown_03004824->playerPartyCount; i ++)
+                gUnknown_03004824->playerPartyIcons[i] = CreateMonIcon(GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2), sub_809D62C, gTradeMonSpriteCoords[i][0] * 8 + 14, gTradeMonSpriteCoords[i][1] * 8 - 12, TRUE, GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY));
+            for (i = 0; i < gUnknown_03004824->friendPartyCount; i ++)
+                gUnknown_03004824->friendPartyIcons[i] = CreateMonIcon(GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2, NULL), sub_809D62C, gTradeMonSpriteCoords[6 + i][0] * 8 + 14, gTradeMonSpriteCoords[6 + i][1] * 8 - 12, TRUE, GetMonData(&gEnemyParty[i], MON_DATA_PERSONALITY));
+            nullsub_5(2, 0);
+            gMain.state ++;
+            break;
+        case  7:
+            LoadHeldItemIconGraphics();
+            CreateHeldItemIcons(&gUnknown_03004824->playerPartyCount, gUnknown_03004824->playerPartyIcons, 0);
+            gMain.state ++;
+            break;
+        case  8:
+            CreateHeldItemIcons(&gUnknown_03004824->playerPartyCount, gUnknown_03004824->playerPartyIcons, 1);
+            gMain.state ++;
+            break;
+        case  9:
+            sub_8047CE8();
+            gMain.state ++;
+            gUnknown_03004824->unk_00b4 = 0;
+            break;
+        case 10:
+            nullsub_5(4, 0);
+            if (sub_804ABF8())
+                gMain.state ++;
+            break;
+        case 11:
+            sub_8047D58();
+            gMain.state ++;
+            break;
+        case 12:
+            sub_8047E44();
+            gUnknown_03004824->unk_0040 = CreateSprite(&gSpriteTemplate_820C134, gTradeMonSpriteCoords[0][0] * 8 + 32, gTradeMonSpriteCoords[0][1] * 8, 2);
+            gUnknown_03004824->unk_0041 = 0;
+            gMain.state ++;
+            nullsub_5(6, 0);
+            break;
+        case 13:
+            sub_804ACF4(0);
+            sub_804A41C(0);
+            gUnknown_03004824->unk_0000 = 0;
+            gUnknown_03004824->unk_0001 = 0;
+            sub_8048C70();
+            gMain.state ++;
+            nullsub_5(7, 0);
+            PlayBGM(BGM_P_SCHOOL);
+            break;
+        case 14:
+            sub_804ACF4(1);
+            sub_804A41C(1);
+            gMain.state ++;
+            // fallthrough
+        case 15:
+            sub_8048B0C(0);
+            gMain.state ++;
+            break;
+        case 16:
+            sub_8048B0C(1);
+            gMain.state ++;
+            break;
+        case 17:
+            BeginNormalPaletteFade(-1, 0, 16, 0, 0);
+            gMain.state ++;
+            break;
+        case 18:
+            REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON;
+            gMain.state ++;
+            break;
+        case 19:
+            sub_804AE3C(0);
+            gMain.state ++;
+            break;
+        case 20:
+            sub_804AE3C(1);
+            sub_804AF10();
+            gMain.state ++;
+            break;
+        case 21:
+            if (!gPaletteFade.active)
+            {
+                gMain.callback1 = sub_80494D8;
+                SetMainCallback2(sub_8048AB4);
+                gUnknown_03000508 = 0;
+            }
+            break;
+    }
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
 asm(".section .text.sub_804A96C");
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From ba17d44881371ac80aaee7178077f887749f9595 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Thu, 31 Aug 2017 17:58:25 -0400
Subject: Matching sub_8047D58 and sub_8047E44

---
 src/trade.c | 210 ++++--------------------------------------------------------
 1 file changed, 14 insertions(+), 196 deletions(-)

diff --git a/src/trade.c b/src/trade.c
index a50024249..c5cde0b39 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -515,30 +515,31 @@ void sub_8047CE8(void)
     nullsub_5(3, 0);
 }
 
-#ifdef NONMATCHING
 void sub_8047D58(void)
 {
-    u8 language;
     struct SpriteTemplate spriteTemplate;
     int i;
-    s16 x;
     u8 mpId;
+    u16 slen;
+    int language;
 
-    language = StringLength(gSaveBlock2.playerName) <= 5 ? 0 : 1;
-    for (i = 0, x = gTradeUnknownSpriteCoords[language][0][0]; i < 3; x += 32, i ++)
+    slen = StringLength(gSaveBlock2.playerName);
+    language = slen <= 5 ? 0 : 1;
+    for (i = 0; i < 3; i ++)
     {
         spriteTemplate = gSpriteTemplate_820C0EC;
         spriteTemplate.tileTag += i;
-        CreateSprite(&spriteTemplate, x, gTradeUnknownSpriteCoords[language][0][1], 1);
+        CreateSprite(&spriteTemplate, gTradeUnknownSpriteCoords[language][0][0] + 32 * i, gTradeUnknownSpriteCoords[language][0][1], 1);
     }
 
     mpId = GetMultiplayerId();
-    language = StringLength(gLinkPlayers[mpId ^ 1].name) <= 5 ? 0 : 1;
-    for (i = 0, x = gTradeUnknownSpriteCoords[language][1][0]; i < 3; x += 32, i ++)
+    slen = StringLength(gLinkPlayers[mpId ^ 1].name);
+    language = slen <= 5 ? 0 : 1;
+    for (i = 0; i < 3; i ++)
     {
         spriteTemplate = gSpriteTemplate_820C0EC;
         spriteTemplate.tileTag += i + 3;
-        CreateSprite(&spriteTemplate, x, gTradeUnknownSpriteCoords[language][1][1], 1);
+        CreateSprite(&spriteTemplate, gTradeUnknownSpriteCoords[language][1][0] + 32 * i, gTradeUnknownSpriteCoords[language][1][1], 1);
     }
     nullsub_5(5, 0);
 }
@@ -547,204 +548,21 @@ void sub_8047E44(void)
 {
     struct SpriteTemplate spriteTemplate;
     int i;
-    s16 x;
 
-    for (i = 0, x = 0xd6; i < 2; x += 32, i ++)
+    for (i = 0; i < 2; i ++)
     {
         spriteTemplate = gSpriteTemplate_820C0EC;
         spriteTemplate.tileTag += i + 6;
-        CreateSprite(&spriteTemplate, x, 0x98, 1);
+        CreateSprite(&spriteTemplate, 0xd6 + 32 * i, 0x98, 1);
     }
 
-    for (i = 0, x = 0x18; i < 5; x += 32, i ++)
+    for (i = 0; i < 5; i ++)
     {
         spriteTemplate = gSpriteTemplate_820C0EC;
         spriteTemplate.tileTag += i + 8;
-        CreateSprite(&spriteTemplate, x, 0x96, 1);
+        CreateSprite(&spriteTemplate, 0x18 + 32 * i, 0x96, 1);
     }
 }
-#else
-__attribute__((naked)) void sub_8047D58(void)
-{
-    asm_unified("\tpush {r4-r7,lr}\n"
-                    "\tmov r7, r8\n"
-                    "\tpush {r7}\n"
-                    "\tsub sp, 0x18\n"
-                    "\tldr r0, _08047E30 @ =gSaveBlock2\n"
-                    "\tbl StringLength\n"
-                    "\tlsls r0, 16\n"
-                    "\tlsrs r0, 16\n"
-                    "\tmovs r1, 0\n"
-                    "\tcmp r0, 0x5\n"
-                    "\tbls _08047D72\n"
-                    "\tmovs r1, 0x1\n"
-                    "_08047D72:\n"
-                    "\tmovs r5, 0\n"
-                    "\tlsls r2, r1, 2\n"
-                    "\tmov r6, sp\n"
-                    "\tldr r0, _08047E34 @ =gTradeUnknownSpriteCoords\n"
-                    "\tadds r1, r0, 0x1\n"
-                    "\tadds r1, r2\n"
-                    "\tmov r8, r1\n"
-                    "\tadds r0, r2, r0\n"
-                    "\tldrb r0, [r0]\n"
-                    "\tlsls r4, r0, 16\n"
-                    "_08047D86:\n"
-                    "\tmov r1, sp\n"
-                    "\tldr r0, _08047E38 @ =gSpriteTemplate_820C0EC\n"
-                    "\tldm r0!, {r2,r3,r7}\n"
-                    "\tstm r1!, {r2,r3,r7}\n"
-                    "\tldm r0!, {r2,r3,r7}\n"
-                    "\tstm r1!, {r2,r3,r7}\n"
-                    "\tldrh r0, [r6]\n"
-                    "\tadds r0, r5\n"
-                    "\tstrh r0, [r6]\n"
-                    "\tasrs r1, r4, 16\n"
-                    "\tmov r0, sp\n"
-                    "\tmov r3, r8\n"
-                    "\tldrb r2, [r3]\n"
-                    "\tmovs r3, 0x1\n"
-                    "\tbl CreateSprite\n"
-                    "\tmovs r7, 0x80\n"
-                    "\tlsls r7, 14\n"
-                    "\tadds r4, r7\n"
-                    "\tadds r5, 0x1\n"
-                    "\tcmp r5, 0x2\n"
-                    "\tble _08047D86\n"
-                    "\tbl GetMultiplayerId\n"
-                    "\tlsls r0, 24\n"
-                    "\tmovs r1, 0x80\n"
-                    "\tlsls r1, 17\n"
-                    "\teors r1, r0\n"
-                    "\tlsrs r1, 24\n"
-                    "\tlsls r0, r1, 3\n"
-                    "\tsubs r0, r1\n"
-                    "\tlsls r0, 2\n"
-                    "\tldr r1, _08047E3C @ =gLinkPlayers + 0x8\n"
-                    "\tadds r0, r1\n"
-                    "\tbl StringLength\n"
-                    "\tlsls r0, 16\n"
-                    "\tlsrs r0, 16\n"
-                    "\tmovs r1, 0\n"
-                    "\tcmp r0, 0x5\n"
-                    "\tbls _08047DDA\n"
-                    "\tmovs r1, 0x1\n"
-                    "_08047DDA:\n"
-                    "\tmovs r5, 0\n"
-                    "\tlsls r2, r1, 2\n"
-                    "\tmov r6, sp\n"
-                    "\tldr r0, _08047E40 @ =gTradeUnknownSpriteCoords + 0x3\n"
-                    "\tadds r1, r2, r0\n"
-                    "\tmov r8, r1\n"
-                    "\tsubs r0, 0x1\n"
-                    "\tadds r0, r2, r0\n"
-                    "\tldrb r0, [r0]\n"
-                    "\tlsls r4, r0, 16\n"
-                    "_08047DEE:\n"
-                    "\tmov r1, sp\n"
-                    "\tldr r0, _08047E38 @ =gSpriteTemplate_820C0EC\n"
-                    "\tldm r0!, {r2,r3,r7}\n"
-                    "\tstm r1!, {r2,r3,r7}\n"
-                    "\tldm r0!, {r2,r3,r7}\n"
-                    "\tstm r1!, {r2,r3,r7}\n"
-                    "\tadds r0, r5, 0x3\n"
-                    "\tldrh r1, [r6]\n"
-                    "\tadds r0, r1\n"
-                    "\tstrh r0, [r6]\n"
-                    "\tasrs r1, r4, 16\n"
-                    "\tmov r0, sp\n"
-                    "\tmov r3, r8\n"
-                    "\tldrb r2, [r3]\n"
-                    "\tmovs r3, 0x1\n"
-                    "\tbl CreateSprite\n"
-                    "\tmovs r7, 0x80\n"
-                    "\tlsls r7, 14\n"
-                    "\tadds r4, r7\n"
-                    "\tadds r5, 0x1\n"
-                    "\tcmp r5, 0x2\n"
-                    "\tble _08047DEE\n"
-                    "\tmovs r0, 0x5\n"
-                    "\tmovs r1, 0\n"
-                    "\tbl nullsub_5\n"
-                    "\tadd sp, 0x18\n"
-                    "\tpop {r3}\n"
-                    "\tmov r8, r3\n"
-                    "\tpop {r4-r7}\n"
-                    "\tpop {r0}\n"
-                    "\tbx r0\n"
-                    "\t.align 2, 0\n"
-                    "_08047E30: .4byte gSaveBlock2\n"
-                    "_08047E34: .4byte gTradeUnknownSpriteCoords\n"
-                    "_08047E38: .4byte gSpriteTemplate_820C0EC\n"
-                    "_08047E3C: .4byte gLinkPlayers + 0x8\n"
-                    "_08047E40: .4byte gTradeUnknownSpriteCoords + 0x3");
-}
-
-__attribute__((naked)) void sub_8047E44(void)
-{
-    asm_unified("\tpush {r4-r7,lr}\n"
-                    "\tsub sp, 0x18\n"
-                    "\tmovs r4, 0\n"
-                    "\tmov r5, sp\n"
-                    "\tmovs r6, 0xD6\n"
-                    "\tlsls r6, 16\n"
-                    "_08047E50:\n"
-                    "\tmov r1, sp\n"
-                    "\tldr r0, _08047EBC @ =gSpriteTemplate_820C0EC\n"
-                    "\tldm r0!, {r2,r3,r7}\n"
-                    "\tstm r1!, {r2,r3,r7}\n"
-                    "\tldm r0!, {r2,r3,r7}\n"
-                    "\tstm r1!, {r2,r3,r7}\n"
-                    "\tadds r0, r4, 0x6\n"
-                    "\tldrh r1, [r5]\n"
-                    "\tadds r0, r1\n"
-                    "\tstrh r0, [r5]\n"
-                    "\tasrs r1, r6, 16\n"
-                    "\tmov r0, sp\n"
-                    "\tmovs r2, 0x98\n"
-                    "\tmovs r3, 0x1\n"
-                    "\tbl CreateSprite\n"
-                    "\tmovs r2, 0x80\n"
-                    "\tlsls r2, 14\n"
-                    "\tadds r6, r2\n"
-                    "\tadds r4, 0x1\n"
-                    "\tcmp r4, 0x1\n"
-                    "\tble _08047E50\n"
-                    "\tmovs r4, 0\n"
-                    "\tmov r5, sp\n"
-                    "\tmovs r6, 0xC0\n"
-                    "\tlsls r6, 13\n"
-                    "_08047E84:\n"
-                    "\tmov r1, sp\n"
-                    "\tldr r0, _08047EBC @ =gSpriteTemplate_820C0EC\n"
-                    "\tldm r0!, {r2,r3,r7}\n"
-                    "\tstm r1!, {r2,r3,r7}\n"
-                    "\tldm r0!, {r2,r3,r7}\n"
-                    "\tstm r1!, {r2,r3,r7}\n"
-                    "\tadds r0, r4, 0\n"
-                    "\tadds r0, 0x8\n"
-                    "\tldrh r3, [r5]\n"
-                    "\tadds r0, r3\n"
-                    "\tstrh r0, [r5]\n"
-                    "\tasrs r1, r6, 16\n"
-                    "\tmov r0, sp\n"
-                    "\tmovs r2, 0x96\n"
-                    "\tmovs r3, 0x1\n"
-                    "\tbl CreateSprite\n"
-                    "\tmovs r7, 0x80\n"
-                    "\tlsls r7, 14\n"
-                    "\tadds r6, r7\n"
-                    "\tadds r4, 0x1\n"
-                    "\tcmp r4, 0x4\n"
-                    "\tble _08047E84\n"
-                    "\tadd sp, 0x18\n"
-                    "\tpop {r4-r7}\n"
-                    "\tpop {r0}\n"
-                    "\tbx r0\n"
-                    "\t.align 2, 0\n"
-                    "_08047EBC: .4byte gSpriteTemplate_820C0EC");
-}
-#endif
 
 void sub_8047EC0(void)
 {
-- 
cgit v1.2.3


From d074813fc531f43a634559f104e41795560678fa Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 31 Aug 2017 19:21:38 -0400
Subject: sub_80484F4

---
 asm/trade.s | 560 ------------------------------------------------------------
 src/trade.c | 152 ++++++++++++++++-
 2 files changed, 151 insertions(+), 561 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index ccf0d094c..d50feda0b 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,566 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_80484F4
-sub_80484F4: @ 80484F4
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x8
-	ldr r1, _08048518 @ =gMain
-	ldr r2, _0804851C @ =0x0000043c
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	adds r2, r1, 0
-	cmp r0, 0x15
-	bls _0804850C
-	b _080489CA
-_0804850C:
-	lsls r0, 2
-	ldr r1, _08048520 @ =_08048524
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08048518: .4byte gMain
-_0804851C: .4byte 0x0000043c
-_08048520: .4byte _08048524
-	.align 2, 0
-_08048524:
-	.4byte _0804857C
-	.4byte _0804865C
-	.4byte _08048668
-	.4byte _08048674
-	.4byte _08048680
-	.4byte _08048694
-	.4byte _080486A0
-	.4byte _080487E8
-	.4byte _08048810
-	.4byte _08048834
-	.4byte _0804885C
-	.4byte _08048880
-	.4byte _08048894
-	.4byte _080489CA
-	.4byte _080489CA
-	.4byte _08048914
-	.4byte _0804891C
-	.4byte _08048950
-	.4byte _08048970
-	.4byte _08048988
-	.4byte _08048994
-	.4byte _080489B0
-_0804857C:
-	ldr r5, _08048630 @ =gUnknown_03004824
-	ldr r6, _08048634 @ =0x02017000
-	str r6, [r5]
-	bl ResetSpriteData
-	bl FreeAllSpritePalettes
-	bl ResetTasks
-	ldr r0, [r5]
-	adds r0, 0xC8
-	ldr r1, _08048638 @ =0x06002800
-	bl sub_804A964
-	ldr r0, _0804863C @ =sub_80489F4
-	bl SetVBlankCallback
-	ldr r0, _08048640 @ =gWindowConfig_81E6CE4
-	bl InitMenuWindow
-	ldr r4, _08048644 @ =gWindowConfig_81E6F84
-	adds r0, r4, 0
-	bl SetUpWindowConfig
-	ldr r0, [r5]
-	adds r0, 0x4
-	adds r1, r4, 0
-	bl InitWindowFromConfig
-	movs r0, 0x14
-	bl SetTextWindowBaseTileNum
-	ldr r1, [r5]
-	adds r1, 0x7A
-	movs r4, 0
-	strb r0, [r1]
-	ldr r0, [r5]
-	adds r0, 0x4
-	bl LoadTextWindowGraphics
-	bl MenuZeroFillScreen
-	bl sub_809D51C
-	ldr r0, [r5]
-	adds r0, 0x75
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x7B
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x7C
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x80
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x81
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x86
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x87
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0xB4
-	strb r4, [r0]
-	ldr r0, _08048648 @ =gUnknown_03000508
-	strb r4, [r0]
-	ldr r1, _0804864C @ =gMain
-	ldr r3, _08048650 @ =0x0000043c
-	adds r1, r3
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r1, _08048654 @ =gUnknown_020296CC
-	movs r5, 0xD8
-	lsls r5, 7
-	adds r6, r5
-	adds r0, r1, 0
-	adds r0, 0x30
-	ldr r2, _08048658 @ =0xffffff00
-_08048622:
-	str r6, [r0]
-	adds r6, r2
-	subs r0, 0x4
-	cmp r0, r1
-	bge _08048622
-	b _080489CA
-	.align 2, 0
-_08048630: .4byte gUnknown_03004824
-_08048634: .4byte 0x02017000
-_08048638: .4byte 0x06002800
-_0804863C: .4byte sub_80489F4
-_08048640: .4byte gWindowConfig_81E6CE4
-_08048644: .4byte gWindowConfig_81E6F84
-_08048648: .4byte gUnknown_03000508
-_0804864C: .4byte gMain
-_08048650: .4byte 0x0000043c
-_08048654: .4byte gUnknown_020296CC
-_08048658: .4byte 0xffffff00
-_0804865C:
-	ldr r0, _08048664 @ =0x0000043c
-	adds r1, r2, r0
-	b _0804883E
-	.align 2, 0
-_08048664: .4byte 0x0000043c
-_08048668:
-	ldr r3, _08048670 @ =0x0000043c
-	adds r1, r2, r3
-	b _0804899E
-	.align 2, 0
-_08048670: .4byte 0x0000043c
-_08048674:
-	ldr r5, _0804867C @ =0x0000043c
-	adds r1, r2, r5
-	b _0804899E
-	.align 2, 0
-_0804867C: .4byte 0x0000043c
-_08048680:
-	bl CalculatePlayerPartyCount
-	ldr r1, _0804868C @ =gMain
-	ldr r0, _08048690 @ =0x0000043c
-	adds r1, r0
-	b _0804899E
-	.align 2, 0
-_0804868C: .4byte gMain
-_08048690: .4byte 0x0000043c
-_08048694:
-	ldr r3, _0804869C @ =0x0000043c
-	adds r1, r2, r3
-	b _0804899E
-	.align 2, 0
-_0804869C: .4byte 0x0000043c
-_080486A0:
-	bl CalculateEnemyPartyCount
-	movs r1, 0x80
-	lsls r1, 19
-	movs r0, 0
-	strh r0, [r1]
-	ldr r4, _080487C0 @ =gUnknown_03004824
-	ldr r0, [r4]
-	ldr r1, _080487C4 @ =gPlayerPartyCount
-	ldrb r1, [r1]
-	adds r0, 0x42
-	strb r1, [r0]
-	ldr r0, [r4]
-	ldr r1, _080487C8 @ =gEnemyPartyCount
-	ldrb r1, [r1]
-	adds r0, 0x43
-	strb r1, [r0]
-	movs r0, 0
-	bl sub_804A41C
-	movs r0, 0x1
-	bl sub_804A41C
-	movs r6, 0
-	ldr r0, [r4]
-	adds r0, 0x42
-	ldrb r0, [r0]
-	cmp r6, r0
-	bge _0804873C
-	mov r8, r4
-	ldr r7, _080487CC @ =gTradeMonSpriteCoords
-_080486DE:
-	movs r0, 0x64
-	adds r4, r6, 0
-	muls r4, r0
-	ldr r0, _080487D0 @ =gPlayerParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x41
-	movs r2, 0
-	bl GetMonData
-	adds r5, r0, 0
-	lsls r5, 16
-	lsrs r5, 16
-	adds r0, r4, 0
-	movs r1, 0
-	bl GetMonData
-	ldrb r2, [r7]
-	lsls r2, 19
-	movs r1, 0xE0
-	lsls r1, 12
-	adds r2, r1
-	asrs r2, 16
-	ldrb r3, [r7, 0x1]
-	lsls r3, 19
-	ldr r1, _080487D4 @ =0xfff40000
-	adds r3, r1
-	asrs r3, 16
-	movs r1, 0x1
-	str r1, [sp]
-	str r0, [sp, 0x4]
-	adds r0, r5, 0
-	ldr r1, _080487D8 @ =sub_809D62C
-	bl CreateMonIcon
-	mov r2, r8
-	ldr r1, [r2]
-	adds r1, 0x34
-	adds r1, r6
-	strb r0, [r1]
-	adds r7, 0x2
-	adds r6, 0x1
-	ldr r0, [r2]
-	adds r0, 0x42
-	ldrb r0, [r0]
-	cmp r6, r0
-	blt _080486DE
-_0804873C:
-	movs r6, 0
-	ldr r1, _080487C0 @ =gUnknown_03004824
-	ldr r0, [r1]
-	adds r0, 0x43
-	ldrb r0, [r0]
-	cmp r6, r0
-	bge _080487B0
-	ldr r0, _080487CC @ =gTradeMonSpriteCoords
-	mov r8, r1
-	adds r7, r0, 0
-	adds r7, 0xC
-_08048752:
-	movs r0, 0x64
-	adds r4, r6, 0
-	muls r4, r0
-	ldr r0, _080487DC @ =gEnemyParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x41
-	movs r2, 0
-	bl GetMonData
-	adds r5, r0, 0
-	lsls r5, 16
-	lsrs r5, 16
-	adds r0, r4, 0
-	movs r1, 0
-	bl GetMonData
-	ldrb r2, [r7]
-	lsls r2, 19
-	movs r3, 0xE0
-	lsls r3, 12
-	adds r2, r3
-	asrs r2, 16
-	ldrb r3, [r7, 0x1]
-	lsls r3, 19
-	ldr r1, _080487D4 @ =0xfff40000
-	adds r3, r1
-	asrs r3, 16
-	movs r1, 0x1
-	str r1, [sp]
-	str r0, [sp, 0x4]
-	adds r0, r5, 0
-	ldr r1, _080487D8 @ =sub_809D62C
-	bl CreateMonIcon
-	mov r2, r8
-	ldr r1, [r2]
-	adds r1, 0x3A
-	adds r1, r6
-	strb r0, [r1]
-	adds r7, 0x2
-	adds r6, 0x1
-	ldr r0, [r2]
-	adds r0, 0x43
-	ldrb r0, [r0]
-	cmp r6, r0
-	blt _08048752
-_080487B0:
-	movs r0, 0x2
-	movs r1, 0
-	bl nullsub_5
-	ldr r1, _080487E0 @ =gMain
-	ldr r3, _080487E4 @ =0x0000043c
-	adds r1, r3
-	b _0804899E
-	.align 2, 0
-_080487C0: .4byte gUnknown_03004824
-_080487C4: .4byte gPlayerPartyCount
-_080487C8: .4byte gEnemyPartyCount
-_080487CC: .4byte gTradeMonSpriteCoords
-_080487D0: .4byte gPlayerParty
-_080487D4: .4byte 0xfff40000
-_080487D8: .4byte sub_809D62C
-_080487DC: .4byte gEnemyParty
-_080487E0: .4byte gMain
-_080487E4: .4byte 0x0000043c
-_080487E8:
-	bl LoadHeldItemIconGraphics
-	ldr r0, _08048804 @ =gUnknown_03004824
-	ldr r1, [r0]
-	adds r0, r1, 0
-	adds r0, 0x42
-	adds r1, 0x34
-	movs r2, 0
-	bl CreateHeldItemIcons
-	ldr r1, _08048808 @ =gMain
-	ldr r5, _0804880C @ =0x0000043c
-	adds r1, r5
-	b _0804899E
-	.align 2, 0
-_08048804: .4byte gUnknown_03004824
-_08048808: .4byte gMain
-_0804880C: .4byte 0x0000043c
-_08048810:
-	ldr r0, _08048828 @ =gUnknown_03004824
-	ldr r1, [r0]
-	adds r0, r1, 0
-	adds r0, 0x42
-	adds r1, 0x34
-	movs r2, 0x1
-	bl CreateHeldItemIcons
-	ldr r1, _0804882C @ =gMain
-	ldr r0, _08048830 @ =0x0000043c
-	adds r1, r0
-	b _0804899E
-	.align 2, 0
-_08048828: .4byte gUnknown_03004824
-_0804882C: .4byte gMain
-_08048830: .4byte 0x0000043c
-_08048834:
-	bl sub_8047CE8
-	ldr r1, _08048850 @ =gMain
-	ldr r2, _08048854 @ =0x0000043c
-	adds r1, r2
-_0804883E:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	movs r2, 0
-	strb r0, [r1]
-	ldr r0, _08048858 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0xB4
-	strb r2, [r0]
-	b _080489CA
-	.align 2, 0
-_08048850: .4byte gMain
-_08048854: .4byte 0x0000043c
-_08048858: .4byte gUnknown_03004824
-_0804885C:
-	movs r0, 0x4
-	movs r1, 0
-	bl nullsub_5
-	bl sub_804ABF8
-	lsls r0, 24
-	cmp r0, 0
-	bne _08048870
-	b _080489CA
-_08048870:
-	ldr r1, _08048878 @ =gMain
-	ldr r3, _0804887C @ =0x0000043c
-	adds r1, r3
-	b _0804899E
-	.align 2, 0
-_08048878: .4byte gMain
-_0804887C: .4byte 0x0000043c
-_08048880:
-	bl sub_8047D58
-	ldr r1, _0804888C @ =gMain
-	ldr r5, _08048890 @ =0x0000043c
-	adds r1, r5
-	b _0804899E
-	.align 2, 0
-_0804888C: .4byte gMain
-_08048890: .4byte 0x0000043c
-_08048894:
-	bl sub_8047E44
-	ldr r2, _080488AC @ =0x02018000
-	ldr r0, _080488B0 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r1, r0, 0
-	adds r1, 0x41
-	ldrb r0, [r1]
-	cmp r0, 0x5
-	bhi _080488B4
-	ldrb r0, [r2, 0x9]
-	b _080488B8
-	.align 2, 0
-_080488AC: .4byte 0x02018000
-_080488B0: .4byte gUnknown_03004824
-_080488B4:
-	ldrb r0, [r2, 0x9]
-	adds r0, 0x6
-_080488B8:
-	strb r0, [r1]
-	ldr r0, _08048900 @ =gSpriteTemplate_820C134
-	ldr r3, _08048904 @ =gTradeMonSpriteCoords
-	ldr r4, _08048908 @ =gUnknown_03004824
-	ldr r1, [r4]
-	adds r1, 0x41
-	ldrb r2, [r1]
-	lsls r2, 1
-	adds r1, r2, r3
-	ldrb r1, [r1]
-	lsls r1, 19
-	movs r5, 0x80
-	lsls r5, 14
-	adds r1, r5
-	asrs r1, 16
-	adds r3, 0x1
-	adds r2, r3
-	ldrb r2, [r2]
-	lsls r2, 3
-	movs r3, 0x2
-	bl CreateSprite
-	ldr r1, [r4]
-	adds r1, 0x40
-	strb r0, [r1]
-	ldr r0, _0804890C @ =gMain
-	ldr r1, _08048910 @ =0x0000043c
-	adds r0, r1
-	movs r1, 0xF
-	strb r1, [r0]
-	movs r0, 0x6
-	movs r1, 0
-	bl nullsub_5
-	b _080489CA
-	.align 2, 0
-_08048900: .4byte gSpriteTemplate_820C134
-_08048904: .4byte gTradeMonSpriteCoords
-_08048908: .4byte gUnknown_03004824
-_0804890C: .4byte gMain
-_08048910: .4byte 0x0000043c
-_08048914:
-	movs r0, 0
-	bl sub_8048B0C
-	b _08048998
-_0804891C:
-	movs r0, 0x1
-	bl sub_8048B0C
-	ldr r2, _08048944 @ =gUnknown_03004824
-	ldr r0, [r2]
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, [r2]
-	strb r1, [r0, 0x1]
-	bl sub_8048C70
-	movs r0, 0x7
-	movs r1, 0
-	bl nullsub_5
-	ldr r1, _08048948 @ =gMain
-	ldr r3, _0804894C @ =0x0000043c
-	adds r1, r3
-	b _0804899E
-	.align 2, 0
-_08048944: .4byte gUnknown_03004824
-_08048948: .4byte gMain
-_0804894C: .4byte 0x0000043c
-_08048950:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	ldr r1, _08048968 @ =gMain
-	ldr r5, _0804896C @ =0x0000043c
-	adds r1, r5
-	b _0804899E
-	.align 2, 0
-_08048968: .4byte gMain
-_0804896C: .4byte 0x0000043c
-_08048970:
-	movs r1, 0x80
-	lsls r1, 19
-	movs r3, 0xFA
-	lsls r3, 5
-	adds r0, r3, 0
-	strh r0, [r1]
-	ldr r5, _08048984 @ =0x0000043c
-	adds r1, r2, r5
-	b _0804899E
-	.align 2, 0
-_08048984: .4byte 0x0000043c
-_08048988:
-	ldr r0, _08048990 @ =0x0000043c
-	adds r1, r2, r0
-	b _0804899E
-	.align 2, 0
-_08048990: .4byte 0x0000043c
-_08048994:
-	bl sub_804AF10
-_08048998:
-	ldr r1, _080489A8 @ =gMain
-	ldr r2, _080489AC @ =0x0000043c
-	adds r1, r2
-_0804899E:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _080489CA
-	.align 2, 0
-_080489A8: .4byte gMain
-_080489AC: .4byte 0x0000043c
-_080489B0:
-	ldr r0, _080489E8 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	bne _080489CA
-	ldr r0, _080489EC @ =sub_8048AB4
-	bl SetMainCallback2
-	ldr r0, _080489F0 @ =gUnknown_03000508
-	strb r4, [r0]
-_080489CA:
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	add sp, 0x8
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080489E8: .4byte gPaletteFade
-_080489EC: .4byte sub_8048AB4
-_080489F0: .4byte gUnknown_03000508
-	thumb_func_end sub_80484F4
-
 	thumb_func_start sub_80489F4
 sub_80489F4: @ 80489F4
 	push {lr}
diff --git a/src/trade.c b/src/trade.c
index c5cde0b39..cf2070fe1 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -84,12 +84,20 @@ struct TradeEwramSubstruct {
     /*0x00b4*/ u8 unk_00b4;
     /*0x00b5*/ u8 filler_00b4[0x13];
     /*0x00c8*/ struct UnkStructE unk_00c8;
-    /*0x00dc*/ u8 filler_00dc[0x5f24];
+    /*0x00dc*/ u8 filler_00dc[0xf24];
+};
+
+struct UnkStructF {
+    u8 filler_0000[9];
+    u8 unk_0009;
+    u8 filler_000a[0xff6];
 };
 
 struct TradeEwramStruct {
     /*0x00000*/ u8 filler_00000[0x7000];
     /*0x07000*/ struct TradeEwramSubstruct unk_07000;
+    /*0x08000*/ struct UnkStructF unk_08000;
+    /*0x09000*/ u8 filler_09000[0x4000];
     /*0x0d000*/ u8 tileBuffers[13][256];
 };
 
@@ -744,6 +752,148 @@ void sub_8047EC0(void)
     UpdatePaletteFade();
 }
 
+void sub_80484F4(void)
+{
+    int i;
+    struct UnkStructF *unkStructF;
+
+    switch (gMain.state)
+    {
+        case  0:
+            gUnknown_03004824 = &ewram_2010000.unk_07000;
+            ResetSpriteData();
+            FreeAllSpritePalettes();
+            ResetTasks();
+            sub_804A964(&gUnknown_03004824->unk_00c8, (void *)BG_SCREEN_ADDR(5));
+            SetVBlankCallback(sub_80489F4);
+            InitMenuWindow(&gWindowConfig_81E6CE4);
+            SetUpWindowConfig(&gWindowConfig_81E6F84);
+            InitWindowFromConfig(&gUnknown_03004824->window, &gWindowConfig_81E6F84);
+            gUnknown_03004824->unk_007a = SetTextWindowBaseTileNum(20);
+            LoadTextWindowGraphics(&gUnknown_03004824->window);
+            MenuZeroFillScreen();
+            sub_809D51C();
+            gUnknown_03004824->unk_0075 = 0;
+            gUnknown_03004824->unk_007b = 0;
+            gUnknown_03004824->unk_007c = 0;
+            gUnknown_03004824->unk_0080 = 0;
+            gUnknown_03004824->unk_0081 = 0;
+            gUnknown_03004824->unk_0086 = 0;
+            gUnknown_03004824->unk_0087 = 0;
+            gUnknown_03004824->unk_00b4 = 0;
+            gUnknown_03000508 = 0;
+            gMain.state ++;
+            for (i = 0; i < 13; i ++)
+                gUnknown_020296CC[i] = ewram_2010000.tileBuffers[i];
+            break;
+        case  1:
+            gMain.state ++;
+            gUnknown_03004824->unk_00b4 = 0;
+            break;
+        case  2:
+            gMain.state ++;
+            break;
+        case  3:
+            gMain.state ++;
+            break;
+        case  4:
+            CalculatePlayerPartyCount();
+            gMain.state ++;
+            break;
+        case  5:
+            gMain.state ++;
+            break;
+        case  6:
+            CalculateEnemyPartyCount();
+            REG_DISPCNT = 0;
+            gUnknown_03004824->playerPartyCount = gPlayerPartyCount;
+            gUnknown_03004824->friendPartyCount = gEnemyPartyCount;
+            sub_804A41C(0);
+            sub_804A41C(1);
+            for (i = 0; i < gUnknown_03004824->playerPartyCount; i ++)
+                gUnknown_03004824->playerPartyIcons[i] = CreateMonIcon(GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL), sub_809D62C, gTradeMonSpriteCoords[i][0] * 8 + 14, gTradeMonSpriteCoords[i][1] * 8 - 12, TRUE, GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY));
+            for (i = 0; i < gUnknown_03004824->friendPartyCount; i ++)
+                gUnknown_03004824->friendPartyIcons[i] = CreateMonIcon(GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2, NULL), sub_809D62C, gTradeMonSpriteCoords[6 + i][0] * 8 + 14, gTradeMonSpriteCoords[6 + i][1] * 8 - 12, TRUE, GetMonData(&gEnemyParty[i], MON_DATA_PERSONALITY));
+            nullsub_5(2, 0);
+            gMain.state ++;
+            break;
+        case  7:
+            LoadHeldItemIconGraphics();
+            CreateHeldItemIcons(&gUnknown_03004824->playerPartyCount, gUnknown_03004824->playerPartyIcons, 0);
+            gMain.state ++;
+            break;
+        case  8:
+            CreateHeldItemIcons(&gUnknown_03004824->playerPartyCount, gUnknown_03004824->playerPartyIcons, 1);
+            gMain.state ++;
+            break;
+        case  9:
+            sub_8047CE8();
+            gMain.state ++;
+            gUnknown_03004824->unk_00b4 = 0;
+            break;
+        case 10:
+            nullsub_5(4, 0);
+            if (sub_804ABF8())
+            {
+                gMain.state ++;
+            }
+            break;
+        case 11:
+            sub_8047D58();
+            gMain.state ++;
+            break;
+        case 12:
+            sub_8047E44();
+            unkStructF = &ewram_2010000.unk_08000;
+            if (gUnknown_03004824->unk_0041 < 6)
+                gUnknown_03004824->unk_0041 = unkStructF->unk_0009;
+            else
+                gUnknown_03004824->unk_0041 = unkStructF->unk_0009 + 6;
+            gUnknown_03004824->unk_0040 = CreateSprite(&gSpriteTemplate_820C134, gTradeMonSpriteCoords[gUnknown_03004824->unk_0041][0] * 8 + 32, gTradeMonSpriteCoords[gUnknown_03004824->unk_0041][1] * 8, 2);
+            gMain.state = 15;
+            nullsub_5(6, 0);
+            break;
+        case 15:
+            sub_8048B0C(0);
+            gMain.state ++;
+            break;
+        case 16:
+            sub_8048B0C(1);
+            gUnknown_03004824->unk_0000 = 0;
+            gUnknown_03004824->unk_0001 = 0;
+            sub_8048C70();
+            nullsub_5(7, 0);
+            gMain.state ++;
+            break;
+        case 17:
+            BeginNormalPaletteFade(-1, 0, 16, 0, 0);
+            gMain.state ++;
+            break;
+        case 18:
+            REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON;
+            gMain.state ++;
+            break;
+        case 19:
+            gMain.state ++;
+            break;
+        case 20:
+            sub_804AF10();
+            gMain.state ++;
+            break;
+        case 21:
+            if (!gPaletteFade.active)
+            {
+                SetMainCallback2(sub_8048AB4);
+                gUnknown_03000508 = 0;
+            }
+            break;
+    }
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
 asm(".section .text.sub_804A96C");
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 67d86d6a4cf715b9089f420c067935bcee9d1d7f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 31 Aug 2017 19:33:46 -0400
Subject: through sub_8048AB4

---
 asm/trade.s | 143 ------------------------------------------------------------
 src/trade.c |  61 +++++++++++++++++++++++++-
 2 files changed, 60 insertions(+), 144 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index d50feda0b..f4ddba518 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,149 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_80489F4
-sub_80489F4: @ 80489F4
-	push {lr}
-	ldr r0, _08048A10 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0xC8
-	bl sub_804A940
-	bl LoadOam
-	bl ProcessSpriteCopyRequests
-	bl TransferPlttBuffer
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08048A10: .4byte gUnknown_03004824
-	thumb_func_end sub_80489F4
-
-	thumb_func_start sub_8048A14
-sub_8048A14: @ 8048A14
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r4, _08048A4C @ =gUnknown_03004824
-	ldr r1, [r4]
-	adds r1, 0xB4
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xF
-	bls _08048A44
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r0, [r4]
-	adds r0, 0x7B
-	movs r1, 0xA
-	strb r1, [r0]
-_08048A44:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08048A4C: .4byte gUnknown_03004824
-	thumb_func_end sub_8048A14
-
-	thumb_func_start sub_8048A50
-sub_8048A50: @ 8048A50
-	push {r4,lr}
-	ldr r0, _08048A84 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08048A7E
-	ldr r2, _08048A88 @ =gUnknown_020297D8
-	ldr r4, _08048A8C @ =gUnknown_03004824
-	ldr r0, [r4]
-	adds r1, r0, 0
-	adds r1, 0x41
-	ldrb r1, [r1]
-	strb r1, [r2]
-	adds r0, 0x8A
-	ldrb r0, [r0]
-	strb r0, [r2, 0x1]
-	bl sub_800832C
-	ldr r0, [r4]
-	adds r0, 0x7B
-	movs r1, 0xD
-	strb r1, [r0]
-_08048A7E:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08048A84: .4byte gPaletteFade
-_08048A88: .4byte gUnknown_020297D8
-_08048A8C: .4byte gUnknown_03004824
-	thumb_func_end sub_8048A50
-
-	thumb_func_start sub_8048A90
-sub_8048A90: @ 8048A90
-	push {lr}
-	ldr r0, _08048AA8 @ =gReceivedRemoteLinkPlayers
-	ldrb r1, [r0]
-	cmp r1, 0
-	bne _08048AA4
-	ldr r0, _08048AAC @ =gMain
-	str r1, [r0]
-	ldr r0, _08048AB0 @ =sub_804B41C
-	bl SetMainCallback2
-_08048AA4:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08048AA8: .4byte gReceivedRemoteLinkPlayers
-_08048AAC: .4byte gMain
-_08048AB0: .4byte sub_804B41C
-	thumb_func_end sub_8048A90
-
-	thumb_func_start sub_8048AB4
-sub_8048AB4: @ 8048AB4
-	push {r4,lr}
-	bl sub_8049DE0
-	bl sub_804AB30
-	movs r0, 0
-	bl sub_8049ED4
-	movs r0, 0x1
-	bl sub_8049ED4
-	ldr r4, _08048B04 @ =REG_BG2HOFS
-	ldr r3, _08048B08 @ =gUnknown_03004824
-	ldr r2, [r3]
-	ldrb r0, [r2]
-	adds r1, r0, 0x1
-	strb r1, [r2]
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4]
-	adds r4, 0x4
-	ldr r2, [r3]
-	ldrb r0, [r2, 0x1]
-	adds r1, r0, 0
-	adds r1, 0xFF
-	strb r1, [r2, 0x1]
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4]
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08048B04: .4byte REG_BG2HOFS
-_08048B08: .4byte gUnknown_03004824
-	thumb_func_end sub_8048AB4
-
 	thumb_func_start sub_8048B0C
 sub_8048B0C: @ 8048B0C
 	push {r4-r7,lr}
diff --git a/src/trade.c b/src/trade.c
index cf2070fe1..4e1c74b83 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -80,7 +80,9 @@ struct TradeEwramSubstruct {
     /*0x0082*/ u8 filler_0082[4];
     /*0x0086*/ u8 unk_0086;
     /*0x0087*/ u8 unk_0087;
-    /*0x0088*/ u8 filler_0088[0x2c];
+    /*0x0088*/ u8 filler_0088[2];
+    /*0x008a*/ u8 unk_008a;
+    /*0x008b*/ u8 filler_008b[0x29];
     /*0x00b4*/ u8 unk_00b4;
     /*0x00b5*/ u8 filler_00b4[0x13];
     /*0x00c8*/ struct UnkStructE unk_00c8;
@@ -121,7 +123,13 @@ void sub_804AE3C(u8);
 void sub_804AF10(void);
 void sub_80494D8(void);
 void sub_8048AB4(void);
+void sub_804A940(struct UnkStructE *);
+void sub_804B41C(void);
+void sub_8049DE0(void);
+void sub_804AB30(void);
+void sub_8049ED4(u8);
 
+extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
 extern struct TradeEwramSubstruct *gUnknown_03004824;
 extern u8 gUnknown_03000508;
@@ -894,6 +902,57 @@ void sub_80484F4(void)
     UpdatePaletteFade();
 }
 
+void sub_80489F4(void)
+{
+    sub_804A940(&gUnknown_03004824->unk_00c8);
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void sub_8048A14(void)
+{
+    if (++gUnknown_03004824->unk_00b4 >= 16)
+    {
+        BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+        gUnknown_03004824->unk_007b = 10;
+    }
+}
+
+void sub_8048A50(void)
+{
+    if (!gPaletteFade.active)
+    {
+        gUnknown_020297D8[0] = gUnknown_03004824->unk_0041;
+        gUnknown_020297D8[1] = gUnknown_03004824->unk_008a;
+        sub_800832C();
+        gUnknown_03004824->unk_007b = 13;
+    }
+}
+
+void sub_8048A90(void)
+{
+    if (!gReceivedRemoteLinkPlayers)
+    {
+        gMain.callback1 = NULL;
+        SetMainCallback2(sub_804B41C);
+    }
+}
+
+void sub_8048AB4(void)
+{
+    sub_8049DE0();
+    sub_804AB30();
+    sub_8049ED4(0);
+    sub_8049ED4(1);
+    REG_BG2HOFS = gUnknown_03004824->unk_0000++;
+    REG_BG3HOFS = gUnknown_03004824->unk_0001--;
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
 asm(".section .text.sub_804A96C");
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From ff1da361388c9f38813e6622839e702740b2974c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 1 Sep 2017 22:02:57 -0400
Subject: nonmatching sub_8048B0C

---
 asm/trade.s        | 163 -------------------------------------
 include/graphics.h |   4 +-
 src/trade.c        | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 236 insertions(+), 166 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index f4ddba518..95c9c4b15 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,169 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8048B0C
-sub_8048B0C: @ 8048B0C
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _08048B1C
-	cmp r0, 0x1
-	beq _08048BD0
-	b _08048C3A
-_08048B1C:
-	ldr r5, _08048BA0 @ =gUnknown_08EA0348
-	ldr r0, _08048BA4 @ =gTradeStripesBG2Tilemap
-	mov r12, r0
-	ldr r1, _08048BA8 @ =gUnknown_08EA02C8
-	ldr r4, _08048BAC @ =gPlttBufferFaded
-	ldr r3, _08048BB0 @ =gPlttBufferUnfaded
-	movs r2, 0x2F
-_08048B2A:
-	ldrh r0, [r1]
-	strh r0, [r3]
-	ldrh r0, [r1]
-	strh r0, [r4]
-	adds r1, 0x2
-	adds r4, 0x2
-	adds r3, 0x2
-	subs r2, 0x1
-	cmp r2, 0
-	bge _08048B2A
-	adds r3, r5, 0
-	movs r4, 0xC0
-	lsls r4, 19
-	movs r5, 0x94
-	lsls r5, 5
-	ldr r1, _08048BB4 @ =0x040000d4
-	ldr r6, _08048BB8 @ =0x80000800
-	movs r2, 0x80
-	lsls r2, 5
-	movs r7, 0x80
-	lsls r7, 24
-_08048B54:
-	str r3, [r1]
-	str r4, [r1, 0x4]
-	str r6, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	adds r3, r2
-	adds r4, r2
-	subs r5, r2
-	cmp r5, r2
-	bhi _08048B54
-	str r3, [r1]
-	str r4, [r1, 0x4]
-	lsrs r0, r5, 1
-	orrs r0, r7
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	movs r2, 0
-	ldr r5, _08048BBC @ =0x000003ff
-	ldr r4, _08048BC0 @ =gUnknown_03004824
-	ldr r3, _08048BC4 @ =gUnknown_08EA15C8
-_08048B7A:
-	ldr r0, [r4]
-	lsls r1, r2, 1
-	adds r0, 0xDA
-	adds r0, r1
-	ldrh r1, [r3]
-	strh r1, [r0]
-	adds r3, 0x2
-	adds r2, 0x1
-	cmp r2, r5
-	ble _08048B7A
-	ldr r1, _08048BC8 @ =0x06003000
-	ldr r0, _08048BB4 @ =0x040000d4
-	mov r2, r12
-	str r2, [r0]
-	str r1, [r0, 0x4]
-	ldr r1, _08048BCC @ =0x80000400
-	str r1, [r0, 0x8]
-	ldr r0, [r0, 0x8]
-	b _08048C3A
-	.align 2, 0
-_08048BA0: .4byte gUnknown_08EA0348
-_08048BA4: .4byte gTradeStripesBG2Tilemap
-_08048BA8: .4byte gUnknown_08EA02C8
-_08048BAC: .4byte gPlttBufferFaded
-_08048BB0: .4byte gPlttBufferUnfaded
-_08048BB4: .4byte 0x040000d4
-_08048BB8: .4byte 0x80000800
-_08048BBC: .4byte 0x000003ff
-_08048BC0: .4byte gUnknown_03004824
-_08048BC4: .4byte gUnknown_08EA15C8
-_08048BC8: .4byte 0x06003000
-_08048BCC: .4byte 0x80000400
-_08048BD0:
-	ldr r1, _08048C40 @ =gTradeStripesBG3Tilemap
-	ldr r2, _08048C44 @ =0x06003800
-	ldr r0, _08048C48 @ =0x040000d4
-	str r1, [r0]
-	str r2, [r0, 0x4]
-	ldr r1, _08048C4C @ =0x80000400
-	str r1, [r0, 0x8]
-	ldr r0, [r0, 0x8]
-	movs r0, 0
-	bl sub_804A6DC
-	movs r0, 0x1
-	bl sub_804A6DC
-	ldr r0, _08048C50 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0xC8
-	bl sub_804A938
-	ldr r2, _08048C54 @ =REG_BG0CNT
-	ldrh r1, [r2]
-	ldr r0, _08048C58 @ =0x0000fffc
-	ands r0, r1
-	strh r0, [r2]
-	ldr r1, _08048C5C @ =REG_BG1CNT
-	ldr r2, _08048C60 @ =0x00000501
-	adds r0, r2, 0
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r2, _08048C64 @ =0x00000602
-	adds r0, r2, 0
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r2, _08048C68 @ =0x00000703
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r0, _08048C6C @ =REG_BG0HOFS
-	movs r1, 0
-	strh r1, [r0]
-	adds r0, 0x4
-	strh r1, [r0]
-	adds r0, 0x4
-	strh r1, [r0]
-	adds r0, 0x4
-	strh r1, [r0]
-	subs r0, 0xA
-	strh r1, [r0]
-	adds r0, 0x4
-	strh r1, [r0]
-	adds r0, 0x4
-	strh r1, [r0]
-	adds r0, 0x4
-	strh r1, [r0]
-_08048C3A:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08048C40: .4byte gTradeStripesBG3Tilemap
-_08048C44: .4byte 0x06003800
-_08048C48: .4byte 0x040000d4
-_08048C4C: .4byte 0x80000400
-_08048C50: .4byte gUnknown_03004824
-_08048C54: .4byte REG_BG0CNT
-_08048C58: .4byte 0x0000fffc
-_08048C5C: .4byte REG_BG1CNT
-_08048C60: .4byte 0x00000501
-_08048C64: .4byte 0x00000602
-_08048C68: .4byte 0x00000703
-_08048C6C: .4byte REG_BG0HOFS
-	thumb_func_end sub_8048B0C
-
 	thumb_func_start sub_8048C70
 sub_8048C70: @ 8048C70
 	push {r4-r7,lr}
diff --git a/include/graphics.h b/include/graphics.h
index 72688ec44..09ef5343c 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2566,5 +2566,7 @@ extern const u8 gUnknown_08E8D9C0[];
 
 extern const u8 gUnknown_08EA1DEC[];
 extern const u16 gUnknown_08EA0328[];
-
+extern const u16 gUnknown_08EA02C8[];
+extern const u16 gUnknown_08EA0348[];
+extern const u16 gUnknown_08EA15C8[];
 #endif  // GUARD_GRAPHICS_H
diff --git a/src/trade.c b/src/trade.c
index 4e1c74b83..38cde38de 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -56,6 +56,7 @@ struct UnkStructE {
     /*0x08*/ void *vramAddr;
     /*0x0c*/ u8 filler_0c[4];
     /*0x10*/ u8 unk_10;
+    /*0x12*/ u16 unk_12[0x400];
 };
 
 struct TradeEwramSubstruct {
@@ -84,9 +85,9 @@ struct TradeEwramSubstruct {
     /*0x008a*/ u8 unk_008a;
     /*0x008b*/ u8 filler_008b[0x29];
     /*0x00b4*/ u8 unk_00b4;
-    /*0x00b5*/ u8 filler_00b4[0x13];
+    /*0x00b5*/ u8 filler_00b5[0x13];
     /*0x00c8*/ struct UnkStructE unk_00c8;
-    /*0x00dc*/ u8 filler_00dc[0xf24];
+    /*0x08dc*/ u8 filler_04dc[0x724];
 };
 
 struct UnkStructF {
@@ -128,6 +129,8 @@ void sub_804B41C(void);
 void sub_8049DE0(void);
 void sub_804AB30(void);
 void sub_8049ED4(u8);
+void sub_804A6DC(u8);
+void sub_804A938(struct UnkStructE *);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -953,6 +956,234 @@ void sub_8048AB4(void)
     UpdatePaletteFade();
 }
 
+#ifdef NONMATCHING
+// Only minor register permutations
+#pragma push_macro("BLOCKSIZE")
+#define BLOCKSIZE 0x800
+void sub_8048B0C(u8 a0)
+{
+    int i;
+    u16 *dest;
+    const u16 *src;
+    u32 size;
+    switch (a0)
+    {
+        case 0:
+            for (i = 0; i < 48; i ++)
+            {
+                gPlttBufferUnfaded[i] = *(gUnknown_08EA02C8 + i);
+                gPlttBufferFaded[i] = *(gUnknown_08EA02C8 + i);
+            }
+            src = gUnknown_08EA0348;
+            dest = (u16 *)BG_VRAM;
+            size = 0x1280;
+            while (1)
+            {
+                DmaCopy16(3, src, dest, BLOCKSIZE * sizeof(u16));
+                src += BLOCKSIZE;
+                dest += BLOCKSIZE;
+                size -= BLOCKSIZE * sizeof(u16);
+                if (size <= BLOCKSIZE * sizeof(u16))
+                {
+                    DmaCopy16(3, src, dest, size);
+                    break;
+                }
+            }
+            for (i = 0; i < 0x400; i ++)
+                gUnknown_03004824->unk_00c8.unk_12[i] = gUnknown_08EA15C8[i];
+            dest = (u16 *)BG_SCREEN_ADDR(6);
+            DmaCopy16(3, gTradeStripesBG2Tilemap, dest, 0x800);
+            break;
+        case 1:
+            src = gTradeStripesBG3Tilemap;
+            dest = (u16 *)BG_SCREEN_ADDR(7);
+            DmaCopy16(3, src, dest, 0x800);
+            sub_804A6DC(0);
+            sub_804A6DC(1);
+            sub_804A938(&gUnknown_03004824->unk_00c8);
+            REG_BG0CNT &= ~0x03; // BGCNT_PRIORITY(0)
+            REG_BG1CNT = BGCNT_PRIORITY(1) | BGCNT_SCREENBASE(5);
+            REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(6);
+            REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_SCREENBASE(7);
+            REG_BG0HOFS = 0;
+            REG_BG1HOFS = 0;
+            REG_BG2HOFS = 0;
+            REG_BG3HOFS = 0;
+            REG_BG0VOFS = 0;
+            REG_BG1VOFS = 0;
+            REG_BG2VOFS = 0;
+            REG_BG3VOFS = 0;
+            break;
+    }
+}
+#pragma pop_macro("BLOCKSIZE")
+#else
+asm(".include \"constants/gba_constants.inc\"");
+__attribute__((naked))
+void sub_8048B0C(u8 a0)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                        "\tlsls r0, 24\n"
+                        "\tlsrs r0, 24\n"
+                        "\tcmp r0, 0\n"
+                        "\tbeq _08048B1C\n"
+                        "\tcmp r0, 0x1\n"
+                        "\tbeq _08048BD0\n"
+                        "\tb _08048C3A\n"
+                        "_08048B1C:\n"
+                        "\tldr r5, _08048BA0 @ =gUnknown_08EA0348\n"
+                        "\tldr r0, _08048BA4 @ =gTradeStripesBG2Tilemap\n"
+                        "\tmov r12, r0\n"
+                        "\tldr r1, _08048BA8 @ =gUnknown_08EA02C8\n"
+                        "\tldr r4, _08048BAC @ =gPlttBufferFaded\n"
+                        "\tldr r3, _08048BB0 @ =gPlttBufferUnfaded\n"
+                        "\tmovs r2, 0x2F\n"
+                        "_08048B2A:\n"
+                        "\tldrh r0, [r1]\n"
+                        "\tstrh r0, [r3]\n"
+                        "\tldrh r0, [r1]\n"
+                        "\tstrh r0, [r4]\n"
+                        "\tadds r1, 0x2\n"
+                        "\tadds r4, 0x2\n"
+                        "\tadds r3, 0x2\n"
+                        "\tsubs r2, 0x1\n"
+                        "\tcmp r2, 0\n"
+                        "\tbge _08048B2A\n"
+                        "\tadds r3, r5, 0\n"
+                        "\tmovs r4, 0xC0\n"
+                        "\tlsls r4, 19\n"
+                        "\tmovs r5, 0x94\n"
+                        "\tlsls r5, 5\n"
+                        "\tldr r1, _08048BB4 @ =0x040000d4\n"
+                        "\tldr r6, _08048BB8 @ =0x80000800\n"
+                        "\tmovs r2, 0x80\n"
+                        "\tlsls r2, 5\n"
+                        "\tmovs r7, 0x80\n"
+                        "\tlsls r7, 24\n"
+                        "_08048B54:\n"
+                        "\tstr r3, [r1]\n"
+                        "\tstr r4, [r1, 0x4]\n"
+                        "\tstr r6, [r1, 0x8]\n"
+                        "\tldr r0, [r1, 0x8]\n"
+                        "\tadds r3, r2\n"
+                        "\tadds r4, r2\n"
+                        "\tsubs r5, r2\n"
+                        "\tcmp r5, r2\n"
+                        "\tbhi _08048B54\n"
+                        "\tstr r3, [r1]\n"
+                        "\tstr r4, [r1, 0x4]\n"
+                        "\tlsrs r0, r5, 1\n"
+                        "\torrs r0, r7\n"
+                        "\tstr r0, [r1, 0x8]\n"
+                        "\tldr r0, [r1, 0x8]\n"
+                        "\tmovs r2, 0\n"
+                        "\tldr r5, _08048BBC @ =0x000003ff\n"
+                        "\tldr r4, _08048BC0 @ =gUnknown_03004824\n"
+                        "\tldr r3, _08048BC4 @ =gUnknown_08EA15C8\n"
+                        "_08048B7A:\n"
+                        "\tldr r0, [r4]\n"
+                        "\tlsls r1, r2, 1\n"
+                        "\tadds r0, 0xDA\n"
+                        "\tadds r0, r1\n"
+                        "\tldrh r1, [r3]\n"
+                        "\tstrh r1, [r0]\n"
+                        "\tadds r3, 0x2\n"
+                        "\tadds r2, 0x1\n"
+                        "\tcmp r2, r5\n"
+                        "\tble _08048B7A\n"
+                        "\tldr r1, _08048BC8 @ =0x06003000\n"
+                        "\tldr r0, _08048BB4 @ =0x040000d4\n"
+                        "\tmov r2, r12\n"
+                        "\tstr r2, [r0]\n"
+                        "\tstr r1, [r0, 0x4]\n"
+                        "\tldr r1, _08048BCC @ =0x80000400\n"
+                        "\tstr r1, [r0, 0x8]\n"
+                        "\tldr r0, [r0, 0x8]\n"
+                        "\tb _08048C3A\n"
+                        "\t.align 2, 0\n"
+                        "_08048BA0: .4byte gUnknown_08EA0348\n"
+                        "_08048BA4: .4byte gTradeStripesBG2Tilemap\n"
+                        "_08048BA8: .4byte gUnknown_08EA02C8\n"
+                        "_08048BAC: .4byte gPlttBufferFaded\n"
+                        "_08048BB0: .4byte gPlttBufferUnfaded\n"
+                        "_08048BB4: .4byte 0x040000d4\n"
+                        "_08048BB8: .4byte 0x80000800\n"
+                        "_08048BBC: .4byte 0x000003ff\n"
+                        "_08048BC0: .4byte gUnknown_03004824\n"
+                        "_08048BC4: .4byte gUnknown_08EA15C8\n"
+                        "_08048BC8: .4byte 0x06003000\n"
+                        "_08048BCC: .4byte 0x80000400\n"
+                        "_08048BD0:\n"
+                        "\tldr r1, _08048C40 @ =gTradeStripesBG3Tilemap\n"
+                        "\tldr r2, _08048C44 @ =0x06003800\n"
+                        "\tldr r0, _08048C48 @ =0x040000d4\n"
+                        "\tstr r1, [r0]\n"
+                        "\tstr r2, [r0, 0x4]\n"
+                        "\tldr r1, _08048C4C @ =0x80000400\n"
+                        "\tstr r1, [r0, 0x8]\n"
+                        "\tldr r0, [r0, 0x8]\n"
+                        "\tmovs r0, 0\n"
+                        "\tbl sub_804A6DC\n"
+                        "\tmovs r0, 0x1\n"
+                        "\tbl sub_804A6DC\n"
+                        "\tldr r0, _08048C50 @ =gUnknown_03004824\n"
+                        "\tldr r0, [r0]\n"
+                        "\tadds r0, 0xC8\n"
+                        "\tbl sub_804A938\n"
+                        "\tldr r2, _08048C54 @ =REG_BG0CNT\n"
+                        "\tldrh r1, [r2]\n"
+                        "\tldr r0, _08048C58 @ =0x0000fffc\n"
+                        "\tands r0, r1\n"
+                        "\tstrh r0, [r2]\n"
+                        "\tldr r1, _08048C5C @ =REG_BG1CNT\n"
+                        "\tldr r2, _08048C60 @ =0x00000501\n"
+                        "\tadds r0, r2, 0\n"
+                        "\tstrh r0, [r1]\n"
+                        "\tadds r1, 0x2\n"
+                        "\tldr r2, _08048C64 @ =0x00000602\n"
+                        "\tadds r0, r2, 0\n"
+                        "\tstrh r0, [r1]\n"
+                        "\tadds r1, 0x2\n"
+                        "\tldr r2, _08048C68 @ =0x00000703\n"
+                        "\tadds r0, r2, 0\n"
+                        "\tstrh r0, [r1]\n"
+                        "\tldr r0, _08048C6C @ =REG_BG0HOFS\n"
+                        "\tmovs r1, 0\n"
+                        "\tstrh r1, [r0]\n"
+                        "\tadds r0, 0x4\n"
+                        "\tstrh r1, [r0]\n"
+                        "\tadds r0, 0x4\n"
+                        "\tstrh r1, [r0]\n"
+                        "\tadds r0, 0x4\n"
+                        "\tstrh r1, [r0]\n"
+                        "\tsubs r0, 0xA\n"
+                        "\tstrh r1, [r0]\n"
+                        "\tadds r0, 0x4\n"
+                        "\tstrh r1, [r0]\n"
+                        "\tadds r0, 0x4\n"
+                        "\tstrh r1, [r0]\n"
+                        "\tadds r0, 0x4\n"
+                        "\tstrh r1, [r0]\n"
+                        "_08048C3A:\n"
+                        "\tpop {r4-r7}\n"
+                        "\tpop {r0}\n"
+                        "\tbx r0\n"
+                        "\t.align 2, 0\n"
+                        "_08048C40: .4byte gTradeStripesBG3Tilemap\n"
+                        "_08048C44: .4byte 0x06003800\n"
+                        "_08048C48: .4byte 0x040000d4\n"
+                        "_08048C4C: .4byte 0x80000400\n"
+                        "_08048C50: .4byte gUnknown_03004824\n"
+                        "_08048C54: .4byte REG_BG0CNT\n"
+                        "_08048C58: .4byte 0x0000fffc\n"
+                        "_08048C5C: .4byte REG_BG1CNT\n"
+                        "_08048C60: .4byte 0x00000501\n"
+                        "_08048C64: .4byte 0x00000602\n"
+                        "_08048C68: .4byte 0x00000703\n"
+                        "_08048C6C: .4byte REG_BG0HOFS");
+}
+#endif
+
 asm(".section .text.sub_804A96C");
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From a4b29bdd2b3cb2ff3fc69fc69e0725ce50bd828a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 1 Sep 2017 22:09:59 -0400
Subject: sub_8048C70

---
 asm/trade.s | 95 -------------------------------------------------------------
 src/trade.c | 31 +++++++++++++++++++-
 2 files changed, 30 insertions(+), 96 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 95c9c4b15..5a0634734 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,101 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8048C70
-sub_8048C70: @ 8048C70
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	movs r3, 0
-	ldr r5, _08048CC0 @ =gUnknown_03004824
-	mov r8, r5
-	ldr r0, _08048CC4 @ =gSprites
-	mov r12, r0
-	movs r1, 0x5
-	negs r1, r1
-	mov r9, r1
-	movs r4, 0x6
-	movs r7, 0x1
-	movs r6, 0
-_08048C8E:
-	mov r1, r8
-	ldr r0, [r1]
-	adds r1, r0, 0
-	adds r1, 0x42
-	ldrb r1, [r1]
-	cmp r3, r1
-	bge _08048CC8
-	adds r0, 0x34
-	adds r0, r3
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	add r1, r12
-	adds r1, 0x3E
-	ldrb r2, [r1]
-	mov r0, r9
-	ands r0, r2
-	strb r0, [r1]
-	ldr r0, [r5]
-	adds r0, 0x44
-	adds r0, r3
-	strb r7, [r0]
-	b _08048CCE
-	.align 2, 0
-_08048CC0: .4byte gUnknown_03004824
-_08048CC4: .4byte gSprites
-_08048CC8:
-	adds r0, 0x44
-	adds r0, r3
-	strb r6, [r0]
-_08048CCE:
-	mov r1, r8
-	ldr r0, [r1]
-	adds r1, r0, 0
-	adds r1, 0x43
-	ldrb r1, [r1]
-	cmp r3, r1
-	bge _08048CFE
-	adds r0, 0x3A
-	adds r0, r3
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	add r1, r12
-	adds r1, 0x3E
-	ldrb r2, [r1]
-	mov r0, r9
-	ands r0, r2
-	strb r0, [r1]
-	ldr r0, [r5]
-	adds r0, 0x44
-	adds r0, r4
-	strb r7, [r0]
-	b _08048D04
-_08048CFE:
-	adds r0, 0x44
-	adds r0, r4
-	strb r6, [r0]
-_08048D04:
-	adds r4, 0x1
-	adds r3, 0x1
-	cmp r3, 0x5
-	ble _08048C8E
-	ldr r0, [r5]
-	adds r0, 0x50
-	movs r1, 0x1
-	strb r1, [r0]
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8048C70
-
 	thumb_func_start nullsub_5
 nullsub_5: @ 8048D20
 	bx lr
diff --git a/src/trade.c b/src/trade.c
index 38cde38de..5b0ea50fe 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -69,7 +69,9 @@ struct TradeEwramSubstruct {
     /*0x0041*/ u8 unk_0041;
     /*0x0042*/ u8 playerPartyCount;
     /*0x0043*/ u8 friendPartyCount;
-    /*0x0044*/ u8 filler_0044[0x31];
+    /*0x0044*/ u8 tradeIconsActive[12];
+    /*0x0050*/ u8 unk_0050;
+    /*0x0051*/ u8 filler_0044[0x24];
     /*0x0075*/ u8 unk_0075;
     /*0x0076*/ u8 filler_0076[4];
     /*0x007a*/ u8 unk_007a;
@@ -1184,6 +1186,33 @@ void sub_8048B0C(u8 a0)
 }
 #endif
 
+void sub_8048C70(void)
+{
+    int i;
+    for (i = 0; i < PARTY_SIZE; i ++)
+    {
+        if (i < gUnknown_03004824->playerPartyCount)
+        {
+            gSprites[gUnknown_03004824->playerPartyIcons[i]].invisible = FALSE;
+            gUnknown_03004824->tradeIconsActive[i] = TRUE;
+        }
+        else
+        {
+            gUnknown_03004824->tradeIconsActive[i] = FALSE;
+        }
+        if (i < gUnknown_03004824->friendPartyCount)
+        {
+            gSprites[gUnknown_03004824->friendPartyIcons[i]].invisible = FALSE;
+            gUnknown_03004824->tradeIconsActive[i + 6] = TRUE;
+        }
+        else
+        {
+            gUnknown_03004824->tradeIconsActive[i + 6] = FALSE;
+        }
+    }
+    gUnknown_03004824->unk_0050 = TRUE;
+}
+
 asm(".section .text.sub_804A96C");
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From e3ecbe5d7850c50de8882385c1400ed4e77c61b5 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 1 Sep 2017 22:12:35 -0400
Subject: nullsub_5 and sub_8048D24

---
 asm/trade.s | 27 ---------------------------
 src/trade.c |  8 ++++++++
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 5a0634734..cad31d7d7 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,33 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start nullsub_5
-nullsub_5: @ 8048D20
-	bx lr
-	thumb_func_end nullsub_5
-
-	thumb_func_start sub_8048D24
-sub_8048D24: @ 8048D24
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	movs r3, 0
-	cmp r3, r2
-	bcs _08048D3E
-_08048D30:
-	adds r0, r5, r3
-	adds r1, r4, r3
-	ldrb r1, [r1]
-	strb r1, [r0]
-	adds r3, 0x1
-	cmp r3, r2
-	bcc _08048D30
-_08048D3E:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8048D24
-
 	thumb_func_start sub_8048D44
 sub_8048D44: @ 8048D44
 	push {r4-r7,lr}
diff --git a/src/trade.c b/src/trade.c
index 5b0ea50fe..60b11b63f 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1213,6 +1213,14 @@ void sub_8048C70(void)
     gUnknown_03004824->unk_0050 = TRUE;
 }
 
+void nullsub_5(u8 a0, u8 a1) {}
+
+void sub_8048D24(u8 *dest, const u8 *src, u32 size)
+{
+    int i;
+    for (i = 0; i < size; i ++) dest[i] = src[i];
+}
+
 asm(".section .text.sub_804A96C");
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From af86929d787ca449ab86b3bd8674cbd5c44fb7ea Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 10:18:29 -0400
Subject: sub_8048D44

---
 asm/trade.s    | 378 ---------------------------------------------------------
 data/trade.s   |  69 -----------
 include/text.h |   1 +
 src/trade.c    | 208 ++++++++++++++++++++++++++++++-
 4 files changed, 207 insertions(+), 449 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index cad31d7d7..abfbc523f 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,384 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8048D44
-sub_8048D44: @ 8048D44
-	push {r4-r7,lr}
-	sub sp, 0xC
-	bl GetMultiplayerId
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r6, _08048D90 @ =gUnknown_03004824
-	ldr r0, [r6]
-	adds r0, 0x75
-	ldrb r5, [r0]
-	adds r0, r5, 0
-	movs r1, 0x64
-	bl __udivsi3
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x64
-	bl __umodsi3
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl SetLinkDebugValues
-	ldr r0, [r6]
-	adds r0, 0x75
-	ldrb r0, [r0]
-	cmp r0, 0x10
-	bls _08048D86
-	b _0804907C
-_08048D86:
-	lsls r0, 2
-	ldr r1, _08048D94 @ =_08048D98
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08048D90: .4byte gUnknown_03004824
-_08048D94: .4byte _08048D98
-	.align 2, 0
-_08048D98:
-	.4byte _08048DDC
-	.4byte _08048DF8
-	.4byte _08048E28
-	.4byte _08048E3C
-	.4byte _08048E74
-	.4byte _08048E90
-	.4byte _08048EA4
-	.4byte _08048EDC
-	.4byte _08048EF8
-	.4byte _08048F0C
-	.4byte _08048F44
-	.4byte _08048F60
-	.4byte _08048F74
-	.4byte _08048FAC
-	.4byte _08048FC8
-	.4byte _08048FDC
-	.4byte _08049018
-_08048DDC:
-	ldr r0, _08048DEC @ =gBlockSendBuffer
-	ldr r1, _08048DF0 @ =gPlayerParty
-	movs r2, 0xC8
-	bl sub_8048D24
-	ldr r0, _08048DF4 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048DEC: .4byte gBlockSendBuffer
-_08048DF0: .4byte gPlayerParty
-_08048DF4: .4byte gUnknown_03004824
-_08048DF8:
-	bl sub_8007ECC
-	lsls r0, 24
-	cmp r0, 0
-	bne _08048E04
-	b _0804907C
-_08048E04:
-	bl GetBlockReceivedStatus
-	lsls r0, 24
-	cmp r0, 0
-	bne _08048E18
-	ldr r0, _08048E14 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048E14: .4byte gUnknown_03004824
-_08048E18:
-	bl ResetBlockReceivedFlags
-	ldr r0, _08048E24 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048E24: .4byte gUnknown_03004824
-_08048E28:
-	cmp r7, 0
-	bne _08048E32
-	movs r0, 0x1
-	bl sub_8007E9C
-_08048E32:
-	ldr r0, _08048E38 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048E38: .4byte gUnknown_03004824
-_08048E3C:
-	bl GetBlockReceivedStatus
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	beq _08048E4A
-	b _0804907C
-_08048E4A:
-	ldr r0, _08048E68 @ =gEnemyParty
-	movs r2, 0x1
-	adds r1, r7, 0
-	eors r1, r2
-	lsls r1, 8
-	ldr r2, _08048E6C @ =gBlockRecvBuffer
-	adds r1, r2
-	movs r2, 0xC8
-	bl sub_8048D24
-	bl ResetBlockReceivedFlags
-	ldr r0, _08048E70 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048E68: .4byte gEnemyParty
-_08048E6C: .4byte gBlockRecvBuffer
-_08048E70: .4byte gUnknown_03004824
-_08048E74:
-	ldr r0, _08048E84 @ =gBlockSendBuffer
-	ldr r1, _08048E88 @ =gPlayerParty + 2 * 0x64
-	movs r2, 0xC8
-	bl sub_8048D24
-	ldr r0, _08048E8C @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048E84: .4byte gBlockSendBuffer
-_08048E88: .4byte gPlayerParty + 2 * 0x64
-_08048E8C: .4byte gUnknown_03004824
-_08048E90:
-	cmp r7, 0
-	bne _08048E9A
-	movs r0, 0x1
-	bl sub_8007E9C
-_08048E9A:
-	ldr r0, _08048EA0 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048EA0: .4byte gUnknown_03004824
-_08048EA4:
-	bl GetBlockReceivedStatus
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	beq _08048EB2
-	b _0804907C
-_08048EB2:
-	ldr r0, _08048ED0 @ =gEnemyParty + 2 * 0x64
-	movs r2, 0x1
-	adds r1, r7, 0
-	eors r1, r2
-	lsls r1, 8
-	ldr r2, _08048ED4 @ =gBlockRecvBuffer
-	adds r1, r2
-	movs r2, 0xC8
-	bl sub_8048D24
-	bl ResetBlockReceivedFlags
-	ldr r0, _08048ED8 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048ED0: .4byte gEnemyParty + 2 * 0x64
-_08048ED4: .4byte gBlockRecvBuffer
-_08048ED8: .4byte gUnknown_03004824
-_08048EDC:
-	ldr r0, _08048EEC @ =gBlockSendBuffer
-	ldr r1, _08048EF0 @ =gPlayerParty + 4 * 0x64
-	movs r2, 0xC8
-	bl sub_8048D24
-	ldr r0, _08048EF4 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048EEC: .4byte gBlockSendBuffer
-_08048EF0: .4byte gPlayerParty + 4 * 0x64
-_08048EF4: .4byte gUnknown_03004824
-_08048EF8:
-	cmp r7, 0
-	bne _08048F02
-	movs r0, 0x1
-	bl sub_8007E9C
-_08048F02:
-	ldr r0, _08048F08 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048F08: .4byte gUnknown_03004824
-_08048F0C:
-	bl GetBlockReceivedStatus
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	beq _08048F1A
-	b _0804907C
-_08048F1A:
-	ldr r0, _08048F38 @ =gEnemyParty + 4 * 0x64
-	movs r2, 0x1
-	adds r1, r7, 0
-	eors r1, r2
-	lsls r1, 8
-	ldr r2, _08048F3C @ =gBlockRecvBuffer
-	adds r1, r2
-	movs r2, 0xC8
-	bl sub_8048D24
-	bl ResetBlockReceivedFlags
-	ldr r0, _08048F40 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048F38: .4byte gEnemyParty + 4 * 0x64
-_08048F3C: .4byte gBlockRecvBuffer
-_08048F40: .4byte gUnknown_03004824
-_08048F44:
-	ldr r0, _08048F54 @ =gBlockSendBuffer
-	ldr r1, _08048F58 @ =gSaveBlock1 + 0x2B4C
-	movs r2, 0xDC
-	bl sub_8048D24
-	ldr r0, _08048F5C @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048F54: .4byte gBlockSendBuffer
-_08048F58: .4byte gSaveBlock1 + 0x2B4C
-_08048F5C: .4byte gUnknown_03004824
-_08048F60:
-	cmp r7, 0
-	bne _08048F6A
-	movs r0, 0x3
-	bl sub_8007E9C
-_08048F6A:
-	ldr r0, _08048F70 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048F70: .4byte gUnknown_03004824
-_08048F74:
-	bl GetBlockReceivedStatus
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	beq _08048F82
-	b _0804907C
-_08048F82:
-	ldr r0, _08048FA0 @ =gUnknown_02029700
-	movs r2, 0x1
-	adds r1, r7, 0
-	eors r1, r2
-	lsls r1, 8
-	ldr r2, _08048FA4 @ =gBlockRecvBuffer
-	adds r1, r2
-	movs r2, 0xD8
-	bl sub_8048D24
-	bl ResetBlockReceivedFlags
-	ldr r0, _08048FA8 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048FA0: .4byte gUnknown_02029700
-_08048FA4: .4byte gBlockRecvBuffer
-_08048FA8: .4byte gUnknown_03004824
-_08048FAC:
-	ldr r0, _08048FBC @ =gBlockSendBuffer
-	ldr r1, _08048FC0 @ =gSaveBlock1 + 0x3110
-	movs r2, 0xB
-	bl sub_8048D24
-	ldr r0, _08048FC4 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048FBC: .4byte gBlockSendBuffer
-_08048FC0: .4byte gSaveBlock1 + 0x3110
-_08048FC4: .4byte gUnknown_03004824
-_08048FC8:
-	cmp r7, 0
-	bne _08048FD2
-	movs r0, 0x4
-	bl sub_8007E9C
-_08048FD2:
-	ldr r0, _08048FD8 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _08049006
-	.align 2, 0
-_08048FD8: .4byte gUnknown_03004824
-_08048FDC:
-	bl GetBlockReceivedStatus
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	bne _0804907C
-	ldr r4, _08049010 @ =gUnknown_03004824
-	ldr r0, [r4]
-	adds r0, 0xB5
-	movs r2, 0x1
-	adds r1, r7, 0
-	eors r1, r2
-	lsls r1, 8
-	ldr r2, _08049014 @ =gBlockRecvBuffer
-	adds r1, r2
-	movs r2, 0xB
-	bl sub_8048D24
-	bl ResetBlockReceivedFlags
-	ldr r1, [r4]
-_08049006:
-	adds r1, 0x75
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _0804907C
-	.align 2, 0
-_08049010: .4byte gUnknown_03004824
-_08049014: .4byte gBlockRecvBuffer
-_08049018:
-	ldr r4, _0804906C @ =gEnemyParty
-	ldr r6, _08049070 @ =0x0000012f
-	movs r5, 0x5
-_0804901E:
-	adds r0, r4, 0
-	movs r1, 0xB
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0
-	beq _0804905E
-	cmp r0, r6
-	bne _0804905E
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl GetMonData
-	cmp r0, 0x1
-	beq _0804905E
-	adds r0, r4, 0
-	movs r1, 0x2
-	mov r2, sp
-	bl GetMonData
-	mov r0, sp
-	ldr r1, _08049074 @ =gUnknown_0820C3B0
-	bl StringCompareWithoutExtCtrlCodes
-	cmp r0, 0
-	bne _0804905E
-	adds r0, r4, 0
-	movs r1, 0x2
-	ldr r2, _08049078 @ =gSpeciesNames + 0xD05
-	bl SetMonData
-_0804905E:
-	adds r4, 0x64
-	subs r5, 0x1
-	cmp r5, 0
-	bge _0804901E
-	movs r0, 0x1
-	b _0804907E
-	.align 2, 0
-_0804906C: .4byte gEnemyParty
-_08049070: .4byte 0x0000012f
-_08049074: .4byte gUnknown_0820C3B0
-_08049078: .4byte gSpeciesNames + 0xD05
-_0804907C:
-	movs r0, 0
-_0804907E:
-	add sp, 0xC
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8048D44
-
 	thumb_func_start sub_8049088
 sub_8049088: @ 8049088
 	push {lr}
diff --git a/data/trade.s b/data/trade.s
index fcfbd8187..9d224bf36 100644
--- a/data/trade.s
+++ b/data/trade.s
@@ -13,75 +13,6 @@
 @  4  5 10 11
 @          12
 
-	.align 2
-gUnknown_0820C2F0:: @ 820C2F0
-	.4byte TradeText_LinkStandby
-	.4byte TradeText_TradeCancelled
-	.4byte TradeText_OnlyPoke
-	.4byte TradeText_NonTradablePoke
-	.4byte TradeText_WaitingForFriend
-	.4byte TradeText_WantToTrade
-
-gTradeMessageWindowRects:: @ 820C308
-	.byte 8, 7, 22, 12
-	.byte 8, 7, 22, 12
-	.byte 6, 7, 24, 12
-	.byte 6, 7, 24, 12
-	.byte 8, 7, 22, 12
-	.byte 7, 7, 23, 12
-
-	.align 2
-gUnknown_0820C320:: @ 820C320
-	.4byte TradeText_Summary2, sub_804A9F4 @unknown
-	.4byte TradeText_Trade2, sub_804AA00
-
-gUnknown_0820C330:: @ 820C330
-	.byte 0, 14
-	.byte 15, 29
-
-gUnknown_0820C334:: @ 820C334
-	.byte 3, 5
-	.byte 3, 7
-	.byte 18, 5
-	.byte 18, 7
-
-gOtherText_Terminator::
-	.string "$"
-
-gOtherText_MaleSymbol3:: @ 820C33D
-	.string "♂$"
-
-gOtherText_FemaleSymbol3:: @ 820C33F
-	.string "♀$"
-
-gOtherText_GenderlessSymbol:: @ 820C341
-	.string "$$"
-
-	.align 2
-	.4byte gTileBuffer
-
-@ Unused debug strings?
-	.string "かいめの そうしん$", 13
-	.string "かいめの じゅしん$", 13
-	.string "ポケモンアイコンセット$", 13
-	.string "OBJテキストセット$", 13
-	.string "セルセット$", 13
-	.string "OBJテキストADD$", 13
-	.string "システムメッセージADD$", 13
-	.string "はいけいセット$", 13
-
-@ Shedinja's Japanese name
-@ sub_8048D44 compares a pokemon name with this string
-gUnknown_0820C3B0:: @ 820C3B0
-	.string "ヌケニン$"
-
-	.string "こうかんせいりつ     $" @ trade completed
-	.string "だめだたらしいよ     $" @ it's no good (trade failed maybe?)
-
-gUnknown_0820C3D1:: @ 820C3D1
-	.byte 4, 3
-	.byte 19, 3
-
 	.align 2
 gTradeBallPalette:: @ 820C3D8
 	.incbin "graphics/trade/ball.gbapal"
diff --git a/include/text.h b/include/text.h
index 9a70dec11..d0c9f0d9d 100644
--- a/include/text.h
+++ b/include/text.h
@@ -202,6 +202,7 @@ extern u8 gStringVar1[];
 extern u8 gStringVar2[];
 extern u8 gStringVar3[];
 extern u8 gStringVar4[];
+extern u8 gTileBuffer[];
 
 void LoadFontDefaultPalette(const struct WindowConfig *winConfig);
 void SetUpWindowConfig(const struct WindowConfig *winConfig);
diff --git a/src/trade.c b/src/trade.c
index 60b11b63f..d4d5e0b50 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -19,6 +19,7 @@
 #include "party_menu.h"
 #include "songs.h"
 #include "sound.h"
+#include "data2.h"
 
 struct InGameTrade {
     /*0x00*/ u8 name[11];
@@ -87,7 +88,8 @@ struct TradeEwramSubstruct {
     /*0x008a*/ u8 unk_008a;
     /*0x008b*/ u8 filler_008b[0x29];
     /*0x00b4*/ u8 unk_00b4;
-    /*0x00b5*/ u8 filler_00b5[0x13];
+    /*0x00b5*/ u8 unk_00b5[7];
+    /*0x00bc*/ u8 filler_00bc[12];
     /*0x00c8*/ struct UnkStructE unk_00c8;
     /*0x08dc*/ u8 filler_04dc[0x724];
 };
@@ -133,11 +135,14 @@ void sub_804AB30(void);
 void sub_8049ED4(u8);
 void sub_804A6DC(u8);
 void sub_804A938(struct UnkStructE *);
+u8 sub_804A9F4(void);
+u8 sub_804AA00(void);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
 extern struct TradeEwramSubstruct *gUnknown_03004824;
 extern u8 gUnknown_03000508;
+extern struct MailStruct gUnknown_02029700[16];
 
 extern u8 ewram[];
 #define ewram_2010000 (*(struct TradeEwramStruct *)(ewram + 0x10000))
@@ -430,8 +435,68 @@ const u8 gTradeUnknownSpriteCoords[][2][2] = {
     }
 };
 
+const u8 *const gUnknown_0820C2F0[] = {
+    TradeText_LinkStandby,
+    TradeText_TradeCancelled,
+    TradeText_OnlyPoke,
+    TradeText_NonTradablePoke,
+    TradeText_WaitingForFriend,
+    TradeText_WantToTrade
+};
+
+const u8 gTradeMessageWindowRects[][4] = {
+    {8, 7, 22, 12},
+    {8, 7, 22, 12},
+    {6, 7, 24, 12},
+    {6, 7, 24, 12},
+    {8, 7, 22, 12},
+    {7, 7, 23, 12}
+};
+
+const struct MenuAction gUnknown_0820C320[] = {
+    {TradeText_Summary2, sub_804A9F4},
+    {TradeText_Trade2, sub_804AA00}
+};
+
+const u8 gUnknown_0820C330[][2] = {
+    { 0, 14},
+    {15, 29}
+};
+
+const u8 gUnknown_0820C334[][2] = {
+    { 3,  5},
+    { 3,  7},
+    {18,  5},
+    {18,  7}
+};
+
+const u8 gOtherText_Terminator[] = _("");
+const u8 gOtherText_MaleSymbol3[] = _("♂");
+const u8 gOtherText_FemaleSymbol3[] = _("♀");
+const u8 gOtherText_GenderlessSymbol[] = _("$");
+
+u8 *const unref_data_820C344 = gTileBuffer;
+const u8 unref_strings_820C348[][13] = {
+    _("かいめの そうしん"),
+    _("かいめの じゅしん"),
+    _("ポケモンアイコンセット"),
+    _("OBJテキストセット"),
+    _("セルセット"),
+    _("OBJテキストADD"),
+    _("システムメッセージADD"),
+    _("はいけいセット"),
+};
+
+const u8 gUnknown_0820C3B0[] = _("ヌケニン");
+const u8 unref_string_0820C3B5[] = _("こうかんせいりつ     ");
+const u8 unref_string_0820C3C3[] = _("だめだたらしいよ     ");
+const u8 gUnknown_0820C3D1[][2] = {
+    { 4,  3},
+    {19,  3}
+};
 
 asm(".section .rodata.igt");
+
 const struct InGameTrade gIngameTrades[] = {
     {
         _("MAKIT"), SPECIES_MAKUHITA,
@@ -520,6 +585,8 @@ const s8 gTradeBallVerticalVelocityTable[] = {
     1,  1,  2,  3
 };
 
+// .text
+
 void sub_8047CD8(void)
 {
     SetMainCallback2(sub_8047EC0);
@@ -1215,12 +1282,149 @@ void sub_8048C70(void)
 
 void nullsub_5(u8 a0, u8 a1) {}
 
-void sub_8048D24(u8 *dest, const u8 *src, u32 size)
+static void sub_8048D24(u8 *dest, const u8 *src, u32 size)
 {
     int i;
     for (i = 0; i < size; i ++) dest[i] = src[i];
 }
 
+bool8 sub_8048D44(void)
+{
+    u8 mpId = GetMultiplayerId();
+    int i;
+    u16 species;
+    u8 nickname[11];
+    struct Pokemon *pokemon;
+
+    SetLinkDebugValues(gUnknown_03004824->unk_0075 / 100, gUnknown_03004824->unk_0075 % 100);
+    switch (gUnknown_03004824->unk_0075)
+    {
+        case  0:
+            sub_8048D24(gBlockSendBuffer, (const u8 *)&gPlayerParty[0], 2 * sizeof(struct Pokemon));
+            gUnknown_03004824->unk_0075 ++;
+            break;
+        case  1:
+            if (sub_8007ECC())
+            {
+                if (GetBlockReceivedStatus() == 0)
+                {
+                    gUnknown_03004824->unk_0075 ++;
+                }
+                else
+                {
+                    ResetBlockReceivedFlags();
+                    gUnknown_03004824->unk_0075 ++;
+                }
+            }
+            break;
+        case  2:
+            if (mpId == 0)
+            {
+                sub_8007E9C(1);
+            }
+            gUnknown_03004824->unk_0075 ++;
+            break;
+        case  3:
+            if (GetBlockReceivedStatus() == 3)
+            {
+                sub_8048D24((u8 *)&gEnemyParty[0], (const u8 *)gBlockRecvBuffer[mpId ^ 1], 2 * sizeof(struct Pokemon));
+                ResetBlockReceivedFlags();
+                gUnknown_03004824->unk_0075 ++;
+            }
+            break;
+        case  4:
+            sub_8048D24(gBlockSendBuffer, (const u8 *)&gPlayerParty[2], 2 * sizeof(struct Pokemon));
+            gUnknown_03004824->unk_0075 ++;
+            break;
+        case  5:
+            if (mpId == 0)
+            {
+                sub_8007E9C(1);
+            }
+            gUnknown_03004824->unk_0075 ++;
+            break;
+        case  6:
+            if (GetBlockReceivedStatus() == 3)
+            {
+                sub_8048D24((u8 *)&gEnemyParty[2], (const u8 *)gBlockRecvBuffer[mpId ^ 1], 2 * sizeof(struct Pokemon));
+                ResetBlockReceivedFlags();
+                gUnknown_03004824->unk_0075 ++;
+            }
+            break;
+        case  7:
+            sub_8048D24(gBlockSendBuffer, (const u8 *)&gPlayerParty[4], 2 * sizeof(struct Pokemon));
+            gUnknown_03004824->unk_0075 ++;
+            break;
+        case  8:
+            if (mpId == 0)
+            {
+                sub_8007E9C(1);
+            }
+            gUnknown_03004824->unk_0075 ++;
+            break;
+        case  9:
+            if (GetBlockReceivedStatus() == 3)
+            {
+                sub_8048D24((u8 *)&gEnemyParty[4], (const u8 *)gBlockRecvBuffer[mpId ^ 1], 2 * sizeof(struct Pokemon));
+                ResetBlockReceivedFlags();
+                gUnknown_03004824->unk_0075 ++;
+            }
+            break;
+        case 10:
+            sub_8048D24(gBlockSendBuffer, (const u8 *)&gSaveBlock1.mail[0], 6 * sizeof(struct MailStruct) + 4);
+            gUnknown_03004824->unk_0075 ++;
+            break;
+        case 11:
+            if (mpId == 0)
+            {
+                sub_8007E9C(3);
+            }
+            gUnknown_03004824->unk_0075 ++;
+            break;
+        case 12:
+            if (GetBlockReceivedStatus() == 3)
+            {
+                sub_8048D24((u8 *)&gUnknown_02029700[0], (const u8 *)gBlockRecvBuffer[mpId ^ 1], 6 * sizeof(struct MailStruct));
+                ResetBlockReceivedFlags();
+                gUnknown_03004824->unk_0075 ++;
+            }
+            break;
+        case 13:
+            sub_8048D24(gBlockSendBuffer, (const u8 *)gSaveBlock1.giftRibbons, 11);
+            gUnknown_03004824->unk_0075 ++;
+            break;
+        case 14:
+            if (mpId == 0)
+            {
+                sub_8007E9C(4);
+            }
+            gUnknown_03004824->unk_0075 ++;
+            break;
+        case 15:
+            if (GetBlockReceivedStatus() == 3)
+            {
+                sub_8048D24((u8 *)gUnknown_03004824->unk_00b5, (const u8 *)gBlockRecvBuffer[mpId ^ 1], 11);
+                ResetBlockReceivedFlags();
+                gUnknown_03004824->unk_0075 ++;
+            }
+            break;
+        case 16:
+            pokemon = gEnemyParty;
+            for (i = 0; i < PARTY_SIZE; i ++)
+            {
+                if ((species = GetMonData(pokemon, MON_DATA_SPECIES)) != SPECIES_NONE && species == SPECIES_SHEDINJA && GetMonData(pokemon, MON_DATA_LANGUAGE) != LANGUAGE_JAPANESE)
+                {
+                    GetMonData(pokemon, MON_DATA_NICKNAME, nickname);
+                    if (!StringCompareWithoutExtCtrlCodes(nickname, gUnknown_0820C3B0))
+                        SetMonData(pokemon, MON_DATA_NICKNAME, gSpeciesNames[SPECIES_SHEDINJA]);
+                }
+                pokemon ++;
+            }
+            return TRUE;
+    }
+    return FALSE;
+}
+
 asm(".section .text.sub_804A96C");
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 2f903c67c9ffbdbec52e1982bbe6cb064e0d1138 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 10:27:59 -0400
Subject: sub_8049088

---
 asm/trade.s | 26 --------------------------
 src/trade.c | 10 +++++++++-
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index abfbc523f..02f09a046 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,32 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049088
-sub_8049088: @ 8049088
-	push {lr}
-	sub sp, 0x1C
-	ldr r1, _080490B0 @ =gTradeText_TradeOkayPrompt
-	mov r0, sp
-	bl StringCopy
-	ldr r0, _080490B4 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x7E
-	ldrh r1, [r0]
-	lsls r1, 5
-	ldr r0, _080490B8 @ =0x06010000
-	adds r1, r0
-	mov r0, sp
-	movs r2, 0x14
-	bl sub_804ACD8
-	add sp, 0x1C
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080490B0: .4byte gTradeText_TradeOkayPrompt
-_080490B4: .4byte gUnknown_03004824
-_080490B8: .4byte 0x06010000
-	thumb_func_end sub_8049088
-
 	thumb_func_start sub_80490BC
 sub_80490BC: @ 80490BC
 	push {r4,lr}
diff --git a/src/trade.c b/src/trade.c
index d4d5e0b50..a8f3bf6e8 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -78,7 +78,8 @@ struct TradeEwramSubstruct {
     /*0x007a*/ u8 unk_007a;
     /*0x007b*/ u8 unk_007b;
     /*0x007c*/ u8 unk_007c;
-    /*0x007d*/ u8 filler_007d[3];
+    /*0x007d*/ u8 unk_007d;
+    /*0x007e*/ u16 unk_007e;
     /*0x0080*/ u8 unk_0080;
     /*0x0081*/ u8 unk_0081;
     /*0x0082*/ u8 filler_0082[4];
@@ -1425,6 +1426,13 @@ bool8 sub_8048D44(void)
     return FALSE;
 }
 
+void sub_8049088(void)
+{
+    u8 string[28];
+    StringCopy(string, gTradeText_TradeOkayPrompt);
+    sub_804ACD8(string, (u8 *)BG_CHAR_ADDR(4) + gUnknown_03004824->unk_007e * 32, 20);
+}
+
 asm(".section .text.sub_804A96C");
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From abdaf14f1098be7e65b388ad1960a94c4552bf80 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 11:32:05 -0400
Subject: sub_80490BC

---
 asm/trade.s | 152 ------------------------------------------------------------
 src/trade.c |  51 +++++++++++++++++++-
 2 files changed, 50 insertions(+), 153 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 02f09a046..e298e18c4 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,158 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_80490BC
-sub_80490BC: @ 80490BC
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	lsls r1, 24
-	lsrs r4, r1, 24
-	movs r3, 0x1
-	adds r0, r4, 0
-	ands r0, r3
-	cmp r0, 0
-	beq _08049148
-	ldr r1, _080490EC @ =gBlockRecvBuffer
-	lsls r0, r2, 8
-	adds r0, r1
-	ldrh r1, [r0]
-	ldr r0, _080490F0 @ =0x0000bbbb
-	cmp r1, r0
-	beq _08049128
-	cmp r1, r0
-	bgt _080490F8
-	ldr r0, _080490F4 @ =0x0000aabb
-	cmp r1, r0
-	beq _08049118
-	b _08049142
-	.align 2, 0
-_080490EC: .4byte gBlockRecvBuffer
-_080490F0: .4byte 0x0000bbbb
-_080490F4: .4byte 0x0000aabb
-_080490F8:
-	ldr r0, _0804910C @ =0x0000bbcc
-	cmp r1, r0
-	beq _08049138
-	ldr r0, _08049110 @ =0x0000eeaa
-	cmp r1, r0
-	bne _08049142
-	ldr r0, _08049114 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x84
-	b _0804913E
-	.align 2, 0
-_0804910C: .4byte 0x0000bbcc
-_08049110: .4byte 0x0000eeaa
-_08049114: .4byte gUnknown_03004824
-_08049118:
-	ldr r0, _08049124 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x84
-	strb r3, [r0]
-	b _08049142
-	.align 2, 0
-_08049124: .4byte gUnknown_03004824
-_08049128:
-	ldr r0, _08049134 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x86
-	strb r3, [r0]
-	b _08049142
-	.align 2, 0
-_08049134: .4byte gUnknown_03004824
-_08049138:
-	ldr r0, _08049170 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x86
-_0804913E:
-	movs r1, 0x2
-	strb r1, [r0]
-_08049142:
-	movs r0, 0
-	bl ResetBlockReceivedFlag
-_08049148:
-	movs r2, 0x2
-	adds r0, r4, 0
-	ands r0, r2
-	cmp r0, 0
-	beq _080491DA
-	ldr r3, _08049174 @ =gBlockRecvBuffer
-	movs r1, 0x80
-	lsls r1, 1
-	adds r0, r3, r1
-	ldrh r1, [r0]
-	ldr r0, _08049178 @ =0x0000bbbb
-	cmp r1, r0
-	beq _080491BC
-	cmp r1, r0
-	bgt _08049180
-	ldr r0, _0804917C @ =0x0000aabb
-	cmp r1, r0
-	beq _080491A0
-	b _080491D4
-	.align 2, 0
-_08049170: .4byte gUnknown_03004824
-_08049174: .4byte gBlockRecvBuffer
-_08049178: .4byte 0x0000bbbb
-_0804917C: .4byte 0x0000aabb
-_08049180:
-	ldr r0, _08049194 @ =0x0000bbcc
-	cmp r1, r0
-	beq _080491CC
-	ldr r0, _08049198 @ =0x0000eeaa
-	cmp r1, r0
-	bne _080491D4
-	ldr r0, _0804919C @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x85
-	b _080491D2
-	.align 2, 0
-_08049194: .4byte 0x0000bbcc
-_08049198: .4byte 0x0000eeaa
-_0804919C: .4byte gUnknown_03004824
-_080491A0:
-	ldr r2, _080491B8 @ =gUnknown_03004824
-	ldr r1, [r2]
-	movs r4, 0x81
-	lsls r4, 1
-	adds r0, r3, r4
-	ldrb r0, [r0]
-	adds r0, 0x6
-	adds r1, 0x8A
-	strb r0, [r1]
-	ldr r0, [r2]
-	adds r0, 0x85
-	b _080491C2
-	.align 2, 0
-_080491B8: .4byte gUnknown_03004824
-_080491BC:
-	ldr r0, _080491C8 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x87
-_080491C2:
-	movs r1, 0x1
-	strb r1, [r0]
-	b _080491D4
-	.align 2, 0
-_080491C8: .4byte gUnknown_03004824
-_080491CC:
-	ldr r0, _080491E0 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x87
-_080491D2:
-	strb r2, [r0]
-_080491D4:
-	movs r0, 0x1
-	bl ResetBlockReceivedFlag
-_080491DA:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080491E0: .4byte gUnknown_03004824
-	thumb_func_end sub_80490BC
-
 	thumb_func_start sub_80491E4
 sub_80491E4: @ 80491E4
 	push {r4,r5,lr}
diff --git a/src/trade.c b/src/trade.c
index a8f3bf6e8..440a26ffb 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -82,7 +82,9 @@ struct TradeEwramSubstruct {
     /*0x007e*/ u16 unk_007e;
     /*0x0080*/ u8 unk_0080;
     /*0x0081*/ u8 unk_0081;
-    /*0x0082*/ u8 filler_0082[4];
+    /*0x0082*/ u8 filler_0082[2];
+    /*0x0084*/ u8 unk_0084;
+    /*0x0085*/ u8 unk_0085;
     /*0x0086*/ u8 unk_0086;
     /*0x0087*/ u8 unk_0087;
     /*0x0088*/ u8 filler_0088[2];
@@ -139,6 +141,10 @@ void sub_804A938(struct UnkStructE *);
 u8 sub_804A9F4(void);
 u8 sub_804AA00(void);
 
+#ifdef ENGLISH
+#define sub_804A96C_alt sub_804A96C
+#endif
+
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
 extern struct TradeEwramSubstruct *gUnknown_03004824;
@@ -1433,6 +1439,49 @@ void sub_8049088(void)
     sub_804ACD8(string, (u8 *)BG_CHAR_ADDR(4) + gUnknown_03004824->unk_007e * 32, 20);
 }
 
+void sub_80490BC(u8 a0, u8 a1)
+{
+    if (a1 & 1)
+    {
+        switch (gBlockRecvBuffer[a0][0])
+        {
+            case 0xeeaa:
+                gUnknown_03004824->unk_0084 = 2;
+                break;
+            case 0xaabb:
+                gUnknown_03004824->unk_0084 = 1;
+                break;
+            case 0xbbbb:
+                gUnknown_03004824->unk_0086 = 1;
+                break;
+            case 0xbbcc:
+                gUnknown_03004824->unk_0086 = 2;
+                break;
+        }
+        ResetBlockReceivedFlag(0);
+    }
+    if (a1 & 2)
+    {
+        switch (gBlockRecvBuffer[1][0])
+        {
+            case 0xeeaa:
+                gUnknown_03004824->unk_0085 = 2;
+                break;
+            case 0xaabb:
+                gUnknown_03004824->unk_008a = gBlockRecvBuffer[1][1] + 6;
+                gUnknown_03004824->unk_0085 = 1;
+                break;
+            case 0xbbbb:
+                gUnknown_03004824->unk_0087 = 1;
+                break;
+            case 0xbbcc:
+                gUnknown_03004824->unk_0087 = 2;
+                break;
+        }
+        ResetBlockReceivedFlag(1);
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 84471b024d0ca28200b49416d022c6c588b3546e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 11:40:02 -0400
Subject: sub_80491E4

---
 asm/trade.s | 124 ------------------------------------------------------------
 src/trade.c |  39 +++++++++++++++++++
 2 files changed, 39 insertions(+), 124 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index e298e18c4..ebfeb8132 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,130 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_80491E4
-sub_80491E4: @ 80491E4
-	push {r4,r5,lr}
-	sub sp, 0x4
-	lsls r1, 24
-	lsrs r5, r1, 24
-	movs r0, 0x1
-	ands r0, r5
-	cmp r0, 0
-	beq _080492BE
-	ldr r2, _08049210 @ =gBlockRecvBuffer
-	ldrh r1, [r2]
-	ldr r0, _08049214 @ =0x0000ddee
-	cmp r1, r0
-	beq _080492A8
-	cmp r1, r0
-	bgt _08049220
-	ldr r0, _08049218 @ =0x0000ccdd
-	cmp r1, r0
-	beq _08049288
-	ldr r0, _0804921C @ =0x0000dddd
-	cmp r1, r0
-	beq _0804925C
-	b _080492B8
-	.align 2, 0
-_08049210: .4byte gBlockRecvBuffer
-_08049214: .4byte 0x0000ddee
-_08049218: .4byte 0x0000ccdd
-_0804921C: .4byte 0x0000dddd
-_08049220:
-	ldr r0, _08049230 @ =0x0000eebb
-	cmp r1, r0
-	beq _08049234
-	adds r0, 0x11
-	cmp r1, r0
-	beq _08049258
-	b _080492B8
-	.align 2, 0
-_08049230: .4byte 0x0000eebb
-_08049234:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	movs r0, 0x4
-	bl sub_804AA0C
-	ldr r0, _08049254 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x7B
-	movs r1, 0xB
-	b _080492B6
-	.align 2, 0
-_08049254: .4byte gUnknown_03004824
-_08049258:
-	movs r0, 0x5
-	b _080492AA
-_0804925C:
-	ldr r4, _08049284 @ =gUnknown_03004824
-	ldr r1, [r4]
-	ldrb r0, [r2, 0x2]
-	adds r0, 0x6
-	adds r1, 0x8A
-	strb r0, [r1]
-	ldr r0, [r4]
-	adds r0, 0x41
-	ldrb r0, [r0]
-	bl sub_8049E9C
-	ldr r0, [r4]
-	adds r0, 0x8A
-	ldrb r0, [r0]
-	bl sub_8049E9C
-	ldr r0, [r4]
-	adds r0, 0x7B
-	movs r1, 0x7
-	b _080492B6
-	.align 2, 0
-_08049284: .4byte gUnknown_03004824
-_08049288:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r0, _080492A4 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x7B
-	movs r1, 0xA
-	b _080492B6
-	.align 2, 0
-_080492A4: .4byte gUnknown_03004824
-_080492A8:
-	movs r0, 0x1
-_080492AA:
-	bl sub_804AA0C
-	ldr r0, _080492D4 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x7B
-	movs r1, 0x8
-_080492B6:
-	strb r1, [r0]
-_080492B8:
-	movs r0, 0
-	bl ResetBlockReceivedFlag
-_080492BE:
-	movs r0, 0x2
-	ands r0, r5
-	cmp r0, 0
-	beq _080492CC
-	movs r0, 0x1
-	bl ResetBlockReceivedFlag
-_080492CC:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080492D4: .4byte gUnknown_03004824
-	thumb_func_end sub_80491E4
-
 	thumb_func_start sub_80492D8
 sub_80492D8: @ 80492D8
 	push {r4-r6,lr}
diff --git a/src/trade.c b/src/trade.c
index 440a26ffb..ee4853944 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -140,6 +140,7 @@ void sub_804A6DC(u8);
 void sub_804A938(struct UnkStructE *);
 u8 sub_804A9F4(void);
 u8 sub_804AA00(void);
+void sub_8049E9C(u8);
 
 #ifdef ENGLISH
 #define sub_804A96C_alt sub_804A96C
@@ -1482,6 +1483,44 @@ void sub_80490BC(u8 a0, u8 a1)
     }
 }
 
+void sub_80491E4(u8 unused, u8 a1)
+{
+    if (a1 & 1)
+    {
+        switch (gBlockRecvBuffer[0][0])
+        {
+            case 0xeebb:
+                BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+                sub_804AA0C(4);
+                gUnknown_03004824->unk_007b = 11;
+                break;
+            case 0xeecc:
+                sub_804AA0C(5);
+                gUnknown_03004824->unk_007b = 8;
+                break;
+            case 0xdddd:
+                gUnknown_03004824->unk_008a = ((u8 *)gBlockRecvBuffer[0])[1 * sizeof(u16)] + 6;
+                sub_8049E9C(gUnknown_03004824->unk_0041);
+                sub_8049E9C(gUnknown_03004824->unk_008a);
+                gUnknown_03004824->unk_007b = 7;
+                break;
+            case 0xccdd:
+                BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+                gUnknown_03004824->unk_007b = 10;
+                break;
+            case 0xddee:
+                sub_804AA0C(1);
+                gUnknown_03004824->unk_007b = 8;
+                break;
+        }
+        ResetBlockReceivedFlag(0);
+    }
+    if (a1 & 2)
+    {
+        ResetBlockReceivedFlag(1);
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 4f684294677b00c4ebf78cf957e16b32882dfa09 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 11:58:00 -0400
Subject: sub_80492D8

---
 asm/trade.s | 251 ------------------------------------------------------------
 src/trade.c |  72 ++++++++++++++++-
 2 files changed, 71 insertions(+), 252 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index ebfeb8132..d986d09e3 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,257 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_80492D8
-sub_80492D8: @ 80492D8
-	push {r4-r6,lr}
-	sub sp, 0x4
-	ldr r6, _08049334 @ =gUnknown_03004824
-	ldr r2, [r6]
-	adds r1, r2, 0
-	adds r1, 0x84
-	ldrb r0, [r1]
-	cmp r0, 0
-	bne _080492EC
-	b _08049420
-_080492EC:
-	adds r0, r2, 0
-	adds r0, 0x85
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080492F8
-	b _08049420
-_080492F8:
-	ldrh r1, [r1]
-	ldr r0, _08049338 @ =0x00000101
-	cmp r1, r0
-	bne _08049340
-	adds r1, r2, 0
-	adds r1, 0x7B
-	movs r0, 0x6
-	strb r0, [r1]
-	ldr r2, [r6]
-	adds r1, r2, 0
-	adds r1, 0x8C
-	movs r4, 0
-	ldr r0, _0804933C @ =0x0000dddd
-	strh r0, [r1]
-	adds r0, r2, 0
-	adds r0, 0x41
-	ldrb r1, [r0]
-	adds r0, 0x4D
-	strh r1, [r0]
-	movs r0, 0x5
-	movs r1, 0
-	bl sub_804AADC
-	ldr r0, [r6]
-	adds r2, r0, 0
-	adds r2, 0x85
-	strb r4, [r2]
-	adds r0, 0x84
-	strb r4, [r0]
-	b _08049420
-	.align 2, 0
-_08049334: .4byte gUnknown_03004824
-_08049338: .4byte 0x00000101
-_0804933C: .4byte 0x0000dddd
-_08049340:
-	ldr r0, _08049388 @ =0x00000201
-	cmp r1, r0
-	bne _08049390
-	movs r0, 0x1
-	bl sub_804AA0C
-	ldr r1, [r6]
-	adds r2, r1, 0
-	adds r2, 0x8C
-	movs r4, 0
-	movs r3, 0
-	ldr r0, _0804938C @ =0x0000eecc
-	strh r0, [r2]
-	adds r1, 0x8E
-	strh r3, [r1]
-	movs r0, 0x5
-	movs r1, 0
-	bl sub_804AADC
-	ldr r0, [r6]
-	adds r1, r0, 0
-	adds r1, 0x87
-	strb r4, [r1]
-	adds r0, 0x86
-	strb r4, [r0]
-	ldr r0, [r6]
-	adds r1, r0, 0
-	adds r1, 0x85
-	strb r4, [r1]
-	adds r0, 0x84
-	strb r4, [r0]
-	ldr r0, [r6]
-	adds r0, 0x7B
-	movs r1, 0x8
-	b _0804941E
-	.align 2, 0
-_08049388: .4byte 0x00000201
-_0804938C: .4byte 0x0000eecc
-_08049390:
-	movs r0, 0x81
-	lsls r0, 1
-	cmp r1, r0
-	bne _080493DC
-	movs r0, 0x5
-	bl sub_804AA0C
-	ldr r1, [r6]
-	adds r2, r1, 0
-	adds r2, 0x8C
-	movs r4, 0
-	movs r3, 0
-	ldr r0, _080493D8 @ =0x0000ddee
-	strh r0, [r2]
-	adds r1, 0x8E
-	strh r3, [r1]
-	movs r0, 0x5
-	movs r1, 0
-	bl sub_804AADC
-	ldr r0, [r6]
-	adds r1, r0, 0
-	adds r1, 0x87
-	strb r4, [r1]
-	adds r0, 0x86
-	strb r4, [r0]
-	ldr r0, [r6]
-	adds r1, r0, 0
-	adds r1, 0x85
-	strb r4, [r1]
-	adds r0, 0x84
-	strb r4, [r0]
-	ldr r0, [r6]
-	adds r0, 0x7B
-	movs r1, 0x8
-	b _0804941E
-	.align 2, 0
-_080493D8: .4byte 0x0000ddee
-_080493DC:
-	ldr r0, _080494C0 @ =0x00000202
-	cmp r1, r0
-	bne _08049420
-	adds r1, r2, 0
-	adds r1, 0x8C
-	movs r5, 0
-	movs r4, 0
-	ldr r0, _080494C4 @ =0x0000eebb
-	strh r0, [r1]
-	adds r0, r2, 0
-	adds r0, 0x8E
-	strh r4, [r0]
-	movs r0, 0x5
-	movs r1, 0
-	bl sub_804AADC
-	movs r0, 0x1
-	negs r0, r0
-	str r4, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r0, [r6]
-	adds r1, r0, 0
-	adds r1, 0x85
-	strb r5, [r1]
-	adds r0, 0x84
-	strb r5, [r0]
-	ldr r0, [r6]
-	adds r0, 0x7B
-	movs r1, 0xB
-_0804941E:
-	strb r1, [r0]
-_08049420:
-	ldr r5, _080494C8 @ =gUnknown_03004824
-	ldr r3, [r5]
-	adds r1, r3, 0
-	adds r1, 0x86
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _080494B8
-	adds r0, r3, 0
-	adds r0, 0x87
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _080494B8
-	ldrh r1, [r1]
-	ldr r0, _080494CC @ =0x00000101
-	cmp r1, r0
-	bne _0804946E
-	adds r1, r3, 0
-	adds r1, 0x8C
-	movs r4, 0
-	movs r2, 0
-	ldr r0, _080494D0 @ =0x0000ccdd
-	strh r0, [r1]
-	adds r0, r3, 0
-	adds r0, 0x8E
-	strh r2, [r0]
-	movs r0, 0x5
-	movs r1, 0
-	bl sub_804AADC
-	ldr r0, [r5]
-	adds r0, 0x86
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x87
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x7B
-	movs r1, 0x9
-	strb r1, [r0]
-_0804946E:
-	ldr r1, [r5]
-	adds r0, r1, 0
-	adds r0, 0x86
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	beq _08049484
-	adds r0, r1, 0
-	adds r0, 0x87
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _080494B8
-_08049484:
-	movs r0, 0x1
-	bl sub_804AA0C
-	ldr r1, [r5]
-	adds r2, r1, 0
-	adds r2, 0x8C
-	movs r4, 0
-	movs r3, 0
-	ldr r0, _080494D4 @ =0x0000ddee
-	strh r0, [r2]
-	adds r1, 0x8E
-	strh r3, [r1]
-	movs r0, 0x5
-	movs r1, 0
-	bl sub_804AADC
-	ldr r0, [r5]
-	adds r0, 0x86
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x87
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, 0x7B
-	movs r1, 0x8
-	strb r1, [r0]
-_080494B8:
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080494C0: .4byte 0x00000202
-_080494C4: .4byte 0x0000eebb
-_080494C8: .4byte gUnknown_03004824
-_080494CC: .4byte 0x00000101
-_080494D0: .4byte 0x0000ccdd
-_080494D4: .4byte 0x0000ddee
-	thumb_func_end sub_80492D8
-
 	thumb_func_start sub_80494D8
 sub_80494D8: @ 80494D8
 	push {r4,lr}
diff --git a/src/trade.c b/src/trade.c
index ee4853944..2fc76c820 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -89,7 +89,10 @@ struct TradeEwramSubstruct {
     /*0x0087*/ u8 unk_0087;
     /*0x0088*/ u8 filler_0088[2];
     /*0x008a*/ u8 unk_008a;
-    /*0x008b*/ u8 filler_008b[0x29];
+    /*0x008b*/ u8 unk_008b;
+    /*0x008c*/ u16 unk_008c;
+    /*0x008e*/ u16 unk_008e;
+    /*0x0090*/ u8 filler_0090[0x24];
     /*0x00b4*/ u8 unk_00b4;
     /*0x00b5*/ u8 unk_00b5[7];
     /*0x00bc*/ u8 filler_00bc[12];
@@ -141,6 +144,7 @@ void sub_804A938(struct UnkStructE *);
 u8 sub_804A9F4(void);
 u8 sub_804AA00(void);
 void sub_8049E9C(u8);
+void sub_804AADC(u8, u8);
 
 #ifdef ENGLISH
 #define sub_804A96C_alt sub_804A96C
@@ -1521,6 +1525,72 @@ void sub_80491E4(u8 unused, u8 a1)
     }
 }
 
+void sub_80492D8(void)
+{
+    if (gUnknown_03004824->unk_0084 && gUnknown_03004824->unk_0085)
+    {
+        if (gUnknown_03004824->unk_0084 == 1 && gUnknown_03004824->unk_0085 == 1)
+        {
+            gUnknown_03004824->unk_007b = 6;
+            gUnknown_03004824->unk_008c = 0xdddd;
+            gUnknown_03004824->unk_008e = gUnknown_03004824->unk_0041;
+            sub_804AADC(5, 0);
+            gUnknown_03004824->unk_0084 = gUnknown_03004824->unk_0085 = 0;
+        }
+        else if (gUnknown_03004824->unk_0084 == 1 && gUnknown_03004824->unk_0085 == 2)
+        {
+            sub_804AA0C(1);
+            gUnknown_03004824->unk_008c = 0xeecc;
+            gUnknown_03004824->unk_008e = 0;
+            sub_804AADC(5, 0);
+            gUnknown_03004824->unk_0086 = gUnknown_03004824->unk_0087 = 0;
+            gUnknown_03004824->unk_0084 = gUnknown_03004824->unk_0085 = 0;
+            gUnknown_03004824->unk_007b = 8;
+        }
+        else if (gUnknown_03004824->unk_0084 == 2 && gUnknown_03004824->unk_0085 == 1)
+        {
+            sub_804AA0C(5);
+            gUnknown_03004824->unk_008c = 0xddee;
+            gUnknown_03004824->unk_008e = 0;
+            sub_804AADC(5, 0);
+            gUnknown_03004824->unk_0086 = gUnknown_03004824->unk_0087 = 0;
+            gUnknown_03004824->unk_0084 = gUnknown_03004824->unk_0085 = 0;
+            gUnknown_03004824->unk_007b = 8;
+        }
+        else if (gUnknown_03004824->unk_0084 == 2 && gUnknown_03004824->unk_0085 == 2)
+        {
+            gUnknown_03004824->unk_008c = 0xeebb;
+            gUnknown_03004824->unk_008e = 0;
+            sub_804AADC(5, 0);
+            BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+            gUnknown_03004824->unk_0084 = gUnknown_03004824->unk_0085 = 0;
+            gUnknown_03004824->unk_007b = 11;
+        }
+    }
+    if (gUnknown_03004824->unk_0086 && gUnknown_03004824->unk_0087)
+    {
+        if (gUnknown_03004824->unk_0086 == 1 && gUnknown_03004824->unk_0087 == 1)
+        {
+            gUnknown_03004824->unk_008c = 0xccdd;
+            gUnknown_03004824->unk_008e = 0;
+            sub_804AADC(5, 0);
+            gUnknown_03004824->unk_0086 = 0;
+            gUnknown_03004824->unk_0087 = 0;
+            gUnknown_03004824->unk_007b = 9;
+        }
+        if (gUnknown_03004824->unk_0086 == 2 || gUnknown_03004824->unk_0087 == 2)
+        {
+            sub_804AA0C(1);
+            gUnknown_03004824->unk_008c = 0xddee;
+            gUnknown_03004824->unk_008e = 0;
+            sub_804AADC(5, 0);
+            gUnknown_03004824->unk_0086 = 0;
+            gUnknown_03004824->unk_0087 = 0;
+            gUnknown_03004824->unk_007b = 8;
+        }
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From fd5ccd263652760f3c0c77fb0b727a01ef9d83a0 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 12:02:53 -0400
Subject: sub_80494D8

---
 asm/trade.s | 31 -------------------------------
 src/trade.c | 28 ++++++++++++++++++++++------
 2 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index d986d09e3..5ac3ba35e 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,37 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_80494D8
-sub_80494D8: @ 80494D8
-	push {r4,lr}
-	bl GetMultiplayerId
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl GetBlockReceivedStatus
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	beq _08049504
-	cmp r4, 0
-	bne _080494FA
-	movs r0, 0
-	bl sub_80490BC
-	b _08049500
-_080494FA:
-	adds r0, r4, 0
-	bl sub_80491E4
-_08049500:
-	bl ResetBlockReceivedFlags
-_08049504:
-	cmp r4, 0
-	bne _0804950C
-	bl sub_80492D8
-_0804950C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80494D8
-
 	thumb_func_start sub_8049514
 sub_8049514: @ 8049514
 	push {r4-r6,lr}
diff --git a/src/trade.c b/src/trade.c
index 2fc76c820..78befff44 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1444,11 +1444,11 @@ void sub_8049088(void)
     sub_804ACD8(string, (u8 *)BG_CHAR_ADDR(4) + gUnknown_03004824->unk_007e * 32, 20);
 }
 
-void sub_80490BC(u8 a0, u8 a1)
+static void sub_80490BC(u8 mpId, u8 a1)
 {
     if (a1 & 1)
     {
-        switch (gBlockRecvBuffer[a0][0])
+        switch (gBlockRecvBuffer[mpId][0])
         {
             case 0xeeaa:
                 gUnknown_03004824->unk_0084 = 2;
@@ -1487,9 +1487,9 @@ void sub_80490BC(u8 a0, u8 a1)
     }
 }
 
-void sub_80491E4(u8 unused, u8 a1)
+static void sub_80491E4(u8 mpId, u8 status)
 {
-    if (a1 & 1)
+    if (status & 1)
     {
         switch (gBlockRecvBuffer[0][0])
         {
@@ -1519,13 +1519,13 @@ void sub_80491E4(u8 unused, u8 a1)
         }
         ResetBlockReceivedFlag(0);
     }
-    if (a1 & 2)
+    if (status & 2)
     {
         ResetBlockReceivedFlag(1);
     }
 }
 
-void sub_80492D8(void)
+static void sub_80492D8(void)
 {
     if (gUnknown_03004824->unk_0084 && gUnknown_03004824->unk_0085)
     {
@@ -1591,6 +1591,22 @@ void sub_80492D8(void)
     }
 }
 
+void sub_80494D8(void)
+{
+    u8 mpId = GetMultiplayerId();
+    u8 status = GetBlockReceivedStatus();
+    if (status)
+    {
+        if (mpId == 0)
+            sub_80490BC(mpId, status);
+        else
+            sub_80491E4(mpId, status);
+        ResetBlockReceivedFlags();
+    }
+    if (mpId == 0)
+        sub_80492D8();
+}
+
 asm(".section .text.sub_804A96C");
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 4ba14aacde2d62ada21ed1054d642fc17aac870e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 12:20:18 -0400
Subject: Add static decorations where possible

---
 include/party_menu.h |   1 +
 include/trade.h      |  10 +++++
 src/trade.c          | 113 +++++++++++++++++++++++++--------------------------
 3 files changed, 67 insertions(+), 57 deletions(-)
 create mode 100644 include/trade.h

diff --git a/include/party_menu.h b/include/party_menu.h
index f3af77191..8abaf58f4 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -152,5 +152,6 @@ void DoRareCandyItemEffect(u8, u16, TaskFunc);
 void Task_RareCandy1(u8);
 void Task_RareCandy2(u8);
 void sub_8070848(u8 taskId);
+void sub_809D62C(struct Sprite *);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/trade.h b/include/trade.h
new file mode 100644
index 000000000..04f474194
--- /dev/null
+++ b/include/trade.h
@@ -0,0 +1,10 @@
+//
+// Created by scott on 9/2/2017.
+//
+
+#ifndef POKERUBY_TRADE_H
+#define POKERUBY_TRADE_H
+
+void sub_8047CD8(void);
+
+#endif //POKERUBY_TRADE_H
diff --git a/src/trade.c b/src/trade.c
index 78befff44..8bdc9865c 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -20,6 +20,11 @@
 #include "songs.h"
 #include "sound.h"
 #include "data2.h"
+#include "trade.h"
+
+#ifdef ENGLISH
+#define sub_804A96C_alt sub_804A96C
+#endif
 
 struct InGameTrade {
     /*0x00*/ u8 name[11];
@@ -114,41 +119,36 @@ struct TradeEwramStruct {
     /*0x0d000*/ u8 tileBuffers[13][256];
 };
 
-void sub_8047EC0(void);
-void sub_804AFB8(const struct WindowConfig *, u8 *, const u8 *, u8);
-void sub_804ACD8(const u8 *, u8 *, u8);
-void nullsub_5(u8, u8);
-void sub_804AA88(void);
-void sub_804A964(struct UnkStructE *, void *);
-void sub_80489F4(void);
-void sub_804AA0C(u8);
-bool8 sub_8048D44(void);
-void sub_804AF84(void);
-void sub_809D62C(struct Sprite *);
-bool8 sub_804ABF8(void);
-void sub_804ACF4(u8);
-void sub_804A41C(u8);
-void sub_8048C70(void);
-void sub_8048B0C(u8);
-void sub_804AE3C(u8);
-void sub_804AF10(void);
-void sub_80494D8(void);
-void sub_8048AB4(void);
-void sub_804A940(struct UnkStructE *);
-void sub_804B41C(void);
-void sub_8049DE0(void);
-void sub_804AB30(void);
-void sub_8049ED4(u8);
-void sub_804A6DC(u8);
-void sub_804A938(struct UnkStructE *);
-u8 sub_804A9F4(void);
-u8 sub_804AA00(void);
-void sub_8049E9C(u8);
-void sub_804AADC(u8, u8);
-
-#ifdef ENGLISH
-#define sub_804A96C_alt sub_804A96C
-#endif
+static void sub_8047EC0(void);
+/*static*/ void sub_804AFB8(const struct WindowConfig *, u8 *, const u8 *, u8);
+/*static*/ void sub_804ACD8(const u8 *, u8 *, u8);
+static void nullsub_5(u8, u8);
+/*static*/ void sub_804AA88(void);
+/*static*/ void sub_804A964(struct UnkStructE *, void *);
+static void sub_80489F4(void);
+/*static*/ void sub_804AA0C(u8);
+static bool8 sub_8048D44(void);
+/*static*/ void sub_804AF84(void);
+/*static*/ bool8 sub_804ABF8(void);
+/*static*/ void sub_804ACF4(u8);
+/*static*/ void sub_804A41C(u8);
+static void sub_8048C70(void);
+static void sub_8048B0C(u8);
+/*static*/ void sub_804AE3C(u8);
+/*static*/ void sub_804AF10(void);
+static void sub_80494D8(void);
+static void sub_8048AB4(void);
+/*static*/ void sub_804A940(struct UnkStructE *);
+/*static*/ void sub_804B41C(void);
+/*static*/ void sub_8049DE0(void);
+/*static*/ void sub_804AB30(void);
+/*static*/ void sub_8049ED4(u8);
+/*static*/ void sub_804A6DC(u8);
+/*static*/ void sub_804A938(struct UnkStructE *);
+/*static*/ u8 sub_804A9F4(void);
+/*static*/ u8 sub_804AA00(void);
+/*static*/ void sub_8049E9C(u8);
+/*static*/ void sub_804AADC(u8, u8);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -156,7 +156,6 @@ extern struct TradeEwramSubstruct *gUnknown_03004824;
 extern u8 gUnknown_03000508;
 extern struct MailStruct gUnknown_02029700[16];
 
-extern u8 ewram[];
 #define ewram_2010000 (*(struct TradeEwramStruct *)(ewram + 0x10000))
 
 
@@ -604,7 +603,7 @@ void sub_8047CD8(void)
     SetMainCallback2(sub_8047EC0);
 }
 
-void sub_8047CE8(void)
+static void sub_8047CE8(void)
 {
     u8 mpId;
     sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC[0], gSaveBlock2.playerName, 0xC);
@@ -615,7 +614,7 @@ void sub_8047CE8(void)
     nullsub_5(3, 0);
 }
 
-void sub_8047D58(void)
+static void sub_8047D58(void)
 {
     struct SpriteTemplate spriteTemplate;
     int i;
@@ -644,7 +643,7 @@ void sub_8047D58(void)
     nullsub_5(5, 0);
 }
 
-void sub_8047E44(void)
+static void sub_8047E44(void)
 {
     struct SpriteTemplate spriteTemplate;
     int i;
@@ -664,7 +663,7 @@ void sub_8047E44(void)
     }
 }
 
-void sub_8047EC0(void)
+static void sub_8047EC0(void)
 {
     int i;
 
@@ -844,7 +843,7 @@ void sub_8047EC0(void)
     UpdatePaletteFade();
 }
 
-void sub_80484F4(void)
+/*static*/ void sub_80484F4(void)
 {
     int i;
     struct UnkStructF *unkStructF;
@@ -986,7 +985,7 @@ void sub_80484F4(void)
     UpdatePaletteFade();
 }
 
-void sub_80489F4(void)
+static void sub_80489F4(void)
 {
     sub_804A940(&gUnknown_03004824->unk_00c8);
     LoadOam();
@@ -994,7 +993,7 @@ void sub_80489F4(void)
     TransferPlttBuffer();
 }
 
-void sub_8048A14(void)
+/*static*/ void sub_8048A14(void)
 {
     if (++gUnknown_03004824->unk_00b4 >= 16)
     {
@@ -1003,7 +1002,7 @@ void sub_8048A14(void)
     }
 }
 
-void sub_8048A50(void)
+/*static*/ void sub_8048A50(void)
 {
     if (!gPaletteFade.active)
     {
@@ -1014,7 +1013,7 @@ void sub_8048A50(void)
     }
 }
 
-void sub_8048A90(void)
+/*static*/ void sub_8048A90(void)
 {
     if (!gReceivedRemoteLinkPlayers)
     {
@@ -1023,7 +1022,7 @@ void sub_8048A90(void)
     }
 }
 
-void sub_8048AB4(void)
+static void sub_8048AB4(void)
 {
     sub_8049DE0();
     sub_804AB30();
@@ -1041,7 +1040,7 @@ void sub_8048AB4(void)
 // Only minor register permutations
 #pragma push_macro("BLOCKSIZE")
 #define BLOCKSIZE 0x800
-void sub_8048B0C(u8 a0)
+static void sub_8048B0C(u8 a0)
 {
     int i;
     u16 *dest;
@@ -1101,7 +1100,7 @@ void sub_8048B0C(u8 a0)
 #else
 asm(".include \"constants/gba_constants.inc\"");
 __attribute__((naked))
-void sub_8048B0C(u8 a0)
+static void sub_8048B0C(u8 a0)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                         "\tlsls r0, 24\n"
@@ -1265,7 +1264,7 @@ void sub_8048B0C(u8 a0)
 }
 #endif
 
-void sub_8048C70(void)
+static void sub_8048C70(void)
 {
     int i;
     for (i = 0; i < PARTY_SIZE; i ++)
@@ -1292,7 +1291,7 @@ void sub_8048C70(void)
     gUnknown_03004824->unk_0050 = TRUE;
 }
 
-void nullsub_5(u8 a0, u8 a1) {}
+static void nullsub_5(u8 a0, u8 a1) {}
 
 static void sub_8048D24(u8 *dest, const u8 *src, u32 size)
 {
@@ -1300,7 +1299,7 @@ static void sub_8048D24(u8 *dest, const u8 *src, u32 size)
     for (i = 0; i < size; i ++) dest[i] = src[i];
 }
 
-bool8 sub_8048D44(void)
+static bool8 sub_8048D44(void)
 {
     u8 mpId = GetMultiplayerId();
     int i;
@@ -1437,7 +1436,7 @@ bool8 sub_8048D44(void)
     return FALSE;
 }
 
-void sub_8049088(void)
+/*static*/ void sub_8049088(void)
 {
     u8 string[28];
     StringCopy(string, gTradeText_TradeOkayPrompt);
@@ -1591,11 +1590,11 @@ static void sub_80492D8(void)
     }
 }
 
-void sub_80494D8(void)
+static void sub_80494D8(void)
 {
     u8 mpId = GetMultiplayerId();
-    u8 status = GetBlockReceivedStatus();
-    if (status)
+    u8 status;
+    if ((status = GetBlockReceivedStatus()))
     {
         if (mpId == 0)
             sub_80490BC(mpId, status);
@@ -1609,7 +1608,7 @@ void sub_80494D8(void)
 
 asm(".section .text.sub_804A96C");
 
-void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
+/*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
     int y, x;
 
     for (y = 0; y < height; y++)
@@ -1636,7 +1635,7 @@ void sub_804A96C_alt(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8
 
 asm(".section .text.sub_804DAD4");
 
-void sub_804DAD4(struct UnkStructC *arg0, struct InGameTrade *trade) {
+/*static*/ void sub_804DAD4(struct UnkStructC *arg0, struct InGameTrade *trade) {
     s32 i;
 
     for (i = 0; i < 9; i++)
-- 
cgit v1.2.3


From 2af364e054debd0a7159b701e86885125e5f9a88 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 13:39:04 -0400
Subject: sub_8049514

---
 asm/trade.s | 44 --------------------------------------------
 src/trade.c | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 44 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 5ac3ba35e..210996176 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,50 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049514
-sub_8049514: @ 8049514
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	movs r6, 0
-	movs r5, 0
-	ldr r2, _08049548 @ =gUnknown_03004824
-	ldr r3, [r2]
-	ldr r4, _0804954C @ =gTradeNextSelectedMonTable
-	lsls r2, r1, 1
-	adds r2, r1
-	lsls r2, 1
-	lsls r1, r0, 1
-	adds r1, r0
-	lsls r1, 3
-	adds r3, 0x44
-	adds r2, r1
-	adds r2, r4
-_0804953A:
-	ldrb r1, [r2]
-	adds r0, r3, r1
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _08049550
-	adds r6, r1, 0
-	b _08049558
-	.align 2, 0
-_08049548: .4byte gUnknown_03004824
-_0804954C: .4byte gTradeNextSelectedMonTable
-_08049550:
-	adds r2, 0x1
-	adds r5, 0x1
-	cmp r5, 0x5
-	ble _0804953A
-_08049558:
-	adds r0, r6, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8049514
-
 	thumb_func_start sub_8049560
 sub_8049560: @ 8049560
 	push {r4-r7,lr}
diff --git a/src/trade.c b/src/trade.c
index 8bdc9865c..76ff71204 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1606,6 +1606,21 @@ static void sub_80494D8(void)
         sub_80492D8();
 }
 
+u8 sub_8049514(u8 a0, u8 a1)
+{
+    int i;
+    u8 retval = 0;
+    for (i = 0; i < PARTY_SIZE; i ++)
+    {
+        if (gUnknown_03004824->tradeIconsActive[gTradeNextSelectedMonTable[a0][a1][i]] == TRUE)
+        {
+            retval = gTradeNextSelectedMonTable[a0][a1][i];
+            break;
+        }
+    }
+    return retval;
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 736fe47d4a9972fa4fcb7c7c48edb1d9c2dd025b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 13:51:29 -0400
Subject: sub_8049560

---
 asm/trade.s |  96 ----------------------------------------
 src/trade.c | 145 ++++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 83 insertions(+), 158 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 210996176..453493da6 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,102 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049560
-sub_8049560: @ 8049560
-	push {r4-r7,lr}
-	adds r7, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldrb r0, [r7]
-	bl sub_8049514
-	lsls r0, 24
-	lsrs r6, r0, 24
-	cmp r6, 0xC
-	bne _080495B8
-	ldr r5, _080495B0 @ =gUnknown_03004824
-	ldr r0, [r5]
-	adds r0, 0x40
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r4, _080495B4 @ =gSprites
-	adds r0, r4
-	movs r1, 0x1
-	bl StartSpriteAnim
-	ldr r2, [r5]
-	adds r2, 0x40
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0xE0
-	strh r1, [r0, 0x20]
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0xA0
-	strh r1, [r0, 0x22]
-	b _08049600
-	.align 2, 0
-_080495B0: .4byte gUnknown_03004824
-_080495B4: .4byte gSprites
-_080495B8:
-	ldr r4, _08049614 @ =gUnknown_03004824
-	ldr r0, [r4]
-	adds r0, 0x40
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r5, _08049618 @ =gSprites
-	adds r0, r5
-	movs r1, 0
-	bl StartSpriteAnim
-	ldr r4, [r4]
-	adds r4, 0x40
-	ldrb r0, [r4]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r5
-	ldr r2, _0804961C @ =gTradeMonSpriteCoords
-	lsls r3, r6, 1
-	adds r0, r3, r2
-	ldrb r0, [r0]
-	lsls r0, 3
-	adds r0, 0x20
-	strh r0, [r1, 0x20]
-	ldrb r0, [r4]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r5
-	adds r2, 0x1
-	adds r3, r2
-	ldrb r0, [r3]
-	lsls r0, 3
-	strh r0, [r1, 0x22]
-_08049600:
-	ldrb r0, [r7]
-	cmp r0, r6
-	beq _0804960C
-	movs r0, 0x5
-	bl PlaySE
-_0804960C:
-	strb r6, [r7]
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08049614: .4byte gUnknown_03004824
-_08049618: .4byte gSprites
-_0804961C: .4byte gTradeMonSpriteCoords
-	thumb_func_end sub_8049560
-
 	thumb_func_start sub_8049620
 sub_8049620: @ 8049620
 	push {r4,lr}
diff --git a/src/trade.c b/src/trade.c
index 76ff71204..c05bc0c63 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -75,9 +75,8 @@ struct TradeEwramSubstruct {
     /*0x0041*/ u8 unk_0041;
     /*0x0042*/ u8 playerPartyCount;
     /*0x0043*/ u8 friendPartyCount;
-    /*0x0044*/ u8 tradeIconsActive[12];
-    /*0x0050*/ u8 unk_0050;
-    /*0x0051*/ u8 filler_0044[0x24];
+    /*0x0044*/ u8 tradeMenuOptionsActive[13];
+    /*0x0051*/ u8 filler_0051[0x24];
     /*0x0075*/ u8 unk_0075;
     /*0x0076*/ u8 filler_0076[4];
     /*0x007a*/ u8 unk_007a;
@@ -312,70 +311,70 @@ const u8 *const gUnknown_0820C14C[] = {
 
 const u8 gTradeNextSelectedMonTable[][4][6] = {
     {
-        {4, 2, 12, 12, 0, 0},
-        {2, 4, 12, 12, 0, 0},
-        {7, 6, 1, 0, 0, 0},
-        {1, 6, 7, 0, 0, 0}
+        { 4,  2, 12, 12,  0,  0},
+        { 2,  4, 12, 12,  0,  0},
+        { 7,  6,  1,  0,  0,  0},
+        { 1,  6,  7,  0,  0,  0}
     }, {
-        {5, 3, 12, 12, 0, 0},
-        {3, 5, 12, 12, 0, 0},
-        {0, 7, 6, 1, 0, 0},
-        {6, 7, 0, 1, 0, 0}
+        { 5,  3, 12, 12,  0,  0},
+        { 3,  5, 12, 12,  0,  0},
+        { 0,  7,  6,  1,  0,  0},
+        { 6,  7,  0,  1,  0,  0}
     }, {
-        {0, 0, 0, 0, 0, 0},
-        {4, 0, 0, 0, 0, 0},
-        {9, 8, 7, 6, 0, 0},
-        {3, 1, 0, 0, 0, 0}
+        { 0,  0,  0,  0,  0,  0},
+        { 4,  0,  0,  0,  0,  0},
+        { 9,  8,  7,  6,  0,  0},
+        { 3,  1,  0,  0,  0,  0}
     }, {
-        {1, 1, 1, 1, 0, 0},
-        {5, 1, 1, 1, 0, 0},
-        {2, 9, 8, 7, 0, 0},
-        {8, 9, 6, 6, 0, 0}
+        { 1,  1,  1,  1,  0,  0},
+        { 5,  1,  1,  1,  0,  0},
+        { 2,  9,  8,  7,  0,  0},
+        { 8,  9,  6,  6,  0,  0}
     }, {
-        {2, 2, 2, 2, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {11, 10, 9, 8, 7, 6},
-        {5, 3, 1, 0, 0, 0}
+        { 2,  2,  2,  2,  0,  0},
+        { 0,  0,  0,  0,  0,  0},
+        {11, 10,  9,  8,  7,  6},
+        { 5,  3,  1,  0,  0,  0}
     }, {
-        {3, 3, 3, 3, 0, 0},
-        {1, 1, 1, 1, 0, 0},
-        {4, 4, 4, 4, 0, 0},
-        {10, 8, 6, 0, 0, 0}
+        { 3,  3,  3,  3,  0,  0},
+        { 1,  1,  1,  1,  0,  0},
+        { 4,  4,  4,  4,  0,  0},
+        {10,  8,  6,  0,  0,  0}
     }, {
-        {10, 8, 12, 0, 0, 0},
-        {8, 10, 12, 0, 0, 0},
-        {1, 0, 0, 0, 0, 0},
-        {7, 0, 1, 0, 0, 0}
+        {10,  8, 12,  0,  0,  0},
+        { 8, 10, 12,  0,  0,  0},
+        { 1,  0,  0,  0,  0,  0},
+        { 7,  0,  1,  0,  0,  0}
     }, {
-        {12, 0, 0, 0, 0, 0},
-        {9, 12, 0, 0, 0, 0},
-        {6, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0}
+        {12,  0,  0,  0,  0,  0},
+        { 9, 12,  0,  0,  0,  0},
+        { 6,  0,  0,  0,  0,  0},
+        { 0,  0,  0,  0,  0,  0}
     }, {
-        {6, 0, 0, 0, 0, 0},
-        {10, 6, 0, 0, 0, 0},
-        {3, 2, 1, 0, 0, 0},
-        {9, 7, 0, 0, 0, 0}
+        { 6,  0,  0,  0,  0,  0},
+        {10,  6,  0,  0,  0,  0},
+        { 3,  2,  1,  0,  0,  0},
+        { 9,  7,  0,  0,  0,  0}
     }, {
-        {7, 0, 0, 0, 0, 0},
-        {11, 12, 0, 0, 0, 0},
-        {8, 0, 0, 0, 0, 0},
-        {2, 1, 0, 0, 0, 0}
+        { 7,  0,  0,  0,  0,  0},
+        {11, 12,  0,  0,  0,  0},
+        { 8,  0,  0,  0,  0,  0},
+        { 2,  1,  0,  0,  0,  0}
     }, {
-        {8, 0, 0, 0, 0, 0},
-        {6, 0, 0, 0, 0, 0},
-        {5, 4, 3, 2, 1, 0},
-        {11, 9, 7, 0, 0, 0}
+        { 8,  0,  0,  0,  0,  0},
+        { 6,  0,  0,  0,  0,  0},
+        { 5,  4,  3,  2,  1,  0},
+        {11,  9,  7,  0,  0,  0}
     }, {
-        {9, 0, 0, 0, 0, 0},
-        {12, 0, 0, 0, 0, 0},
-        {10, 0, 0, 0, 0, 0},
-        {4, 2, 0, 0, 0, 0}
+        { 9,  0,  0,  0,  0,  0},
+        {12,  0,  0,  0,  0,  0},
+        {10,  0,  0,  0,  0,  0},
+        { 4,  2,  0,  0,  0,  0}
     }, {
-        {11, 9, 7, 6, 0, 0},
-        {7, 6, 0, 0, 0, 0},
-        {12, 0, 0, 0, 0, 0},
-        {12, 0, 0, 0, 0, 0}
+        {11,  9,  7,  6,  0,  0},
+        { 7,  6,  0,  0,  0,  0},
+        {12,  0,  0,  0,  0,  0},
+        {12,  0,  0,  0,  0,  0}
     }
 };
 
@@ -1272,23 +1271,23 @@ static void sub_8048C70(void)
         if (i < gUnknown_03004824->playerPartyCount)
         {
             gSprites[gUnknown_03004824->playerPartyIcons[i]].invisible = FALSE;
-            gUnknown_03004824->tradeIconsActive[i] = TRUE;
+            gUnknown_03004824->tradeMenuOptionsActive[i] = TRUE;
         }
         else
         {
-            gUnknown_03004824->tradeIconsActive[i] = FALSE;
+            gUnknown_03004824->tradeMenuOptionsActive[i] = FALSE;
         }
         if (i < gUnknown_03004824->friendPartyCount)
         {
             gSprites[gUnknown_03004824->friendPartyIcons[i]].invisible = FALSE;
-            gUnknown_03004824->tradeIconsActive[i + 6] = TRUE;
+            gUnknown_03004824->tradeMenuOptionsActive[i + 6] = TRUE;
         }
         else
         {
-            gUnknown_03004824->tradeIconsActive[i + 6] = FALSE;
+            gUnknown_03004824->tradeMenuOptionsActive[i + 6] = FALSE;
         }
     }
-    gUnknown_03004824->unk_0050 = TRUE;
+    gUnknown_03004824->tradeMenuOptionsActive[12] = TRUE;
 }
 
 static void nullsub_5(u8 a0, u8 a1) {}
@@ -1606,13 +1605,13 @@ static void sub_80494D8(void)
         sub_80492D8();
 }
 
-u8 sub_8049514(u8 a0, u8 a1)
+static u8 sub_8049514(u8 a0, u8 a1)
 {
     int i;
     u8 retval = 0;
     for (i = 0; i < PARTY_SIZE; i ++)
     {
-        if (gUnknown_03004824->tradeIconsActive[gTradeNextSelectedMonTable[a0][a1][i]] == TRUE)
+        if (gUnknown_03004824->tradeMenuOptionsActive[gTradeNextSelectedMonTable[a0][a1][i]] == TRUE)
         {
             retval = gTradeNextSelectedMonTable[a0][a1][i];
             break;
@@ -1621,6 +1620,28 @@ u8 sub_8049514(u8 a0, u8 a1)
     return retval;
 }
 
+/*static*/ void sub_8049560(u8 *a0, u8 a1)
+{
+    u8 v0 = sub_8049514(*a0, a1);
+    if (v0 == 12) // CANCEL
+    {
+        StartSpriteAnim(&gSprites[gUnknown_03004824->unk_0040], 1);
+        gSprites[gUnknown_03004824->unk_0040].pos1.x = 0xe0;
+        gSprites[gUnknown_03004824->unk_0040].pos1.y = 0xa0;
+    }
+    else
+    {
+        StartSpriteAnim(&gSprites[gUnknown_03004824->unk_0040], 0);
+        gSprites[gUnknown_03004824->unk_0040].pos1.x = gTradeMonSpriteCoords[v0][0] * 8 + 32;
+        gSprites[gUnknown_03004824->unk_0040].pos1.y = gTradeMonSpriteCoords[v0][1] * 8;
+    }
+    if (*a0 != v0)
+    {
+        PlaySE(SE_SELECT);
+    }
+    *a0 = v0;
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 249dda4489a31e5b7e1b283a32d3e830cfb46926 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 13:57:02 -0400
Subject: sub_8049620

---
 asm/trade.s | 47 -----------------------------------------------
 src/trade.c | 44 +++++++++++++++++++++++++++++---------------
 2 files changed, 29 insertions(+), 62 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 453493da6..d7fea9a6f 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,53 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049620
-sub_8049620: @ 8049620
-	push {r4,lr}
-	movs r0, 0
-	bl sub_804AA0C
-	ldr r4, _08049668 @ =gUnknown_03004824
-	ldr r0, [r4]
-	adds r0, 0x7B
-	movs r1, 0x5
-	strb r1, [r0]
-	bl GetMultiplayerId
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08049670
-	ldr r2, [r4]
-	adds r1, r2, 0
-	adds r1, 0x8C
-	ldr r0, _0804966C @ =0x0000aabb
-	strh r0, [r1]
-	adds r0, r2, 0
-	adds r0, 0x41
-	ldrb r1, [r0]
-	adds r0, 0x4D
-	strh r1, [r0]
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, [r4]
-	adds r1, 0x8C
-	movs r2, 0x14
-	bl SendBlock
-	b _08049678
-	.align 2, 0
-_08049668: .4byte gUnknown_03004824
-_0804966C: .4byte 0x0000aabb
-_08049670:
-	ldr r0, [r4]
-	adds r0, 0x84
-	movs r1, 0x1
-	strb r1, [r0]
-_08049678:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8049620
-
 	thumb_func_start sub_8049680
 sub_8049680: @ 8049680
 	push {r4,lr}
diff --git a/src/trade.c b/src/trade.c
index c05bc0c63..a313106ea 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -94,9 +94,7 @@ struct TradeEwramSubstruct {
     /*0x0088*/ u8 filler_0088[2];
     /*0x008a*/ u8 unk_008a;
     /*0x008b*/ u8 unk_008b;
-    /*0x008c*/ u16 unk_008c;
-    /*0x008e*/ u16 unk_008e;
-    /*0x0090*/ u8 filler_0090[0x24];
+    /*0x008c*/ u16 linkData[20];
     /*0x00b4*/ u8 unk_00b4;
     /*0x00b5*/ u8 unk_00b5[7];
     /*0x00bc*/ u8 filler_00bc[12];
@@ -1530,16 +1528,16 @@ static void sub_80492D8(void)
         if (gUnknown_03004824->unk_0084 == 1 && gUnknown_03004824->unk_0085 == 1)
         {
             gUnknown_03004824->unk_007b = 6;
-            gUnknown_03004824->unk_008c = 0xdddd;
-            gUnknown_03004824->unk_008e = gUnknown_03004824->unk_0041;
+            gUnknown_03004824->linkData[0] = 0xdddd;
+            gUnknown_03004824->linkData[1] = gUnknown_03004824->unk_0041;
             sub_804AADC(5, 0);
             gUnknown_03004824->unk_0084 = gUnknown_03004824->unk_0085 = 0;
         }
         else if (gUnknown_03004824->unk_0084 == 1 && gUnknown_03004824->unk_0085 == 2)
         {
             sub_804AA0C(1);
-            gUnknown_03004824->unk_008c = 0xeecc;
-            gUnknown_03004824->unk_008e = 0;
+            gUnknown_03004824->linkData[0] = 0xeecc;
+            gUnknown_03004824->linkData[1] = 0;
             sub_804AADC(5, 0);
             gUnknown_03004824->unk_0086 = gUnknown_03004824->unk_0087 = 0;
             gUnknown_03004824->unk_0084 = gUnknown_03004824->unk_0085 = 0;
@@ -1548,8 +1546,8 @@ static void sub_80492D8(void)
         else if (gUnknown_03004824->unk_0084 == 2 && gUnknown_03004824->unk_0085 == 1)
         {
             sub_804AA0C(5);
-            gUnknown_03004824->unk_008c = 0xddee;
-            gUnknown_03004824->unk_008e = 0;
+            gUnknown_03004824->linkData[0] = 0xddee;
+            gUnknown_03004824->linkData[1] = 0;
             sub_804AADC(5, 0);
             gUnknown_03004824->unk_0086 = gUnknown_03004824->unk_0087 = 0;
             gUnknown_03004824->unk_0084 = gUnknown_03004824->unk_0085 = 0;
@@ -1557,8 +1555,8 @@ static void sub_80492D8(void)
         }
         else if (gUnknown_03004824->unk_0084 == 2 && gUnknown_03004824->unk_0085 == 2)
         {
-            gUnknown_03004824->unk_008c = 0xeebb;
-            gUnknown_03004824->unk_008e = 0;
+            gUnknown_03004824->linkData[0] = 0xeebb;
+            gUnknown_03004824->linkData[1] = 0;
             sub_804AADC(5, 0);
             BeginNormalPaletteFade(-1, 0, 0, 16, 0);
             gUnknown_03004824->unk_0084 = gUnknown_03004824->unk_0085 = 0;
@@ -1569,8 +1567,8 @@ static void sub_80492D8(void)
     {
         if (gUnknown_03004824->unk_0086 == 1 && gUnknown_03004824->unk_0087 == 1)
         {
-            gUnknown_03004824->unk_008c = 0xccdd;
-            gUnknown_03004824->unk_008e = 0;
+            gUnknown_03004824->linkData[0] = 0xccdd;
+            gUnknown_03004824->linkData[1] = 0;
             sub_804AADC(5, 0);
             gUnknown_03004824->unk_0086 = 0;
             gUnknown_03004824->unk_0087 = 0;
@@ -1579,8 +1577,8 @@ static void sub_80492D8(void)
         if (gUnknown_03004824->unk_0086 == 2 || gUnknown_03004824->unk_0087 == 2)
         {
             sub_804AA0C(1);
-            gUnknown_03004824->unk_008c = 0xddee;
-            gUnknown_03004824->unk_008e = 0;
+            gUnknown_03004824->linkData[0] = 0xddee;
+            gUnknown_03004824->linkData[1] = 0;
             sub_804AADC(5, 0);
             gUnknown_03004824->unk_0086 = 0;
             gUnknown_03004824->unk_0087 = 0;
@@ -1642,6 +1640,22 @@ static u8 sub_8049514(u8 a0, u8 a1)
     *a0 = v0;
 }
 
+/*static*/ void sub_8049620(void)
+{
+    sub_804AA0C(0);
+    gUnknown_03004824->unk_007b = 5;
+    if (GetMultiplayerId() == 1)
+    {
+        gUnknown_03004824->linkData[0] = 0xaabb;
+        gUnknown_03004824->linkData[1] = gUnknown_03004824->unk_0041;
+        SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, 20);
+    }
+    else
+    {
+        gUnknown_03004824->unk_0084 = 1;
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 28615f2924d208b97de19f7376d6eea3278ed779 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 14:12:51 -0400
Subject: sub_8049680

---
 asm/trade.s | 183 ------------------------------------------------------------
 src/trade.c |  96 +++++++++++++++++++++++--------
 2 files changed, 74 insertions(+), 205 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index d7fea9a6f..e33814899 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,189 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049680
-sub_8049680: @ 8049680
-	push {r4,lr}
-	sub sp, 0x8
-	ldr r0, _080496A0 @ =gMain
-	ldrh r1, [r0, 0x30]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _080496A8
-	ldr r0, _080496A4 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x41
-	movs r1, 0
-	bl sub_8049560
-	b _080496F4
-	.align 2, 0
-_080496A0: .4byte gMain
-_080496A4: .4byte gUnknown_03004824
-_080496A8:
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _080496C4
-	ldr r0, _080496C0 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x41
-	movs r1, 0x1
-	bl sub_8049560
-	b _080496F4
-	.align 2, 0
-_080496C0: .4byte gUnknown_03004824
-_080496C4:
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _080496E0
-	ldr r0, _080496DC @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x41
-	movs r1, 0x2
-	bl sub_8049560
-	b _080496F4
-	.align 2, 0
-_080496DC: .4byte gUnknown_03004824
-_080496E0:
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080496F4
-	ldr r0, _08049750 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x41
-	movs r1, 0x3
-	bl sub_8049560
-_080496F4:
-	ldr r0, _08049754 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080497B6
-	movs r0, 0x5
-	bl PlaySE
-	ldr r4, _08049750 @ =gUnknown_03004824
-	ldr r0, [r4]
-	adds r1, r0, 0
-	adds r1, 0x41
-	ldrb r1, [r1]
-	cmp r1, 0x5
-	bhi _0804975C
-	adds r0, 0x4
-	movs r1, 0x13
-	str r1, [sp]
-	movs r1, 0x12
-	movs r2, 0xE
-	movs r3, 0x1C
-	bl DrawTextWindow
-	ldr r3, _08049758 @ =gUnknown_0820C320
-	movs r0, 0x13
-	movs r1, 0xF
-	movs r2, 0x2
-	bl PrintMenuItems
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0x9
-	str r0, [sp, 0x4]
-	movs r0, 0
-	movs r1, 0x13
-	movs r2, 0xF
-	movs r3, 0x2
-	bl InitMenu
-	ldr r0, [r4]
-	adds r0, 0x7B
-	movs r1, 0x1
-	strb r1, [r0]
-	b _080497B6
-	.align 2, 0
-_08049750: .4byte gUnknown_03004824
-_08049754: .4byte gMain
-_08049758: .4byte gUnknown_0820C320
-_0804975C:
-	cmp r1, 0xB
-	bhi _0804977A
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r0, [r4]
-	adds r0, 0x7B
-	movs r1, 0x2
-	strb r1, [r0]
-	b _080497B6
-_0804977A:
-	cmp r1, 0xC
-	bne _080497B6
-	adds r0, 0x4
-	movs r1, 0x13
-	str r1, [sp]
-	movs r1, 0x18
-	movs r2, 0xE
-	movs r3, 0x1D
-	bl DrawTextWindow
-	movs r0, 0x18
-	movs r1, 0xE
-	movs r2, 0x4
-	bl InitYesNoMenu
-	ldr r0, [r4]
-	adds r0, 0x7B
-	movs r1, 0x4
-	strb r1, [r0]
-	ldr r0, _080497F4 @ =gUnknown_0820C14C
-	ldr r0, [r0, 0x10]
-	ldr r1, [r4]
-	adds r1, 0x7E
-	ldrh r1, [r1]
-	lsls r1, 5
-	ldr r2, _080497F8 @ =0x06010000
-	adds r1, r2
-	movs r2, 0x14
-	bl sub_804ACD8
-_080497B6:
-	ldr r0, _080497FC @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x80
-	lsls r0, 1
-	ands r0, r1
-	cmp r0, 0
-	beq _080497EC
-	movs r2, 0
-	ldr r3, _08049800 @ =gUnknown_03004824
-_080497C8:
-	ldr r0, [r3]
-	lsls r1, r2, 1
-	adds r0, 0x8C
-	adds r0, r1
-	strh r2, [r0]
-	adds r2, 0x1
-	cmp r2, 0x9
-	ble _080497C8
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _08049800 @ =gUnknown_03004824
-	ldr r1, [r1]
-	adds r1, 0x8C
-	movs r2, 0x14
-	bl SendBlock
-_080497EC:
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080497F4: .4byte gUnknown_0820C14C
-_080497F8: .4byte 0x06010000
-_080497FC: .4byte gMain
-_08049800: .4byte gUnknown_03004824
-	thumb_func_end sub_8049680
-
 	thumb_func_start sub_8049804
 sub_8049804: @ 8049804
 	push {lr}
diff --git a/src/trade.c b/src/trade.c
index a313106ea..a96a68f66 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -72,7 +72,7 @@ struct TradeEwramSubstruct {
     /*0x0034*/ u8 playerPartyIcons[6];
     /*0x003a*/ u8 friendPartyIcons[6];
     /*0x0040*/ u8 unk_0040;
-    /*0x0041*/ u8 unk_0041;
+    /*0x0041*/ u8 tradeMenuCursorPosition;
     /*0x0042*/ u8 playerPartyCount;
     /*0x0043*/ u8 friendPartyCount;
     /*0x0044*/ u8 tradeMenuOptionsActive[13];
@@ -781,7 +781,7 @@ static void sub_8047EC0(void)
         case 12:
             sub_8047E44();
             gUnknown_03004824->unk_0040 = CreateSprite(&gSpriteTemplate_820C134, gTradeMonSpriteCoords[0][0] * 8 + 32, gTradeMonSpriteCoords[0][1] * 8, 2);
-            gUnknown_03004824->unk_0041 = 0;
+            gUnknown_03004824->tradeMenuCursorPosition = 0;
             gMain.state ++;
             nullsub_5(6, 0);
             break;
@@ -933,11 +933,11 @@ static void sub_8047EC0(void)
         case 12:
             sub_8047E44();
             unkStructF = &ewram_2010000.unk_08000;
-            if (gUnknown_03004824->unk_0041 < 6)
-                gUnknown_03004824->unk_0041 = unkStructF->unk_0009;
+            if (gUnknown_03004824->tradeMenuCursorPosition < 6)
+                gUnknown_03004824->tradeMenuCursorPosition = unkStructF->unk_0009;
             else
-                gUnknown_03004824->unk_0041 = unkStructF->unk_0009 + 6;
-            gUnknown_03004824->unk_0040 = CreateSprite(&gSpriteTemplate_820C134, gTradeMonSpriteCoords[gUnknown_03004824->unk_0041][0] * 8 + 32, gTradeMonSpriteCoords[gUnknown_03004824->unk_0041][1] * 8, 2);
+                gUnknown_03004824->tradeMenuCursorPosition = unkStructF->unk_0009 + 6;
+            gUnknown_03004824->unk_0040 = CreateSprite(&gSpriteTemplate_820C134, gTradeMonSpriteCoords[gUnknown_03004824->tradeMenuCursorPosition][0] * 8 + 32, gTradeMonSpriteCoords[gUnknown_03004824->tradeMenuCursorPosition][1] * 8, 2);
             gMain.state = 15;
             nullsub_5(6, 0);
             break;
@@ -1003,7 +1003,7 @@ static void sub_80489F4(void)
 {
     if (!gPaletteFade.active)
     {
-        gUnknown_020297D8[0] = gUnknown_03004824->unk_0041;
+        gUnknown_020297D8[0] = gUnknown_03004824->tradeMenuCursorPosition;
         gUnknown_020297D8[1] = gUnknown_03004824->unk_008a;
         sub_800832C();
         gUnknown_03004824->unk_007b = 13;
@@ -1500,7 +1500,7 @@ static void sub_80491E4(u8 mpId, u8 status)
                 break;
             case 0xdddd:
                 gUnknown_03004824->unk_008a = ((u8 *)gBlockRecvBuffer[0])[1 * sizeof(u16)] + 6;
-                sub_8049E9C(gUnknown_03004824->unk_0041);
+                sub_8049E9C(gUnknown_03004824->tradeMenuCursorPosition);
                 sub_8049E9C(gUnknown_03004824->unk_008a);
                 gUnknown_03004824->unk_007b = 7;
                 break;
@@ -1529,7 +1529,7 @@ static void sub_80492D8(void)
         {
             gUnknown_03004824->unk_007b = 6;
             gUnknown_03004824->linkData[0] = 0xdddd;
-            gUnknown_03004824->linkData[1] = gUnknown_03004824->unk_0041;
+            gUnknown_03004824->linkData[1] = gUnknown_03004824->tradeMenuCursorPosition;
             sub_804AADC(5, 0);
             gUnknown_03004824->unk_0084 = gUnknown_03004824->unk_0085 = 0;
         }
@@ -1603,25 +1603,25 @@ static void sub_80494D8(void)
         sub_80492D8();
 }
 
-static u8 sub_8049514(u8 a0, u8 a1)
+static u8 sub_8049514(u8 oldPosition, u8 direction)
 {
     int i;
-    u8 retval = 0;
+    u8 newPosition = 0;
     for (i = 0; i < PARTY_SIZE; i ++)
     {
-        if (gUnknown_03004824->tradeMenuOptionsActive[gTradeNextSelectedMonTable[a0][a1][i]] == TRUE)
+        if (gUnknown_03004824->tradeMenuOptionsActive[gTradeNextSelectedMonTable[oldPosition][direction][i]] == TRUE)
         {
-            retval = gTradeNextSelectedMonTable[a0][a1][i];
+            newPosition = gTradeNextSelectedMonTable[oldPosition][direction][i];
             break;
         }
     }
-    return retval;
+    return newPosition;
 }
 
-/*static*/ void sub_8049560(u8 *a0, u8 a1)
+static void TradeMenuMoveCursor(u8 *tradeMenuCursorPosition, u8 direction)
 {
-    u8 v0 = sub_8049514(*a0, a1);
-    if (v0 == 12) // CANCEL
+    u8 newPosition = sub_8049514(*tradeMenuCursorPosition, direction);
+    if (newPosition == 12) // CANCEL
     {
         StartSpriteAnim(&gSprites[gUnknown_03004824->unk_0040], 1);
         gSprites[gUnknown_03004824->unk_0040].pos1.x = 0xe0;
@@ -1630,14 +1630,14 @@ static u8 sub_8049514(u8 a0, u8 a1)
     else
     {
         StartSpriteAnim(&gSprites[gUnknown_03004824->unk_0040], 0);
-        gSprites[gUnknown_03004824->unk_0040].pos1.x = gTradeMonSpriteCoords[v0][0] * 8 + 32;
-        gSprites[gUnknown_03004824->unk_0040].pos1.y = gTradeMonSpriteCoords[v0][1] * 8;
+        gSprites[gUnknown_03004824->unk_0040].pos1.x = gTradeMonSpriteCoords[newPosition][0] * 8 + 32;
+        gSprites[gUnknown_03004824->unk_0040].pos1.y = gTradeMonSpriteCoords[newPosition][1] * 8;
     }
-    if (*a0 != v0)
+    if (*tradeMenuCursorPosition != newPosition)
     {
         PlaySE(SE_SELECT);
     }
-    *a0 = v0;
+    *tradeMenuCursorPosition = newPosition;
 }
 
 /*static*/ void sub_8049620(void)
@@ -1647,7 +1647,7 @@ static u8 sub_8049514(u8 a0, u8 a1)
     if (GetMultiplayerId() == 1)
     {
         gUnknown_03004824->linkData[0] = 0xaabb;
-        gUnknown_03004824->linkData[1] = gUnknown_03004824->unk_0041;
+        gUnknown_03004824->linkData[1] = gUnknown_03004824->tradeMenuCursorPosition;
         SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, 20);
     }
     else
@@ -1656,6 +1656,58 @@ static u8 sub_8049514(u8 a0, u8 a1)
     }
 }
 
+/*static*/ void sub_8049680(void)
+{
+    int i;
+    if (gMain.newAndRepeatedKeys & DPAD_UP)
+    {
+        TradeMenuMoveCursor(&gUnknown_03004824->tradeMenuCursorPosition, 0);
+    }
+    else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
+    {
+        TradeMenuMoveCursor(&gUnknown_03004824->tradeMenuCursorPosition, 1);
+    }
+    else if (gMain.newAndRepeatedKeys & DPAD_LEFT)
+    {
+        TradeMenuMoveCursor(&gUnknown_03004824->tradeMenuCursorPosition, 2);
+    }
+    else if (gMain.newAndRepeatedKeys & DPAD_RIGHT)
+    {
+        TradeMenuMoveCursor(&gUnknown_03004824->tradeMenuCursorPosition, 3);
+    }
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        if (gUnknown_03004824->tradeMenuCursorPosition < PARTY_SIZE)
+        {
+            DrawTextWindow(&gUnknown_03004824->window, 18, 14, 28, 19);
+            PrintMenuItems(19, 15, 2, gUnknown_0820C320);
+            InitMenu(0, 19, 15, 2, 0, 9);
+            gUnknown_03004824->unk_007b = 1;
+        }
+        else if (gUnknown_03004824->tradeMenuCursorPosition < 2 * PARTY_SIZE)
+        {
+            BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+            gUnknown_03004824->unk_007b = 2;
+        }
+        else if (gUnknown_03004824->tradeMenuCursorPosition == 2 * PARTY_SIZE)
+        {
+            DrawTextWindow(&gUnknown_03004824->window, 24, 14, 29, 19);
+            InitYesNoMenu(24, 14, 4);
+            gUnknown_03004824->unk_007b = 4;
+            sub_804ACD8(gUnknown_0820C14C[4], (u8 *)(BG_CHAR_ADDR(4) + 32 * gUnknown_03004824->unk_007e), 20);
+        }
+    }
+    if (gMain.newKeys & R_BUTTON)
+    {
+        for (i = 0; i < 10; i ++)
+        {
+            gUnknown_03004824->linkData[i] = i;
+        }
+        SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, 20);
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From c66dc8fe51e6d49bf761b30a8772ef879e5ebf2d Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 14:19:00 -0400
Subject: sub_8049804

---
 asm/trade.s | 43 -------------------------------------------
 src/trade.c | 10 ++++++++++
 2 files changed, 10 insertions(+), 43 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index e33814899..0694e3b0a 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,49 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049804
-sub_8049804: @ 8049804
-	push {lr}
-	bl HandleDestroyMenuCursors
-	bl sub_804A80C
-	ldr r3, _08049850 @ =gUnknown_03004824
-	ldr r0, [r3]
-	adds r0, 0x7B
-	movs r1, 0
-	strb r1, [r0]
-	ldr r2, _08049854 @ =gSprites
-	ldr r0, [r3]
-	adds r0, 0x40
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	adds r0, 0x3E
-	ldrb r2, [r0]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r2
-	strb r1, [r0]
-	ldr r0, _08049858 @ =gUnknown_0820C14C
-	ldr r0, [r0, 0x4]
-	ldr r1, [r3]
-	adds r1, 0x7E
-	ldrh r1, [r1]
-	lsls r1, 5
-	ldr r2, _0804985C @ =0x06010000
-	adds r1, r2
-	movs r2, 0x14
-	bl sub_804ACD8
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08049850: .4byte gUnknown_03004824
-_08049854: .4byte gSprites
-_08049858: .4byte gUnknown_0820C14C
-_0804985C: .4byte 0x06010000
-	thumb_func_end sub_8049804
-
 	thumb_func_start sub_8049860
 sub_8049860: @ 8049860
 	push {r4,lr}
diff --git a/src/trade.c b/src/trade.c
index a96a68f66..faa931e37 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -146,6 +146,7 @@ static void sub_8048AB4(void);
 /*static*/ u8 sub_804AA00(void);
 /*static*/ void sub_8049E9C(u8);
 /*static*/ void sub_804AADC(u8, u8);
+/*static*/ void sub_804A80C(void);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -1708,6 +1709,15 @@ static void TradeMenuMoveCursor(u8 *tradeMenuCursorPosition, u8 direction)
     }
 }
 
+/*static*/ void sub_8049804(void)
+{
+    HandleDestroyMenuCursors();
+    sub_804A80C();
+    gUnknown_03004824->unk_007b = 0;
+    gSprites[gUnknown_03004824->unk_0040].invisible = FALSE;
+    sub_804ACD8(gUnknown_0820C14C[1], (u8 *)(BG_CHAR_ADDR(4) + 32 * gUnknown_03004824->unk_007e), 20);
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 765bed46b08990779c379204f5ac813b310b863d Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 14:28:29 -0400
Subject: sub_8049860

---
 asm/trade.s | 118 ------------------------------------------------------------
 src/trade.c |  43 ++++++++++++++++++++--
 2 files changed, 41 insertions(+), 120 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 0694e3b0a..103fdbbaa 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,124 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049860
-sub_8049860: @ 8049860
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r0, _0804987C @ =gMain
-	ldrh r1, [r0, 0x30]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _08049880
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x1
-	negs r0, r0
-	b _08049890
-	.align 2, 0
-_0804987C: .4byte gMain
-_08049880:
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0804989C
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x1
-_08049890:
-	bl MoveMenuCursor
-	ldr r1, _080498D8 @ =gUnknown_03004824
-	ldr r1, [r1]
-	adds r1, 0x7C
-	strb r0, [r1]
-_0804989C:
-	ldr r0, _080498DC @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08049938
-	movs r0, 0x5
-	bl PlaySE
-	bl GetMenuCursorPos
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	bne _080498E0
-	movs r0, 0x1
-	negs r0, r0
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r0, _080498D8 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x7B
-	movs r1, 0x2
-	strb r1, [r0]
-	b _0804994A
-	.align 2, 0
-_080498D8: .4byte gUnknown_03004824
-_080498DC: .4byte gMain
-_080498E0:
-	ldr r4, _08049910 @ =gUnknown_03004824
-	ldr r2, [r4]
-	adds r0, r2, 0
-	adds r0, 0x51
-	adds r1, r2, 0
-	adds r1, 0x42
-	ldrb r1, [r1]
-	adds r2, 0x41
-	ldrb r2, [r2]
-	bl sub_80499F0
-	lsls r0, 24
-	cmp r0, 0
-	bne _08049914
-	movs r0, 0x3
-	movs r1, 0x2
-	bl sub_804AADC
-	ldr r0, [r4]
-	adds r0, 0x7B
-	movs r1, 0x8
-	strb r1, [r0]
-	b _0804994A
-	.align 2, 0
-_08049910: .4byte gUnknown_03004824
-_08049914:
-	bl sub_8049620
-	ldr r2, _08049934 @ =gSprites
-	ldr r0, [r4]
-	adds r0, 0x40
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-	b _0804994A
-	.align 2, 0
-_08049934: .4byte gSprites
-_08049938:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0804994A
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_8049804
-_0804994A:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8049860
-
 	thumb_func_start sub_8049954
 sub_8049954: @ 8049954
 	push {lr}
diff --git a/src/trade.c b/src/trade.c
index faa931e37..b8732aeea 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -76,7 +76,7 @@ struct TradeEwramSubstruct {
     /*0x0042*/ u8 playerPartyCount;
     /*0x0043*/ u8 friendPartyCount;
     /*0x0044*/ u8 tradeMenuOptionsActive[13];
-    /*0x0051*/ u8 filler_0051[0x24];
+    /*0x0051*/ u8 unk_0051[0x24];
     /*0x0075*/ u8 unk_0075;
     /*0x0076*/ u8 filler_0076[4];
     /*0x007a*/ u8 unk_007a;
@@ -147,6 +147,7 @@ static void sub_8048AB4(void);
 /*static*/ void sub_8049E9C(u8);
 /*static*/ void sub_804AADC(u8, u8);
 /*static*/ void sub_804A80C(void);
+/*static*/ bool8 sub_80499F0(const u8 *, u8, u8);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -1641,7 +1642,7 @@ static void TradeMenuMoveCursor(u8 *tradeMenuCursorPosition, u8 direction)
     *tradeMenuCursorPosition = newPosition;
 }
 
-/*static*/ void sub_8049620(void)
+static void sub_8049620(void)
 {
     sub_804AA0C(0);
     gUnknown_03004824->unk_007b = 5;
@@ -1718,6 +1719,44 @@ static void TradeMenuMoveCursor(u8 *tradeMenuCursorPosition, u8 direction)
     sub_804ACD8(gUnknown_0820C14C[1], (u8 *)(BG_CHAR_ADDR(4) + 32 * gUnknown_03004824->unk_007e), 20);
 }
 
+/*static*/ void sub_8049860(void)
+{
+    if (gMain.newAndRepeatedKeys & DPAD_UP)
+    {
+        PlaySE(SE_SELECT);
+        gUnknown_03004824->unk_007c = MoveMenuCursor(-1);
+    }
+    else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
+    {
+        PlaySE(SE_SELECT);
+        gUnknown_03004824->unk_007c = MoveMenuCursor(+1);
+    }
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        if (GetMenuCursorPos() == 0)
+        {
+            BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+            gUnknown_03004824->unk_007b = 2;
+        }
+        else if (!sub_80499F0(gUnknown_03004824->unk_0051, gUnknown_03004824->playerPartyCount, gUnknown_03004824->tradeMenuCursorPosition))
+        {
+            sub_804AADC(3, 2);
+            gUnknown_03004824->unk_007b = 8;
+        }
+        else
+        {
+            sub_8049620();
+            gSprites[gUnknown_03004824->unk_0040].invisible = TRUE;
+        }
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        sub_8049804();
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 85e758cb43dff511033c03d5c8f9ff3155bb805a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 14:30:28 -0400
Subject: sub_8049954

---
 asm/trade.s | 24 ------------------------
 src/trade.c |  9 +++++++++
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 103fdbbaa..131df0f6f 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,30 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049954
-sub_8049954: @ 8049954
-	push {lr}
-	ldr r0, _08049978 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _0804996A
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08049974
-_0804996A:
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_8049804
-_08049974:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08049978: .4byte gMain
-	thumb_func_end sub_8049954
-
 	thumb_func_start sub_804997C
 sub_804997C: @ 804997C
 	push {r4,lr}
diff --git a/src/trade.c b/src/trade.c
index b8732aeea..a9eeddf7c 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1757,6 +1757,15 @@ static void sub_8049620(void)
     }
 }
 
+/*static*/ void sub_8049954(void)
+{
+    if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        sub_8049804();
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 2a5df1b3eed197bd44a10d54960770b9f02995f5 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 14:34:55 -0400
Subject: sub_804997C

---
 asm/trade.s | 58 ----------------------------------------------------------
 src/trade.c | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 59 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 131df0f6f..1edb0d61c 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,64 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_804997C
-sub_804997C: @ 804997C
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r0, _080499B4 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _080499E0
-	ldr r0, _080499B8 @ =gUnknown_03004824
-	ldr r2, [r0]
-	adds r3, r2, 0
-	adds r3, 0x41
-	ldrb r1, [r3]
-	cmp r1, 0x5
-	bhi _080499C4
-	ldr r0, _080499BC @ =gPlayerParty
-	ldrb r1, [r3]
-	adds r2, 0x42
-	ldrb r2, [r2]
-	subs r2, 0x1
-	lsls r2, 24
-	lsrs r2, 24
-	ldr r3, _080499C0 @ =sub_80484F4
-	movs r4, 0x4
-	str r4, [sp]
-	bl ShowPokemonSummaryScreen
-	b _080499E0
-	.align 2, 0
-_080499B4: .4byte gPaletteFade
-_080499B8: .4byte gUnknown_03004824
-_080499BC: .4byte gPlayerParty
-_080499C0: .4byte sub_80484F4
-_080499C4:
-	ldr r0, _080499E8 @ =gEnemyParty
-	subs r1, 0x6
-	lsls r1, 24
-	lsrs r1, 24
-	adds r2, 0x43
-	ldrb r2, [r2]
-	subs r2, 0x1
-	lsls r2, 24
-	lsrs r2, 24
-	ldr r3, _080499EC @ =sub_80484F4
-	movs r4, 0x4
-	str r4, [sp]
-	bl ShowPokemonSummaryScreen
-_080499E0:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080499E8: .4byte gEnemyParty
-_080499EC: .4byte sub_80484F4
-	thumb_func_end sub_804997C
-
 	thumb_func_start sub_80499F0
 sub_80499F0: @ 80499F0
 	push {r4,r5,lr}
diff --git a/src/trade.c b/src/trade.c
index a9eeddf7c..ff63411ce 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -20,6 +20,7 @@
 #include "songs.h"
 #include "sound.h"
 #include "data2.h"
+#include "pokemon_summary_screen.h"
 #include "trade.h"
 
 #ifdef ENGLISH
@@ -842,7 +843,7 @@ static void sub_8047EC0(void)
     UpdatePaletteFade();
 }
 
-/*static*/ void sub_80484F4(void)
+void sub_80484F4(void)
 {
     int i;
     struct UnkStructF *unkStructF;
@@ -1766,6 +1767,21 @@ static void sub_8049620(void)
     }
 }
 
+/*static*/ void sub_804997C(void)
+{
+    if (!gPaletteFade.active)
+    {
+        if (gUnknown_03004824->tradeMenuCursorPosition < PARTY_SIZE)
+        {
+            ShowPokemonSummaryScreen(gPlayerParty, gUnknown_03004824->tradeMenuCursorPosition, gUnknown_03004824->playerPartyCount - 1, sub_80484F4, 4);
+        }
+        else
+        {
+            ShowPokemonSummaryScreen(gEnemyParty, gUnknown_03004824->tradeMenuCursorPosition - 6, gUnknown_03004824->friendPartyCount - 1, sub_80484F4, 4);
+        }
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 6481f3b1201dfc6cbefb49e735d16f0522b32e09 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 14:39:03 -0400
Subject: sub_80499F0

---
 asm/trade.s | 31 -------------------------------
 src/trade.c | 21 ++++++++++++++++++---
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 1edb0d61c..6e11cdaf2 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,37 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_80499F0
-sub_80499F0: @ 80499F0
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	lsls r1, 24
-	lsrs r4, r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	movs r1, 0
-	movs r3, 0
-	cmp r1, r4
-	bge _08049A18
-_08049A04:
-	cmp r2, r3
-	beq _08049A12
-	adds r0, r5, r3
-	ldrb r0, [r0]
-	adds r0, r1, r0
-	lsls r0, 24
-	lsrs r1, r0, 24
-_08049A12:
-	adds r3, 0x1
-	cmp r3, r4
-	blt _08049A04
-_08049A18:
-	adds r0, r1, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80499F0
-
 	thumb_func_start sub_8049A20
 sub_8049A20: @ 8049A20
 	push {r4,r5,lr}
diff --git a/src/trade.c b/src/trade.c
index ff63411ce..493730095 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -77,7 +77,8 @@ struct TradeEwramSubstruct {
     /*0x0042*/ u8 playerPartyCount;
     /*0x0043*/ u8 friendPartyCount;
     /*0x0044*/ u8 tradeMenuOptionsActive[13];
-    /*0x0051*/ u8 unk_0051[0x24];
+    /*0x0051*/ u8 unk_0051[6];
+    /*0x0056*/ u8 filler_0057[30];
     /*0x0075*/ u8 unk_0075;
     /*0x0076*/ u8 filler_0076[4];
     /*0x007a*/ u8 unk_007a;
@@ -148,7 +149,7 @@ static void sub_8048AB4(void);
 /*static*/ void sub_8049E9C(u8);
 /*static*/ void sub_804AADC(u8, u8);
 /*static*/ void sub_804A80C(void);
-/*static*/ bool8 sub_80499F0(const u8 *, u8, u8);
+/*static*/ u8 sub_80499F0(const u8 *, u8, u8);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -1740,7 +1741,7 @@ static void sub_8049620(void)
             BeginNormalPaletteFade(-1, 0, 0, 16, 0);
             gUnknown_03004824->unk_007b = 2;
         }
-        else if (!sub_80499F0(gUnknown_03004824->unk_0051, gUnknown_03004824->playerPartyCount, gUnknown_03004824->tradeMenuCursorPosition))
+        else if (sub_80499F0(gUnknown_03004824->unk_0051, gUnknown_03004824->playerPartyCount, gUnknown_03004824->tradeMenuCursorPosition) == 0)
         {
             sub_804AADC(3, 2);
             gUnknown_03004824->unk_007b = 8;
@@ -1782,6 +1783,20 @@ static void sub_8049620(void)
     }
 }
 
+/*static*/ u8 sub_80499F0(const u8 *src, u8 partyCount, u8 tradeMenuCursorPosition)
+{
+    u8 retval = 0;
+    int i;
+    for (i = 0; i < partyCount; i ++)
+    {
+        if (tradeMenuCursorPosition != i)
+        {
+            retval += src[i];
+        }
+    }
+    return retval;
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 6e8d33ec0c683dc9520dfca79102d595fd4780b7 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 14:46:41 -0400
Subject: sub_8049A20

---
 asm/trade.s | 80 -------------------------------------------------------------
 src/trade.c | 33 +++++++++++++++++++++----
 2 files changed, 29 insertions(+), 84 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 6e11cdaf2..b44f74453 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,86 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049A20
-sub_8049A20: @ 8049A20
-	push {r4,r5,lr}
-	sub sp, 0xC
-	movs r2, 0
-	ldr r0, _08049A80 @ =gUnknown_03004824
-	ldr r1, [r0]
-	adds r3, r1, 0
-	adds r3, 0x42
-	adds r5, r0, 0
-	ldrb r0, [r3]
-	cmp r2, r0
-	bge _08049A4C
-	adds r4, r1, 0
-	adds r4, 0x51
-_08049A3A:
-	mov r1, sp
-	adds r0, r1, r2
-	adds r1, r4, r2
-	ldrb r1, [r1]
-	strb r1, [r0]
-	adds r2, 0x1
-	ldrb r0, [r3]
-	cmp r2, r0
-	blt _08049A3A
-_08049A4C:
-	adds r4, r5, 0
-	ldr r0, [r4]
-	adds r1, r0, 0
-	adds r1, 0x42
-	ldrb r1, [r1]
-	adds r0, 0x41
-	ldrb r2, [r0]
-	mov r0, sp
-	bl sub_80499F0
-	lsls r0, 24
-	cmp r0, 0
-	bne _08049A88
-	movs r0, 0x3
-	movs r1, 0x2
-	bl sub_804AADC
-	ldr r0, [r4]
-	adds r0, 0x8C
-	ldr r1, _08049A84 @ =0x0000bbcc
-	strh r1, [r0]
-	movs r0, 0xB4
-	movs r1, 0
-	bl sub_804AADC
-	b _08049AB4
-	.align 2, 0
-_08049A80: .4byte gUnknown_03004824
-_08049A84: .4byte 0x0000bbcc
-_08049A88:
-	movs r0, 0x3
-	movs r1, 0x1
-	bl sub_804AADC
-	ldr r0, [r5]
-	adds r0, 0x8C
-	ldr r1, _08049ABC @ =0x0000bbbb
-	strh r1, [r0]
-	bl sub_8007ECC
-	lsls r0, 24
-	cmp r0, 0
-	beq _08049AB4
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, [r5]
-	adds r1, 0x8C
-	movs r2, 0x14
-	bl SendBlock
-_08049AB4:
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08049ABC: .4byte 0x0000bbbb
-	thumb_func_end sub_8049A20
-
 	thumb_func_start sub_8049AC0
 sub_8049AC0: @ 8049AC0
 	push {r4,lr}
diff --git a/src/trade.c b/src/trade.c
index 493730095..d0a375b0f 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -149,7 +149,7 @@ static void sub_8048AB4(void);
 /*static*/ void sub_8049E9C(u8);
 /*static*/ void sub_804AADC(u8, u8);
 /*static*/ void sub_804A80C(void);
-/*static*/ u8 sub_80499F0(const u8 *, u8, u8);
+static u8 sub_80499F0(const u8 *, u8, u8);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -1652,7 +1652,7 @@ static void sub_8049620(void)
     {
         gUnknown_03004824->linkData[0] = 0xaabb;
         gUnknown_03004824->linkData[1] = gUnknown_03004824->tradeMenuCursorPosition;
-        SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, 20);
+        SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, ARRAY_COUNT(gUnknown_03004824->linkData));
     }
     else
     {
@@ -1708,7 +1708,7 @@ static void sub_8049620(void)
         {
             gUnknown_03004824->linkData[i] = i;
         }
-        SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, 20);
+        SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, ARRAY_COUNT(gUnknown_03004824->linkData));
     }
 }
 
@@ -1783,7 +1783,7 @@ static void sub_8049620(void)
     }
 }
 
-/*static*/ u8 sub_80499F0(const u8 *src, u8 partyCount, u8 tradeMenuCursorPosition)
+static u8 sub_80499F0(const u8 *src, u8 partyCount, u8 tradeMenuCursorPosition)
 {
     u8 retval = 0;
     int i;
@@ -1797,6 +1797,31 @@ static void sub_8049620(void)
     return retval;
 }
 
+/*static*/ void sub_8049A20(void)
+{
+    u8 unk_0051[12];
+    int i;
+    for (i = 0; i < gUnknown_03004824->playerPartyCount; i ++)
+    {
+        unk_0051[i] = gUnknown_03004824->unk_0051[i];
+    }
+    if (sub_80499F0(unk_0051, gUnknown_03004824->playerPartyCount, gUnknown_03004824->tradeMenuCursorPosition) == 0)
+    {
+        sub_804AADC(3, 2);
+        gUnknown_03004824->linkData[0] = 0xbbcc;
+        sub_804AADC(0xb4, 0);
+    }
+    else
+    {
+        sub_804AADC(3, 1);
+        gUnknown_03004824->linkData[0] = 0xbbbb;
+        if (sub_8007ECC())
+        {
+            SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, ARRAY_COUNT(gUnknown_03004824->linkData));
+        }
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From b9a41c7dca30fdbe1b8f14aa254b345666df2462 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 14:55:23 -0400
Subject: sub_8049AC0

---
 asm/trade.s | 120 ------------------------------------------------------------
 src/trade.c |  45 ++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 121 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index b44f74453..a155a892f 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,126 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049AC0
-sub_8049AC0: @ 8049AC0
-	push {r4,lr}
-	ldr r0, _08049ADC @ =gMain
-	ldrh r1, [r0, 0x30]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _08049AE0
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x1
-	negs r0, r0
-	b _08049AF0
-	.align 2, 0
-_08049ADC: .4byte gMain
-_08049AE0:
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08049AFC
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x1
-_08049AF0:
-	bl MoveMenuCursor
-	ldr r1, _08049B20 @ =gUnknown_03004824
-	ldr r1, [r1]
-	adds r1, 0x7C
-	strb r0, [r1]
-_08049AFC:
-	ldr r0, _08049B24 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08049B64
-	movs r0, 0x5
-	bl PlaySE
-	bl GetMenuCursorPos
-	lsls r0, 24
-	cmp r0, 0
-	bne _08049B28
-	bl sub_8049A20
-	b _08049B56
-	.align 2, 0
-_08049B20: .4byte gUnknown_03004824
-_08049B24: .4byte gMain
-_08049B28:
-	movs r0, 0x3
-	movs r1, 0x1
-	bl sub_804AADC
-	bl sub_8007ECC
-	lsls r0, 24
-	cmp r0, 0
-	beq _08049B56
-	ldr r4, _08049B5C @ =gUnknown_03004824
-	ldr r0, [r4]
-	adds r0, 0x8C
-	ldr r1, _08049B60 @ =0x0000bbcc
-	strh r1, [r0]
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, [r4]
-	adds r1, 0x8C
-	movs r2, 0x14
-	bl SendBlock
-_08049B56:
-	ldr r0, _08049B5C @ =gUnknown_03004824
-	ldr r0, [r0]
-	b _08049BAA
-	.align 2, 0
-_08049B5C: .4byte gUnknown_03004824
-_08049B60: .4byte 0x0000bbcc
-_08049B64:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08049BB0
-	movs r0, 0x3
-	movs r1, 0x1
-	bl sub_804AADC
-	bl GetMenuCursorPos
-	lsls r0, 24
-	cmp r0, 0
-	bne _08049B8C
-	movs r0, 0x1
-	bl MoveMenuCursor
-	ldr r1, _08049BB8 @ =gUnknown_03004824
-	ldr r1, [r1]
-	adds r1, 0x7C
-	strb r0, [r1]
-_08049B8C:
-	ldr r4, _08049BB8 @ =gUnknown_03004824
-	ldr r0, [r4]
-	adds r0, 0x8C
-	ldr r1, _08049BBC @ =0x0000bbcc
-	strh r1, [r0]
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, [r4]
-	adds r1, 0x8C
-	movs r2, 0x14
-	bl SendBlock
-	ldr r0, [r4]
-_08049BAA:
-	adds r0, 0x7B
-	movs r1, 0x64
-	strb r1, [r0]
-_08049BB0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08049BB8: .4byte gUnknown_03004824
-_08049BBC: .4byte 0x0000bbcc
-	thumb_func_end sub_8049AC0
-
 	thumb_func_start sub_8049BC0
 sub_8049BC0: @ 8049BC0
 	push {r4,r5,lr}
diff --git a/src/trade.c b/src/trade.c
index d0a375b0f..32791dce7 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1797,7 +1797,7 @@ static u8 sub_80499F0(const u8 *src, u8 partyCount, u8 tradeMenuCursorPosition)
     return retval;
 }
 
-/*static*/ void sub_8049A20(void)
+static void sub_8049A20(void)
 {
     u8 unk_0051[12];
     int i;
@@ -1822,6 +1822,49 @@ static u8 sub_80499F0(const u8 *src, u8 partyCount, u8 tradeMenuCursorPosition)
     }
 }
 
+/*static*/ void sub_8049AC0(void)
+{
+    if (gMain.newAndRepeatedKeys & DPAD_UP)
+    {
+        PlaySE(SE_SELECT);
+        gUnknown_03004824->unk_007c = MoveMenuCursor(-1);
+    }
+    else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
+    {
+        PlaySE(SE_SELECT);
+        gUnknown_03004824->unk_007c = MoveMenuCursor(+1);
+    }
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        if (GetMenuCursorPos() == 0)
+        {
+            sub_8049A20();
+        }
+        else
+        {
+            sub_804AADC(3, 1);
+            if (sub_8007ECC())
+            {
+                gUnknown_03004824->linkData[0] = 0xbbcc;
+                SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, ARRAY_COUNT(gUnknown_03004824->linkData));
+            }
+        }
+        gUnknown_03004824->unk_007b = 100;
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        sub_804AADC(3, 1);
+        if (GetMenuCursorPos() == 0)
+        {
+            gUnknown_03004824->unk_007c = MoveMenuCursor(1);
+        }
+        gUnknown_03004824->linkData[0] = 0xbbcc;
+        SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, ARRAY_COUNT(gUnknown_03004824->linkData));
+        gUnknown_03004824->unk_007b = 100;
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 2903c9cc17c42b53a05bf9d5642bbc33bf2de5e8 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 15:02:52 -0400
Subject: sub_8049BC0

---
 asm/trade.s | 97 -------------------------------------------------------------
 src/trade.c | 60 ++++++++++++++++++++++++++++++--------
 2 files changed, 48 insertions(+), 109 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index a155a892f..85043bfab 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,103 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049BC0
-sub_8049BC0: @ 8049BC0
-	push {r4,r5,lr}
-	ldr r0, _08049BDC @ =gMain
-	ldrh r1, [r0, 0x30]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _08049BE0
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x1
-	negs r0, r0
-	b _08049BF0
-	.align 2, 0
-_08049BDC: .4byte gMain
-_08049BE0:
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08049BFC
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x1
-_08049BF0:
-	bl MoveMenuCursor
-	ldr r1, _08049C5C @ =gUnknown_03004824
-	ldr r1, [r1]
-	adds r1, 0x7C
-	strb r0, [r1]
-_08049BFC:
-	ldr r0, _08049C60 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08049C72
-	movs r0, 0x5
-	bl PlaySE
-	bl GetMenuCursorPos
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0
-	bne _08049C6C
-	movs r0, 0x4
-	bl sub_804AA0C
-	ldr r4, _08049C5C @ =gUnknown_03004824
-	ldr r0, [r4]
-	adds r2, r0, 0
-	adds r2, 0x8C
-	ldr r1, _08049C64 @ =0x0000eeaa
-	strh r1, [r2]
-	adds r0, 0x8E
-	strh r5, [r0]
-	movs r0, 0x5
-	movs r1, 0
-	bl sub_804AADC
-	ldr r2, _08049C68 @ =gSprites
-	ldr r0, [r4]
-	adds r0, 0x40
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-	ldr r0, [r4]
-	adds r0, 0x7B
-	movs r1, 0x64
-	strb r1, [r0]
-	b _08049C84
-	.align 2, 0
-_08049C5C: .4byte gUnknown_03004824
-_08049C60: .4byte gMain
-_08049C64: .4byte 0x0000eeaa
-_08049C68: .4byte gSprites
-_08049C6C:
-	bl sub_8049804
-	b _08049C84
-_08049C72:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08049C84
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_8049804
-_08049C84:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8049BC0
-
 	thumb_func_start sub_8049C8C
 sub_8049C8C: @ 8049C8C
 	push {r4,lr}
diff --git a/src/trade.c b/src/trade.c
index 32791dce7..5cddaf12f 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -72,7 +72,7 @@ struct TradeEwramSubstruct {
     /*0x0004*/ struct Window window;
     /*0x0034*/ u8 playerPartyIcons[6];
     /*0x003a*/ u8 friendPartyIcons[6];
-    /*0x0040*/ u8 unk_0040;
+    /*0x0040*/ u8 tradeMenuCursorSpriteIdx;
     /*0x0041*/ u8 tradeMenuCursorPosition;
     /*0x0042*/ u8 playerPartyCount;
     /*0x0043*/ u8 friendPartyCount;
@@ -784,7 +784,7 @@ static void sub_8047EC0(void)
             break;
         case 12:
             sub_8047E44();
-            gUnknown_03004824->unk_0040 = CreateSprite(&gSpriteTemplate_820C134, gTradeMonSpriteCoords[0][0] * 8 + 32, gTradeMonSpriteCoords[0][1] * 8, 2);
+            gUnknown_03004824->tradeMenuCursorSpriteIdx = CreateSprite(&gSpriteTemplate_820C134, gTradeMonSpriteCoords[0][0] * 8 + 32, gTradeMonSpriteCoords[0][1] * 8, 2);
             gUnknown_03004824->tradeMenuCursorPosition = 0;
             gMain.state ++;
             nullsub_5(6, 0);
@@ -941,7 +941,7 @@ void sub_80484F4(void)
                 gUnknown_03004824->tradeMenuCursorPosition = unkStructF->unk_0009;
             else
                 gUnknown_03004824->tradeMenuCursorPosition = unkStructF->unk_0009 + 6;
-            gUnknown_03004824->unk_0040 = CreateSprite(&gSpriteTemplate_820C134, gTradeMonSpriteCoords[gUnknown_03004824->tradeMenuCursorPosition][0] * 8 + 32, gTradeMonSpriteCoords[gUnknown_03004824->tradeMenuCursorPosition][1] * 8, 2);
+            gUnknown_03004824->tradeMenuCursorSpriteIdx = CreateSprite(&gSpriteTemplate_820C134, gTradeMonSpriteCoords[gUnknown_03004824->tradeMenuCursorPosition][0] * 8 + 32, gTradeMonSpriteCoords[gUnknown_03004824->tradeMenuCursorPosition][1] * 8, 2);
             gMain.state = 15;
             nullsub_5(6, 0);
             break;
@@ -1627,15 +1627,15 @@ static void TradeMenuMoveCursor(u8 *tradeMenuCursorPosition, u8 direction)
     u8 newPosition = sub_8049514(*tradeMenuCursorPosition, direction);
     if (newPosition == 12) // CANCEL
     {
-        StartSpriteAnim(&gSprites[gUnknown_03004824->unk_0040], 1);
-        gSprites[gUnknown_03004824->unk_0040].pos1.x = 0xe0;
-        gSprites[gUnknown_03004824->unk_0040].pos1.y = 0xa0;
+        StartSpriteAnim(&gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx], 1);
+        gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].pos1.x = 0xe0;
+        gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].pos1.y = 0xa0;
     }
     else
     {
-        StartSpriteAnim(&gSprites[gUnknown_03004824->unk_0040], 0);
-        gSprites[gUnknown_03004824->unk_0040].pos1.x = gTradeMonSpriteCoords[newPosition][0] * 8 + 32;
-        gSprites[gUnknown_03004824->unk_0040].pos1.y = gTradeMonSpriteCoords[newPosition][1] * 8;
+        StartSpriteAnim(&gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx], 0);
+        gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].pos1.x = gTradeMonSpriteCoords[newPosition][0] * 8 + 32;
+        gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].pos1.y = gTradeMonSpriteCoords[newPosition][1] * 8;
     }
     if (*tradeMenuCursorPosition != newPosition)
     {
@@ -1717,7 +1717,7 @@ static void sub_8049620(void)
     HandleDestroyMenuCursors();
     sub_804A80C();
     gUnknown_03004824->unk_007b = 0;
-    gSprites[gUnknown_03004824->unk_0040].invisible = FALSE;
+    gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].invisible = FALSE;
     sub_804ACD8(gUnknown_0820C14C[1], (u8 *)(BG_CHAR_ADDR(4) + 32 * gUnknown_03004824->unk_007e), 20);
 }
 
@@ -1749,7 +1749,7 @@ static void sub_8049620(void)
         else
         {
             sub_8049620();
-            gSprites[gUnknown_03004824->unk_0040].invisible = TRUE;
+            gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].invisible = TRUE;
         }
     }
     else if (gMain.newKeys & B_BUTTON)
@@ -1857,7 +1857,7 @@ static void sub_8049A20(void)
         sub_804AADC(3, 1);
         if (GetMenuCursorPos() == 0)
         {
-            gUnknown_03004824->unk_007c = MoveMenuCursor(1);
+            gUnknown_03004824->unk_007c = MoveMenuCursor(+1);
         }
         gUnknown_03004824->linkData[0] = 0xbbcc;
         SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, ARRAY_COUNT(gUnknown_03004824->linkData));
@@ -1865,6 +1865,42 @@ static void sub_8049A20(void)
     }
 }
 
+/*static*/ void sub_8049BC0(void)
+{
+    if (gMain.newAndRepeatedKeys & DPAD_UP)
+    {
+        PlaySE(SE_SELECT);
+        gUnknown_03004824->unk_007c = MoveMenuCursor(-1);
+    }
+    else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
+    {
+        PlaySE(SE_SELECT);
+        gUnknown_03004824->unk_007c = MoveMenuCursor(+1);
+    }
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        if (GetMenuCursorPos() == 0)
+        {
+            sub_804AA0C(4);
+            gUnknown_03004824->linkData[0] = 0xeeaa;
+            gUnknown_03004824->linkData[1] = 0;
+            sub_804AADC(5, 0);
+            gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].invisible = TRUE;
+            gUnknown_03004824->unk_007b = 100;
+        }
+        else
+        {
+            sub_8049804();
+        }
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        sub_8049804();
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From da429471ec7dead013e49c340ed4932b5a85bc44 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 15:07:42 -0400
Subject: sub_8049C8C

---
 asm/trade.s | 29 -----------------------------
 src/trade.c | 10 ++++++++++
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 85043bfab..db8eeed1b 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,35 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049C8C
-sub_8049C8C: @ 8049C8C
-	push {r4,lr}
-	bl GetMultiplayerId
-	lsls r0, 24
-	cmp r0, 0
-	bne _08049CAE
-	ldr r4, _08049CC0 @ =gUnknown_03004824
-	ldr r0, [r4]
-	adds r0, 0x41
-	ldrb r0, [r0]
-	bl sub_8049E9C
-	ldr r0, [r4]
-	adds r0, 0x8A
-	ldrb r0, [r0]
-	bl sub_8049E9C
-_08049CAE:
-	ldr r0, _08049CC0 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x7B
-	movs r1, 0x7
-	strb r1, [r0]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08049CC0: .4byte gUnknown_03004824
-	thumb_func_end sub_8049C8C
-
 	thumb_func_start sub_8049CC4
 sub_8049CC4: @ 8049CC4
 	push {r4,lr}
diff --git a/src/trade.c b/src/trade.c
index 5cddaf12f..d04662a93 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1901,6 +1901,16 @@ static void sub_8049A20(void)
     }
 }
 
+void sub_8049C8C(void)
+{
+    if (GetMultiplayerId() == 0)
+    {
+        sub_8049E9C(gUnknown_03004824->tradeMenuCursorPosition);
+        sub_8049E9C(gUnknown_03004824->unk_008a);
+    }
+    gUnknown_03004824->unk_007b = 7;
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 6183bc1e87b42f0996eb38fbfabb91d79a9cc2cb Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 15:10:28 -0400
Subject: sub_8049CC4

---
 asm/trade.s | 24 ------------------------
 src/trade.c | 13 +++++++++++--
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index db8eeed1b..ec21c27d5 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,30 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049CC4
-sub_8049CC4: @ 8049CC4
-	push {r4,lr}
-	ldr r4, _08049CE8 @ =gUnknown_03004824
-	ldr r0, [r4]
-	adds r0, 0x80
-	ldrh r1, [r0]
-	ldr r0, _08049CEC @ =0x00000505
-	cmp r1, r0
-	bne _08049CE0
-	bl sub_8049088
-	ldr r0, [r4]
-	adds r0, 0x7B
-	movs r1, 0xE
-	strb r1, [r0]
-_08049CE0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08049CE8: .4byte gUnknown_03004824
-_08049CEC: .4byte 0x00000505
-	thumb_func_end sub_8049CC4
-
 	thumb_func_start DisplayMessageAndContinueTask
 DisplayMessageAndContinueTask: @ 8049CF0
 	push {r4,lr}
diff --git a/src/trade.c b/src/trade.c
index d04662a93..036f0b4f4 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1437,7 +1437,7 @@ static bool8 sub_8048D44(void)
     return FALSE;
 }
 
-/*static*/ void sub_8049088(void)
+static void sub_8049088(void)
 {
     u8 string[28];
     StringCopy(string, gTradeText_TradeOkayPrompt);
@@ -1901,7 +1901,7 @@ static void sub_8049A20(void)
     }
 }
 
-void sub_8049C8C(void)
+/*static*/ void sub_8049C8C(void)
 {
     if (GetMultiplayerId() == 0)
     {
@@ -1911,6 +1911,15 @@ void sub_8049C8C(void)
     gUnknown_03004824->unk_007b = 7;
 }
 
+/*static*/ void sub_8049CC4(void)
+{
+    if (gUnknown_03004824->unk_0080 == 5 && gUnknown_03004824->unk_0081 == 5)
+    {
+        sub_8049088();
+        gUnknown_03004824->unk_007b = 14;
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From f4b7f25df8a8231a6ade0a39b833b27b9c31ccbc Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 15:14:30 -0400
Subject: DisplayMessageAndContinueTask

---
 asm/trade.s | 44 --------------------------------------------
 src/trade.c | 12 ++++++++++++
 2 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index ec21c27d5..4333bda3f 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,50 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start DisplayMessageAndContinueTask
-DisplayMessageAndContinueTask: @ 8049CF0
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r4, _08049D40 @ =gUnknown_03004824
-	ldr r1, [r4]
-	adds r1, 0xB4
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r1, [r4]
-	adds r0, r1, 0
-	adds r0, 0xB4
-	ldrb r0, [r0]
-	cmp r0, 0x78
-	bls _08049D36
-	adds r0, r1, 0x4
-	movs r1, 0x13
-	str r1, [sp]
-	movs r1, 0x18
-	movs r2, 0xE
-	movs r3, 0x1D
-	bl DrawTextWindow
-	movs r0, 0x18
-	movs r1, 0xE
-	movs r2, 0x4
-	bl InitYesNoMenu
-	ldr r0, [r4]
-	adds r0, 0xB4
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, [r4]
-	adds r0, 0x7B
-	movs r1, 0x3
-	strb r1, [r0]
-_08049D36:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08049D40: .4byte gUnknown_03004824
-	thumb_func_end DisplayMessageAndContinueTask
-
 	thumb_func_start sub_8049D44
 sub_8049D44: @ 8049D44
 	push {lr}
diff --git a/src/trade.c b/src/trade.c
index 036f0b4f4..308082606 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1920,6 +1920,18 @@ static void sub_8049A20(void)
     }
 }
 
+/*static*/ void DisplayMessageAndContinueTask(void)
+{
+    gUnknown_03004824->unk_00b4++;
+    if (gUnknown_03004824->unk_00b4 > 120)
+    {
+        DrawTextWindow(&gUnknown_03004824->window, 24, 14, 29, 19);
+        InitYesNoMenu(24, 14, 4);
+        gUnknown_03004824->unk_00b4 = 0;
+        gUnknown_03004824->unk_007b = 3;
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 714503c895eb1fae6771fbf8d687f3d6ca16c3d8 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 15:20:40 -0400
Subject: Through sub_8049D9C

---
 asm/trade.s | 66 -------------------------------------------------------------
 src/trade.c | 22 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 66 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 4333bda3f..0403bc252 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,72 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049D44
-sub_8049D44: @ 8049D44
-	push {lr}
-	ldr r0, _08049D90 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08049D8A
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0
-	bl sub_804A840
-	movs r0, 0x1
-	bl sub_804A840
-	ldr r2, _08049D94 @ =gUnknown_03004824
-	ldr r0, [r2]
-	adds r0, 0x7B
-	movs r1, 0
-	strb r1, [r0]
-	ldr r3, _08049D98 @ =gSprites
-	ldr r0, [r2]
-	adds r0, 0x40
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x3E
-	ldrb r2, [r0]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r2
-	strb r1, [r0]
-_08049D8A:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08049D90: .4byte gMain
-_08049D94: .4byte gUnknown_03004824
-_08049D98: .4byte gSprites
-	thumb_func_end sub_8049D44
-
-	thumb_func_start sub_8049D9C
-sub_8049D9C: @ 8049D9C
-	push {lr}
-	ldr r0, _08049DBC @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08049DB8
-	bl sub_800832C
-	ldr r0, _08049DC0 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x7B
-	movs r1, 0xC
-	strb r1, [r0]
-_08049DB8:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08049DBC: .4byte gPaletteFade
-_08049DC0: .4byte gUnknown_03004824
-	thumb_func_end sub_8049D9C
-
 	thumb_func_start sub_8049DC4
 sub_8049DC4: @ 8049DC4
 	push {lr}
diff --git a/src/trade.c b/src/trade.c
index 308082606..774b5f6d1 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -150,6 +150,7 @@ static void sub_8048AB4(void);
 /*static*/ void sub_804AADC(u8, u8);
 /*static*/ void sub_804A80C(void);
 static u8 sub_80499F0(const u8 *, u8, u8);
+/*static*/ void sub_804A840(u8);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -1932,6 +1933,27 @@ static void sub_8049A20(void)
     }
 }
 
+/*static*/ void sub_8049D44(void)
+{
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        sub_804A840(0);
+        sub_804A840(1);
+        gUnknown_03004824->unk_007b = 0;
+        gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].invisible = FALSE;
+    }
+}
+
+/*static*/ void sub_8049D9C(void)
+{
+    if (!gPaletteFade.active)
+    {
+        sub_800832C();
+        gUnknown_03004824->unk_007b = 12;
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From fdce319c1c3e54948b476a6e27be80b07a80ac1d Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 15:23:49 -0400
Subject: sub_8049DC4

---
 asm/trade.s    | 17 -----------------
 include/rom4.h |  1 +
 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) {
-- 
cgit v1.2.3


From 8fa301e80c5b196c4530235d874e603689a7a8f4 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 15:30:51 -0400
Subject: sub_8049DE0

---
 asm/trade.s | 84 -------------------------------------------------------------
 src/trade.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 66 insertions(+), 98 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 7e2912e06..dd9a26675 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,90 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049DE0
-sub_8049DE0: @ 8049DE0
-	push {lr}
-	ldr r0, _08049DF8 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x7B
-	ldrb r0, [r0]
-	cmp r0, 0xF
-	bhi _08049E98
-	lsls r0, 2
-	ldr r1, _08049DFC @ =_08049E00
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08049DF8: .4byte gUnknown_03004824
-_08049DFC: .4byte _08049E00
-	.align 2, 0
-_08049E00:
-	.4byte _08049E40
-	.4byte _08049E46
-	.4byte _08049E4C
-	.4byte _08049E52
-	.4byte _08049E58
-	.4byte _08049E98
-	.4byte _08049E5E
-	.4byte _08049E64
-	.4byte _08049E6A
-	.4byte _08049E70
-	.4byte _08049E76
-	.4byte _08049E7C
-	.4byte _08049E82
-	.4byte _08049E88
-	.4byte _08049E8E
-	.4byte _08049E94
-_08049E40:
-	bl sub_8049680
-	b _08049E98
-_08049E46:
-	bl sub_8049860
-	b _08049E98
-_08049E4C:
-	bl sub_804997C
-	b _08049E98
-_08049E52:
-	bl sub_8049AC0
-	b _08049E98
-_08049E58:
-	bl sub_8049BC0
-	b _08049E98
-_08049E5E:
-	bl sub_8049C8C
-	b _08049E98
-_08049E64:
-	bl sub_8049CC4
-	b _08049E98
-_08049E6A:
-	bl sub_8049D44
-	b _08049E98
-_08049E70:
-	bl sub_8048A14
-	b _08049E98
-_08049E76:
-	bl sub_8048A50
-	b _08049E98
-_08049E7C:
-	bl sub_8049D9C
-	b _08049E98
-_08049E82:
-	bl sub_8049DC4
-	b _08049E98
-_08049E88:
-	bl sub_8048A90
-	b _08049E98
-_08049E8E:
-	bl DisplayMessageAndContinueTask
-	b _08049E98
-_08049E94:
-	bl sub_8049954
-_08049E98:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8049DE0
-
 	thumb_func_start sub_8049E9C
 sub_8049E9C: @ 8049E9C
 	push {r4,lr}
diff --git a/src/trade.c b/src/trade.c
index 5989b1484..b1692a984 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -140,7 +140,7 @@ static void sub_80494D8(void);
 static void sub_8048AB4(void);
 /*static*/ void sub_804A940(struct UnkStructE *);
 /*static*/ void sub_804B41C(void);
-/*static*/ void sub_8049DE0(void);
+static void sub_8049DE0(void);
 /*static*/ void sub_804AB30(void);
 /*static*/ void sub_8049ED4(u8);
 /*static*/ void sub_804A6DC(u8);
@@ -1662,7 +1662,7 @@ static void sub_8049620(void)
     }
 }
 
-/*static*/ void sub_8049680(void)
+static void sub_8049680(void)
 {
     int i;
     if (gMain.newAndRepeatedKeys & DPAD_UP)
@@ -1714,7 +1714,7 @@ static void sub_8049620(void)
     }
 }
 
-/*static*/ void sub_8049804(void)
+static void sub_8049804(void)
 {
     HandleDestroyMenuCursors();
     sub_804A80C();
@@ -1723,7 +1723,7 @@ static void sub_8049620(void)
     sub_804ACD8(gUnknown_0820C14C[1], (u8 *)(BG_CHAR_ADDR(4) + 32 * gUnknown_03004824->unk_007e), 20);
 }
 
-/*static*/ void sub_8049860(void)
+static void sub_8049860(void)
 {
     if (gMain.newAndRepeatedKeys & DPAD_UP)
     {
@@ -1761,7 +1761,7 @@ static void sub_8049620(void)
     }
 }
 
-/*static*/ void sub_8049954(void)
+static void sub_8049954(void)
 {
     if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
     {
@@ -1770,7 +1770,7 @@ static void sub_8049620(void)
     }
 }
 
-/*static*/ void sub_804997C(void)
+static void sub_804997C(void)
 {
     if (!gPaletteFade.active)
     {
@@ -1824,7 +1824,7 @@ static void sub_8049A20(void)
     }
 }
 
-/*static*/ void sub_8049AC0(void)
+static void sub_8049AC0(void)
 {
     if (gMain.newAndRepeatedKeys & DPAD_UP)
     {
@@ -1867,7 +1867,7 @@ static void sub_8049A20(void)
     }
 }
 
-/*static*/ void sub_8049BC0(void)
+static void sub_8049BC0(void)
 {
     if (gMain.newAndRepeatedKeys & DPAD_UP)
     {
@@ -1903,7 +1903,7 @@ static void sub_8049A20(void)
     }
 }
 
-/*static*/ void sub_8049C8C(void)
+static void sub_8049C8C(void)
 {
     if (GetMultiplayerId() == 0)
     {
@@ -1913,7 +1913,7 @@ static void sub_8049A20(void)
     gUnknown_03004824->unk_007b = 7;
 }
 
-/*static*/ void sub_8049CC4(void)
+static void sub_8049CC4(void)
 {
     if (gUnknown_03004824->unk_0080 == 5 && gUnknown_03004824->unk_0081 == 5)
     {
@@ -1922,7 +1922,7 @@ static void sub_8049A20(void)
     }
 }
 
-/*static*/ void DisplayMessageAndContinueTask(void)
+static void DisplayMessageAndContinueTask(void)
 {
     gUnknown_03004824->unk_00b4++;
     if (gUnknown_03004824->unk_00b4 > 120)
@@ -1934,7 +1934,7 @@ static void sub_8049A20(void)
     }
 }
 
-/*static*/ void sub_8049D44(void)
+static void sub_8049D44(void)
 {
     if (gMain.newKeys & A_BUTTON)
     {
@@ -1946,7 +1946,7 @@ static void sub_8049A20(void)
     }
 }
 
-/*static*/ void sub_8049D9C(void)
+static void sub_8049D9C(void)
 {
     if (!gPaletteFade.active)
     {
@@ -1955,7 +1955,7 @@ static void sub_8049A20(void)
     }
 }
 
-/*static*/ void sub_8049DC4(void)
+static void sub_8049DC4(void)
 {
     if (gReceivedRemoteLinkPlayers == 0)
     {
@@ -1963,6 +1963,58 @@ static void sub_8049A20(void)
     }
 }
 
+static void sub_8049DE0(void)
+{
+    switch (gUnknown_03004824->unk_007b)
+    {
+        case  0:
+            sub_8049680();
+            break;
+        case  1:
+            sub_8049860();
+            break;
+        case  2:
+            sub_804997C();
+            break;
+        case  3:
+            sub_8049AC0();
+            break;
+        case  4:
+            sub_8049BC0();
+            break;
+        case  6:
+            sub_8049C8C();
+            break;
+        case  7:
+            sub_8049CC4();
+            break;
+        case  8:
+            sub_8049D44();
+            break;
+        case  9:
+            sub_8048A14();
+            break;
+        case 10:
+            sub_8048A50();
+            break;
+        case 11:
+            sub_8049D9C();
+            break;
+        case 12:
+            sub_8049DC4();
+            break;
+        case 13:
+            sub_8048A90();
+            break;
+        case 14:
+            DisplayMessageAndContinueTask();
+            break;
+        case 15:
+            sub_8049954();
+            break;
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 99b65c1b5e8b4f75ca50cb21ecf84b20eff944ae Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 15:35:05 -0400
Subject: sub_8049E9C

---
 asm/trade.s | 31 -------------------------------
 src/trade.c | 27 ++++++++++++++++++---------
 2 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index dd9a26675..2512e7802 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,37 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049E9C
-sub_8049E9C: @ 8049E9C
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	movs r1, 0x6
-	bl __udivsi3
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r3, _08049ED0 @ =gUnknown_03004824
-	ldr r0, [r3]
-	adds r0, 0x80
-	adds r1, r0, r2
-	ldrb r0, [r1]
-	cmp r0, 0
-	bne _08049EC8
-	movs r0, 0x1
-	strb r0, [r1]
-	ldr r0, [r3]
-	adds r0, 0x82
-	adds r0, r2
-	strb r4, [r0]
-_08049EC8:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08049ED0: .4byte gUnknown_03004824
-	thumb_func_end sub_8049E9C
-
 	thumb_func_start sub_8049ED4
 sub_8049ED4: @ 8049ED4
 	push {r4-r7,lr}
diff --git a/src/trade.c b/src/trade.c
index b1692a984..9d28ec8a5 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -87,9 +87,8 @@ struct TradeEwramSubstruct {
     /*0x007c*/ u8 unk_007c;
     /*0x007d*/ u8 unk_007d;
     /*0x007e*/ u16 unk_007e;
-    /*0x0080*/ u8 unk_0080;
-    /*0x0081*/ u8 unk_0081;
-    /*0x0082*/ u8 filler_0082[2];
+    /*0x0080*/ u8 unk_0080[2];
+    /*0x0082*/ u8 unk_0082[2];
     /*0x0084*/ u8 unk_0084;
     /*0x0085*/ u8 unk_0085;
     /*0x0086*/ u8 unk_0086;
@@ -147,7 +146,7 @@ static void sub_8049DE0(void);
 /*static*/ void sub_804A938(struct UnkStructE *);
 /*static*/ u8 sub_804A9F4(void);
 /*static*/ u8 sub_804AA00(void);
-/*static*/ void sub_8049E9C(u8);
+static void sub_8049E9C(u8);
 /*static*/ void sub_804AADC(u8, u8);
 /*static*/ void sub_804A80C(void);
 static u8 sub_80499F0(const u8 *, u8, u8);
@@ -690,8 +689,8 @@ static void sub_8047EC0(void)
             gUnknown_03004824->unk_0075 = 0;
             gUnknown_03004824->unk_007b = 0;
             gUnknown_03004824->unk_007c = 0;
-            gUnknown_03004824->unk_0080 = 0;
-            gUnknown_03004824->unk_0081 = 0;
+            gUnknown_03004824->unk_0080[0] = 0;
+            gUnknown_03004824->unk_0080[1] = 0;
             gUnknown_03004824->unk_0086 = 0;
             gUnknown_03004824->unk_0087 = 0;
             gUnknown_03004824->unk_00b4 = 0;
@@ -870,8 +869,8 @@ void sub_80484F4(void)
             gUnknown_03004824->unk_0075 = 0;
             gUnknown_03004824->unk_007b = 0;
             gUnknown_03004824->unk_007c = 0;
-            gUnknown_03004824->unk_0080 = 0;
-            gUnknown_03004824->unk_0081 = 0;
+            gUnknown_03004824->unk_0080[0] = 0;
+            gUnknown_03004824->unk_0080[1] = 0;
             gUnknown_03004824->unk_0086 = 0;
             gUnknown_03004824->unk_0087 = 0;
             gUnknown_03004824->unk_00b4 = 0;
@@ -1915,7 +1914,7 @@ static void sub_8049C8C(void)
 
 static void sub_8049CC4(void)
 {
-    if (gUnknown_03004824->unk_0080 == 5 && gUnknown_03004824->unk_0081 == 5)
+    if (gUnknown_03004824->unk_0080[0] == 5 && gUnknown_03004824->unk_0080[1] == 5)
     {
         sub_8049088();
         gUnknown_03004824->unk_007b = 14;
@@ -2015,6 +2014,16 @@ static void sub_8049DE0(void)
     }
 }
 
+static void sub_8049E9C(u8 a0)
+{
+    u8 v0 = a0 / 6;
+    if (gUnknown_03004824->unk_0080[v0] == 0)
+    {
+        gUnknown_03004824->unk_0080[v0] = 1;
+        gUnknown_03004824->unk_0082[v0] = a0;
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 01b88dba1f0a7f28c8d047e711affeaa14c257d4 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 18:35:33 -0400
Subject: sub_804A2B4; change `struct Window->config` to const

---
 asm/trade.s           |  63 +------------------
 include/rom_8077ABC.h |   1 +
 include/text.h        |   4 +-
 ld_script.txt         |   2 +
 src/text.c            |   4 +-
 src/trade.c           | 164 ++++++++++++++++++++++++++++++++++++--------------
 6 files changed, 127 insertions(+), 111 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 2512e7802..1c31dced3 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -493,68 +493,7 @@ _0804A2AC: .4byte gUnknown_0820C3D1
 _0804A2B0: .4byte gUnknown_03004824
 	thumb_func_end sub_8049ED4
 
-	thumb_func_start sub_804A2B4
-sub_804A2B4: @ 804A2B4
-	push {r4,r5,lr}
-	sub sp, 0xC
-	adds r5, r0, 0
-	lsls r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	cmp r1, 0
-	bne _0804A2F4
-	movs r0, 0x64
-	adds r4, r2, 0
-	muls r4, r0
-	ldr r0, _0804A2F0 @ =gPlayerParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x2
-	mov r2, sp
-	bl GetMonData
-	adds r0, r5, 0
-	mov r1, sp
-	bl StringCopy10
-	adds r0, r4, 0
-	bl GetMonGender
-	adds r0, r4, 0
-	movs r1, 0x38
-	bl GetMonData
-	b _0804A31E
-	.align 2, 0
-_0804A2F0: .4byte gPlayerParty
-_0804A2F4:
-	movs r0, 0x64
-	adds r4, r2, 0
-	muls r4, r0
-	ldr r0, _0804A334 @ =gEnemyParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x2
-	mov r2, sp
-	bl GetMonData
-	adds r0, r5, 0
-	mov r1, sp
-	bl StringCopy10
-	adds r0, r4, 0
-	bl GetMonGender
-	adds r0, r4, 0
-	movs r1, 0x38
-	bl GetMonData
-_0804A31E:
-	ldr r0, _0804A338 @ =gWindowConfig_81E7294
-	adds r1, r5, 0
-	bl GetStringWidthGivenWindowConfig
-	lsls r0, 24
-	lsrs r0, 24
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0804A334: .4byte gEnemyParty
-_0804A338: .4byte gWindowConfig_81E7294
-	thumb_func_end sub_804A2B4
+    .section .text.sub_804A33C
 
 	thumb_func_start sub_804A33C
 sub_804A33C: @ 804A33C
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h
index 11e94e1f5..34ad7b432 100644
--- a/include/rom_8077ABC.h
+++ b/include/rom_8077ABC.h
@@ -55,5 +55,6 @@ void sub_807A784(u8 taskId);
 void sub_807A850(struct Task *task, u8 taskId);
 void sub_807A8D4(struct Sprite *sprite);
 void sub_807A960(struct Sprite *sprite);
+void sub_8078A34(struct Sprite *sprite);
 
 #endif // GUARD_ROM_8077ABC_H
diff --git a/include/text.h b/include/text.h
index d0c9f0d9d..6b2efc7ae 100644
--- a/include/text.h
+++ b/include/text.h
@@ -125,7 +125,7 @@ struct Window
  /*0x20*/ const u8 *text;
  /*0x24*/ u8 *tileData;
  /*0x28*/ u16 *tilemap;
- /*0x2C*/ struct WindowConfig *config;
+ /*0x2C*/ const struct WindowConfig *config;
 };
 
 extern vu16 *const gBGControlRegs[];
@@ -246,7 +246,7 @@ u8 sub_8004DB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 l
 u8 sub_8004E24(struct Window *win);
 void sub_8004E28(struct Window *win, u8 *foreground, u8 *background, u8 *shadow);
 void sub_8004E3C(struct WindowConfig *winConfig, u8 *tileData, const u8 *text);
-u8 GetStringWidthGivenWindowConfig(struct WindowConfig *winConfig, const u8 *s);
+u8 GetStringWidthGivenWindowConfig(const struct WindowConfig *winConfig, const u8 *s);
 void ConvertInternationalString(u8 *s, u8 language);
 void StripExtCtrlCodes(u8 *str);
 s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2);
diff --git a/ld_script.txt b/ld_script.txt
index 98af35582..170ee9cca 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -80,6 +80,8 @@ SECTIONS {
         src/load_save.o(.text);
         src/trade.o(.text);
         asm/trade.o(.text);
+        src/trade.o(.text.sub_804A2B4);
+        asm/trade.o(.text.sub_804A33C);
         src/trade.o(.text.sub_804A96C);
         asm/trade.o(.text.sub_804A9F4);
         src/trade.o(.text.sub_804DAD4);
diff --git a/src/text.c b/src/text.c
index b27084b86..1dc81df0c 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1943,7 +1943,7 @@ void InitWindowFromConfig(struct Window *win, const struct WindowConfig *winConf
 
 void InitWindow(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top)
 {
-    struct WindowConfig *winConfig = win->config;
+    const struct WindowConfig *winConfig = win->config;
     win->textMode = winConfig->textMode;
     win->fontNum = winConfig->fontNum;
     win->language = GAME_LANGUAGE;
@@ -3653,7 +3653,7 @@ void sub_8004E3C(struct WindowConfig *winConfig, u8 *tileData, const u8 *text)
     sub_8002F44(&sTempWindow);
 }
 
-u8 GetStringWidthGivenWindowConfig(struct WindowConfig *winConfig, const u8 *s)
+u8 GetStringWidthGivenWindowConfig(const struct WindowConfig *winConfig, const u8 *s)
 {
     sTempWindow.config = winConfig;
     InitWindow(&sTempWindow, s, 0, 0, 0);
diff --git a/src/trade.c b/src/trade.c
index 9d28ec8a5..302d323d3 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -23,6 +23,7 @@
 #include "pokemon_summary_screen.h"
 #include "rom4.h"
 #include "trade.h"
+#include "rom_8077ABC.h"
 
 #ifdef ENGLISH
 #define sub_804A96C_alt sub_804A96C
@@ -53,13 +54,6 @@ struct UnkStructC {
 };
 
 struct UnkStructD {
-    /*0x00*/ u8 pad00[0x10];
-    /*0x10*/ u8 var10;
-    /*0x11*/ u8 pad11[1];
-    /*0x12*/ u16 var12[1];
-};
-
-struct UnkStructE {
     /*0x00*/ u8 filler_00[8];
     /*0x08*/ void *vramAddr;
     /*0x0c*/ u8 filler_0c[4];
@@ -71,12 +65,10 @@ struct TradeEwramSubstruct {
     /*0x0000*/ u8 unk_0000;
     /*0x0001*/ u8 unk_0001;
     /*0x0004*/ struct Window window;
-    /*0x0034*/ u8 playerPartyIcons[6];
-    /*0x003a*/ u8 friendPartyIcons[6];
+    /*0x0034*/ u8 partyIcons[2][6];
     /*0x0040*/ u8 tradeMenuCursorSpriteIdx;
     /*0x0041*/ u8 tradeMenuCursorPosition;
-    /*0x0042*/ u8 playerPartyCount;
-    /*0x0043*/ u8 friendPartyCount;
+    /*0x0042*/ u8 partyCounts[2];
     /*0x0044*/ u8 tradeMenuOptionsActive[13];
     /*0x0051*/ u8 unk_0051[6];
     /*0x0056*/ u8 filler_0057[30];
@@ -100,7 +92,7 @@ struct TradeEwramSubstruct {
     /*0x00b4*/ u8 unk_00b4;
     /*0x00b5*/ u8 unk_00b5[7];
     /*0x00bc*/ u8 filler_00bc[12];
-    /*0x00c8*/ struct UnkStructE unk_00c8;
+    /*0x00c8*/ struct UnkStructD unk_00c8;
     /*0x08dc*/ u8 filler_04dc[0x724];
 };
 
@@ -123,7 +115,7 @@ static void sub_8047EC0(void);
 /*static*/ void sub_804ACD8(const u8 *, u8 *, u8);
 static void nullsub_5(u8, u8);
 /*static*/ void sub_804AA88(void);
-/*static*/ void sub_804A964(struct UnkStructE *, void *);
+/*static*/ void sub_804A964(struct UnkStructD *, void *);
 static void sub_80489F4(void);
 /*static*/ void sub_804AA0C(u8);
 static bool8 sub_8048D44(void);
@@ -137,13 +129,13 @@ static void sub_8048B0C(u8);
 /*static*/ void sub_804AF10(void);
 static void sub_80494D8(void);
 static void sub_8048AB4(void);
-/*static*/ void sub_804A940(struct UnkStructE *);
+/*static*/ void sub_804A940(struct UnkStructD *);
 /*static*/ void sub_804B41C(void);
 static void sub_8049DE0(void);
 /*static*/ void sub_804AB30(void);
 /*static*/ void sub_8049ED4(u8);
 /*static*/ void sub_804A6DC(u8);
-/*static*/ void sub_804A938(struct UnkStructE *);
+/*static*/ void sub_804A938(struct UnkStructD *);
 /*static*/ u8 sub_804A9F4(void);
 /*static*/ u8 sub_804AA00(void);
 static void sub_8049E9C(u8);
@@ -151,6 +143,7 @@ static void sub_8049E9C(u8);
 /*static*/ void sub_804A80C(void);
 static u8 sub_80499F0(const u8 *, u8, u8);
 /*static*/ void sub_804A840(u8);
+/*static*/ u8 sub_804A2B4(u8 *, u8, u8);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -751,22 +744,22 @@ static void sub_8047EC0(void)
             CalculateEnemyPartyCount();
             FillWindowRect_DefaultPalette(&gUnknown_03004824->window, 0, 0, 0, 29, 19);
             REG_DISPCNT = 0;
-            gUnknown_03004824->playerPartyCount = gPlayerPartyCount;
-            gUnknown_03004824->friendPartyCount = gEnemyPartyCount;
-            for (i = 0; i < gUnknown_03004824->playerPartyCount; i ++)
-                gUnknown_03004824->playerPartyIcons[i] = CreateMonIcon(GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2), sub_809D62C, gTradeMonSpriteCoords[i][0] * 8 + 14, gTradeMonSpriteCoords[i][1] * 8 - 12, TRUE, GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY));
-            for (i = 0; i < gUnknown_03004824->friendPartyCount; i ++)
-                gUnknown_03004824->friendPartyIcons[i] = CreateMonIcon(GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2, NULL), sub_809D62C, gTradeMonSpriteCoords[6 + i][0] * 8 + 14, gTradeMonSpriteCoords[6 + i][1] * 8 - 12, TRUE, GetMonData(&gEnemyParty[i], MON_DATA_PERSONALITY));
+            gUnknown_03004824->partyCounts[0] = gPlayerPartyCount;
+            gUnknown_03004824->partyCounts[1] = gEnemyPartyCount;
+            for (i = 0; i < gUnknown_03004824->partyCounts[0]; i ++)
+                gUnknown_03004824->partyIcons[0][i] = CreateMonIcon(GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2), sub_809D62C, gTradeMonSpriteCoords[i][0] * 8 + 14, gTradeMonSpriteCoords[i][1] * 8 - 12, TRUE, GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY));
+            for (i = 0; i < gUnknown_03004824->partyCounts[1]; i ++)
+                gUnknown_03004824->partyIcons[1][i] = CreateMonIcon(GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2, NULL), sub_809D62C, gTradeMonSpriteCoords[6 + i][0] * 8 + 14, gTradeMonSpriteCoords[6 + i][1] * 8 - 12, TRUE, GetMonData(&gEnemyParty[i], MON_DATA_PERSONALITY));
             nullsub_5(2, 0);
             gMain.state ++;
             break;
         case  7:
             LoadHeldItemIconGraphics();
-            CreateHeldItemIcons(&gUnknown_03004824->playerPartyCount, gUnknown_03004824->playerPartyIcons, 0);
+            CreateHeldItemIcons(&gUnknown_03004824->partyCounts[0], gUnknown_03004824->partyIcons[0], 0);
             gMain.state ++;
             break;
         case  8:
-            CreateHeldItemIcons(&gUnknown_03004824->playerPartyCount, gUnknown_03004824->playerPartyIcons, 1);
+            CreateHeldItemIcons(&gUnknown_03004824->partyCounts[0], gUnknown_03004824->partyIcons[0], 1);
             gMain.state ++;
             break;
         case  9:
@@ -899,24 +892,24 @@ void sub_80484F4(void)
         case  6:
             CalculateEnemyPartyCount();
             REG_DISPCNT = 0;
-            gUnknown_03004824->playerPartyCount = gPlayerPartyCount;
-            gUnknown_03004824->friendPartyCount = gEnemyPartyCount;
+            gUnknown_03004824->partyCounts[0] = gPlayerPartyCount;
+            gUnknown_03004824->partyCounts[1] = gEnemyPartyCount;
             sub_804A41C(0);
             sub_804A41C(1);
-            for (i = 0; i < gUnknown_03004824->playerPartyCount; i ++)
-                gUnknown_03004824->playerPartyIcons[i] = CreateMonIcon(GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL), sub_809D62C, gTradeMonSpriteCoords[i][0] * 8 + 14, gTradeMonSpriteCoords[i][1] * 8 - 12, TRUE, GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY));
-            for (i = 0; i < gUnknown_03004824->friendPartyCount; i ++)
-                gUnknown_03004824->friendPartyIcons[i] = CreateMonIcon(GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2, NULL), sub_809D62C, gTradeMonSpriteCoords[6 + i][0] * 8 + 14, gTradeMonSpriteCoords[6 + i][1] * 8 - 12, TRUE, GetMonData(&gEnemyParty[i], MON_DATA_PERSONALITY));
+            for (i = 0; i < gUnknown_03004824->partyCounts[0]; i ++)
+                gUnknown_03004824->partyIcons[0][i] = CreateMonIcon(GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL), sub_809D62C, gTradeMonSpriteCoords[i][0] * 8 + 14, gTradeMonSpriteCoords[i][1] * 8 - 12, TRUE, GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY));
+            for (i = 0; i < gUnknown_03004824->partyCounts[1]; i ++)
+                gUnknown_03004824->partyIcons[1][i] = CreateMonIcon(GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2, NULL), sub_809D62C, gTradeMonSpriteCoords[6 + i][0] * 8 + 14, gTradeMonSpriteCoords[6 + i][1] * 8 - 12, TRUE, GetMonData(&gEnemyParty[i], MON_DATA_PERSONALITY));
             nullsub_5(2, 0);
             gMain.state ++;
             break;
         case  7:
             LoadHeldItemIconGraphics();
-            CreateHeldItemIcons(&gUnknown_03004824->playerPartyCount, gUnknown_03004824->playerPartyIcons, 0);
+            CreateHeldItemIcons(&gUnknown_03004824->partyCounts[0], gUnknown_03004824->partyIcons[0], 0);
             gMain.state ++;
             break;
         case  8:
-            CreateHeldItemIcons(&gUnknown_03004824->playerPartyCount, gUnknown_03004824->playerPartyIcons, 1);
+            CreateHeldItemIcons(&gUnknown_03004824->partyCounts[0], gUnknown_03004824->partyIcons[0], 1);
             gMain.state ++;
             break;
         case  9:
@@ -1271,18 +1264,18 @@ static void sub_8048C70(void)
     int i;
     for (i = 0; i < PARTY_SIZE; i ++)
     {
-        if (i < gUnknown_03004824->playerPartyCount)
+        if (i < gUnknown_03004824->partyCounts[0])
         {
-            gSprites[gUnknown_03004824->playerPartyIcons[i]].invisible = FALSE;
+            gSprites[gUnknown_03004824->partyIcons[0][i]].invisible = FALSE;
             gUnknown_03004824->tradeMenuOptionsActive[i] = TRUE;
         }
         else
         {
             gUnknown_03004824->tradeMenuOptionsActive[i] = FALSE;
         }
-        if (i < gUnknown_03004824->friendPartyCount)
+        if (i < gUnknown_03004824->partyCounts[1])
         {
-            gSprites[gUnknown_03004824->friendPartyIcons[i]].invisible = FALSE;
+            gSprites[gUnknown_03004824->partyIcons[1][i]].invisible = FALSE;
             gUnknown_03004824->tradeMenuOptionsActive[i + 6] = TRUE;
         }
         else
@@ -1742,7 +1735,7 @@ static void sub_8049860(void)
             BeginNormalPaletteFade(-1, 0, 0, 16, 0);
             gUnknown_03004824->unk_007b = 2;
         }
-        else if (sub_80499F0(gUnknown_03004824->unk_0051, gUnknown_03004824->playerPartyCount, gUnknown_03004824->tradeMenuCursorPosition) == 0)
+        else if (sub_80499F0(gUnknown_03004824->unk_0051, gUnknown_03004824->partyCounts[0], gUnknown_03004824->tradeMenuCursorPosition) == 0)
         {
             sub_804AADC(3, 2);
             gUnknown_03004824->unk_007b = 8;
@@ -1775,11 +1768,11 @@ static void sub_804997C(void)
     {
         if (gUnknown_03004824->tradeMenuCursorPosition < PARTY_SIZE)
         {
-            ShowPokemonSummaryScreen(gPlayerParty, gUnknown_03004824->tradeMenuCursorPosition, gUnknown_03004824->playerPartyCount - 1, sub_80484F4, 4);
+            ShowPokemonSummaryScreen(gPlayerParty, gUnknown_03004824->tradeMenuCursorPosition, gUnknown_03004824->partyCounts[0] - 1, sub_80484F4, 4);
         }
         else
         {
-            ShowPokemonSummaryScreen(gEnemyParty, gUnknown_03004824->tradeMenuCursorPosition - 6, gUnknown_03004824->friendPartyCount - 1, sub_80484F4, 4);
+            ShowPokemonSummaryScreen(gEnemyParty, gUnknown_03004824->tradeMenuCursorPosition - 6, gUnknown_03004824->partyCounts[1] - 1, sub_80484F4, 4);
         }
     }
 }
@@ -1802,11 +1795,11 @@ static void sub_8049A20(void)
 {
     u8 unk_0051[12];
     int i;
-    for (i = 0; i < gUnknown_03004824->playerPartyCount; i ++)
+    for (i = 0; i < gUnknown_03004824->partyCounts[0]; i ++)
     {
         unk_0051[i] = gUnknown_03004824->unk_0051[i];
     }
-    if (sub_80499F0(unk_0051, gUnknown_03004824->playerPartyCount, gUnknown_03004824->tradeMenuCursorPosition) == 0)
+    if (sub_80499F0(unk_0051, gUnknown_03004824->partyCounts[0], gUnknown_03004824->tradeMenuCursorPosition) == 0)
     {
         sub_804AADC(3, 2);
         gUnknown_03004824->linkData[0] = 0xbbcc;
@@ -2024,9 +2017,90 @@ static void sub_8049E9C(u8 a0)
     }
 }
 
+//static void sub_8049ED4(u8 a0)
+//{
+//    struct Pokemon pokemon;
+//    u8 i;
+//    u8 temp0 = gUnknown_03004824->unk_0082[a0];
+//    u8 sp_plus_6c = temp0 < PARTY_SIZE ? 1 : 0;
+//    u8 r8 = temp0 % 6;
+//    u8 stringLength;
+//    u8 string[12];
+//    
+//    switch (gUnknown_03004824->unk_0080[a0])
+//    {
+//        case 1:
+//            for (i = 0; i < gUnknown_03004824->partyCounts[a0]; i ++)
+//            {
+//                gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][i]].invisible = TRUE;
+//            }
+//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].invisible = FALSE;
+//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].data0 = 20;
+//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].data2 = (gTradeMonSpriteCoords[sp_plus_6c][0] + gTradeMonSpriteCoords[sp_plus_6c][1]) / 2 * 8 + 14;
+//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].data4 = gTradeMonSpriteCoords[sp_plus_6c][1] * 8 - 12;
+//            oamt_set_x3A_32(&gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]], sub_809D62C);
+//            gUnknown_03004824->unk_0080[a0] ++;
+//            sub_8078A34(&gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]]);
+//            HandleDestroyMenuCursors();
+//            FillWindowRect_DefaultPalette(&gUnknown_03004824->window, 0, gUnknown_0820C330[sp_plus_6c][1], 0, gUnknown_0820C330[sp_plus_6c][1], 19);
+//            sub_804A96C_alt(&gUnknown_03004824->unk_00c8, 15 * sp_plus_6c, 0, gTradePartyBoxTilemap, 15, 17, 0);
+//            if (sp_plus_6c == 0)
+//            {
+//                sub_804A80C();
+//            }
+//            break;
+//        case 2:
+//            if (gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].callback == sub_809D62C)
+//            {
+//                gUnknown_03004824->unk_0080[a0] = 3;
+//            }
+//            break;
+//        case 3:
+//            sub_804A96C_alt(&gUnknown_03004824->unk_00c8, 15 * sp_plus_6c, 0, gTradePartyBoxTilemap, 15, 11, 0);
+//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].pos1.x = (gTradeMonSpriteCoords[sp_plus_6c][0] + gTradeMonSpriteCoords[sp_plus_6c][1]) / 2 * 8 + 14;
+//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].pos1.y = gTradeMonSpriteCoords[sp_plus_6c][1] * 8 - 12;
+//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].pos2.x = 0;
+//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].pos2.y = 0;
+//            stringLength = sub_804A2B4(&pokemon, sp_plus_6c, r8);
+//            string[0] = 0xFC;
+//            string[1] = 0x06;
+//            string[2] = 0x04;
+//            string[3] = 0xFC;
+//            string[4] = 0x11;
+//            string[5] = (64 - stringLength + (stringLength > 64 ? 1 : 0)) / 2;
+//            sub_8003460(&gUnknown_03004824->window, string, sp_plus_6c * 192 + gUnknown_03004824->unk_007a, gUnknown_0820C334[sp_plus_6c][0], gUnknown_0820C334[sp_plus_6c][1]);
+//            sub_804A33C()
+//            break;
+//        case 4:
+//            break;
+//    }
+//}
+
+asm(".section .text.sub_804A2B4");
+
+u8 sub_804A2B4(u8 *a0, u8 whichParty, u8 whichPokemon)
+{
+    u8 string[11];
+    if (whichParty == 0)
+    {
+        GetMonData(&gPlayerParty[whichPokemon], MON_DATA_NICKNAME, string);
+        StringCopy10(a0, string);
+        GetMonGender(&gPlayerParty[whichPokemon]);
+        GetMonData(&gPlayerParty[whichPokemon], MON_DATA_LEVEL);
+    }
+    else
+    {
+        GetMonData(&gEnemyParty[whichPokemon], MON_DATA_NICKNAME, string);
+        StringCopy10(a0, string);
+        GetMonGender(&gEnemyParty[whichPokemon]);
+        GetMonData(&gEnemyParty[whichPokemon], MON_DATA_LEVEL);
+    }
+    return GetStringWidthGivenWindowConfig(&gWindowConfig_81E7294, a0);
+}
+
 asm(".section .text.sub_804A96C");
 
-/*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
+/*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, const u16 *tilemap, u8 width, u8 height, u16 sp8) {
     int y, x;
 
     for (y = 0; y < height; y++)
@@ -2034,20 +2108,20 @@ asm(".section .text.sub_804A96C");
 
         for (x = 0; x < width; x++)
         {
-            arg0->var12[(top * 32 + left) + y * 32 + x] = tilemap[width * y + x] | sp8;
+            arg0->unk_12[(top * 32 + left) + y * 32 + x] = tilemap[width * y + x] | sp8;
         }
     }
 
 #if ENGLISH
-    arg0->var10 = 1;
+    arg0->unk_10 = 1;
 #endif
 }
 
 #if GERMAN
-void sub_804A96C_alt(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
+void sub_804A96C_alt(struct UnkStructD *arg0, u8 left, u8 top, const u16 *tilemap, u8 width, u8 height, u16 sp8) {
     sub_804A96C(arg0, left, top, tilemap, width, height, sp8);
 
-    arg0->var10 = 1;
+    arg0->unk_10 = 1;
 }
 #endif
 
-- 
cgit v1.2.3


From e36682b776b03c69b7d6dc3f2bfce5e97c255830 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 18:47:26 -0400
Subject: sub_804A33C

---
 asm/trade.s | 110 ------------------------------------------------------------
 src/trade.c |  38 +++++++++++++++++++--
 2 files changed, 35 insertions(+), 113 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 1c31dced3..5930eff3d 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -495,116 +495,6 @@ _0804A2B0: .4byte gUnknown_03004824
 
     .section .text.sub_804A33C
 
-	thumb_func_start sub_804A33C
-sub_804A33C: @ 804A33C
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x8
-	adds r6, r0, 0
-	lsls r1, 24
-	lsrs r7, r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	ldr r0, _0804A384 @ =gUnknown_03004824
-	ldr r1, [r0]
-	lsls r0, r7, 1
-	adds r0, r7
-	lsls r0, 1
-	adds r0, r2, r0
-	adds r1, 0x5D
-	adds r1, r0
-	ldrb r0, [r1]
-	cmp r0, 0
-	bne _0804A3F4
-	movs r4, 0
-	movs r0, 0x64
-	adds r5, r2, 0
-	muls r5, r0
-	ldr r0, _0804A388 @ =gPlayerParty
-	mov r9, r0
-	ldr r2, _0804A38C @ =gEnemyParty
-	mov r8, r2
-_0804A376:
-	cmp r7, 0
-	bne _0804A390
-	adds r1, r4, 0
-	adds r1, 0xD
-	mov r2, r9
-	b _0804A396
-	.align 2, 0
-_0804A384: .4byte gUnknown_03004824
-_0804A388: .4byte gPlayerParty
-_0804A38C: .4byte gEnemyParty
-_0804A390:
-	adds r1, r4, 0
-	adds r1, 0xD
-	mov r2, r8
-_0804A396:
-	adds r0, r5, r2
-	movs r2, 0
-	bl GetMonData
-	lsls r1, r4, 1
-	add r1, sp
-	strh r0, [r1]
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0x3
-	bls _0804A376
-	ldr r1, _0804A3E8 @ =gOtherText_Terminator
-	adds r0, r6, 0
-	bl StringCopy
-	movs r4, 0
-_0804A3B8:
-	lsls r0, r4, 1
-	mov r2, sp
-	adds r1, r2, r0
-	ldrh r0, [r1]
-	cmp r0, 0
-	beq _0804A3D4
-	adds r1, r0, 0
-	movs r0, 0xD
-	muls r1, r0
-	ldr r0, _0804A3EC @ =gMoveNames
-	adds r1, r0
-	adds r0, r6, 0
-	bl StringAppend
-_0804A3D4:
-	adds r0, r6, 0
-	ldr r1, _0804A3F0 @ =gOtherText_ControlAndMiscText
-	bl StringAppend
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0x3
-	bls _0804A3B8
-	b _0804A404
-	.align 2, 0
-_0804A3E8: .4byte gOtherText_Terminator
-_0804A3EC: .4byte gMoveNames
-_0804A3F0: .4byte gOtherText_ControlAndMiscText
-_0804A3F4:
-	ldr r1, _0804A414 @ =gOtherText_Terminator
-	adds r0, r6, 0
-	bl StringCopy
-	ldr r1, _0804A418 @ =gOtherText_FourQuestions
-	adds r0, r6, 0
-	bl StringAppend
-_0804A404:
-	add sp, 0x8
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804A414: .4byte gOtherText_Terminator
-_0804A418: .4byte gOtherText_FourQuestions
-	thumb_func_end sub_804A33C
-
 	thumb_func_start sub_804A41C
 sub_804A41C: @ 804A41C
 	push {r4-r7,lr}
diff --git a/src/trade.c b/src/trade.c
index 302d323d3..ad97b0ca7 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -71,7 +71,8 @@ struct TradeEwramSubstruct {
     /*0x0042*/ u8 partyCounts[2];
     /*0x0044*/ u8 tradeMenuOptionsActive[13];
     /*0x0051*/ u8 unk_0051[6];
-    /*0x0056*/ u8 filler_0057[30];
+    /*0x0057*/ u8 filler_0057[6];
+    /*0x005d*/ u8 unk_005d[4][6];
     /*0x0075*/ u8 unk_0075;
     /*0x0076*/ u8 filler_0076[4];
     /*0x007a*/ u8 unk_007a;
@@ -2017,6 +2018,7 @@ static void sub_8049E9C(u8 a0)
     }
 }
 
+// TODO: Figure out what the f**k is going on here
 //static void sub_8049ED4(u8 a0)
 //{
 //    struct Pokemon pokemon;
@@ -2024,8 +2026,8 @@ static void sub_8049E9C(u8 a0)
 //    u8 temp0 = gUnknown_03004824->unk_0082[a0];
 //    u8 sp_plus_6c = temp0 < PARTY_SIZE ? 1 : 0;
 //    u8 r8 = temp0 % 6;
-//    u8 stringLength;
-//    u8 string[12];
+//    s8 stringLength;
+//    u8 string[10];
 //    
 //    switch (gUnknown_03004824->unk_0080[a0])
 //    {
@@ -2098,6 +2100,36 @@ u8 sub_804A2B4(u8 *a0, u8 whichParty, u8 whichPokemon)
     return GetStringWidthGivenWindowConfig(&gWindowConfig_81E7294, a0);
 }
 
+void sub_804A33C(u8 *a0, u8 whichParty, u8 whichPokemon)
+{
+    u16 i;
+    u16 moves[4];
+    if (gUnknown_03004824->unk_005d[whichParty][whichPokemon] == 0)
+    {
+        for (i = 0; i < 4; i ++)
+        {
+            if (whichParty == 0)
+                moves[i] = GetMonData(&gPlayerParty[whichPokemon], MON_DATA_MOVE1 + i, NULL);
+            else
+                moves[i] = GetMonData(&gEnemyParty[whichPokemon], MON_DATA_MOVE1 + i, NULL);
+        }
+        StringCopy(a0, gOtherText_Terminator);
+        for (i = 0; i < 4; i ++)
+        {
+            if (moves[i] != 0)
+            {
+                StringAppend(a0, gMoveNames[moves[i]]);
+            }
+            StringAppend(a0, gOtherText_ControlAndMiscText);
+        }
+    }
+    else
+    {
+        StringCopy(a0, gOtherText_Terminator);
+        StringAppend(a0, gOtherText_FourQuestions);
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, const u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From e32ae86756636812ab899b543ebe4c943459cd49 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 20:06:47 -0400
Subject: sub_804A51C

---
 asm/trade.s        | 358 -----------------------------------------------------
 include/daycare.h  |   1 +
 include/graphics.h |   1 +
 src/trade.c        | 218 +++++++++++++++++++++++++++++++-
 4 files changed, 216 insertions(+), 362 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 5930eff3d..032a31051 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -495,364 +495,6 @@ _0804A2B0: .4byte gUnknown_03004824
 
     .section .text.sub_804A33C
 
-	thumb_func_start sub_804A41C
-sub_804A41C: @ 804A41C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x44
-	lsls r0, 24
-	lsrs r5, r0, 24
-	add r3, sp, 0x1C
-	movs r2, 0
-	movs r1, 0xFC
-	strb r1, [r3]
-	movs r0, 0x6
-	strb r0, [r3, 0x1]
-	movs r0, 0x4
-	strb r0, [r3, 0x2]
-	strb r1, [r3, 0x3]
-	movs r0, 0x11
-	strb r0, [r3, 0x4]
-	strb r2, [r3, 0x5]
-	movs r6, 0
-	ldr r1, _0804A470 @ =gUnknown_03004824
-	ldr r0, [r1]
-	adds r0, 0x42
-	adds r0, r5
-	ldrb r0, [r0]
-	cmp r6, r0
-	bcs _0804A504
-	mov r8, r3
-	adds r7, r1, 0
-	ldr r0, _0804A474 @ =gTradeMonSpriteCoords
-	mov r9, r0
-	movs r4, 0x1
-	add r4, r9
-	mov r10, r4
-_0804A462:
-	cmp r5, 0
-	bne _0804A47C
-	movs r0, 0x64
-	adds r4, r6, 0
-	muls r4, r0
-	ldr r0, _0804A478 @ =gPlayerParty
-	b _0804A484
-	.align 2, 0
-_0804A470: .4byte gUnknown_03004824
-_0804A474: .4byte gTradeMonSpriteCoords
-_0804A478: .4byte gPlayerParty
-_0804A47C:
-	movs r0, 0x64
-	adds r4, r6, 0
-	muls r4, r0
-	ldr r0, _0804A514 @ =gEnemyParty
-_0804A484:
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x2
-	add r2, sp, 0x4
-	bl GetMonData
-	mov r0, sp
-	adds r0, 0x22
-	add r1, sp, 0x4
-	bl StringCopy10
-	adds r0, r4, 0
-	bl GetMonGender
-	mov r1, sp
-	adds r1, 0x22
-	ldr r0, _0804A518 @ =gWindowConfig_81E7294
-	bl GetStringWidthGivenWindowConfig
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x32
-	subs r1, r0
-	lsrs r0, r1, 31
-	adds r1, r0
-	asrs r1, 1
-	mov r0, r8
-	strb r1, [r0, 0x5]
-	ldr r1, [r7]
-	adds r0, r1, 0x4
-	adds r1, 0x7A
-	lsls r2, r5, 5
-	adds r2, r5
-	lsls r2, 2
-	ldrb r1, [r1]
-	adds r2, r1
-	movs r1, 0x16
-	muls r1, r6
-	adds r2, r1
-	lsls r2, 16
-	lsrs r2, 16
-	lsls r1, r5, 1
-	adds r1, r5
-	lsls r1, 1
-	adds r1, r6, r1
-	lsls r1, 1
-	mov r4, r9
-	adds r3, r1, r4
-	ldrb r3, [r3]
-	add r1, r10
-	ldrb r1, [r1]
-	str r1, [sp]
-	mov r1, r8
-	bl sub_8003460
-	adds r0, r6, 0x1
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r0, [r7]
-	adds r0, 0x42
-	adds r0, r5
-	ldrb r0, [r0]
-	cmp r6, r0
-	bcc _0804A462
-_0804A504:
-	add sp, 0x44
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804A514: .4byte gEnemyParty
-_0804A518: .4byte gWindowConfig_81E7294
-	thumb_func_end sub_804A41C
-
-	thumb_func_start sub_804A51C
-sub_804A51C: @ 804A51C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x28
-	ldr r4, [sp, 0x48]
-	ldr r5, [sp, 0x4C]
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	lsls r1, 24
-	lsrs r1, 24
-	mov r9, r1
-	lsls r2, 24
-	lsrs r2, 24
-	mov r10, r2
-	lsls r3, 24
-	lsrs r3, 24
-	str r3, [sp, 0x24]
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r5, 24
-	lsrs r5, 24
-	ldr r0, _0804A59C @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0xC8
-	ldr r3, _0804A5A0 @ =gTradeMonBoxTilemap
-	movs r1, 0x6
-	str r1, [sp]
-	movs r1, 0x3
-	str r1, [sp, 0x4]
-	movs r1, 0
-	str r1, [sp, 0x8]
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl sub_804A96C
-	mov r0, r8
-	cmp r0, 0
-	bne _0804A5A8
-	movs r0, 0x64
-	mov r4, r9
-	muls r4, r0
-	ldr r0, _0804A5A4 @ =gPlayerParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x38
-	movs r2, 0
-	bl GetMonData
-	lsls r0, 24
-	lsrs r6, r0, 24
-	adds r0, r4, 0
-	bl GetMonGender
-	lsls r0, 24
-	lsrs r7, r0, 24
-	adds r0, r4, 0
-	movs r1, 0x2
-	add r2, sp, 0xC
-	bl GetMonData
-	b _0804A5D4
-	.align 2, 0
-_0804A59C: .4byte gUnknown_03004824
-_0804A5A0: .4byte gTradeMonBoxTilemap
-_0804A5A4: .4byte gPlayerParty
-_0804A5A8:
-	movs r0, 0x64
-	mov r4, r9
-	muls r4, r0
-	ldr r0, _0804A65C @ =gEnemyParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x38
-	movs r2, 0
-	bl GetMonData
-	lsls r0, 24
-	lsrs r6, r0, 24
-	adds r0, r4, 0
-	bl GetMonGender
-	lsls r0, 24
-	lsrs r7, r0, 24
-	adds r0, r4, 0
-	movs r1, 0x2
-	add r2, sp, 0xC
-	bl GetMonData
-_0804A5D4:
-	ldr r1, _0804A660 @ =gUnknown_03004824
-	ldr r5, [r1]
-	mov r3, r8
-	lsls r0, r3, 1
-	add r0, r8
-	lsls r0, 1
-	add r0, r9
-	adds r1, r5, 0
-	adds r1, 0x5D
-	adds r1, r0
-	ldrb r0, [r1]
-	cmp r0, 0
-	bne _0804A690
-	adds r0, r6, 0
-	movs r1, 0xA
-	bl __udivsi3
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, [sp, 0x24]
-	lsls r2, r0, 5
-	cmp r4, 0
-	beq _0804A614
-	mov r1, r10
-	adds r0, r1, r2
-	lsls r0, 1
-	adds r1, r5, 0
-	adds r1, 0xDA
-	adds r1, r0
-	adds r0, r4, 0
-	adds r0, 0x60
-	strh r0, [r1]
-_0804A614:
-	ldr r3, _0804A660 @ =gUnknown_03004824
-	ldr r4, [r3]
-	mov r0, r10
-	adds r5, r0, r2
-	adds r0, r5, 0x1
-	lsls r0, 1
-	adds r4, 0xDA
-	adds r4, r0
-	adds r0, r6, 0
-	movs r1, 0xA
-	bl __umodsi3
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, 0x70
-	strh r0, [r4]
-	cmp r7, 0
-	bne _0804A664
-	add r0, sp, 0xC
-	movs r1, 0
-	bl NameHasGenderSymbol
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804A6CC
-	ldr r3, _0804A660 @ =gUnknown_03004824
-	ldr r1, [r3]
-	adds r0, r5, 0
-	subs r0, 0x1F
-	lsls r0, 1
-	adds r1, 0xDA
-	adds r1, r0
-	ldrh r0, [r1]
-	adds r0, 0x1
-	b _0804A6CA
-	.align 2, 0
-_0804A65C: .4byte gEnemyParty
-_0804A660: .4byte gUnknown_03004824
-_0804A664:
-	cmp r7, 0xFE
-	bne _0804A6CC
-	add r0, sp, 0xC
-	movs r1, 0xFE
-	bl NameHasGenderSymbol
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804A6CC
-	ldr r0, _0804A68C @ =gUnknown_03004824
-	ldr r1, [r0]
-	adds r0, r5, 0
-	subs r0, 0x1F
-	lsls r0, 1
-	adds r1, 0xDA
-	adds r1, r0
-	ldrh r0, [r1]
-	adds r0, 0x2
-	b _0804A6CA
-	.align 2, 0
-_0804A68C: .4byte gUnknown_03004824
-_0804A690:
-	ldr r1, [sp, 0x24]
-	lsls r0, r1, 5
-	mov r1, r10
-	adds r3, r1, r0
-	adds r1, r3, 0
-	subs r1, 0x20
-	lsls r1, 1
-	adds r2, r5, 0
-	adds r2, 0xDA
-	adds r1, r2, r1
-	adds r0, r3, 0
-	subs r0, 0x21
-	lsls r0, 1
-	adds r0, r2, r0
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, r3, 0
-	subs r1, 0x1F
-	lsls r1, 1
-	adds r1, r2, r1
-	adds r0, r3, 0
-	subs r0, 0x24
-	lsls r0, 1
-	adds r2, r0
-	ldrh r2, [r2]
-	movs r3, 0x80
-	lsls r3, 3
-	adds r0, r3, 0
-	orrs r0, r2
-_0804A6CA:
-	strh r0, [r1]
-_0804A6CC:
-.ifdef GERMAN
-	ldr r0, _0804A6E8 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0xD8
-	movs r1, 0x1
-	strb r1, [r0]
-.endif
-	add sp, 0x28
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-.ifdef GERMAN
-	.align 2, 0
-_0804A6E8: .4byte gUnknown_03004824
-.endif
-	thumb_func_end sub_804A51C
-
 	thumb_func_start sub_804A6DC
 sub_804A6DC: @ 804A6DC
 	push {r4-r7,lr}
diff --git a/include/daycare.h b/include/daycare.h
index b90c50610..7963d911a 100644
--- a/include/daycare.h
+++ b/include/daycare.h
@@ -10,5 +10,6 @@ void sub_8041950(void);
 void sub_8042044(struct Pokemon *mon, u16, u8);
 u8 sub_80422A0(void);
 u8 daycare_relationship_score_from_savegame(void);
+bool8 NameHasGenderSymbol(const u8 *, u8);
 
 #endif // GUARD_DAYCARE_H
diff --git a/include/graphics.h b/include/graphics.h
index 09ef5343c..b196cfe1c 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2569,4 +2569,5 @@ extern const u16 gUnknown_08EA0328[];
 extern const u16 gUnknown_08EA02C8[];
 extern const u16 gUnknown_08EA0348[];
 extern const u16 gUnknown_08EA15C8[];
+extern const u16 gTradeMonBoxTilemap[];
 #endif  // GUARD_GRAPHICS_H
diff --git a/src/trade.c b/src/trade.c
index ad97b0ca7..412e52102 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -22,8 +22,9 @@
 #include "data2.h"
 #include "pokemon_summary_screen.h"
 #include "rom4.h"
-#include "trade.h"
 #include "rom_8077ABC.h"
+#include "daycare.h"
+#include "trade.h"
 
 #ifdef ENGLISH
 #define sub_804A96C_alt sub_804A96C
@@ -145,6 +146,7 @@ static void sub_8049E9C(u8);
 static u8 sub_80499F0(const u8 *, u8, u8);
 /*static*/ void sub_804A840(u8);
 /*static*/ u8 sub_804A2B4(u8 *, u8, u8);
+/*static*/ void sub_804A96C_alt(struct UnkStructD *, u8, u8, const u16 *, u8, u8, u16);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -2027,7 +2029,7 @@ static void sub_8049E9C(u8 a0)
 //    u8 sp_plus_6c = temp0 < PARTY_SIZE ? 1 : 0;
 //    u8 r8 = temp0 % 6;
 //    s8 stringLength;
-//    u8 string[10];
+//    u8 string[50];
 //    
 //    switch (gUnknown_03004824->unk_0080[a0])
 //    {
@@ -2063,13 +2065,13 @@ static void sub_8049E9C(u8 a0)
 //            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].pos1.y = gTradeMonSpriteCoords[sp_plus_6c][1] * 8 - 12;
 //            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].pos2.x = 0;
 //            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].pos2.y = 0;
-//            stringLength = sub_804A2B4(&pokemon, sp_plus_6c, r8);
+//            stringLength = sub_804A2B4(&string[6], sp_plus_6c, r8);
 //            string[0] = 0xFC;
 //            string[1] = 0x06;
 //            string[2] = 0x04;
 //            string[3] = 0xFC;
 //            string[4] = 0x11;
-//            string[5] = (64 - stringLength + (stringLength > 64 ? 1 : 0)) / 2;
+//            string[5] = (64 - stringLength) / 2;
 //            sub_8003460(&gUnknown_03004824->window, string, sp_plus_6c * 192 + gUnknown_03004824->unk_007a, gUnknown_0820C334[sp_plus_6c][0], gUnknown_0820C334[sp_plus_6c][1]);
 //            sub_804A33C()
 //            break;
@@ -2130,6 +2132,214 @@ void sub_804A33C(u8 *a0, u8 whichParty, u8 whichPokemon)
     }
 }
 
+#ifdef NONMATCHING
+void sub_804A41C(u8 whichParty)
+{
+    u8 i;
+    u8 nickname[22];
+    u8 string[40];
+    struct Pokemon *pokemon;
+
+    string[0] = 0xFC;
+    string[1] = 0x06;
+    string[2] = 0x04;
+    string[3] = 0xFC;
+    string[4] = 0x11;
+    string[5] = 0x00;
+
+    for (i = 0; i < gUnknown_03004824->partyCounts[whichParty]; i ++)
+    {
+        pokemon = whichParty == 0 ? &gPlayerParty[i] : &gEnemyParty[i];
+        GetMonData(pokemon, MON_DATA_NICKNAME, nickname);
+        StringCopy10(string + 6, nickname);
+        GetMonGender(pokemon);
+        string[5] = (50 - GetStringWidthGivenWindowConfig(&gWindowConfig_81E7294, string + 6)) / 2;
+        sub_8003460(&gUnknown_03004824->window, string, gUnknown_03004824->unk_007a + 22 * 6 * whichParty + 22 * i, gTradeMonSpriteCoords[i + 6 * whichParty][0], gTradeMonSpriteCoords[i + 6 * whichParty][1]);
+    }
+}
+#else
+__attribute__((naked))
+void sub_804A41C(u8 whichParty)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                    "\tmov r7, r10\n"
+                    "\tmov r6, r9\n"
+                    "\tmov r5, r8\n"
+                    "\tpush {r5-r7}\n"
+                    "\tsub sp, 0x44\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r5, r0, 24\n"
+                    "\tadd r3, sp, 0x1C\n"
+                    "\tmovs r2, 0\n"
+                    "\tmovs r1, 0xFC\n"
+                    "\tstrb r1, [r3]\n"
+                    "\tmovs r0, 0x6\n"
+                    "\tstrb r0, [r3, 0x1]\n"
+                    "\tmovs r0, 0x4\n"
+                    "\tstrb r0, [r3, 0x2]\n"
+                    "\tstrb r1, [r3, 0x3]\n"
+                    "\tmovs r0, 0x11\n"
+                    "\tstrb r0, [r3, 0x4]\n"
+                    "\tstrb r2, [r3, 0x5]\n"
+                    "\tmovs r6, 0\n"
+                    "\tldr r1, _0804A470 @ =gUnknown_03004824\n"
+                    "\tldr r0, [r1]\n"
+                    "\tadds r0, 0x42\n"
+                    "\tadds r0, r5\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r6, r0\n"
+                    "\tbcs _0804A504\n"
+                    "\tmov r8, r3\n"
+                    "\tadds r7, r1, 0\n"
+                    "\tldr r0, _0804A474 @ =gTradeMonSpriteCoords\n"
+                    "\tmov r9, r0\n"
+                    "\tmovs r4, 0x1\n"
+                    "\tadd r4, r9\n"
+                    "\tmov r10, r4\n"
+                    "_0804A462:\n"
+                    "\tcmp r5, 0\n"
+                    "\tbne _0804A47C\n"
+                    "\tmovs r0, 0x64\n"
+                    "\tadds r4, r6, 0\n"
+                    "\tmuls r4, r0\n"
+                    "\tldr r0, _0804A478 @ =gPlayerParty\n"
+                    "\tb _0804A484\n"
+                    "\t.align 2, 0\n"
+                    "_0804A470: .4byte gUnknown_03004824\n"
+                    "_0804A474: .4byte gTradeMonSpriteCoords\n"
+                    "_0804A478: .4byte gPlayerParty\n"
+                    "_0804A47C:\n"
+                    "\tmovs r0, 0x64\n"
+                    "\tadds r4, r6, 0\n"
+                    "\tmuls r4, r0\n"
+                    "\tldr r0, _0804A514 @ =gEnemyParty\n"
+                    "_0804A484:\n"
+                    "\tadds r4, r0\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tmovs r1, 0x2\n"
+                    "\tadd r2, sp, 0x4\n"
+                    "\tbl GetMonData\n"
+                    "\tmov r0, sp\n"
+                    "\tadds r0, 0x22\n"
+                    "\tadd r1, sp, 0x4\n"
+                    "\tbl StringCopy10\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tbl GetMonGender\n"
+                    "\tmov r1, sp\n"
+                    "\tadds r1, 0x22\n"
+                    "\tldr r0, _0804A518 @ =gWindowConfig_81E7294\n"
+                    "\tbl GetStringWidthGivenWindowConfig\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tmovs r1, 0x32\n"
+                    "\tsubs r1, r0\n"
+                    "\tlsrs r0, r1, 31\n"
+                    "\tadds r1, r0\n"
+                    "\tasrs r1, 1\n"
+                    "\tmov r0, r8\n"
+                    "\tstrb r1, [r0, 0x5]\n"
+                    "\tldr r1, [r7]\n"
+                    "\tadds r0, r1, 0x4\n"
+                    "\tadds r1, 0x7A\n"
+                    "\tlsls r2, r5, 5\n"
+                    "\tadds r2, r5\n"
+                    "\tlsls r2, 2\n"
+                    "\tldrb r1, [r1]\n"
+                    "\tadds r2, r1\n"
+                    "\tmovs r1, 0x16\n"
+                    "\tmuls r1, r6\n"
+                    "\tadds r2, r1\n"
+                    "\tlsls r2, 16\n"
+                    "\tlsrs r2, 16\n"
+                    "\tlsls r1, r5, 1\n"
+                    "\tadds r1, r5\n"
+                    "\tlsls r1, 1\n"
+                    "\tadds r1, r6, r1\n"
+                    "\tlsls r1, 1\n"
+                    "\tmov r4, r9\n"
+                    "\tadds r3, r1, r4\n"
+                    "\tldrb r3, [r3]\n"
+                    "\tadd r1, r10\n"
+                    "\tldrb r1, [r1]\n"
+                    "\tstr r1, [sp]\n"
+                    "\tmov r1, r8\n"
+                    "\tbl sub_8003460\n"
+                    "\tadds r0, r6, 0x1\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r6, r0, 24\n"
+                    "\tldr r0, [r7]\n"
+                    "\tadds r0, 0x42\n"
+                    "\tadds r0, r5\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r6, r0\n"
+                    "\tbcc _0804A462\n"
+                    "_0804A504:\n"
+                    "\tadd sp, 0x44\n"
+                    "\tpop {r3-r5}\n"
+                    "\tmov r8, r3\n"
+                    "\tmov r9, r4\n"
+                    "\tmov r10, r5\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r0}\n"
+                    "\tbx r0\n"
+                    "\t.align 2, 0\n"
+                    "_0804A514: .4byte gEnemyParty\n"
+                    "_0804A518: .4byte gWindowConfig_81E7294");
+}
+#endif
+
+void sub_804A51C(u8 a0, u8 a1, u8 a2, u8 a3, u8 a4, u8 a5)
+{
+    u8 nickname[24];
+    u8 level;
+    u8 gender;
+    u8 lv_div_10;
+    sub_804A96C(&gUnknown_03004824->unk_00c8, a4, a5, gTradeMonBoxTilemap, 6, 3, 0);
+    if (a0 == 0)
+    {
+        level = GetMonData(&gPlayerParty[a1], MON_DATA_LEVEL, NULL);
+        gender = GetMonGender(&gPlayerParty[a1]);
+        GetMonData(&gPlayerParty[a1], MON_DATA_NICKNAME, nickname);
+    }
+    else
+    {
+        level = GetMonData(&gEnemyParty[a1], MON_DATA_LEVEL, NULL);
+        gender = GetMonGender(&gEnemyParty[a1]);
+        GetMonData(&gEnemyParty[a1], MON_DATA_NICKNAME, nickname);
+    }
+    if (gUnknown_03004824->unk_005d[a0][a1] == 0)
+    {
+        lv_div_10 = level / 10;
+        if (lv_div_10 != 0)
+        {
+            gUnknown_03004824->unk_00c8.unk_12[a2 + 32 * a3] = lv_div_10 + 0x60;
+        }
+        gUnknown_03004824->unk_00c8.unk_12[a2 + 32 * a3 + 1] = (u8)(level % 10) + 0x70;
+        if (gender == MON_MALE)
+        {
+            if (!NameHasGenderSymbol(nickname, MON_MALE))
+            {
+                gUnknown_03004824->unk_00c8.unk_12[a2 + 32 * a3 - 31] += 1;
+            }
+        }
+        else if (gender == MON_FEMALE)
+        {
+            if (!NameHasGenderSymbol(nickname, MON_FEMALE))
+            {
+                gUnknown_03004824->unk_00c8.unk_12[a2 + 32 * a3 - 31] += 2;
+            }
+        }
+    }
+    else
+    {
+        gUnknown_03004824->unk_00c8.unk_12[a2 + 32 * a3 - 32] = gUnknown_03004824->unk_00c8.unk_12[a2 + 32 * a3 - 33];
+        gUnknown_03004824->unk_00c8.unk_12[a2 + 32 * a3 - 31] = gUnknown_03004824->unk_00c8.unk_12[a2 + 32 * a3 - 36] | 0x400;
+    }
+#ifdef GERMAN
+    gUnknown_03004824->unk_00c8.unk_10 = 1;
+#endif
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, const u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From e2475defe8867d6b50364e98e765ef4b5d117c4f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 20:25:16 -0400
Subject: nearly-matching sub_804A6DC

---
 asm/trade.s |  53 ------------------------
 src/trade.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 103 insertions(+), 85 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 032a31051..c8f35ceae 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -495,59 +495,6 @@ _0804A2B0: .4byte gUnknown_03004824
 
     .section .text.sub_804A33C
 
-	thumb_func_start sub_804A6DC
-sub_804A6DC: @ 804A6DC
-	push {r4-r7,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r6, r0, 24
-	movs r7, 0
-	ldr r0, _0804A734 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x42
-	adds r0, r6
-	ldrb r0, [r0]
-	cmp r7, r0
-	bge _0804A72C
-	lsls r0, r6, 1
-	adds r0, r6
-	ldr r1, _0804A738 @ =gTradeLevelDisplayCoords
-	lsls r0, 2
-	adds r5, r0, r1
-	ldr r1, _0804A73C @ =gTradeMonBoxCoords
-	adds r4, r0, r1
-_0804A702:
-	lsls r1, r7, 24
-	lsrs r1, 24
-	ldrb r2, [r5]
-	ldrb r3, [r5, 0x1]
-	ldrb r0, [r4]
-	str r0, [sp]
-	ldrb r0, [r4, 0x1]
-	str r0, [sp, 0x4]
-	adds r0, r6, 0
-	bl sub_804A51C
-	adds r5, 0x2
-	adds r4, 0x2
-	adds r7, 0x1
-	ldr r0, _0804A734 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x42
-	adds r0, r6
-	ldrb r0, [r0]
-	cmp r7, r0
-	blt _0804A702
-_0804A72C:
-	add sp, 0x8
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804A734: .4byte gUnknown_03004824
-_0804A738: .4byte gTradeLevelDisplayCoords
-_0804A73C: .4byte gTradeMonBoxCoords
-	thumb_func_end sub_804A6DC
-
 	thumb_func_start sub_804A740
 sub_804A740: @ 804A740
 	push {r4-r7,lr}
diff --git a/src/trade.c b/src/trade.c
index 412e52102..29ba8c137 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -397,40 +397,46 @@ const u8 gTradeMonSpriteCoords[][2] = {
     {23, 18} // CANCEL
 };
 
-const u8 gTradeLevelDisplayCoords[][2] = {
-    // Your party
-    { 5,  4},
-    {12,  4},
-    { 5,  9},
-    {12,  9},
-    { 5, 14},
-    {12, 14},
-
-    // Friend's party
-    {20,  4},
-    {27,  4},
-    {20,  9},
-    {27,  9},
-    {20, 14},
-    {27, 14}
+const u8 gTradeLevelDisplayCoords[2][6][2] = {
+    {
+        // Your party
+        {5, 4},
+        {12, 4},
+        {5, 9},
+        {12, 9},
+        {5, 14},
+        {12, 14},
+    },
+    {
+        // Friend's party
+        {20, 4},
+        {27, 4},
+        {20, 9},
+        {27, 9},
+        {20, 14},
+        {27, 14}
+    }
 };
 
-const u8 gTradeMonBoxCoords[][2] = {
-    // Your party
-    { 1,  3},
-    { 8,  3},
-    { 1,  8},
-    { 8,  8},
-    { 1, 13},
-    { 8, 13},
-
-    // Friend's party
-    {16,  3},
-    {23,  3},
-    {16,  8},
-    {23,  8},
-    {16, 13},
-    {23, 13}
+const u8 gTradeMonBoxCoords[2][6][2] = {
+    {
+        // Your party
+        {1, 3},
+        {8, 3},
+        {1, 8},
+        {8, 8},
+        {1, 13},
+        {8, 13},
+    },
+    {
+        // Friend's party
+        {16, 3},
+        {23, 3},
+        {16, 8},
+        {23, 8},
+        {16, 13},
+        {23, 13}
+    }
 };
 
 const u8 gTradeUnknownSpriteCoords[][2][2] = {
@@ -2340,6 +2346,71 @@ void sub_804A51C(u8 a0, u8 a1, u8 a2, u8 a3, u8 a4, u8 a5)
 #endif
 }
 
+#ifdef NONMATCHING
+void sub_804A6DC(u8 whichParty)
+{
+    int i;
+    for (i = 0; i < gUnknown_03004824->partyCounts[whichParty]; i ++)
+    {
+        sub_804A51C(whichParty, i, gTradeLevelDisplayCoords[whichParty][i][0], gTradeLevelDisplayCoords[whichParty][i][1], gTradeMonBoxCoords[whichParty][i][0], gTradeMonBoxCoords[whichParty][i][1]);
+    }
+}
+#else
+__attribute__((naked))
+void sub_804A6DC(u8 whichParty)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                    "\tsub sp, 0x8\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r6, r0, 24\n"
+                    "\tmovs r7, 0\n"
+                    "\tldr r0, _0804A734 @ =gUnknown_03004824\n"
+                    "\tldr r0, [r0]\n"
+                    "\tadds r0, 0x42\n"
+                    "\tadds r0, r6\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r7, r0\n"
+                    "\tbge _0804A72C\n"
+                    "\tlsls r0, r6, 1\n"
+                    "\tadds r0, r6\n"
+                    "\tldr r1, _0804A738 @ =gTradeLevelDisplayCoords\n"
+                    "\tlsls r0, 2\n"
+                    "\tadds r5, r0, r1\n"
+                    "\tldr r1, _0804A73C @ =gTradeMonBoxCoords\n"
+                    "\tadds r4, r0, r1\n"
+                    "_0804A702:\n"
+                    "\tlsls r1, r7, 24\n"
+                    "\tlsrs r1, 24\n"
+                    "\tldrb r2, [r5]\n"
+                    "\tldrb r3, [r5, 0x1]\n"
+                    "\tldrb r0, [r4]\n"
+                    "\tstr r0, [sp]\n"
+                    "\tldrb r0, [r4, 0x1]\n"
+                    "\tstr r0, [sp, 0x4]\n"
+                    "\tadds r0, r6, 0\n"
+                    "\tbl sub_804A51C\n"
+                    "\tadds r5, 0x2\n"
+                    "\tadds r4, 0x2\n"
+                    "\tadds r7, 0x1\n"
+                    "\tldr r0, _0804A734 @ =gUnknown_03004824\n"
+                    "\tldr r0, [r0]\n"
+                    "\tadds r0, 0x42\n"
+                    "\tadds r0, r6\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r7, r0\n"
+                    "\tblt _0804A702\n"
+                    "_0804A72C:\n"
+                    "\tadd sp, 0x8\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r0}\n"
+                    "\tbx r0\n"
+                    "\t.align 2, 0\n"
+                    "_0804A734: .4byte gUnknown_03004824\n"
+                    "_0804A738: .4byte gTradeLevelDisplayCoords\n"
+                    "_0804A73C: .4byte gTradeMonBoxCoords");
+}
+#endif
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, const u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 23854ba34673553218830405dfce1af4dbd701ad Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 20:31:40 -0400
Subject: sub_804A740

---
 asm/trade.s | 106 ------------------------------------------------------------
 src/trade.c |  13 ++++++++
 2 files changed, 13 insertions(+), 106 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index c8f35ceae..dda831864 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -495,112 +495,6 @@ _0804A2B0: .4byte gUnknown_03004824
 
     .section .text.sub_804A33C
 
-	thumb_func_start sub_804A740
-sub_804A740: @ 804A740
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 24
-	lsrs r0, 24
-	mov r12, r0
-	movs r7, 0
-	ldr r3, _0804A800 @ =gUnknown_03004824
-	ldr r0, [r3]
-	adds r0, 0x42
-	add r0, r12
-	ldrb r0, [r0]
-	cmp r7, r0
-	bge _0804A7F2
-	ldr r6, _0804A804 @ =gSprites
-	mov r9, r3
-	mov r1, r12
-	lsls r0, r1, 1
-	add r0, r12
-	lsls r2, r0, 1
-	mov r10, r2
-	ldr r1, _0804A808 @ =gTradeMonSpriteCoords
-	movs r2, 0
-	mov r8, r2
-	lsls r0, 2
-	adds r5, r0, r1
-_0804A778:
-	mov r1, r9
-	ldr r0, [r1]
-	mov r2, r10
-	adds r4, r7, r2
-	adds r0, 0x34
-	adds r0, r4
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r6
-	adds r1, 0x3E
-	ldrb r2, [r1]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	mov r0, r9
-	ldr r3, [r0]
-	adds r2, r3, 0
-	adds r2, 0x34
-	adds r2, r4
-	ldrb r0, [r2]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r6
-	ldrb r0, [r5]
-	lsls r0, 3
-	adds r0, 0xE
-	strh r0, [r1, 0x20]
-	ldrb r0, [r2]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r6
-	ldrb r0, [r5, 0x1]
-	lsls r0, 3
-	subs r0, 0xC
-	strh r0, [r1, 0x22]
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	mov r1, r8
-	strh r1, [r0, 0x24]
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	mov r2, r8
-	strh r2, [r0, 0x26]
-	adds r5, 0x2
-	adds r7, 0x1
-	adds r3, 0x42
-	add r3, r12
-	ldrb r3, [r3]
-	cmp r7, r3
-	blt _0804A778
-_0804A7F2:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804A800: .4byte gUnknown_03004824
-_0804A804: .4byte gSprites
-_0804A808: .4byte gTradeMonSpriteCoords
-	thumb_func_end sub_804A740
-
 	thumb_func_start sub_804A80C
 sub_804A80C: @ 804A80C
 	push {lr}
diff --git a/src/trade.c b/src/trade.c
index 29ba8c137..4a3584083 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -2411,6 +2411,19 @@ void sub_804A6DC(u8 whichParty)
 }
 #endif
 
+void sub_804A740(u8 whichParty)
+{
+    int i;
+    for (i = 0; i < gUnknown_03004824->partyCounts[whichParty]; i ++)
+    {
+        gSprites[gUnknown_03004824->partyIcons[whichParty][i]].invisible = FALSE;
+        gSprites[gUnknown_03004824->partyIcons[whichParty][i]].pos1.x = gTradeMonSpriteCoords[6 * whichParty + i][0] * 8 + 14;
+        gSprites[gUnknown_03004824->partyIcons[whichParty][i]].pos1.y = gTradeMonSpriteCoords[6 * whichParty + i][1] * 8 - 12;
+        gSprites[gUnknown_03004824->partyIcons[whichParty][i]].pos2.x = 0;
+        gSprites[gUnknown_03004824->partyIcons[whichParty][i]].pos2.y = 0;
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, const u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 43bb9296ae8d2fdcaf9b80b3116bca93fe288c12 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 21:15:51 -0400
Subject: sub_804A80C

---
 asm/trade.s | 26 --------------------------
 src/trade.c |  6 ++++++
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index dda831864..7d04ebdc4 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -495,32 +495,6 @@ _0804A2B0: .4byte gUnknown_03004824
 
     .section .text.sub_804A33C
 
-	thumb_func_start sub_804A80C
-sub_804A80C: @ 804A80C
-	push {lr}
-	sub sp, 0x8
-	ldr r0, _0804A838 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x4
-	ldr r1, _0804A83C @ =gUnknown_0820C330
-	ldrb r2, [r1, 0x2]
-	ldrb r1, [r1, 0x3]
-	str r1, [sp]
-	movs r1, 0x13
-	str r1, [sp, 0x4]
-	movs r1, 0
-	movs r3, 0
-	bl FillWindowRect_DefaultPalette
-	movs r0, 0x1
-	bl sub_804A41C
-	add sp, 0x8
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804A838: .4byte gUnknown_03004824
-_0804A83C: .4byte gUnknown_0820C330
-	thumb_func_end sub_804A80C
-
 	thumb_func_start sub_804A840
 sub_804A840: @ 804A840
 	push {r4,r5,lr}
diff --git a/src/trade.c b/src/trade.c
index 4a3584083..4a84c1b1d 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -2424,6 +2424,12 @@ void sub_804A740(u8 whichParty)
     }
 }
 
+void sub_804A80C(void)
+{
+    FillWindowRect_DefaultPalette(&gUnknown_03004824->window, 0, gUnknown_0820C330[1][0], 0, gUnknown_0820C330[1][1], 19);
+    sub_804A41C(1);
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, const u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 3d914f466ccb187d20b84ae050fb54eec63cb9c6 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 21:23:25 -0400
Subject: sub_804A840

---
 asm/trade.s | 109 ------------------------------------------------------------
 src/trade.c |  25 ++++++++++++++
 2 files changed, 25 insertions(+), 109 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 7d04ebdc4..56eeeb7ae 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -495,115 +495,6 @@ _0804A2B0: .4byte gUnknown_03004824
 
     .section .text.sub_804A33C
 
-	thumb_func_start sub_804A840
-sub_804A840: @ 804A840
-	push {r4,r5,lr}
-	sub sp, 0xC
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0
-	bne _0804A8A8
-	ldr r4, _0804A89C @ =gUnknown_03004824
-	ldr r0, [r4]
-	adds r0, 0x4
-	ldr r1, _0804A8A0 @ =gUnknown_0820C330
-	ldrb r2, [r1]
-	ldrb r1, [r1, 0x1]
-	str r1, [sp]
-	movs r1, 0x13
-	str r1, [sp, 0x4]
-	movs r1, 0
-	movs r3, 0
-	bl FillWindowRect_DefaultPalette
-	ldr r0, [r4]
-	adds r0, 0xC8
-	ldr r3, _0804A8A4 @ =gTradePartyBoxTilemap
-	movs r1, 0xF
-	str r1, [sp]
-	movs r1, 0x11
-	str r1, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r1, 0
-	movs r2, 0
-	bl sub_804A96C_alt
-	movs r0, 0
-	bl sub_804A6DC
-	movs r0, 0
-	bl sub_804A41C
-	movs r0, 0
-	bl sub_804A740
-	ldr r0, [r4]
-	adds r0, 0xC8
-	bl sub_804A938
-	b _0804A8FA
-	.align 2, 0
-_0804A89C: .4byte gUnknown_03004824
-_0804A8A0: .4byte gUnknown_0820C330
-_0804A8A4: .4byte gTradePartyBoxTilemap
-_0804A8A8:
-	bl HandleDestroyMenuCursors
-	ldr r4, _0804A924 @ =gUnknown_03004824
-	ldr r0, [r4]
-	adds r0, 0x4
-	ldr r1, _0804A928 @ =gUnknown_0820C330
-	ldrb r2, [r1, 0x2]
-	ldrb r1, [r1, 0x3]
-	str r1, [sp]
-	movs r1, 0x13
-	str r1, [sp, 0x4]
-	movs r1, 0
-	movs r3, 0
-	bl FillWindowRect_DefaultPalette
-	ldr r0, [r4]
-	adds r0, 0xC8
-	ldr r3, _0804A92C @ =gTradePartyBoxTilemap
-	movs r1, 0xF
-	str r1, [sp]
-	movs r1, 0x11
-	str r1, [sp, 0x4]
-	movs r1, 0
-	str r1, [sp, 0x8]
-	movs r1, 0xF
-	movs r2, 0
-	bl sub_804A96C_alt
-	movs r0, 0x1
-	bl sub_804A6DC
-	movs r0, 0x1
-	bl sub_804A41C
-	movs r0, 0x1
-	bl sub_804A740
-	ldr r0, [r4]
-	adds r0, 0xC8
-	bl sub_804A938
-_0804A8FA:
-	ldr r0, _0804A930 @ =gUnknown_0820C14C
-	ldr r0, [r0, 0x4]
-	ldr r4, _0804A924 @ =gUnknown_03004824
-	ldr r1, [r4]
-	adds r1, 0x7E
-	ldrh r1, [r1]
-	lsls r1, 5
-	ldr r2, _0804A934 @ =0x06010000
-	adds r1, r2
-	movs r2, 0x14
-	bl sub_804ACD8
-	ldr r0, [r4]
-	adds r0, 0x80
-	adds r0, r5
-	movs r1, 0
-	strb r1, [r0]
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804A924: .4byte gUnknown_03004824
-_0804A928: .4byte gUnknown_0820C330
-_0804A92C: .4byte gTradePartyBoxTilemap
-_0804A930: .4byte gUnknown_0820C14C
-_0804A934: .4byte 0x06010000
-	thumb_func_end sub_804A840
-
 	thumb_func_start sub_804A938
 sub_804A938: @ 804A938
 	movs r1, 0x1
diff --git a/src/trade.c b/src/trade.c
index 4a84c1b1d..9a6273238 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -2430,6 +2430,31 @@ void sub_804A80C(void)
     sub_804A41C(1);
 }
 
+void sub_804A840(u8 whichParty)
+{
+    if (whichParty == 0)
+    {
+        FillWindowRect_DefaultPalette(&gUnknown_03004824->window, 0, gUnknown_0820C330[0][0], 0, gUnknown_0820C330[0][1], 19);
+        sub_804A96C_alt(&gUnknown_03004824->unk_00c8, 0, 0, gTradePartyBoxTilemap, 15, 17, 0);
+        sub_804A6DC(0);
+        sub_804A41C(0);
+        sub_804A740(0);
+        sub_804A938(&gUnknown_03004824->unk_00c8);
+    }
+    else
+    {
+        HandleDestroyMenuCursors();
+        FillWindowRect_DefaultPalette(&gUnknown_03004824->window, 0, gUnknown_0820C330[1][0], 0, gUnknown_0820C330[1][1], 19);
+        sub_804A96C_alt(&gUnknown_03004824->unk_00c8, 15, 0, gTradePartyBoxTilemap, 15, 17, 0);
+        sub_804A6DC(1);
+        sub_804A41C(1);
+        sub_804A740(1);
+        sub_804A938(&gUnknown_03004824->unk_00c8);
+    }
+    sub_804ACD8(gUnknown_0820C14C[1], (u8 *)(BG_CHAR_ADDR(4) + 32 * gUnknown_03004824->unk_007e), 20);
+    gUnknown_03004824->unk_0080[whichParty] = 0;
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, const u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3


From 3fb87d064e12bda763c15a4d1e54f244bf185db9 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 21:32:56 -0400
Subject: Close a swiss cheese hole

---
 asm/trade.s   | 40 +---------------------------------------
 ld_script.txt |  2 --
 src/trade.c   | 20 +++++++++++++++++++-
 3 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 56eeeb7ae..8c5afd24f 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -493,45 +493,7 @@ _0804A2AC: .4byte gUnknown_0820C3D1
 _0804A2B0: .4byte gUnknown_03004824
 	thumb_func_end sub_8049ED4
 
-    .section .text.sub_804A33C
-
-	thumb_func_start sub_804A938
-sub_804A938: @ 804A938
-	movs r1, 0x1
-	strb r1, [r0, 0x10]
-	bx lr
-	thumb_func_end sub_804A938
-
-	thumb_func_start sub_804A940
-sub_804A940: @ 804A940
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrb r0, [r4, 0x10]
-	cmp r0, 0
-	beq _0804A95C
-	adds r0, r4, 0
-	adds r0, 0x12
-	ldr r1, [r4, 0x8]
-	movs r2, 0x80
-	lsls r2, 3
-	bl CpuSet
-	movs r0, 0
-	strb r0, [r4, 0x10]
-_0804A95C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804A940
-
-	thumb_func_start sub_804A964
-sub_804A964: @ 804A964
-	movs r2, 0
-	strb r2, [r0, 0x10]
-	str r1, [r0, 0x8]
-	bx lr
-	thumb_func_end sub_804A964
-
-.section .text.sub_804A9F4
+    .section .text.sub_804A9F4
 
 	thumb_func_start sub_804A9F4
 sub_804A9F4: @ 804A9F4
diff --git a/ld_script.txt b/ld_script.txt
index 170ee9cca..b82c7b92f 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -81,8 +81,6 @@ SECTIONS {
         src/trade.o(.text);
         asm/trade.o(.text);
         src/trade.o(.text.sub_804A2B4);
-        asm/trade.o(.text.sub_804A33C);
-        src/trade.o(.text.sub_804A96C);
         asm/trade.o(.text.sub_804A9F4);
         src/trade.o(.text.sub_804DAD4);
         asm/trade.o(.text.sub_804DB2C);
diff --git a/src/trade.c b/src/trade.c
index 9a6273238..702bc109d 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -2455,7 +2455,25 @@ void sub_804A840(u8 whichParty)
     gUnknown_03004824->unk_0080[whichParty] = 0;
 }
 
-asm(".section .text.sub_804A96C");
+void sub_804A938(struct UnkStructD *unkStructD)
+{
+    unkStructD->unk_10 = 1;
+}
+
+void sub_804A940(struct UnkStructD *unkStructD)
+{
+    if (unkStructD->unk_10)
+    {
+        CpuCopy16(unkStructD->unk_12, unkStructD->vramAddr, sizeof(unkStructD->unk_12));
+        unkStructD->unk_10 = 0;
+    }
+}
+
+void sub_804A964(struct UnkStructD *unkStructD, void *dest)
+{
+    unkStructD->unk_10 = 0;
+    unkStructD->vramAddr = dest;
+}
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, const u16 *tilemap, u8 width, u8 height, u16 sp8) {
     int y, x;
-- 
cgit v1.2.3


From b7b7010563a309a67422d52775c892ac4d25fb64 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 21:49:30 -0400
Subject: sub_804AA0C

---
 asm/trade.s | 78 -------------------------------------------------------------
 src/trade.c | 50 +++++++++++++++++++++++++--------------
 2 files changed, 33 insertions(+), 95 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 8c5afd24f..5508f9406 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -495,84 +495,6 @@ _0804A2B0: .4byte gUnknown_03004824
 
     .section .text.sub_804A9F4
 
-	thumb_func_start sub_804A9F4
-sub_804A9F4: @ 804A9F4
-	push {lr}
-	bl MenuZeroFillScreen
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804A9F4
-
-	thumb_func_start sub_804AA00
-sub_804AA00: @ 804AA00
-	push {lr}
-	bl MenuZeroFillScreen
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804AA00
-
-	thumb_func_start sub_804AA0C
-sub_804AA0C: @ 804AA0C
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	sub sp, 0x4
-	adds r4, r0, 0
-	lsls r4, 24
-	ldr r0, _0804AA7C @ =gUnknown_03004824
-	mov r8, r0
-	ldr r0, [r0]
-	adds r0, 0x4
-	ldr r2, _0804AA80 @ =gTradeMessageWindowRects
-	lsrs r4, 22
-	adds r1, r4, r2
-	ldrb r6, [r1]
-	adds r1, r2, 0x1
-	adds r1, r4, r1
-	ldrb r5, [r1]
-	adds r1, r2, 0x2
-	adds r1, r4, r1
-	ldrb r3, [r1]
-	adds r2, 0x3
-	adds r2, r4, r2
-	ldrb r1, [r2]
-	str r1, [sp]
-	adds r1, r6, 0
-	adds r2, r5, 0
-	bl DrawTextWindow
-	mov r1, r8
-	ldr r3, [r1]
-	adds r0, r3, 0x4
-	ldr r1, _0804AA84 @ =gUnknown_0820C2F0
-	adds r4, r1
-	ldr r1, [r4]
-	adds r3, 0x7A
-	movs r4, 0xC0
-	lsls r4, 1
-	adds r2, r4, 0
-	ldrb r3, [r3]
-	adds r2, r3
-	adds r6, 0x1
-	lsls r6, 24
-	lsrs r6, 24
-	adds r5, 0x1
-	lsls r5, 24
-	lsrs r5, 24
-	str r5, [sp]
-	adds r3, r6, 0
-	bl sub_8003460
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804AA7C: .4byte gUnknown_03004824
-_0804AA80: .4byte gTradeMessageWindowRects
-_0804AA84: .4byte gUnknown_0820C2F0
-	thumb_func_end sub_804AA0C
-
 	thumb_func_start sub_804AA88
 sub_804AA88: @ 804AA88
 	push {r4-r7,lr}
diff --git a/src/trade.c b/src/trade.c
index 702bc109d..ea3e7732f 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -117,34 +117,34 @@ static void sub_8047EC0(void);
 /*static*/ void sub_804ACD8(const u8 *, u8 *, u8);
 static void nullsub_5(u8, u8);
 /*static*/ void sub_804AA88(void);
-/*static*/ void sub_804A964(struct UnkStructD *, void *);
+static void sub_804A964(struct UnkStructD *, void *);
 static void sub_80489F4(void);
 /*static*/ void sub_804AA0C(u8);
 static bool8 sub_8048D44(void);
 /*static*/ void sub_804AF84(void);
 /*static*/ bool8 sub_804ABF8(void);
 /*static*/ void sub_804ACF4(u8);
-/*static*/ void sub_804A41C(u8);
+static void sub_804A41C(u8);
 static void sub_8048C70(void);
 static void sub_8048B0C(u8);
 /*static*/ void sub_804AE3C(u8);
 /*static*/ void sub_804AF10(void);
 static void sub_80494D8(void);
 static void sub_8048AB4(void);
-/*static*/ void sub_804A940(struct UnkStructD *);
+static void sub_804A940(struct UnkStructD *);
 /*static*/ void sub_804B41C(void);
 static void sub_8049DE0(void);
 /*static*/ void sub_804AB30(void);
 /*static*/ void sub_8049ED4(u8);
-/*static*/ void sub_804A6DC(u8);
-/*static*/ void sub_804A938(struct UnkStructD *);
-/*static*/ u8 sub_804A9F4(void);
-/*static*/ u8 sub_804AA00(void);
+static void sub_804A6DC(u8);
+static void sub_804A938(struct UnkStructD *);
+static void sub_804A9F4(u8);
+static void sub_804AA00(u8);
 static void sub_8049E9C(u8);
 /*static*/ void sub_804AADC(u8, u8);
 /*static*/ void sub_804A80C(void);
 static u8 sub_80499F0(const u8 *, u8, u8);
-/*static*/ void sub_804A840(u8);
+static void sub_804A840(u8);
 /*static*/ u8 sub_804A2B4(u8 *, u8, u8);
 /*static*/ void sub_804A96C_alt(struct UnkStructD *, u8, u8, const u16 *, u8, u8, u16);
 
@@ -468,7 +468,7 @@ const u8 gTradeMessageWindowRects[][4] = {
     {7, 7, 23, 12}
 };
 
-const struct MenuAction gUnknown_0820C320[] = {
+const struct MenuAction2 gUnknown_0820C320[] = {
     {TradeText_Summary2, sub_804A9F4},
     {TradeText_Trade2, sub_804AA00}
 };
@@ -1688,7 +1688,7 @@ static void sub_8049680(void)
         if (gUnknown_03004824->tradeMenuCursorPosition < PARTY_SIZE)
         {
             DrawTextWindow(&gUnknown_03004824->window, 18, 14, 28, 19);
-            PrintMenuItems(19, 15, 2, gUnknown_0820C320);
+            PrintMenuItems(19, 15, 2, (const struct MenuAction *)gUnknown_0820C320);
             InitMenu(0, 19, 15, 2, 0, 9);
             gUnknown_03004824->unk_007b = 1;
         }
@@ -2139,7 +2139,7 @@ void sub_804A33C(u8 *a0, u8 whichParty, u8 whichPokemon)
 }
 
 #ifdef NONMATCHING
-void sub_804A41C(u8 whichParty)
+static void sub_804A41C(u8 whichParty)
 {
     u8 i;
     u8 nickname[22];
@@ -2165,7 +2165,7 @@ void sub_804A41C(u8 whichParty)
 }
 #else
 __attribute__((naked))
-void sub_804A41C(u8 whichParty)
+static void sub_804A41C(u8 whichParty)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tmov r7, r10\n"
@@ -2347,7 +2347,7 @@ void sub_804A51C(u8 a0, u8 a1, u8 a2, u8 a3, u8 a4, u8 a5)
 }
 
 #ifdef NONMATCHING
-void sub_804A6DC(u8 whichParty)
+static void sub_804A6DC(u8 whichParty)
 {
     int i;
     for (i = 0; i < gUnknown_03004824->partyCounts[whichParty]; i ++)
@@ -2357,7 +2357,7 @@ void sub_804A6DC(u8 whichParty)
 }
 #else
 __attribute__((naked))
-void sub_804A6DC(u8 whichParty)
+static void sub_804A6DC(u8 whichParty)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tsub sp, 0x8\n"
@@ -2430,7 +2430,7 @@ void sub_804A80C(void)
     sub_804A41C(1);
 }
 
-void sub_804A840(u8 whichParty)
+static void sub_804A840(u8 whichParty)
 {
     if (whichParty == 0)
     {
@@ -2455,7 +2455,7 @@ void sub_804A840(u8 whichParty)
     gUnknown_03004824->unk_0080[whichParty] = 0;
 }
 
-void sub_804A938(struct UnkStructD *unkStructD)
+static void sub_804A938(struct UnkStructD *unkStructD)
 {
     unkStructD->unk_10 = 1;
 }
@@ -2469,7 +2469,7 @@ void sub_804A940(struct UnkStructD *unkStructD)
     }
 }
 
-void sub_804A964(struct UnkStructD *unkStructD, void *dest)
+static void sub_804A964(struct UnkStructD *unkStructD, void *dest)
 {
     unkStructD->unk_10 = 0;
     unkStructD->vramAddr = dest;
@@ -2500,6 +2500,22 @@ void sub_804A96C_alt(struct UnkStructD *arg0, u8 left, u8 top, const u16 *tilema
 }
 #endif
 
+static void sub_804A9F4(u8 unused)
+{
+    MenuZeroFillScreen();
+}
+
+static void sub_804AA00(u8 unused)
+{
+    MenuZeroFillScreen();
+}
+
+/*static*/ void sub_804AA0C(u8 a0)
+{
+    DrawTextWindow(&gUnknown_03004824->window, gTradeMessageWindowRects[a0][0], gTradeMessageWindowRects[a0][1], gTradeMessageWindowRects[a0][2], gTradeMessageWindowRects[a0][3]);
+    sub_8003460(&gUnknown_03004824->window, gUnknown_0820C2F0[a0], 0x180 + gUnknown_03004824->unk_007a, gTradeMessageWindowRects[a0][0] + 1, gTradeMessageWindowRects[a0][1] + 1);
+}
+
 asm(".section .text.sub_804DAD4");
 
 /*static*/ void sub_804DAD4(struct UnkStructC *arg0, struct InGameTrade *trade) {
-- 
cgit v1.2.3


From afc3164c5b9139537875c96bb7da693fe16f5815 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 21:58:54 -0400
Subject: sub_804AA88

---
 asm/trade.s | 44 --------------------------------------------
 src/trade.c | 22 ++++++++++++++++++++--
 2 files changed, 20 insertions(+), 46 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 5508f9406..a0fd799e2 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -495,50 +495,6 @@ _0804A2B0: .4byte gUnknown_03004824
 
     .section .text.sub_804A9F4
 
-	thumb_func_start sub_804AA88
-sub_804AA88: @ 804AA88
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	movs r3, 0
-	ldr r5, _0804AAD0 @ =gUnknown_03004824
-	ldr r0, _0804AAD4 @ =0x000008dc
-	mov r8, r0
-	movs r4, 0
-	ldr r2, _0804AAD8 @ =0x000008de
-	mov r12, r2
-	movs r7, 0x8E
-	lsls r7, 4
-	movs r6, 0xFF
-_0804AAA2:
-	ldr r0, [r5]
-	lsls r2, r3, 3
-	adds r0, r2
-	add r0, r8
-	strb r4, [r0]
-	ldr r1, [r5]
-	adds r1, r2
-	mov r2, r12
-	adds r0, r1, r2
-	strh r4, [r0]
-	adds r1, r7
-	ldrb r0, [r1]
-	orrs r0, r6
-	strb r0, [r1]
-	adds r3, 0x1
-	cmp r3, 0x3
-	ble _0804AAA2
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804AAD0: .4byte gUnknown_03004824
-_0804AAD4: .4byte 0x000008dc
-_0804AAD8: .4byte 0x000008de
-	thumb_func_end sub_804AA88
-
 	thumb_func_start sub_804AADC
 sub_804AADC: @ 804AADC
 	push {r4-r7,lr}
diff --git a/src/trade.c b/src/trade.c
index ea3e7732f..2e854ebb7 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -62,6 +62,12 @@ struct UnkStructD {
     /*0x12*/ u16 unk_12[0x400];
 };
 
+struct UnkStructE {
+    /*0x00*/ u8 unk_00;
+    /*0x02*/ u16 unk_02;
+    /*0x04*/ u8 unk_04;
+};
+
 struct TradeEwramSubstruct {
     /*0x0000*/ u8 unk_0000;
     /*0x0001*/ u8 unk_0001;
@@ -95,7 +101,8 @@ struct TradeEwramSubstruct {
     /*0x00b5*/ u8 unk_00b5[7];
     /*0x00bc*/ u8 filler_00bc[12];
     /*0x00c8*/ struct UnkStructD unk_00c8;
-    /*0x08dc*/ u8 filler_04dc[0x724];
+    /*0x08dc*/ struct UnkStructE unk_08dc[4];
+    /*0x08fc*/ u8 filler_08fc[0x704];
 };
 
 struct UnkStructF {
@@ -116,7 +123,7 @@ static void sub_8047EC0(void);
 /*static*/ void sub_804AFB8(const struct WindowConfig *, u8 *, const u8 *, u8);
 /*static*/ void sub_804ACD8(const u8 *, u8 *, u8);
 static void nullsub_5(u8, u8);
-/*static*/ void sub_804AA88(void);
+static void sub_804AA88(void);
 static void sub_804A964(struct UnkStructD *, void *);
 static void sub_80489F4(void);
 /*static*/ void sub_804AA0C(u8);
@@ -2516,6 +2523,17 @@ static void sub_804AA00(u8 unused)
     sub_8003460(&gUnknown_03004824->window, gUnknown_0820C2F0[a0], 0x180 + gUnknown_03004824->unk_007a, gTradeMessageWindowRects[a0][0] + 1, gTradeMessageWindowRects[a0][1] + 1);
 }
 
+static void sub_804AA88(void)
+{
+    int i;
+    for (i = 0; i < 4; i ++)
+    {
+        gUnknown_03004824->unk_08dc[i].unk_00 = 0;
+        gUnknown_03004824->unk_08dc[i].unk_02 = 0;
+        gUnknown_03004824->unk_08dc[i].unk_04 |= 0xff;
+    }
+}
+
 asm(".section .text.sub_804DAD4");
 
 /*static*/ void sub_804DAD4(struct UnkStructC *arg0, struct InGameTrade *trade) {
-- 
cgit v1.2.3


From 2f5f072f2254cfe324b9be297ec1ae6056e6d11a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 22:01:46 -0400
Subject: sub_804AADC

---
 asm/trade.s | 47 -----------------------------------------------
 src/trade.c | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 48 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index a0fd799e2..5a2a2899b 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -495,53 +495,6 @@ _0804A2B0: .4byte gUnknown_03004824
 
     .section .text.sub_804A9F4
 
-	thumb_func_start sub_804AADC
-sub_804AADC: @ 804AADC
-	push {r4-r7,lr}
-	lsls r0, 16
-	lsrs r5, r0, 16
-	lsls r1, 24
-	lsrs r6, r1, 24
-	movs r3, 0
-	ldr r4, _0804AB18 @ =gUnknown_03004824
-	mov r12, r4
-	ldr r7, _0804AB1C @ =0x000008dc
-_0804AAEE:
-	mov r1, r12
-	ldr r0, [r1]
-	lsls r1, r3, 3
-	adds r2, r0, r1
-	adds r0, r2, r7
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0804AB24
-	ldr r3, _0804AB20 @ =0x000008de
-	adds r0, r2, r3
-	strh r5, [r0]
-	adds r3, 0x2
-	adds r0, r2, r3
-	strb r6, [r0]
-	ldr r0, [r4]
-	adds r0, r1
-	ldr r1, _0804AB1C @ =0x000008dc
-	adds r0, r1
-	movs r1, 0x1
-	strb r1, [r0]
-	b _0804AB2A
-	.align 2, 0
-_0804AB18: .4byte gUnknown_03004824
-_0804AB1C: .4byte 0x000008dc
-_0804AB20: .4byte 0x000008de
-_0804AB24:
-	adds r3, 0x1
-	cmp r3, 0x3
-	ble _0804AAEE
-_0804AB2A:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804AADC
-
 	thumb_func_start sub_804AB30
 sub_804AB30: @ 804AB30
 	push {r4,r5,lr}
diff --git a/src/trade.c b/src/trade.c
index 2e854ebb7..66f0b2b30 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -148,7 +148,7 @@ static void sub_804A938(struct UnkStructD *);
 static void sub_804A9F4(u8);
 static void sub_804AA00(u8);
 static void sub_8049E9C(u8);
-/*static*/ void sub_804AADC(u8, u8);
+static void sub_804AADC(u16, u8);
 /*static*/ void sub_804A80C(void);
 static u8 sub_80499F0(const u8 *, u8, u8);
 static void sub_804A840(u8);
@@ -2534,6 +2534,21 @@ static void sub_804AA88(void)
     }
 }
 
+static void sub_804AADC(u16 a0, u8 a1)
+{
+    int i;
+    for (i = 0; i < 4; i ++)
+    {
+        if (gUnknown_03004824->unk_08dc[i].unk_00 == 0)
+        {
+            gUnknown_03004824->unk_08dc[i].unk_02 = a0;
+            gUnknown_03004824->unk_08dc[i].unk_04 = a1;
+            gUnknown_03004824->unk_08dc[i].unk_00 = 1;
+            break;
+        }
+    }
+}
+
 asm(".section .text.sub_804DAD4");
 
 /*static*/ void sub_804DAD4(struct UnkStructC *arg0, struct InGameTrade *trade) {
-- 
cgit v1.2.3


From f1e2ec57fbdf2cd39bf792add4c26acc386f80ce Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 22:09:19 -0400
Subject: sub_804AB30

---
 asm/trade.s | 97 -------------------------------------------------------------
 src/trade.c | 54 +++++++++++++++++++++++++++++-----
 2 files changed, 47 insertions(+), 104 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 5a2a2899b..5e9cb528f 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -495,103 +495,6 @@ _0804A2B0: .4byte gUnknown_03004824
 
     .section .text.sub_804A9F4
 
-	thumb_func_start sub_804AB30
-sub_804AB30: @ 804AB30
-	push {r4,r5,lr}
-	movs r4, 0
-	ldr r3, _0804AB58 @ =gUnknown_03004824
-_0804AB36:
-	ldr r0, [r3]
-	lsls r1, r4, 3
-	adds r2, r0, r1
-	ldr r5, _0804AB5C @ =0x000008dc
-	adds r0, r2, r5
-	ldrb r0, [r0]
-	adds r5, r1, 0
-	cmp r0, 0
-	beq _0804ABE2
-	ldr r0, _0804AB60 @ =0x000008de
-	adds r1, r2, r0
-	ldrh r0, [r1]
-	cmp r0, 0
-	beq _0804AB64
-	subs r0, 0x1
-	strh r0, [r1]
-	b _0804ABE2
-	.align 2, 0
-_0804AB58: .4byte gUnknown_03004824
-_0804AB5C: .4byte 0x000008dc
-_0804AB60: .4byte 0x000008de
-_0804AB64:
-	movs r1, 0x8E
-	lsls r1, 4
-	adds r0, r2, r1
-	ldrb r0, [r0]
-	cmp r0, 0x5
-	bhi _0804ABD2
-	lsls r0, 2
-	ldr r1, _0804AB7C @ =_0804AB80
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0804AB7C: .4byte _0804AB80
-	.align 2, 0
-_0804AB80:
-	.4byte _0804AB98
-	.4byte _0804ABB4
-	.4byte _0804ABBC
-	.4byte _0804ABC4
-	.4byte _0804ABC4
-	.4byte _0804ABCC
-_0804AB98:
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _0804ABB0 @ =gUnknown_03004824
-	ldr r1, [r1]
-	adds r1, 0x8C
-	movs r2, 0x14
-	bl SendBlock
-	b _0804ABD2
-	.align 2, 0
-_0804ABB0: .4byte gUnknown_03004824
-_0804ABB4:
-	movs r0, 0
-	bl sub_804AA0C
-	b _0804ABD2
-_0804ABBC:
-	movs r0, 0x2
-	bl sub_804AA0C
-	b _0804ABD2
-_0804ABC4:
-	movs r0, 0x3
-	bl sub_804AA0C
-	b _0804ABD2
-_0804ABCC:
-	movs r0, 0x3
-	bl sub_804AA0C
-_0804ABD2:
-	ldr r0, _0804ABF0 @ =gUnknown_03004824
-	ldr r1, [r0]
-	adds r1, r5
-	ldr r2, _0804ABF4 @ =0x000008dc
-	adds r1, r2
-	movs r2, 0
-	strb r2, [r1]
-	adds r3, r0, 0
-_0804ABE2:
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _0804AB36
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804ABF0: .4byte gUnknown_03004824
-_0804ABF4: .4byte 0x000008dc
-	thumb_func_end sub_804AB30
-
 	thumb_func_start sub_804ABF8
 sub_804ABF8: @ 804ABF8
 	push {r4,lr}
diff --git a/src/trade.c b/src/trade.c
index 66f0b2b30..71cef2d08 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -30,6 +30,8 @@
 #define sub_804A96C_alt sub_804A96C
 #endif
 
+#define Trade_SendData() SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, ARRAY_COUNT(gUnknown_03004824->linkData))
+
 struct InGameTrade {
     /*0x00*/ u8 name[11];
     /*0x0C*/ u16 species;
@@ -141,7 +143,7 @@ static void sub_8048AB4(void);
 static void sub_804A940(struct UnkStructD *);
 /*static*/ void sub_804B41C(void);
 static void sub_8049DE0(void);
-/*static*/ void sub_804AB30(void);
+static void sub_804AB30(void);
 /*static*/ void sub_8049ED4(u8);
 static void sub_804A6DC(u8);
 static void sub_804A938(struct UnkStructD *);
@@ -1662,7 +1664,7 @@ static void sub_8049620(void)
     {
         gUnknown_03004824->linkData[0] = 0xaabb;
         gUnknown_03004824->linkData[1] = gUnknown_03004824->tradeMenuCursorPosition;
-        SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, ARRAY_COUNT(gUnknown_03004824->linkData));
+        Trade_SendData();
     }
     else
     {
@@ -1718,7 +1720,7 @@ static void sub_8049680(void)
         {
             gUnknown_03004824->linkData[i] = i;
         }
-        SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, ARRAY_COUNT(gUnknown_03004824->linkData));
+        Trade_SendData();
     }
 }
 
@@ -1827,7 +1829,7 @@ static void sub_8049A20(void)
         gUnknown_03004824->linkData[0] = 0xbbbb;
         if (sub_8007ECC())
         {
-            SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, ARRAY_COUNT(gUnknown_03004824->linkData));
+            Trade_SendData();
         }
     }
 }
@@ -1857,7 +1859,7 @@ static void sub_8049AC0(void)
             if (sub_8007ECC())
             {
                 gUnknown_03004824->linkData[0] = 0xbbcc;
-                SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, ARRAY_COUNT(gUnknown_03004824->linkData));
+                Trade_SendData();
             }
         }
         gUnknown_03004824->unk_007b = 100;
@@ -1870,7 +1872,7 @@ static void sub_8049AC0(void)
             gUnknown_03004824->unk_007c = MoveMenuCursor(+1);
         }
         gUnknown_03004824->linkData[0] = 0xbbcc;
-        SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, ARRAY_COUNT(gUnknown_03004824->linkData));
+        Trade_SendData();
         gUnknown_03004824->unk_007b = 100;
     }
 }
@@ -2043,7 +2045,7 @@ static void sub_8049E9C(u8 a0)
 //    u8 r8 = temp0 % 6;
 //    s8 stringLength;
 //    u8 string[50];
-//    
+//
 //    switch (gUnknown_03004824->unk_0080[a0])
 //    {
 //        case 1:
@@ -2549,6 +2551,44 @@ static void sub_804AADC(u16 a0, u8 a1)
     }
 }
 
+static void sub_804AB30(void)
+{
+    int i;
+    for (i = 0; i < 4; i ++)
+    {
+        if (gUnknown_03004824->unk_08dc[i].unk_00)
+        {
+            if (gUnknown_03004824->unk_08dc[i].unk_02 != 0)
+            {
+                gUnknown_03004824->unk_08dc[i].unk_02 --;
+                continue;
+            }
+            switch (gUnknown_03004824->unk_08dc[i].unk_04)
+            {
+                case 0:
+                    Trade_SendData();
+                    break;
+                case 1:
+                    sub_804AA0C(0);
+                    break;
+                case 2:
+                    sub_804AA0C(2);
+                    break;
+                case 3:
+                    sub_804AA0C(3);
+                    break;
+                case 4:
+                    sub_804AA0C(3);
+                    break;
+                case 5:
+                    sub_804AA0C(3);
+                    break;
+            }
+            gUnknown_03004824->unk_08dc[i].unk_00 = 0;
+        }
+    }
+}
+
 asm(".section .text.sub_804DAD4");
 
 /*static*/ void sub_804DAD4(struct UnkStructC *arg0, struct InGameTrade *trade) {
-- 
cgit v1.2.3


From 530155f301fb535c3be4a8094c8749b1c828e587 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 22:16:32 -0400
Subject: sub_804ABF8

---
 asm/trade.s | 106 ------------------------------------------------------------
 src/trade.c |  32 +++++++++++++++++-
 2 files changed, 31 insertions(+), 107 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 5e9cb528f..dce4baa9e 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -495,112 +495,6 @@ _0804A2B0: .4byte gUnknown_03004824
 
     .section .text.sub_804A9F4
 
-	thumb_func_start sub_804ABF8
-sub_804ABF8: @ 804ABF8
-	push {r4,lr}
-	ldr r0, _0804AC14 @ =gUnknown_03004824
-	ldr r1, [r0]
-	adds r1, 0xB4
-	ldrb r1, [r1]
-	subs r1, 0x8
-	adds r4, r0, 0
-	cmp r1, 0x8
-	bhi _0804ACB0
-	lsls r0, r1, 2
-	ldr r1, _0804AC18 @ =_0804AC1C
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0804AC14: .4byte gUnknown_03004824
-_0804AC18: .4byte _0804AC1C
-	.align 2, 0
-_0804AC1C:
-	.4byte _0804AC40
-	.4byte _0804ACB0
-	.4byte _0804ACB0
-	.4byte _0804ACB0
-	.4byte _0804ACB0
-	.4byte _0804AC60
-	.4byte _0804AC74
-	.4byte _0804AC88
-	.4byte _0804AC9A
-_0804AC40:
-	ldr r0, [r4]
-	adds r0, 0xB4
-	ldrb r0, [r0]
-	lsls r0, 3
-	ldr r1, _0804AC5C @ =gUnknown_0820C07C
-	adds r0, r1
-	bl LoadSpriteSheet
-	ldr r1, [r4]
-	adds r2, r1, 0
-	adds r2, 0x7E
-	strh r0, [r2]
-	b _0804ACC2
-	.align 2, 0
-_0804AC5C: .4byte gUnknown_0820C07C
-_0804AC60:
-	ldr r0, _0804AC6C @ =gSpritePalette_TradeScreenText
-	bl LoadSpritePalette
-	ldr r0, _0804AC70 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _0804ACC2
-	.align 2, 0
-_0804AC6C: .4byte gSpritePalette_TradeScreenText
-_0804AC70: .4byte gUnknown_03004824
-_0804AC74:
-	ldr r0, _0804AC80 @ =gUnknown_0820C12C
-	bl LoadSpritePalette
-	ldr r0, _0804AC84 @ =gUnknown_03004824
-	ldr r1, [r0]
-	b _0804ACC2
-	.align 2, 0
-_0804AC80: .4byte gUnknown_0820C12C
-_0804AC84: .4byte gUnknown_03004824
-_0804AC88:
-	ldr r0, _0804ACA8 @ =gUnknown_0820C124
-	bl LoadSpriteSheet
-	ldr r0, _0804ACAC @ =gUnknown_03004824
-	ldr r1, [r0]
-	adds r1, 0xB4
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-_0804AC9A:
-	ldr r0, _0804ACAC @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0xB4
-	movs r1, 0
-	strb r1, [r0]
-	movs r0, 0x1
-	b _0804ACCC
-	.align 2, 0
-_0804ACA8: .4byte gUnknown_0820C124
-_0804ACAC: .4byte gUnknown_03004824
-_0804ACB0:
-	ldr r0, [r4]
-	adds r0, 0xB4
-	ldrb r0, [r0]
-	lsls r0, 3
-	ldr r1, _0804ACD4 @ =gUnknown_0820C07C
-	adds r0, r1
-	bl LoadSpriteSheet
-	ldr r1, [r4]
-_0804ACC2:
-	adds r1, 0xB4
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	movs r0, 0
-_0804ACCC:
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0804ACD4: .4byte gUnknown_0820C07C
-	thumb_func_end sub_804ABF8
-
 	thumb_func_start sub_804ACD8
 sub_804ACD8: @ 804ACD8
 	push {r4,lr}
diff --git a/src/trade.c b/src/trade.c
index 71cef2d08..4262f19bf 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -131,7 +131,7 @@ static void sub_80489F4(void);
 /*static*/ void sub_804AA0C(u8);
 static bool8 sub_8048D44(void);
 /*static*/ void sub_804AF84(void);
-/*static*/ bool8 sub_804ABF8(void);
+static bool8 sub_804ABF8(void);
 /*static*/ void sub_804ACF4(u8);
 static void sub_804A41C(u8);
 static void sub_8048C70(void);
@@ -2589,6 +2589,36 @@ static void sub_804AB30(void)
     }
 }
 
+static bool8 sub_804ABF8(void)
+{
+    switch (gUnknown_03004824->unk_00b4)
+    {
+        case  8:
+            gUnknown_03004824->unk_007e = LoadSpriteSheet(&gUnknown_0820C07C[gUnknown_03004824->unk_00b4]);
+            gUnknown_03004824->unk_00b4 ++;
+            return FALSE;
+        case 13:
+            LoadSpritePalette(&gSpritePalette_TradeScreenText);
+            gUnknown_03004824->unk_00b4 ++;
+            return FALSE;
+        case 14:
+            LoadSpritePalette(&gUnknown_0820C12C);
+            gUnknown_03004824->unk_00b4 ++;
+            return FALSE;
+        case 15:
+            LoadSpriteSheet(&gUnknown_0820C124);
+            gUnknown_03004824->unk_00b4 ++;
+            // fallthrough
+        case 16:
+            gUnknown_03004824->unk_00b4 = 0;
+            return TRUE;
+        default:
+            LoadSpriteSheet(&gUnknown_0820C07C[gUnknown_03004824->unk_00b4]);
+            gUnknown_03004824->unk_00b4 ++;
+            return FALSE;
+    }
+}
+
 asm(".section .text.sub_804DAD4");
 
 /*static*/ void sub_804DAD4(struct UnkStructC *arg0, struct InGameTrade *trade) {
-- 
cgit v1.2.3


From 8e97779987c1e8fd3a943386ef376c8c6911ddab Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 22:18:59 -0400
Subject: sub_804ACD8

---
 asm/trade.s | 16 ----------------
 src/trade.c |  5 +++++
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index dce4baa9e..8d14dbe09 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -495,22 +495,6 @@ _0804A2B0: .4byte gUnknown_03004824
 
     .section .text.sub_804A9F4
 
-	thumb_func_start sub_804ACD8
-sub_804ACD8: @ 804ACD8
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r3, r2, 24
-	lsrs r3, 24
-	ldr r0, _0804ACF0 @ =gWindowConfig_81E725C
-	adds r2, r4, 0
-	bl sub_804AFB8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804ACF0: .4byte gWindowConfig_81E725C
-	thumb_func_end sub_804ACD8
-
 	thumb_func_start sub_804ACF4
 sub_804ACF4: @ 804ACF4
 	push {r4-r7,lr}
diff --git a/src/trade.c b/src/trade.c
index 4262f19bf..efd6a1314 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -2619,6 +2619,11 @@ static bool8 sub_804ABF8(void)
     }
 }
 
+/*static*/ void sub_804ACD8(const u8 *src, u8 *dest, u8 a2)
+{
+    sub_804AFB8(&gWindowConfig_81E725C, dest, src, a2);
+}
+
 asm(".section .text.sub_804DAD4");
 
 /*static*/ void sub_804DAD4(struct UnkStructC *arg0, struct InGameTrade *trade) {
-- 
cgit v1.2.3


From 927df6fb3e61b94eee3ceffb08ce0e9d5db2c71e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 3 Sep 2017 09:35:25 -0400
Subject: sub_8049ED4 (an attempt was made)

---
 asm/trade.s   | 485 --------------------------------------------
 ld_script.txt |   2 -
 src/trade.c   | 630 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 569 insertions(+), 548 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 8d14dbe09..5d8dcbe19 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,491 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049ED4
-sub_8049ED4: @ 8049ED4
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x74
-	lsls r0, 24
-	lsrs r0, 24
-	mov r10, r0
-	ldr r0, _08049F24 @ =gUnknown_03004824
-	ldr r5, [r0]
-	adds r0, r5, 0
-	adds r0, 0x82
-	add r0, r10
-	ldrb r0, [r0]
-	movs r1, 0x1
-	str r1, [sp, 0x6C]
-	cmp r0, 0x5
-	bhi _08049EFE
-	movs r2, 0
-	str r2, [sp, 0x6C]
-_08049EFE:
-	movs r1, 0x6
-	bl __umodsi3
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	adds r0, r5, 0
-	adds r0, 0x80
-	mov r1, r10
-	adds r3, r0, r1
-	ldrb r0, [r3]
-	cmp r0, 0x2
-	bne _08049F1A
-	b _0804A0AC
-_08049F1A:
-	cmp r0, 0x2
-	bgt _08049F28
-	cmp r0, 0x1
-	beq _08049F36
-	b _0804A294
-	.align 2, 0
-_08049F24: .4byte gUnknown_03004824
-_08049F28:
-	cmp r0, 0x3
-	bne _08049F2E
-	b _0804A0E4
-_08049F2E:
-	cmp r0, 0x4
-	bne _08049F34
-	b _0804A244
-_08049F34:
-	b _0804A294
-_08049F36:
-	movs r4, 0
-	adds r0, r5, 0
-	adds r0, 0x42
-	add r0, r10
-	ldr r7, _0804A094 @ =gSprites
-	ldr r2, [sp, 0x6C]
-	lsls r2, 1
-	mov r9, r2
-	ldr r3, _0804A098 @ =gTradeMonSpriteCoords
-	mov r12, r3
-	mov r5, r10
-	lsls r5, 4
-	str r5, [sp, 0x70]
-	ldrb r0, [r0]
-	cmp r4, r0
-	bcs _08049F8E
-	adds r6, r7, 0
-	ldr r2, _0804A09C @ =gUnknown_03004824
-	ldr r0, [sp, 0x6C]
-	add r0, r9
-	lsls r3, r0, 1
-	movs r5, 0x4
-_08049F62:
-	ldr r0, [r2]
-	adds r1, r4, r3
-	adds r0, 0x34
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	orrs r1, r5
-	strb r1, [r0]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, [r2]
-	adds r0, 0x42
-	add r0, r10
-	ldrb r0, [r0]
-	cmp r4, r0
-	bcc _08049F62
-_08049F8E:
-	ldr r1, _0804A09C @ =gUnknown_03004824
-	ldr r0, [r1]
-	ldr r5, [sp, 0x6C]
-	add r5, r9
-	lsls r3, r5, 1
-	mov r2, r8
-	adds r6, r2, r3
-	adds r0, 0x34
-	adds r0, r6
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r7
-	adds r0, 0x3E
-	ldrb r2, [r0]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r2
-	strb r1, [r0]
-	ldr r0, _0804A09C @ =gUnknown_03004824
-	ldr r4, [r0]
-	adds r4, 0x34
-	adds r4, r6
-	ldrb r1, [r4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r7
-	movs r1, 0x14
-	strh r1, [r0, 0x2E]
-	ldrb r0, [r4]
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	adds r2, r7
-	lsls r5, 2
-	mov r1, r12
-	adds r0, r5, r1
-	ldrb r0, [r0]
-	adds r3, 0x1
-	lsls r3, 1
-	add r3, r12
-	ldrb r1, [r3]
-	adds r0, r1
-	asrs r0, 1
-	lsls r0, 3
-	adds r0, 0xE
-	strh r0, [r2, 0x32]
-	ldrb r0, [r4]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r7
-	mov r0, r12
-	adds r0, 0x1
-	adds r5, r0
-	ldrb r0, [r5]
-	lsls r0, 3
-	subs r0, 0xC
-	strh r0, [r1, 0x36]
-	ldrb r1, [r4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r7
-	ldr r1, _0804A0A0 @ =sub_809D62C
-	bl oamt_set_x3A_32
-	ldr r2, _0804A09C @ =gUnknown_03004824
-	ldr r1, [r2]
-	adds r1, 0x80
-	add r1, r10
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r0, [r2]
-	adds r0, 0x34
-	adds r0, r6
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r7
-	bl sub_8078A34
-	bl HandleDestroyMenuCursors
-	ldr r3, _0804A09C @ =gUnknown_03004824
-	ldr r0, [r3]
-	adds r0, 0x4
-	ldr r1, _0804A0A4 @ =gUnknown_0820C330
-	mov r5, r9
-	adds r2, r5, r1
-	ldrb r2, [r2]
-	adds r1, 0x1
-	add r1, r9
-	ldrb r1, [r1]
-	str r1, [sp]
-	movs r1, 0x13
-	str r1, [sp, 0x4]
-	movs r1, 0
-	movs r3, 0
-	bl FillWindowRect_DefaultPalette
-	ldr r1, _0804A09C @ =gUnknown_03004824
-	ldr r0, [r1]
-	adds r0, 0xC8
-	ldr r2, [sp, 0x70]
-	mov r3, r10
-	subs r1, r2, r3
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, _0804A0A8 @ =gTradePartyBoxTilemap
-	movs r2, 0xF
-	str r2, [sp]
-	movs r2, 0x11
-	str r2, [sp, 0x4]
-	movs r5, 0
-	str r5, [sp, 0x8]
-	movs r2, 0
-	bl sub_804A96C_alt
-	ldr r0, [sp, 0x6C]
-	cmp r0, 0
-	beq _0804A08C
-	b _0804A294
-_0804A08C:
-	bl sub_804A80C
-	b _0804A294
-	.align 2, 0
-_0804A094: .4byte gSprites
-_0804A098: .4byte gTradeMonSpriteCoords
-_0804A09C: .4byte gUnknown_03004824
-_0804A0A0: .4byte sub_809D62C
-_0804A0A4: .4byte gUnknown_0820C330
-_0804A0A8: .4byte gTradePartyBoxTilemap
-_0804A0AC:
-	ldr r2, _0804A0DC @ =gSprites
-	ldr r1, [sp, 0x6C]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 1
-	add r0, r8
-	adds r1, r5, 0
-	adds r1, 0x34
-	adds r1, r0
-	ldrb r1, [r1]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r2, 0x1C
-	adds r0, r2
-	ldr r1, [r0]
-	ldr r0, _0804A0E0 @ =sub_809D62C
-	cmp r1, r0
-	beq _0804A0D4
-	b _0804A294
-_0804A0D4:
-	movs r0, 0x3
-	strb r0, [r3]
-	b _0804A294
-	.align 2, 0
-_0804A0DC: .4byte gSprites
-_0804A0E0: .4byte sub_809D62C
-_0804A0E4:
-	adds r0, r5, 0
-	adds r0, 0xC8
-	ldr r2, [sp, 0x6C]
-	lsls r1, r2, 4
-	subs r1, r2
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, _0804A228 @ =gTradeMovesBoxTilemap
-	movs r2, 0xF
-	str r2, [sp]
-	movs r7, 0x11
-	str r7, [sp, 0x4]
-	movs r5, 0
-	str r5, [sp, 0x8]
-	movs r2, 0
-	bl sub_804A96C_alt
-	ldr r0, _0804A22C @ =gUnknown_03004824
-	ldr r3, [r0]
-	ldr r1, [sp, 0x6C]
-	lsls r6, r1, 1
-	adds r1, r6
-	mov r9, r1
-	lsls r1, 1
-	mov r2, r8
-	adds r0, r2, r1
-	adds r3, 0x34
-	adds r3, r0
-	ldrb r0, [r3]
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	ldr r5, _0804A230 @ =gSprites
-	adds r2, r5
-	ldr r4, _0804A234 @ =gTradeMonSpriteCoords
-	mov r0, r9
-	lsls r5, r0, 2
-	adds r0, r5, r4
-	ldrb r0, [r0]
-	adds r1, 0x1
-	lsls r1, 1
-	adds r1, r4
-	ldrb r1, [r1]
-	adds r0, r1
-	asrs r0, 1
-	lsls r0, 3
-	adds r0, 0xE
-	strh r0, [r2, 0x20]
-	ldrb r0, [r3]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	ldr r2, _0804A230 @ =gSprites
-	adds r1, r2
-	adds r4, 0x1
-	adds r5, r4
-	ldrb r0, [r5]
-	lsls r0, 3
-	subs r0, 0xC
-	strh r0, [r1, 0x22]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	movs r5, 0
-	strh r5, [r0, 0x24]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	strh r5, [r0, 0x26]
-	mov r0, sp
-	adds r0, 0x12
-	ldr r1, [sp, 0x6C]
-	mov r2, r8
-	bl sub_804A2B4
-	add r1, sp, 0xC
-	movs r3, 0xFC
-	strb r3, [r1]
-	adds r2, r1, 0
-	movs r1, 0x6
-	strb r1, [r2, 0x1]
-	movs r1, 0x4
-	strb r1, [r2, 0x2]
-	adds r1, r2, 0
-	strb r3, [r1, 0x3]
-	strb r7, [r1, 0x4]
-	lsls r0, 24
-	asrs r0, 24
-	movs r1, 0x40
-	subs r1, r0
-	lsrs r0, r1, 31
-	adds r1, r0
-	asrs r1, 1
-	strb r1, [r2, 0x5]
-	ldr r0, _0804A22C @ =gUnknown_03004824
-	ldr r1, [r0]
-	adds r0, r1, 0x4
-	adds r1, 0x7A
-	ldrb r2, [r1]
-	mov r1, r9
-	lsls r1, 6
-	mov r9, r1
-	add r2, r9
-	ldr r4, _0804A238 @ =gUnknown_0820C334
-	ldr r3, [sp, 0x6C]
-	lsls r1, r3, 2
-	adds r3, r1, r4
-	ldrb r3, [r3]
-	ldr r5, _0804A23C @ =gUnknown_0820C334 + 0x1
-	adds r1, r5
-	ldrb r1, [r1]
-	str r1, [sp]
-	add r1, sp, 0xC
-	bl sub_8003460
-	add r7, sp, 0x34
-	adds r0, r7, 0
-	ldr r1, [sp, 0x6C]
-	mov r2, r8
-	bl sub_804A33C
-	ldr r0, _0804A22C @ =gUnknown_03004824
-	ldr r2, [r0]
-	adds r0, r2, 0x4
-	ldr r1, _0804A240 @ =gOtherText_Terminator2
-	adds r2, 0x7A
-	ldrb r2, [r2]
-	add r2, r9
-	adds r2, 0x20
-	adds r6, 0x1
-	lsls r6, 1
-	adds r4, r6, r4
-	ldrb r5, [r4]
-	ldr r3, _0804A23C @ =gUnknown_0820C334 + 0x1
-	adds r6, r3
-	ldrb r4, [r6]
-	adds r4, 0x1
-	lsls r4, 24
-	lsrs r4, 24
-	str r4, [sp]
-	adds r3, r5, 0
-	bl sub_8003460
-	ldr r0, _0804A22C @ =gUnknown_03004824
-	ldr r1, [r0]
-	adds r0, r1, 0x4
-	adds r1, 0x7A
-	ldrb r2, [r1]
-	add r2, r9
-	adds r2, 0x26
-	str r4, [sp]
-	adds r1, r7, 0
-	adds r3, r5, 0
-	bl sub_8003460
-	ldr r2, _0804A22C @ =gUnknown_03004824
-	ldr r1, [r2]
-	b _0804A28A
-	.align 2, 0
-_0804A228: .4byte gTradeMovesBoxTilemap
-_0804A22C: .4byte gUnknown_03004824
-_0804A230: .4byte gSprites
-_0804A234: .4byte gTradeMonSpriteCoords
-_0804A238: .4byte gUnknown_0820C334
-_0804A23C: .4byte gUnknown_0820C334 + 0x1
-_0804A240: .4byte gOtherText_Terminator2
-_0804A244:
-	ldr r0, _0804A2A4 @ =gUnknown_0820C14C
-	ldr r0, [r0, 0x14]
-	adds r1, r5, 0
-	adds r1, 0x7E
-	ldrh r1, [r1]
-	lsls r1, 5
-	ldr r3, _0804A2A8 @ =0x06010000
-	adds r1, r3
-	movs r2, 0x14
-	bl sub_804ACD8
-	ldr r0, _0804A2AC @ =gUnknown_0820C3D1
-	mov r5, r10
-	lsls r1, r5, 1
-	adds r4, r1, r0
-	ldrb r2, [r4]
-	adds r2, 0x4
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, 0x1
-	adds r1, r0
-	ldrb r3, [r1]
-	adds r3, 0x1
-	lsls r3, 24
-	lsrs r3, 24
-	ldrb r0, [r4]
-	str r0, [sp]
-	ldrb r0, [r1]
-	str r0, [sp, 0x4]
-	mov r0, r10
-	mov r1, r8
-	bl sub_804A51C
-	ldr r0, _0804A2B0 @ =gUnknown_03004824
-	ldr r1, [r0]
-_0804A28A:
-	adds r1, 0x80
-	add r1, r10
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-_0804A294:
-	add sp, 0x74
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804A2A4: .4byte gUnknown_0820C14C
-_0804A2A8: .4byte 0x06010000
-_0804A2AC: .4byte gUnknown_0820C3D1
-_0804A2B0: .4byte gUnknown_03004824
-	thumb_func_end sub_8049ED4
-
-    .section .text.sub_804A9F4
-
 	thumb_func_start sub_804ACF4
 sub_804ACF4: @ 804ACF4
 	push {r4-r7,lr}
diff --git a/ld_script.txt b/ld_script.txt
index b82c7b92f..ce4090847 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -80,8 +80,6 @@ SECTIONS {
         src/load_save.o(.text);
         src/trade.o(.text);
         asm/trade.o(.text);
-        src/trade.o(.text.sub_804A2B4);
-        asm/trade.o(.text.sub_804A9F4);
         src/trade.o(.text.sub_804DAD4);
         asm/trade.o(.text.sub_804DB2C);
         src/berry_blender.o(.text);
diff --git a/src/trade.c b/src/trade.c
index efd6a1314..0eb05bb52 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -28,6 +28,7 @@
 
 #ifdef ENGLISH
 #define sub_804A96C_alt sub_804A96C
+asm(".set sub_804A96C_alt, sub_804A96C");
 #endif
 
 #define Trade_SendData() SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, ARRAY_COUNT(gUnknown_03004824->linkData))
@@ -144,7 +145,7 @@ static void sub_804A940(struct UnkStructD *);
 /*static*/ void sub_804B41C(void);
 static void sub_8049DE0(void);
 static void sub_804AB30(void);
-/*static*/ void sub_8049ED4(u8);
+static void sub_8049ED4(u8);
 static void sub_804A6DC(u8);
 static void sub_804A938(struct UnkStructD *);
 static void sub_804A9F4(u8);
@@ -156,6 +157,14 @@ static u8 sub_80499F0(const u8 *, u8, u8);
 static void sub_804A840(u8);
 /*static*/ u8 sub_804A2B4(u8 *, u8, u8);
 /*static*/ void sub_804A96C_alt(struct UnkStructD *, u8, u8, const u16 *, u8, u8, u16);
+#ifdef NONMATCHING
+static
+#endif
+void sub_804A33C(u8 *, u8, u8);
+#ifdef NONMATCHING
+static
+#endif
+void sub_804A51C(u8, u8, u8, u8, u8, u8);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -2036,66 +2045,559 @@ static void sub_8049E9C(u8 a0)
 }
 
 // TODO: Figure out what the f**k is going on here
-//static void sub_8049ED4(u8 a0)
-//{
-//    struct Pokemon pokemon;
-//    u8 i;
-//    u8 temp0 = gUnknown_03004824->unk_0082[a0];
-//    u8 sp_plus_6c = temp0 < PARTY_SIZE ? 1 : 0;
-//    u8 r8 = temp0 % 6;
-//    s8 stringLength;
-//    u8 string[50];
-//
-//    switch (gUnknown_03004824->unk_0080[a0])
-//    {
-//        case 1:
-//            for (i = 0; i < gUnknown_03004824->partyCounts[a0]; i ++)
-//            {
-//                gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][i]].invisible = TRUE;
-//            }
-//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].invisible = FALSE;
-//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].data0 = 20;
-//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].data2 = (gTradeMonSpriteCoords[sp_plus_6c][0] + gTradeMonSpriteCoords[sp_plus_6c][1]) / 2 * 8 + 14;
-//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].data4 = gTradeMonSpriteCoords[sp_plus_6c][1] * 8 - 12;
-//            oamt_set_x3A_32(&gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]], sub_809D62C);
-//            gUnknown_03004824->unk_0080[a0] ++;
-//            sub_8078A34(&gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]]);
-//            HandleDestroyMenuCursors();
-//            FillWindowRect_DefaultPalette(&gUnknown_03004824->window, 0, gUnknown_0820C330[sp_plus_6c][1], 0, gUnknown_0820C330[sp_plus_6c][1], 19);
-//            sub_804A96C_alt(&gUnknown_03004824->unk_00c8, 15 * sp_plus_6c, 0, gTradePartyBoxTilemap, 15, 17, 0);
-//            if (sp_plus_6c == 0)
-//            {
-//                sub_804A80C();
-//            }
-//            break;
-//        case 2:
-//            if (gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].callback == sub_809D62C)
-//            {
-//                gUnknown_03004824->unk_0080[a0] = 3;
-//            }
-//            break;
-//        case 3:
-//            sub_804A96C_alt(&gUnknown_03004824->unk_00c8, 15 * sp_plus_6c, 0, gTradePartyBoxTilemap, 15, 11, 0);
-//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].pos1.x = (gTradeMonSpriteCoords[sp_plus_6c][0] + gTradeMonSpriteCoords[sp_plus_6c][1]) / 2 * 8 + 14;
-//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].pos1.y = gTradeMonSpriteCoords[sp_plus_6c][1] * 8 - 12;
-//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].pos2.x = 0;
-//            gSprites[gUnknown_03004824->partyIcons[sp_plus_6c][r8]].pos2.y = 0;
-//            stringLength = sub_804A2B4(&string[6], sp_plus_6c, r8);
-//            string[0] = 0xFC;
-//            string[1] = 0x06;
-//            string[2] = 0x04;
-//            string[3] = 0xFC;
-//            string[4] = 0x11;
-//            string[5] = (64 - stringLength) / 2;
-//            sub_8003460(&gUnknown_03004824->window, string, sp_plus_6c * 192 + gUnknown_03004824->unk_007a, gUnknown_0820C334[sp_plus_6c][0], gUnknown_0820C334[sp_plus_6c][1]);
-//            sub_804A33C()
-//            break;
-//        case 4:
-//            break;
-//    }
-//}
-
-asm(".section .text.sub_804A2B4");
+#ifdef NONMATCHING
+static void sub_8049ED4(u8 a0)
+{
+    u8 i;
+    s8 stringLength;
+    u8 whichParty = 1;
+    u8 whichPokemon;
+    u8 string1[40];
+    u8 string2[56];
+    u8 temp0 = gUnknown_03004824->unk_0082[a0];
+    if (temp0 < PARTY_SIZE)
+        whichParty = 0;
+    whichPokemon = temp0 % PARTY_SIZE;
+
+    switch (gUnknown_03004824->unk_0080[a0])
+    {
+        case 1:
+            for (i = 0; i < gUnknown_03004824->partyCounts[a0]; i ++)
+            {
+                gSprites[gUnknown_03004824->partyIcons[whichParty][i]].invisible = TRUE;
+            }
+            gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].invisible = FALSE;
+            gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].data0 = 20;
+            gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].data2 = (gTradeMonSpriteCoords[6 * whichParty + whichPokemon][0] + gTradeMonSpriteCoords[6 * whichParty + whichPokemon + 1][0]) / 2 * 8 + 14;
+            gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].data4 = gTradeMonSpriteCoords[6 * whichParty + whichPokemon][1] * 8 - 12;
+            oamt_set_x3A_32(&gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]], sub_809D62C);
+            gUnknown_03004824->unk_0080[a0] ++;
+            sub_8078A34(&gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]]);
+            HandleDestroyMenuCursors();
+            FillWindowRect_DefaultPalette(&gUnknown_03004824->window, 0, gUnknown_0820C330[whichParty][0], 0, gUnknown_0820C330[whichParty][1], 19);
+            sub_804A96C_alt(&gUnknown_03004824->unk_00c8, 15 * a0, 0, gTradePartyBoxTilemap, 15, 17, 0);
+            if (whichParty == 0)
+            {
+                sub_804A80C();
+            }
+            break;
+        case 2:
+            if (gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].callback == sub_809D62C)
+            {
+                gUnknown_03004824->unk_0080[a0] = 3;
+            }
+            break;
+        case 3:
+            sub_804A96C_alt(&gUnknown_03004824->unk_00c8, 15 * whichParty, 0, gTradePartyBoxTilemap, 15, 17, 0);
+            gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].pos1.x = (gTradeMonSpriteCoords[6 * whichParty + whichPokemon ][0] + gTradeMonSpriteCoords[6 * whichParty + whichPokemon + 1][0]) / 2 * 8 + 14;
+            gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].pos1.y = gTradeMonSpriteCoords[6 * whichParty + whichPokemon ][1] * 8 - 12;
+            gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].pos2.x = 0;
+            gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].pos2.y = 0;
+            stringLength = sub_804A2B4(string1 + 6, whichParty, whichPokemon);
+            string1[0] = 0xFC;
+            string1[1] = 0x06;
+            string1[2] = 0x04;
+            string1[3] = 0xFC;
+            string1[4] = 0x11;
+            string1[5] = (64 - stringLength) / 2;
+            sub_8003460(&gUnknown_03004824->window, string1, gUnknown_03004824->unk_007a + whichParty * 6 * 32, gUnknown_0820C334[whichParty][0], gUnknown_0820C334[whichParty][1]);
+            sub_804A33C(string2, whichParty, whichPokemon);
+            sub_8003460(&gUnknown_03004824->window, gOtherText_Terminator2, gUnknown_03004824->unk_007a + whichParty * 6 * 32 + 32, gUnknown_0820C334[whichParty + 1][0], gUnknown_0820C334[whichParty + 1][1] + 1);
+            sub_8003460(&gUnknown_03004824->window, string2, gUnknown_03004824->unk_007a + whichParty * 6 * 32 + 38, gUnknown_0820C334[whichParty + 1][0], gUnknown_0820C334[whichParty + 1][1] + 1);
+            gUnknown_03004824->unk_0080[a0] ++;
+            break;
+        case 4:
+            sub_804ACD8(gUnknown_0820C14C[5], (u8 *)(BG_CHAR_ADDR(4) + 32 * gUnknown_03004824->unk_007e), 20);
+            sub_804A51C(a0, whichPokemon, gUnknown_0820C3D1[a0][0] + 4, gUnknown_0820C3D1[a0][1] + 1, gUnknown_0820C3D1[a0][0], gUnknown_0820C3D1[a0][1]);
+            gUnknown_03004824->unk_0080[a0] ++;
+            break;
+    }
+}
+#else
+__attribute__((naked))
+static void sub_8049ED4(u8 a0)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                    "\tmov r7, r10\n"
+                    "\tmov r6, r9\n"
+                    "\tmov r5, r8\n"
+                    "\tpush {r5-r7}\n"
+                    "\tsub sp, 0x74\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tmov r10, r0\n"
+                    "\tldr r0, _08049F24 @ =gUnknown_03004824\n"
+                    "\tldr r5, [r0]\n"
+                    "\tadds r0, r5, 0\n"
+                    "\tadds r0, 0x82\n"
+                    "\tadd r0, r10\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tmovs r1, 0x1\n"
+                    "\tstr r1, [sp, 0x6C]\n"
+                    "\tcmp r0, 0x5\n"
+                    "\tbhi _08049EFE\n"
+                    "\tmovs r2, 0\n"
+                    "\tstr r2, [sp, 0x6C]\n"
+                    "_08049EFE:\n"
+                    "\tmovs r1, 0x6\n"
+                    "\tbl __umodsi3\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tmov r8, r0\n"
+                    "\tadds r0, r5, 0\n"
+                    "\tadds r0, 0x80\n"
+                    "\tmov r1, r10\n"
+                    "\tadds r3, r0, r1\n"
+                    "\tldrb r0, [r3]\n"
+                    "\tcmp r0, 0x2\n"
+                    "\tbne _08049F1A\n"
+                    "\tb _0804A0AC\n"
+                    "_08049F1A:\n"
+                    "\tcmp r0, 0x2\n"
+                    "\tbgt _08049F28\n"
+                    "\tcmp r0, 0x1\n"
+                    "\tbeq _08049F36\n"
+                    "\tb _0804A294\n"
+                    "\t.align 2, 0\n"
+                    "_08049F24: .4byte gUnknown_03004824\n"
+                    "_08049F28:\n"
+                    "\tcmp r0, 0x3\n"
+                    "\tbne _08049F2E\n"
+                    "\tb _0804A0E4\n"
+                    "_08049F2E:\n"
+                    "\tcmp r0, 0x4\n"
+                    "\tbne _08049F34\n"
+                    "\tb _0804A244\n"
+                    "_08049F34:\n"
+                    "\tb _0804A294\n"
+                    "_08049F36:\n"
+                    "\tmovs r4, 0\n"
+                    "\tadds r0, r5, 0\n"
+                    "\tadds r0, 0x42\n"
+                    "\tadd r0, r10\n"
+                    "\tldr r7, _0804A094 @ =gSprites\n"
+                    "\tldr r2, [sp, 0x6C]\n"
+                    "\tlsls r2, 1\n"
+                    "\tmov r9, r2\n"
+                    "\tldr r3, _0804A098 @ =gTradeMonSpriteCoords\n"
+                    "\tmov r12, r3\n"
+                    "\tmov r5, r10\n"
+                    "\tlsls r5, 4\n"
+                    "\tstr r5, [sp, 0x70]\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r4, r0\n"
+                    "\tbcs _08049F8E\n"
+                    "\tadds r6, r7, 0\n"
+                    "\tldr r2, _0804A09C @ =gUnknown_03004824\n"
+                    "\tldr r0, [sp, 0x6C]\n"
+                    "\tadd r0, r9\n"
+                    "\tlsls r3, r0, 1\n"
+                    "\tmovs r5, 0x4\n"
+                    "_08049F62:\n"
+                    "\tldr r0, [r2]\n"
+                    "\tadds r1, r4, r3\n"
+                    "\tadds r0, 0x34\n"
+                    "\tadds r0, r1\n"
+                    "\tldrb r1, [r0]\n"
+                    "\tlsls r0, r1, 4\n"
+                    "\tadds r0, r1\n"
+                    "\tlsls r0, 2\n"
+                    "\tadds r0, r6\n"
+                    "\tadds r0, 0x3E\n"
+                    "\tldrb r1, [r0]\n"
+                    "\torrs r1, r5\n"
+                    "\tstrb r1, [r0]\n"
+                    "\tadds r0, r4, 0x1\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r4, r0, 24\n"
+                    "\tldr r0, [r2]\n"
+                    "\tadds r0, 0x42\n"
+                    "\tadd r0, r10\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r4, r0\n"
+                    "\tbcc _08049F62\n"
+                    "_08049F8E:\n"
+                    "\tldr r1, _0804A09C @ =gUnknown_03004824\n"
+                    "\tldr r0, [r1]\n"
+                    "\tldr r5, [sp, 0x6C]\n"
+                    "\tadd r5, r9\n"
+                    "\tlsls r3, r5, 1\n"
+                    "\tmov r2, r8\n"
+                    "\tadds r6, r2, r3\n"
+                    "\tadds r0, 0x34\n"
+                    "\tadds r0, r6\n"
+                    "\tldrb r1, [r0]\n"
+                    "\tlsls r0, r1, 4\n"
+                    "\tadds r0, r1\n"
+                    "\tlsls r0, 2\n"
+                    "\tadds r0, r7\n"
+                    "\tadds r0, 0x3E\n"
+                    "\tldrb r2, [r0]\n"
+                    "\tmovs r1, 0x5\n"
+                    "\tnegs r1, r1\n"
+                    "\tands r1, r2\n"
+                    "\tstrb r1, [r0]\n"
+                    "\tldr r0, _0804A09C @ =gUnknown_03004824\n"
+                    "\tldr r4, [r0]\n"
+                    "\tadds r4, 0x34\n"
+                    "\tadds r4, r6\n"
+                    "\tldrb r1, [r4]\n"
+                    "\tlsls r0, r1, 4\n"
+                    "\tadds r0, r1\n"
+                    "\tlsls r0, 2\n"
+                    "\tadds r0, r7\n"
+                    "\tmovs r1, 0x14\n"
+                    "\tstrh r1, [r0, 0x2E]\n"
+                    "\tldrb r0, [r4]\n"
+                    "\tlsls r2, r0, 4\n"
+                    "\tadds r2, r0\n"
+                    "\tlsls r2, 2\n"
+                    "\tadds r2, r7\n"
+                    "\tlsls r5, 2\n"
+                    "\tmov r1, r12\n"
+                    "\tadds r0, r5, r1\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tadds r3, 0x1\n"
+                    "\tlsls r3, 1\n"
+                    "\tadd r3, r12\n"
+                    "\tldrb r1, [r3]\n"
+                    "\tadds r0, r1\n"
+                    "\tasrs r0, 1\n"
+                    "\tlsls r0, 3\n"
+                    "\tadds r0, 0xE\n"
+                    "\tstrh r0, [r2, 0x32]\n"
+                    "\tldrb r0, [r4]\n"
+                    "\tlsls r1, r0, 4\n"
+                    "\tadds r1, r0\n"
+                    "\tlsls r1, 2\n"
+                    "\tadds r1, r7\n"
+                    "\tmov r0, r12\n"
+                    "\tadds r0, 0x1\n"
+                    "\tadds r5, r0\n"
+                    "\tldrb r0, [r5]\n"
+                    "\tlsls r0, 3\n"
+                    "\tsubs r0, 0xC\n"
+                    "\tstrh r0, [r1, 0x36]\n"
+                    "\tldrb r1, [r4]\n"
+                    "\tlsls r0, r1, 4\n"
+                    "\tadds r0, r1\n"
+                    "\tlsls r0, 2\n"
+                    "\tadds r0, r7\n"
+                    "\tldr r1, _0804A0A0 @ =sub_809D62C\n"
+                    "\tbl oamt_set_x3A_32\n"
+                    "\tldr r2, _0804A09C @ =gUnknown_03004824\n"
+                    "\tldr r1, [r2]\n"
+                    "\tadds r1, 0x80\n"
+                    "\tadd r1, r10\n"
+                    "\tldrb r0, [r1]\n"
+                    "\tadds r0, 0x1\n"
+                    "\tstrb r0, [r1]\n"
+                    "\tldr r0, [r2]\n"
+                    "\tadds r0, 0x34\n"
+                    "\tadds r0, r6\n"
+                    "\tldrb r1, [r0]\n"
+                    "\tlsls r0, r1, 4\n"
+                    "\tadds r0, r1\n"
+                    "\tlsls r0, 2\n"
+                    "\tadds r0, r7\n"
+                    "\tbl sub_8078A34\n"
+                    "\tbl HandleDestroyMenuCursors\n"
+                    "\tldr r3, _0804A09C @ =gUnknown_03004824\n"
+                    "\tldr r0, [r3]\n"
+                    "\tadds r0, 0x4\n"
+                    "\tldr r1, _0804A0A4 @ =gUnknown_0820C330\n"
+                    "\tmov r5, r9\n"
+                    "\tadds r2, r5, r1\n"
+                    "\tldrb r2, [r2]\n"
+                    "\tadds r1, 0x1\n"
+                    "\tadd r1, r9\n"
+                    "\tldrb r1, [r1]\n"
+                    "\tstr r1, [sp]\n"
+                    "\tmovs r1, 0x13\n"
+                    "\tstr r1, [sp, 0x4]\n"
+                    "\tmovs r1, 0\n"
+                    "\tmovs r3, 0\n"
+                    "\tbl FillWindowRect_DefaultPalette\n"
+                    "\tldr r1, _0804A09C @ =gUnknown_03004824\n"
+                    "\tldr r0, [r1]\n"
+                    "\tadds r0, 0xC8\n"
+                    "\tldr r2, [sp, 0x70]\n"
+                    "\tmov r3, r10\n"
+                    "\tsubs r1, r2, r3\n"
+                    "\tlsls r1, 24\n"
+                    "\tlsrs r1, 24\n"
+                    "\tldr r3, _0804A0A8 @ =gTradePartyBoxTilemap\n"
+                    "\tmovs r2, 0xF\n"
+                    "\tstr r2, [sp]\n"
+                    "\tmovs r2, 0x11\n"
+                    "\tstr r2, [sp, 0x4]\n"
+                    "\tmovs r5, 0\n"
+                    "\tstr r5, [sp, 0x8]\n"
+                    "\tmovs r2, 0\n"
+                    "\tbl sub_804A96C_alt\n"
+                    "\tldr r0, [sp, 0x6C]\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _0804A08C\n"
+                    "\tb _0804A294\n"
+                    "_0804A08C:\n"
+                    "\tbl sub_804A80C\n"
+                    "\tb _0804A294\n"
+                    "\t.align 2, 0\n"
+                    "_0804A094: .4byte gSprites\n"
+                    "_0804A098: .4byte gTradeMonSpriteCoords\n"
+                    "_0804A09C: .4byte gUnknown_03004824\n"
+                    "_0804A0A0: .4byte sub_809D62C\n"
+                    "_0804A0A4: .4byte gUnknown_0820C330\n"
+                    "_0804A0A8: .4byte gTradePartyBoxTilemap\n"
+                    "_0804A0AC:\n"
+                    "\tldr r2, _0804A0DC @ =gSprites\n"
+                    "\tldr r1, [sp, 0x6C]\n"
+                    "\tlsls r0, r1, 1\n"
+                    "\tadds r0, r1\n"
+                    "\tlsls r0, 1\n"
+                    "\tadd r0, r8\n"
+                    "\tadds r1, r5, 0\n"
+                    "\tadds r1, 0x34\n"
+                    "\tadds r1, r0\n"
+                    "\tldrb r1, [r1]\n"
+                    "\tlsls r0, r1, 4\n"
+                    "\tadds r0, r1\n"
+                    "\tlsls r0, 2\n"
+                    "\tadds r2, 0x1C\n"
+                    "\tadds r0, r2\n"
+                    "\tldr r1, [r0]\n"
+                    "\tldr r0, _0804A0E0 @ =sub_809D62C\n"
+                    "\tcmp r1, r0\n"
+                    "\tbeq _0804A0D4\n"
+                    "\tb _0804A294\n"
+                    "_0804A0D4:\n"
+                    "\tmovs r0, 0x3\n"
+                    "\tstrb r0, [r3]\n"
+                    "\tb _0804A294\n"
+                    "\t.align 2, 0\n"
+                    "_0804A0DC: .4byte gSprites\n"
+                    "_0804A0E0: .4byte sub_809D62C\n"
+                    "_0804A0E4:\n"
+                    "\tadds r0, r5, 0\n"
+                    "\tadds r0, 0xC8\n"
+                    "\tldr r2, [sp, 0x6C]\n"
+                    "\tlsls r1, r2, 4\n"
+                    "\tsubs r1, r2\n"
+                    "\tlsls r1, 24\n"
+                    "\tlsrs r1, 24\n"
+                    "\tldr r3, _0804A228 @ =gTradeMovesBoxTilemap\n"
+                    "\tmovs r2, 0xF\n"
+                    "\tstr r2, [sp]\n"
+                    "\tmovs r7, 0x11\n"
+                    "\tstr r7, [sp, 0x4]\n"
+                    "\tmovs r5, 0\n"
+                    "\tstr r5, [sp, 0x8]\n"
+                    "\tmovs r2, 0\n"
+                    "\tbl sub_804A96C_alt\n"
+                    "\tldr r0, _0804A22C @ =gUnknown_03004824\n"
+                    "\tldr r3, [r0]\n"
+                    "\tldr r1, [sp, 0x6C]\n"
+                    "\tlsls r6, r1, 1\n"
+                    "\tadds r1, r6\n"
+                    "\tmov r9, r1\n"
+                    "\tlsls r1, 1\n"
+                    "\tmov r2, r8\n"
+                    "\tadds r0, r2, r1\n"
+                    "\tadds r3, 0x34\n"
+                    "\tadds r3, r0\n"
+                    "\tldrb r0, [r3]\n"
+                    "\tlsls r2, r0, 4\n"
+                    "\tadds r2, r0\n"
+                    "\tlsls r2, 2\n"
+                    "\tldr r5, _0804A230 @ =gSprites\n"
+                    "\tadds r2, r5\n"
+                    "\tldr r4, _0804A234 @ =gTradeMonSpriteCoords\n"
+                    "\tmov r0, r9\n"
+                    "\tlsls r5, r0, 2\n"
+                    "\tadds r0, r5, r4\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tadds r1, 0x1\n"
+                    "\tlsls r1, 1\n"
+                    "\tadds r1, r4\n"
+                    "\tldrb r1, [r1]\n"
+                    "\tadds r0, r1\n"
+                    "\tasrs r0, 1\n"
+                    "\tlsls r0, 3\n"
+                    "\tadds r0, 0xE\n"
+                    "\tstrh r0, [r2, 0x20]\n"
+                    "\tldrb r0, [r3]\n"
+                    "\tlsls r1, r0, 4\n"
+                    "\tadds r1, r0\n"
+                    "\tlsls r1, 2\n"
+                    "\tldr r2, _0804A230 @ =gSprites\n"
+                    "\tadds r1, r2\n"
+                    "\tadds r4, 0x1\n"
+                    "\tadds r5, r4\n"
+                    "\tldrb r0, [r5]\n"
+                    "\tlsls r0, 3\n"
+                    "\tsubs r0, 0xC\n"
+                    "\tstrh r0, [r1, 0x22]\n"
+                    "\tldrb r1, [r3]\n"
+                    "\tlsls r0, r1, 4\n"
+                    "\tadds r0, r1\n"
+                    "\tlsls r0, 2\n"
+                    "\tadds r0, r2\n"
+                    "\tmovs r5, 0\n"
+                    "\tstrh r5, [r0, 0x24]\n"
+                    "\tldrb r1, [r3]\n"
+                    "\tlsls r0, r1, 4\n"
+                    "\tadds r0, r1\n"
+                    "\tlsls r0, 2\n"
+                    "\tadds r0, r2\n"
+                    "\tstrh r5, [r0, 0x26]\n"
+                    "\tmov r0, sp\n"
+                    "\tadds r0, 0x12\n"
+                    "\tldr r1, [sp, 0x6C]\n"
+                    "\tmov r2, r8\n"
+                    "\tbl sub_804A2B4\n"
+                    "\tadd r1, sp, 0xC\n"
+                    "\tmovs r3, 0xFC\n"
+                    "\tstrb r3, [r1]\n"
+                    "\tadds r2, r1, 0\n"
+                    "\tmovs r1, 0x6\n"
+                    "\tstrb r1, [r2, 0x1]\n"
+                    "\tmovs r1, 0x4\n"
+                    "\tstrb r1, [r2, 0x2]\n"
+                    "\tadds r1, r2, 0\n"
+                    "\tstrb r3, [r1, 0x3]\n"
+                    "\tstrb r7, [r1, 0x4]\n"
+                    "\tlsls r0, 24\n"
+                    "\tasrs r0, 24\n"
+                    "\tmovs r1, 0x40\n"
+                    "\tsubs r1, r0\n"
+                    "\tlsrs r0, r1, 31\n"
+                    "\tadds r1, r0\n"
+                    "\tasrs r1, 1\n"
+                    "\tstrb r1, [r2, 0x5]\n"
+                    "\tldr r0, _0804A22C @ =gUnknown_03004824\n"
+                    "\tldr r1, [r0]\n"
+                    "\tadds r0, r1, 0x4\n"
+                    "\tadds r1, 0x7A\n"
+                    "\tldrb r2, [r1]\n"
+                    "\tmov r1, r9\n"
+                    "\tlsls r1, 6\n"
+                    "\tmov r9, r1\n"
+                    "\tadd r2, r9\n"
+                    "\tldr r4, _0804A238 @ =gUnknown_0820C334\n"
+                    "\tldr r3, [sp, 0x6C]\n"
+                    "\tlsls r1, r3, 2\n"
+                    "\tadds r3, r1, r4\n"
+                    "\tldrb r3, [r3]\n"
+                    "\tldr r5, _0804A23C @ =gUnknown_0820C334 + 0x1\n"
+                    "\tadds r1, r5\n"
+                    "\tldrb r1, [r1]\n"
+                    "\tstr r1, [sp]\n"
+                    "\tadd r1, sp, 0xC\n"
+                    "\tbl sub_8003460\n"
+                    "\tadd r7, sp, 0x34\n"
+                    "\tadds r0, r7, 0\n"
+                    "\tldr r1, [sp, 0x6C]\n"
+                    "\tmov r2, r8\n"
+                    "\tbl sub_804A33C\n"
+                    "\tldr r0, _0804A22C @ =gUnknown_03004824\n"
+                    "\tldr r2, [r0]\n"
+                    "\tadds r0, r2, 0x4\n"
+                    "\tldr r1, _0804A240 @ =gOtherText_Terminator2\n"
+                    "\tadds r2, 0x7A\n"
+                    "\tldrb r2, [r2]\n"
+                    "\tadd r2, r9\n"
+                    "\tadds r2, 0x20\n"
+                    "\tadds r6, 0x1\n"
+                    "\tlsls r6, 1\n"
+                    "\tadds r4, r6, r4\n"
+                    "\tldrb r5, [r4]\n"
+                    "\tldr r3, _0804A23C @ =gUnknown_0820C334 + 0x1\n"
+                    "\tadds r6, r3\n"
+                    "\tldrb r4, [r6]\n"
+                    "\tadds r4, 0x1\n"
+                    "\tlsls r4, 24\n"
+                    "\tlsrs r4, 24\n"
+                    "\tstr r4, [sp]\n"
+                    "\tadds r3, r5, 0\n"
+                    "\tbl sub_8003460\n"
+                    "\tldr r0, _0804A22C @ =gUnknown_03004824\n"
+                    "\tldr r1, [r0]\n"
+                    "\tadds r0, r1, 0x4\n"
+                    "\tadds r1, 0x7A\n"
+                    "\tldrb r2, [r1]\n"
+                    "\tadd r2, r9\n"
+                    "\tadds r2, 0x26\n"
+                    "\tstr r4, [sp]\n"
+                    "\tadds r1, r7, 0\n"
+                    "\tadds r3, r5, 0\n"
+                    "\tbl sub_8003460\n"
+                    "\tldr r2, _0804A22C @ =gUnknown_03004824\n"
+                    "\tldr r1, [r2]\n"
+                    "\tb _0804A28A\n"
+                    "\t.align 2, 0\n"
+                    "_0804A228: .4byte gTradeMovesBoxTilemap\n"
+                    "_0804A22C: .4byte gUnknown_03004824\n"
+                    "_0804A230: .4byte gSprites\n"
+                    "_0804A234: .4byte gTradeMonSpriteCoords\n"
+                    "_0804A238: .4byte gUnknown_0820C334\n"
+                    "_0804A23C: .4byte gUnknown_0820C334 + 0x1\n"
+                    "_0804A240: .4byte gOtherText_Terminator2\n"
+                    "_0804A244:\n"
+                    "\tldr r0, _0804A2A4 @ =gUnknown_0820C14C\n"
+                    "\tldr r0, [r0, 0x14]\n"
+                    "\tadds r1, r5, 0\n"
+                    "\tadds r1, 0x7E\n"
+                    "\tldrh r1, [r1]\n"
+                    "\tlsls r1, 5\n"
+                    "\tldr r3, _0804A2A8 @ =0x06010000\n"
+                    "\tadds r1, r3\n"
+                    "\tmovs r2, 0x14\n"
+                    "\tbl sub_804ACD8\n"
+                    "\tldr r0, _0804A2AC @ =gUnknown_0820C3D1\n"
+                    "\tmov r5, r10\n"
+                    "\tlsls r1, r5, 1\n"
+                    "\tadds r4, r1, r0\n"
+                    "\tldrb r2, [r4]\n"
+                    "\tadds r2, 0x4\n"
+                    "\tlsls r2, 24\n"
+                    "\tlsrs r2, 24\n"
+                    "\tadds r0, 0x1\n"
+                    "\tadds r1, r0\n"
+                    "\tldrb r3, [r1]\n"
+                    "\tadds r3, 0x1\n"
+                    "\tlsls r3, 24\n"
+                    "\tlsrs r3, 24\n"
+                    "\tldrb r0, [r4]\n"
+                    "\tstr r0, [sp]\n"
+                    "\tldrb r0, [r1]\n"
+                    "\tstr r0, [sp, 0x4]\n"
+                    "\tmov r0, r10\n"
+                    "\tmov r1, r8\n"
+                    "\tbl sub_804A51C\n"
+                    "\tldr r0, _0804A2B0 @ =gUnknown_03004824\n"
+                    "\tldr r1, [r0]\n"
+                    "_0804A28A:\n"
+                    "\tadds r1, 0x80\n"
+                    "\tadd r1, r10\n"
+                    "\tldrb r0, [r1]\n"
+                    "\tadds r0, 0x1\n"
+                    "\tstrb r0, [r1]\n"
+                    "_0804A294:\n"
+                    "\tadd sp, 0x74\n"
+                    "\tpop {r3-r5}\n"
+                    "\tmov r8, r3\n"
+                    "\tmov r9, r4\n"
+                    "\tmov r10, r5\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r0}\n"
+                    "\tbx r0\n"
+                    "\t.align 2, 0\n"
+                    "_0804A2A4: .4byte gUnknown_0820C14C\n"
+                    "_0804A2A8: .4byte 0x06010000\n"
+                    "_0804A2AC: .4byte gUnknown_0820C3D1\n"
+                    "_0804A2B0: .4byte gUnknown_03004824");
+}
+#endif
 
 u8 sub_804A2B4(u8 *a0, u8 whichParty, u8 whichPokemon)
 {
@@ -2117,6 +2619,9 @@ u8 sub_804A2B4(u8 *a0, u8 whichParty, u8 whichPokemon)
     return GetStringWidthGivenWindowConfig(&gWindowConfig_81E7294, a0);
 }
 
+#ifdef NONMATCHING
+static
+#endif
 void sub_804A33C(u8 *a0, u8 whichParty, u8 whichPokemon)
 {
     u16 i;
@@ -2303,6 +2808,9 @@ static void sub_804A41C(u8 whichParty)
 }
 #endif
 
+#ifdef NONMATCHING
+static
+#endif
 void sub_804A51C(u8 a0, u8 a1, u8 a2, u8 a3, u8 a4, u8 a5)
 {
     u8 nickname[24];
-- 
cgit v1.2.3


From 0849f5637d2aa2b9feebd9dce27cf9cb64754d4a Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 11:06:39 -0400
Subject: sub_804DB2C

---
 asm/trade.s     | 32 --------------------------------
 include/trade.h |  1 +
 src/trade.c     |  8 ++++++++
 3 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 5d8dcbe19..8b1162583 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -5395,38 +5395,6 @@ _0804DAD0: .4byte gEnemyParty
 
 .section .text.sub_804DB2C
 
-	thumb_func_start sub_804DB2C
-sub_804DB2C: @ 804DB2C
-	push {r4-r6,lr}
-	ldr r6, _0804DB58 @ =gSpecialVar_0x8005
-	ldrh r0, [r6]
-	movs r5, 0x64
-	muls r0, r5
-	ldr r4, _0804DB5C @ =gPlayerParty
-	adds r0, r4
-	movs r1, 0x2D
-	bl GetMonData
-	cmp r0, 0
-	bne _0804DB60
-	ldrh r0, [r6]
-	muls r0, r5
-	adds r0, r4
-	movs r1, 0xB
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	b _0804DB62
-	.align 2, 0
-_0804DB58: .4byte gSpecialVar_0x8005
-_0804DB5C: .4byte gPlayerParty
-_0804DB60:
-	movs r0, 0
-_0804DB62:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_804DB2C
-
 	thumb_func_start sub_804DB68
 sub_804DB68: @ 804DB68
 	push {lr}
diff --git a/include/trade.h b/include/trade.h
index 04f474194..591c50e8a 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -6,5 +6,6 @@
 #define POKERUBY_TRADE_H
 
 void sub_8047CD8(void);
+u16 sub_804DB2C(void);
 
 #endif //POKERUBY_TRADE_H
diff --git a/src/trade.c b/src/trade.c
index 0eb05bb52..6b85ecb05 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -24,6 +24,7 @@
 #include "rom4.h"
 #include "rom_8077ABC.h"
 #include "daycare.h"
+#include "event_data.h"
 #include "trade.h"
 
 #ifdef ENGLISH
@@ -3155,3 +3156,10 @@ asm(".section .text.sub_804DAD4");
     arg0->species = trade->species;
     arg0->heldItem = trade->heldItem;
 }
+
+u16 sub_804DB2C(void)
+{
+    if (GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_IS_EGG))
+        return SPECIES_NONE;
+    return GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_SPECIES);
+}
-- 
cgit v1.2.3


From 007f28e2d0b54f3ce06029a0a2101ae6388771e8 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 11:27:39 -0400
Subject: sub_804DB84

---
 asm/trade.s     | 78 ---------------------------------------------------------
 include/trade.h |  1 +
 src/trade.c     | 47 ++++++++++++++++++++++++++++++++--
 3 files changed, 46 insertions(+), 80 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 8b1162583..6177232df 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -5395,84 +5395,6 @@ _0804DAD0: .4byte gEnemyParty
 
 .section .text.sub_804DB2C
 
-	thumb_func_start sub_804DB68
-sub_804DB68: @ 804DB68
-	push {lr}
-	ldr r0, _0804DB7C @ =gSpecialVar_0x8005
-	ldrb r0, [r0]
-	ldr r1, _0804DB80 @ =gSpecialVar_0x8004
-	ldrb r1, [r1]
-	bl sub_804D948
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804DB7C: .4byte gSpecialVar_0x8005
-_0804DB80: .4byte gSpecialVar_0x8004
-	thumb_func_end sub_804DB68
-
-	thumb_func_start sub_804DB84
-sub_804DB84: @ 804DB84
-	push {r4-r6,lr}
-	bl sub_804C29C
-	lsls r0, 24
-	lsrs r6, r0, 24
-	cmp r6, 0x1
-	bne _0804DBE6
-	ldr r5, _0804DC04 @ =gUnknown_03004828
-	ldr r0, [r5]
-	adds r0, 0xB8
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r4, _0804DC08 @ =gSprites
-	adds r0, r4
-	bl DestroySprite
-	ldr r0, [r5]
-	adds r0, 0xB9
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	bl FreeSpriteOamMatrix
-	ldr r0, _0804DC0C @ =gUnknown_020297D8
-	ldrb r4, [r0]
-	ldrb r0, [r0, 0x1]
-	movs r1, 0x6
-	bl __umodsi3
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl sub_804BA94
-	ldr r0, [r5]
-	adds r2, r0, 0
-	adds r2, 0x9E
-	ldr r1, _0804DC10 @ =0x0000abcd
-	strh r1, [r2]
-	adds r0, 0xBD
-	strb r6, [r0]
-	ldr r0, _0804DC14 @ =sub_804DC18
-	bl SetMainCallback2
-_0804DBE6:
-	bl sub_804BB78
-	bl sub_804D63C
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804DC04: .4byte gUnknown_03004828
-_0804DC08: .4byte gSprites
-_0804DC0C: .4byte gUnknown_020297D8
-_0804DC10: .4byte 0x0000abcd
-_0804DC14: .4byte sub_804DC18
-	thumb_func_end sub_804DB84
-
 	thumb_func_start sub_804DC18
 sub_804DC18: @ 804DC18
 	push {r4,lr}
diff --git a/include/trade.h b/include/trade.h
index 591c50e8a..083fabca7 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -7,5 +7,6 @@
 
 void sub_8047CD8(void);
 u16 sub_804DB2C(void);
+void sub_804DB68(void);
 
 #endif //POKERUBY_TRADE_H
diff --git a/src/trade.c b/src/trade.c
index 6b85ecb05..982e6a319 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -102,8 +102,8 @@ struct TradeEwramSubstruct {
     /*0x008b*/ u8 unk_008b;
     /*0x008c*/ u16 linkData[20];
     /*0x00b4*/ u8 unk_00b4;
-    /*0x00b5*/ u8 unk_00b5[7];
-    /*0x00bc*/ u8 filler_00bc[12];
+    /*0x00b5*/ u8 unk_00b5[11];
+    /*0x00c0*/ u8 filler_00c0[8];
     /*0x00c8*/ struct UnkStructD unk_00c8;
     /*0x08dc*/ struct UnkStructE unk_08dc[4];
     /*0x08fc*/ u8 filler_08fc[0x704];
@@ -115,12 +115,24 @@ struct UnkStructF {
     u8 filler_000a[0xff6];
 };
 
+struct TradeEwramSubstruct2 {
+    /*0x0000*/ u8 filler_0000[0x9e];
+    /*0x009e*/ u16 unk_009e;
+    /*0x00a0*/ u8 unk_00a0[0x18];
+    /*0x00b8*/ u8 unk_00b8;
+    /*0x00b9*/ u8 unk_00b9;
+    /*0x00ba*/ u8 filler_00ba[3];
+    /*0x00bd*/ u8 unk_00bd;
+};
+
 struct TradeEwramStruct {
     /*0x00000*/ u8 filler_00000[0x7000];
     /*0x07000*/ struct TradeEwramSubstruct unk_07000;
     /*0x08000*/ struct UnkStructF unk_08000;
     /*0x09000*/ u8 filler_09000[0x4000];
     /*0x0d000*/ u8 tileBuffers[13][256];
+    /*0x0dd00*/ u8 filler_0dd00[0x1300];
+    /*0x0f000*/ struct TradeEwramSubstruct2 unk_0f000;
 };
 
 static void sub_8047EC0(void);
@@ -166,10 +178,17 @@ void sub_804A33C(u8 *, u8, u8);
 static
 #endif
 void sub_804A51C(u8, u8, u8, u8, u8, u8);
+/*static*/ void sub_804D948(u8, u8);
+/*static*/ void sub_804BA94(u8, u8);
+/*static*/ bool8 sub_804C29C(void);
+/*static*/ void sub_804DC18(void);
+/*static*/ void sub_804BB78(void);
+/*static*/ void sub_804D63C(void);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
 extern struct TradeEwramSubstruct *gUnknown_03004824;
+extern struct TradeEwramSubstruct2 *gUnknown_03004828;
 extern u8 gUnknown_03000508;
 extern struct MailStruct gUnknown_02029700[16];
 
@@ -3163,3 +3182,27 @@ u16 sub_804DB2C(void)
         return SPECIES_NONE;
     return GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_SPECIES);
 }
+
+void sub_804DB68(void)
+{
+    sub_804D948(gSpecialVar_0x8005, gSpecialVar_0x8004);
+}
+
+void sub_804DB84(void)
+{
+    if (sub_804C29C() == TRUE)
+    {
+        DestroySprite(&gSprites[gUnknown_03004828->unk_00b8]);
+        FreeSpriteOamMatrix(&gSprites[gUnknown_03004828->unk_00b9]);
+        sub_804BA94(gUnknown_020297D8[0], gUnknown_020297D8[1] % 6);
+        gUnknown_03004828->unk_009e = 0xabcd;
+        gUnknown_03004828->unk_00bd = 1;
+        SetMainCallback2(sub_804DC18);
+    }
+    sub_804BB78();
+    sub_804D63C();
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
-- 
cgit v1.2.3


From 257acf3e0766a3ec98066e016c6a1e6b6c44db70 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 11:35:23 -0400
Subject: sub_804DC18

---
 asm/trade.s | 50 --------------------------------------------------
 src/trade.c | 41 ++++++++++++++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 61 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 6177232df..caadad6ee 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -5395,56 +5395,6 @@ _0804DAD0: .4byte gEnemyParty
 
 .section .text.sub_804DB2C
 
-	thumb_func_start sub_804DC18
-sub_804DC18: @ 804DC18
-	push {r4,lr}
-	bl sub_804B2B0
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl sub_804D63C
-	cmp r4, 0
-	bne _0804DC64
-	ldr r4, _0804DC7C @ =gUnknown_03004828
-	ldr r2, [r4]
-	adds r0, r2, 0
-	adds r0, 0x9C
-	ldrh r1, [r0]
-	ldr r0, _0804DC80 @ =0x00000101
-	cmp r1, r0
-	bne _0804DC64
-	adds r1, r2, 0
-	adds r1, 0x9E
-	ldr r0, _0804DC84 @ =0x0000dcba
-	strh r0, [r1]
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, [r4]
-	adds r1, 0x9E
-	movs r2, 0x14
-	bl SendBlock
-	ldr r0, [r4]
-	adds r0, 0x9C
-	movs r1, 0x2
-	strb r1, [r0]
-	ldr r0, [r4]
-	adds r0, 0x9D
-	strb r1, [r0]
-_0804DC64:
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804DC7C: .4byte gUnknown_03004828
-_0804DC80: .4byte 0x00000101
-_0804DC84: .4byte 0x0000dcba
-	thumb_func_end sub_804DC18
-
 	thumb_func_start sub_804DC88
 sub_804DC88: @ 804DC88
 	push {r4,r5,lr}
diff --git a/src/trade.c b/src/trade.c
index 982e6a319..2d045d3b5 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -32,7 +32,7 @@
 asm(".set sub_804A96C_alt, sub_804A96C");
 #endif
 
-#define Trade_SendData() SendBlock(bitmask_all_link_players_but_self(), gUnknown_03004824->linkData, ARRAY_COUNT(gUnknown_03004824->linkData))
+#define Trade_SendData(ptr) SendBlock(bitmask_all_link_players_but_self(), ptr->linkData, 20)
 
 struct InGameTrade {
     /*0x00*/ u8 name[11];
@@ -116,9 +116,10 @@ struct UnkStructF {
 };
 
 struct TradeEwramSubstruct2 {
-    /*0x0000*/ u8 filler_0000[0x9e];
-    /*0x009e*/ u16 unk_009e;
-    /*0x00a0*/ u8 unk_00a0[0x18];
+    /*0x0000*/ u8 filler_0000[0x9c];
+    /*0x009c*/ u8 unk_009c;
+    /*0x009d*/ u8 unk_009d;
+    /*0x009e*/ u16 linkData[13];
     /*0x00b8*/ u8 unk_00b8;
     /*0x00b9*/ u8 unk_00b9;
     /*0x00ba*/ u8 filler_00ba[3];
@@ -184,6 +185,7 @@ void sub_804A51C(u8, u8, u8, u8, u8, u8);
 /*static*/ void sub_804DC18(void);
 /*static*/ void sub_804BB78(void);
 /*static*/ void sub_804D63C(void);
+/*static*/ bool8 sub_804B2B0(void);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -1693,7 +1695,7 @@ static void sub_8049620(void)
     {
         gUnknown_03004824->linkData[0] = 0xaabb;
         gUnknown_03004824->linkData[1] = gUnknown_03004824->tradeMenuCursorPosition;
-        Trade_SendData();
+        Trade_SendData(gUnknown_03004824);
     }
     else
     {
@@ -1749,7 +1751,7 @@ static void sub_8049680(void)
         {
             gUnknown_03004824->linkData[i] = i;
         }
-        Trade_SendData();
+        Trade_SendData(gUnknown_03004824);
     }
 }
 
@@ -1858,7 +1860,7 @@ static void sub_8049A20(void)
         gUnknown_03004824->linkData[0] = 0xbbbb;
         if (sub_8007ECC())
         {
-            Trade_SendData();
+            Trade_SendData(gUnknown_03004824);
         }
     }
 }
@@ -1888,7 +1890,7 @@ static void sub_8049AC0(void)
             if (sub_8007ECC())
             {
                 gUnknown_03004824->linkData[0] = 0xbbcc;
-                Trade_SendData();
+                Trade_SendData(gUnknown_03004824);
             }
         }
         gUnknown_03004824->unk_007b = 100;
@@ -1901,7 +1903,7 @@ static void sub_8049AC0(void)
             gUnknown_03004824->unk_007c = MoveMenuCursor(+1);
         }
         gUnknown_03004824->linkData[0] = 0xbbcc;
-        Trade_SendData();
+        Trade_SendData(gUnknown_03004824);
         gUnknown_03004824->unk_007b = 100;
     }
 }
@@ -3094,7 +3096,7 @@ static void sub_804AB30(void)
             switch (gUnknown_03004824->unk_08dc[i].unk_04)
             {
                 case 0:
-                    Trade_SendData();
+                    Trade_SendData(gUnknown_03004824);
                     break;
                 case 1:
                     sub_804AA0C(0);
@@ -3195,7 +3197,7 @@ void sub_804DB84(void)
         DestroySprite(&gSprites[gUnknown_03004828->unk_00b8]);
         FreeSpriteOamMatrix(&gSprites[gUnknown_03004828->unk_00b9]);
         sub_804BA94(gUnknown_020297D8[0], gUnknown_020297D8[1] % 6);
-        gUnknown_03004828->unk_009e = 0xabcd;
+        gUnknown_03004828->linkData[0] = 0xabcd;
         gUnknown_03004828->unk_00bd = 1;
         SetMainCallback2(sub_804DC18);
     }
@@ -3206,3 +3208,20 @@ void sub_804DB84(void)
     BuildOamBuffer();
     UpdatePaletteFade();
 }
+
+void sub_804DC18(void)
+{
+    u8 flag = sub_804B2B0();
+    sub_804D63C();
+    if (!flag && gUnknown_03004828->unk_009c == 1 && gUnknown_03004828->unk_009d == 1)
+    {
+        gUnknown_03004828->linkData[0] = 0xdcba;
+        Trade_SendData(gUnknown_03004828);
+        gUnknown_03004828->unk_009c = 2;
+        gUnknown_03004828->unk_009d = 2;
+    }
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
-- 
cgit v1.2.3


From fac5905a048fd08b5d41ef316d48d6c8d330405e Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 12:37:26 -0400
Subject: sub_804DC88

---
 asm/trade.s | 477 ------------------------------------------------------------
 src/trade.c | 141 +++++++++++++++++-
 2 files changed, 140 insertions(+), 478 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index caadad6ee..4221e3c1b 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -5395,483 +5395,6 @@ _0804DAD0: .4byte gEnemyParty
 
 .section .text.sub_804DB2C
 
-	thumb_func_start sub_804DC88
-sub_804DC88: @ 804DC88
-	push {r4,r5,lr}
-	sub sp, 0x4
-	ldr r1, _0804DCA8 @ =gMain
-	ldr r2, _0804DCAC @ =0x0000043c
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	adds r2, r1, 0
-	cmp r0, 0x65
-	bls _0804DC9C
-	b _0804E11A
-_0804DC9C:
-	lsls r0, 2
-	ldr r1, _0804DCB0 @ =_0804DCB4
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0804DCA8: .4byte gMain
-_0804DCAC: .4byte 0x0000043c
-_0804DCB0: .4byte _0804DCB4
-	.align 2, 0
-_0804DCB4:
-	.4byte _0804DE4C
-	.4byte _0804DE9C
-	.4byte _0804DF14
-	.4byte _0804E11A
-	.4byte _0804DFE0
-	.4byte _0804E078
-	.4byte _0804E0A0
-	.4byte _0804E0BC
-	.4byte _0804E0E4
-	.4byte _0804E10C
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E008
-	.4byte _0804E034
-	.4byte _0804E04C
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804DF54
-	.4byte _0804DF7C
-	.4byte _0804DF9C
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804DEB4
-	.4byte _0804DEF4
-_0804DE4C:
-	ldr r5, _0804DE88 @ =gUnknown_03004828
-	ldr r0, _0804DE8C @ =0x0201f000
-	str r0, [r5]
-	ldr r1, _0804DE90 @ =0x0000043c
-	adds r2, r1
-	ldrb r1, [r2]
-	adds r1, 0x1
-	strb r1, [r2]
-	adds r0, 0x4
-	movs r1, 0x13
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x1D
-	bl ZeroFillWindowRect
-	ldr r4, _0804DE94 @ =gStringVar4
-	ldr r1, _0804DE98 @ =gOtherText_LinkStandby2
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	ldr r1, [r5]
-	adds r0, r1, 0x4
-	adds r1, 0x34
-	ldrb r2, [r1]
-	movs r1, 0xF
-	str r1, [sp]
-	adds r1, r4, 0
-	b _0804DF3E
-	.align 2, 0
-_0804DE88: .4byte gUnknown_03004828
-_0804DE8C: .4byte 0x0201f000
-_0804DE90: .4byte 0x0000043c
-_0804DE94: .4byte gStringVar4
-_0804DE98: .4byte gOtherText_LinkStandby2
-_0804DE9C:
-	bl sub_80084A4
-	ldr r0, _0804DEAC @ =gMain
-	ldr r2, _0804DEB0 @ =0x0000043c
-	adds r0, r2
-	movs r2, 0
-	movs r1, 0x64
-	b _0804DFEE
-	.align 2, 0
-_0804DEAC: .4byte gMain
-_0804DEB0: .4byte 0x0000043c
-_0804DEB4:
-	ldr r0, _0804DEE8 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r3, r0, 0
-	adds r3, 0xC0
-	ldr r0, [r3]
-	adds r0, 0x1
-	str r0, [r3]
-	cmp r0, 0xB4
-	bls _0804DED2
-	ldr r1, _0804DEEC @ =0x0000043c
-	adds r0, r2, r1
-	movs r2, 0
-	movs r1, 0x65
-	strb r1, [r0]
-	str r2, [r3]
-_0804DED2:
-	bl sub_8007ECC
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804DEDE
-	b _0804E11A
-_0804DEDE:
-	ldr r0, _0804DEF0 @ =gMain
-	ldr r2, _0804DEEC @ =0x0000043c
-	adds r0, r2
-	b _0804DF06
-	.align 2, 0
-_0804DEE8: .4byte gUnknown_03004828
-_0804DEEC: .4byte 0x0000043c
-_0804DEF0: .4byte gMain
-_0804DEF4:
-	bl sub_8007ECC
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804DF00
-	b _0804E11A
-_0804DF00:
-	ldr r0, _0804DF0C @ =gMain
-	ldr r1, _0804DF10 @ =0x0000043c
-	adds r0, r1
-_0804DF06:
-	movs r1, 0x2
-	strb r1, [r0]
-	b _0804E11A
-	.align 2, 0
-_0804DF0C: .4byte gMain
-_0804DF10: .4byte 0x0000043c
-_0804DF14:
-	ldr r0, _0804DF48 @ =0x0000043c
-	adds r1, r2, r0
-	movs r0, 0x32
-	strb r0, [r1]
-	ldr r4, _0804DF4C @ =gUnknown_03004828
-	ldr r0, [r4]
-	adds r0, 0x4
-	movs r1, 0x13
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x1D
-	bl ZeroFillWindowRect
-	ldr r2, [r4]
-	adds r0, r2, 0x4
-	ldr r1, _0804DF50 @ =gSystemText_Saving
-	adds r2, 0x34
-	ldrb r2, [r2]
-	movs r3, 0xF
-	str r3, [sp]
-_0804DF3E:
-	movs r3, 0x2
-	bl sub_8003460
-	b _0804E11A
-	.align 2, 0
-_0804DF48: .4byte 0x0000043c
-_0804DF4C: .4byte gUnknown_03004828
-_0804DF50: .4byte gSystemText_Saving
-_0804DF54:
-	bl SetSecretBase2Field_9_AndHideBG
-	movs r0, 0x15
-	bl IncrementGameStat
-	bl sub_8125D80
-	ldr r1, _0804DF74 @ =gMain
-	ldr r2, _0804DF78 @ =0x0000043c
-	adds r1, r2
-	ldrb r0, [r1]
-	adds r0, 0x1
-	movs r2, 0
-	strb r0, [r1]
-	b _0804DFF0
-	.align 2, 0
-_0804DF74: .4byte gMain
-_0804DF78: .4byte 0x0000043c
-_0804DF7C:
-	ldr r0, _0804DF94 @ =gUnknown_03004828
-	ldr r1, [r0]
-	adds r1, 0xC0
-	ldr r0, [r1]
-	adds r0, 0x1
-	str r0, [r1]
-	cmp r0, 0x5
-	beq _0804DF8E
-	b _0804E11A
-_0804DF8E:
-	ldr r0, _0804DF98 @ =0x0000043c
-	adds r1, r2, r0
-	b _0804E0FA
-	.align 2, 0
-_0804DF94: .4byte gUnknown_03004828
-_0804DF98: .4byte 0x0000043c
-_0804DF9C:
-	bl sub_8125DA8
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	beq _0804DFC0
-	bl ClearSecretBase2Field_9_2
-	ldr r0, _0804DFB8 @ =gMain
-	ldr r1, _0804DFBC @ =0x0000043c
-	adds r0, r1
-	movs r1, 0x4
-	strb r1, [r0]
-	b _0804E11A
-	.align 2, 0
-_0804DFB8: .4byte gMain
-_0804DFBC: .4byte 0x0000043c
-_0804DFC0:
-	ldr r0, _0804DFD4 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r0, 0xC0
-	str r1, [r0]
-	ldr r0, _0804DFD8 @ =gMain
-	ldr r2, _0804DFDC @ =0x0000043c
-	adds r0, r2
-	movs r1, 0x33
-	strb r1, [r0]
-	b _0804E11A
-	.align 2, 0
-_0804DFD4: .4byte gUnknown_03004828
-_0804DFD8: .4byte gMain
-_0804DFDC: .4byte 0x0000043c
-_0804DFE0:
-	bl sub_8125DDC
-	ldr r0, _0804DFFC @ =gMain
-	ldr r1, _0804E000 @ =0x0000043c
-	adds r0, r1
-	movs r2, 0
-	movs r1, 0x28
-_0804DFEE:
-	strb r1, [r0]
-_0804DFF0:
-	ldr r0, _0804E004 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r0, 0xC0
-	str r2, [r0]
-	b _0804E11A
-	.align 2, 0
-_0804DFFC: .4byte gMain
-_0804E000: .4byte 0x0000043c
-_0804E004: .4byte gUnknown_03004828
-_0804E008:
-	ldr r0, _0804E02C @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r1, r0, 0
-	adds r1, 0xC0
-	ldr r0, [r1]
-	adds r0, 0x1
-	str r0, [r1]
-	cmp r0, 0x32
-	bhi _0804E01C
-	b _0804E11A
-_0804E01C:
-	movs r0, 0
-	str r0, [r1]
-	ldr r0, _0804E030 @ =0x0000043c
-	adds r1, r2, r0
-	movs r0, 0x29
-	strb r0, [r1]
-	b _0804E11A
-	.align 2, 0
-_0804E02C: .4byte gUnknown_03004828
-_0804E030: .4byte 0x0000043c
-_0804E034:
-	bl sub_80084A4
-	ldr r0, _0804E044 @ =gMain
-	ldr r1, _0804E048 @ =0x0000043c
-	adds r0, r1
-	movs r1, 0x2A
-	strb r1, [r0]
-	b _0804E11A
-	.align 2, 0
-_0804E044: .4byte gMain
-_0804E048: .4byte 0x0000043c
-_0804E04C:
-	bl sub_8007ECC
-	lsls r0, 24
-	cmp r0, 0
-	beq _0804E11A
-	bl sub_8125E04
-	ldr r1, _0804E06C @ =gSoftResetDisabled
-	movs r0, 0
-	strb r0, [r1]
-	ldr r0, _0804E070 @ =gMain
-	ldr r2, _0804E074 @ =0x0000043c
-	adds r0, r2
-	movs r1, 0x5
-	strb r1, [r0]
-	b _0804E11A
-	.align 2, 0
-_0804E06C: .4byte gSoftResetDisabled
-_0804E070: .4byte gMain
-_0804E074: .4byte 0x0000043c
-_0804E078:
-	ldr r0, _0804E098 @ =gUnknown_03004828
-	ldr r1, [r0]
-	adds r1, 0xC0
-	ldr r0, [r1]
-	adds r0, 0x1
-	str r0, [r1]
-	cmp r0, 0x3C
-	bls _0804E11A
-	ldr r0, _0804E09C @ =0x0000043c
-	adds r1, r2, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	bl sub_80084A4
-	b _0804E11A
-	.align 2, 0
-_0804E098: .4byte gUnknown_03004828
-_0804E09C: .4byte 0x0000043c
-_0804E0A0:
-	bl sub_8007ECC
-	lsls r0, 24
-	cmp r0, 0
-	beq _0804E11A
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	b _0804E0F4
-_0804E0BC:
-	ldr r0, _0804E0D8 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0804E11A
-	movs r0, 0x3
-	bl FadeOutBGM
-	ldr r1, _0804E0DC @ =gMain
-	ldr r0, _0804E0E0 @ =0x0000043c
-	adds r1, r0
-	b _0804E0FA
-	.align 2, 0
-_0804E0D8: .4byte gPaletteFade
-_0804E0DC: .4byte gMain
-_0804E0E0: .4byte 0x0000043c
-_0804E0E4:
-	bl IsBGMStopped
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0804E11A
-	bl sub_800832C
-_0804E0F4:
-	ldr r1, _0804E104 @ =gMain
-	ldr r2, _0804E108 @ =0x0000043c
-	adds r1, r2
-_0804E0FA:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _0804E11A
-	.align 2, 0
-_0804E104: .4byte gMain
-_0804E108: .4byte 0x0000043c
-_0804E10C:
-	ldr r0, _0804E13C @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0804E11A
-	ldr r0, _0804E140 @ =sub_804E144
-	bl SetMainCallback2
-_0804E11A:
-	bl HasLinkErrorOccurred
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804E128
-	bl RunTasks
-_0804E128:
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804E13C: .4byte gReceivedRemoteLinkPlayers
-_0804E140: .4byte sub_804E144
-	thumb_func_end sub_804DC88
-
 	thumb_func_start sub_804E144
 sub_804E144: @ 804E144
 	push {lr}
diff --git a/src/trade.c b/src/trade.c
index 2d045d3b5..8eb9983c8 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -25,6 +25,9 @@
 #include "rom_8077ABC.h"
 #include "daycare.h"
 #include "event_data.h"
+#include "strings.h"
+#include "load_save.h"
+#include "save.h"
 #include "trade.h"
 
 #ifdef ENGLISH
@@ -116,7 +119,10 @@ struct UnkStructF {
 };
 
 struct TradeEwramSubstruct2 {
-    /*0x0000*/ u8 filler_0000[0x9c];
+    /*0x0000*/ u8 filler_0000;
+    /*0x0004*/ struct Window window;
+    /*0x0034*/ u8 unk_0034;
+    /*0x0035*/ u8 filler_0035[0x67];
     /*0x009c*/ u8 unk_009c;
     /*0x009d*/ u8 unk_009d;
     /*0x009e*/ u16 linkData[13];
@@ -124,6 +130,7 @@ struct TradeEwramSubstruct2 {
     /*0x00b9*/ u8 unk_00b9;
     /*0x00ba*/ u8 filler_00ba[3];
     /*0x00bd*/ u8 unk_00bd;
+    /*0x00c0*/ u32 unk_00c0;
 };
 
 struct TradeEwramStruct {
@@ -186,6 +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);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -3225,3 +3233,134 @@ void sub_804DC18(void)
     BuildOamBuffer();
     UpdatePaletteFade();
 }
+
+void sub_804DC88(void)
+{
+    switch (gMain.state)
+    {
+        case 0:
+            gUnknown_03004828 = &ewram_2010000.unk_0f000;
+            gMain.state ++;
+            ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19);
+            StringExpandPlaceholders(gStringVar4, gOtherText_LinkStandby2);
+            sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->unk_0034, 2, 15);
+            break;
+        case 1:
+            sub_80084A4();
+            gMain.state = 100;
+            gUnknown_03004828->unk_00c0 = 0;
+            break;
+        case 100:
+            if (++ gUnknown_03004828->unk_00c0 > 180)
+            {
+                gMain.state = 101;
+                gUnknown_03004828->unk_00c0 = 0;
+            }
+            if (sub_8007ECC())
+            {
+                gMain.state = 2;
+            }
+            break;
+        case 101:
+            if (sub_8007ECC())
+            {
+                gMain.state = 2;
+            }
+            break;
+        case 2:
+            gMain.state = 50;
+            ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19);
+            sub_8003460(&gUnknown_03004828->window, gSystemText_Saving, gUnknown_03004828->unk_0034, 2, 15);
+            break;
+        case 50:
+            SetSecretBase2Field_9_AndHideBG();
+            IncrementGameStat(GAME_STAT_POKEMON_TRADES);
+            sub_8125D80();
+            gMain.state ++;
+            gUnknown_03004828->unk_00c0 = 0;
+            break;
+        case 51:
+            if (++ gUnknown_03004828->unk_00c0 == 5)
+            {
+                gMain.state ++;
+            }
+            break;
+        case 52:
+            if (sub_8125DA8())
+            {
+                ClearSecretBase2Field_9_2();
+                gMain.state = 4;
+            }
+            else
+            {
+                gUnknown_03004828->unk_00c0 = 0;
+                gMain.state = 51;
+            }
+            break;
+        case 4:
+            sub_8125DDC();
+            gMain.state = 40;
+            gUnknown_03004828->unk_00c0 = 0;
+            break;
+        case 40:
+            if (++ gUnknown_03004828->unk_00c0 > 50)
+            {
+                gUnknown_03004828->unk_00c0 = 0;
+                gMain.state = 41;
+            }
+            break;
+        case 41:
+            sub_80084A4();
+            gMain.state = 42;
+            break;
+        case 42:
+            if (sub_8007ECC())
+            {
+                sub_8125E04();
+                gSoftResetDisabled = FALSE;
+                gMain.state = 5;
+            }
+            break;
+        case 5:
+            if (++ gUnknown_03004828->unk_00c0 > 60)
+            {
+                gMain.state ++;
+                sub_80084A4();
+            }
+            break;
+        case 6:
+            if (sub_8007ECC())
+            {
+                BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+                gMain.state ++;
+            }
+            break;
+        case 7:
+            if (!gPaletteFade.active)
+            {
+                FadeOutBGM(3);
+                gMain.state ++;
+            }
+            break;
+        case 8:
+            if (IsBGMStopped() == TRUE)
+            {
+                sub_800832C();
+                gMain.state ++;
+            }
+            break;
+        case 9:
+            if (!gReceivedRemoteLinkPlayers)
+            {
+                SetMainCallback2(sub_804E144);
+            }
+            break;
+    }
+    if (!HasLinkErrorOccurred())
+    {
+        RunTasks();
+    }
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
-- 
cgit v1.2.3


From d0e2766ec23f63b1acb90bdaa1757a3c7bc71dd7 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 12:41:15 -0400
Subject: sub_804E144

---
 asm/trade.s | 23 -----------------------
 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();
+}
-- 
cgit v1.2.3


From a94566d512891ab13a218e686f8b0317c4ad7e03 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 12:45:52 -0400
Subject: sub_804E174 and sub_804E1A0

---
 asm/trade.s     | 51 ---------------------------------------------------
 include/trade.h |  1 +
 src/trade.c     | 23 ++++++++++++++++++++++-
 3 files changed, 23 insertions(+), 52 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index d7a33b41b..c95d0feb8 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -5395,57 +5395,6 @@ _0804DAD0: .4byte gEnemyParty
 
 .section .text.sub_804DB2C
 
-	thumb_func_start sub_804E174
-sub_804E174: @ 804E174
-	push {lr}
-	sub sp, 0x4
-	bl ScriptContext2_Enable
-	ldr r0, _0804E19C @ =sub_804E1A0
-	movs r1, 0xA
-	bl CreateTask
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804E19C: .4byte sub_804E1A0
-	thumb_func_end sub_804E174
-
-	thumb_func_start sub_804E1A0
-sub_804E1A0: @ 804E1A0
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _0804E1CC @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0804E1C4
-	ldr r0, _0804E1D0 @ =sub_804B790
-	bl SetMainCallback2
-	ldr r1, _0804E1D4 @ =gFieldCallback
-	ldr r0, _0804E1D8 @ =sub_8080990
-	str r0, [r1]
-	adds r0, r4, 0
-	bl DestroyTask
-_0804E1C4:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804E1CC: .4byte gPaletteFade
-_0804E1D0: .4byte sub_804B790
-_0804E1D4: .4byte gFieldCallback
-_0804E1D8: .4byte sub_8080990
-	thumb_func_end sub_804E1A0
-
 	thumb_func_start sub_804E1DC
 sub_804E1DC: @ 804E1DC
 	push {r4,r5,lr}
diff --git a/include/trade.h b/include/trade.h
index 083fabca7..36561e413 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -8,5 +8,6 @@
 void sub_8047CD8(void);
 u16 sub_804DB2C(void);
 void sub_804DB68(void);
+void sub_804E174(void);
 
 #endif //POKERUBY_TRADE_H
diff --git a/src/trade.c b/src/trade.c
index c29d7558b..940bfc8fc 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -28,6 +28,8 @@
 #include "strings.h"
 #include "load_save.h"
 #include "save.h"
+#include "script.h"
+#include "field_fadetransition.h"
 #include "trade.h"
 
 #ifdef ENGLISH
@@ -35,7 +37,7 @@
 asm(".set sub_804A96C_alt, sub_804A96C");
 #endif
 
-#define Trade_SendData(ptr) SendBlock(bitmask_all_link_players_but_self(), ptr->linkData, 20)
+#define Trade_SendData(ptr) (SendBlock(bitmask_all_link_players_but_self(), ptr->linkData, 20))
 
 struct InGameTrade {
     /*0x00*/ u8 name[11];
@@ -194,6 +196,8 @@ void sub_804A51C(u8, u8, u8, u8, u8, u8);
 /*static*/ void sub_804D63C(void);
 /*static*/ bool8 sub_804B2B0(void);
 static void sub_804E144(void);
+static void sub_804E1A0(u8);
+/*static*/ void sub_804B790(void);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -3374,3 +3378,20 @@ static void sub_804E144(void)
     BuildOamBuffer();
     UpdatePaletteFade();
 }
+
+void sub_804E174(void)
+{
+    ScriptContext2_Enable();
+    CreateTask(sub_804E1A0, 10);
+    BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+}
+
+static void sub_804E1A0(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        SetMainCallback2(sub_804B790);
+        gFieldCallback = sub_8080990;
+        DestroyTask(taskId);
+    }
+}
-- 
cgit v1.2.3


From 7b5d41909bcf86103fe51eea0c1a8370ca4c478e Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 12:50:16 -0400
Subject: sub_804E1DC

---
 asm/trade.s | 41 -----------------------------------------
 src/trade.c | 12 ++++++++++++
 2 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index c95d0feb8..e604ee56b 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -5395,47 +5395,6 @@ _0804DAD0: .4byte gEnemyParty
 
 .section .text.sub_804DB2C
 
-	thumb_func_start sub_804E1DC
-sub_804E1DC: @ 804E1DC
-	push {r4,r5,lr}
-	movs r5, 0
-	movs r4, 0
-_0804E1E2:
-	ldr r0, _0804E220 @ =gUnknown_020297D8
-	ldrb r0, [r0, 0x1]
-	movs r1, 0x6
-	bl __umodsi3
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	muls r0, r1
-	ldr r1, _0804E224 @ =gEnemyParty
-	adds r0, r1
-	adds r1, r4, 0
-	adds r1, 0x43
-	bl GetMonData
-	adds r0, r5, r0
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0xB
-	bls _0804E1E2
-	cmp r5, 0
-	beq _0804E21A
-	ldr r0, _0804E228 @ =0x0000083b
-	bl FlagSet
-_0804E21A:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804E220: .4byte gUnknown_020297D8
-_0804E224: .4byte gEnemyParty
-_0804E228: .4byte 0x0000083b
-	thumb_func_end sub_804E1DC
-
 	thumb_func_start sub_804E22C
 sub_804E22C: @ 804E22C
 	push {r4,lr}
diff --git a/src/trade.c b/src/trade.c
index 940bfc8fc..72f198511 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -3395,3 +3395,15 @@ static void sub_804E1A0(u8 taskId)
         DestroyTask(taskId);
     }
 }
+
+/*static*/ void sub_804E1DC(void)
+{
+    u8 i;
+    u8 numRibbons = 0;
+    for (i = 0; i < 12; i ++)
+    {
+        numRibbons += GetMonData(&gEnemyParty[gUnknown_020297D8[1] % 6], MON_DATA_CHAMPION_RIBBON + i);
+    }
+    if (numRibbons != 0)
+        FlagSet(SYS_RIBBON_GET);
+}
-- 
cgit v1.2.3


From 92f40d920b26a13dfc7a3756382cdf97aff08288 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 13:02:20 -0400
Subject: sub_804E22C

---
 asm/trade.s        | 45 ---------------------------------------------
 include/graphics.h |  3 +++
 include/trade.h    |  1 +
 ld_script.txt      |  1 -
 src/trade.c        | 14 ++++++++++++++
 5 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index e604ee56b..84c50d9a2 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -5393,49 +5393,4 @@ _0804DAC0:
 _0804DAD0: .4byte gEnemyParty
 	thumb_func_end sub_804D948
 
-.section .text.sub_804DB2C
-
-	thumb_func_start sub_804E22C
-sub_804E22C: @ 804E22C
-	push {r4,lr}
-	ldr r0, _0804E26C @ =gUnknown_08D00000
-	movs r1, 0xC0
-	lsls r1, 19
-	bl LZDecompressVram
-	ldr r0, _0804E270 @ =gUnknown_08D00524
-	ldr r4, _0804E274 @ =0x02000000
-	movs r2, 0x80
-	lsls r2, 4
-	adds r1, r4, 0
-	bl CpuSet
-	ldr r1, _0804E278 @ =0x06002800
-	ldr r0, _0804E27C @ =0x040000d4
-	str r4, [r0]
-	str r1, [r0, 0x4]
-	ldr r1, _0804E280 @ =0x80000280
-	str r1, [r0, 0x8]
-	ldr r0, [r0, 0x8]
-	ldr r0, _0804E284 @ =gUnknown_08D004E0
-	movs r1, 0
-	movs r2, 0x20
-	bl LoadCompressedPalette
-	ldr r1, _0804E288 @ =REG_BG1CNT
-	ldr r2, _0804E28C @ =0x00000502
-	adds r0, r2, 0
-	strh r0, [r1]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804E26C: .4byte gUnknown_08D00000
-_0804E270: .4byte gUnknown_08D00524
-_0804E274: .4byte 0x02000000
-_0804E278: .4byte 0x06002800
-_0804E27C: .4byte 0x040000d4
-_0804E280: .4byte 0x80000280
-_0804E284: .4byte gUnknown_08D004E0
-_0804E288: .4byte REG_BG1CNT
-_0804E28C: .4byte 0x00000502
-	thumb_func_end sub_804E22C
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/include/graphics.h b/include/graphics.h
index b196cfe1c..f3a722b40 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2570,4 +2570,7 @@ extern const u16 gUnknown_08EA02C8[];
 extern const u16 gUnknown_08EA0348[];
 extern const u16 gUnknown_08EA15C8[];
 extern const u16 gTradeMonBoxTilemap[];
+extern const u8 gUnknown_08D00000[];
+extern const u16 gUnknown_08D00524[];
+extern const u8 gUnknown_08D004E0[];
 #endif  // GUARD_GRAPHICS_H
diff --git a/include/trade.h b/include/trade.h
index 36561e413..5fa13ad03 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -9,5 +9,6 @@ void sub_8047CD8(void);
 u16 sub_804DB2C(void);
 void sub_804DB68(void);
 void sub_804E174(void);
+void sub_804E22C(void);
 
 #endif //POKERUBY_TRADE_H
diff --git a/ld_script.txt b/ld_script.txt
index ce4090847..6ecf65843 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -81,7 +81,6 @@ SECTIONS {
         src/trade.o(.text);
         asm/trade.o(.text);
         src/trade.o(.text.sub_804DAD4);
-        asm/trade.o(.text.sub_804DB2C);
         src/berry_blender.o(.text);
         src/play_time.o(.text);
         src/new_game.o(.text);
diff --git a/src/trade.c b/src/trade.c
index 72f198511..db49b94e6 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -30,6 +30,7 @@
 #include "save.h"
 #include "script.h"
 #include "field_fadetransition.h"
+#include "decompress.h"
 #include "trade.h"
 
 #ifdef ENGLISH
@@ -3407,3 +3408,16 @@ static void sub_804E1A0(u8 taskId)
     if (numRibbons != 0)
         FlagSet(SYS_RIBBON_GET);
 }
+
+void sub_804E22C(void)
+{
+    const u16 *src;
+    u16 *dest;
+    LZDecompressVram(gUnknown_08D00000, (u8 *)VRAM);
+    CpuCopy16(gUnknown_08D00524, ewram, 0x1000);
+    src = (const u16 *)ewram;
+    dest = (u16 *)(BG_SCREEN_ADDR(5));
+    DmaCopy16(3, src, dest, 0x500)
+    LoadCompressedPalette(gUnknown_08D004E0, 0, 32);
+    REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(5);
+}
-- 
cgit v1.2.3


From 86ac21e417dde4d4f33aff78714648517afc88fc Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 13:36:40 -0400
Subject: sub_804D948

---
 asm/trade.s | 174 ------------------------------------------------------------
 src/trade.c |  72 +++++++++++++++++++++----
 2 files changed, 62 insertions(+), 184 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 84c50d9a2..500906d29 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -5219,178 +5219,4 @@ _0804D940: .4byte gStringVar2
 _0804D944: .4byte gSpeciesNames
 	thumb_func_end sub_804D8E4
 
-	thumb_func_start sub_804D948
-sub_804D948: @ 804D948
-	push {r4-r7,lr}
-	sub sp, 0x38
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r2, r1, 4
-	subs r2, r1
-	lsls r2, 2
-	ldr r1, _0804DAA4 @ =gIngameTrades
-	adds r5, r2, r1
-	movs r1, 0x64
-	muls r0, r1
-	ldr r1, _0804DAA8 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x38
-	bl GetMonData
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	add r4, sp, 0x34
-	movs r0, 0xFE
-	strb r0, [r4]
-	ldr r6, _0804DAAC @ =gEnemyParty
-	ldrh r1, [r5, 0xC]
-	movs r3, 0x1
-	str r3, [sp]
-	ldr r0, [r5, 0x24]
-	str r0, [sp, 0x4]
-	str r3, [sp, 0x8]
-	ldr r0, [r5, 0x18]
-	str r0, [sp, 0xC]
-	adds r0, r6, 0
-	movs r3, 0x20
-	bl CreateMon
-	adds r2, r5, 0
-	adds r2, 0xE
-	adds r0, r6, 0
-	movs r1, 0x27
-	bl SetMonData
-	adds r2, r5, 0
-	adds r2, 0xF
-	adds r0, r6, 0
-	movs r1, 0x28
-	bl SetMonData
-	adds r2, r5, 0
-	adds r2, 0x10
-	adds r0, r6, 0
-	movs r1, 0x29
-	bl SetMonData
-	adds r2, r5, 0
-	adds r2, 0x11
-	adds r0, r6, 0
-	movs r1, 0x2A
-	bl SetMonData
-	adds r2, r5, 0
-	adds r2, 0x12
-	adds r0, r6, 0
-	movs r1, 0x2B
-	bl SetMonData
-	adds r2, r5, 0
-	adds r2, 0x13
-	adds r0, r6, 0
-	movs r1, 0x2C
-	bl SetMonData
-	adds r0, r6, 0
-	movs r1, 0x2
-	adds r2, r5, 0
-	bl SetMonData
-	adds r2, r5, 0
-	adds r2, 0x2B
-	adds r0, r6, 0
-	movs r1, 0x7
-	bl SetMonData
-	adds r2, r5, 0
-	adds r2, 0x36
-	adds r0, r6, 0
-	movs r1, 0x31
-	bl SetMonData
-	adds r2, r5, 0
-	adds r2, 0x14
-	adds r0, r6, 0
-	movs r1, 0x2E
-	bl SetMonData
-	adds r2, r5, 0
-	adds r2, 0x1D
-	adds r0, r6, 0
-	movs r1, 0x17
-	bl SetMonData
-	adds r2, r5, 0
-	adds r2, 0x1E
-	adds r0, r6, 0
-	movs r1, 0x18
-	bl SetMonData
-	adds r2, r5, 0
-	adds r2, 0x1C
-	adds r0, r6, 0
-	movs r1, 0x16
-	bl SetMonData
-	adds r2, r5, 0
-	adds r2, 0x1F
-	adds r0, r6, 0
-	movs r1, 0x21
-	bl SetMonData
-	adds r2, r5, 0
-	adds r2, 0x20
-	adds r0, r6, 0
-	movs r1, 0x2F
-	bl SetMonData
-	adds r2, r5, 0
-	adds r2, 0x37
-	adds r0, r6, 0
-	movs r1, 0x30
-	bl SetMonData
-	adds r0, r6, 0
-	movs r1, 0x23
-	adds r2, r4, 0
-	bl SetMonData
-	mov r4, sp
-	adds r4, 0x35
-	movs r0, 0
-	strb r0, [r4]
-	ldrh r0, [r5, 0x28]
-	cmp r0, 0
-	beq _0804DAC0
-	bl ItemIsMail
-	lsls r0, 24
-	cmp r0, 0
-	beq _0804DAB4
-	add r0, sp, 0x10
-	adds r1, r5, 0
-	bl sub_804DAD4
-	ldr r0, _0804DAB0 @ =gUnknown_02029700
-	add r1, sp, 0x10
-	ldm r1!, {r2,r3,r7}
-	stm r0!, {r2,r3,r7}
-	ldm r1!, {r2,r3,r7}
-	stm r0!, {r2,r3,r7}
-	ldm r1!, {r2,r3,r7}
-	stm r0!, {r2,r3,r7}
-	adds r0, r6, 0
-	movs r1, 0x40
-	adds r2, r4, 0
-	bl SetMonData
-	adds r2, r5, 0
-	adds r2, 0x28
-	adds r0, r6, 0
-	movs r1, 0xC
-	bl SetMonData
-	b _0804DAC0
-	.align 2, 0
-_0804DAA4: .4byte gIngameTrades
-_0804DAA8: .4byte gPlayerParty
-_0804DAAC: .4byte gEnemyParty
-_0804DAB0: .4byte gUnknown_02029700
-_0804DAB4:
-	adds r2, r5, 0
-	adds r2, 0x28
-	adds r0, r6, 0
-	movs r1, 0xC
-	bl SetMonData
-_0804DAC0:
-	ldr r0, _0804DAD0 @ =gEnemyParty
-	bl CalculateMonStats
-	add sp, 0x38
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804DAD0: .4byte gEnemyParty
-	thumb_func_end sub_804D948
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index db49b94e6..d0be1b48b 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -31,6 +31,7 @@
 #include "script.h"
 #include "field_fadetransition.h"
 #include "decompress.h"
+#include "mail_data.h"
 #include "trade.h"
 
 #ifdef ENGLISH
@@ -199,6 +200,7 @@ void sub_804A51C(u8, u8, u8, u8, u8, u8);
 static void sub_804E144(void);
 static void sub_804E1A0(u8);
 /*static*/ void sub_804B790(void);
+static void sub_804DAD4(struct MailStruct *, const struct InGameTrade *);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -3169,26 +3171,76 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
-/*static*/ void sub_804DAD4(struct UnkStructC *arg0, struct InGameTrade *trade) {
+void sub_804D948(u8 whichPlayerMon, u8 whichInGameTrade)
+{
+    const struct InGameTrade *inGameTrade = &gIngameTrades[whichInGameTrade];
+    u8 level = GetMonData(&gPlayerParty[whichPlayerMon], MON_DATA_LEVEL);
+
+    struct MailStruct mail;
+    u8 metLocation = 0xFE;
+    u8 isMail;
+    u8 *item;
+    struct Pokemon *pokemon = &gEnemyParty[0];
+
+    CreateMon(pokemon, inGameTrade->species, level, 32, TRUE, inGameTrade->personality, TRUE, inGameTrade->otId);
+
+    SetMonData(pokemon, MON_DATA_HP_IV, &inGameTrade->ivs[0]);
+    SetMonData(pokemon, MON_DATA_ATK_IV, &inGameTrade->ivs[1]);
+    SetMonData(pokemon, MON_DATA_DEF_IV, &inGameTrade->ivs[2]);
+    SetMonData(pokemon, MON_DATA_SPD_IV, &inGameTrade->ivs[3]);
+    SetMonData(pokemon, MON_DATA_SPATK_IV, &inGameTrade->ivs[4]);
+    SetMonData(pokemon, MON_DATA_SPDEF_IV, &inGameTrade->ivs[5]);
+    SetMonData(pokemon, MON_DATA_NICKNAME, inGameTrade->name);
+    SetMonData(pokemon, MON_DATA_OT_NAME, inGameTrade->otName);
+    SetMonData(pokemon, MON_DATA_OT_GENDER, &inGameTrade->otGender);
+    SetMonData(pokemon, MON_DATA_ALT_ABILITY, &inGameTrade->secondAbility);
+    SetMonData(pokemon, MON_DATA_BEAUTY, &inGameTrade->stats[1]);
+    SetMonData(pokemon, MON_DATA_CUTE, &inGameTrade->stats[2]);
+    SetMonData(pokemon, MON_DATA_COOL, &inGameTrade->stats[0]);
+    SetMonData(pokemon, MON_DATA_SMART, &inGameTrade->stats[3]);
+    SetMonData(pokemon, MON_DATA_TOUGH, &inGameTrade->stats[4]);
+    SetMonData(pokemon, MON_DATA_SHEEN, &inGameTrade->sheen);
+    SetMonData(pokemon, MON_DATA_MET_LOCATION, &metLocation);
+
+    isMail = FALSE;
+    if (inGameTrade->heldItem != ITEM_NONE)
+    {
+        if (ItemIsMail(inGameTrade->heldItem))
+        {
+            sub_804DAD4(&mail, inGameTrade);
+            gUnknown_02029700[0] = mail;
+            SetMonData(pokemon, MON_DATA_MAIL, &isMail);
+            SetMonData(pokemon, MON_DATA_HELD_ITEM, (u8 *)&inGameTrade->heldItem);
+        }
+        else
+        {
+            item = (u8 *)&inGameTrade->heldItem;
+            SetMonData(pokemon, MON_DATA_HELD_ITEM, item);
+        }
+    }
+    CalculateMonStats(&gEnemyParty[0]);
+}
+
+static void sub_804DAD4(struct MailStruct *mail, const struct InGameTrade *trade) {
     s32 i;
 
     for (i = 0; i < 9; i++)
     {
-        arg0->words[i] = gIngameTradeMail[trade->mailNum][i];
+        mail->words[i] = gIngameTradeMail[trade->mailNum][i];
     }
 
-    StringCopy(arg0->string, trade->otName);
+    StringCopy(mail->playerName, trade->otName);
 
 #if GERMAN
-    PadNameString(arg0->string, CHAR_SPACE);
+    PadNameString(mail->string, CHAR_SPACE);
 #endif
 
-    arg0->otId[0] = trade->otId >> 24;
-    arg0->otId[1] = trade->otId >> 16;
-    arg0->otId[2] = trade->otId >> 8;
-    arg0->otId[3] = trade->otId;
-    arg0->species = trade->species;
-    arg0->heldItem = trade->heldItem;
+    mail->trainerId[0] = trade->otId >> 24;
+    mail->trainerId[1] = trade->otId >> 16;
+    mail->trainerId[2] = trade->otId >> 8;
+    mail->trainerId[3] = trade->otId;
+    mail->species = trade->species;
+    mail->itemId = trade->heldItem;
 }
 
 u16 sub_804DB2C(void)
-- 
cgit v1.2.3


From 63e96ae515a35a184341965fd30a8bc48e434d81 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 13:48:45 -0400
Subject: sub_804D8E4

---
 asm/trade.s | 44 --------------------------------------------
 src/trade.c | 13 +++++++++++--
 2 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 500906d29..7e341c9a4 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -5175,48 +5175,4 @@ _0804D8DC: .4byte gSpeciesNames
 _0804D8E0: .4byte gStringVar2
 	thumb_func_end sub_804D89C
 
-	thumb_func_start sub_804D8E4
-sub_804D8E4: @ 804D8E4
-	push {r4,lr}
-	sub sp, 0x20
-	ldr r0, _0804D92C @ =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	lsls r4, r0, 4
-	subs r4, r0
-	lsls r4, 2
-	ldr r0, _0804D930 @ =gIngameTrades
-	adds r4, r0
-	ldr r0, _0804D934 @ =gSpecialVar_0x8005
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _0804D938 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x2
-	mov r2, sp
-	bl GetMonData
-	ldr r0, _0804D93C @ =gStringVar1
-	mov r1, sp
-	bl StringCopy10
-	ldr r0, _0804D940 @ =gStringVar2
-	ldrh r2, [r4, 0xC]
-	movs r1, 0xB
-	muls r1, r2
-	ldr r2, _0804D944 @ =gSpeciesNames
-	adds r1, r2
-	bl StringCopy
-	add sp, 0x20
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804D92C: .4byte gSpecialVar_0x8004
-_0804D930: .4byte gIngameTrades
-_0804D934: .4byte gSpecialVar_0x8005
-_0804D938: .4byte gPlayerParty
-_0804D93C: .4byte gStringVar1
-_0804D940: .4byte gStringVar2
-_0804D944: .4byte gSpeciesNames
-	thumb_func_end sub_804D8E4
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index d0be1b48b..592b3f3e8 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -190,7 +190,7 @@ void sub_804A33C(u8 *, u8, u8);
 static
 #endif
 void sub_804A51C(u8, u8, u8, u8, u8, u8);
-/*static*/ void sub_804D948(u8, u8);
+
 /*static*/ void sub_804BA94(u8, u8);
 /*static*/ bool8 sub_804C29C(void);
 /*static*/ void sub_804DC18(void);
@@ -3171,7 +3171,16 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
-void sub_804D948(u8 whichPlayerMon, u8 whichInGameTrade)
+/*static*/ void sub_804D8E4(void)
+{
+    u8 nickname[32];
+    const struct InGameTrade *inGameTrade = &gIngameTrades[gSpecialVar_0x8004];
+    GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_NICKNAME, nickname);
+    StringCopy10(gStringVar1, nickname);
+    StringCopy(gStringVar2, gSpeciesNames[inGameTrade->species]);
+}
+
+static void sub_804D948(u8 whichPlayerMon, u8 whichInGameTrade)
 {
     const struct InGameTrade *inGameTrade = &gIngameTrades[whichInGameTrade];
     u8 level = GetMonData(&gPlayerParty[whichPlayerMon], MON_DATA_LEVEL);
-- 
cgit v1.2.3


From 1512aee2335dc7f47a4cbb822791f27351b6f1ef Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 14:08:51 -0400
Subject: sub_804D89C

---
 asm/trade.s     | 34 ----------------------------------
 include/trade.h |  1 +
 src/trade.c     |  8 ++++++++
 3 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 7e341c9a4..ac7baa083 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -5141,38 +5141,4 @@ _0804D894: .4byte gTradeBallVerticalVelocityTable
 _0804D898: .4byte SpriteCallbackDummy
 	thumb_func_end sub_804D80C
 
-	thumb_func_start sub_804D89C
-sub_804D89C: @ 804D89C
-	push {r4-r6,lr}
-	ldr r0, _0804D8D0 @ =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	lsls r4, r0, 4
-	subs r4, r0
-	lsls r4, 2
-	ldr r0, _0804D8D4 @ =gIngameTrades
-	adds r4, r0
-	ldr r0, _0804D8D8 @ =gStringVar1
-	ldrh r1, [r4, 0x38]
-	movs r6, 0xB
-	muls r1, r6
-	ldr r5, _0804D8DC @ =gSpeciesNames
-	adds r1, r5
-	bl StringCopy
-	ldr r0, _0804D8E0 @ =gStringVar2
-	ldrh r1, [r4, 0xC]
-	muls r1, r6
-	adds r1, r5
-	bl StringCopy
-	ldrh r0, [r4, 0x38]
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0804D8D0: .4byte gSpecialVar_0x8004
-_0804D8D4: .4byte gIngameTrades
-_0804D8D8: .4byte gStringVar1
-_0804D8DC: .4byte gSpeciesNames
-_0804D8E0: .4byte gStringVar2
-	thumb_func_end sub_804D89C
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/include/trade.h b/include/trade.h
index 5fa13ad03..909d17dab 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -10,5 +10,6 @@ u16 sub_804DB2C(void);
 void sub_804DB68(void);
 void sub_804E174(void);
 void sub_804E22C(void);
+u16 sub_804D89C(void);
 
 #endif //POKERUBY_TRADE_H
diff --git a/src/trade.c b/src/trade.c
index 592b3f3e8..960a1b6bc 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -3171,6 +3171,14 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+u16 sub_804D89C(void)
+{
+    const struct InGameTrade *inGameTrade = &gIngameTrades[gSpecialVar_0x8004];
+    StringCopy(gStringVar1, gSpeciesNames[inGameTrade->playerSpecies]);
+    StringCopy(gStringVar2, gSpeciesNames[inGameTrade->species]);
+    return inGameTrade->playerSpecies;
+}
+
 /*static*/ void sub_804D8E4(void)
 {
     u8 nickname[32];
-- 
cgit v1.2.3


From 168cfdab081db37a7b27ed1a2dee88983c84e13b Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 14:19:14 -0400
Subject: sub_804D80C

---
 asm/trade.s | 75 -------------------------------------------------------------
 src/trade.c | 25 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 75 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index ac7baa083..dcbfa8fdc 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -5066,79 +5066,4 @@ _0804D804: .4byte gTradeBallVerticalVelocityTable
 _0804D808: .4byte gUnknown_03004828
 	thumb_func_end sub_804D7AC
 
-	thumb_func_start sub_804D80C
-sub_804D80C: @ 804D80C
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r2, [r4, 0x32]
-	movs r1, 0x32
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _0804D83C
-	ldrh r0, [r4, 0x22]
-	adds r0, 0x4
-	strh r0, [r4, 0x22]
-	lsls r0, 16
-	asrs r0, 16
-	movs r3, 0x34
-	ldrsh r1, [r4, r3]
-	cmp r0, r1
-	ble _0804D88C
-	adds r0, r2, 0x1
-	strh r0, [r4, 0x32]
-	movs r0, 0x16
-	strh r0, [r4, 0x2E]
-	movs r0, 0x38
-	bl PlaySE
-	b _0804D88C
-_0804D83C:
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x42
-	bne _0804D84A
-	movs r0, 0x39
-	bl PlaySE
-_0804D84A:
-	movs r2, 0x2E
-	ldrsh r0, [r4, r2]
-	cmp r0, 0x5C
-	bne _0804D858
-	movs r0, 0x3A
-	bl PlaySE
-_0804D858:
-	movs r3, 0x2E
-	ldrsh r0, [r4, r3]
-	cmp r0, 0x6B
-	bne _0804D866
-	movs r0, 0x3B
-	bl PlaySE
-_0804D866:
-	ldr r1, _0804D894 @ =gTradeBallVerticalVelocityTable
-	movs r2, 0x2E
-	ldrsh r0, [r4, r2]
-	adds r0, r1
-	ldrb r0, [r0]
-	lsls r0, 24
-	asrs r0, 24
-	ldrh r3, [r4, 0x26]
-	adds r0, r3
-	strh r0, [r4, 0x26]
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x6C
-	bne _0804D88C
-	ldr r0, _0804D898 @ =SpriteCallbackDummy
-	str r0, [r4, 0x1C]
-_0804D88C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804D894: .4byte gTradeBallVerticalVelocityTable
-_0804D898: .4byte SpriteCallbackDummy
-	thumb_func_end sub_804D80C
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index 960a1b6bc..efafe278c 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -3171,6 +3171,31 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804D80C(struct Sprite *sprite)
+{
+    if (sprite->data2 == 0)
+    {
+        if ((sprite->pos1.y += 4) > sprite->data3)
+        {
+            sprite->data2 ++;
+            sprite->data0 = 0x16;
+            PlaySE(SE_KON);
+        }
+    }
+    else
+    {
+        if (sprite->data0 == 0x42)
+            PlaySE(SE_KON2);
+        if (sprite->data0 == 0x5c)
+            PlaySE(SE_KON3);
+        if (sprite->data0 == 0x6b)
+            PlaySE(SE_KON4);
+        sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data0];
+        if (++sprite->data0 == 0x6c)
+            sprite->callback = SpriteCallbackDummy;
+    }
+}
+
 u16 sub_804D89C(void)
 {
     const struct InGameTrade *inGameTrade = &gIngameTrades[gSpecialVar_0x8004];
-- 
cgit v1.2.3


From 59574c5ab2c210c7d6158675c8cbe4fefda3ae81 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 14:27:41 -0400
Subject: sub_804D7AC

---
 asm/trade.s | 51 ---------------------------------------------------
 src/trade.c | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 51 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index dcbfa8fdc..fe9e054f3 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -5015,55 +5015,4 @@ _0804D7A4: .4byte sub_804D7AC
 _0804D7A8: .4byte 0x0000ffff
 	thumb_func_end sub_804D738
 
-	thumb_func_start sub_804D7AC
-sub_804D7AC: @ 804D7AC
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x30
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x14
-	bne _0804D7C0
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl StartSpriteAffineAnim
-_0804D7C0:
-	ldrh r0, [r4, 0x30]
-	adds r0, 0x1
-	strh r0, [r4, 0x30]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x14
-	ble _0804D7FE
-	ldr r1, _0804D804 @ =gTradeBallVerticalVelocityTable
-	movs r2, 0x2E
-	ldrsh r0, [r4, r2]
-	adds r0, r1
-	movs r1, 0
-	ldrsb r1, [r0, r1]
-	ldrh r0, [r4, 0x26]
-	subs r0, r1
-	strh r0, [r4, 0x26]
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x17
-	bne _0804D7FE
-	adds r0, r4, 0
-	bl DestroySprite
-	ldr r0, _0804D808 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r0, 0xC4
-	movs r1, 0xE
-	strh r1, [r0]
-_0804D7FE:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804D804: .4byte gTradeBallVerticalVelocityTable
-_0804D808: .4byte gUnknown_03004828
-	thumb_func_end sub_804D7AC
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index efafe278c..f09c077d6 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -135,6 +135,7 @@ struct TradeEwramSubstruct2 {
     /*0x00ba*/ u8 filler_00ba[3];
     /*0x00bd*/ u8 unk_00bd;
     /*0x00c0*/ u32 unk_00c0;
+    /*0x00c4*/ u16 unk_00c4;
 };
 
 struct TradeEwramStruct {
@@ -3171,6 +3172,21 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804D7AC(struct Sprite *sprite)
+{
+    if (sprite->data1 == 20)
+        StartSpriteAffineAnim(sprite, 1);
+    if (++ sprite->data1 > 20)
+    {
+        sprite->pos2.y -= gTradeBallVerticalVelocityTable[sprite->data0];
+        if (++ sprite->data0 == 23)
+        {
+            DestroySprite(sprite);
+            gUnknown_03004828->unk_00c4 = 14;
+        }
+    }
+}
+
 void sub_804D80C(struct Sprite *sprite)
 {
     if (sprite->data2 == 0)
-- 
cgit v1.2.3


From fc135f6e97ff780f1aba4c5ce8d22f450a5cf5c4 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 14:43:52 -0400
Subject: sub_804D738

---
 asm/trade.s | 58 ----------------------------------------------------------
 src/trade.c | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 59 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index fe9e054f3..8938a8ff9 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -4957,62 +4957,4 @@ _0804D72E:
 _0804D734: .4byte SpriteCallbackDummy
 	thumb_func_end sub_804D6BC
 
-	thumb_func_start sub_804D738
-sub_804D738: @ 804D738
-	push {r4,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	ldr r1, _0804D7A0 @ =gTradeBallVerticalVelocityTable
-	movs r2, 0x2E
-	ldrsh r0, [r4, r2]
-	adds r0, r1
-	ldrb r0, [r0]
-	lsls r0, 24
-	asrs r0, 24
-	ldrh r1, [r4, 0x26]
-	adds r0, r1
-	strh r0, [r4, 0x26]
-	movs r2, 0x2E
-	ldrsh r0, [r4, r2]
-	cmp r0, 0x16
-	bne _0804D760
-	movs r0, 0x38
-	bl PlaySE
-_0804D760:
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x2C
-	bne _0804D796
-	movs r0, 0x8C
-	bl PlaySE
-	ldr r0, _0804D7A4 @ =sub_804D7AC
-	str r0, [r4, 0x1C]
-	movs r0, 0
-	strh r0, [r4, 0x2E]
-	ldrb r1, [r4, 0x5]
-	lsrs r1, 4
-	adds r1, 0x10
-	movs r0, 0x1
-	lsls r0, r1
-	movs r1, 0x1
-	negs r1, r1
-	ldr r2, _0804D7A8 @ =0x0000ffff
-	str r2, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-_0804D796:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804D7A0: .4byte gTradeBallVerticalVelocityTable
-_0804D7A4: .4byte sub_804D7AC
-_0804D7A8: .4byte 0x0000ffff
-	thumb_func_end sub_804D738
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index f09c077d6..f48a5d902 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -191,7 +191,7 @@ void sub_804A33C(u8 *, u8, u8);
 static
 #endif
 void sub_804A51C(u8, u8, u8, u8, u8, u8);
-
+static void sub_804D7AC(struct Sprite *);
 /*static*/ void sub_804BA94(u8, u8);
 /*static*/ bool8 sub_804C29C(void);
 /*static*/ void sub_804DC18(void);
@@ -3172,6 +3172,20 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804D738(struct Sprite *sprite)
+{
+    sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data0];
+    if (sprite->data0 == 22)
+        PlaySE(SE_KON);
+    if (++ sprite->data0 == 44)
+    {
+        PlaySE(SE_W025);
+        sprite->callback = sub_804D7AC;
+        sprite->data0 = 0;
+        BeginNormalPaletteFade(1 << (16 + sprite->oam.paletteNum), -1, 0, 16, -1);
+    }
+}
+
 void sub_804D7AC(struct Sprite *sprite)
 {
     if (sprite->data1 == 20)
-- 
cgit v1.2.3


From c3c645ceac878cf7f5c1a3d47b01770bb61cfe19 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 15:02:47 -0400
Subject: sub_804D6BC

---
 asm/trade.s | 66 -------------------------------------------------------------
 src/trade.c | 21 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 66 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 8938a8ff9..40cbc0ac6 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -4891,70 +4891,4 @@ _0804D6B4: .4byte 0x0000abcd
 _0804D6B8: .4byte gUnknown_03004828
 	thumb_func_end sub_804D63C
 
-	thumb_func_start sub_804D6BC
-sub_804D6BC: @ 804D6BC
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r5, r1]
-	movs r1, 0xA
-	bl __divsi3
-	ldrh r4, [r5, 0x22]
-	adds r4, r0
-	strh r4, [r5, 0x22]
-	ldrh r0, [r5, 0x30]
-	ldrh r2, [r5, 0x38]
-	adds r0, r2
-	strh r0, [r5, 0x38]
-	movs r1, 0x38
-	ldrsh r0, [r5, r1]
-	movs r1, 0xA
-	bl __divsi3
-	strh r0, [r5, 0x20]
-	lsls r4, 16
-	asrs r4, 16
-	cmp r4, 0x4C
-	ble _0804D70A
-	movs r0, 0x4C
-	strh r0, [r5, 0x22]
-	movs r2, 0x2E
-	ldrsh r1, [r5, r2]
-	movs r2, 0x32
-	ldrsh r0, [r5, r2]
-	muls r0, r1
-	negs r0, r0
-	movs r1, 0x64
-	bl __divsi3
-	strh r0, [r5, 0x2E]
-	ldrh r0, [r5, 0x34]
-	adds r0, 0x1
-	strh r0, [r5, 0x34]
-_0804D70A:
-	movs r1, 0x20
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x78
-	bne _0804D716
-	movs r0, 0
-	strh r0, [r5, 0x30]
-_0804D716:
-	ldrh r0, [r5, 0x36]
-	ldrh r2, [r5, 0x2E]
-	adds r0, r2
-	strh r0, [r5, 0x2E]
-	movs r1, 0x34
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x4
-	bne _0804D72E
-	movs r0, 0x1
-	strh r0, [r5, 0x3C]
-	ldr r0, _0804D734 @ =SpriteCallbackDummy
-	str r0, [r5, 0x1C]
-_0804D72E:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804D734: .4byte SpriteCallbackDummy
-	thumb_func_end sub_804D6BC
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index f48a5d902..84640fbf0 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -3172,6 +3172,27 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804D6BC(struct Sprite *sprite)
+{
+    sprite->pos1.y += sprite->data0 / 10;
+    sprite->data5 += sprite->data1;
+    sprite->pos1.x = sprite->data5 / 10;
+    if (sprite->pos1.y > 0x4c)
+    {
+        sprite->pos1.y = 0x4c;
+        sprite->data0 = -(sprite->data0 * sprite->data2) / 100;
+        sprite->data3 ++;
+    }
+    if (sprite->pos1.x == 0x78)
+        sprite->data1 = 0;
+    sprite->data0 += sprite->data4;
+    if (sprite->data3 == 4)
+    {
+        sprite->data7 = 1;
+        sprite->callback = SpriteCallbackDummy;
+    }
+}
+
 void sub_804D738(struct Sprite *sprite)
 {
     sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data0];
-- 
cgit v1.2.3


From 5a993f4acc8e10c75c563cfbbdd21d59df0dd0b9 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 15:32:51 -0400
Subject: sub_804D63C

---
 asm/trade.s | 64 -------------------------------------------------------------
 src/trade.c | 29 +++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 65 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 40cbc0ac6..670866401 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -4827,68 +4827,4 @@ _0804D622:
 _0804D638: .4byte gUnknown_020297D8
 	thumb_func_end sub_804D588
 
-	thumb_func_start sub_804D63C
-sub_804D63C: @ 804D63C
-	push {r4-r6,lr}
-	bl sub_804B2B0
-	bl GetBlockReceivedStatus
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r6, 0x1
-	adds r0, r5, 0
-	ands r0, r6
-	cmp r0, 0
-	beq _0804D67A
-	ldr r4, _0804D6A8 @ =gBlockRecvBuffer
-	ldrh r1, [r4]
-	ldr r0, _0804D6AC @ =0x0000dcba
-	cmp r1, r0
-	bne _0804D664
-	ldr r0, _0804D6B0 @ =sub_804D588
-	bl SetMainCallback2
-_0804D664:
-	ldrh r1, [r4]
-	ldr r0, _0804D6B4 @ =0x0000abcd
-	cmp r1, r0
-	bne _0804D674
-	ldr r0, _0804D6B8 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r0, 0x9C
-	strb r6, [r0]
-_0804D674:
-	movs r0, 0
-	bl ResetBlockReceivedFlag
-_0804D67A:
-	movs r0, 0x2
-	ands r0, r5
-	cmp r0, 0
-	beq _0804D6A2
-	ldr r0, _0804D6A8 @ =gBlockRecvBuffer
-	movs r1, 0x80
-	lsls r1, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	ldr r0, _0804D6B4 @ =0x0000abcd
-	cmp r1, r0
-	bne _0804D69C
-	ldr r0, _0804D6B8 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r0, 0x9D
-	movs r1, 0x1
-	strb r1, [r0]
-_0804D69C:
-	movs r0, 0x1
-	bl ResetBlockReceivedFlag
-_0804D6A2:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804D6A8: .4byte gBlockRecvBuffer
-_0804D6AC: .4byte 0x0000dcba
-_0804D6B0: .4byte sub_804D588
-_0804D6B4: .4byte 0x0000abcd
-_0804D6B8: .4byte gUnknown_03004828
-	thumb_func_end sub_804D63C
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index 84640fbf0..fc15da7f8 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -196,12 +196,12 @@ static void sub_804D7AC(struct Sprite *);
 /*static*/ bool8 sub_804C29C(void);
 /*static*/ void sub_804DC18(void);
 /*static*/ void sub_804BB78(void);
-/*static*/ void sub_804D63C(void);
 /*static*/ bool8 sub_804B2B0(void);
 static void sub_804E144(void);
 static void sub_804E1A0(u8);
 /*static*/ void sub_804B790(void);
 static void sub_804DAD4(struct MailStruct *, const struct InGameTrade *);
+void sub_804D588(void);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -3172,6 +3172,33 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+static void sub_804D63C(void)
+{
+    u8 blockReceivedStatus;
+    sub_804B2B0();
+    blockReceivedStatus = GetBlockReceivedStatus();
+    if (blockReceivedStatus & 0x01)
+    {
+        if (gBlockRecvBuffer[0][0] == 0xdcba)
+        {
+            SetMainCallback2(sub_804D588);
+        }
+        if (gBlockRecvBuffer[0][0] == 0xabcd)
+        {
+            gUnknown_03004828->unk_009c = 1;
+        }
+        ResetBlockReceivedFlag(0);
+    }
+    if (blockReceivedStatus & 0x02)
+    {
+        if (gBlockRecvBuffer[1][0] == 0xabcd)
+        {
+            gUnknown_03004828->unk_009d = 1;
+        }
+        ResetBlockReceivedFlag(1);
+    }
+}
+
 void sub_804D6BC(struct Sprite *sprite)
 {
     sprite->pos1.y += sprite->data0 / 10;
-- 
cgit v1.2.3


From 0c7472075bbf318711e5d7c84df17796af0ec0d5 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 3 Sep 2017 16:08:51 -0400
Subject: sub_804D588

---
 asm/trade.s               | 87 -----------------------------------------------
 include/evolution_scene.h | 12 +++++++
 include/pokemon.h         |  1 +
 src/trade.c               | 30 +++++++++++++++-
 4 files changed, 42 insertions(+), 88 deletions(-)
 create mode 100644 include/evolution_scene.h

diff --git a/asm/trade.s b/asm/trade.s
index 670866401..8906de1bb 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -4740,91 +4740,4 @@ _0804D580: .4byte gPaletteFade
 _0804D584: .4byte c2_exit_to_overworld_2_switch
 	thumb_func_end sub_804C29C
 
-	thumb_func_start sub_804D588
-sub_804D588: @ 804D588
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	ldr r0, _0804D5A0 @ =gMain
-	ldr r2, _0804D5A4 @ =0x0000043c
-	adds r1, r0, r2
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _0804D5A8
-	cmp r0, 0x4
-	beq _0804D5B8
-	b _0804D614
-	.align 2, 0
-_0804D5A0: .4byte gMain
-_0804D5A4: .4byte 0x0000043c
-_0804D5A8:
-	movs r0, 0x4
-	strb r0, [r1]
-	ldr r1, _0804D5B4 @ =gSoftResetDisabled
-	movs r0, 0x1
-	b _0804D612
-	.align 2, 0
-_0804D5B4: .4byte gSoftResetDisabled
-_0804D5B8:
-	ldr r0, _0804D5F4 @ =gUnknown_03005E94
-	ldr r1, _0804D5F8 @ =sub_804DC88
-	mov r8, r1
-	str r1, [r0]
-	ldr r7, _0804D5FC @ =gUnknown_020297D8
-	ldrb r0, [r7]
-	movs r6, 0x64
-	muls r0, r6
-	ldr r5, _0804D600 @ =gPlayerParty
-	adds r0, r5
-	movs r1, 0x1
-	movs r2, 0
-	bl GetEvolutionTargetSpecies
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0
-	beq _0804D608
-	ldrb r3, [r7]
-	adds r0, r3, 0
-	muls r0, r6
-	adds r0, r5
-	ldr r1, _0804D604 @ =gUnknown_03004828
-	ldr r1, [r1]
-	adds r1, 0xB9
-	ldrb r2, [r1]
-	adds r1, r4, 0
-	bl TradeEvolutionScene
-	b _0804D60E
-	.align 2, 0
-_0804D5F4: .4byte gUnknown_03005E94
-_0804D5F8: .4byte sub_804DC88
-_0804D5FC: .4byte gUnknown_020297D8
-_0804D600: .4byte gPlayerParty
-_0804D604: .4byte gUnknown_03004828
-_0804D608:
-	mov r0, r8
-	bl SetMainCallback2
-_0804D60E:
-	ldr r1, _0804D638 @ =gUnknown_020297D8
-	movs r0, 0xFF
-_0804D612:
-	strb r0, [r1]
-_0804D614:
-	bl HasLinkErrorOccurred
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804D622
-	bl RunTasks
-_0804D622:
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804D638: .4byte gUnknown_020297D8
-	thumb_func_end sub_804D588
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/include/evolution_scene.h b/include/evolution_scene.h
new file mode 100644
index 000000000..ec78cb9ad
--- /dev/null
+++ b/include/evolution_scene.h
@@ -0,0 +1,12 @@
+//
+// Created by Scott Norton on 9/3/17.
+//
+
+#ifndef POKERUBY_EVOLUTION_SCENE_H
+#define POKERUBY_EVOLUTION_SCENE_H
+
+extern MainCallback gUnknown_03005E94;
+
+void TradeEvolutionScene(struct Pokemon *, u16, u8, u8);
+
+#endif //POKERUBY_EVOLUTION_SCENE_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 594295b40..ba9d7237e 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -599,5 +599,6 @@ u8 *sub_8040D08();
 bool32 sub_8040D3C(u16 species, u8 *name, u8 language);
 s8 sub_8040A54(struct Pokemon *, u8);
 u16 GetMonEVCount(struct Pokemon *);
+u16 GetEvolutionTargetSpecies(struct Pokemon *, u8, u16);
 
 #endif // GUARD_POKEMON_H
diff --git a/src/trade.c b/src/trade.c
index fc15da7f8..ee0ed96db 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -32,6 +32,7 @@
 #include "field_fadetransition.h"
 #include "decompress.h"
 #include "mail_data.h"
+#include "evolution_scene.h"
 #include "trade.h"
 
 #ifdef ENGLISH
@@ -202,6 +203,7 @@ static void sub_804E1A0(u8);
 /*static*/ void sub_804B790(void);
 static void sub_804DAD4(struct MailStruct *, const struct InGameTrade *);
 void sub_804D588(void);
+static void sub_804DC88(void);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -3172,6 +3174,32 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804D588(void)
+{
+    u16 evoTarget;
+    switch (gMain.state)
+    {
+        case 0:
+            gMain.state = 4;
+            gSoftResetDisabled = TRUE;
+            break;
+        case 4:
+            gUnknown_03005E94 = sub_804DC88;
+            evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gUnknown_020297D8[0]], TRUE, ITEM_NONE);
+            if (evoTarget != SPECIES_NONE)
+                TradeEvolutionScene(&gPlayerParty[gUnknown_020297D8[0]], evoTarget, gUnknown_03004828->unk_00b9, gUnknown_020297D8[0]);
+            else
+                SetMainCallback2(sub_804DC88);
+            gUnknown_020297D8[0] = 255;
+            break;
+    }
+    if (!HasLinkErrorOccurred())
+        RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
 static void sub_804D63C(void)
 {
     u8 blockReceivedStatus;
@@ -3411,7 +3439,7 @@ void sub_804DC18(void)
     UpdatePaletteFade();
 }
 
-void sub_804DC88(void)
+static void sub_804DC88(void)
 {
     switch (gMain.state)
     {
-- 
cgit v1.2.3


From 9fe04d897f1c92ee9fb60d7ca526b54010464118 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 4 Sep 2017 15:02:00 -0400
Subject: sub_804C29C

---
 asm/trade.s     | 2120 -------------------------------------------------------
 data/trade.s    |  317 ---------
 include/trade.h |    4 +
 ld_script.txt   |    2 -
 src/egg_hatch.c |    6 +-
 src/trade.c     |  781 +++++++++++++++++++-
 6 files changed, 783 insertions(+), 2447 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 8906de1bb..0efeabdb7 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -2620,2124 +2620,4 @@ _0804C294: .4byte gPlayerParty
 _0804C298: .4byte gStringVar2
 	thumb_func_end sub_804C1A8
 
-	thumb_func_start sub_804C29C
-sub_804C29C: @ 804C29C
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x10
-	ldr r1, _0804C2C0 @ =gUnknown_03004828
-	ldr r0, [r1]
-	adds r0, 0xC4
-	ldrh r0, [r0]
-	adds r6, r1, 0
-	cmp r0, 0xC8
-	bls _0804C2B6
-	bl _0804D570
-_0804C2B6:
-	lsls r0, 2
-	ldr r1, _0804C2C4 @ =_0804C2C8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0804C2C0: .4byte gUnknown_03004828
-_0804C2C4: .4byte _0804C2C8
-	.align 2, 0
-_0804C2C8:
-	.4byte _0804C5EC
-	.4byte _0804C66C
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804C6C8
-	.4byte _0804C704
-	.4byte _0804C79C
-	.4byte _0804D570
-	.4byte _0804C824
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804C848
-	.4byte _0804C868
-	.4byte _0804C87A
-	.4byte _0804C89C
-	.4byte _0804C8F4
-	.4byte _0804C92C
-	.4byte _0804C978
-	.4byte _0804C9C8
-	.4byte _0804CA1C
-	.4byte _0804CAB4
-	.4byte _0804CAD8
-	.4byte _0804CB24
-	.4byte _0804CB70
-	.4byte _0804CBCC
-	.4byte _0804CC2C
-	.4byte _0804CC40
-	.4byte _0804CC54
-	.4byte _0804CC68
-	.4byte _0804CD94
-	.4byte _0804CE64
-	.4byte _0804CEEC
-	.4byte _0804CF68
-	.4byte _0804CF78
-	.4byte _0804CFA0
-	.4byte _0804CFFC
-	.4byte _0804D028
-	.4byte _0804D054
-	.4byte _0804D06A
-	.4byte _0804D0D4
-	.4byte _0804D570
-	.4byte _0804D0FC
-	.4byte _0804D13C
-	.4byte _0804D182
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D1A4
-	.4byte _0804D1C4
-	.4byte _0804D1D2
-	.4byte _0804D1F4
-	.4byte _0804D2A8
-	.4byte _0804D2E4
-	.4byte _0804D314
-	.4byte _0804D3C4
-	.4byte _0804D41C
-	.4byte _0804D48C
-	.4byte _0804D4A0
-	.4byte _0804D4A6
-	.4byte _0804D4CC
-	.4byte _0804D528
-	.4byte _0804D54C
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804D570
-	.4byte _0804CA54
-_0804C5EC:
-	ldr r3, _0804C65C @ =gSprites
-	ldr r0, [r6]
-	adds r0, 0xB8
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x3E
-	ldrb r2, [r0]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r2
-	strb r1, [r0]
-	ldr r4, [r6]
-	adds r2, r4, 0
-	adds r2, 0xB8
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	ldr r1, _0804C660 @ =0x0000ff4c
-	strh r1, [r0, 0x24]
-	ldrb r0, [r2]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	ldr r2, _0804C664 @ =gMonFrontPicCoords
-	movs r3, 0x90
-	lsls r3, 1
-	adds r0, r4, r3
-	ldrh r0, [r0]
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x1]
-	strh r0, [r1, 0x26]
-	adds r1, r4, 0
-	adds r1, 0xC4
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-	bl GetCurrentMapMusic
-	ldr r1, [r6]
-	movs r7, 0x92
-	lsls r7, 1
-	adds r1, r7
-	strh r0, [r1]
-	ldr r0, _0804C668 @ =0x00000179
-	bl PlayBGM
-	bl _0804D570
-	.align 2, 0
-_0804C65C: .4byte gSprites
-_0804C660: .4byte 0x0000ff4c
-_0804C664: .4byte gMonFrontPicCoords
-_0804C668: .4byte 0x00000179
-_0804C66C:
-	ldr r4, [r6]
-	movs r0, 0x8B
-	lsls r0, 1
-	adds r5, r4, r0
-	movs r1, 0
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	ble _0804C6A0
-	ldr r2, _0804C69C @ =gSprites
-	adds r0, r4, 0
-	adds r0, 0xB8
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r1, [r0, 0x24]
-	adds r1, 0x3
-	strh r1, [r0, 0x24]
-	ldrh r0, [r5]
-	subs r0, 0x3
-	strh r0, [r5]
-	bl _0804D570
-	.align 2, 0
-_0804C69C: .4byte gSprites
-_0804C6A0:
-	ldr r2, _0804C6C4 @ =gSprites
-	adds r0, r4, 0
-	adds r0, 0xB8
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	movs r1, 0
-	strh r1, [r0, 0x24]
-	strh r1, [r5]
-	adds r1, r4, 0
-	adds r1, 0xC4
-	movs r0, 0xA
-	strh r0, [r1]
-	bl _0804D570
-	.align 2, 0
-_0804C6C4: .4byte gSprites
-_0804C6C8:
-	ldr r5, _0804C6F8 @ =gStringVar4
-	ldr r1, _0804C6FC @ =gTradeText_WillBeSent
-	adds r0, r5, 0
-	bl StringExpandPlaceholders
-	ldr r4, _0804C700 @ =gUnknown_03004828
-	ldr r1, [r4]
-	adds r0, r1, 0x4
-	adds r1, 0x34
-	ldrb r2, [r1]
-	movs r1, 0xF
-	str r1, [sp]
-	adds r1, r5, 0
-	movs r3, 0x2
-	bl sub_8003460
-	ldr r1, [r4]
-	adds r2, r1, 0
-	adds r2, 0xC4
-	movs r3, 0
-	movs r0, 0xB
-	bl _0804D40C
-	.align 2, 0
-_0804C6F8: .4byte gStringVar4
-_0804C6FC: .4byte gTradeText_WillBeSent
-_0804C700: .4byte gUnknown_03004828
-_0804C704:
-	ldr r2, [r6]
-	adds r1, r2, 0
-	adds r1, 0xC0
-	ldr r0, [r1]
-	adds r0, 0x1
-	str r0, [r1]
-	cmp r0, 0x50
-	beq _0804C718
-	bl _0804D570
-_0804C718:
-	adds r0, r2, 0
-	adds r0, 0xB8
-	ldrb r0, [r0]
-	ldr r2, _0804C78C @ =gSprites
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrb r1, [r1, 0x5]
-	lsrs r1, 4
-	movs r2, 0x2
-	str r2, [sp]
-	movs r2, 0x1
-	str r2, [sp, 0x4]
-	movs r2, 0x14
-	str r2, [sp, 0x8]
-	ldr r2, _0804C790 @ =0x000fffff
-	str r2, [sp, 0xC]
-	movs r2, 0x78
-	movs r3, 0x20
-	bl sub_8047580
-	ldr r1, [r6]
-	movs r2, 0x81
-	lsls r2, 1
-	adds r1, r2
-	strb r0, [r1]
-	ldr r0, [r6]
-	adds r2, r0, 0
-	adds r2, 0xC4
-	ldrh r1, [r2]
-	adds r1, 0x1
-	strh r1, [r2]
-	adds r0, 0x4
-	movs r1, 0x13
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x1D
-	bl ZeroFillWindowRect
-	ldr r4, _0804C794 @ =gStringVar4
-	ldr r1, _0804C798 @ =gTradeText_ByeBye
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	ldr r1, [r6]
-	adds r0, r1, 0x4
-	adds r1, 0x34
-	ldrb r2, [r1]
-	movs r1, 0xF
-	str r1, [sp]
-	adds r1, r4, 0
-	movs r3, 0x2
-	bl sub_8003460
-	bl _0804D570
-	.align 2, 0
-_0804C78C: .4byte gSprites
-_0804C790: .4byte 0x000fffff
-_0804C794: .4byte gStringVar4
-_0804C798: .4byte gTradeText_ByeBye
-_0804C79C:
-	ldr r7, _0804C810 @ =gSprites
-	ldr r2, [r6]
-	movs r5, 0x81
-	lsls r5, 1
-	adds r0, r2, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r4, r7, 0
-	adds r4, 0x1C
-	adds r0, r4
-	ldr r1, [r0]
-	ldr r0, _0804C814 @ =SpriteCallbackDummy
-	cmp r1, r0
-	beq _0804C7C0
-	bl _0804D570
-_0804C7C0:
-	adds r0, r2, 0x4
-	bl sub_80035AC
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0804C7D2
-	bl _0804D570
-_0804C7D2:
-	ldr r0, _0804C818 @ =gSpriteTemplate_821595C
-	movs r1, 0x78
-	movs r2, 0x20
-	movs r3, 0
-	bl CreateSprite
-	ldr r1, [r6]
-	ldr r2, _0804C81C @ =0x00000103
-	adds r1, r2
-	strb r0, [r1]
-	ldr r3, [r6]
-	adds r2, r3, r2
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldr r1, _0804C820 @ =sub_804D738
-	str r1, [r0]
-	adds r3, r5
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r7
-	bl DestroySprite
-	ldr r1, [r6]
-	bl _0804D53C
-	.align 2, 0
-_0804C810: .4byte gSprites
-_0804C814: .4byte SpriteCallbackDummy
-_0804C818: .4byte gSpriteTemplate_821595C
-_0804C81C: .4byte 0x00000103
-_0804C820: .4byte sub_804D738
-_0804C824:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r0, _0804C844 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r0, 0xC4
-	movs r1, 0x14
-	strh r1, [r0]
-	bl _0804D570
-	.align 2, 0
-_0804C844: .4byte gUnknown_03004828
-_0804C848:
-	ldr r0, _0804C864 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0804C858
-	bl _0804D570
-_0804C858:
-	movs r0, 0x4
-	bl sub_804BBE8
-	bl _0804D538
-	.align 2, 0
-_0804C864: .4byte gPaletteFade
-_0804C868:
-	movs r1, 0x1
-	negs r1, r1
-	movs r0, 0
-	str r0, [sp]
-	adds r0, r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl _0804D534
-_0804C87A:
-	ldr r0, _0804C898 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0804C88A
-	bl _0804D570
-_0804C88A:
-	ldr r0, [r6]
-	adds r0, 0xC4
-	movs r1, 0x17
-	strh r1, [r0]
-	bl _0804D570
-	.align 2, 0
-_0804C898: .4byte gPaletteFade
-_0804C89C:
-	ldr r4, _0804C8B8 @ =gUnknown_03004828
-	ldr r0, [r4]
-	movs r3, 0x8D
-	lsls r3, 1
-	adds r2, r0, r3
-	ldrh r1, [r2]
-	movs r0, 0x80
-	lsls r0, 1
-	cmp r1, r0
-	bls _0804C8BC
-	adds r0, r1, 0
-	subs r0, 0x34
-	strh r0, [r2]
-	b _0804C8E0
-	.align 2, 0
-_0804C8B8: .4byte gUnknown_03004828
-_0804C8BC:
-	movs r0, 0x1
-	bl sub_804BBE8
-	ldr r3, [r4]
-	movs r7, 0x8D
-	lsls r7, 1
-	adds r1, r3, r7
-	movs r2, 0
-	movs r0, 0x80
-	strh r0, [r1]
-	adds r1, r3, 0
-	adds r1, 0xC4
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-	adds r0, r3, 0
-	adds r0, 0xC0
-	str r2, [r0]
-_0804C8E0:
-	ldr r0, _0804C8F0 @ =gUnknown_03004828
-	ldr r4, [r0]
-	movs r1, 0x8D
-	lsls r1, 1
-	adds r0, r4, r1
-	bl _0804D16E
-	.align 2, 0
-_0804C8F0: .4byte gUnknown_03004828
-_0804C8F4:
-	ldr r1, [r6]
-	adds r1, 0xC0
-	ldr r0, [r1]
-	adds r0, 0x1
-	str r0, [r1]
-	cmp r0, 0x14
-	bhi _0804C906
-	bl _0804D570
-_0804C906:
-	movs r0, 0x3
-	bl sub_804BBE8
-	bl sub_804B128
-	ldr r0, _0804C928 @ =gSpriteTemplate_8215A80
-	movs r1, 0x78
-	movs r2, 0x50
-	movs r3, 0
-	bl CreateSprite
-	ldr r1, [r6]
-	adds r1, 0xBB
-	strb r0, [r1]
-	ldr r1, [r6]
-	bl _0804D53C
-	.align 2, 0
-_0804C928: .4byte gSpriteTemplate_8215A80
-_0804C92C:
-	ldr r2, _0804C96C @ =gSprites
-	ldr r0, [r6]
-	adds r0, 0xBB
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r0, r2
-	adds r0, r1, 0
-	adds r0, 0x3F
-	ldrb r0, [r0]
-	lsls r0, 27
-	cmp r0, 0
-	blt _0804C94C
-	bl _0804D570
-_0804C94C:
-	adds r0, r1, 0
-	bl DestroySprite
-	ldr r1, _0804C970 @ =REG_BLDCNT
-	movs r3, 0xC8
-	lsls r3, 3
-	adds r0, r3, 0
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r7, _0804C974 @ =0x0000040c
-	adds r0, r7, 0
-	strh r0, [r1]
-	ldr r1, [r6]
-	bl _0804D53C
-	.align 2, 0
-_0804C96C: .4byte gSprites
-_0804C970: .4byte REG_BLDCNT
-_0804C974: .4byte 0x0000040c
-_0804C978:
-	ldr r2, [r6]
-	movs r3, 0x88
-	lsls r3, 1
-	adds r0, r2, r3
-	ldrh r1, [r0]
-	subs r1, 0x1
-	strh r1, [r0]
-	lsls r1, 16
-	movs r0, 0x9E
-	lsls r0, 17
-	cmp r1, r0
-	bne _0804C99A
-	adds r1, r2, 0
-	adds r1, 0xC4
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-_0804C99A:
-	ldr r0, [r6]
-	adds r0, r3
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	movs r0, 0xA4
-	lsls r0, 1
-	cmp r1, r0
-	beq _0804C9AE
-	bl _0804D570
-_0804C9AE:
-	ldr r0, _0804C9C4 @ =gSpriteTemplate_8215A30
-	movs r1, 0x80
-	movs r2, 0x41
-	movs r3, 0
-	bl CreateSprite
-	ldr r1, [r6]
-	adds r1, 0xBC
-	strb r0, [r1]
-	bl _0804D570
-	.align 2, 0
-_0804C9C4: .4byte gSpriteTemplate_8215A30
-_0804C9C8:
-	ldr r0, _0804CA0C @ =gSpriteTemplate_82159BC
-	movs r1, 0x80
-	movs r2, 0x50
-	movs r3, 0x3
-	bl CreateSprite
-	ldr r4, _0804CA10 @ =gUnknown_03004828
-	ldr r1, [r4]
-	adds r1, 0xBA
-	strb r0, [r1]
-	ldr r0, _0804CA14 @ =gSpriteTemplate_82159FC
-	movs r1, 0x80
-	movs r2, 0x50
-	movs r3, 0
-	bl CreateSprite
-	ldr r1, [r4]
-	adds r1, 0xBB
-	strb r0, [r1]
-	ldr r0, [r4]
-	adds r0, 0xBB
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0804CA18 @ =gSprites
-	adds r0, r1
-	movs r1, 0x1
-	bl StartSpriteAnim
-	ldr r1, [r4]
-	bl _0804D53C
-	.align 2, 0
-_0804CA0C: .4byte gSpriteTemplate_82159BC
-_0804CA10: .4byte gUnknown_03004828
-_0804CA14: .4byte gSpriteTemplate_82159FC
-_0804CA18: .4byte gSprites
-_0804CA1C:
-	ldr r2, [r6]
-	movs r3, 0x88
-	lsls r3, 1
-	adds r1, r2, r3
-	ldrh r0, [r1]
-	subs r0, 0x2
-	strh r0, [r1]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xA6
-	bne _0804CA3A
-	adds r1, r2, 0
-	adds r1, 0xC4
-	movs r0, 0xC8
-	strh r0, [r1]
-_0804CA3A:
-	movs r0, 0
-	bl sub_804C0F8
-	movs r1, 0x80
-	lsls r1, 19
-	ldr r7, _0804CA50 @ =0x00001641
-	adds r0, r7, 0
-	strh r0, [r1]
-	bl _0804D570
-	.align 2, 0
-_0804CA50: .4byte 0x00001641
-_0804CA54:
-	ldr r4, _0804CAB0 @ =gSprites
-	ldr r2, [r6]
-	adds r0, r2, 0
-	adds r0, 0xBA
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrh r1, [r0, 0x22]
-	subs r1, 0x2
-	strh r1, [r0, 0x22]
-	adds r2, 0xBB
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrh r1, [r0, 0x22]
-	subs r1, 0x2
-	strh r1, [r0, 0x22]
-	movs r0, 0
-	bl sub_804C0F8
-	ldr r2, [r6]
-	adds r0, r2, 0
-	adds r0, 0xBA
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r3, 0x22
-	ldrsh r1, [r0, r3]
-	movs r0, 0x8
-	negs r0, r0
-	cmp r1, r0
-	blt _0804CAA4
-	bl _0804D570
-_0804CAA4:
-	adds r1, r2, 0
-	adds r1, 0xC4
-	movs r0, 0x1D
-	strh r0, [r1]
-	bl _0804D570
-	.align 2, 0
-_0804CAB0: .4byte gSprites
-_0804CAB4:
-	movs r1, 0x1
-	negs r1, r1
-	movs r0, 0
-	str r0, [sp]
-	adds r0, r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r0, _0804CAD4 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r0, 0xC4
-	movs r1, 0x1E
-	strh r1, [r0]
-	bl _0804D570
-	.align 2, 0
-_0804CAD4: .4byte gUnknown_03004828
-_0804CAD8:
-	ldr r0, _0804CB1C @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0804CAE8
-	bl _0804D570
-_0804CAE8:
-	ldr r0, [r6]
-	adds r0, 0xBA
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r4, _0804CB20 @ =gSprites
-	adds r0, r4
-	bl DestroySprite
-	ldr r0, [r6]
-	adds r0, 0xBB
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	bl DestroySprite
-	movs r0, 0x2
-	bl sub_804BBE8
-	ldr r1, [r6]
-	bl _0804D53C
-	.align 2, 0
-_0804CB1C: .4byte gPaletteFade
-_0804CB20: .4byte gSprites
-_0804CB24:
-	movs r1, 0x1
-	negs r1, r1
-	movs r0, 0
-	str r0, [sp]
-	adds r0, r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	ldr r5, _0804CB68 @ =gSpriteTemplate_82159FC
-	adds r0, r5, 0
-	movs r1, 0x6F
-	movs r2, 0xAA
-	movs r3, 0
-	bl CreateSprite
-	ldr r4, _0804CB6C @ =gUnknown_03004828
-	ldr r1, [r4]
-	adds r1, 0xBA
-	strb r0, [r1]
-	movs r2, 0xA
-	negs r2, r2
-	adds r0, r5, 0
-	movs r1, 0x81
-	movs r3, 0
-	bl CreateSprite
-	ldr r1, [r4]
-	adds r1, 0xBB
-	strb r0, [r1]
-	ldr r1, [r4]
-	bl _0804D53C
-	.align 2, 0
-_0804CB68: .4byte gSpriteTemplate_82159FC
-_0804CB6C: .4byte gUnknown_03004828
-_0804CB70:
-	ldr r0, _0804CBC0 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0804CB8E
-	movs r0, 0x2E
-	bl PlaySE
-	ldr r0, _0804CBC4 @ =gUnknown_03004828
-	ldr r1, [r0]
-	adds r1, 0xC4
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-_0804CB8E:
-	ldr r3, _0804CBC8 @ =gSprites
-	ldr r0, _0804CBC4 @ =gUnknown_03004828
-	ldr r2, [r0]
-	adds r0, r2, 0
-	adds r0, 0xBA
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	ldrh r1, [r0, 0x26]
-	subs r1, 0x3
-	strh r1, [r0, 0x26]
-	adds r2, 0xBB
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	ldrh r1, [r0, 0x26]
-	adds r1, 0x3
-	strh r1, [r0, 0x26]
-	bl _0804D570
-	.align 2, 0
-_0804CBC0: .4byte gPaletteFade
-_0804CBC4: .4byte gUnknown_03004828
-_0804CBC8: .4byte gSprites
-_0804CBCC:
-	ldr r5, _0804CC28 @ =gSprites
-	ldr r4, [r6]
-	adds r2, r4, 0
-	adds r2, 0xBA
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	ldrh r1, [r0, 0x26]
-	subs r1, 0x3
-	strh r1, [r0, 0x26]
-	adds r6, r4, 0
-	adds r6, 0xBB
-	ldrb r1, [r6]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	ldrh r1, [r0, 0x26]
-	adds r1, 0x3
-	strh r1, [r0, 0x26]
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r3, r0, r5
-	movs r7, 0x26
-	ldrsh r1, [r3, r7]
-	movs r0, 0x5A
-	negs r0, r0
-	cmp r1, r0
-	ble _0804CC12
-	bl _0804D570
-_0804CC12:
-	movs r2, 0x1
-	strh r2, [r3, 0x30]
-	ldrb r1, [r6]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	strh r2, [r0, 0x30]
-	adds r1, r4, 0
-	bl _0804D53C
-	.align 2, 0
-_0804CC28: .4byte gSprites
-_0804CC2C:
-	ldr r2, _0804CC3C @ =0x0000ffff
-	movs r0, 0x1
-	movs r1, 0x10
-	bl BlendPalettes
-	bl _0804D538
-	.align 2, 0
-_0804CC3C: .4byte 0x0000ffff
-_0804CC40:
-	ldr r2, _0804CC50 @ =0x0000ffff
-	movs r0, 0x1
-	movs r1, 0
-	bl BlendPalettes
-	bl _0804D538
-	.align 2, 0
-_0804CC50: .4byte 0x0000ffff
-_0804CC54:
-	ldr r2, _0804CC64 @ =0x0000ffff
-	movs r0, 0x1
-	movs r1, 0x10
-	bl BlendPalettes
-	bl _0804D538
-	.align 2, 0
-_0804CC64: .4byte 0x0000ffff
-_0804CC68:
-	ldr r5, _0804CCD8 @ =gUnknown_03004828
-	ldr r0, [r5]
-	movs r1, 0x90
-	lsls r1, 1
-	adds r0, r1
-	ldrh r0, [r0]
-	bl sub_8040A3C
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804CCE4
-	ldr r4, _0804CCDC @ =gSprites
-	ldr r2, [r5]
-	adds r2, 0xB8
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r4, 0
-	adds r1, 0x10
-	adds r0, r1
-	ldr r1, _0804CCE0 @ =gSpriteAffineAnimTable_8215AC0
-	str r1, [r0]
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrb r1, [r0, 0x1]
-	movs r2, 0x3
-	orrs r1, r2
-	strb r1, [r0, 0x1]
-	ldr r0, [r5]
-	adds r0, 0xB8
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0
-	movs r2, 0x3
-	movs r3, 0x3
-	bl CalcCenterToCornerVec
-	ldr r0, [r5]
-	adds r0, 0xB8
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0
-	bl StartSpriteAffineAnim
-	b _0804CCFA
-	.align 2, 0
-_0804CCD8: .4byte gUnknown_03004828
-_0804CCDC: .4byte gSprites
-_0804CCE0: .4byte gSpriteAffineAnimTable_8215AC0
-_0804CCE4:
-	ldr r0, [r5]
-	adds r0, 0xB8
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0804CD88 @ =gSprites
-	adds r0, r1
-	movs r1, 0
-	bl StartSpriteAffineAnim
-_0804CCFA:
-	ldr r5, _0804CD8C @ =gUnknown_03004828
-	ldr r0, [r5]
-	adds r0, 0xB9
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r4, _0804CD88 @ =gSprites
-	adds r0, r4
-	movs r1, 0
-	bl StartSpriteAffineAnim
-	ldr r2, [r5]
-	adds r3, r2, 0
-	adds r3, 0xB8
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0x3C
-	strh r1, [r0, 0x20]
-	adds r2, 0xB9
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0xB4
-	strh r1, [r0, 0x20]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0xC0
-	strh r1, [r0, 0x22]
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldr r1, _0804CD90 @ =0x0000ffe0
-	strh r1, [r0, 0x22]
-	ldrb r0, [r3]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	adds r1, 0x3E
-	ldrb r3, [r1]
-	movs r2, 0x5
-	negs r2, r2
-	adds r0, r2, 0
-	ands r0, r3
-	strb r0, [r1]
-	ldr r0, [r5]
-	adds r0, 0xB9
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	ands r2, r1
-	strb r2, [r0]
-	ldr r1, [r5]
-	bl _0804D53C
-	.align 2, 0
-_0804CD88: .4byte gSprites
-_0804CD8C: .4byte gUnknown_03004828
-_0804CD90: .4byte 0x0000ffe0
-_0804CD94:
-	ldr r4, _0804CE5C @ =gSprites
-	ldr r2, [r6]
-	adds r3, r2, 0
-	adds r3, 0xB8
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrh r1, [r0, 0x26]
-	subs r1, 0x3
-	movs r5, 0
-	strh r1, [r0, 0x26]
-	adds r2, 0xB9
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrh r1, [r0, 0x26]
-	adds r1, 0x3
-	strh r1, [r0, 0x26]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrh r0, [r0, 0x26]
-	adds r0, 0xA3
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x2
-	bhi _0804CDDC
-	movs r0, 0x2D
-	bl PlaySE
-_0804CDDC:
-	ldr r2, [r6]
-	adds r3, r2, 0
-	adds r3, 0xB8
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r7, 0x26
-	ldrsh r1, [r0, r7]
-	movs r0, 0xDE
-	negs r0, r0
-	cmp r1, r0
-	blt _0804CDFA
-	b _0804D570
-_0804CDFA:
-	adds r0, r2, 0
-	adds r0, 0xBA
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	strh r5, [r0, 0x30]
-	adds r0, r2, 0
-	adds r0, 0xBB
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	strh r5, [r0, 0x30]
-	adds r1, r2, 0
-	adds r1, 0xC4
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-	ldr r0, [r6]
-	adds r0, 0xB9
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	orrs r1, r2
-	strb r1, [r0]
-	ldr r2, _0804CE60 @ =0x0000ffff
-	movs r0, 0x1
-	movs r1, 0
-	bl BlendPalettes
-	b _0804D570
-	.align 2, 0
-_0804CE5C: .4byte gSprites
-_0804CE60: .4byte 0x0000ffff
-_0804CE64:
-	ldr r4, _0804CEE8 @ =gSprites
-	ldr r2, [r6]
-	adds r3, r2, 0
-	adds r3, 0xBA
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrh r1, [r0, 0x26]
-	subs r1, 0x3
-	strh r1, [r0, 0x26]
-	adds r2, 0xBB
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrh r1, [r0, 0x26]
-	adds r1, 0x3
-	strh r1, [r0, 0x26]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r2, 0x26
-	ldrsh r1, [r0, r2]
-	movs r0, 0xDE
-	negs r0, r0
-	cmp r1, r0
-	ble _0804CEA6
-	b _0804D570
-_0804CEA6:
-	movs r1, 0x1
-	negs r1, r1
-	movs r0, 0
-	str r0, [sp]
-	adds r0, r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, [r6]
-	adds r2, r1, 0
-	adds r2, 0xC4
-	ldrh r0, [r2]
-	adds r0, 0x1
-	strh r0, [r2]
-	adds r1, 0xBA
-	ldrb r1, [r1]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	bl DestroySprite
-	ldr r0, [r6]
-	adds r0, 0xBB
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	bl DestroySprite
-	b _0804D570
-	.align 2, 0
-_0804CEE8: .4byte gSprites
-_0804CEEC:
-	ldr r0, _0804CF58 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0804CEFA
-	b _0804D570
-_0804CEFA:
-	ldr r1, [r6]
-	adds r1, 0xC4
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-	movs r0, 0x1
-	bl sub_804BBE8
-	ldr r0, [r6]
-	movs r3, 0x88
-	lsls r3, 1
-	adds r0, r3
-	movs r1, 0xA6
-	strh r1, [r0]
-	ldr r0, _0804CF5C @ =gSpriteTemplate_82159BC
-	movs r4, 0x14
-	negs r4, r4
-	movs r1, 0x80
-	adds r2, r4, 0
-	movs r3, 0x3
-	bl CreateSprite
-	ldr r1, [r6]
-	adds r1, 0xBA
-	strb r0, [r1]
-	ldr r0, _0804CF60 @ =gSpriteTemplate_82159FC
-	movs r1, 0x80
-	adds r2, r4, 0
-	movs r3, 0
-	bl CreateSprite
-	ldr r1, [r6]
-	adds r1, 0xBB
-	strb r0, [r1]
-	ldr r0, [r6]
-	adds r0, 0xBB
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0804CF64 @ =gSprites
-	adds r0, r1
-	movs r1, 0x1
-	bl StartSpriteAnim
-	b _0804D570
-	.align 2, 0
-_0804CF58: .4byte gPaletteFade
-_0804CF5C: .4byte gSpriteTemplate_82159BC
-_0804CF60: .4byte gSpriteTemplate_82159FC
-_0804CF64: .4byte gSprites
-_0804CF68:
-	movs r1, 0x1
-	negs r1, r1
-	movs r0, 0
-	str r0, [sp]
-	adds r0, r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	b _0804D534
-_0804CF78:
-	movs r1, 0x80
-	lsls r1, 19
-	ldr r7, _0804CF98 @ =0x00001641
-	adds r0, r7, 0
-	strh r0, [r1]
-	movs r0, 0x1
-	bl sub_804C0F8
-	ldr r0, _0804CF9C @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0804CF96
-	b _0804D570
-_0804CF96:
-	b _0804D538
-	.align 2, 0
-_0804CF98: .4byte 0x00001641
-_0804CF9C: .4byte gPaletteFade
-_0804CFA0:
-	movs r0, 0x1
-	bl sub_804C0F8
-	ldr r2, _0804CFF4 @ =gSprites
-	ldr r0, _0804CFF8 @ =gUnknown_03004828
-	ldr r3, [r0]
-	adds r4, r3, 0
-	adds r4, 0xBA
-	ldrb r1, [r4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r1, [r0, 0x26]
-	adds r1, 0x3
-	strh r1, [r0, 0x26]
-	adds r0, r3, 0
-	adds r0, 0xBB
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r1, [r0, 0x26]
-	adds r1, 0x3
-	strh r1, [r0, 0x26]
-	ldrb r1, [r4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	movs r2, 0x26
-	ldrsh r1, [r0, r2]
-	movs r7, 0x22
-	ldrsh r0, [r0, r7]
-	adds r1, r0
-	cmp r1, 0x40
-	beq _0804CFEE
-	b _0804D570
-_0804CFEE:
-	adds r1, r3, 0
-	b _0804D53C
-	.align 2, 0
-_0804CFF4: .4byte gSprites
-_0804CFF8: .4byte gUnknown_03004828
-_0804CFFC:
-	movs r0, 0x1
-	bl sub_804C0F8
-	ldr r0, _0804D024 @ =gUnknown_03004828
-	ldr r1, [r0]
-	movs r0, 0x88
-	lsls r0, 1
-	adds r2, r1, r0
-	ldrh r0, [r2]
-	adds r0, 0x2
-	strh r0, [r2]
-	lsls r0, 16
-	asrs r0, 16
-	movs r3, 0x9E
-	lsls r3, 1
-	cmp r0, r3
-	bgt _0804D020
-	b _0804D570
-_0804D020:
-	strh r3, [r2]
-	b _0804D53C
-	.align 2, 0
-_0804D024: .4byte gUnknown_03004828
-_0804D028:
-	ldr r0, [r6]
-	adds r0, 0xBA
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r4, _0804D050 @ =gSprites
-	adds r0, r4
-	bl DestroySprite
-	ldr r0, [r6]
-	adds r0, 0xBB
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	bl DestroySprite
-	b _0804D400
-	.align 2, 0
-_0804D050: .4byte gSprites
-_0804D054:
-	ldr r2, [r6]
-	adds r1, r2, 0
-	adds r1, 0xC0
-	ldr r0, [r1]
-	adds r0, 0x1
-	str r0, [r1]
-	cmp r0, 0xA
-	beq _0804D066
-	b _0804D570
-_0804D066:
-	adds r1, 0x4
-	b _0804D53E
-_0804D06A:
-	ldr r1, [r6]
-	movs r4, 0x88
-	lsls r4, 1
-	adds r2, r1, r4
-	ldrh r0, [r2]
-	adds r0, 0x1
-	strh r0, [r2]
-	lsls r0, 16
-	asrs r0, 16
-	movs r3, 0xAE
-	lsls r3, 1
-	cmp r0, r3
-	ble _0804D08E
-	strh r3, [r2]
-	adds r1, 0xC4
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-_0804D08E:
-	ldr r0, [r6]
-	adds r0, r4
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	movs r0, 0xA4
-	lsls r0, 1
-	cmp r1, r0
-	bne _0804D0B0
-	ldr r0, _0804D0C8 @ =gSpriteTemplate_8215A30
-	movs r1, 0x80
-	movs r2, 0x41
-	movs r3, 0
-	bl CreateSprite
-	ldr r1, [r6]
-	adds r1, 0xBC
-	strb r0, [r1]
-_0804D0B0:
-	ldr r2, _0804D0CC @ =gSprites
-	ldr r0, [r6]
-	adds r0, 0xBC
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r2, 0x1C
-	adds r0, r2
-	ldr r1, _0804D0D0 @ =sub_804B0E0
-	str r1, [r0]
-	b _0804D570
-	.align 2, 0
-_0804D0C8: .4byte gSpriteTemplate_8215A30
-_0804D0CC: .4byte gSprites
-_0804D0D0: .4byte sub_804B0E0
-_0804D0D4:
-	ldr r0, _0804D0F4 @ =gSpriteTemplate_8215A80
-	movs r1, 0x78
-	movs r2, 0x50
-	movs r3, 0
-	bl CreateSprite
-	ldr r2, _0804D0F8 @ =gUnknown_03004828
-	ldr r1, [r2]
-	adds r1, 0xBB
-	strb r0, [r1]
-	ldr r0, [r2]
-	adds r0, 0xC4
-	movs r1, 0x32
-	strh r1, [r0]
-	b _0804D570
-	.align 2, 0
-_0804D0F4: .4byte gSpriteTemplate_8215A80
-_0804D0F8: .4byte gUnknown_03004828
-_0804D0FC:
-	ldr r2, _0804D138 @ =gSprites
-	ldr r0, [r6]
-	adds r0, 0xBB
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r0, r2
-	adds r0, r1, 0
-	adds r0, 0x3F
-	ldrb r0, [r0]
-	lsls r0, 27
-	cmp r0, 0
-	blt _0804D11A
-	b _0804D570
-_0804D11A:
-	adds r0, r1, 0
-	bl DestroySprite
-	movs r0, 0x6
-	bl sub_804BBE8
-	ldr r1, [r6]
-	adds r1, 0xC4
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-	movs r0, 0x9F
-	bl PlaySE
-	b _0804D570
-	.align 2, 0
-_0804D138: .4byte gSprites
-_0804D13C:
-	ldr r1, [r6]
-	movs r3, 0x8D
-	lsls r3, 1
-	adds r2, r1, r3
-	ldrh r3, [r2]
-	ldr r0, _0804D154 @ =0x000003ff
-	cmp r3, r0
-	bhi _0804D158
-	adds r0, r3, 0
-	adds r0, 0x34
-	strh r0, [r2]
-	b _0804D166
-	.align 2, 0
-_0804D154: .4byte 0x000003ff
-_0804D158:
-	movs r0, 0x80
-	lsls r0, 3
-	strh r0, [r2]
-	adds r1, 0xC4
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-_0804D166:
-	ldr r4, [r6]
-	movs r7, 0x8D
-	lsls r7, 1
-	adds r0, r4, r7
-_0804D16E:
-	ldrh r1, [r0]
-	movs r0, 0x80
-	lsls r0, 8
-	bl __divsi3
-	movs r2, 0x8C
-	lsls r2, 1
-	adds r1, r4, r2
-	strh r0, [r1]
-	b _0804D570
-_0804D182:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r0, _0804D1A0 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r0, 0xC4
-	movs r1, 0x3C
-	strh r1, [r0]
-	b _0804D570
-	.align 2, 0
-_0804D1A0: .4byte gUnknown_03004828
-_0804D1A4:
-	ldr r0, _0804D1C0 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0804D1B2
-	b _0804D570
-_0804D1B2:
-	movs r0, 0x5
-	bl sub_804BBE8
-	movs r0, 0x7
-	bl sub_804BBE8
-	b _0804D538
-	.align 2, 0
-_0804D1C0: .4byte gPaletteFade
-_0804D1C4:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	b _0804D534
-_0804D1D2:
-	movs r1, 0x80
-	lsls r1, 19
-	movs r3, 0xA2
-	lsls r3, 5
-	adds r0, r3, 0
-	strh r0, [r1]
-	ldr r0, _0804D1F0 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0804D1EC
-	b _0804D570
-_0804D1EC:
-	ldr r1, [r6]
-	b _0804D53C
-	.align 2, 0
-_0804D1F0: .4byte gPaletteFade
-_0804D1F4:
-	ldr r0, _0804D290 @ =gSpriteTemplate_821595C
-	movs r2, 0x8
-	negs r2, r2
-	movs r1, 0x78
-	movs r3, 0
-	bl CreateSprite
-	ldr r6, _0804D294 @ =gUnknown_03004828
-	ldr r1, [r6]
-	ldr r5, _0804D298 @ =0x00000103
-	adds r1, r5
-	movs r7, 0
-	mov r8, r7
-	strb r0, [r1]
-	ldr r4, _0804D29C @ =gSprites
-	ldr r2, [r6]
-	adds r2, r5
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0x4A
-	strh r1, [r0, 0x34]
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r4, 0
-	adds r1, 0x1C
-	adds r0, r1
-	ldr r1, _0804D2A0 @ =sub_804D80C
-	str r1, [r0]
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0x1
-	bl StartSpriteAnim
-	ldr r0, [r6]
-	adds r0, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0x2
-	bl StartSpriteAffineAnim
-	ldr r0, [r6]
-	adds r0, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrb r1, [r0, 0x5]
-	lsrs r1, 4
-	adds r1, 0x10
-	movs r0, 0x1
-	lsls r0, r1
-	ldr r2, _0804D2A4 @ =0x0000ffff
-	movs r1, 0x10
-	bl BlendPalettes
-	ldr r1, [r6]
-	adds r2, r1, 0
-	adds r2, 0xC4
-	ldrh r0, [r2]
-	adds r0, 0x1
-	strh r0, [r2]
-	adds r1, 0xC0
-	mov r0, r8
-	str r0, [r1]
-	b _0804D570
-	.align 2, 0
-_0804D290: .4byte gSpriteTemplate_821595C
-_0804D294: .4byte gUnknown_03004828
-_0804D298: .4byte 0x00000103
-_0804D29C: .4byte gSprites
-_0804D2A0: .4byte sub_804D80C
-_0804D2A4: .4byte 0x0000ffff
-_0804D2A8:
-	ldr r2, _0804D2D8 @ =gSprites
-	ldr r0, [r6]
-	ldr r1, _0804D2DC @ =0x00000103
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0, 0x5]
-	lsrs r1, 4
-	adds r1, 0x10
-	movs r0, 0x1
-	lsls r0, r1
-	ldr r1, _0804D2E0 @ =0x0000ffff
-	str r1, [sp]
-	movs r1, 0x1
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	ldr r1, [r6]
-	b _0804D53C
-	.align 2, 0
-_0804D2D8: .4byte gSprites
-_0804D2DC: .4byte 0x00000103
-_0804D2E0: .4byte 0x0000ffff
-_0804D2E4:
-	ldr r2, _0804D308 @ =gSprites
-	ldr r3, [r6]
-	ldr r7, _0804D30C @ =0x00000103
-	adds r0, r3, r7
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r2, 0x1C
-	adds r0, r2
-	ldr r1, [r0]
-	ldr r0, _0804D310 @ =SpriteCallbackDummy
-	cmp r1, r0
-	beq _0804D302
-	b _0804D570
-_0804D302:
-	adds r1, r3, 0
-	b _0804D53C
-	.align 2, 0
-_0804D308: .4byte gSprites
-_0804D30C: .4byte 0x00000103
-_0804D310: .4byte SpriteCallbackDummy
-_0804D314:
-	ldr r4, _0804D3B4 @ =gSprites
-	ldr r0, [r6]
-	mov r8, r0
-	mov r5, r8
-	adds r5, 0xB9
-	ldrb r1, [r5]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r3, 0
-	movs r1, 0x78
-	strh r1, [r0, 0x20]
-	ldrb r0, [r5]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	ldr r2, _0804D3B8 @ =gMonFrontPicCoords
-	movs r0, 0x91
-	lsls r0, 1
-	add r0, r8
-	ldrh r0, [r0]
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x1]
-	adds r0, 0x3C
-	strh r0, [r1, 0x22]
-	ldrb r1, [r5]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	strh r3, [r0, 0x24]
-	ldrb r1, [r5]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	strh r3, [r0, 0x26]
-	ldrb r0, [r5]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	ldrb r1, [r1, 0x5]
-	lsrs r1, 4
-	movs r2, 0x2
-	str r2, [sp]
-	movs r2, 0x1
-	str r2, [sp, 0x4]
-	movs r2, 0x14
-	str r2, [sp, 0x8]
-	ldr r2, _0804D3BC @ =0x000fffff
-	str r2, [sp, 0xC]
-	movs r2, 0x78
-	movs r3, 0x54
-	bl CreatePokeballSprite
-	ldr r0, [r6]
-	ldr r5, _0804D3C0 @ =0x00000103
-	adds r0, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	bl FreeSpriteOamMatrix
-	ldr r0, [r6]
-	adds r0, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	bl DestroySprite
-	ldr r1, [r6]
-	b _0804D53C
-	.align 2, 0
-_0804D3B4: .4byte gSprites
-_0804D3B8: .4byte gMonFrontPicCoords
-_0804D3BC: .4byte 0x000fffff
-_0804D3C0: .4byte 0x00000103
-_0804D3C4:
-	movs r1, 0x80
-	lsls r1, 19
-	movs r2, 0xBA
-	lsls r2, 5
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r0, [r6]
-	adds r0, 0x4
-	movs r1, 0x13
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x1D
-	bl ZeroFillWindowRect
-	ldr r4, _0804D414 @ =gStringVar4
-	ldr r1, _0804D418 @ =gTradeText_SentOverPoke
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	ldr r1, [r6]
-	adds r0, r1, 0x4
-	adds r1, 0x34
-	ldrb r2, [r1]
-	movs r1, 0xF
-	str r1, [sp]
-	adds r1, r4, 0
-	movs r3, 0x2
-	bl sub_8003460
-_0804D400:
-	ldr r1, [r6]
-	adds r2, r1, 0
-	adds r2, 0xC4
-	ldrh r0, [r2]
-	adds r0, 0x1
-	movs r3, 0
-_0804D40C:
-	strh r0, [r2]
-	adds r1, 0xC0
-	str r3, [r1]
-	b _0804D570
-	.align 2, 0
-_0804D414: .4byte gStringVar4
-_0804D418: .4byte gTradeText_SentOverPoke
-_0804D41C:
-	ldr r1, [r6]
-	adds r1, 0xC0
-	ldr r0, [r1]
-	adds r0, 0x1
-	str r0, [r1]
-	cmp r0, 0x4
-	bne _0804D430
-	ldr r0, _0804D480 @ =0x00000173
-	bl PlayFanfare
-_0804D430:
-	ldr r2, [r6]
-	adds r0, r2, 0
-	adds r0, 0xC0
-	ldr r0, [r0]
-	cmp r0, 0xF0
-	beq _0804D43E
-	b _0804D570
-_0804D43E:
-	adds r1, r2, 0
-	adds r1, 0xC4
-	ldrh r0, [r1]
-	adds r0, 0x1
-	movs r5, 0
-	strh r0, [r1]
-	adds r0, r2, 0x4
-	movs r1, 0x13
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x1D
-	bl ZeroFillWindowRect
-	ldr r4, _0804D484 @ =gStringVar4
-	ldr r1, _0804D488 @ =gTradeText_TakeGoodCare
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	ldr r1, [r6]
-	adds r0, r1, 0x4
-	adds r1, 0x34
-	ldrb r2, [r1]
-	movs r1, 0xF
-	str r1, [sp]
-	adds r1, r4, 0
-	movs r3, 0x2
-	bl sub_8003460
-	ldr r0, [r6]
-	adds r0, 0xC0
-	str r5, [r0]
-	b _0804D570
-	.align 2, 0
-_0804D480: .4byte 0x00000173
-_0804D484: .4byte gStringVar4
-_0804D488: .4byte gTradeText_TakeGoodCare
-_0804D48C:
-	ldr r2, [r6]
-	adds r1, r2, 0
-	adds r1, 0xC0
-	ldr r0, [r1]
-	adds r0, 0x1
-	str r0, [r1]
-	cmp r0, 0x3C
-	bne _0804D570
-	adds r1, 0x4
-	b _0804D53E
-_0804D4A0:
-	bl sub_804E1DC
-	b _0804D538
-_0804D4A6:
-	ldr r2, [r6]
-	movs r3, 0x8F
-	lsls r3, 1
-	adds r0, r2, r3
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0804D4B8
-	movs r0, 0x1
-	b _0804D572
-_0804D4B8:
-	ldr r0, _0804D4C8 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0804D570
-	adds r1, r2, 0
-	b _0804D53C
-	.align 2, 0
-_0804D4C8: .4byte gMain
-_0804D4CC:
-	ldr r0, _0804D510 @ =gSpecialVar_0x8005
-	ldrb r0, [r0]
-	movs r1, 0
-	bl sub_804BA94
-	ldr r1, _0804D514 @ =gUnknown_03005E94
-	ldr r0, _0804D518 @ =sub_804BBCC
-	str r0, [r1]
-	ldr r7, _0804D51C @ =gUnknown_020297D8
-	ldrb r0, [r7]
-	movs r6, 0x64
-	muls r0, r6
-	ldr r5, _0804D520 @ =gPlayerParty
-	adds r0, r5
-	movs r1, 0x1
-	movs r2, 0
-	bl GetEvolutionTargetSpecies
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0
-	beq _0804D538
-	ldrb r3, [r7]
-	adds r0, r3, 0
-	muls r0, r6
-	adds r0, r5
-	ldr r1, _0804D524 @ =gUnknown_03004828
-	ldr r1, [r1]
-	adds r1, 0xB9
-	ldrb r2, [r1]
-	adds r1, r4, 0
-	bl TradeEvolutionScene
-	b _0804D538
-	.align 2, 0
-_0804D510: .4byte gSpecialVar_0x8005
-_0804D514: .4byte gUnknown_03005E94
-_0804D518: .4byte sub_804BBCC
-_0804D51C: .4byte gUnknown_020297D8
-_0804D520: .4byte gPlayerParty
-_0804D524: .4byte gUnknown_03004828
-_0804D528:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-_0804D534:
-	bl BeginNormalPaletteFade
-_0804D538:
-	ldr r0, _0804D548 @ =gUnknown_03004828
-	ldr r1, [r0]
-_0804D53C:
-	adds r1, 0xC4
-_0804D53E:
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-	b _0804D570
-	.align 2, 0
-_0804D548: .4byte gUnknown_03004828
-_0804D54C:
-	ldr r0, _0804D580 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0804D570
-	ldr r0, [r6]
-	movs r7, 0x92
-	lsls r7, 1
-	adds r0, r7
-	ldrh r0, [r0]
-	bl PlayBGM
-	ldr r0, _0804D584 @ =c2_exit_to_overworld_2_switch
-	bl SetMainCallback2
-	bl sub_804D8E4
-_0804D570:
-	movs r0, 0
-_0804D572:
-	add sp, 0x10
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0804D580: .4byte gPaletteFade
-_0804D584: .4byte c2_exit_to_overworld_2_switch
-	thumb_func_end sub_804C29C
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/data/trade.s b/data/trade.s
index 9d224bf36..508e86c63 100644
--- a/data/trade.s
+++ b/data/trade.s
@@ -3,320 +3,3 @@
 
 	.section .rodata
 
-@ This is used to determine the next mon to select when the D-Pad is
-@ pressed in a given direction.
-@ Note that the mons are laid out like this.
-@ 0-5 are the player's party and 6-11 are the trading partner's party.
-@ 12 is the cancel button.
-@  0  1  6  7
-@  2  3  8  9
-@  4  5 10 11
-@          12
-
-	.align 2
-gTradeBallPalette:: @ 820C3D8
-	.incbin "graphics/trade/ball.gbapal"
-
-	.align 2
-gTradeBallTiles:: @ 820C3F8
-	.incbin "graphics/trade/ball.4bpp"
-
-	.align 2
-gUnknown_0820C9F8:: @ 820C9F8
-	.incbin "graphics/trade/unknown.gbapal"
-	.incbin "graphics/trade/gba.gbapal"
-	.incbin "graphics/trade/shadow.gbapal"
-	.space 32
-	.incbin "graphics/trade/misc.gbapal"
-
-	.align 2
-gUnknown_0820CA98:: @ 820CA98
-	.incbin "graphics/trade/gba.4bpp"
-	.incbin "graphics/trade/shadow.4bpp"
-
-	.align 2
-gUnknown_0820DD98:: @ 820DD98
-	.incbin "graphics/trade/pokeball_symbol.8bpp"
-
-	.align 2
-gUnknown_0820F798:: @ 820F798
-	.incbin "graphics/trade/shadow_map.bin"
-
-	.align 2
-gUnknown_08210798:: @ 8210798
-	.incbin "graphics/trade/gba_map.bin"
-
-	.align 2
-gUnknown_08211798:: @ 8211798
-	.incbin "graphics/trade/cable_closeup_map.bin"
-
-	.align 2
-gUnknown_08211F98:: @ 8211F98
-	.incbin "graphics/trade/pokeball_symbol_map.bin"
-
-	.incbin "graphics/unused/unknown/8212098.gbapal"
-
-	.align 2
-gTradeCableEndPalette:: @ 82120B8
-	.incbin "graphics/trade/cable_end.gbapal"
-
-	.incbin "graphics/unused/unknown/82120D8.gbapal"
-
-	.space 32
-
-	.align 2
-gTradeGlowPalette:: @ 8212118
-	.incbin "graphics/trade/glow.gbapal"
-
-	.align 2
-gTradeGlow1Tiles:: @ 8212138
-	.incbin "graphics/trade/glow1.4bpp"
-
-	.align 2
-gTradeGlow2Tiles:: @ 8212338
-	.incbin "graphics/trade/glow2.4bpp"
-
-	.align 2
-gTradeCableEndTiles:: @ 8212538
-	.incbin "graphics/trade/cable_end.4bpp"
-
-	.align 2
-gTradeGBAScreenTiles:: @ 8212738
-	.incbin "graphics/trade/gba_screen.4bpp"
-
-	.align 2
-gUnknown_08213738:: @ 8213738
-	.incbin "graphics/trade/gba_affine.8bpp"
-
-	.align 2
-gUnknown_08215778:: @ 8215778
-	.incbin "graphics/trade/gba_affine_map.bin"
-
-	.align 2
-gOamData_8215878:: @ 8215878
-	.2byte 0x0100
-	.2byte 0x4000
-	.2byte 0x0000
-
-	.align 2
-gSpriteAnim_8215880:: @ 8215880
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 4, 3
-	obj_image_anim_frame 8, 3
-	obj_image_anim_frame 12, 3
-	obj_image_anim_frame 16, 3
-	obj_image_anim_frame 20, 3
-	obj_image_anim_frame 24, 3
-	obj_image_anim_frame 28, 3
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 36, 3
-	obj_image_anim_frame 40, 3
-	obj_image_anim_frame 44, 3
-	obj_image_anim_loop 1
-	obj_image_anim_frame 0, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_82158BC:: @ 82158BC
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 4, 3
-	obj_image_anim_frame 8, 3
-	obj_image_anim_frame 12, 3
-	obj_image_anim_frame 16, 3
-	obj_image_anim_frame 20, 3
-	obj_image_anim_frame 24, 3
-	obj_image_anim_frame 28, 3
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 36, 3
-	obj_image_anim_frame 40, 3
-	obj_image_anim_frame 44, 3
-	obj_image_anim_loop 2
-	obj_image_anim_frame 0, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_82158F8:: @ 82158F8
-	.4byte gSpriteAnim_8215880
-	.4byte gSpriteAnim_82158BC
-
-	.align 2
-gSpriteAffineAnim_8215900:: @ 8215900
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8215910:: @ 8215910
-	obj_rot_scal_anim_frame 0xFFF8, 0x0, 0, 20
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8215920:: @ 8215920
-	obj_rot_scal_anim_frame 0x60, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 5
-	obj_rot_scal_anim_frame 0x8, 0x0, 0, 20
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_8215940:: @ 8215940
-	.4byte gSpriteAffineAnim_8215900
-	.4byte gSpriteAffineAnim_8215910
-	.4byte gSpriteAffineAnim_8215920
-
-	.align 2
-gUnknown_0821594C:: @ 821594C
-	obj_tiles gTradeBallTiles, 0x600, 5557
-
-	.align 2
-gUnknown_08215954:: @ 8215954
-	obj_pal gTradeBallPalette, 5558
-
-	.align 2
-gSpriteTemplate_821595C:: @ 821595C
-	spr_template 5557, 5558, gOamData_8215878, gSpriteAnimTable_82158F8, NULL, gSpriteAffineAnimTable_8215940, sub_804D6BC
-
-	.align 2
-gOamData_8215974:: @ 8215974
-	.2byte 0x0500
-	.2byte 0x8000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_821597C:: @ 821597C
-	obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8215984:: @ 8215984
-	.4byte gSpriteAnim_821597C
-
-	.align 2
-gSpriteAffineAnim_8215988:: @ 8215988
-	obj_rot_scal_anim_frame 0xFFF6, 0xFFF6, 0, 5
-	obj_rot_scal_anim_frame 0xA, 0xA, 0, 5
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_82159A0:: @ 82159A0
-	.4byte gSpriteAffineAnim_8215988
-
-	.align 2
-gUnknown_082159A4:: @ 82159A4
-	obj_tiles gTradeGlow1Tiles, 0x200, 5550
-
-	.align 2
-gUnknown_082159AC:: @ 82159AC
-	obj_pal gTradeGlowPalette, 5551
-
-	.align 2
-gUnknown_082159B4:: @ 82159B4
-	obj_pal gTradeCableEndPalette, 5555
-
-	.align 2
-gSpriteTemplate_82159BC:: @ 82159BC
-	spr_template 5550, 5551, gOamData_8215974, gSpriteAnimTable_8215984, NULL, gSpriteAffineAnimTable_82159A0, sub_804B058
-
-	.align 2
-gOamData_82159D4:: @ 82159D4
-	.2byte 0x8000
-	.2byte 0x8000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_82159DC:: @ 82159DC
-	obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_82159E4:: @ 82159E4
-	obj_image_anim_frame 8, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_82159EC:: @ 82159EC
-	.4byte gSpriteAnim_82159DC
-	.4byte gSpriteAnim_82159E4
-
-	.align 2
-gUnknown_082159F4:: @ 82159F4
-	obj_tiles gTradeGlow2Tiles, 0x300, 5552
-
-	.align 2
-gSpriteTemplate_82159FC:: @ 82159FC
-	spr_template 5552, 5551, gOamData_82159D4, gSpriteAnimTable_82159EC, NULL, gDummySpriteAffineAnimTable, sub_804B07C
-
-	.align 2
-gOamData_8215A14:: @ 8215A14
-	.2byte 0x8000
-	.2byte 0x8000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_8215A1C:: @ 8215A1C
-	obj_image_anim_frame 0, 10
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8215A24:: @ 8215A24
-	.4byte gSpriteAnim_8215A1C
-
-	.align 2
-gUnknown_08215A28:: @ 8215A28
-	obj_tiles gTradeCableEndTiles, 0x100, 5554
-
-	.align 2
-gSpriteTemplate_8215A30:: @ 8215A30
-	spr_template 5554, 5555, gOamData_8215A14, gSpriteAnimTable_8215A24, NULL, gDummySpriteAffineAnimTable, sub_804B0BC
-
-	.align 2
-gOamData_8215A48:: @ 8215A48
-	.2byte 0x4000
-	.2byte 0xC000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_8215A50:: @ 8215A50
-	obj_image_anim_frame 0, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 64, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 96, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 64, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_loop 8
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8215A74:: @ 8215A74
-	.4byte gSpriteAnim_8215A50
-
-	.align 2
-gUnknown_08215A78:: @ 8215A78
-	obj_tiles gTradeGBAScreenTiles, 0x1000, 5556
-
-	.align 2
-gSpriteTemplate_8215A80:: @ 8215A80
-	spr_template 5556, 5555, gOamData_8215A48, gSpriteAnimTable_8215A74, NULL, gDummySpriteAffineAnimTable, sub_804B104
-
-	.align 1
-gTradeGlow2PaletteAnimTable:: @ 8215A98
-	.2byte 0x7F12
-	.2byte 0x7F12
-	.2byte 0x7F12
-	.2byte 0x7FFF
-	.2byte 0x7FFF
-	.2byte 0x7FFF
-	.2byte 0x7F12
-	.2byte 0x7F12
-	.2byte 0x7F12
-	.2byte 0x7FFF
-	.2byte 0x7FFF
-	.2byte 0x7FFF
-
-	.align 2
-gSpriteAffineAnim_8215AB0:: @ 8215AB0
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_8215AC0:: @ 8215AC0
-	.4byte gSpriteAffineAnim_8215AB0
diff --git a/include/trade.h b/include/trade.h
index 909d17dab..bf744f8d4 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -5,6 +5,10 @@
 #ifndef POKERUBY_TRADE_H
 #define POKERUBY_TRADE_H
 
+extern const u16 gUnknown_0820C9F8[][16];
+extern const u32 gUnknown_0820CA98[];
+extern const u16 gUnknown_0820F798[];
+
 void sub_8047CD8(void);
 u16 sub_804DB2C(void);
 void sub_804DB68(void);
diff --git a/ld_script.txt b/ld_script.txt
index 6ecf65843..92786630d 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -344,8 +344,6 @@ SECTIONS {
         data/battle_interface.o(.rodata);
         src/pokeball.o(.rodata);
         src/trade.o(.rodata);
-        data/trade.o(.rodata);
-        src/trade.o(.rodata.igt);
         src/berry_blender.o(.rodata);
         src/new_game.o(.rodata);
         data/rom4.o(.rodata);
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index aa3d45250..df54587af 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -19,6 +19,7 @@
 #include "naming_screen.h"
 #include "trig.h"
 #include "rng.h"
+#include "trade.h"
 
 extern u8 ewram[];
 extern struct SpriteTemplate gUnknown_02024E8C;
@@ -40,10 +41,7 @@ struct EggHatchData* gEggHatchData;
 
 extern const u32 gUnknown_08D00000[];
 extern const u32 gUnknown_08D00524[];
-extern const u32 gUnknown_0820CA98[];
-extern const u32 gUnknown_0820F798[];
 extern const u16 gUnknown_08D004E0[]; //palette
-extern const u16 gUnknown_0820C9F8[]; //palette
 extern const struct SpriteSheet sUnknown_0820A3B0;
 extern const struct SpriteSheet sUnknown_0820A3B8;
 extern const struct SpritePalette sUnknown_0820A3C0;
@@ -512,7 +510,7 @@ static void CB2_EggHatch_0(void)
             u32 size;
 
             REG_BG2CNT = 0x4C06;
-            LoadPalette(&gUnknown_0820C9F8, 0x10, 0xA0);
+            LoadPalette(gUnknown_0820C9F8, 0x10, 0xA0);
 
             offsetRead = (u32)(&gUnknown_0820CA98);
             offsetWrite = (VRAM + 0x4000);
diff --git a/src/trade.c b/src/trade.c
index ee0ed96db..3ec01246c 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -33,6 +33,7 @@
 #include "decompress.h"
 #include "mail_data.h"
 #include "evolution_scene.h"
+#include "pokeball.h"
 #include "trade.h"
 
 #ifdef ENGLISH
@@ -131,12 +132,31 @@ struct TradeEwramSubstruct2 {
     /*0x009c*/ u8 unk_009c;
     /*0x009d*/ u8 unk_009d;
     /*0x009e*/ u16 linkData[13];
+    // Sprite indices
     /*0x00b8*/ u8 unk_00b8;
     /*0x00b9*/ u8 unk_00b9;
-    /*0x00ba*/ u8 filler_00ba[3];
+    /*0x00ba*/ u8 unk_00ba;
+    /*0x00bb*/ u8 unk_00bb;
+    /*0x00bc*/ u8 unk_00bc;
     /*0x00bd*/ u8 unk_00bd;
+    // Timer
     /*0x00c0*/ u32 unk_00c0;
+    // Scene index
     /*0x00c4*/ u16 unk_00c4;
+    /*0x00c6*/ u8 filler_00c6[0x3c];
+    /*0x0102*/ u8 unk_0102;
+    /*0x0103*/ u8 unk_0103;
+    /*0x0104*/ u8 filler_0104[0x0c];
+    /*0x0110*/ s16 unk_0110;
+    /*0x0112*/ u8 filler_0112[4];
+    /*0x0116*/ s16 unk_0116;
+    /*0x0118*/ u16 unk_0118;
+    /*0x011a*/ u16 unk_011a;
+    /*0x011c*/ u8 filler_011c[2];
+    /*0x011e*/ u8 unk_011e;
+    /*0x0120*/ u16 unk_0120;
+    /*0x0122*/ u16 unk_0122;
+    /*0x0124*/ u16 unk_0124;
 };
 
 struct TradeEwramStruct {
@@ -204,6 +224,22 @@ static void sub_804E1A0(u8);
 static void sub_804DAD4(struct MailStruct *, const struct InGameTrade *);
 void sub_804D588(void);
 static void sub_804DC88(void);
+u8 sub_8047580(u8, u8, u8, u8, u8, u8, u8, u32);
+void sub_804D6BC(struct Sprite *);
+void sub_804D738(struct Sprite *);
+void sub_804BBE8(u8);
+void sub_804B128(void);
+void sub_804B058(struct Sprite *);
+void sub_804B07C(struct Sprite *);
+void sub_804B0BC(struct Sprite *);
+void sub_804B104(struct Sprite *);
+void sub_804C0F8(u8);
+bool8 sub_8040A3C(u16);
+void sub_804B0E0(struct Sprite *);
+void sub_804D80C(struct Sprite *);
+void sub_804E1DC(void);
+void sub_804BBCC(void);
+void sub_804D8E4(void);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -565,10 +601,297 @@ const u8 unref_string_0820C3B5[] = _("こうかんせいりつ     ");
 const u8 unref_string_0820C3C3[] = _("だめだたらしいよ     ");
 const u8 gUnknown_0820C3D1[][2] = {
     { 4,  3},
-    {19,  3}
+    {19,  3},
+    { 0,  0}
 };
 
-asm(".section .rodata.igt");
+const u16 gTradeBallPalette[] = INCBIN_U16("graphics/trade/ball.gbapal");
+const u32 gTradeBallTiles[] = INCBIN_U32("graphics/trade/ball.4bpp");
+const u16 gUnknown_0820C9F8[][16] = {
+    INCBIN_U16("graphics/trade/unknown.gbapal"),
+    INCBIN_U16("graphics/trade/gba.gbapal"),
+    INCBIN_U16("graphics/trade/shadow.gbapal"),
+    {},
+    INCBIN_U16("graphics/trade/misc.gbapal")
+};
+
+const u32 gUnknown_0820CA98[] = INCBIN_U32("graphics/trade/gba.4bpp");
+const u32 gUnknown_0820CA98_2[] = INCBIN_U32("graphics/trade/shadow.4bpp");
+const u32 gUnknown_0820DD98[] = INCBIN_U32("graphics/trade/pokeball_symbol.8bpp");
+const u16 gUnknown_0820F798[] = INCBIN_U16("graphics/trade/shadow_map.bin");
+const u16 gUnknown_08210798[] = INCBIN_U16("graphics/trade/gba_map.bin");
+const u16 gUnknown_08211798[] = INCBIN_U16("graphics/trade/cable_closeup_map.bin");
+const u16 gUnknown_08211F98[] = INCBIN_U16("graphics/trade/pokeball_symbol_map.bin");
+const u16 unused_08212098[] = INCBIN_U16("graphics/unused/unknown/8212098.gbapal");
+const u16 gTradeCableEndPalette[] = INCBIN_U16("graphics/trade/cable_end.gbapal");
+const u16 unused_082120D8[] = INCBIN_U16("graphics/unused/unknown/82120D8.gbapal");
+const u16 nullpal_082120F8[16] = {};
+const u16 gTradeGlowPalette[] = INCBIN_U16("graphics/trade/glow.gbapal");
+const u32 gTradeGlow1Tiles[] = INCBIN_U32("graphics/trade/glow1.4bpp");
+const u32 gTradeGlow2Tiles[] = INCBIN_U32("graphics/trade/glow2.4bpp");
+const u32 gTradeCableEndTiles[] = INCBIN_U32("graphics/trade/cable_end.4bpp");
+const u32 gTradeGBAScreenTiles[] = INCBIN_U32("graphics/trade/gba_screen.4bpp");
+const u32 gUnknown_08213738[] = INCBIN_U32("graphics/trade/gba_affine.8bpp");
+const u16 gUnknown_08215778[] = INCBIN_U16("graphics/trade/gba_affine_map.bin");
+
+const struct OamData gOamData_8215878 = {
+    .affineMode = 1,
+    .size = 1
+};
+
+const union AnimCmd gSpriteAnim_8215880[] = {
+    ANIMCMD_FRAME( 0, 3),
+    ANIMCMD_FRAME( 4, 3),
+    ANIMCMD_FRAME( 8, 3),
+    ANIMCMD_FRAME(12, 3),
+    ANIMCMD_FRAME(16, 3),
+    ANIMCMD_FRAME(20, 3),
+    ANIMCMD_FRAME(24, 3),
+    ANIMCMD_FRAME(28, 3),
+    ANIMCMD_FRAME(32, 3),
+    ANIMCMD_FRAME(36, 3),
+    ANIMCMD_FRAME(40, 3),
+    ANIMCMD_FRAME(44, 3),
+    ANIMCMD_LOOP(1),
+    ANIMCMD_FRAME( 0, 3),
+    ANIMCMD_END
+};
+
+const union AnimCmd gSpriteAnim_82158BC[] = {
+    ANIMCMD_FRAME( 0, 3),
+    ANIMCMD_FRAME( 4, 3),
+    ANIMCMD_FRAME( 8, 3),
+    ANIMCMD_FRAME(12, 3),
+    ANIMCMD_FRAME(16, 3),
+    ANIMCMD_FRAME(20, 3),
+    ANIMCMD_FRAME(24, 3),
+    ANIMCMD_FRAME(28, 3),
+    ANIMCMD_FRAME(32, 3),
+    ANIMCMD_FRAME(36, 3),
+    ANIMCMD_FRAME(40, 3),
+    ANIMCMD_FRAME(44, 3),
+    ANIMCMD_LOOP(2),
+    ANIMCMD_FRAME( 0, 3),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gSpriteAnimTable_82158F8[] = {
+    gSpriteAnim_8215880,
+    gSpriteAnim_82158BC
+};
+
+const union AffineAnimCmd gSpriteAffineAnim_8215900[] = {
+    AFFINEANIMCMD_FRAME(0, 0, 0, 1),
+    AFFINEANIMCMD_END
+};
+
+const union AffineAnimCmd gSpriteAffineAnim_8215910[] = {
+    AFFINEANIMCMD_FRAME(-8, 0, 0, 20),
+    AFFINEANIMCMD_END
+};
+
+const union AffineAnimCmd gSpriteAffineAnim_8215920[] = {
+    AFFINEANIMCMD_FRAME(0x60, 0x100, 0,  0),
+    AFFINEANIMCMD_FRAME(   0,     0, 0,  5),
+    AFFINEANIMCMD_FRAME(   8,     0, 0, 20),
+    AFFINEANIMCMD_END
+};
+
+const union AffineAnimCmd *const gSpriteAffineAnimTable_8215940[] = {
+    gSpriteAffineAnim_8215900,
+    gSpriteAffineAnim_8215910,
+    gSpriteAffineAnim_8215920
+};
+
+const struct SpriteSheet gUnknown_0821594C = {
+    (const u8 *)gTradeBallTiles, 0x600, 5557
+};
+
+const struct SpritePalette gUnknown_08215954 = {
+    gTradeBallPalette, 5558
+};
+
+const struct SpriteTemplate gSpriteTemplate_821595C = {
+    5557,
+    5558,
+    &gOamData_8215878,
+    gSpriteAnimTable_82158F8,
+    NULL,
+    gSpriteAffineAnimTable_8215940,
+    sub_804D6BC
+};
+
+const struct OamData gOamData_8215974 = {
+    .affineMode = 1,
+    .objMode = 1,
+    .size = 2,
+    .priority = 1
+};
+
+const union AnimCmd gSpriteAnim_821597C[] = {
+    ANIMCMD_FRAME(0, 5, .hFlip = TRUE, .vFlip = TRUE),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gSpriteAnimTable_8215984[] = {
+    gSpriteAnim_821597C
+};
+
+const union AffineAnimCmd gSpriteAffineAnim_8215988[] = {
+    AFFINEANIMCMD_FRAME(-10, -10, 0, 5),
+    AFFINEANIMCMD_FRAME(10, 10, 0, 5),
+    AFFINEANIMCMD_JUMP(0)
+};
+
+const union AffineAnimCmd *const gSpriteAffineAnimTable_82159A0[] = {
+    gSpriteAffineAnim_8215988
+};
+
+const struct SpriteSheet gUnknown_082159A4 = {
+    (const u8 *)gTradeGlow1Tiles, 0x200, 5550
+};
+
+const struct SpritePalette gUnknown_082159AC = {
+    gTradeGlowPalette, 5551
+};
+
+const struct SpritePalette gUnknown_082159B4 = {
+    gTradeCableEndPalette, 5555
+};
+
+const struct SpriteTemplate gSpriteTemplate_82159BC = {
+    5550,
+    5551,
+    &gOamData_8215974,
+    gSpriteAnimTable_8215984,
+    NULL,
+    gSpriteAffineAnimTable_82159A0,
+    sub_804B058
+};
+
+const struct OamData gOamData_82159D4 = {
+    .shape = ST_OAM_V_RECTANGLE,
+    .size = 2,
+    .priority = 1
+};
+
+const union AnimCmd gSpriteAnim_82159DC[] = {
+    ANIMCMD_FRAME(0, 5, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_END
+};
+
+const union AnimCmd gSpriteAnim_82159E4[] = {
+    ANIMCMD_FRAME(8, 5, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gSpriteAnimTable_82159EC[] = {
+    gSpriteAnim_82159DC,
+    gSpriteAnim_82159E4
+};
+
+const struct SpriteSheet gUnknown_082159F4 = {
+    (const u8 *)gTradeGlow2Tiles, 0x300, 5552
+};
+
+const struct SpriteTemplate gSpriteTemplate_82159FC = {
+    5552,
+    5551,
+    &gOamData_82159D4,
+    gSpriteAnimTable_82159EC,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    sub_804B07C
+};
+
+const struct OamData gOamData_8215A14 = {
+    .shape = ST_OAM_V_RECTANGLE,
+    .size = 2,
+    .priority = 1
+};
+
+const union AnimCmd gSpriteAnim_8215A1C[] = {
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gSpriteAnimTable_8215A24[] = {
+    gSpriteAnim_8215A1C
+};
+
+const struct SpriteSheet gUnknown_08215A28 = {
+    (const u8 *)gTradeCableEndTiles, 0x100, 5554
+};
+
+const struct SpriteTemplate gSpriteTemplate_8215A30 = {
+    5554,
+    5555,
+    &gOamData_8215A14,
+    gSpriteAnimTable_8215A24,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    sub_804B0BC
+};
+
+const struct OamData gOamData_8215A48 = {
+    .shape = ST_OAM_H_RECTANGLE,
+    .size = 3,
+    .priority = 1
+};
+
+const union AnimCmd gSpriteAnim_8215A50[] = {
+    ANIMCMD_FRAME( 0, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME(32, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME(64, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME(96, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME(64, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME(32, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME( 0, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_LOOP(8),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gSpriteAnimTable_8215A74[] = {
+    gSpriteAnim_8215A50
+};
+
+const struct SpriteSheet gUnknown_08215A78 = {
+    (const u8 *)gTradeGBAScreenTiles, 0x1000, 5556
+};
+
+const struct SpriteTemplate gSpriteTemplate_8215A80 = {
+    5556,
+    5555,
+    &gOamData_8215A48,
+    gSpriteAnimTable_8215A74,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    sub_804B104
+};
+
+const u16 gTradeGlow2PaletteAnimTable[] = {
+    RGB(18, 24, 31),
+    RGB(18, 24, 31),
+    RGB(18, 24, 31),
+    RGB(31, 31, 31),
+    RGB(31, 31, 31),
+    RGB(31, 31, 31),
+    RGB(18, 24, 31),
+    RGB(18, 24, 31),
+    RGB(18, 24, 31),
+    RGB(31, 31, 31),
+    RGB(31, 31, 31),
+    RGB(31, 31, 31),
+};
+
+const union AffineAnimCmd gSpriteAffineAnim_8215AB0[] = {
+    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_JUMP(0)
+};
+
+const union AffineAnimCmd *const gSpriteAffineAnimTable_8215AC0[] = {
+    gSpriteAffineAnim_8215AB0
+};
 
 const struct InGameTrade gIngameTrades[] = {
     {
@@ -3174,6 +3497,456 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+bool8 sub_804C29C(void)
+{
+    u16 evoTarget;
+
+    switch (gUnknown_03004828->unk_00c4)
+    {
+        case 0:
+            gSprites[gUnknown_03004828->unk_00b8].invisible = FALSE;
+            gSprites[gUnknown_03004828->unk_00b8].pos2.x = -0xb4;
+            gSprites[gUnknown_03004828->unk_00b8].pos2.y = gMonFrontPicCoords[gUnknown_03004828->unk_0120].y_offset;
+            gUnknown_03004828->unk_00c4 ++;
+            gUnknown_03004828->unk_0124 = GetCurrentMapMusic();
+            PlayBGM(BGM_SHINKA);
+            break;
+        case 1:
+            if (gUnknown_03004828->unk_0116 > 0)
+            {
+                gSprites[gUnknown_03004828->unk_00b8].pos2.x += 3;
+                gUnknown_03004828->unk_0116 -= 3;
+            }
+            else
+            {
+                gSprites[gUnknown_03004828->unk_00b8].pos2.x = 0;
+                gUnknown_03004828->unk_0116 = 0;
+                gUnknown_03004828->unk_00c4 = 10;
+            }
+            break;
+
+        case 10:
+            StringExpandPlaceholders(gStringVar4, gTradeText_WillBeSent);
+            sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->unk_0034, 2, 15);
+            gUnknown_03004828->unk_00c4 = 11;
+            gUnknown_03004828->unk_00c0 = 0;
+            break;
+        case 11:
+            if (++gUnknown_03004828->unk_00c0 == 80)
+            {
+                gUnknown_03004828->unk_0102 = sub_8047580(gUnknown_03004828->unk_00b8, gSprites[gUnknown_03004828->unk_00b8].oam.paletteNum, 0x78, 0x20, 0x2, 0x1, 0x14, 0xfffff);
+                gUnknown_03004828->unk_00c4 ++;
+                ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19);
+                StringExpandPlaceholders(gStringVar4, gTradeText_ByeBye);
+                sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->unk_0034, 2, 15);
+            }
+            break;
+        case 12:
+            if (gSprites[gUnknown_03004828->unk_0102].callback == SpriteCallbackDummy && sub_80035AC(&gUnknown_03004828->window) == TRUE)
+            {
+                gUnknown_03004828->unk_0103 = CreateSprite(&gSpriteTemplate_821595C, 0x78, 0x20, 0);
+                gSprites[gUnknown_03004828->unk_0103].callback = sub_804D738;
+                DestroySprite(&gSprites[gUnknown_03004828->unk_0102]);
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            break;
+        case 13:
+            // The game waits here for the sprite to finish its animation sequence.
+            break;
+        case 14:
+            BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+            gUnknown_03004828->unk_00c4 = 20;
+            break;
+
+        case 20:
+            if (!gPaletteFade.active)
+            {
+                sub_804BBE8(4);
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            break;
+        case 21:
+            BeginNormalPaletteFade(-1, -1, 16, 0, 0);
+            gUnknown_03004828->unk_00c4 ++;
+            break;
+        case 22:
+            if (!gPaletteFade.active)
+            {
+                gUnknown_03004828->unk_00c4 = 23;
+            }
+            break;
+        case 23:
+            if (gUnknown_03004828->unk_011a > 0x100)
+            {
+                gUnknown_03004828->unk_011a -= 0x34;
+            }
+            else
+            {
+                sub_804BBE8(1);
+                gUnknown_03004828->unk_011a = 0x80;
+                gUnknown_03004828->unk_00c4 ++;
+                gUnknown_03004828->unk_00c0 = 0;
+            }
+            gUnknown_03004828->unk_0118 = 0x8000 / gUnknown_03004828->unk_011a;
+            break;
+        case 24:
+            if (++ gUnknown_03004828->unk_00c0 > 20)
+            {
+                sub_804BBE8(3);
+                sub_804B128();
+                gUnknown_03004828->unk_00bb = CreateSprite(&gSpriteTemplate_8215A80, 0x78, 0x50, 0);
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            break;
+        case 25:
+            if (gSprites[gUnknown_03004828->unk_00bb].animEnded)
+            {
+                DestroySprite(&gSprites[gUnknown_03004828->unk_00bb]);
+                REG_BLDCNT = 0x640;
+                REG_BLDALPHA = 0x40C;
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            break;
+        case 26:
+            if (-- gUnknown_03004828->unk_0110 == 0x13C)
+            {
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            if (gUnknown_03004828->unk_0110 == 0x148)
+            {
+                gUnknown_03004828->unk_00bc = CreateSprite(&gSpriteTemplate_8215A30, 0x80, 0x41, 0);
+            }
+            break;
+        case 27:
+            gUnknown_03004828->unk_00ba = CreateSprite(&gSpriteTemplate_82159BC, 0x80, 0x50, 3);
+            gUnknown_03004828->unk_00bb = CreateSprite(&gSpriteTemplate_82159FC, 0x80, 0x50, 0);
+            StartSpriteAnim(&gSprites[gUnknown_03004828->unk_00bb], 1);
+            gUnknown_03004828->unk_00c4 ++;
+            break;
+        case 28:
+            if ((gUnknown_03004828->unk_0110 -= 2) == 0xA6)
+            {
+                gUnknown_03004828->unk_00c4 = 200;
+            }
+            sub_804C0F8(0);
+            REG_DISPCNT = DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON;
+            break;
+        case 200:
+            gSprites[gUnknown_03004828->unk_00ba].pos1.y -= 2;
+            gSprites[gUnknown_03004828->unk_00bb].pos1.y -= 2;
+            sub_804C0F8(0);
+            if (gSprites[gUnknown_03004828->unk_00ba].pos1.y < -8)
+            {
+                gUnknown_03004828->unk_00c4 = 29;
+            }
+            break;
+        case 29:
+            BeginNormalPaletteFade(-1, -1, 0, 16, 0);
+            gUnknown_03004828->unk_00c4 = 30;
+            break;
+        case 30:
+            if (!gPaletteFade.active)
+            {
+                DestroySprite(&gSprites[gUnknown_03004828->unk_00ba]);
+                DestroySprite(&gSprites[gUnknown_03004828->unk_00bb]);
+                sub_804BBE8(2);
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            break;
+        case 31:
+            BeginNormalPaletteFade(-1, -1, 16, 0, 0);
+            gUnknown_03004828->unk_00ba = CreateSprite(&gSpriteTemplate_82159FC, 0x6f, 0xaa, 0);
+            gUnknown_03004828->unk_00bb = CreateSprite(&gSpriteTemplate_82159FC, 0x81, -0xa, 0);
+            gUnknown_03004828->unk_00c4 ++;
+            break;
+        case 32:
+            if (!gPaletteFade.active)
+            {
+                PlaySE(SE_TK_WARPOUT);
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            gSprites[gUnknown_03004828->unk_00ba].pos2.y -= 3;
+            gSprites[gUnknown_03004828->unk_00bb].pos2.y += 3;
+            break;
+        case 33:
+            gSprites[gUnknown_03004828->unk_00ba].pos2.y -= 3;
+            gSprites[gUnknown_03004828->unk_00bb].pos2.y += 3;
+            if (gSprites[gUnknown_03004828->unk_00ba].pos2.y <= -0x5a)
+            {
+                gSprites[gUnknown_03004828->unk_00ba].data1 = 1;
+                gSprites[gUnknown_03004828->unk_00bb].data1 = 1;
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            break;
+        case 34:
+            BlendPalettes(1, 16, 0xffff);
+            gUnknown_03004828->unk_00c4 ++;
+            break;
+        case 35:
+            BlendPalettes(1,  0, 0xffff);
+            gUnknown_03004828->unk_00c4 ++;
+            break;
+        case 36:
+            BlendPalettes(1, 16, 0xffff);
+            gUnknown_03004828->unk_00c4 ++;
+            break;
+        case 37:
+            if (!sub_8040A3C(gUnknown_03004828->unk_0120))
+            {
+                gSprites[gUnknown_03004828->unk_00b8].affineAnims = gSpriteAffineAnimTable_8215AC0;
+                gSprites[gUnknown_03004828->unk_00b8].oam.affineMode = 3;
+                CalcCenterToCornerVec(&gSprites[gUnknown_03004828->unk_00b8], 0, 3, 3);
+                StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_00b8], 0);
+            }
+            else
+            {
+                StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_00b8], 0);
+            }
+            StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_00b9], 0);
+            gSprites[gUnknown_03004828->unk_00b8].pos1.x = 0x3c;
+            gSprites[gUnknown_03004828->unk_00b9].pos1.x = 0xb4;
+            gSprites[gUnknown_03004828->unk_00b8].pos1.y = 0xc0;
+            gSprites[gUnknown_03004828->unk_00b9].pos1.y = -0x20;
+            gSprites[gUnknown_03004828->unk_00b8].invisible = FALSE;
+            gSprites[gUnknown_03004828->unk_00b9].invisible = FALSE;
+            gUnknown_03004828->unk_00c4 ++;
+            break;
+        case 38:
+            gSprites[gUnknown_03004828->unk_00b8].pos2.y -= 3;
+            gSprites[gUnknown_03004828->unk_00b9].pos2.y += 3;
+            if (-0xa0 > gSprites[gUnknown_03004828->unk_00b8].pos2.y && gSprites[gUnknown_03004828->unk_00b8].pos2.y >= -0xa3)
+            {
+                PlaySE(SE_TK_WARPIN);
+            }
+            if (gSprites[gUnknown_03004828->unk_00b8].pos2.y < -0xde)
+            {
+                gSprites[gUnknown_03004828->unk_00ba].data1 = 0;
+                gSprites[gUnknown_03004828->unk_00bb].data1 = 0;
+                gUnknown_03004828->unk_00c4 ++;
+                gSprites[gUnknown_03004828->unk_00b8].invisible = TRUE;
+                gSprites[gUnknown_03004828->unk_00b9].invisible = TRUE;
+                BlendPalettes(1,  0, 0xffff);
+            }
+            break;
+        case 39:
+            gSprites[gUnknown_03004828->unk_00ba].pos2.y -= 3;
+            gSprites[gUnknown_03004828->unk_00bb].pos2.y += 3;
+            if (gSprites[gUnknown_03004828->unk_00ba].pos2.y <= -0xde)
+            {
+                BeginNormalPaletteFade(-1, -1, 0, 16, 0);
+                gUnknown_03004828->unk_00c4 ++;
+                DestroySprite(&gSprites[gUnknown_03004828->unk_00ba]);
+                DestroySprite(&gSprites[gUnknown_03004828->unk_00bb]);
+            }
+            break;
+        case 40:
+            if (!gPaletteFade.active)
+            {
+                gUnknown_03004828->unk_00c4 ++;
+                sub_804BBE8(1);
+                gUnknown_03004828->unk_0110 = 0xa6;
+                gUnknown_03004828->unk_00ba = CreateSprite(&gSpriteTemplate_82159BC, 0x80, -0x14, 3);
+                gUnknown_03004828->unk_00bb = CreateSprite(&gSpriteTemplate_82159FC, 0x80, -0x14, 0);
+                StartSpriteAnim(&gSprites[gUnknown_03004828->unk_00bb], 1);
+            }
+            break;
+        case 41:
+            BeginNormalPaletteFade(-1, -1, 16, 0, 0);
+            gUnknown_03004828->unk_00c4 ++;
+            break;
+        case 42:
+            REG_DISPCNT = DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON;
+            sub_804C0F8(1);
+            if (!gPaletteFade.active)
+            {
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            break;
+        case 43:
+            sub_804C0F8(1);
+            gSprites[gUnknown_03004828->unk_00ba].pos2.y += 3;
+            gSprites[gUnknown_03004828->unk_00bb].pos2.y += 3;
+            if (gSprites[gUnknown_03004828->unk_00ba].pos2.y + gSprites[gUnknown_03004828->unk_00ba].pos1.y == 64)
+            {
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            break;
+        case 44:
+            sub_804C0F8(1);
+            if ((gUnknown_03004828->unk_0110 += 2) > 0x13c)
+            {
+                gUnknown_03004828->unk_0110 = 0x13c;
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            break;
+        case 45:
+            DestroySprite(&gSprites[gUnknown_03004828->unk_00ba]);
+            DestroySprite(&gSprites[gUnknown_03004828->unk_00bb]);
+            gUnknown_03004828->unk_00c4 ++;
+            gUnknown_03004828->unk_00c0 = 0;
+            break;
+        case 46:
+            if (++ gUnknown_03004828->unk_00c0 == 10)
+            {
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            break;
+        case 47:
+            if (++ gUnknown_03004828->unk_0110 > 0x15c)
+            {
+                gUnknown_03004828->unk_0110 = 0x15c;
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            if (gUnknown_03004828->unk_0110 == 0x148)
+                gUnknown_03004828->unk_00bc = CreateSprite(&gSpriteTemplate_8215A30, 0x80, 0x41, 0);
+            gSprites[gUnknown_03004828->unk_00bc].callback = sub_804B0E0;
+            break;
+        case 48:
+            gUnknown_03004828->unk_00bb = CreateSprite(&gSpriteTemplate_8215A80, 0x78, 0x50, 0);
+            gUnknown_03004828->unk_00c4 = 50;
+            break;
+
+        case 50:
+            if (gSprites[gUnknown_03004828->unk_00bb].animEnded)
+            {
+                DestroySprite(&gSprites[gUnknown_03004828->unk_00bb]);
+                sub_804BBE8(6);
+                gUnknown_03004828->unk_00c4 ++;
+                PlaySE(SE_W028);
+            }
+            break;
+        case 51:
+            if (gUnknown_03004828->unk_011a < 0x400)
+            {
+                gUnknown_03004828->unk_011a += 0x34;
+            }
+            else
+            {
+                gUnknown_03004828->unk_011a = 0x400;
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            gUnknown_03004828->unk_0118 = 0x8000 / gUnknown_03004828->unk_011a;
+            break;
+        case 52:
+            BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+            gUnknown_03004828->unk_00c4 = 60;
+            break;
+
+        case 60:
+            if (!gPaletteFade.active)
+            {
+                sub_804BBE8(5);
+                sub_804BBE8(7);
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            break;
+        case 61:
+            BeginNormalPaletteFade(-1, 0, 16, 0, 0);
+            gUnknown_03004828->unk_00c4 ++;
+            break;
+        case 62:
+            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG2_ON | DISPCNT_OBJ_ON;
+            if (!gPaletteFade.active)
+            {
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            break;
+        case 63:
+            gUnknown_03004828->unk_0103 = CreateSprite(&gSpriteTemplate_821595C, 0x78, -0x8, 0);
+            gSprites[gUnknown_03004828->unk_0103].data3 = 0x4a;
+            gSprites[gUnknown_03004828->unk_0103].callback = sub_804D80C;
+            StartSpriteAnim(&gSprites[gUnknown_03004828->unk_0103], 1);
+            StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_0103], 2);
+            BlendPalettes(1 << (16 + gSprites[gUnknown_03004828->unk_0103].oam.paletteNum), 16, 0xffff);
+            gUnknown_03004828->unk_00c4 ++;
+            gUnknown_03004828->unk_00c0 = 0;
+            break;
+        case 64:
+            BeginNormalPaletteFade(1 << (16 + gSprites[gUnknown_03004828->unk_0103].oam.paletteNum), 1, 16, 0, 0xffff);
+            gUnknown_03004828->unk_00c4 ++;
+            break;
+        case 65:
+            if (gSprites[gUnknown_03004828->unk_0103].callback == SpriteCallbackDummy)
+            {
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            break;
+        case 66:
+            gSprites[gUnknown_03004828->unk_00b9].pos1.x = 0x78;
+            gSprites[gUnknown_03004828->unk_00b9].pos1.y = gMonFrontPicCoords[gUnknown_03004828->unk_0122].y_offset + 60;
+            gSprites[gUnknown_03004828->unk_00b9].pos2.x = 0;
+            gSprites[gUnknown_03004828->unk_00b9].pos2.y = 0;
+            CreatePokeballSprite(gUnknown_03004828->unk_00b9, gSprites[gUnknown_03004828->unk_00b9].oam.paletteNum, 0x78, 0x54, 2, 1, 0x14, 0xfffff);
+            FreeSpriteOamMatrix(&gSprites[gUnknown_03004828->unk_0103]);
+            DestroySprite(&gSprites[gUnknown_03004828->unk_0103]);
+            gUnknown_03004828->unk_00c4 ++;
+            break;
+        case 67:
+            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON;
+            ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19);
+            StringExpandPlaceholders(gStringVar4, gTradeText_SentOverPoke);
+            sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->unk_0034, 2, 15);
+            gUnknown_03004828->unk_00c4 ++;
+            gUnknown_03004828->unk_00c0 = 0;
+            break;
+        case 68:
+            if (++ gUnknown_03004828->unk_00c0 == 4)
+            {
+                PlayFanfare(BGM_FANFA5);
+            }
+            if (gUnknown_03004828->unk_00c0 == 0xf0)
+            {
+                gUnknown_03004828->unk_00c4 ++;
+                ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19);
+                StringExpandPlaceholders(gStringVar4, gTradeText_TakeGoodCare);
+                sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->unk_0034, 2, 15);
+                gUnknown_03004828->unk_00c0 = 0;
+            }
+            break;
+        case 69: // OneHand
+            if (++ gUnknown_03004828->unk_00c0 == 60)
+            {
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            break;
+        case 70:
+            sub_804E1DC();
+            gUnknown_03004828->unk_00c4 ++;
+            break;
+        case 71:
+            if (gUnknown_03004828->unk_011e)
+            {
+                return TRUE;
+            }
+            else if (gMain.newKeys & A_BUTTON)
+            {
+                gUnknown_03004828->unk_00c4 ++;
+            }
+            break;
+        case 72: // Only if in-game trade
+            sub_804BA94(gSpecialVar_0x8005, 0);
+            gUnknown_03005E94 = sub_804BBCC;
+            evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gUnknown_020297D8[0]], TRUE, ITEM_NONE);
+            if (evoTarget != SPECIES_NONE)
+                TradeEvolutionScene(&gPlayerParty[gUnknown_020297D8[0]], evoTarget, gUnknown_03004828->unk_00b9, gUnknown_020297D8[0]);
+            gUnknown_03004828->unk_00c4 ++;
+            break;
+        case 73:
+            BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+            gUnknown_03004828->unk_00c4 ++;
+            break;
+        case 74:
+            if (!gPaletteFade.active)
+            {
+                PlayBGM(gUnknown_03004828->unk_0124);
+                SetMainCallback2(c2_exit_to_overworld_2_switch);
+                sub_804D8E4();
+            }
+            break;
+    }
+    return FALSE;
+}
+
 void sub_804D588(void)
 {
     u16 evoTarget;
@@ -3272,7 +4045,7 @@ void sub_804D7AC(struct Sprite *sprite)
         if (++ sprite->data0 == 23)
         {
             DestroySprite(sprite);
-            gUnknown_03004828->unk_00c4 = 14;
+            gUnknown_03004828->unk_00c4 = 14; // Resume the master trade animation
         }
     }
 }
-- 
cgit v1.2.3


From 446a95451d059d7b824086c53595736a5ce68d8e Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 4 Sep 2017 15:14:24 -0400
Subject: sub_804C1A8

---
 asm/trade.s  | 104 -----------------------------------------------------------
 data/trade.s |   5 ---
 src/trade.c  |  28 ++++++++++++++--
 3 files changed, 26 insertions(+), 111 deletions(-)
 delete mode 100644 data/trade.s

diff --git a/asm/trade.s b/asm/trade.s
index 0efeabdb7..c0f1ca9b6 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -2516,108 +2516,4 @@ _0804C1A0: .4byte gUnknown_082159AC
 _0804C1A4: .4byte gUnknown_082159B4
 	thumb_func_end sub_804C164
 
-	thumb_func_start sub_804C1A8
-sub_804C1A8: @ 804C1A8
-	push {r4,r5,lr}
-	sub sp, 0x14
-	ldr r0, _0804C21C @ =gUnknown_03004828
-	ldr r0, [r0]
-	movs r1, 0x8F
-	lsls r1, 1
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0804C23C
-	bl GetMultiplayerId
-	lsls r0, 24
-	ldr r3, _0804C220 @ =gStringVar1
-	movs r2, 0x80
-	lsls r2, 17
-	eors r2, r0
-	lsrs r2, 24
-	lsls r1, r2, 3
-	subs r1, r2
-	lsls r1, 2
-	ldr r0, _0804C224 @ =gLinkPlayers + 0x8
-	adds r1, r0
-	adds r0, r3, 0
-	bl StringCopy
-	ldr r5, _0804C228 @ =gUnknown_020297D8
-	ldrb r0, [r5, 0x1]
-	movs r1, 0x6
-	bl __umodsi3
-	lsls r0, 24
-	lsrs r0, 24
-	movs r4, 0x64
-	muls r0, r4
-	ldr r1, _0804C22C @ =gEnemyParty
-	adds r0, r1
-	movs r1, 0x2
-	mov r2, sp
-	bl GetMonData
-	ldr r0, _0804C230 @ =gStringVar3
-	mov r1, sp
-	bl StringCopy10
-	ldrb r0, [r5]
-	muls r0, r4
-	ldr r1, _0804C234 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x2
-	mov r2, sp
-	bl GetMonData
-	ldr r0, _0804C238 @ =gStringVar2
-	mov r1, sp
-	bl StringCopy10
-	b _0804C278
-	.align 2, 0
-_0804C21C: .4byte gUnknown_03004828
-_0804C220: .4byte gStringVar1
-_0804C224: .4byte gLinkPlayers + 0x8
-_0804C228: .4byte gUnknown_020297D8
-_0804C22C: .4byte gEnemyParty
-_0804C230: .4byte gStringVar3
-_0804C234: .4byte gPlayerParty
-_0804C238: .4byte gStringVar2
-_0804C23C:
-	ldr r0, _0804C280 @ =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	lsls r4, r0, 4
-	subs r4, r0
-	lsls r4, 2
-	ldr r0, _0804C284 @ =gIngameTrades
-	adds r4, r0
-	ldr r0, _0804C288 @ =gStringVar1
-	adds r1, r4, 0
-	adds r1, 0x2B
-	bl StringCopy
-	ldr r0, _0804C28C @ =gStringVar3
-	adds r1, r4, 0
-	bl StringCopy10
-	ldr r0, _0804C290 @ =gSpecialVar_0x8005
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _0804C294 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x2
-	mov r2, sp
-	bl GetMonData
-	ldr r0, _0804C298 @ =gStringVar2
-	mov r1, sp
-	bl StringCopy10
-_0804C278:
-	add sp, 0x14
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804C280: .4byte gSpecialVar_0x8004
-_0804C284: .4byte gIngameTrades
-_0804C288: .4byte gStringVar1
-_0804C28C: .4byte gStringVar3
-_0804C290: .4byte gSpecialVar_0x8005
-_0804C294: .4byte gPlayerParty
-_0804C298: .4byte gStringVar2
-	thumb_func_end sub_804C1A8
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/data/trade.s b/data/trade.s
deleted file mode 100644
index 508e86c63..000000000
--- a/data/trade.s
+++ /dev/null
@@ -1,5 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
diff --git a/src/trade.c b/src/trade.c
index 3ec01246c..2443f1a57 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -153,7 +153,7 @@ struct TradeEwramSubstruct2 {
     /*0x0118*/ u16 unk_0118;
     /*0x011a*/ u16 unk_011a;
     /*0x011c*/ u8 filler_011c[2];
-    /*0x011e*/ u8 unk_011e;
+    /*0x011e*/ u8 isLinkTrade;
     /*0x0120*/ u16 unk_0120;
     /*0x0122*/ u16 unk_0122;
     /*0x0124*/ u16 unk_0124;
@@ -3497,6 +3497,30 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804C1A8(void)
+{
+    u8 mpId;
+    u8 string[20];
+    const struct InGameTrade *ingameTrade;
+    if (gUnknown_03004828->isLinkTrade)
+    {
+        mpId = GetMultiplayerId();
+        StringCopy(gStringVar1, gLinkPlayers[mpId ^ 1].name);
+        GetMonData(&gEnemyParty[gUnknown_020297D8[1] % 6], MON_DATA_NICKNAME, string);
+        StringCopy10(gStringVar3, string);
+        GetMonData(&gPlayerParty[gUnknown_020297D8[0]], MON_DATA_NICKNAME, string);
+        StringCopy10(gStringVar2, string);
+    }
+    else
+    {
+        ingameTrade = &gIngameTrades[gSpecialVar_0x8004];
+        StringCopy(gStringVar1, ingameTrade->otName);
+        StringCopy10(gStringVar3, ingameTrade->name);
+        GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_NICKNAME, string);
+        StringCopy10(gStringVar2, string);
+    }
+}
+
 bool8 sub_804C29C(void)
 {
     u16 evoTarget;
@@ -3914,7 +3938,7 @@ bool8 sub_804C29C(void)
             gUnknown_03004828->unk_00c4 ++;
             break;
         case 71:
-            if (gUnknown_03004828->unk_011e)
+            if (gUnknown_03004828->isLinkTrade)
             {
                 return TRUE;
             }
-- 
cgit v1.2.3


From e09012be02234e323e14493d14b8533bb74dfad8 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 4 Sep 2017 15:16:52 -0400
Subject: sub_804C164

---
 asm/trade.s | 26 --------------------------
 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;
-- 
cgit v1.2.3


From 058653a00b2855d6b8e25b24649667fe90316274 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 4 Sep 2017 15:25:20 -0400
Subject: sub_804C0F8

---
 asm/trade.s | 58 ----------------------------------------------------------
 src/trade.c | 29 ++++++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 61 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 6d0c2135c..5a57bf8d3 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -2432,62 +2432,4 @@ _0804C0F0: .4byte gUnknown_0820F798
 _0804C0F4: .4byte 0x06009000
 	thumb_func_end sub_804BBE8
 
-	thumb_func_start sub_804C0F8
-sub_804C0F8: @ 804C0F8
-	push {lr}
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804C130
-	ldr r0, _0804C128 @ =gUnknown_03004828
-	ldr r2, [r0]
-	movs r1, 0x88
-	lsls r1, 1
-	adds r0, r2, r1
-	movs r3, 0
-	ldrsh r1, [r0, r3]
-	ldr r0, _0804C12C @ =0x00000109
-	cmp r1, r0
-	bgt _0804C15A
-	adds r0, 0x5
-	adds r1, r2, r0
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-	movs r3, 0x8E
-	lsls r3, 1
-	adds r1, r2, r3
-	b _0804C154
-	.align 2, 0
-_0804C128: .4byte gUnknown_03004828
-_0804C12C: .4byte 0x00000109
-_0804C130:
-	ldr r0, _0804C160 @ =gUnknown_03004828
-	ldr r0, [r0]
-	mov r12, r0
-	movs r2, 0x87
-	lsls r2, 1
-	add r2, r12
-	ldrh r3, [r2]
-	movs r0, 0
-	ldrsh r1, [r2, r0]
-	movs r0, 0x40
-	negs r0, r0
-	cmp r1, r0
-	ble _0804C15A
-	subs r0, r3, 0x1
-	strh r0, [r2]
-	movs r1, 0x8E
-	lsls r1, 1
-	add r1, r12
-_0804C154:
-	ldrh r0, [r1]
-	adds r0, 0x40
-	strh r0, [r1]
-_0804C15A:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804C160: .4byte gUnknown_03004828
-	thumb_func_end sub_804C0F8
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index 723b6e8f8..a1ca4a173 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -146,13 +146,16 @@ struct TradeEwramSubstruct2 {
     /*0x00c6*/ u8 filler_00c6[0x3c];
     /*0x0102*/ u8 unk_0102;
     /*0x0103*/ u8 unk_0103;
-    /*0x0104*/ u8 filler_0104[0x0c];
+    /*0x0104*/ u8 filler_0104[0x08];
+    /*0x010c*/ u16 unk_010c;
+    /*0x010e*/ s16 unk_010e;
     /*0x0110*/ s16 unk_0110;
-    /*0x0112*/ u8 filler_0112[4];
+    /*0x0112*/ u16 unk_0112;
+    /*0x0114*/ u16 unk_0114;
     /*0x0116*/ s16 unk_0116;
     /*0x0118*/ u16 unk_0118;
     /*0x011a*/ u16 unk_011a;
-    /*0x011c*/ u8 filler_011c[2];
+    /*0x011c*/ u16 unk_011c;
     /*0x011e*/ u8 isLinkTrade;
     /*0x0120*/ u16 unk_0120;
     /*0x0122*/ u16 unk_0122;
@@ -3497,6 +3500,26 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804C0F8(u8 a0)
+{
+    if (a0 == 0)
+    {
+        if (gUnknown_03004828->unk_0110 < 0x10a)
+        {
+            gUnknown_03004828->unk_010e ++;
+            gUnknown_03004828->unk_011c += 64;
+        }
+    }
+    else
+    {
+        if (gUnknown_03004828->unk_010e > -0x40)
+        {
+            gUnknown_03004828->unk_010e --;
+            gUnknown_03004828->unk_011c += 64;
+        }
+    }
+}
+
 void sub_804C164(void)
 {
     LoadSpriteSheet(&gUnknown_082159A4);
-- 
cgit v1.2.3


From f2a6e0a58d9bef9b8d9b8d3db2198da488d36749 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 4 Sep 2017 17:18:02 -0400
Subject: sub_804BBE8 and new DmaCopy macros

---
 asm/trade.s         | 587 ----------------------------------------------------
 include/gba/macro.h |  34 +++
 src/trade.c         |  93 ++++++++-
 3 files changed, 126 insertions(+), 588 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 5a57bf8d3..ffacff8b3 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -1845,591 +1845,4 @@ sub_804BBCC: @ 804BBCC
 	bx r0
 	thumb_func_end sub_804BBCC
 
-	thumb_func_start sub_804BBE8
-sub_804BBE8: @ 804BBE8
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x7
-	bls _0804BBF4
-	b _0804C0CA
-_0804BBF4:
-	lsls r0, 2
-	ldr r1, _0804BC00 @ =_0804BC04
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0804BC00: .4byte _0804BC04
-	.align 2, 0
-_0804BC04:
-	.4byte _0804BC24
-	.4byte _0804BCC4
-	.4byte _0804BD5C
-	.4byte _0804BDA4
-	.4byte _0804BE48
-	.4byte _0804BEF8
-	.4byte _0804BFA0
-	.4byte _0804C060
-_0804BC24:
-	ldr r0, _0804BCA0 @ =gUnknown_0820C9F8
-	movs r1, 0x10
-	movs r2, 0xA0
-	bl LoadPalette
-	ldr r3, _0804BCA4 @ =gUnknown_0820CA98
-	ldr r4, _0804BCA8 @ =0x06004000
-	movs r5, 0x98
-	lsls r5, 5
-	ldr r1, _0804BCAC @ =0x040000d4
-	ldr r6, _0804BCB0 @ =0x80000800
-	movs r2, 0x80
-	lsls r2, 5
-	movs r7, 0x80
-	lsls r7, 24
-_0804BC42:
-	str r3, [r1]
-	str r4, [r1, 0x4]
-	str r6, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	adds r3, r2
-	adds r4, r2
-	subs r5, r2
-	cmp r5, r2
-	bhi _0804BC42
-	str r3, [r1]
-	str r4, [r1, 0x4]
-	lsrs r0, r5, 1
-	orrs r0, r7
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	ldr r1, _0804BCB4 @ =gUnknown_0820F798
-	ldr r2, _0804BCB8 @ =0x06009000
-	ldr r0, _0804BCAC @ =0x040000d4
-	str r1, [r0]
-	str r2, [r0, 0x4]
-	ldr r1, _0804BCB0 @ =0x80000800
-	str r1, [r0, 0x8]
-	ldr r0, [r0, 0x8]
-	ldr r0, _0804BCBC @ =gUnknown_03004828
-	ldr r2, [r0]
-	movs r0, 0x8A
-	lsls r0, 1
-	adds r1, r2, r0
-	movs r0, 0
-	strh r0, [r1]
-	movs r3, 0x8B
-	lsls r3, 1
-	adds r1, r2, r3
-	movs r0, 0xB4
-	strh r0, [r1]
-	movs r1, 0x80
-	lsls r1, 19
-	movs r4, 0xBA
-	lsls r4, 5
-	adds r0, r4, 0
-	strh r0, [r1]
-	adds r1, 0xC
-	ldr r2, _0804BCC0 @ =0x00005206
-	adds r0, r2, 0
-	strh r0, [r1]
-	b _0804C0CA
-	.align 2, 0
-_0804BCA0: .4byte gUnknown_0820C9F8
-_0804BCA4: .4byte gUnknown_0820CA98
-_0804BCA8: .4byte 0x06004000
-_0804BCAC: .4byte 0x040000d4
-_0804BCB0: .4byte 0x80000800
-_0804BCB4: .4byte gUnknown_0820F798
-_0804BCB8: .4byte 0x06009000
-_0804BCBC: .4byte gUnknown_03004828
-_0804BCC0: .4byte 0x00005206
-_0804BCC4:
-	ldr r0, _0804BD3C @ =gUnknown_03004828
-	ldr r2, [r0]
-	movs r3, 0x89
-	lsls r3, 1
-	adds r1, r2, r3
-	movs r0, 0
-	strh r0, [r1]
-	movs r4, 0x88
-	lsls r4, 1
-	adds r0, r2, r4
-	movs r1, 0xAE
-	lsls r1, 1
-	strh r1, [r0]
-	ldr r0, _0804BD40 @ =REG_BG1VOFS
-	strh r1, [r0]
-	ldr r1, _0804BD44 @ =REG_BG1CNT
-	ldr r2, _0804BD48 @ =0x00008502
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r0, _0804BD4C @ =gUnknown_08210798
-	ldr r2, _0804BD50 @ =0x06002800
-	movs r3, 0x80
-	lsls r3, 5
-	adds r1, 0xCA
-	str r0, [r1]
-	str r2, [r1, 0x4]
-	lsrs r0, r3, 1
-	movs r2, 0x80
-	lsls r2, 24
-	orrs r0, r2
-	str r0, [r1, 0x8]
-	ldr r4, [r1, 0x8]
-	ldr r4, _0804BD54 @ =gUnknown_0820CA98
-	movs r5, 0xC0
-	lsls r5, 19
-	movs r6, 0x98
-	lsls r6, 5
-	adds r7, r0, 0
-_0804BD10:
-	str r4, [r1]
-	str r5, [r1, 0x4]
-	str r7, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	adds r4, r3
-	adds r5, r3
-	subs r6, r3
-	cmp r6, r3
-	bhi _0804BD10
-	str r4, [r1]
-	str r5, [r1, 0x4]
-	lsrs r0, r6, 1
-	orrs r0, r2
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	movs r1, 0x80
-	lsls r1, 19
-	ldr r3, _0804BD58 @ =0x00001241
-	adds r0, r3, 0
-	strh r0, [r1]
-	b _0804C0CA
-	.align 2, 0
-_0804BD3C: .4byte gUnknown_03004828
-_0804BD40: .4byte REG_BG1VOFS
-_0804BD44: .4byte REG_BG1CNT
-_0804BD48: .4byte 0x00008502
-_0804BD4C: .4byte gUnknown_08210798
-_0804BD50: .4byte 0x06002800
-_0804BD54: .4byte gUnknown_0820CA98
-_0804BD58: .4byte 0x00001241
-_0804BD5C:
-	ldr r0, _0804BD8C @ =gUnknown_03004828
-	ldr r2, [r0]
-	movs r4, 0x88
-	lsls r4, 1
-	adds r0, r2, r4
-	movs r1, 0
-	strh r1, [r0]
-	movs r3, 0x89
-	lsls r3, 1
-	adds r0, r2, r3
-	strh r1, [r0]
-	movs r1, 0x80
-	lsls r1, 19
-	ldr r4, _0804BD90 @ =0x00001241
-	adds r0, r4, 0
-	strh r0, [r1]
-	ldr r1, _0804BD94 @ =gUnknown_08211798
-	ldr r2, _0804BD98 @ =0x06002800
-	ldr r0, _0804BD9C @ =0x040000d4
-	str r1, [r0]
-	str r2, [r0, 0x4]
-	ldr r1, _0804BDA0 @ =0x80000400
-	b _0804C0C6
-	.align 2, 0
-_0804BD8C: .4byte gUnknown_03004828
-_0804BD90: .4byte 0x00001241
-_0804BD94: .4byte gUnknown_08211798
-_0804BD98: .4byte 0x06002800
-_0804BD9C: .4byte 0x040000d4
-_0804BDA0: .4byte 0x80000400
-_0804BDA4:
-	movs r1, 0x80
-	lsls r1, 19
-	movs r2, 0x92
-	lsls r2, 5
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r0, _0804BE24 @ =gUnknown_03004828
-	ldr r3, [r0]
-	movs r4, 0x82
-	lsls r4, 1
-	adds r1, r3, r4
-	movs r2, 0
-	movs r0, 0x40
-	strh r0, [r1]
-	adds r4, 0x2
-	adds r1, r3, r4
-	strh r0, [r1]
-	adds r0, 0xCC
-	adds r1, r3, r0
-	movs r0, 0x78
-	strh r0, [r1]
-	adds r4, 0x8
-	adds r1, r3, r4
-	ldr r0, _0804BE28 @ =0x0000ffba
-	strh r0, [r1]
-	movs r1, 0x8E
-	lsls r1, 1
-	adds r0, r3, r1
-	strh r2, [r0]
-	ldr r3, _0804BE2C @ =gUnknown_0820DD98
-	ldr r4, _0804BE30 @ =0x06004000
-	movs r5, 0xD0
-	lsls r5, 5
-	ldr r2, _0804BE34 @ =gUnknown_08211F98
-	mov r12, r2
-	ldr r1, _0804BE38 @ =0x040000d4
-	ldr r6, _0804BE3C @ =0x80000800
-	movs r2, 0x80
-	lsls r2, 5
-	movs r7, 0x80
-	lsls r7, 24
-_0804BDF6:
-	str r3, [r1]
-	str r4, [r1, 0x4]
-	str r6, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	adds r3, r2
-	adds r4, r2
-	subs r5, r2
-	cmp r5, r2
-	bhi _0804BDF6
-	str r3, [r1]
-	str r4, [r1, 0x4]
-	lsrs r0, r5, 1
-	orrs r0, r7
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	ldr r1, _0804BE40 @ =0x06009000
-	ldr r0, _0804BE38 @ =0x040000d4
-	mov r3, r12
-	str r3, [r0]
-	str r1, [r0, 0x4]
-	ldr r1, _0804BE44 @ =0x80000080
-	b _0804C0C6
-	.align 2, 0
-_0804BE24: .4byte gUnknown_03004828
-_0804BE28: .4byte 0x0000ffba
-_0804BE2C: .4byte gUnknown_0820DD98
-_0804BE30: .4byte 0x06004000
-_0804BE34: .4byte gUnknown_08211F98
-_0804BE38: .4byte 0x040000d4
-_0804BE3C: .4byte 0x80000800
-_0804BE40: .4byte 0x06009000
-_0804BE44: .4byte 0x80000080
-_0804BE48:
-	movs r1, 0x80
-	lsls r1, 19
-	ldr r4, _0804BED0 @ =0x00001441
-	adds r0, r4, 0
-	strh r0, [r1]
-	adds r1, 0xC
-	ldr r2, _0804BED4 @ =0x00001287
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r0, _0804BED8 @ =gUnknown_03004828
-	ldr r3, [r0]
-	movs r4, 0x82
-	lsls r4, 1
-	adds r1, r3, r4
-	movs r2, 0
-	movs r0, 0x40
-	strh r0, [r1]
-	adds r0, 0xC6
-	adds r1, r3, r0
-	movs r0, 0x5C
-	strh r0, [r1]
-	adds r4, 0x14
-	adds r1, r3, r4
-	movs r0, 0x20
-	strh r0, [r1]
-	adds r0, 0xFA
-	adds r1, r3, r0
-	movs r0, 0x80
-	lsls r0, 3
-	strh r0, [r1]
-	movs r1, 0x8E
-	lsls r1, 1
-	adds r0, r3, r1
-	strh r2, [r0]
-	ldr r3, _0804BEDC @ =gUnknown_08213738
-	ldr r4, _0804BEE0 @ =0x06004000
-	movs r5, 0x81
-	lsls r5, 6
-	ldr r2, _0804BEE4 @ =gUnknown_08215778
-	mov r12, r2
-	ldr r1, _0804BEE8 @ =0x040000d4
-	ldr r6, _0804BEEC @ =0x80000800
-	movs r2, 0x80
-	lsls r2, 5
-	movs r7, 0x80
-	lsls r7, 24
-_0804BEA4:
-	str r3, [r1]
-	str r4, [r1, 0x4]
-	str r6, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	adds r3, r2
-	adds r4, r2
-	subs r5, r2
-	cmp r5, r2
-	bhi _0804BEA4
-	str r3, [r1]
-	str r4, [r1, 0x4]
-	lsrs r0, r5, 1
-	orrs r0, r7
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	ldr r1, _0804BEF0 @ =0x06009000
-	ldr r0, _0804BEE8 @ =0x040000d4
-	mov r3, r12
-	str r3, [r0]
-	str r1, [r0, 0x4]
-	ldr r1, _0804BEF4 @ =0x80000080
-	b _0804C0C6
-	.align 2, 0
-_0804BED0: .4byte 0x00001441
-_0804BED4: .4byte 0x00001287
-_0804BED8: .4byte gUnknown_03004828
-_0804BEDC: .4byte gUnknown_08213738
-_0804BEE0: .4byte 0x06004000
-_0804BEE4: .4byte gUnknown_08215778
-_0804BEE8: .4byte 0x040000d4
-_0804BEEC: .4byte 0x80000800
-_0804BEF0: .4byte 0x06009000
-_0804BEF4: .4byte 0x80000080
-_0804BEF8:
-	ldr r0, _0804BF78 @ =gUnknown_03004828
-	ldr r2, [r0]
-	movs r4, 0x88
-	lsls r4, 1
-	adds r0, r2, r4
-	movs r1, 0
-	strh r1, [r0]
-	movs r3, 0x89
-	lsls r3, 1
-	adds r0, r2, r3
-	strh r1, [r0]
-	ldr r1, _0804BF7C @ =REG_BG1CNT
-	ldr r4, _0804BF80 @ =0x00000502
-	adds r0, r4, 0
-	strh r0, [r1]
-	ldr r0, _0804BF84 @ =gUnknown_08D00000
-	movs r1, 0xC0
-	lsls r1, 19
-	bl LZDecompressVram
-	ldr r0, _0804BF88 @ =gUnknown_08D00524
-	ldr r4, _0804BF8C @ =0x02000000
-	movs r2, 0x80
-	lsls r2, 4
-	adds r1, r4, 0
-	bl CpuSet
-	ldr r0, _0804BF90 @ =gUnknown_08D004E0
-	movs r1, 0x70
-	movs r2, 0x20
-	bl LoadCompressedPalette
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0x2
-	bl FillPalette
-	movs r0, 0xE0
-	lsls r0, 7
-	adds r2, r0, 0
-	movs r1, 0xA0
-	lsls r1, 2
-_0804BF4C:
-	ldrh r0, [r4]
-	orrs r0, r2
-	strh r0, [r4]
-	adds r4, 0x2
-	subs r1, 0x1
-	cmp r1, 0
-	bne _0804BF4C
-	ldr r1, _0804BF8C @ =0x02000000
-	ldr r2, _0804BF94 @ =0x06002800
-	ldr r0, _0804BF98 @ =0x040000d4
-	str r1, [r0]
-	str r2, [r0, 0x4]
-	ldr r1, _0804BF9C @ =0x80000280
-	str r1, [r0, 0x8]
-	ldr r0, [r0, 0x8]
-	movs r0, 0x2
-	movs r1, 0xF
-	movs r2, 0x1B
-	movs r3, 0x12
-	bl MenuZeroFillWindowRect
-	b _0804C0CA
-	.align 2, 0
-_0804BF78: .4byte gUnknown_03004828
-_0804BF7C: .4byte REG_BG1CNT
-_0804BF80: .4byte 0x00000502
-_0804BF84: .4byte gUnknown_08D00000
-_0804BF88: .4byte gUnknown_08D00524
-_0804BF8C: .4byte 0x02000000
-_0804BF90: .4byte gUnknown_08D004E0
-_0804BF94: .4byte 0x06002800
-_0804BF98: .4byte 0x040000d4
-_0804BF9C: .4byte 0x80000280
-_0804BFA0:
-	movs r1, 0x80
-	lsls r1, 19
-	ldr r2, _0804C038 @ =0x00001441
-	adds r0, r2, 0
-	strh r0, [r1]
-	adds r1, 0xC
-	ldr r3, _0804C03C @ =0x00001287
-	adds r0, r3, 0
-	strh r0, [r1]
-	ldr r0, _0804C040 @ =gUnknown_03004828
-	ldr r3, [r0]
-	movs r4, 0x82
-	lsls r4, 1
-	adds r1, r3, r4
-	movs r2, 0
-	movs r0, 0x40
-	strh r0, [r1]
-	adds r0, 0xC6
-	adds r1, r3, r0
-	movs r0, 0x5C
-	strh r0, [r1]
-	adds r4, 0x14
-	adds r1, r3, r4
-	adds r0, 0xA4
-	strh r0, [r1]
-	adds r0, 0x1A
-	adds r1, r3, r0
-	movs r0, 0x80
-	strh r0, [r1]
-	subs r4, 0xC
-	adds r1, r3, r4
-	movs r0, 0x78
-	strh r0, [r1]
-	adds r0, 0x96
-	adds r1, r3, r0
-	movs r0, 0x50
-	strh r0, [r1]
-	movs r1, 0x8E
-	lsls r1, 1
-	adds r0, r3, r1
-	strh r2, [r0]
-	ldr r3, _0804C044 @ =gUnknown_08213738
-	ldr r4, _0804C048 @ =0x06004000
-	movs r5, 0x81
-	lsls r5, 6
-	ldr r2, _0804C04C @ =gUnknown_08215778
-	mov r12, r2
-	ldr r1, _0804C050 @ =0x040000d4
-	ldr r6, _0804C054 @ =0x80000800
-	movs r2, 0x80
-	lsls r2, 5
-	movs r7, 0x80
-	lsls r7, 24
-_0804C00A:
-	str r3, [r1]
-	str r4, [r1, 0x4]
-	str r6, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	adds r3, r2
-	adds r4, r2
-	subs r5, r2
-	cmp r5, r2
-	bhi _0804C00A
-	str r3, [r1]
-	str r4, [r1, 0x4]
-	lsrs r0, r5, 1
-	orrs r0, r7
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	ldr r1, _0804C058 @ =0x06009000
-	ldr r0, _0804C050 @ =0x040000d4
-	mov r3, r12
-	str r3, [r0]
-	str r1, [r0, 0x4]
-	ldr r1, _0804C05C @ =0x80000080
-	b _0804C0C6
-	.align 2, 0
-_0804C038: .4byte 0x00001441
-_0804C03C: .4byte 0x00001287
-_0804C040: .4byte gUnknown_03004828
-_0804C044: .4byte gUnknown_08213738
-_0804C048: .4byte 0x06004000
-_0804C04C: .4byte gUnknown_08215778
-_0804C050: .4byte 0x040000d4
-_0804C054: .4byte 0x80000800
-_0804C058: .4byte 0x06009000
-_0804C05C: .4byte 0x80000080
-_0804C060:
-	ldr r0, _0804C0D0 @ =gUnknown_03004828
-	ldr r2, [r0]
-	movs r4, 0x8A
-	lsls r4, 1
-	adds r0, r2, r4
-	movs r1, 0
-	strh r1, [r0]
-	movs r3, 0x8B
-	lsls r3, 1
-	adds r0, r2, r3
-	strh r1, [r0]
-	ldr r1, _0804C0D4 @ =REG_BG2CNT
-	ldr r4, _0804C0D8 @ =0x00005206
-	adds r0, r4, 0
-	strh r0, [r1]
-	ldr r0, _0804C0DC @ =gUnknown_0820C9F8
-	movs r1, 0x10
-	movs r2, 0xA0
-	bl LoadPalette
-	ldr r3, _0804C0E0 @ =gUnknown_0820CA98
-	ldr r4, _0804C0E4 @ =0x06004000
-	movs r5, 0x98
-	lsls r5, 5
-	ldr r1, _0804C0E8 @ =0x040000d4
-	ldr r6, _0804C0EC @ =0x80000800
-	movs r2, 0x80
-	lsls r2, 5
-	movs r7, 0x80
-	lsls r7, 24
-_0804C09C:
-	str r3, [r1]
-	str r4, [r1, 0x4]
-	str r6, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	adds r3, r2
-	adds r4, r2
-	subs r5, r2
-	cmp r5, r2
-	bhi _0804C09C
-	str r3, [r1]
-	str r4, [r1, 0x4]
-	lsrs r0, r5, 1
-	orrs r0, r7
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	ldr r1, _0804C0F0 @ =gUnknown_0820F798
-	ldr r2, _0804C0F4 @ =0x06009000
-	ldr r0, _0804C0E8 @ =0x040000d4
-	str r1, [r0]
-	str r2, [r0, 0x4]
-	ldr r1, _0804C0EC @ =0x80000800
-_0804C0C6:
-	str r1, [r0, 0x8]
-	ldr r0, [r0, 0x8]
-_0804C0CA:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804C0D0: .4byte gUnknown_03004828
-_0804C0D4: .4byte REG_BG2CNT
-_0804C0D8: .4byte 0x00005206
-_0804C0DC: .4byte gUnknown_0820C9F8
-_0804C0E0: .4byte gUnknown_0820CA98
-_0804C0E4: .4byte 0x06004000
-_0804C0E8: .4byte 0x040000d4
-_0804C0EC: .4byte 0x80000800
-_0804C0F0: .4byte gUnknown_0820F798
-_0804C0F4: .4byte 0x06009000
-	thumb_func_end sub_804BBE8
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/include/gba/macro.h b/include/gba/macro.h
index 230fb4383..1e0254806 100644
--- a/include/gba/macro.h
+++ b/include/gba/macro.h
@@ -84,4 +84,38 @@
     dmaRegs[5];                                                 \
 }
 
+#define DmaCopyLarge(dmaNum, src, dest, size, block, bit) \
+{                                                         \
+    const void *_src = src;                               \
+    void *_dest = dest;                                   \
+    u32 _size = size;                                     \
+    while (1)                                             \
+    {                                                     \
+        DmaCopy##bit(dmaNum, _src, _dest, (block));       \
+        _src += (block);                                  \
+        _dest += (block);                                 \
+        _size -= (block);                                 \
+        if (_size <= (block))                             \
+        {                                                 \
+            DmaCopy##bit(dmaNum, _src, _dest, _size);     \
+            break;                                        \
+        }                                                 \
+    }                                                     \
+}
+
+#define DmaCopyLarge16(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 16)
+
+#define DmaCopyLarge32(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 32)
+
+#define DmaCopyDefvars(dmaNum, src, dest, size, bit) \
+{                                                    \
+    const void *_src = src;                          \
+    void *_dest = dest;                              \
+    u32 _size = size;                                \
+    DmaCopy##bit(dmaNum, _src, _dest, _size);        \
+}
+
+#define DmaCopy16Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 16)
+#define DmaCopy32Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 32)
+
 #endif // GUARD_GBA_MACRO_H
diff --git a/src/trade.c b/src/trade.c
index a1ca4a173..3da3e2d11 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -146,7 +146,9 @@ struct TradeEwramSubstruct2 {
     /*0x00c6*/ u8 filler_00c6[0x3c];
     /*0x0102*/ u8 unk_0102;
     /*0x0103*/ u8 unk_0103;
-    /*0x0104*/ u8 filler_0104[0x08];
+    /*0x0104*/ u16 unk_0104;
+    /*0x0106*/ u16 unk_0106;
+    /*0x0108*/ u8 filler_0108[0x04];
     /*0x010c*/ u16 unk_010c;
     /*0x010e*/ s16 unk_010e;
     /*0x0110*/ s16 unk_0110;
@@ -3500,6 +3502,95 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804BBE8(u8 a0)
+{
+    int i;
+    u16 *buffer;
+    switch (a0)
+    {
+        case 0:
+            LoadPalette(gUnknown_0820C9F8, 0x10, 0xa0);
+            DmaCopyLarge16(3, gUnknown_0820CA98, (void *)BG_CHAR_ADDR(1), 0x1300, 0x1000);
+            DmaCopy16Defvars(3, gUnknown_0820F798, (void *)BG_SCREEN_ADDR(18), 0x1000);
+            gUnknown_03004828->unk_0114 = 0;
+            gUnknown_03004828->unk_0116 = 0xb4;
+            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON;
+            REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(18) | BGCNT_TXT512x256;
+            break;
+        case 1:
+            gUnknown_03004828->unk_0112 = 0;
+            gUnknown_03004828->unk_0110 = 0x15c;
+            REG_BG1VOFS = 0x15c;
+            REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(5) | BGCNT_TXT256x512;
+
+            DmaCopy16Defvars(3, gUnknown_08210798, (void *)BG_SCREEN_ADDR(5), 0x1000);
+            DmaCopyLarge16(3, gUnknown_0820CA98, (void *)BG_CHAR_ADDR(0), 0x1300, 0x1000);
+            REG_DISPCNT = DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_OBJ_ON;
+            break;
+        case 2:
+            gUnknown_03004828->unk_0110 = 0;
+            gUnknown_03004828->unk_0112 = 0;
+            REG_DISPCNT = DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_OBJ_ON;
+            DmaCopy16Defvars(3, gUnknown_08211798, (void *)BG_SCREEN_ADDR(5), 0x800);
+            break;
+        case 3:
+            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_OBJ_ON;
+            gUnknown_03004828->unk_0104 = 0x40;
+            gUnknown_03004828->unk_0106 = 0x40;
+            gUnknown_03004828->unk_010c = 0x78;
+            gUnknown_03004828->unk_010e = -0x46;
+            gUnknown_03004828->unk_011c = 0;
+            DmaCopyLarge16(3, gUnknown_0820DD98, (void *)BG_CHAR_ADDR(1), 0x1a00, 0x1000);
+            DmaCopy16Defvars(3, gUnknown_08211F98, (void *)BG_SCREEN_ADDR(18), 0x100);
+            break;
+        case 4:
+            REG_DISPCNT = DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG2_ON | DISPCNT_OBJ_ON;
+            REG_BG2CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(1) | BGCNT_256COLOR | BGCNT_SCREENBASE(18);
+            gUnknown_03004828->unk_0104 = 0x40;
+            gUnknown_03004828->unk_0106 = 0x5c;
+            gUnknown_03004828->unk_0118 = 0x20;
+            gUnknown_03004828->unk_011a = 0x400;
+            gUnknown_03004828->unk_011c = 0;
+            DmaCopyLarge16(3, gUnknown_08213738, (void *)BG_CHAR_ADDR(1), 0x2040, 0x1000);
+            DmaCopy16Defvars(3, gUnknown_08215778, (void *)BG_SCREEN_ADDR(18), 0x100);
+            break;
+        case 5:
+            gUnknown_03004828->unk_0110 = 0;
+            gUnknown_03004828->unk_0112 = 0;
+            REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(5);
+            LZDecompressVram(gUnknown_08D00000, (void *)BG_CHAR_ADDR(0));
+            CpuCopy16(gUnknown_08D00524, buffer = (u16 *)ewram, 0x1000);
+            LoadCompressedPalette(gUnknown_08D004E0, 0x70, 0x20);
+            FillPalette(0, 0, 2);
+            for (i = 0; i < 0x280; i ++)
+                buffer[i] |= 0x7000;
+            DmaCopy16Defvars(3, ewram, (void *)BG_SCREEN_ADDR(5), 0x500);
+            MenuZeroFillWindowRect(2, 15, 27, 18);
+            break;
+        case 6:
+            REG_DISPCNT = DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG2_ON | DISPCNT_OBJ_ON;
+            REG_BG2CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(1) | BGCNT_256COLOR | BGCNT_SCREENBASE(18);
+            gUnknown_03004828->unk_0104 = 0x40;
+            gUnknown_03004828->unk_0106 = 0x5c;
+            gUnknown_03004828->unk_0118 = 0x100;
+            gUnknown_03004828->unk_011a = 0x80;
+            gUnknown_03004828->unk_010c = 0x78;
+            gUnknown_03004828->unk_010e = 0x50;
+            gUnknown_03004828->unk_011c = 0;
+            DmaCopyLarge16(3, gUnknown_08213738, (void *)BG_CHAR_ADDR(1), 0x2040, 0x1000);
+            DmaCopy16Defvars(3, gUnknown_08215778, (void *)BG_SCREEN_ADDR(18), 0x100);
+            break;
+        case 7:
+            gUnknown_03004828->unk_0114 = 0;
+            gUnknown_03004828->unk_0116 = 0;
+            REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(18) | BGCNT_TXT512x256;
+            LoadPalette(gUnknown_0820C9F8, 0x10, 0xa0);
+            DmaCopyLarge16(3, gUnknown_0820CA98, (void *)BG_CHAR_ADDR(1), 0x1300, 0x1000);
+            DmaCopy16Defvars(3, gUnknown_0820F798, (void *)BG_SCREEN_ADDR(18), 0x1000);
+            break;
+    }
+}
+
 void sub_804C0F8(u8 a0)
 {
     if (a0 == 0)
-- 
cgit v1.2.3


From e807ff370712511f4cb0997683892c2e3320518d Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 4 Sep 2017 17:22:30 -0400
Subject: sub_804BB78

---
 asm/trade.s | 57 ---------------------------------------------------------
 src/trade.c | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 57 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index ffacff8b3..8cfc23345 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -1788,61 +1788,4 @@ _0804BB70: .4byte gUnknown_02029700
 _0804BB74: .4byte gReceivedRemoteLinkPlayers
 	thumb_func_end sub_804BA94
 
-	thumb_func_start sub_804BB78
-sub_804BB78: @ 804BB78
-	push {r4,lr}
-	ldr r4, _0804BB8C @ =gUnknown_03004828
-	ldr r0, [r4]
-	adds r0, 0xBD
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0804BB90
-	cmp r0, 0x2
-	beq _0804BBB6
-	b _0804BBC0
-	.align 2, 0
-_0804BB8C: .4byte gUnknown_03004828
-_0804BB90:
-	bl sub_8007ECC
-	lsls r0, 24
-	cmp r0, 0
-	beq _0804BBB6
-	bl bitmask_all_link_players_but_self
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, [r4]
-	adds r1, 0x9E
-	movs r2, 0x14
-	bl SendBlock
-	ldr r1, [r4]
-	adds r1, 0xBD
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-_0804BBB6:
-	ldr r0, _0804BBC8 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r0, 0xBD
-	movs r1, 0
-	strb r1, [r0]
-_0804BBC0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804BBC8: .4byte gUnknown_03004828
-	thumb_func_end sub_804BB78
-
-	thumb_func_start sub_804BBCC
-sub_804BBCC: @ 804BBCC
-	push {lr}
-	bl sub_804C29C
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804BBCC
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index 3da3e2d11..ada0f5ace 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -3502,6 +3502,32 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804BB78(void)
+{
+    switch (gUnknown_03004828->unk_00bd)
+    {
+        case 1:
+            if (sub_8007ECC())
+            {
+                Trade_SendData(gUnknown_03004828);
+                gUnknown_03004828->unk_00bd ++;
+            }
+            // fallthrough
+        case 2:
+            gUnknown_03004828->unk_00bd = 0;
+            break;
+    }
+}
+
+void sub_804BBCC(void)
+{
+    sub_804C29C();
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
 void sub_804BBE8(u8 a0)
 {
     int i;
-- 
cgit v1.2.3


From c121c19a159d902fb697df71fc60dbbd511da567 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 4 Sep 2017 17:36:04 -0400
Subject: sub_804BA94

---
 asm/trade.s | 105 ------------------------------------------------------------
 src/trade.c |  33 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 106 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 8cfc23345..49fdce61c 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -1683,109 +1683,4 @@ _0804BA8C:
 _0804BA90: .4byte gLinkPlayers
 	thumb_func_end sub_804BA64
 
-	thumb_func_start sub_804BA94
-sub_804BA94: @ 804BA94
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x4
-	adds r4, r1, 0
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r5, 0x64
-	mov r1, r9
-	muls r1, r5
-	ldr r0, _0804BB60 @ =gPlayerParty
-	adds r7, r1, r0
-	adds r0, r7, 0
-	movs r1, 0x40
-	bl GetMonData
-	lsls r0, 16
-	lsrs r6, r0, 16
-	adds r1, r4, 0
-	muls r1, r5
-	ldr r0, _0804BB64 @ =gEnemyParty
-	adds r5, r1, r0
-	adds r0, r5, 0
-	movs r1, 0x40
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	mov r8, r0
-	cmp r6, 0xFF
-	beq _0804BAE8
-	lsls r0, r6, 3
-	adds r0, r6
-	lsls r0, 2
-	ldr r1, _0804BB68 @ =gSaveBlock1 + 0x2B4C
-	adds r0, r1
-	bl ClearMailStruct
-_0804BAE8:
-	ldr r4, _0804BB6C @ =gUnknown_03004828
-	ldr r0, [r4]
-	adds r0, 0x38
-	adds r1, r7, 0
-	movs r2, 0x64
-	bl memcpy
-	adds r0, r7, 0
-	adds r1, r5, 0
-	movs r2, 0x64
-	bl memcpy
-	ldr r1, [r4]
-	adds r1, 0x38
-	adds r0, r5, 0
-	movs r2, 0x64
-	bl memcpy
-	movs r1, 0x46
-	mov r0, sp
-	strb r1, [r0]
-	adds r0, r7, 0
-	movs r1, 0x2D
-	bl GetMonData
-	cmp r0, 0
-	bne _0804BB28
-	adds r0, r7, 0
-	movs r1, 0x20
-	mov r2, sp
-	bl SetMonData
-_0804BB28:
-	mov r0, r8
-	cmp r0, 0xFF
-	beq _0804BB3E
-	lsls r1, r0, 3
-	add r1, r8
-	lsls r1, 2
-	ldr r0, _0804BB70 @ =gUnknown_02029700
-	adds r1, r0
-	adds r0, r7, 0
-	bl GiveMailToMon2
-_0804BB3E:
-	mov r0, r9
-	bl sub_804BA18
-	ldr r0, _0804BB74 @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0804BB50
-	bl sub_804BA64
-_0804BB50:
-	add sp, 0x4
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804BB60: .4byte gPlayerParty
-_0804BB64: .4byte gEnemyParty
-_0804BB68: .4byte gSaveBlock1 + 0x2B4C
-_0804BB6C: .4byte gUnknown_03004828
-_0804BB70: .4byte gUnknown_02029700
-_0804BB74: .4byte gReceivedRemoteLinkPlayers
-	thumb_func_end sub_804BA94
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index ada0f5ace..c3e8c6a6f 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -128,7 +128,7 @@ struct TradeEwramSubstruct2 {
     /*0x0000*/ u8 filler_0000;
     /*0x0004*/ struct Window window;
     /*0x0034*/ u8 unk_0034;
-    /*0x0035*/ u8 filler_0035[0x67];
+    /*0x0038*/ struct Pokemon pokemon;
     /*0x009c*/ u8 unk_009c;
     /*0x009d*/ u8 unk_009d;
     /*0x009e*/ u16 linkData[13];
@@ -245,6 +245,8 @@ void sub_804D80C(struct Sprite *);
 void sub_804E1DC(void);
 void sub_804BBCC(void);
 void sub_804D8E4(void);
+void sub_804BA18(u8);
+void sub_804BA64(void);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -3502,6 +3504,35 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804BA94(u8 a0, u8 a1)
+{
+    u8 friendship;
+    struct Pokemon *playerPokemon = &gPlayerParty[a0];
+    u16 playerMail = GetMonData(playerPokemon, MON_DATA_MAIL);
+
+    struct Pokemon *friendPokemon = &gEnemyParty[a1];
+    u16 friendMail = GetMonData(friendPokemon, MON_DATA_MAIL);
+
+    if (playerMail != 0xff)
+        ClearMailStruct(&gSaveBlock1.mail[playerMail]);
+
+    // This is where the actual trade happens!!
+    gUnknown_03004828->pokemon = *playerPokemon;
+    *playerPokemon = *friendPokemon;
+    *friendPokemon = gUnknown_03004828->pokemon;
+
+    friendship = 70;
+    if (!GetMonData(playerPokemon, MON_DATA_IS_EGG))
+        SetMonData(playerPokemon, MON_DATA_FRIENDSHIP, &friendship);
+
+    if (friendMail != 0xff)
+        GiveMailToMon2(playerPokemon, &gUnknown_02029700[friendMail]);
+
+    sub_804BA18(a0);
+    if (gReceivedRemoteLinkPlayers)
+        sub_804BA64();
+}
+
 void sub_804BB78(void)
 {
     switch (gUnknown_03004828->unk_00bd)
-- 
cgit v1.2.3


From ce7f9a1cab4ed09809aef9e550050cef7c62488f Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 4 Sep 2017 17:42:33 -0400
Subject: sub_804BA18

---
 asm/trade.s | 65 -------------------------------------------------------------
 src/trade.c | 21 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 67 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 49fdce61c..b8377897f 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -1618,69 +1618,4 @@ _0804BA10: .4byte gPaletteFade
 _0804BA14: .4byte sub_804BBCC
 	thumb_func_end sub_804B790
 
-	thumb_func_start sub_804BA18
-sub_804BA18: @ 804BA18
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	muls r1, r0
-	ldr r0, _0804BA60 @ =gPlayerParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0x2D
-	bl GetMonData
-	cmp r0, 0
-	bne _0804BA5A
-	adds r0, r4, 0
-	movs r1, 0xB
-	movs r2, 0
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	bl SpeciesToNationalPokedexNum
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	adds r0, r4, 0
-	movs r1, 0x2
-	bl GetNationalPokedexFlag
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl GetNationalPokedexFlag
-_0804BA5A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804BA60: .4byte gPlayerParty
-	thumb_func_end sub_804BA18
-
-	thumb_func_start sub_804BA64
-sub_804BA64: @ 804BA64
-	push {lr}
-	bl GetMultiplayerId
-	lsls r0, 24
-	ldr r2, _0804BA90 @ =gLinkPlayers
-	movs r1, 0x80
-	lsls r1, 17
-	eors r1, r0
-	lsrs r1, 24
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r1, [r0, 0x2]
-	movs r0, 0x80
-	lsls r0, 8
-	cmp r1, r0
-	bne _0804BA8C
-	bl EnableNationalPokedex
-_0804BA8C:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804BA90: .4byte gLinkPlayers
-	thumb_func_end sub_804BA64
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index c3e8c6a6f..4e4903e51 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -34,6 +34,7 @@
 #include "mail_data.h"
 #include "evolution_scene.h"
 #include "pokeball.h"
+#include "pokedex.h"
 #include "trade.h"
 
 #ifdef ENGLISH
@@ -245,8 +246,6 @@ void sub_804D80C(struct Sprite *);
 void sub_804E1DC(void);
 void sub_804BBCC(void);
 void sub_804D8E4(void);
-void sub_804BA18(u8);
-void sub_804BA64(void);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -3504,6 +3503,24 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+static void sub_804BA18(u8 partyIdx)
+{
+    struct Pokemon *pokemon = &gPlayerParty[partyIdx];
+    if (!GetMonData(pokemon, MON_DATA_IS_EGG))
+    {
+        u16 species = SpeciesToNationalPokedexNum(GetMonData(pokemon, MON_DATA_SPECIES, NULL));
+        GetNationalPokedexFlag(species, 2);
+        GetNationalPokedexFlag(species, 3);
+    }
+}
+
+static void sub_804BA64(void)
+{
+    u8 mpId = GetMultiplayerId();
+    if (gLinkPlayers[mpId ^ 1].lp_field_2 == 0x8000)
+        EnableNationalPokedex();
+}
+
 void sub_804BA94(u8 a0, u8 a1)
 {
     u8 friendship;
-- 
cgit v1.2.3


From f2675d17a7f7717f1f59fabf33225bec6c2a8826 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 4 Sep 2017 18:29:35 -0400
Subject: sub_804B790

---
 asm/trade.s | 273 ------------------------------------------------------------
 src/trade.c |  95 ++++++++++++++++++++-
 2 files changed, 94 insertions(+), 274 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index b8377897f..845b9df6f 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -1345,277 +1345,4 @@ _0804B788: .4byte gPaletteFade
 _0804B78C: .4byte sub_804DB84
 	thumb_func_end sub_804B41C
 
-	thumb_func_start sub_804B790
-sub_804B790: @ 804B790
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	sub sp, 0x10
-	ldr r1, _0804B7B4 @ =gMain
-	ldr r2, _0804B7B8 @ =0x0000043c
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	adds r2, r1, 0
-	cmp r0, 0xC
-	bls _0804B7A8
-	b _0804B9F2
-_0804B7A8:
-	lsls r0, 2
-	ldr r1, _0804B7BC @ =_0804B7C0
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0804B7B4: .4byte gMain
-_0804B7B8: .4byte 0x0000043c
-_0804B7BC: .4byte _0804B7C0
-	.align 2, 0
-_0804B7C0:
-	.4byte _0804B7F4
-	.4byte _0804B9F2
-	.4byte _0804B9F2
-	.4byte _0804B9F2
-	.4byte _0804B9F2
-	.4byte _0804B914
-	.4byte _0804B92C
-	.4byte _0804B944
-	.4byte _0804B94E
-	.4byte _0804B968
-	.4byte _0804B9A0
-	.4byte _0804B9AA
-	.4byte _0804B9E0
-_0804B7F4:
-	ldr r1, _0804B8E0 @ =gUnknown_020297D8
-	ldr r0, _0804B8E4 @ =gSpecialVar_0x8005
-	ldrh r0, [r0]
-	movs r6, 0
-	strb r0, [r1]
-	movs r0, 0x6
-	strb r0, [r1, 0x1]
-	ldr r4, _0804B8E8 @ =gLinkPlayers + 0x8
-	ldr r1, _0804B8EC @ =gSaveBlock2
-	adds r0, r4, 0
-	bl StringCopy
-	ldr r0, _0804B8F0 @ =gEnemyParty
-	movs r1, 0x7
-	add r2, sp, 0x4
-	bl GetMonData
-	adds r4, 0x1C
-	adds r0, r4, 0
-	add r1, sp, 0x4
-	bl StringCopy
-	movs r0, 0x80
-	lsls r0, 19
-	movs r3, 0
-	mov r8, r3
-	strh r6, [r0]
-	bl ResetTasks
-	ldr r5, _0804B8F4 @ =gUnknown_03004828
-	ldr r0, _0804B8F8 @ =0x0201f000
-	str r0, [r5]
-	bl ResetSpriteData
-	bl FreeAllSpritePalettes
-	ldr r0, _0804B8FC @ =sub_804B210
-	bl SetVBlankCallback
-	bl sub_804B228
-	ldr r4, _0804B900 @ =gWindowConfig_81E717C
-	adds r0, r4, 0
-	bl SetUpWindowConfig
-	ldr r0, [r5]
-	adds r0, 0x4
-	adds r1, r4, 0
-	bl InitWindowFromConfig
-	movs r0, 0x2
-	bl SetTextWindowBaseTileNum
-	ldr r1, [r5]
-	adds r1, 0x34
-	strb r0, [r1]
-	ldr r0, [r5]
-	adds r0, 0x4
-	bl LoadTextWindowGraphics
-	bl MenuZeroFillScreen
-	ldr r1, _0804B904 @ =gLinkType
-	ldr r2, _0804B908 @ =0x00001144
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r0, [r5]
-	movs r3, 0x8F
-	lsls r3, 1
-	adds r0, r3
-	mov r1, r8
-	strb r1, [r0]
-	ldr r2, [r5]
-	adds r0, r2, 0
-	adds r0, 0xB6
-	strh r6, [r0]
-	adds r0, 0xE
-	strh r6, [r0]
-	subs r3, 0x1A
-	adds r0, r2, r3
-	movs r1, 0x40
-	strh r1, [r0]
-	adds r3, 0x2
-	adds r0, r2, r3
-	strh r1, [r0]
-	adds r1, 0xC8
-	adds r0, r2, r1
-	strh r6, [r0]
-	adds r3, 0x4
-	adds r0, r2, r3
-	strh r6, [r0]
-	movs r0, 0x86
-	lsls r0, 1
-	adds r1, r2, r0
-	movs r0, 0x78
-	strh r0, [r1]
-	adds r3, 0x4
-	adds r1, r2, r3
-	movs r0, 0x50
-	strh r0, [r1]
-	adds r0, 0xC8
-	adds r1, r2, r0
-	subs r0, 0x18
-	strh r0, [r1]
-	movs r1, 0x8E
-	lsls r1, 1
-	adds r0, r2, r1
-	strh r6, [r0]
-	adds r0, r2, 0
-	adds r0, 0xC0
-	str r6, [r0]
-	ldr r0, _0804B90C @ =gMain
-	ldr r2, _0804B910 @ =0x0000043c
-	adds r0, r2
-	movs r1, 0x5
-	strb r1, [r0]
-	b _0804B9F2
-	.align 2, 0
-_0804B8E0: .4byte gUnknown_020297D8
-_0804B8E4: .4byte gSpecialVar_0x8005
-_0804B8E8: .4byte gLinkPlayers + 0x8
-_0804B8EC: .4byte gSaveBlock2
-_0804B8F0: .4byte gEnemyParty
-_0804B8F4: .4byte gUnknown_03004828
-_0804B8F8: .4byte 0x0201f000
-_0804B8FC: .4byte sub_804B210
-_0804B900: .4byte gWindowConfig_81E717C
-_0804B904: .4byte gLinkType
-_0804B908: .4byte 0x00001144
-_0804B90C: .4byte gMain
-_0804B910: .4byte 0x0000043c
-_0804B914:
-	movs r0, 0
-	movs r1, 0
-	bl sub_804B2D0
-	ldr r1, _0804B924 @ =gMain
-	ldr r3, _0804B928 @ =0x0000043c
-	adds r1, r3
-	b _0804B9D0
-	.align 2, 0
-_0804B924: .4byte gMain
-_0804B928: .4byte 0x0000043c
-_0804B92C:
-	movs r0, 0
-	movs r1, 0x1
-	bl sub_804B2D0
-	ldr r1, _0804B93C @ =gMain
-	ldr r0, _0804B940 @ =0x0000043c
-	adds r1, r0
-	b _0804B9D0
-	.align 2, 0
-_0804B93C: .4byte gMain
-_0804B940: .4byte 0x0000043c
-_0804B944:
-	movs r0, 0x1
-	movs r1, 0
-	bl sub_804B2D0
-	b _0804B9CA
-_0804B94E:
-	movs r0, 0x1
-	movs r1, 0x1
-	bl sub_804B2D0
-	ldr r1, _0804B960 @ =gMain
-	ldr r3, _0804B964 @ =0x0000043c
-	adds r1, r3
-	b _0804B9D0
-	.align 2, 0
-_0804B960: .4byte gMain
-_0804B964: .4byte 0x0000043c
-_0804B968:
-	bl sub_804C164
-	ldr r0, _0804B988 @ =gUnknown_0821594C
-	bl LoadSpriteSheet
-	ldr r0, _0804B98C @ =gUnknown_08215954
-	bl LoadSpritePalette
-	ldr r1, _0804B990 @ =REG_BG1CNT
-	ldr r2, _0804B994 @ =0x00000502
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r1, _0804B998 @ =gMain
-	ldr r3, _0804B99C @ =0x0000043c
-	adds r1, r3
-	b _0804B9D0
-	.align 2, 0
-_0804B988: .4byte gUnknown_0821594C
-_0804B98C: .4byte gUnknown_08215954
-_0804B990: .4byte REG_BG1CNT
-_0804B994: .4byte 0x00000502
-_0804B998: .4byte gMain
-_0804B99C: .4byte 0x0000043c
-_0804B9A0:
-	ldr r0, _0804B9D8 @ =0x0000043c
-	adds r1, r2, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-_0804B9AA:
-	movs r0, 0x5
-	bl sub_804BBE8
-	movs r0, 0
-	bl sub_804BBE8
-	bl sub_804C1A8
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-_0804B9CA:
-	ldr r1, _0804B9DC @ =gMain
-	ldr r2, _0804B9D8 @ =0x0000043c
-	adds r1, r2
-_0804B9D0:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _0804B9F2
-	.align 2, 0
-_0804B9D8: .4byte 0x0000043c
-_0804B9DC: .4byte gMain
-_0804B9E0:
-	ldr r0, _0804BA10 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0804B9F2
-	ldr r0, _0804BA14 @ =sub_804BBCC
-	bl SetMainCallback2
-_0804B9F2:
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	add sp, 0x10
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804BA10: .4byte gPaletteFade
-_0804BA14: .4byte sub_804BBCC
-	thumb_func_end sub_804B790
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index 4e4903e51..09c0ba4a1 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -149,7 +149,8 @@ struct TradeEwramSubstruct2 {
     /*0x0103*/ u8 unk_0103;
     /*0x0104*/ u16 unk_0104;
     /*0x0106*/ u16 unk_0106;
-    /*0x0108*/ u8 filler_0108[0x04];
+    /*0x0108*/ u16 unk_0108;
+    /*0x010a*/ u16 unk_010a;
     /*0x010c*/ u16 unk_010c;
     /*0x010e*/ s16 unk_010e;
     /*0x0110*/ s16 unk_0110;
@@ -246,6 +247,8 @@ void sub_804D80C(struct Sprite *);
 void sub_804E1DC(void);
 void sub_804BBCC(void);
 void sub_804D8E4(void);
+void sub_804C164(void);
+void sub_804C1A8(void);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -3503,6 +3506,96 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804B210(void);
+
+void sub_804B228(void);
+
+void sub_804B2D0(u8, u8);
+
+void sub_804B790(void)
+{
+    u8 otName[11];
+    switch (gMain.state)
+    {
+        case 0:
+            gUnknown_020297D8[0] = gSpecialVar_0x8005;
+            gUnknown_020297D8[1] = 6;
+            StringCopy(gLinkPlayers[0].name, gSaveBlock2.playerName);
+            GetMonData(&gEnemyParty[0], MON_DATA_OT_NAME, otName);
+            StringCopy(gLinkPlayers[1].name, otName);
+            REG_DISPCNT = 0;
+            ResetTasks();
+            gUnknown_03004828 = &ewram_2010000.unk_0f000;
+            ResetSpriteData();
+            FreeAllSpritePalettes();
+            SetVBlankCallback(sub_804B210);
+            sub_804B228();
+            SetUpWindowConfig(&gWindowConfig_81E717C);
+            InitWindowFromConfig(&gUnknown_03004828->window, &gWindowConfig_81E717C);
+            gUnknown_03004828->unk_0034 = SetTextWindowBaseTileNum(2);
+            LoadTextWindowGraphics(&gUnknown_03004828->window);
+            MenuZeroFillScreen();
+            gLinkType = 0x1144;
+            gUnknown_03004828->isLinkTrade = FALSE;
+            gUnknown_03004828->linkData[12] = 0;
+            gUnknown_03004828->unk_00c4 = 0;
+            gUnknown_03004828->unk_0104 = 0x40;
+            gUnknown_03004828->unk_0106 = 0x40;
+            gUnknown_03004828->unk_0108 = 0;
+            gUnknown_03004828->unk_010a = 0;
+            gUnknown_03004828->unk_010c = 0x78;
+            gUnknown_03004828->unk_010e = 0x50;
+            gUnknown_03004828->unk_0118 = 0x100;
+            gUnknown_03004828->unk_011c = 0;
+            gUnknown_03004828->unk_00c0 = 0;
+            gMain.state = 5;
+            break;
+        case 5:
+            sub_804B2D0(0, 0);
+            gMain.state ++;
+            break;
+        case 6:
+            sub_804B2D0(0, 1);
+            gMain.state ++;
+            break;
+        case 7:
+            sub_804B2D0(1, 0);
+            gMain.state ++;
+            break;
+        case 8:
+            sub_804B2D0(1, 1);
+            gMain.state ++;
+            break;
+        case 9:
+            sub_804C164();
+            LoadSpriteSheet(&gUnknown_0821594C);
+            LoadSpritePalette(&gUnknown_08215954);
+            REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(5);
+            gMain.state ++;
+            break;
+        case 10:
+            gMain.state ++;
+            // fallthrough
+        case 11:
+            sub_804BBE8(5);
+            sub_804BBE8(0);
+            sub_804C1A8();
+            BeginNormalPaletteFade(-1, 0, 16, 0, 0);
+            gMain.state ++;
+            break;
+        case 12:
+            if (!gPaletteFade.active)
+            {
+                SetMainCallback2(sub_804BBCC);
+            }
+            break;
+    }
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
 static void sub_804BA18(u8 partyIdx)
 {
     struct Pokemon *pokemon = &gPlayerParty[partyIdx];
-- 
cgit v1.2.3


From d9058ba71efe5a6487c4817ed6d899514493a5a4 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 4 Sep 2017 19:22:28 -0400
Subject: nonmatching sub_804B41C

---
 asm/trade.s | 381 -------------------------------------------
 src/trade.c | 524 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 514 insertions(+), 391 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 845b9df6f..99c3e8e7d 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -964,385 +964,4 @@ _0804B414: .4byte gSprites
 _0804B418: .4byte SpriteCallbackDummy
 	thumb_func_end sub_804B2D0
 
-	thumb_func_start sub_804B41C
-sub_804B41C: @ 804B41C
-	push {r4-r6,lr}
-	sub sp, 0x4
-	ldr r1, _0804B43C @ =gMain
-	ldr r2, _0804B440 @ =0x0000043c
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	adds r2, r1, 0
-	cmp r0, 0xC
-	bls _0804B430
-	b _0804B76E
-_0804B430:
-	lsls r0, 2
-	ldr r1, _0804B444 @ =_0804B448
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0804B43C: .4byte gMain
-_0804B440: .4byte 0x0000043c
-_0804B444: .4byte _0804B448
-	.align 2, 0
-_0804B448:
-	.4byte _0804B47C
-	.4byte _0804B5AC
-	.4byte _0804B5D4
-	.4byte _0804B5FC
-	.4byte _0804B648
-	.4byte _0804B678
-	.4byte _0804B6A8
-	.4byte _0804B6B2
-	.4byte _0804B6CC
-	.4byte _0804B6E4
-	.4byte _0804B71C
-	.4byte _0804B726
-	.4byte _0804B75C
-_0804B47C:
-	movs r1, 0x80
-	lsls r1, 19
-	movs r0, 0
-	strh r0, [r1]
-	bl ResetTasks
-	bl CloseLink
-	ldr r6, _0804B570 @ =gUnknown_03004828
-	ldr r5, _0804B574 @ =0x0201f000
-	str r5, [r6]
-	bl ResetSpriteData
-	bl FreeAllSpritePalettes
-	ldr r0, _0804B578 @ =sub_804B210
-	bl SetVBlankCallback
-	bl sub_804B228
-	ldr r4, _0804B57C @ =gWindowConfig_81E6F84
-	adds r0, r4, 0
-	bl SetUpWindowConfig
-	ldr r0, [r6]
-	adds r0, 0x4
-	adds r1, r4, 0
-	bl InitWindowFromConfig
-	movs r0, 0x2
-	bl SetTextWindowBaseTileNum
-	ldr r1, [r6]
-	adds r1, 0x34
-	strb r0, [r1]
-	ldr r0, [r6]
-	adds r0, 0x4
-	bl LoadTextWindowGraphics
-	bl MenuZeroFillScreen
-	ldr r1, _0804B580 @ =gLinkType
-	ldr r4, _0804B584 @ =0x00001144
-	adds r0, r4, 0
-	strh r0, [r1]
-	ldr r1, _0804B588 @ =gMain
-	ldr r0, _0804B58C @ =0x0000043c
-	adds r1, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r0, _0804B590 @ =gUnknown_08D00000
-	movs r1, 0xC0
-	lsls r1, 19
-	bl LZDecompressVram
-	ldr r0, _0804B594 @ =gUnknown_08D00524
-	ldr r1, _0804B598 @ =0xfffe1000
-	adds r5, r1
-	movs r2, 0x80
-	lsls r2, 4
-	adds r1, r5, 0
-	bl CpuSet
-	ldr r1, _0804B59C @ =0x06002800
-	ldr r0, _0804B5A0 @ =0x040000d4
-	str r5, [r0]
-	str r1, [r0, 0x4]
-	ldr r1, _0804B5A4 @ =0x80000280
-	str r1, [r0, 0x8]
-	ldr r0, [r0, 0x8]
-	ldr r0, _0804B5A8 @ =gUnknown_08D004E0
-	movs r1, 0
-	movs r2, 0x20
-	bl LoadCompressedPalette
-	ldr r1, [r6]
-	adds r0, r1, 0
-	adds r0, 0xB6
-	movs r2, 0
-	strh r2, [r0]
-	adds r0, 0xE
-	strh r2, [r0]
-	movs r4, 0x8F
-	lsls r4, 1
-	adds r1, r4
-	movs r0, 0x1
-	strb r0, [r1]
-	ldr r3, [r6]
-	movs r1, 0x82
-	lsls r1, 1
-	adds r0, r3, r1
-	movs r1, 0x40
-	strh r1, [r0]
-	subs r4, 0x18
-	adds r0, r3, r4
-	strh r1, [r0]
-	adds r1, 0xC8
-	adds r0, r3, r1
-	strh r2, [r0]
-	adds r4, 0x4
-	adds r0, r3, r4
-	strh r2, [r0]
-	movs r0, 0x86
-	lsls r0, 1
-	adds r1, r3, r0
-	movs r0, 0x78
-	strh r0, [r1]
-	adds r4, 0x4
-	adds r1, r3, r4
-	movs r0, 0x50
-	strh r0, [r1]
-	adds r0, 0xC8
-	adds r1, r3, r0
-	subs r0, 0x18
-	strh r0, [r1]
-	movs r1, 0x8E
-	lsls r1, 1
-	adds r0, r3, r1
-	strh r2, [r0]
-	b _0804B76E
-	.align 2, 0
-_0804B570: .4byte gUnknown_03004828
-_0804B574: .4byte 0x0201f000
-_0804B578: .4byte sub_804B210
-_0804B57C: .4byte gWindowConfig_81E6F84
-_0804B580: .4byte gLinkType
-_0804B584: .4byte 0x00001144
-_0804B588: .4byte gMain
-_0804B58C: .4byte 0x0000043c
-_0804B590: .4byte gUnknown_08D00000
-_0804B594: .4byte gUnknown_08D00524
-_0804B598: .4byte 0xfffe1000
-_0804B59C: .4byte 0x06002800
-_0804B5A0: .4byte 0x040000d4
-_0804B5A4: .4byte 0x80000280
-_0804B5A8: .4byte gUnknown_08D004E0
-_0804B5AC:
-	bl OpenLink
-	ldr r1, _0804B5C8 @ =gMain
-	ldr r2, _0804B5CC @ =0x0000043c
-	adds r1, r2
-	ldrb r0, [r1]
-	adds r0, 0x1
-	movs r2, 0
-	strb r0, [r1]
-	ldr r0, _0804B5D0 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r0, 0xC0
-	str r2, [r0]
-	b _0804B76E
-	.align 2, 0
-_0804B5C8: .4byte gMain
-_0804B5CC: .4byte 0x0000043c
-_0804B5D0: .4byte gUnknown_03004828
-_0804B5D4:
-	ldr r0, _0804B5F4 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r1, r0, 0
-	adds r1, 0xC0
-	ldr r0, [r1]
-	adds r0, 0x1
-	str r0, [r1]
-	cmp r0, 0x3C
-	bhi _0804B5E8
-	b _0804B76E
-_0804B5E8:
-	movs r0, 0
-	str r0, [r1]
-	ldr r4, _0804B5F8 @ =0x0000043c
-	adds r1, r2, r4
-	b _0804B74C
-	.align 2, 0
-_0804B5F4: .4byte gUnknown_03004828
-_0804B5F8: .4byte 0x0000043c
-_0804B5FC:
-	bl IsLinkMaster
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804B608
-	b _0804B746
-_0804B608:
-	bl GetLinkPlayerCount_2
-	adds r4, r0, 0
-	bl sub_800820C
-	lsls r4, 24
-	lsls r0, 24
-	cmp r4, r0
-	bcs _0804B61C
-	b _0804B76E
-_0804B61C:
-	ldr r0, _0804B63C @ =gUnknown_03004828
-	ldr r1, [r0]
-	adds r1, 0xC0
-	ldr r0, [r1]
-	adds r0, 0x1
-	str r0, [r1]
-	cmp r0, 0x1E
-	bhi _0804B62E
-	b _0804B76E
-_0804B62E:
-	bl sub_8007F4C
-	ldr r1, _0804B640 @ =gMain
-	ldr r0, _0804B644 @ =0x0000043c
-	adds r1, r0
-	b _0804B74C
-	.align 2, 0
-_0804B63C: .4byte gUnknown_03004828
-_0804B640: .4byte gMain
-_0804B644: .4byte 0x0000043c
-_0804B648:
-	bl sub_804B24C
-	ldr r0, _0804B66C @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0804B656
-	b _0804B76E
-_0804B656:
-	bl IsLinkPlayerDataExchangeComplete
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0804B664
-	b _0804B76E
-_0804B664:
-	ldr r1, _0804B670 @ =gMain
-	ldr r4, _0804B674 @ =0x0000043c
-	adds r1, r4
-	b _0804B74C
-	.align 2, 0
-_0804B66C: .4byte gReceivedRemoteLinkPlayers
-_0804B670: .4byte gMain
-_0804B674: .4byte 0x0000043c
-_0804B678:
-	ldr r2, _0804B69C @ =gUnknown_03004828
-	ldr r0, [r2]
-	adds r0, 0x9C
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, [r2]
-	adds r0, 0x9D
-	strb r1, [r0]
-	ldr r0, [r2]
-	adds r0, 0xBD
-	strb r1, [r0]
-	movs r0, 0
-	bl sub_804B2D0
-	ldr r1, _0804B6A0 @ =gMain
-	ldr r0, _0804B6A4 @ =0x0000043c
-	adds r1, r0
-	b _0804B74C
-	.align 2, 0
-_0804B69C: .4byte gUnknown_03004828
-_0804B6A0: .4byte gMain
-_0804B6A4: .4byte 0x0000043c
-_0804B6A8:
-	movs r0, 0
-	movs r1, 0x1
-	bl sub_804B2D0
-	b _0804B746
-_0804B6B2:
-	movs r0, 0x1
-	movs r1, 0
-	bl sub_804B2D0
-	ldr r1, _0804B6C4 @ =gMain
-	ldr r4, _0804B6C8 @ =0x0000043c
-	adds r1, r4
-	b _0804B74C
-	.align 2, 0
-_0804B6C4: .4byte gMain
-_0804B6C8: .4byte 0x0000043c
-_0804B6CC:
-	movs r0, 0x1
-	movs r1, 0x1
-	bl sub_804B2D0
-	ldr r1, _0804B6DC @ =gMain
-	ldr r0, _0804B6E0 @ =0x0000043c
-	adds r1, r0
-	b _0804B74C
-	.align 2, 0
-_0804B6DC: .4byte gMain
-_0804B6E0: .4byte 0x0000043c
-_0804B6E4:
-	bl sub_804C164
-	ldr r0, _0804B704 @ =gUnknown_0821594C
-	bl LoadSpriteSheet
-	ldr r0, _0804B708 @ =gUnknown_08215954
-	bl LoadSpritePalette
-	ldr r1, _0804B70C @ =REG_BG1CNT
-	ldr r2, _0804B710 @ =0x00000502
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r1, _0804B714 @ =gMain
-	ldr r4, _0804B718 @ =0x0000043c
-	adds r1, r4
-	b _0804B74C
-	.align 2, 0
-_0804B704: .4byte gUnknown_0821594C
-_0804B708: .4byte gUnknown_08215954
-_0804B70C: .4byte REG_BG1CNT
-_0804B710: .4byte 0x00000502
-_0804B714: .4byte gMain
-_0804B718: .4byte 0x0000043c
-_0804B71C:
-	ldr r0, _0804B754 @ =0x0000043c
-	adds r1, r2, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-_0804B726:
-	movs r0, 0x5
-	bl sub_804BBE8
-	movs r0, 0
-	bl sub_804BBE8
-	bl sub_804C1A8
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-_0804B746:
-	ldr r1, _0804B758 @ =gMain
-	ldr r2, _0804B754 @ =0x0000043c
-	adds r1, r2
-_0804B74C:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _0804B76E
-	.align 2, 0
-_0804B754: .4byte 0x0000043c
-_0804B758: .4byte gMain
-_0804B75C:
-	ldr r0, _0804B788 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0804B76E
-	ldr r0, _0804B78C @ =sub_804DB84
-	bl SetMainCallback2
-_0804B76E:
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804B788: .4byte gPaletteFade
-_0804B78C: .4byte sub_804DB84
-	thumb_func_end sub_804B41C
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index 09c0ba4a1..aa3296969 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -128,11 +128,12 @@ struct UnkStructF {
 struct TradeEwramSubstruct2 {
     /*0x0000*/ u8 filler_0000;
     /*0x0004*/ struct Window window;
-    /*0x0034*/ u8 unk_0034;
+    /*0x0034*/ u8 textWindowBaseTileNum;
     /*0x0038*/ struct Pokemon pokemon;
     /*0x009c*/ u8 unk_009c;
     /*0x009d*/ u8 unk_009d;
-    /*0x009e*/ u16 linkData[13];
+    /*0x009e*/ u16 linkData[12];
+    /*0x00b6*/ u16 unk_00b6;
     // Sprite indices
     /*0x00b8*/ u8 unk_00b8;
     /*0x00b9*/ u8 unk_00b9;
@@ -249,6 +250,7 @@ void sub_804BBCC(void);
 void sub_804D8E4(void);
 void sub_804C164(void);
 void sub_804C1A8(void);
+void sub_804DB84(void);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -3510,9 +3512,511 @@ void sub_804B210(void);
 
 void sub_804B228(void);
 
+void sub_804B24C(void);
+
 void sub_804B2D0(u8, u8);
 
+#ifdef NONMATCHING
+void sub_804B41C(void)
+// Link trade init
+{
+    switch (gMain.state)
+    {
+        case 0:
+            REG_DISPCNT = 0;
+            ResetTasks();
+            CloseLink();
+            gUnknown_03004828 = &ewram_2010000.unk_0f000;
+            ResetSpriteData();
+            FreeAllSpritePalettes();
+            SetVBlankCallback(sub_804B210);
+            sub_804B228();
+            SetUpWindowConfig(&gWindowConfig_81E6F84);
+            InitWindowFromConfig(&gUnknown_03004828->window, &gWindowConfig_81E6F84);
+            gUnknown_03004828->textWindowBaseTileNum = SetTextWindowBaseTileNum(2);
+            LoadTextWindowGraphics(&gUnknown_03004828->window);
+            MenuZeroFillScreen();
+            gLinkType = 0x1144;
+            gMain.state ++;
+            LZDecompressVram(gUnknown_08D00000, (void *)VRAM);
+            CpuCopy16(gUnknown_08D00524, ewram, 0x1000);
+            DmaCopy16Defvars(3, ewram, (void *)BG_SCREEN_ADDR(5), 0x500);
+            LoadCompressedPalette(gUnknown_08D004E0, 0, 32);
+            gUnknown_03004828->unk_00b6 = 0;
+            gUnknown_03004828->unk_00c4 = 0;
+            gUnknown_03004828->isLinkTrade = TRUE;
+            gUnknown_03004828->unk_0104 = 0x40;
+            gUnknown_03004828->unk_0106 = 0x40;
+            gUnknown_03004828->unk_0108 = 0;
+            gUnknown_03004828->unk_010a = 0;
+            gUnknown_03004828->unk_010c = 0x78;
+            gUnknown_03004828->unk_010e = 0x50;
+            gUnknown_03004828->unk_0118 = 0x100;
+            gUnknown_03004828->unk_011c = 0;
+            break;
+        case 1:
+            OpenLink();
+            gMain.state ++;
+            gUnknown_03004828->unk_00c0 = 0;
+            break;
+        case 2:
+            if (++ gUnknown_03004828->unk_00c0 > 60)
+            {
+                gUnknown_03004828->unk_00c0 = 0;
+                gMain.state ++;
+            }
+            break;
+        case 3:
+            if (IsLinkMaster())
+            {
+                if (GetLinkPlayerCount_2() >= sub_800820C() && ++ gUnknown_03004828->unk_00c0 > 30)
+                {
+                    sub_8007F4C();
+                    gMain.state ++;
+                }
+            }
+            else
+            {
+                gMain.state ++;
+            }
+            break;
+        case 4:
+            sub_804B24C();
+            if (gReceivedRemoteLinkPlayers == TRUE && IsLinkPlayerDataExchangeComplete() == TRUE) gMain.state ++;
+            break;
+        case 5:
+            gUnknown_03004828->unk_009c = 0;
+            gUnknown_03004828->unk_009d = 0;
+            gUnknown_03004828->unk_00bd = 0;
+            sub_804B2D0(0, 0);
+            gMain.state ++;
+            break;
+        case 6:
+            sub_804B2D0(0, 1);
+            gMain.state ++;
+            break;
+        case 7:
+            sub_804B2D0(1, 0);
+            gMain.state ++;
+            break;
+        case 8:
+            sub_804B2D0(1, 1);
+            gMain.state ++;
+            break;
+        case 9:
+            sub_804C164();
+            LoadSpriteSheet(&gUnknown_0821594C);
+            LoadSpritePalette(&gUnknown_08215954);
+            REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(5);
+            gMain.state ++;
+            break;
+        case 10:
+            gMain.state ++;
+            // fallthrough
+        case 11:
+            sub_804BBE8(5);
+            sub_804BBE8(0);
+            sub_804C1A8();
+            BeginNormalPaletteFade(-1, 0, 16, 0, 0);
+            gMain.state ++;
+            break;
+        case 12:
+            if (!gPaletteFade.active)
+            {
+                SetMainCallback2(sub_804DB84);
+            }
+            break;
+    }
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+#else
+__attribute__((naked)) void sub_804B41C(void)
+{
+    asm_unified("\tpush {r4-r6,lr}\n"
+                    "\tsub sp, 0x4\n"
+                    "\tldr r1, _0804B43C @ =gMain\n"
+                    "\tldr r2, _0804B440 @ =0x0000043c\n"
+                    "\tadds r0, r1, r2\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tadds r2, r1, 0\n"
+                    "\tcmp r0, 0xC\n"
+                    "\tbls _0804B430\n"
+                    "\tb _0804B76E_break\n"
+                    "_0804B430:\n"
+                    "\tlsls r0, 2\n"
+                    "\tldr r1, _0804B444 @ =_0804B448\n"
+                    "\tadds r0, r1\n"
+                    "\tldr r0, [r0]\n"
+                    "\tmov pc, r0\n"
+                    "\t.align 2, 0\n"
+                    "_0804B43C: .4byte gMain\n"
+                    "_0804B440: .4byte 0x0000043c\n"
+                    "_0804B444: .4byte _0804B448\n"
+                    "\t.align 2, 0\n"
+                    "_0804B448:\n"
+                    "\t.4byte _0804B47C_case00\n"
+                    "\t.4byte _0804B5AC_case01\n"
+                    "\t.4byte _0804B5D4_case02\n"
+                    "\t.4byte _0804B5FC_case03\n"
+                    "\t.4byte _0804B648_case04\n"
+                    "\t.4byte _0804B678_case05\n"
+                    "\t.4byte _0804B6A8_case06\n"
+                    "\t.4byte _0804B6B2_case07\n"
+                    "\t.4byte _0804B6CC_case08\n"
+                    "\t.4byte _0804B6E4_case09\n"
+                    "\t.4byte _0804B71C_case10\n"
+                    "\t.4byte _0804B726_case11\n"
+                    "\t.4byte _0804B75C_case12\n"
+                    "_0804B47C_case00:\n"
+                    "\tmovs r1, 0x80\n"
+                    "\tlsls r1, 19\n"
+                    "\tmovs r0, 0\n"
+                    "\tstrh r0, [r1]\n"
+                    "\tbl ResetTasks\n"
+                    "\tbl CloseLink\n"
+                    "\tldr r6, _0804B570 @ =gUnknown_03004828\n"
+                    "\tldr r5, _0804B574 @ =0x0201f000\n"
+                    "\tstr r5, [r6]\n"
+                    "\tbl ResetSpriteData\n"
+                    "\tbl FreeAllSpritePalettes\n"
+                    "\tldr r0, _0804B578 @ =sub_804B210\n"
+                    "\tbl SetVBlankCallback\n"
+                    "\tbl sub_804B228\n"
+                    "\tldr r4, _0804B57C @ =gWindowConfig_81E6F84\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tbl SetUpWindowConfig\n"
+                    "\tldr r0, [r6]\n"
+                    "\tadds r0, 0x4\n"
+                    "\tadds r1, r4, 0\n"
+                    "\tbl InitWindowFromConfig\n"
+                    "\tmovs r0, 0x2\n"
+                    "\tbl SetTextWindowBaseTileNum\n"
+                    "\tldr r1, [r6]\n"
+                    "\tadds r1, 0x34\n"
+                    "\tstrb r0, [r1]\n"
+                    "\tldr r0, [r6]\n"
+                    "\tadds r0, 0x4\n"
+                    "\tbl LoadTextWindowGraphics\n"
+                    "\tbl MenuZeroFillScreen\n"
+                    "\tldr r1, _0804B580 @ =gLinkType\n"
+                    "\tldr r4, _0804B584 @ =0x00001144\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tstrh r0, [r1]\n"
+                    "\tldr r1, _0804B588 @ =gMain\n"
+                    "\tldr r0, _0804B58C @ =0x0000043c\n"
+                    "\tadds r1, r0\n"
+                    "\tldrb r0, [r1]\n"
+                    "\tadds r0, 0x1\n"
+                    "\tstrb r0, [r1]\n"
+                    "\tldr r0, _0804B590 @ =gUnknown_08D00000\n"
+                    "\tmovs r1, 0xC0\n"
+                    "\tlsls r1, 19\n"
+                    "\tbl LZDecompressVram\n"
+                    "\tldr r0, _0804B594 @ =gUnknown_08D00524\n"
+                    "\tldr r1, _0804B598 @ =0xfffe1000\n"
+                    "\tadds r5, r1\n"
+                    "\tmovs r2, 0x80\n"
+                    "\tlsls r2, 4\n"
+                    "\tadds r1, r5, 0\n"
+                    "\tbl CpuSet\n"
+                    "\tldr r1, _0804B59C @ =0x06002800\n"
+                    "\tldr r0, _0804B5A0 @ =0x040000d4\n"
+                    "\tstr r5, [r0]\n"
+                    "\tstr r1, [r0, 0x4]\n"
+                    "\tldr r1, _0804B5A4 @ =0x80000280\n"
+                    "\tstr r1, [r0, 0x8]\n"
+                    "\tldr r0, [r0, 0x8]\n"
+                    "\tldr r0, _0804B5A8 @ =gUnknown_08D004E0\n"
+                    "\tmovs r1, 0\n"
+                    "\tmovs r2, 0x20\n"
+                    "\tbl LoadCompressedPalette\n"
+                    "\tldr r1, [r6]\n"
+                    "\tadds r0, r1, 0\n"
+                    "\tadds r0, 0xB6\n"
+                    "\tmovs r2, 0\n"
+                    "\tstrh r2, [r0]\n"
+                    "\tadds r0, 0xE\n"
+                    "\tstrh r2, [r0]\n"
+                    "\tmovs r4, 0x8F\n"
+                    "\tlsls r4, 1\n"
+                    "\tadds r1, r4\n"
+                    "\tmovs r0, 0x1\n"
+                    "\tstrb r0, [r1]\n"
+                    "\tldr r3, [r6]\n"
+                    "\tmovs r1, 0x82\n"
+                    "\tlsls r1, 1\n"
+                    "\tadds r0, r3, r1\n"
+                    "\tmovs r1, 0x40\n"
+                    "\tstrh r1, [r0]\n"
+                    "\tsubs r4, 0x18\n"
+                    "\tadds r0, r3, r4\n"
+                    "\tstrh r1, [r0]\n"
+                    "\tadds r1, 0xC8\n"
+                    "\tadds r0, r3, r1\n"
+                    "\tstrh r2, [r0]\n"
+                    "\tadds r4, 0x4\n"
+                    "\tadds r0, r3, r4\n"
+                    "\tstrh r2, [r0]\n"
+                    "\tmovs r0, 0x86\n"
+                    "\tlsls r0, 1\n"
+                    "\tadds r1, r3, r0\n"
+                    "\tmovs r0, 0x78\n"
+                    "\tstrh r0, [r1]\n"
+                    "\tadds r4, 0x4\n"
+                    "\tadds r1, r3, r4\n"
+                    "\tmovs r0, 0x50\n"
+                    "\tstrh r0, [r1]\n"
+                    "\tadds r0, 0xC8\n"
+                    "\tadds r1, r3, r0\n"
+                    "\tsubs r0, 0x18\n"
+                    "\tstrh r0, [r1]\n"
+                    "\tmovs r1, 0x8E\n"
+                    "\tlsls r1, 1\n"
+                    "\tadds r0, r3, r1\n"
+                    "\tstrh r2, [r0]\n"
+                    "\tb _0804B76E_break\n"
+                    "\t.align 2, 0\n"
+                    "_0804B570: .4byte gUnknown_03004828\n"
+                    "_0804B574: .4byte 0x0201f000\n"
+                    "_0804B578: .4byte sub_804B210\n"
+                    "_0804B57C: .4byte gWindowConfig_81E6F84\n"
+                    "_0804B580: .4byte gLinkType\n"
+                    "_0804B584: .4byte 0x00001144\n"
+                    "_0804B588: .4byte gMain\n"
+                    "_0804B58C: .4byte 0x0000043c\n"
+                    "_0804B590: .4byte gUnknown_08D00000\n"
+                    "_0804B594: .4byte gUnknown_08D00524\n"
+                    "_0804B598: .4byte 0xfffe1000\n"
+                    "_0804B59C: .4byte 0x06002800\n"
+                    "_0804B5A0: .4byte 0x040000d4\n"
+                    "_0804B5A4: .4byte 0x80000280\n"
+                    "_0804B5A8: .4byte gUnknown_08D004E0\n"
+                    "_0804B5AC_case01:\n"
+                    "\tbl OpenLink\n"
+                    "\tldr r1, _0804B5C8 @ =gMain\n"
+                    "\tldr r2, _0804B5CC @ =0x0000043c\n"
+                    "\tadds r1, r2\n"
+                    "\tldrb r0, [r1]\n"
+                    "\tadds r0, 0x1\n"
+                    "\tmovs r2, 0\n"
+                    "\tstrb r0, [r1]\n"
+                    "\tldr r0, _0804B5D0 @ =gUnknown_03004828\n"
+                    "\tldr r0, [r0]\n"
+                    "\tadds r0, 0xC0\n"
+                    "\tstr r2, [r0]\n"
+                    "\tb _0804B76E_break\n"
+                    "\t.align 2, 0\n"
+                    "_0804B5C8: .4byte gMain\n"
+                    "_0804B5CC: .4byte 0x0000043c\n"
+                    "_0804B5D0: .4byte gUnknown_03004828\n"
+                    "_0804B5D4_case02:\n"
+                    "\tldr r0, _0804B5F4 @ =gUnknown_03004828\n"
+                    "\tldr r0, [r0]\n"
+                    "\tadds r1, r0, 0\n"
+                    "\tadds r1, 0xC0\n"
+                    "\tldr r0, [r1]\n"
+                    "\tadds r0, 0x1\n"
+                    "\tstr r0, [r1]\n"
+                    "\tcmp r0, 0x3C\n"
+                    "\tbhi _0804B5E8\n"
+                    "\tb _0804B76E_break\n"
+                    "_0804B5E8:\n"
+                    "\tmovs r0, 0\n"
+                    "\tstr r0, [r1]\n"
+                    "\tldr r4, _0804B5F8 @ =0x0000043c\n"
+                    "\tadds r1, r2, r4\n"
+                    "\tb _0804B74C\n"
+                    "\t.align 2, 0\n"
+                    "_0804B5F4: .4byte gUnknown_03004828\n"
+                    "_0804B5F8: .4byte 0x0000043c\n"
+                    "_0804B5FC_case03:\n"
+                    "\tbl IsLinkMaster\n"
+                    "\tlsls r0, 24\n"
+                    "\tcmp r0, 0\n"
+                    "\tbne _0804B608\n"
+                    "\tb _0804B746\n"
+                    "_0804B608:\n"
+                    "\tbl GetLinkPlayerCount_2\n"
+                    "\tadds r4, r0, 0\n"
+                    "\tbl sub_800820C\n"
+                    "\tlsls r4, 24\n"
+                    "\tlsls r0, 24\n"
+                    "\tcmp r4, r0\n"
+                    "\tbcs _0804B61C\n"
+                    "\tb _0804B76E_break\n"
+                    "_0804B61C:\n"
+                    "\tldr r0, _0804B63C @ =gUnknown_03004828\n"
+                    "\tldr r1, [r0]\n"
+                    "\tadds r1, 0xC0\n"
+                    "\tldr r0, [r1]\n"
+                    "\tadds r0, 0x1\n"
+                    "\tstr r0, [r1]\n"
+                    "\tcmp r0, 0x1E\n"
+                    "\tbhi _0804B62E\n"
+                    "\tb _0804B76E_break\n"
+                    "_0804B62E:\n"
+                    "\tbl sub_8007F4C\n"
+                    "\tldr r1, _0804B640 @ =gMain\n"
+                    "\tldr r0, _0804B644 @ =0x0000043c\n"
+                    "\tadds r1, r0\n"
+                    "\tb _0804B74C\n"
+                    "\t.align 2, 0\n"
+                    "_0804B63C: .4byte gUnknown_03004828\n"
+                    "_0804B640: .4byte gMain\n"
+                    "_0804B644: .4byte 0x0000043c\n"
+                    "_0804B648_case04:\n"
+                    "\tbl sub_804B24C\n"
+                    "\tldr r0, _0804B66C @ =gReceivedRemoteLinkPlayers\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r0, 0x1\n"
+                    "\tbeq _0804B656\n"
+                    "\tb _0804B76E_break\n"
+                    "_0804B656:\n"
+                    "\tbl IsLinkPlayerDataExchangeComplete\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tcmp r0, 0x1\n"
+                    "\tbeq _0804B664\n"
+                    "\tb _0804B76E_break\n"
+                    "_0804B664:\n"
+                    "\tldr r1, _0804B670 @ =gMain\n"
+                    "\tldr r4, _0804B674 @ =0x0000043c\n"
+                    "\tadds r1, r4\n"
+                    "\tb _0804B74C\n"
+                    "\t.align 2, 0\n"
+                    "_0804B66C: .4byte gReceivedRemoteLinkPlayers\n"
+                    "_0804B670: .4byte gMain\n"
+                    "_0804B674: .4byte 0x0000043c\n"
+                    "_0804B678_case05:\n"
+                    "\tldr r2, _0804B69C @ =gUnknown_03004828\n"
+                    "\tldr r0, [r2]\n"
+                    "\tadds r0, 0x9C\n"
+                    "\tmovs r1, 0\n"
+                    "\tstrb r1, [r0]\n"
+                    "\tldr r0, [r2]\n"
+                    "\tadds r0, 0x9D\n"
+                    "\tstrb r1, [r0]\n"
+                    "\tldr r0, [r2]\n"
+                    "\tadds r0, 0xBD\n"
+                    "\tstrb r1, [r0]\n"
+                    "\tmovs r0, 0\n"
+                    "\tbl sub_804B2D0\n"
+                    "\tldr r1, _0804B6A0 @ =gMain\n"
+                    "\tldr r0, _0804B6A4 @ =0x0000043c\n"
+                    "\tadds r1, r0\n"
+                    "\tb _0804B74C\n"
+                    "\t.align 2, 0\n"
+                    "_0804B69C: .4byte gUnknown_03004828\n"
+                    "_0804B6A0: .4byte gMain\n"
+                    "_0804B6A4: .4byte 0x0000043c\n"
+                    "_0804B6A8_case06:\n"
+                    "\tmovs r0, 0\n"
+                    "\tmovs r1, 0x1\n"
+                    "\tbl sub_804B2D0\n"
+                    "\tb _0804B746\n"
+                    "_0804B6B2_case07:\n"
+                    "\tmovs r0, 0x1\n"
+                    "\tmovs r1, 0\n"
+                    "\tbl sub_804B2D0\n"
+                    "\tldr r1, _0804B6C4 @ =gMain\n"
+                    "\tldr r4, _0804B6C8 @ =0x0000043c\n"
+                    "\tadds r1, r4\n"
+                    "\tb _0804B74C\n"
+                    "\t.align 2, 0\n"
+                    "_0804B6C4: .4byte gMain\n"
+                    "_0804B6C8: .4byte 0x0000043c\n"
+                    "_0804B6CC_case08:\n"
+                    "\tmovs r0, 0x1\n"
+                    "\tmovs r1, 0x1\n"
+                    "\tbl sub_804B2D0\n"
+                    "\tldr r1, _0804B6DC @ =gMain\n"
+                    "\tldr r0, _0804B6E0 @ =0x0000043c\n"
+                    "\tadds r1, r0\n"
+                    "\tb _0804B74C\n"
+                    "\t.align 2, 0\n"
+                    "_0804B6DC: .4byte gMain\n"
+                    "_0804B6E0: .4byte 0x0000043c\n"
+                    "_0804B6E4_case09:\n"
+                    "\tbl sub_804C164\n"
+                    "\tldr r0, _0804B704 @ =gUnknown_0821594C\n"
+                    "\tbl LoadSpriteSheet\n"
+                    "\tldr r0, _0804B708 @ =gUnknown_08215954\n"
+                    "\tbl LoadSpritePalette\n"
+                    "\tldr r1, _0804B70C @ =REG_BG1CNT\n"
+                    "\tldr r2, _0804B710 @ =0x00000502\n"
+                    "\tadds r0, r2, 0\n"
+                    "\tstrh r0, [r1]\n"
+                    "\tldr r1, _0804B714 @ =gMain\n"
+                    "\tldr r4, _0804B718 @ =0x0000043c\n"
+                    "\tadds r1, r4\n"
+                    "\tb _0804B74C\n"
+                    "\t.align 2, 0\n"
+                    "_0804B704: .4byte gUnknown_0821594C\n"
+                    "_0804B708: .4byte gUnknown_08215954\n"
+                    "_0804B70C: .4byte REG_BG1CNT\n"
+                    "_0804B710: .4byte 0x00000502\n"
+                    "_0804B714: .4byte gMain\n"
+                    "_0804B718: .4byte 0x0000043c\n"
+                    "_0804B71C_case10:\n"
+                    "\tldr r0, _0804B754 @ =0x0000043c\n"
+                    "\tadds r1, r2, r0\n"
+                    "\tldrb r0, [r1]\n"
+                    "\tadds r0, 0x1\n"
+                    "\tstrb r0, [r1]\n"
+                    "_0804B726_case11:\n"
+                    "\tmovs r0, 0x5\n"
+                    "\tbl sub_804BBE8\n"
+                    "\tmovs r0, 0\n"
+                    "\tbl sub_804BBE8\n"
+                    "\tbl sub_804C1A8\n"
+                    "\tmovs r0, 0x1\n"
+                    "\tnegs r0, r0\n"
+                    "\tmovs r1, 0\n"
+                    "\tstr r1, [sp]\n"
+                    "\tmovs r2, 0x10\n"
+                    "\tmovs r3, 0\n"
+                    "\tbl BeginNormalPaletteFade\n"
+                    "_0804B746:\n"
+                    "\tldr r1, _0804B758 @ =gMain\n"
+                    "\tldr r2, _0804B754 @ =0x0000043c\n"
+                    "\tadds r1, r2\n"
+                    "_0804B74C:\n"
+                    "\tldrb r0, [r1]\n"
+                    "\tadds r0, 0x1\n"
+                    "\tstrb r0, [r1]\n"
+                    "\tb _0804B76E_break\n"
+                    "\t.align 2, 0\n"
+                    "_0804B754: .4byte 0x0000043c\n"
+                    "_0804B758: .4byte gMain\n"
+                    "_0804B75C_case12:\n"
+                    "\tldr r0, _0804B788 @ =gPaletteFade\n"
+                    "\tldrb r1, [r0, 0x7]\n"
+                    "\tmovs r0, 0x80\n"
+                    "\tands r0, r1\n"
+                    "\tcmp r0, 0\n"
+                    "\tbne _0804B76E_break\n"
+                    "\tldr r0, _0804B78C @ =sub_804DB84\n"
+                    "\tbl SetMainCallback2\n"
+                    "_0804B76E_break:\n"
+                    "\tbl RunTasks\n"
+                    "\tbl AnimateSprites\n"
+                    "\tbl BuildOamBuffer\n"
+                    "\tbl UpdatePaletteFade\n"
+                    "\tadd sp, 0x4\n"
+                    "\tpop {r4-r6}\n"
+                    "\tpop {r0}\n"
+                    "\tbx r0\n"
+                    "\t.align 2, 0\n"
+                    "_0804B788: .4byte gPaletteFade\n"
+                    "_0804B78C: .4byte sub_804DB84");
+}
+#endif
+
 void sub_804B790(void)
+// In-game trade init
 {
     u8 otName[11];
     switch (gMain.state)
@@ -3532,12 +4036,12 @@ void sub_804B790(void)
             sub_804B228();
             SetUpWindowConfig(&gWindowConfig_81E717C);
             InitWindowFromConfig(&gUnknown_03004828->window, &gWindowConfig_81E717C);
-            gUnknown_03004828->unk_0034 = SetTextWindowBaseTileNum(2);
+            gUnknown_03004828->textWindowBaseTileNum = SetTextWindowBaseTileNum(2);
             LoadTextWindowGraphics(&gUnknown_03004828->window);
             MenuZeroFillScreen();
             gLinkType = 0x1144;
             gUnknown_03004828->isLinkTrade = FALSE;
-            gUnknown_03004828->linkData[12] = 0;
+            gUnknown_03004828->unk_00b6 = 0;
             gUnknown_03004828->unk_00c4 = 0;
             gUnknown_03004828->unk_0104 = 0x40;
             gUnknown_03004828->unk_0106 = 0x40;
@@ -3842,7 +4346,7 @@ bool8 sub_804C29C(void)
 
         case 10:
             StringExpandPlaceholders(gStringVar4, gTradeText_WillBeSent);
-            sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->unk_0034, 2, 15);
+            sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
             gUnknown_03004828->unk_00c4 = 11;
             gUnknown_03004828->unk_00c0 = 0;
             break;
@@ -3853,7 +4357,7 @@ bool8 sub_804C29C(void)
                 gUnknown_03004828->unk_00c4 ++;
                 ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19);
                 StringExpandPlaceholders(gStringVar4, gTradeText_ByeBye);
-                sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->unk_0034, 2, 15);
+                sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
             }
             break;
         case 12:
@@ -4200,7 +4704,7 @@ bool8 sub_804C29C(void)
             REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON;
             ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19);
             StringExpandPlaceholders(gStringVar4, gTradeText_SentOverPoke);
-            sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->unk_0034, 2, 15);
+            sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
             gUnknown_03004828->unk_00c4 ++;
             gUnknown_03004828->unk_00c0 = 0;
             break;
@@ -4214,7 +4718,7 @@ bool8 sub_804C29C(void)
                 gUnknown_03004828->unk_00c4 ++;
                 ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19);
                 StringExpandPlaceholders(gStringVar4, gTradeText_TakeGoodCare);
-                sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->unk_0034, 2, 15);
+                sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
                 gUnknown_03004828->unk_00c0 = 0;
             }
             break;
@@ -4536,7 +5040,7 @@ static void sub_804DC88(void)
             gMain.state ++;
             ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19);
             StringExpandPlaceholders(gStringVar4, gOtherText_LinkStandby2);
-            sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->unk_0034, 2, 15);
+            sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
             break;
         case 1:
             sub_80084A4();
@@ -4563,7 +5067,7 @@ static void sub_804DC88(void)
         case 2:
             gMain.state = 50;
             ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19);
-            sub_8003460(&gUnknown_03004828->window, gSystemText_Saving, gUnknown_03004828->unk_0034, 2, 15);
+            sub_8003460(&gUnknown_03004828->window, gSystemText_Saving, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
             break;
         case 50:
             SetSecretBase2Field_9_AndHideBG();
-- 
cgit v1.2.3


From 67f39a3b7363fc74539b15a023c340b45b91af14 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 4 Sep 2017 19:44:44 -0400
Subject: Remove redundant declaration from pokedex.c

---
 src/pokedex.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pokedex.c b/src/pokedex.c
index c132635cb..26a9fdce4 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -150,7 +150,6 @@ extern const u8 gUnknown_08E96738[];
 extern const u8 gUnknown_08E96888[];
 extern const u8 gUnknown_08E96994[];
 extern const u8 gUnknown_08E9C6DC[];
-extern const u8 gUnknown_08D00524[];
 extern const u8 gUnknown_08E96BD4[];
 extern const u8 gUnknown_08E96ACC[];
 extern const u8 gUnknown_08E96B58[];
-- 
cgit v1.2.3


From 12c4614cc396830f62c02c65547a3465829be5c8 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 4 Sep 2017 20:27:26 -0400
Subject: sub_804B2D0

---
 asm/trade.s       | 156 ------------------------------------------------------
 include/pokemon.h |   1 +
 src/trade.c       | 112 +++++++++++++++++++++++++--------------
 3 files changed, 74 insertions(+), 195 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 99c3e8e7d..ba5cef071 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -808,160 +808,4 @@ _0804B2CC:
 	bx r1
 	thumb_func_end sub_804B2B0
 
-	thumb_func_start sub_804B2D0
-sub_804B2D0: @ 804B2D0
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0xC
-	lsls r0, 24
-	lsrs r7, r0, 24
-	lsls r1, 24
-	lsrs r5, r1, 24
-	movs r4, 0
-	mov r10, r4
-	cmp r7, 0
-	bne _0804B2FC
-	ldr r0, _0804B324 @ =gUnknown_020297D8
-	ldrb r1, [r0]
-	movs r0, 0x64
-	muls r1, r0
-	ldr r0, _0804B328 @ =gPlayerParty
-	adds r1, r0
-	mov r10, r1
-	movs r4, 0x1
-_0804B2FC:
-	cmp r7, 0x1
-	bne _0804B31A
-	ldr r0, _0804B324 @ =gUnknown_020297D8
-	ldrb r0, [r0, 0x1]
-	movs r1, 0x6
-	bl __umodsi3
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	muls r1, r0
-	ldr r0, _0804B32C @ =gEnemyParty
-	adds r1, r0
-	mov r10, r1
-	movs r4, 0x3
-_0804B31A:
-	cmp r5, 0
-	beq _0804B330
-	cmp r5, 0x1
-	beq _0804B3A4
-	b _0804B3FA
-	.align 2, 0
-_0804B324: .4byte gUnknown_020297D8
-_0804B328: .4byte gPlayerParty
-_0804B32C: .4byte gEnemyParty
-_0804B330:
-	mov r0, r10
-	movs r1, 0x41
-	bl GetMonData
-	adds r5, r0, 0
-	lsls r5, 16
-	lsrs r5, 16
-	mov r0, r10
-	movs r1, 0
-	bl GetMonData
-	mov r9, r0
-	lsls r0, r5, 3
-	ldr r1, _0804B390 @ =gMonFrontPicTable
-	adds r0, r1
-	ldr r1, _0804B394 @ =gMonFrontPicCoords
-	lsls r2, r5, 2
-	adds r2, r1
-	ldrb r1, [r2]
-	ldrb r2, [r2, 0x1]
-	ldr r3, _0804B398 @ =0x02000000
-	ldr r6, _0804B39C @ =gUnknown_081FAF4C
-	lsls r7, 1
-	mov r8, r7
-	mov r4, r8
-	adds r4, 0x1
-	lsls r4, 2
-	adds r4, r6
-	ldr r4, [r4]
-	str r4, [sp]
-	str r5, [sp, 0x4]
-	mov r4, r9
-	str r4, [sp, 0x8]
-	bl HandleLoadSpecialPokePic
-	mov r0, r10
-	bl sub_8040990
-	bl LoadCompressedObjectPalette
-	ldr r0, _0804B3A0 @ =gUnknown_03004828
-	ldr r0, [r0]
-	movs r1, 0x90
-	lsls r1, 1
-	adds r0, r1
-	add r0, r8
-	strh r5, [r0]
-	b _0804B3FA
-	.align 2, 0
-_0804B390: .4byte gMonFrontPicTable
-_0804B394: .4byte gMonFrontPicCoords
-_0804B398: .4byte 0x02000000
-_0804B39C: .4byte gUnknown_081FAF4C
-_0804B3A0: .4byte gUnknown_03004828
-_0804B3A4:
-	mov r0, r10
-	bl sub_8040990
-	ldrh r0, [r0, 0x4]
-	adds r1, r4, 0
-	bl GetMonSpriteTemplate_803C56C
-	ldr r0, _0804B40C @ =gUnknown_02024E8C
-	movs r1, 0x78
-	movs r2, 0x3C
-	movs r3, 0x6
-	bl CreateSprite
-	ldr r4, _0804B410 @ =gUnknown_03004828
-	ldr r1, [r4]
-	adds r1, 0xB8
-	adds r1, r7
-	strb r0, [r1]
-	ldr r3, _0804B414 @ =gSprites
-	ldr r0, [r4]
-	adds r0, 0xB8
-	adds r0, r7
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-	ldr r0, [r4]
-	adds r0, 0xB8
-	adds r0, r7
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r3, 0x1C
-	adds r0, r3
-	ldr r1, _0804B418 @ =SpriteCallbackDummy
-	str r1, [r0]
-_0804B3FA:
-	add sp, 0xC
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804B40C: .4byte gUnknown_02024E8C
-_0804B410: .4byte gUnknown_03004828
-_0804B414: .4byte gSprites
-_0804B418: .4byte SpriteCallbackDummy
-	thumb_func_end sub_804B2D0
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/include/pokemon.h b/include/pokemon.h
index ba9d7237e..6ff36a2c4 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -600,5 +600,6 @@ bool32 sub_8040D3C(u16 species, u8 *name, u8 language);
 s8 sub_8040A54(struct Pokemon *, u8);
 u16 GetMonEVCount(struct Pokemon *);
 u16 GetEvolutionTargetSpecies(struct Pokemon *, u8, u16);
+const struct CompressedSpritePalette *sub_8040990(struct Pokemon *);
 
 #endif // GUARD_POKEMON_H
diff --git a/src/trade.c b/src/trade.c
index aa3296969..2532e6e89 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -35,6 +35,7 @@
 #include "evolution_scene.h"
 #include "pokeball.h"
 #include "pokedex.h"
+#include "field_effect.h"
 #include "trade.h"
 
 #ifdef ENGLISH
@@ -135,8 +136,7 @@ struct TradeEwramSubstruct2 {
     /*0x009e*/ u16 linkData[12];
     /*0x00b6*/ u16 unk_00b6;
     // Sprite indices
-    /*0x00b8*/ u8 unk_00b8;
-    /*0x00b9*/ u8 unk_00b9;
+    /*0x00b8*/ u8 unk_00b8[2];
     /*0x00ba*/ u8 unk_00ba;
     /*0x00bb*/ u8 unk_00bb;
     /*0x00bc*/ u8 unk_00bc;
@@ -162,8 +162,7 @@ struct TradeEwramSubstruct2 {
     /*0x011a*/ u16 unk_011a;
     /*0x011c*/ u16 unk_011c;
     /*0x011e*/ u8 isLinkTrade;
-    /*0x0120*/ u16 unk_0120;
-    /*0x0122*/ u16 unk_0122;
+    /*0x0120*/ u16 unk_0120[2];
     /*0x0124*/ u16 unk_0124;
 };
 
@@ -3514,7 +3513,42 @@ void sub_804B228(void);
 
 void sub_804B24C(void);
 
-void sub_804B2D0(u8, u8);
+void sub_804B2D0(u8 whichParty, u8 a1)
+{
+    u8 v0;
+    struct Pokemon *pokemon;
+    u16 species;
+    u32 personality;
+
+    v0 = 0;
+    pokemon = NULL;
+    if (whichParty == 0)
+    {
+        pokemon = &gPlayerParty[gUnknown_020297D8[0]];
+        v0 = 1;
+    }
+    if (whichParty == 1)
+    {
+        pokemon = &gEnemyParty[gUnknown_020297D8[1] % 6];
+        v0 = 3;
+    }
+    switch (a1)
+    {
+        case 0:
+            species = GetMonData(pokemon, MON_DATA_SPECIES2);
+            personality = GetMonData(pokemon, MON_DATA_PERSONALITY);
+            HandleLoadSpecialPokePic(&gMonFrontPicTable[species], gMonFrontPicCoords[species].coords, gMonFrontPicCoords[species].y_offset, (u32)ewram, gUnknown_081FAF4C[whichParty * 2 + 1], species, personality);
+            LoadCompressedObjectPalette(sub_8040990(pokemon));
+            gUnknown_03004828->unk_0120[whichParty] = species;
+            break;
+        case 1:
+            GetMonSpriteTemplate_803C56C(sub_8040990(pokemon)->tag, v0);
+            gUnknown_03004828->unk_00b8[whichParty] = CreateSprite(&gUnknown_02024E8C, 0x78, 0x3c, 0x6);
+            gSprites[gUnknown_03004828->unk_00b8[whichParty]].invisible = TRUE;
+            gSprites[gUnknown_03004828->unk_00b8[whichParty]].callback = SpriteCallbackDummy;
+            break;
+    }
+}
 
 #ifdef NONMATCHING
 void sub_804B41C(void)
@@ -4323,9 +4357,9 @@ bool8 sub_804C29C(void)
     switch (gUnknown_03004828->unk_00c4)
     {
         case 0:
-            gSprites[gUnknown_03004828->unk_00b8].invisible = FALSE;
-            gSprites[gUnknown_03004828->unk_00b8].pos2.x = -0xb4;
-            gSprites[gUnknown_03004828->unk_00b8].pos2.y = gMonFrontPicCoords[gUnknown_03004828->unk_0120].y_offset;
+            gSprites[gUnknown_03004828->unk_00b8[0]].invisible = FALSE;
+            gSprites[gUnknown_03004828->unk_00b8[0]].pos2.x = -0xb4;
+            gSprites[gUnknown_03004828->unk_00b8[0]].pos2.y = gMonFrontPicCoords[gUnknown_03004828->unk_0120[0]].y_offset;
             gUnknown_03004828->unk_00c4 ++;
             gUnknown_03004828->unk_0124 = GetCurrentMapMusic();
             PlayBGM(BGM_SHINKA);
@@ -4333,12 +4367,12 @@ bool8 sub_804C29C(void)
         case 1:
             if (gUnknown_03004828->unk_0116 > 0)
             {
-                gSprites[gUnknown_03004828->unk_00b8].pos2.x += 3;
+                gSprites[gUnknown_03004828->unk_00b8[0]].pos2.x += 3;
                 gUnknown_03004828->unk_0116 -= 3;
             }
             else
             {
-                gSprites[gUnknown_03004828->unk_00b8].pos2.x = 0;
+                gSprites[gUnknown_03004828->unk_00b8[0]].pos2.x = 0;
                 gUnknown_03004828->unk_0116 = 0;
                 gUnknown_03004828->unk_00c4 = 10;
             }
@@ -4353,7 +4387,7 @@ bool8 sub_804C29C(void)
         case 11:
             if (++gUnknown_03004828->unk_00c0 == 80)
             {
-                gUnknown_03004828->unk_0102 = sub_8047580(gUnknown_03004828->unk_00b8, gSprites[gUnknown_03004828->unk_00b8].oam.paletteNum, 0x78, 0x20, 0x2, 0x1, 0x14, 0xfffff);
+                gUnknown_03004828->unk_0102 = sub_8047580(gUnknown_03004828->unk_00b8[0], gSprites[gUnknown_03004828->unk_00b8[0]].oam.paletteNum, 0x78, 0x20, 0x2, 0x1, 0x14, 0xfffff);
                 gUnknown_03004828->unk_00c4 ++;
                 ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19);
                 StringExpandPlaceholders(gStringVar4, gTradeText_ByeBye);
@@ -4510,40 +4544,40 @@ bool8 sub_804C29C(void)
             gUnknown_03004828->unk_00c4 ++;
             break;
         case 37:
-            if (!sub_8040A3C(gUnknown_03004828->unk_0120))
+            if (!sub_8040A3C(gUnknown_03004828->unk_0120[0]))
             {
-                gSprites[gUnknown_03004828->unk_00b8].affineAnims = gSpriteAffineAnimTable_8215AC0;
-                gSprites[gUnknown_03004828->unk_00b8].oam.affineMode = 3;
-                CalcCenterToCornerVec(&gSprites[gUnknown_03004828->unk_00b8], 0, 3, 3);
-                StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_00b8], 0);
+                gSprites[gUnknown_03004828->unk_00b8[0]].affineAnims = gSpriteAffineAnimTable_8215AC0;
+                gSprites[gUnknown_03004828->unk_00b8[0]].oam.affineMode = 3;
+                CalcCenterToCornerVec(&gSprites[gUnknown_03004828->unk_00b8[0]], 0, 3, 3);
+                StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_00b8[0]], 0);
             }
             else
             {
-                StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_00b8], 0);
+                StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_00b8[0]], 0);
             }
-            StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_00b9], 0);
-            gSprites[gUnknown_03004828->unk_00b8].pos1.x = 0x3c;
-            gSprites[gUnknown_03004828->unk_00b9].pos1.x = 0xb4;
-            gSprites[gUnknown_03004828->unk_00b8].pos1.y = 0xc0;
-            gSprites[gUnknown_03004828->unk_00b9].pos1.y = -0x20;
-            gSprites[gUnknown_03004828->unk_00b8].invisible = FALSE;
-            gSprites[gUnknown_03004828->unk_00b9].invisible = FALSE;
+            StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_00b8[1]], 0);
+            gSprites[gUnknown_03004828->unk_00b8[0]].pos1.x = 0x3c;
+            gSprites[gUnknown_03004828->unk_00b8[1]].pos1.x = 0xb4;
+            gSprites[gUnknown_03004828->unk_00b8[0]].pos1.y = 0xc0;
+            gSprites[gUnknown_03004828->unk_00b8[1]].pos1.y = -0x20;
+            gSprites[gUnknown_03004828->unk_00b8[0]].invisible = FALSE;
+            gSprites[gUnknown_03004828->unk_00b8[1]].invisible = FALSE;
             gUnknown_03004828->unk_00c4 ++;
             break;
         case 38:
-            gSprites[gUnknown_03004828->unk_00b8].pos2.y -= 3;
-            gSprites[gUnknown_03004828->unk_00b9].pos2.y += 3;
-            if (-0xa0 > gSprites[gUnknown_03004828->unk_00b8].pos2.y && gSprites[gUnknown_03004828->unk_00b8].pos2.y >= -0xa3)
+            gSprites[gUnknown_03004828->unk_00b8[0]].pos2.y -= 3;
+            gSprites[gUnknown_03004828->unk_00b8[1]].pos2.y += 3;
+            if (-0xa0 > gSprites[gUnknown_03004828->unk_00b8[0]].pos2.y && gSprites[gUnknown_03004828->unk_00b8[0]].pos2.y >= -0xa3)
             {
                 PlaySE(SE_TK_WARPIN);
             }
-            if (gSprites[gUnknown_03004828->unk_00b8].pos2.y < -0xde)
+            if (gSprites[gUnknown_03004828->unk_00b8[0]].pos2.y < -0xde)
             {
                 gSprites[gUnknown_03004828->unk_00ba].data1 = 0;
                 gSprites[gUnknown_03004828->unk_00bb].data1 = 0;
                 gUnknown_03004828->unk_00c4 ++;
-                gSprites[gUnknown_03004828->unk_00b8].invisible = TRUE;
-                gSprites[gUnknown_03004828->unk_00b9].invisible = TRUE;
+                gSprites[gUnknown_03004828->unk_00b8[0]].invisible = TRUE;
+                gSprites[gUnknown_03004828->unk_00b8[1]].invisible = TRUE;
                 BlendPalettes(1,  0, 0xffff);
             }
             break;
@@ -4691,11 +4725,11 @@ bool8 sub_804C29C(void)
             }
             break;
         case 66:
-            gSprites[gUnknown_03004828->unk_00b9].pos1.x = 0x78;
-            gSprites[gUnknown_03004828->unk_00b9].pos1.y = gMonFrontPicCoords[gUnknown_03004828->unk_0122].y_offset + 60;
-            gSprites[gUnknown_03004828->unk_00b9].pos2.x = 0;
-            gSprites[gUnknown_03004828->unk_00b9].pos2.y = 0;
-            CreatePokeballSprite(gUnknown_03004828->unk_00b9, gSprites[gUnknown_03004828->unk_00b9].oam.paletteNum, 0x78, 0x54, 2, 1, 0x14, 0xfffff);
+            gSprites[gUnknown_03004828->unk_00b8[1]].pos1.x = 0x78;
+            gSprites[gUnknown_03004828->unk_00b8[1]].pos1.y = gMonFrontPicCoords[gUnknown_03004828->unk_0120[1]].y_offset + 60;
+            gSprites[gUnknown_03004828->unk_00b8[1]].pos2.x = 0;
+            gSprites[gUnknown_03004828->unk_00b8[1]].pos2.y = 0;
+            CreatePokeballSprite(gUnknown_03004828->unk_00b8[1], gSprites[gUnknown_03004828->unk_00b8[1]].oam.paletteNum, 0x78, 0x54, 2, 1, 0x14, 0xfffff);
             FreeSpriteOamMatrix(&gSprites[gUnknown_03004828->unk_0103]);
             DestroySprite(&gSprites[gUnknown_03004828->unk_0103]);
             gUnknown_03004828->unk_00c4 ++;
@@ -4747,7 +4781,7 @@ bool8 sub_804C29C(void)
             gUnknown_03005E94 = sub_804BBCC;
             evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gUnknown_020297D8[0]], TRUE, ITEM_NONE);
             if (evoTarget != SPECIES_NONE)
-                TradeEvolutionScene(&gPlayerParty[gUnknown_020297D8[0]], evoTarget, gUnknown_03004828->unk_00b9, gUnknown_020297D8[0]);
+                TradeEvolutionScene(&gPlayerParty[gUnknown_020297D8[0]], evoTarget, gUnknown_03004828->unk_00b8[1], gUnknown_020297D8[0]);
             gUnknown_03004828->unk_00c4 ++;
             break;
         case 73:
@@ -4779,7 +4813,7 @@ void sub_804D588(void)
             gUnknown_03005E94 = sub_804DC88;
             evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gUnknown_020297D8[0]], TRUE, ITEM_NONE);
             if (evoTarget != SPECIES_NONE)
-                TradeEvolutionScene(&gPlayerParty[gUnknown_020297D8[0]], evoTarget, gUnknown_03004828->unk_00b9, gUnknown_020297D8[0]);
+                TradeEvolutionScene(&gPlayerParty[gUnknown_020297D8[0]], evoTarget, gUnknown_03004828->unk_00b8[1], gUnknown_020297D8[0]);
             else
                 SetMainCallback2(sub_804DC88);
             gUnknown_020297D8[0] = 255;
@@ -4999,8 +5033,8 @@ void sub_804DB84(void)
 {
     if (sub_804C29C() == TRUE)
     {
-        DestroySprite(&gSprites[gUnknown_03004828->unk_00b8]);
-        FreeSpriteOamMatrix(&gSprites[gUnknown_03004828->unk_00b9]);
+        DestroySprite(&gSprites[gUnknown_03004828->unk_00b8[0]]);
+        FreeSpriteOamMatrix(&gSprites[gUnknown_03004828->unk_00b8[1]]);
         sub_804BA94(gUnknown_020297D8[0], gUnknown_020297D8[1] % 6);
         gUnknown_03004828->linkData[0] = 0xabcd;
         gUnknown_03004828->unk_00bd = 1;
-- 
cgit v1.2.3


From 5c7bef25af764b3abe71ba421f603b092be6cb52 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 4 Sep 2017 20:31:11 -0400
Subject: sub_804B2B0

---
 asm/trade.s | 20 --------------------
 src/trade.c | 13 ++++++++++---
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index ba5cef071..8ebe142e0 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -788,24 +788,4 @@ _0804B29C:
 	bx r0
 	thumb_func_end sub_804B24C
 
-	thumb_func_start sub_804B2B0
-sub_804B2B0: @ 804B2B0
-	push {lr}
-	ldr r0, _0804B2C0 @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0804B2C4
-	movs r0, 0
-	b _0804B2CC
-	.align 2, 0
-_0804B2C0: .4byte gReceivedRemoteLinkPlayers
-_0804B2C4:
-	bl GetMultiplayerId
-	lsls r0, 24
-	lsrs r0, 24
-_0804B2CC:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_804B2B0
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index 2532e6e89..c6933d8a0 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -224,7 +224,7 @@ static void sub_804D7AC(struct Sprite *);
 /*static*/ bool8 sub_804C29C(void);
 /*static*/ void sub_804DC18(void);
 /*static*/ void sub_804BB78(void);
-/*static*/ bool8 sub_804B2B0(void);
+static u8 sub_804B2B0(void);
 static void sub_804E144(void);
 static void sub_804E1A0(u8);
 /*static*/ void sub_804B790(void);
@@ -3513,6 +3513,13 @@ void sub_804B228(void);
 
 void sub_804B24C(void);
 
+static u8 sub_804B2B0(void)
+{
+    if (gReceivedRemoteLinkPlayers)
+        return GetMultiplayerId();
+    return 0;
+}
+
 void sub_804B2D0(u8 whichParty, u8 a1)
 {
     u8 v0;
@@ -5050,9 +5057,9 @@ void sub_804DB84(void)
 
 void sub_804DC18(void)
 {
-    u8 flag = sub_804B2B0();
+    u8 mpId = sub_804B2B0();
     sub_804D63C();
-    if (!flag && gUnknown_03004828->unk_009c == 1 && gUnknown_03004828->unk_009d == 1)
+    if (mpId == 0 && gUnknown_03004828->unk_009c == 1 && gUnknown_03004828->unk_009d == 1)
     {
         gUnknown_03004828->linkData[0] = 0xdcba;
         Trade_SendData(gUnknown_03004828);
-- 
cgit v1.2.3


From 3b274627db0af5edb2b37cdd84effff6358a4cf3 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 4 Sep 2017 20:36:12 -0400
Subject: sub_804B24C

---
 asm/trade.s | 55 -------------------------------------------------------
 src/trade.c | 24 ++++++++++++++++++++++--
 2 files changed, 22 insertions(+), 57 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 8ebe142e0..03c51aa52 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -733,59 +733,4 @@ sub_804B228: @ 804B228
 _0804B248: .4byte gUnknown_03004828
 	thumb_func_end sub_804B228
 
-	thumb_func_start sub_804B24C
-sub_804B24C: @ 804B24C
-	push {r4,r5,lr}
-	ldr r1, _0804B270 @ =gUnknown_03004828
-	ldr r2, [r1]
-	adds r0, r2, 0
-	adds r0, 0xB2
-	adds r3, r2, 0
-	adds r3, 0xB3
-	ldrb r0, [r0]
-	adds r5, r1, 0
-	ldrb r3, [r3]
-	cmp r0, r3
-	bne _0804B274
-	adds r1, r2, 0
-	adds r1, 0xB4
-	ldrh r0, [r1]
-	adds r0, 0x1
-	b _0804B27A
-	.align 2, 0
-_0804B270: .4byte gUnknown_03004828
-_0804B274:
-	adds r1, r2, 0
-	adds r1, 0xB4
-	movs r0, 0
-_0804B27A:
-	strh r0, [r1]
-	adds r4, r5, 0
-	ldr r3, [r4]
-	adds r2, r3, 0
-	adds r2, 0xB4
-	ldrh r0, [r2]
-	cmp r0, 0xB4
-	bls _0804B29C
-	movs r1, 0
-	movs r0, 0
-	strh r0, [r2]
-	adds r0, r3, 0
-	adds r0, 0xB3
-	strb r1, [r0]
-	ldr r0, [r4]
-	adds r0, 0xB2
-	strb r1, [r0]
-_0804B29C:
-	ldr r0, [r5]
-	adds r1, r0, 0
-	adds r1, 0xB2
-	ldrb r1, [r1]
-	adds r0, 0xB3
-	strb r1, [r0]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804B24C
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index c6933d8a0..72f149dfd 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -133,7 +133,10 @@ struct TradeEwramSubstruct2 {
     /*0x0038*/ struct Pokemon pokemon;
     /*0x009c*/ u8 unk_009c;
     /*0x009d*/ u8 unk_009d;
-    /*0x009e*/ u16 linkData[12];
+    /*0x009e*/ u16 linkData[10];
+    /*0x00b2*/ u8 unk_00b2;
+    /*0x00b3*/ u8 unk_00b3;
+    /*0x00b4*/ u16 unk_00b4;
     /*0x00b6*/ u16 unk_00b6;
     // Sprite indices
     /*0x00b8*/ u8 unk_00b8[2];
@@ -3511,7 +3514,24 @@ void sub_804B210(void);
 
 void sub_804B228(void);
 
-void sub_804B24C(void);
+void sub_804B24C(void)
+{
+    if (gUnknown_03004828->unk_00b2 == gUnknown_03004828->unk_00b3)
+    {
+        gUnknown_03004828->unk_00b4 ++;
+    }
+    else
+    {
+        gUnknown_03004828->unk_00b4 = 0;
+    }
+    if (gUnknown_03004828->unk_00b4 > 0xb4)
+    {
+        gUnknown_03004828->unk_00b4 = 0;
+        gUnknown_03004828->unk_00b3 = 0;
+        gUnknown_03004828->unk_00b2 = 0;
+    }
+    gUnknown_03004828->unk_00b3 = gUnknown_03004828->unk_00b2;
+}
 
 static u8 sub_804B2B0(void)
 {
-- 
cgit v1.2.3


From 83fe9cb4947301a0472628500ff9961a54d8c456 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 4 Sep 2017 20:37:47 -0400
Subject: sub_804B210 and sub_804B228

---
 asm/trade.s | 33 ---------------------------------
 src/trade.c | 17 +++++++++++++++--
 2 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 03c51aa52..d44ecf600 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -700,37 +700,4 @@ _0804B20C:
 	bx r0
 	thumb_func_end sub_804B1BC
 
-	thumb_func_start sub_804B210
-sub_804B210: @ 804B210
-	push {lr}
-	bl sub_804B1BC
-	bl LoadOam
-	bl ProcessSpriteCopyRequests
-	bl TransferPlttBuffer
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804B210
-
-	thumb_func_start sub_804B228
-sub_804B228: @ 804B228
-	push {r4,lr}
-	ldr r4, _0804B248 @ =gUnknown_03004828
-	ldr r1, [r4]
-	adds r2, r1, 0
-	adds r2, 0xB4
-	movs r3, 0
-	movs r0, 0
-	strh r0, [r2]
-	adds r1, 0xB2
-	strb r3, [r1]
-	ldr r0, [r4]
-	adds r0, 0xB3
-	strb r3, [r0]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804B248: .4byte gUnknown_03004828
-	thumb_func_end sub_804B228
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index 72f149dfd..777d37d27 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -3510,9 +3510,22 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
-void sub_804B210(void);
+void sub_804B1BC(void);
 
-void sub_804B228(void);
+void sub_804B210(void)
+{
+    sub_804B1BC();
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void sub_804B228(void)
+{
+    gUnknown_03004828->unk_00b4 = 0;
+    gUnknown_03004828->unk_00b2 = 0;
+    gUnknown_03004828->unk_00b3 = 0;
+}
 
 void sub_804B24C(void)
 {
-- 
cgit v1.2.3


From d4d324a41652abe19b6f24417713d8cd8efdb421 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 4 Sep 2017 21:04:56 -0400
Subject: nonmatching sub_804B1BC

---
 asm/trade.s |  45 --------------
 src/trade.c | 196 +++++++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 128 insertions(+), 113 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index d44ecf600..8e89884fa 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -655,49 +655,4 @@ _0804B1B4: .4byte gUnknown_03004828
 _0804B1B8: .4byte REG_BG2PA
 	thumb_func_end sub_804B128
 
-	thumb_func_start sub_804B1BC
-sub_804B1BC: @ 804B1BC
-	push {lr}
-	ldr r1, _0804B1FC @ =REG_BG1VOFS
-	ldr r0, _0804B200 @ =gUnknown_03004828
-	ldr r2, [r0]
-	movs r3, 0x88
-	lsls r3, 1
-	adds r0, r2, r3
-	ldrh r0, [r0]
-	strh r0, [r1]
-	subs r1, 0x2
-	adds r3, 0x2
-	adds r0, r2, r3
-	ldrh r0, [r0]
-	strh r0, [r1]
-	movs r0, 0x80
-	lsls r0, 19
-	ldrh r0, [r0]
-	movs r1, 0x7
-	ands r0, r1
-	cmp r0, 0
-	bne _0804B208
-	ldr r1, _0804B204 @ =REG_BG2VOFS
-	adds r3, 0x2
-	adds r0, r2, r3
-	ldrh r0, [r0]
-	strh r0, [r1]
-	subs r1, 0x2
-	adds r3, 0x2
-	adds r0, r2, r3
-	ldrh r0, [r0]
-	strh r0, [r1]
-	b _0804B20C
-	.align 2, 0
-_0804B1FC: .4byte REG_BG1VOFS
-_0804B200: .4byte gUnknown_03004828
-_0804B204: .4byte REG_BG2VOFS
-_0804B208:
-	bl sub_804B128
-_0804B20C:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804B1BC
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index 777d37d27..1554380bd 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -139,7 +139,7 @@ struct TradeEwramSubstruct2 {
     /*0x00b4*/ u16 unk_00b4;
     /*0x00b6*/ u16 unk_00b6;
     // Sprite indices
-    /*0x00b8*/ u8 unk_00b8[2];
+    /*0x00b8*/ u8 pokePicSpriteIdxs[2];
     /*0x00ba*/ u8 unk_00ba;
     /*0x00bb*/ u8 unk_00bb;
     /*0x00bc*/ u8 unk_00bc;
@@ -157,15 +157,15 @@ struct TradeEwramSubstruct2 {
     /*0x010a*/ u16 unk_010a;
     /*0x010c*/ u16 unk_010c;
     /*0x010e*/ s16 unk_010e;
-    /*0x0110*/ s16 unk_0110;
-    /*0x0112*/ u16 unk_0112;
-    /*0x0114*/ u16 unk_0114;
-    /*0x0116*/ s16 unk_0116;
+    /*0x0110*/ s16 bg1vofs;
+    /*0x0112*/ s16 bg1hofs;
+    /*0x0114*/ s16 bg2vofs;
+    /*0x0116*/ s16 bg2hofs;
     /*0x0118*/ u16 unk_0118;
     /*0x011a*/ u16 unk_011a;
     /*0x011c*/ u16 unk_011c;
     /*0x011e*/ u8 isLinkTrade;
-    /*0x0120*/ u16 unk_0120[2];
+    /*0x0120*/ u16 tradeSpecies[2];
     /*0x0124*/ u16 unk_0124;
 };
 
@@ -3510,7 +3510,67 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
-void sub_804B1BC(void);
+#ifdef NONMATCHING
+void sub_804B1BC(void)
+{
+    REG_BG1VOFS = gUnknown_03004828->bg1vofs;
+    REG_BG1HOFS = gUnknown_03004828->bg1hofs;
+    if ((REG_DISPCNT & 7) == DISPCNT_MODE_0)
+    {
+        REG_BG2VOFS = gUnknown_03004828->bg2vofs;
+        REG_BG2HOFS = gUnknown_03004828->bg2hofs;
+    }
+    else
+    {
+        sub_804B128();
+    }
+}
+#else
+__attribute__((naked)) void sub_804B1BC(void)
+{
+    asm_unified("\tpush {lr}\n"
+                    "\tldr r1, _0804B1FC @ =REG_BG1VOFS\n"
+                    "\tldr r0, _0804B200 @ =gUnknown_03004828\n"
+                    "\tldr r2, [r0]\n"
+                    "\tmovs r3, 0x88\n"
+                    "\tlsls r3, 1\n"
+                    "\tadds r0, r2, r3\n"
+                    "\tldrh r0, [r0]\n"
+                    "\tstrh r0, [r1]\n"
+                    "\tsubs r1, 0x2\n"
+                    "\tadds r3, 0x2\n"
+                    "\tadds r0, r2, r3\n"
+                    "\tldrh r0, [r0]\n"
+                    "\tstrh r0, [r1]\n"
+                    "\tmovs r0, 0x80\n"
+                    "\tlsls r0, 19\n"
+                    "\tldrh r0, [r0]\n"
+                    "\tmovs r1, 0x7\n"
+                    "\tands r0, r1\n"
+                    "\tcmp r0, 0\n"
+                    "\tbne _0804B208\n"
+                    "\tldr r1, _0804B204 @ =REG_BG2VOFS\n"
+                    "\tadds r3, 0x2\n"
+                    "\tadds r0, r2, r3\n"
+                    "\tldrh r0, [r0]\n"
+                    "\tstrh r0, [r1]\n"
+                    "\tsubs r1, 0x2\n"
+                    "\tadds r3, 0x2\n"
+                    "\tadds r0, r2, r3\n"
+                    "\tldrh r0, [r0]\n"
+                    "\tstrh r0, [r1]\n"
+                    "\tb _0804B20C\n"
+                    "\t.align 2, 0\n"
+                    "_0804B1FC: .4byte REG_BG1VOFS\n"
+                    "_0804B200: .4byte gUnknown_03004828\n"
+                    "_0804B204: .4byte REG_BG2VOFS\n"
+                    "_0804B208:\n"
+                    "\tbl sub_804B128\n"
+                    "_0804B20C:\n"
+                    "\tpop {r0}\n"
+                    "\tbx r0");
+}
+#endif
 
 void sub_804B210(void)
 {
@@ -3579,13 +3639,13 @@ void sub_804B2D0(u8 whichParty, u8 a1)
             personality = GetMonData(pokemon, MON_DATA_PERSONALITY);
             HandleLoadSpecialPokePic(&gMonFrontPicTable[species], gMonFrontPicCoords[species].coords, gMonFrontPicCoords[species].y_offset, (u32)ewram, gUnknown_081FAF4C[whichParty * 2 + 1], species, personality);
             LoadCompressedObjectPalette(sub_8040990(pokemon));
-            gUnknown_03004828->unk_0120[whichParty] = species;
+            gUnknown_03004828->tradeSpecies[whichParty] = species;
             break;
         case 1:
             GetMonSpriteTemplate_803C56C(sub_8040990(pokemon)->tag, v0);
-            gUnknown_03004828->unk_00b8[whichParty] = CreateSprite(&gUnknown_02024E8C, 0x78, 0x3c, 0x6);
-            gSprites[gUnknown_03004828->unk_00b8[whichParty]].invisible = TRUE;
-            gSprites[gUnknown_03004828->unk_00b8[whichParty]].callback = SpriteCallbackDummy;
+            gUnknown_03004828->pokePicSpriteIdxs[whichParty] = CreateSprite(&gUnknown_02024E8C, 0x78, 0x3c, 0x6);
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[whichParty]].invisible = TRUE;
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[whichParty]].callback = SpriteCallbackDummy;
             break;
     }
 }
@@ -4257,14 +4317,14 @@ void sub_804BBE8(u8 a0)
             LoadPalette(gUnknown_0820C9F8, 0x10, 0xa0);
             DmaCopyLarge16(3, gUnknown_0820CA98, (void *)BG_CHAR_ADDR(1), 0x1300, 0x1000);
             DmaCopy16Defvars(3, gUnknown_0820F798, (void *)BG_SCREEN_ADDR(18), 0x1000);
-            gUnknown_03004828->unk_0114 = 0;
-            gUnknown_03004828->unk_0116 = 0xb4;
+            gUnknown_03004828->bg2vofs = 0;
+            gUnknown_03004828->bg2hofs = 0xb4;
             REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON;
             REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(18) | BGCNT_TXT512x256;
             break;
         case 1:
-            gUnknown_03004828->unk_0112 = 0;
-            gUnknown_03004828->unk_0110 = 0x15c;
+            gUnknown_03004828->bg1hofs = 0;
+            gUnknown_03004828->bg1vofs = 0x15c;
             REG_BG1VOFS = 0x15c;
             REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(5) | BGCNT_TXT256x512;
 
@@ -4273,8 +4333,8 @@ void sub_804BBE8(u8 a0)
             REG_DISPCNT = DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_OBJ_ON;
             break;
         case 2:
-            gUnknown_03004828->unk_0110 = 0;
-            gUnknown_03004828->unk_0112 = 0;
+            gUnknown_03004828->bg1vofs = 0;
+            gUnknown_03004828->bg1hofs = 0;
             REG_DISPCNT = DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_OBJ_ON;
             DmaCopy16Defvars(3, gUnknown_08211798, (void *)BG_SCREEN_ADDR(5), 0x800);
             break;
@@ -4300,8 +4360,8 @@ void sub_804BBE8(u8 a0)
             DmaCopy16Defvars(3, gUnknown_08215778, (void *)BG_SCREEN_ADDR(18), 0x100);
             break;
         case 5:
-            gUnknown_03004828->unk_0110 = 0;
-            gUnknown_03004828->unk_0112 = 0;
+            gUnknown_03004828->bg1vofs = 0;
+            gUnknown_03004828->bg1hofs = 0;
             REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(5);
             LZDecompressVram(gUnknown_08D00000, (void *)BG_CHAR_ADDR(0));
             CpuCopy16(gUnknown_08D00524, buffer = (u16 *)ewram, 0x1000);
@@ -4326,8 +4386,8 @@ void sub_804BBE8(u8 a0)
             DmaCopy16Defvars(3, gUnknown_08215778, (void *)BG_SCREEN_ADDR(18), 0x100);
             break;
         case 7:
-            gUnknown_03004828->unk_0114 = 0;
-            gUnknown_03004828->unk_0116 = 0;
+            gUnknown_03004828->bg2vofs = 0;
+            gUnknown_03004828->bg2hofs = 0;
             REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(18) | BGCNT_TXT512x256;
             LoadPalette(gUnknown_0820C9F8, 0x10, 0xa0);
             DmaCopyLarge16(3, gUnknown_0820CA98, (void *)BG_CHAR_ADDR(1), 0x1300, 0x1000);
@@ -4340,7 +4400,7 @@ void sub_804C0F8(u8 a0)
 {
     if (a0 == 0)
     {
-        if (gUnknown_03004828->unk_0110 < 0x10a)
+        if (gUnknown_03004828->bg1vofs < 0x10a)
         {
             gUnknown_03004828->unk_010e ++;
             gUnknown_03004828->unk_011c += 64;
@@ -4397,23 +4457,23 @@ bool8 sub_804C29C(void)
     switch (gUnknown_03004828->unk_00c4)
     {
         case 0:
-            gSprites[gUnknown_03004828->unk_00b8[0]].invisible = FALSE;
-            gSprites[gUnknown_03004828->unk_00b8[0]].pos2.x = -0xb4;
-            gSprites[gUnknown_03004828->unk_00b8[0]].pos2.y = gMonFrontPicCoords[gUnknown_03004828->unk_0120[0]].y_offset;
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].invisible = FALSE;
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.x = -0xb4;
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y = gMonFrontPicCoords[gUnknown_03004828->tradeSpecies[0]].y_offset;
             gUnknown_03004828->unk_00c4 ++;
             gUnknown_03004828->unk_0124 = GetCurrentMapMusic();
             PlayBGM(BGM_SHINKA);
             break;
         case 1:
-            if (gUnknown_03004828->unk_0116 > 0)
+            if (gUnknown_03004828->bg2hofs > 0)
             {
-                gSprites[gUnknown_03004828->unk_00b8[0]].pos2.x += 3;
-                gUnknown_03004828->unk_0116 -= 3;
+                gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.x += 3;
+                gUnknown_03004828->bg2hofs -= 3;
             }
             else
             {
-                gSprites[gUnknown_03004828->unk_00b8[0]].pos2.x = 0;
-                gUnknown_03004828->unk_0116 = 0;
+                gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.x = 0;
+                gUnknown_03004828->bg2hofs = 0;
                 gUnknown_03004828->unk_00c4 = 10;
             }
             break;
@@ -4427,7 +4487,7 @@ bool8 sub_804C29C(void)
         case 11:
             if (++gUnknown_03004828->unk_00c0 == 80)
             {
-                gUnknown_03004828->unk_0102 = sub_8047580(gUnknown_03004828->unk_00b8[0], gSprites[gUnknown_03004828->unk_00b8[0]].oam.paletteNum, 0x78, 0x20, 0x2, 0x1, 0x14, 0xfffff);
+                gUnknown_03004828->unk_0102 = sub_8047580(gUnknown_03004828->pokePicSpriteIdxs[0], gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].oam.paletteNum, 0x78, 0x20, 0x2, 0x1, 0x14, 0xfffff);
                 gUnknown_03004828->unk_00c4 ++;
                 ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19);
                 StringExpandPlaceholders(gStringVar4, gTradeText_ByeBye);
@@ -4501,11 +4561,11 @@ bool8 sub_804C29C(void)
             }
             break;
         case 26:
-            if (-- gUnknown_03004828->unk_0110 == 0x13C)
+            if (-- gUnknown_03004828->bg1vofs == 0x13C)
             {
                 gUnknown_03004828->unk_00c4 ++;
             }
-            if (gUnknown_03004828->unk_0110 == 0x148)
+            if (gUnknown_03004828->bg1vofs == 0x148)
             {
                 gUnknown_03004828->unk_00bc = CreateSprite(&gSpriteTemplate_8215A30, 0x80, 0x41, 0);
             }
@@ -4517,7 +4577,7 @@ bool8 sub_804C29C(void)
             gUnknown_03004828->unk_00c4 ++;
             break;
         case 28:
-            if ((gUnknown_03004828->unk_0110 -= 2) == 0xA6)
+            if ((gUnknown_03004828->bg1vofs -= 2) == 0xA6)
             {
                 gUnknown_03004828->unk_00c4 = 200;
             }
@@ -4584,40 +4644,40 @@ bool8 sub_804C29C(void)
             gUnknown_03004828->unk_00c4 ++;
             break;
         case 37:
-            if (!sub_8040A3C(gUnknown_03004828->unk_0120[0]))
+            if (!sub_8040A3C(gUnknown_03004828->tradeSpecies[0]))
             {
-                gSprites[gUnknown_03004828->unk_00b8[0]].affineAnims = gSpriteAffineAnimTable_8215AC0;
-                gSprites[gUnknown_03004828->unk_00b8[0]].oam.affineMode = 3;
-                CalcCenterToCornerVec(&gSprites[gUnknown_03004828->unk_00b8[0]], 0, 3, 3);
-                StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_00b8[0]], 0);
+                gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].affineAnims = gSpriteAffineAnimTable_8215AC0;
+                gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].oam.affineMode = 3;
+                CalcCenterToCornerVec(&gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]], 0, 3, 3);
+                StartSpriteAffineAnim(&gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]], 0);
             }
             else
             {
-                StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_00b8[0]], 0);
+                StartSpriteAffineAnim(&gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]], 0);
             }
-            StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_00b8[1]], 0);
-            gSprites[gUnknown_03004828->unk_00b8[0]].pos1.x = 0x3c;
-            gSprites[gUnknown_03004828->unk_00b8[1]].pos1.x = 0xb4;
-            gSprites[gUnknown_03004828->unk_00b8[0]].pos1.y = 0xc0;
-            gSprites[gUnknown_03004828->unk_00b8[1]].pos1.y = -0x20;
-            gSprites[gUnknown_03004828->unk_00b8[0]].invisible = FALSE;
-            gSprites[gUnknown_03004828->unk_00b8[1]].invisible = FALSE;
+            StartSpriteAffineAnim(&gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]], 0);
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos1.x = 0x3c;
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos1.x = 0xb4;
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos1.y = 0xc0;
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos1.y = -0x20;
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].invisible = FALSE;
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].invisible = FALSE;
             gUnknown_03004828->unk_00c4 ++;
             break;
         case 38:
-            gSprites[gUnknown_03004828->unk_00b8[0]].pos2.y -= 3;
-            gSprites[gUnknown_03004828->unk_00b8[1]].pos2.y += 3;
-            if (-0xa0 > gSprites[gUnknown_03004828->unk_00b8[0]].pos2.y && gSprites[gUnknown_03004828->unk_00b8[0]].pos2.y >= -0xa3)
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y -= 3;
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos2.y += 3;
+            if (-0xa0 > gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y && gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y >= -0xa3)
             {
                 PlaySE(SE_TK_WARPIN);
             }
-            if (gSprites[gUnknown_03004828->unk_00b8[0]].pos2.y < -0xde)
+            if (gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y < -0xde)
             {
                 gSprites[gUnknown_03004828->unk_00ba].data1 = 0;
                 gSprites[gUnknown_03004828->unk_00bb].data1 = 0;
                 gUnknown_03004828->unk_00c4 ++;
-                gSprites[gUnknown_03004828->unk_00b8[0]].invisible = TRUE;
-                gSprites[gUnknown_03004828->unk_00b8[1]].invisible = TRUE;
+                gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].invisible = TRUE;
+                gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].invisible = TRUE;
                 BlendPalettes(1,  0, 0xffff);
             }
             break;
@@ -4637,7 +4697,7 @@ bool8 sub_804C29C(void)
             {
                 gUnknown_03004828->unk_00c4 ++;
                 sub_804BBE8(1);
-                gUnknown_03004828->unk_0110 = 0xa6;
+                gUnknown_03004828->bg1vofs = 0xa6;
                 gUnknown_03004828->unk_00ba = CreateSprite(&gSpriteTemplate_82159BC, 0x80, -0x14, 3);
                 gUnknown_03004828->unk_00bb = CreateSprite(&gSpriteTemplate_82159FC, 0x80, -0x14, 0);
                 StartSpriteAnim(&gSprites[gUnknown_03004828->unk_00bb], 1);
@@ -4666,9 +4726,9 @@ bool8 sub_804C29C(void)
             break;
         case 44:
             sub_804C0F8(1);
-            if ((gUnknown_03004828->unk_0110 += 2) > 0x13c)
+            if ((gUnknown_03004828->bg1vofs += 2) > 0x13c)
             {
-                gUnknown_03004828->unk_0110 = 0x13c;
+                gUnknown_03004828->bg1vofs = 0x13c;
                 gUnknown_03004828->unk_00c4 ++;
             }
             break;
@@ -4685,12 +4745,12 @@ bool8 sub_804C29C(void)
             }
             break;
         case 47:
-            if (++ gUnknown_03004828->unk_0110 > 0x15c)
+            if (++ gUnknown_03004828->bg1vofs > 0x15c)
             {
-                gUnknown_03004828->unk_0110 = 0x15c;
+                gUnknown_03004828->bg1vofs = 0x15c;
                 gUnknown_03004828->unk_00c4 ++;
             }
-            if (gUnknown_03004828->unk_0110 == 0x148)
+            if (gUnknown_03004828->bg1vofs == 0x148)
                 gUnknown_03004828->unk_00bc = CreateSprite(&gSpriteTemplate_8215A30, 0x80, 0x41, 0);
             gSprites[gUnknown_03004828->unk_00bc].callback = sub_804B0E0;
             break;
@@ -4765,11 +4825,11 @@ bool8 sub_804C29C(void)
             }
             break;
         case 66:
-            gSprites[gUnknown_03004828->unk_00b8[1]].pos1.x = 0x78;
-            gSprites[gUnknown_03004828->unk_00b8[1]].pos1.y = gMonFrontPicCoords[gUnknown_03004828->unk_0120[1]].y_offset + 60;
-            gSprites[gUnknown_03004828->unk_00b8[1]].pos2.x = 0;
-            gSprites[gUnknown_03004828->unk_00b8[1]].pos2.y = 0;
-            CreatePokeballSprite(gUnknown_03004828->unk_00b8[1], gSprites[gUnknown_03004828->unk_00b8[1]].oam.paletteNum, 0x78, 0x54, 2, 1, 0x14, 0xfffff);
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos1.x = 0x78;
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos1.y = gMonFrontPicCoords[gUnknown_03004828->tradeSpecies[1]].y_offset + 60;
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos2.x = 0;
+            gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos2.y = 0;
+            CreatePokeballSprite(gUnknown_03004828->pokePicSpriteIdxs[1], gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].oam.paletteNum, 0x78, 0x54, 2, 1, 0x14, 0xfffff);
             FreeSpriteOamMatrix(&gSprites[gUnknown_03004828->unk_0103]);
             DestroySprite(&gSprites[gUnknown_03004828->unk_0103]);
             gUnknown_03004828->unk_00c4 ++;
@@ -4821,7 +4881,7 @@ bool8 sub_804C29C(void)
             gUnknown_03005E94 = sub_804BBCC;
             evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gUnknown_020297D8[0]], TRUE, ITEM_NONE);
             if (evoTarget != SPECIES_NONE)
-                TradeEvolutionScene(&gPlayerParty[gUnknown_020297D8[0]], evoTarget, gUnknown_03004828->unk_00b8[1], gUnknown_020297D8[0]);
+                TradeEvolutionScene(&gPlayerParty[gUnknown_020297D8[0]], evoTarget, gUnknown_03004828->pokePicSpriteIdxs[1], gUnknown_020297D8[0]);
             gUnknown_03004828->unk_00c4 ++;
             break;
         case 73:
@@ -4853,7 +4913,7 @@ void sub_804D588(void)
             gUnknown_03005E94 = sub_804DC88;
             evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gUnknown_020297D8[0]], TRUE, ITEM_NONE);
             if (evoTarget != SPECIES_NONE)
-                TradeEvolutionScene(&gPlayerParty[gUnknown_020297D8[0]], evoTarget, gUnknown_03004828->unk_00b8[1], gUnknown_020297D8[0]);
+                TradeEvolutionScene(&gPlayerParty[gUnknown_020297D8[0]], evoTarget, gUnknown_03004828->pokePicSpriteIdxs[1], gUnknown_020297D8[0]);
             else
                 SetMainCallback2(sub_804DC88);
             gUnknown_020297D8[0] = 255;
@@ -5073,8 +5133,8 @@ void sub_804DB84(void)
 {
     if (sub_804C29C() == TRUE)
     {
-        DestroySprite(&gSprites[gUnknown_03004828->unk_00b8[0]]);
-        FreeSpriteOamMatrix(&gSprites[gUnknown_03004828->unk_00b8[1]]);
+        DestroySprite(&gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]]);
+        FreeSpriteOamMatrix(&gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]]);
         sub_804BA94(gUnknown_020297D8[0], gUnknown_020297D8[1] % 6);
         gUnknown_03004828->linkData[0] = 0xabcd;
         gUnknown_03004828->unk_00bd = 1;
-- 
cgit v1.2.3


From 2aca208b0339ede43cca22b5aba257551c515783 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 4 Sep 2017 22:24:56 -0400
Subject: sub_804B128

---
 asm/trade.s    | 75 ----------------------------------------------------------
 include/util.h |  1 +
 src/trade.c    | 13 ++++++++++
 3 files changed, 14 insertions(+), 75 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 8e89884fa..309ebc46b 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -580,79 +580,4 @@ _0804B120:
 	bx r0
 	thumb_func_end sub_804B104
 
-	thumb_func_start sub_804B128
-sub_804B128: @ 804B128
-	push {r4,r5,lr}
-	sub sp, 0x20
-	ldr r0, _0804B1B4 @ =gUnknown_03004828
-	ldr r0, [r0]
-	mov r12, r0
-	movs r0, 0x82
-	lsls r0, 1
-	add r0, r12
-	ldrh r1, [r0]
-	lsls r1, 8
-	movs r0, 0x83
-	lsls r0, 1
-	add r0, r12
-	ldrh r2, [r0]
-	lsls r2, 8
-	movs r0, 0x86
-	lsls r0, 1
-	add r0, r12
-	movs r4, 0
-	ldrsh r3, [r0, r4]
-	movs r0, 0x87
-	lsls r0, 1
-	add r0, r12
-	movs r5, 0
-	ldrsh r0, [r0, r5]
-	str r0, [sp]
-	movs r4, 0x8C
-	lsls r4, 1
-	add r4, r12
-	movs r5, 0
-	ldrsh r0, [r4, r5]
-	str r0, [sp, 0x4]
-	movs r5, 0
-	ldrsh r0, [r4, r5]
-	str r0, [sp, 0x8]
-	movs r0, 0x8E
-	lsls r0, 1
-	add r0, r12
-	ldrh r0, [r0]
-	str r0, [sp, 0xC]
-	add r0, sp, 0x10
-	bl DoBgAffineSet
-	ldr r1, _0804B1B8 @ =REG_BG2PA
-	add r0, sp, 0x10
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, 0x2
-	add r0, sp, 0x10
-	ldrh r0, [r0, 0x2]
-	strh r0, [r1]
-	adds r1, 0x2
-	add r0, sp, 0x10
-	ldrh r0, [r0, 0x4]
-	strh r0, [r1]
-	adds r1, 0x2
-	add r0, sp, 0x10
-	ldrh r0, [r0, 0x6]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, [sp, 0x18]
-	str r0, [r1]
-	adds r1, 0x4
-	ldr r0, [sp, 0x1C]
-	str r0, [r1]
-	add sp, 0x20
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804B1B4: .4byte gUnknown_03004828
-_0804B1B8: .4byte REG_BG2PA
-	thumb_func_end sub_804B128
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/include/util.h b/include/util.h
index cd50b75cc..87fa4aecc 100644
--- a/include/util.h
+++ b/include/util.h
@@ -10,5 +10,6 @@ u8 CreateInvisibleSpriteWithCallback(void (*)(struct Sprite *));
 void StoreWordInTwoHalfwords(u16 *, u32);
 void LoadWordFromTwoHalfwords(u16 *, u32 *);
 u16 CalcCRC16(u8 *data, int length);
+void DoBgAffineSet(struct BgAffineDstData *dest, u32 texX, u32 texY, s16 scrX, s16 scrY, s16 sx, s16 sy, u16 alpha);
 
 #endif // GUARD_UTIL_H
diff --git a/src/trade.c b/src/trade.c
index 1554380bd..06da2c333 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -36,6 +36,7 @@
 #include "pokeball.h"
 #include "pokedex.h"
 #include "field_effect.h"
+#include "util.h"
 #include "trade.h"
 
 #ifdef ENGLISH
@@ -3510,6 +3511,18 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804B128(void)
+{
+    struct BgAffineDstData dest;
+    DoBgAffineSet(&dest, gUnknown_03004828->unk_0104 << 8, gUnknown_03004828->unk_0106 << 8, gUnknown_03004828->unk_010c, gUnknown_03004828->unk_010e, gUnknown_03004828->unk_0118, gUnknown_03004828->unk_0118, gUnknown_03004828->unk_011c);
+    REG_BG2PA = dest.pa;
+    REG_BG2PB = dest.pb;
+    REG_BG2PC = dest.pc;
+    REG_BG2PD = dest.pd;
+    REG_BG2X = dest.dx;
+    REG_BG2Y = dest.dy;
+}
+
 #ifdef NONMATCHING
 void sub_804B1BC(void)
 {
-- 
cgit v1.2.3


From 7592de577a9d065d52e950a4e7f071623c233b6d Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 4 Sep 2017 22:32:44 -0400
Subject: A bunch of small sprite callbacks

---
 asm/trade.s | 120 ------------------------------------------------------------
 src/trade.c |  44 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 120 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 309ebc46b..b68905d0f 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -460,124 +460,4 @@ _0804B042:
 _0804B054: .4byte gTileBuffer
 	thumb_func_end sub_804AFB8
 
-	thumb_func_start sub_804B058
-sub_804B058: @ 804B058
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xA
-	bne _0804B074
-	movs r0, 0x17
-	bl PlaySE
-	movs r0, 0
-	strh r0, [r4, 0x2E]
-_0804B074:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804B058
-
-	thumb_func_start sub_804B07C
-sub_804B07C: @ 804B07C
-	push {lr}
-	adds r2, r0, 0
-	movs r0, 0x30
-	ldrsh r1, [r2, r0]
-	cmp r1, 0
-	bne _0804B0B2
-	ldrh r0, [r2, 0x2E]
-	adds r0, 0x1
-	strh r0, [r2, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xC
-	bne _0804B098
-	strh r1, [r2, 0x2E]
-_0804B098:
-	movs r1, 0x2E
-	ldrsh r0, [r2, r1]
-	lsls r0, 1
-	ldr r1, _0804B0B8 @ =gTradeGlow2PaletteAnimTable
-	adds r0, r1
-	ldrb r1, [r2, 0x5]
-	lsrs r1, 4
-	adds r1, 0x10
-	lsls r1, 4
-	adds r1, 0x4
-	movs r2, 0x2
-	bl LoadPalette
-_0804B0B2:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804B0B8: .4byte gTradeGlow2PaletteAnimTable
-	thumb_func_end sub_804B07C
-
-	thumb_func_start sub_804B0BC
-sub_804B0BC: @ 804B0BC
-	push {lr}
-	adds r2, r0, 0
-	ldrh r1, [r2, 0x2E]
-	adds r1, 0x1
-	strh r1, [r2, 0x2E]
-	ldrh r0, [r2, 0x26]
-	adds r0, 0x1
-	strh r0, [r2, 0x26]
-	lsls r1, 16
-	asrs r1, 16
-	cmp r1, 0xA
-	bne _0804B0DA
-	adds r0, r2, 0
-	bl DestroySprite
-_0804B0DA:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804B0BC
-
-	thumb_func_start sub_804B0E0
-sub_804B0E0: @ 804B0E0
-	push {lr}
-	adds r2, r0, 0
-	ldrh r1, [r2, 0x2E]
-	adds r1, 0x1
-	strh r1, [r2, 0x2E]
-	ldrh r0, [r2, 0x26]
-	subs r0, 0x1
-	strh r0, [r2, 0x26]
-	lsls r1, 16
-	asrs r1, 16
-	cmp r1, 0xA
-	bne _0804B0FE
-	adds r0, r2, 0
-	bl DestroySprite
-_0804B0FE:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804B0E0
-
-	thumb_func_start sub_804B104
-sub_804B104: @ 804B104
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xF
-	bne _0804B120
-	movs r0, 0xCC
-	bl PlaySE
-	movs r0, 0
-	strh r0, [r4, 0x2E]
-_0804B120:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804B104
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index 06da2c333..13811336e 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -3511,6 +3511,50 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804B058(struct Sprite *sprite)
+{
+    if (++ sprite->data0 == 10)
+    {
+        PlaySE(SE_BOWA);
+        sprite->data0 = 0;
+    }
+}
+
+void sub_804B07C(struct Sprite *sprite)
+{
+    if (sprite->data1 == 0)
+    {
+        if (++ sprite->data0 == 12)
+            sprite->data0 = 0;
+        LoadPalette(&gTradeGlow2PaletteAnimTable[sprite->data0], 16 * (sprite->oam.paletteNum + 16) + 4, 2);
+    }
+}
+
+void sub_804B0BC(struct Sprite *sprite)
+{
+    sprite->data0 ++;
+    sprite->pos2.y ++;
+    if (sprite->data0 == 10)
+        DestroySprite(sprite);
+}
+
+void sub_804B0E0(struct Sprite *sprite)
+{
+    sprite->data0 ++;
+    sprite->pos2.y --;
+    if (sprite->data0 == 10)
+        DestroySprite(sprite);
+}
+
+void sub_804B104(struct Sprite *sprite)
+{
+    if (++ sprite->data0 == 15)
+    {
+        PlaySE(SE_W107);
+        sprite->data0 = 0;
+    }
+}
+
 void sub_804B128(void)
 {
     struct BgAffineDstData dest;
-- 
cgit v1.2.3


From ef786e5c3067498a0628b58e914c8ce83c39b44b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 4 Sep 2017 22:56:08 -0400
Subject: sub_804AFB8

---
 asm/trade.s    | 80 ----------------------------------------------------------
 include/text.h |  2 +-
 src/text.c     |  4 +--
 src/trade.c    | 16 ++++++++++++
 4 files changed, 19 insertions(+), 83 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index b68905d0f..19fbf83d7 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -380,84 +380,4 @@ _0804AFB0: .4byte gSaveBlock1 + 0x3110
 _0804AFB4: .4byte gUnknown_03004824
 	thumb_func_end sub_804AF84
 
-	thumb_func_start sub_804AFB8
-sub_804AFB8: @ 804AFB8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	mov r9, r0
-	mov r8, r1
-	mov r10, r2
-	lsls r3, 24
-	lsrs r6, r3, 24
-	adds r0, r6, 0x3
-	lsrs r6, r0, 2
-	ldr r7, _0804B054 @ =gTileBuffer
-	mov r0, sp
-	movs r5, 0
-	strh r5, [r0]
-	lsls r4, r6, 6
-	movs r0, 0x80
-	lsls r0, 17
-	orrs r4, r0
-	mov r0, sp
-	adds r1, r7, 0
-	adds r2, r4, 0
-	bl CpuSet
-	mov r0, sp
-	adds r0, 0x2
-	strh r5, [r0]
-	mov r2, r9
-	ldrb r1, [r2, 0xD]
-	lsls r1, 5
-	adds r1, r7
-	adds r2, r4, 0
-	bl CpuSet
-	mov r0, r9
-	adds r1, r7, 0
-	mov r2, r10
-	bl sub_8004E3C
-	movs r4, 0
-	cmp r4, r6
-	bcs _0804B042
-_0804B010:
-	lsls r0, r4, 7
-	adds r0, r7, r0
-	lsls r1, r4, 8
-	add r1, r8
-	movs r2, 0x40
-	bl CpuSet
-	lsls r0, r4, 2
-	mov r1, r9
-	ldrb r1, [r1, 0xD]
-	adds r0, r1
-	lsls r0, 5
-	adds r0, r7, r0
-	lsls r1, r4, 3
-	adds r1, 0x4
-	lsls r1, 5
-	add r1, r8
-	movs r2, 0x40
-	bl CpuSet
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, r6
-	bcc _0804B010
-_0804B042:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804B054: .4byte gTileBuffer
-	thumb_func_end sub_804AFB8
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/include/text.h b/include/text.h
index 6b2efc7ae..b93653bc2 100644
--- a/include/text.h
+++ b/include/text.h
@@ -245,7 +245,7 @@ u8 sub_8004D38(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 l
 u8 sub_8004DB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top, u16 a6);
 u8 sub_8004E24(struct Window *win);
 void sub_8004E28(struct Window *win, u8 *foreground, u8 *background, u8 *shadow);
-void sub_8004E3C(struct WindowConfig *winConfig, u8 *tileData, const u8 *text);
+void sub_8004E3C(const struct WindowConfig *winConfig, u8 *tileData, const u8 *text);
 u8 GetStringWidthGivenWindowConfig(const struct WindowConfig *winConfig, const u8 *s);
 void ConvertInternationalString(u8 *s, u8 language);
 void StripExtCtrlCodes(u8 *str);
diff --git a/src/text.c b/src/text.c
index 1dc81df0c..35f74b339 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2342,7 +2342,7 @@ u8 sub_8003490(struct Window *win, u8 c, u16 tileDataStartOffset, u8 left, u8 to
 
 void sub_80034D4(u8 *tileData, const u8 *text)
 {
-    sub_8004E3C((struct WindowConfig *)&gWindowConfig_81E6C74, tileData, text);
+    sub_8004E3C(&gWindowConfig_81E6C74, tileData, text);
 }
 
 u8 sub_80034EC(u8 *str)
@@ -3645,7 +3645,7 @@ void sub_8004E28(struct Window *win, u8 *foreground, u8 *background, u8 *shadow)
     *shadow = win->shadowColor;
 }
 
-void sub_8004E3C(struct WindowConfig *winConfig, u8 *tileData, const u8 *text)
+void sub_8004E3C(const struct WindowConfig *winConfig, u8 *tileData, const u8 *text)
 {
     sTempWindow.config = winConfig;
     InitWindow(&sTempWindow, text, 0, 0, 0);
diff --git a/src/trade.c b/src/trade.c
index 13811336e..3cb292a1b 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -3511,6 +3511,22 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804AFB8(const struct WindowConfig *windowConfig, u8 *dest, const u8 *src, u8 size)
+{
+    u8 i;
+    u8 *tileBuffer;
+    size = (size + 3) / 4;
+    tileBuffer = gTileBuffer;
+    CpuFill16(0, tileBuffer, size * 0x80);
+    CpuFill16(0, tileBuffer + windowConfig->width * 0x20, size * 0x80);
+    sub_8004E3C(windowConfig, tileBuffer, src);
+    for (i = 0; i < size; i ++)
+    {
+        CpuCopy16(&tileBuffer[32 * (i * 4)], &dest[32 * (i * 8)], 0x80);
+        CpuCopy16(&tileBuffer[32 * (i * 4 + windowConfig->width)], &dest[32 * (i * 8 + 4)], 0x80);
+    }
+}
+
 void sub_804B058(struct Sprite *sprite)
 {
     if (++ sprite->data0 == 10)
-- 
cgit v1.2.3


From 1b2096556ae0dcbc31723e782cfec354a4a94117 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 4 Sep 2017 23:05:24 -0400
Subject: sub_804AF10 and sub_804AF84

---
 asm/trade.s            | 92 --------------------------------------------------
 include/global.h       |  4 +--
 include/pokemon_icon.h |  1 +
 src/trade.c            | 23 ++++++++++++-
 4 files changed, 25 insertions(+), 95 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 19fbf83d7..53fe968a5 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -288,96 +288,4 @@ _0804AF08: .4byte gUnknown_03004824
 _0804AF0C: .4byte gEnemyParty
 	thumb_func_end sub_804AE3C
 
-	thumb_func_start sub_804AF10
-sub_804AF10: @ 804AF10
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	movs r5, 0
-_0804AF18:
-	movs r4, 0
-	ldr r2, _0804AF7C @ =gUnknown_03004824
-	ldr r0, [r2]
-	adds r0, 0x42
-	adds r0, r5
-	adds r1, r5, 0x1
-	mov r8, r1
-	ldrb r0, [r0]
-	cmp r4, r0
-	bge _0804AF6A
-	adds r6, r2, 0
-	lsls r0, r5, 1
-	adds r0, r5
-	lsls r7, r0, 1
-_0804AF34:
-	ldr r2, [r6]
-	adds r3, r4, r7
-	adds r0, r2, 0
-	adds r0, 0x34
-	adds r0, r3
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0804AF80 @ =gSprites
-	adds r0, r1
-	adds r2, 0x69
-	adds r2, r3
-	ldrb r2, [r2]
-	movs r1, 0x4
-	subs r1, r2
-	lsls r1, 24
-	lsrs r1, 24
-	bl sub_809D824
-	adds r4, 0x1
-	ldr r0, [r6]
-	adds r0, 0x42
-	adds r0, r5
-	ldrb r0, [r0]
-	cmp r4, r0
-	blt _0804AF34
-_0804AF6A:
-	mov r5, r8
-	cmp r5, 0x1
-	ble _0804AF18
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804AF7C: .4byte gUnknown_03004824
-_0804AF80: .4byte gSprites
-	thumb_func_end sub_804AF10
-
-	thumb_func_start sub_804AF84
-sub_804AF84: @ 804AF84
-	push {r4,lr}
-	movs r2, 0
-	ldr r4, _0804AFB0 @ =gSaveBlock1 + 0x3110
-	ldr r3, _0804AFB4 @ =gUnknown_03004824
-_0804AF8C:
-	adds r1, r2, r4
-	ldrb r0, [r1]
-	cmp r0, 0
-	bne _0804AFA2
-	ldr r0, [r3]
-	adds r0, 0xB5
-	adds r0, r2
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0804AFA2
-	strb r0, [r1]
-_0804AFA2:
-	adds r2, 0x1
-	cmp r2, 0xA
-	ble _0804AF8C
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804AFB0: .4byte gSaveBlock1 + 0x3110
-_0804AFB4: .4byte gUnknown_03004824
-	thumb_func_end sub_804AF84
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/include/global.h b/include/global.h
index f076274cc..07ea6a410 100644
--- a/include/global.h
+++ b/include/global.h
@@ -651,8 +651,8 @@ struct SaveBlock1 /* 0x02025734 */
     /*0x30B7*/ u8 filler_30B7[1];
     /*0x30B8*/ struct LinkBattleRecord linkBattleRecords[5];
     /*0x3108*/ u8 filler_3108[8];
-    /*0x3110*/ u8 giftRibbons[7];
-    /*0x3117*/ u8 filler_311B[0x2D];
+    /*0x3110*/ u8 giftRibbons[11];
+    /*0x3117*/ u8 filler_311B[0x29];
     /*0x3144*/ struct Roamer roamer;
     /*0x3160*/ struct EnigmaBerry enigmaBerry;
     /*0x3690*/ struct RamScript ramScript;
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index 20acb6676..6f00619fc 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -10,5 +10,6 @@ void sub_809D51C(void);
 void sub_809D580(u16);
 void sub_809D608(u16);
 void UpdateMonIconFrame(struct Sprite *sprite);
+void sub_809D824(struct Sprite *, u8);
 
 #endif // GUARD_POKEMON_ICON_H
diff --git a/src/trade.c b/src/trade.c
index 3cb292a1b..f9922dcfb 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -95,7 +95,8 @@ struct TradeEwramSubstruct {
     /*0x0044*/ u8 tradeMenuOptionsActive[13];
     /*0x0051*/ u8 unk_0051[6];
     /*0x0057*/ u8 filler_0057[6];
-    /*0x005d*/ u8 unk_005d[4][6];
+    /*0x005d*/ u8 unk_005d[2][6];
+    /*0x005d*/ u8 unk_0069[2][6];
     /*0x0075*/ u8 unk_0075;
     /*0x0076*/ u8 filler_0076[4];
     /*0x007a*/ u8 unk_007a;
@@ -3511,6 +3512,26 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804AF10(void)
+{
+    int i, j;
+    for (i = 0; i < 2; i ++)
+    {
+        for (j = 0; j < gUnknown_03004824->partyCounts[i]; j ++)
+        {
+            sub_809D824(&gSprites[gUnknown_03004824->partyIcons[i][j]], 4 - gUnknown_03004824->unk_0069[i][j]);
+        }
+    }
+}
+
+void sub_804AF84(void)
+{
+    int i;
+    for (i = 0; i < 11; i ++)
+        if (gSaveBlock1.giftRibbons[i] == 0 && gUnknown_03004824->unk_00b5[i] != 0)
+            gSaveBlock1.giftRibbons[i] = gUnknown_03004824->unk_00b5[i];
+}
+
 void sub_804AFB8(const struct WindowConfig *windowConfig, u8 *dest, const u8 *src, u8 size)
 {
     u8 i;
-- 
cgit v1.2.3


From fd131fb769e25037c2979b5648e29b18cc8f0f6c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 4 Sep 2017 23:11:46 -0400
Subject: sub_804AE3C

---
 asm/trade.s | 105 ------------------------------------------------------------
 src/trade.c |  27 ++++++++++++++++
 2 files changed, 27 insertions(+), 105 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 53fe968a5..45bb5da25 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -183,109 +183,4 @@ _0804AE2C:
 _0804AE38: .4byte gUnknown_03004824
 	thumb_func_end sub_804ACF4
 
-	thumb_func_start sub_804AE3C
-sub_804AE3C: @ 804AE3C
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _0804AE4C
-	cmp r0, 0x1
-	beq _0804AEAC
-	b _0804AF00
-_0804AE4C:
-	movs r6, 0
-	ldr r1, _0804AEA4 @ =gUnknown_03004824
-	ldr r0, [r1]
-	adds r0, 0x42
-	ldrb r0, [r0]
-	cmp r6, r0
-	bcs _0804AF00
-	adds r7, r1, 0
-_0804AE5C:
-	movs r0, 0x64
-	adds r4, r6, 0
-	muls r4, r0
-	ldr r0, _0804AEA8 @ =gPlayerParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	lsls r0, 16
-	lsrs r5, r0, 16
-	adds r0, r4, 0
-	movs r1, 0x3A
-	bl GetMonData
-	adds r1, r0, 0
-	lsls r0, r5, 16
-	asrs r0, 16
-	lsls r1, 16
-	asrs r1, 16
-	bl GetHPBarLevel
-	ldr r1, [r7]
-	adds r1, 0x69
-	adds r1, r6
-	strb r0, [r1]
-	adds r0, r6, 0x1
-	lsls r0, 16
-	lsrs r6, r0, 16
-	ldr r0, [r7]
-	adds r0, 0x42
-	ldrb r0, [r0]
-	cmp r6, r0
-	bcc _0804AE5C
-	b _0804AF00
-	.align 2, 0
-_0804AEA4: .4byte gUnknown_03004824
-_0804AEA8: .4byte gPlayerParty
-_0804AEAC:
-	movs r6, 0
-	ldr r1, _0804AF08 @ =gUnknown_03004824
-	ldr r0, [r1]
-	adds r0, 0x43
-	ldrb r0, [r0]
-	cmp r6, r0
-	bcs _0804AF00
-	adds r7, r1, 0
-_0804AEBC:
-	movs r0, 0x64
-	adds r4, r6, 0
-	muls r4, r0
-	ldr r0, _0804AF0C @ =gEnemyParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	lsls r0, 16
-	lsrs r5, r0, 16
-	adds r0, r4, 0
-	movs r1, 0x3A
-	bl GetMonData
-	adds r1, r0, 0
-	lsls r0, r5, 16
-	asrs r0, 16
-	lsls r1, 16
-	asrs r1, 16
-	bl GetHPBarLevel
-	ldr r1, [r7]
-	adds r1, 0x6F
-	adds r1, r6
-	strb r0, [r1]
-	adds r0, r6, 0x1
-	lsls r0, 16
-	lsrs r6, r0, 16
-	ldr r0, [r7]
-	adds r0, 0x43
-	ldrb r0, [r0]
-	cmp r6, r0
-	bcc _0804AEBC
-_0804AF00:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804AF08: .4byte gUnknown_03004824
-_0804AF0C: .4byte gEnemyParty
-	thumb_func_end sub_804AE3C
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index f9922dcfb..877f24f9e 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -37,6 +37,7 @@
 #include "pokedex.h"
 #include "field_effect.h"
 #include "util.h"
+#include "battle_interface.h"
 #include "trade.h"
 
 #ifdef ENGLISH
@@ -3512,6 +3513,32 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804AE3C(u8 who)
+{
+    u16 i;
+    u16 curHp;
+    u16 maxHp;
+    switch (who)
+    {
+        case 0:
+            for (i = 0; i < gUnknown_03004824->partyCounts[0]; i ++)
+            {
+                curHp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
+                maxHp = GetMonData(&gPlayerParty[i], MON_DATA_MAX_HP);
+                gUnknown_03004824->unk_0069[0][i] = GetHPBarLevel(curHp, maxHp);
+            }
+            break;
+        case 1:
+            for (i = 0; i < gUnknown_03004824->partyCounts[1]; i ++)
+            {
+                curHp = GetMonData(&gEnemyParty[i], MON_DATA_HP);
+                maxHp = GetMonData(&gEnemyParty[i], MON_DATA_MAX_HP);
+                gUnknown_03004824->unk_0069[1][i] = GetHPBarLevel(curHp, maxHp);
+            }
+            break;
+    }
+}
+
 void sub_804AF10(void)
 {
     int i, j;
-- 
cgit v1.2.3


From 1de75f32304d880d96f38778cd4b711ec5bc760b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 4 Sep 2017 23:25:36 -0400
Subject: Final function (nonmatching)

---
 asm/trade.s   | 186 ----------------------------------------------
 ld_script.txt |   2 -
 src/trade.c   | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 229 insertions(+), 193 deletions(-)
 delete mode 100644 asm/trade.s

diff --git a/asm/trade.s b/asm/trade.s
deleted file mode 100644
index 45bb5da25..000000000
--- a/asm/trade.s
+++ /dev/null
@@ -1,186 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-.ifdef ENGLISH
-	.set sub_804A96C_alt, sub_804A96C
-.endif
-
-	thumb_func_start sub_804ACF4
-sub_804ACF4: @ 804ACF4
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	cmp r0, 0
-	beq _0804AD0C
-	cmp r0, 0x1
-	beq _0804ADA0
-	b _0804AE2C
-_0804AD0C:
-	movs r7, 0
-	ldr r1, _0804AD4C @ =gUnknown_03004824
-	ldr r0, [r1]
-	adds r0, 0x42
-	ldrb r0, [r0]
-	cmp r7, r0
-	blt _0804AD1C
-	b _0804AE2C
-_0804AD1C:
-	adds r6, r1, 0
-	movs r5, 0
-	mov r9, r5
-_0804AD22:
-	movs r0, 0x64
-	adds r1, r7, 0
-	muls r1, r0
-	ldr r0, _0804AD50 @ =gPlayerParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0x2D
-	bl GetMonData
-	adds r1, r0, 0
-	cmp r1, 0x1
-	bne _0804AD54
-	ldr r0, [r6]
-	adds r0, 0x51
-	adds r0, r5
-	mov r2, r9
-	strb r2, [r0]
-	ldr r0, [r6]
-	adds r0, 0x5D
-	adds r0, r5
-	b _0804AD84
-	.align 2, 0
-_0804AD4C: .4byte gUnknown_03004824
-_0804AD50: .4byte gPlayerParty
-_0804AD54:
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	adds r1, r0, 0
-	cmp r1, 0
-	bne _0804AD72
-	ldr r0, [r6]
-	adds r0, 0x51
-	adds r0, r5
-	strb r1, [r0]
-	ldr r0, [r6]
-	adds r0, 0x5D
-	adds r0, r5
-	b _0804AD84
-_0804AD72:
-	ldr r0, [r6]
-	adds r0, 0x51
-	adds r0, r5
-	movs r1, 0x1
-	strb r1, [r0]
-	ldr r0, [r6]
-	adds r0, 0x5D
-	adds r0, r5
-	mov r1, r9
-_0804AD84:
-	strb r1, [r0]
-	ldr r0, _0804AD9C @ =gUnknown_03004824
-	adds r5, 0x1
-	adds r7, 0x1
-	ldr r0, [r0]
-	adds r0, 0x42
-	add r0, r8
-	ldrb r0, [r0]
-	cmp r7, r0
-	blt _0804AD22
-	b _0804AE2C
-	.align 2, 0
-_0804AD9C: .4byte gUnknown_03004824
-_0804ADA0:
-	movs r7, 0
-	ldr r1, _0804ADE0 @ =gUnknown_03004824
-	ldr r0, [r1]
-	adds r0, 0x43
-	ldrb r0, [r0]
-	cmp r7, r0
-	bge _0804AE2C
-	adds r6, r1, 0
-	movs r5, 0x6
-	movs r2, 0
-	mov r9, r2
-_0804ADB6:
-	movs r0, 0x64
-	adds r1, r7, 0
-	muls r1, r0
-	ldr r0, _0804ADE4 @ =gEnemyParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0x2D
-	bl GetMonData
-	adds r1, r0, 0
-	cmp r1, 0x1
-	bne _0804ADE8
-	ldr r0, [r6]
-	adds r0, 0x51
-	adds r0, r5
-	mov r2, r9
-	strb r2, [r0]
-	ldr r0, [r6]
-	adds r0, 0x5D
-	adds r0, r5
-	b _0804AE18
-	.align 2, 0
-_0804ADE0: .4byte gUnknown_03004824
-_0804ADE4: .4byte gEnemyParty
-_0804ADE8:
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	adds r1, r0, 0
-	cmp r1, 0
-	bne _0804AE06
-	ldr r0, [r6]
-	adds r0, 0x51
-	adds r0, r5
-	strb r1, [r0]
-	ldr r0, [r6]
-	adds r0, 0x5D
-	adds r0, r5
-	b _0804AE18
-_0804AE06:
-	ldr r0, [r6]
-	adds r0, 0x51
-	adds r0, r5
-	movs r1, 0x1
-	strb r1, [r0]
-	ldr r0, [r6]
-	adds r0, 0x5D
-	adds r0, r5
-	mov r1, r9
-_0804AE18:
-	strb r1, [r0]
-	ldr r0, _0804AE38 @ =gUnknown_03004824
-	adds r5, 0x1
-	adds r7, 0x1
-	ldr r0, [r0]
-	adds r0, 0x42
-	add r0, r8
-	ldrb r0, [r0]
-	cmp r7, r0
-	blt _0804ADB6
-_0804AE2C:
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804AE38: .4byte gUnknown_03004824
-	thumb_func_end sub_804ACF4
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/ld_script.txt b/ld_script.txt
index 92786630d..ce02ee84b 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -79,8 +79,6 @@ SECTIONS {
         src/pokeball.o(.text);
         src/load_save.o(.text);
         src/trade.o(.text);
-        asm/trade.o(.text);
-        src/trade.o(.text.sub_804DAD4);
         src/berry_blender.o(.text);
         src/play_time.o(.text);
         src/new_game.o(.text);
diff --git a/src/trade.c b/src/trade.c
index 877f24f9e..93a8957fd 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -94,8 +94,7 @@ struct TradeEwramSubstruct {
     /*0x0041*/ u8 tradeMenuCursorPosition;
     /*0x0042*/ u8 partyCounts[2];
     /*0x0044*/ u8 tradeMenuOptionsActive[13];
-    /*0x0051*/ u8 unk_0051[6];
-    /*0x0057*/ u8 filler_0057[6];
+    /*0x0051*/ u8 unk_0051[2][6];
     /*0x005d*/ u8 unk_005d[2][6];
     /*0x005d*/ u8 unk_0069[2][6];
     /*0x0075*/ u8 unk_0075;
@@ -2141,7 +2140,7 @@ static void sub_8049860(void)
             BeginNormalPaletteFade(-1, 0, 0, 16, 0);
             gUnknown_03004824->unk_007b = 2;
         }
-        else if (sub_80499F0(gUnknown_03004824->unk_0051, gUnknown_03004824->partyCounts[0], gUnknown_03004824->tradeMenuCursorPosition) == 0)
+        else if (sub_80499F0(gUnknown_03004824->unk_0051[0], gUnknown_03004824->partyCounts[0], gUnknown_03004824->tradeMenuCursorPosition) == 0)
         {
             sub_804AADC(3, 2);
             gUnknown_03004824->unk_007b = 8;
@@ -2203,7 +2202,7 @@ static void sub_8049A20(void)
     int i;
     for (i = 0; i < gUnknown_03004824->partyCounts[0]; i ++)
     {
-        unk_0051[i] = gUnknown_03004824->unk_0051[i];
+        unk_0051[i] = gUnknown_03004824->unk_0051[0][i];
     }
     if (sub_80499F0(unk_0051, gUnknown_03004824->partyCounts[0], gUnknown_03004824->tradeMenuCursorPosition) == 0)
     {
@@ -3511,7 +3510,232 @@ static bool8 sub_804ABF8(void)
     sub_804AFB8(&gWindowConfig_81E725C, dest, src, a2);
 }
 
-asm(".section .text.sub_804DAD4");
+#ifdef NONMATCHING
+void sub_804ACF4(u8 who)
+{
+    struct Pokemon *pokemon;
+    int i;
+    switch (who)
+    {
+        case 0:
+            for (i = 0; i < gUnknown_03004824->partyCounts[0]; i ++)
+            {
+                pokemon = &gPlayerParty[i];
+                if (GetMonData(pokemon, MON_DATA_IS_EGG) == TRUE)
+                {
+                    gUnknown_03004824->unk_0051[0][i] = 0;
+                    gUnknown_03004824->unk_005d[0][i] = 1;
+                }
+                else if (GetMonData(pokemon, MON_DATA_HP) == 0)
+                {
+                    gUnknown_03004824->unk_0051[0][i] = 0;
+                    gUnknown_03004824->unk_005d[0][i] = 0;
+                }
+                else
+                {
+                    gUnknown_03004824->unk_0051[0][i] = 1;
+                    gUnknown_03004824->unk_005d[0][i] = 0;
+                }
+            }
+            break;
+        case 1:
+            for (i = 0; i < gUnknown_03004824->partyCounts[1]; i ++)
+            {
+                pokemon = &gEnemyParty[i];
+                if (GetMonData(pokemon, MON_DATA_IS_EGG) == TRUE)
+                {
+                    gUnknown_03004824->unk_0051[1][i] = 0;
+                    gUnknown_03004824->unk_005d[1][i] = 1;
+                }
+                else if (GetMonData(pokemon, MON_DATA_HP) == 0)
+                {
+                    gUnknown_03004824->unk_0051[1][i] = 0;
+                    gUnknown_03004824->unk_005d[1][i] = 0;
+                }
+                else
+                {
+                    gUnknown_03004824->unk_0051[1][i] = 1;
+                    gUnknown_03004824->unk_005d[1][i] = 0;
+                }
+            }
+            break;
+    }
+}
+#else
+__attribute__((naked)) void sub_804ACF4(u8 who)
+{
+    asm_unified("sub_804ACF4: @ 804ACF4\n"
+                    "\tpush {r4-r7,lr}\n"
+                    "\tmov r7, r9\n"
+                    "\tmov r6, r8\n"
+                    "\tpush {r6,r7}\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tmov r8, r0\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _0804AD0C\n"
+                    "\tcmp r0, 0x1\n"
+                    "\tbeq _0804ADA0\n"
+                    "\tb _0804AE2C\n"
+                    "_0804AD0C:\n"
+                    "\tmovs r7, 0\n"
+                    "\tldr r1, _0804AD4C @ =gUnknown_03004824\n"
+                    "\tldr r0, [r1]\n"
+                    "\tadds r0, 0x42\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r7, r0\n"
+                    "\tblt _0804AD1C\n"
+                    "\tb _0804AE2C\n"
+                    "_0804AD1C:\n"
+                    "\tadds r6, r1, 0\n"
+                    "\tmovs r5, 0\n"
+                    "\tmov r9, r5\n"
+                    "_0804AD22:\n"
+                    "\tmovs r0, 0x64\n"
+                    "\tadds r1, r7, 0\n"
+                    "\tmuls r1, r0\n"
+                    "\tldr r0, _0804AD50 @ =gPlayerParty\n"
+                    "\tadds r4, r1, r0\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tmovs r1, 0x2D\n"
+                    "\tbl GetMonData\n"
+                    "\tadds r1, r0, 0\n"
+                    "\tcmp r1, 0x1\n"
+                    "\tbne _0804AD54\n"
+                    "\tldr r0, [r6]\n"
+                    "\tadds r0, 0x51\n"
+                    "\tadds r0, r5\n"
+                    "\tmov r2, r9\n"
+                    "\tstrb r2, [r0]\n"
+                    "\tldr r0, [r6]\n"
+                    "\tadds r0, 0x5D\n"
+                    "\tadds r0, r5\n"
+                    "\tb _0804AD84\n"
+                    "\t.align 2, 0\n"
+                    "_0804AD4C: .4byte gUnknown_03004824\n"
+                    "_0804AD50: .4byte gPlayerParty\n"
+                    "_0804AD54:\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tmovs r1, 0x39\n"
+                    "\tbl GetMonData\n"
+                    "\tadds r1, r0, 0\n"
+                    "\tcmp r1, 0\n"
+                    "\tbne _0804AD72\n"
+                    "\tldr r0, [r6]\n"
+                    "\tadds r0, 0x51\n"
+                    "\tadds r0, r5\n"
+                    "\tstrb r1, [r0]\n"
+                    "\tldr r0, [r6]\n"
+                    "\tadds r0, 0x5D\n"
+                    "\tadds r0, r5\n"
+                    "\tb _0804AD84\n"
+                    "_0804AD72:\n"
+                    "\tldr r0, [r6]\n"
+                    "\tadds r0, 0x51\n"
+                    "\tadds r0, r5\n"
+                    "\tmovs r1, 0x1\n"
+                    "\tstrb r1, [r0]\n"
+                    "\tldr r0, [r6]\n"
+                    "\tadds r0, 0x5D\n"
+                    "\tadds r0, r5\n"
+                    "\tmov r1, r9\n"
+                    "_0804AD84:\n"
+                    "\tstrb r1, [r0]\n"
+                    "\tldr r0, _0804AD9C @ =gUnknown_03004824\n"
+                    "\tadds r5, 0x1\n"
+                    "\tadds r7, 0x1\n"
+                    "\tldr r0, [r0]\n"
+                    "\tadds r0, 0x42\n"
+                    "\tadd r0, r8\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r7, r0\n"
+                    "\tblt _0804AD22\n"
+                    "\tb _0804AE2C\n"
+                    "\t.align 2, 0\n"
+                    "_0804AD9C: .4byte gUnknown_03004824\n"
+                    "_0804ADA0:\n"
+                    "\tmovs r7, 0\n"
+                    "\tldr r1, _0804ADE0 @ =gUnknown_03004824\n"
+                    "\tldr r0, [r1]\n"
+                    "\tadds r0, 0x43\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r7, r0\n"
+                    "\tbge _0804AE2C\n"
+                    "\tadds r6, r1, 0\n"
+                    "\tmovs r5, 0x6\n"
+                    "\tmovs r2, 0\n"
+                    "\tmov r9, r2\n"
+                    "_0804ADB6:\n"
+                    "\tmovs r0, 0x64\n"
+                    "\tadds r1, r7, 0\n"
+                    "\tmuls r1, r0\n"
+                    "\tldr r0, _0804ADE4 @ =gEnemyParty\n"
+                    "\tadds r4, r1, r0\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tmovs r1, 0x2D\n"
+                    "\tbl GetMonData\n"
+                    "\tadds r1, r0, 0\n"
+                    "\tcmp r1, 0x1\n"
+                    "\tbne _0804ADE8\n"
+                    "\tldr r0, [r6]\n"
+                    "\tadds r0, 0x51\n"
+                    "\tadds r0, r5\n"
+                    "\tmov r2, r9\n"
+                    "\tstrb r2, [r0]\n"
+                    "\tldr r0, [r6]\n"
+                    "\tadds r0, 0x5D\n"
+                    "\tadds r0, r5\n"
+                    "\tb _0804AE18\n"
+                    "\t.align 2, 0\n"
+                    "_0804ADE0: .4byte gUnknown_03004824\n"
+                    "_0804ADE4: .4byte gEnemyParty\n"
+                    "_0804ADE8:\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tmovs r1, 0x39\n"
+                    "\tbl GetMonData\n"
+                    "\tadds r1, r0, 0\n"
+                    "\tcmp r1, 0\n"
+                    "\tbne _0804AE06\n"
+                    "\tldr r0, [r6]\n"
+                    "\tadds r0, 0x51\n"
+                    "\tadds r0, r5\n"
+                    "\tstrb r1, [r0]\n"
+                    "\tldr r0, [r6]\n"
+                    "\tadds r0, 0x5D\n"
+                    "\tadds r0, r5\n"
+                    "\tb _0804AE18\n"
+                    "_0804AE06:\n"
+                    "\tldr r0, [r6]\n"
+                    "\tadds r0, 0x51\n"
+                    "\tadds r0, r5\n"
+                    "\tmovs r1, 0x1\n"
+                    "\tstrb r1, [r0]\n"
+                    "\tldr r0, [r6]\n"
+                    "\tadds r0, 0x5D\n"
+                    "\tadds r0, r5\n"
+                    "\tmov r1, r9\n"
+                    "_0804AE18:\n"
+                    "\tstrb r1, [r0]\n"
+                    "\tldr r0, _0804AE38 @ =gUnknown_03004824\n"
+                    "\tadds r5, 0x1\n"
+                    "\tadds r7, 0x1\n"
+                    "\tldr r0, [r0]\n"
+                    "\tadds r0, 0x42\n"
+                    "\tadd r0, r8\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r7, r0\n"
+                    "\tblt _0804ADB6\n"
+                    "_0804AE2C:\n"
+                    "\tpop {r3,r4}\n"
+                    "\tmov r8, r3\n"
+                    "\tmov r9, r4\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r0}\n"
+                    "\tbx r0\n"
+                    "\t.align 2, 0\n"
+                    "_0804AE38: .4byte gUnknown_03004824");
+}
+#endif
 
 void sub_804AE3C(u8 who)
 {
-- 
cgit v1.2.3


From 008a0504b5fd6a5e633e1be3bbe1f10e28bbe9d3 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 4 Sep 2017 23:40:09 -0400
Subject: Make static labels static

---
 include/pokeball.h               |   1 +
 include/pokemon_summary_screen.h |   1 +
 src/trade.c                      | 146 ++++++++++++++++++++-------------------
 3 files changed, 76 insertions(+), 72 deletions(-)

diff --git a/include/pokeball.h b/include/pokeball.h
index 19f813415..0a709c869 100644
--- a/include/pokeball.h
+++ b/include/pokeball.h
@@ -7,5 +7,6 @@ void CreatePokeballSprite(u8 r0, u8 r1, u8 r2, u8 r3, u8 s1, u8 s2, u8 s3, u32 s
 void sub_804777C(u8);
 void sub_80478DC(u8);
 void sub_804794C(u8);
+u8 sub_8047580(u8, u8, u8, u8, u8, u8, u8, u32);
 
 #endif // GUARD_POKEBALL_H
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index c1b99c367..845e39990 100644
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -13,5 +13,6 @@ u8 *sub_80A1E9C(u8 *dest, const u8 *src, u8);
 u8 *PokemonSummaryScreen_CopyPokemonLevel(u8 *dest, u8 level);
 u8 PokemonSummaryScreen_CheckOT(struct Pokemon *pokemon);
 bool8 CheckPartyPokerus(struct Pokemon *, u8);
+bool8 sub_8040A3C(u16);
 
 #endif // GUARD_POKEMON_SUMMARY_SCREEN_H
diff --git a/src/trade.c b/src/trade.c
index 93a8957fd..ad770fd76 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -182,26 +182,26 @@ struct TradeEwramStruct {
 };
 
 static void sub_8047EC0(void);
-/*static*/ void sub_804AFB8(const struct WindowConfig *, u8 *, const u8 *, u8);
-/*static*/ void sub_804ACD8(const u8 *, u8 *, u8);
+static void sub_804AFB8(const struct WindowConfig *, u8 *, const u8 *, u8);
+static void sub_804ACD8(const u8 *, u8 *, u8);
 static void nullsub_5(u8, u8);
 static void sub_804AA88(void);
 static void sub_804A964(struct UnkStructD *, void *);
 static void sub_80489F4(void);
-/*static*/ void sub_804AA0C(u8);
+static void sub_804AA0C(u8);
 static bool8 sub_8048D44(void);
-/*static*/ void sub_804AF84(void);
+static void sub_804AF84(void);
 static bool8 sub_804ABF8(void);
-/*static*/ void sub_804ACF4(u8);
+static void sub_804ACF4(u8);
 static void sub_804A41C(u8);
 static void sub_8048C70(void);
 static void sub_8048B0C(u8);
-/*static*/ void sub_804AE3C(u8);
-/*static*/ void sub_804AF10(void);
+static void sub_804AE3C(u8);
+static void sub_804AF10(void);
 static void sub_80494D8(void);
 static void sub_8048AB4(void);
 static void sub_804A940(struct UnkStructD *);
-/*static*/ void sub_804B41C(void);
+static void sub_804B41C(void);
 static void sub_8049DE0(void);
 static void sub_804AB30(void);
 static void sub_8049ED4(u8);
@@ -211,11 +211,14 @@ static void sub_804A9F4(u8);
 static void sub_804AA00(u8);
 static void sub_8049E9C(u8);
 static void sub_804AADC(u16, u8);
-/*static*/ void sub_804A80C(void);
+static void sub_804A80C(void);
 static u8 sub_80499F0(const u8 *, u8, u8);
 static void sub_804A840(u8);
-/*static*/ u8 sub_804A2B4(u8 *, u8, u8);
-/*static*/ void sub_804A96C_alt(struct UnkStructD *, u8, u8, const u16 *, u8, u8, u16);
+#ifdef NONMATCHING
+static
+#endif
+u8 sub_804A2B4(u8 *, u8, u8);
+static void sub_804A96C_alt(struct UnkStructD *, u8, u8, const u16 *, u8, u8, u16);
 #ifdef NONMATCHING
 static
 #endif
@@ -225,35 +228,29 @@ static
 #endif
 void sub_804A51C(u8, u8, u8, u8, u8, u8);
 static void sub_804D7AC(struct Sprite *);
-/*static*/ void sub_804BA94(u8, u8);
-/*static*/ bool8 sub_804C29C(void);
-/*static*/ void sub_804DC18(void);
-/*static*/ void sub_804BB78(void);
+static bool8 sub_804C29C(void);
+static void sub_804DC18(void);
 static u8 sub_804B2B0(void);
 static void sub_804E144(void);
 static void sub_804E1A0(u8);
-/*static*/ void sub_804B790(void);
 static void sub_804DAD4(struct MailStruct *, const struct InGameTrade *);
-void sub_804D588(void);
 static void sub_804DC88(void);
-u8 sub_8047580(u8, u8, u8, u8, u8, u8, u8, u32);
-void sub_804D6BC(struct Sprite *);
-void sub_804D738(struct Sprite *);
-void sub_804BBE8(u8);
-void sub_804B128(void);
-void sub_804B058(struct Sprite *);
-void sub_804B07C(struct Sprite *);
-void sub_804B0BC(struct Sprite *);
-void sub_804B104(struct Sprite *);
-void sub_804C0F8(u8);
-bool8 sub_8040A3C(u16);
-void sub_804B0E0(struct Sprite *);
-void sub_804D80C(struct Sprite *);
-void sub_804E1DC(void);
-void sub_804BBCC(void);
-void sub_804D8E4(void);
-void sub_804C164(void);
-void sub_804C1A8(void);
+static void sub_804D6BC(struct Sprite *);
+static void sub_804D738(struct Sprite *);
+static void sub_804BBE8(u8);
+static void sub_804B058(struct Sprite *);
+static void sub_804B07C(struct Sprite *);
+static void sub_804B0BC(struct Sprite *);
+static void sub_804B104(struct Sprite *);
+static void sub_804D80C(struct Sprite *);
+static void sub_804E1DC(void);
+static void sub_804BBCC(void);
+static void sub_804D8E4(void);
+static void sub_804C164(void);
+static void sub_804C1A8(void);
+#ifdef NONMATCHING
+static
+#endif
 void sub_804DB84(void);
 
 extern u8 gUnknown_020297D8[2];
@@ -2977,6 +2974,9 @@ static void sub_8049ED4(u8 a0)
 }
 #endif
 
+#ifdef NONMATCHING
+static
+#endif
 u8 sub_804A2B4(u8 *a0, u8 whichParty, u8 whichPokemon)
 {
     u8 string[11];
@@ -3319,7 +3319,7 @@ void sub_804A740(u8 whichParty)
     }
 }
 
-void sub_804A80C(void)
+static void sub_804A80C(void)
 {
     FillWindowRect_DefaultPalette(&gUnknown_03004824->window, 0, gUnknown_0820C330[1][0], 0, gUnknown_0820C330[1][1], 19);
     sub_804A41C(1);
@@ -3370,7 +3370,7 @@ static void sub_804A964(struct UnkStructD *unkStructD, void *dest)
     unkStructD->vramAddr = dest;
 }
 
-/*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, const u16 *tilemap, u8 width, u8 height, u16 sp8) {
+static void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, const u16 *tilemap, u8 width, u8 height, u16 sp8) {
     int y, x;
 
     for (y = 0; y < height; y++)
@@ -3388,7 +3388,7 @@ static void sub_804A964(struct UnkStructD *unkStructD, void *dest)
 }
 
 #if GERMAN
-void sub_804A96C_alt(struct UnkStructD *arg0, u8 left, u8 top, const u16 *tilemap, u8 width, u8 height, u16 sp8) {
+static void sub_804A96C_alt(struct UnkStructD *arg0, u8 left, u8 top, const u16 *tilemap, u8 width, u8 height, u16 sp8) {
     sub_804A96C(arg0, left, top, tilemap, width, height, sp8);
 
     arg0->unk_10 = 1;
@@ -3405,7 +3405,7 @@ static void sub_804AA00(u8 unused)
     MenuZeroFillScreen();
 }
 
-/*static*/ void sub_804AA0C(u8 a0)
+static void sub_804AA0C(u8 a0)
 {
     DrawTextWindow(&gUnknown_03004824->window, gTradeMessageWindowRects[a0][0], gTradeMessageWindowRects[a0][1], gTradeMessageWindowRects[a0][2], gTradeMessageWindowRects[a0][3]);
     sub_8003460(&gUnknown_03004824->window, gUnknown_0820C2F0[a0], 0x180 + gUnknown_03004824->unk_007a, gTradeMessageWindowRects[a0][0] + 1, gTradeMessageWindowRects[a0][1] + 1);
@@ -3505,13 +3505,13 @@ static bool8 sub_804ABF8(void)
     }
 }
 
-/*static*/ void sub_804ACD8(const u8 *src, u8 *dest, u8 a2)
+static void sub_804ACD8(const u8 *src, u8 *dest, u8 a2)
 {
     sub_804AFB8(&gWindowConfig_81E725C, dest, src, a2);
 }
 
 #ifdef NONMATCHING
-void sub_804ACF4(u8 who)
+static void sub_804ACF4(u8 who)
 {
     struct Pokemon *pokemon;
     int i;
@@ -3562,10 +3562,9 @@ void sub_804ACF4(u8 who)
     }
 }
 #else
-__attribute__((naked)) void sub_804ACF4(u8 who)
+static __attribute__((naked)) void sub_804ACF4(u8 who)
 {
-    asm_unified("sub_804ACF4: @ 804ACF4\n"
-                    "\tpush {r4-r7,lr}\n"
+    asm_unified("\tpush {r4-r7,lr}\n"
                     "\tmov r7, r9\n"
                     "\tmov r6, r8\n"
                     "\tpush {r6,r7}\n"
@@ -3737,7 +3736,7 @@ __attribute__((naked)) void sub_804ACF4(u8 who)
 }
 #endif
 
-void sub_804AE3C(u8 who)
+static void sub_804AE3C(u8 who)
 {
     u16 i;
     u16 curHp;
@@ -3763,7 +3762,7 @@ void sub_804AE3C(u8 who)
     }
 }
 
-void sub_804AF10(void)
+static void sub_804AF10(void)
 {
     int i, j;
     for (i = 0; i < 2; i ++)
@@ -3775,7 +3774,7 @@ void sub_804AF10(void)
     }
 }
 
-void sub_804AF84(void)
+static void sub_804AF84(void)
 {
     int i;
     for (i = 0; i < 11; i ++)
@@ -3783,7 +3782,7 @@ void sub_804AF84(void)
             gSaveBlock1.giftRibbons[i] = gUnknown_03004824->unk_00b5[i];
 }
 
-void sub_804AFB8(const struct WindowConfig *windowConfig, u8 *dest, const u8 *src, u8 size)
+static void sub_804AFB8(const struct WindowConfig *windowConfig, u8 *dest, const u8 *src, u8 size)
 {
     u8 i;
     u8 *tileBuffer;
@@ -3799,7 +3798,7 @@ void sub_804AFB8(const struct WindowConfig *windowConfig, u8 *dest, const u8 *sr
     }
 }
 
-void sub_804B058(struct Sprite *sprite)
+static void sub_804B058(struct Sprite *sprite)
 {
     if (++ sprite->data0 == 10)
     {
@@ -3808,7 +3807,7 @@ void sub_804B058(struct Sprite *sprite)
     }
 }
 
-void sub_804B07C(struct Sprite *sprite)
+static void sub_804B07C(struct Sprite *sprite)
 {
     if (sprite->data1 == 0)
     {
@@ -3818,7 +3817,7 @@ void sub_804B07C(struct Sprite *sprite)
     }
 }
 
-void sub_804B0BC(struct Sprite *sprite)
+static void sub_804B0BC(struct Sprite *sprite)
 {
     sprite->data0 ++;
     sprite->pos2.y ++;
@@ -3826,7 +3825,7 @@ void sub_804B0BC(struct Sprite *sprite)
         DestroySprite(sprite);
 }
 
-void sub_804B0E0(struct Sprite *sprite)
+static void sub_804B0E0(struct Sprite *sprite)
 {
     sprite->data0 ++;
     sprite->pos2.y --;
@@ -3834,7 +3833,7 @@ void sub_804B0E0(struct Sprite *sprite)
         DestroySprite(sprite);
 }
 
-void sub_804B104(struct Sprite *sprite)
+static void sub_804B104(struct Sprite *sprite)
 {
     if (++ sprite->data0 == 15)
     {
@@ -3843,7 +3842,7 @@ void sub_804B104(struct Sprite *sprite)
     }
 }
 
-void sub_804B128(void)
+static void sub_804B128(void)
 {
     struct BgAffineDstData dest;
     DoBgAffineSet(&dest, gUnknown_03004828->unk_0104 << 8, gUnknown_03004828->unk_0106 << 8, gUnknown_03004828->unk_010c, gUnknown_03004828->unk_010e, gUnknown_03004828->unk_0118, gUnknown_03004828->unk_0118, gUnknown_03004828->unk_011c);
@@ -3996,7 +3995,7 @@ void sub_804B2D0(u8 whichParty, u8 a1)
 }
 
 #ifdef NONMATCHING
-void sub_804B41C(void)
+static void sub_804B41C(void)
 // Link trade init
 {
     switch (gMain.state)
@@ -4112,7 +4111,7 @@ void sub_804B41C(void)
     UpdatePaletteFade();
 }
 #else
-__attribute__((naked)) void sub_804B41C(void)
+static __attribute__((naked)) void sub_804B41C(void)
 {
     asm_unified("\tpush {r4-r6,lr}\n"
                     "\tsub sp, 0x4\n"
@@ -4494,7 +4493,7 @@ __attribute__((naked)) void sub_804B41C(void)
 }
 #endif
 
-void sub_804B790(void)
+static void sub_804B790(void)
 // In-game trade init
 {
     u8 otName[11];
@@ -4597,7 +4596,7 @@ static void sub_804BA64(void)
         EnableNationalPokedex();
 }
 
-void sub_804BA94(u8 a0, u8 a1)
+static void sub_804BA94(u8 a0, u8 a1)
 {
     u8 friendship;
     struct Pokemon *playerPokemon = &gPlayerParty[a0];
@@ -4626,7 +4625,7 @@ void sub_804BA94(u8 a0, u8 a1)
         sub_804BA64();
 }
 
-void sub_804BB78(void)
+static void sub_804BB78(void)
 {
     switch (gUnknown_03004828->unk_00bd)
     {
@@ -4643,7 +4642,7 @@ void sub_804BB78(void)
     }
 }
 
-void sub_804BBCC(void)
+static void sub_804BBCC(void)
 {
     sub_804C29C();
     RunTasks();
@@ -4652,7 +4651,7 @@ void sub_804BBCC(void)
     UpdatePaletteFade();
 }
 
-void sub_804BBE8(u8 a0)
+static void sub_804BBE8(u8 a0)
 {
     int i;
     u16 *buffer;
@@ -4741,7 +4740,7 @@ void sub_804BBE8(u8 a0)
     }
 }
 
-void sub_804C0F8(u8 a0)
+static void sub_804C0F8(u8 a0)
 {
     if (a0 == 0)
     {
@@ -4761,7 +4760,7 @@ void sub_804C0F8(u8 a0)
     }
 }
 
-void sub_804C164(void)
+static void sub_804C164(void)
 {
     LoadSpriteSheet(&gUnknown_082159A4);
     LoadSpriteSheet(&gUnknown_082159F4);
@@ -4771,7 +4770,7 @@ void sub_804C164(void)
     LoadSpritePalette(&gUnknown_082159B4);
 }
 
-void sub_804C1A8(void)
+static void sub_804C1A8(void)
 {
     u8 mpId;
     u8 string[20];
@@ -4795,7 +4794,7 @@ void sub_804C1A8(void)
     }
 }
 
-bool8 sub_804C29C(void)
+static bool8 sub_804C29C(void)
 {
     u16 evoTarget;
 
@@ -5245,7 +5244,7 @@ bool8 sub_804C29C(void)
     return FALSE;
 }
 
-void sub_804D588(void)
+static void sub_804D588(void)
 {
     u16 evoTarget;
     switch (gMain.state)
@@ -5298,7 +5297,7 @@ static void sub_804D63C(void)
     }
 }
 
-void sub_804D6BC(struct Sprite *sprite)
+static void sub_804D6BC(struct Sprite *sprite)
 {
     sprite->pos1.y += sprite->data0 / 10;
     sprite->data5 += sprite->data1;
@@ -5319,7 +5318,7 @@ void sub_804D6BC(struct Sprite *sprite)
     }
 }
 
-void sub_804D738(struct Sprite *sprite)
+static void sub_804D738(struct Sprite *sprite)
 {
     sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data0];
     if (sprite->data0 == 22)
@@ -5348,7 +5347,7 @@ void sub_804D7AC(struct Sprite *sprite)
     }
 }
 
-void sub_804D80C(struct Sprite *sprite)
+static void sub_804D80C(struct Sprite *sprite)
 {
     if (sprite->data2 == 0)
     {
@@ -5381,7 +5380,7 @@ u16 sub_804D89C(void)
     return inGameTrade->playerSpecies;
 }
 
-/*static*/ void sub_804D8E4(void)
+static void sub_804D8E4(void)
 {
     u8 nickname[32];
     const struct InGameTrade *inGameTrade = &gIngameTrades[gSpecialVar_0x8004];
@@ -5474,6 +5473,9 @@ void sub_804DB68(void)
     sub_804D948(gSpecialVar_0x8005, gSpecialVar_0x8004);
 }
 
+#ifdef NONMATCHING
+static
+#endif
 void sub_804DB84(void)
 {
     if (sub_804C29C() == TRUE)
@@ -5493,7 +5495,7 @@ void sub_804DB84(void)
     UpdatePaletteFade();
 }
 
-void sub_804DC18(void)
+static void sub_804DC18(void)
 {
     u8 mpId = sub_804B2B0();
     sub_804D63C();
@@ -5668,7 +5670,7 @@ static void sub_804E1A0(u8 taskId)
     }
 }
 
-/*static*/ void sub_804E1DC(void)
+static void sub_804E1DC(void)
 {
     u8 i;
     u8 numRibbons = 0;
-- 
cgit v1.2.3


From 1b78a6e423a791d4f5248fd2b70bea9bf8e22e6c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 5 Sep 2017 00:05:50 -0400
Subject: Put all local functions in statis; feeble attempt to fix undefined
 reference errors in German

---
 include/menu_cursor.h | 4 ++++
 include/strings2.h    | 4 ++++
 src/trade.c           | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/include/menu_cursor.h b/include/menu_cursor.h
index ca82ef244..6d31cc29f 100644
--- a/include/menu_cursor.h
+++ b/include/menu_cursor.h
@@ -21,4 +21,8 @@ void sub_814AD7C(u8 a1, u8 a2);
 void sub_814ADC8(void);
 void sub_814ADF4(u8 a1);
 
+#if GERMAN
+extern const u32 gUnknown_0842F798[2];
+#endif
+
 #endif // GUARD_MENU_CURSOR_H
diff --git a/include/strings2.h b/include/strings2.h
index 600bb2d31..8052c6c4a 100644
--- a/include/strings2.h
+++ b/include/strings2.h
@@ -319,4 +319,8 @@ extern const u8 gOtherText_OK[];
 // wallclock
 extern const u8 gOtherText_CorrectTimePrompt[];
 
+#if GERMAN
+extern const u8 deuOtherText_ForgotAndLearned[];
+#endif
+
 #endif // GUARD_STRINGS2_H
diff --git a/src/trade.c b/src/trade.c
index ad770fd76..42c4afe07 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -219,6 +219,7 @@ static
 #endif
 u8 sub_804A2B4(u8 *, u8, u8);
 static void sub_804A96C_alt(struct UnkStructD *, u8, u8, const u16 *, u8, u8, u16);
+static void sub_804A96C(struct UnkStructD *, u8, u8, const u16 *, u8, u8, u16);
 #ifdef NONMATCHING
 static
 #endif
@@ -5450,7 +5451,7 @@ static void sub_804DAD4(struct MailStruct *mail, const struct InGameTrade *trade
     StringCopy(mail->playerName, trade->otName);
 
 #if GERMAN
-    PadNameString(mail->string, CHAR_SPACE);
+    PadNameString(mail->playerName, CHAR_SPACE);
 #endif
 
     mail->trainerId[0] = trade->otId >> 24;
-- 
cgit v1.2.3


From 113659ca87d944f2949d0cdb9e863101d040edc1 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 5 Sep 2017 08:38:31 -0400
Subject: Remaining static decorators

---
 src/trade.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/trade.c b/src/trade.c
index 42c4afe07..5a127c5dc 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1241,7 +1241,7 @@ static void sub_8047EC0(void)
     UpdatePaletteFade();
 }
 
-void sub_80484F4(void)
+static void sub_80484F4(void)
 {
     int i;
     struct UnkStructF *unkStructF;
@@ -3307,7 +3307,7 @@ static void sub_804A6DC(u8 whichParty)
 }
 #endif
 
-void sub_804A740(u8 whichParty)
+static void sub_804A740(u8 whichParty)
 {
     int i;
     for (i = 0; i < gUnknown_03004824->partyCounts[whichParty]; i ++)
@@ -3356,7 +3356,7 @@ static void sub_804A938(struct UnkStructD *unkStructD)
     unkStructD->unk_10 = 1;
 }
 
-void sub_804A940(struct UnkStructD *unkStructD)
+static void sub_804A940(struct UnkStructD *unkStructD)
 {
     if (unkStructD->unk_10)
     {
@@ -3856,7 +3856,7 @@ static void sub_804B128(void)
 }
 
 #ifdef NONMATCHING
-void sub_804B1BC(void)
+static void sub_804B1BC(void)
 {
     REG_BG1VOFS = gUnknown_03004828->bg1vofs;
     REG_BG1HOFS = gUnknown_03004828->bg1hofs;
@@ -3871,7 +3871,7 @@ void sub_804B1BC(void)
     }
 }
 #else
-__attribute__((naked)) void sub_804B1BC(void)
+__attribute__((naked)) static void sub_804B1BC(void)
 {
     asm_unified("\tpush {lr}\n"
                     "\tldr r1, _0804B1FC @ =REG_BG1VOFS\n"
@@ -3917,7 +3917,7 @@ __attribute__((naked)) void sub_804B1BC(void)
 }
 #endif
 
-void sub_804B210(void)
+static void sub_804B210(void)
 {
     sub_804B1BC();
     LoadOam();
@@ -3925,13 +3925,16 @@ void sub_804B210(void)
     TransferPlttBuffer();
 }
 
-void sub_804B228(void)
+static void sub_804B228(void)
 {
     gUnknown_03004828->unk_00b4 = 0;
     gUnknown_03004828->unk_00b2 = 0;
     gUnknown_03004828->unk_00b3 = 0;
 }
 
+#ifdef NONMATCHING
+static
+#endif
 void sub_804B24C(void)
 {
     if (gUnknown_03004828->unk_00b2 == gUnknown_03004828->unk_00b3)
@@ -3958,7 +3961,7 @@ static u8 sub_804B2B0(void)
     return 0;
 }
 
-void sub_804B2D0(u8 whichParty, u8 a1)
+static void sub_804B2D0(u8 whichParty, u8 a1)
 {
     u8 v0;
     struct Pokemon *pokemon;
@@ -5333,7 +5336,7 @@ static void sub_804D738(struct Sprite *sprite)
     }
 }
 
-void sub_804D7AC(struct Sprite *sprite)
+static void sub_804D7AC(struct Sprite *sprite)
 {
     if (sprite->data1 == 20)
         StartSpriteAffineAnim(sprite, 1);
-- 
cgit v1.2.3


From 8bbb75fba0d8dc81be6cfc88a4d7fd932efa900e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 9 Sep 2017 08:55:50 -0400
Subject: Move some function labels to their proper headers

---
 include/party_menu.h             | 1 -
 include/pokemon.h                | 1 +
 include/pokemon_icon.h           | 1 +
 include/pokemon_summary_screen.h | 1 -
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/party_menu.h b/include/party_menu.h
index c9e6e51f5..e3f5c62f3 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -169,7 +169,6 @@ void DoRareCandyItemEffect(u8, u16, TaskFunc);
 void Task_RareCandy1(u8);
 void Task_RareCandy2(u8);
 void sub_8070848(u8 taskId);
-void sub_809D62C(struct Sprite *);
 void sub_806CA60(u8 taskId);
 void sub_806CD5C(u8 taskId);
 void DoTakeMail(u8 taskId, TaskFunc func);
diff --git a/include/pokemon.h b/include/pokemon.h
index cbeef1b9b..c4347a15b 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -601,5 +601,6 @@ s8 sub_8040A54(struct Pokemon *, u8);
 u16 GetMonEVCount(struct Pokemon *);
 u16 GetEvolutionTargetSpecies(struct Pokemon *, u8, u16);
 const struct CompressedSpritePalette *sub_8040990(struct Pokemon *);
+bool8 sub_8040A3C(u16);
 
 #endif // GUARD_POKEMON_H
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index 6f00619fc..2fbf9f700 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -11,5 +11,6 @@ void sub_809D580(u16);
 void sub_809D608(u16);
 void UpdateMonIconFrame(struct Sprite *sprite);
 void sub_809D824(struct Sprite *, u8);
+void sub_809D62C(struct Sprite *);
 
 #endif // GUARD_POKEMON_ICON_H
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index 845e39990..c1b99c367 100644
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -13,6 +13,5 @@ u8 *sub_80A1E9C(u8 *dest, const u8 *src, u8);
 u8 *PokemonSummaryScreen_CopyPokemonLevel(u8 *dest, u8 level);
 u8 PokemonSummaryScreen_CheckOT(struct Pokemon *pokemon);
 bool8 CheckPartyPokerus(struct Pokemon *, u8);
-bool8 sub_8040A3C(u16);
 
 #endif // GUARD_POKEMON_SUMMARY_SCREEN_H
-- 
cgit v1.2.3


From 97d2b14422fae0c8bc30440d136e86778a122964 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 1 Oct 2017 20:48:32 -0400
Subject: Fix DE

---
 src/engine/trade.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/src/engine/trade.c b/src/engine/trade.c
index 19381f4ee..6e78ba3ce 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -864,6 +864,7 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8215AC0[] = {
 };
 
 const struct InGameTrade gIngameTrades[] = {
+#if ENGLISH
     {
         _("MAKIT"), SPECIES_MAKUHITA,
         5, 5, 4, 4, 4, 4,
@@ -893,9 +894,41 @@ const struct InGameTrade gIngameTrades[] = {
         _("LANE"), FEMALE, 10,
         SPECIES_BELLOSSOM
     }
+#elif GERMAN
+    {
+        _("MAKIT"), SPECIES_MAKUHITA,
+        5, 5, 4, 4, 4, 4,
+        TRUE, 49562,
+        5, 5, 5, 5, 30,
+        0x9C40,
+        ITEM_X_ATTACK, -1,
+        _("MAIK"), MALE, 10,
+        SPECIES_SLAKOTH
+    }, {
+        _("CONEC"), SPECIES_SKITTY,
+        5, 4, 4, 5, 4, 4,
+        FALSE, 2259,
+        5, 5, 30, 5, 5,
+        0x498A2E17,
+        ITEM_GLITTER_MAIL, 0,
+        _("MADINA"), FEMALE, 10,
+        SPECIES_PIKACHU
+    }, {
+        _("CORASO"),
+        SPECIES_CORSOLA,
+        4, 4, 5, 4, 4, 5,
+        TRUE, 50183,
+        5, 30, 5, 5, 5,
+        0x4C970B7F,
+        ITEM_TROPIC_MAIL, 1,
+        _("LIANA"), FEMALE, 10,
+        SPECIES_BELLOSSOM
+    }
+#endif
 };
 
 const u16 gIngameTradeMail[][10] = {
+#if ENGLISH
     {
         EC_POKEMON(PIKACHU),
         EC_WORD_THANK_YOU,
@@ -919,6 +952,31 @@ const u16 gIngameTradeMail[][10] = {
         EC_WORD_PRETTY,
         0
     }
+#elif GERMAN
+    {
+        EC_POKEMON(PIKACHU),
+        EC_WORD_THANK_YOU,
+        EC_WORD_EXCL,
+        EC_WORD_MY,
+        EC_POKEMON(SKITTY),
+        EC_WORD_EATS,
+        0xFFFF,
+        EC_WORD_A_LOT,
+        EC_WORD_EXCL,
+        0
+    }, {
+        EC_WORD_I,
+        EC_WORD_WANT,
+        EC_WORD_OF,
+        EC_MOVE2(PETAL_DANCE),
+        EC_WORD_WORKS,
+        EC_WORD_THE,
+        EC_WORD_IS,
+        EC_WORD_SO,
+        EC_WORD_PRETTY,
+        0
+    }
+#endif
 };
 
 const s8 gTradeBallVerticalVelocityTable[] = {
-- 
cgit v1.2.3