Merge pull request #456 from Diegoisawesome/trade

trade.c

13 files changed, 49 insertions, 17 deletions

diff --git a/include/battle_anim.h b/include/battle_anim.h
index 9082e138b..4723fb0d5 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -122,7 +122,7 @@ s16 CloneBattlerSpriteWithBlend(u8);
 void obj_delete_but_dont_free_vram(struct Sprite*);
 u8 sub_80A89C8(int, u8, int);
 void sub_80A6D60(struct UnknownAnimStruct2*, const void*, u32);
-void sub_80A6CC0(u32, const void*, u32);
+void sub_80A6CC0(u32, const u32*, u32);
 void sub_80A6DAC(bool8);
 void TranslateSpriteInGrowingCircleOverDuration(struct Sprite *);
 void sub_80A653C(struct Sprite *);
@@ -148,6 +148,7 @@ void sub_80A6BFC(struct UnknownAnimStruct2 *unk, u8 unused);
 u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10);
 void sub_80A749C(struct Sprite *sprite);
 void sub_80A6814(u8 taskId);
+void sub_80A6DEC(struct Sprite *sprite);
 void DestroySpriteAndFreeResources_(struct Sprite *sprite);
 void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId);
 
@@ -209,7 +210,7 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes,
 
 // battle_anim_utility_funcs.s
 void sub_8116EB4(u8);
-void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u8 *arg8, const u8 *arg9, const u16 *palette);
+void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *arg8, const u32 *arg9, const u32 *palette);
 
 u32 UnpackSelectedBattleAnimPalettes(s16);
 
diff --git a/include/gba/defines.h b/include/gba/defines.h
index 16f1315d0..b68a2ad1e 100644
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@@ -66,6 +66,4 @@
 
 #define TOTAL_OBJ_TILE_COUNT 1024
 
-#define WIN_RANGE(a, b) (((a) << 8) | (b))
-
 #endif // GUARD_GBA_DEFINES
diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h
index c20b69886..df79b084d 100644
--- a/include/gba/io_reg.h
+++ b/include/gba/io_reg.h
@@ -576,6 +576,9 @@
 #define WINOUT_WINOBJ_OBJ   (1 << 12)
 #define WINOUT_WINOBJ_CLR   (1 << 13)
 
+#define WIN_RANGE(a, b) (((a) << 8) | (b))
+#define WIN_RANGE2(a, b) ((b) | ((a) << 8))
+
 // BLDCNT
 // Bits 0-5 select layers for the 1st target
 #define BLDCNT_TGT1_BG0      (1 << 0)
diff --git a/include/graphics.h b/include/graphics.h
index 5cb6354aa..8a54ba536 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3071,7 +3071,7 @@ extern const u32 gTrainerBackPicPalette_Leaf[];
 
 // pokeblock
 extern const u32 gMenuPokeblock_Gfx[];
-extern const u8 gMenuPokeblock_Pal[];
+extern const u32 gMenuPokeblock_Pal[];
 extern const u32 gMenuPokeblock_Tilemap[];
 extern const u32 gMenuPokeblockDevice_Gfx[];
 extern const u32 gMenuPokeblockDevice_Pal[];
@@ -3859,8 +3859,8 @@ extern const u8 gFireRedMenuElements_Gfx[];
 
 // item menu graphics
 extern const u32 gBagScreen_Gfx[];
-extern const u16 gBagScreenFemale_Pal[];
-extern const u16 gBagScreenMale_Pal[];
+extern const u32 gBagScreenFemale_Pal[];
+extern const u32 gBagScreenMale_Pal[];
 extern const u8 gBagMenuHMIcon_Gfx[];
 
 // item menu icons graphics
@@ -3914,7 +3914,7 @@ extern const u32 gIntro2FlygonGfx[];
 // party menu graphics
 extern const u32 gPartyMenuMisc_Gfx[];
 extern const u32 gPartyMenuMisc_Tilemap[];
-extern const u8 gPartyMenuMisc_Pal[];
+extern const u32 gPartyMenuMisc_Pal[];
 
 // berry pics
 extern const u32 gBerryPic_Cheri[];
