dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Review comments and documentation

Browse Source
This commit is contained in:
PikalaxALT
2019-10-30 21:06:15 -04:00
parent 71dbb00800
commit f86bb07027
21 changed files with 467 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_tower.s
+2 -2
View File
@@ -2832,7 +2832,7 @@ _080E6F68:
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080E6FB4 @ =gEnemyParty + 0x1f4 ldr r1, _080E6FB4 @ =gEnemyParty + 500 @ &gEnemyParty[5]
adds r0, r1 adds r0, r1
movs r1, 0x2C movs r1, 0x2C
muls r1, r4 muls r1, r4
@@ -2855,7 +2855,7 @@ _080E6FA4: .4byte gSaveBlock2Ptr
_080E6FA8: .4byte gSaveBlock1Ptr _080E6FA8: .4byte gSaveBlock1Ptr
_080E6FAC: .4byte 0x00002cac _080E6FAC: .4byte 0x00002cac
_080E6FB0: .4byte 0x0000056d _080E6FB0: .4byte 0x0000056d
_080E6FB4: .4byte gEnemyParty + 0x1f4 _080E6FB4: .4byte gEnemyParty + 500 @ &gEnemyParty[5]
thumb_func_end sub_80E6EE0 thumb_func_end sub_80E6EE0
thumb_func_start SaveBattleTowerProgress thumb_func_start SaveBattleTowerProgress
asm/cable_club.s
+2 -2
View File
@@ -2211,7 +2211,7 @@ _080818C4:
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080818D8 bne _080818D8
ldr r0, _080818E4 @ =sub_804C718 ldr r0, _080818E4 @ =CB2_ReturnFromLinkTrade
bl SetMainCallback2 bl SetMainCallback2
adds r0, r5, 0 adds r0, r5, 0
bl DestroyTask bl DestroyTask
@@ -2221,7 +2221,7 @@ _080818D8:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080818E0: .4byte gReceivedRemoteLinkPlayers _080818E0: .4byte gReceivedRemoteLinkPlayers
_080818E4: .4byte sub_804C718 _080818E4: .4byte CB2_ReturnFromLinkTrade
thumb_func_end sub_8081850 thumb_func_end sub_8081850
thumb_func_start sub_80818E8 thumb_func_start sub_80818E8
asm/evolution_scene.s
+1 -1
View File
@@ -738,7 +738,7 @@ _080CE3D8: .4byte nullsub_76
_080CE3DC: .4byte sub_80D00D8 _080CE3DC: .4byte sub_80D00D8
_080CE3E0: .4byte gMain _080CE3E0: .4byte gMain
_080CE3E4: _080CE3E4:
bl sub_80544FC bl LoadTradeAnimGfx
b _080CE4EC b _080CE4EC
_080CE3EA: _080CE3EA:
movs r0, 0x20 movs r0, 0x20
asm/link_rfu_3.s
+1 -1
View File
@@ -2939,7 +2939,7 @@ sub_8117100: @ 8117100
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
bl sub_804C718 bl CB2_ReturnFromLinkTrade
adds r0, r4, 0 adds r0, r4, 0
bl DestroyTask bl DestroyTask
pop {r4} pop {r4}
asm/party_menu.s
+10 -10
View File
@@ -3033,7 +3033,7 @@ _081201C0:
lsrs r6, r0, 29 lsrs r6, r0, 29
cmp r6, 0x3 cmp r6, 0x3
bne _081201F0 bne _081201F0
ldr r0, _081201EC @ =gPlayerParty + 0x12C ldr r0, _081201EC @ =gPlayerParty + 300 @ &gPlayerParty[3]
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
cmp r0, 0 cmp r0, 0
@@ -3042,12 +3042,12 @@ _081201C0:
b _08120290 b _08120290
.align 2, 0 .align 2, 0
_081201E8: .4byte gUnknown_203B09C _081201E8: .4byte gUnknown_203B09C
_081201EC: .4byte gPlayerParty + 0x12C _081201EC: .4byte gPlayerParty + 300 @ &gPlayerParty[3]
_081201F0: _081201F0:
ldr r0, _081201F4 @ =gPlayerParty + 0xC8 ldr r0, _081201F4 @ =gPlayerParty + 200 @ &gPlayerParty[2]
b _0812020C b _0812020C
.align 2, 0 .align 2, 0
_081201F4: .4byte gPlayerParty + 0xC8 _081201F4: .4byte gPlayerParty + 200 @ &gPlayerParty[2]
_081201F8: _081201F8:
cmp r0, 0x1 cmp r0, 0x1
bne _08120290 bne _08120290
@@ -3058,7 +3058,7 @@ _081201F8:
lsrs r5, r0, 29 lsrs r5, r0, 29
cmp r5, 0x5 cmp r5, 0x5
bne _08120224 bne _08120224
ldr r0, _08120220 @ =gPlayerParty + 0x1F4 ldr r0, _08120220 @ =gPlayerParty + 500 @ &gPlayerParty[5]
_0812020C: _0812020C:
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
@@ -3068,9 +3068,9 @@ _0812020C:
b _08120290 b _08120290
.align 2, 0 .align 2, 0
_0812021C: .4byte gUnknown_203B09C _0812021C: .4byte gUnknown_203B09C
_08120220: .4byte gPlayerParty + 0x1F4 _08120220: .4byte gPlayerParty + 500 @ &gPlayerParty[5]
_08120224: _08120224:
ldr r0, _08120234 @ =gPlayerParty + 0x190 ldr r0, _08120234 @ =gPlayerParty + 400 @ &gPlayerParty[4]
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
cmp r0, 0 cmp r0, 0
@@ -3078,7 +3078,7 @@ _08120224:
movs r0, 0x4 movs r0, 0x4
b _0812028E b _0812028E
.align 2, 0 .align 2, 0
_08120234: .4byte gPlayerParty + 0x190 _08120234: .4byte gPlayerParty + 400 @ &gPlayerParty[4]
_08120238: _08120238:
ldrb r1, [r4] ldrb r1, [r4]
subs r0, r1, 0x2 subs r0, r1, 0x2
@@ -18129,7 +18129,7 @@ _08127A80: .4byte sub_811FB28
sub_8127A84: @ 8127A84 sub_8127A84: @ 8127A84
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldr r0, _08127AA4 @ =gPlayerParty + 0x64 ldr r0, _08127AA4 @ =gPlayerParty + 100 @ &gPlayerParty[1]
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
cmp r0, 0 cmp r0, 0
@@ -18143,7 +18143,7 @@ _08127AA0:
movs r0, 0x7 movs r0, 0x7
b _08127ABA b _08127ABA
.align 2, 0 .align 2, 0
_08127AA4: .4byte gPlayerParty + 0x64 _08127AA4: .4byte gPlayerParty + 100 @ &gPlayerParty[1]
_08127AA8: _08127AA8:
ldr r0, _08127AB4 @ =gUnknown_203B0A0 ldr r0, _08127AB4 @ =gUnknown_203B0A0
ldrb r0, [r0, 0xB] ldrb r0, [r0, 0xB]
baserom.ips
BIN
View File
Binary file not shown.
data/graphics.s
+13 -13
View File
@@ -16214,26 +16214,26 @@ gUnknown_8E9CB9C:: @ 8E9CB9C
gUnknown_8E9CBBC:: @ 8E9CBBC gUnknown_8E9CBBC:: @ 8E9CBBC
.incbin "baserom.gba", 0xE9CBBC, 0x320 @UNKNOWN .incbin "baserom.gba", 0xE9CBBC, 0x320 @UNKNOWN
gUnknown_8E9CEDC:: @ 8E9CEDC gTradeMenu_Pal:: @ 8E9CEDC
.incbin "baserom.gba", 0xE9CEDC, 0x60 @UNKNOWN .incbin "graphics/trade/menu.gbapal"
gUnknown_8E9CF3C:: gTradeButtons_Pal:: @ E9CF3C
.incbin "baserom.gba", 0xE9CF3C, 0x20 @UNKNOWN .incbin "graphics/trade/unknown_DDB444.gbapal"
gUnknown_8E9CF5C:: @ 8E9CF5C gTradeMenu_Gfx:: @ 8E9CF5C
.incbin "baserom.gba", 0xE9CF5C, 0x1280 @UNKNOWN .incbin "graphics/trade/menu.4bpp"
gUnknown_8E9E1DC:: gTradeButtons_Gfx:: @ E9E1DC
.incbin "baserom.gba", 0xE9E1DC, 0x800 @UNKNOWN .incbin "graphics/trade/buttons.4bpp"
gUnknown_8E9E9DC:: gUnknown_8E9E9DC:: @ E9E9DC
.incbin "baserom.gba", 0xE9E9DC, 0x20 @UNKNOWN .incbin "graphics/unused/unused_DDCEE4.bin"
gUnknown_8E9E9FC:: @ 8E9E9FC gUnknown_8E9E9FC:: @ 8E9E9FC
.incbin "baserom.gba", 0xE9E9FC, 0x800 @UNKNOWN .incbin "graphics/trade/unknown_DDCF04.bin"
gUnknown_8E9F1FC:: @ 8E9F1FC gTradeMenuMonBox_Tilemap:: @ 8E9F1FC
.incbin "baserom.gba", 0xE9F1FC, 0x24 @UNKNOWN .incbin "graphics/trade/menu_mon_box.bin"
gFameCheckerBgPals:: @ 8E9F220 gFameCheckerBgPals:: @ 8E9F220
.incbin "data/graphics/fame_checker_bg.gbapal" .incbin "data/graphics/fame_checker_bg.gbapal"
graphics/trade/menu.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 608 B

