From d002ea4fe8f043cf4d88fb1bb355f7823e20891c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 4 Nov 2019 10:37:13 -0500 Subject: [PATCH] Disassemble hall_of_fame data --- asm/hall_of_fame.s | 4 +- baserom.ips | Bin 449424 -> 448532 bytes data/hall_of_fame.s | 165 +++++++++++++++++++++++--- graphics/hall_of_fame/unk_840C3BC.png | Bin 0 -> 481 bytes 4 files changed, 153 insertions(+), 16 deletions(-) create mode 100644 graphics/hall_of_fame/unk_840C3BC.png diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index 36eacbf17..d649871e0 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -1788,7 +1788,7 @@ _080F2BF8: adds r0, 0x4 adds r0, r1, r0 ldrh r3, [r0] - ldr r2, _080F2C38 @ =gUnknown_840C26E + ldr r2, _080F2C38 @ =gUnknown_840C268 + 6 adds r1, r2 ldrh r4, [r1] b _080F2C4C @@ -1798,7 +1798,7 @@ _080F2C28: .4byte gTasks _080F2C2C: .4byte gUnknown_203AB34 _080F2C30: .4byte 0x000001ff _080F2C34: .4byte gUnknown_840C268 -_080F2C38: .4byte gUnknown_840C26E +_080F2C38: .4byte gUnknown_840C268 + 6 _080F2C3C: ldr r0, _080F2C9C @ =gUnknown_840C298 lsls r2, r5, 3 diff --git a/baserom.ips b/baserom.ips index 9e3746b73023ab1464a7f9d8ec39e1f556fc5249..d8b086947bfab64514607abb12d57557204066b3 100644 GIT binary patch delta 40 vcmbQRU3$s}>4p}@7N!>FEi5^?OiXXK=jF1zVQRlt%mT!$+piU~?Mep#N4pTI delta 940 zcmY+DO=uHA6vzLwlP0mXI%EAp>zcG6^&o9nk@`U!MHD>=9uz^eDAS7P;@p|~v*vT$0-Z^-xEB4td{9r&Rf!7%To+snARA3(E9I-0k*W2-A%A4l2Iv@4# z#*_c&4A6ggB=gZIbi#LTcbLIad znRW$H<_LfaD={hOu4tgxNikVTv?Oxt11U2BuaiL#WWXzXih?;OrBZc!3=*M2jnt(z z@Qw5RQ2Bc`mMM)IS6XYBH7-=tvLtN^3fz}E6zj*bThZ+!FN0YP8EBgc^z4-2r6b~c zfbO=saEofgLcxp7h(3J*cdV~$sBtII3Y{&?`nU#O?R?{l+YVf>u*w$OGxT$H;9YZ| zQSH!ov_EwYv7MSV*tR+(3W3>YM~Yf7ql|^q#wlyer}TnyicZ7U8JrjF6Ruu3j13l# zop>NNTk%xfl6`{9{?z62H(kaR%k~=?`r$+KM2h2DTxH$m)7d94F#zrq+u(OJcPu>? zu-&pZP#?vmOyl<)OZTF1gVs?!*}jBrH+ZFe>y)>#Z_HQ5PYnuH+2*a#?4l>ws(`&p zon!ZM?7%FF8r`a4*sNh+Cek;-ERKe2@zdD5J8G0^m(IIq+4f01YiJ*%dBO~z`8z>> YKDNhrJjQ9ndJpAdMAhJ-TzvS%Z?8BzZvX%Q diff --git a/data/hall_of_fame.s b/data/hall_of_fame.s index 3cd0876fc..732d8ce07 100644 --- a/data/hall_of_fame.s +++ b/data/hall_of_fame.s @@ -7,37 +7,174 @@ .align 2 gUnknown_840C228:: @ 840C228 - .incbin "baserom.gba", 0x40C228, 0xC + .4byte 0x000001f8 + @ { + @ .bg = 0, + @ .charBaseIndex = 2, + @ .mapBaseIndex = 31, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0000 + @ } + .4byte 0x000011e1 + @ { + @ .bg = 1, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 30, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 1, + @ .baseTile = 0x0000 + @ } + .4byte 0x000031d3 + @ { + @ .bg = 3, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 29, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 3, + @ .baseTile = 0x0000 + @ } gUnknown_840C234:: @ 840C234 - .incbin "baserom.gba", 0x40C234, 0x8 + .byte 0, 2, 2, 17, 6, 13 + .2byte 0x0001 + .align 2 gUnknown_840C23C:: @ 840C23C - .incbin "baserom.gba", 0x40C23C, 0x4 + .byte 0, 1, 2 + .align 2 gUnknown_840C240:: @ 840C240 - .incbin "baserom.gba", 0x40C240, 0x8 + .byte 0, 2, 3 + .byte 0, 4, 5 + .align 2 gUnknown_840C248:: @ 840C248 - .incbin "baserom.gba", 0x40C248, 0x10 + obj_tiles gFile_graphics_misc_confetti_sheet, 0x220, 1001 + null_obj_tiles gUnknown_840C258:: @ 840C258 - .incbin "baserom.gba", 0x40C258, 0x10 + obj_pal gFile_graphics_misc_confetti_palette, 1001 + null_obj_pal gUnknown_840C268:: @ 840C268 - .incbin "baserom.gba", 0x40C268, 0x6 - -gUnknown_840C26E:: @ 840C26E - .incbin "baserom.gba", 0x40C26E, 0x2A + .2byte 0x0078, 0x00d2, 0x0078, 0x0028 + .2byte 0x0146, 0x00dc, 0x0038, 0x0028 + .2byte 0xffaa, 0x00dc, 0x00b8, 0x0028 + .2byte 0x0078, 0xffc2, 0x0078, 0x0058 + .2byte 0xffba, 0xffa4, 0x00c8, 0x0058 + .2byte 0x0136, 0xffa4, 0x0028, 0x0058 gUnknown_840C298:: @ 840C298 - .incbin "baserom.gba", 0x40C298, 0xEC + .2byte 0x0078, 0x00ea, 0x0078, 0x0040 + .2byte 0x0146, 0x00f4, 0x0038, 0x0040 + .2byte 0xffaa, 0x00f4, 0x00b8, 0x0040 + +gOamData_840C2B0:: + .4byte 0x00000000, 0x00000000 + +gAnimCmd_840C2B8:: + obj_image_anim_frame 0x00, 30 + obj_image_anim_end + +gAnimCmd_840C2C0:: + obj_image_anim_frame 0x01, 30 + obj_image_anim_end + +gAnimCmd_840C2C8:: + obj_image_anim_frame 0x02, 30 + obj_image_anim_end + +gAnimCmd_840C2D0:: + obj_image_anim_frame 0x03, 30 + obj_image_anim_end + +gAnimCmd_840C2D8:: + obj_image_anim_frame 0x04, 30 + obj_image_anim_end + +gAnimCmd_840C2E0:: + obj_image_anim_frame 0x05, 30 + obj_image_anim_end + +gAnimCmd_840C2E8:: + obj_image_anim_frame 0x06, 30 + obj_image_anim_end + +gAnimCmd_840C2F0:: + obj_image_anim_frame 0x07, 30 + obj_image_anim_end + +gAnimCmd_840C2F8:: + obj_image_anim_frame 0x08, 30 + obj_image_anim_end + +gAnimCmd_840C300:: + obj_image_anim_frame 0x09, 30 + obj_image_anim_end + +gAnimCmd_840C308:: + obj_image_anim_frame 0x0a, 30 + obj_image_anim_end + +gAnimCmd_840C310:: + obj_image_anim_frame 0x0b, 30 + obj_image_anim_end + +gAnimCmd_840C318:: + obj_image_anim_frame 0x0c, 30 + obj_image_anim_end + +gAnimCmd_840C320:: + obj_image_anim_frame 0x0d, 30 + obj_image_anim_end + +gAnimCmd_840C328:: + obj_image_anim_frame 0x0e, 30 + obj_image_anim_end + +gAnimCmd_840C330:: + obj_image_anim_frame 0x0f, 30 + obj_image_anim_end + +gAnimCmd_840C338:: + obj_image_anim_frame 0x10, 30 + obj_image_anim_end + +gSpriteAnimTable_840C340:: + .4byte gAnimCmd_840C2B8 + .4byte gAnimCmd_840C2C0 + .4byte gAnimCmd_840C2C8 + .4byte gAnimCmd_840C2D0 + .4byte gAnimCmd_840C2D8 + .4byte gAnimCmd_840C2E0 + .4byte gAnimCmd_840C2E8 + .4byte gAnimCmd_840C2F0 + .4byte gAnimCmd_840C2F8 + .4byte gAnimCmd_840C300 + .4byte gAnimCmd_840C308 + .4byte gAnimCmd_840C310 + .4byte gAnimCmd_840C318 + .4byte gAnimCmd_840C320 + .4byte gAnimCmd_840C328 + .4byte gAnimCmd_840C330 + .4byte gAnimCmd_840C338 gUnknown_840C384:: @ 840C384 - .incbin "baserom.gba", 0x40C384, 0x18 + spr_template 1001, 1001, gOamData_840C2B0, gSpriteAnimTable_840C340, NULL, gDummySpriteAffineAnimTable, sub_80F38D8 gUnknown_840C39C:: @ 840C39C - .incbin "baserom.gba", 0x40C39C, 0x20 + .incbin "graphics/hall_of_fame/unk_840C3BC.gbapal" gUnknown_840C3BC:: @ 840C3BC - .incbin "baserom.gba", 0x40C3BC, 0x1E8 + .incbin "graphics/hall_of_fame/unk_840C3BC.4bpp.lz" + +gUnknown_840C588:: + @ Unreferenced + .2byte 1002, 1002 + .space 16 + .byte 2, 1, 3 + .byte 6, 4, 5 diff --git a/graphics/hall_of_fame/unk_840C3BC.png b/graphics/hall_of_fame/unk_840C3BC.png new file mode 100644 index 0000000000000000000000000000000000000000..5676654959f3aaf1ab89f01d054bc279ec28c210 GIT binary patch literal 481 zcmeAS@N?(olHy`uVBq!ia0vp^96_af(eeNP|Iz$i=NK3mb39!fLo9lGgB|k@8}M8f@42I!V9!w!umAhMe9OJ3@*c`_ z%d#hztmbcFH8ykAQp#V~_LZ+D;iULA``yRS^K7`Gb@oh(;-8Ohq6$u7PuH=Zo>o0C zduIjzbe|~`b+V6NR*bS;;=bsLLdE1aKTi~A2*?%STZKR?wY-R zg?YuJm&+_~p7|hgY4TZ>Tfd(2E-!G}X;l^w+9LDg(aU|T8!nhGmY%j{^9oD;ODj}! zkAA&A)jIgin+L^a5tF1W)`qN<(0Wz*LDGaPpHV$F(d=vLuX*7A@38&pd8Dn*8fc z-Z$ZV@2a~CGQRz+?VYR5u2(ySMeWBF@mJgRil?ow>yRums$lrF*E9Ot9&Ts9G&!I8 zbB%NFEax*