@@ -4105,6 +4105,10 @@ extern const u32 gUnknown_08D83C3C[];
 extern const u32 gUnknown_08D83900[];
 extern const u32 gBattleFrontierGfx_DomeOptions[];
 
+extern const u32 gUnknown_08D854E8[];
+extern const u32 gUnknown_08D855E8[];
+extern const u32 gContest2Pal[];
+
 extern const u32 gBattleAnimSpriteSheet_000[];
 extern const u32 gBattleAnimSpriteSheet_001[];
 extern const u32 gBattleAnimSpriteSheet_002[];
@@ -4626,9 +4630,9 @@ extern const u32 gBattleAnimSpritePalette_241[];
 extern const u32 gBattleAnimSpritePalette_242[];
 extern const u32 gBattleAnimSpritePalette_243[];
 extern const u32 gBattleAnimSpritePalette_244[];
-extern const u8 gUnknown_08C2DC68[];
-extern const u16 gUnknown_08C2DDA4[];
-extern const u8 gUnknown_08C2DDC4[];
+extern const u32 gUnknown_08C2DC68[];
+extern const u32 gUnknown_08C2DDA4[];
+extern const u32 gUnknown_08C2DDC4[];
 extern const u32 gBattleAnimSpritePalette_245[];
 extern const u32 gBattleAnimSpritePalette_248[];
 extern const u32 gBattleAnimSpritePalette_249[];
@@ -4797,6 +4801,16 @@ extern const u32 gCableCarDoor_Gfx[];
 extern const u32 gCableCarCord_Gfx[];
 extern const u16 gCableCar_Pal[];
 
+// Trade
+extern const u16 gUnknown_08DDB3E4[];
+extern const u8 gUnknown_08DDB464[];
+extern const u16 gUnknown_08DDCF04[];
+extern const u16 gTradeGba2_Pal[];
+extern const u8 gTradeGba_Gfx[];
+extern const u16 gUnknown_08DDD704[];
+extern const u8 gUnknown_08DDC6E4[];
+extern const u16 gUnknown_08DDB444[];
+
 // Party menu
 extern const u32 gPartyMenuPokeball_Gfx[];
 extern const u32 gPartyMenuPokeballSmall_Gfx[];
diff --git a/include/librfu.h b/include/librfu.h
index 49df42541..38c819835 100644
--- a/include/librfu.h
+++ b/include/librfu.h
@@ -255,6 +255,6 @@ void rfu_REQ_recvData(void);
 void rfu_UNI_readySendData(u8 a0);
 void rfu_UNI_clearRecvNewDataFlag(u8 a0);
 void rfu_REQ_PARENT_resumeRetransmitAndChange(void);
-void rfu_NI_setSendData(u8, u8, u8 *, u8);
+void rfu_NI_setSendData(u8, u8, const void *, u32);
 
 #endif // GUARD_LIBRFU_H
diff --git a/include/link.h b/include/link.h
index f12f0990f..9552f062c 100644
--- a/include/link.h
+++ b/include/link.h
@@ -240,7 +240,7 @@ void SerialCB(void);
 u8 GetLinkPlayerCount(void);
 bool32 InUnionRoom(void);
 void sub_800E0E8(void);
-bool8 sub_800A520(void);
+bool8 IsLinkTaskFinished(void);
 void CreateWirelessStatusIndicatorSprite(u8, u8);
 void sub_800ADF8(void);
 void sub_800B488(void);
@@ -311,5 +311,6 @@ void sub_800AD10(void);
 void sub_800AB18(void);
 void sub_8009F18(void);
 bool8 sub_800AA60(void);
+void sub_800ABF4(u16 a0);
 
 #endif // GUARD_LINK_H
diff --git a/include/link_rfu.h b/include/link_rfu.h
index e394e2611..715b4cdd9 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -279,5 +279,7 @@ void sub_8011DE0(u32 arg0);
 u8 sub_801100C(int a0);
 void sub_800EF7C(void);
 bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx);
+s32 sub_800E87C(u8 idx);
+void sub_8011BA4(void);
 
 #endif //GUARD_LINK_RFU_H
