summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-11-22 10:42:31 -0500
committerGitHub <noreply@github.com>2019-11-22 10:42:31 -0500
commit548490c675f68dfacf4d1939486c47d8405dddd8 (patch)
tree9d21e9bb940cfb6b03c51b23986f3d7503333562
parent2d284654440cb77365639bf107c31b44326362e3 (diff)
parent04272c51df9f2ef08219cb6c3e03d3242c709803 (diff)
Merge pull request #163 from PikalaxALT/dism_more_data
Data dism: item_menu, link_rfu_2, union_room_chat
-rw-r--r--asm/link_rfu_2.s4
-rw-r--r--asm/union_room_chat.s4
-rw-r--r--baserom.ipsbin248798 -> 244193 bytes
-rw-r--r--data/data_8471F00.s85
-rw-r--r--data/item_menu.s92
-rw-r--r--data/link_rfu_2.s203
-rw-r--r--data/union_room_chat.s332
-rw-r--r--graphics/interface/select_button.pngbin0 -> 191 bytes
-rw-r--r--graphics/interface/wireless_link_icon.pngbin0 -> 308 bytes
-rw-r--r--graphics/item_menu/bagmap_0.binbin0 -> 36 bytes
-rw-r--r--graphics/item_menu/bagmap_1.binbin0 -> 36 bytes
-rw-r--r--graphics/item_menu/bagmap_2.binbin0 -> 36 bytes
-rw-r--r--graphics/item_menu/bagmap_3.binbin0 -> 36 bytes
-rw-r--r--graphics/item_menu/bagmap_4.binbin0 -> 36 bytes
-rw-r--r--graphics/item_menu/bagmap_5.binbin0 -> 36 bytes
-rw-r--r--graphics/item_menu/bagmap_6.binbin0 -> 36 bytes
-rw-r--r--graphics/item_menu/bagmap_7.binbin0 -> 36 bytes
-rw-r--r--graphics/item_menu/bagmap_8.binbin0 -> 36 bytes
-rw-r--r--graphics/item_menu/bagmap_9.binbin0 -> 36 bytes
-rw-r--r--graphics/item_menu/bagmap_A.binbin0 -> 36 bytes
-rw-r--r--graphics/item_menu/bagmap_B.binbin0 -> 36 bytes
-rw-r--r--graphics/union_room_chat/unk_845AA24.pal19
-rw-r--r--graphics/union_room_chat/unk_845AA44.pal19
-rw-r--r--graphics/union_room_chat/unk_845AA64.pal19
-rw-r--r--graphics/union_room_chat/unk_845AC14.pal19
-rw-r--r--graphics/union_room_chat/unk_845AC34.pngbin0 -> 320 bytes
-rw-r--r--graphics/union_room_chat/unk_845AEB8.pngbin0 -> 159 bytes
-rw-r--r--graphics/union_room_chat/unk_845AED8.pngbin0 -> 170 bytes
-rw-r--r--graphics/union_room_chat/unk_845AF04.pngbin0 -> 190 bytes
29 files changed, 734 insertions, 62 deletions
diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s
index 8f896ea7c..c1582c4e4 100644
--- a/asm/link_rfu_2.s
+++ b/asm/link_rfu_2.s
@@ -2308,7 +2308,7 @@ sub_80F9828: @ 80F9828
cmp r0, 0
beq _080F983E
ldr r0, _080F984C @ =gUnknown_843ED94 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu.c"
- ldr r1, _080F9850 @ =0x000005c1
+ ldr r1, _080F9850 @ =0x000005c1 // 1473
ldr r2, _080F9854 @ =gUnknown_843EDC4 "Rfu.RfuFunc == NULL"
movs r3, 0x1
bl AGBAssert
@@ -3137,7 +3137,7 @@ Rfu_InitBlockSend: @ 80F9E60
cmp r6, 0xFC
bls _080F9E7C
ldr r0, _080F9EA8 @ =gUnknown_843ED94 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu.c"
- ldr r1, _080F9EAC @ =0x00000701
+ ldr r1, _080F9EAC @ =0x00000701 // 1793
ldr r2, _080F9EB0 @ =gUnknown_843EDD8 "size<=252"
movs r3, 0x1
bl AGBAssert
diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s
index ae5381dda..1a2b4951e 100644
--- a/asm/union_room_chat.s
+++ b/asm/union_room_chat.s
@@ -5660,7 +5660,7 @@ sub_812AF8C: @ 812AF8C
push {r4,lr}
adds r4, r0, 0
lsls r4, 2
- ldr r0, _0812AFB8 @ =gUnknown_845AC16
+ ldr r0, _0812AFB8 @ =gUnknown_845AC14 + 2
adds r4, r0
movs r0, 0
bl IndexOfSpritePaletteTag
@@ -5677,7 +5677,7 @@ sub_812AF8C: @ 812AF8C
pop {r0}
bx r0
.align 2, 0
-_0812AFB8: .4byte gUnknown_845AC16
+_0812AFB8: .4byte gUnknown_845AC14 + 2
_0812AFBC: .4byte 0x01010000
thumb_func_end sub_812AF8C
diff --git a/baserom.ips b/baserom.ips
index dbfed775a..cfed26693 100644
--- a/baserom.ips
+++ b/baserom.ips
Binary files differ
diff --git a/data/data_8471F00.s b/data/data_8471F00.s
index 62a23c646..c3b4b7c01 100644
--- a/data/data_8471F00.s
+++ b/data/data_8471F00.s
@@ -218,38 +218,103 @@ gUnknown_847A913::
gUnknown_847A934::
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
+
+gUnknown_847A955::
.string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 26}.$"
+
+gUnknown_847A976::
.string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 6}k{CLEAR 6}l{CLEAR 7} {CLEAR 26},$"
+
+gUnknown_847A997::
.string "{CLEAR 11}m{CLEAR 6}n{CLEAR 7}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
+
+gUnknown_847A9B8::
.string "{CLEAR 12}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $"
+
+gUnknown_847A9D9::
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 26}.$"
+
+gUnknown_847A9FA::
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 26},$"
+
+gUnknown_847AA1B::
.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
+
+gUnknown_847AA3C::
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
+
+gUnknown_847AA5D::
.string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
+
+gUnknown_847AA76::
.string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
+
+gUnknown_847AA8F::
.string "{CLEAR 11}!{CLEAR 16}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 16}-$"
+
+gUnknown_847AAA8::
.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $"
+
+gUnknown_847AAC1::
.string "ABCDE$"
+
+gUnknown_847AAC7::
.string "FGHIJ$"
+
+gUnknown_847AACD::
.string "KLMNO$"
+
+gUnknown_847AAD3::
.string "PQRST$"
+
+gUnknown_847AAD9::
.string "UVWXY$"
+
+gUnknown_847AADF::
.string "Z $"
+
+gUnknown_847AAE5::
.string "01234$"
+
+gUnknown_847AAEB::
.string "56789$"
+
+gUnknown_847AAF1::
.string ".,!? $"
+
+gUnknown_847AAF7::
.string "-/&… $"
+
+gUnknown_847AAFD::
.string "abcde$"
+
+gUnknown_847AB03::
.string "fghij$"
+
+gUnknown_847AB09::
.string "klmno$"
+
+gUnknown_847AB0F::
.string "pqrst$"
+
+gUnknown_847AB15::
.string "uvwxy$"
+
+gUnknown_847AB1B::
.string "z $"
+
+gUnknown_847AB21::
.string "01234$"
+
+gUnknown_847AB27::
.string "56789$"
+
+gUnknown_847AB2D::
.string ".,!? $"
+
+gUnknown_847AB33::
.string "-/&… $"
+
.string "$"
.string "$"
.string "$"
@@ -258,15 +323,35 @@ gUnknown_847A934::
.string "$"
.string "$"
.string "$"
+
+gUnknown_847AB41::
.string "{EXTRA 245}{EXTRA 246}{EXTRA 247}{EXTRA 248}{EXTRA 254}$"
+
+gUnknown_847AB4C::
.string "{EXTRA 249}{EXTRA 250}{EXTRA 252}{EXTRA 251}{EXTRA 253}$"
+
+gUnknown_847AB57::
.string "{EXTRA 236}{EXTRA 237}{EXTRA 238}{EXTRA 235}{EXTRA 234}$"
+
+gUnknown_847AB62::
.string "♂♀{EXTRA 212}{EXTRA 213}{EXTRA 211}$"
+
+gUnknown_847AB6B::
.string "{EXTRA 216}{EXTRA 217}{EXTRA 242}{EXTRA 243}{EXTRA 244}$"
+
+gUnknown_847AB76::
.string "{EXTRA 218}{EXTRA 241}{EXTRA 224}{EXTRA 226}{EXTRA 227}$"
+
+gUnknown_847AB81::
.string "{EXTRA 240}{EXTRA 239}{EXTRA 225}{EXTRA 214}{EXTRA 215}$"
+
+gUnknown_847AB8C::
.string "{EXTRA 228}{EXTRA 229}{EXTRA 230}{EXTRA 231}{EXTRA 232}$"
+
+gUnknown_847AB97::
.string "{EXTRA 233}{EXTRA 220}{EXTRA 221}{EXTRA 222}{EXTRA 209}$"
+
+gUnknown_847ABA2::
.string "{EXTRA 210}{EXTRA 208}ょ: $"
// trainer_tower (again?)
diff --git a/data/item_menu.s b/data/item_menu.s
index 6b548edbe..b5cc492e3 100644
--- a/data/item_menu.s
+++ b/data/item_menu.s
@@ -7,52 +7,110 @@
.align 2
gUnknown_8452CF4:: @ 8452CF4
- .incbin "baserom.gba", 0x452CF4, 0x8
+ .4byte 0x000001f0
+ @ {
+ @ .bg = 0,
+ @ .charBaseIndex = 0,
+ @ .mapBaseIndex = 31,
+ @ .screenSize = 0,
+ @ .paletteMode = 0,
+ @ .priority = 0,
+ @ .baseTile = 0x0000
+ @ }
+ .4byte 0x000011ed
+ @ {
+ @ .bg = 1,
+ @ .charBaseIndex = 3,
+ @ .mapBaseIndex = 30,
+ @ .screenSize = 0,
+ @ .paletteMode = 0,
+ @ .priority = 1,
+ @ .baseTile = 0x0000
+ @ }
gUnknown_8452CFC:: @ 8452CFC
- .incbin "baserom.gba", 0x452CFC, 0xC
+ .4byte gUnknown_84162CD
+ .4byte gUnknown_84162DE
+ .4byte gUnknown_84162D3
gUnknown_8452D08:: @ 8452D08
- .incbin "baserom.gba", 0x452D08, 0x1B0
+ .incbin "graphics/item_menu/bagmap_0.bin"
+ .incbin "graphics/item_menu/bagmap_1.bin"
+ .incbin "graphics/item_menu/bagmap_2.bin"
+ .incbin "graphics/item_menu/bagmap_3.bin"
+ .incbin "graphics/item_menu/bagmap_4.bin"
+ .incbin "graphics/item_menu/bagmap_5.bin"
+ .incbin "graphics/item_menu/bagmap_6.bin"
+ .incbin "graphics/item_menu/bagmap_7.bin"
+ .incbin "graphics/item_menu/bagmap_8.bin"
+ .incbin "graphics/item_menu/bagmap_9.bin"
+ .incbin "graphics/item_menu/bagmap_A.bin"
+ .incbin "graphics/item_menu/bagmap_B.bin"
gUnknown_8452EB8:: @ 8452EB8
- .incbin "baserom.gba", 0x452EB8, 0x60
+ .4byte gOtherText_Use, sub_8109C50
+ .4byte gOtherText_Toss, sub_8109CC0
+ .4byte gUnknown_84161A9, sub_810A000
+ .4byte gOtherText_Give, sub_810A0A8
+ .4byte gFameCheckerText_Cancel, sub_810A2DC
+ .4byte gOtherText_Use, sub_810A324
+ .4byte gUnknown_84161E9, sub_8109C50
+ .4byte gUnknown_84161F4, sub_8109C50
+ .4byte gUnknown_84161F4, sub_810A324
+ .4byte gUnknown_84161BC, sub_8109C50
+ .4byte gUnknown_84161F9, sub_810A000
+ .4byte gString_Dummy, NULL
gUnknown_8452F18:: @ 8452F18
- .incbin "baserom.gba", 0x452F18, 0xC
+ .byte 0x00, 0x03, 0x01, 0x04
+ .byte 0x00, 0x02, 0x04, 0x0b
+ .byte 0x03, 0x01, 0x04, 0x0b
gUnknown_8452F24:: @ 8452F24
- .incbin "baserom.gba", 0x452F24, 0x4
+ .byte 0x06, 0x03, 0x01, 0x04
gUnknown_8452F28:: @ 8452F28
- .incbin "baserom.gba", 0x452F28, 0x6
+ .byte 0x03, 0x04
+ .byte 0x04, 0x0b
+ .byte 0x03, 0x04
gUnknown_8452F2E:: @ 8452F2E
- .incbin "baserom.gba", 0x452F2E, 0x2
+ .byte 0x07, 0x04
gUnknown_8452F30:: @ 8452F30
- .incbin "baserom.gba", 0x452F30, 0x2
+ .byte 0x05, 0x04
gUnknown_8452F32:: @ 8452F32
- .incbin "baserom.gba", 0x452F32, 0x2
+ .byte 0x04, 0x0b
gUnknown_8452F34:: @ 8452F34
- .incbin "baserom.gba", 0x452F34, 0x1C
+ .4byte sub_8109BB8
+ .4byte sub_810A370
+ .4byte sub_810A568
+ .4byte sub_810AB40
+ .4byte sub_810A468
+ .4byte sub_8109BB8
+ .4byte NULL
gUnknown_8452F50:: @ 8452F50
- .incbin "baserom.gba", 0x452F50, 0x8
+ .4byte sub_8109EA8
+ .4byte sub_8109DB0
gUnknown_8452F58:: @ 8452F58
- .incbin "baserom.gba", 0x452F58, 0x8
+ .4byte sub_810A940
+ .4byte sub_810A720
gUnknown_8452F60:: @ 8452F60
- .incbin "baserom.gba", 0x452F60, 0x6
+ .string "{COLOR_HIGHLIGHT_SHADOW RED TRANSPARENT GREEN}$"
gUnknown_8452F66:: @ 8452F66
- .incbin "baserom.gba", 0x452F66, 0x6
+ .string "{COLOR_HIGHLIGHT_SHADOW LIGHT_GRAY TRANSPARENT BLACK}$"
gUnknown_8452F6C:: @ 8452F6C
- .incbin "baserom.gba", 0x452F6C, 0x10
+ .byte 0, 8, 72, 1, 72, 72
+ .2byte 0, 2, 111, 111
+ .byte 0
+ .align 2
gUnknown_8452F7C:: @ 8452F7C
- .incbin "baserom.gba", 0x452F7C, 0xC0
+ .incbin "graphics/interface/select_button.4bpp"
diff --git a/data/link_rfu_2.s b/data/link_rfu_2.s
index 9827f17ea..5285ac578 100644
--- a/data/link_rfu_2.s
+++ b/data/link_rfu_2.s
@@ -7,32 +7,91 @@
.align 2
gUnknown_843EBB4:: @ 843EBB4
- .incbin "baserom.gba", 0x43EBB4, 0x18
+ .byte 0x04, 0x20
+ .2byte 0x0000
+ .byte 0x00
+ .align 1
+ .2byte 0x0002
+ .4byte gUnknown_3005440
+ .4byte gUnknown_3005E00
+ .byte 0x01, 0x00
+ .2byte 0x0258, 0x012c
+ .align 2
gUnknown_843EBCC:: @ 843EBCC
- .incbin "baserom.gba", 0x43EBCC, 0x8
+ .byte 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00
gUnknown_843EBD4:: @ 843EBD4
- .incbin "baserom.gba", 0x43EBD4, 0x64
+ .4byte 0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f
+ .4byte 0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff, 0x00000fff, 0x00001fff, 0x00003fff, 0x00007fff
+ .4byte 0x0000ffff, 0x0001ffff, 0x0003ffff, 0x0007ffff, 0x000fffff, 0x001fffff, 0x003fffff, 0x007fffff
+ .4byte 0x00ffffff
gUnknown_843EC38:: @ 843EC38
- .incbin "baserom.gba", 0x43EC38, 0x9
+ .byte 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02
+ .byte 0x03
gUnknown_843EC41:: @ 843EC41
- .incbin "baserom.gba", 0x43EC41, 0x10
+ .byte 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02, 0x03
+ .byte 0x01, 0x02, 0x02, 0x03, 0x02, 0x03, 0x03, 0x04
gUnknown_843EC51:: @ 843EC51
- .incbin "baserom.gba", 0x43EC51, 0x13
+ .byte 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
+ .byte 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
+ .byte 0x00, 0x00, 0x00
gUnknown_843EC64:: @ 843EC64
- .incbin "baserom.gba", 0x43EC64, 0x28
+ .4byte gBlockSendBuffer
+ .2byte 0xc8
+ .align 2
+ .4byte gBlockSendBuffer
+ .2byte 0xc8
+ .align 2
+ .4byte gBlockSendBuffer
+ .2byte 0x64
+ .align 2
+ .4byte gBlockSendBuffer
+ .2byte 0xdc
+ .align 2
+ .4byte gBlockSendBuffer
+ .2byte 0x28
+ .align 2
gUnknown_843EC8C:: @ 843EC8C
- .incbin "baserom.gba", 0x43EC8C, 0xFC
+ .2byte 0x0002, 0x7f7d, 0xffff
+
+ .macro ascipad str, len
+1:
+ .ascii "\str"
+2:
+ .space \len - (2b - 1b)
+ .endm
+
+sUnref_843EC92::
+ ascipad "RFU WAIT", 15
+ ascipad "RFU BOOT", 15
+ ascipad "RFU ERROR", 15
+ ascipad "RFU RESET", 15
+ ascipad "RFU CONFIG", 15
+ ascipad "RFU START", 15
+ ascipad "RFU SC POLL", 15
+ ascipad "RFU SP POLL", 15
+ ascipad "RFU START", 15
+ ascipad "RFU SEND ERR", 15
+ ascipad "RFU CP POLL", 15
+
+sUnref_843ED38::
+ ascipad " ", 16
+ ascipad "RECOVER START ", 16
+ ascipad "DISSCONECT ", 16
+ ascipad "RECOVER SUUSES", 16
+ ascipad "RECOVER FAILED", 16
.align 2
gUnknown_843ED88:: @ 843ED88
- .incbin "baserom.gba", 0x43ED88, 0xC
+ .4byte sub_80FA834
+ .4byte sub_80FAA94
+ .4byte sub_80FACF0
.align 2
gUnknown_843ED94:: @ 843ED94
@@ -62,13 +121,15 @@ gUnknown_843EE10:: @ 843EE10
.align 2
gUnknown_843EE28:: @ 843EE28
- .incbin "baserom.gba", 0x43EE28, 0x1F
+ .asciz " "
gUnknown_843EE47:: @ 843EE47
- .incbin "baserom.gba", 0x43EE47, 0x10
+ .asciz " "
gUnknown_843EE57:: @ 843EE57
- .incbin "baserom.gba", 0x43EE57, 0xD
+ .asciz " "
+ .asciz " "
+ .asciz "*"
.align 2
gUnknown_843EE64:: @ 843EE64
@@ -91,22 +152,126 @@ gUnknown_843EE64:: @ 843EE64
.asciz "SEARCH"
.align 2
- .incbin "baserom.gba", 0x43EEC0, 0x144
+gUnknown_843EEC0::
+ .incbin "graphics/interface/wireless_link_icon.gbapal"
+
+gUnknown_843EEE0::
+ .incbin "graphics/interface/wireless_link_icon.4bpp.lz"
gUnknown_843F004:: @ 843F004
- .incbin "baserom.gba", 0x43F004, 0x100
+ .byte 0xff, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x37
+ .byte 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f
+ .byte 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47
+ .byte 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f
+ .byte 0x00, 0xab, 0xb5, 0xb6, 0xb1, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0xb2, 0xf1, 0x00, 0xae, 0xad, 0xba
+ .byte 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8
+ .byte 0xa9, 0xaa, 0x00, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f
+ .byte 0x00, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1
+ .byte 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9
+ .byte 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1
+ .byte 0xd2, 0xd3, 0xd4, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6
+ .byte 0x00, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb
+ .byte 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3
+ .byte 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb
+ .byte 0xec, 0xed, 0xee, 0x2d, 0x2f, 0x30, 0x31, 0x32
+ .byte 0x33, 0x34, 0x35, 0x36, 0x50, 0x00, 0x01, 0x02
+ .byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a
+ .byte 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12
+ .byte 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a
+ .byte 0x1b, 0xad, 0xb3, 0xb4, 0x00, 0xaf, 0x7d, 0x7f
+ .byte 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0xa0
+ .byte 0xae, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57
+ .byte 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f
+ .byte 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67
+ .byte 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f
+ .byte 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77
+ .byte 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7e, 0xb0, 0xac
+ .byte 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23
+ .byte 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b
+ .byte 0x2c, 0x2e, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c
+ .byte 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94
gUnknown_843F104:: @ 843F104
- .incbin "baserom.gba", 0x43F104, 0x100
+ .byte 0x20, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c
+ .byte 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94
+ .byte 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c
+ .byte 0x9d, 0x9e, 0x9f, 0xa0, 0xe0, 0xe1, 0xe2, 0xe3
+ .byte 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb
+ .byte 0xec, 0xed, 0xee, 0xef, 0xf0, 0x7b, 0xf1, 0x7c
+ .byte 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x07
+ .byte 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
+ .byte 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17
+ .byte 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
+ .byte 0x84, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7
+ .byte 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf
+ .byte 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7
+ .byte 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf
+ .byte 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7
+ .byte 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xa6, 0xdd, 0xa7
+ .byte 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xf2
+ .byte 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa
+ .byte 0xfb, 0xfc, 0xfd, 0xfe, 0xff, 0x01, 0x02, 0x03
+ .byte 0x04, 0x05, 0x06, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f
+ .byte 0xaf, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36
+ .byte 0x37, 0x38, 0x39, 0x21, 0xdf, 0xa1, 0xb0, 0xa5
+ .byte 0xde, 0x24, 0x2a, 0xa2, 0xa3, 0x22, 0x23, 0x20
+ .byte 0xa4, 0x20, 0x2f, 0x41, 0x42, 0x43, 0x44, 0x45
+ .byte 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d
+ .byte 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55
+ .byte 0x56, 0x57, 0x58, 0x59, 0x5a, 0x61, 0x62, 0x63
+ .byte 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b
+ .byte 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73
+ .byte 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x20
+ .byte 0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x20
+ .byte 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00
gUnknown_843F204:: @ 843F204
- .incbin "baserom.gba", 0x43F204, 0x70
+ .4byte 0x40000000, 0x00000000
+
+gAnimCmd_843F20C::
+ obj_image_anim_frame 0x0004, 5
+ obj_image_anim_frame 0x0008, 5
+ obj_image_anim_frame 0x000c, 5
+ obj_image_anim_frame 0x0010, 10
+ obj_image_anim_frame 0x000c, 5
+ obj_image_anim_frame 0x0008, 5
+ obj_image_anim_jump 0
+
+gAnimCmd_843F228::
+ obj_image_anim_frame 0x0004, 5
+ obj_image_anim_frame 0x0008, 5
+ obj_image_anim_frame 0x000c, 10
+ obj_image_anim_frame 0x0008, 5
+ obj_image_anim_jump 0
+
+gAnimCmd_843F23C::
+ obj_image_anim_frame 0x0004, 5
+ obj_image_anim_frame 0x0008, 5
+ obj_image_anim_jump 0
+
+gAnimCmd_843F248::
+ obj_image_anim_frame 0x0004, 10
+ obj_image_anim_frame 0x0014, 10
+ obj_image_anim_jump 0
+
+gAnimCmd_843F254::
+ obj_image_anim_frame 0x0018, 10
+ obj_image_anim_frame 0x0004, 10
+ obj_image_anim_jump 0
+
+gSpriteAnimTable_843F260::
+ .4byte gAnimCmd_843F20C
+ .4byte gAnimCmd_843F228
+ .4byte gAnimCmd_843F23C
+ .4byte gAnimCmd_843F248
+ .4byte gAnimCmd_843F254
gUnknown_843F274:: @ 843F274
- .incbin "baserom.gba", 0x43F274, 0x8
+ obj_tiles gUnknown_843EEE0, 0x0380, 54321
gUnknown_843F27C:: @ 843F27C
- .incbin "baserom.gba", 0x43F27C, 0x8
+ obj_pal gUnknown_843EEC0, 54322
gUnknown_843F284:: @ 843F284
- .incbin "baserom.gba", 0x43F284, 0x18
+ spr_template 54321, 54322, gUnknown_843F204, gSpriteAnimTable_843F260, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
diff --git a/data/union_room_chat.s b/data/union_room_chat.s
index 3133c65d6..b61c5f44d 100644
--- a/data/union_room_chat.s
+++ b/data/union_room_chat.s
@@ -7,64 +7,352 @@
.align 2
gUnknown_845A880:: @ 845A880
- .incbin "baserom.gba", 0x45A880, 0x28
+ .4byte sub_8128640
+ .4byte sub_81286C4
+ .4byte sub_81287B4
+ .4byte sub_81288D4
+ .4byte sub_8128DA4
+ .4byte sub_8128E78
+ .4byte sub_8128AA0
+ .4byte sub_8128C04
+ .4byte sub_8128CA8
+ .4byte sub_8128FB8
gUnknown_845A8A8:: @ 845A8A8
- .incbin "baserom.gba", 0x45A8A8, 0x4
+ .byte 0x09, 0x09, 0x09, 0x09
gUnknown_845A8AC:: @ 845A8AC
- .incbin "baserom.gba", 0x45A8AC, 0x100
+ .byte 0x00, 0x16, 0x17, 0x68, 0x19, 0x1a, 0x1b, 0x1c
+ .byte 0x1d, 0x1e, 0x00, 0x20, 0x21, 0x22, 0x23, 0x24
+ .byte 0x25, 0x26, 0x27, 0x28, 0x29, 0x15, 0x01, 0x02
+ .byte 0x00, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00
+ .byte 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12
+ .byte 0x13, 0x14, 0x2a, 0x2b, 0x2c, 0x2d, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x35, 0x36, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x53, 0x54, 0x55, 0x56, 0x00
+ .byte 0x00, 0x00, 0x6f, 0x5b, 0x5c, 0x5d, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x84, 0x85, 0x86, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7
+ .byte 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf
+ .byte 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7
+ .byte 0xb8, 0xb9, 0xba, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9
+ .byte 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1
+ .byte 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9
+ .byte 0xea, 0xeb, 0xec, 0xed, 0xee, 0xbb, 0xbc, 0xbd
+ .byte 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5
+ .byte 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd
+ .byte 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xef
+ .byte 0xf0, 0xf4, 0xf5, 0xf6, 0xf1, 0xf2, 0xf3, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_845A9AC:: @ 845A9AC
- .incbin "baserom.gba", 0x45A9AC, 0x78
+ .4byte gUnknown_847AAC1
+ .4byte gUnknown_847AAC7
+ .4byte gUnknown_847AACD
+ .4byte gUnknown_847AAD3
+ .4byte gUnknown_847AAD9
+ .4byte gUnknown_847AADF
+ .4byte gUnknown_847AAE5
+ .4byte gUnknown_847AAEB
+ .4byte gUnknown_847AAF1
+ .4byte gUnknown_847AAF7
+ .4byte gUnknown_847AAFD
+ .4byte gUnknown_847AB03
+ .4byte gUnknown_847AB09
+ .4byte gUnknown_847AB0F
+ .4byte gUnknown_847AB15
+ .4byte gUnknown_847AB1B
+ .4byte gUnknown_847AB21
+ .4byte gUnknown_847AB27
+ .4byte gUnknown_847AB2D
+ .4byte gUnknown_847AB33
+ .4byte gUnknown_847AB41
+ .4byte gUnknown_847AB4C
+ .4byte gUnknown_847AB57
+ .4byte gUnknown_847AB62
+ .4byte gUnknown_847AB6B
+ .4byte gUnknown_847AB76
+ .4byte gUnknown_847AB81
+ .4byte gUnknown_847AB8C
+ .4byte gUnknown_847AB97
+ .4byte gUnknown_847ABA2
gUnknown_845AA24:: @ 845AA24
- .incbin "baserom.gba", 0x45AA24, 0x20
+ .incbin "graphics/union_room_chat/unk_845AA24.gbapal"
gUnknown_845AA44:: @ 845AA44
- .incbin "baserom.gba", 0x45AA44, 0x20
+ .incbin "graphics/union_room_chat/unk_845AA44.gbapal"
gUnknown_845AA64:: @ 845AA64
- .incbin "baserom.gba", 0x45AA64, 0x20
+ .incbin "graphics/union_room_chat/unk_845AA64.gbapal"
gUnknown_845AA84:: @ 845AA84
- .incbin "baserom.gba", 0x45AA84, 0x10
+ .4byte 0x00000070
+ @ {
+ @ .bg = 0,
+ @ .charBaseIndex = 0,
+ @ .mapBaseIndex = 7,
+ @ .screenSize = 0,
+ @ .paletteMode = 0,
+ @ .priority = 0,
+ @ .baseTile = 0x0000
+ @ }
+ .4byte 0x000011fd
+ @ {
+ @ .bg = 1,
+ @ .charBaseIndex = 3,
+ @ .mapBaseIndex = 31,
+ @ .screenSize = 0,
+ @ .paletteMode = 0,
+ @ .priority = 1,
+ @ .baseTile = 0x0000
+ @ }
+ .4byte 0x0000217a
+ @ {
+ @ .bg = 2,
+ @ .charBaseIndex = 2,
+ @ .mapBaseIndex = 23,
+ @ .screenSize = 0,
+ @ .paletteMode = 0,
+ @ .priority = 2,
+ @ .baseTile = 0x0000
+ @ }
+ .4byte 0x000070f7
+ @ {
+ @ .bg = 3,
+ @ .charBaseIndex = 1,
+ @ .mapBaseIndex = 15,
+ @ .screenSize = 0,
+ @ .paletteMode = 0,
+ @ .priority = 3,
+ @ .baseTile = 0x0001
+ @ }
gUnknown_845AA94:: @ 845AA94
- .incbin "baserom.gba", 0x45AA94, 0x28
+ .byte 3, 8, 1, 21, 19, 15
+ .2byte 0x0001
+ .byte 1, 9, 18, 15, 2, 12
+ .2byte 0x007a
+ .byte 1, 0, 2, 6, 15, 7
+ .2byte 0x0020
+ .byte 0, 1, 2, 7, 9, 14
+ .2byte 0x0013
+ .byte 255, 0, 0, 0, 0, 0
+ .2byte 0x0000
gUnknown_845AABC:: @ 845AABC
- .incbin "baserom.gba", 0x45AABC, 0xA8
+ .2byte 0x00
+ .align 2
+ .4byte sub_8129CA0
+ .2byte 0x03
+ .align 2
+ .4byte sub_8129D40
+ .2byte 0x04
+ .align 2
+ .4byte sub_8129D78
+ .2byte 0x05
+ .align 2
+ .4byte sub_8129DB0
+ .2byte 0x01
+ .align 2
+ .4byte sub_8129E1C
+ .2byte 0x06
+ .align 2
+ .4byte sub_8129E28
+ .2byte 0x07
+ .align 2
+ .4byte sub_8129E74
+ .2byte 0x08
+ .align 2
+ .4byte sub_8129EB8
+ .2byte 0x09
+ .align 2
+ .4byte sub_8129F24
+ .2byte 0x0a
+ .align 2
+ .4byte sub_8129FCC
+ .2byte 0x0b
+ .align 2
+ .4byte sub_812A074
+ .2byte 0x0c
+ .align 2
+ .4byte sub_812A0B0
+ .2byte 0x02
+ .align 2
+ .4byte sub_812A18C
+ .2byte 0x0d
+ .align 2
+ .4byte sub_812A1B8
+ .2byte 0x12
+ .align 2
+ .4byte sub_812A1FC
+ .2byte 0x13
+ .align 2
+ .4byte sub_812A240
+ .2byte 0x0e
+ .align 2
+ .4byte sub_812A294
+ .2byte 0x0f
+ .align 2
+ .4byte sub_812A2E4
+ .2byte 0x10
+ .align 2
+ .4byte sub_812A334
+ .2byte 0x11
+ .align 2
+ .4byte sub_812A378
+ .2byte 0x14
+ .align 2
+ .4byte sub_812A3D0
gUnknown_845AB64:: @ 845AB64
- .incbin "baserom.gba", 0x45AB64, 0x84
+ .4byte gUnknown_841B366
+ .byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
+ .align 2
+ .4byte gUnknown_841B375
+ .byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
+ .align 2
+ .4byte gUnknown_841B38A
+ .byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
+ .align 2
+ .4byte gUnknown_841B39E
+ .byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
+ .align 2
+ .4byte gUnknown_841B3E9
+ .byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
+ .align 2
+ .4byte gUnknown_841B3FB
+ .byte 0x02, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00
+ .align 2
+ .4byte gUnknown_841B426
+ .byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01
+ .align 2
+ .4byte gUnknown_841B469
+ .byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01
+ .align 2
+ .4byte gUnknown_841B4A4
+ .byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01
+ .align 2
+ .4byte gUnknown_841B4C6
+ .byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x01, 0x01
+ .align 2
+ .4byte gUnknown_841B4D9
+ .byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01
+ .align 2
gUnknown_845ABE8:: @ 845ABE8
- .incbin "baserom.gba", 0x45ABE8, 0x4
+ .string "…$"
+ .align 2
gUnknown_845ABEC:: @ 845ABEC
- .incbin "baserom.gba", 0x45ABEC, 0x2A
+ .4byte gUnknown_841B33D, 0
+ .4byte gUnknown_841B343, 0
+ .4byte gUnknown_841B350, 0
+ .4byte gUnknown_841B358, 0
+ .4byte gUnknown_841B361, 0
-gUnknown_845AC16:: @ 845AC16
- .incbin "baserom.gba", 0x45AC16, 0x342
+gUnknown_845AC14:: @ 845AC14
+ .incbin "graphics/union_room_chat/unk_845AC14.gbapal"
+
+gUnknown_845AC34::
+ .incbin "graphics/union_room_chat/unk_845AC34.4bpp.lz"
+
+gUnknown_845AEB8::
+ .incbin "graphics/union_room_chat/unk_845AEB8.4bpp.lz"
+
+gUnknown_845AED8::
+ .incbin "graphics/union_room_chat/unk_845AED8.4bpp.lz"
+
+gUnknown_845AF04::
+ .incbin "graphics/union_room_chat/unk_845AF04.4bpp.lz"
gUnknown_845AF58:: @ 845AF58
- .incbin "baserom.gba", 0x45AF58, 0x28
+ obj_tiles gUnknown_845AC34, 0x1000, 0
+ obj_tiles gUnknown_845AED8, 0x0040, 1
+ obj_tiles gUnknown_845AEB8, 0x0040, 2
+ obj_tiles gUnknown_845AF04, 0x0080, 3
+ obj_tiles gUnknown_8EA1A50, 0x0400, 4
gUnknown_845AF80:: @ 845AF80
- .incbin "baserom.gba", 0x45AF80, 0x40
+ obj_pal gUnknown_845AC14, 0
+
+gOamData_845AF88::
+ .4byte 0xc0004000, 0x00000400
+
+gAnimCmd_845AF90::
+ obj_image_anim_frame 0x0000, 30
+ obj_image_anim_end
+
+gAnimCmd_845AF98::
+ obj_image_anim_frame 0x0020, 30
+ obj_image_anim_end
+
+gAnimCmd_845AFA0::
+ obj_image_anim_frame 0x0040, 30
+ obj_image_anim_end
+
+gAnimCmd_845AFA8::
+ obj_image_anim_frame 0x0060, 30
+ obj_image_anim_end
+
+gSpriteAnimTable_845AFB0::
+ .4byte gAnimCmd_845AF90
+ .4byte gAnimCmd_845AF98
+ .4byte gAnimCmd_845AFA0
+ .4byte gAnimCmd_845AFA8
gUnknown_845AFC0:: @ 845AFC0
- .incbin "baserom.gba", 0x45AFC0, 0x20
+ spr_template 0, 0, gOamData_845AF88, gSpriteAnimTable_845AFB0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+gOamData_845AFD8::
+ .4byte 0x00008000, 0x00000800
gUnknown_845AFE0:: @ 845AFE0
- .incbin "baserom.gba", 0x45AFE0, 0x18
+ spr_template 2, 0, gOamData_845AFD8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812B09C
gUnknown_845AFF8:: @ 845AFF8
- .incbin "baserom.gba", 0x45AFF8, 0x58
+ spr_template 1, 0, gOamData_845AFD8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812B0D4
+
+gOamData_845B010::
+ .4byte 0x40000000, 0x00000800
+
+gOamData_845B018::
+ .4byte 0x80004000, 0x00000800
+
+gAnimCmd_845B020::
+ obj_image_anim_frame 0x0000, 2
+ obj_image_anim_end
+
+gAnimCmd_845B028::
+ obj_image_anim_frame 0x0008, 2
+ obj_image_anim_end
+
+gAnimCmd_845B030::
+ obj_image_anim_frame 0x0010, 2
+ obj_image_anim_end
+
+gAnimCmd_845B038::
+ obj_image_anim_frame 0x0018, 2
+ obj_image_anim_end
+
+gSpriteAnimTable_845B040::
+ .4byte gAnimCmd_845B020
+ .4byte gAnimCmd_845B028
+ .4byte gAnimCmd_845B030
+ .4byte gAnimCmd_845B038
gUnknown_845B050:: @ 845B050
- .incbin "baserom.gba", 0x45B050, 0x18
+ spr_template 3, 0, gOamData_845B010, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_845B068:: @ 845B068
- .incbin "baserom.gba", 0x45B068, 0x18
+ spr_template 4, 0, gOamData_845B018, gSpriteAnimTable_845B040, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
diff --git a/graphics/interface/select_button.png b/graphics/interface/select_button.png
new file mode 100644
index 000000000..241239dba
--- /dev/null
+++ b/graphics/interface/select_button.png
Binary files differ
diff --git a/graphics/interface/wireless_link_icon.png b/graphics/interface/wireless_link_icon.png
new file mode 100644
index 000000000..3f34dbfb0
--- /dev/null
+++ b/graphics/interface/wireless_link_icon.png
Binary files differ
diff --git a/graphics/item_menu/bagmap_0.bin b/graphics/item_menu/bagmap_0.bin
new file mode 100644
index 000000000..94c0af766
--- /dev/null
+++ b/graphics/item_menu/bagmap_0.bin
Binary files differ
diff --git a/graphics/item_menu/bagmap_1.bin b/graphics/item_menu/bagmap_1.bin
new file mode 100644
index 000000000..ff1b44740
--- /dev/null
+++ b/graphics/item_menu/bagmap_1.bin
Binary files differ
diff --git a/graphics/item_menu/bagmap_2.bin b/graphics/item_menu/bagmap_2.bin
new file mode 100644
index 000000000..167c246f8
--- /dev/null
+++ b/graphics/item_menu/bagmap_2.bin
Binary files differ
diff --git a/graphics/item_menu/bagmap_3.bin b/graphics/item_menu/bagmap_3.bin
new file mode 100644
index 000000000..ff1b44740
--- /dev/null
+++ b/graphics/item_menu/bagmap_3.bin
Binary files differ
diff --git a/graphics/item_menu/bagmap_4.bin b/graphics/item_menu/bagmap_4.bin
new file mode 100644
index 000000000..167c246f8
--- /dev/null
+++ b/graphics/item_menu/bagmap_4.bin
Binary files differ
diff --git a/graphics/item_menu/bagmap_5.bin b/graphics/item_menu/bagmap_5.bin
new file mode 100644
index 000000000..ff1b44740
--- /dev/null
+++ b/graphics/item_menu/bagmap_5.bin
Binary files differ
diff --git a/graphics/item_menu/bagmap_6.bin b/graphics/item_menu/bagmap_6.bin
new file mode 100644
index 000000000..167c246f8
--- /dev/null
+++ b/graphics/item_menu/bagmap_6.bin
Binary files differ
diff --git a/graphics/item_menu/bagmap_7.bin b/graphics/item_menu/bagmap_7.bin
new file mode 100644
index 000000000..ff1b44740
--- /dev/null
+++ b/graphics/item_menu/bagmap_7.bin
Binary files differ
diff --git a/graphics/item_menu/bagmap_8.bin b/graphics/item_menu/bagmap_8.bin
new file mode 100644
index 000000000..167c246f8
--- /dev/null
+++ b/graphics/item_menu/bagmap_8.bin
Binary files differ
diff --git a/graphics/item_menu/bagmap_9.bin b/graphics/item_menu/bagmap_9.bin
new file mode 100644
index 000000000..ff1b44740
--- /dev/null
+++ b/graphics/item_menu/bagmap_9.bin
Binary files differ
diff --git a/graphics/item_menu/bagmap_A.bin b/graphics/item_menu/bagmap_A.bin
new file mode 100644
index 000000000..167c246f8
--- /dev/null
+++ b/graphics/item_menu/bagmap_A.bin
Binary files differ
diff --git a/graphics/item_menu/bagmap_B.bin b/graphics/item_menu/bagmap_B.bin
new file mode 100644
index 000000000..4da8f8ff5
--- /dev/null
+++ b/graphics/item_menu/bagmap_B.bin
Binary files differ
diff --git a/graphics/union_room_chat/unk_845AA24.pal b/graphics/union_room_chat/unk_845AA24.pal
new file mode 100644
index 000000000..a86815b0e
--- /dev/null
+++ b/graphics/union_room_chat/unk_845AA24.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+213 205 205
+255 255 255
+255 255 255
+41 41 41
+255 156 82
+0 0 0
+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/union_room_chat/unk_845AA44.pal b/graphics/union_room_chat/unk_845AA44.pal
new file mode 100644
index 000000000..12bc76261
--- /dev/null
+++ b/graphics/union_room_chat/unk_845AA44.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+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
diff --git a/graphics/union_room_chat/unk_845AA64.pal b/graphics/union_room_chat/unk_845AA64.pal
new file mode 100644
index 000000000..d2a55fec6
--- /dev/null
+++ b/graphics/union_room_chat/unk_845AA64.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+0 0 0
+205 205 230
+49 213 0
+222 230 213
+0 0 255
+205 213 222
+255 0 0
+222 213 197
+255 189 0
+230 230 222
+197 197 197
+41 32 32
+0 0 0
+57 57 57
diff --git a/graphics/union_room_chat/unk_845AC14.pal b/graphics/union_room_chat/unk_845AC14.pal
new file mode 100644
index 000000000..071f73b42
--- /dev/null
+++ b/graphics/union_room_chat/unk_845AC14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 197 98
+255 49 49
+156 49 49
+49 98 255
+0 0 98
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+230 230 255
+213 213 255
+172 172 172
+115 115 115
+255 255 255
+65 65 65
diff --git a/graphics/union_room_chat/unk_845AC34.png b/graphics/union_room_chat/unk_845AC34.png
new file mode 100644
index 000000000..c98308516
--- /dev/null
+++ b/graphics/union_room_chat/unk_845AC34.png
Binary files differ
diff --git a/graphics/union_room_chat/unk_845AEB8.png b/graphics/union_room_chat/unk_845AEB8.png
new file mode 100644
index 000000000..f9688c402
--- /dev/null
+++ b/graphics/union_room_chat/unk_845AEB8.png
Binary files differ
diff --git a/graphics/union_room_chat/unk_845AED8.png b/graphics/union_room_chat/unk_845AED8.png
new file mode 100644
index 000000000..9a426edd7
--- /dev/null
+++ b/graphics/union_room_chat/unk_845AED8.png
Binary files differ
diff --git a/graphics/union_room_chat/unk_845AF04.png b/graphics/union_room_chat/unk_845AF04.png
new file mode 100644
index 000000000..2ef4da185
--- /dev/null
+++ b/graphics/union_room_chat/unk_845AF04.png
Binary files differ