From 0e3d574276db954994b0be24c61813b0b0e28c0c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 22 Nov 2019 14:40:57 -0500 Subject: [PATCH 1/5] Dump data/field_player_avatar.s --- baserom.ips | Bin 242864 -> 242395 bytes data/field_player_avatar.s | 113 +++++++++++++++++++++++++++++-------- 2 files changed, 89 insertions(+), 24 deletions(-) diff --git a/baserom.ips b/baserom.ips index b8a3107e464ee4d29fa17f7d2d4a7b4813e61a77..d7de0a120a93bb534d44e42cbfed9af2a128fd7d 100644 GIT binary patch delta 29 icmdn+lJE9YKGp!o5ND6(Ta4|u7(tk6`z=Q1YnuSO84N7| delta 497 zcmZ9JJxD@P6oBvhIeMRe;SgwHASARjI5adkL>MhWLX8eW4h@ZtA#ZSKYz#7}XlRHs zC~FBE92zXav?LlD8XO!N9HYL{srUHach0?scg}nF^&@oA3l&!v))trNsvAbLRu-MA ziar~;hco1DyotZCi^B(^_wYQPy%C+jX}p57IEM@P{YZ3$x&dxr=U8+P$FQ)!LtVW{ zP#}22Wjw$Y9K5CIaM&P&6XfeSi4|A+nmXb-w86H;<7GWavoMT96k_1`{DB~QxjTA| z*u^JMJmrxc5#A;0PY;{E6L+zPg{lc+87u>FBLk(|BdDQv$ ew2G@KUaQoM@~I_ag;KY^40 diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s index c11bc74b3..d89daa03c 100644 --- a/data/field_player_avatar.s +++ b/data/field_player_avatar.s @@ -1,73 +1,138 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" .section .rodata .align 2 gUnknown_835B764:: @ 835B764 - .incbin "baserom.gba", 0x35B764, 0xB0 + .4byte MetatileBehavior_IsUnknownMovement48, ForcedMovement_Slip + .4byte MetatileBehavior_IsIce_2, ForcedMovement_Slip + .4byte MetatileBehavior_IsWalkSouth, sub_805B750 + .4byte MetatileBehavior_IsWalkNorth, sub_805B768 + .4byte MetatileBehavior_IsWalkWest, sub_805B780 + .4byte MetatileBehavior_IsWalkEast, sub_805B798 + .4byte MetatileBehavior_IsSouthwardCurrent, sub_805B82C + .4byte MetatileBehavior_IsNorthwardCurrent, sub_805B844 + .4byte MetatileBehavior_IsWestwardCurrent, sub_805B85C + .4byte MetatileBehavior_IsEastwardCurrent, sub_805B874 + .4byte MetatileBehavior_UnusedIsSpinRight, sub_805B7B0 + .4byte MetatileBehavior_UnusedIsSpinLeft, sub_805B7CC + .4byte MetatileBehavior_UnusedIsSpinUp, sub_805B7E8 + .4byte MetatileBehavior_UnusedIsSpinDown, sub_805B804 + .4byte MetatileBehavior_IsSlideSouth, ForcedMovement_SlideSouth + .4byte MetatileBehavior_IsSlideNorth, ForcedMovement_SlideNorth + .4byte MetatileBehavior_IsSlideWest, ForcedMovement_SlideWest + .4byte MetatileBehavior_IsSlideEast, ForcedMovement_SlideEast + .4byte MetatileBehavior_IsWaterfall, sub_805B82C + .4byte MetatileBehavior_UnusedReturnFalse_7, sub_805B924 + .4byte MetatileBehavior_UnusedReturnFalse_8, sub_805B930 + .4byte NULL, ForcedMovement_None gUnknown_835B814:: @ 835B814 - .incbin "baserom.gba", 0x35B814, 0xC + .4byte PlayerNotOnBikeNotMoving + .4byte sub_805B9C4 + .4byte sub_805B9D4 gUnknown_835B820:: @ 835B820 - .incbin "baserom.gba", 0x35B820, 0x8 + .byte 0x04, 0x04, 0x05, 0x06, 0x07 + .align 2 gUnknown_835B828:: @ 835B828 - .incbin "baserom.gba", 0x35B828, 0x14 + .4byte MetatileBehavior_ReturnFalse_14 + .4byte MetatileBehavior_ReturnFalse_15 + .4byte MetatileBehavior_ReturnFalse_16 + .4byte MetatileBehavior_ReturnFalse_17 + .4byte MetatileBehavior_ReturnFalse_18 gUnknown_835B83C:: @ 835B83C - .incbin "baserom.gba", 0x35B83C, 0x8 + .byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d + .align 2 gUnknown_835B844:: @ 835B844 - .incbin "baserom.gba", 0x35B844, 0x20 + .4byte sub_805BE60 + .4byte sub_805BE74 + .4byte sub_805BE74 + .4byte sub_805BE90 + .4byte nullsub_23 + .4byte PlayerAvatarTransition_ReturnToField + .4byte nullsub_22 + .4byte nullsub_22 gUnknown_835B864:: @ 835B864 - .incbin "baserom.gba", 0x35B864, 0x10 + .4byte MetatileBehavior_IsSouthArrowWarp + .4byte MetatileBehavior_IsNorthArrowWarp + .4byte MetatileBehavior_IsWestArrowWarp + .4byte MetatileBehavior_IsEastArrowWarp gUnknown_835B874:: @ 835B874 - .incbin "baserom.gba", 0x35B874, 0xC + .byte 0x00, 0x07, 0x01, 0x08, 0x02, 0x09, 0x03, 0x0a, 0x04, 0x0b, 0x05, 0x0c gUnknown_835B880:: @ 835B880 - .incbin "baserom.gba", 0x35B880, 0x2 + .byte 0x0e, 0x0f gUnknown_835B882:: @ 835B882 - .incbin "baserom.gba", 0x35B882, 0xC + .byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x08, 0x07, 0x01, 0x08, 0x02, 0x09, 0x08 gUnknown_835B88E:: @ 835B88E - .incbin "baserom.gba", 0x35B88E, 0x2 + .byte 0x06, 0x0d gUnknown_835B890:: @ 835B890 - .incbin "baserom.gba", 0x35B890, 0x10 + .4byte MetatileBehavior_IsSouthArrowWarp + .4byte MetatileBehavior_IsNorthArrowWarp + .4byte MetatileBehavior_IsWestArrowWarp + .4byte MetatileBehavior_IsEastArrowWarp gUnknown_835B8A0:: @ 835B8A0 - .incbin "baserom.gba", 0x35B8A0, 0xC + .4byte sub_805CD64 + .4byte sub_805CD84 + .4byte sub_805CE20 gUnknown_835B8AC:: @ 835B8AC - .incbin "baserom.gba", 0x35B8AC, 0x4 + .4byte PlayerAvatar_DoSecretBaseMatJump gUnknown_835B8B0:: @ 835B8B0 - .incbin "baserom.gba", 0x35B8B0, 0x10 + .4byte sub_805CFC4 + .4byte sub_805CFEC + .4byte sub_805D064 + .4byte sub_805D0A4 gUnknown_835B8C0:: @ 835B8C0 - .incbin "baserom.gba", 0x35B8C0, 0x4 + .byte 0x03, 0x04, 0x02, 0x01 gUnknown_835B8C4:: @ 835B8C4 - .incbin "baserom.gba", 0x35B8C4, 0x8 + .byte 0x18, 0x18, 0x19, 0x1a, 0x1b + .align 2 gUnknown_835B8CC:: @ 835B8CC - .incbin "baserom.gba", 0x35B8CC, 0x40 + .4byte sub_805D33C + .4byte fish1 + .4byte fish2 + .4byte sub_805D430 + .4byte sub_805D47C + .4byte sub_805D508 + .4byte sub_805D574 + .4byte sub_805D580 + .4byte sub_805D5EC + .4byte sub_805D66C + .4byte sub_805D6C8 + .4byte sub_805D7C0 + .4byte sub_805D838 + .4byte sub_805D8AC + .4byte sub_805D8D8 + .4byte sub_805D980 gUnknown_835B90C:: @ 835B90C - .incbin "baserom.gba", 0x35B90C, 0x6 + .2byte 0x0001, 0x0001, 0x0001 gUnknown_835B912:: @ 835B912 - .incbin "baserom.gba", 0x35B912, 0x6 + .2byte 0x0001, 0x0003, 0x0006 gUnknown_835B918:: @ 835B918 - .incbin "baserom.gba", 0x35B918, 0x2 + .string "ยท$" gUnknown_835B91A:: @ 835B91A - .incbin "baserom.gba", 0x35B91A, 0x6 + .2byte 0x0024, 0x0021, 0x001e gUnknown_835B920:: @ 835B920 - .incbin "baserom.gba", 0x35B920, 0xC + .2byte 0x0000, 0x0000, 0x0028, 0x000a, 0x0046, 0x001e gUnknown_835B92C:: @ 835B92C - .incbin "baserom.gba", 0x35B92C, 0x8 + .byte 0x01, 0x03, 0x04, 0x02, 0x01 From 46773995020da0bc7984933f7f407ff30394596d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 24 Nov 2019 17:18:00 -0500 Subject: [PATCH 2/5] Most of data/link_rfu.s --- baserom.ips | Bin 242395 -> 239212 bytes data/link_rfu.s | 261 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 219 insertions(+), 42 deletions(-) diff --git a/baserom.ips b/baserom.ips index d7de0a120a93bb534d44e42cbfed9af2a128fd7d..fe18b52d11d084a98a6e486455d5da21bc8ca102 100644 GIT binary patch delta 87 zcmccpl<&|r#Ka{iUU lAiw|w|Nk>Eus~_&UmF5jw)^a5TvOD(%#vyQGD~LDN&p`1ADVzU%ki_4!l&_y6wS^$J`3s(#^+Gu0fPqj{A;)Gc_!)yjN@1c54l zlH_kalH{KN|D#DRJeK545Lq4k&fz342PL*&fPeW6|1Gv(gui!&{~p^f2@Zi^yM~iG ze+Gs2*#iztY!8@zvx6@u3O#^AV~BkV9I@kF@Q=WshHoR-ZTsB<6Nlmd1^Ryg6Sm)v z`eX1L7xr&6J~n-2lEX7=#m72cWv3-wlr)J+C6Y**$LUlh zMRE&%NtI4AqCW+R{!$vHFKURGixk155J`bTDc~W2Q6wr7P3149(Cv@{_tF*j)R)2F z6m?vlxHEP6Vh4{RK>M_V6B9_gWGJ$1d;Ovg2ka~YF(Ji&{t-9!O8ZX-zZyoAK%cmS zDt`G9CxuZ8am1aJ9WnY6k*peOS2Z1S95`e%UEa@Ih%oq{I$^SpLdjBGl77C4c5Rl{$qQOvm;ye z^fRx!t0(Y#{<)Os4Qy>&NadQh!WRukd3%`ixp9p*0IjTAlwR!+c15WO*Cy(fSXS+ioe=DgzLl?_r-H%nbK@+pB>+4 z#rO3M<_0oblxTQW2)-)a{sRcp}_5w3=J`l z*H9r)Z0wjo*g<(f)QW5?j+WXMyI!lJrM0Fvsd?G*b=~z1i&E*Ot5)ANxb6Oj_dK%yrw2COm#Jw?B)@&@?Q7Qdem6Vv!YI-B zmLxwgkmN_fB-*q!$qPUwSPM3T-Jloae*;&*LG=Fx7}}u$J;`HeoC1yDHt_r2BwvDn zm%tm~U7*7s98B^ea3hF=N>Bq9fyE#VR)QaIOY%B!EBFEU4mbc_0$+erVAAFT9SviD zx>6|zxMZ+7lljcRXyYAgK8Z>&$f|?Ei%O_wGFn@9AsUNa$dBFJIHh;%cXW@h+|hD( z!Qi}^`%SbDXC%ygg){S&Z5$#-)$rjo*CY5k@?4s?Q`edE(5^FB%$cq;GW>C119lK2>o{eQm!ui>LE63KK<(_)a;2PwuYZi z^9YE81)v_Zf)wZk&*I8S8j}uJpW|b=sxh=>_*a2z7KHy43~-&@&Ni_1Y$5gFjdmwn z!9J!*^08)Wp~bX?UZV;69lcL~q)z%Lt)?}!j?U70x|=>Djb&+o?qLmdg5IPDsf~3q zk-1om9in$>l-{NrSSf2^0SZwQEv5Z*1^Zpb_J0pIdX>r_hw5yh%72YJKDkKc??6YO zV^Bw<%0GZMwW|C*=q2bF5`4F){1|jyo0WH8yUHI#{}S|JTc3ljPOAJx=+F|C{}uVG zJ5>JZYe~KbdIJ6@Ql{#BB#rZadz?QHU9-i~y|%^%t^Uw}rAi^IlU$WEc<0!-*Lofb`2r>yi68t1c4mWqX^#BR@{~g4TVf=+O_X0l%fkIFOf*=BJ z0x?hyDgcS53FbF8*x2f&*lc5?H{oYGO~dpL+|E@$lerJ|4{pb#(8rgnX8&W|<+BEs zsoc0j-aBXoUaLs4}?- diff --git a/data/link_rfu.s b/data/link_rfu.s index d16c35a22..877242271 100644 --- a/data/link_rfu.s +++ b/data/link_rfu.s @@ -7,82 +7,259 @@ .align 2 gUnknown_843F29C:: @ 843F29C - .incbin "baserom.gba", 0x43F29C, 0x8 + .2byte 0x143a, 0x1817, 0x100b, 0x200f gUnknown_843F2A4:: @ 843F2A4 - .incbin "baserom.gba", 0x43F2A4, 0x8 + .2byte 0x0209, 0x140b, 0x1030, 0x102a gUnknown_843F2AC:: @ 843F2AC - .incbin "baserom.gba", 0x43F2AC, 0xF0 + .byte 0, 2, 2, 0 + .4byte gUnknown_8418A2B + .4byte gUnknown_84186D1 + .4byte gUnknown_84186EF + .4byte gUnknown_841880E + .4byte gUnknown_8418902 + .byte 1, 2, 3, 1 + .4byte gUnknown_8418A33 + .4byte gUnknown_8418706 + .4byte gUnknown_8418725 + .4byte gUnknown_841881B + .4byte gUnknown_8418902 + .byte 2, 2, 3, 1 + .4byte gUnknown_8418A4A + .4byte gUnknown_8418706 + .4byte gUnknown_8418725 + .4byte gUnknown_841883E + .4byte gUnknown_8418902 + .byte 3, 2, 3, 1 + .4byte gUnknown_8418A61 + .4byte gUnknown_8418706 + .4byte gUnknown_8418725 + .4byte gUnknown_841885F + .4byte gUnknown_8418902 + .byte 4, 2, 5, 2 + .4byte NULL + .4byte gUnknown_8418780 + .4byte gUnknown_841879E + .4byte gUnknown_841888C + .4byte gUnknown_8418902 + .byte 5, 2, 2, 0 + .4byte NULL + .4byte gUnknown_8418780 + .4byte gUnknown_841879E + .4byte NULL + .4byte NULL + .byte 6, 2, 3, 1 + .4byte gUnknown_8418A77 + .4byte gUnknown_84187B2 + .4byte gUnknown_84187D1 + .4byte gUnknown_84188AC + .4byte gUnknown_8418902 + .byte 7, 2, 3, 1 + .4byte gUnknown_8418AA1 + .4byte gUnknown_8418745 + .4byte gUnknown_8418763 + .4byte gUnknown_8418881 + .4byte gUnknown_8418902 + .byte 9, 2, 1, 3 + .4byte gUnknown_8418A87 + .4byte gUnknown_84188B9 + .4byte gUnknown_84188D6 + .4byte gUnknown_84188F0 + .4byte gUnknown_8418902 + .byte 14, 2, 2, 0 + .4byte gUnknown_8418AB2 + .4byte gUnknown_84186D1 + .4byte gUnknown_84187EE + .4byte gUnknown_8418881 + .4byte gUnknown_8418902 -gUnknown_843F39C:: @ 843F39C - .incbin "baserom.gba", 0x43F39C, 0x3D0 +gUnknown_843F39C:: @ 843F39C data8 4x7 + .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a -gUnknown_843F76C:: @ 843F76C +gUnknown_843F3B8:: @ 843F3B8 + .incbin "baserom.gba", 0x43F3B8, 0x20 + +gUnknown_843F3D8:: @ 843F3D8 + .incbin "baserom.gba", 0x43F3D8, 0x20 + +gUnknown_843F3F8:: @ 843F3F8 + .incbin "baserom.gba", 0x43F3F8, 0x20 + +gUnknown_843F418:: @ 843F418 + .incbin "baserom.gba", 0x43F418, 0x100 + +gUnknown_843F518:: @ 843F518 + .incbin "baserom.gba", 0x43F518, 0x100 + +gUnknown_843F618:: @ 843F618 + .incbin "baserom.gba", 0x43F618, 0x20 + +gUnknown_843F638:: @ 843F638 + .incbin "baserom.gba", 0x43F638, 0x134 + +gUnknown_843F76C:: @ 843F76C gbapal .incbin "baserom.gba", 0x43F76C, 0x20 -gUnknown_843F78C:: @ 843F78C +gUnknown_843F78C:: @ 843F78C gbapal .incbin "baserom.gba", 0x43F78C, 0x20 -gUnknown_843F7AC:: @ 843F7AC +gUnknown_843F7AC:: @ 843F7AC 4bpp.lz .incbin "baserom.gba", 0x43F7AC, 0xC8 -gUnknown_843F874:: @ 843F874 +gUnknown_843F874:: @ 843F874 gbapal .incbin "baserom.gba", 0x43F874, 0x8 -gUnknown_843F87C:: @ 843F87C +gUnknown_843F87C:: @ 843F87C gbapal .incbin "baserom.gba", 0x43F87C, 0xC -gUnknown_843F888:: @ 843F888 - .incbin "baserom.gba", 0x43F888, 0x18 +gUnknown_843F888:: @ 843F888 data8 6x4 + .byte 0x03, 0x04, 0x18, 0x04, 0x01, 0x04, 0x1b, 0x04, 0x03, 0x00, 0x18, 0x0a, 0x06, 0x06, 0x12, 0x04, 0x10, 0x04, 0x09, 0x02, 0x0e, 0x04, 0x12, 0x04 -gUnknown_843F8A0:: @ 843F8A0 - .incbin "baserom.gba", 0x43F8A0, 0x10 +gUnknown_843F8A0:: @ 843F8A0 bg_template + .4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb -gUnknown_843F8B0:: @ 843F8B0 - .incbin "baserom.gba", 0x43F8B0, 0x20 +gUnknown_843F8B0:: @ 843F8B0 window_template + .align 2 + .byte 0x01, 0x07, 0x00, 0x10, 0x02, 0x0a + .2byte 0x0010 + @ {0x01, 0x07, 0x00, 0x10, 0x02, 0x0a, 0x0010} + .align 2 + .byte 0x00, 0x04, 0x0f, 0x16, 0x04, 0x0f + .2byte 0x000a + @ {0x00, 0x04, 0x0f, 0x16, 0x04, 0x0f, 0x000a} + .align 2 + .byte 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03 + .2byte 0x0000 + @ {0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000} + .align 2 + .byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 + .2byte 0x0000 + @ {0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000} -gUnknown_843F8D0:: @ 843F8D0 - .incbin "baserom.gba", 0x43F8D0, 0x8 +gUnknown_843F8D0:: @ 843F8D0 window_template + .align 2 + .byte 0x00, 0x16, 0x09, 0x05, 0x04, 0x0f + .2byte 0x0062 + @ {0x00, 0x16, 0x09, 0x05, 0x04, 0x0f, 0x0062} -gUnknown_843F8D8:: @ 843F8D8 - .incbin "baserom.gba", 0x43F8D8, 0x3 +gUnknown_843F8D8:: @ 843F8D8 text + .string "{UNDERSCORE}$" -gUnknown_843F8DB:: @ 843F8DB - .incbin "baserom.gba", 0x43F8DB, 0x5 +gUnknown_843F8DB:: @ 843F8DB text + .string "{CLEAR 17}$" + .align 2 gUnknown_843F8E0:: @ 843F8E0 .4byte gUnknown_847A8D8 .4byte gUnknown_847A8FA .4byte gUnknown_847A913 .4byte gUnknown_847A934 -gUnknown_843F8F0:: @ 843F8F0 - .incbin "baserom.gba", 0x43F8F0, 0x20 +gUnknown_843F8F0:: @ 843F8F0 sprite_sheet + obj_tiles gUnknown_843F3F8, 0x0020, 0 + obj_tiles gUnknown_843F418, 0x0100, 2 + obj_tiles gUnknown_843F518, 0x0100, 3 + obj_tiles NULL, 0x0000, 0 -gUnknown_843F910:: @ 843F910 - .incbin "baserom.gba", 0x43F910, 0x28 +gUnknown_843F910:: @ 843F910 sprite_palette + obj_pal gUnknown_843F3B8, 0 + obj_pal gUnknown_843F3D8, 1 + obj_pal gUnknown_8E99F24, 2 + obj_pal gUnknown_843F618, 3 + null_obj_pal -gUnknown_843F938:: @ 843F938 - .incbin "baserom.gba", 0x43F938, 0x20 +gUnknown_843F938:: @ 843F938 sprite_sheet + obj_tiles gUnknown_843F638, 0x0800, 5 + obj_tiles gUnknown_8E9BD28, 0x1000, 1 + obj_tiles gUnknown_8E99F44, 0x0800, 6 + obj_tiles gUnknown_8E9A168, 0x1000, 4 -gUnknown_843F958:: @ 843F958 - .incbin "baserom.gba", 0x43F958, 0x10 +gUnknown_843F958:: @ 843F958 data8 + .byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00 -gUnknown_843F968:: @ 843F968 - .incbin "baserom.gba", 0x43F968, 0x50 +gUnknown_843F960:: + .4byte 0x00000000, 0x00000c00 -gUnknown_843F9B8:: @ 843F9B8 - .incbin "baserom.gba", 0x43F9B8, 0x68 +gUnknown_843F968:: @ 843F968 sprite_template + spr_template 0, 0, gUnknown_843F960, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8101B20 -gUnknown_843FA20:: @ 843FA20 - .incbin "baserom.gba", 0x43FA20, 0x20 +gUnknown_843F980:: + .4byte 0xc0004000, 0x00000400 -gUnknown_843FA40:: @ 843FA40 - .incbin "baserom.gba", 0x43FA40, 0x40 +gUnknown_843F988:: + .incbin "baserom.gba", 0x43F988, 0x8 -gUnknown_843FA80:: @ 843FA80 - .incbin "baserom.gba", 0x43FA80, 0x18 +gUnknown_843F990:: + .incbin "baserom.gba", 0x43F990, 0x8 -gUnknown_843FA98:: @ 843FA98 - .incbin "baserom.gba", 0x43FA98, 0x18 +gUnknown_843F998:: + .incbin "baserom.gba", 0x43F998, 0x8 + +gUnknown_843F9A0:: + .incbin "baserom.gba", 0x43F9A0, 0x8 + +gUnknown_843F9A8:: + .4byte 0x843f988 + .4byte 0x843f990 + .4byte 0x843f998 + .4byte 0x843f9a0 + +gUnknown_843F9B8:: @ 843F9B8 sprite_template + spr_template 1, 1, gUnknown_843F980, gUnknown_843F9A8, NULL, gDummySpriteAffineAnimTable, sub_8101B20 + +gUnknown_843F9D0:: + .4byte 0xc0004000, 0x00000400 + +gUnknown_843F9D8:: + .incbin "baserom.gba", 0x43F9D8, 0x8 + +gUnknown_843F9E0:: + .incbin "baserom.gba", 0x43F9E0, 0xC + +gUnknown_843F9EC:: + .incbin "baserom.gba", 0x43F9EC, 0xC + +gUnknown_843F9F8:: + .incbin "baserom.gba", 0x43F9F8, 0xC + +gUnknown_843FA04:: + .incbin "baserom.gba", 0x43FA04, 0x8 + +gUnknown_843FA0C:: + .4byte gUnknown_843F9D8 + .4byte gUnknown_843F9E0 + .4byte gUnknown_843F9EC + .4byte gUnknown_843F9F8 + .4byte gUnknown_843FA04 + +gUnknown_843FA20:: @ 843FA20 sprite_template + spr_template 4, 2, gUnknown_843F9D0, gUnknown_843FA0C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_843FA38:: + .4byte 0xc0000000, 0x00000c00 + +gUnknown_843FA40:: @ 843FA40 sprite_template + spr_template 6, 2, gUnknown_843FA38, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_843FA58:: + .4byte 0x40004000, 0x00000400 + +gUnknown_843FA60:: + .4byte 0x40000000, 0x00000400 + +gUnknown_843FA68:: + .incbin "baserom.gba", 0x43FA68, 0x8 + +gUnknown_843FA70:: + .incbin "baserom.gba", 0x43FA70, 0x8 + +gUnknown_843FA78:: + .4byte gUnknown_843FA68 + .4byte gUnknown_843FA70 + +gUnknown_843FA80:: @ 843FA80 sprite_template + spr_template 3, 2, gUnknown_843FA58, gUnknown_843FA78, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_843FA98:: @ 843FA98 sprite_template + spr_template 2, 2, gUnknown_843FA60, gUnknown_843FA78, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy From 8c07b0cb7b291ee517fb458a4011b22b1b9d98ca Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 25 Nov 2019 09:52:19 -0500 Subject: [PATCH 3/5] Dump link_rfu graphics --- baserom.ips | Bin 239212 -> 236117 bytes data/graphics.s | 12 ++-- data/link_rfu.s | 97 ++++++++++++++++++++---------- graphics/link_rfu/unk_843F3B8.pal | 19 ++++++ graphics/link_rfu/unk_843F3D8.pal | 19 ++++++ graphics/link_rfu/unk_843F3F8.png | Bin 0 -> 160 bytes graphics/link_rfu/unk_843F418.png | Bin 0 -> 173 bytes graphics/link_rfu/unk_843F518.png | Bin 0 -> 226 bytes graphics/link_rfu/unk_843F638.png | Bin 0 -> 205 bytes graphics/link_rfu/unk_843F76C.pal | 19 ++++++ graphics/link_rfu/unk_843F78C.pal | 19 ++++++ graphics/link_rfu/unk_843F7AC.png | Bin 0 -> 221 bytes graphics/link_rfu/unk_8E99DAC.png | Bin 0 -> 284 bytes graphics/link_rfu/unk_8E99E74.bin | Bin 0 -> 1280 bytes graphics/link_rfu/unk_8E99F44.png | Bin 0 -> 432 bytes graphics/link_rfu/unk_8E9A168.png | Bin 0 -> 426 bytes graphics/link_rfu/unk_8E9BD28.png | Bin 0 -> 212 bytes 17 files changed, 146 insertions(+), 39 deletions(-) create mode 100644 graphics/link_rfu/unk_843F3B8.pal create mode 100644 graphics/link_rfu/unk_843F3D8.pal create mode 100644 graphics/link_rfu/unk_843F3F8.png create mode 100644 graphics/link_rfu/unk_843F418.png create mode 100644 graphics/link_rfu/unk_843F518.png create mode 100644 graphics/link_rfu/unk_843F638.png create mode 100644 graphics/link_rfu/unk_843F76C.pal create mode 100644 graphics/link_rfu/unk_843F78C.pal create mode 100644 graphics/link_rfu/unk_843F7AC.png create mode 100644 graphics/link_rfu/unk_8E99DAC.png create mode 100644 graphics/link_rfu/unk_8E99E74.bin create mode 100644 graphics/link_rfu/unk_8E99F44.png create mode 100644 graphics/link_rfu/unk_8E9A168.png create mode 100644 graphics/link_rfu/unk_8E9BD28.png diff --git a/baserom.ips b/baserom.ips index fe18b52d11d084a98a6e486455d5da21bc8ca102..f3b11bb7ba43a80de26a13354d7c667e95a8db74 100644 GIT binary patch delta 42 zcmV+_0M-BO%nsGG4uG@)KedO4x&gO`x&j@G0t@uFrbPqv3kB(1&b{Z{bI;d3_O&;5t?^xxZ;;5$cM5OT<-}3#=odTA?ml^H>G+-_P#xJl z&vt%%{KRQt{nDpFhD9Eoef;ECZXCC82j{pLuSwb*z+UttTtQg$S3uIZ$Iq?rPTDB? z6bg+YLU?faarq9y7!qTWu*b&k14rc#jxiLh0q6d6>+P0}68|s#4_=NdJDpBnC}zZk zV!DX9cp+`!7ZQ>IoO49!jL3*|CX-3mu%vMyyT(svinxJ*7*8XOqssRqIbY1A=Y^1v znV0J-+rQ0#OxX|%Z<54z1Bz);ETZarI3tRvpmu>YP+l&l#1&)i^UDUvi=_e55M zm?i`$dt^|B2BXXDG*?`ODIz!MD%+=!i<~04uB1hI<3A;YyYYhxTXO!3$OdvHRCV7Y z}uxm&hj)c-=d)3UI z5T_P;DsO4m(8j>|&pRC>*43vwMgX)U-#oOP&n5|&04|v(W*DghDt-(z2!>&{83r!Z zTTO;hYC@tUEmPG78ClaJ`Fx(`g_s~=inps>6b$u`fCtr3?ZOQNF1%M zN2|E6_!sD|Euv6|f_3Esl7?;cb{Wx(n)?3rePAe3mX@+YJkvWvF7?j%^k4W6*IoKn zl-_N$a36D2+$-ZQr7I)5r}{UO?ZO1~hv$;e z&yU4o=oNz<5UEE;?oae*%KVzooce0Nud#E2_~3_Ba&1yK8rcD7%c3?>+=$$L#*N^! zeyAc~?OcDTT&(S*Te^xV|?v;_OOyJL(l*fP$PtfRo{u7f(uM>$0vQc?g z7d4wvS2M|uB`l#upgc;I*xPPLS<>`3G7u81g*n*0NTMjx$#ll1T6#XowA5;j=$d_71y_`+ zE~7?Qd}+$N8NKedGA)@EUa}|4fx4|`LS_t$Ecsf=k|0Z@<)#LElfu&XLZpe^@>kB5a@dUkb z<~M@AcEkt^G4%IIjSIFP2HLlpf*7AbN}~r8^k8s6fO2Qxo;Bp65cP!-F-_P{o6nDA zWRgX#gX$VAHzRX0N2WsGqmRm}vUFm<3>16nM^K*!7+nK8L1dNZznzZ~*ty_2Yp(WE zlq@hE-=>ydnqi@}D9ug!fnEV>EkOfTP_^C=#|c|@X`C)N-rDalL+~e0M}zTS#ag~3 zKFOE7Apt8M{Miw(53Krk^#a?%u4FnykFMNG6&PjcEIzZ9*&MwQ-KKlf6`cijD@ct- z$d?Xr2leQyB@YTze6ol`eV1tg&vTqniob@}Q(BYoJklV0F2kzR*mCN2Jg{C3yF^p_ z!X#vUI9DR)eboLa5B1y+YYSdswy(6nd)6HCo~sRqIQIq6`98sR((acc1>wHvk~G v{lcAXuA#oW`sRTjA8@Z?#SJaHd#5#7C{t>fJXP*SJFw9LT>APkT6*H&NWF$K diff --git a/data/graphics.s b/data/graphics.s index a6b9db097..818b01e3a 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -16125,22 +16125,22 @@ gUnknown_8E998CC:: @ 8E998CC .incbin "baserom.gba", 0xE998CC, 0x4C0 gUnknown_8E99D8C:: @ 8E99D8C - .incbin "baserom.gba", 0xE99D8C, 0x20 @UNKNOWN + .incbin "graphics/link_rfu/unk_8E99DAC.gbapal" gUnknown_8E99DAC:: @ 8E99DAC - .incbin "baserom.gba", 0xE99DAC, 0xC8 @UNKNOWN + .incbin "graphics/link_rfu/unk_8E99DAC.4bpp.lz" gUnknown_8E99E74:: @ 8E99E74 - .incbin "baserom.gba", 0xE99E74, 0xB0 + .incbin "graphics/link_rfu/unk_8E99E74.bin.lz" gUnknown_8E99F24:: @ 8E99F24 - .incbin "baserom.gba", 0xE99F24, 0x20 @UNKNOWN + .incbin "graphics/link_rfu/unk_8E9A168.gbapal" gUnknown_8E99F44:: @ 8E99F44 - .incbin "baserom.gba", 0xE99F44, 0x224 + .incbin "graphics/link_rfu/unk_8E99F44.4bpp.lz" gUnknown_8E9A168:: @ 8E9A168 - .incbin "baserom.gba", 0xE9A168, 0x2F8 + .incbin "graphics/link_rfu/unk_8E9A168.4bpp.lz" gUnknown_8E9A460:: @ 8E9A460 .incbin "baserom.gba", 0xE9A460, 0xEB0 diff --git a/data/link_rfu.s b/data/link_rfu.s index 877242271..8e9abd3f0 100644 --- a/data/link_rfu.s +++ b/data/link_rfu.s @@ -1,6 +1,7 @@ #include "constants/region_map.h" #include "constants/flags.h" #include "constants/moves.h" +#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata @@ -75,46 +76,62 @@ gUnknown_843F2AC:: @ 843F2AC .4byte gUnknown_8418902 gUnknown_843F39C:: @ 843F39C data8 4x7 - .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a + .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00 + .byte 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00 + .byte 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13 + .byte 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a -gUnknown_843F3B8:: @ 843F3B8 - .incbin "baserom.gba", 0x43F3B8, 0x20 +gUnknown_843F3B8:: @ 843F3B8 gbapal + .incbin "graphics/link_rfu/unk_843F3F8.gbapal" -gUnknown_843F3D8:: @ 843F3D8 - .incbin "baserom.gba", 0x43F3D8, 0x20 +gUnknown_843F3D8:: @ 843F3D8 gbapal + .incbin "graphics/link_rfu/unk_8E9BD28.gbapal" -gUnknown_843F3F8:: @ 843F3F8 - .incbin "baserom.gba", 0x43F3F8, 0x20 +gUnknown_843F3F8:: @ 843F3F8 4bpp + .incbin "graphics/link_rfu/unk_843F3F8.4bpp" -gUnknown_843F418:: @ 843F418 - .incbin "baserom.gba", 0x43F418, 0x100 +gUnknown_843F418:: @ 843F418 4bpp + .incbin "graphics/link_rfu/unk_843F418.4bpp" -gUnknown_843F518:: @ 843F518 - .incbin "baserom.gba", 0x43F518, 0x100 +gUnknown_843F518:: @ 843F518 4bpp + .incbin "graphics/link_rfu/unk_843F518.4bpp" -gUnknown_843F618:: @ 843F618 - .incbin "baserom.gba", 0x43F618, 0x20 +gUnknown_843F618:: @ 843F618 gbapal + .incbin "graphics/link_rfu/unk_843F638.gbapal" -gUnknown_843F638:: @ 843F638 - .incbin "baserom.gba", 0x43F638, 0x134 +gUnknown_843F638:: @ 843F638 4bpp.lz + .incbin "graphics/link_rfu/unk_843F638.4bpp.lz" gUnknown_843F76C:: @ 843F76C gbapal - .incbin "baserom.gba", 0x43F76C, 0x20 + .incbin "graphics/link_rfu/unk_843F76C.gbapal" gUnknown_843F78C:: @ 843F78C gbapal - .incbin "baserom.gba", 0x43F78C, 0x20 + .incbin "graphics/link_rfu/unk_843F78C.gbapal" gUnknown_843F7AC:: @ 843F7AC 4bpp.lz - .incbin "baserom.gba", 0x43F7AC, 0xC8 + .incbin "graphics/link_rfu/unk_843F7AC.4bpp.lz" gUnknown_843F874:: @ 843F874 gbapal - .incbin "baserom.gba", 0x43F874, 0x8 + .2byte RGB(0, 0, 0) + .2byte RGB(0, 0, 0) + .2byte RGB(7, 25, 31) + .2byte RGB(21, 21, 29) gUnknown_843F87C:: @ 843F87C gbapal - .incbin "baserom.gba", 0x43F87C, 0xC + .2byte RGB(0, 0, 0) + .2byte RGB(31, 31, 31) + .2byte RGB(12, 12, 12) + .2byte RGB(27, 26, 27) + .2byte RGB(8, 17, 9) + .align 2 gUnknown_843F888:: @ 843F888 data8 6x4 - .byte 0x03, 0x04, 0x18, 0x04, 0x01, 0x04, 0x1b, 0x04, 0x03, 0x00, 0x18, 0x0a, 0x06, 0x06, 0x12, 0x04, 0x10, 0x04, 0x09, 0x02, 0x0e, 0x04, 0x12, 0x04 + .byte 0x03, 0x04, 0x18, 0x04 + .byte 0x01, 0x04, 0x1b, 0x04 + .byte 0x03, 0x00, 0x18, 0x0a + .byte 0x06, 0x06, 0x12, 0x04 + .byte 0x10, 0x04, 0x09, 0x02 + .byte 0x0e, 0x04, 0x12, 0x04 gUnknown_843F8A0:: @ 843F8A0 bg_template .4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb @@ -160,7 +177,7 @@ gUnknown_843F8F0:: @ 843F8F0 sprite_sheet obj_tiles gUnknown_843F3F8, 0x0020, 0 obj_tiles gUnknown_843F418, 0x0100, 2 obj_tiles gUnknown_843F518, 0x0100, 3 - obj_tiles NULL, 0x0000, 0 + null_obj_tiles gUnknown_843F910:: @ 843F910 sprite_palette obj_pal gUnknown_843F3B8, 0 @@ -188,16 +205,20 @@ gUnknown_843F980:: .4byte 0xc0004000, 0x00000400 gUnknown_843F988:: - .incbin "baserom.gba", 0x43F988, 0x8 + obj_image_anim_frame 0x0000, 0 + obj_image_anim_end gUnknown_843F990:: - .incbin "baserom.gba", 0x43F990, 0x8 + obj_image_anim_frame 0x0020, 0 + obj_image_anim_end gUnknown_843F998:: - .incbin "baserom.gba", 0x43F998, 0x8 + obj_image_anim_frame 0x0040, 0 + obj_image_anim_end gUnknown_843F9A0:: - .incbin "baserom.gba", 0x43F9A0, 0x8 + obj_image_anim_frame 0x0060, 0 + obj_image_anim_end gUnknown_843F9A8:: .4byte 0x843f988 @@ -212,19 +233,27 @@ gUnknown_843F9D0:: .4byte 0xc0004000, 0x00000400 gUnknown_843F9D8:: - .incbin "baserom.gba", 0x43F9D8, 0x8 + obj_image_anim_frame 0x0060, 0 + obj_image_anim_end gUnknown_843F9E0:: - .incbin "baserom.gba", 0x43F9E0, 0xC + obj_image_anim_frame 0x0040, 4 + obj_image_anim_frame 0x0020, 4 + obj_image_anim_end gUnknown_843F9EC:: - .incbin "baserom.gba", 0x43F9EC, 0xC + obj_image_anim_frame 0x0040, 4 + obj_image_anim_frame 0x0000, 4 + obj_image_anim_end gUnknown_843F9F8:: - .incbin "baserom.gba", 0x43F9F8, 0xC + obj_image_anim_frame 0x0040, 4 + obj_image_anim_frame 0x0060, 0 + obj_image_anim_end gUnknown_843FA04:: - .incbin "baserom.gba", 0x43FA04, 0x8 + obj_image_anim_frame 0x0040, 4 + obj_image_anim_end gUnknown_843FA0C:: .4byte gUnknown_843F9D8 @@ -249,10 +278,12 @@ gUnknown_843FA60:: .4byte 0x40000000, 0x00000400 gUnknown_843FA68:: - .incbin "baserom.gba", 0x43FA68, 0x8 + obj_image_anim_frame 0x0000, 0 + obj_image_anim_end gUnknown_843FA70:: - .incbin "baserom.gba", 0x43FA70, 0x8 + obj_image_anim_frame 0x0004, 0 + obj_image_anim_end gUnknown_843FA78:: .4byte gUnknown_843FA68 diff --git a/graphics/link_rfu/unk_843F3B8.pal b/graphics/link_rfu/unk_843F3B8.pal new file mode 100644 index 000000000..dfe91b5de --- /dev/null +++ b/graphics/link_rfu/unk_843F3B8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 148 +255 197 148 +238 139 90 +189 90 41 +255 213 213 +246 180 180 +197 131 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +41 49 49 +98 98 98 +180 189 180 +222 213 222 +255 255 255 diff --git a/graphics/link_rfu/unk_843F3D8.pal b/graphics/link_rfu/unk_843F3D8.pal new file mode 100644 index 000000000..72d2547f9 --- /dev/null +++ b/graphics/link_rfu/unk_843F3D8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 164 0 +255 0 0 +255 32 32 +255 74 74 +255 106 106 +255 148 148 +255 180 180 +255 222 222 +255 255 255 +255 255 255 +255 255 205 +255 255 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/link_rfu/unk_843F3F8.png b/graphics/link_rfu/unk_843F3F8.png new file mode 100644 index 0000000000000000000000000000000000000000..cdcf144b00e0505167bb5946751f913245ebc207 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^93afX3?$7I7w-U41_3@HuK)i}`G0iEyY8sHQJVj+ zUj4RZ%hBd$pd=h<8X6`gC2iTe<=)kM|NsBbpBthAlw&Lj@(X5gcy=QV$dU7OaSY*@ wnf$==@PPvdioY{->|j=E@X;t_S7QueV&D(to$0v#L>tIRPgg&ebxsLQ0G%x~-2eap literal 0 HcmV?d00001 diff --git a/graphics/link_rfu/unk_843F418.png b/graphics/link_rfu/unk_843F418.png new file mode 100644 index 0000000000000000000000000000000000000000..a0aa30385aef74f00b63a402635da65cbb09a371 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNErn9gt!(TU9$Io_nc>0)mx&r zT>am@t~C6!<>KG#K?gbzr@8Nx|v(rAtK%m;@AcdW;mdKI;Vst0ODpvt^fc4 literal 0 HcmV?d00001 diff --git a/graphics/link_rfu/unk_843F518.png b/graphics/link_rfu/unk_843F518.png new file mode 100644 index 0000000000000000000000000000000000000000..7801f4ab5ef618bb3b5598518ccfa706b045fba9 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h->lDC42vO&v}+ry(MbP z)&JdFo)vem0ZRUFZhjXO^#9$K|NpNR7Z-2YyXD^1d;kCc-}J_?87R$I666=m;PC85 z8jzFV>Eak7F}1fZkn4Z~k8^dyU3sSFxTE(Q#b1So?bf=w{%D;?jp;=0*|Ti2&KURH z=G8c}v>{5O?rZsWM?PjVPF3B`m`?k?DSDU8w@&_1Rnc=zPAoX6X@#xY##u(s%KOD% XIBd17co29QXcvR0tDnm{r-UW|PXAp# literal 0 HcmV?d00001 diff --git a/graphics/link_rfu/unk_843F638.png b/graphics/link_rfu/unk_843F638.png new file mode 100644 index 0000000000000000000000000000000000000000..9507d99b3aae3040c655d770dd9e5ed57e3c1253 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|eg8-ipS0MfW|K4}+&R#t_<^TVC zKrVi8F6>%4Pz7U2kY6x^!?PP{K#sSki(`mKXL5oBYcr<-*CPg|09HS*9Sn@j32qO} z96Tl0Fl=XRYFez;Gs_^0>7|+mFO&I&vn*nF)Fcc9449%$8A?B92w-+QsKCfzv8gDF Si!Zqh0~0m)Y)ZZZp^EMP4g?vi@MMug$vOy{nrP+42kSy*01&lQU(D&A+A9B|K8&N-Iiyo4gbH} z^8f!;pa?S1G&C$OF5a?t%e|}j{{R1!MIt=kwh{W-O&y?nhzb>pHcYFsoz?X%Fql+YrgZN#~ZfGJQ1E#uTqlBVejy< VbAIrD8C{T%JYD@<);T3K0RVm@a)JN= literal 0 HcmV?d00001 diff --git a/graphics/link_rfu/unk_8E99E74.bin b/graphics/link_rfu/unk_8E99E74.bin new file mode 100644 index 0000000000000000000000000000000000000000..c262b89400940ecdc5a219894be62219a086942d GIT binary patch literal 1280 vcmZQ$U>k*_Auxa;z{J2z24sP|n3aK%49HG3{TvLOWI!&s{iFGBAVUBEODPTg literal 0 HcmV?d00001 diff --git a/graphics/link_rfu/unk_8E99F44.png b/graphics/link_rfu/unk_8E99F44.png new file mode 100644 index 0000000000000000000000000000000000000000..71faa05fee6921f977266edcc615b5b41c6f2042 GIT binary patch literal 432 zcmV;h0Z;ykP)Qd0l!wEzFrb8~aFy|mud-v9sqvg|Q~00001 zbW%=J06^y0W&i*IE=fc|R7i=uBvFgNIUXqNDS!93G!$x#OBqk&ydY7K36^cuYRuxrXa)G%9@+VAhp ae~V9q1F4si<5Z^r0000Qd0l!wEzFrb8~aFy|mud-v9sqvg|Q~00001 zbW%=J06^y0W&i*IC`m*?R9J=WmcebqFbqXKK=z-f1AK`Kq{#xVx&RB7k{v_>NUDbx zIaL3^)59kz$sgXfr5EXfP8N{LQy*`J!L0+z)ieM~*@0|ZgEuaXf3$PD} zkSOG=@o?Z^$TmYXWZf`YvwX^3PJP(`2{ADQZ~!n7vk4j&lYD4Eln)Jv^5Jj@^5N0Kbx38B5B0j^d>G=v z%7^jEt$bMe6z9RL6T literal 0 HcmV?d00001 diff --git a/graphics/link_rfu/unk_8E9BD28.png b/graphics/link_rfu/unk_8E9BD28.png new file mode 100644 index 0000000000000000000000000000000000000000..7e695fd263626cf740363885b687d8e92f27783b GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!VDxm*B3b|{{J(eaKNOt(|NksdEgYE3Kl}#dFqQ=Q1v5B2yO9Ru1bMnRhD5Z!oo2|# zpulnD0sF82=dCO=OvHJaRo>p&P+)1$Ec>2a%+b$5LuExN^PK|G86uqS9YQbID;(vf tEK^eu5&9wjfH}O;v+%dTB9>o?MhvF0Z1xR0Y_CD~db;|#taD0e0sv%&N-h8Z literal 0 HcmV?d00001 From ca6528d2cfda03d274f90ba9f7cc993222f62bcc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 25 Nov 2019 13:35:57 -0500 Subject: [PATCH 4/5] Dump data/field_weather --- baserom.ips | Bin 236117 -> 208212 bytes data/field_weather.s | 360 ++++++++++++++++++++++--- graphics/field_effects/unk_83BFBE4.bin | Bin 0 -> 8192 bytes graphics/field_effects/unk_83C0408.bin | Bin 0 -> 8192 bytes graphics/field_effects/unk_83C0C00.bin | Bin 0 -> 8192 bytes graphics/field_effects/unk_83C139C.bin | Bin 0 -> 8192 bytes graphics/field_effects/unk_83C1BB8.bin | Bin 0 -> 8192 bytes graphics/field_effects/unk_83C2380.bin | Bin 0 -> 8192 bytes graphics/field_effects/unk_83C2CE0.pal | 19 ++ graphics/field_effects/unk_83C2D00.pal | 19 ++ graphics/field_effects/unk_83C2D20.pal | 19 ++ graphics/field_effects/unk_83C2D40.png | Bin 0 -> 941 bytes graphics/field_effects/unk_83C3540.png | Bin 0 -> 1031 bytes graphics/field_effects/unk_83C3D40.png | Bin 0 -> 653 bytes graphics/field_effects/unk_83C4540.png | Bin 0 -> 179 bytes graphics/field_effects/unk_83C4580.png | Bin 0 -> 190 bytes graphics/field_effects/unk_83C45C0.png | Bin 0 -> 366 bytes graphics/field_effects/unk_83C55C0.png | Bin 0 -> 271 bytes graphics/field_effects/unk_83C5BC0.png | Bin 0 -> 603 bytes 19 files changed, 383 insertions(+), 34 deletions(-) create mode 100644 graphics/field_effects/unk_83BFBE4.bin create mode 100644 graphics/field_effects/unk_83C0408.bin create mode 100644 graphics/field_effects/unk_83C0C00.bin create mode 100644 graphics/field_effects/unk_83C139C.bin create mode 100644 graphics/field_effects/unk_83C1BB8.bin create mode 100644 graphics/field_effects/unk_83C2380.bin create mode 100644 graphics/field_effects/unk_83C2CE0.pal create mode 100644 graphics/field_effects/unk_83C2D00.pal create mode 100644 graphics/field_effects/unk_83C2D20.pal create mode 100644 graphics/field_effects/unk_83C2D40.png create mode 100644 graphics/field_effects/unk_83C3540.png create mode 100644 graphics/field_effects/unk_83C3D40.png create mode 100644 graphics/field_effects/unk_83C4540.png create mode 100644 graphics/field_effects/unk_83C4580.png create mode 100644 graphics/field_effects/unk_83C45C0.png create mode 100644 graphics/field_effects/unk_83C55C0.png create mode 100644 graphics/field_effects/unk_83C5BC0.png diff --git a/baserom.ips b/baserom.ips index f3b11bb7ba43a80de26a13354d7c667e95a8db74..90ea4461cc4c20603cc7bbd63f9271022a93e39a 100644 GIT binary patch delta 35 qcmcb*h40EOo((VOv)U{#koK7PF=_IK0G9SpUPd5hS{};F+zS9ID-JFI delta 23032 zcmcJ%4|o*El`q;oBUzFOp+^E^MV?gm3^K-!Lyv?^u+Vmo{uqcu+#@ky3}j}ICE4rs z^@x8mVU?CF9Pk>iM_?~u2`kCO%X)KtErD6$@U(+W2>2R5OLiQV^$yJ#b6MXkFasu- z72>>K^+^12?swn)zW2Ris=K=C)Twh$ojT`Kb&KEq>o-1m`GNsxtn zL2$H*pAW~zJ8l!g-}vluibX|T`iA4H*o3UB4x#)rO0gJ|6px&pV#ib#^~wj>lmnp@ zQ_CfXfNJ?0{x6?(%7sR@TA?ZqL7*^G70DS3Ni14!WJi^2G1fa(^`i5VC{vRMW}4$7 zVU|)HI!gi3q25_W&Vg}L+U^&7_W!f$@Z4QdiX*XBf3A`hV@?ug1tKYC zux2-?WUd{zE4gA;r{z5mQhqLL%GLBTH6m&LFK2#6L-7EKG8?jtkoFm=TJMrr+|Vv4 zDYh*g|I7qaeO5B3m%Trjqq5I)ItQHM$C7ianwNAsU0HqUG!4)hNt7lDGsC$(B)H|Z zU+ATMaev{kvD2R`w#QF0hxle-1ae?Lca)9fkBhYE%#{%04yN?Y{2wy&jY!P@RUbt) zk#rW_vs=-%bXO#iVrD1(XNq<9yG90CZ%$G?mNcCOmM__SJSs}8k9x&xLnQe(JJWQC z(zJ!LhSTxD(~>)FEtumGW+?~3z>J)3=AtdzdeLFxEGuhQm?;rzUnXddSrU!-Xt#2b zsaI0WAI~b7a3bng63#YFa{D`?W-$hgv7v*3GbJpYOjE7<@(Sf5eJLi%`RYg#{0^rn zyhq7NQ`$Nu?o_&pvJ@f3B+;YqNfSm7(CeRuS(;?A4cBW?5YeU_U>_;nOl)_Ot2`ZF zuBDT)kof9zlU{MgMf%Ecr^G4>zjQ$~fud$ac^}=AVPAyg&?TyHTs_I;@(2a2EZ3f| zVv7ez9v@w7xIJ0oKRYxp5Yji9#AAsY>0cHZjZ~ zF~}r2$YSnpMP_05hclXAPbSGrUqPUq)Ml9C)o|8l!%64)%Wl=}Bhh7E0?)qqMFT3E zO&z3U4J;EnNf{9Kc`aG1RHANyPa2CT0kmW5|HwYa`IDK z$na-9liRMM{4tT&*F$e>2bh61H>K^l8b5h3i z9ALA=-0}39d%()g(z~`BE3G6+1 zxas5^C|4&mY4!G@bgY|vvD38jmq0O6Y)EE;+nc{ED|z{Qi>!94_IibiS~iqanJd0MO^z(7FkmTt zB;}a7wSFwja@dlPGP09S3?0sHWtIkCQM^ zb}Yqanm*D_VTrf~0wnA|U@|{ZrIunP?IH=S`TbE=TSZk=T{uIjP59%>Sub;~)4W*| z`#o$D4IF%sBz8QX4Z6Mc2ZhL2pX-Y+N0tcgO1Fzr`>qsF?G;GHb$rO`q`m=|lUY&! zwNCo(^C>aK_`f85Mt7Y~xu39vOLvtC=G5l>KcmlJIX~U6`LhPH@?eq;=K3@WrS-tJ z8!b?CWk=TCU453&zZ^3|GFy)EMe+|gpi1-Ie+RpLz8_ODu^&PlxkNo@hG6n?sFe{d(SUDq+EGySw2h0XTW1LTk@x8xU?SGpCvoM%iOAc`I-=*KX1-5@*JXg4N7r} z(uuyVbU(Nidl|WwrQE&R$NPQGsOC%TcAhB~cYbOyF)QEgOFU|>hKb3t2DRE6$vKf$ zEc;%WwW><7oSj|jt_2v<2#r+lzfYT3UfUYm;Id?gb~sH@CJ3M35!yy=o#@vG@z zr#L0-y10y_2?o2kxK~Sg)p0O=+bvMx&x-6#dB02R&Zd;JGW+qvc1cPMT~ z{Zr;79-O7JziF1LhQS=r zQ>&Z>*=DVRg)YVYj_3EO&dRXn8c~EVTvlgSsB(FpN7mqlH8saD&qMl}6w-CJxxNH8 z;^GR#4_Kow=vTSliTmEr^$k+C{Bn1W>tnU>vLQ;74X?~{FR<5OR-q2!lWB5IO2=d6 z%2wGF$>`X#Uu9ArJZVcxb1nIUFXU<|Jtc&hzo%8zNSGd&+Ote)krhLe%J*!$riPlE zRPRTMZyq9wVn4|tU))e)OzJ9$ORR4z8960!AN3u_*ldVC8c%Pt-UvLb_abdE1-{~i zZ9SyV^2gsbnegWFaQoLMVT)#2vJ@0QOxg3_Oel3eUjj=QNO6?;-8 zk-6-BBSN+`e2|R!g4k{?50Ny}RP%(_A7?_ge^@Q|zfTB@?yoEDp*rfGw43!1oup}g zU8xHq!b)sdl+vgc`leV9DXHxSOjN3fX2$c`b3=n6h5m>LsQUxbmGw>+`B$&Nm=W?! zf3I|;ju4<`=PH7zd2%CI^1{Q9H(i8Endkp;!?bs{kf_wJjE9GW$cT#sbNTcwpBB7; zm@%wbdm5w;eJ8!ENLC$89`!8C-|E50>3*r-g-Jj#0XINVtWV+K#e=aBwOha0B`$JN z_|mIMecVc-*Tj6MpZ;U2eqRB}@2FF$WTxz|qXJ9rFc;KGte$8tlMYG^v1P)x;B;Sy zlB6fIpGzz62-?cHe5E!|EFTt>u(n%K$d$;=&qiEP`lOUyvQsGZV4X%=scQj?YJ==s#iWp~t-d1V_{o=8-@by;!y_}4 zlWQe5z3T^FKh=u#&`5PFSBIZH(wS6R_YwV*D49J}Tyb>%wvU_Q|C~*RuU6FW^X=D} zxm(u!9;qii5mtW`+$w_83^l9#dD(Ah+Vu2d{Ku4>H<3RNugceqYdY?fjf z>nfFhT2jkO%G-(R6Ve9@TVJICYY#P?;!8+dwe{odd6UCz=GwkQ4-G%LqkW`ff5X9* zB>YZ+a!qMBqeWXzH&IxN`Ckg@j5bf$M#1*Wtc=QrQ>=ze!O(mok4GNbDYniVP#Hb; zMv3#G9c^agoaHP+y^N+TtFmsZ@1aUj-IqjoNs?Qk#!vKR{-J=?Qm{Be%`YjWt*#V5 z9^SGoDwc?p|3cKg>$JdT(qwZ-r?sGpo*|X}^%XT|(R5WC)}A7o+LJMnCXnSTCm96* zkMpYCPpd4q*;>)+s&T(rMb{Q?SuU=*ue#vA z51-ocj|!PNLssBaC;eom!RC?RqPZ`How}Jd-83ZF`8X%gTUJL%`uTK`Xh|=imIfi_z$FZEQjTv zN$0W5T>FG*gPI&4lBMoi(~7|7BNslr<~SE|07Xo-T2bYW6bK`(#&JXhl;m{64Ly_r(X{ zLgqb{Vk^8V6L=ipvEu;2A&6qT41+6Y>A5NPrV4-0WXz`~r?mY-nWvi#YN$-HHWu{A zOc59lFR&vxEQ!K5vtY+-iTxww~ zG?FTkI#OLxrvdvY2v*AVf|@;;Cy|)t$a+?66NOSi43Eoo92R)D0D ztX|WtimD=v3|Lr8f;P~lehQwf6!RY^LxaX@`ASp^M2uy=3Np;7JL)wwIT?v#`&k8b zNXI496<>kytwd4dm!r!*%9gqWEo%tA6M7>CBgcC4lrKaY6eV{__Fqe;Bg=8Yxmko? zgmVzhE24$y({e5AA;aA@#hnG|R2_@4PAkw)a9S8XklGG2U z3H!$8GBSr?g^RXezhbx_aQk6DTzkkUk08=k%A-pH6%q26QQdw81u5tCS@2IG-3{X! z7@3ijSXr`ef6ROvdRY@`aK$Ahu-9-(48D8F>Pe_fp57OaYIT>=76Rjx;w4EOKo}6A zED@UwSJ!V$jOkIPVz;2XuT^#JW|o)YsvADFqwMl$F?Zi+&O&{cP$_ zz4QsWNDf{kza`CEY?+v(h1-`q14)A|xOhhhp_xTtzuXXcrs!=E`< zD11}mCoEL&_9%PKDLLnE@1%F@o8b+u8C%jjRR11qJT6ji6{SadL23$N7nWR|X9Q94 z$qwkqaFlfpG+}>Am50^xDP~>+RmBJE`z+s7?A|Zp6lL~a#6%4bh?O`yiTAQ9lHE&| zlwxMStim*@N-06PPS5R(yb;+?mCEG(a~+KVYxTGqCh9$m7gNu)_br-pxB+`0Yk z`*38G++I)maBr3VLJNfvDU=)TUKaCjc_%Q^X0lJf?=<;XAN48^?dYL!_M|t-_sc={ zc2$f$pvZa8?$Y;CwCRE2G&W)b$rY?739;&0%x$boQ!`0<{;A(r=tnM9{MK~6Uii>y z<+ewsQ?#mz?(MmtbYKd?4f)IHQMa;8W@>htW{KrFf71XZnm5Os^1e6TzNntQpQHM_ z+9_9;5z9Zi!9U=cN>a~yu|)Bo-$`X(JSQ3qdLugxCcRl%*5>Z9JYe9$Ni;Zh$}>+qnVnw(-ZTiob9B}xRS&%-0{8y%_^R&wXv|*_vEt3wsEHJ zy&Q!(`%O*668y)1QMGz2{S8~wP&Xj3N){6r`2BGxXym4VKB5@+5ovDv43pKp5R zX=m>*DO@CXsf)~*Uv>LK0xO+Ii#j`iamyR42V&Zybm>Z3&Z^5}FhKIuX6w(lZrzDB zbm(v$buC^{SVc9oWHoii)$9iP l~>=x%C5~TK>DqFF#d!1r!3B0n+mxK|UQLwhA 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 diff --git a/data/field_weather.s b/data/field_weather.s index 03b3e8faa..a9bc70f3c 100644 --- a/data/field_weather.s +++ b/data/field_weather.s @@ -1,104 +1,396 @@ +#include "constants/region_map.h" +#include "constants/flags.h" +#include "constants/moves.h" +#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) + .include "asm/macros.inc" + .include "constants/constants.inc" .section .rodata .align 2 gUnknown_83BFBE4:: @ 83BFBE4 - .incbin "baserom.gba", 0x3BFBE4, 0x2FD8 + .incbin "graphics/field_effects/unk_83BFBE4.bin.lz" + +gUnknown_83C0408:: + .incbin "graphics/field_effects/unk_83C0408.bin.lz" + +gUnknown_83C0C00:: + .incbin "graphics/field_effects/unk_83C0C00.bin.lz" + +gUnknown_83C139C:: + .incbin "graphics/field_effects/unk_83C139C.bin.lz" + +gUnknown_83C1BB8:: + .incbin "graphics/field_effects/unk_83C1BB8.bin.lz" + +gUnknown_83C2380:: + .incbin "graphics/field_effects/unk_83C2380.bin.lz" + +gUnknown_83C2BA4:: + .4byte gUnknown_83BFBE4 + .4byte gUnknown_83C0408 + .4byte gUnknown_83C0C00 + .4byte gUnknown_83C139C + .4byte gUnknown_83C1BB8 + .4byte gUnknown_83C2380 gUnknown_83C2BBC:: @ 83C2BBC - .incbin "baserom.gba", 0x3C2BBC, 0x4 + .4byte gUnknown_2037F34 gUnknown_83C2BC0:: @ 83C2BC0 - .incbin "baserom.gba", 0x3C2BC0, 0xF0 + .4byte sub_8079EC0 + .4byte nullsub_45 + .4byte sub_8079EC0 + .4byte sub_8079EE4 + .4byte Clouds_InitVars + .4byte Clouds_Main + .4byte Clouds_InitAll + .4byte Clouds_Finish + .4byte Weather2_InitVars + .4byte nullsub_48 + .4byte Weather2_InitAll + .4byte sub_807B434 + .4byte LightRain_InitVars + .4byte LightRain_Main + .4byte LightRain_InitAll + .4byte LightRain_Finish + .4byte Snow_InitVars + .4byte snowflakes_progress2 + .4byte Snow_InitAll + .4byte Snow_Finish + .4byte sub_807C2E4 + .4byte Rain_Main + .4byte sub_807C358 + .4byte Rain_Finish + .4byte Fog1_InitVars + .4byte Fog1_Main + .4byte Fog1_InitAll + .4byte Fog1_Finish + .4byte Ash_InitVars + .4byte Ash_Main + .4byte Ash_InitAll + .4byte Ash_Finish + .4byte Sandstorm_InitVars + .4byte Sandstorm_Main + .4byte Sandstorm_InitAll + .4byte Sandstorm_Finish + .4byte Fog2_InitVars + .4byte Fog2_Main + .4byte Fog2_InitAll + .4byte Fog2_Finish + .4byte Fog1_InitVars + .4byte Fog1_Main + .4byte Fog1_InitAll + .4byte Fog1_Finish + .4byte Weather11_InitVars + .4byte nullsub_49 + .4byte Weather11_InitAll + .4byte sub_807D8D0 + .4byte Drought_InitVars + .4byte Drought_Main + .4byte Drought_InitAll + .4byte sub_807B6BC + .4byte sub_807C388 + .4byte Rain_Main + .4byte sub_807C3F4 + .4byte Rain_Finish + .4byte Bubbles_InitVars + .4byte Bubbles_Main + .4byte Bubbles_InitAll + .4byte Bubbles_Finish gUnknown_83C2CB0:: @ 83C2CB0 - .incbin "baserom.gba", 0x3C2CB0, 0x10 + .4byte sub_8079FFC + .4byte sub_807A084 + .4byte nullsub_46 + .4byte nullsub_46 gUnknown_83C2CC0:: @ 83C2CC0 - .incbin "baserom.gba", 0x3C2CC0, 0x20 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01 gUnknown_83C2CE0:: @ 83C2CE0 - .incbin "baserom.gba", 0x3C2CE0, 0x20 + .incbin "graphics/field_effects/unk_83C2CE0.gbapal" gUnknown_83C2D00:: @ 83C2D00 - .incbin "baserom.gba", 0x3C2D00, 0x20 + .incbin "graphics/field_effects/unk_83C2D00.gbapal" gUnknown_83C2D20:: @ 83C2D20 - .incbin "baserom.gba", 0x3C2D20, 0x820 + .incbin "graphics/field_effects/unk_83C2D20.gbapal" + +gUnknown_83C2D40:: + .incbin "graphics/field_effects/unk_83C2D40.4bpp" gWeatherFog1Tiles:: @ 83C3540 - .incbin "baserom.gba", 0x3C3540, 0x3080 + .incbin "graphics/field_effects/unk_83C3540.4bpp" + +gUnknown_83C3D40:: + .incbin "graphics/field_effects/unk_83C3D40.4bpp" + +gUnknown_83C4540:: + .incbin "graphics/field_effects/unk_83C4540.4bpp" + +gUnknown_83C4580:: + .incbin "graphics/field_effects/unk_83C4580.4bpp" + +gUnknown_83C45C0:: + .incbin "graphics/field_effects/unk_83C45C0.4bpp" + +gUnknown_83C55C0:: + .incbin "graphics/field_effects/unk_83C55C0.4bpp" + +gUnknown_83C5BC0:: + .incbin "graphics/field_effects/unk_83C5BC0.4bpp" gUnknown_83C65C0:: @ 83C65C0 - .incbin "baserom.gba", 0x3C65C0, 0x4 + .byte 0x02, 0x03, 0x05, 0x03 gUnknown_83C65C4:: @ 83C65C4 - .incbin "baserom.gba", 0x3C65C4, 0x4 + .byte 0x02, 0x02, 0x03, 0x02 gUnknown_83C65C8:: @ 83C65C8 - .incbin "baserom.gba", 0x3C65C8, 0xC + .2byte 0x0000, 0x0042, 0x0005, 0x0049, 0x000a, 0x004e gUnknown_83C65D4:: @ 83C65D4 - .incbin "baserom.gba", 0x3C65D4, 0x1C + obj_tiles gUnknown_83C3D40, 0x0800, 4608 + +gUnknown_83C65DC:: + .4byte 0xc0000400, 0x00000c00 + +gUnknown_83C65E4:: + obj_image_anim_frame 0x0000, 16 + obj_image_anim_end + +gUnknown_83C65EC:: + .4byte gUnknown_83C65E4 gUnknown_83C65F0:: @ 83C65F0 - .incbin "baserom.gba", 0x3C65F0, 0x18 + spr_template 4608, 4608, gUnknown_83C65DC, gUnknown_83C65EC, NULL, gDummySpriteAffineAnimTable, sub_807B558 gUnknown_83C6608:: @ 83C6608 - .incbin "baserom.gba", 0x3C6608, 0x9C + .2byte 0x0000, 0x0000 + .2byte 0x0000, 0x00a0 + .2byte 0x0000, 0x0040 + .2byte 0x0090, 0x00e0 + .2byte 0x0090, 0x0080 + .2byte 0x0020, 0x0020 + .2byte 0x0020, 0x00c0 + .2byte 0x0020, 0x0060 + .2byte 0x0048, 0x0080 + .2byte 0x0048, 0x0020 + .2byte 0x0048, 0x00c0 + .2byte 0x00d8, 0x0060 + .2byte 0x00d8, 0x0000 + .2byte 0x0068, 0x00a0 + .2byte 0x0068, 0x0040 + .2byte 0x0068, 0x00e0 + .2byte 0x0090, 0x0000 + .2byte 0x0090, 0x00a0 + .2byte 0x0090, 0x0040 + .2byte 0x0020, 0x00e0 + .2byte 0x0020, 0x0080 + .2byte 0x0048, 0x0020 + .2byte 0x0048, 0x00c0 + .2byte 0x0030, 0x0060 + +gUnknown_83C6668:: + .4byte 0x80008000, 0x00002400 + +gUnknown_83C6670:: + obj_image_anim_frame 0x0000, 16 + obj_image_anim_jump 0 + +gUnknown_83C6678:: + obj_image_anim_frame 0x0008, 3 + obj_image_anim_frame 0x0020, 2 + obj_image_anim_frame 0x0028, 2 + obj_image_anim_end + +gUnknown_83C6688:: + obj_image_anim_frame 0x0008, 3 + obj_image_anim_frame 0x0010, 3 + obj_image_anim_frame 0x0018, 4 + obj_image_anim_end + +gUnknown_83C6698:: + .4byte gUnknown_83C6670 + .4byte gUnknown_83C6678 + .4byte gUnknown_83C6688 gUnknown_83C66A4:: @ 83C66A4 - .incbin "baserom.gba", 0x3C66A4, 0x18 + spr_template 4614, 4608, gUnknown_83C6668, gUnknown_83C6698, NULL, gDummySpriteAffineAnimTable, sub_807BA24 gUnknown_83C66BC:: @ 83C66BC - .incbin "baserom.gba", 0x3C66BC, 0x8 + .2byte 0xff98, 0x00d0 + .2byte 0xff60, 0x0140 gUnknown_83C66C4:: @ 83C66C4 - .incbin "baserom.gba", 0x3C66C4, 0x8 + .2byte 0x0012, 0x0007 + .2byte 0x000c, 0x000a gUnknown_83C66CC:: @ 83C66CC - .incbin "baserom.gba", 0x3C66CC, 0x38 + obj_tiles gUnknown_83C55C0, 0x0600, 4614 + +gUnknown_83C66D4:: + .4byte 0x00000000, 0x00000400 + +gUnknown_83C66DC:: + obj_frame_tiles gUnknown_83C4540 + 0x00, 0x0020 + obj_frame_tiles gUnknown_83C4540 + 0x20, 0x0020 + +gUnknown_83C66EC:: + obj_image_anim_frame 0x0000, 16 + obj_image_anim_end + +gUnknown_83C66F4:: + obj_image_anim_frame 0x0001, 16 + obj_image_anim_end + +gUnknown_83C66FC:: + .4byte gUnknown_83C66EC + .4byte gUnknown_83C66F4 gUnknown_83C6704:: @ 83C6704 - .incbin "baserom.gba", 0x3C6704, 0x8C + spr_template 65535, 4608, gUnknown_83C66D4, gUnknown_83C66FC, gUnknown_83C66DC, gDummySpriteAffineAnimTable, sub_807C1AC + +gUnknown_83C671C:: + .2byte 0x0000, 0x0006, 0x0006, 0x000c, 0x0012, 0x002a, 0x012c, 0x012c + +gUnknown_83C672C:: + .4byte 0xc0000400, 0x00000800 + +gUnknown_83C6734:: + obj_image_anim_frame 0x0000, 16 + obj_image_anim_end + +gUnknown_83C673C:: + obj_image_anim_frame 0x0020, 16 + obj_image_anim_end + +gUnknown_83C6744:: + obj_image_anim_frame 0x0040, 16 + obj_image_anim_end + +gUnknown_83C674C:: + obj_image_anim_frame 0x0060, 16 + obj_image_anim_end + +gUnknown_83C6754:: + obj_image_anim_frame 0x0080, 16 + obj_image_anim_end + +gUnknown_83C675C:: + obj_image_anim_frame 0x00a0, 16 + obj_image_anim_end + +gUnknown_83C6764:: + .4byte gUnknown_83C6734 + .4byte gUnknown_83C673C + .4byte gUnknown_83C6744 + .4byte gUnknown_83C674C + .4byte gUnknown_83C6754 + .4byte gUnknown_83C675C + +gUnknown_83C677C:: + obj_rot_scal_anim_frame 512, 512, 0, 0 + obj_rot_scal_anim_end + +gUnknown_83C678C:: + .4byte gUnknown_83C677C gUnknown_83C6790:: @ 83C6790 - .incbin "baserom.gba", 0x3C6790, 0x18 + spr_template 4609, 4608, gUnknown_83C672C, gUnknown_83C6764, NULL, gUnknown_83C678C, Fog1SpriteCallback gUnknown_83C67A8:: @ 83C67A8 - .incbin "baserom.gba", 0x3C67A8, 0x8 + obj_tiles gWeatherFog1Tiles, 0x0800, 4609 gUnknown_83C67B0:: @ 83C67B0 - .incbin "baserom.gba", 0x3C67B0, 0x20 + obj_tiles gUnknown_83C45C0, 0x1000, 4610 + +gUknown_83C67B8:: + .4byte 0xc0000400, 0x0000f400 + +gUnknown_83C67C0:: + obj_image_anim_frame 0x0000, 60 + obj_image_anim_frame 0x0040, 60 + obj_image_anim_jump 0 + +gUnknown_83C67CC:: + .4byte gUnknown_83C67C0 gUnknown_83C67D0:: @ 83C67D0 - .incbin "baserom.gba", 0x3C67D0, 0x18 + spr_template 4610, 4608, gUknown_83C67B8, gUnknown_83C67CC, NULL, gDummySpriteAffineAnimTable, sub_807CF08 gUnknown_83C67E8:: @ 83C67E8 - .incbin "baserom.gba", 0x3C67E8, 0x1C + obj_tiles gUnknown_83C2D40, 0x0800, 4611 + +gUnknown_83C67F0:: + .4byte 0xc0000400, 0x00000800 + +gUnknown_83C67F8:: + obj_image_anim_frame 0x0000, 16 + obj_image_anim_end + +gUnknown_83C6800:: + .4byte gUnknown_83C67F8 gUnknown_83C6804:: @ 83C6804 - .incbin "baserom.gba", 0x3C6804, 0x38 + spr_template 4611, 4608, gUnknown_83C67F0, gUnknown_83C6800, NULL, gDummySpriteAffineAnimTable, Fog2SpriteCallback + +gUnknown_83C681C:: + .4byte 0xc0000400, 0x00000400 + +gUnknown_83C6824:: + obj_image_anim_frame 0x0000, 3 + obj_image_anim_end + +gUnknown_83C682C:: + obj_image_anim_frame 0x0040, 3 + obj_image_anim_end + +gUnknown_83C6834:: + .4byte gUnknown_83C6824 + .4byte gUnknown_83C682C gUnknown_83C683C:: @ 83C683C - .incbin "baserom.gba", 0x3C683C, 0x18 + spr_template 4612, 4608, gUnknown_83C681C, gUnknown_83C6834, NULL, gDummySpriteAffineAnimTable, SandstormSpriteCallback1 gUnknown_83C6854:: @ 83C6854 - .incbin "baserom.gba", 0x3C6854, 0x8 + obj_tiles gUnknown_83C5BC0, 0x0a00, 4612 gUnknown_83C685C:: @ 83C685C - .incbin "baserom.gba", 0x3C685C, 0xC + .2byte 0x0000, 0x0078, 0x0050, 0x00a0, 0x0028, 0x0000 gUnknown_83C6868:: @ 83C6868 - .incbin "baserom.gba", 0x3C6868, 0x8 + .byte 0x28, 0x5a, 0x3c, 0x5a, 0x02, 0x3c, 0x28, 0x1e gUnknown_83C6870:: @ 83C6870 - .incbin "baserom.gba", 0x3C6870, 0x8 + obj_tiles gUnknown_83C4580, 0x0040, 4613 gUnknown_83C6878:: @ 83C6878 - .incbin "baserom.gba", 0x3C6878, 0x44 + .2byte 0x0078, 0x00a0 + .2byte 0x0178, 0x00a0 + .2byte 0x0028, 0x008c + .2byte 0x0128, 0x008c + .2byte 0x00b4, 0x0082 + .2byte 0x01b4, 0x0082 + .2byte 0x003c, 0x00a0 + .2byte 0x01b4, 0x00a0 + .2byte 0x00dc, 0x00b4 + .2byte 0x01dc, 0x00b4 + .2byte 0x000a, 0x005a + .2byte 0x010a, 0x005a + .2byte 0x0100, 0x00a0 + +gUnknown_83C68AC:: + obj_image_anim_frame 0x0000, 16 + obj_image_anim_frame 0x0001, 16 + obj_image_anim_end + +gUnknown_83C68B8:: + .4byte gUnknown_83C68AC gUnknown_83C68BC:: @ 83C68BC - .incbin "baserom.gba", 0x3C68BC, 0x18 + spr_template 4613, 4608, gOamData_83AC9C8, gUnknown_83C68B8, NULL, gDummySpriteAffineAnimTable, unc_0807DAB4 gUnknown_83C68D4:: @ 83C68D4 - .incbin "baserom.gba", 0x3C68D4, 0xC + .2byte 0x00c8, 0x0048, 0x0038, 0x0028, 0x0018, 0x0000 + diff --git a/graphics/field_effects/unk_83BFBE4.bin b/graphics/field_effects/unk_83BFBE4.bin new file mode 100644 index 0000000000000000000000000000000000000000..54748ea04292353724cb08ea6d420b61602e255c GIT binary patch literal 8192 zcmbVR?TXt-5R@!I49P>R#`_>A$b;;`J!k^=BDVMc9o#||R^Y4Z?wT*l$#E+pOHGRv?XISYN^Hmv1sAxG}$z3(l@_&Uo6q!EjahYpq7cnP?hD!{sYn>|So}FWf)f%5CH? z3q{cS9^+nvpW}z&{E7L~)+6_yj=z4Qg^p<$VNIraK2O*&voL z;w}F|gtz=t8?^==@*nXZ@E_s^w4l2S>*LybPtk z)R9xv%k_~gpTa+ScZG|8RhPT7;CuWd_w2vy@LzD(hxpeF_qZ(b8X~^=Lv7P=HNN55 z9M)e@w?_>7{IB8b+!ltdKfDWVBm158|GZjRlxM&W|I7~=yAJO7=N^deU-56N^|h;) z0zDqK*xv;=->dkK{hwxXR!1)UQ6GL+A`4CP2>mRmuII!IYWC3uhGl~yBV*4H>kD=q zhfjWHg+<24f&D@3X8!MRT4;}}%A8035BSfxIIOuX{x#ZIn14nstG2_RZ`S|GXQjJe z@-N%%WxjlzC$CC~_;pe>nfqH)zE(_G^qu&3^?A->OQ0fPH!r$MxD>N%WQ8ND(LT}B{^WQ7L_;22htOlVF?Eek? z<_dd#{EYsOc}yS1py%vZ<{$kT`pLLFJN|QgF_64MbJ|9)w<#>1Az3?Q*!b@h%IJ7Y zjQTH#)hn>*V?Cb#Vdm}oANl7q3o1U2_I{uFN1d&KlVcYF8P!IAZf-DUjmDrChx z!9U;FaVLJSQ$lCpi2DNxMad!&#r)PEP`MU26c(}naW&y7e;7{m$_K2xKN!yO5}n*( z1UU1+{%`Ut`dH_){UXL+K8inQ=6%Aq4CsU1K>Ht~tS!c%GUPYAK5G7Rk1&77dk!sz z`BNVi8nGQm{`h{{pqQ6W3CFp+@A#j&YAFB~P365ps?#s|xBXvwv;6E6>L~oG!zzA? z=c@Q8gLQ=y*ID@!KgF0MJfpto0K6iDJr0i4A7C+Ak2pnT3ja~bz$feZjF&juEdIf- zJ*AjGJ%Ey7_AgV$9S-zFb5ljUe(w0Uc{vCD$9a!`B3!lO4gVOO@ViCk zx8)x*&#YG{0RF+h^FlvfmAjYC_rD{2?{Lh|D|WH)dfX%M$t8Xjv3xG*A2oh5{y9&5 zEU19@^*uaU1!#Z0-Qx-4@q9qmuCEfCDC!XUd4S^`hR-LexA;p##((q&@Ebbd+L@Q} zm-W%&Wal(Py{-@T|9Cp6KG3eQg#LHG|KXb%oR@d~CNE#?e|obvSpWRD-*JQo_>b6z zXa31-&o6%e%lzl)7RB#s{-vCvkeYvd3yJyLPwC_T;jA*T2Abyp3>X+y6ivA9njc?VRDB|5hO@x;VZc+`jHqpE0z* zpC94z{`e4&{_!=c=P}FK`FHk{|9X4m$jaCTF8 zmIy1JZ@s@%L@Pf3=+Ag$pAm>Nli+u%`SCnywU2uoR~d5S^8xBpenb`D`F(=E>iEQ| zQXaEfiq<6UR0G{@BWD-H+!orvE?eD=RDEwU01<7Q7xU*DYR0@f;rGZac@0 zWJDb$dwl-|9&d9QFS8K$YRmU)Fyl7k@TcwQ65$!~7@zF$Ok79874xNqY+4+>%JOv! kTGcq?xW8fycevJ@5Ql%gKi9*9x$y6`%8%p1dCk9n0pRj}0ssI2 literal 0 HcmV?d00001 diff --git a/graphics/field_effects/unk_83C0408.bin b/graphics/field_effects/unk_83C0408.bin new file mode 100644 index 0000000000000000000000000000000000000000..932da7b46f916a66504f4e9f785fb34660012ab6 GIT binary patch literal 8192 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 KvCppih5rLBnPu<* literal 0 HcmV?d00001 diff --git a/graphics/field_effects/unk_83C2380.bin b/graphics/field_effects/unk_83C2380.bin new file mode 100644 index 0000000000000000000000000000000000000000..9e13c930b182af93d0d24d4d6fc9f3a68ce9a31c GIT binary patch literal 8192 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 literal 0 HcmV?d00001 diff --git a/graphics/field_effects/unk_83C3D40.png b/graphics/field_effects/unk_83C3D40.png new file mode 100644 index 0000000000000000000000000000000000000000..882fc213f659dcf105f171a916af45c7c2e67f23 GIT binary patch literal 653 zcmV;80&@L{P)|>Mc$(ZhG$N>r+-~TF=98QFAQ9b%=cxi(T9dR#8XnDw!jUqjrQd7;OLxdrCl5Wu*Yb$w6~BWeH~ zVGO+wgRTK4LNq)aK-!m9`+x#K!0QaHCX@r@j=-Wd=8=-^d^dZK3^XbrAVUYwKL9wt zG9dnRhok_>LyrsRiJm=3rcUYm6j1`30EH_BslcbnCC=2OlwV1p`}p}u^D~3J0;ugG zSexdnhZDYJ(V{K7-5eV$r;fHkLpL!g}FfM}bR>RsO<)&g&2!DqL-G|9WLbwWLSW9!w+k(o}z+_)e zM2MlOzz7SlO_ioJ1FQ`ea5qB*kPRD#9$-(RdjpUQFMwm-s*yZKK-GkZHHc7EA+Nv^ zKqo?JBc5>1rt(%InC%2tBAE4WHUqRz_>SGxey54cfY?heuxMW#;~aX)1iIjgfM@J6 zo9VFBC?U@c;1HJ@^3`ksc&x~`0PxXN)i_e$F9&#uX?qTn`zf@+5)%|PB%Z4HXeJ5P zf1+pt@Cakz(nB1c=k^dopO$RRar`Xg`L5@0vKZRaQU(D&A+A7r&9nc-Xa9R``9EdK zl%q$FUcGwt-o1NEmMrLenNj=7K8>o%{AX+`PBlp=r5@Cm+M{ W{rs-pN}UQo%?zHdelF{r5}E*IYDcgD literal 0 HcmV?d00001 diff --git a/graphics/field_effects/unk_83C4580.png b/graphics/field_effects/unk_83C4580.png new file mode 100644 index 0000000000000000000000000000000000000000..6bc71415257b06c34dd3d936e40b6fb74b3dc092 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^96&6ZRaQU(D&A+A7r&9nc-Xa9R``9EdK zl%q$FUcGwt-o1NEmMr`6pHR9J=8R!I`XAPD3I{Qr6Vl$n}CB8y4_noOV4Mggs6Au0kB zq09MPhsU?za0-`myBC&MMu8r$c_>V7lY+7Y&1>DD$Dc=uV76Ryn42x&2xX|8!%W!4 zT_hiBQ+B7ZSPz?$H(P=tWpG?b(+CJ=(ol9F)GwCjW(Axe&&xD_pccfTrC{~JKK%ib z*L7bjbCCNSOlo6$X70ksJ$^i3y|uln1VMU3vH3jyXMXsa6Tyw<2lMA8^8-{ciTT0J zkC&jMhpGZ(k`;;<`q58*!T6vpiYjhu^aUUB5W3k7xmVF0czk~N0Euo}RS@^|3IG5A M07*qoM6N<$f{@mzKmY&$ literal 0 HcmV?d00001 diff --git a/graphics/field_effects/unk_83C55C0.png b/graphics/field_effects/unk_83C55C0.png new file mode 100644 index 0000000000000000000000000000000000000000..a367de4e74aa3420cf4a43087ff15cc97c625706 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0ziC#g&9cxfBdf&NErn9gt!9fHP8MRpZ)K(<^Pl^ zQ;r@zdiCnnd-v`wS+e9m!+!|cvSrJ&XV1QU`}Y6;|H5|(+(12yB|(0{3=Yq3qyag- zo-U3d7QJ_;T;y#~;BoPmZP<0N_rbql%O?4N#qJ_5$&0>!4f30`Prx;ZEpdi~l$I7x zf`;}nftH2Kg<2ESGFI5k);pc>VuOsHme1zvfA>t&xi0hU@pc~e=I{xvIU;H0&lX>O z%HH%?`M&M1xYwt+41K2t+%tH#{%YCv8n4rPAEZ2azx-kRkNXSaF79e){ou>vyJF@E RKA^)GJYD@<);T3K0RX8sd=LNt literal 0 HcmV?d00001 diff --git a/graphics/field_effects/unk_83C5BC0.png b/graphics/field_effects/unk_83C5BC0.png new file mode 100644 index 0000000000000000000000000000000000000000..9896daac72e0f9322b70c00357a6ccce2c1ed14d GIT binary patch literal 603 zcmV-h0;K(kP)qXVWI`QC>nT2FV#dtWhzl{Z%3o@4Bw7{07k`^6 z2*5VRNi6@jDM?cP(N=3(8xH-2_zIfx#bjw5MLyTr;{#&V0kiog$UOuf0u-xU_=^Zy zPNkWu`LIA1665gj(oA&GtYsfMtYi|?mNPDGP>juB7Rf59&BYw0$>+cg;YU^;XLDZ% ztqY+7gms2byA+tU`e>QOg%TQKU0J5z`OP z>5@Re*_0Wl`>LOPv~Aug5Q46hov#AyXeAd{IznzqTt6DrE9ZaM_-TcH`V^XSfyxr% z*@=4MU5RR|>5E4|co|&)!{I#W+8{gRtK;+ON-yl#7y{hLn^O9F_m{HiN!(o-YmJC4 zmUYH4m>Os+_6TqYRtN4BMKtO*$XLcHNs|zHzH?HXS5vnS2S@cIQG(1L#^boxA#70B zl)p!o``iV+7;qc|cyuo#I_FQUk@)i3!%3j_$-^jbLX*G#mzoFJuP7w$X9g;r%o pGld(6-&V`TjWGfiws_Xo2>-eY8r;(%*pL7K002ovPDHLkV1h_27C`_2 literal 0 HcmV?d00001 From d650f4d880022632a49f4cbbf84f09394a89fac1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 25 Nov 2019 13:49:26 -0500 Subject: [PATCH 5/5] Bump discord invite --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c317630ca..b72d2ca86 100644 --- a/README.md +++ b/README.md @@ -33,4 +33,4 @@ Other disassembly and/or decompilation projects: ## Contacts -You can find us on [Discord](https://discord.gg/6EuWgX9) and [IRC](https://kiwiirc.com/client/irc.freenode.net/?#pret). +You can find us on [Discord](https://discord.gg/d5dubZ3) and [IRC](https://kiwiirc.com/client/irc.freenode.net/?#pret).