From ed8269889bff04d8bb4c05298b062df2c2232f40 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 20 Jan 2018 17:17:51 -0600 Subject: [PATCH 1/3] Extract data from pokedex.s --- asm/pokedex.s | 2 +- data/pokedex.s | 64 +++++++++++++++++++++---------- graphics/pokedex/black.pal | 19 +++++++++ graphics/pokedex/caught_ball.png | Bin 0 -> 210 bytes 4 files changed, 63 insertions(+), 22 deletions(-) create mode 100644 graphics/pokedex/black.pal create mode 100644 graphics/pokedex/caught_ball.png diff --git a/asm/pokedex.s b/asm/pokedex.s index 6ebeb0792b..92130e0513 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -8940,7 +8940,7 @@ _080C0250: b _080C028E .pool _080C028C: - ldr r0, =gUnknown_0856E688 + ldr r0, =sText_TenDashes2 _080C028E: movs r1, 0x84 movs r2, 0x19 diff --git a/data/pokedex.s b/data/pokedex.s index 3b783be34e..7fdecaf5f7 100644 --- a/data/pokedex.s +++ b/data/pokedex.s @@ -23,16 +23,15 @@ .endm gUnknown_0855D2B8:: @ 855D2B8 - .incbin "baserom.gba", 0x55d2b8, 0x6 + .string "{UNK_CTRL_F9 8}000$" gUnknown_0855D2BE:: @ 855D2BE - .incbin "baserom.gba", 0x55d2be, 0x40 + .incbin "graphics/pokedex/caught_ball.4bpp" sText_TenDashes:: @ 855D2FE .string "----------$" -.align 2 - + .align 2 gUnknown_0855D30C:: @ 855D30C .string "$" @@ -42,29 +41,41 @@ gUnknown_0855D30C:: @ 855D30C @ 856B5B0 .include "data/pokedex_entries.inc" + .align 2 gUnknown_0856E610:: @ 856E610 - .incbin "baserom.gba", 0x56e610, 0x20 + .incbin "graphics/pokedex/black.gbapal" + .align 2 gUnknown_0856E630:: @ 856E630 - .incbin "baserom.gba", 0x56e630, 0x10 + .4byte 0x000030c8, 0x000000d1, 0x000010ea, 0x000020f3 + .align 2 gUnknown_0856E640:: @ 856E640 - .incbin "baserom.gba", 0x56e640, 0x28 + window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001 + window_template 0x02, 0x19, 0x08, 0x02, 0x02, 0x0f, 0x0281 + window_template 0x00, 0x00, 0x0c, 0x20, 0x07, 0x08, 0x0285 + window_template 0x02, 0x12, 0x03, 0x0a, 0x08, 0x09, 0x0365 + window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + .align 2 gUnknown_0856E668:: @ 856E668 - .incbin "baserom.gba", 0x56e668, 0x8 + .4byte 0x000020ea, 0x000030f7 + .align 2 gUnknown_0856E670:: @ 856E670 - .incbin "baserom.gba", 0x56e670, 0x18 + window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001 + window_template 0x02, 0x19, 0x08, 0x02, 0x02, 0x0f, 0x0281 + window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 -gUnknown_0856E688:: @ 856E688 - .incbin "baserom.gba", 0x56e688, 0xc +sText_TenDashes2:: @ 856E688 + .string "----------$" @ 856E694 .include "data/graphics/pokemon/footprint_table.inc" gUnknown_0856ED08:: @ 856ED08 - .incbin "baserom.gba", 0x56ed08, 0x28 + .byte 0x00, 0x00, 0x00, 0x00, 0xbb, 0x03, 0xd5, 0x03, 0xbe, 0x03, 0xd8, 0x03, 0xc1, 0x03, 0xdb, 0x03, 0xc4, 0x03, 0xde, 0x03, 0xc7, 0x03, 0xe1, 0x03, 0xca, 0x03, 0xe4, 0x03, 0xcd, 0x03, 0xe7, 0x03 + .byte 0xd0, 0x03, 0xea, 0x03, 0xd3, 0x02, 0xed, 0x02 gUnknown_0856ED30:: @ 856ED30 unk_dex_struct_3 gUnknown_085E87A5, 0, 0, 5 @@ -80,18 +91,23 @@ gUnknown_0856ED48:: @ 856ED48 unk_dex_struct_2 gUnknown_085E8806, 0, 10, 5, 5, 10, 12 unk_dex_struct_2 gUnknown_085E88C8, 0, 12, 5, 0, 0, 0 + .align 1 gUnknown_0856ED9C:: @ 856ED9C - .incbin "baserom.gba", 0x56ed9c, 0x1c + .2byte 0xffff, 0x01ff, 0xffff, 0x0200, 0x03ff, 0x0401, 0xff02, 0x0401, 0xffff, 0x0502, 0xffff, 0x0604, 0xffff, 0xff05 + .align 1 gUnknown_0856EDB8:: @ 856EDB8 - .incbin "baserom.gba", 0x56edb8, 0x1c + .2byte 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x05ff, 0xffff, 0x0604, 0xffff, 0xff05 + .align 1 gUnknown_0856EDD4:: @ 856EDD4 - .incbin "baserom.gba", 0x56edd4, 0x1c + .2byte 0xffff, 0x01ff, 0xffff, 0x0200, 0x03ff, 0x0401, 0xff02, 0x0401, 0xffff, 0x0602, 0xffff, 0xffff, 0xffff, 0xff04 + .align 1 gUnknown_0856EDF0:: @ 856EDF0 - .incbin "baserom.gba", 0x56edf0, 0x1c + .2byte 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x06ff, 0xffff, 0xffff, 0xffff, 0xff04 + .align 2 gUnknown_0856EE0C:: @ 856EE0C .4byte gUnknown_085E89A4 .4byte gUnknown_085E88DF @@ -100,6 +116,7 @@ gUnknown_0856EE0C:: @ 856EE0C .4byte NULL .4byte NULL + .align 2 gUnknown_0856EE24:: @ 856EE24 .4byte gUnknown_085E89D4 .4byte gUnknown_085E88F6 @@ -208,14 +225,15 @@ gUnknown_0856EF14:: @ 856EF14 .4byte 0 gUnknown_0856EFAC:: @ 856EFAC - .incbin "baserom.gba", 0x56efac, 0x2 + .byte 0x00, 0x01 gUnknown_0856EFAE:: @ 856EFAE - .incbin "baserom.gba", 0x56efae, 0x6 + .byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 gUnknown_0856EFB4:: @ 856EFB4 - .incbin "baserom.gba", 0x56efb4, 0x14 + .byte 0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x00, 0x00 + .align 2 gUnknown_0856EFC8:: @ 856EFC8 unk_dex_struct gUnknown_0856EE5C, 6, 7, 10 unk_dex_struct gUnknown_0856EEB4, 8, 9, 11 @@ -224,8 +242,12 @@ gUnknown_0856EFC8:: @ 856EFC8 unk_dex_struct gUnknown_0856EE24, 4, 5, 6 unk_dex_struct gUnknown_0856EE0C, 2, 3, 2 + .align 2 gUnknown_0856EFF8:: @ 856EFF8 - .incbin "baserom.gba", 0x56eff8, 0x10 + .4byte 0x000000c8, 0x000010d1, 0x000020ea, 0x000030f3 + .align 2 gUnknown_0856F008:: @ 856F008 - .incbin "baserom.gba", 0x56f008, 0x10 + window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001 + null_window_template + diff --git a/graphics/pokedex/black.pal b/graphics/pokedex/black.pal new file mode 100644 index 0000000000..4b0812f094 --- /dev/null +++ b/graphics/pokedex/black.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokedex/caught_ball.png b/graphics/pokedex/caught_ball.png new file mode 100644 index 0000000000000000000000000000000000000000..b4e518f22c87e00a437b9d1a81df29fc8e5ab5a6 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^96&6ZRaQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`4FY^ZTq_zFe*E}x;w Date: Sat, 20 Jan 2018 17:45:45 -0600 Subject: [PATCH 2/3] Extract data from map_obj_8097404 --- data/field_ground_effect.s | 36 ------------ data/map_obj_8097404.s | 115 ++++++++++++++++++++++++++++++++----- 2 files changed, 100 insertions(+), 51 deletions(-) diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s index be5639406d..113814721e 100644 --- a/data/field_ground_effect.s +++ b/data/field_ground_effect.s @@ -65,40 +65,4 @@ gUnknown_0850E674:: @ 850E674 .4byte GroundEffect_ShortGrass .4byte GroundEffect_HotSprings .4byte GroundEffect_Seaweed - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte triple_little_steps - .4byte triple_little_steps - .4byte double_little_steps - .4byte triple_little_steps - .4byte triple_little_steps - .4byte quad_little_steps - .4byte quad_little_steps - .4byte quad_little_steps - .4byte quad_little_steps - .4byte oct_little_steps - .4byte oct_little_steps diff --git a/data/map_obj_8097404.s b/data/map_obj_8097404.s index 161796765e..719a782662 100644 --- a/data/map_obj_8097404.s +++ b/data/map_obj_8097404.s @@ -2,44 +2,129 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 + .align 2 +gUnknown_0850E6C4:: @ 850E6C4 + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .align 2 +gUnknown_0850E704:: @ 850E704 + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + + .align 2 +gUnknown_0850E724:: @ 850E724 + .4byte double_little_steps + .4byte triple_little_steps + .4byte triple_little_steps + .4byte double_little_steps + .4byte triple_little_steps + .4byte triple_little_steps + + .align 2 +gUnknown_0850E73C:: @ 850E73C + .4byte quad_little_steps + .4byte quad_little_steps + .4byte quad_little_steps + .4byte quad_little_steps + + .align 2 +gUnknown_0850E74C:: @ 850E74C + .4byte oct_little_steps + .4byte oct_little_steps + + .align 2 gUnknown_0850E754:: @ 850E754 - .incbin "baserom.gba", 0x50e754, 0x14 + .4byte gUnknown_0850E6C4 + .4byte gUnknown_0850E704 + .4byte gUnknown_0850E724 + .4byte gUnknown_0850E73C + .4byte gUnknown_0850E74C + .align 1 gUnknown_0850E768:: @ 850E768 - .incbin "baserom.gba", 0x50e768, 0xa + .2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002 gUnknown_0850E772:: @ 850E772 - .incbin "baserom.gba", 0x50e772, 0x48 + .byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01 + .byte 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 gUnknown_0850E7BA:: @ 850E7BA - .incbin "baserom.gba", 0x50e7ba, 0x7a + .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00 + .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe +gUnknown_0850E802:: @ 850E802 + .byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00 + +gUnknown_0850E812:: @ 850E812 + .byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00 + +gUnknown_0850E822:: @ 850E822 + .byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00 + + .align 2 gUnknown_0850E834:: @ 850E834 - .incbin "baserom.gba", 0x50e834, 0xc + .4byte gUnknown_0850E802 + .4byte gUnknown_0850E812 + .4byte gUnknown_0850E822 + .align 1 gUnknown_0850E840:: @ 850E840 - .incbin "baserom.gba", 0x50e840, 0x6 + .byte 0x10, 0x00, 0x10, 0x00, 0x20, 0x00 + .align 1 gUnknown_0850E846:: @ 850E846 - .incbin "baserom.gba", 0x50e846, 0x4 + .byte 0x00, 0x00, 0x01, 0x00 + .align 1 gUnknown_0850E84A:: @ 850E84A - .incbin "baserom.gba", 0x50e84a, 0x6 + .byte 0x20, 0x00, 0x20, 0x00, 0x40, 0x00 + .align 1 gUnknown_0850E850:: @ 850E850 - .incbin "baserom.gba", 0x50e850, 0x4 + .byte 0x01, 0x01, 0x02, 0x00 -// referenced in src/field_map_obj.o +// referenced in data/field_map_obj.s + .align 2 gUnknown_0850E854:: - .incbin "baserom.gba", 0x50e854, 0x8 + .4byte sub_8097E50 + .4byte sub_80964B8 + .align 2 gUnknown_0850E85C:: - .incbin "baserom.gba", 0x50e85C, 0x8 + .4byte sub_8097EF0 + .4byte sub_80964B8 + .align 2 gUnknown_0850E864:: - .incbin "baserom.gba", 0x50e864, 0xc + .4byte sub_80980C0 + .4byte sub_80980D0 + .4byte sub_8098124 + .align 2 gUnknown_0850E870:: - .incbin "baserom.gba", 0x50e870, 0xc + .4byte sub_80980F4 + .4byte sub_8098108 + .4byte sub_8098124 From 8d7a8301514700d11c83ecdb69c5f52088672365 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 20 Jan 2018 18:30:33 -0600 Subject: [PATCH 3/3] Extract data from field_effect_misc --- data/field_effect_misc.s | 211 ++++++++++++++++++++++++++-- graphics/unknown/858E588/0.png | Bin 0 -> 145 bytes graphics/unknown/858E588/1.png | Bin 0 -> 149 bytes graphics/unknown/858E588/2.png | Bin 0 -> 138 bytes graphics/unknown/858E588/3.png | Bin 0 -> 133 bytes graphics/unknown/858E588/4.png | Bin 0 -> 114 bytes graphics/unknown/858E5B0/0.png | Bin 0 -> 89 bytes graphics/unknown/858E5B0/1.png | Bin 0 -> 109 bytes graphics/unknown/858E5B0/2.png | Bin 0 -> 119 bytes graphics/unknown/858E5B0/3.png | Bin 0 -> 123 bytes graphics/unknown/858E5B0/4.png | Bin 0 -> 129 bytes graphics/unknown/858E5B0/5.png | Bin 0 -> 126 bytes graphics/unknown/858E5D8/0.png | Bin 0 -> 87 bytes graphics/unknown/858E5D8/1.png | Bin 0 -> 116 bytes graphics/unknown/858E5D8/2.png | Bin 0 -> 131 bytes graphics/unknown/858E5D8/3.png | Bin 0 -> 115 bytes graphics/unknown/858E5D8/4.png | Bin 0 -> 92 bytes graphics/unknown/858E674/0.png | Bin 0 -> 272 bytes graphics/unknown/858E674/1.png | Bin 0 -> 255 bytes graphics/unknown/858E674/2.png | Bin 0 -> 256 bytes graphics/unknown/858E84C/0.png | Bin 0 -> 103 bytes graphics/unknown/858E84C/1.png | Bin 0 -> 107 bytes graphics/unknown/858E84C/2.png | Bin 0 -> 107 bytes graphics/unknown/unknown_58E82C.pal | 19 +++ 24 files changed, 219 insertions(+), 11 deletions(-) create mode 100644 graphics/unknown/858E588/0.png create mode 100644 graphics/unknown/858E588/1.png create mode 100644 graphics/unknown/858E588/2.png create mode 100644 graphics/unknown/858E588/3.png create mode 100644 graphics/unknown/858E588/4.png create mode 100644 graphics/unknown/858E5B0/0.png create mode 100644 graphics/unknown/858E5B0/1.png create mode 100644 graphics/unknown/858E5B0/2.png create mode 100644 graphics/unknown/858E5B0/3.png create mode 100644 graphics/unknown/858E5B0/4.png create mode 100644 graphics/unknown/858E5B0/5.png create mode 100644 graphics/unknown/858E5D8/0.png create mode 100644 graphics/unknown/858E5D8/1.png create mode 100644 graphics/unknown/858E5D8/2.png create mode 100644 graphics/unknown/858E5D8/3.png create mode 100644 graphics/unknown/858E5D8/4.png create mode 100644 graphics/unknown/858E674/0.png create mode 100644 graphics/unknown/858E674/1.png create mode 100644 graphics/unknown/858E674/2.png create mode 100644 graphics/unknown/858E84C/0.png create mode 100644 graphics/unknown/858E84C/1.png create mode 100644 graphics/unknown/858E84C/2.png create mode 100644 graphics/unknown/unknown_58E82C.pal diff --git a/data/field_effect_misc.s b/data/field_effect_misc.s index 88f9f1c946..ef73c32635 100644 --- a/data/field_effect_misc.s +++ b/data/field_effect_misc.s @@ -4,28 +4,169 @@ .section .rodata .align 2 - .incbin "baserom.gba", 0x58d978, 0x2a0 +gSpriteImage_858D978:: @ 858D978 + .incbin "graphics/unknown/858E588/0.4bpp" + + .align 2 +gSpriteImage_858D9F8:: @ 858D9F8 + .incbin "graphics/unknown/858E588/1.4bpp" + + .align 2 +gSpriteImage_858DA78:: @ 858DA78 + .incbin "graphics/unknown/858E588/2.4bpp" + + .align 2 +gSpriteImage_858DAF8:: @ 858DAF8 + .incbin "graphics/unknown/858E588/3.4bpp" + + .align 2 +gSpriteImage_858DB78:: @ 858DB78 + .incbin "graphics/unknown/858E588/4.4bpp" + + .space 32 .align 2 gFieldEffectObjectPalette7:: @ 858DC18 .incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal" - .incbin "baserom.gba", 0x58dc38, 0x580 + .align 2 +gSpriteImage_858DC38:: @ 858DC38 + .incbin "graphics/unknown/858E5D8/0.4bpp" + + .align 2 +gSpriteImage_858DCB8:: @ 858DCB8 + .incbin "graphics/unknown/858E5D8/1.4bpp" + + .align 2 +gSpriteImage_858DD38:: @ 858DD38 + .incbin "graphics/unknown/858E5D8/2.4bpp" + + .align 2 +gSpriteImage_858DDB8:: @ 858DDB8 + .incbin "graphics/unknown/858E5D8/3.4bpp" + + .align 2 +gSpriteImage_858DE38:: @ 858DE38 + .incbin "graphics/unknown/858E5D8/4.4bpp" + + .align 2 +gSpriteImage_858DEB8:: @ 858DEB8 + .incbin "graphics/unknown/858E5B0/0.4bpp" + + .align 2 +gSpriteImage_858DF38:: @ 858DF38 + .incbin "graphics/unknown/858E5B0/1.4bpp" + + .align 2 +gSpriteImage_858DFB8:: @ 858DFB8 + .incbin "graphics/unknown/858E5B0/2.4bpp" + + .align 2 +gSpriteImage_858E038:: @ 858E038 + .incbin "graphics/unknown/858E5B0/3.4bpp" + + .align 2 +gSpriteImage_858E0B8:: @ 858E0B8 + .incbin "graphics/unknown/858E5B0/4.4bpp" + + .align 2 +gSpriteImage_858E138:: @ 858E138 + .incbin "graphics/unknown/858E5B0/5.4bpp" .align 2 gFieldEffectObjectPalette8:: @ 858E1B8 .incbin "graphics/map_objects/palettes/field_effect_object_palette_08.gbapal" - .incbin "baserom.gba", 0x58e1d8, 0x428 + .align 2 +gSpriteImage_858E1D8:: @ 858E1D8 + .incbin "graphics/unknown/858E674/0.4bpp" + .align 2 +gSpriteImage_858E2D8:: @ 858E2D8 + .incbin "graphics/unknown/858E674/1.4bpp" + + .align 2 +gSpriteImage_858E3D8:: @ 858E3D8 + .incbin "graphics/unknown/858E674/2.4bpp" + + .align 2 +gOamData_858E4D8:: @ 858E4D8 + .2byte 0x0000, 0x4000, 0x0800, 0x0000 + + .align 2 +gSpriteAnim_858E4E0:: @ 858E4E0 + .2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_858E4F8:: @ 858E4F8 + .2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_858E510:: @ 858E510 + .2byte 0x0004, 0x0008, 0x0003, 0x0008, 0x0002, 0x0008, 0x0001, 0x0008, 0x0000, 0x0008, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_858E528:: @ 858E528 + .2byte 0x0000, 0x0048, 0x0001, 0x0048, 0x0002, 0x0048, 0x0003, 0x0048, 0x0004, 0x0048, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_858E540:: @ 858E540 + .2byte 0x0004, 0x0048, 0x0003, 0x0048, 0x0002, 0x0048, 0x0001, 0x0048, 0x0000, 0x0048, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_858E558:: @ 858E558 + .2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_858E570:: @ 858E570 + .4byte gSpriteAnim_858E4E0 + + .align 2 +gSpriteAnimTable_858E574:: @ 858E574 + .4byte gSpriteAnim_858E4F8 + .4byte gSpriteAnim_858E510 + .4byte gSpriteAnim_858E528 + .4byte gSpriteAnim_858E540 + + .align 2 +gSpriteAnimTable_858E584:: @ 858E584 + .4byte gSpriteAnim_858E558 + + .align 2 +gUnknown_858E588:: @ 858E588 + obj_frame_tiles gSpriteImage_858D978, 0x0080 + obj_frame_tiles gSpriteImage_858D9F8, 0x0080 + obj_frame_tiles gSpriteImage_858DA78, 0x0080 + obj_frame_tiles gSpriteImage_858DAF8, 0x0080 + obj_frame_tiles gSpriteImage_858DB78, 0x0080 + + .align 2 +gUnknown_858E5B0:: @ 858E5B0 + obj_frame_tiles gSpriteImage_858DEB8, 0x0080 + obj_frame_tiles gSpriteImage_858DF38, 0x0080 + obj_frame_tiles gSpriteImage_858DFB8, 0x0080 + obj_frame_tiles gSpriteImage_858E038, 0x0080 + obj_frame_tiles gSpriteImage_858E0B8, 0x0080 + + .align 2 +gUnknown_858E5D8:: @ 858E5D8 + obj_frame_tiles gSpriteImage_858DC38, 0x0080 + obj_frame_tiles gSpriteImage_858DCB8, 0x0080 + obj_frame_tiles gSpriteImage_858DD38, 0x0080 + obj_frame_tiles gSpriteImage_858DDB8, 0x0080 + obj_frame_tiles gSpriteImage_858DE38, 0x0080 + + .align 2 gUnknown_0858E600:: @ 858E600 - .incbin "baserom.gba", 0x58e600, 0x18 + spr_template 0xffff, 0x1003, gOamData_858E4D8, gSpriteAnimTable_858E570, gUnknown_858E588, gDummySpriteAffineAnimTable, sub_80FA18C + .align 2 gUnknown_0858E618:: @ 858E618 - .incbin "baserom.gba", 0x58e618, 0x18 + spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E574, gUnknown_858E5B0, gDummySpriteAffineAnimTable, sub_80FA2D8 + .align 2 gUnknown_0858E630:: @ 858E630 - .incbin "baserom.gba", 0x58e630, 0x18 + spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E584, gUnknown_858E5D8, gDummySpriteAffineAnimTable, sub_80FA3FC .align 2 gFieldEffectObjectPaletteInfo7:: @ 858E648 @@ -35,10 +176,27 @@ gFieldEffectObjectPaletteInfo7:: @ 858E648 gFieldEffectObjectPaletteInfo8:: @ 858E650 obj_pal gFieldEffectObjectPalette8, 0x1008 - .incbin "baserom.gba", 0x58e658, 0x34 + .align 2 +gOamData_858E658:: @ 858E658 + .2byte 0x8000, 0x8000, 0x0800, 0x0000 + .align 2 +gSpriteAnim_858E660:: @ 858E660 + .2byte 0x0000, 0x0006, 0x0001, 0x0006, 0x0002, 0x0006, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_858E670:: @ 858E670 + .4byte gSpriteAnim_858E660 + + .align 2 +gUnknown_0858E674:: @ 858E674 + obj_frame_tiles gSpriteImage_858E1D8, 0x0100 + obj_frame_tiles gSpriteImage_858E2D8, 0x0100 + obj_frame_tiles gSpriteImage_858E3D8, 0x0100 + + .align 2 gUnknown_0858E68C:: @ 858E68C - .incbin "baserom.gba", 0x58e68c, 0x18 + spr_template 0xffff, 0x100e, gOamData_858E658, gSpriteAnimTable_858E670, gUnknown_0858E674, gDummySpriteAffineAnimTable, door_restore_tilemap .align 2 @ This uses one of the secret base palettes, so there is no @@ -46,10 +204,41 @@ gUnknown_0858E68C:: @ 858E68C gFieldEffectObjectPaletteInfo9:: @ 858E6A4 obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E - .incbin "baserom.gba", 0x58e6ac, 0x1b8 + .align 2 +gSpriteImage_858E6AC:: @ 858E6AC + .incbin "graphics/unknown/858E84C/0.4bpp" + .align 2 +gSpriteImage_858E72C:: @ 858E72C + .incbin "graphics/unknown/858E84C/1.4bpp" + + .align 2 +gSpriteImage_858E7AC:: @ 858E7AC + .incbin "graphics/unknown/858E84C/2.4bpp" + + .align 2 +gUnknown_0858E82C:: @ 858E82C + .incbin "graphics/unknown/unknown_58E82C.gbapal" + + .align 2 +gUnknown_0858E84C:: @ 858E84C + obj_frame_tiles gSpriteImage_858E6AC, 0x0080 + obj_frame_tiles gSpriteImage_858E72C, 0x0080 + obj_frame_tiles gSpriteImage_858E7AC, 0x0080 + + .align 2 gUnknown_0858E864:: @ 858E864 - .incbin "baserom.gba", 0x58e864, 0x1c + obj_pal gUnknown_0858E82C, 0x1000 + .align 2 +gSpriteAnim_858E86C:: @ 858E86C + .2byte 0x0000, 0x001e, 0x0001, 0x001e, 0x0002, 0x001e, 0xfffe, 0x0000 + + .align 2 +gSpriteAnimTable_858E87C:: @ 858E87C + .4byte gSpriteAnim_858E86C + + .align 2 gUnknown_0858E880:: @ 858E880 - .incbin "baserom.gba", 0x58e880, 0x18 + spr_template 0xffff, 0x1000, gFieldObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy + diff --git a/graphics/unknown/858E588/0.png b/graphics/unknown/858E588/0.png new file mode 100644 index 0000000000000000000000000000000000000000..70b0774b0d546f6ca73eb346aa66f0a2315f8c24 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx5uPrNAsjPX&u-*BV8FrRVAlCb z?!Y9^_e{Uu>}T8YKf!gSbLpe63Mb23PM_HN(C(#q>dwqKzmrZTYdLaRxQq*g_L?0D s+^Tt1F+<=oZ!6E6-8WT#eQ(-d!N9pE=5V`D#6^%@p00i_>zopr0DJg08vpW6usqBG_N?~Pd@tEzHP xA}O(*tNf$Ej>5%86DPZv;6;cBD>&=$T=H6+yPn2;OXk;vd$@?2>`ffIQ;+s literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E588/2.png b/graphics/unknown/858E588/2.png new file mode 100644 index 0000000000000000000000000000000000000000..c006bb660962272d5b22f42aaf35aa9157e5ed8d GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExfu1goAsjPnPZ{zx81OJ3_`@>M zZh=tZ`3rA;{x_fWW|@Pzip|^{;jkC-eV4AL)K8qh*=_~n6<*_3%N02u^Vm*xW*DjG lxo=SM{1A7iRcO!7<#9Z-lQyN~%l-yg;_2$=vd$@?2>^v&F$e$v literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E588/3.png b/graphics/unknown/858E588/3.png new file mode 100644 index 0000000000000000000000000000000000000000..67a3cf76900d5b9e3969ee2e94e7bc197a356a74 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExKAtX)AsjQ4fAF*NEHQdxxYX`{ zd0VH%-}DcA`KRux{{CL{|NifdJ=WFlE$;8Fp8xR7JLBcK@8<12{NeYRyLXqLe`k62 i!_8kk-`?Fl^^GBPX5oRhO&8XK%=dKlb6Mw<&;$UcMLY@s literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E588/4.png b/graphics/unknown/858E588/4.png new file mode 100644 index 0000000000000000000000000000000000000000..e2a5aec4fbc57c3fa1c826d5ba60d8d4b1af9856 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExmYyz-AsjQ;c3k9SP~v4-nZ!(IX@j%n97R5#--8VE MboFyt=akR{01b^LMF0Q* literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5B0/0.png b/graphics/unknown/858E5B0/0.png new file mode 100644 index 0000000000000000000000000000000000000000..afd104d7ca67c876327122032566e81dfd84e429 GIT binary patch literal 89 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx3Z5>GAsjQ4fAF*H{{H{}d4?tR l?|1X2zG*dj5R~A+&c^VqtajP_^v4b$J)W+9F6*2Ung9T}8?68U literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5B0/1.png b/graphics/unknown/858E5B0/1.png new file mode 100644 index 0000000000000000000000000000000000000000..026b9b7afe1b01bd05528f1e44a04cf054c50148 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExCY~;iAsjQ4fBgUd|NVW3CdQ8P z_iYAs^KbGezOno(f9l46dEY1Btyj#tU;h2@7U!i34K{2H758hnO5PV}gUs=C^>bP0 Hl+XkKa49HV literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5B0/2.png b/graphics/unknown/858E5B0/2.png new file mode 100644 index 0000000000000000000000000000000000000000..360e2ab63e655b5c4e37d564eca2f5b58dc37dd3 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExcAhSdAsjQ4fBgUd|NVW3CdQ8P z_w5FC^Z)gqvtXY3Yd`xjhSQA_|G&R;PyVxyJM~R9Z|LUlW R`TQD?iJq>0F6*2UngCA@E}8%U literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5B0/3.png b/graphics/unknown/858E5B0/3.png new file mode 100644 index 0000000000000000000000000000000000000000..88672c182463cab3c4f460b6a28e713ee5e5f9ce GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExPM$7~AsjPpPoLyvP~>5D_?54@ zCWs+`@s?PI0)O$%CyBi|s*D{G6U}@w{6x%t9@JkXbgfWe?t$k`oX+v~jK1IH)ZC_3 UNq&;ZNdTGZ>FVdQ&MBb@0E0{Kb)%E-UJ*m;Ea6{vytzVwS0)s<68T@ Yj1vFKtVI7${sS`D)78&qol`;+0QOKSs{jB1 literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5D8/0.png b/graphics/unknown/858E5D8/0.png new file mode 100644 index 0000000000000000000000000000000000000000..110b1dd0a50dd8335d7b088e22c7641a824a2945 GIT binary patch literal 87 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExa-J@ZAsjQ4fAF*Nv`Fk<(3Af& j!0lF*hH|&WTNfh+?H#qLmmRGHK{`BL{an^LB{Ts5Q!*D0 literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5D8/1.png b/graphics/unknown/858E5D8/1.png new file mode 100644 index 0000000000000000000000000000000000000000..f50079de7f4ea6efe4bf84cac1e8ce51e9cfd692 GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx)}AhoAsjQ4fAF*N{E(=>?<`sW z?%reLu37T+ z|NXZ7X*H+qnWtI()_VK@|8|FC^Q%w)`@fs{>euHs9gLTl!+0(+r!{<;Q_FAq^SteZ eS=KMI6c`vf{i<#qH}^^bneOT8=d#Wzp$Py2XE5^s literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5D8/3.png b/graphics/unknown/858E5D8/3.png new file mode 100644 index 0000000000000000000000000000000000000000..0ea6e43c96ecf571dcd7d06edad1637404b02236 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExR-P`7AsjQ4fAF*N+>reL&RH`5 zyt8Ebf}q!lS^FA88kb&bSS8`GC-rB#Ls0(t|EJhjTQY~W9_A8ZV>tPw+U@^;``;kb NJYD@<);T3K0RU#NCp-WE literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E5D8/4.png b/graphics/unknown/858E5D8/4.png new file mode 100644 index 0000000000000000000000000000000000000000..4b4e300bb70c593b700504e5e6c1aa568f6c7092 GIT binary patch literal 92 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fEx%APKcAsjQ4fAF*Nm?Zw$&78W& owqL3Ao9&d3&*dTnUAR_oFdUYs^VeEhXAjcm>FVdQ&MBb@0MtAf@Bjb+ literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E674/0.png b/graphics/unknown/858E674/0.png new file mode 100644 index 0000000000000000000000000000000000000000..64b61050f629c42546831427d3352481a6207ae5 GIT binary patch literal 272 zcmV+r0q_2aP)8IuY0000mP)t-sQnXUl z#f!A0Vw8hHdtxB})mm!3|Nnceq~3FbtWt};i(-^wQc_ZLb924D#qRF^H4WU=0001+ zNkl|ep=n*BO4eR@b!psj+cih>k$?89|kH!Br1G-EAngh^Sjgxx+@oWcgBOLN9Y5E W<2r|;K@1`Q00008IuY0000mP)t-sQnXUl z#f!A0Vw8hHdtxB})mm!3|Nnceq~3FbtWt};i(-^wQc_ZLb924D#qRF^H4WU=0001r zNklT`O9p8#iKHB2Lj9a69(AP}U%bszH{9dsrcdA~@Bw}uB;JS1mf-*Z002ovPDHLk FV1n<}Z&UyP literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E674/2.png b/graphics/unknown/858E674/2.png new file mode 100644 index 0000000000000000000000000000000000000000..d5dd69078b6059e6fc4d728a16acd9dbc9c22b9d GIT binary patch literal 256 zcmV+b0ssDqP)8IuY0000mP)t-sQnXUl z#f!A0Vw8hHdtxB})mm!3|Nnceq~3FbtWt};i(-^wQc_ZLb924D#qRF^H4WU=0001s zNklZYgTMd(|31I}fA?J;CnkpO=(@nk8a){x6Fgo0T-G@yGywoa CVI}JT literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E84C/1.png b/graphics/unknown/858E84C/1.png new file mode 100644 index 0000000000000000000000000000000000000000..c55f2146d54f5e0f5b8a1c6aa12b914a0fd92f77 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-k0wfqJ4V+hC0B8&@i*FfbHJ)V^C@CtwaT#naW#Wt~$( F699bhE2;nh literal 0 HcmV?d00001 diff --git a/graphics/unknown/858E84C/2.png b/graphics/unknown/858E84C/2.png new file mode 100644 index 0000000000000000000000000000000000000000..4f03b50ae96a69b3c5fe1401e33c4f7edd93aad3 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-k0wfqJ4V+hC0