After

Width:  |  Height:  |  Size: 609 B

graphics/trade/menu_mon_box.bin
BIN
View File
Binary file not shown.
graphics/trade/pokeball.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 464 B

graphics/trade/unknown_DDB444.pal
+19
View File
@@ -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
graphics/trade/unknown_DDCF04.bin
BIN
View File
Binary file not shown.
graphics/unused/unused_DDCEE4.bin
BIN
View File
Binary file not shown.
include/graphics.h
+5 -5
View File
@@ -4215,11 +4215,11 @@ extern const u8 gMonIcon_Unown_QuestionMark[];
extern const u8 gMonIcon_QuestionMark[]; extern const u8 gMonIcon_QuestionMark[];
// trade // trade
extern const u16 gUnknown_8E9CEDC[]; extern const u16 gTradeMenu_Pal[];
extern const u16 gUnknown_8E9CF3C[]; extern const u16 gTradeButtons_Pal[];
extern const u16 gUnknown_8E9CF5C[]; extern const u16 gTradeMenu_Gfx[];
extern const u16 gUnknown_8E9E9FC[]; extern const u16 gUnknown_8E9E9FC[];
extern const u16 gUnknown_8E9E1DC[]; extern const u16 gTradeButtons_Gfx[];
extern const u16 gUnknown_8E9F1FC[]; extern const u16 gTradeMenuMonBox_Tilemap[];
#endif //GUARD_GRAPHICS_H #endif //GUARD_GRAPHICS_H
include/pokemon_icon.h
+4 -4
View File
@@ -8,18 +8,18 @@ const u8 *GetMonIconTiles(u16 iconSpecies, bool32 extra);
const u16 *GetValidMonIconPalettePtr(u16 speciesId); const u16 *GetValidMonIconPalettePtr(u16 speciesId);
u16 sub_80D2E84(u16 speciesId); u16 sub_80D2E84(u16 speciesId);
void sub_80D2F68(u16 iconId); 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_80D2FF0(u16 iconId);
void sub_80D2EF8(struct Sprite *sprite); void sub_80D2EF8(struct Sprite * sprite);
void LoadMonIconPalettes(void); void LoadMonIconPalettes(void);
void FreeMonIconPalettes(void); void FreeMonIconPalettes(void);
u16 MailSpeciesToIconSpecies(u16); 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 *); void DestroyMonIcon(struct Sprite *);
u16 GetUnownLetterByPersonality(u32 personality); u16 GetUnownLetterByPersonality(u32 personality);
void SpriteCB_MonIcon(struct Sprite *); void SpriteCB_MonIcon(struct Sprite *);
u8 CreateMonIcon(u16 species, SpriteCallback callback, s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra); u8 CreateMonIcon(u16 species, SpriteCallback callback, s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra);
u8 UpdateMonIconFrame(struct Sprite *sprite); u8 UpdateMonIconFrame(struct Sprite * sprite);
void LoadMonIconPalette(u16 iconId); void LoadMonIconPalette(u16 iconId);
void FreeMonIconPalette(u16 iconId); void FreeMonIconPalette(u16 iconId);
void MonIcon_SetAnim(struct Sprite * sprite, u8 animNum); void MonIcon_SetAnim(struct Sprite * sprite, u8 animNum);
include/trade.h
+1 -1
View File
@@ -5,7 +5,7 @@ extern struct MailStruct gLinkPartnerMail[6];
extern u8 gSelectedTradeMonPositions[2]; extern u8 gSelectedTradeMonPositions[2];
extern const u16 gUnknown_826601C[]; extern const u16 gUnknown_826601C[];
void sub_804C718(void); void CB2_ReturnFromLinkTrade(void);
s32 sub_804FB34(void); s32 sub_804FB34(void);
#endif //GUARD_TRADE_H #endif //GUARD_TRADE_H
include/trade_scene.h
+1 -1
View File
@@ -9,7 +9,7 @@ u16 GetInGameTradeSpeciesInfo(void);
u16 GetTradeSpecies(void); u16 GetTradeSpecies(void);
void sub_805049C(void); void sub_805049C(void);
void sub_80504B0(void); void sub_80504B0(void);
void sub_80544FC(void); void LoadTradeAnimGfx(void);
extern const u16 gUnknown_826601C[]; extern const u16 gUnknown_826601C[];
extern const struct WindowTemplate gUnknown_826D1CC; extern const struct WindowTemplate gUnknown_826D1CC;
include/util.h
+1 -1
View File
@@ -14,7 +14,7 @@ void LoadWordFromTwoHalfwords(u16 *, u32 *);
int CountTrailingZeroBits(u32 value); int CountTrailingZeroBits(u32 value);
u16 CalcCRC16(const u8 *data, u32 length); u16 CalcCRC16(const u8 *data, u32 length);
u16 CalcCRC16WithTable(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 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); void DoBgAffineSet(struct BgAffineDstData * dest, u32 texX, u32 texY, s16 srcX, s16 srcY, s16 sx, s16 sy, u16 alpha);
src/data/ingame_trades.h
+2 -2
View File
@@ -1,4 +1,4 @@
const struct InGameTrade gInGameTrades[] = { static const struct InGameTrade sInGameTrades[] = {
{ {
.nickname = _("MIMIEN"), .nickname = _("MIMIEN"),
.species = SPECIES_MR_MIME, .species = SPECIES_MR_MIME,
@@ -129,7 +129,7 @@ const struct InGameTrade gInGameTrades[] = {
} }
}; };
const u16 sInGameTradeMailMessages[][10] = { static const u16 sInGameTradeMailMessages[][10] = {
{ {
EC_WORD_THAT_S, EC_WORD_THAT_S,
EC_WORD_A, EC_WORD_A,
src/trade.c
+100 -99
View File
@@ -130,7 +130,7 @@ static void TradeMenuAction_Summary(u8 taskId);
static void TradeMenuAction_Trade(u8 taskId); static void TradeMenuAction_Trade(u8 taskId);
static void ScheduleLinkTaskWithDelay(u16 delay, u8 kind); static void ScheduleLinkTaskWithDelay(u16 delay, u8 kind);
static void RunScheduledLinkTasks(void); static void RunScheduledLinkTasks(void);
static void PrintTradeErrorOrStatusMessage(u8 str_idx); static void PrintTradeErrorOrStatusMessage(u8 strIdx);
static bool8 sub_804F610(void); static bool8 sub_804F610(void);
static void RenderTextToVramViaBuffer(const u8 *name, u8 *a1, u8 unused); static void RenderTextToVramViaBuffer(const u8 *name, u8 *a1, u8 unused);
static void sub_804F748(u8 side); static void sub_804F748(u8 side);
@@ -150,10 +150,10 @@ static const size_t gUnknown_8260814[] = {
0x528 // unk 0x528 // unk
}; };
static const u16 gTradeMovesBoxTilemap[] = INCBIN_U16("graphics/trade/moves_box_map.bin"); static const u16 sTradeMovesBoxTilemap[] = INCBIN_U16("graphics/trade/moves_box_map.bin");
static const u16 gTradePartyBoxTilemap[] = INCBIN_U16("graphics/trade/party_box_map.bin"); static const u16 sTradePartyBoxTilemap[] = INCBIN_U16("graphics/trade/party_box_map.bin");
static const u8 gTradeStripesBG2Tilemap[] = INCBIN_U8("graphics/trade/stripes_bg2_map.bin"); static const u8 sTradeStripesBG2Tilemap[] = INCBIN_U8("graphics/trade/stripes_bg2_map.bin");
static const u8 gTradeStripesBG3Tilemap[] = INCBIN_U8("graphics/trade/stripes_bg3_map.bin"); static const u8 sTradeStripesBG3Tilemap[] = INCBIN_U8("graphics/trade/stripes_bg3_map.bin");
static const struct OamData gOamData_8261C30 = { static const struct OamData gOamData_8261C30 = {
.shape = SPRITE_SHAPE(32x16), .shape = SPRITE_SHAPE(32x16),
@@ -182,14 +182,14 @@ static const union AnimCmd *const gSpriteAnimTable_8261C50[] = {
gSpriteAnim_8261C48 gSpriteAnim_8261C48
}; };
static const struct SpriteSheet gUnknown_8261C58 = { static const struct SpriteSheet sTradeButtons_SpriteSheet = {
gUnknown_8E9E1DC, gTradeButtons_Gfx,
0x800, 0x800,
300 300
}; };
static const struct SpritePalette gUnknown_8261C60 = { static const struct SpritePalette sTradeButtons_SpritePal = {
gUnknown_8E9CF3C, gTradeButtons_Pal,
2345 2345
}; };
@@ -233,7 +233,7 @@ static const union AnimCmd *const gSpriteAnimTable_8261C98[] = {
gSpriteAnim_8261C90 gSpriteAnim_8261C90
}; };
static const struct SpriteTemplate gUnknown_8261CB0 = { static const struct SpriteTemplate sSpriteTemplate_TradeButtons = {
.tileTag = 300, .tileTag = 300,
.paletteTag = 2345, .paletteTag = 2345,
.oam = &gOamData_8261C38, .oam = &gOamData_8261C38,
@@ -242,7 +242,7 @@ static const struct SpriteTemplate gUnknown_8261CB0 = {
.callback = SpriteCallbackDummy .callback = SpriteCallbackDummy
}; };
static const struct SpriteTemplate gUnknown_8261CC8 = { static const struct SpriteTemplate sSpriteTemplate_Text = {
.tileTag = 200, .tileTag = 200,
.paletteTag = 4925, .paletteTag = 4925,
.oam = &gOamData_8261C30, .oam = &gOamData_8261C30,
@@ -251,10 +251,10 @@ static const struct SpriteTemplate gUnknown_8261CC8 = {
.callback = SpriteCallbackDummy .callback = SpriteCallbackDummy
}; };
static const u16 gUnknown_8261CE0[] = INCBIN_U16("graphics/trade/text.gbapal"); static const u16 sTradeTextPal[] = INCBIN_U16("graphics/trade/text.gbapal");
static const struct SpritePalette gUnknown_8261D00 = { static const struct SpritePalette sSpritePalette_Text = {
gUnknown_8261CE0, sTradeTextPal,
4925 4925
}; };
@@ -347,7 +347,7 @@ static const u8 sCursorMoveDestinations[][4][6] = {
} }
}; };
static const u8 gTradeMonSpriteCoords[][2] = { static const u8 sTradeMonSpriteCoords[][2] = {
{0x01, 0x05}, {0x01, 0x05},
{0x08, 0x05}, {0x08, 0x05},
{0x01, 0x0a}, {0x01, 0x0a},
@@ -365,6 +365,7 @@ static const u8 gTradeMonSpriteCoords[][2] = {
{0x17, 0x12}, {0x17, 0x12},
}; };
// No idea if a 4D array is correct
static const u8 gUnknown_8261E5A[][2][6][2] = { static const u8 gUnknown_8261E5A[][2][6][2] = {
{ {
{ {
@@ -401,7 +402,7 @@ static const u8 gUnknown_8261E5A[][2][6][2] = {
} }
}; };
static const u8 gTradeUnknownSpriteCoords[][4] = { static const u8 sTradeUnknownSpriteCoords[][4] = {
{0x3c, 0x09, 0xb4, 0x09}, {0x3c, 0x09, 0xb4, 0x09},
{0x30, 0x09, 0xa8, 0x09} {0x30, 0x09, 0xa8, 0x09}
}; };
@@ -719,7 +720,7 @@ static void sub_804C600(void)
} }
} }
void sub_804C718(void) void CB2_ReturnFromLinkTrade(void)
{ {
SetMainCallback2(sub_804C728); SetMainCallback2(sub_804C728);
} }
@@ -853,11 +854,11 @@ static void sub_804C728(void)
for (i = 0; i < sTradeMenuResourcesPtr->partyCounts[0]; i++) for (i = 0; i < sTradeMenuResourcesPtr->partyCounts[0]; i++)
{ {
struct Pokemon *mon = &gPlayerParty[i]; struct Pokemon * mon = &gPlayerParty[i];
sTradeMenuResourcesPtr->partyIcons[0][i] = CreateMonIcon(GetMonData(mon, MON_DATA_SPECIES2), sTradeMenuResourcesPtr->partyIcons[0][i] = CreateMonIcon(GetMonData(mon, MON_DATA_SPECIES2),
SpriteCB_MonIcon, SpriteCB_MonIcon,
(gTradeMonSpriteCoords[i][0] * 8) + 14, (sTradeMonSpriteCoords[i][0] * 8) + 14,
(gTradeMonSpriteCoords[i][1] * 8) - 12, (sTradeMonSpriteCoords[i][1] * 8) - 12,
1, 1,
GetMonData(mon, MON_DATA_PERSONALITY), GetMonData(mon, MON_DATA_PERSONALITY),
TRUE); TRUE);
@@ -865,11 +866,11 @@ static void sub_804C728(void)
for (i = 0; i < sTradeMenuResourcesPtr->partyCounts[1]; i++) for (i = 0; i < sTradeMenuResourcesPtr->partyCounts[1]; i++)
{ {
struct Pokemon *mon = &gEnemyParty[i]; struct Pokemon * mon = &gEnemyParty[i];
sTradeMenuResourcesPtr->partyIcons[1][i] = CreateMonIcon(GetMonData(mon, MON_DATA_SPECIES2, NULL), sTradeMenuResourcesPtr->partyIcons[1][i] = CreateMonIcon(GetMonData(mon, MON_DATA_SPECIES2, NULL),
SpriteCB_MonIcon, SpriteCB_MonIcon,
(gTradeMonSpriteCoords[i + PARTY_SIZE][0] * 8) + 14, (sTradeMonSpriteCoords[i + PARTY_SIZE][0] * 8) + 14,
(gTradeMonSpriteCoords[i + PARTY_SIZE][1] * 8) - 12, (sTradeMonSpriteCoords[i + PARTY_SIZE][1] * 8) - 12,
1, 1,
GetMonData(mon, MON_DATA_PERSONALITY), GetMonData(mon, MON_DATA_PERSONALITY),
FALSE); FALSE);
@@ -903,9 +904,9 @@ static void sub_804C728(void)
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
temp = gUnknown_8261CC8; temp = sSpriteTemplate_Text;
temp.tileTag += i; temp.tileTag += i;
CreateSprite(&temp, xPos + gTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][0] + (i * 32), gTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][1], 1); CreateSprite(&temp, xPos + sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][0] + (i * 32), sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][1], 1);
} }
/* /*
@@ -918,28 +919,28 @@ static void sub_804C728(void)
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
temp = gUnknown_8261CC8; temp = sSpriteTemplate_Text;
temp.tileTag += i + 3; temp.tileTag += i + 3;
CreateSprite(&temp, xPos + gTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][2] + (i * 32), gTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][3], 1); CreateSprite(&temp, xPos + sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][2] + (i * 32), sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][3], 1);
} }
gMain.state++; gMain.state++;
break; break;
case 13: case 13:
temp = gUnknown_8261CC8; temp = sSpriteTemplate_Text;
temp.tileTag += 6; temp.tileTag += 6;
CreateSprite(&temp, 215, 151, 1); CreateSprite(&temp, 215, 151, 1);
temp = gUnknown_8261CC8; temp = sSpriteTemplate_Text;
temp.tileTag += 7; temp.tileTag += 7;
CreateSprite(&temp, 247, 151, 1); CreateSprite(&temp, 247, 151, 1);
for (i = 0; i < PARTY_SIZE; i++) for (i = 0; i < PARTY_SIZE; i++)
{ {
temp = gUnknown_8261CC8; temp = sSpriteTemplate_Text;
temp.tileTag += i + 8; temp.tileTag += i + 8;
CreateSprite(&temp, (i * 32) + 24, 150, 1); CreateSprite(&temp, (i * 32) + 24, 150, 1);
} }
sTradeMenuResourcesPtr->tradeMenuCursorSpriteIdx = CreateSprite(&gUnknown_8261CB0, gTradeMonSpriteCoords[0][0] * 8 + 32, gTradeMonSpriteCoords[0][1] * 8, 2); sTradeMenuResourcesPtr->tradeMenuCursorSpriteIdx = CreateSprite(&sSpriteTemplate_TradeButtons, sTradeMonSpriteCoords[0][0] * 8 + 32, sTradeMonSpriteCoords[0][1] * 8, 2);
sTradeMenuResourcesPtr->tradeMenuCursorPosition = 0; sTradeMenuResourcesPtr->tradeMenuCursorPosition = 0;
gMain.state++; gMain.state++;
rbox_fill_rectangle(0); rbox_fill_rectangle(0);
@@ -1353,7 +1354,7 @@ static void sub_804C728(void)
"\tcmp r6, r0\n" "\tcmp r6, r0\n"
"\tbge _0804CAA8\n" "\tbge _0804CAA8\n"
"\tmov r8, r2\n" "\tmov r8, r2\n"
"\tldr r7, _0804CB38 @ =gTradeMonSpriteCoords\n" "\tldr r7, _0804CB38 @ =sTradeMonSpriteCoords\n"
"_0804CA4A:\n" "_0804CA4A:\n"
"\tmovs r0, 0x64\n" "\tmovs r0, 0x64\n"
"\tadds r4, r6, 0\n" "\tadds r4, r6, 0\n"
@@ -1407,7 +1408,7 @@ static void sub_804C728(void)
"\tldrb r0, [r0]\n" "\tldrb r0, [r0]\n"
"\tcmp r6, r0\n" "\tcmp r6, r0\n"
"\tbge _0804CB20\n" "\tbge _0804CB20\n"
"\tldr r0, _0804CB38 @ =gTradeMonSpriteCoords\n" "\tldr r0, _0804CB38 @ =sTradeMonSpriteCoords\n"
"\tmov r8, r1\n" "\tmov r8, r1\n"
"\tadds r7, r0, 0\n" "\tadds r7, r0, 0\n"
"\tadds r7, 0xC\n" "\tadds r7, 0xC\n"
@@ -1468,7 +1469,7 @@ static void sub_804C728(void)
"_0804CB2C: .4byte sTradeMenuResourcesPtr\n" "_0804CB2C: .4byte sTradeMenuResourcesPtr\n"
"_0804CB30: .4byte gPlayerPartyCount\n" "_0804CB30: .4byte gPlayerPartyCount\n"
"_0804CB34: .4byte gEnemyPartyCount\n" "_0804CB34: .4byte gEnemyPartyCount\n"
"_0804CB38: .4byte gTradeMonSpriteCoords\n" "_0804CB38: .4byte sTradeMonSpriteCoords\n"
"_0804CB3C: .4byte gPlayerParty\n" "_0804CB3C: .4byte gPlayerParty\n"
"_0804CB40: .4byte 0xfff40000\n" "_0804CB40: .4byte 0xfff40000\n"
"_0804CB44: .4byte SpriteCB_MonIcon\n" "_0804CB44: .4byte SpriteCB_MonIcon\n"
@@ -1591,14 +1592,14 @@ static void sub_804C728(void)
"\tadds r0, r1\n" "\tadds r0, r1\n"
"\tmovs r6, 0\n" "\tmovs r6, 0\n"
"\tadd r5, sp, 0x10\n" "\tadd r5, sp, 0x10\n"
"\tldr r3, _0804CD00 @ =gTradeUnknownSpriteCoords\n" "\tldr r3, _0804CD00 @ =sTradeUnknownSpriteCoords\n"
"\tmov r8, r3\n" "\tmov r8, r3\n"
"\tasrs r0, 1\n" "\tasrs r0, 1\n"
"\tldrb r7, [r3, 0x4]\n" "\tldrb r7, [r3, 0x4]\n"
"\tadds r4, r0, r7\n" "\tadds r4, r0, r7\n"
"_0804CC62:\n" "_0804CC62:\n"
"\tadd r1, sp, 0x10\n" "\tadd r1, sp, 0x10\n"
"\tldr r0, _0804CD04 @ =gUnknown_8261CC8\n" "\tldr r0, _0804CD04 @ =sSpriteTemplate_Text\n"
"\tldm r0!, {r2,r3,r7}\n" "\tldm r0!, {r2,r3,r7}\n"
"\tstm r1!, {r2,r3,r7}\n" "\tstm r1!, {r2,r3,r7}\n"
"\tldm r0!, {r2,r3,r7}\n" "\tldm r0!, {r2,r3,r7}\n"
@@ -1638,7 +1639,7 @@ static void sub_804C728(void)
"\tadds r0, r1\n" "\tadds r0, r1\n"
"\tmovs r6, 0\n" "\tmovs r6, 0\n"
"\tadd r5, sp, 0x10\n" "\tadd r5, sp, 0x10\n"
"\tldr r7, _0804CD00 @ =gTradeUnknownSpriteCoords\n" "\tldr r7, _0804CD00 @ =sTradeUnknownSpriteCoords\n"
"\tmov r8, r7\n" "\tmov r8, r7\n"
"\tasrs r0, 1\n" "\tasrs r0, 1\n"
"\tmov r1, r8\n" "\tmov r1, r8\n"
@@ -1646,7 +1647,7 @@ static void sub_804C728(void)
"\tadds r4, r0, r1\n" "\tadds r4, r0, r1\n"
"_0804CCC6:\n" "_0804CCC6:\n"
"\tadd r1, sp, 0x10\n" "\tadd r1, sp, 0x10\n"
"\tldr r0, _0804CD04 @ =gUnknown_8261CC8\n" "\tldr r0, _0804CD04 @ =sSpriteTemplate_Text\n"
"\tldm r0!, {r2,r3,r7}\n" "\tldm r0!, {r2,r3,r7}\n"
"\tstm r1!, {r2,r3,r7}\n" "\tstm r1!, {r2,r3,r7}\n"
"\tldm r0!, {r2,r3,r7}\n" "\tldm r0!, {r2,r3,r7}\n"
@@ -1673,12 +1674,12 @@ static void sub_804C728(void)
"\tb _0804CEC2\n" "\tb _0804CEC2\n"
"\t.align 2, 0\n" "\t.align 2, 0\n"
"_0804CCFC: .4byte gSaveBlock2Ptr\n" "_0804CCFC: .4byte gSaveBlock2Ptr\n"
"_0804CD00: .4byte gTradeUnknownSpriteCoords\n" "_0804CD00: .4byte sTradeUnknownSpriteCoords\n"
"_0804CD04: .4byte gUnknown_8261CC8\n" "_0804CD04: .4byte sSpriteTemplate_Text\n"
"_0804CD08: .4byte gLinkPlayers + 8\n" "_0804CD08: .4byte gLinkPlayers + 8\n"
"_0804CD0C: .4byte gMain\n" "_0804CD0C: .4byte gMain\n"
"_0804CD10:\n" "_0804CD10:\n"
"\tldr r4, _0804CDCC @ =gUnknown_8261CC8\n" "\tldr r4, _0804CDCC @ =sSpriteTemplate_Text\n"
"\tadd r1, sp, 0x10\n" "\tadd r1, sp, 0x10\n"
"\tadds r0, r4, 0\n" "\tadds r0, r4, 0\n"
"\tldm r0!, {r2,r3,r7}\n" "\tldm r0!, {r2,r3,r7}\n"
@@ -1716,7 +1717,7 @@ static void sub_804C728(void)
"\tlsls r5, 13\n" "\tlsls r5, 13\n"
"_0804CD5C:\n" "_0804CD5C:\n"
"\tadd r1, sp, 0x10\n" "\tadd r1, sp, 0x10\n"
"\tldr r0, _0804CDCC @ =gUnknown_8261CC8\n" "\tldr r0, _0804CDCC @ =sSpriteTemplate_Text\n"
"\tldm r0!, {r2,r3,r7}\n" "\tldm r0!, {r2,r3,r7}\n"
"\tstm r1!, {r2,r3,r7}\n" "\tstm r1!, {r2,r3,r7}\n"
"\tldm r0!, {r2,r3,r7}\n" "\tldm r0!, {r2,r3,r7}\n"
@@ -1737,8 +1738,8 @@ static void sub_804C728(void)
"\tadds r6, 0x1\n" "\tadds r6, 0x1\n"
"\tcmp r6, 0x5\n" "\tcmp r6, 0x5\n"
"\tble _0804CD5C\n" "\tble _0804CD5C\n"
"\tldr r0, _0804CDD0 @ =gUnknown_8261CB0\n" "\tldr r0, _0804CDD0 @ =sSpriteTemplate_TradeButtons\n"
"\tldr r2, _0804CDD4 @ =gTradeMonSpriteCoords\n" "\tldr r2, _0804CDD4 @ =sTradeMonSpriteCoords\n"
"\tldrb r1, [r2]\n" "\tldrb r1, [r2]\n"
"\tlsls r1, 19\n" "\tlsls r1, 19\n"
"\tmovs r3, 0x80\n" "\tmovs r3, 0x80\n"
@@ -1768,9 +1769,9 @@ static void sub_804C728(void)
"\tbl rbox_fill_rectangle\n" "\tbl rbox_fill_rectangle\n"
"\tb _0804CEE6\n" "\tb _0804CEE6\n"
"\t.align 2, 0\n" "\t.align 2, 0\n"
"_0804CDCC: .4byte gUnknown_8261CC8\n" "_0804CDCC: .4byte sSpriteTemplate_Text\n"
"_0804CDD0: .4byte gUnknown_8261CB0\n" "_0804CDD0: .4byte sSpriteTemplate_TradeButtons\n"
"_0804CDD4: .4byte gTradeMonSpriteCoords\n" "_0804CDD4: .4byte sTradeMonSpriteCoords\n"
"_0804CDD8: .4byte sTradeMenuResourcesPtr\n" "_0804CDD8: .4byte sTradeMenuResourcesPtr\n"
"_0804CDDC: .4byte gMain\n" "_0804CDDC: .4byte gMain\n"
"_0804CDE0:\n" "_0804CDE0:\n"
@@ -1965,8 +1966,8 @@ void sub_804CF14(void)
sTradeMenuResourcesPtr->partyIcons[0][i] = CreateMonIcon( sTradeMenuResourcesPtr->partyIcons[0][i] = CreateMonIcon(
GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL), GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL),
SpriteCB_MonIcon, SpriteCB_MonIcon,
gTradeMonSpriteCoords[i][0] * 8 + 14, sTradeMonSpriteCoords[i][0] * 8 + 14,
gTradeMonSpriteCoords[i][1] * 8 - 12, sTradeMonSpriteCoords[i][1] * 8 - 12,
1, 1,
GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY), GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY),
TRUE TRUE
@@ -1977,8 +1978,8 @@ void sub_804CF14(void)
sTradeMenuResourcesPtr->partyIcons[1][i] = CreateMonIcon( sTradeMenuResourcesPtr->partyIcons[1][i] = CreateMonIcon(
GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2, NULL), GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2, NULL),
SpriteCB_MonIcon, SpriteCB_MonIcon,
gTradeMonSpriteCoords[i + 6][0] * 8 + 14, sTradeMonSpriteCoords[i + 6][0] * 8 + 14,
gTradeMonSpriteCoords[i + 6][1] * 8 - 12, sTradeMonSpriteCoords[i + 6][1] * 8 - 12,
1, 1,
GetMonData(&gEnemyParty[i], MON_DATA_PERSONALITY), GetMonData(&gEnemyParty[i], MON_DATA_PERSONALITY),
FALSE FALSE
@@ -2015,9 +2016,9 @@ void sub_804CF14(void)
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
temp = gUnknown_8261CC8; temp = sSpriteTemplate_Text;
temp.tileTag += i; temp.tileTag += i;
CreateSprite(&temp, xPos + gTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][0] + (i * 32), gTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][1], 1); CreateSprite(&temp, xPos + sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][0] + (i * 32), sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][1], 1);
} }
/* /*
@@ -2030,23 +2031,23 @@ void sub_804CF14(void)
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
temp = gUnknown_8261CC8; temp = sSpriteTemplate_Text;
temp.tileTag += i + 3; temp.tileTag += i + 3;
CreateSprite(&temp, xPos + gTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][2] + (i * 32), gTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][3], 1); CreateSprite(&temp, xPos + sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][2] + (i * 32), sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][3], 1);
} }
gMain.state++; gMain.state++;
break; break;
case 13: case 13:
temp = gUnknown_8261CC8; temp = sSpriteTemplate_Text;
temp.tileTag += 6; temp.tileTag += 6;
CreateSprite(&temp, 215, 151, 1); CreateSprite(&temp, 215, 151, 1);
temp = gUnknown_8261CC8; temp = sSpriteTemplate_Text;
temp.tileTag += 7; temp.tileTag += 7;
CreateSprite(&temp, 247, 151, 1); CreateSprite(&temp, 247, 151, 1);
for (i = 0; i < PARTY_SIZE; i++) for (i = 0; i < PARTY_SIZE; i++)
{ {
temp = gUnknown_8261CC8; temp = sSpriteTemplate_Text;
temp.tileTag += i + 8; temp.tileTag += i + 8;
CreateSprite(&temp, (i * 32) + 24, 150, 1); CreateSprite(&temp, (i * 32) + 24, 150, 1);
} }
@@ -2056,7 +2057,7 @@ void sub_804CF14(void)
else else
sTradeMenuResourcesPtr->tradeMenuCursorPosition = sub_8138B20() + 6; sTradeMenuResourcesPtr->tradeMenuCursorPosition = sub_8138B20() + 6;
sTradeMenuResourcesPtr->tradeMenuCursorSpriteIdx = CreateSprite(&gUnknown_8261CB0, gTradeMonSpriteCoords[sTradeMenuResourcesPtr->tradeMenuCursorPosition][0] * 8 + 32, gTradeMonSpriteCoords[sTradeMenuResourcesPtr->tradeMenuCursorPosition][1] * 8, 2); sTradeMenuResourcesPtr->tradeMenuCursorSpriteIdx = CreateSprite(&sSpriteTemplate_TradeButtons, sTradeMonSpriteCoords[sTradeMenuResourcesPtr->tradeMenuCursorPosition][0] * 8 + 32, sTradeMonSpriteCoords[sTradeMenuResourcesPtr->tradeMenuCursorPosition][1] * 8, 2);
gMain.state = 16; gMain.state = 16;
break; break;
case 16: case 16:
@@ -2234,7 +2235,7 @@ void sub_804CF14(void)
"\tcmp r6, r0\n" "\tcmp r6, r0\n"
"\tbge _0804D0A8\n" "\tbge _0804D0A8\n"
"\tmov r8, r4\n" "\tmov r8, r4\n"
"\tldr r7, _0804D138 @ =gTradeMonSpriteCoords\n" "\tldr r7, _0804D138 @ =sTradeMonSpriteCoords\n"
"_0804D048:\n" "_0804D048:\n"
"\tmovs r0, 0x64\n" "\tmovs r0, 0x64\n"
"\tadds r4, r6, 0\n" "\tadds r4, r6, 0\n"
@@ -2289,7 +2290,7 @@ void sub_804CF14(void)
"\tldrb r0, [r0]\n" "\tldrb r0, [r0]\n"
"\tcmp r6, r0\n" "\tcmp r6, r0\n"
"\tbge _0804D120\n" "\tbge _0804D120\n"
"\tldr r0, _0804D138 @ =gTradeMonSpriteCoords\n" "\tldr r0, _0804D138 @ =sTradeMonSpriteCoords\n"
"\tmov r8, r1\n" "\tmov r8, r1\n"
"\tadds r7, r0, 0\n" "\tadds r7, r0, 0\n"
"\tadds r7, 0xC\n" "\tadds r7, 0xC\n"
@@ -2350,7 +2351,7 @@ void sub_804CF14(void)
"_0804D12C: .4byte sTradeMenuResourcesPtr\n" "_0804D12C: .4byte sTradeMenuResourcesPtr\n"
"_0804D130: .4byte gPlayerPartyCount\n" "_0804D130: .4byte gPlayerPartyCount\n"
"_0804D134: .4byte gEnemyPartyCount\n" "_0804D134: .4byte gEnemyPartyCount\n"
"_0804D138: .4byte gTradeMonSpriteCoords\n" "_0804D138: .4byte sTradeMonSpriteCoords\n"
"_0804D13C: .4byte gPlayerParty\n" "_0804D13C: .4byte gPlayerParty\n"
"_0804D140: .4byte 0xfff40000\n" "_0804D140: .4byte 0xfff40000\n"
"_0804D144: .4byte SpriteCB_MonIcon\n" "_0804D144: .4byte SpriteCB_MonIcon\n"
@@ -2480,14 +2481,14 @@ void sub_804CF14(void)
"\tadds r0, r1\n" "\tadds r0, r1\n"
"\tmovs r6, 0\n" "\tmovs r6, 0\n"
"\tadd r5, sp, 0xC\n" "\tadd r5, sp, 0xC\n"
"\tldr r3, _0804D310 @ =gTradeUnknownSpriteCoords\n" "\tldr r3, _0804D310 @ =sTradeUnknownSpriteCoords\n"
"\tmov r8, r3\n" "\tmov r8, r3\n"
"\tasrs r0, 1\n" "\tasrs r0, 1\n"
"\tldrb r7, [r3, 0x4]\n" "\tldrb r7, [r3, 0x4]\n"
"\tadds r4, r0, r7\n" "\tadds r4, r0, r7\n"
"_0804D270:\n" "_0804D270:\n"
"\tadd r1, sp, 0xC\n" "\tadd r1, sp, 0xC\n"
"\tldr r0, _0804D314 @ =gUnknown_8261CC8\n" "\tldr r0, _0804D314 @ =sSpriteTemplate_Text\n"
"\tldm r0!, {r2,r3,r7}\n" "\tldm r0!, {r2,r3,r7}\n"
"\tstm r1!, {r2,r3,r7}\n" "\tstm r1!, {r2,r3,r7}\n"
"\tldm r0!, {r2,r3,r7}\n" "\tldm r0!, {r2,r3,r7}\n"
@@ -2527,7 +2528,7 @@ void sub_804CF14(void)
"\tadds r0, r1\n" "\tadds r0, r1\n"
"\tmovs r6, 0\n" "\tmovs r6, 0\n"
"\tadd r5, sp, 0xC\n" "\tadd r5, sp, 0xC\n"
"\tldr r7, _0804D310 @ =gTradeUnknownSpriteCoords\n" "\tldr r7, _0804D310 @ =sTradeUnknownSpriteCoords\n"
"\tmov r8, r7\n" "\tmov r8, r7\n"
"\tasrs r0, 1\n" "\tasrs r0, 1\n"
"\tmov r1, r8\n" "\tmov r1, r8\n"
@@ -2535,7 +2536,7 @@ void sub_804CF14(void)
"\tadds r4, r0, r1\n" "\tadds r4, r0, r1\n"
"_0804D2D4:\n" "_0804D2D4:\n"
"\tadd r1, sp, 0xC\n" "\tadd r1, sp, 0xC\n"
"\tldr r0, _0804D314 @ =gUnknown_8261CC8\n" "\tldr r0, _0804D314 @ =sSpriteTemplate_Text\n"
"\tldm r0!, {r2,r3,r7}\n" "\tldm r0!, {r2,r3,r7}\n"
"\tstm r1!, {r2,r3,r7}\n" "\tstm r1!, {r2,r3,r7}\n"
"\tldm r0!, {r2,r3,r7}\n" "\tldm r0!, {r2,r3,r7}\n"
@@ -2562,12 +2563,12 @@ void sub_804CF14(void)
"\tb _0804D4B4\n" "\tb _0804D4B4\n"
"\t.align 2, 0\n" "\t.align 2, 0\n"
"_0804D30C: .4byte gSaveBlock2Ptr\n" "_0804D30C: .4byte gSaveBlock2Ptr\n"
"_0804D310: .4byte gTradeUnknownSpriteCoords\n" "_0804D310: .4byte sTradeUnknownSpriteCoords\n"
"_0804D314: .4byte gUnknown_8261CC8\n" "_0804D314: .4byte sSpriteTemplate_Text\n"
"_0804D318: .4byte gLinkPlayers + 8\n" "_0804D318: .4byte gLinkPlayers + 8\n"
"_0804D31C: .4byte gMain\n" "_0804D31C: .4byte gMain\n"
"_0804D320:\n" "_0804D320:\n"
"\tldr r4, _0804D3B0 @ =gUnknown_8261CC8\n" "\tldr r4, _0804D3B0 @ =sSpriteTemplate_Text\n"
"\tadd r1, sp, 0xC\n" "\tadd r1, sp, 0xC\n"
"\tadds r0, r4, 0\n" "\tadds r0, r4, 0\n"
"\tldm r0!, {r2,r3,r7}\n" "\tldm r0!, {r2,r3,r7}\n"
@@ -2605,7 +2606,7 @@ void sub_804CF14(void)
"\tlsls r5, 13\n" "\tlsls r5, 13\n"
"_0804D36C:\n" "_0804D36C:\n"
"\tadd r1, sp, 0xC\n" "\tadd r1, sp, 0xC\n"
"\tldr r0, _0804D3B0 @ =gUnknown_8261CC8\n" "\tldr r0, _0804D3B0 @ =sSpriteTemplate_Text\n"
"\tldm r0!, {r2,r3,r7}\n" "\tldm r0!, {r2,r3,r7}\n"
"\tstm r1!, {r2,r3,r7}\n" "\tstm r1!, {r2,r3,r7}\n"
"\tldm r0!, {r2,r3,r7}\n" "\tldm r0!, {r2,r3,r7}\n"
@@ -2636,7 +2637,7 @@ void sub_804CF14(void)
"\tldr r1, [r4]\n" "\tldr r1, [r4]\n"
"\tb _0804D3C0\n" "\tb _0804D3C0\n"
"\t.align 2, 0\n" "\t.align 2, 0\n"
"_0804D3B0: .4byte gUnknown_8261CC8\n" "_0804D3B0: .4byte sSpriteTemplate_Text\n"
"_0804D3B4: .4byte sTradeMenuResourcesPtr\n" "_0804D3B4: .4byte sTradeMenuResourcesPtr\n"
"_0804D3B8:\n" "_0804D3B8:\n"
"\tbl sub_8138B20\n" "\tbl sub_8138B20\n"
@@ -2645,8 +2646,8 @@ void sub_804CF14(void)
"_0804D3C0:\n" "_0804D3C0:\n"
"\tadds r1, 0x35\n" "\tadds r1, 0x35\n"
"\tstrb r0, [r1]\n" "\tstrb r0, [r1]\n"
"\tldr r0, _0804D404 @ =gUnknown_8261CB0\n" "\tldr r0, _0804D404 @ =sSpriteTemplate_TradeButtons\n"
"\tldr r3, _0804D408 @ =gTradeMonSpriteCoords\n" "\tldr r3, _0804D408 @ =sTradeMonSpriteCoords\n"
"\tldr r4, _0804D40C @ =sTradeMenuResourcesPtr\n" "\tldr r4, _0804D40C @ =sTradeMenuResourcesPtr\n"
"\tldr r1, [r4]\n" "\tldr r1, [r4]\n"
"\tadds r1, 0x35\n" "\tadds r1, 0x35\n"
@@ -2676,8 +2677,8 @@ void sub_804CF14(void)
"\tstrb r1, [r0]\n" "\tstrb r1, [r0]\n"
"\tb _0804D4D2\n" "\tb _0804D4D2\n"
"\t.align 2, 0\n" "\t.align 2, 0\n"
"_0804D404: .4byte gUnknown_8261CB0\n" "_0804D404: .4byte sSpriteTemplate_TradeButtons\n"
"_0804D408: .4byte gTradeMonSpriteCoords\n" "_0804D408: .4byte sTradeMonSpriteCoords\n"
"_0804D40C: .4byte sTradeMenuResourcesPtr\n" "_0804D40C: .4byte sTradeMenuResourcesPtr\n"
"_0804D410: .4byte gMain\n" "_0804D410: .4byte gMain\n"
"_0804D414:\n" "_0804D414:\n"
@@ -2824,7 +2825,7 @@ static void sub_804D548(void)
static void sub_804D5A4(void) static void sub_804D5A4(void)
{ {
gMain.savedCallback = sub_804C718; gMain.savedCallback = CB2_ReturnFromLinkTrade;
if (gWirelessCommType != 0) if (gWirelessCommType != 0)
{ {
if (IsLinkRfuTaskFinished()) if (IsLinkRfuTaskFinished())
@@ -2872,13 +2873,13 @@ static void sub_804D694(u8 state)
switch (state) switch (state)
{ {
case 0: case 0:
LoadPalette(gUnknown_8E9CEDC, 0x00, 0x60); LoadPalette(gTradeMenu_Pal, 0x00, 0x60);
LoadBgTiles(1, gUnknown_8E9CF5C, 0x1280, 0); LoadBgTiles(1, gTradeMenu_Gfx, 0x1280, 0);
CopyToBgTilemapBufferRect_ChangePalette(1, gUnknown_8E9E9FC, 0, 0, 32, 20, 0); CopyToBgTilemapBufferRect_ChangePalette(1, gUnknown_8E9E9FC, 0, 0, 32, 20, 0);
LoadBgTilemap(2, gTradeStripesBG2Tilemap, 0x800, 0); LoadBgTilemap(2, sTradeStripesBG2Tilemap, 0x800, 0);
break; break;
case 1: case 1:
LoadBgTilemap(3, gTradeStripesBG3Tilemap, 0x800, 0); LoadBgTilemap(3, sTradeStripesBG3Tilemap, 0x800, 0);
sub_804F284(0); sub_804F284(0);
sub_804F284(1); sub_804F284(1);
CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(1);
@@ -2937,7 +2938,7 @@ static bool8 shedinja_maker_maybe(void)
{ {
u8 id = GetMultiplayerId(); u8 id = GetMultiplayerId();
int i; int i;
struct Pokemon *mon; struct Pokemon * mon;
switch (sTradeMenuResourcesPtr->unk_69) switch (sTradeMenuResourcesPtr->unk_69)
{ {
@@ -3287,8 +3288,8 @@ static void TradeMenuMoveCursor(u8 *tradeMenuCursorPosition, u8 direction)
else else
{ {
StartSpriteAnim(&gSprites[sTradeMenuResourcesPtr->tradeMenuCursorSpriteIdx], 0); StartSpriteAnim(&gSprites[sTradeMenuResourcesPtr->tradeMenuCursorSpriteIdx], 0);
gSprites[sTradeMenuResourcesPtr->tradeMenuCursorSpriteIdx].pos1.x = gTradeMonSpriteCoords[newPosition][0] * 8 + 32; gSprites[sTradeMenuResourcesPtr->tradeMenuCursorSpriteIdx].pos1.x = sTradeMonSpriteCoords[newPosition][0] * 8 + 32;
gSprites[sTradeMenuResourcesPtr->tradeMenuCursorSpriteIdx].pos1.y = gTradeMonSpriteCoords[newPosition][1] * 8; gSprites[sTradeMenuResourcesPtr->tradeMenuCursorSpriteIdx].pos1.y = sTradeMonSpriteCoords[newPosition][1] * 8;
} }
if (*tradeMenuCursorPosition != newPosition) if (*tradeMenuCursorPosition != newPosition)
@@ -3582,7 +3583,7 @@ static void sub_804E880(void)
{ {
int i; int i;
if (gMain.newKeys & A_BUTTON) if (JOY_NEW(A_BUTTON))
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
rbox_fill_rectangle(0); rbox_fill_rectangle(0);
@@ -3749,12 +3750,12 @@ static void sub_804EAE4(u8 a0)
gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].invisible = FALSE; gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].invisible = FALSE;
gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].data[0] = 20; gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].data[0] = 20;
gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].data[2] = (gTradeMonSpriteCoords[whichParty * PARTY_SIZE][0] + gTradeMonSpriteCoords[whichParty * PARTY_SIZE + 1][0]) / 2 * 8 + 14; gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].data[2] = (sTradeMonSpriteCoords[whichParty * PARTY_SIZE][0] + sTradeMonSpriteCoords[whichParty * PARTY_SIZE + 1][0]) / 2 * 8 + 14;
gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].data[4] = (gTradeMonSpriteCoords[whichParty * PARTY_SIZE][1] * 8) - 12; gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].data[4] = (sTradeMonSpriteCoords[whichParty * PARTY_SIZE][1] * 8) - 12;
StoreSpriteCallbackInData6(&gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]], SpriteCB_MonIcon); StoreSpriteCallbackInData6(&gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]], SpriteCB_MonIcon);
sTradeMenuResourcesPtr->unk_74[a0]++; sTradeMenuResourcesPtr->unk_74[a0]++;
sub_8075490(&gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]]); sub_8075490(&gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]]);
CopyToBgTilemapBufferRect_ChangePalette(1, gTradePartyBoxTilemap, a0 * 15, 0, 15, 17, 0); CopyToBgTilemapBufferRect_ChangePalette(1, sTradePartyBoxTilemap, a0 * 15, 0, 15, 17, 0);
CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(1);
CopyBgTilemapBufferToVram(0); CopyBgTilemapBufferToVram(0);
@@ -3766,10 +3767,10 @@ static void sub_804EAE4(u8 a0)
sTradeMenuResourcesPtr->unk_74[a0] = 3; sTradeMenuResourcesPtr->unk_74[a0] = 3;
break; break;
case 3: case 3:
CopyToBgTilemapBufferRect_ChangePalette(1, gTradeMovesBoxTilemap, whichParty * 15, 0, 15, 17, 0); CopyToBgTilemapBufferRect_ChangePalette(1, sTradeMovesBoxTilemap, whichParty * 15, 0, 15, 17, 0);
CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(1);
gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].pos1.x = (gTradeMonSpriteCoords[whichParty * PARTY_SIZE][0] + gTradeMonSpriteCoords[whichParty * PARTY_SIZE + 1][0]) / 2 * 8 + 14; gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].pos1.x = (sTradeMonSpriteCoords[whichParty * PARTY_SIZE][0] + sTradeMonSpriteCoords[whichParty * PARTY_SIZE + 1][0]) / 2 * 8 + 14;
gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].pos1.y = (gTradeMonSpriteCoords[whichParty * PARTY_SIZE][1] * 8) - 12; gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].pos1.y = (sTradeMonSpriteCoords[whichParty * PARTY_SIZE][1] * 8) - 12;
gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].pos2.x = 0; gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].pos2.x = 0;
gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].pos2.y = 0; gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].pos2.y = 0;
nameStringWidth = sub_804EE6C(nickname, whichParty, partyIdx); nameStringWidth = sub_804EE6C(nickname, whichParty, partyIdx);
@@ -3871,7 +3872,7 @@ static void sub_804F08C(u8 whichParty, u8 monIdx, u8 a2, u8 a3, u8 a4, u8 a5)
u8 gender; u8 gender;
u8 nickname[12]; u8 nickname[12];
CopyToBgTilemapBufferRect_ChangePalette(1, gUnknown_8E9F1FC, a4, a5, 6, 3, 0); CopyToBgTilemapBufferRect_ChangePalette(1, gTradeMenuMonBox_Tilemap, a4, a5, 6, 3, 0);
CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(1);
if (whichParty == 0) if (whichParty == 0)
@@ -4005,8 +4006,8 @@ static void sub_804F2E8(u8 whichParty)
for (i = 0; i < sTradeMenuResourcesPtr->partyCounts[whichParty]; i++) for (i = 0; i < sTradeMenuResourcesPtr->partyCounts[whichParty]; i++)
{ {
gSprites[sTradeMenuResourcesPtr->partyIcons[whichParty][i]].invisible = FALSE; gSprites[sTradeMenuResourcesPtr->partyIcons[whichParty][i]].invisible = FALSE;
gSprites[sTradeMenuResourcesPtr->partyIcons[whichParty][i]].pos1.x = gTradeMonSpriteCoords[(whichParty * PARTY_SIZE) + i][0] * 8 + 14; gSprites[sTradeMenuResourcesPtr->partyIcons[whichParty][i]].pos1.x = sTradeMonSpriteCoords[(whichParty * PARTY_SIZE) + i][0] * 8 + 14;
gSprites[sTradeMenuResourcesPtr->partyIcons[whichParty][i]].pos1.y = gTradeMonSpriteCoords[(whichParty * PARTY_SIZE) + i][1] * 8 - 12; gSprites[sTradeMenuResourcesPtr->partyIcons[whichParty][i]].pos1.y = sTradeMonSpriteCoords[(whichParty * PARTY_SIZE) + i][1] * 8 - 12;
gSprites[sTradeMenuResourcesPtr->partyIcons[whichParty][i]].pos2.x = 0; gSprites[sTradeMenuResourcesPtr->partyIcons[whichParty][i]].pos2.x = 0;
gSprites[sTradeMenuResourcesPtr->partyIcons[whichParty][i]].pos2.y = 0; gSprites[sTradeMenuResourcesPtr->partyIcons[whichParty][i]].pos2.y = 0;
} }
@@ -4020,7 +4021,7 @@ static void sub_804F3B4(void)
static void sub_804F3C8(u8 whichParty) static void sub_804F3C8(u8 whichParty)
{ {
CopyToBgTilemapBufferRect_ChangePalette(1, gTradePartyBoxTilemap, 15 * whichParty, 0, 15, 17, 0); CopyToBgTilemapBufferRect_ChangePalette(1, sTradePartyBoxTilemap, 15 * whichParty, 0, 15, 17, 0);
CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(1);
sub_804F284(whichParty); sub_804F284(whichParty);
sub_804F020(whichParty); sub_804F020(whichParty);
@@ -4137,15 +4138,15 @@ static bool8 sub_804F610(void)
sTradeMenuResourcesPtr->unk_A8++; sTradeMenuResourcesPtr->unk_A8++;
break; break;
case 14: case 14:
LoadSpritePalette(&gUnknown_8261D00); LoadSpritePalette(&sSpritePalette_Text);
sTradeMenuResourcesPtr->unk_A8++; sTradeMenuResourcesPtr->unk_A8++;
break; break;
case 15: case 15:
LoadSpritePalette(&gUnknown_8261C60); LoadSpritePalette(&sTradeButtons_SpritePal);
sTradeMenuResourcesPtr->unk_A8++; sTradeMenuResourcesPtr->unk_A8++;
break; break;
case 16: case 16:
LoadSpriteSheet(&gUnknown_8261C58); LoadSpriteSheet(&sTradeButtons_SpriteSheet);
sTradeMenuResourcesPtr->unk_A8++; sTradeMenuResourcesPtr->unk_A8++;
break; break;
case 17: case 17:
@@ -4257,10 +4258,10 @@ static void sub_804F9D8(void)
} }
} }
static u32 sub_804FA14(struct Pokemon *party, int partyCount, int cursorPos) static u32 sub_804FA14(struct Pokemon * party, int partyCount, int cursorPos)
{ {
int i, sum; int i, sum;
struct LinkPlayer *player; struct LinkPlayer * player;
int species[6]; int species[6];
int species2[6]; int species2[6];
src/trade_scene.c
+305 -290
View File
File diff suppressed because it is too large Load Diff