summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-05-07 09:26:36 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2019-05-07 09:26:36 -0400
commitfb6e1b726588686d94582bd52b927bd936c84f3b (patch)
treea0c6b85f61a0a4eeb27d47d796ab3887c2cc659f
parentdbb001d594a6956bd099870ea116b9321761b5a3 (diff)
Disassemble rodata referenced in unk_8147500
-rw-r--r--data/data_8468C98.s45
-rw-r--r--graphics/misc/unk_846B008.pngbin0 -> 757 bytes
-rw-r--r--graphics_file_rules.mk3
3 files changed, 44 insertions, 4 deletions
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 000000000..4fed89d24
--- /dev/null
+++ b/graphics/misc/unk_846B008.png
Binary files differ
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