summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/trade.s32
-rw-r--r--data/trade.s153
-rw-r--r--graphics/trade/moves_box_map.binbin0 -> 510 bytes
-rw-r--r--graphics/trade/party_box_map.binbin0 -> 510 bytes
-rw-r--r--graphics/trade/stripes_bg2_map.bin1
-rw-r--r--graphics/trade/stripes_bg3_map.bin1
-rw-r--r--graphics/trade/text.pal19
7 files changed, 166 insertions, 40 deletions
diff --git a/asm/trade.s b/asm/trade.s
index bfca20a70..50e6b71e2 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -826,7 +826,7 @@ _080778CA:
adds r4, 0x10
_080778DE:
add r1, sp, 0x10
- ldr r0, =gUnknown_0832DCAC
+ ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@@ -863,7 +863,7 @@ _080778DE:
adds r4, 0x88
_0807792C:
add r1, sp, 0x10
- ldr r0, =gUnknown_0832DCAC
+ ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@@ -889,7 +889,7 @@ _0807792C:
b _08077B22
.pool
_08077970:
- ldr r4, =gUnknown_0832DCAC
+ ldr r4, =gSpriteTemplate_832DCAC
add r1, sp, 0x10
adds r0, r4, 0
ldm r0!, {r2,r3,r7}
@@ -927,7 +927,7 @@ _08077970:
lsls r5, 13
_080779BC:
add r1, sp, 0x10
- ldr r0, =gUnknown_0832DCAC
+ ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@@ -948,7 +948,7 @@ _080779BC:
adds r6, 0x1
cmp r6, 0x5
ble _080779BC
- ldr r0, =gUnknown_0832DC94
+ ldr r0, =gSpriteTemplate_832DC94
ldr r2, =gUnknown_0832DE24
ldrb r1, [r2]
lsls r1, 19
@@ -1450,7 +1450,7 @@ _08077EA0:
adds r4, 0x10
_08077EB4:
add r1, sp, 0xC
- ldr r0, =gUnknown_0832DCAC
+ ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@@ -1487,7 +1487,7 @@ _08077EB4:
adds r4, 0x88
_08077F02:
add r1, sp, 0xC
- ldr r0, =gUnknown_0832DCAC
+ ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@@ -1513,7 +1513,7 @@ _08077F02:
b _080780D8
.pool
_08077F48:
- ldr r4, =gUnknown_0832DCAC
+ ldr r4, =gSpriteTemplate_832DCAC
add r1, sp, 0xC
adds r0, r4, 0
ldm r0!, {r2,r3,r7}
@@ -1551,7 +1551,7 @@ _08077F48:
lsls r5, 13
_08077F94:
add r1, sp, 0xC
- ldr r0, =gUnknown_0832DCAC
+ ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@@ -1590,7 +1590,7 @@ _08077FE4:
adds r0, 0x6
_08077FEA:
strb r0, [r2]
- ldr r0, =gUnknown_0832DC94
+ ldr r0, =gSpriteTemplate_832DC94
ldr r3, =gUnknown_0832DE24
ldr r1, [r4]
adds r1, 0x35
@@ -1931,7 +1931,7 @@ _080782D4:
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBufferRect_ChangePalette
- ldr r1, =gUnknown_0832CABC
+ ldr r1, =gTradeStripesBG2Tilemap
movs r2, 0x80
lsls r2, 4
movs r0, 0x2
@@ -1940,7 +1940,7 @@ _080782D4:
b _0807837E
.pool
_08078324:
- ldr r1, =gUnknown_0832D2BC
+ ldr r1, =gTradeStripesBG3Tilemap
movs r2, 0x80
lsls r2, 4
movs r0, 0x3
@@ -4438,7 +4438,7 @@ _08079772:
lsls r0, 2
add r0, r8
bl sub_80A6DEC
- ldr r1, =gUnknown_0832C8BE
+ ldr r1, =gTradePartyBoxTilemap
ldr r0, [sp, 0x64]
subs r2, r0, r7
lsls r2, 24
@@ -4491,7 +4491,7 @@ _080798AC:
b _08079A24
.pool
_080798BC:
- ldr r1, =gUnknown_0832C6C0
+ ldr r1, =gTradeMovesBoxTilemap
ldr r0, [sp, 0x60]
lsls r2, r0, 4
subs r2, r0
@@ -5326,7 +5326,7 @@ sub_8079F88: @ 8079F88
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r1, =gUnknown_0832C8BE
+ ldr r1, =gTradePartyBoxTilemap
lsls r2, r4, 4
subs r2, r4
lsls r2, 24
@@ -5698,7 +5698,7 @@ _0807A2B8:
mov r0, sp
b _0807A2D6
_0807A2BC:
- ldr r0, =gUnknown_0832DCE4
+ ldr r0, =gSpritePalette_TradeScreenText
bl LoadSpritePalette
b _0807A2DA
.pool
diff --git a/data/trade.s b/data/trade.s
index 7308b92a3..2674f3b65 100644
--- a/data/trade.s
+++ b/data/trade.s
@@ -2,25 +2,31 @@
.include "constants/constants.inc"
.section .rodata
- .align 2, 0
+ .align 2
gUnknown_0832C6A8:: @ 832C6A8
- .incbin "baserom.gba", 0x32C6A8, 0x18
+ .4byte 0x00000f2c, 0x00003d88, 0x0000001c, 0x00000024, 0x00000064, 0x00000528
-gUnknown_0832C6C0:: @ 832C6C0
- .incbin "baserom.gba", 0x32c6c0, 0x1fe
+ .align 1
+gTradeMovesBoxTilemap:: @ 832C6C0
+ .incbin "graphics/trade/moves_box_map.bin"
-gUnknown_0832C8BE:: @ 832C8BE
- .incbin "baserom.gba", 0x32c8be, 0x1fe
+ .align 1
+gTradePartyBoxTilemap:: @ 832C8BE
+ .incbin "graphics/trade/party_box_map.bin"
-gUnknown_0832CABC:: @ 832CABC
- .incbin "baserom.gba", 0x32cabc, 0x800
+ .align 1
+gTradeStripesBG2Tilemap:: @ 832CABC
+ .incbin "graphics/trade/stripes_bg2_map.bin"
-gUnknown_0832D2BC:: @ 832D2BC
- .incbin "baserom.gba", 0x32d2bc, 0x800
+ .align 1
+gTradeStripesBG3Tilemap:: @ 832D2BC
+ .incbin "graphics/trade/stripes_bg3_map.bin"
gUnknown_0832DABC:: @ 832DABC
- .incbin "baserom.gba", 0x32dabc, 0xb
+ .string "$"
+
+ .string "{COLOR WHITE}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}$"
gText_MaleSymbol4:: @ 832DAC7
.string "♂$"
@@ -29,30 +35,128 @@ gText_FemaleSymbol4:: @ 832DAC9
.string "♀$"
gText_GenderlessSymbol:: @ 832DACB
- .incbin "baserom.gba", 0x32dacb, 0x7
+ .string "$"
+
+ .string " MOVE$"
gUnknown_0832DAD2:: @ 832DAD2
- .incbin "baserom.gba", 0x32dad2, 0xd
+ .string "\n$"
+
+ .string "/$"
+
+ .string "Lv. $"
+
+ .string "---$"
gUnknown_0832DADF:: @ 832DADF
- .incbin "baserom.gba", 0x32dadf, 0x6
+ .string "????$"
+
+ .string "$"
gUnknown_0832DAE5:: @ 832DAE5
- .incbin "baserom.gba", 0x32dae5, 0x157
+ .string "Is this trade okay?$"
-gUnknown_0832DC3C:: @ 832DC3C
- .incbin "baserom.gba", 0x32dc3c, 0x8
+ .string "CANCEL$"
-gUnknown_0832DC44:: @ 832DC44
- .incbin "baserom.gba", 0x32dc44, 0x50
+ .string "Choose a POKéMON.$"
+
+ .string "SUMMARY$"
+
+ .string "TRADE$"
+
+ .string "Cancel trade?$"
+
+ .string "Bボタン　で　もどります$"
+
+ .string "SUMMARY$"
-gUnknown_0832DC94:: @ 832DC94
- .incbin "baserom.gba", 0x32dc94, 0x18
+ .string "TRADE$"
-gUnknown_0832DCAC:: @ 832DCAC
- .incbin "baserom.gba", 0x32dcac, 0x38
+ .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Communication standby…\nPlease wait.$"
-gUnknown_0832DCE4:: @ 832DCE4
+ .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}The trade has\nbeen canceled.$"
+
+ .string "That’s your only\nPOKéMON for battle.$"
+
+ .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Waiting for your friend\nto finish…$"
+
+ .string "Your friend wants\nto trade POKéMON.$"
+
+ .align 2
+gOamData_832DC14:: @ 832DC14
+ .2byte 0x4000, 0x8000, 0x0400, 0x0000
+
+ .align 2
+gOamData_832DC1C:: @ 832DC1C
+ .2byte 0x4000, 0xc000, 0x0400, 0x0000
+
+ .align 2
+gSpriteAnim_832DC24:: @ 832DC24
+ .2byte 0x0000, 0x0005, 0xffff, 0x0000
+
+ .align 2
+gSpriteAnim_832DC2C:: @ 832DC2C
+ .2byte 0x0020, 0x0005, 0xffff, 0x0000
+
+ .align 2
+gSpriteAnimTable_832DC34:: @ 832DC34
+ .4byte gSpriteAnim_832DC24
+ .4byte gSpriteAnim_832DC2C
+
+ .align 2
+gUnknown_0832DC3C:: @ 832DC3C
+ obj_tiles gUnknown_08DDC6E4, 0x0800, 0x012c
+
+ .align 2
+gUnknown_0832DC44:: @ 832DC44
+ obj_pal gUnknown_08DDB444, 0x0929
+
+ .align 2
+gSpriteAnim_832DC4C:: @ 832DC4C
+ .2byte 0x0000, 0x0005, 0xffff, 0x0000
+
+ .align 2
+gSpriteAnim_832DC54:: @ 832DC54
+ .2byte 0x0008, 0x0005, 0xffff, 0x0000
+
+ .align 2
+gSpriteAnim_832DC5C:: @ 832DC5C
+ .2byte 0x0010, 0x0005, 0xffff, 0x0000
+
+ .align 2
+gSpriteAnim_832DC64:: @ 832DC64
+ .2byte 0x0018, 0x0005, 0xffff, 0x0000
+
+ .align 2
+gSpriteAnim_832DC6C:: @ 832DC6C
+ .2byte 0x0020, 0x0005, 0xffff, 0x0000
+
+ .align 2
+gSpriteAnim_832DC74:: @ 832DC74
+ .2byte 0x0028, 0x0005, 0xffff, 0x0000
+
+ .align 2
+gSpriteAnimTable_832DC7C:: @ 832DC7C
+ .4byte gSpriteAnim_832DC4C
+ .4byte gSpriteAnim_832DC54
+ .4byte gSpriteAnim_832DC5C
+ .4byte gSpriteAnim_832DC64
+ .4byte gSpriteAnim_832DC6C
+ .4byte gSpriteAnim_832DC74
+
+ .align 2
+gSpriteTemplate_832DC94:: @ 832DC94
+ spr_template 0x012c, 0x0929, gOamData_832DC1C, gSpriteAnimTable_832DC34, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+ .align 2
+gSpriteTemplate_832DCAC:: @ 832DCAC
+ .incbin "baserom.gba", 0x32dcac, 0x18
+
+ .align 2
+TradeScreenTextPalette:: @ 832DCC4
+ .incbin "graphics/trade/text.gbapal"
+
+gSpritePalette_TradeScreenText:: @ 832DCE4
.incbin "baserom.gba", 0x32dce4, 0x8
gUnknown_0832DCEC:: @ 832DCEC
@@ -67,6 +171,7 @@ gUnknown_0832DE3E:: @ 832DE3E
gUnknown_0832DE56:: @ 832DE56
.incbin "baserom.gba", 0x32de56, 0x3e
+ .align 2
gUnknown_0832DE94:: @ 832DE94
.incbin "baserom.gba", 0x32de94, 0x18
diff --git a/graphics/trade/moves_box_map.bin b/graphics/trade/moves_box_map.bin
new file mode 100644
index 000000000..123abf716
--- /dev/null
+++ b/graphics/trade/moves_box_map.bin
Binary files differ
diff --git a/graphics/trade/party_box_map.bin b/graphics/trade/party_box_map.bin
new file mode 100644
index 000000000..69304c5cb
--- /dev/null
+++ b/graphics/trade/party_box_map.bin
Binary files differ
diff --git a/graphics/trade/stripes_bg2_map.bin b/graphics/trade/stripes_bg2_map.bin
new file mode 100644
index 000000000..22f8f3b71
--- /dev/null
+++ b/graphics/trade/stripes_bg2_map.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/graphics/trade/stripes_bg3_map.bin b/graphics/trade/stripes_bg3_map.bin
new file mode 100644
index 000000000..e4168474a
--- /dev/null
+++ b/graphics/trade/stripes_bg3_map.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/graphics/trade/text.pal b/graphics/trade/text.pal
new file mode 100644
index 000000000..40426b71f
--- /dev/null
+++ b/graphics/trade/text.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-05-10 10:37:25 +0000