diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data.s | 40 | ||||
| -rw-r--r-- | data/ingame_trades.inc | 174 |
2 files changed, 201 insertions, 13 deletions
diff --git a/data/data.s b/data/data.s index fd4b9d274..0b99ba48c 100644 --- a/data/data.s +++ b/data/data.s @@ -2,7 +2,11 @@ #include "constants/trainer_classes.h" #include "constants/songs.h" #include "constants/region_map.h" - .set NULL, 0 +#include "constants/species.h" +#include "constants/items.h" +#include "constants/easy_chat.h" + .include "asm/macros.inc" + .include "constants/constants.inc" .section .rodata @@ -319,7 +323,7 @@ gUnknown_8261D00:: @ 8261D00 gUnknown_8261D08:: @ 8261D08 .incbin "baserom.gba", 0x261D08, 0x138 -gUnknown_8261E40:: @ 8261E40 +gTradeMonSpriteCoords:: @ 8261E40 .incbin "baserom.gba", 0x261E40, 0x1A gUnknown_8261E5A:: @ 8261E5A @@ -328,24 +332,36 @@ gUnknown_8261E5A:: @ 8261E5A gUnknown_8261E72:: @ 8261E72 .incbin "baserom.gba", 0x261E72, 0x18 -gUnknown_8261E8A:: @ 8261E8A +gTradeUnknownSpriteCoords:: @ 8261E8A .incbin "baserom.gba", 0x261E8A, 0x2C gUnknown_8261EB6:: @ 8261EB6 - .incbin "baserom.gba", 0x261EB6, 0xB + .string "$" + +gUnknown_8261EB7:: + .string "{COLOR DARK_GREY}{HIGHLIGHT TRANSPARENT}{SHADOW RED}$" gText_MaleSymbol4:: @ 8261EC1 - .incbin "baserom.gba", 0x261EC1, 0x2 + .string "♂$" gText_FemaleSymbol4:: @ 8261EC3 - .incbin "baserom.gba", 0x261EC3, 0x2 + .string "♀$" gText_GenderlessSymbol:: @ 8261EC5 - .incbin "baserom.gba", 0x261EC5, 0x2 + .string "$" + +gUnknown_8261EC6:: + .string "$" gUnknown_8261EC7:: @ 8261EC7 - .incbin "baserom.gba", 0x261EC7, 0x5 + .string "\n$" + +gUnknown_8261EC9:: + .string "/$" + + @ trade + .align 2 gUnknown_8261ECC:: @ 8261ECC .incbin "baserom.gba", 0x261ECC, 0x18 @@ -461,11 +477,7 @@ gUnknown_826CF60:: @ 826CF60 gUnknown_826CF88:: @ 826CF88 .incbin "baserom.gba", 0x26CF88, 0x4 -gUnknown_826CF8C:: @ 826CF8C - .incbin "baserom.gba", 0x26CF8C, 0x21C - -gUnknown_826D1A8:: @ 826D1A8 - .incbin "baserom.gba", 0x26D1A8, 0x14 + .include "data/ingame_trades.inc" gUnknown_826D1BC:: @ 826D1BC .incbin "baserom.gba", 0x26D1BC, 0x10 @@ -482,6 +494,8 @@ gUnknown_826D1E4:: @ 826D1E4 gUnknown_826D250:: @ 826D250 .incbin "baserom.gba", 0x26D250, 0x44 + @ overworld + gUnknown_826D294:: @ 826D294 .incbin "baserom.gba", 0x26D294, 0xA diff --git a/data/ingame_trades.inc b/data/ingame_trades.inc new file mode 100644 index 000000000..c3447d79b --- /dev/null +++ b/data/ingame_trades.inc @@ -0,0 +1,174 @@ +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 |