summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/graphics.s13
-rw-r--r--data/trade.s212
-rw-r--r--data/trade/unk_8260834.binbin0 -> 510 bytes
-rw-r--r--data/trade/unk_8260A32.binbin0 -> 510 bytes
-rw-r--r--data/trade/unk_8260C30.bin1
-rw-r--r--data/trade/unk_8261430.bin1
-rw-r--r--data/trade/unk_8261CE0.pal19
7 files changed, 220 insertions, 26 deletions
diff --git a/data/graphics.s b/data/graphics.s
index 2adc0f0b3..93c5b6614 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -16215,10 +16215,19 @@ gUnknown_8E9CBBC:: @ 8E9CBBC
.incbin "baserom.gba", 0xE9CBBC, 0x320 @UNKNOWN
gUnknown_8E9CEDC:: @ 8E9CEDC
- .incbin "baserom.gba", 0xE9CEDC, 0x80 @UNKNOWN
+ .incbin "baserom.gba", 0xE9CEDC, 0x60 @UNKNOWN
+
+gUnknown_8E9CF3C::
+ .incbin "baserom.gba", 0xE9CF3C, 0x20 @UNKNOWN
gUnknown_8E9CF5C:: @ 8E9CF5C
- .incbin "baserom.gba", 0xE9CF5C, 0x1AA0 @UNKNOWN
+ .incbin "baserom.gba", 0xE9CF5C, 0x1280 @UNKNOWN
+
+gUnknown_8E9E1DC::
+ .incbin "baserom.gba", 0xE9E1DC, 0x800 @UNKNOWN
+
+gUnknown_8E9E9DC::
+ .incbin "baserom.gba", 0xE9E9DC, 0x20 @UNKNOWN
gUnknown_8E9E9FC:: @ 8E9E9FC
.incbin "baserom.gba", 0xE9E9FC, 0x800 @UNKNOWN
diff --git a/data/trade.s b/data/trade.s
index 3ddeb1b1b..06ee748ce 100644
--- a/data/trade.s
+++ b/data/trade.s
@@ -8,62 +8,226 @@ gUnknown_8260814:: @ 8260814
.incbin "baserom.gba", 0x260814, 0x20
gUnknown_8260834:: @ 8260834
- .incbin "baserom.gba", 0x260834, 0x1FE
+ .incbin "data/trade/unk_8260834.bin"
gUnknown_8260A32:: @ 8260A32
- .incbin "baserom.gba", 0x260A32, 0x1FE
+ .incbin "data/trade/unk_8260A32.bin"
gUnknown_8260C30:: @ 8260C30
- .incbin "baserom.gba", 0x260C30, 0x800
+ .incbin "data/trade/unk_8260C30.bin"
gUnknown_8261430:: @ 8261430
- .incbin "baserom.gba", 0x261430, 0x828
+ .incbin "data/trade/unk_8261430.bin"
+
+gOamdata_8261C30::
+ .incbin "baserom.gba", 0x261C30, 0x8
+
+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
- .incbin "baserom.gba", 0x261C58, 0x8
+ obj_tiles gUnknown_8E9E1DC, 0x0800, 300
gUnknown_8261C60:: @ 8261C60
- .incbin "baserom.gba", 0x261C60, 0x50
+ 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
- .incbin "baserom.gba", 0x261CB0, 0x18
+ spr_template 300, 2345, gOamData_8261C38, gSpriteAnimTable_8261C50, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_8261CC8:: @ 8261CC8
- .incbin "baserom.gba", 0x261CC8, 0x38
+ spr_template 200, 4925, gOamdata_8261C30, gSpriteAnimTable_8261C98, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+gUnknown_8261CE0::
+ .incbin "data/trade/unk_8261CE0.gbapal"
gUnknown_8261D00:: @ 8261D00
- .incbin "baserom.gba", 0x261D00, 0x8
+ obj_pal gUnknown_8261CE0, 4925
gUnknown_8261D08:: @ 8261D08
- .incbin "baserom.gba", 0x261D08, 0x138
-
-gUnknown_8261E40:: @ 8261E40
- .incbin "baserom.gba", 0x261E40, 0x1A
+ .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
- .incbin "baserom.gba", 0x261E5A, 0x18
+ .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
- .incbin "baserom.gba", 0x261E72, 0x18
-
-gUnknown_8261E8A:: @ 8261E8A
- .incbin "baserom.gba", 0x261E8A, 0x2C
+ .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::
+ .incbin "baserom.gba", 0x261E92, 0x24
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 "/$"
+
+ .align 2
gUnknown_8261ECC:: @ 8261ECC
.incbin "baserom.gba", 0x261ECC, 0x18
@@ -179,7 +343,7 @@ gUnknown_826CF60:: @ 826CF60
gUnknown_826CF88:: @ 826CF88
.incbin "baserom.gba", 0x26CF88, 0x4
-gUnknown_826CF8C:: @ 826CF8C
+gIngameTrades:: @ 826CF8C
.incbin "baserom.gba", 0x26CF8C, 0x21C
gUnknown_826D1A8:: @ 826D1A8
diff --git a/data/trade/unk_8260834.bin b/data/trade/unk_8260834.bin
new file mode 100644
index 000000000..123abf716
--- /dev/null
+++ b/data/trade/unk_8260834.bin
Binary files differ
diff --git a/data/trade/unk_8260A32.bin b/data/trade/unk_8260A32.bin
new file mode 100644
index 000000000..69304c5cb
--- /dev/null
+++ b/data/trade/unk_8260A32.bin
Binary files differ
diff --git a/data/trade/unk_8260C30.bin b/data/trade/unk_8260C30.bin
new file mode 100644
index 000000000..22f8f3b71
--- /dev/null
+++ b/data/trade/unk_8260C30.bin
@@ -0,0 +1 @@
+@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@ \ No newline at end of file
diff --git a/data/trade/unk_8261430.bin b/data/trade/unk_8261430.bin
new file mode 100644
index 000000000..e4168474a
--- /dev/null
+++ b/data/trade/unk_8261430.bin
@@ -0,0 +1 @@
+P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P \ No newline at end of file
diff --git a/data/trade/unk_8261CE0.pal b/data/trade/unk_8261CE0.pal
new file mode 100644
index 000000000..40426b71f
--- /dev/null
+++ b/data/trade/unk_8261CE0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+74 74 74
+255 0 0
+0 255 0
+0 0 255
+255 255 0
+0 255 255
+255 0 255
+213 213 205
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+0 0 0
+115 115 115
+255 255 255
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 14:59:42 +0000