summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-01-19 19:54:19 -0600
committerDiegoisawesome <diego@domoreaweso.me>2018-01-19 19:54:19 -0600
commit4559a95d9b67a9f5e9f00d8e4349bb578ccf027f (patch)
treec87aa282533fac285958c97afd710bec71d66017
parentc74334c26a1565b3cae586efd2f8a07a8bb0f912 (diff)
parentb22a80058104eca7f04ef608b01e96982a276216 (diff)
Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald
-rw-r--r--asm/macros/window.inc2
-rw-r--r--asm/trade.s88
-rw-r--r--data/battle_frontier_1.s2
-rw-r--r--data/battle_frontier_2.s4
-rw-r--r--data/battle_records.s2
-rw-r--r--data/berry_tag_screen.s2
-rw-r--r--data/contest.s2
-rw-r--r--data/contest_link_80F57C4.s2
-rw-r--r--data/credits.s2
-rw-r--r--data/data2b.s4
-rw-r--r--data/easy_chat.s2
-rw-r--r--data/link.s16
-rw-r--r--data/main_menu.s4
-rw-r--r--data/pokemon_storage_system.s2
-rw-r--r--data/pokenav.s2
-rw-r--r--data/reset_rtc_screen.s2
-rw-r--r--data/shop.s2
-rw-r--r--data/slot_machine.s2
-rw-r--r--data/strings.s23
-rw-r--r--data/trade.s621
-rw-r--r--data/use_pokeblock.s2
-rw-r--r--graphics/trade/ball.pngbin0 -> 464 bytes
-rw-r--r--graphics/trade/black.pal19
-rw-r--r--graphics/trade/cable_closeup_map.binbin0 -> 2048 bytes
-rw-r--r--graphics/trade/cable_end.pngbin0 -> 194 bytes
-rw-r--r--graphics/trade/gba.pal19
-rw-r--r--graphics/trade/gba_affine.pngbin0 -> 1897 bytes
-rw-r--r--graphics/trade/gba_affine_map_cable.binbin0 -> 256 bytes
-rw-r--r--graphics/trade/gba_affine_map_wireless.binbin0 -> 256 bytes
-rw-r--r--graphics/trade/gba_map_cable.binbin0 -> 4096 bytes
-rw-r--r--graphics/trade/gba_map_wireless.binbin0 -> 4096 bytes
-rw-r--r--graphics/trade/gba_screen.pngbin0 -> 170 bytes
-rw-r--r--graphics/trade/glow1.pngbin0 -> 195 bytes
-rw-r--r--graphics/trade/glow2.pngbin0 -> 190 bytes
-rw-r--r--graphics/trade/misc.pal19
-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/pokeball_symbol.pngbin0 -> 1569 bytes
-rw-r--r--graphics/trade/pokeball_symbol_map.binbin0 -> 256 bytes
-rw-r--r--graphics/trade/shadow.pal19
-rw-r--r--graphics/trade/shadow_map.binbin0 -> 4096 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
-rw-r--r--graphics/trade/unknown_3308C0.pal19
-rw-r--r--graphics/trade/unknown_3379A0.binbin0 -> 2048 bytes
-rw-r--r--graphics/trade/unknown_338EA4.pal15
-rw-r--r--graphics/trade/wireless_signal.binbin0 -> 2048 bytes
-rw-r--r--graphics/trade/wireless_signal.pngbin0 -> 1307 bytes
-rw-r--r--graphics/trade/wireless_signal_receive.pal259
-rw-r--r--graphics/trade/wireless_signal_send.pal259
51 files changed, 1254 insertions, 183 deletions
diff --git a/asm/macros/window.inc b/asm/macros/window.inc
index b7291138b..a91782bbf 100644
--- a/asm/macros/window.inc
+++ b/asm/macros/window.inc
@@ -8,7 +8,7 @@
.2byte \vram_tile_offset
.endm
- .macro window_template_terminator
+ .macro null_window_template
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
.endm
diff --git a/asm/trade.s b/asm/trade.s
index bfca20a70..cfc5307d3 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
@@ -2394,7 +2394,7 @@ _08078726:
mov r2, sp
bl GetMonData
mov r0, sp
- ldr r1, =gUnknown_0832DF94
+ ldr r1, =gJPText_Shedinja
bl StringCompareWithoutExtCtrlCodes
cmp r0, 0
bne _08078766
@@ -2444,7 +2444,7 @@ _080787AC:
thumb_func_start sub_80787B8
sub_80787B8: @ 80787B8
push {lr}
- ldr r0, =gUnknown_0832DAE5
+ ldr r0, =gText_IsThisTradeOkay
ldr r1, =gUnknown_0203229C
ldr r1, [r1]
adds r1, 0x72
@@ -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
@@ -4769,7 +4769,7 @@ _08079AFE:
lsrs r4, r0, 16
cmp r4, 0x3
bls _08079ADE
- ldr r1, =gUnknown_0832DABC
+ ldr r1, =gText_EmptyString7
adds r0, r6, 0
bl StringCopy
movs r4, 0
@@ -4789,7 +4789,7 @@ _08079B20:
bl StringAppend
_08079B3C:
adds r0, r6, 0
- ldr r1, =gUnknown_0832DAD2
+ ldr r1, =gText_NewLine3
bl StringAppend
adds r0, r4, 0x1
lsls r0, 16
@@ -4799,10 +4799,10 @@ _08079B3C:
b _08079B6C
.pool
_08079B5C:
- ldr r1, =gUnknown_0832DABC
+ ldr r1, =gText_EmptyString7
adds r0, r6, 0
bl StringCopy
- ldr r1, =gUnknown_0832DADF
+ ldr r1, =gText_FourQuestionMarks
adds r0, r6, 0
bl StringAppend
_08079B6C:
@@ -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
@@ -8571,7 +8571,7 @@ _0807BB68:
lsls r4, r0, 4
subs r4, r0
lsls r4, 2
- ldr r0, =gUnknown_08338ED0
+ ldr r0, =gIngameTrades
adds r4, r0
ldr r0, =gStringVar1
adds r1, r4, 0
@@ -9098,7 +9098,7 @@ _0807C1DC:
beq _0807C1FC
bl _0807CFB4
_0807C1FC:
- ldr r0, =gUnknown_08338D28
+ ldr r0, =gSpriteTemplate_8338D28
movs r1, 0x78
movs r2, 0x20
movs r3, 0
@@ -9228,7 +9228,7 @@ _0807C318:
bl _0807CFB4
_0807C328:
bl sub_807AB28
- ldr r0, =gUnknown_08338E74
+ ldr r0, =gSpriteTemplate_8338E74
movs r1, 0x78
movs r2, 0x50
movs r3, 0
@@ -9296,7 +9296,7 @@ _0807C3B0:
beq _0807C3C4
bl _0807CFB4
_0807C3C4:
- ldr r0, =gUnknown_08338DFC
+ ldr r0, =gSpriteTemplate_8338DFC
movs r1, 0x80
movs r2, 0x41
movs r3, 0
@@ -9316,7 +9316,7 @@ _0807C3E0:
ldr r1, [r4]
adds r1, 0x90
strb r0, [r1]
- ldr r0, =gUnknown_08338DC8
+ ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x80
movs r2, 0x50
movs r3, 0
@@ -9455,7 +9455,7 @@ _0807C528:
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
- ldr r5, =gUnknown_08338DC8
+ ldr r5, =gSpriteTemplate_8338DC8
adds r0, r5, 0
movs r1, 0x6F
movs r2, 0xAA
@@ -9604,7 +9604,7 @@ _0807C66C:
adds r1, r4, 0
adds r1, 0x10
adds r0, r1
- ldr r1, =gUnknown_08338ECC
+ ldr r1, =gSpriteAffineAnimTable_8338ECC
str r1, [r0]
ldrb r1, [r2]
lsls r0, r1, 4
@@ -9915,7 +9915,7 @@ _0807C8FA:
ldr r1, [r7]
adds r1, 0x90
strb r0, [r1]
- ldr r0, =gUnknown_08338DC8
+ ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x80
adds r2, r4, 0
movs r3, 0
@@ -10091,7 +10091,7 @@ _0807CA86:
bne _0807CA92
b _0807CFB4
_0807CA92:
- ldr r0, =gUnknown_08338DFC
+ ldr r0, =gSpriteTemplate_8338DFC
movs r1, 0x80
movs r2, 0x41
movs r3, 0
@@ -10113,7 +10113,7 @@ _0807CA92:
b _0807CFB4
.pool
_0807CAC8:
- ldr r0, =gUnknown_08338E74
+ ldr r0, =gSpriteTemplate_8338E74
movs r1, 0x78
movs r2, 0x50
movs r3, 0
@@ -10255,7 +10255,7 @@ _0807CBEC:
b _0807CF48
.pool
_0807CBF4:
- ldr r0, =gUnknown_08338D28
+ ldr r0, =gSpriteTemplate_8338D28
movs r2, 0x8
negs r2, r2
movs r1, 0x78
@@ -11160,7 +11160,7 @@ _0807D5B8:
beq _0807D5D8
bl _0807E400
_0807D5D8:
- ldr r0, =gUnknown_08338D28
+ ldr r0, =gSpriteTemplate_8338D28
movs r1, 0x78
movs r2, 0x20
movs r3, 0
@@ -11290,7 +11290,7 @@ _0807D6F4:
_0807D704:
movs r0, 0x3
bl sub_807B62C
- ldr r0, =gUnknown_08338E8C
+ ldr r0, =gSpriteTemplate_8338E8C
movs r1, 0x78
movs r2, 0x50
movs r3, 0
@@ -11386,7 +11386,7 @@ _0807D7C4:
adds r0, r1
ldr r1, =sub_807AA4C
str r1, [r0]
- ldr r0, =gUnknown_08338DC8
+ ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x78
movs r2, 0x50
movs r3, 0
@@ -11524,7 +11524,7 @@ _0807D924:
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
- ldr r5, =gUnknown_08338DC8
+ ldr r5, =gSpriteTemplate_8338DC8
adds r0, r5, 0
movs r1, 0x6F
movs r2, 0xAA
@@ -11678,7 +11678,7 @@ _0807DA74:
adds r1, r4, 0
adds r1, 0x10
adds r0, r1
- ldr r1, =gUnknown_08338ECC
+ ldr r1, =gSpriteAffineAnimTable_8338ECC
str r1, [r0]
ldrb r1, [r2]
lsls r0, r1, 4
@@ -12008,7 +12008,7 @@ _0807DD02:
adds r0, r1
ldr r1, =sub_807AA4C
str r1, [r0]
- ldr r0, =gUnknown_08338DC8
+ ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x78
adds r2, r4, 0
movs r3, 0
@@ -12218,7 +12218,7 @@ _0807DF12:
strh r6, [r5]
b _0807E398
_0807DF16:
- ldr r0, =gUnknown_08338E74
+ ldr r0, =gSpriteTemplate_8338E74
movs r1, 0x78
movs r2, 0x50
movs r3, 0
@@ -12360,7 +12360,7 @@ _0807E038:
b _0807E394
.pool
_0807E040:
- ldr r0, =gUnknown_08338D28
+ ldr r0, =gSpriteTemplate_8338D28
movs r2, 0x8
negs r2, r2
movs r1, 0x78
@@ -13184,7 +13184,7 @@ sub_807E73C: @ 807E73C
lsls r4, r0, 4
subs r4, r0
lsls r4, 2
- ldr r0, =gUnknown_08338ED0
+ ldr r0, =gIngameTrades
adds r4, r0
ldr r0, =gStringVar1
ldrh r1, [r4, 0x38]
@@ -13214,7 +13214,7 @@ sub_807E784: @ 807E784
lsls r4, r0, 4
subs r4, r0
lsls r4, 2
- ldr r0, =gUnknown_08338ED0
+ ldr r0, =gIngameTrades
adds r4, r0
ldr r0, =gSpecialVar_0x8005
ldrh r1, [r0]
@@ -13253,7 +13253,7 @@ sub_807E7E8: @ 807E7E8
lsls r2, r1, 4
subs r2, r1
lsls r2, 2
- ldr r1, =gUnknown_08338ED0
+ ldr r1, =gIngameTrades
adds r5, r2, r1
movs r1, 0x64
muls r0, r1
diff --git a/data/battle_frontier_1.s b/data/battle_frontier_1.s
index 177d8adfc..34e8df6d2 100644
--- a/data/battle_frontier_1.s
+++ b/data/battle_frontier_1.s
@@ -243,7 +243,7 @@ gUnknown_0860CE94:: @ 860CE94
window_template 0x00, 0x00, 0x03, 0x08, 0x10, 0x0f, 0x0010
window_template 0x00, 0x16, 0x03, 0x08, 0x10, 0x0f, 0x0090
window_template 0x00, 0x08, 0x01, 0x0e, 0x02, 0x0f, 0x0110
- window_template_terminator
+ null_window_template
.align 2
gUnknown_0860CEB4:: @ 860CEB4
diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s
index bfb99f97d..c9bab5a64 100644
--- a/data/battle_frontier_2.s
+++ b/data/battle_frontier_2.s
@@ -108,7 +108,7 @@ gUnknown_08610434:: @ 8610434
window_template 0x00, 0x16, 0x0e, 0x08, 0x06, 0x0f, 0x006b
window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x009b
window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00bb
- window_template_terminator
+ null_window_template
.align 1
gUnknown_0861046C:: @ 861046C
@@ -345,7 +345,7 @@ gUnknown_086108C8:: @ 86108C8
window_template 0x02, 0x0a, 0x02, 0x04, 0x02, 0x0e, 0x00c1
window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0f, 0x00c9
window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00df
- window_template_terminator
+ null_window_template
gUnknown_08610918:: @ 8610918
.byte 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x1f, 0x00
diff --git a/data/battle_records.s b/data/battle_records.s
index 22c487e4c..86dc9d8b9 100644
--- a/data/battle_records.s
+++ b/data/battle_records.s
@@ -23,7 +23,7 @@ gUnknown_085B3D64:: @ 85B3D64
.align 2
gUnknown_085B3D6C:: @ 85B3D6C
window_template 0x00, 0x02, 0x01, 0x1a, 0x12, 0x0f, 0x0014
- window_template_terminator
+ null_window_template
.align 2
gUnknown_085B3D7C:: @ 85B3D7C
diff --git a/data/berry_tag_screen.s b/data/berry_tag_screen.s
index 01a44bb14..13078e8e5 100644
--- a/data/berry_tag_screen.s
+++ b/data/berry_tag_screen.s
@@ -23,7 +23,7 @@ gUnknown_085EFD28:: @ 85EFD28
window_template 0x01, 0x0b, 0x07, 0x12, 0x04, 0x0f, 0x0055
window_template 0x01, 0x04, 0x0e, 0x19, 0x04, 0x0f, 0x009d
window_template 0x00, 0x02, 0x00, 0x08, 0x02, 0x0f, 0x0101
- window_template_terminator
+ null_window_template
.align 2
gBerryFirmnessStringPointers:: @ 85EFD50
diff --git a/data/contest.s b/data/contest.s
index 0db64b13a..53cab1935 100644
--- a/data/contest.s
+++ b/data/contest.s
@@ -295,7 +295,7 @@ gUnknown_08587F44:: @ 8587F44
window_template 0x00, 0x01, 0x25, 0x09, 0x02, 0x0f, 0x02da
window_template 0x00, 0x10, 0x1f, 0x01, 0x02, 0x0f, 0x02ec
window_template 0x00, 0x0b, 0x23, 0x12, 0x04, 0x0f, 0x02ee
- window_template_terminator
+ null_window_template
.align 2
gUnknown_08587FA4:: @ 8587FA4
diff --git a/data/contest_link_80F57C4.s b/data/contest_link_80F57C4.s
index 6bf51d174..a434eee28 100644
--- a/data/contest_link_80F57C4.s
+++ b/data/contest_link_80F57C4.s
@@ -68,7 +68,7 @@ gUnknown_0858D898:: @ 858D898
window_template 0x01, 0x07, 0x07, 0x0c, 0x02, 0x0f, 0x031a
window_template 0x01, 0x07, 0x0a, 0x0c, 0x02, 0x0f, 0x0332
window_template 0x01, 0x07, 0x0d, 0x0c, 0x02, 0x0f, 0x034a
- window_template_terminator
+ null_window_template
.align 2
gUnknown_0858D8C0:: @ 858D8C0
diff --git a/data/credits.s b/data/credits.s
index cc75915a0..a5c0837d1 100644
--- a/data/credits.s
+++ b/data/credits.s
@@ -1493,7 +1493,7 @@ gUnknown_085E6F68:: @ 85E6F68 struct BgTemplate
.align 2
gUnknown_085E6F6C:: @ 85E6F6C
window_template 0x00, 0x00, 0x09, 0x1e, 0x0c, 0x08, 0x0001
- window_template_terminator
+ null_window_template
.align 2
gUnknown_085E6F7C:: @ 85E6F7C
diff --git a/data/data2b.s b/data/data2b.s
index 1400b31d3..6c24060a0 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -4711,7 +4711,7 @@ gUnknown_0831AA18:: @ 831AA18
window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0
window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0
window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0
- window_template_terminator
+ null_window_template
.align 2
gUnknown_0831AAE0:: @ 831AAE0
@@ -4738,7 +4738,7 @@ gUnknown_0831AAE0:: @ 831AAE0
window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c
window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090
- window_template_terminator
+ null_window_template
.align 2
gUnknown_0831ABA0:: @ 831ABA0
diff --git a/data/easy_chat.s b/data/easy_chat.s
index edbb77f59..ce416dfbc 100644
--- a/data/easy_chat.s
+++ b/data/easy_chat.s
@@ -273,7 +273,7 @@ gUnknown_08597C64:: @ 8597C64
window_template 0x01, 0x06, 0x00, 0x12, 0x02, 0x0a, 0x0010
window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x000a
window_template 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000
- window_template_terminator
+ null_window_template
.align 2
gUnknown_08597C84:: @ 8597C84
diff --git a/data/link.s b/data/link.s
index f1f84c5b8..e458ad5de 100644
--- a/data/link.s
+++ b/data/link.s
@@ -60,7 +60,7 @@ gUnknown_082ED204:: @ 82ED204
window_template 0x00, 0x00, 0x00, 0x1E, 0x05, 0x0F, 0x0002
window_template 0x00, 0x00, 0x06, 0x1E, 0x07, 0x0F, 0x0098
window_template 0x00, 0x00, 0x0D, 0x1E, 0x07, 0x0F, 0x016A
- window_template_terminator
+ null_window_template
.align 2
gUnknown_082ED224:: @ 82ED224
@@ -1887,7 +1887,7 @@ gUnknown_082F05A8:: @ 82F05A8
window_template 0x00, 0x00, 0x00, 0x1e, 0x02, 0x0c, 0x0013
window_template 0x00, 0x01, 0x0f, 0x1c, 0x04, 0x0c, 0x004f
window_template 0x00, 0x00, 0x0f, 0x1e, 0x05, 0x0d, 0x004f
- window_template_terminator
+ null_window_template
.align 2
gUnknown_082F05C8:: @ 82F05C8
@@ -2071,7 +2071,7 @@ gUnknown_082F0D3C:: @ 82F0D3C
window_template 0x00, 0x03, 0x00, 0x18, 0x03, 0x0f, 0x0001
window_template 0x00, 0x03, 0x04, 0x15, 0x0f, 0x0f, 0x0049
window_template 0x00, 0x18, 0x04, 0x03, 0x0f, 0x0f, 0x0184
- window_template_terminator
+ null_window_template
.align 2
gUnknown_082F0D5C:: @ 82F0D5C
@@ -2103,7 +2103,7 @@ gUnknown_082F0DD0:: @ 82F0DD0
.align 2
gUnknown_082F0DD4:: @ 82F0DD4
window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0e, 0x0014
- window_template_terminator
+ null_window_template
.align 2
gUnknown_082F0DE4:: @ 82F0DE4
@@ -2756,7 +2756,7 @@ gUnknown_082F2C70:: @ 82F2C70
window_template 0x01, 0x09, 0x12, 0x0f, 0x02, 0x0c, 0x007a
window_template 0x01, 0x00, 0x02, 0x06, 0x0f, 0x07, 0x0020
window_template 0x00, 0x01, 0x02, 0x07, 0x09, 0x0e, 0x0013
- window_template_terminator
+ null_window_template
.align 2
gUnknown_082F2C98:: @ 82F2C98
@@ -3023,12 +3023,12 @@ gUnknown_082F32F4:: @ 82F32F4
window_template 0x00, 0x00, 0x06, 0x09, 0x02, 0x08, 0x03c9
window_template 0x00, 0x15, 0x03, 0x09, 0x02, 0x08, 0x03b7
window_template 0x00, 0x15, 0x06, 0x09, 0x02, 0x08, 0x03a5
- window_template_terminator
+ null_window_template
window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
window_template 0x00, 0x04, 0x02, 0x16, 0x10, 0x0f, 0x0001
- window_template_terminator
+ null_window_template
.align 2
gUnknown_082F3344:: @ 82F3344
@@ -4422,7 +4422,7 @@ gUnknown_082FE164:: @ 82FE164 struct BgTemplate
gUnknown_082FE174:: @ 82FE174
window_template 0x00, 0x13, 0x00, 0x06, 0x02, 0x02, 0x0013
window_template 0x00, 0x08, 0x00, 0x06, 0x02, 0x02, 0x001f
- window_template_terminator
+ null_window_template
.align 2
gUnknown_082FE18C:: @ 82FE18C
diff --git a/data/main_menu.s b/data/main_menu.s
index fba0e7ddb..019fdfab8 100644
--- a/data/main_menu.s
+++ b/data/main_menu.s
@@ -42,7 +42,7 @@ gUnknown_082FF048:: @ 82FF048
.align 2
gUnknown_082FF070:: @ 82FF070
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x0f, 0x016d
- window_template_terminator
+ null_window_template
.align 2
gUnknown_082FF080:: @ 82FF080
@@ -52,7 +52,7 @@ gUnknown_082FF080:: @ 82FF080
gUnknown_082FF088:: @ 82FF088
window_template 0x00, 0x03, 0x05, 0x06, 0x04, 0x0f, 0x006d
window_template 0x00, 0x03, 0x02, 0x09, 0x0a, 0x0f, 0x0085
- window_template_terminator
+ null_window_template
.align 2
gMainMenuBgPal:: @ 82FF0A0
diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s
index f123f4fe2..f05613b00 100644
--- a/data/pokemon_storage_system.s
+++ b/data/pokemon_storage_system.s
@@ -87,7 +87,7 @@ gUnknown_08572714:: @ 8572714
window_template 0x01, 0x00, 0x0b, 0x09, 0x07, 0x03, 0x00c0
window_template 0x00, 0x0b, 0x11, 0x12, 0x02, 0x0f, 0x0014
window_template 0x00, 0x00, 0x0d, 0x15, 0x07, 0x0f, 0x0014
- window_template_terminator
+ null_window_template
.align 2
gUnknown_08572734:: @ 8572734
diff --git a/data/pokenav.s b/data/pokenav.s
index 3a8be11a3..03c0d4b8a 100644
--- a/data/pokenav.s
+++ b/data/pokenav.s
@@ -127,7 +127,7 @@ gUnknown_0861FA04:: @ 861FA04
gUnknown_0861FA08:: @ 861FA08
window_template 0, 1, 0x16, 0x10, 0x2, 0x0, 0x36
- window_template_terminator
+ null_window_template
gUnknown_0861FA18:: @ 861FA18
.4byte gUnknown_085EBED5
diff --git a/data/reset_rtc_screen.s b/data/reset_rtc_screen.s
index 37c532497..6d3964da8 100644
--- a/data/reset_rtc_screen.s
+++ b/data/reset_rtc_screen.s
@@ -11,7 +11,7 @@ gUnknown_08510404:: @ 8510404 struct BgTemplate
gUnknown_08510408:: @ 8510408
window_template 0x00, 0x01, 0x01, 0x13, 0x09, 0x0f, 0x0155
window_template 0x00, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x00e9
- window_template_terminator
+ null_window_template
.align 2
gUnknown_08510420:: @ 8510420
diff --git a/data/shop.s b/data/shop.s
index d19feff1e..58f294e6b 100644
--- a/data/shop.s
+++ b/data/shop.s
@@ -46,7 +46,7 @@ gUnknown_08589A70:: @ 8589A70
window_template 0, 1, 11, 12, 2, 15, 0x176
window_template 0, 18, 11, 10, 2, 15, 0x18E
window_template 0, 2, 15, 27, 4, 15, 0x1A2
- window_template_terminator
+ null_window_template
gUnknown_08589AA8:: @ 8589AA8
window_template 0, 21, 9, 5, 4, 15, 0x20E
diff --git a/data/slot_machine.s b/data/slot_machine.s
index b25d496d9..b704cdb7a 100644
--- a/data/slot_machine.s
+++ b/data/slot_machine.s
@@ -12,7 +12,7 @@ gUnknown_085A7424:: @ 85A7424
gUnknown_085A7434:: @ 85A7434
window_template 0, 2, 15, 0x1B, 4, 15, 0x194
- window_template_terminator
+ null_window_template
gUnknown_085A7444:: @ 85A7444
window_template 0, 1, 3, 20, 13, 13, 1
diff --git a/data/strings.s b/data/strings.s
index 9ff36256d..30969e452 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -139,17 +139,14 @@ gUnknown_085E852C:: @ 85E852C
.string "CONTROLS$"
.align 2
-
gUnknown_085E8538:: @ 85E8538
.string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}OK$"
.align 2
-
gUnknown_085E8544:: @ 85E8544
.string "{UNK_CTRL_F800}NEXT$"
.align 2
-
gUnknown_085E854C:: @ 85E854C
.string "{UNK_CTRL_F800}NEXT {UNK_CTRL_F801}BACK$"
@@ -1340,27 +1337,22 @@ gText_EggCantBeTradedNow:: @ 85EA234
.string "An EGG can’t be traded now.$"
.align 2
-
-gUnknown_085EA250:: @ 85EA250
+gText_OtherTrainersPkmnCantBeTraded:: @ 85EA250
.string "The other TRAINER’s POKéMON\ncan’t be traded now.$"
.align 2
-
gUnknown_085EA284:: @ 85EA284
.string "The other TRAINER can’t accept\nthat POKéMON now.$"
.align 2
-
gUnknown_085EA2B8:: @ 85EA2B8
.string "You can’t trade with that\nTRAINER now.$"
.align 2
-
gUnknown_085EA2E0:: @ 85EA2E0
.string "That isn’t the type of POKéMON\nthat the other TRAINER wants.$"
.align 2
-
gUnknown_085EA320:: @ 85EA320
.string "That isn’t an EGG.$"
@@ -3585,27 +3577,22 @@ gText_BattlePyramid:: @ 85ED153
.string "BATTLE PYRAMID$"
.align 2
-
gUnknown_085ED164:: @ 85ED164
.string "{STR_VAR_1} SINGLE$"
.align 2
-
gUnknown_085ED170:: @ 85ED170
.string "{STR_VAR_1} DOUBLE$"
.align 2
-
gUnknown_085ED17C:: @ 85ED17C
.string "{STR_VAR_1} MULTI$"
.align 2
-
gUnknown_085ED188:: @ 85ED188
.string "{STR_VAR_1} LINK$"
.align 2
-
gUnknown_085ED190:: @ 85ED190
.string "{STR_VAR_1}$"
@@ -4319,37 +4306,30 @@ gText_FloorsCleared:: @ 85EE39C
.string "Floors cleared: {STR_VAR_1}$"
.align 2
-
gUnknown_085EE3B0:: @ 85EE3B0
.string "LV. 50$"
.align 2
-
gUnknown_085EE3B8:: @ 85EE3B8
.string "OPEN LEVEL$"
.align 2
-
gUnknown_085EE3C4:: @ 85EE3C4
.string "Win streak: {STR_VAR_2}$"
.align 2
-
gUnknown_085EE3D4:: @ 85EE3D4
.string "Clear streak: {STR_VAR_2}$"
.align 2
-
gUnknown_085EE3E8:: @ 85EE3E8
.string "Rooms cleared: {STR_VAR_2}$"
.align 2
-
gUnknown_085EE3FC:: @ 85EE3FC
.string "KOs in a row: {STR_VAR_2}$"
.align 2
-
gUnknown_085EE410:: @ 85EE410
.string "Floors cleared: {STR_VAR_2}$"
@@ -4931,7 +4911,6 @@ gText_WhereShouldNewsBeAccessed:: @ 85EEF94
.string "Where should the WONDER NEWS\nbe accessed?$"
.align 2
-
gUnknown_085EEFC0:: @ 85EEFC0
.string "Communication standby…\nB Button: Cancel$"
diff --git a/data/trade.s b/data/trade.s
index 7308b92a3..4958d5717 100644
--- a/data/trade.s
+++ b/data/trade.s
@@ -1,26 +1,35 @@
+#include "constants/species.h"
+#include "constants/items.h"
.include "asm/macros.inc"
.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
+gText_EmptyString7:: @ 832DABC
+ .string "$"
+
+gText_ClrWhtHltTrspntShdwDrkGry:: @ 832DABD
+ .string "{COLOR WHITE}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}$"
gText_MaleSymbol4:: @ 832DAC7
.string "♂$"
@@ -29,175 +38,609 @@ gText_FemaleSymbol4:: @ 832DAC9
.string "♀$"
gText_GenderlessSymbol:: @ 832DACB
- .incbin "baserom.gba", 0x32dacb, 0x7
+ .string "$"
+
+gText_SpaceMove:: @ 832DACC
+ .string " MOVE$"
+
+gText_NewLine3:: @ 832DAD2
+ .string "\n$"
+
+gText_Slash2:: @ 832DAD4
+ .string "/$"
+
+gText_Lv2:: @ 832DAD6
+ .string "Lv. $"
+
+gText_ThreeDashes2:: @ 832DADB
+ .string "---$"
+
+gText_FourQuestionMarks:: @ 832DADF
+ .string "????$"
+
+gText_832DAE4:: @ 832DAE4
+ .string "$"
+
+gText_IsThisTradeOkay:: @ 832DAE5
+ .string "Is this trade okay?$"
+
+gText_Cancel6:: @ 832DAF9
+ .string "CANCEL$"
+
+gText_ChooseAPkmn:: @ 832DB00
+ .string "Choose a POKéMON.$"
+
+gText_Summary3:: @ 832DB12
+ .string "SUMMARY$"
+
+gText_Trade2:: @ 832DB1A
+ .string "TRADE$"
+
+gText_CancelTrade:: @ 832DB20
+ .string "Cancel trade?$"
+
+gJPText_832DB2E:: @ 832DB2E
+ .string "Bボタン で もどります$"
+
+gText_Summary4:: @ 832DB3B
+ .string "SUMMARY$"
+
+gText_Trade3:: @ 832DB43
+ .string "TRADE$"
-gUnknown_0832DAD2:: @ 832DAD2
- .incbin "baserom.gba", 0x32dad2, 0xd
+gText_CommunicationStandby6:: @ 832DB49
+ .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Communication standby…\nPlease wait.$"
-gUnknown_0832DADF:: @ 832DADF
- .incbin "baserom.gba", 0x32dadf, 0x6
+gText_TheTradeHasBeenCanceled:: @ 832DB76
+ .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}The trade has\nbeen canceled.$"
-gUnknown_0832DAE5:: @ 832DAE5
- .incbin "baserom.gba", 0x32dae5, 0x157
+gText_YourOnlyPkmnForBattle:: @ 832DB9C
+ .string "That’s your only\nPOKéMON for battle.$"
+gText_WaitingForYourFriend:: @ 832DBC1
+ .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Waiting for your friend\nto finish…$"
+
+gText_YourFriendWantsToTrade:: @ 832DBED
+ .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
- .incbin "baserom.gba", 0x32dc3c, 0x8
+ obj_tiles gUnknown_08DDC6E4, 0x0800, 0x012c
+ .align 2
gUnknown_0832DC44:: @ 832DC44
- .incbin "baserom.gba", 0x32dc44, 0x50
+ obj_pal gUnknown_08DDB444, 0x0929
+
+ .align 2
+gSpriteAnim_832DC4C:: @ 832DC4C
+ .2byte 0x0000, 0x0005, 0xffff, 0x0000
-gUnknown_0832DC94:: @ 832DC94
- .incbin "baserom.gba", 0x32dc94, 0x18
+ .align 2
+gSpriteAnim_832DC54:: @ 832DC54
+ .2byte 0x0008, 0x0005, 0xffff, 0x0000
-gUnknown_0832DCAC:: @ 832DCAC
- .incbin "baserom.gba", 0x32dcac, 0x38
+ .align 2
+gSpriteAnim_832DC5C:: @ 832DC5C
+ .2byte 0x0010, 0x0005, 0xffff, 0x0000
-gUnknown_0832DCE4:: @ 832DCE4
- .incbin "baserom.gba", 0x32dce4, 0x8
+ .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
+ spr_template 0x00c8, 0x133d, gOamData_832DC14, gSpriteAnimTable_832DC7C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+ .align 2
+TradeScreenTextPalette:: @ 832DCC4
+ .incbin "graphics/trade/text.gbapal"
+
+ .align 2
+gSpritePalette_TradeScreenText:: @ 832DCE4
+ obj_pal TradeScreenTextPalette, 0x133d
gUnknown_0832DCEC:: @ 832DCEC
- .incbin "baserom.gba", 0x32dcec, 0x138
+ .byte 0x04, 0x02, 0x0c, 0x0c, 0x00, 0x00, 0x02, 0x04, 0x0c, 0x0c, 0x00, 0x00, 0x07, 0x06, 0x01, 0x00, 0x00, 0x00, 0x01, 0x06, 0x07, 0x00, 0x00, 0x00, 0x05, 0x03, 0x0c, 0x0c, 0x00, 0x00, 0x03, 0x05
+ .byte 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x07, 0x06, 0x01, 0x00, 0x00, 0x06, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x08, 0x07, 0x06
+ .byte 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x05, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x09, 0x08, 0x07, 0x00, 0x00, 0x08, 0x09, 0x06, 0x06, 0x00, 0x00
+ .byte 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x01, 0x01
+ .byte 0x01, 0x01, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x0a, 0x08, 0x06, 0x00, 0x00, 0x00, 0x0a, 0x08, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x0a, 0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x09, 0x07, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x0c
+ .byte 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x04, 0x03, 0x02
+ .byte 0x01, 0x00, 0x0b, 0x09, 0x07, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00
+ .byte 0x0b, 0x09, 0x07, 0x06, 0x00, 0x00, 0x07, 0x06, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_0832DE24:: @ 832DE24
- .incbin "baserom.gba", 0x32de24, 0x1a
+ .byte 0x01, 0x05, 0x08, 0x05, 0x01, 0x0a, 0x08, 0x0a, 0x01, 0x0f, 0x08, 0x0f, 0x10, 0x05, 0x17, 0x05, 0x10, 0x0a, 0x17, 0x0a, 0x10, 0x0f, 0x17, 0x0f, 0x17, 0x12
gUnknown_0832DE3E:: @ 832DE3E
- .incbin "baserom.gba", 0x32de3e, 0x18
+ .byte 0x05, 0x04, 0x0c, 0x04, 0x05, 0x09, 0x0c, 0x09, 0x05, 0x0e, 0x0c, 0x0e, 0x14, 0x04, 0x1b, 0x04, 0x14, 0x09, 0x1b, 0x09, 0x14, 0x0e, 0x1b, 0x0e
gUnknown_0832DE56:: @ 832DE56
- .incbin "baserom.gba", 0x32de56, 0x3e
+ .byte 0x01, 0x03, 0x08, 0x03, 0x01, 0x08, 0x08, 0x08, 0x01, 0x0d, 0x08, 0x0d, 0x10, 0x03, 0x17, 0x03, 0x10, 0x08, 0x17, 0x08, 0x10, 0x0d, 0x17, 0x0d, 0x00, 0x0e, 0x0f, 0x1d, 0x03, 0x05, 0x03, 0x07
+ .byte 0x12, 0x05, 0x12, 0x07, 0x08, 0x07, 0x16, 0x0c, 0x08, 0x07, 0x16, 0x0c, 0x06, 0x07, 0x18, 0x0c, 0x06, 0x07, 0x18, 0x0c, 0x08, 0x07, 0x16, 0x0c, 0x07, 0x07, 0x17, 0x0c, 0x00, 0x00
+ .align 2
gUnknown_0832DE94:: @ 832DE94
- .incbin "baserom.gba", 0x32de94, 0x18
-
+ .4byte gText_Cancel6
+ .4byte gText_ChooseAPkmn
+ .4byte gText_Summary3
+ .4byte gText_Trade2
+ .4byte gText_CancelTrade
+ .4byte gJPText_832DB2E
+
+ .align 2
gUnknown_0832DEAC:: @ 832DEAC
- .incbin "baserom.gba", 0x32deac, 0x10
+ .4byte gText_Summary4, sub_807A000
+ .4byte gText_Trade3, sub_807A024
+ .align 2
gUnknown_0832DEBC:: @ 832DEBC
- .incbin "baserom.gba", 0x32debc, 0x24
+ .4byte gText_CommunicationStandby6
+ .4byte gText_TheTradeHasBeenCanceled
+ .4byte gText_YourOnlyPkmnForBattle
+ .4byte gText_OnlyPkmnForBattle
+ .4byte gText_WaitingForYourFriend
+ .4byte gText_YourFriendWantsToTrade
+ .4byte gText_PkmnCantBeTradedNow
+ .4byte gText_EggCantBeTradedNow
+ .4byte gText_OtherTrainersPkmnCantBeTraded
gUnknown_0832DEE0:: @ 832DEE0
- .incbin "baserom.gba", 0x32dee0, 0x4
+ .byte 0x00, 0x01, 0x02, 0x00
+ .align 2
gUnknown_0832DEE4:: @ 832DEE4
- .incbin "baserom.gba", 0x32dee4, 0x10
+ .4byte 0x000001f8, 0x00001051, 0x00002062, 0x00003073
+ .align 2
gUnknown_0832DEF4:: @ 832DEF4
- .incbin "baserom.gba", 0x32def4, 0x98
-
+ window_template 0x00, 0x04, 0x07, 0x16, 0x04, 0x0f, 0x001e
+ window_template 0x00, 0x13, 0x0f, 0x0a, 0x04, 0x0f, 0x0076
+ window_template 0x00, 0x00, 0x05, 0x08, 0x02, 0x0d, 0x009e
+ window_template 0x00, 0x07, 0x05, 0x08, 0x02, 0x0d, 0x00ae
+ window_template 0x00, 0x00, 0x0a, 0x08, 0x02, 0x0d, 0x00be
+ window_template 0x00, 0x07, 0x0a, 0x08, 0x02, 0x0d, 0x00ce
+ window_template 0x00, 0x00, 0x0f, 0x08, 0x02, 0x0d, 0x00de
+ window_template 0x00, 0x07, 0x0f, 0x08, 0x02, 0x0d, 0x00ee
+ window_template 0x00, 0x0f, 0x05, 0x08, 0x02, 0x0d, 0x00fe
+ window_template 0x00, 0x16, 0x05, 0x08, 0x02, 0x0d, 0x010e
+ window_template 0x00, 0x0f, 0x0a, 0x08, 0x02, 0x0d, 0x011e
+ window_template 0x00, 0x16, 0x0a, 0x08, 0x02, 0x0d, 0x012e
+ window_template 0x00, 0x0f, 0x0f, 0x08, 0x02, 0x0d, 0x013e
+ window_template 0x00, 0x16, 0x0f, 0x08, 0x02, 0x0d, 0x014e
+ window_template 0x00, 0x02, 0x05, 0x0e, 0x02, 0x0d, 0x015e
+ window_template 0x00, 0x03, 0x08, 0x0b, 0x08, 0x0f, 0x017a
+ window_template 0x00, 0x11, 0x05, 0x0e, 0x02, 0x0f, 0x01d2
+ window_template 0x00, 0x12, 0x08, 0x0b, 0x08, 0x0f, 0x01ee
+ null_window_template
+
+ .align 2
gUnknown_0832DF8C:: @ 832DF8C
- .incbin "baserom.gba", 0x32df8c, 0x8
+ window_template 0x00, 0x17, 0x0d, 0x05, 0x04, 0x0f, 0x0246
-gUnknown_0832DF94:: @ 832DF94
- .incbin "baserom.gba", 0x32df94, 0x5
+gJPText_Shedinja:: @ 832DF94
+ .string "ヌケニン$"
gUnknown_0832DF99:: @ 832DF99
- .incbin "baserom.gba", 0x32df99, 0x2027
+ .incbin "baserom.gba", 0x32df99, 0x7
+
+ .align 2
+gTradeBallPalette:: @ 832DFA0
+ .incbin "graphics/trade/ball.gbapal"
+
+ .align 2
+gTradeBallTiles:: @ 832DFC0
+ .incbin "graphics/trade/ball.4bpp"
+
+ .align 2
+gUnknown_832E5C0:: @ 832E5C0
+ .incbin "graphics/trade/pokeball_symbol.8bpp"
+ .align 2
gUnknown_0832FFC0:: @ 832FFC0
- .incbin "baserom.gba", 0x32ffc0, 0x1fa0
+ .incbin "graphics/trade/cable_closeup_map.bin"
+
+ .align 2
+gUnknown_083307C0:: @ 83307C0
+ .incbin "graphics/trade/pokeball_symbol_map.bin"
+
+ .align 2
+gUnknown_083308C0:: @ 83308C0
+ .incbin "graphics/trade/unknown_3308C0.gbapal"
+
+ .align 2
+gUnknown_083308E0:: @ 83308E0
+ .incbin "graphics/trade/gba.gbapal"
+ .incbin "graphics/trade/shadow.gbapal"
+ .incbin "graphics/trade/black.gbapal"
+
+ .align 2
+gUnknown_08330940:: @ 8330940
+ .incbin "graphics/trade/misc.gbapal"
+ .align 2
+gTradeGlow1Tiles:: @ 8330960
+ .incbin "graphics/trade/glow1.4bpp"
+
+ .align 2
+gTradeGlow2Tiles:: @ 8330B60
+ .incbin "graphics/trade/glow2.4bpp"
+
+ .align 2
+gTradeCableEndTiles:: @ 8330D60
+ .incbin "graphics/trade/cable_end.4bpp"
+
+ .align 2
+gTradeGBAScreenTiles:: @ 8330F60
+ .incbin "graphics/trade/gba_screen.4bpp"
+
+ .align 2
gUnknown_08331F60:: @ 8331F60
- .incbin "baserom.gba", 0x331f60, 0x1000
+ .incbin "graphics/trade/shadow_map.bin"
+ .align 2
gUnknown_08332F60:: @ 8332F60
- .incbin "baserom.gba", 0x332f60, 0x2840
+ .incbin "graphics/trade/gba_affine.8bpp"
+ .space 0x40
+
+ .align 2
gUnknown_083357A0:: @ 83357A0
- .incbin "baserom.gba", 0x3357a0, 0x100
+ .incbin "graphics/trade/gba_affine_map_cable.bin"
+ .align 2
gUnknown_083358A0:: @ 83358A0
- .incbin "baserom.gba", 0x3358a0, 0x100
+ .incbin "graphics/trade/gba_affine_map_wireless.bin"
+ .align 2
gUnknown_083359A0:: @ 83359A0
- .incbin "baserom.gba", 0x3359a0, 0x1000
+ .incbin "graphics/trade/gba_map_wireless.bin"
+ .align 2
gUnknown_083369A0:: @ 83369A0
- .incbin "baserom.gba", 0x3369a0, 0x1000
+ .incbin "graphics/trade/gba_map_cable.bin"
+ .align 2
gUnknown_083379A0:: @ 83379A0
- .incbin "baserom.gba", 0x3379a0, 0x100
+ .incbin "graphics/trade/unknown_3379A0.bin.lz"
+ .align 2
gUnknown_08337AA0:: @ 8337AA0
- .incbin "baserom.gba", 0x337aa0, 0x200
+ .incbin "graphics/trade/wireless_signal_send.gbapal"
+ .align 2
gUnknown_08337CA0:: @ 8337CA0
- .incbin "baserom.gba", 0x337ca0, 0x200
+ .incbin "graphics/trade/wireless_signal_receive.gbapal"
+ .align 2
gUnknown_08337EA0:: @ 8337EA0
- .incbin "baserom.gba", 0x337ea0, 0x20
+ .incbin "graphics/trade/black.gbapal"
+ .align 2
gUnknown_08337EC0:: @ 8337EC0
- .incbin "baserom.gba", 0x337ec0, 0x690
+ .incbin "graphics/trade/wireless_signal.4bpp.lz"
+ .align 2
gUnknown_08338550:: @ 8338550
- .incbin "baserom.gba", 0x338550, 0x7c8
-
+ .incbin "graphics/trade/wireless_signal.bin.lz"
+
+ .align 2
+gOamData_8338C44:: @ 8338C44
+ .2byte 0x0100, 0x4000, 0x0000, 0x0000
+
+ .align 2
+gSpriteAnim_8338C4C:: @ 8338C4C
+ .2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0x0010, 0x0003, 0x0014, 0x0003, 0x0018, 0x0003, 0x001c, 0x0003
+ .2byte 0x0020, 0x0003, 0x0024, 0x0003, 0x0028, 0x0003, 0x002c, 0x0003, 0xfffd, 0x0001, 0x0000, 0x0003, 0xffff, 0x0000
+
+ .align 2
+gSpriteAnim_8338C88:: @ 8338C88
+ .2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0x0010, 0x0003, 0x0014, 0x0003, 0x0018, 0x0003, 0x001c, 0x0003
+ .2byte 0x0020, 0x0003, 0x0024, 0x0003, 0x0028, 0x0003, 0x002c, 0x0003, 0xfffd, 0x0002, 0x0000, 0x0003, 0xffff, 0x0000
+
+ .align 2
+gSpriteAnimTable_8338C88:: @ 8338CC4
+ .4byte gSpriteAnim_8338C4C
+ .4byte gSpriteAnim_8338C88
+
+ .align 2
+gSpriteAffineAnim_8338CCC:: @ 8338CCC
+ .2byte 0x0000, 0x0000, 0x0100, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
+
+ .align 2
+gSpriteAffineAnim_8338CDC:: @ 8338CDC
+ .2byte 0xfff8, 0x0000, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
+
+ .align 2
+gSpriteAffineAnim_8338CEC:: @ 8338CEC
+ .2byte 0x0060, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0500, 0x0000, 0x0008, 0x0000, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
+
+ .align 2
+gSpriteAffineAnimTable_8338D0C:: @ 8338D0C
+ .4byte gSpriteAffineAnim_8338CCC
+ .4byte gSpriteAffineAnim_8338CDC
+ .4byte gSpriteAffineAnim_8338CEC
+
+ .align 2
gUnknown_08338D18:: @ 8338D18
- .incbin "baserom.gba", 0x338d18, 0x8
+ obj_tiles gTradeBallTiles, 0x0600, 0x15b5
+ .align 2
gUnknown_08338D20:: @ 8338D20
- .incbin "baserom.gba", 0x338d20, 0x8
+ obj_pal gTradeBallPalette, 0x15b6
+
+ .align 2
+gSpriteTemplate_8338D28:: @ 8338D28
+ spr_template 0x15b5, 0x15b6, gOamData_8338C44, gSpriteAnimTable_8338C88, NULL, gSpriteAffineAnimTable_8338D0C, sub_807E55C
+
+ .align 2
+gOamData_8338D40:: @ 8338D40
+ .2byte 0x0500, 0x8000, 0x0400, 0x0000
-gUnknown_08338D28:: @ 8338D28
- .incbin "baserom.gba", 0x338d28, 0x48
+ .align 2
+gSpriteAnim_8338D48:: @ 8338D48
+ .2byte 0x0000, 0x00c5, 0xffff, 0x0000
+ .align 2
+gSpriteAnimTable_8338D50:: @ 8338D50
+ .4byte gSpriteAnim_8338D48
+
+ .align 2
+gSpriteAffineAnim_8338D54:: @ 8338D54
+ .2byte 0xfff6, 0xfff6, 0x0500, 0x0000, 0x000a, 0x000a, 0x0500, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
+
+ .align 2
+gSpriteAffineAnimTable_8338D6C:: @ 8338D6C
+ .4byte gSpriteAffineAnim_8338D54
+
+ .align 2
gUnknown_08338D70:: @ 8338D70
- .incbin "baserom.gba", 0x338d70, 0x8
+ obj_tiles gTradeGlow1Tiles, 0x0200, 0x15ae
+ .align 2
gUnknown_08338D78:: @ 8338D78
- .incbin "baserom.gba", 0x338d78, 0x8
+ obj_pal gUnknown_08330940, 0x15af
+ .align 2
gUnknown_08338D80:: @ 8338D80
- .incbin "baserom.gba", 0x338d80, 0x8
+ obj_pal gUnknown_083308E0, 0x15b3
+ .align 2
gUnknown_08338D88:: @ 8338D88
- .incbin "baserom.gba", 0x338d88, 0x38
+ spr_template 0x15ae, 0x15af, gOamData_8338D40, gSpriteAnimTable_8338D50, NULL, gSpriteAffineAnimTable_8338D6C, sub_807AA28
+
+ .align 2
+gOamData_8338DA0:: @ 8338DA0
+ .2byte 0x8000, 0x8000, 0x0400, 0x0000
+ .align 2
+gSpriteAnim_8338DA8:: @ 8338DA8
+ .2byte 0x0000, 0x00c5, 0xffff, 0x0000
+
+ .align 2
+gSpriteAnim_8338DB0:: @ 8338DB0
+ .2byte 0x0008, 0x00c5, 0xffff, 0x0000
+
+ .align 2
+gSpriteAnimTable_8338DB8:: @ 8338DB8
+ .4byte gSpriteAnim_8338DA8
+ .4byte gSpriteAnim_8338DB0
+
+ .align 2
gUnknown_08338DC0:: @ 8338DC0
- .incbin "baserom.gba", 0x338dc0, 0x8
+ obj_tiles gTradeGlow2Tiles, 0x0300, 0x15b0
+
+ .align 2
+gSpriteTemplate_8338DC8:: @ 8338DC8
+ spr_template 0x15b0, 0x15af, gOamData_8338DA0, gSpriteAnimTable_8338DB8, NULL, gDummySpriteAffineAnimTable, sub_807AA7C
-gUnknown_08338DC8:: @ 8338DC8
- .incbin "baserom.gba", 0x338dc8, 0x2c
+ .align 2
+gOamData_8338DE0:: @ 8338DE0
+ .2byte 0x8000, 0x8000, 0x0400, 0x0000
+ .align 2
+gSpriteAnim_8338DE8:: @ 8338DE8
+ .2byte 0x0000, 0x000a, 0xffff, 0x0000
+
+ .align 2
+gSpriteAnimTable_8338DF0:: @ 8338DF0
+ .4byte gSpriteAnim_8338DE8
+
+ .align 2
gUnknown_08338DF4:: @ 8338DF4
- .incbin "baserom.gba", 0x338df4, 0x8
+ obj_tiles gTradeCableEndTiles, 0x0100, 0x15b2
-gUnknown_08338DFC:: @ 8338DFC
- .incbin "baserom.gba", 0x338dfc, 0x70
+ .align 2
+gSpriteTemplate_8338DFC:: @ 8338DFC
+ spr_template 0x15b2, 0x15b3, gOamData_8338DE0, gSpriteAnimTable_8338DF0, NULL, gDummySpriteAffineAnimTable, sub_807AABC
-gUnknown_08338E6C:: @ 8338E6C
- .incbin "baserom.gba", 0x338e6c, 0x8
+ .align 2
+gOamData_8338E14:: @ 8338E14
+ .2byte 0x4000, 0xc000, 0x0400, 0x0000
-gUnknown_08338E74:: @ 8338E74
- .incbin "baserom.gba", 0x338e74, 0x18
+ .align 2
+gSpriteAnim_8338E1C:: @ 8338E1C
+ .2byte 0x0000, 0x00c2, 0x0020, 0x00c2, 0x0040, 0x00c2, 0x0060, 0x00c2, 0x0040, 0x00c2, 0x0020, 0x00c2, 0x0000, 0x00c2, 0xfffd, 0x0008
+ .2byte 0xffff, 0x0000
-gUnknown_08338E8C:: @ 8338E8C
- .incbin "baserom.gba", 0x338e8c, 0x18
+ .align 2
+gSpriteAnim_8338E40:: @ 8338E40
+ .2byte 0x0000, 0x00c2, 0x0020, 0x00c2, 0x0040, 0x00c2, 0x0060, 0x00c2, 0x0040, 0x00c2, 0x0020, 0x00c2, 0x0000, 0x00c2, 0xfffd, 0x0002
+ .2byte 0xffff, 0x0000
-gUnknown_08338EA4:: @ 8338EA4
- .incbin "baserom.gba", 0x338ea4, 0x28
+ .align 2
+gSpriteAnimTable_8338E64:: @ 8338E64
+ .4byte gSpriteAnim_8338E1C
-gUnknown_08338ECC:: @ 8338ECC
- .incbin "baserom.gba", 0x338ecc, 0x4
+ .align 2
+gSpriteAnimTable_8338E68:: @ 8338E68
+ .4byte gSpriteAnim_8338E40
-gUnknown_08338ED0:: @ 8338ED0
- .incbin "baserom.gba", 0x338ed0, 0xf0
+gUnknown_08338E6C:: @ 8338E6C
+ obj_tiles gTradeGBAScreenTiles, 0x1000, 0x15b4
+
+ .align 2
+gSpriteTemplate_8338E74:: @ 8338E74
+ spr_template 0x15b4, 0x15b3, gOamData_8338E14, gSpriteAnimTable_8338E64, NULL, gDummySpriteAffineAnimTable, sub_807AB04
+ .align 2
+gSpriteTemplate_8338E8C:: @ 8338E8C
+ spr_template 0x15b4, 0x15b3, gOamData_8338E14, gSpriteAnimTable_8338E68, NULL, gDummySpriteAffineAnimTable, sub_807AB04
+
+ .align 1
+gUnknown_08338EA4:: @ 8338EA4
+ .incbin "graphics/trade/unknown_338EA4.gbapal"
+
+ .align 2
+gSpriteAffineAnim_8338EBC:: @ 8338EBC
+ .2byte 0xff00, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
+
+ .align 2
+gSpriteAffineAnimTable_8338ECC:: @ 8338ECC
+ .4byte gSpriteAffineAnim_8338EBC
+
+ .align 2
+gIngameTrades:: @ 8338ED0
+ .string "DOTS$", 11
+ .align 1
+ .2byte SPECIES_SEEDOT
+ .byte 5, 4, 5, 4, 4, 4
+ .byte 1
+ .align 2
+ .4byte 0x9746
+ .byte 30, 5, 5, 5, 5
+ .align 2
+ .4byte 0x84
+ .2byte ITEM_CHESTO_BERRY
+ .byte -1
+ .string "KOBE$", 11
+ .byte 0
+ .byte 10
+ .2byte SPECIES_RALTS
+
+ .align 2
+ .string "PLUSES$", 11
+ .align 1
+ .2byte SPECIES_PLUSLE
+ .byte 4, 4, 4, 5, 5, 4
+ .byte 0
+ .align 2
+ .4byte 0x1210c
+ .byte 5, 5, 30, 5, 5
+ .align 2
+ .4byte 0x6f
+ .2byte ITEM_WOOD_MAIL
+ .byte 0
+ .string "ROMAN$", 11
+ .byte 0
+ .byte 10
+ .2byte SPECIES_VOLBEAT
+
+ .align 2
+ .string "SEASOR$", 11
+ .align 1
+ .2byte SPECIES_HORSEA
+ .byte 5, 4, 4, 4, 5, 4
+ .byte 0
+ .align 2
+ .4byte 0xb4cd
+ .byte 5, 5, 5, 5, 30
+ .align 2
+ .4byte 0x7f
+ .2byte ITEM_WAVE_MAIL
+ .byte 1
+ .string "SKYLAR$", 11
+ .byte 0
+ .byte 10
+ .2byte SPECIES_BAGON
+
+ .align 2
+ .string "MEOWOW$", 11
+ .align 1
+ .2byte SPECIES_MEOWTH
+ .byte 4, 5, 4, 5, 4, 4
+ .byte 0
+ .align 2
+ .4byte 0x16559
+ .byte 5, 5, 5, 30, 5
+ .align 2
+ .4byte 0x8b
+ .2byte ITEM_RETRO_MAIL
+ .byte 2
+ .string "ISIS$", 11
+ .byte 1
+ .byte 10
+ .2byte SPECIES_SKITTY
+
+ .align 2
gUnknown_08338FC0:: @ 8338FC0
- .incbin "baserom.gba", 0x338fc0, 0x3c
+ .2byte 0x1006, 0x1232, 0x102f, 0x0161, 0x0c00, 0x0182, 0x1000, 0x1006, 0x0e3b, 0x0000, 0x0a01, 0x1000, 0x161e, 0x018b, 0x0433, 0x1611
+ .2byte 0x180f, 0x0074, 0x1440, 0x0000, 0x0811, 0x102b, 0x013b, 0x2a34, 0x0c16, 0x1037, 0x1020, 0x0418, 0x0c23, 0x0000
+ .align 2
gUnknown_08338FFC:: @ 8338FFC
- .incbin "baserom.gba", 0x338ffc, 0x10
+ window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0040
+ null_window_template
+ .align 2
gUnknown_0833900C:: @ 833900C
- .incbin "baserom.gba", 0x33900c, 0x8
+ window_template 0x00, 0x15, 0x09, 0x05, 0x04, 0x0f, 0x00bc
+ .align 2
gUnknown_08339014:: @ 8339014
- .incbin "baserom.gba", 0x339014, 0x10
+ .4byte 0x000001fc, 0x00002051, 0x00002326, 0x00003063
gUnknown_08339024:: @ 8339024
- .incbin "baserom.gba", 0x339024, 0x6c
+ .byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0xfc, 0xfc, 0xfc, 0xfd, 0xfd, 0xfd, 0xfd, 0xfe, 0xfe, 0xfe
+ .byte 0xfe, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04
+ .byte 0x04, 0x04, 0xfc, 0xfd, 0xfd, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0xfc, 0xfd, 0xfe, 0xff
+ .byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x02, 0x03
gUnknown_08339090:: @ 8339090
- .incbin "baserom.gba", 0x339090, 0x44
+ .byte 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x01, 0x05, 0x02, 0x06, 0x02, 0x07, 0x02, 0x08, 0x02, 0x09, 0x02, 0x0a, 0x03, 0x0b, 0x03, 0x0c, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x0f, 0x02
+ .byte 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x01, 0x05, 0x02, 0x06, 0x02, 0x07, 0x02, 0x08, 0x02, 0x09, 0x02, 0x0a, 0x03, 0x0b, 0x03, 0x0c, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x10, 0x01
+ .byte 0x10, 0xff, 0x00, 0x00
diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s
index ffb7802d9..0e99cf223 100644
--- a/data/use_pokeblock.s
+++ b/data/use_pokeblock.s
@@ -34,7 +34,7 @@ gUnknown_085DFCDC:: @ 85DFCDC
window_template 0, 0xD, 1, 0xD, 4, 0xF, 1
window_template 0, 0, 0xE, 0xB, 2, 0xF, 0x35
window_template 0, 1, 0x11, 0x1C, 2, 0xF, 0x4B
- window_template_terminator
+ null_window_template
sUsePokeblockYesNoWinTemplate:: @ 85DFCFC
window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x83
diff --git a/graphics/trade/ball.png b/graphics/trade/ball.png
new file mode 100644
index 000000000..97cc86a6f
--- /dev/null
+++ b/graphics/trade/ball.png
Binary files differ
diff --git a/graphics/trade/black.pal b/graphics/trade/black.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/graphics/trade/black.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/trade/cable_closeup_map.bin b/graphics/trade/cable_closeup_map.bin
new file mode 100644
index 000000000..aad25ed83
--- /dev/null
+++ b/graphics/trade/cable_closeup_map.bin
Binary files differ
diff --git a/graphics/trade/cable_end.png b/graphics/trade/cable_end.png
new file mode 100644
index 000000000..1d7828a00
--- /dev/null
+++ b/graphics/trade/cable_end.png
Binary files differ
diff --git a/graphics/trade/gba.pal b/graphics/trade/gba.pal
new file mode 100644
index 000000000..64a442293
--- /dev/null
+++ b/graphics/trade/gba.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+230 230 230
+205 205 205
+180 180 180
+156 156 156
+213 180 106
+205 156 82
+49 255 106
diff --git a/graphics/trade/gba_affine.png b/graphics/trade/gba_affine.png
new file mode 100644
index 000000000..b8c2623c4
--- /dev/null
+++ b/graphics/trade/gba_affine.png
Binary files differ
diff --git a/graphics/trade/gba_affine_map_cable.bin b/graphics/trade/gba_affine_map_cable.bin
new file mode 100644
index 000000000..19bab962b
--- /dev/null
+++ b/graphics/trade/gba_affine_map_cable.bin
Binary files differ
diff --git a/graphics/trade/gba_affine_map_wireless.bin b/graphics/trade/gba_affine_map_wireless.bin
new file mode 100644
index 000000000..53a511321
--- /dev/null
+++ b/graphics/trade/gba_affine_map_wireless.bin
Binary files differ
diff --git a/graphics/trade/gba_map_cable.bin b/graphics/trade/gba_map_cable.bin
new file mode 100644
index 000000000..80705aef5
--- /dev/null
+++ b/graphics/trade/gba_map_cable.bin
Binary files differ
diff --git a/graphics/trade/gba_map_wireless.bin b/graphics/trade/gba_map_wireless.bin
new file mode 100644
index 000000000..52f6232fc
--- /dev/null
+++ b/graphics/trade/gba_map_wireless.bin
Binary files differ
diff --git a/graphics/trade/gba_screen.png b/graphics/trade/gba_screen.png
new file mode 100644
index 000000000..4220e5e0d
--- /dev/null
+++ b/graphics/trade/gba_screen.png
Binary files differ
diff --git a/graphics/trade/glow1.png b/graphics/trade/glow1.png
new file mode 100644
index 000000000..e223d97ce
--- /dev/null
+++ b/graphics/trade/glow1.png
Binary files differ
diff --git a/graphics/trade/glow2.png b/graphics/trade/glow2.png
new file mode 100644
index 000000000..e7729bc84
--- /dev/null
+++ b/graphics/trade/glow2.png
Binary files differ
diff --git a/graphics/trade/misc.pal b/graphics/trade/misc.pal
new file mode 100644
index 000000000..32fafddfc
--- /dev/null
+++ b/graphics/trade/misc.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 156 123
+164 123 197
+41 255 115
+0 139 255
+255 255 74
+255 255 255
+106 106 106
+255 156 123
+255 156 123
+255 156 123
+255 156 123
+255 156 123
+255 156 123
+255 156 123
+255 156 123
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/pokeball_symbol.png b/graphics/trade/pokeball_symbol.png
new file mode 100644
index 000000000..3b4a30f4f
--- /dev/null
+++ b/graphics/trade/pokeball_symbol.png
Binary files differ
diff --git a/graphics/trade/pokeball_symbol_map.bin b/graphics/trade/pokeball_symbol_map.bin
new file mode 100644
index 000000000..8355c2f5c
--- /dev/null
+++ b/graphics/trade/pokeball_symbol_map.bin
Binary files differ
diff --git a/graphics/trade/shadow.pal b/graphics/trade/shadow.pal
new file mode 100644
index 000000000..a4bec6478
--- /dev/null
+++ b/graphics/trade/shadow.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+0 16 172
+32 32 106
+16 16 90
+0 0 74
+255 255 189
+230 230 164
+205 205 148
+189 180 115
+139 139 90
+74 74 57
+32 32 32
diff --git a/graphics/trade/shadow_map.bin b/graphics/trade/shadow_map.bin
new file mode 100644
index 000000000..8846e2d7d
--- /dev/null
+++ b/graphics/trade/shadow_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
diff --git a/graphics/trade/unknown_3308C0.pal b/graphics/trade/unknown_3308C0.pal
new file mode 100644
index 000000000..72cf8b7c9
--- /dev/null
+++ b/graphics/trade/unknown_3308C0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 57 8
+255 90 8
+255 131 8
+255 172 8
+255 213 8
+255 255 8
+255 255 131
+255 255 255
+255 255 0
+65 0 0
+115 16 0
+172 32 0
+230 57 8
+0 0 0
+0 0 0
diff --git a/graphics/trade/unknown_3379A0.bin b/graphics/trade/unknown_3379A0.bin
new file mode 100644
index 000000000..d1e364a29
--- /dev/null
+++ b/graphics/trade/unknown_3379A0.bin
Binary files differ
diff --git a/graphics/trade/unknown_338EA4.pal b/graphics/trade/unknown_338EA4.pal
new file mode 100644
index 000000000..346db3df8
--- /dev/null
+++ b/graphics/trade/unknown_338EA4.pal
@@ -0,0 +1,15 @@
+JASC-PAL
+0100
+12
+148 197 255
+148 197 255
+148 197 255
+255 255 255
+255 255 255
+255 255 255
+148 197 255
+148 197 255
+148 197 255
+255 255 255
+255 255 255
+255 255 255
diff --git a/graphics/trade/wireless_signal.bin b/graphics/trade/wireless_signal.bin
new file mode 100644
index 000000000..4ce5d18b8
--- /dev/null
+++ b/graphics/trade/wireless_signal.bin
Binary files differ
diff --git a/graphics/trade/wireless_signal.png b/graphics/trade/wireless_signal.png
new file mode 100644
index 000000000..a48c70ae7
--- /dev/null
+++ b/graphics/trade/wireless_signal.png
Binary files differ
diff --git a/graphics/trade/wireless_signal_receive.pal b/graphics/trade/wireless_signal_receive.pal
new file mode 100644
index 000000000..218390aa2
--- /dev/null
+++ b/graphics/trade/wireless_signal_receive.pal
@@ -0,0 +1,259 @@
+JASC-PAL
+0100
+256
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
diff --git a/graphics/trade/wireless_signal_send.pal b/graphics/trade/wireless_signal_send.pal
new file mode 100644
index 000000000..a5da8a543
--- /dev/null
+++ b/graphics/trade/wireless_signal_send.pal
@@ -0,0 +1,259 @@
+JASC-PAL
+0100
+256
+0 0 0
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172