From fb6e1b726588686d94582bd52b927bd936c84f3b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 7 May 2019 09:26:36 -0400 Subject: [PATCH] Disassemble rodata referenced in unk_8147500 --- data/data_8468C98.s | 45 +++++++++++++++++++++++++++++++--- graphics/misc/unk_846B008.png | Bin 0 -> 757 bytes graphics_file_rules.mk | 3 +++ 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 graphics/misc/unk_846B008.png diff --git a/data/data_8468C98.s b/data/data_8468C98.s index cf1e51529..0f3b039c1 100644 --- a/data/data_8468C98.s +++ b/data/data_8468C98.s @@ -5,16 +5,53 @@ .align 2 gUnknown_846AFE8:: @ 846AFE8 - .incbin "baserom.gba", 0x46AFE8, 0x444 + .incbin "graphics/misc/unk_846B008.gbapal" + +gUnknown_846B008:: @ 846B008 + .incbin "graphics/misc/unk_846B008.4bpp.lz" gUnknown_846B42C:: @ 846B42C - .incbin "baserom.gba", 0x46B42C, 0x10 + obj_tiles gUnknown_846B008, 0x0c00, 0x2000 + null_obj_tiles gUnknown_846B43C:: @ 846B43C - .incbin "baserom.gba", 0x46B43C, 0x58 + obj_pal gUnknown_846AFE8, 0x2000 + null_obj_pal + +gUnknown_846B44C:: @ 846B44C + obj_image_anim_frame 0x00, 0 + obj_image_anim_end + +gUnknown_846B454:: @ 846B454 + obj_image_anim_frame 0x10, 0 + obj_image_anim_end + +gUnknown_846B45C:: @ 846B45C + obj_image_anim_frame 0x20, 0 + obj_image_anim_end + +gUnknown_846B464:: @ 846B464 + obj_image_anim_frame 0x40, 0 + obj_image_anim_end + +gUnknown_846B46C:: @ 846B46C + obj_image_anim_frame 0x30, 0 + obj_image_anim_end + +gUnknown_846B474:: @ 846B474 + obj_image_anim_frame 0x50, 0 + obj_image_anim_end + +gUnknown_846B47C:: + .4byte gUnknown_846B44C + .4byte gUnknown_846B454 + .4byte gUnknown_846B45C + .4byte gUnknown_846B464 + .4byte gUnknown_846B46C + .4byte gUnknown_846B474 gUnknown_846B494:: @ 846B494 - .incbin "baserom.gba", 0x46B494, 0x18 + spr_template 0x2000, 0x2000, gOamData_83AC9D8, gUnknown_846B47C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_846B4AC:: @ 846B4AC @ This is a 2D array with one row. diff --git a/graphics/misc/unk_846B008.png b/graphics/misc/unk_846B008.png new file mode 100644 index 0000000000000000000000000000000000000000..4fed89d24ef8e953168a7bfee24240a0cd1a4b80 GIT binary patch literal 757 zcmVKmOXCsFbsxu16^Bj-DnMRg4iech8`fm=L2-=+@*#_ zEd|RzNtA0B89S6f9lw+w>epnQBLlMJs%^E~%FhtOb8~IA^Em`){r%_jx~?D9wbdBm zysps(^uku)w%1|3X-nJ6QcvG)7p^I^Z4w#^O``wET}P zVh7|U0*8sanj=`iL7;7K9f0@80C@==-~n*o$2Mm=0W$(d$Q{7Z(C*z~j&%(f;Q%m) z3Hin9Z@|n}eHijI&zEF7bO5a(pf8pFVVLJB9s{1XX_#-R^r!Lcb?X7%73V8Z`lllR zxUG$luiO4T;PZT#$gSZ`7dO444VKT9rG4@Nkf1P>}=1K9Nr1yDx;YISIUyv5dJ z0m`94sssPfoXLf$E=d!mz|6Uq*PzuPEKxH!P^q}nUlRG$oV<0MwY^R81&|c1X`K4W z_e5E`lx1n-!1UM$GFLSDK6e0`Z3mQ8AL|Hp8=|~OrD*_+tvCoE4s_-6k}Tl!P>Tbn z(3)0mS~fT%wp{HX*W&OP;97AgzzstT3~;Pl2S|0uJs=?@XAc{ItApPFiJy%(0CuHX za5@I0m^5JEiApuu1KbW!x8fl{tHWf^;U_?=!z8!$5kRX0Z!XaPg80SLcY;rr;#6;! nX5>|JiX5j%dAh&y@T=?#S;}LXluHq100000NkvXXu0mjfj1*nE literal 0 HcmV?d00001 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index bdb4eda05..43da030c1 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -665,3 +665,6 @@ $(GLOBALGFXDIR)/fame_checker_bg.4bpp: %.4bpp: %.png data/seagallop/water.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 41 + +$(MISCGFXDIR)/unk_846B008.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4