Merge pull request #120 from PikalaxALT/trade

Trade

.gitignore

@@ -50,3 +50,4 @@ tools/br_ips/ips_patch
 types_*.taghl
 !.travis/calcrom/calcrom.pl
 !sound/programmable_wave_samples/*.pcm
+_Deparsed_XSubs.pm

asm/battle_tower.s

@@ -2832,7 +2832,7 @@ _080E6F68:
 	ldrb r1, [r0]
 	movs r0, 0x64
 	muls r0, r1
-	ldr r1, _080E6FB4 @ =gUnknown_2024220
+	ldr r1, _080E6FB4 @ =gEnemyParty + 500 @ &gEnemyParty[5]
 	adds r0, r1
 	movs r1, 0x2C
 	muls r1, r4
@@ -2855,7 +2855,7 @@ _080E6FA4: .4byte gSaveBlock2Ptr
 _080E6FA8: .4byte gSaveBlock1Ptr
 _080E6FAC: .4byte 0x00002cac
 _080E6FB0: .4byte 0x0000056d
-_080E6FB4: .4byte gUnknown_2024220
+_080E6FB4: .4byte gEnemyParty + 500 @ &gEnemyParty[5]
 	thumb_func_end sub_80E6EE0
 
 	thumb_func_start SaveBattleTowerProgress

asm/cable_club.s

@@ -2193,7 +2193,7 @@ _08081894:
 	.align 2, 0
 _080818A4: .4byte gPaletteFade
 _080818A8:
-	ldr r1, _080818C0 @ =gUnknown_2031DA4
+	ldr r1, _080818C0 @ =gSelectedTradeMonPositions
 	movs r0, 0
 	strb r0, [r1]
 	strb r0, [r1, 0x1]
@@ -2205,13 +2205,13 @@ _080818B8:
 	strh r0, [r4, 0x8]
 	b _080818D8
 	.align 2, 0
-_080818C0: .4byte gUnknown_2031DA4
+_080818C0: .4byte gSelectedTradeMonPositions
 _080818C4:
 	ldr r0, _080818E0 @ =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080818D8
-	ldr r0, _080818E4 @ =sub_804C718
+	ldr r0, _080818E4 @ =CB2_ReturnFromLinkTrade
 	bl SetMainCallback2
 	adds r0, r5, 0
 	bl DestroyTask
@@ -2221,7 +2221,7 @@ _080818D8:
 	bx r0
 	.align 2, 0
 _080818E0: .4byte gReceivedRemoteLinkPlayers
-_080818E4: .4byte sub_804C718
+_080818E4: .4byte CB2_ReturnFromLinkTrade
 	thumb_func_end sub_8081850
 
 	thumb_func_start sub_80818E8
@@ -2269,7 +2269,7 @@ _0808192C:
 	.align 2, 0
 _0808193C: .4byte gPaletteFade
 _08081940:
-	ldr r1, _08081958 @ =gUnknown_2031DA4
+	ldr r1, _08081958 @ =gSelectedTradeMonPositions
 	movs r0, 0
 	strb r0, [r1]
 	strb r0, [r1, 0x1]
@@ -2281,7 +2281,7 @@ _08081950:
 	strh r0, [r4]
 	b _08081970
 	.align 2, 0
-_08081958: .4byte gUnknown_2031DA4
+_08081958: .4byte gSelectedTradeMonPositions
 _0808195C:
 	bl IsLinkTaskFinished
 	lsls r0, 24

asm/evolution_scene.s

@@ -738,7 +738,7 @@ _080CE3D8: .4byte nullsub_76
 _080CE3DC: .4byte sub_80D00D8
 _080CE3E0: .4byte gMain
 _080CE3E4:
-	bl sub_80544FC
+	bl LoadTradeAnimGfx
 	b _080CE4EC
 _080CE3EA:
 	movs r0, 0x20
@@ -2817,7 +2817,7 @@ _080CF620:
 	movs r0, 0
 	adds r1, r4, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CF648 @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3110,7 +3110,7 @@ _080CF8A8:
 	movs r0, 0
 	adds r1, r4, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CF91C @ =0x00000103
 	bl PlayFanfare
 	ldr r2, _080CF920 @ =gTasks
@@ -3222,7 +3222,7 @@ _080CF9AC:
 	ldr r1, _080CF9C8 @ =gUnknown_841E325
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CF9CC @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3341,7 +3341,7 @@ _080CFAA8:
 	movs r0, 0
 	adds r1, r4, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r1, _080CFAD4 @ =gTasks
 	adds r0, r7, r6
 	lsls r0, 3
@@ -3376,7 +3376,7 @@ _080CFAF2:
 	ldr r1, _080CFB2C @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CFB30 @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3477,7 +3477,7 @@ _080CFBDA:
 	ldr r1, _080CFC04 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CFC08 @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3509,7 +3509,7 @@ _080CFC26:
 	ldr r1, _080CFC4C @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CFC50 @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3537,7 +3537,7 @@ _080CFC54:
 	ldr r1, _080CFCEC @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CFCF0 @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3625,7 +3625,7 @@ _080CFD1C:
 	ldr r1, _080CFD68 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r1, _080CFD6C @ =gTasks
 	adds r0, r7, r6
 	lsls r0, 3
@@ -3665,7 +3665,7 @@ _080CFD70:
 	ldr r1, _080CFDA4 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r1, _080CFDA8 @ =gTasks
 	adds r0, r7, r6
 	lsls r0, 3
@@ -3782,7 +3782,7 @@ _080CFE74:
 	ldr r1, _080CFEB8 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r1, _080CFEBC @ =gTasks
 	adds r0, r7, r6
 	lsls r0, 3
@@ -3825,7 +3825,7 @@ _080CFEC0:
 	ldr r1, _080CFF20 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CFF24 @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3859,7 +3859,7 @@ _080CFF42:
 	ldr r1, _080CFF68 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CFF6C @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3890,7 +3890,7 @@ _080CFF70:
 	ldr r1, _080CFFB0 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r1, _080CFFB4 @ =gTasks
 	adds r0, r7, r6
 	lsls r0, 3
@@ -3909,7 +3909,7 @@ _080CFFB8:
 	ldr r1, _080CFFE4 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r1, _080CFFE8 @ =gTasks
 	adds r0, r7, r6
 	lsls r0, 3
@@ -3932,7 +3932,7 @@ _080CFFEC:
 	ldr r1, _080D0010 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r1, _080D0014 @ =gTasks
 	adds r0, r7, r6
 	lsls r0, 3

asm/link_rfu_3.s

@@ -2939,7 +2939,7 @@ sub_8117100: @ 8117100
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sub_804C718
+	bl CB2_ReturnFromLinkTrade
 	adds r0, r4, 0
 	bl DestroyTask
 	pop {r4}
@@ -3070,7 +3070,7 @@ _08117210:
 	lsrs r0, 24
 	cmp r0, 0x3
 	bne _0811725C
-	ldr r4, _08117268 @ =gUnknown_2031CCC
+	ldr r4, _08117268 @ =gLinkPartnerMail
 	bl GetMultiplayerId
 	adds r1, r0, 0
 	movs r0, 0x1
@@ -3083,14 +3083,14 @@ _08117210:
 	movs r2, 0xD8
 	bl memcpy
 	bl ResetBlockReceivedFlags
-	ldr r1, _08117270 @ =gUnknown_2031DA4
+	ldr r1, _08117270 @ =gSelectedTradeMonPositions
 	strb r7, [r1]
 	movs r0, 0x6
 	strb r0, [r1, 0x1]
 	ldr r1, _08117274 @ =gMain
 	ldr r0, _08117278 @ =CB2_ReturnToField
 	str r0, [r1, 0x8]
-	ldr r0, _0811727C @ =sub_8050138
+	ldr r0, _0811727C @ =CB2_InitTradeAnim_LinkTrade
 	bl SetMainCallback2
 	mov r0, r8
 	bl sub_811B148
@@ -3103,12 +3103,12 @@ _0811725C:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08117268: .4byte gUnknown_2031CCC
+_08117268: .4byte gLinkPartnerMail
 _0811726C: .4byte gBlockRecvBuffer
-_08117270: .4byte gUnknown_2031DA4
+_08117270: .4byte gSelectedTradeMonPositions
 _08117274: .4byte gMain
 _08117278: .4byte CB2_ReturnToField
-_0811727C: .4byte sub_8050138
+_0811727C: .4byte CB2_InitTradeAnim_LinkTrade
 	thumb_func_end sub_8117130
 
 	thumb_func_start sub_8117280

asm/party_menu.s

@@ -364,7 +364,7 @@ _0811ED14:
 _0811ED30: .4byte gUnknown_203B0A0
 _0811ED34: .4byte gUnknown_203B09C
 _0811ED38:
-	bl sub_8122550
+	bl LoadHeldItemIcons
 	b _0811EDFC
 _0811ED3E:
 	bl sub_8122860
@@ -3033,7 +3033,7 @@ _081201C0:
 	lsrs r6, r0, 29
 	cmp r6, 0x3
 	bne _081201F0
-	ldr r0, _081201EC @ =gUnknown_20243B0
+	ldr r0, _081201EC @ =gPlayerParty + 300 @ &gPlayerParty[3]
 	movs r1, 0xB
 	bl GetMonData
 	cmp r0, 0
@@ -3042,12 +3042,12 @@ _081201C0:
 	b _08120290
 	.align 2, 0
 _081201E8: .4byte gUnknown_203B09C
-_081201EC: .4byte gUnknown_20243B0
+_081201EC: .4byte gPlayerParty + 300 @ &gPlayerParty[3]
 _081201F0:
-	ldr r0, _081201F4 @ =gUnknown_202434C
+	ldr r0, _081201F4 @ =gPlayerParty + 200 @ &gPlayerParty[2]
 	b _0812020C
 	.align 2, 0
-_081201F4: .4byte gUnknown_202434C
+_081201F4: .4byte gPlayerParty + 200 @ &gPlayerParty[2]
 _081201F8:
 	cmp r0, 0x1
 	bne _08120290
@@ -3058,7 +3058,7 @@ _081201F8:
 	lsrs r5, r0, 29
 	cmp r5, 0x5
 	bne _08120224
-	ldr r0, _08120220 @ =gUnknown_2024478
+	ldr r0, _08120220 @ =gPlayerParty + 500 @ &gPlayerParty[5]
 _0812020C:
 	movs r1, 0xB
 	bl GetMonData
@@ -3068,9 +3068,9 @@ _0812020C:
 	b _08120290
 	.align 2, 0
 _0812021C: .4byte gUnknown_203B09C
-_08120220: .4byte gUnknown_2024478
+_08120220: .4byte gPlayerParty + 500 @ &gPlayerParty[5]
 _08120224:
-	ldr r0, _08120234 @ =gUnknown_2024414
+	ldr r0, _08120234 @ =gPlayerParty + 400 @ &gPlayerParty[4]
 	movs r1, 0xB
 	bl GetMonData
 	cmp r0, 0
@@ -3078,7 +3078,7 @@ _08120224:
 	movs r0, 0x4
 	b _0812028E
 	.align 2, 0
-_08120234: .4byte gUnknown_2024414
+_08120234: .4byte gPlayerParty + 400 @ &gPlayerParty[4]
 _08120238:
 	ldrb r1, [r4]
 	subs r0, r1, 0x2
@@ -7598,8 +7598,8 @@ _08122544:
 _0812254C: .4byte gSprites
 	thumb_func_end sub_81224D0
 
-	thumb_func_start sub_8122550
-sub_8122550: @ 8122550
+	thumb_func_start LoadHeldItemIcons
+LoadHeldItemIcons: @ 8122550
 	push {lr}
 	ldr r0, _08122564 @ =gUnknown_845A42C
 	bl LoadSpriteSheet
@@ -7610,7 +7610,7 @@ sub_8122550: @ 8122550
 	.align 2, 0
 _08122564: .4byte gUnknown_845A42C
 _08122568: .4byte gUnknown_845A434
-	thumb_func_end sub_8122550
+	thumb_func_end LoadHeldItemIcons
 
 	thumb_func_start sub_812256C
 sub_812256C: @ 812256C
@@ -8681,7 +8681,7 @@ _08122D8C:
 	ldr r3, _08122DB8 @ =sub_8122DBC
 	movs r4, 0
 	str r4, [sp]
-	bl sub_81344F8
+	bl ShowPokemonSummaryScreen
 	add sp, 0x4
 	pop {r4}
 	pop {r0}
@@ -11407,7 +11407,7 @@ sub_8124384: @ 8124384
 	adds r1, r6, 0
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl sub_804FCE0
+	bl Trade_CanTradeSelectedMon
 	cmp r0, 0x1
 	beq _08124418
 	cmp r0, 0x2
@@ -18129,7 +18129,7 @@ _08127A80: .4byte sub_811FB28
 sub_8127A84: @ 8127A84
 	push {r4,lr}
 	adds r4, r0, 0
-	ldr r0, _08127AA4 @ =gUnknown_20242E8
+	ldr r0, _08127AA4 @ =gPlayerParty + 100 @ &gPlayerParty[1]
 	movs r1, 0xB
 	bl GetMonData
 	cmp r0, 0
@@ -18143,7 +18143,7 @@ _08127AA0:
 	movs r0, 0x7
 	b _08127ABA
 	.align 2, 0
-_08127AA4: .4byte gUnknown_20242E8
+_08127AA4: .4byte gPlayerParty + 100 @ &gPlayerParty[1]
 _08127AA8:
 	ldr r0, _08127AB4 @ =gUnknown_203B0A0
 	ldrb r0, [r0, 0xB]

asm/pokeball.s

@@ -2327,8 +2327,8 @@ _0804BB90:
 	bx r0
 	thumb_func_end sub_804BAA4
 
-	thumb_func_start sub_804BB98
-sub_804BB98: @ 804BB98
+	thumb_func_start CreateTradePokeballSprite
+CreateTradePokeballSprite: @ 804BB98
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2414,7 +2414,7 @@ _0804BC40: .4byte gUnknown_82605CC
 _0804BC44: .4byte gUnknown_82606F4
 _0804BC48: .4byte gSprites
 _0804BC4C: .4byte sub_804BC50
-	thumb_func_end sub_804BB98
+	thumb_func_end CreateTradePokeballSprite
 
 	thumb_func_start sub_804BC50
 sub_804BC50: @ 804BC50

asm/pokemon_storage_system.s

@@ -719,8 +719,8 @@ _0808BEA8:
 	bx r1
 	thumb_func_end sub_808BDE8
 
-	thumb_func_start sub_808BEB4
-sub_808BEB4: @ 808BEB4
+	thumb_func_start PSS_RenderTextToVramViaBuffer
+PSS_RenderTextToVramViaBuffer: @ 808BEB4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -868,7 +868,7 @@ _0808BFC4:
 	bx r0
 	.align 2, 0
 _0808BFDC: .4byte 0x001fffff
-	thumb_func_end sub_808BEB4
+	thumb_func_end PSS_RenderTextToVramViaBuffer
 
 	thumb_func_start sub_808BFE0
 sub_808BFE0: @ 808BFE0
@@ -6561,7 +6561,7 @@ _0808EE78:
 	mov r0, r8
 	adds r1, r6, 0
 	adds r2, r5, 0
-	bl sub_81344F8
+	bl ShowPokemonSummaryScreen
 	b _0808EEF6
 	.align 2, 0
 _0808EEAC: .4byte gUnknown_20397B0
@@ -12353,7 +12353,7 @@ sub_8091A94: @ 8091A94
 	adds r0, r5, 0
 	movs r2, 0
 	movs r3, 0
-	bl sub_808BEB4
+	bl PSS_RenderTextToVramViaBuffer
 	ldr r0, [sp, 0x30]
 	bl LoadSpriteSheet
 	mov r0, r8
@@ -12539,7 +12539,7 @@ _08091CFC:
 	adds r0, r5, 0
 	movs r2, 0
 	movs r3, 0
-	bl sub_808BEB4
+	bl PSS_RenderTextToVramViaBuffer
 	adds r0, r6, 0
 	bl LoadSpriteSheet
 	ldr r0, [sp, 0x2C]

asm/pokemon_summary_screen.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_81344F8
-sub_81344F8: @ 81344F8
+	thumb_func_start ShowPokemonSummaryScreen
+ShowPokemonSummaryScreen: @ 81344F8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -268,7 +268,7 @@ _08134728: .4byte 0x0000322c
 _0813472C: .4byte 0x00003290
 _08134730: .4byte 0x00003204
 _08134734: .4byte sub_8135C34
-	thumb_func_end sub_81344F8
+	thumb_func_end ShowPokemonSummaryScreen
 
 	thumb_func_start ShowSelectMovePokemonSummaryScreen
 ShowSelectMovePokemonSummaryScreen: @ 8134738
@@ -283,7 +283,7 @@ ShowSelectMovePokemonSummaryScreen: @ 8134738
 	lsrs r5, 16
 	movs r4, 0x2
 	str r4, [sp]
-	bl sub_81344F8
+	bl ShowPokemonSummaryScreen
 	ldr r0, _08134764 @ =gUnknown_203B140
 	ldr r0, [r0]
 	ldr r1, _08134768 @ =0x00003260
@@ -14091,7 +14091,7 @@ sub_813B854: @ 813B854
 	str r0, [sp]
 	movs r1, 0
 	movs r2, 0
-	bl sub_81344F8
+	bl ShowPokemonSummaryScreen
 	add sp, 0x4
 	pop {r0}
 	bx r0

asm/union_room_chat.s

@@ -1636,7 +1636,7 @@ _08129144:
 	lsls r0, 24
 	cmp r0, 0
 	bne _08129206
-	bl sub_804C1C0
+	bl SetContinueGameWarpStatusToDynamicWarp
 	movs r0, 0
 	bl TrySavingData
 	ldr r0, _08129164 @ =gUnknown_203B0E0
@@ -1665,7 +1665,7 @@ _08129180:
 	bne _08129206
 	movs r0, 0x30
 	bl PlaySE
-	bl sav2_gender2_inplace_and_xFE
+	bl ClearContinueGameWarpStatus2
 	ldr r0, _081291A0 @ =gUnknown_203B0E0
 	ldr r1, [r0]
 	movs r0, 0xA

constants/constants.inc

@@ -4,7 +4,7 @@
 	.include "constants/contest_constants.inc"
 @	.include "constants/item_data_constants.inc"
 	.include "constants/battle_move_constants.inc"
-	.include "constants/trainer_constants.inc"
+@	.include "constants/trainer_constants.inc"
 	.include "constants/berry_constants.inc"
 	.include "constants/version.inc"
 	.include "constants/battle.inc"

constants/trainer_constants.inc

@@ -1,243 +0,0 @@
-	.set TRAINER_CLASS_AQUA_LEADER,            0
-	.set TRAINER_CLASS_TEAM_AQUA_M,            1
-	.set TRAINER_CLASS_TEAM_AQUA_F,            2
-	.set TRAINER_CLASS_AROMA_LADY,             3
-	.set TRAINER_CLASS_RUIN_MANIAC,            4
-	.set TRAINER_CLASS_INTERVIEWER,            5
-	.set TRAINER_CLASS_TUBER_F,                6
-	.set TRAINER_CLASS_TUBER_M,                7
-	.set TRAINER_CLASS_COOL_TRAINER_M,         8
-	.set TRAINER_CLASS_COOL_TRAINER_F,         9
-	.set TRAINER_CLASS_HEX_MANIAC,            10
-	.set TRAINER_CLASS_LADY,                  11
-	.set TRAINER_CLASS_BEAUTY,                12
-	.set TRAINER_CLASS_RICH_BOY,              13
-	.set TRAINER_CLASS_POKEMANIAC,            14
-	.set TRAINER_CLASS_SWIMMER_M,             15
-	.set TRAINER_CLASS_BLACK_BELT,            16
-	.set TRAINER_CLASS_GUITARIST,             17
-	.set TRAINER_CLASS_KINDLER,               18
-	.set TRAINER_CLASS_CAMPER,                19
-	.set TRAINER_CLASS_BUG_MANIAC,            20
-	.set TRAINER_CLASS_PSYCHIC_M,             21
-	.set TRAINER_CLASS_PSYCHIC_F,             22
-	.set TRAINER_CLASS_GENTLEMAN,             23
-	.set TRAINER_CLASS_ELITE_FOUR_M,          24
-	.set TRAINER_CLASS_ELITE_FOUR_F,          25
-	.set TRAINER_CLASS_LEADER_F,              26
-	.set TRAINER_CLASS_LEADER_M,              27
-	.set TRAINER_CLASS_LEADER_MF,             28
-	.set TRAINER_CLASS_SCHOOL_KID_M,          29
-	.set TRAINER_CLASS_SCHOOL_KID_F,          30
-	.set TRAINER_CLASS_SR_AND_JR,             31
-	.set TRAINER_CLASS_POKEFAN_M,             32
-	.set TRAINER_CLASS_POKEFAN_F,             33
-	.set TRAINER_CLASS_EXPERT_M,              34
-	.set TRAINER_CLASS_EXPERT_F,              35
-	.set TRAINER_CLASS_YOUNGSTER,             36
-	.set TRAINER_CLASS_CHAMPION,              37
-	.set TRAINER_CLASS_FISHERMAN,             38
-	.set TRAINER_CLASS_CYCLING_TRIATHLETE_M,  39
-	.set TRAINER_CLASS_CYCLING_TRIATHLETE_F,  40
-	.set TRAINER_CLASS_RUNNING_TRIATHLETE_M,  41
-	.set TRAINER_CLASS_RUNNING_TRIATHLETE_F,  42
-	.set TRAINER_CLASS_SWIMMING_TRIATHLETE_M, 43
-	.set TRAINER_CLASS_SWIMMING_TRIATHLETE_F, 44
-	.set TRAINER_CLASS_DRAGON_TAMER,          45
-	.set TRAINER_CLASS_BIRD_KEEPER,           46
-	.set TRAINER_CLASS_NINJA_BOY,             47
-	.set TRAINER_CLASS_BATTLE_GIRL,           48
-	.set TRAINER_CLASS_PARASOL_LADY,          49
-	.set TRAINER_CLASS_SWIMMER_F,             50
-	.set TRAINER_CLASS_PICNICKER,             51
-	.set TRAINER_CLASS_TWINS,                 52
-	.set TRAINER_CLASS_SAILOR,                53
-	.set TRAINER_CLASS_BOARDER_1,             54
-	.set TRAINER_CLASS_BOARDER_2,             55
-	.set TRAINER_CLASS_COLLECTOR,             56
-	.set TRAINER_CLASS_WALLY,                 57
-	.set TRAINER_CLASS_BRENDAN_1,             58
-	.set TRAINER_CLASS_BRENDAN_2,             59
-	.set TRAINER_CLASS_BRENDAN_3,             60
-	.set TRAINER_CLASS_MAY_1,                 61
-	.set TRAINER_CLASS_MAY_2,                 62
-	.set TRAINER_CLASS_MAY_3,                 63
-	.set TRAINER_CLASS_POKEMON_BREEDER_M,     64
-	.set TRAINER_CLASS_POKEMON_BREEDER_F,     65
-	.set TRAINER_CLASS_POKEMON_RANGER_M,      66
-	.set TRAINER_CLASS_POKEMON_RANGER_F,      67
-	.set TRAINER_CLASS_MAGMA_LEADER,          68
-	.set TRAINER_CLASS_TEAM_MAGMA_M,          69
-	.set TRAINER_CLASS_TEAM_MAGMA_F,          70
-	.set TRAINER_CLASS_LASS,                  71
-	.set TRAINER_CLASS_BUG_CATCHER,           72
-	.set TRAINER_CLASS_HIKER,                 73
-	.set TRAINER_CLASS_YOUNG_COUPLE,          74
-	.set TRAINER_CLASS_OLD_COUPLE,            75
-	.set TRAINER_CLASS_SIS_AND_BRO,           76
-
-	.set TRAINER_PIC_BRENDAN,                0
-	.set TRAINER_PIC_MAY,                    1
-	.set TRAINER_PIC_LASS,                   2
-	.set TRAINER_PIC_YOUNGSTER,              3
-	.set TRAINER_PIC_HIKER,                  4
-	.set TRAINER_PIC_BEAUTY,                 5
-	.set TRAINER_PIC_FISHERMAN,              6
-	.set TRAINER_PIC_LADY,                   7
-	.set TRAINER_PIC_CYCLING_TRIATHLETE_M,   8
-	.set TRAINER_PIC_AQUA_GRUNT_M,           9
-	.set TRAINER_PIC_TWINS,                 10
-	.set TRAINER_PIC_SWIMMER_F,             11
-	.set TRAINER_PIC_BUG_CATCHER,           12
-	.set TRAINER_PIC_SCHOOL_KID_M,          13
-	.set TRAINER_PIC_RICH_BOY,              14
-	.set TRAINER_PIC_SR_AND_JR,             15
-	.set TRAINER_PIC_BLACK_BELT,            16
-	.set TRAINER_PIC_WALLY,                 17
-	.set TRAINER_PIC_AQUA_GRUNT_F,          18
-	.set TRAINER_PIC_TUBER_F,               19
-	.set TRAINER_PIC_HEX_MANIAC,            20
-	.set TRAINER_PIC_POKEMON_BREEDER_F,     21
-	.set TRAINER_PIC_MAGMA_GRUNT_M,         22
-	.set TRAINER_PIC_MAGMA_GRUNT_F,         23
-	.set TRAINER_PIC_INTERVIEWER,           24
-	.set TRAINER_PIC_TUBER_M,               25
-	.set TRAINER_PIC_YOUNG_COUPLE,          26
-	.set TRAINER_PIC_GUITARIST,             27
-	.set TRAINER_PIC_GENTLEMAN,             28
-	.set TRAINER_PIC_STEVEN,                29
-	.set TRAINER_PIC_MAXIE,                 30
-	.set TRAINER_PIC_RUNNING_TRIATHLETE_F,  31
-	.set TRAINER_PIC_RUNNING_TRIATHLETE_M,  32
-	.set TRAINER_PIC_BATTLE_GIRL,           33
-	.set TRAINER_PIC_CYCLING_TRIATHLETE_F,  34
-	.set TRAINER_PIC_SWIMMER_M,             35
-	.set TRAINER_PIC_POKEFAN_F,             36
-	.set TRAINER_PIC_EXPERT_M,              37
-	.set TRAINER_PIC_EXPERT_F,              38
-	.set TRAINER_PIC_SWIMMING_TRIATHLETE_M, 39
-	.set TRAINER_PIC_SWIMMING_TRIATHLETE_F, 40
-	.set TRAINER_PIC_DRAGON_TAMER,          41
-	.set TRAINER_PIC_BIRD_KEEPER,           42
-	.set TRAINER_PIC_NINJA_BOY,             43
-	.set TRAINER_PIC_PARASOL_LADY,          44
-	.set TRAINER_PIC_BUG_MANIAC,            45
-	.set TRAINER_PIC_SAILOR,                46
-	.set TRAINER_PIC_COLLECTOR,             47
-	.set TRAINER_PIC_POKEMON_BREEDER_M,     48
-	.set TRAINER_PIC_POKEMON_RANGER_M,      49
-	.set TRAINER_PIC_POKEMON_RANGER_F,      50
-	.set TRAINER_PIC_MAGMA_ADMIN_M,         51
-	.set TRAINER_PIC_MAGMA_ADMIN_F,         52
-	.set TRAINER_PIC_AROMA_LADY,            53
-	.set TRAINER_PIC_RUIN_MANIAC,           54
-	.set TRAINER_PIC_COOL_TRAINER_M,        55
-	.set TRAINER_PIC_COOL_TRAINER_F,        56
-	.set TRAINER_PIC_POKEMANIAC,            57
-	.set TRAINER_PIC_KINDLER,               58
-	.set TRAINER_PIC_CAMPER,                59
-	.set TRAINER_PIC_PICNICKER,             60
-	.set TRAINER_PIC_PSYCHIC_M,             61
-	.set TRAINER_PIC_PSYCHIC_F,             62
-	.set TRAINER_PIC_SCHOOL_KID_F,          63
-	.set TRAINER_PIC_POKEFAN_M,             64
-	.set TRAINER_PIC_SIS_AND_BRO,           65
-	.set TRAINER_PIC_OLD_COUPLE,            66
-	.set TRAINER_PIC_AQUA_ADMIN_M,          67
-	.set TRAINER_PIC_AQUA_ADMIN_F,          68
-	.set TRAINER_PIC_UNUSED_AQUA,           69
-	.set TRAINER_PIC_ARCHIE,                70
-	.set TRAINER_PIC_ROXANNE,               71
-	.set TRAINER_PIC_BRAWLY,                72
-	.set TRAINER_PIC_WATTSON,               73
-	.set TRAINER_PIC_FLANNERY,              74
-	.set TRAINER_PIC_NORMAN,                75
-	.set TRAINER_PIC_WINONA,                76
-	.set TRAINER_PIC_TATE_AND_LIZA,         77
-	.set TRAINER_PIC_WALLACE,               78
-	.set TRAINER_PIC_SIDNEY,                79
-	.set TRAINER_PIC_PHOEBE,                80
-	.set TRAINER_PIC_GLACIA,                81
-	.set TRAINER_PIC_DRAKE,                 82
-
-	.set TRAINER_CLASS_NAME_POKEMON_TRAINER_1,  0
-	.set TRAINER_CLASS_NAME_POKEMON_TRAINER_2,  1
-	.set TRAINER_CLASS_NAME_AQUA_LEADER,        2
-	.set TRAINER_CLASS_NAME_TEAM_AQUA,          3
-	.set TRAINER_CLASS_NAME_AQUA_ADMIN,         4
-	.set TRAINER_CLASS_NAME_AROMA_LADY,         5
-	.set TRAINER_CLASS_NAME_RUIN_MANIAC,        6
-	.set TRAINER_CLASS_NAME_INTERVIEWER,        7
-	.set TRAINER_CLASS_NAME_TUBER_F,            8
-	.set TRAINER_CLASS_NAME_TUBER_M,            9
-	.set TRAINER_CLASS_NAME_COOL_TRAINER,      10
-	.set TRAINER_CLASS_NAME_HEX_MANIAC,        11
-	.set TRAINER_CLASS_NAME_LADY,              12
-	.set TRAINER_CLASS_NAME_BEAUTY,            13
-	.set TRAINER_CLASS_NAME_RICH_BOY,          14
-	.set TRAINER_CLASS_NAME_POKEMANIAC,        15
-	.set TRAINER_CLASS_NAME_SWIMMER_M,         16
-	.set TRAINER_CLASS_NAME_BLACK_BELT,        17
-	.set TRAINER_CLASS_NAME_GUITARIST,         18
-	.set TRAINER_CLASS_NAME_KINDLER,           19
-	.set TRAINER_CLASS_NAME_CAMPER,            20
-	.set TRAINER_CLASS_NAME_BUG_MANIAC,        21
-	.set TRAINER_CLASS_NAME_PSYCHIC,           22
-	.set TRAINER_CLASS_NAME_GENTLEMAN,         23
-	.set TRAINER_CLASS_NAME_ELITE_FOUR,        24
-	.set TRAINER_CLASS_NAME_LEADER,            25
-	.set TRAINER_CLASS_NAME_SCHOOL_KID,        26
-	.set TRAINER_CLASS_NAME_SR_AND_JR,         27
-	.set TRAINER_CLASS_NAME_WINSTRATE,         28
-	.set TRAINER_CLASS_NAME_POKEFAN,           29
-	.set TRAINER_CLASS_NAME_EXPERT,            30
-	.set TRAINER_CLASS_NAME_YOUNGSTER,         31
-	.set TRAINER_CLASS_NAME_CHAMPION,          32
-	.set TRAINER_CLASS_NAME_FISHERMAN,         33
-	.set TRAINER_CLASS_NAME_TRIATHLETE,        34
-	.set TRAINER_CLASS_NAME_DRAGON_TAMER,      35
-	.set TRAINER_CLASS_NAME_BIRD_KEEPER,       36
-	.set TRAINER_CLASS_NAME_NINJA_BOY,         37
-	.set TRAINER_CLASS_NAME_BATTLE_GIRL,       38
-	.set TRAINER_CLASS_NAME_PARASOL_LADY,      39
-	.set TRAINER_CLASS_NAME_SWIMMER_F,         40
-	.set TRAINER_CLASS_NAME_PICNICKER,         41
-	.set TRAINER_CLASS_NAME_TWINS,             42
-	.set TRAINER_CLASS_NAME_SAILOR,            43
-	.set TRAINER_CLASS_NAME_BOARDER,           44
-	.set TRAINER_CLASS_NAME_COLLECTOR,         45
-	.set TRAINER_CLASS_NAME_POKEMON_TRAINER_3, 46
-	.set TRAINER_CLASS_NAME_POKEMON_BREEDER,   47
-	.set TRAINER_CLASS_NAME_POKEMON_RANGER,    48
-	.set TRAINER_CLASS_NAME_MAGMA_LEADER,      49
-	.set TRAINER_CLASS_NAME_TEAM_MAGMA,        50
-	.set TRAINER_CLASS_NAME_MAGMA_ADMIN,       51
-	.set TRAINER_CLASS_NAME_LASS,              52
-	.set TRAINER_CLASS_NAME_BUG_CATCHER,       53
-	.set TRAINER_CLASS_NAME_HIKER,             54
-	.set TRAINER_CLASS_NAME_YOUNG_COUPLE,      55
-	.set TRAINER_CLASS_NAME_OLD_COUPLE,        56
-	.set TRAINER_CLASS_NAME_SIS_AND_BRO,       57
-
-	.set TRAINER_ENCOUNTER_MUSIC_MALE,         0 @ standard male encounter music
-	.set TRAINER_ENCOUNTER_MUSIC_FEMALE,       1 @ standard female encounter music
-	.set TRAINER_ENCOUNTER_MUSIC_GIRL,         2 @ used for male Tubers and Young Couples too
-	.set TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,   3
-	.set TRAINER_ENCOUNTER_MUSIC_INTENSE,      4
-	.set TRAINER_ENCOUNTER_MUSIC_COOL,         5
-	.set TRAINER_ENCOUNTER_MUSIC_AQUA,         6
-	.set TRAINER_ENCOUNTER_MUSIC_MAGMA,        7
-	.set TRAINER_ENCOUNTER_MUSIC_SWIMMER,      8
-	.set TRAINER_ENCOUNTER_MUSIC_TWINS,        9 @ used for other trainer classes too
-	.set TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,  10
-	.set TRAINER_ENCOUNTER_MUSIC_HIKER,       11 @ used for other trainer classes too
-	.set TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, 12
-	.set TRAINER_ENCOUNTER_MUSIC_RICH,        13 @ Rich Boys and Gentlemen
-
-	.set F_TRAINER_FEMALE, 1 << 7
-
-@ All trainer parties specify the IV, level, and species for each Pokémon in the
-@ party. Some trainer parties also specify held items and custom moves for each
-@ Pokémon.
-	.set F_TRAINER_PARTY_CUSTOM_MOVESET, 1 << 0
-	.set F_TRAINER_PARTY_HELD_ITEM,      1 << 1

data/data_83FECCC.s

@@ -1739,7 +1739,15 @@ gUnknown_845A788:: @ 845A788
 	.incbin "baserom.gba", 0x45A788, 0x60
 
 gUnknown_845A7E8:: @ 845A7E8
-	.incbin "baserom.gba", 0x45A7E8, 0x24
+	.4byte gUnknown_841718C @ Not what other player wants
+	.4byte gUnknown_84171CC @ Not an egg
+	.4byte gUnknown_84170BC @ Mon can't be traded
+	.4byte gUnknown_84170BC @ Mon can't be traded
+	.4byte gUnknown_84170FC @ Other trainer's mon can't be traded
+	.4byte gUnknown_84170E0 @ Egg can't be traded
+	.4byte gUnknown_8417130 @ Other trainer can't accept
+	.4byte gUnknown_8417164 @ Can't trade with trainer now
+	.4byte gUnknown_8417164 @ Can't trade with trainer now
 
 gUnknown_845A80C:: @ 845A80C
 	.incbin "baserom.gba", 0x45A80C, 0x74

data/graphics.s

@@ -16214,26 +16214,26 @@ gUnknown_8E9CB9C:: @ 8E9CB9C
 gUnknown_8E9CBBC:: @ 8E9CBBC
 	.incbin "baserom.gba", 0xE9CBBC, 0x320 @UNKNOWN
 
-gUnknown_8E9CEDC:: @ 8E9CEDC
-	.incbin "baserom.gba", 0xE9CEDC, 0x60 @UNKNOWN
+gTradeMenu_Pal:: @ 8E9CEDC
+	.incbin "graphics/trade/menu.gbapal"
 
-gUnknown_8E9CF3C::
-	.incbin "baserom.gba", 0xE9CF3C, 0x20 @UNKNOWN
+gTradeButtons_Pal:: @ E9CF3C
+	.incbin "graphics/trade/unknown_DDB444.gbapal"
 
-gUnknown_8E9CF5C:: @ 8E9CF5C
-	.incbin "baserom.gba", 0xE9CF5C, 0x1280 @UNKNOWN
+gTradeMenu_Gfx:: @ 8E9CF5C
+	.incbin "graphics/trade/menu.4bpp"
 
-gUnknown_8E9E1DC::
-	.incbin "baserom.gba", 0xE9E1DC, 0x800 @UNKNOWN
+gTradeButtons_Gfx:: @ E9E1DC
+	.incbin "graphics/trade/buttons.4bpp"
 
-gUnknown_8E9E9DC::
-	.incbin "baserom.gba", 0xE9E9DC, 0x20 @UNKNOWN
+gUnknown_8E9E9DC:: @ E9E9DC
+	.incbin "graphics/unused/unused_DDCEE4.bin"
 
 gUnknown_8E9E9FC:: @ 8E9E9FC
-	.incbin "baserom.gba", 0xE9E9FC, 0x800 @UNKNOWN
+	.incbin "graphics/trade/unknown_DDCF04.bin"
 
-gUnknown_8E9F1FC:: @ 8E9F1FC
-	.incbin "baserom.gba", 0xE9F1FC, 0x24 @UNKNOWN
+gTradeMenuMonBox_Tilemap:: @ 8E9F1FC
+	.incbin "graphics/trade/menu_mon_box.bin"
 
 gFameCheckerBgPals:: @ 8E9F220
 	.incbin "data/graphics/fame_checker_bg.gbapal"

data/ingame_trades.inc

@@ -1,174 +0,0 @@
-gIngameTrades:: @ 826CF8C
-	.string "MIMIEN$", 11
-	.align 1
-	.2byte SPECIES_MR_MIME @ species
-	.byte 20, 15, 17, 24, 23, 22 @ IVs
-	.byte FALSE @ has second ability
-	.align 2
-	.4byte 1985 @ OT ID
-	.byte 5, 5, 5, 30, 5 @ contest stats
-	.align 2
-	.4byte 0x00009cae @ personality
-	.2byte ITEM_NONE @ held item
-	.byte 255 @ mail index
-	.string "REYLEY$", 11
-	.byte MALE @ OT gender
-	.byte 10 @ sheen
-	.2byte SPECIES_ABRA @ species requested
-	.align 2
-
-	.string "ZYNX$", 11
-	.align 1
-	.2byte SPECIES_JYNX @ species
-	.byte 18, 17, 18, 22, 25, 21 @ IVs
-	.byte FALSE @ has second ability
-	.align 2
-	.4byte 36728 @ OT ID
-	.byte 5, 30, 5, 5, 5 @ contest stats
-	.align 2
-	.4byte 0x498a2e1d @ personality
-	.2byte ITEM_FAB_MAIL @ held item
-	.byte 0 @ mail index
-	.string "DONTAE$", 11
-	.byte MALE @ OT gender
-	.byte 10 @ sheen
-	.2byte SPECIES_POLIWHIRL @ species requested
-	.align 2
-
-	.string "MS. NIDO$", 11
-	.align 1
-	.2byte SPECIES_NIDORAN_F @ species
-	.byte 22, 18, 25, 19, 15, 22 @ IVs
-	.byte FALSE @ has second ability
-	.align 2
-	.4byte 63184 @ OT ID
-	.byte 5, 5, 5, 5, 30 @ contest stats
-	.align 2
-	.4byte 0x4c970b89 @ personality
-	.2byte ITEM_TINY_MUSHROOM @ held item
-	.byte 255 @ mail index
-	.string "SAIGE$", 11
-	.byte FEMALE @ OT gender
-	.byte 10 @ sheen
-	.2byte SPECIES_NIDORAN_M @ species requested
-	.align 2
-
-	.string "CH'DING$", 11
-	.align 1
-	.2byte SPECIES_FARFETCHD @ species
-	.byte 20, 25, 21, 24, 15, 20 @ IVs
-	.byte FALSE @ has second ability
-	.align 2
-	.4byte 8810 @ OT ID
-	.byte 30, 5, 5, 5, 5 @ contest stats
-	.align 2
-	.4byte 0x151943d7 @ personality
-	.2byte ITEM_STICK @ held item
-	.byte 255 @ mail index
-	.string "ELYSSA$", 11
-	.byte MALE @ OT gender
-	.byte 10 @ sheen
-	.2byte SPECIES_SPEAROW @ species requested
-	.align 2
-
-	.string "NINA$", 11
-	.align 1
-	.2byte SPECIES_NIDORINA @ species
-	.byte 22, 25, 18, 19, 22, 15 @ IVs
-	.byte FALSE @ has second ability
-	.align 2
-	.4byte 13637 @ OT ID
-	.byte 5, 5, 30, 5, 5 @ contest stats
-	.align 2
-	.4byte 0x00eeca15 @ personality
-	.2byte ITEM_NONE @ held item
-	.byte 255 @ mail index
-	.string "TURNER$", 11
-	.byte MALE @ OT gender
-	.byte 10 @ sheen
-	.2byte SPECIES_NIDORINO @ species requested
-	.align 2
-
-	.string "MARC$", 11
-	.align 1
-	.2byte SPECIES_LICKITUNG @ species
-	.byte 24, 19, 21, 15, 23, 21 @ IVs
-	.byte FALSE @ has second ability
-	.align 2
-	.4byte 1239 @ OT ID
-	.byte 5, 5, 5, 5, 30 @ contest stats
-	.align 2
-	.4byte 0x451308ab @ personality
-	.2byte ITEM_NONE @ held item
-	.byte 255 @ mail index
-	.string "HADEN$", 11
-	.byte MALE @ OT gender
-	.byte 10 @ sheen
-	.2byte SPECIES_GOLDUCK @ species requested
-	.align 2
-
-	.string "ESPHERE$", 11
-	.align 1
-	.2byte SPECIES_ELECTRODE @ species
-	.byte 19, 16, 18, 25, 25, 19 @ IVs
-	.byte TRUE @ has second ability
-	.align 2
-	.4byte 50298 @ OT ID
-	.byte 30, 5, 5, 5, 5 @ contest stats
-	.align 2
-	.4byte 0x06341016 @ personality
-	.2byte ITEM_NONE @ held item
-	.byte 255 @ mail index
-	.string "CLIFTON$", 11
-	.byte MALE @ OT gender
-	.byte 10 @ sheen
-	.2byte SPECIES_RAICHU @ species requested
-	.align 2
-
-	.string "TANGENY$", 11
-	.align 1
-	.2byte SPECIES_TANGELA @ species
-	.byte 22, 17, 25, 16, 23, 20 @ IVs
-	.byte FALSE @ has second ability
-	.align 2
-	.4byte 60042 @ OT ID
-	.byte 5, 5, 30, 5, 5 @ contest stats
-	.align 2
-	.4byte 0x5c77ecfa @ personality
-	.2byte ITEM_STARDUST @ held item
-	.byte 255 @ mail index
-	.string "NORMA$", 11
-	.byte FEMALE @ OT gender
-	.byte 10 @ sheen
-	.2byte SPECIES_VENONAT @ species requested
-	.align 2
-
-	.string "SEELOR$", 11
-	.align 1
-	.2byte SPECIES_SEEL @ species
-	.byte 24, 15, 22, 16, 23, 22 @ IVs
-	.byte FALSE @ has second ability
-	.align 2
-	.4byte 9853 @ OT ID
-	.byte 5, 5, 5, 5, 30 @ contest stats
-	.align 2
-	.4byte 0x482cac89 @ personality
-	.2byte ITEM_NONE @ held item
-	.byte 255 @ mail index
-	.string "GARETT$", 11
-	.byte MALE @ OT gender
-	.byte 10 @ sheen
-	.2byte SPECIES_PONYTA @ species requested
-	.align 2
-
-gUnknown_826D1A8:: @ 826D1A8
-	.2byte EC_WORD_THAT_S
-	.2byte EC_WORD_A
-	.2byte EC_WORD_HEALTHY
-	.2byte EC_POKEMON2(JYNX)
-	.2byte EC_WORD_EXCL
-	.2byte EC_WORD_BE
-	.2byte EC_WORD_KIND
-	.2byte EC_WORD_TO
-	.2byte EC_WORD_IT
-	.2byte 0

data/strings.s

@@ -1052,24 +1052,29 @@ gUnknown_84170BC:: @ 84170BC
 gUnknown_84170E0:: @ 84170E0
 	.string "An EGG can't be traded now.$"
 
+	.align 2
 gUnknown_84170FC:: @ 0x84170FC
 	.string "The other TRAINER's POKéMON\n"
 	.string "can't be traded now.$"
 
-gUnknown_841712D:: @ 0x841712D
-	.string "   The other TRAINER can't accept\n"
+	.align 2
+gUnknown_8417130:: @ 0x8417130
+	.string "The other TRAINER can't accept\n"
 	.string "that POKéMON now.$"
 
-gUnknown_8417161:: @ 0x8417161
-	.string "   You can't trade with that\n"
+	.align 2
+gUnknown_8417164:: @ 0x8417164
+	.string "You can't trade with that\n"
 	.string "TRAINER now.$"
 
-gUnknown_841718B:: @ 0x841718B
-	.string " That isn't the type of POKéMON\n"
+	.align 2
+gUnknown_841718C:: @ 0x841718C
+	.string "That isn't the type of POKéMON\n"
 	.string "that the other TRAINER wants.$"
 
-gUnknown_84171C9:: @ 0x84171C9
-	.string "   That isn't an EGG.$"
+	.align 2
+gUnknown_84171CC:: @ 0x84171CC
+	.string "That isn't an EGG.$"
 
 gUnknown_84171DF:: @ 0x84171DF
 	.string "Choose a POKéMON.$"
@@ -4359,22 +4364,22 @@ gUnknown_841E09F:: @ 841E09F
 gUnknown_841E0A5:: @ 841E0A5
 	.string "Is this trade okay?$"
 
-gUnknown_841E0B9::
+gTradeText_Cancel::
 	.string "CANCEL$"
 
-gUnknown_841E0C0::
+gTradeText_ChooseAPokemon::
 	.string "Choose a POKéMON.$"
 
-gUnknown_841E0D2::
+gTradeText_Summary::
 	.string "SUMMARY$"
 
-gUnknown_841E0DA::
+gTradeText_Trade::
 	.string "TRADE$"
 
-gUnknown_841E0E0::
+gTradeText_CancelTrade::
 	.string "Cancel trade?$"
 
-gUnknown_841E0EE::
+gTradeText_PressBButtonToExit::
 	.string "Press the B Button to exit.$"
 
 gUnknown_841E10A::
@@ -4402,17 +4407,17 @@ gUnknown_841E1C5::
 	.string "Your friend wants\n"
 	.string "to trade POKéMON.$"
 
-gUnknown_841E1E9:: @ 841E1E9
+gText_XWillBeSentToY:: @ 841E1E9
 	.string "{STR_VAR_2} will be\n"
 	.string "sent to {STR_VAR_1}.$"
 
-gUnknown_841E200:: @ 841E200
+gText_ByeByeVar1:: @ 841E200
 	.string "Bye-bye, {STR_VAR_2}!$"
 
-gUnknown_841E20D:: @ 841E20D
+gText_XSentOverY:: @ 841E20D
 	.string "{STR_VAR_1} sent over {STR_VAR_3}.$"
 
-gUnknown_841E21E:: @ 841E21E
+gText_TakeGoodCareOfX:: @ 841E21E
 	.string "Take good care of {STR_VAR_3}!$"
 
 gText_From:: @ 841E234

data/trade.s

@@ -1,997 +0,0 @@
-#include "constants/items.h"
-#include "constants/species.h"
-#include "constants/easy_chat.h"
-#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2, 0
-
-	@ unknown
-gUnknown_8260814:: @ 8260814
-	.4byte 0x00000f24 @ sizeof(struct SaveBlock2)
-	.4byte 0x00003d68 @ sizeof(struct SaveBlock1)
-	.4byte 0x0000001c @ sizeof(struct MapData)
-	.4byte 0x00000530 @ unk
-	.4byte 0x00000034 @ unk
-	.4byte 0x00000024 @ sizeof(struct MailStruct)
-	.4byte 0x00000064 @ sizeof(struct Pokemon)
-	.4byte 0x00000528
-
-gUnknown_8260834:: @ 8260834
-	.incbin "data/trade/unk_8260834.bin"
-
-gUnknown_8260A32:: @ 8260A32
-	.incbin "data/trade/unk_8260A32.bin"
-
-gUnknown_8260C30:: @ 8260C30
-	.incbin "data/trade/unk_8260C30.bin"
-
-gUnknown_8261430:: @ 8261430
-	.incbin "data/trade/unk_8261430.bin"
-
-gOamdata_8261C30::
-	.4byte 0x80004000, 0x00000400
-
-gOamData_8261C38::
-	.4byte 0xc0004000, 0x00000400
-
-gSpriteAnim_8261C40::
-	obj_image_anim_frame 0x00, 5
-	obj_image_anim_end
-
-gSpriteAnim_8261C48::
-	obj_image_anim_frame 0x20, 5
-	obj_image_anim_end
-
-gSpriteAnimTable_8261C50::
-	.4byte gSpriteAnim_8261C40
-	.4byte gSpriteAnim_8261C48
-
-gUnknown_8261C58:: @ 8261C58
-	obj_tiles gUnknown_8E9E1DC, 0x0800, 300
-
-gUnknown_8261C60:: @ 8261C60
-	obj_pal gUnknown_8E9CF3C, 2345
-
-gSpriteAnim_8261C68::
-	obj_image_anim_frame 0x00, 5
-	obj_image_anim_end
-
-gSpriteAnim_8261C70::
-	obj_image_anim_frame 0x08, 5
-	obj_image_anim_end
-
-gSpriteAnim_8261C78::
-	obj_image_anim_frame 0x10, 5
-	obj_image_anim_end
-
-gSpriteAnim_8261C80::
-	obj_image_anim_frame 0x18, 5
-	obj_image_anim_end
-
-gSpriteAnim_8261C88::
-	obj_image_anim_frame 0x20, 5
-	obj_image_anim_end
-
-gSpriteAnim_8261C90::
-	obj_image_anim_frame 0x28, 5
-	obj_image_anim_end
-
-gSpriteAnimTable_8261C98::
-	.4byte gSpriteAnim_8261C68
-	.4byte gSpriteAnim_8261C70
-	.4byte gSpriteAnim_8261C78
-	.4byte gSpriteAnim_8261C80
-	.4byte gSpriteAnim_8261C88
-	.4byte gSpriteAnim_8261C90
-
-gUnknown_8261CB0:: @ 8261CB0
-	spr_template 300, 2345, gOamData_8261C38, gSpriteAnimTable_8261C50, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_8261CC8:: @ 8261CC8
-	spr_template 200, 4925, gOamdata_8261C30, gSpriteAnimTable_8261C98, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_8261CE0::
-	.incbin "data/trade/unk_8261CE0.gbapal"
-
-gUnknown_8261D00:: @ 8261D00
-	obj_pal gUnknown_8261CE0, 4925
-
-gUnknown_8261D08:: @ 8261D08
-	.byte 0x04, 0x02, 0x0c, 0x0c, 0x00, 0x00
-	.byte 0x02, 0x04, 0x0c, 0x0c, 0x00, 0x00
-	.byte 0x07, 0x06, 0x01, 0x00, 0x00, 0x00
-	.byte 0x01, 0x06, 0x07, 0x00, 0x00, 0x00
-
-	.byte 0x05, 0x03, 0x0c, 0x0c, 0x00, 0x00
-	.byte 0x03, 0x05, 0x0c, 0x0c, 0x00, 0x00
-	.byte 0x00, 0x07, 0x06, 0x01, 0x00, 0x00
-	.byte 0x06, 0x07, 0x00, 0x01, 0x00, 0x00
-
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x09, 0x08, 0x07, 0x06, 0x00, 0x00
-	.byte 0x03, 0x01, 0x00, 0x00, 0x00, 0x00
-
-	.byte 0x01, 0x01, 0x01, 0x01, 0x00, 0x00
-	.byte 0x05, 0x01, 0x01, 0x01, 0x00, 0x00
-	.byte 0x02, 0x09, 0x08, 0x07, 0x00, 0x00
-	.byte 0x08, 0x09, 0x06, 0x06, 0x00, 0x00
-
-	.byte 0x02, 0x02, 0x02, 0x02, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06
-	.byte 0x05, 0x03, 0x01, 0x00, 0x00, 0x00
-
-	.byte 0x03, 0x03, 0x03, 0x03, 0x00, 0x00
-	.byte 0x01, 0x01, 0x01, 0x01, 0x00, 0x00
-	.byte 0x04, 0x04, 0x04, 0x04, 0x00, 0x00
-	.byte 0x0a, 0x08, 0x06, 0x00, 0x00, 0x00
-
-	.byte 0x0a, 0x08, 0x0c, 0x00, 0x00, 0x00
-	.byte 0x08, 0x0a, 0x0c, 0x00, 0x00, 0x00
-	.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x07, 0x00, 0x01, 0x00, 0x00, 0x00
-
-	.byte 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x09, 0x0c, 0x00, 0x00, 0x00, 0x00
-	.byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-	.byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00
-	.byte 0x03, 0x02, 0x01, 0x00, 0x00, 0x00
-	.byte 0x09, 0x07, 0x00, 0x00, 0x00, 0x00
-
-	.byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x0b, 0x0c, 0x00, 0x00, 0x00, 0x00
-	.byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x02, 0x01, 0x00, 0x00, 0x00, 0x00
-
-	.byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x05, 0x04, 0x03, 0x02, 0x01, 0x00
-	.byte 0x0b, 0x09, 0x07, 0x00, 0x00, 0x00
-
-	.byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x04, 0x02, 0x00, 0x00, 0x00, 0x00
-
-	.byte 0x0b, 0x09, 0x07, 0x06, 0x00, 0x00
-	.byte 0x07, 0x06, 0x00, 0x00, 0x00, 0x00
-	.byte 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00
-
-gTradeMonSpriteCoords:: @ 8261E40
-	.byte 0x01, 0x05
-	.byte 0x08, 0x05
-	.byte 0x01, 0x0a
-	.byte 0x08, 0x0a
-	.byte 0x01, 0x0f
-	.byte 0x08, 0x0f
-	.byte 0x10, 0x05
-	.byte 0x17, 0x05
-	.byte 0x10, 0x0a
-	.byte 0x17, 0x0a
-	.byte 0x10, 0x0f
-	.byte 0x17, 0x0f
-	.byte 0x17, 0x12
-
-gUnknown_8261E5A:: @ 8261E5A
-	.byte 0x05, 0x04
-	.byte 0x0c, 0x04
-	.byte 0x05, 0x09
-	.byte 0x0c, 0x09
-	.byte 0x05, 0x0e
-	.byte 0x0c, 0x0e
-	.byte 0x14, 0x04
-	.byte 0x1b, 0x04
-	.byte 0x14, 0x09
-	.byte 0x1b, 0x09
-	.byte 0x14, 0x0e
-	.byte 0x1b, 0x0e
-
-gUnknown_8261E72:: @ 8261E72
-	.byte 0x01, 0x03
-	.byte 0x08, 0x03
-	.byte 0x01, 0x08
-	.byte 0x08, 0x08
-	.byte 0x01, 0x0d
-	.byte 0x08, 0x0d
-
-	.byte 0x10, 0x03
-	.byte 0x17, 0x03
-	.byte 0x10, 0x08
-	.byte 0x17, 0x08
-	.byte 0x10, 0x0d
-	.byte 0x17, 0x0d
-
-gTradeUnknownSpriteCoords:: @ 8261E8A
-	.byte 0x3c, 0x09, 0xb4, 0x09
-	.byte 0x30, 0x09, 0xa8, 0x09
-
-gUnknown_8261E92::
-	.byte 0x00, 0x0e, 0x0f, 0x1d
-	.byte 0x03, 0x05, 0x03, 0x07
-	.byte 0x12, 0x05, 0x12, 0x07
-	.byte 0x08, 0x07, 0x16, 0x0c
-	.byte 0x08, 0x07, 0x16, 0x0c
-	.byte 0x06, 0x07, 0x18, 0x0c
-	.byte 0x06, 0x07, 0x18, 0x0c
-	.byte 0x08, 0x07, 0x16, 0x0c
-	.byte 0x07, 0x07, 0x17, 0x0c
-
-gUnknown_8261EB6:: @ 8261EB6
-	.string "$"
-
-gUnknown_8261EB7::
-	.string "{COLOR DARK_GREY}{HIGHLIGHT TRANSPARENT}{SHADOW RED}$"
-
-gText_MaleSymbol4:: @ 8261EC1
-	.string "♂$"
-
-gText_FemaleSymbol4:: @ 8261EC3
-	.string "♀$"
-
-gText_GenderlessSymbol:: @ 8261EC5
-	.string "$"
-
-gUnknown_8261EC6::
-	.string "$"
-
-gUnknown_8261EC7:: @ 8261EC7
-	.string "\n$"
-
-gUnknown_8261EC9::
-	.string "/$"
-
-	.align 2
-gUnknown_8261ECC:: @ 8261ECC
-	.4byte gUnknown_841E0B9
-	.4byte gUnknown_841E0C0
-	.4byte gUnknown_841E0D2
-	.4byte gUnknown_841E0DA
-	.4byte gUnknown_841E0E0
-	.4byte gUnknown_841E0EE
-
-gUnknown_8261EE4:: @ 8261EE4
-	.4byte gUnknown_841E10A, sub_804F440
-	.4byte gUnknown_841E112, sub_804F464
-
-gUnknown_8261EF4:: @ 8261EF4
-	.4byte gUnknown_841E118
-	.4byte gUnknown_841E145
-	.4byte gUnknown_841E16B
-	.4byte gUnknown_8417094
-	.4byte gUnknown_841E199
-	.4byte gUnknown_841E1C5
-	.4byte gUnknown_84170BC
-	.4byte gUnknown_84170E0
-	.4byte gUnknown_84170FC
-
-gUnknown_8261F18:: @ 8261F18
-	.byte 0, 1, 2
-
-	.align 2
-gUnknown_8261F1C:: @ 8261F1C
-	.4byte 0x000001f8
-	@ {
-	@   .bg = 0,
-	@   .charBaseIndex = 2,
-	@   .mapBaseIndex = 31,
-	@   .screenSize = 0,
-	@   .paletteMode = 0,
-	@   .priority = 0,
-	@   .baseTile = 0x0000
-	@ }
-	.4byte 0x00001051
-	@ {
-	@   .bg = 1,
-	@   .charBaseIndex = 0,
-	@   .mapBaseIndex = 5,
-	@   .screenSize = 0,
-	@   .paletteMode = 0,
-	@   .priority = 1,
-	@   .baseTile = 0x0000
-	@ }
-	.4byte 0x00002062
-	@ {
-	@   .bg = 2,
-	@   .charBaseIndex = 0,
-	@   .mapBaseIndex = 6,
-	@   .screenSize = 0,
-	@   .paletteMode = 0,
-	@   .priority = 2,
-	@   .baseTile = 0x0000
-	@ }
-	.4byte 0x00003073
-	@ {
-	@   .bg = 3,
-	@   .charBaseIndex = 0,
-	@   .mapBaseIndex = 7,
-	@   .screenSize = 0,
-	@   .paletteMode = 0,
-	@   .priority = 3,
-	@   .baseTile = 0x0000
-	@ }
-
-gUnknown_8261F2C:: @ 8261F2C
-	.byte 0, 4, 7, 22, 4, 15
-	.2byte 0x001e
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 4,
-	@   .tilemapTop = 7,
-	@   .width = 22,
-	@   .height = 4,
-	@   .paletteNum = 15,
-	@   .baseBlock = 0x001e
-	@ }
-	.byte 0, 17, 15, 12, 4, 15
-	.2byte 0x0076
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 17,
-	@   .tilemapTop = 15,
-	@   .width = 12,
-	@   .height = 4,
-	@   .paletteNum = 15,
-	@   .baseBlock = 0x0076
-	@ }
-	.byte 0, 0, 5, 8, 2, 13
-	.2byte 0x00a6
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 0,
-	@   .tilemapTop = 5,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 13,
-	@   .baseBlock = 0x00a6
-	@ }
-	.byte 0, 7, 5, 8, 2, 13
-	.2byte 0x00b6
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 7,
-	@   .tilemapTop = 5,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 13,
-	@   .baseBlock = 0x00b6
-	@ }
-	.byte 0, 0, 10, 8, 2, 13
-	.2byte 0x00c6
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 0,
-	@   .tilemapTop = 10,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 13,
-	@   .baseBlock = 0x00c6
-	@ }
-	.byte 0, 7, 10, 8, 2, 13
-	.2byte 0x00d6
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 7,
-	@   .tilemapTop = 10,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 13,
-	@   .baseBlock = 0x00d6
-	@ }
-	.byte 0, 0, 15, 8, 2, 13
-	.2byte 0x00e6
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 0,
-	@   .tilemapTop = 15,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 13,
-	@   .baseBlock = 0x00e6
-	@ }
-	.byte 0, 7, 15, 8, 2, 13
-	.2byte 0x00f6
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 7,
-	@   .tilemapTop = 15,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 13,
-	@   .baseBlock = 0x00f6
-	@ }
-	.byte 0, 15, 5, 8, 2, 13
-	.2byte 0x0106
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 15,
-	@   .tilemapTop = 5,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 13,
-	@   .baseBlock = 0x0106
-	@ }
-	.byte 0, 22, 5, 8, 2, 13
-	.2byte 0x0116
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 22,
-	@   .tilemapTop = 5,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 13,
-	@   .baseBlock = 0x0116
-	@ }
-	.byte 0, 15, 10, 8, 2, 13
-	.2byte 0x0126
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 15,
-	@   .tilemapTop = 10,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 13,
-	@   .baseBlock = 0x0126
-	@ }
-	.byte 0, 22, 10, 8, 2, 13
-	.2byte 0x0136
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 22,
-	@   .tilemapTop = 10,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 13,
-	@   .baseBlock = 0x0136
-	@ }
-	.byte 0, 15, 15, 8, 2, 13
-	.2byte 0x0146
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 15,
-	@   .tilemapTop = 15,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 13,
-	@   .baseBlock = 0x0146
-	@ }
-	.byte 0, 22, 15, 8, 2, 13
-	.2byte 0x0156
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 22,
-	@   .tilemapTop = 15,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 13,
-	@   .baseBlock = 0x0156
-	@ }
-	.byte 0, 2, 5, 14, 2, 13
-	.2byte 0x0166
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 2,
-	@   .tilemapTop = 5,
-	@   .width = 14,
-	@   .height = 2,
-	@   .paletteNum = 13,
-	@   .baseBlock = 0x0166
-	@ }
-	.byte 0, 3, 8, 11, 8, 15
-	.2byte 0x0182
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 3,
-	@   .tilemapTop = 8,
-	@   .width = 11,
-	@   .height = 8,
-	@   .paletteNum = 15,
-	@   .baseBlock = 0x0182
-	@ }
-	.byte 0, 17, 5, 14, 2, 15
-	.2byte 0x01da
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 17,
-	@   .tilemapTop = 5,
-	@   .width = 14,
-	@   .height = 2,
-	@   .paletteNum = 15,
-	@   .baseBlock = 0x01da
-	@ }
-	.byte 0, 18, 8, 11, 8, 15
-	.2byte 0x01f6
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 18,
-	@   .tilemapTop = 8,
-	@   .width = 11,
-	@   .height = 8,
-	@   .paletteNum = 15,
-	@   .baseBlock = 0x01f6
-	@ }
-	.byte 255, 0, 0, 0, 0, 0
-	.2byte 0x0000
-	@ {
-	@   .bg = 255,
-	@   .tilemapLeft = 0,
-	@   .tilemapTop = 0,
-	@   .width = 0,
-	@   .height = 0,
-	@   .paletteNum = 0,
-	@   .baseBlock = 0x0000
-	@ }
-
-gUnknown_8261FC4:: @ 8261FC4
-	.byte 0, 21, 13, 6, 4, 15
-	.2byte 0x024e
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 21,
-	@   .tilemapTop = 13,
-	@   .width = 6,
-	@   .height = 4,
-	@   .paletteNum = 15,
-	@   .baseBlock = 0x024e
-	@ }
-
-	.string "かいめの そうしん$", 13
-	.string "かいめの じゅしん$", 13
-	.string "ポケモンアイコンセット$", 13
-	.string "OBJテキストセット$", 13
-	.string "セルセット$", 13
-	.string "OBJテキストADD$", 13
-	.string "システムメッセージADD$", 13
-	.string "はいけいセット$", 13
-
-gUnknown_8262034:: @ 8262034
-	.string "ヌケニン$"
-	.string "こうかんせいりつ     $"
-	.string "だめだたらしいよ     $"
-
-gUnknown_8262055:: @ 8262055
-	.byte 0x04, 0x03
-	.byte 0x13, 0x03
-
-	.align 2
-gUnknown_826205C::
-	.incbin "data/trade/unk_826207C.gbapal"
-
-gUnknown_826207C::
-	.incbin "data/trade/unk_826207C.4bpp"
-
-	.incbin "baserom.gba", 0x26267C, 0x1A00
-
-gUnknown_826407C:: @ 826407C
-	.incbin "data/trade/unk_826407C.bin"
-
-	.incbin "baserom.gba", 0x26487C, 0x120
-
-gUnknown_826499C::
-	.incbin "data/trade/unk_8264E1C.gbapal"
-
-	.incbin "baserom.gba", 0x2649BC, 0x40
-
-gUnknown_82649FC::
-	.incbin "data/trade/unk_8264A1C.gbapal"
-
-gUnknown_8264A1C::
-	.incbin "data/trade/unk_8264A1C.4bpp"
-
-gUnknown_8264C1C::
-	.incbin "data/trade/unk_8264C1C.4bpp"
-
-gUnknown_8264E1C::
-	.incbin "data/trade/unk_8264E1C.4bpp"
-
-	.incbin "baserom.gba", 0x264F1C, 0x100
-
-gUnknown_826501C::
-	.incbin "data/trade/unk_826501C.4bpp"
-
-gUnknown_826601C:: @ 826601C
-	.incbin "data/trade/unk_826601C.bin"
-
-gUnknown_826701C:: @ 826701C
-	.incbin "data/trade/unk_826701C.8bpp"
-
-gUnknown_826985C:: @ 826985C
-	.incbin "data/trade/unk_826985C.bin"
-
-gUnknown_826995C:: @ 826995C
-	.incbin "data/trade/unk_826995C.bin"
-
-gUnknown_8269A5C:: @ 8269A5C
-	.incbin "data/trade/unk_8269A5C.bin"
-
-gUnknown_826AA5C:: @ 826AA5C
-	.incbin "data/trade/unk_826AA5C.bin"
-
-	.align 2
-gUnknown_3379A0Bin:: @ 826BA5C
-	.incbin "graphics/trade/unknown_3379A0.bin.lz"
-
-gUnknown_826BB5C:: @ 826BB5C
-	.incbin "data/trade/unk_826BB5C.gbapal"
-
-gUnknown_826BD5C:: @ 826BD5C
-	.incbin "data/trade/unk_826BD5C.gbapal"
-
-gUnknown_826BF5C:: @ 826BF5C
-	.incbin "data/trade/unk_826BF5C.gbapal"
-
-gWirelessSignal4bpp:: @ 826BF7C
-	.incbin "graphics/trade/wireless_signal.4bpp.lz"
-
-gUnknown_826C60C:: @ 826C60C
-	.incbin "data/trade/unk_826C60C.bin.lz"
-
-gOamData_826CD00::
-	.4byte 0x40000100, 0x00000000
-
-gAnimCmd_826CD08::
-	obj_image_anim_frame 0x00, 3
-	obj_image_anim_frame 0x04, 3
-	obj_image_anim_frame 0x08, 3
-	obj_image_anim_frame 0x0c, 3
-	obj_image_anim_frame 0x10, 3
-	obj_image_anim_frame 0x14, 3
-	obj_image_anim_frame 0x18, 3
-	obj_image_anim_frame 0x1c, 3
-	obj_image_anim_frame 0x20, 3
-	obj_image_anim_frame 0x24, 3
-	obj_image_anim_frame 0x28, 3
-	obj_image_anim_frame 0x2c, 3
-	obj_image_anim_loop 1
-	obj_image_anim_frame 0x00, 3
-	obj_image_anim_end
-
-gAnimCmd_826CD44::
-	obj_image_anim_frame 0x00, 3
-	obj_image_anim_frame 0x04, 3
-	obj_image_anim_frame 0x08, 3
-	obj_image_anim_frame 0x0c, 3
-	obj_image_anim_frame 0x10, 3
-	obj_image_anim_frame 0x14, 3
-	obj_image_anim_frame 0x18, 3
-	obj_image_anim_frame 0x1c, 3
-	obj_image_anim_frame 0x20, 3
-	obj_image_anim_frame 0x24, 3
-	obj_image_anim_frame 0x28, 3
-	obj_image_anim_frame 0x2c, 3
-	obj_image_anim_loop 2
-	obj_image_anim_frame 0x00, 3
-	obj_image_anim_end
-
-gSpriteAnimTable_826CD80::
-	.4byte gAnimCmd_826CD08
-	.4byte gAnimCmd_826CD44
-
-gAffineAnimCmd_826CD88::
-	obj_rot_scal_anim_frame 0x0000, 0x0000, 0x00, 0x01
-	obj_rot_scal_anim_end
-
-gAffineAnimCmd_826CD98::
-	obj_rot_scal_anim_frame 0xfff8, 0x0000, 0x00, 0x14
-	obj_rot_scal_anim_end
-
-gAffineAnimCmd_826CDA8::
-	obj_rot_scal_anim_frame 0x0060, 0x0100, 0x00, 0x00
-	obj_rot_scal_anim_frame 0x0000, 0x0000, 0x00, 0x05
-	obj_rot_scal_anim_frame 0x0008, 0x0000, 0x00, 0x14
-	obj_rot_scal_anim_end
-
-gSpriteAffineAnimTable_826CDC8::
-	.4byte gAffineAnimCmd_826CD88
-	.4byte gAffineAnimCmd_826CD98
-	.4byte gAffineAnimCmd_826CDA8
-
-gUnknown_826CDD4:: @ 826CDD4
-	obj_tiles gUnknown_826207C, 0x0600, 5557
-
-gUnknown_826CDDC:: @ 826CDDC
-	obj_pal gUnknown_826205C, 5558
-
-gUnknown_826CDE4:: @ 826CDE4
-	spr_template 5557, 5558, gOamData_826CD00, gSpriteAnimTable_826CD80, NULL, gSpriteAffineAnimTable_826CDC8, sub_80538BC
-
-gOamData_826CDFC::
-	.4byte 0x80000500, 0x00000400
-
-gAnimCmd_826CE04::
-	obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-gSpriteAnimTable_826CE0C::
-	.4byte gAnimCmd_826CE04
-
-gAffineAnimCmd_826CE10::
-	obj_rot_scal_anim_frame -10, -10, 0, 5
-	obj_rot_scal_anim_frame  10,  10, 0, 5
-	obj_rot_scal_anim_jump 0
-
-gSpriteAffineAnimTable_826CE28::
-	.4byte gAffineAnimCmd_826CE10
-
-gUnknown_826CE2C:: @ 826CE2C
-	obj_tiles gUnknown_8264A1C, 0x0200, 5550
-
-gUnknown_826CE34:: @ 826CE34
-	obj_pal gUnknown_82649FC, 5551
-
-gUnknown_826CE3C:: @ 826CE3C
-	obj_pal gUnknown_826499C, 5555
-
-gUnknown_826CE44:: @ 826CE44
-	spr_template 5550, 5551, gOamData_826CDFC, gSpriteAnimTable_826CE0C, NULL, gSpriteAffineAnimTable_826CE28, sub_804FD24
-
-gOamData_826CE5C::
-	.4byte 0x80008000, 0x00000400
-
-gAnimCmd_826CE64::
-	obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-gAnimCmd_826CE6C::
-	obj_image_anim_frame 8, 5, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-gSpriteAnimTable_826CE74::
-	.4byte gAnimCmd_826CE64
-	.4byte gAnimCmd_826CE6C
-
-gUnknown_826CE7C:: @ 826CE7C
-	obj_tiles gUnknown_8264C1C, 0x0300, 5552
-
-gUnknown_826CE84:: @ 826CE84
-	spr_template 5552, 5551, gOamData_826CE5C, gSpriteAnimTable_826CE74, NULL, gDummySpriteAffineAnimTable, sub_804FD78
-
-gOamData_826CE9C::
-	.4byte 0x80008000, 0x00000400
-
-gAnimCmd_826CEA4::
-	obj_image_anim_frame 0, 10
-	obj_image_anim_end
-
-gSpriteAnimTable_826CEAC::
-	.4byte gAnimCmd_826CEA4
-
-gUnknown_826CEB0:: @ 826CEB0
-	obj_tiles gUnknown_8264E1C, 0x0100, 5554
-
-gUnknown_826CEB8:: @ 826CEB8
-	spr_template 5554, 5555, gOamData_826CE9C, gSpriteAnimTable_826CEAC, NULL, gDummySpriteAffineAnimTable, sub_804FDB8
-
-gOamData_826CED0::
-	.4byte 0xc0004000, 0x00000400
-
-gAnimCmd_826CED8::
-	obj_image_anim_frame 0x00, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 0x20, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 0x40, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 0x60, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 0x40, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 0x20, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 0x00, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_loop 8
-	obj_image_anim_end
-
-gAnimCmd_826CEFC::
-	obj_image_anim_frame 0x00, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 0x20, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 0x40, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 0x60, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 0x40, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 0x20, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 0x00, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_loop 2
-	obj_image_anim_end
-
-gSpriteAnimTable_826CF20::
-	.4byte gAnimCmd_826CED8
-
-gSpriteAnimTable_826CF24::
-	.4byte gAnimCmd_826CEFC
-
-gUnknown_826CF28:: @ 826CF28
-	obj_tiles gUnknown_826501C, 0x1000, 5556
-
-gUnknown_826CF30:: @ 826CF30
-	spr_template 5556, 5555, gOamData_826CED0, gSpriteAnimTable_826CF20, NULL, gDummySpriteAffineAnimTable, sub_804FE00
-
-gUnknown_826CF48:: @ 826CF48
-	spr_template 5556, 5555, gOamData_826CED0, gSpriteAnimTable_826CF24, NULL, gDummySpriteAffineAnimTable, sub_804FE00
-
-gUnknown_826CF60:: @ 826CF60
-	.2byte RGB(18, 24, 31)
-	.2byte RGB(18, 24, 31)
-	.2byte RGB(18, 24, 31)
-	.2byte RGB(31, 31, 31)
-	.2byte RGB(31, 31, 31)
-	.2byte RGB(31, 31, 31)
-	.2byte RGB(18, 24, 31)
-	.2byte RGB(18, 24, 31)
-	.2byte RGB(18, 24, 31)
-	.2byte RGB(31, 31, 31)
-	.2byte RGB(31, 31, 31)
-	.2byte RGB(31, 31, 31)
-
-gAffineAnimCmd_826CF78::
-	obj_rot_scal_anim_frame 0xFF00, 0x0100, 0x00, 0x00
-	obj_rot_scal_anim_jump 0
-
-gUnknown_826CF88:: @ 826CF88
-	.4byte gAffineAnimCmd_826CF78
-
-	.include "data/ingame_trades.inc"
-
-gUnknown_826D1BC:: @ 826D1BC
-	.byte 0, 2, 15, 26, 4, 0
-	.2byte 0x0040
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 2,
-	@   .tilemapTop = 15,
-	@   .width = 26,
-	@   .height = 4,
-	@   .paletteNum = 0,
-	@   .baseBlock = 0x0040
-	@ }
-	.byte 255, 0, 0, 0, 0, 0
-	.2byte 0x0000
-	@ {
-	@   .bg = 255,
-	@   .tilemapLeft = 0,
-	@   .tilemapTop = 0,
-	@   .width = 0,
-	@   .height = 0,
-	@   .paletteNum = 0,
-	@   .baseBlock = 0x0000
-	@ }
-
-gUnknown_826D1CC:: @ 826D1CC
-	.byte 0, 21, 9, 6, 4, 15
-	.2byte 0x00bc
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 21,
-	@   .tilemapTop = 9,
-	@   .width = 6,
-	@   .height = 4,
-	@   .paletteNum = 15,
-	@   .baseBlock = 0x00bc
-	@ }
-
-gUnknown_826D1D4:: @ 826D1D4
-	.4byte 0x000001fc
-	@ {
-	@   .bg = 0,
-	@   .charBaseIndex = 3,
-	@   .mapBaseIndex = 31,
-	@   .screenSize = 0,
-	@   .paletteMode = 0,
-	@   .priority = 0,
-	@   .baseTile = 0x0000
-	@ }
-	.4byte 0x00002051
-	@ {
-	@   .bg = 1,
-	@   .charBaseIndex = 0,
-	@   .mapBaseIndex = 5,
-	@   .screenSize = 0,
-	@   .paletteMode = 0,
-	@   .priority = 2,
-	@   .baseTile = 0x0000
-	@ }
-	.4byte 0x00002326
-	@ {
-	@   .bg = 2,
-	@   .charBaseIndex = 1,
-	@   .mapBaseIndex = 18,
-	@   .screenSize = 1,
-	@   .paletteMode = 0,
-	@   .priority = 2,
-	@   .baseTile = 0x0000
-	@ }
-	.4byte 0x00003063
-	@ {
-	@   .bg = 3,
-	@   .charBaseIndex = 0,
-	@   .mapBaseIndex = 6,
-	@   .screenSize = 0,
-	@   .paletteMode = 0,
-	@   .priority = 3,
-	@   .baseTile = 0x0000
-	@ }
-
-gUnknown_826D1E4:: @ 826D1E4
-	.byte 0x00
-	.byte 0x00
-	.byte 0x01
-	.byte 0x00
-	.byte 0x01
-	.byte 0x00
-	.byte 0x01
-	.byte 0x01
-	.byte 0x01
-	.byte 0x01
-	.byte 0x02
-	.byte 0x02
-	.byte 0x02
-	.byte 0x02
-	.byte 0x03
-	.byte 0x03
-	.byte 0x03
-	.byte 0x03
-	.byte 0x04
-	.byte 0x04
-	.byte 0x04
-	.byte 0x04
-	.byte 0xfc
-	.byte 0xfc
-	.byte 0xfc
-	.byte 0xfd
-	.byte 0xfd
-	.byte 0xfd
-	.byte 0xfd
-	.byte 0xfe
-	.byte 0xfe
-	.byte 0xfe
-	.byte 0xfe
-	.byte 0xff
-	.byte 0xff
-	.byte 0xff
-	.byte 0xff
-	.byte 0x00
-	.byte 0xff
-	.byte 0x00
-	.byte 0xff
-	.byte 0x00
-	.byte 0x00
-	.byte 0x00
-
-	.incbin "baserom.gba", 0x26D210, 0x40
-
-gUnknown_826D250:: @ 826D250
-	.byte 0x00, 0x01
-	.byte 0x01, 0x01
-	.byte 0x02, 0x01
-	.byte 0x03, 0x01
-	.byte 0x04, 0x01
-	.byte 0x05, 0x02
-	.byte 0x06, 0x02
-	.byte 0x07, 0x02
-	.byte 0x08, 0x02
-	.byte 0x09, 0x02
-	.byte 0x0a, 0x03
-	.byte 0x0b, 0x03
-	.byte 0x0c, 0x03
-	.byte 0x0d, 0x04
-	.byte 0x0e, 0x05
-	.byte 0x0f, 0x02
-	.byte 0x00, 0x01
-	.byte 0x01, 0x01
-	.byte 0x02, 0x01
-	.byte 0x03, 0x01
-	.byte 0x04, 0x01
-	.byte 0x05, 0x02
-	.byte 0x06, 0x02
-	.byte 0x07, 0x02
-	.byte 0x08, 0x02
-	.byte 0x09, 0x02
-	.byte 0x0a, 0x03
-	.byte 0x0b, 0x03
-	.byte 0x0c, 0x03
-	.byte 0x0d, 0x04
-	.byte 0x0e, 0x05
-	.byte 0x10, 0x01
-	.byte 0x10, 0xff
-
-	.align 2, 0

graphics/trade/menu.pal

@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+57 57 172
+98 98 180
+123 106 222
+82 90 213
+82 148 205
+131 115 230
+148 156 189
+205 106 0
+246 148 0
+49 49 90
+255 213 115
+205 74 90
+255 98 32
+205 205 222
+255 255 213
+0 0 0
+0 8 16
+0 16 32
+0 24 49
+0 41 65
+0 49 82
+0 57 98
+0 65 115
+0 82 131
+0 90 148
+0 98 164
+0 106 180
+0 123 197
+0 131 213
+0 139 230
+0 156 255
+0 0 0
+0 8 16
+0 16 32
+0 24 49
+0 41 65
+0 49 82
+0 57 98
+0 65 115
+0 82 131
+0 90 148
+0 98 164
+0 106 180
+0 123 197
+0 131 213
+0 139 230
+0 156 255

graphics/trade/misc.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 156 123
+164 123 197
+41 255 115
+0 139 255
+255 255 74
+255 255 255
+106 106 106
+255 156 123
+255 156 123
+255 156 123
+255 156 123
+255 156 123
+255 156 123
+255 156 123
+255 156 123

graphics/trade/shadow.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+0 16 172
+32 32 106
+16 16 90
+0 0 74
+255 255 189
+230 230 164
+205 205 148
+189 180 115
+139 139 90
+74 74 57
+32 32 32

graphics/trade/unknown_3308C0.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 57 8
+255 90 8
+255 131 8
+255 172 8
+255 213 8
+255 255 8
+255 255 131
+255 255 255
+255 255 0
+65 0 0
+115 16 0
+172 32 0
+230 57 8
+0 0 0
+0 0 0

graphics/trade/unknown_338EA4.pal

@@ -0,0 +1,15 @@
+JASC-PAL
+0100
+12
+148 197 255
+148 197 255
+148 197 255
+255 255 255
+255 255 255
+255 255 255
+148 197 255
+148 197 255
+148 197 255
+255 255 255
+255 255 255
+255 255 255

graphics/trade/unknown_DDB444.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+123 131 222
+98 98 180
+123 106 222
+106 172 238
+82 148 205
+180 189 230
+148 156 189
+205 106 0
+255 189 49
+246 148 0
+255 213 115
+205 74 90
+255 98 32
+205 205 222
+255 98 32

include/berry_powder.h

@@ -3,5 +3,6 @@
 
 u32 GetBerryPowder(void);
 void SetBerryPowder(u32 *powder, u32 amount);
+void sub_815EE6C(u32 newKey);
 
 #endif //GUARD_BERRY_POWDER_H

include/constants/flags.h

@@ -1,7 +1,7 @@
 #ifndef GUARD_CONSTANTS_FLAGS_H
 #define GUARD_CONSTANTS_FLAGS_H
 
-// TODO: Get correct names and numbers
+#include "constants/trainers.h"
 
 #define FLAG_TEMP_1              0x001
 #define FLAG_TEMP_2              0x002
@@ -1309,10 +1309,8 @@
 
 #define FLAG_TRAINER_FLAG_START  0x500
 
-#define TRAINERS_FLAG_NO    0x2E7 // 743
-#define TRAINER_FLAGS_WORDS 0x300
-
-#define SYS_FLAGS           (FLAG_TRAINER_FLAG_START + TRAINER_FLAGS_WORDS) // 0x800
+// Vanilla: SYS_FLAGS = 0x800
+#define SYS_FLAGS (FLAG_TRAINER_FLAG_START + ((NUM_TRAINERS) + 31) / 32 * 32)
 
 // SYSTEM FLAGS
 

include/constants/region_map.h

@@ -200,4 +200,6 @@
 #define MAPSEC_SPECIAL_AREA                 0xC4
 #define MAPSEC_NONE                         0xC5
 
+#define MAPSEC_IN_GAME_TRADE                0xFE
+
 #endif //GUARD_CONSTANTS_REGION_MAP_H

include/decompress.h

@@ -23,9 +23,7 @@ void DecompressPicFromTable_2(const struct CompressedSpriteSheet *src, void* buf
 void DecompressPicFromTable_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void* buffer, s32 species);
 
 void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality);
-void HandleLoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality);
 void HandleLoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality);
-void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality);
 
 void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic);
 void LoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic);

include/gba/defines.h

@@ -76,6 +76,7 @@
 
 #define RGB_BLACK RGB(0, 0, 0)
 #define RGB_WHITE RGB(31, 31, 31)
+#define RGB_WHITEALPHA (0xFFFF)
 
 #define NAKED __attribute__((naked))
 #define UNUSED __attribute__((unused))

include/graphics.h

@@ -4214,4 +4214,12 @@ extern const u8 gMonIcon_Unown_ExclamationMark[];
 extern const u8 gMonIcon_Unown_QuestionMark[];
 extern const u8 gMonIcon_QuestionMark[];
 
+// trade
+extern const u16 gTradeMenu_Pal[];
+extern const u16 gTradeButtons_Pal[];
+extern const u16 gTradeMenu_Gfx[];
+extern const u16 gUnknown_8E9E9FC[];
+extern const u16 gTradeButtons_Gfx[];
+extern const u16 gTradeMenuMonBox_Tilemap[];
+
 #endif //GUARD_GRAPHICS_H

include/international_string_util.h

@@ -1,25 +0,0 @@
-#ifndef GUARD_INTERNATIONAL_STRING_UTIL_H
-#define GUARD_INTERNATIONAL_STRING_UTIL_H
-
-#include "global.h"
-
-#include "menu.h"
-
-void sub_81DB52C(const u8 *src);
-void TVShowConvertInternationalString(u8 *dest, const u8 *src, u8 language);
-s32 GetStringCenterAlignXOffset(s32 fontId, const u8 *str, s32 totalWidth);
-s32 GetStringRightAlignXOffset(s32 fontId, const u8 *str, s32 totalWidth);
-s32 GetStringCenterAlignXOffsetWithLetterSpacing(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing);
-s32 GetStringWidthDifference(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing);
-s32 GetMaxWidthInMenuTable(const struct MenuAction *str, s32 arg1);
-s32 sub_81DB3D8(const struct MenuAction *str, u8* arg1, s32 arg2);
-// sub_81DB41C
-// CopyMonCategoryText
-// sub_81DB494
-// sub_81DB4DC
-// sub_81DB554
-// sub_81DB5AC
-u32 sub_81DB604(const u8 *);
-// sub_81DB620
-
-#endif // GUARD_INTERNATIONAL_STRING_UTIL_H

include/item.h

@@ -72,10 +72,12 @@ u16 BagGetQuantityByPocketPosition(u8 pocketId, u16 itemId);
 bool8 itemid_is_unique(u16 itemId);
 void BagPocketCompaction(struct ItemSlot * slots, u8 capacity);
 u16 GetPcItemQuantity(u16 *);
+void SetBagPocketsPointers(void);
 
 void ItemPcCompaction(void);
 void RemoveItemFromPC(u16 itemId, u16 quantity);
 void SortAndCompactBagPocket(struct BagPocket * pocket);
 u8 CountItemsInPC(void);
+void ApplyNewEncryptionKeyToBagItems_(u32 newKey);
 
 #endif // GUARD_ITEM_H

include/link.h

@@ -181,7 +181,7 @@ extern u32 gLinkStatus;
 extern u16 gBlockRecvBuffer[MAX_RFU_PLAYERS][BLOCK_BUFFER_SIZE / 2];
 extern u16 gSendCmd[CMD_LENGTH];
 extern u8 gShouldAdvanceLinkState;
-extern struct LinkPlayer gLinkPlayers[];
+extern struct LinkPlayer gLinkPlayers[MAX_RFU_PLAYERS];
 extern u16 word_3002910[];
 extern bool8 gReceivedRemoteLinkPlayers;
 extern bool8 gLinkVSyncDisabled;
@@ -212,6 +212,7 @@ u8 GetBlockReceivedStatus(void);
 void ResetBlockReceivedFlags(void);
 void ResetBlockReceivedFlag(u8);
 void SetLinkDebugValues(u32, u32);
+u8 GetSavedPlayerCount(void);
 u8 GetLinkPlayerCount_2(void);
 bool8 IsLinkMaster(void);
 void CB2_LinkError(void);
@@ -232,10 +233,10 @@ bool8 sub_800A520(void);
 bool8 sub_8010500(void);
 void sub_800DFB4(u8, u8);
 void sub_800AB9C(void);
-void sub_800B488(void);
+void sub_800B1F4(void);
 void sub_8009734(void);
 void sub_800A620(void);
-void sub_8011BD0(void);
+void sub_80FBB4C(void);
 u8 sub_800ABAC(void);
 u8 sub_800ABBC(void);
 void sub_800AAC0(void);
@@ -257,5 +258,6 @@ void ClearLinkCallback_2(void);
 void sub_80FA42C(void);
 void sub_800B284(struct LinkPlayer * linkPlayer);
 bool8 IsWirelessAdapterConnected(void);
+bool8 sub_800A474(u8 a0);
 
 #endif // GUARD_LINK_H

include/link_rfu.h

@@ -39,6 +39,8 @@ bool32 sub_80FAEF0(void);
 bool32 IsRfuRecvQueueEmpty(void);
 u32 GetRfuRecvQueueLength(void);
 void sub_80F8DC0(void);
+void sub_80FBB20(void);
+bool8 sub_80FA484(bool32 a0);
 void var_800D_set_xB(void);
 
 #endif //GUARD_LINK_RFU_H

include/load_save.h

@@ -26,7 +26,7 @@ void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey);
 void ApplyNewEncryptionKeyToBagItems(u32 encryptionKey);
 void ApplyNewEncryptionKeyToWord(u32 * word, u32 encryptionKey);
 void ApplyNewEncryptionKeyToHword(u16 * hword, u32 encryptionKey);
-void sav2_gender2_inplace_and_xFE(void);
-void sub_804C1C0(void);
+void ClearContinueGameWarpStatus2(void);
+void SetContinueGameWarpStatusToDynamicWarp(void);
 
 #endif // GUARD_LOAD_SAVE_H

include/mevent.h

@@ -68,5 +68,6 @@ bool32 WonderCard_Test_Unk_08_6(void);
 u32 MENews_GetInput(u16 input);
 void sub_8143D24(void);
 u16 sub_81445C0(u32 command);
+void sub_8144714(u32 a0, u32 a1);
 
 #endif //GUARD_MEVENT_H

include/overworld.h

@@ -142,5 +142,8 @@ bool32 sub_8058318(void);
 
 void CB2_ReturnToStartMenu(void);
 void CB2_WhiteOut(void);
+void c2_8056854(void);
+void sub_8054F38(u32 newKey);
+void sub_8055778(int);
 
 #endif //GUARD_OVERWORLD_H

include/party_menu.h

@@ -82,9 +82,11 @@ void OpenPartyMenuInBattle(u8 arg);
 void sub_8127EC4(u8 battlerId, u8 unk, u8 arrayIndex);
 bool8 IsMultiBattle(void);
 void sub_8126EDC(void);
+void sub_812256C(u8 *partyCount, u8 (*icons)[6], u8 side);
 void PartyMenuInit_FromPlayerPc(void);
 void CB2_PartyMenuFromStartMenu(void);
 void sub_8128198(void);
 void sub_8127FF4(u8 slot, u8 slot2);
+void LoadHeldItemIcons(void);
 
 #endif // GUARD_PARTY_MENU_H

include/pokeball.h

@@ -25,7 +25,7 @@ enum
 
 u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow);
 void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h);
-u8 sub_804BB98(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h);
+u8 CreateTradePokeballSprite(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h);
 u8 sub_807671C(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32 h);
 void sub_8076918(u8 bank);
 void DoHitAnimHealthboxEffect(u8 bank);

include/pokemon_icon.h

@@ -8,17 +8,20 @@ const u8 *GetMonIconTiles(u16 iconSpecies, bool32 extra);
 const u16 *GetValidMonIconPalettePtr(u16 speciesId);
 u16 sub_80D2E84(u16 speciesId);
 void sub_80D2F68(u16 iconId);
-u8 sub_80D2D78(u16 iconId, void callback(struct Sprite *), u16 x, u16 y, u16 a4, u8 a5);
+u8 sub_80D2D78(u16 iconId, SpriteCallback callback, u16 x, u16 y, u16 a4, u8 a5);
 void sub_80D2FF0(u16 iconId);
-void sub_80D2EF8(struct Sprite *sprite);
+void sub_80D2EF8(struct Sprite * sprite);
 void LoadMonIconPalettes(void);
 void FreeMonIconPalettes(void);
 u16 MailSpeciesToIconSpecies(u16);
-u8 CreateMonIcon_HandleDeoxys(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 extra);
+u8 CreateMonIcon_HandleDeoxys(u16 species, SpriteCallback callback, s16 x, s16 y, u8 subpriority, bool32 extra);
 void DestroyMonIcon(struct Sprite *);
 u16 GetUnownLetterByPersonality(u32 personality);
-u8 UpdateMonIconFrame(struct Sprite *sprite);
+void SpriteCB_MonIcon(struct Sprite *);
+u8 CreateMonIcon(u16 species, SpriteCallback callback, s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra);
+u8 UpdateMonIconFrame(struct Sprite * sprite);
 void LoadMonIconPalette(u16 iconId);
 void FreeMonIconPalette(u16 iconId);
+void MonIcon_SetAnim(struct Sprite * sprite, u8 animNum);
 
 #endif // GUARD_POKEMON_ICON_H

include/pokemon_storage_system.h

@@ -16,5 +16,6 @@ u8 * GetBoxNamePtr(u8 boxId);
 void sub_808CE60(void);
 void ResetPokemonStorageSystem(void);
 u8 StorageGetCurrentBox(void);
+void PSS_RenderTextToVramViaBuffer(const u8 *name, u8 *a1, u8 a2, u8 a3, u8 *buffer, u8 a5);
 
 #endif // GUARD_POKEMON_STORAGE_SYSTEM_H

include/pokemon_summary_screen.h

@@ -8,7 +8,6 @@ extern u8 gLastViewedMonIndex;
 extern const u8 *const gMoveDescriptionPointers[];
 extern const u8 *const gNatureNamePointers[];
 
-void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
 void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
 void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
 u8 sub_8138B2C(void);
@@ -33,4 +32,7 @@ enum PokemonSummaryScreenPage
     PSS_PAGE_CONTEST_MOVES,
 };
 
+s32 sub_8138B20(void);
+void ShowPokemonSummaryScreen(struct Pokemon * party, u8 cursorPos, u8 lastIdx, void (*callback)(void), u8 a4);
+
 #endif // GUARD_POKEMON_SUMMARY_SCREEN_H

include/quest_log.h

@@ -46,6 +46,7 @@ void sub_811231C(void);
 void sub_81139BC(void);
 void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx);
 void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value);
+void sub_8110840(void *oldSave);
 
 extern u8 gUnknown_203ADFA;
 

include/save_failed_screen.h

@@ -0,0 +1,6 @@
+#ifndef GUARD_SAVE_FAILED_SCREEN_H
+#define GUARD_SAVE_FAILED_SCREEN_H
+
+extern void DoSaveFailedScreen(u8 saveType); // save_failed_screen
+
+#endif //GUARD_SAVE_FAILED_SCREEN_H

include/strings.h

@@ -660,4 +660,30 @@ extern const u8 gText_FiveIsland[];
 extern const u8 gText_SixIsland[];
 extern const u8 gText_SevenIsland[];
 
+// trade
+extern const u8 gUnknown_841E0A5[];
+extern const u8 gText_XWillBeSentToY[];
+extern const u8 gText_ByeByeVar1[];
+extern const u8 gText_XSentOverY[];
+extern const u8 gText_TakeGoodCareOfX[];
+extern const u8 gUnknown_841E325[];
+extern const u8 gTradeText_Cancel[];
+extern const u8 gTradeText_ChooseAPokemon[];
+extern const u8 gTradeText_Summary[];
+extern const u8 gTradeText_Trade[];
+extern const u8 gTradeText_CancelTrade[];
+extern const u8 gTradeText_PressBButtonToExit[];
+extern const u8 gUnknown_841E10A[];
+extern const u8 gUnknown_841E112[];
+extern const u8 gUnknown_841E118[];
+extern const u8 gUnknown_841E145[];
+extern const u8 gUnknown_841E16B[];
+extern const u8 gUnknown_8417094[];
+extern const u8 gUnknown_841E199[];
+extern const u8 gUnknown_841E1C5[];
+extern const u8 gUnknown_84170BC[];
+extern const u8 gUnknown_84170E0[];
+extern const u8 gUnknown_84170FC[];
+extern const u8 gUnknown_841E09F[];
+
 #endif //GUARD_STRINGS_H

include/trade.h

@@ -1,6 +1,11 @@
 #ifndef GUARD_TRADE_H
 #define GUARD_TRADE_H
 
+extern struct MailStruct gLinkPartnerMail[6];
+extern u8 gSelectedTradeMonPositions[2];
+
+extern const u16 gUnknown_826601C[];
+void CB2_ReturnFromLinkTrade(void);
 s32 sub_804FB34(void);
 
 #endif //GUARD_TRADE_H

include/trade_scene.h

@@ -0,0 +1,17 @@
+#ifndef GUARD_TRADE_SCENE_H
+#define GUARD_TRADE_SCENE_H
+
+void CB2_InitTradeAnim_LinkTrade(void);
+void CreateInGameTradePokemon(void);
+void DoInGameTradeScene(void);
+void DrawTextOnTradeWindow(u8 windowId, const u8 *str, s8 speed);
+u16 GetInGameTradeSpeciesInfo(void);
+u16 GetTradeSpecies(void);
+void sub_805049C(void);
+void sub_80504B0(void);
+void LoadTradeAnimGfx(void);
+
+extern const u16 gUnknown_826601C[];
+extern const struct WindowTemplate gUnknown_826D1CC;
+
+#endif //GUARD_TRADE_SCENE_H

include/util.h

@@ -14,7 +14,8 @@ void LoadWordFromTwoHalfwords(u16 *, u32 *);
 int CountTrailingZeroBits(u32 value);
 u16 CalcCRC16(const u8 *data, u32 length);
 u16 CalcCRC16WithTable(const u8 *data, u32 length);
-u32 CalcByteArraySum(const u8* data, u32 length);
+u32 CalcByteArraySum(const u8 *data, u32 length);
 void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor);
+void DoBgAffineSet(struct BgAffineDstData * dest, u32 texX, u32 texY, s16 srcX, s16 srcY, s16 sx, s16 sy, u16 alpha);
 
 #endif // GUARD_UTIL_H

ld_script.txt

@@ -85,7 +85,8 @@ SECTIONS {
         asm/smokescreen.o(.text);
         asm/pokeball.o(.text);
         src/load_save.o(.text);
-        asm/trade.o(.text);
+        src/trade.o(.text);
+        src/trade_scene.o(.text);
         src/play_time.o(.text);
         src/new_game.o(.text);
         asm/overworld.o(.text);
@@ -399,7 +400,8 @@ SECTIONS {
         src/battle_gfx_sfx_util.o(.rodata);
         data/battle_interface.o(.rodata);
         data/pokeball.o(.rodata);
-        data/trade.o(.rodata);
+        src/trade.o(.rodata);
+        src/trade_scene.o(.rodata);
         data/overworld.o(.rodata);
         data/tilesets.o(.rodata);
         data/maps.o(.rodata);

src/battle_main.c

@@ -20,7 +20,6 @@
 #include "graphics.h"
 #include "gpu_regs.h"
 #include "help_system.h"
-#include "international_string_util.h"
 #include "item.h"
 #include "link.h"
 #include "link_rfu.h"

src/data/ingame_trades.h

@@ -0,0 +1,144 @@
+static const struct InGameTrade sInGameTrades[] = {
+    {
+        .nickname = _("MIMIEN"),
+        .species = SPECIES_MR_MIME,
+        .ivs = {20, 15, 17, 24, 23, 22},
+        .abilityNum = 0,
+        .otId = 1985,
+        .conditions = {5, 5, 5, 30, 5},
+        .personality = 0x00009cae,
+        .heldItem = ITEM_NONE,
+        .mailNum = 255,
+        .otName = _("REYLEY"),
+        .otGender = MALE,
+        .sheen = 10,
+        .requestedSpecies = SPECIES_ABRA
+    }, {
+        .nickname = _("ZYNX"),
+        .species = SPECIES_JYNX,
+        .ivs = {18, 17, 18, 22, 25, 21},
+        .abilityNum = 0,
+        .otId = 36728,
+        .conditions = {5, 30, 5, 5, 5},
+        .personality = 0x498a2e1d,
+        .heldItem = ITEM_FAB_MAIL,
+        .mailNum = 0,
+        .otName = _("DONTAE"),
+        .otGender = MALE,
+        .sheen = 10,
+        .requestedSpecies = SPECIES_POLIWHIRL
+    }, {
+        .nickname = _("MS. NIDO"),
+        .species = SPECIES_NIDORAN_F,
+        .ivs = {22, 18, 25, 19, 15, 22},
+        .abilityNum = 0,
+        .otId = 63184,
+        .conditions = {5, 5, 5, 5, 30},
+        .personality = 0x4c970b89,
+        .heldItem = ITEM_TINY_MUSHROOM,
+        .mailNum = 255,
+        .otName = _("SAIGE"),
+        .otGender = FEMALE,
+        .sheen = 10,
+        .requestedSpecies = SPECIES_NIDORAN_M
+    }, {
+        .nickname = _("CH'DING"),
+        .species = SPECIES_FARFETCHD,
+        .ivs = {20, 25, 21, 24, 15, 20},
+        .abilityNum = 0,
+        .otId = 8810,
+        .conditions = {30, 5, 5, 5, 5},
+        .personality = 0x151943d7,
+        .heldItem = ITEM_STICK,
+        .mailNum = 255,
+        .otName = _("ELYSSA"),
+        .otGender = MALE,
+        .sheen = 10,
+        .requestedSpecies = SPECIES_SPEAROW
+    }, {
+        .nickname = _("NINA"),
+        .species = SPECIES_NIDORINA,
+        .ivs = {22, 25, 18, 19, 22, 15},
+        .abilityNum = 0,
+        .otId = 13637,
+        .conditions = {5, 5, 30, 5, 5},
+        .personality = 0x00eeca15,
+        .heldItem = ITEM_NONE,
+        .mailNum = 255,
+        .otName = _("TURNER"),
+        .otGender = MALE,
+        .sheen = 10,
+        .requestedSpecies = SPECIES_NIDORINO
+    }, {
+        .nickname = _("MARC"),
+        .species = SPECIES_LICKITUNG,
+        .ivs = {24, 19, 21, 15, 23, 21},
+        .abilityNum = 0,
+        .otId = 1239,
+        .conditions = {5, 5, 5, 5, 30},
+        .personality = 0x451308ab,
+        .heldItem = ITEM_NONE,
+        .mailNum = 255,
+        .otName = _("HADEN"),
+        .otGender = MALE,
+        .sheen = 10,
+        .requestedSpecies = SPECIES_GOLDUCK
+    }, {
+        .nickname = _("ESPHERE"),
+        .species = SPECIES_ELECTRODE,
+        .ivs = {19, 16, 18, 25, 25, 19},
+        .abilityNum = 1,
+        .otId = 50298,
+        .conditions = {30, 5, 5, 5, 5},
+        .personality = 0x06341016,
+        .heldItem = ITEM_NONE,
+        .mailNum = 255,
+        .otName = _("CLIFTON"),
+        .otGender = MALE,
+        .sheen = 10,
+        .requestedSpecies = SPECIES_RAICHU
+    }, {
+        .nickname = _("TANGENY"),
+        .species = SPECIES_TANGELA,
+        .ivs = {22, 17, 25, 16, 23, 20},
+        .abilityNum = 0,
+        .otId = 60042,
+        .conditions = {5, 5, 30, 5, 5},
+        .personality = 0x5c77ecfa,
+        .heldItem = ITEM_STARDUST,
+        .mailNum = 255,
+        .otName = _("NORMA"),
+        .otGender = FEMALE,
+        .sheen = 10,
+        .requestedSpecies = SPECIES_VENONAT
+    },
+    {
+        .nickname = _("SEELOR"),
+        .species = SPECIES_SEEL,
+        .ivs = {24, 15, 22, 16, 23, 22},
+        .abilityNum = 0,
+        .otId = 9853,
+        .conditions = {5, 5, 5, 5, 30},
+        .personality = 0x482cac89,
+        .heldItem = ITEM_NONE,
+        .mailNum = 255,
+        .otName = _("GARETT"),
+        .otGender = MALE,
+        .sheen = 10,
+        .requestedSpecies = SPECIES_PONYTA
+    }
+};
+
+static const u16 sInGameTradeMailMessages[][10] = {
+    {
+        EC_WORD_THAT_S,
+        EC_WORD_A,
+        EC_WORD_HEALTHY,
+        EC_POKEMON2(JYNX),
+        EC_WORD_EXCL,
+        EC_WORD_BE,
+        EC_WORD_KIND,
+        EC_WORD_TO,
+        EC_WORD_IT
+    }
+};

src/daycare.c

@@ -14,7 +14,6 @@
 #include "text.h"
 #include "menu.h"
 #include "new_menu_helpers.h"
-#include "international_string_util.h"
 #include "script.h"
 #include "strings.h"
 #include "task.h"
@@ -24,25 +23,18 @@
 #include "overworld.h"
 #include "pokedex.h"
 #include "decompress.h"
-#include "task.h"
 #include "palette.h"
-#include "main.h"
 #include "sound.h"
 #include "constants/songs.h"
 #include "text_window.h"
 #include "trig.h"
 #include "malloc.h"
-#include "dma3.h"
 #include "gpu_regs.h"
 #include "bg.h"
 #include "m4a.h"
 #include "graphics.h"
-#include "constants/abilities.h"
-#include "constants/species.h"
 #include "scanline_effect.h"
-#include "field_weather.h"
 #include "naming_screen.h"
-#include "field_screen_effect.h"
 #include "help_system.h"
 #include "field_fadetransition.h"
 

src/load_save.c

@@ -7,13 +7,10 @@
 #include "malloc.h"
 #include "item.h"
 #include "save_location.h"
-
-extern void SetBagPocketsPointers(void);
-extern void sub_8110840(void *oldSave);
-extern void sub_8055778(int);
-extern void sub_8054F38(u32 newKey);
-extern void ApplyNewEncryptionKeyToBagItems_(u32 newKey);
-extern void sub_815EE6C(u32 newKey);
+#include "berry_powder.h"
+#include "item.h"
+#include "overworld.h"
+#include "quest_log.h"
 
 #define SAVEBLOCK_MOVE_RANGE    128
 
@@ -146,13 +143,13 @@ void sub_804C1AC(void)
     gSaveBlock2Ptr->specialSaveWarpFlags |= CONTINUE_GAME_WARP;
 }
 
-void sub_804C1C0(void)
+void SetContinueGameWarpStatusToDynamicWarp(void)
 {
     sub_8055778(0);
     gSaveBlock2Ptr->specialSaveWarpFlags |= CONTINUE_GAME_WARP;
 }
 
-void sav2_gender2_inplace_and_xFE(void)
+void ClearContinueGameWarpStatus2(void)
 {
     gSaveBlock2Ptr->specialSaveWarpFlags &= ~CONTINUE_GAME_WARP;
 }

src/oak_speech.c

@@ -977,7 +977,7 @@ static void Task_OakSpeech15(u8 taskId)
     {
         ClearDialogWindowAndFrame(0, 1);
         spriteId = gTasks[taskId].data[4];
-        gTasks[taskId].data[6] = sub_804BB98(spriteId, gSprites[spriteId].oam.paletteNum, 0x64, 0x42, 0, 0, 32, 0xFFFF1F3F);
+        gTasks[taskId].data[6] = CreateTradePokeballSprite(spriteId, gSprites[spriteId].oam.paletteNum, 0x64, 0x42, 0, 0, 32, 0xFFFF1F3F);
         gTasks[taskId].data[3] = 48;
         gTasks[taskId].data[0] = 64;
         gTasks[taskId].func = Task_OakSpeech16;

src/pokemon.c

@@ -64,9 +64,11 @@ struct OakSpeechNidoranFStruct
     struct SpriteFrameImage *frameImages;
 };
 
-// TODO: move sLearningMoveTableID, gPlayerPartyCount, gEnemyPartyCount, 
-// gEnemyParty, gPlayerParty here after resolving symbol ref in between. 
-extern u8 sLearningMoveTableID;
+static EWRAM_DATA u8 sLearningMoveTableID = 0;
+EWRAM_DATA u8 gPlayerPartyCount = 0;
+EWRAM_DATA u8 gEnemyPartyCount = 0;
+EWRAM_DATA struct Pokemon gEnemyParty[PARTY_SIZE] = {};
+EWRAM_DATA struct Pokemon gPlayerParty[PARTY_SIZE] = {};
 EWRAM_DATA struct SpriteTemplate gMultiuseSpriteTemplate = {0};
 static EWRAM_DATA struct OakSpeechNidoranFStruct *sOakSpeechNidoranResources = NULL;
 

src/random.c

@@ -8,11 +8,11 @@ u32 gRngValue;
 
 u16 Random(void)
 {
-	gRngValue = 1103515245 * gRngValue + 24691;
-	return gRngValue >> 16;
+    gRngValue = 1103515245 * gRngValue + 24691;
+    return gRngValue >> 16;
 }
 
 void SeedRng(u16 seed)
 {
-	gRngValue = seed;
+    gRngValue = seed;
 }

src/save.c

@@ -6,6 +6,8 @@
 #include "load_save.h"
 #include "task.h"
 #include "link.h"
+#include "save_failed_screen.h"
+#include "fieldmap.h"
 #include "gba/flash_internal.h"
 
 #define FILE_SIGNATURE 0x08012025  // signature value to determine if a sector is in use
@@ -66,13 +68,6 @@ const struct SaveSectionOffsets gSaveSectionOffsets[] =
     SAVEBLOCK_CHUNK(struct PokemonStorage, 8)
 };
 
-extern void DoSaveFailedScreen(u8 saveType); // save_failed_screen
-extern void sub_800AB9C(void); // link
-extern bool8 IsLinkTaskFinished(void); // link
-extern void save_serialize_map(void); // fieldmap
-extern void sub_804C1C0(void); // load_save
-extern void sav2_gender2_inplace_and_xFE(void); // load_save
-
 // Sector num to begin writing save data. Sectors are rotated each time the game is saved. (possibly to avoid wear on flash memory?)
 u16 gFirstSaveSector;
 u32 gPrevSaveCounter;
@@ -872,7 +867,7 @@ void sub_80DA634(u8 taskId)
         }
         break;
     case 3:
-        sub_804C1C0();
+        SetContinueGameWarpStatusToDynamicWarp();
         sub_80DA3AC();
         gTasks[taskId].data[0] = 4;
         break;
@@ -894,7 +889,7 @@ void sub_80DA634(u8 taskId)
         gTasks[taskId].data[0] = 7;
         break;
     case 7:
-        sav2_gender2_inplace_and_xFE();
+        ClearContinueGameWarpStatus2();
         sub_800AB9C();
         gTasks[taskId].data[0] = 8;
         break;

src/start_menu.c

@@ -923,14 +923,14 @@ static void task50_after_link_battle_save(u8 taskId)
                 data[0] = 1;
             break;
         case 1:
-            sub_804C1C0();
+            SetContinueGameWarpStatusToDynamicWarp();
             sub_80DA45C();
             data[0] = 2;
             break;
         case 2:
             if (sub_80DA4A0())
             {
-                sav2_gender2_inplace_and_xFE();
+                ClearContinueGameWarpStatus2();
                 data[0] = 3;
             }
             break;

sym_bss.txt

@@ -20,10 +20,9 @@
 	.include "src/multiboot.o"
 	.align 2
 	.include "src/daycare.o"
-
-gUnknown_3000E78: @ 3000E78
-	.space 0x4
-
+	.align 2
+	.include "src/trade.o"
+	.align 2
 	.include "src/play_time.o"
 	.align 2
 gUnknown_3000E80: @ 3000E80

sym_ewram.txt

@@ -18,75 +18,20 @@
 	.space 8
 
 	@ .include "src/link_rfu.o"
+	.align 2
 	.include "src/battle_controllers.o"
+	.align 2
 	.include "src/battle_main.o"
-
-sLearningMoveTableID: @ 2024028
-	.space 0x1
-
-gPlayerPartyCount: @ 2024029
-	.space 0x1
-
-gEnemyPartyCount: @ 202402A
-	.space 0x2
-
-gEnemyParty: @ 202402C
-	.space 0xC8
-
-gUnknown_20240F4: @ 20240F4
-	.space 0x64
-
-gUnknown_2024158: @ 2024158
-	.space 0x64
-
-gUnknown_20241BC: @ 20241BC
-	.space 0x64
-
-gUnknown_2024220: @ 2024220
-	.space 0x64
-
-gPlayerParty: @ 2024284
-	.space 0x64
-
-gUnknown_20242E8: @ 20242E8
-	.space 0x64
-
-gUnknown_202434C: @ 202434C
-	.space 0x64
-
-gUnknown_20243B0: @ 20243B0
-	.space 0x64
-
-gUnknown_2024414: @ 2024414
-	.space 0x64
-
-gUnknown_2024478: @ 2024478
-	.space 0x64
-
+	.align 2
 	.include "src/pokemon.o"
+	.align 2
 	.include "src/daycare.o"
 	.align 2
 	.include "src/load_save.o"
-
 	.align 2
-gUnknown_2031C90: @ 2031C90
-	.space 0x4
-
-gUnknown_2031C94: @ 2031C94
-	.space 0x38
-
-gUnknown_2031CCC: @ 2031CCC
-	.space 0xD8
-
-gUnknown_2031DA4: @ 2031DA4
-	.space 0x4
-
-gUnknown_2031DA8: @ 2031DA8
-	.space 0x4
-
-gUnknown_2031DAC: @ 2031DAC
-	.space 0x4
-
+	.include "src/trade.o"
+	.align 2
+	.include "src/trade_scene.o"
 	.align 2
 	.include "src/new_game.o"