diff --git a/baserom.ips b/baserom.ips index cfed266938..b8a3107e46 100644 Binary files a/baserom.ips and b/baserom.ips differ diff --git a/data/pokemon_special_anim.s b/data/pokemon_special_anim.s index d0f4decdf3..16593e4d83 100644 --- a/data/pokemon_special_anim.s +++ b/data/pokemon_special_anim.s @@ -6,71 +6,195 @@ .section .rodata .align 2 -gUnknown_8459634:: @ 8459634 - .incbin "baserom.gba", 0x459634, 0x8 +gUnknown_8459634:: @ 8459634 data16 2x2 + .2byte 0x0044, 0x0000 + .2byte 0x000d, 0x0001 + +gUnknown_845963C:: @ 845963C gbapal + .incbin "graphics/pokemon_special_anim/unk_845963C.gbapal" -gUnknown_845963C:: @ 845963C - .incbin "baserom.gba", 0x45963C, 0x20 +gUnknown_845965C:: @ 845965C gbapal + .incbin "graphics/pokemon_special_anim/unk_845965C.gbapal" -gUnknown_845965C:: @ 845965C - .incbin "baserom.gba", 0x45965C, 0x20 +gUnknown_845967C:: @ 845967C 4bpp.lz + .incbin "graphics/pokemon_special_anim/unk_845967C.4bpp.lz" + +gUnknown_845973C:: @ 845973C bin.lz + .incbin "graphics/pokemon_special_anim/unk_845973C.bin.lz" + +gUnknown_8459868:: @ 8459868 gbapal + .incbin "graphics/pokemon_special_anim/unk_8459868.gbapal" -gUnknown_845967C:: @ 845967C - .incbin "baserom.gba", 0x45967C, 0xC0 +gUnknown_8459888:: @ 8459888 4bpp.lz + .incbin "graphics/pokemon_special_anim/unk_8459888.4bpp.lz" + +gUnknown_84598A4:: @ 84598A4 gbapal + .incbin "graphics/pokemon_special_anim/unk_84598A4.gbapal" + +gUnknown_84598C4:: @ 84598C4 4bpp.lz + .incbin "graphics/pokemon_special_anim/unk_84598C4.4bpp.lz" + +gUnknown_8459940:: @ 8459940 gbapal + .incbin "graphics/pokemon_special_anim/unk_8459940.gbapal" + +gUnknown_8459960:: @ 8459960 4bpp.lz + .incbin "graphics/pokemon_special_anim/unk_8459960.4bpp.lz" + +gUnknown_8459980:: @ 8459980 bg_template + .4byte 0x000041f0 + @ { + @ .bg = 0, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 31, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0001 + @ } + .4byte 0x000031cf + @ { + @ .bg = 3, + @ .charBaseIndex = 3, + @ .mapBaseIndex = 28, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 3, + @ .baseTile = 0x0000 + @ } + +gUnknown_8459988:: @ 8459988 window_template + .byte 0, 1, 15, 28, 4, 15 + .2byte 0x000a + .byte 255, 0, 0, 0, 0, 0 + .2byte 0x0000 + +gUnknown_8459998:: @ 8459998 dataptr + .4byte gUnknown_841B2ED @ 1, + .4byte gUnknown_841B2F1 @ 2, and ‥ ‥ ‥ + .4byte gUnknown_841B2FF @ Poof! -gUnknown_845973C:: @ 845973C - .incbin "baserom.gba", 0x45973C, 0x12C +gUnknown_84599A4:: @ 84599A4 + .2byte 0x0000, 0x0010 + +gUnknown_84599A8:: @ 84599A8 unref, data16? + .2byte 0x0044 + +gUnknown_84599AA:: @ 84599AA data16 + .2byte 0x0100, 0x0155, 0x01aa, 0x0200 + +gUnknown_84599B2:: @ 84599B2 data8 + .byte 0xf8, 0xf8, 0x06, 0xf3, 0x08, 0xf8 + +gUnknown_84599B8:: @ 84599B8 sprite_sheet + obj_tiles gUnknown_84598C4, 0x0080, 2 + +gUnknown_84599C0:: @ 84599C0 sprite_palette + obj_pal gUnknown_84598A4, 2 + +gUnknown_84599C8:: @ 84599C8 sprite_sheet + obj_tiles gUnknown_8459960, 0x0060, 5 + +gUnknown_84599D0:: @ 84599D0 sprite_palette + obj_pal gUnknown_8459940, 5 + +gUnknown_84599D8:: @ 84599D8 + .4byte 0xc0000300, 0x00000400 + +gUnknown_84599E0:: @ 84599E0 + obj_rot_scal_anim_frame 256, 256, 0, 0 + obj_rot_scal_anim_end + +gUnknown_84599F0:: @ 84599F0 + obj_rot_scal_anim_frame 341, 341, 0, 0 + obj_rot_scal_anim_end + +gUnknown_8459A00:: @ 8459A00 + obj_rot_scal_anim_frame 426, 426, 0, 0 + obj_rot_scal_anim_end + +gUnknown_8459A10:: @ 8459A10 + obj_rot_scal_anim_frame 512, 512, 0, 0 + obj_rot_scal_anim_end + +gUnknown_8459A20:: @ 8459A20 dataptr + .4byte gUnknown_84599E0 + .4byte gUnknown_84599F0 + .4byte gUnknown_8459A00 + .4byte gUnknown_8459A10 + +gUnknown_8459A30:: @ 8459A30 spr_template + spr_template 0, 0, gUnknown_84599D8, gDummySpriteAnimTable, NULL, gUnknown_8459A20, SpriteCallbackDummy + +gUnknown_8459A48:: @ 8459A48 affine_anim_cmd? + obj_rot_scal_anim_frame 256, 256, 0, 0 + obj_rot_scal_anim_frame -28, -28, 0, 8 + obj_rot_scal_anim_end + +gUnknown_8459A60:: @ 459A60 + obj_rot_scal_anim_frame 341, 341, 0, 0 + obj_rot_scal_anim_frame -37, -37, 0, 8 + obj_rot_scal_anim_end + +gUnknown_8459A78:: @ 459A78 + obj_rot_scal_anim_frame 426, 426, 0, 0 + obj_rot_scal_anim_frame -47, -47, 0, 8 + obj_rot_scal_anim_end + +gUnknown_8459A90:: @ 459A90 + obj_rot_scal_anim_frame 512, 512, 0, 0 + obj_rot_scal_anim_frame -56, -56, 0, 8 + obj_rot_scal_anim_end + +gUnknown_8459AA8:: @ 8459AA8 dataptr + .4byte gUnknown_8459A48 + .4byte gUnknown_8459A60 + .4byte gUnknown_8459A78 + .4byte gUnknown_8459A90 + +gUnknown_8459AB8:: @ 8459AB8 + .4byte 0x00008400, 0x00000400 + +gUnknown_8459AC0:: @ 8459AC0 + obj_image_anim_frame 0x0000, 3 + obj_image_anim_end + +gUnknown_8459AC8:: @ 8459AC8 + .4byte gUnknown_8459AC0 -gUnknown_8459868:: @ 8459868 - .incbin "baserom.gba", 0x459868, 0x20 +gUnknown_8459ACC:: @ 8459ACC spr_template + spr_template 0, 0, gUnknown_8459AB8, gUnknown_8459AC8, NULL, gDummySpriteAffineAnimTable, sub_811E7B4 -gUnknown_8459888:: @ 8459888 - .incbin "baserom.gba", 0x459888, 0xF8 +gUnknown_8459AE4:: @ 8459AE4 + .4byte 0x40000000, 0x00000400 -gUnknown_8459980:: @ 8459980 - .incbin "baserom.gba", 0x459980, 0x8 +gUnknown_8459AEC:: @ 8459AEC spr_template + spr_template 2, 2, gUnknown_8459AE4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811E300 -gUnknown_8459988:: @ 8459988 - .incbin "baserom.gba", 0x459988, 0x10 +gUnknown_8459B04:: @ 8459B04 + .4byte 0x00000000, 0x00000000 -gUnknown_8459998:: @ 8459998 - .incbin "baserom.gba", 0x459998, 0x12 +gUnknown_8459B0C:: @ 8459B0C + obj_image_anim_frame 0x0000, 16 + obj_image_anim_frame 0x0001, 8 + obj_image_anim_frame 0x0002, 4 + obj_image_anim_end -gUnknown_84599AA:: @ 84599AA - .incbin "baserom.gba", 0x4599AA, 0x8 +gUnknown_8459B1C:: @ 8459B1C + obj_image_anim_frame 0x0001, 4 + obj_image_anim_frame 0x0000, 4 + obj_image_anim_end -gUnknown_84599B2:: @ 84599B2 - .incbin "baserom.gba", 0x4599B2, 0x6 +gUnknown_8459B28:: @ 8459B28 + .4byte gUnknown_8459B0C + .4byte gUnknown_8459B1C -gUnknown_84599B8:: @ 84599B8 - .incbin "baserom.gba", 0x4599B8, 0x8 - -gUnknown_84599C0:: @ 84599C0 - .incbin "baserom.gba", 0x4599C0, 0x8 - -gUnknown_84599C8:: @ 84599C8 - .incbin "baserom.gba", 0x4599C8, 0x8 - -gUnknown_84599D0:: @ 84599D0 - .incbin "baserom.gba", 0x4599D0, 0x50 - -gUnknown_8459A20:: @ 8459A20 - .incbin "baserom.gba", 0x459A20, 0x10 - -gUnknown_8459A30:: @ 8459A30 - .incbin "baserom.gba", 0x459A30, 0x78 - -gUnknown_8459AA8:: @ 8459AA8 - .incbin "baserom.gba", 0x459AA8, 0x24 - -gUnknown_8459ACC:: @ 8459ACC - .incbin "baserom.gba", 0x459ACC, 0x20 - -gUnknown_8459AEC:: @ 8459AEC - .incbin "baserom.gba", 0x459AEC, 0x44 - -gUnknown_8459B30:: @ 8459B30 - .incbin "baserom.gba", 0x459B30, 0x18 - -gUnknown_8459B48:: @ 8459B48 - .incbin "baserom.gba", 0x459B48, 0x18 +gUnknown_8459B30:: @ 8459B30 spr_template + spr_template 5, 5, gUnknown_8459B04, gUnknown_8459B28, NULL, gDummySpriteAffineAnimTable, sub_811E520 + +gUnknown_8459B48:: @ 8459B48 dataptr + .4byte gUnknown_841B2A9 + .4byte gUnknown_841B2B7 + .4byte gUnknown_841B2BE + .4byte gUnknown_841B2CC + .4byte gUnknown_841B2D4 + .4byte gUnknown_841B2C6 diff --git a/graphics/pokemon_special_anim/unk_845963C.pal b/graphics/pokemon_special_anim/unk_845963C.pal new file mode 100644 index 0000000000..35239d3da3 --- /dev/null +++ b/graphics/pokemon_special_anim/unk_845963C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 222 205 +255 222 189 +255 222 180 +255 213 180 +255 205 180 +255 205 164 +255 205 156 +255 205 139 +0 0 0 +255 197 139 +255 172 131 +255 213 156 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon_special_anim/unk_845965C.pal b/graphics/pokemon_special_anim/unk_845965C.pal new file mode 100644 index 0000000000..50d72a9f08 --- /dev/null +++ b/graphics/pokemon_special_anim/unk_845965C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 238 255 +213 238 255 +213 230 255 +213 230 255 +205 230 255 +205 222 255 +205 222 255 +197 222 255 +0 0 0 +189 222 255 +172 213 255 +205 230 255 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon_special_anim/unk_845967C.png b/graphics/pokemon_special_anim/unk_845967C.png new file mode 100644 index 0000000000..79e555c851 Binary files /dev/null and b/graphics/pokemon_special_anim/unk_845967C.png differ diff --git a/graphics/pokemon_special_anim/unk_845973C.bin b/graphics/pokemon_special_anim/unk_845973C.bin new file mode 100644 index 0000000000..6c9b5cdff1 Binary files /dev/null and b/graphics/pokemon_special_anim/unk_845973C.bin differ diff --git a/graphics/pokemon_special_anim/unk_8459888.png b/graphics/pokemon_special_anim/unk_8459888.png new file mode 100644 index 0000000000..5d6cad137f Binary files /dev/null and b/graphics/pokemon_special_anim/unk_8459888.png differ diff --git a/graphics/pokemon_special_anim/unk_84598C4.png b/graphics/pokemon_special_anim/unk_84598C4.png new file mode 100644 index 0000000000..cbf71cdcb0 Binary files /dev/null and b/graphics/pokemon_special_anim/unk_84598C4.png differ diff --git a/graphics/pokemon_special_anim/unk_8459960.png b/graphics/pokemon_special_anim/unk_8459960.png new file mode 100644 index 0000000000..2c428a0db0 Binary files /dev/null and b/graphics/pokemon_special_anim/unk_8459960.png differ