More trade doc, fix switch indentations

This commit is contained in:
GriffinR 2019-10-09 09:55:06 -04:00
parent 2c062dc764
commit 32aa87c7e1
4 changed files with 1871 additions and 1864 deletions

View File

@ -21,6 +21,8 @@
#define CANCEL_TRADE 2
#define WANTS_TO_TRADE 1
#define WANTS_TO_CANCEL 2
#define READY_FINISH_TRADE 1
#define FINISH_TRADE 2
// Return values for CanTradeSelectedMon
#define CAN_TRADE_MON 0

View File

@ -60,13 +60,13 @@
#define LINKCMD_0xAAAA 0xAAAA
#define LINKCMD_0xAAAB 0xAAAB
#define LINKCMD_READY_TO_TRADE 0xAABB // used in trade
#define LINKCMD_0xABCD 0xABCD // used in trade
#define LINKCMD_READY_FINISH_TRADE 0xABCD // used in trade
#define LINKCMD_INIT_BLOCK 0xBBBB
#define LINKCMD_SET_CANCEL_TRADE 0xBBCC // used in trade
#define LINKCMD_SEND_HELD_KEYS_2 0xCAFE
#define LINKCMD_0xCCCC 0xCCCC
#define LINKCMD_START_TRADE 0xCCDD // all below linkcmds used in trade
#define LINKCMD_0xDCBA 0xDCBA
#define LINKCMD_CONFIRM_FINISH_TRADE 0xDCBA
#define LINKCMD_SET_MONS_TO_TRADE 0xDDDD
#define LINKCMD_0xDDEE 0xDDEE
#define LINKCMD_REQUEST_CANCEL 0xEEAA

View File

@ -825,7 +825,7 @@ static const struct SpriteSheet sGlow2SpriteSheet =
.tag = 5552
};
static const struct SpriteTemplate gSpriteTemplate_8338DC8 =
static const struct SpriteTemplate sGlowBallSpriteTemplate =
{
.tileTag = 5552,
.paletteTag = 5551,
@ -1156,7 +1156,7 @@ static const s8 sTradeBallVerticalVelocityTable[] =
1, 1, 2, 3
};
static const u8 gUnknown_08339090[][2] =
static const u8 sWirelessSignalTiming[][2] =
{
{0, 1},
{1, 1},
@ -1190,6 +1190,6 @@ static const u8 gUnknown_08339090[][2] =
{13, 4},
{14, 5},
{16, 1},
{16, -1},
{16, 255},
{0, 0}
};

File diff suppressed because it is too large Load Diff