Trade data; split off trade_scene

This commit is contained in:
PikalaxALT 2019-10-30 14:20:32 -04:00
parent 2c2c179eb9
commit f6d768d5ed
9 changed files with 3017 additions and 2979 deletions

View File

@ -8,548 +8,6 @@
.section .rodata
.align 2, 0
gTradeMovesBoxTilemap:: @ 8260834
.incbin "data/trade/unk_8260834.bin"
gTradePartyBoxTilemap:: @ 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
sTradeErrorOrStatusMessagePtrs:: @ 8261EF4
.4byte gUnknown_841E118 @ Communication standby
.4byte gUnknown_841E145 @ The trade has been canceled.
.4byte gUnknown_841E16B @ That's your only POKéMON for battle
.4byte gUnknown_8417094 @ That's your only POKéMON for battle
.4byte gUnknown_841E199 @ Waiting for your friend to finish
.4byte gUnknown_841E1C5 @ Your friend wants to trade POKéMON
.4byte gUnknown_84170BC @ That POKéMON can't be traded now
.4byte gUnknown_84170E0 @ An EGG can't be traded now
.4byte gUnknown_84170FC @ The other TRAINER's POKéMON can't be traded now
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 "OBJADD$", 13
.string "ADD$", 13
.string "$", 13
gJPText_Shedinja:: @ 8262034
.string "$"
.string " $"
.string " $"
gUnknown_8262055:: @ 8262055
.byte 0x04, 0x03
.byte 0x13, 0x03
.align 2
gUnknown_826205C::
.incbin "data/trade/unk_826207C.gbapal"

View File

@ -4216,8 +4216,10 @@ extern const u8 gMonIcon_QuestionMark[];
// trade
extern const u16 gUnknown_8E9CEDC[];
extern const u16 gUnknown_8E9CF3C[];
extern const u16 gUnknown_8E9CF5C[];
extern const u16 gUnknown_8E9E9FC[];
extern const u16 gUnknown_8E9E1DC[];
extern const u16 gUnknown_8E9F1FC[];
#endif //GUARD_GRAPHICS_H

View File

@ -667,5 +667,23 @@ extern const u8 gText_ByeByeVar1[];
extern const u8 gText_XSentOverY[];
extern const u8 gText_TakeGoodCareOfX[];
extern const u8 gUnknown_841E325[];
extern const u8 gUnknown_841E0B9[];
extern const u8 gUnknown_841E0C0[];
extern const u8 gUnknown_841E0D2[];
extern const u8 gUnknown_841E0DA[];
extern const u8 gUnknown_841E0E0[];
extern const u8 gUnknown_841E0EE[];
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

View File

@ -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 sub_804C718(void);
s32 sub_804FB34(void);
#endif //GUARD_TRADE_H

6
include/trade_scene.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef GUARD_TRADE_SCENE_H
#define GUARD_TRADE_SCENE_H
void CB2_InitTradeAnim_LinkTrade(void);
#endif //GUARD_TRADE_SCENE_H

View File

@ -86,6 +86,7 @@ SECTIONS {
asm/pokeball.o(.text);
src/load_save.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);
@ -400,6 +401,7 @@ SECTIONS {
data/battle_interface.o(.rodata);
data/pokeball.o(.rodata);
src/trade.o(.rodata);
src/trade_scene.o(.rodata);
data/trade.o(.rodata);
data/overworld.o(.rodata);
data/tilesets.o(.rodata);

File diff suppressed because it is too large Load Diff

2444
src/trade_scene.c Normal file

File diff suppressed because it is too large Load Diff

View File

@ -31,6 +31,8 @@
.align 2
.include "src/trade.o"
.align 2
.include "src/trade_scene.o"
.align 2
.include "src/new_game.o"
.align 2