From 84e1b97eacadbf857847b173218176d9b22ab144 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 30 Oct 2019 15:09:13 -0400 Subject: [PATCH] Ape trade graphics from Emerald --- data/trade.s | 84 +---------- data/trade/unk_8264C1C.png | Bin 203 -> 0 bytes data/trade/unk_8264E1C.png | Bin 205 -> 0 bytes data/trade/unk_826501C.png | Bin 183 -> 0 bytes data/trade/unk_826701C.png | Bin 1833 -> 0 bytes data/trade/unk_826C60C.bin | Bin 2048 -> 0 bytes .../trade/ball.png | Bin 477 -> 464 bytes .../trade/black.pal | 0 graphics/trade/buttons.png | Bin 0 -> 227 bytes .../trade/cable_closeup_map.bin | Bin graphics/trade/cable_end.png | Bin 0 -> 194 bytes .../unk_826499C.pal => graphics/trade/gba.pal | 0 graphics/trade/gba_affine.png | Bin 0 -> 1897 bytes .../trade/gba_affine_map_cable.bin | Bin .../trade/gba_affine_map_wireless.bin | Bin .../trade/gba_map_cable.bin | Bin .../trade/gba_map_wireless.bin | Bin graphics/trade/gba_screen.png | Bin 0 -> 170 bytes .../trade/glow1.png | Bin 208 -> 195 bytes graphics/trade/glow2.png | Bin 0 -> 190 bytes graphics/trade/menu.pal | 51 +++++++ graphics/trade/menu.png | Bin 0 -> 608 bytes graphics/trade/misc.pal | 19 +++ .../trade/moves_box_map.bin | Bin .../trade/party_box_map.bin | Bin graphics/trade/pokeball_symbol.png | Bin 0 -> 1569 bytes graphics/trade/pokeball_symbol_map.bin | Bin 0 -> 256 bytes graphics/trade/shadow.pal | 19 +++ .../trade/shadow_map.bin | Bin .../trade/stripes_bg2_map.bin | 0 .../trade/stripes_bg3_map.bin | 0 .../trade/text.pal | 0 graphics/trade/unknown_3308C0.pal | 19 +++ graphics/trade/unknown_338EA4.pal | 15 ++ .../trade/wireless_signal_receive.pal | 0 .../trade/wireless_signal_send.pal | 0 src/trade.c | 14 +- src/trade_scene.c | 138 ++++++++++-------- 38 files changed, 213 insertions(+), 146 deletions(-) delete mode 100644 data/trade/unk_8264C1C.png delete mode 100644 data/trade/unk_8264E1C.png delete mode 100644 data/trade/unk_826501C.png delete mode 100644 data/trade/unk_826701C.png delete mode 100644 data/trade/unk_826C60C.bin rename data/trade/unk_826207C.png => graphics/trade/ball.png (75%) rename data/trade/unk_826BF5C.pal => graphics/trade/black.pal (100%) create mode 100644 graphics/trade/buttons.png rename data/trade/unk_826407C.bin => graphics/trade/cable_closeup_map.bin (100%) create mode 100644 graphics/trade/cable_end.png rename data/trade/unk_826499C.pal => graphics/trade/gba.pal (100%) create mode 100644 graphics/trade/gba_affine.png rename data/trade/unk_826985C.bin => graphics/trade/gba_affine_map_cable.bin (100%) rename data/trade/unk_826995C.bin => graphics/trade/gba_affine_map_wireless.bin (100%) rename data/trade/unk_826AA5C.bin => graphics/trade/gba_map_cable.bin (100%) rename data/trade/unk_8269A5C.bin => graphics/trade/gba_map_wireless.bin (100%) create mode 100644 graphics/trade/gba_screen.png rename data/trade/unk_8264A1C.png => graphics/trade/glow1.png (73%) create mode 100644 graphics/trade/glow2.png create mode 100644 graphics/trade/menu.pal create mode 100644 graphics/trade/menu.png create mode 100644 graphics/trade/misc.pal rename data/trade/unk_8260834.bin => graphics/trade/moves_box_map.bin (100%) rename data/trade/unk_8260A32.bin => graphics/trade/party_box_map.bin (100%) create mode 100644 graphics/trade/pokeball_symbol.png create mode 100644 graphics/trade/pokeball_symbol_map.bin create mode 100644 graphics/trade/shadow.pal rename data/trade/unk_826601C.bin => graphics/trade/shadow_map.bin (100%) rename data/trade/unk_8260C30.bin => graphics/trade/stripes_bg2_map.bin (100%) rename data/trade/unk_8261430.bin => graphics/trade/stripes_bg3_map.bin (100%) rename data/trade/unk_8261CE0.pal => graphics/trade/text.pal (100%) create mode 100644 graphics/trade/unknown_3308C0.pal create mode 100644 graphics/trade/unknown_338EA4.pal rename data/trade/unk_826BD5C.pal => graphics/trade/wireless_signal_receive.pal (100%) rename data/trade/unk_826BB5C.pal => graphics/trade/wireless_signal_send.pal (100%) diff --git a/data/trade.s b/data/trade.s index f3c6f8b7e..16fde1e35 100644 --- a/data/trade.s +++ b/data/trade.s @@ -8,78 +8,6 @@ .section .rodata .align 2, 0 -gUnknown_826205C:: - .incbin "data/trade/unk_826207C.gbapal" - -gUnknown_826207C:: - .incbin "data/trade/unk_826207C.4bpp" - - .incbin "baserom.gba", 0x26267C, 0x1A00 - -gUnknown_826407C:: @ 826407C - .incbin "data/trade/unk_826407C.bin" - - .incbin "baserom.gba", 0x26487C, 0x120 - -gUnknown_826499C:: - .incbin "data/trade/unk_8264E1C.gbapal" - - .incbin "baserom.gba", 0x2649BC, 0x40 - -gUnknown_82649FC:: - .incbin "data/trade/unk_8264A1C.gbapal" - -gUnknown_8264A1C:: - .incbin "data/trade/unk_8264A1C.4bpp" - -gUnknown_8264C1C:: - .incbin "data/trade/unk_8264C1C.4bpp" - -gUnknown_8264E1C:: - .incbin "data/trade/unk_8264E1C.4bpp" - - .incbin "baserom.gba", 0x264F1C, 0x100 - -gUnknown_826501C:: - .incbin "data/trade/unk_826501C.4bpp" - -gUnknown_826601C:: @ 826601C - .incbin "data/trade/unk_826601C.bin" - -gUnknown_826701C:: @ 826701C - .incbin "data/trade/unk_826701C.8bpp" - -gUnknown_826985C:: @ 826985C - .incbin "data/trade/unk_826985C.bin" - -gUnknown_826995C:: @ 826995C - .incbin "data/trade/unk_826995C.bin" - -gUnknown_8269A5C:: @ 8269A5C - .incbin "data/trade/unk_8269A5C.bin" - -gUnknown_826AA5C:: @ 826AA5C - .incbin "data/trade/unk_826AA5C.bin" - - .align 2 -gUnknown_3379A0Bin:: @ 826BA5C - .incbin "graphics/trade/unknown_3379A0.bin.lz" - -gUnknown_826BB5C:: @ 826BB5C - .incbin "data/trade/unk_826BB5C.gbapal" - -gUnknown_826BD5C:: @ 826BD5C - .incbin "data/trade/unk_826BD5C.gbapal" - -gUnknown_826BF5C:: @ 826BF5C - .incbin "data/trade/unk_826BF5C.gbapal" - -gWirelessSignal4bpp:: @ 826BF7C - .incbin "graphics/trade/wireless_signal.4bpp.lz" - -gUnknown_826C60C:: @ 826C60C - .incbin "data/trade/unk_826C60C.bin.lz" - gOamData_826CD00:: .4byte 0x40000100, 0x00000000 @@ -141,10 +69,10 @@ gSpriteAffineAnimTable_826CDC8:: .4byte gAffineAnimCmd_826CDA8 gUnknown_826CDD4:: @ 826CDD4 - obj_tiles gUnknown_826207C, 0x0600, 5557 + obj_tiles gTradeBallTiles, 0x0600, 5557 gUnknown_826CDDC:: @ 826CDDC - obj_pal gUnknown_826205C, 5558 + obj_pal gTradeBallPalette, 5558 sTradePokeballSpriteTemplate:: @ 826CDE4 spr_template 5557, 5558, gOamData_826CD00, gSpriteAnimTable_826CD80, NULL, gSpriteAffineAnimTable_826CDC8, SpriteCB_TradePokeball_Default @@ -168,7 +96,7 @@ gSpriteAffineAnimTable_826CE28:: .4byte gAffineAnimCmd_826CE10 gUnknown_826CE2C:: @ 826CE2C - obj_tiles gUnknown_8264A1C, 0x0200, 5550 + obj_tiles gTradeGlow1Tiles, 0x0200, 5550 gUnknown_826CE34:: @ 826CE34 obj_pal gUnknown_82649FC, 5551 @@ -195,7 +123,7 @@ gSpriteAnimTable_826CE74:: .4byte gAnimCmd_826CE6C gUnknown_826CE7C:: @ 826CE7C - obj_tiles gUnknown_8264C1C, 0x0300, 5552 + obj_tiles gTradeGlow2Tiles, 0x0300, 5552 sGlowBallSpriteTemplate:: @ 826CE84 spr_template 5552, 5551, gOamData_826CE5C, gSpriteAnimTable_826CE74, NULL, gDummySpriteAffineAnimTable, SpriteCB_TradeGlowCore @@ -211,7 +139,7 @@ gSpriteAnimTable_826CEAC:: .4byte gAnimCmd_826CEA4 gUnknown_826CEB0:: @ 826CEB0 - obj_tiles gUnknown_8264E1C, 0x0100, 5554 + obj_tiles gTradeCableEndTiles, 0x0100, 5554 sGameLinkCableEndSpriteTemplate:: @ 826CEB8 spr_template 5554, 5555, gOamData_826CE9C, gSpriteAnimTable_826CEAC, NULL, gDummySpriteAffineAnimTable, SpriteCB_GameLinkCableEnd_Outbound @@ -248,7 +176,7 @@ gSpriteAnimTable_826CF24:: .4byte gAnimCmd_826CEFC gUnknown_826CF28:: @ 826CF28 - obj_tiles gUnknown_826501C, 0x1000, 5556 + obj_tiles gTradeGBAScreenTiles, 0x1000, 5556 gUnknown_826CF30:: @ 826CF30 spr_template 5556, 5555, gOamData_826CED0, gSpriteAnimTable_826CF20, NULL, gDummySpriteAffineAnimTable, sub_804FE00 diff --git a/data/trade/unk_8264C1C.png b/data/trade/unk_8264C1C.png deleted file mode 100644 index 3dbbf845cbc9630f4e95e47bbfe3304a2c9b7b12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!VDxI2ESSgqznRlLR^9L|2fr5s*h^^FJ|ce z|Np-i5NBm&0R^!lJ+;M7Ks}5lL4Lsu4$p3+0Xd$YE{-7@6O$7Tutmr$*wW42@|1~1 zgGWr@FyqXJkC>(&PT1fe!FMJ7!A6m8Zo}Hf4+?iqe_<%tyBfxbH~(7|3~NP%})<8`^e-a8(H2qyT2G{EQ6=3pUXO@geCwc Cb5(=@ diff --git a/data/trade/unk_826501C.png b/data/trade/unk_826501C.png deleted file mode 100644 index a900dea3b474e2ab673a8a51ceef539d6b89987a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!VDxm*B3zopr0CuiJp8x;= diff --git a/data/trade/unk_826701C.png b/data/trade/unk_826701C.png deleted file mode 100644 index 91123d0148e3b64357d3b1664eface458b700c6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1833 zcmV+^2iEwBP)l70H|`=vdi^I-$%L!Z4?Cje2Dl75(>X# z|Aha!pa9u~OoP3W+a5S-Zu=vECir&8D+3MC2J8Xd14lrQZmB2`LBFl;*@fI-iXgi^ zQ#3D)kWnQ<291|J1kfJ@6Lz=5ab(F4hOCQe!ooeANAB*gffiiTKY$Z%gg%5n4ri(^ zwD1g08k&5!V^h^+ih1?Y9h3#K0ShY{~3+6pq~{9Ksd7t{r9E-d~?Ll;*(oS$GTJ4m>B zw1&*|c7L?pfAkCI1*Z>9_#h6|HBHAOXMX8Hhw<_zj?-Y#Y}^nP$dGW{j6iGV)eg0p z`+vL}q6naZPzmC}P;DK?rWkU{lVF@z@AW4q8GN|^P!u4`*oD7g{9~h7CKSlMIWNzGD}6o-YWWa||2obLS_PI6`kmG_Tx*tBHY2RYM)p~r|0Vn!L6^|`T^l2ySC5uE zIK6*Gf5!Hg?sChkMp3Bbq+02E7Nqvp&vQfDlz{kL>w|7Kn%F~LqGk9Z9hAIG);dyM zpuN@A^F(h6r1y?wkPt!$lFEItx=^Yg}ip{6ubS@SI-N|N4`}*Dv9* zpi7|lhcZz>zv@bo}Q%)P7q;m)X3081I%a8^9*MMl`}A(4{zEC=(-@U zJC+qAppVW^a!S$=WcmKkIBrji&7EaGpx*)JmNsy1x9oDQu~fEs{*#x(XZQy|PXLlX z=H4y_Xv{13-^E3v&Hqq=27Z$F_el7a|NJ!tT>{9+pO+`SHgLN8KC=#Q z*RujNIE;kro#%o!^7-{%f@}oz+4=dQkfnbbhXs$h&*3=#+_Om!(x>!e)trofE|2XG zNM;BkY1O!-M-a3QN}(CalzDQ^`GREHjWKR4QzMA>i$))$JyW~x{4joofBcG>ms{Bl z8@c=FDV!LI5TjP43iZSNi4kH%r6SaqIe2e>#-nkt_=D$XwdnzR-&l3)rNQw<6K*ua zMq7ge9JL+b2nRhJU30vrkqsM;f@+e66SDl$w_G7T$J8@1!v+lVmgb;!w!+PbFp2N9) zWXOH31v~4TVXDHO-mc=XFpaHz5PUFV}2IzkQa8d z2|^q0KSr4E9^%YHvu;2wk0W^_lR)N1YZ-*y+^BX5wrisrxLa}N_s;X$XdR9IgM6gz z?7pt;dKGd5*bC5ha1v95d7ae@PMEE*qn?p>nJYjqQujbFh@PMqkUG<^6QN$f5)Uh+ za+9~bXMpSRR^5HgGdHrhr*Mq4I#N2&>nxNG?5jZOa8dzE5A#(`s`M47qlDh+38`2L zEPDuqj5x(1Gp5?;PX`Dc{p};u^8X`*-yu^`B~#h4DAciNBd|0fwNcYdtuI#FO06*q zkQ+04r0x84v%7Aq4Z(>+)}a2PQM_d4bUQmJ{^8gAa5}cMv;Yx;lU2L9pWi$fj^8al ztd=k-JARPufUw(D{L{qf#=Rwkuvl?35LyBx1j6{Z;u90~<%0g}PtlEE!e3PQs(kFf XV3)0Z!&kAp00000NkvXXu0mjfbeM)s diff --git a/data/trade/unk_826C60C.bin b/data/trade/unk_826C60C.bin deleted file mode 100644 index 4ce5d18b89d6b4ff38d6e2d3e73a7c7fd4872ab8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2048 zcmaLU_g{{E7{>AYHnKAtl+4W1frAblGRw@KWk)1YA~U;bWrvK2tSBV@yC-*q9xt!& zFV_#(`*WVx_X;5JufxE<&tGg1ozNLw&=p|_V^?-zXLe%n@0||58@i(hdZHJ4qYuIn z&OYqTUhK&p?9OigZ~Wo=q96KW00v?ZA`povL@|;P9K?Yf!2ayVz8wqgK8R=x#t_6H z7DEw-VHl1P7{TEj#yAdTEMqu?gBktjm;CTSjKnC6Mm)w~EXH9xCSW2GkidzY!0{Z% zu^hvAj^-$i{JrqQC${QINCGe!Q!o|8G)zY_k~y8zNKWMxP9~VdNv(y%UtbaO!VJvB zEEuzqf;pIrd6x zd_fDo;v2s4D_i)5&HT(y{KzIY@&n(qf$#XX&Fh^S^j;s-s3v{XCw*44zNkfC^-bUW z)h+(wW`Fi4e{_=@{lV|u;CFuOfCH$}BR$p=Jyorq>AC9kLN8UXS9+~CdgIrA<$AyL z3)lI%pSjjg{lt&`$TcB@x~1E?qr1ANYTefZJ=8-#@O@YNp6~jOZ~K;S z`i84~-Pe3ILV`nVHY^xheAH6o!X@= z?baS;Yp?bxNBfnl1Ip7u9dw=#IM@4~<9*)iZ13@IXL*-*IvDZ+t<^fM*9L9WCT&)R zGPOlpwN2Z#Lp!|P+q~6Voaqd2_9k!i2Cw%zul=rD??0earD>5CYl)U>nU*VEE3{Ip zv|4Ml#;d)`E4{+$UhZXH>Lp(6MNV^SyAMd3p_!T`YqnA}M{_k#^R++=wa^PZ-}5}z zbDZMYwr6>!XIO1IG(Vt#5;aPblq6`frf90DX_~HNC40K3nV#w?o@_YDlRV0aKXtng zYGi9+wBj{JV>M3WH9-@Vpaf6!1dsPPkM$VGdvvQF*>-ck?f-p)prSQcLlmP}4ON_m zX}Cscgok^W<2=-{j`0u=cJ%MMeg5}CKz-Fu{WU-XHAoSPRFt9|=?D+Y<+MrQYhJaD}^%d%Kr=x`(^FTSwhtep@4`PU@^K>Z&k>xvRUlvpfB{ R^{-Cr|NrOt_2%E7@E`BJe3yAbJU0VlNswPKgTu2MX&YmU839>M2mAm4 diff --git a/data/trade/unk_826BF5C.pal b/graphics/trade/black.pal similarity index 100% rename from data/trade/unk_826BF5C.pal rename to graphics/trade/black.pal diff --git a/graphics/trade/buttons.png b/graphics/trade/buttons.png new file mode 100644 index 0000000000000000000000000000000000000000..568f40a425fbdfaafdb1003f8642d4dcb135261e GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|eg8-ipS0HU^xh5%TOLf-0ps1@s zQ_eOQKbtaV@7XMdZ&Mfy4Ws^FEk5fN^*>4B?Ad$&|6lb!e=!EAC(qNxF~p-Y`GIA# zs7yjbP1Xgh9AaD+-086g)-{xeF#Z)y=s&Z&oPDbD%LNSyi&P~7oShgCp7A#L zZEP^-e?Q|tg?35)WqA>?CjaITefVOGiT1#Em>#h1R4I%62IBb4%Fl8>EaloG4XAe zAyzv`1XZa3yonTz9@>`*t*(X>gCVFF7Q-@IT s{$P!J1{Z!^`@Q?d)zm7tr|F#hUvEa1FXr=q2sD_%)78&qol`;+0D$jMo&W#< literal 0 HcmV?d00001 diff --git a/data/trade/unk_826499C.pal b/graphics/trade/gba.pal similarity index 100% rename from data/trade/unk_826499C.pal rename to graphics/trade/gba.pal diff --git a/graphics/trade/gba_affine.png b/graphics/trade/gba_affine.png new file mode 100644 index 0000000000000000000000000000000000000000..b8c2623c4ffce1da5f1ed3ad18e6a08246d3422e GIT binary patch literal 1897 zcmeHHTToM16y149?v0RKmEoZXQBstrfdYyG4azG-X>bG)l!ppptRMzOpkRc+Xh8@X zus{r}O}XW}nB}d!4oCoR4#i z7aU+jT}TB0BTk_2M*S+(4<16&&)UbwdjUwmTffOqPya1&4+M`u@EinJAoxQB$Mune ze+2jd2ry7EK1}a7pRZ5;V|>2t|H}X33!HS$%>p1ZIlexd5{`_PZP~A28Tw_|j?(Gjo8s&r;e456 znq|Gw*z-)^GCS8H%V?CO)me%n3PQZ^-fks#WJX)ZHJW{Cu@2T(HI&xAGJar@&Phf! zO1B-scsMm6rtqLK7eb`Ya7AHh#uTdW=L~^-m36Z9;mwsuwR+x?c#ur>hi&T}o6LGW z*+e^GhGp+|Ghj{oc-m)mmzai}V0ExD9+m=u1F2c!YY+B{cOvB2r!jkDVJq|%jysYH+fP1vjBQ$V!cNkRZg=rjKE;wwp~Wyr;lx@op6~uzZ%;745030 za9O!i9@PYVMWj61Hx!tfvshS}3@uGyMCqR%2of*Y**8WfRu_|C)GiBUD8aq;9_f!a zYv_EqG-z6MXAS6l#Uy4$Bxn;HHD>@@3gI6hrZMM&%2C*C5FhE^J!j(m^(c5bq`!8| z*qizjF5+m(hxT3w{%pM=vn9p=cgD-wHwNAPxYEGRP|X3 z)((n(-E&~UQ|EV+_2`bpwtY-+e^T1h-Pa;J=0B;jf#~-h!ktT9$!%60FT6mSzeIZ* zeY@rsf=!Y8fKDhB+feG!lA}c~ZfwH?rkYpTGn5IO#H^dN2Qg~|kY`&6t47Wmx&z!m zR+>|`(r+|$(%62& z+(6yvO2J_wNBG7*+t_opW~Ru#B)k3fR((xzKNIrY=x{Vv?VMH?T*pBN-tU67xtp< z%DE_$0w{0L3_J8lLK_ZpGihLcF3%yP>F1D^vUHk;80*rMq=+Y!?`m&O#~TJcRRdl( z9QH(CbKOb|KV!y!LOyD|SKNJEP?kuPFgS`Y4pApOXF*%@^bXO!?rSHJDucJA%b_j4 zb+o7B{Rgk3^V#=b@3C?;h|{_CEKdoGMTd4=q-lQ1bQ=72vcQ1V)ju7m@oqFxfP5yc zCiPFG*gBjvgGEl4s?3?az-!5Rz!tT^cZJ@egzMofy1e|YXy3V%m9r>3?7N(cRT<8c z*IJ=91j*`?#cqh`QLE!*@}=#bYIaXdX7rf8p;kDj cATr_%NloVn_Ev>7eEjD)e!;%y*T!W31#1^ZM*si- literal 0 HcmV?d00001 diff --git a/data/trade/unk_826985C.bin b/graphics/trade/gba_affine_map_cable.bin similarity index 100% rename from data/trade/unk_826985C.bin rename to graphics/trade/gba_affine_map_cable.bin diff --git a/data/trade/unk_826995C.bin b/graphics/trade/gba_affine_map_wireless.bin similarity index 100% rename from data/trade/unk_826995C.bin rename to graphics/trade/gba_affine_map_wireless.bin diff --git a/data/trade/unk_826AA5C.bin b/graphics/trade/gba_map_cable.bin similarity index 100% rename from data/trade/unk_826AA5C.bin rename to graphics/trade/gba_map_cable.bin diff --git a/data/trade/unk_8269A5C.bin b/graphics/trade/gba_map_wireless.bin similarity index 100% rename from data/trade/unk_8269A5C.bin rename to graphics/trade/gba_map_wireless.bin diff --git a/graphics/trade/gba_screen.png b/graphics/trade/gba_screen.png new file mode 100644 index 0000000000000000000000000000000000000000..4220e5e0d4500d4b503891c07096b992b28c1fde GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!VDxm*B3zopr09&Cy(*OVf literal 0 HcmV?d00001 diff --git a/data/trade/unk_8264A1C.png b/graphics/trade/glow1.png similarity index 73% rename from data/trade/unk_8264A1C.png rename to graphics/trade/glow1.png index 4197d701c6d6e935931b6d339299c4c27c25b4ac..e223d97ce3583d2bc7b7d6872a24cb3627cef418 100644 GIT binary patch delta 9 Qcmcb>c$jfQ!o=KU02BNJ=Kufz delta 20 bcmX@ic!6<30vBURkY6x^!?PP{6Jyf=OaTY5 diff --git a/graphics/trade/glow2.png b/graphics/trade/glow2.png new file mode 100644 index 0000000000000000000000000000000000000000..e7729bc84b08d46a1cd766ff3c7b19cd2cb1d02a GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!VDxI2ESSgqznRlLR^9L|NsB*J$twJ?6Wyr z?lm`eCnZ%odSz)EMm>A>?CjaITefVOGiT1#Em>#h1R4I%62IBb4%Fl6>EaloF)=ye z09%C2f-T+LEl-(PG^cRML-3!(^ oSTL722p>IQ!k)+4Ys0}%lWxp-e)GS@KtmZkUHx3vIVCg!0Co~eGynhq literal 0 HcmV?d00001 diff --git a/graphics/trade/menu.pal b/graphics/trade/menu.pal new file mode 100644 index 000000000..98377bbb3 --- /dev/null +++ b/graphics/trade/menu.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +57 57 172 +98 98 180 +123 106 222 +82 90 213 +82 148 205 +131 115 230 +148 156 189 +205 106 0 +246 148 0 +49 49 90 +255 213 115 +205 74 90 +255 98 32 +205 205 222 +255 255 213 +0 0 0 +0 8 16 +0 16 32 +0 24 49 +0 41 65 +0 49 82 +0 57 98 +0 65 115 +0 82 131 +0 90 148 +0 98 164 +0 106 180 +0 123 197 +0 131 213 +0 139 230 +0 156 255 +0 0 0 +0 8 16 +0 16 32 +0 24 49 +0 41 65 +0 49 82 +0 57 98 +0 65 115 +0 82 131 +0 90 148 +0 98 164 +0 106 180 +0 123 197 +0 131 213 +0 139 230 +0 156 255 diff --git a/graphics/trade/menu.png b/graphics/trade/menu.png new file mode 100644 index 0000000000000000000000000000000000000000..91bc0f7eb4801638567675e63460bb1f3fe8348d GIT binary patch literal 608 zcmV-m0-ybfP)oE45rM`Gd#`FSTK*2a;MvrN*0Drgw2MFS%>) zm6fXXfOUio*YiZFkEqnV!meJ4KtyWdr2=!HH>vfBErU{-mx?;|A(dSrF{w*0b-E9! zQOfX5z0_iOsRTM*jL<@QN8XTEgjO`IZtf;R_nsmDQiJd(r4DlV4pM3m_9k_UDC8QU z9X{|*jP(qYX43 zKHTupLn%8-vIH(u#!0$N{e+YigHpzRPbI1DkZPl!IaQ5nrhI+RbE@O&>$-HeUkc;@ zSQ*@=FqEpC+|6cdFTO^DHG(r4$Yw uZb99Kk0)nBM5Qz+&M9U}e7-|3K9I9|Ra285oKM7}h8-JhSA08w-@U_w3!?v(M&ix!2s>os?AV=#`~u z81?Mgv$JQ53#bcOJ%hj+1%)gDfhYzBumAt|K6|$0?Aa-M zw-k4GM|pW!DkvzxZ6TiVe@^w1>Z6+fiy69sRsoIupOuvb6vT>%H+EFzPz-^|hOKoB z3`}=CT^vIqT9?j@EMivVak1nRHz@u;TlKNzg=@Mlhul}mc%P4Q;K{nf?+JOLj%&KtB`=s0-j z*_TS54SQK%^Z!Y>7Hx0z*Xtj1V%@&8_gC7x{kRi;Ry}V|!@s$IGs0Z*l-Oik$|5(e zJ8IK-#I^gbo`#|O3dWu(iWiP_Tv_k2IjC!bN}1=~2FHEB%^lj)c-2c!U+~!b^|Ry} zk9!I$^hN(jifflW{-ozq8vXBgbY5c)3r|q3LDH5*R<0HYmVIlSb#u9W><9SF#fnDQng0)3`3dX8aeO3 z%i6X`gJpXv{$_eaxMpqlXM7~{CW?n4XZ_d{hE1HrR4z$F2ZvM4l*K^mY%wDOsYX1wGJ9paOezfnf-m=ZU-+mw0d%ijM zpP|E&vw~^fJ9d`_`1eK4W$StsxS93zFVEfVt9Pwutdt2j$Iz&haLF-n8OIF63)%rJ z-$X(~n>3hD1a>fZ7_zl*Z2S82;7xhDzna47Fqg>Z&eR>PB3Ju?{emntw>H@@G!K+u3^2iqfV zZ;=yA`q+L@rt;B^W86>ZqwuatzDF9JWcc1xjQ_? zmicG4KRk6$;z&Z(LmoM;2h6Tzx8Kb7dLVrA-7^pSYX`nhjfquwQ}~SCX<}Z}pVc-h Pp#16S>gTe~DWM4fbpg^= literal 0 HcmV?d00001 diff --git a/graphics/trade/pokeball_symbol_map.bin b/graphics/trade/pokeball_symbol_map.bin new file mode 100644 index 0000000000000000000000000000000000000000..8355c2f5ca1a903c8e07632380710eab6a819712 GIT binary patch literal 256 zcmXAi*Fr);3`9p+1YM;{Q<{b1VnLcTrGo_#vC$O~{Qo~7>rNS@t26IHWCYin9LBV@d-{t2uDbxXG*CU&Mz*n z5GTFn7m1{lsWdAib0cLo$C?*H6i~dqE1^tUsnU^J9gQYh_oNSxPsH|f=cW5f(tE=@ jg_Iwk9A7|xz{VJk=;nAb)i&QhGwtQ?{7unk_D4 * 0x100, sTradeData->unk_D6 * 0x100, sTradeData->unk_DC, sTradeData->unk_DE, sTradeData->sXY, sTradeData->sXY, sTradeData->unk_EC); + DoBgAffineSet(&affine, sTradeData->bg2texX * 0x100, sTradeData->bg2texY * 0x100, sTradeData->bg2srcX, sTradeData->bg2srcY, sTradeData->sXY, sTradeData->sXY, sTradeData->bg2alpha); SetGpuReg(REG_OFFSET_BG2PA, affine.pa); SetGpuReg(REG_OFFSET_BG2PB, affine.pb); SetGpuReg(REG_OFFSET_BG2PC, affine.pc); @@ -374,14 +390,14 @@ void CB2_InitTradeAnim_LinkTrade(void) sTradeData->unk_8C = 0; sTradeData->state = 0; sTradeData->isLinkTrade = TRUE; - sTradeData->unk_D4 = 64; - sTradeData->unk_D6 = 64; + sTradeData->bg2texX = 64; + sTradeData->bg2texY = 64; sTradeData->unk_D8 = 0; sTradeData->unk_DA = 0; - sTradeData->unk_DC = 120; - sTradeData->unk_DE = 80; + sTradeData->bg2srcX = 120; + sTradeData->bg2srcY = 80; sTradeData->sXY = 256; - sTradeData->unk_EC = 0; + sTradeData->bg2alpha = 0; break; case 1: if (!gReceivedRemoteLinkPlayers) @@ -550,14 +566,14 @@ void CB2_InitTradeAnim_InGameTrade(void) sTradeData->isLinkTrade = FALSE; sTradeData->unk_8C = 0; sTradeData->state = 0; - sTradeData->unk_D4 = 64; - sTradeData->unk_D6 = 64; + sTradeData->bg2texX = 64; + sTradeData->bg2texY = 64; sTradeData->unk_D8 = 0; sTradeData->unk_DA = 0; - sTradeData->unk_DC = 120; - sTradeData->unk_DE = 80; + sTradeData->bg2srcX = 120; + sTradeData->bg2srcY = 80; sTradeData->sXY = 256; - sTradeData->unk_EC = 0; + sTradeData->bg2alpha = 0; sTradeData->timer = 0; gMain.state = 5; break; @@ -747,11 +763,11 @@ void SetTradeSequenceBgGpuRegs(u8 state) case 4: SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG2_ON | DISPCNT_OBJ_ON); SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(3) | BGCNT_CHARBASE(1) | BGCNT_256COLOR | BGCNT_SCREENBASE(18) | BGCNT_AFF128x128); - sTradeData->unk_D4 = 0x40; - sTradeData->unk_D6 = 0x5C; + sTradeData->bg2texX = 0x40; + sTradeData->bg2texY = 0x5C; sTradeData->sXY = 0x20; sTradeData->unk_EA = 0x400; - sTradeData->unk_EC = 0; + sTradeData->bg2alpha = 0; DmaCopyLarge16(3, gUnknown_826701C, (void *)BG_CHAR_ADDR(1), 0x2840, 0x1000); if (sTradeData->isCableTrade) { @@ -769,13 +785,13 @@ void SetTradeSequenceBgGpuRegs(u8 state) case 6: SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG2_ON | DISPCNT_OBJ_ON); SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(3) | BGCNT_CHARBASE(1) | BGCNT_256COLOR | BGCNT_SCREENBASE(18) | BGCNT_TXT256x256); - sTradeData->unk_D4 = 0x40; - sTradeData->unk_D6 = 0x5C; + sTradeData->bg2texX = 0x40; + sTradeData->bg2texY = 0x5C; sTradeData->sXY = 0x100; sTradeData->unk_EA = 0x80; - sTradeData->unk_DC = 0x78; - sTradeData->unk_DE = 0x50; - sTradeData->unk_EC = 0; + sTradeData->bg2srcX = 0x78; + sTradeData->bg2srcY = 0x50; + sTradeData->bg2alpha = 0; DmaCopyLarge16(3, gUnknown_826701C, BG_CHAR_ADDR(1), 0x2840, 0x1000); if (sTradeData->isCableTrade) { @@ -891,8 +907,8 @@ bool8 sub_8050F3C(void) case 12: if (gSprites[sTradeData->pokeballSpriteId].callback == SpriteCallbackDummy) { - sTradeData->unk_D3 = CreateSprite(&sTradePokeballSpriteTemplate, 120, 32, 0); - gSprites[sTradeData->unk_D3].callback = SpriteCB_TradePokeball_Outbound; + sTradeData->pokeballSpriteId2 = CreateSprite(&sTradePokeballSpriteTemplate, 120, 32, 0); + gSprites[sTradeData->pokeballSpriteId2].callback = SpriteCB_TradePokeball_Outbound; DestroySprite(&gSprites[sTradeData->pokeballSpriteId]); sTradeData->state++; } @@ -1208,21 +1224,21 @@ bool8 sub_8050F3C(void) } break; case 63: - sTradeData->unk_D3 = CreateSprite(&sTradePokeballSpriteTemplate, 120, -8, 0); - gSprites[sTradeData->unk_D3].data[3] = 74; - gSprites[sTradeData->unk_D3].callback = SpriteCB_TradePokeball_Inbound; - StartSpriteAnim(&gSprites[sTradeData->unk_D3], 1); - StartSpriteAffineAnim(&gSprites[sTradeData->unk_D3], 2); - BlendPalettes(1 << (16 + gSprites[sTradeData->unk_D3].oam.paletteNum), 16, RGB_WHITEALPHA); + sTradeData->pokeballSpriteId2 = CreateSprite(&sTradePokeballSpriteTemplate, 120, -8, 0); + gSprites[sTradeData->pokeballSpriteId2].data[3] = 74; + gSprites[sTradeData->pokeballSpriteId2].callback = SpriteCB_TradePokeball_Inbound; + StartSpriteAnim(&gSprites[sTradeData->pokeballSpriteId2], 1); + StartSpriteAffineAnim(&gSprites[sTradeData->pokeballSpriteId2], 2); + BlendPalettes(1 << (16 + gSprites[sTradeData->pokeballSpriteId2].oam.paletteNum), 16, RGB_WHITEALPHA); sTradeData->state++; sTradeData->timer = 0; break; case 64: - BeginNormalPaletteFade(1 << (16 + gSprites[sTradeData->unk_D3].oam.paletteNum), 1, 16, 0, RGB_WHITEALPHA); + BeginNormalPaletteFade(1 << (16 + gSprites[sTradeData->pokeballSpriteId2].oam.paletteNum), 1, 16, 0, RGB_WHITEALPHA); sTradeData->state++; break; case 65: - if (gSprites[sTradeData->unk_D3].callback == SpriteCallbackDummy) + if (gSprites[sTradeData->pokeballSpriteId2].callback == SpriteCallbackDummy) { HandleLoadSpecialPokePic(&gMonFrontPicTable[sTradeData->tradeSpecies[1]], gMonSpritesGfxPtr->sprites[3], sTradeData->tradeSpecies[1], sTradeData->monPersonalities[1]); sTradeData->state++; @@ -1235,8 +1251,8 @@ bool8 sub_8050F3C(void) gSprites[sTradeData->pokePicSpriteIdxs[1]].pos2.y = 0; StartSpriteAnim(&gSprites[sTradeData->pokePicSpriteIdxs[1]], 0); CreatePokeballSpriteToReleaseMon(sTradeData->pokePicSpriteIdxs[1], gSprites[sTradeData->pokePicSpriteIdxs[1]].oam.paletteNum, 120, 84, 2, 1, 20, 0xFFFFF); - FreeSpriteOamMatrix(&gSprites[sTradeData->unk_D3]); - DestroySprite(&gSprites[sTradeData->unk_D3]); + FreeSpriteOamMatrix(&gSprites[sTradeData->pokeballSpriteId2]); + DestroySprite(&gSprites[sTradeData->pokeballSpriteId2]); sTradeData->state++; break; case 67: @@ -1388,8 +1404,8 @@ bool8 sub_805232C(void) case 12: if (gSprites[sTradeData->pokeballSpriteId].callback == SpriteCallbackDummy) { - sTradeData->unk_D3 = CreateSprite(&sTradePokeballSpriteTemplate, 120, 32, 0); - gSprites[sTradeData->unk_D3].callback = SpriteCB_TradePokeball_Outbound; + sTradeData->pokeballSpriteId2 = CreateSprite(&sTradePokeballSpriteTemplate, 120, 32, 0); + gSprites[sTradeData->pokeballSpriteId2].callback = SpriteCB_TradePokeball_Outbound; DestroySprite(&gSprites[sTradeData->pokeballSpriteId]); sTradeData->state++; } @@ -1729,21 +1745,21 @@ bool8 sub_805232C(void) } break; case 63: - sTradeData->unk_D3 = CreateSprite(&sTradePokeballSpriteTemplate, 120, -8, 0); - gSprites[sTradeData->unk_D3].data[3] = 74; - gSprites[sTradeData->unk_D3].callback = SpriteCB_TradePokeball_Inbound; - StartSpriteAnim(&gSprites[sTradeData->unk_D3], 1); - StartSpriteAffineAnim(&gSprites[sTradeData->unk_D3], 2); - BlendPalettes(1 << (16 + gSprites[sTradeData->unk_D3].oam.paletteNum), 16, RGB_WHITEALPHA); + sTradeData->pokeballSpriteId2 = CreateSprite(&sTradePokeballSpriteTemplate, 120, -8, 0); + gSprites[sTradeData->pokeballSpriteId2].data[3] = 74; + gSprites[sTradeData->pokeballSpriteId2].callback = SpriteCB_TradePokeball_Inbound; + StartSpriteAnim(&gSprites[sTradeData->pokeballSpriteId2], 1); + StartSpriteAffineAnim(&gSprites[sTradeData->pokeballSpriteId2], 2); + BlendPalettes(1 << (16 + gSprites[sTradeData->pokeballSpriteId2].oam.paletteNum), 16, RGB_WHITEALPHA); sTradeData->state++; sTradeData->timer = 0; break; case 64: - BeginNormalPaletteFade(1 << (16 + gSprites[sTradeData->unk_D3].oam.paletteNum), 1, 16, 0, RGB_WHITEALPHA); + BeginNormalPaletteFade(1 << (16 + gSprites[sTradeData->pokeballSpriteId2].oam.paletteNum), 1, 16, 0, RGB_WHITEALPHA); sTradeData->state++; break; case 65: - if (gSprites[sTradeData->unk_D3].callback == SpriteCallbackDummy) + if (gSprites[sTradeData->pokeballSpriteId2].callback == SpriteCallbackDummy) { HandleLoadSpecialPokePic(&gMonFrontPicTable[sTradeData->tradeSpecies[1]], gMonSpritesGfxPtr->sprites[3], sTradeData->tradeSpecies[1], sTradeData->monPersonalities[1]); sTradeData->state++; @@ -1756,8 +1772,8 @@ bool8 sub_805232C(void) gSprites[sTradeData->pokePicSpriteIdxs[1]].pos2.y = 0; StartSpriteAnim(&gSprites[sTradeData->pokePicSpriteIdxs[1]], 0); CreatePokeballSpriteToReleaseMon(sTradeData->pokePicSpriteIdxs[1], gSprites[sTradeData->pokePicSpriteIdxs[1]].oam.paletteNum, 120, 84, 2, 1, 20, 0xFFFFF); - FreeSpriteOamMatrix(&gSprites[sTradeData->unk_D3]); - DestroySprite(&gSprites[sTradeData->unk_D3]); + FreeSpriteOamMatrix(&gSprites[sTradeData->pokeballSpriteId2]); + DestroySprite(&gSprites[sTradeData->pokeballSpriteId2]); sTradeData->state++; break; case 67: