summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-10-11 11:55:54 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2019-10-11 11:55:54 -0400
commit4aa3ff78ecb33723818e44595f0b54c6fd1ca7a9 (patch)
tree108b1d16aa5b240266f2089ca63abe74f2763f28
parentf2a4a0b4b345ebd25169c9fa8164f44b6a88c457 (diff)
Dump in-game trades
-rw-r--r--asm/trade.s16
-rw-r--r--data/data.s8
-rw-r--r--data/ingame_trades.inc162
-rw-r--r--src/trade.c3
4 files changed, 178 insertions, 11 deletions
diff --git a/asm/trade.s b/asm/trade.s
index 8e6131f9d..de2dc48e8 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -8917,7 +8917,7 @@ _08050EB4:
lsls r4, r0, 4
subs r4, r0
lsls r4, 2
- ldr r0, _08050EFC @ =gUnknown_826CF8C
+ ldr r0, _08050EFC @ =gIngameTrades
adds r4, r0
ldr r0, _08050F00 @ =gStringVar1
adds r1, r4, 0
@@ -8945,7 +8945,7 @@ _08050EF0:
bx r0
.align 2, 0
_08050EF8: .4byte gSpecialVar_0x8004
-_08050EFC: .4byte gUnknown_826CF8C
+_08050EFC: .4byte gIngameTrades
_08050F00: .4byte gStringVar1
_08050F04: .4byte gStringVar3
_08050F08: .4byte gSpecialVar_0x8005
@@ -13787,7 +13787,7 @@ sub_8053A9C: @ 8053A9C
lsls r4, r0, 4
subs r4, r0
lsls r4, 2
- ldr r0, _08053AD4 @ =gUnknown_826CF8C
+ ldr r0, _08053AD4 @ =gIngameTrades
adds r4, r0
ldr r0, _08053AD8 @ =gStringVar1
ldrh r1, [r4, 0x38]
@@ -13807,7 +13807,7 @@ sub_8053A9C: @ 8053A9C
bx r1
.align 2, 0
_08053AD0: .4byte gSpecialVar_0x8004
-_08053AD4: .4byte gUnknown_826CF8C
+_08053AD4: .4byte gIngameTrades
_08053AD8: .4byte gStringVar1
_08053ADC: .4byte gSpeciesNames
_08053AE0: .4byte gStringVar2
@@ -13822,7 +13822,7 @@ sub_8053AE4: @ 8053AE4
lsls r4, r0, 4
subs r4, r0
lsls r4, 2
- ldr r0, _08053B30 @ =gUnknown_826CF8C
+ ldr r0, _08053B30 @ =gIngameTrades
adds r4, r0
ldr r0, _08053B34 @ =gSpecialVar_0x8005
ldrh r1, [r0]
@@ -13849,7 +13849,7 @@ sub_8053AE4: @ 8053AE4
bx r0
.align 2, 0
_08053B2C: .4byte gSpecialVar_0x8004
-_08053B30: .4byte gUnknown_826CF8C
+_08053B30: .4byte gIngameTrades
_08053B34: .4byte gSpecialVar_0x8005
_08053B38: .4byte gPlayerParty
_08053B3C: .4byte gStringVar1
@@ -13868,7 +13868,7 @@ sub_8053B48: @ 8053B48
lsls r2, r1, 4
subs r2, r1
lsls r2, 2
- ldr r1, _08053CA4 @ =gUnknown_826CF8C
+ ldr r1, _08053CA4 @ =gIngameTrades
adds r5, r2, r1
movs r1, 0x64
muls r0, r1
@@ -14010,7 +14010,7 @@ sub_8053B48: @ 8053B48
bl SetMonData
b _08053CC0
.align 2, 0
-_08053CA4: .4byte gUnknown_826CF8C
+_08053CA4: .4byte gIngameTrades
_08053CA8: .4byte gPlayerParty
_08053CAC: .4byte gEnemyParty
_08053CB0: .4byte gUnknown_2031CCC
diff --git a/data/data.s b/data/data.s
index 0883c65d7..6a89af93a 100644
--- a/data/data.s
+++ b/data/data.s
@@ -2,7 +2,10 @@
#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 "asm/macros.inc"
+ .include "constants/constants.inc"
.section .rodata
@@ -461,8 +464,7 @@ gUnknown_826CF60:: @ 826CF60
gUnknown_826CF88:: @ 826CF88
.incbin "baserom.gba", 0x26CF88, 0x4
-gUnknown_826CF8C:: @ 826CF8C
- .incbin "baserom.gba", 0x26CF8C, 0x21C
+ .include "data/ingame_trades.inc"
gUnknown_826D1A8:: @ 826D1A8
.incbin "baserom.gba", 0x26D1A8, 0x14
diff --git a/data/ingame_trades.inc b/data/ingame_trades.inc
new file mode 100644
index 000000000..c8596c217
--- /dev/null
+++ b/data/ingame_trades.inc
@@ -0,0 +1,162 @@
+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
diff --git a/src/trade.c b/src/trade.c
new file mode 100644
index 000000000..5c17035fa
--- /dev/null
+++ b/src/trade.c
@@ -0,0 +1,3 @@
+#include "global.h"
+
+