diff --git a/include/palette.h b/include/palette.h
index c14e9f453..540452f3d 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -43,7 +43,7 @@ extern u8 gPaletteDecompressionBuffer[];
 extern u16 gPlttBufferUnfaded[];
 extern u16 gPlttBufferFaded[];
 
-void LoadCompressedPalette(const void *, u16, u16);
+void LoadCompressedPalette(const u32 *, u16, u16);
 void LoadPalette(const void *, u16, u16);
 void FillPalette(u16, u16, u16);
 void TransferPlttBuffer(void);
diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h
index c1bdbdf34..faffd3375 100644
--- a/include/rom_8011DC0.h
+++ b/include/rom_8011DC0.h
@@ -5,6 +5,7 @@
 
 // Exported RAM declarations
 
+extern u8 gUnknown_02022C2C;
 extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38;
 extern u16 gUnknown_02022C3C;
 extern u8 gUnknown_02022C3E;
diff --git a/include/strings.h b/include/strings.h
index 64222cddb..7c6ca14ba 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1893,7 +1893,6 @@ extern const u8 gText_PkmnTransferredSomeonesPC[];
 extern const u8 gText_PkmnTransferredLanettesPC[];
 
 // hall of fame
-extern const u8 gText_SavingDontTurnOffPower[];
 extern const u8 gText_LeagueChamp[];
 extern const u8 gText_HOFNumber[];
 extern const u8 gText_PickNextCancel[];
@@ -1984,4 +1983,11 @@ extern const u8 gText_EggCantBeTradedNow[];
 extern const u8 gText_OtherTrainerCantAcceptPkmn[];
 extern const u8 gText_CantTradeWithTrainer[];
 
+// trade
+extern const u8 gText_XWillBeSentToY[];
+extern const u8 gText_ByeByeVar1[];
+extern const u8 gText_XSentOverY[];
+extern const u8 gText_TakeGoodCareOfX[];
+extern const u8 gText_CommunicationStandby5[];
+
 #endif //GUARD_STRINGS_H
diff --git a/include/trade.h b/include/trade.h
index e3c18bffd..95a10cacf 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -12,8 +12,12 @@
 s32 sub_807A728(void);
 void sub_80773AC(void);
 void sub_807AE50(void);
-int sub_807A8D0(u32 /* probably wrong */, u16, u16, u8);
-int sub_807A7E0(u32 /* probably wrong */, u32 /* probably wrong */, u16, u16, u16, u16, u8);
+int sub_807A8D0(struct UnkLinkRfuStruct_02022B14Substruct a0, u16, u16, u8);
+int sub_807A7E0(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 a2, u16 a3, u8 a4, u16 a5, u8 a6);
 int sub_807A918(struct Pokemon*, u16);
+void sub_807B140(void);
+void sub_807B154(void);
+void sub_807F19C(void);
+void sub_807F1A8(u8, const u8 *, u8);
 
 #endif //GUARD_TRADE_H
diff --git a/include/trainer_card.h b/include/trainer_card.h
index d80a5fa52..1af247d8a 100644
--- a/include/trainer_card.h
+++ b/include/trainer_card.h
@@ -38,5 +38,6 @@ void sub_80C3120(struct TrainerCard *arg0, u16 *arg1, u8 gameVersion);
 void TrainerCard_ShowLinkCard(u8 arg0, void (*callback)(void));
 void TrainerCard_GenerateCardForPlayer(struct TrainerCard *);
 u8 sub_80C4904(u8);
+void sub_80C6D80(const u8 *, u8 *, u8, u8, u8);
 
 #endif // GUARD_TRAINER_CARD_H
diff --git a/include/util.h b/include/util.h
index 997c8f713..9d13453c2 100644
--- a/include/util.h
+++ b/include/util.h
@@ -14,5 +14,6 @@ u16 CalcCRC16(u8 *data, s32 length);
 u16 CalcCRC16WithTable(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 scrX, s16 scrY, s16 sx, s16 sy, u16 alpha);
 
 #endif // GUARD_UTIL_H